From 7da5b08b55e6e6465165dc19c079d4eaf4f70dca Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Wed, 24 Sep 2008 23:20:22 +0000 Subject: [PATCH 01/29] added libjasper-dev to build-deps --- debian/changelog | 5 ++++- debian/control | 3 ++- debian/control.in | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0eadb1c9f4..e7051035f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,11 @@ gtk+2.0 (2.14.3-1) UNRELEASED; urgency=low - removed; fixed upstream * debian/patches/070_mandatory-relibtoolize.patch: - refreshed + * debian/control.in: + - added libjasper-dev to the Build-Depends, as GTK+ now supports + JPEG2000 - -- Gustavo Noronha Silva Wed, 24 Sep 2008 19:53:45 -0300 + -- Gustavo Noronha Silva Wed, 24 Sep 2008 20:19:02 -0300 gtk+2.0 (2.12.11-4) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 66f4ab5192..08dc779ec4 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gtk+2.0 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge +Uploaders: Debian GNOME Maintainers , Gustavo Noronha Silva , Josselin Mouette , Loic Minier , Sebastian Dröge Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, @@ -26,6 +26,7 @@ Build-Depends: debhelper (>= 5.0.22), libcairo-directfb2-dev (>= 1.2.4-4), libtiff4-dev, libjpeg62-dev, + libjasper-dev, libpng12-dev, gnome-pkg-tools (>= 0.11), chrpath, diff --git a/debian/control.in b/debian/control.in index 1ce4afb7ad..cc185f15c7 100644 --- a/debian/control.in +++ b/debian/control.in @@ -26,6 +26,7 @@ Build-Depends: debhelper (>= 5.0.22), libcairo-directfb2-dev (>= 1.2.4-4), libtiff4-dev, libjpeg62-dev, + libjasper-dev, libpng12-dev, gnome-pkg-tools (>= 0.11), chrpath, From 49cb8b2d80b0fd0d19c9a8f73183698d45c29876 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Thu, 25 Sep 2008 00:39:14 +0000 Subject: [PATCH 02/29] new patch to fix the printing test build --- debian/changelog | 4 +++- .../patches/092_fix_printtest_include.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 debian/patches/092_fix_printtest_include.patch diff --git a/debian/changelog b/debian/changelog index e7051035f5..d291604fab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,10 @@ gtk+2.0 (2.14.3-1) UNRELEASED; urgency=low * debian/control.in: - added libjasper-dev to the Build-Depends, as GTK+ now supports JPEG2000 + * debian/patches/092_fix_printtest_include.patch: + - new patch, to fix build problem in print test - -- Gustavo Noronha Silva Wed, 24 Sep 2008 20:19:02 -0300 + -- Gustavo Noronha Silva Wed, 24 Sep 2008 21:12:33 -0300 gtk+2.0 (2.12.11-4) UNRELEASED; urgency=low diff --git a/debian/patches/092_fix_printtest_include.patch b/debian/patches/092_fix_printtest_include.patch new file mode 100644 index 0000000000..18e3e66ae4 --- /dev/null +++ b/debian/patches/092_fix_printtest_include.patch @@ -0,0 +1,19 @@ +Index: gtk+2.0-2.14.3/modules/printbackends/test/gtkprintbackendtest.c +=================================================================== +--- gtk+2.0-2.14.3.orig/modules/printbackends/test/gtkprintbackendtest.c 2008-09-24 21:07:22.000000000 -0300 ++++ gtk+2.0-2.14.3/modules/printbackends/test/gtkprintbackendtest.c 2008-09-24 21:07:28.000000000 -0300 +@@ -35,12 +35,12 @@ + + #include + +-#include "gtkprintoperation.h" ++#include + + #include "gtkprintbackend.h" + #include "gtkprintbackendtest.h" + +-#include "gtkprinter.h" ++#include + #include "gtkprinter-private.h" + + typedef struct _GtkPrintBackendTestClass GtkPrintBackendTestClass; diff --git a/debian/patches/series b/debian/patches/series index fa20a90672..3195207b3c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,3 +19,4 @@ 060_ignore-random-icons.patch 070_mandatory-relibtoolize.patch 091_workaround_no_gtk_init_incorrect_display.patch +092_fix_printtest_include.patch From ed05b2b3c1b8ed50b086d02c3feae9ecb880f449 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Thu, 25 Sep 2008 00:40:29 +0000 Subject: [PATCH 03/29] avoid building directfb for now --- debian/changelog | 4 +++- debian/rules | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d291604fab..b1608b8da1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,10 @@ gtk+2.0 (2.14.3-1) UNRELEASED; urgency=low JPEG2000 * debian/patches/092_fix_printtest_include.patch: - new patch, to fix build problem in print test + * debian/rules: + - FIXME: do not build directfb for now; we need a newer libdirectfb-dev - -- Gustavo Noronha Silva Wed, 24 Sep 2008 21:12:33 -0300 + -- Gustavo Noronha Silva Wed, 24 Sep 2008 21:38:58 -0300 gtk+2.0 (2.12.11-4) UNRELEASED; urgency=low diff --git a/debian/rules b/debian/rules index 2f3ac50925..840da4ac9e 100644 --- a/debian/rules +++ b/debian/rules @@ -75,7 +75,9 @@ 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 +# FIXME: readd directfb as soon as libdirectfb-dev is updated to the 1.2.x +# series +FLAVORS := shared static # list of flavors to run the test suite on # don't run the directfb testsuite on kfreebsd as it hangs; see #431477 From 18638a1d17e1cd22d7edf60b3a10beb751c647cd Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Thu, 25 Sep 2008 11:19:16 +0000 Subject: [PATCH 04/29] merge old UNRELEASED changelog entry --- debian/changelog | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index b1608b8da1..6439c237dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ gtk+2.0 (2.14.3-1) UNRELEASED; urgency=low + [ Gustavo Noronha Silva ] * New upstream release * debian/patches/006_proper-directfb-modules.patch: - refreshed @@ -21,16 +22,13 @@ gtk+2.0 (2.14.3-1) UNRELEASED; urgency=low * debian/rules: - FIXME: do not build directfb for now; we need a newer libdirectfb-dev - -- Gustavo Noronha Silva Wed, 24 Sep 2008 21:38:58 -0300 - -gtk+2.0 (2.12.11-4) UNRELEASED; urgency=low - + [ Loic Minier ] * Let libgtk2.0-dev recommend debhelper for dh_gtkmodules. * Let libgtk2.0-dev depend on libxml2-utils as it's required for gtk-builder-convert to work and might be relied upon by packages bdeping on libgtk2.0-dev. - -- Loic Minier Wed, 13 Aug 2008 22:49:48 +0200 + -- Gustavo Noronha Silva Wed, 24 Sep 2008 21:38:58 -0300 gtk+2.0 (2.12.11-3) unstable; urgency=low From 2c2a9c9788fdc44a112f7c719861e5433659be84 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Tue, 4 Nov 2008 18:32:35 +0000 Subject: [PATCH 05/29] new upstream version, 2.14.4 --- debian/changelog | 2 +- .../patches/070_mandatory-relibtoolize.patch | 84338 ++++++++-------- 2 files changed, 41115 insertions(+), 43225 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6439c237dd..0eed765980 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gtk+2.0 (2.14.3-1) UNRELEASED; urgency=low +gtk+2.0 (2.14.4-1) UNRELEASED; urgency=low [ Gustavo Noronha Silva ] * New upstream release diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index afab7e1789..22609f3879 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -1,1571 +1,7 @@ -Index: gtk+2.0-2.14.3/aclocal.m4 -=================================================================== ---- gtk+2.0-2.14.3.orig/aclocal.m4 2008-09-24 00:11:30.000000000 -0300 -+++ gtk+2.0-2.14.3/aclocal.m4 2008-09-24 19:56:02.000000000 -0300 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.7.9 -*- Autoconf -*- -+# generated automatically by aclocal 1.10.1 -*- Autoconf -*- - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 --# Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -11,937 +11,702 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# autoconf 2.13 / 2.50 compatibility macro -- --# GLIB_AC_DIVERT_BEFORE_HELP(STUFF) --# --------------------------------- --# Put STUFF early enough so that they are available for $ac_help expansion. --# Handle both classic (<= v2.13) and modern autoconf --AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP], --[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])], -- [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])], -- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl --$1 --AC_DIVERT_POP()])])]) -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(AC_AUTOCONF_VERSION, [2.61],, -+[m4_warning([this file was generated for autoconf 2.61. -+You have another version of autoconf. It may work, but is not guaranteed to. -+If you have problems, you may need to regenerate the build system entirely. -+To do so, use the procedure documented by the package, typically `autoreconf'.])]) - --# GTK_ADD_LIB(VAR,LIBNAME) --# --------------------------------- --# Helper macro to add a -lBlah to a variable, avoiding repeats --# Note that this needs to be quoted when used in an enclosing macro --AC_DEFUN([GTK_ADD_LIB], --[ case "$$1 " in -- *-l$2[[\ \ ]]*) ;; -- *) $1="-l$2 $$1" ;; -- esac --]) -+# Configure paths for GLIB -+# Owen Taylor 1997-2001 - -+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -+dnl gthread, or gio is specified in MODULES, pass to pkg-config -+dnl -+AC_DEFUN([AM_PATH_GLIB_2_0], -+[dnl -+dnl Get the cflags and libraries from pkg-config -+dnl -+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], -+ , enable_glibtest=yes) - --# Checks the location of the XML Catalog --# Usage: --# JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) --# Defines XMLCATALOG and XML_CATALOG_FILE substitutions --AC_DEFUN([JH_PATH_XML_CATALOG], --[ -- # check for the presence of the XML catalog -- AC_ARG_WITH([xml-catalog], -- AC_HELP_STRING([--with-xml-catalog=CATALOG], -- [path to xml catalog to use]),, -- [with_xml_catalog=/etc/xml/catalog]) -- jh_found_xmlcatalog=true -- XML_CATALOG_FILE="$with_xml_catalog" -- AC_SUBST([XML_CATALOG_FILE]) -- AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)]) -- if test -f "$XML_CATALOG_FILE"; then -- AC_MSG_RESULT([found]) -- else -- jh_found_xmlcatalog=false -- AC_MSG_RESULT([not found]) -- fi -+ pkg_config_args=glib-2.0 -+ for module in . $4 -+ do -+ case "$module" in -+ gmodule) -+ pkg_config_args="$pkg_config_args gmodule-2.0" -+ ;; -+ gmodule-no-export) -+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" -+ ;; -+ gobject) -+ pkg_config_args="$pkg_config_args gobject-2.0" -+ ;; -+ gthread) -+ pkg_config_args="$pkg_config_args gthread-2.0" -+ ;; -+ gio*) -+ pkg_config_args="$pkg_config_args $module-2.0" -+ ;; -+ esac -+ done - -- # check for the xmlcatalog program -- AC_PATH_PROG(XMLCATALOG, xmlcatalog, no) -- if test "x$XMLCATALOG" = xno; then -- jh_found_xmlcatalog=false -- fi -+ PKG_PROG_PKG_CONFIG([0.16]) - -- if $jh_found_xmlcatalog; then -- ifelse([$1],,[:],[$1]) -- else -- ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2]) -- fi --]) -+ no_glib="" - --# Checks if a particular URI appears in the XML catalog --# Usage: --# JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) --AC_DEFUN([JH_CHECK_XML_CATALOG], --[ -- AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl -- AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) -- if $jh_found_xmlcatalog && \ -- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then -- AC_MSG_RESULT([found]) -- ifelse([$3],,,[$3 --])dnl -- else -- AC_MSG_RESULT([not found]) -- ifelse([$4],, -- [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])], -- [$4]) -+ if test "x$PKG_CONFIG" = x ; then -+ no_glib=yes -+ PKG_CONFIG=no - fi --]) - --# Do all the work for Automake. -*- Autoconf -*- -- --# This macro actually does too much some checks are only needed if --# your package does certain things. But this isn't really a big deal. -- --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+ min_glib_version=ifelse([$1], ,2.0.0,$1) -+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+ if test x$PKG_CONFIG != xno ; then -+ ## don't try to run the test against uninstalled libtool libs -+ if $PKG_CONFIG --uninstalled $pkg_config_args; then -+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" -+ enable_glibtest=no -+ fi - --# This program 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 General Public License for more details. -+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then -+ : -+ else -+ no_glib=yes -+ fi -+ fi - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+ if test x"$no_glib" = x ; then -+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` -+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - --# serial 10 -+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_glibtest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$GLIB_LIBS $LIBS" -+dnl -+dnl Now check if the installed GLIB is sufficiently new. (Also sanity -+dnl checks the results of pkg-config to some extent) -+dnl -+ rm -f conf.glibtest -+ AC_TRY_RUN([ -+#include -+#include -+#include - --AC_PREREQ([2.54]) -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; - --# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow --# the ones we care about. --m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -+ system ("touch conf.glibtest"); - --# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) --# AM_INIT_AUTOMAKE([OPTIONS]) --# ----------------------------------------------- --# The call with PACKAGE and VERSION arguments is the old style --# call (pre autoconf-2.50), which is being phased out. PACKAGE --# and VERSION should now be passed to AC_INIT and removed from --# the call to AM_INIT_AUTOMAKE. --# We support both call styles for the transition. After --# the next Automake release, Autoconf can make the AC_INIT --# arguments mandatory, and then we can depend on a new Autoconf --# release and drop the old call support. --AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -- AC_REQUIRE([AC_PROG_INSTALL])dnl --# test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) --fi -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_glib_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_glib_version"); -+ exit(1); -+ } - --# test whether we have cygpath --if test -z "$CYGPATH_W"; then -- if (cygpath --version) >/dev/null 2>/dev/null; then -- CYGPATH_W='cygpath -w' -+ if ((glib_major_version != $glib_config_major_version) || -+ (glib_minor_version != $glib_config_minor_version) || -+ (glib_micro_version != $glib_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -+ printf("*** to point to the correct configuration files\n"); -+ } -+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || -+ (glib_minor_version != GLIB_MINOR_VERSION) || -+ (glib_micro_version != GLIB_MICRO_VERSION)) -+ { -+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", -+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ } - else -- CYGPATH_W=echo -+ { -+ if ((glib_major_version > major) || -+ ((glib_major_version == major) && (glib_minor_version > minor)) || -+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi - fi --fi --AC_SUBST([CYGPATH_W]) -- --# Define the identity of the package. --dnl Distinguish between old-style and new-style calls. --m4_ifval([$2], --[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -- AC_SUBST([PACKAGE], [$1])dnl -- AC_SUBST([VERSION], [$2])], --[_AM_SET_OPTIONS([$1])dnl -- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -- --_AM_IF_OPTION([no-define],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -- --# Some tools Automake needs. --AC_REQUIRE([AM_SANITY_CHECK])dnl --AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) --AM_MISSING_PROG(AUTOCONF, autoconf) --AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) --AM_MISSING_PROG(AUTOHEADER, autoheader) --AM_MISSING_PROG(MAKEINFO, makeinfo) --AM_MISSING_PROG(AMTAR, tar) --AM_PROG_INSTALL_SH --AM_PROG_INSTALL_STRIP --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. --AC_REQUIRE([AC_PROG_AWK])dnl --AC_REQUIRE([AC_PROG_MAKE_SET])dnl --AC_REQUIRE([AM_SET_LEADING_DOT])dnl -- --_AM_IF_OPTION([no-dependencies],, --[AC_PROVIDE_IFELSE([AC_PROG_CC], -- [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_CC], -- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_CXX], -- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl --]) --]) -- -- --# When config.status generates a header, we must update the stamp-h file. --# This file resides in the same directory as the config header --# that is generated. The stamp files are numbered to have different names. -- --# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the --# loop where config.status creates the headers, so we can generate --# our stamp files there. --AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], --[# Compute $1's index in $config_headers. --_am_stamp_count=1 --for _am_header in $config_headers :; do -- case $_am_header in -- $1 | $1:* ) -- break ;; -- * ) -- _am_stamp_count=`expr $_am_stamp_count + 1` ;; -- esac --done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -- --# Copyright 2002 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -- --# AM_AUTOMAKE_VERSION(VERSION) --# ---------------------------- --# Automake X.Y traces this macro to ensure aclocal.m4 has been --# generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) -- --# AM_SET_CURRENT_AUTOMAKE_VERSION --# ------------------------------- --# Call AM_AUTOMAKE_VERSION so it can be traced. --# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. --AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.7.9])]) -- --# Helper functions for option handling. -*- Autoconf -*- -- --# Copyright 2001, 2002 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 2 -- --# _AM_MANGLE_OPTION(NAME) --# ----------------------- --AC_DEFUN([_AM_MANGLE_OPTION], --[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -- --# _AM_SET_OPTION(NAME) --# ------------------------------ --# Set option NAME. Presently that only means defining a flag for this option. --AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -- --# _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- --# OPTIONS is a space-separated list of Automake options. --AC_DEFUN([_AM_SET_OPTIONS], --[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -- --# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) --# ------------------------------------------- --# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. --AC_DEFUN([_AM_IF_OPTION], --[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -+ if test "x$no_glib" = x ; then -+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig/" -+ else -+ if test -f conf.glibtest ; then -+ : -+ else -+ echo "*** Could not run GLIB test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$LIBS $GLIB_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -+ [ 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" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GLIB_CFLAGS="" -+ GLIB_LIBS="" -+ GLIB_GENMARSHAL="" -+ GOBJECT_QUERY="" -+ GLIB_MKENUMS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ AC_SUBST(GLIB_GENMARSHAL) -+ AC_SUBST(GOBJECT_QUERY) -+ AC_SUBST(GLIB_MKENUMS) -+ rm -f conf.glibtest -+]) - -+# Copyright (C) 1995-2002 Free Software Foundation, Inc. -+# Copyright (C) 2001-2003,2004 Red Hat, Inc. - # --# Check to make sure that the build environment is sane. -+# This file is free software, distributed under the terms of the GNU -+# General Public License. As a special exception to the GNU General -+# Public License, this file may be distributed as part of a program -+# that contains a configuration script generated by Autoconf, under -+# the same distribution terms as the rest of that program. - # -- --# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 3 -- --# AM_SANITY_CHECK --# --------------- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -- fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then -- -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -- fi -- -- test "$[2]" = conftest.file -- ) --then -- # Ok. -- : --else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) --fi --AC_MSG_RESULT(yes)]) -- --# -*- Autoconf -*- -- -- --# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 3 -- --# AM_MISSING_PROG(NAME, PROGRAM) --# ------------------------------ --AC_DEFUN([AM_MISSING_PROG], --[AC_REQUIRE([AM_MISSING_HAS_RUN]) --$1=${$1-"${am_missing_run}$2"} --AC_SUBST($1)]) -- -- --# AM_MISSING_HAS_RUN --# ------------------ --# Define MISSING if not defined so far and test if it supports --run. --# If it does, set am_missing_run to use it, otherwise, to nothing. --AC_DEFUN([AM_MISSING_HAS_RUN], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" --# Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " --else -- am_missing_run= -- AC_MSG_WARN([`missing' script is too old or missing]) --fi --]) -- --# AM_AUX_DIR_EXPAND -- --# Copyright 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets --# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to --# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -+# This file can be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. - # --# Of course, Automake must honor this variable whenever it calls a --# tool from the auxiliary directory. The problem is that $srcdir (and --# therefore $ac_aux_dir as well) can be either absolute or relative, --# depending on how configure is run. This is pretty annoying, since --# it makes $ac_aux_dir quite unusable in subdirectories: in the top --# source directory, any form will work fine, but in subdirectories a --# relative path needs to be adjusted first. -+# Macro to add for using GNU gettext. -+# Ulrich Drepper , 1995, 1996 - # --# $ac_aux_dir/missing --# fails when called from a subdirectory if $ac_aux_dir is relative --# $top_srcdir/$ac_aux_dir/missing --# fails if $ac_aux_dir is absolute, --# fails when called from a subdirectory in a VPATH build with --# a relative $ac_aux_dir -+# Modified to never use included libintl. -+# Owen Taylor , 12/15/1998 - # --# The reason of the latter failure is that $top_srcdir and $ac_aux_dir --# are both prefixed by $srcdir. In an in-source build this is usually --# harmless because $srcdir is `.', but things will broke when you --# start a VPATH build or use an absolute $srcdir. -+# Major rework to remove unused code -+# Owen Taylor , 12/11/2002 - # --# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, --# iff we strip the leading $srcdir from $ac_aux_dir. That would be: --# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` --# and then we would define $MISSING as --# MISSING="\${SHELL} $am_aux_dir/missing" --# This will work as long as MISSING is not called from configure, because --# unfortunately $(top_srcdir) has no meaning in configure. --# However there are other variables, like CC, which are often used in --# configure, and could therefore not use this "fixed" $ac_aux_dir. -+# Added better handling of ALL_LINGUAS from GNU gettext version -+# written by Bruno Haible, Owen Taylor 5/30/3002 - # --# Another solution, used here, is to always expand $ac_aux_dir to an --# absolute PATH. The drawback is that using absolute paths prevent a --# configured tree to be moved without reconfiguration. -- --# Rely on autoconf to set up CDPATH properly. --AC_PREREQ([2.50]) -- --AC_DEFUN([AM_AUX_DIR_EXPAND], [ --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` --]) -- --# AM_PROG_INSTALL_SH --# ------------------ --# Define $install_sh. -- --# Copyright 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --AC_DEFUN([AM_PROG_INSTALL_SH], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"$am_aux_dir/install-sh"} --AC_SUBST(install_sh)]) -- --# AM_PROG_INSTALL_STRIP -- --# Copyright 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# One issue with vendor `install' (even GNU) is that you can't --# specify the program used to strip binaries. This is especially --# annoying in cross-compiling environments, where the build's strip --# is unlikely to handle the host's binaries. --# Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in `make install-strip', and initialize --# STRIPPROG with the value of the STRIP variable (set by the user). --AC_DEFUN([AM_PROG_INSTALL_STRIP], --[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --# Installed binaries are usually stripped using `strip' when the user --# run `make install-strip'. However `strip' might not be the right --# tool to use in cross-compilation environments, therefore Automake --# will honor the `STRIP' environment variable to overrule this program. --dnl Don't test for $cross_compiling = yes, because it might be `maybe'. --if test "$cross_compiling" != no; then -- AC_CHECK_TOOL([STRIP], [strip], :) --fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" --AC_SUBST([INSTALL_STRIP_PROGRAM])]) -- --# -*- Autoconf -*- --# Copyright (C) 2003 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 1 -- --# Check whether the underlying file-system supports filenames --# with a leading dot. For instance MS-DOS doesn't. --AC_DEFUN([AM_SET_LEADING_DOT], --[rm -rf .tst 2>/dev/null --mkdir .tst 2>/dev/null --if test -d .tst; then -- am__leading_dot=. --else -- am__leading_dot=_ --fi --rmdir .tst 2>/dev/null --AC_SUBST([am__leading_dot])]) -- --# serial 5 -*- Autoconf -*- -- --# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- -- --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -- -- -- --# _AM_DEPENDENCIES(NAME) --# ---------------------- --# See how the compiler implements dependency checking. --# NAME is "CC", "CXX", "GCJ", or "OBJC". --# We try a few techniques and use that to set a single cache variable. -+# Modified to require ngettext -+# Matthias Clasen 08/06/2004 - # --# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was --# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular --# dependency, and given that the user is not expected to run this macro, --# just rely on AC_PROG_CC. --AC_DEFUN([_AM_DEPENDENCIES], --[AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl --AC_REQUIRE([AM_MAKE_INCLUDE])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl -- --ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -- [$1], CXX, [depcc="$CXX" am_compiler_list=], -- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) -+# We need this here as well, since someone might use autoconf-2.5x -+# to configure GLib then an older version to configure a package -+# using AM_GLIB_GNU_GETTEXT -+AC_PREREQ(2.53) - --AC_CACHE_CHECK([dependency style of $depcc], -- [am_cv_$1_dependencies_compiler_type], --[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub -+dnl -+dnl We go to great lengths to make sure that aclocal won't -+dnl try to pull in the installed version of these macros -+dnl when running aclocal in the glib directory. -+dnl -+m4_copy([AC_DEFUN],[glib_DEFUN]) -+m4_copy([AC_REQUIRE],[glib_REQUIRE]) -+dnl -+dnl At the end, if we're not within glib, we'll define the public -+dnl definitions in terms of our private definitions. -+dnl - -- am_cv_$1_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -- fi -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- : > sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+# GLIB_LC_MESSAGES -+#-------------------- -+glib_DEFUN([GLIB_LC_MESSAGES], -+ [AC_CHECK_HEADERS([locale.h]) -+ if test $ac_cv_header_locale_h = yes; then -+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -+ [AC_TRY_LINK([#include ], [return LC_MESSAGES], -+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ AC_DEFINE(HAVE_LC_MESSAGES, 1, -+ [Define if your file defines LC_MESSAGES.]) -+ fi -+ fi]) - -- case $depmode in -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -+# GLIB_PATH_PROG_WITH_TEST -+#---------------------------- -+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -+[# Extract the first word of "$2", so it can be a program name with args. -+set dummy $2; ac_word=[$]2 -+AC_MSG_CHECKING([for $ac_word]) -+AC_CACHE_VAL(ac_cv_path_$1, -+[case "[$]$1" in -+ /*) -+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in ifelse([$5], , $PATH, [$5]); do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if [$3]; then -+ ac_cv_path_$1="$ac_dir/$ac_word" - break - fi -- ;; -- none) break ;; -- esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. -- if depmode=$depmode \ -- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -- am_cv_$1_dependencies_compiler_type=$depmode -- break -- fi - fi - done -- -- cd .. -- rm -rf conftest.dir -+ IFS="$ac_save_ifs" -+dnl If no 4th arg is given, leave the cache variable unset, -+dnl so AC_PATH_PROGS will keep looking. -+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -+])dnl -+ ;; -+esac])dnl -+$1="$ac_cv_path_$1" -+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then -+ AC_MSG_RESULT([$]$1) - else -- am_cv_$1_dependencies_compiler_type=none -+ AC_MSG_RESULT(no) - fi -+AC_SUBST($1)dnl - ]) --AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) --AM_CONDITIONAL([am__fastdep$1], [ -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) --]) -- - --# AM_SET_DEPDIR --# ------------- --# Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES --AC_DEFUN([AM_SET_DEPDIR], --[AC_REQUIRE([AM_SET_LEADING_DOT])dnl --AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl --]) -+# GLIB_WITH_NLS -+#----------------- -+glib_DEFUN([GLIB_WITH_NLS], -+ dnl NLS is obligatory -+ [USE_NLS=yes -+ AC_SUBST(USE_NLS) - -+ gt_cv_have_gettext=no - --# AM_DEP_TRACK --# ------------ --AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking Speeds up one-time builds -- --enable-dependency-tracking Do not reject slow dependency extractors]) --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' --fi --AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --AC_SUBST([AMDEPBACKSLASH]) --]) -+ CATOBJEXT=NONE -+ XGETTEXT=: -+ INTLLIBS= - --# Generate code to set up dependency tracking. -*- Autoconf -*- -+ AC_CHECK_HEADER(libintl.h, -+ [gt_cv_func_dgettext_libintl="no" -+ libintl_extra_libs="" - --# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. -+ # -+ # First check in libc -+ # -+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, -+ [AC_TRY_LINK([ -+#include -+], -+ [return !ngettext ("","", 1)], -+ gt_cv_func_ngettext_libc=yes, -+ gt_cv_func_ngettext_libc=no) -+ ]) -+ -+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then -+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, -+ [AC_TRY_LINK([ -+#include -+], -+ [return !dgettext ("","")], -+ gt_cv_func_dgettext_libc=yes, -+ gt_cv_func_dgettext_libc=no) -+ ]) -+ fi -+ -+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then -+ AC_CHECK_FUNCS(bind_textdomain_codeset) -+ fi - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+ # -+ # If we don't have everything we want, check in libintl -+ # -+ if test "$gt_cv_func_dgettext_libc" != "yes" \ -+ || test "$gt_cv_func_ngettext_libc" != "yes" \ -+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -+ -+ AC_CHECK_LIB(intl, bindtextdomain, -+ [AC_CHECK_LIB(intl, ngettext, -+ [AC_CHECK_LIB(intl, dgettext, -+ gt_cv_func_dgettext_libintl=yes)])]) - --# This program 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 General Public License for more details. -+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -+ AC_MSG_CHECKING([if -liconv is needed to use gettext]) -+ AC_MSG_RESULT([]) -+ AC_CHECK_LIB(intl, ngettext, -+ [AC_CHECK_LIB(intl, dcgettext, -+ [gt_cv_func_dgettext_libintl=yes -+ libintl_extra_libs=-liconv], -+ :,-liconv)], -+ :,-liconv) -+ fi - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+ # -+ # If we found libintl, then check in it for bind_textdomain_codeset(); -+ # we'll prefer libc if neither have bind_textdomain_codeset(), -+ # and both have dgettext and ngettext -+ # -+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS -lintl $libintl_extra_libs" -+ unset ac_cv_func_bind_textdomain_codeset -+ AC_CHECK_FUNCS(bind_textdomain_codeset) -+ LIBS="$glib_save_LIBS" - --#serial 2 -+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -+ gt_cv_func_dgettext_libc=no -+ else -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ && test "$gt_cv_func_ngettext_libc" = "yes"; then -+ gt_cv_func_dgettext_libintl=no -+ fi -+ fi -+ fi -+ fi - --# _AM_OUTPUT_DEPENDENCY_COMMANDS --# ------------------------------ --AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], --[for mf in $CONFIG_FILES; do -- # Strip MF so we end up with the name of the file. -- mf=`echo "$mf" | sed -e 's/:.*$//'` -- # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named `Makefile.in', but -- # some people rename them; so instead we look at the file content. -- # Grep'ing the first line is not enough: some people post-process -- # each Makefile.in and add a new line on top of each file to say so. -- # So let's grep whole file. -- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -- dirpart=`AS_DIRNAME("$mf")` -- else -- continue -- fi -- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -- test -z "$DEPDIR" && continue -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n -e '/^U = / s///p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n -e ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`AS_DIRNAME(["$file"])` -- AS_MKDIR_P([$dirpart/$fdir]) -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -- done --done --])# _AM_OUTPUT_DEPENDENCY_COMMANDS -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ gt_cv_have_gettext=yes -+ fi -+ -+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ INTLLIBS="-lintl $libintl_extra_libs" -+ fi -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ AC_DEFINE(HAVE_GETTEXT,1, -+ [Define if the GNU gettext() function is already present or preinstalled.]) -+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl -+ if test "$MSGFMT" != "no"; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS $INTLLIBS" -+ AC_CHECK_FUNCS(dcgettext) -+ MSGFMT_OPTS= -+ AC_MSG_CHECKING([if msgfmt accepts -c]) -+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -+msgid "" -+msgstr "" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Project-Id-Version: test 1.0\n" -+"PO-Revision-Date: 2007-02-15 12:01+0100\n" -+"Last-Translator: test \n" -+"Language-Team: C \n" -+"MIME-Version: 1.0\n" -+"Content-Transfer-Encoding: 8bit\n" -+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) -+ AC_SUBST(MSGFMT_OPTS) -+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr], -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [case $host in -+ *-*-solaris*) -+ dnl On Solaris, if bind_textdomain_codeset is in libc, -+ dnl GNU format message catalog is always supported, -+ dnl since both are added to the libc all together. -+ dnl Hence, we'd like to go with DATADIRNAME=share and -+ dnl and CATOBJEXT=.gmo in this case. -+ AC_CHECK_FUNC(bind_textdomain_codeset, -+ [CATOBJEXT=.gmo -+ DATADIRNAME=share], -+ [CATOBJEXT=.mo -+ DATADIRNAME=lib]) -+ ;; -+ *) -+ CATOBJEXT=.mo -+ DATADIRNAME=lib -+ ;; -+ esac]) -+ LIBS="$glib_save_LIBS" -+ INSTOBJEXT=.mo -+ else -+ gt_cv_have_gettext=no -+ fi -+ fi -+ ]) - -+ if test "$gt_cv_have_gettext" = "yes" ; then -+ AC_DEFINE(ENABLE_NLS, 1, -+ [always defined to indicate that i18n is enabled]) -+ fi - --# AM_OUTPUT_DEPENDENCY_COMMANDS --# ----------------------------- --# This macro should only be invoked once -- use via AC_REQUIRE. --# --# This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each `.P' file that we will --# need in order to bootstrap the dependency handling code. --AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], --[AC_CONFIG_COMMANDS([depfiles], -- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) --]) -+ dnl Test whether we really found GNU xgettext. -+ if test "$XGETTEXT" != ":"; then -+ dnl If it is not GNU xgettext we define it as : so that the -+ dnl Makefiles still can work. -+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -+ : ; -+ else -+ AC_MSG_RESULT( -+ [found xgettext program is not GNU xgettext; ignore it]) -+ XGETTEXT=":" -+ fi -+ fi - --# Check to see how 'make' treats includes. -*- Autoconf -*- -+ # We need to process the po/ directory. -+ POSUB=po - --# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -+ AC_OUTPUT_COMMANDS( -+ [case "$CONFIG_FILES" in *po/Makefile.in*) -+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -+ esac]) - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+ dnl These rules are solely for the distribution goal. While doing this -+ dnl we only have to keep exactly one list of the available catalogs -+ dnl in configure.in. -+ for lang in $ALL_LINGUAS; do -+ GMOFILES="$GMOFILES $lang.gmo" -+ POFILES="$POFILES $lang.po" -+ done - --# This program 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 General Public License for more details. -+ dnl Make all variables we use known to autoconf. -+ AC_SUBST(CATALOGS) -+ AC_SUBST(CATOBJEXT) -+ AC_SUBST(DATADIRNAME) -+ AC_SUBST(GMOFILES) -+ AC_SUBST(INSTOBJEXT) -+ AC_SUBST(INTLLIBS) -+ AC_SUBST(PO_IN_DATADIR_TRUE) -+ AC_SUBST(PO_IN_DATADIR_FALSE) -+ AC_SUBST(POFILES) -+ AC_SUBST(POSUB) -+ ]) - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# AM_GLIB_GNU_GETTEXT -+# ------------------- -+# Do checks necessary for use of gettext. If a suitable implementation -+# of gettext is found in either in libintl or in the C library, -+# it will set INTLLIBS to the libraries needed for use of gettext -+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -+# on various variables needed by the Makefile.in.in installed by -+# glib-gettextize. -+dnl -+glib_DEFUN([GLIB_GNU_GETTEXT], -+ [AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_HEADER_STDC])dnl -+ -+ GLIB_LC_MESSAGES -+ GLIB_WITH_NLS - --# serial 2 -+ if test "$gt_cv_have_gettext" = "yes"; then -+ if test "x$ALL_LINGUAS" = "x"; then -+ LINGUAS= -+ else -+ AC_MSG_CHECKING(for catalogs to be installed) -+ NEW_LINGUAS= -+ for presentlang in $ALL_LINGUAS; do -+ useit=no -+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -+ desiredlanguages="$LINGUAS" -+ else -+ desiredlanguages="$ALL_LINGUAS" -+ fi -+ for desiredlang in $desiredlanguages; do -+ # Use the presentlang catalog if desiredlang is -+ # a. equal to presentlang, or -+ # b. a variant of presentlang (because in this case, -+ # presentlang can be used as a fallback for messages -+ # which are not translated in the desiredlang catalog). -+ case "$desiredlang" in -+ "$presentlang"*) useit=yes;; -+ esac -+ done -+ if test $useit = yes; then -+ NEW_LINGUAS="$NEW_LINGUAS $presentlang" -+ fi -+ done -+ LINGUAS=$NEW_LINGUAS -+ AC_MSG_RESULT($LINGUAS) -+ fi - --# AM_MAKE_INCLUDE() --# ----------------- --# Check to see how make treats includes. --AC_DEFUN([AM_MAKE_INCLUDE], --[am_make=${MAKE-make} --cat > confinc << 'END' --am__doit: -- @echo done --.PHONY: am__doit --END --# If we don't find an include directive, just comment out the code. --AC_MSG_CHECKING([for style of include used by $am_make]) --am__include="#" --am__quote= --_am_result=none --# First try GNU make style include. --echo "include confinc" > confmf --# We grep out `Entering directory' and `Leaving directory' --# messages which can occur if `w' ends up in MAKEFLAGS. --# In particular we don't look at `^make:' because GNU make might --# be invoked under some other name (usually "gmake"), in which --# case it prints its new name instead of `make'. --if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -- am__include=include -- am__quote= -- _am_result=GNU --fi --# Now try BSD make style include. --if test "$am__include" = "#"; then -- echo '.include "confinc"' > confmf -- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -- am__include=.include -- am__quote="\"" -- _am_result=BSD -+ dnl Construct list of names of catalog files to be constructed. -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi - fi --fi --AC_SUBST([am__include]) --AC_SUBST([am__quote]) --AC_MSG_RESULT([$_am_result]) --rm -f confinc confmf --]) -- --# AM_CONDITIONAL -*- Autoconf -*- -- --# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 5 -+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). -+ dnl Try to locate is. -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+ fi -+ AC_SUBST(MKINSTALLDIRS) - --AC_PREREQ(2.52) -+ dnl Generate list of files to be processed by xgettext which will -+ dnl be included in po/Makefile. -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES -+ ]) - --# AM_CONDITIONAL(NAME, SHELL-CONDITION) --# ------------------------------------- --# Define a conditional. --AC_DEFUN([AM_CONDITIONAL], --[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl --AC_SUBST([$1_TRUE]) --AC_SUBST([$1_FALSE]) --if $2; then -- $1_TRUE= -- $1_FALSE='#' -+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -+# ------------------------------- -+# Define VARIABLE to the location where catalog files will -+# be installed by po/Makefile. -+glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -+glib_save_prefix="$prefix" -+glib_save_exec_prefix="$exec_prefix" -+glib_save_datarootdir="$datarootdir" -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+test "x$exec_prefix" = xNONE && exec_prefix=$prefix -+datarootdir=`eval echo "${datarootdir}"` -+if test "x$CATOBJEXT" = "x.mo" ; then -+ localedir=`eval echo "${libdir}/locale"` - else -- $1_TRUE='#' -- $1_FALSE= -+ localedir=`eval echo "${datadir}/locale"` - fi --AC_CONFIG_COMMANDS_PRE( --[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -- AC_MSG_ERROR([conditional "$1" was never defined. --Usually this means the macro was only invoked conditionally.]) --fi])]) -+prefix="$glib_save_prefix" -+exec_prefix="$glib_save_exec_prefix" -+datarootdir="$glib_save_datarootdir" -+AC_DEFINE_UNQUOTED($1, "$localedir", -+ [Define the location where the catalogs will be installed]) -+]) -+ -+dnl -+dnl Now the definitions that aclocal will find -+dnl -+ifdef(glib_configure_in,[],[ -+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -+])dnl -+ -+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -+# -+# Create a temporary file with TEST-FILE as its contents and pass the -+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -+# 0 and perform ACTION-IF-FAIL for any other exit status. -+AC_DEFUN([GLIB_RUN_PROG], -+[cat >conftest.foo <<_ACEOF -+$2 -+_ACEOF -+if AC_RUN_LOG([$1 conftest.foo]); then -+ m4_ifval([$3], [$3], [:]) -+m4_ifvaln([$4], [else $4])dnl -+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -+fi]) - --# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - --# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. -+dnl -*- mode: autoconf -*- - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+# serial 1 - --# This program 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 General Public License for more details. -+dnl Usage: -+dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -+AC_DEFUN([GTK_DOC_CHECK], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ dnl for overriding the documentation installation directory -+ 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]) - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+ dnl enable/disable documentation building -+ AC_ARG_ENABLE([gtk-doc], -+ AS_HELP_STRING([--enable-gtk-doc], -+ [use gtk-doc to build documentation [[default=no]]]),, -+ [enable_gtk_doc=no]) - --AC_PREREQ([2.52]) -+ if test x$enable_gtk_doc = xyes; then -+ ifelse([$1],[], -+ [PKG_CHECK_EXISTS([gtk-doc],, -+ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], -+ [PKG_CHECK_EXISTS([gtk-doc >= $1],, -+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) -+ fi - --# serial 6 -+ AC_MSG_CHECKING([whether to build gtk-doc documentation]) -+ AC_MSG_RESULT($enable_gtk_doc) - --# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. --AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) -+ -+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) -+]) +diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 +--- gtk+2.0-2.14.4.old/aclocal.m4 2008-10-17 01:07:01.000000000 -0300 ++++ gtk+2.0-2.14.4/aclocal.m4 2008-11-04 15:36:57.000000000 -0200 +@@ -941,7 +941,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- @@ -1574,7 +10,7 @@ Index: gtk+2.0-2.14.3/aclocal.m4 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -1565,7 +1330,6 @@ +@@ -1565,7 +1565,6 @@ esac ;; *64-bit*) @@ -1582,7 +18,7 @@ Index: gtk+2.0-2.14.3/aclocal.m4 case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -2628,13 +2392,11 @@ +@@ -2628,13 +2627,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -1597,7 +33,7 @@ Index: gtk+2.0-2.14.3/aclocal.m4 fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -2646,6 +2408,18 @@ +@@ -2646,6 +2643,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -1616,7 +52,7 @@ Index: gtk+2.0-2.14.3/aclocal.m4 netbsd*) version_type=sunos need_lib_prefix=no -@@ -3427,7 +3201,7 @@ +@@ -3427,7 +3436,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -1625,7 +61,7 @@ Index: gtk+2.0-2.14.3/aclocal.m4 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 -@@ -4434,7 +4208,7 @@ +@@ -4434,7 +4443,7 @@ ;; esac ;; @@ -1634,7 +70,7 @@ Index: gtk+2.0-2.14.3/aclocal.m4 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= -@@ -6126,7 +5900,7 @@ +@@ -6126,7 +6135,7 @@ ;; esac ;; @@ -1643,7 +79,7 @@ Index: gtk+2.0-2.14.3/aclocal.m4 ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -6503,6 +6277,9 @@ +@@ -6503,6 +6512,9 @@ cygwin* | mingw*) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; @@ -1653,7 +89,7 @@ Index: gtk+2.0-2.14.3/aclocal.m4 *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; -@@ -6711,12 +6488,13 @@ +@@ -6711,12 +6723,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -1668,7 +104,7 @@ Index: gtk+2.0-2.14.3/aclocal.m4 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= -@@ -7147,7 +6925,7 @@ +@@ -7147,7 +7160,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -1677,76 +113,4767 @@ Index: gtk+2.0-2.14.3/aclocal.m4 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 -@@ -7464,1137 +7242,1209 @@ - ])# _LT_AC_FILE_LTDLL_C - - --# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) --# --------------------------------- --AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -+# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -+# --------------------------------- -+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -+ -+ -+# old names -+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -+ -+# This is just to silence aclocal about the macro not being used -+ifelse([AC_DISABLE_FAST_INSTALL]) -+ -+AC_DEFUN([LT_AC_PROG_GCJ], -+[AC_CHECK_TOOL(GCJ, gcj, no) -+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ AC_SUBST(GCJFLAGS) -+]) -+ -+AC_DEFUN([LT_AC_PROG_RC], -+[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' +@@ -7825,14 +7838,16 @@ + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi +else -+ as_executable_p='test -f' ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -7876,9 +7891,9 @@ + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cache/output.0 +--- gtk+2.0-2.14.4.old/autom4te.cache/output.0 1969-12-31 21:00:00.000000000 -0300 ++++ gtk+2.0-2.14.4/autom4te.cache/output.0 2008-11-04 15:37:01.000000000 -0200 +@@ -0,0 +1,37489 @@ ++@%:@! /bin/sh ++@%:@ Guess values for system-dependent variables and create Makefiles. ++@%:@ Generated by GNU Autoconf 2.61 for gtk+ 2.14.4. ++@%:@ ++@%:@ Report bugs to . ++@%:@ ++@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++@%:@ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++@%:@ This configure script is free software; the Free Software Foundation ++@%:@ gives unlimited permission to copy, distribute and modify it. ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# 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=: ++ # 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 -+])])# _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 # -+# macro and use it instead. # -+# LT_AC_PROG_SED -+# -------------- -+# Check for a fully-functional sed program, that truncates -+# as few characters as possible. Prefer GNU sed if found. -+AC_DEFUN([LT_AC_PROG_SED], -+[AC_MSG_CHECKING([for a sed that does not truncate output]) -+AC_CACHE_VAL(lt_cv_path_SED, -+[# Loop through the user's path and test for sed and gsed. ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi ++ ++# Support unset when possible. ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ fi ++done ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# CDPATH. ++$as_unset CDPATH ++ ++ ++if test "x$CONFIG_SHELL" = x; then ++ if (eval ":") 2>/dev/null; then ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ ++ if test $as_have_required = yes && (eval ": ++(as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=\$LINENO ++ as_lineno_2=\$LINENO ++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && ++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } ++") 2> /dev/null; then ++ : ++else ++ as_candidate_shells= ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ case $as_dir in ++ /*) ++ for as_base in sh bash ksh sh5; do ++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ done;; ++ esac ++done ++IFS=$as_save_IFS ++ ++ ++ for as_shell in $as_candidate_shells $SHELL; do ++ # 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 ++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 ++ ++ ++: ++_ASEOF ++}; then ++ CONFIG_SHELL=$as_shell ++ as_have_required=yes ++ if { "$as_shell" 2> /dev/null <<\_ASEOF ++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 ++ ++ ++: ++(as_func_return () { ++ (exit $1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = "$1" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test $exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } ++ ++_ASEOF ++}; then ++ break ++fi ++ ++fi ++ ++ done ++ ++ if test "x$CONFIG_SHELL" != x; then ++ for as_var in BASH_ENV ENV ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ ++ if test $as_have_required = no; then ++ echo This script requires a shell more modern than all the ++ echo shells that I found on your system. Please install a ++ echo modern shell, or manually run the script under such a ++ echo shell if you do have one. ++ { (exit 1); exit 1; } ++fi ++ ++ ++fi ++ ++fi ++ ++ ++ ++(eval "as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0") || { ++ echo No shell found that supports shell functions. ++ echo Please tell autoconf@gnu.org about your system, ++ echo including any error possibly output before this ++ echo message ++} ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | ++ sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno ++ N ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ ++ t loop ++ s/-\n.*// ++ ' >$as_me.lineno && ++ chmod +x "$as_me.lineno" || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false ++fi ++ ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' ++else ++ 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 ++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'" ++ ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" ++ ++ ++ ++ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++case X$ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` ++ ;; ++esac ++ ++echo=${ECHO-echo} ++if test "X$1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X$1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $echo works! ++ : ++else ++ # Restart under the correct shell. ++ exec $SHELL "$0" --no-reexec ${1+"$@"} ++fi ++ ++if test "X$1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat </dev/null 2>&1 && unset CDPATH ++ ++if test -z "$ECHO"; then ++if test "X${echo_test_string+set}" != Xset; then ++# find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if (echo_test_string=`eval $cmd`) 2>/dev/null && ++ echo_test_string=`eval $cmd` && ++ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ++ then ++ break ++ fi ++ done ++fi ++ ++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. ++ ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ++ if test "X$echo" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ echo='print -r' ++ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} ++ else ++ # Try using printf. ++ echo='printf %s\n' ++ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ echo="$CONFIG_SHELL $0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$CONFIG_SHELL $0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: ++ ++ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do ++ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done ++ ++ if test "$prev" != 'sed 50q "$0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ echo=echo ++ fi ++ fi ++ fi ++ fi ++fi ++fi ++ ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++ECHO=$echo ++if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ++ ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" ++fi ++ ++ ++ ++ ++tagnames=${tagnames+${tagnames},}CXX ++ ++tagnames=${tagnames+${tagnames},}F77 ++ ++exec 7<&0 &1 ++ ++# Name of the host. ++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# so uname gets run too. ++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` ++ ++# ++# Initializations. ++# ++ac_default_prefix=/usr/local ++ac_clean_files= ++ac_config_libobj_dir=. ++LIB@&t@OBJS= ++cross_compiling=no ++subdirs= ++MFLAGS= ++MAKEFLAGS= ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++# Identity of this package. ++PACKAGE_NAME='gtk+' ++PACKAGE_TARNAME='gtk+' ++PACKAGE_VERSION='2.14.4' ++PACKAGE_STRING='gtk+ 2.14.4' ++PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B' ++ ++ac_unique_file="gdk/gdktypes.h" ++# Factoring default headers for most tests. ++ac_includes_default="\ ++#include ++#ifdef HAVE_SYS_TYPES_H ++# include ++#endif ++#ifdef HAVE_SYS_STAT_H ++# include ++#endif ++#ifdef STDC_HEADERS ++# include ++# include ++#else ++# ifdef HAVE_STDLIB_H ++# include ++# endif ++#endif ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H ++# include ++# endif ++# include ++#endif ++#ifdef HAVE_STRINGS_H ++# include ++#endif ++#ifdef HAVE_INTTYPES_H ++# include ++#endif ++#ifdef HAVE_STDINT_H ++# include ++#endif ++#ifdef HAVE_UNISTD_H ++# include ++#endif" ++ ++ac_subst_vars='SHELL ++PATH_SEPARATOR ++PACKAGE_NAME ++PACKAGE_TARNAME ++PACKAGE_VERSION ++PACKAGE_STRING ++PACKAGE_BUGREPORT ++exec_prefix ++prefix ++program_transform_name ++bindir ++sbindir ++libexecdir ++datarootdir ++datadir ++sysconfdir ++sharedstatedir ++localstatedir ++includedir ++oldincludedir ++docdir ++infodir ++htmldir ++dvidir ++pdfdir ++psdir ++libdir ++localedir ++mandir ++DEFS ++ECHO_C ++ECHO_N ++ECHO_T ++LIBS ++build_alias ++host_alias ++target_alias ++INSTALL_PROGRAM ++INSTALL_SCRIPT ++INSTALL_DATA ++CYGPATH_W ++PACKAGE ++VERSION ++ACLOCAL ++AUTOCONF ++AUTOMAKE ++AUTOHEADER ++MAKEINFO ++AMTAR ++install_sh ++STRIP ++INSTALL_STRIP_PROGRAM ++AWK ++SET_MAKE ++am__leading_dot ++GTK_MAJOR_VERSION ++GTK_MINOR_VERSION ++GTK_MICRO_VERSION ++GTK_INTERFACE_AGE ++GTK_BINARY_AGE ++GTK_API_VERSION ++GTK_VERSION ++GTK_BINARY_VERSION ++LT_VERSION_INFO ++LT_CURRENT_MINUS_AGE ++GAIL_LT_VERSION_INFO ++GAIL_LT_CURRENT_MINUS_AGE ++GDK_PIXBUF_MAJOR ++GDK_PIXBUF_MINOR ++GDK_PIXBUF_MICRO ++GDK_PIXBUF_VERSION ++GETTEXT_PACKAGE ++build ++build_cpu ++build_vendor ++build_os ++host ++host_cpu ++host_vendor ++host_os ++LIB_EXE_MACHINE_FLAG ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS ++ac_ct_CC ++EXEEXT ++OBJEXT ++DEPDIR ++am__include ++am__quote ++AMDEP_TRUE ++AMDEP_FALSE ++AMDEPBACKSLASH ++CCDEPMODE ++am__fastdepCC_TRUE ++am__fastdepCC_FALSE ++ENABLE_STATIC_TRUE ++ENABLE_STATIC_FALSE ++CXX ++ac_ct_CXX ++CXXFLAGS ++CXXDEPMODE ++am__fastdepCXX_TRUE ++am__fastdepCXX_FALSE ++HAVE_CXX_TRUE ++HAVE_CXX_FALSE ++HAVE_OBJC_TRUE ++HAVE_OBJC_FALSE ++SED ++GREP ++EGREP ++LN_S ++ECHO ++AR ++RANLIB ++DSYMUTIL ++NMEDIT ++DLLTOOL ++AS ++OBJDUMP ++CPP ++CXXCPP ++F77 ++FFLAGS ++ac_ct_F77 ++LIBTOOL ++CCAS ++CCASFLAGS ++NM ++MAINTAINER_MODE_TRUE ++MAINTAINER_MODE_FALSE ++MAINT ++PLATFORM_WIN32_TRUE ++PLATFORM_WIN32_FALSE ++OS_WIN32_TRUE ++OS_WIN32_FALSE ++OS_UNIX_TRUE ++OS_UNIX_FALSE ++OS_LINUX_TRUE ++OS_LINUX_FALSE ++WINDRES ++ms_librarian ++MS_LIB_AVAILABLE_TRUE ++MS_LIB_AVAILABLE_FALSE ++gdktarget ++gdktargetlib ++gtktargetlib ++PKG_CONFIG ++BASE_DEPENDENCIES_CFLAGS ++BASE_DEPENDENCIES_LIBS ++LIBTOOL_EXPORT_OPTIONS ++DISABLE_EXPLICIT_DEPS_TRUE ++DISABLE_EXPLICIT_DEPS_FALSE ++PERL ++INDENT ++REBUILD ++USE_NLS ++MSGFMT ++MSGFMT_OPTS ++GMSGFMT ++XGETTEXT ++CATALOGS ++CATOBJEXT ++DATADIRNAME ++GMOFILES ++INSTOBJEXT ++INTLLIBS ++PO_IN_DATADIR_TRUE ++PO_IN_DATADIR_FALSE ++POFILES ++POSUB ++MKINSTALLDIRS ++GLIB_CFLAGS ++GLIB_LIBS ++GLIB_GENMARSHAL ++GOBJECT_QUERY ++GLIB_MKENUMS ++GDK_WLIBS ++BUILD_GDIPLUS_LOADERS_TRUE ++BUILD_GDIPLUS_LOADERS_FALSE ++LIBTIFF ++LIBJPEG ++LIBPNG ++LIBJASPER ++BUILD_DYNAMIC_MODULES_TRUE ++BUILD_DYNAMIC_MODULES_FALSE ++INCLUDED_LOADER_OBJ ++INCLUDED_LOADER_DEFINE ++INCLUDE_PNG_TRUE ++INCLUDE_PNG_FALSE ++INCLUDE_BMP_TRUE ++INCLUDE_BMP_FALSE ++INCLUDE_WBMP_TRUE ++INCLUDE_WBMP_FALSE ++INCLUDE_GIF_TRUE ++INCLUDE_GIF_FALSE ++INCLUDE_ICO_TRUE ++INCLUDE_ICO_FALSE ++INCLUDE_ANI_TRUE ++INCLUDE_ANI_FALSE ++INCLUDE_JPEG_TRUE ++INCLUDE_JPEG_FALSE ++INCLUDE_PNM_TRUE ++INCLUDE_PNM_FALSE ++INCLUDE_RAS_TRUE ++INCLUDE_RAS_FALSE ++INCLUDE_TIFF_TRUE ++INCLUDE_TIFF_FALSE ++INCLUDE_XPM_TRUE ++INCLUDE_XPM_FALSE ++INCLUDE_XBM_TRUE ++INCLUDE_XBM_FALSE ++INCLUDE_TGA_TRUE ++INCLUDE_TGA_FALSE ++INCLUDE_PCX_TRUE ++INCLUDE_PCX_FALSE ++INCLUDE_ICNS_TRUE ++INCLUDE_ICNS_FALSE ++INCLUDE_JASPER_TRUE ++INCLUDE_JASPER_FALSE ++INCLUDE_GDIPLUS_TRUE ++INCLUDE_GDIPLUS_FALSE ++HAVE_INCLUDED_IMMMODULES_TRUE ++HAVE_INCLUDED_IMMMODULES_FALSE ++INCLUDED_IMMODULE_OBJ ++INCLUDED_IMMODULE_DEFINE ++INCLUDE_IM_AM_ET_TRUE ++INCLUDE_IM_AM_ET_FALSE ++INCLUDE_IM_CEDILLA_TRUE ++INCLUDE_IM_CEDILLA_FALSE ++INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE ++INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE ++INCLUDE_IM_IME_TRUE ++INCLUDE_IM_IME_FALSE ++INCLUDE_IM_INUKTITUT_TRUE ++INCLUDE_IM_INUKTITUT_FALSE ++INCLUDE_IM_IPA_TRUE ++INCLUDE_IM_IPA_FALSE ++INCLUDE_IM_MULTIPRESS_TRUE ++INCLUDE_IM_MULTIPRESS_FALSE ++INCLUDE_IM_THAI_TRUE ++INCLUDE_IM_THAI_FALSE ++INCLUDE_IM_TI_ER_TRUE ++INCLUDE_IM_TI_ER_FALSE ++INCLUDE_IM_TI_ET_TRUE ++INCLUDE_IM_TI_ET_FALSE ++INCLUDE_IM_VIQR_TRUE ++INCLUDE_IM_VIQR_FALSE ++INCLUDE_IM_XIM_TRUE ++INCLUDE_IM_XIM_FALSE ++HAVE_TIFF_TRUE ++HAVE_TIFF_FALSE ++HAVE_PNG_TRUE ++HAVE_PNG_FALSE ++HAVE_JPEG_TRUE ++HAVE_JPEG_FALSE ++HAVE_JASPER_TRUE ++HAVE_JASPER_FALSE ++USE_MEDIALIB_TRUE ++USE_MEDIALIB_FALSE ++USE_MEDIALIB25_TRUE ++USE_MEDIALIB25_FALSE ++USE_MMX_TRUE ++USE_MMX_FALSE ++CROSS_COMPILING_TRUE ++CROSS_COMPILING_FALSE ++GDK_PIXBUF_CSOURCE ++GTK_UPDATE_ICON_CACHE ++REBUILD_PNGS ++XMKMF ++X_CFLAGS ++X_PRE_LIBS ++X_LIBS ++X_EXTRA_LIBS ++HAVE_X11R6_TRUE ++HAVE_X11R6_FALSE ++XINPUT_XFREE_TRUE ++XINPUT_XFREE_FALSE ++USE_X11_TRUE ++USE_X11_FALSE ++USE_WIN32_TRUE ++USE_WIN32_FALSE ++USE_QUARTZ_TRUE ++USE_QUARTZ_FALSE ++GDK_PIXBUF_XLIB_PACKAGES ++GDK_PIXBUF_XLIB_EXTRA_LIBS ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS ++GDK_PIXBUF_XLIB_DEP_LIBS ++GDK_PIXBUF_XLIB_DEP_CFLAGS ++USE_DIRECTFB_TRUE ++USE_DIRECTFB_FALSE ++GDK_PACKAGES ++GDK_PRIVATE_PACKAGES ++GDK_EXTRA_LIBS ++GDK_EXTRA_CFLAGS ++GDK_DEP_LIBS ++GDK_DEP_CFLAGS ++GDK_PIXBUF_PACKAGES ++GDK_PIXBUF_EXTRA_LIBS ++GDK_PIXBUF_EXTRA_CFLAGS ++GDK_PIXBUF_DEP_LIBS ++GDK_PIXBUF_DEP_CFLAGS ++GTK_PACKAGES ++GTK_EXTRA_LIBS ++GTK_EXTRA_CFLAGS ++GTK_DEP_LIBS ++GTK_DEP_CFLAGS ++GLIB_PREFIX ++ATK_PREFIX ++PANGO_PREFIX ++CAIRO_PREFIX ++GTK_DEBUG_FLAGS ++GTK_XIM_FLAGS ++GAIL_INET_LIBS ++CUPS_CONFIG ++CUPS_API_MAJOR ++CUPS_API_MINOR ++CUPS_CFLAGS ++CUPS_LIBS ++HAVE_CUPS_TRUE ++HAVE_CUPS_FALSE ++HAVE_HTTP_AUTHSTRING ++TEST_PRINT_BACKEND_TRUE ++TEST_PRINT_BACKEND_FALSE ++HTML_DIR ++GTKDOC_CHECK ++ENABLE_GTK_DOC_TRUE ++ENABLE_GTK_DOC_FALSE ++GTK_DOC_USE_LIBTOOL_TRUE ++GTK_DOC_USE_LIBTOOL_FALSE ++DB2HTML ++HAVE_DOCBOOK_TRUE ++HAVE_DOCBOOK_FALSE ++XSLTPROC ++XML_CATALOG_FILE ++XMLCATALOG ++ENABLE_MAN_TRUE ++ENABLE_MAN_FALSE ++LIB@&t@OBJS ++LTLIBOBJS' ++ac_subst_files='' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++CXX ++CXXFLAGS ++CCC ++CPP ++CXXCPP ++F77 ++FFLAGS ++PKG_CONFIG ++BASE_DEPENDENCIES_CFLAGS ++BASE_DEPENDENCIES_LIBS ++XMKMF' ++ ++ ++# Initialize some variables set by options. ++ac_init_help= ++ac_init_version=false ++# The variables have the same names as the options, with ++# dashes changed to underlines. ++cache_file=/dev/null ++exec_prefix=NONE ++no_create= ++no_recursion= ++prefix=NONE ++program_prefix=NONE ++program_suffix=NONE ++program_transform_name=s,x,x, ++silent= ++site= ++srcdir= ++verbose= ++x_includes=NONE ++x_libraries=NONE ++ ++# Installation directory options. ++# These are left unexpanded so users can "make install exec_prefix=/foo" ++# and all the variables that are supposed to be based on exec_prefix ++# by default will actually change. ++# Use braces instead of parens because sh, perl, etc. also accept them. ++# (The list follows the same order as the GNU Coding Standards.) ++bindir='${exec_prefix}/bin' ++sbindir='${exec_prefix}/sbin' ++libexecdir='${exec_prefix}/libexec' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' ++sysconfdir='${prefix}/etc' ++sharedstatedir='${prefix}/com' ++localstatedir='${prefix}/var' ++includedir='${prefix}/include' ++oldincludedir='/usr/include' ++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' ++infodir='${datarootdir}/info' ++htmldir='${docdir}' ++dvidir='${docdir}' ++pdfdir='${docdir}' ++psdir='${docdir}' ++libdir='${exec_prefix}/lib' ++localedir='${datarootdir}/locale' ++mandir='${datarootdir}/man' ++ ++ac_prev= ++ac_dashdash= ++for ac_option ++do ++ # If the previous option needs an argument, assign it. ++ if test -n "$ac_prev"; then ++ eval $ac_prev=\$ac_option ++ ac_prev= ++ continue ++ fi ++ ++ case $ac_option in ++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *) ac_optarg=yes ;; ++ esac ++ ++ # Accept the important Cygnus configure options, so we can diagnose typos. ++ ++ case $ac_dashdash$ac_option in ++ --) ++ ac_dashdash=yes ;; ++ ++ -bindir | --bindir | --bindi | --bind | --bin | --bi) ++ ac_prev=bindir ;; ++ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) ++ bindir=$ac_optarg ;; ++ ++ -build | --build | --buil | --bui | --bu) ++ ac_prev=build_alias ;; ++ -build=* | --build=* | --buil=* | --bui=* | --bu=*) ++ build_alias=$ac_optarg ;; ++ ++ -cache-file | --cache-file | --cache-fil | --cache-fi \ ++ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ++ ac_prev=cache_file ;; ++ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ ++ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) ++ cache_file=$ac_optarg ;; ++ ++ --config-cache | -C) ++ cache_file=config.cache ;; ++ ++ -datadir | --datadir | --datadi | --datad) ++ ac_prev=datadir ;; ++ -datadir=* | --datadir=* | --datadi=* | --datad=*) ++ datadir=$ac_optarg ;; ++ ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ ++ | --dataroo | --dataro | --datar) ++ ac_prev=datarootdir ;; ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) ++ datarootdir=$ac_optarg ;; ++ ++ -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 && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ { (exit 1); exit 1; }; } ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` ++ eval enable_$ac_feature=no ;; ++ ++ -docdir | --docdir | --docdi | --doc | --do) ++ ac_prev=docdir ;; ++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) ++ docdir=$ac_optarg ;; ++ ++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) ++ ac_prev=dvidir ;; ++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) ++ dvidir=$ac_optarg ;; ++ ++ -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 && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ { (exit 1); exit 1; }; } ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` ++ eval enable_$ac_feature=\$ac_optarg ;; ++ ++ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ ++ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ ++ | --exec | --exe | --ex) ++ ac_prev=exec_prefix ;; ++ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ ++ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ ++ | --exec=* | --exe=* | --ex=*) ++ exec_prefix=$ac_optarg ;; ++ ++ -gas | --gas | --ga | --g) ++ # Obsolete; use --with-gas. ++ with_gas=yes ;; ++ ++ -help | --help | --hel | --he | -h) ++ ac_init_help=long ;; ++ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) ++ ac_init_help=recursive ;; ++ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) ++ ac_init_help=short ;; ++ ++ -host | --host | --hos | --ho) ++ ac_prev=host_alias ;; ++ -host=* | --host=* | --hos=* | --ho=*) ++ host_alias=$ac_optarg ;; ++ ++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) ++ ac_prev=htmldir ;; ++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ ++ | --ht=*) ++ htmldir=$ac_optarg ;; ++ ++ -includedir | --includedir | --includedi | --included | --include \ ++ | --includ | --inclu | --incl | --inc) ++ ac_prev=includedir ;; ++ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ ++ | --includ=* | --inclu=* | --incl=* | --inc=*) ++ includedir=$ac_optarg ;; ++ ++ -infodir | --infodir | --infodi | --infod | --info | --inf) ++ ac_prev=infodir ;; ++ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) ++ infodir=$ac_optarg ;; ++ ++ -libdir | --libdir | --libdi | --libd) ++ ac_prev=libdir ;; ++ -libdir=* | --libdir=* | --libdi=* | --libd=*) ++ libdir=$ac_optarg ;; ++ ++ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ ++ | --libexe | --libex | --libe) ++ ac_prev=libexecdir ;; ++ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ ++ | --libexe=* | --libex=* | --libe=*) ++ libexecdir=$ac_optarg ;; ++ ++ -localedir | --localedir | --localedi | --localed | --locale) ++ ac_prev=localedir ;; ++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) ++ localedir=$ac_optarg ;; ++ ++ -localstatedir | --localstatedir | --localstatedi | --localstated \ ++ | --localstate | --localstat | --localsta | --localst | --locals) ++ ac_prev=localstatedir ;; ++ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ ++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) ++ localstatedir=$ac_optarg ;; ++ ++ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ++ ac_prev=mandir ;; ++ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) ++ mandir=$ac_optarg ;; ++ ++ -nfp | --nfp | --nf) ++ # Obsolete; use --without-fp. ++ with_fp=no ;; ++ ++ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ++ | --no-cr | --no-c | -n) ++ no_create=yes ;; ++ ++ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ ++ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ++ no_recursion=yes ;; ++ ++ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ ++ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ ++ | --oldin | --oldi | --old | --ol | --o) ++ ac_prev=oldincludedir ;; ++ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ ++ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ ++ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) ++ oldincludedir=$ac_optarg ;; ++ ++ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ++ ac_prev=prefix ;; ++ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) ++ prefix=$ac_optarg ;; ++ ++ -program-prefix | --program-prefix | --program-prefi | --program-pref \ ++ | --program-pre | --program-pr | --program-p) ++ ac_prev=program_prefix ;; ++ -program-prefix=* | --program-prefix=* | --program-prefi=* \ ++ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) ++ program_prefix=$ac_optarg ;; ++ ++ -program-suffix | --program-suffix | --program-suffi | --program-suff \ ++ | --program-suf | --program-su | --program-s) ++ ac_prev=program_suffix ;; ++ -program-suffix=* | --program-suffix=* | --program-suffi=* \ ++ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) ++ program_suffix=$ac_optarg ;; ++ ++ -program-transform-name | --program-transform-name \ ++ | --program-transform-nam | --program-transform-na \ ++ | --program-transform-n | --program-transform- \ ++ | --program-transform | --program-transfor \ ++ | --program-transfo | --program-transf \ ++ | --program-trans | --program-tran \ ++ | --progr-tra | --program-tr | --program-t) ++ ac_prev=program_transform_name ;; ++ -program-transform-name=* | --program-transform-name=* \ ++ | --program-transform-nam=* | --program-transform-na=* \ ++ | --program-transform-n=* | --program-transform-=* \ ++ | --program-transform=* | --program-transfor=* \ ++ | --program-transfo=* | --program-transf=* \ ++ | --program-trans=* | --program-tran=* \ ++ | --progr-tra=* | --program-tr=* | --program-t=*) ++ program_transform_name=$ac_optarg ;; ++ ++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) ++ ac_prev=pdfdir ;; ++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) ++ pdfdir=$ac_optarg ;; ++ ++ -psdir | --psdir | --psdi | --psd | --ps) ++ ac_prev=psdir ;; ++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) ++ psdir=$ac_optarg ;; ++ ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ silent=yes ;; ++ ++ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ++ ac_prev=sbindir ;; ++ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ ++ | --sbi=* | --sb=*) ++ sbindir=$ac_optarg ;; ++ ++ -sharedstatedir | --sharedstatedir | --sharedstatedi \ ++ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ ++ | --sharedst | --shareds | --shared | --share | --shar \ ++ | --sha | --sh) ++ ac_prev=sharedstatedir ;; ++ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ ++ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ ++ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ ++ | --sha=* | --sh=*) ++ sharedstatedir=$ac_optarg ;; ++ ++ -site | --site | --sit) ++ ac_prev=site ;; ++ -site=* | --site=* | --sit=*) ++ site=$ac_optarg ;; ++ ++ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ++ ac_prev=srcdir ;; ++ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) ++ srcdir=$ac_optarg ;; ++ ++ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ ++ | --syscon | --sysco | --sysc | --sys | --sy) ++ ac_prev=sysconfdir ;; ++ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ ++ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) ++ sysconfdir=$ac_optarg ;; ++ ++ -target | --target | --targe | --targ | --tar | --ta | --t) ++ ac_prev=target_alias ;; ++ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) ++ target_alias=$ac_optarg ;; ++ ++ -v | -verbose | --verbose | --verbos | --verbo | --verb) ++ verbose=yes ;; ++ ++ -version | --version | --versio | --versi | --vers | -V) ++ ac_init_version=: ;; ++ ++ -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 && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ { (exit 1); exit 1; }; } ++ 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 && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ { (exit 1); exit 1; }; } ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` ++ eval with_$ac_package=no ;; ++ ++ --x) ++ # Obsolete; use --with-x. ++ with_x=yes ;; ++ ++ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ ++ | --x-incl | --x-inc | --x-in | --x-i) ++ ac_prev=x_includes ;; ++ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ ++ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) ++ x_includes=$ac_optarg ;; ++ ++ -x-libraries | --x-libraries | --x-librarie | --x-librari \ ++ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ++ ac_prev=x_libraries ;; ++ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ ++ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) ++ x_libraries=$ac_optarg ;; ++ ++ -*) { echo "$as_me: error: unrecognized option: $ac_option ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; } ++ ;; ++ ++ *=*) ++ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 ++ { (exit 1); exit 1; }; } ++ eval $ac_envvar=\$ac_optarg ++ export $ac_envvar ;; ++ ++ *) ++ # FIXME: should be removed in autoconf 3.0. ++ echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ++ ;; ++ ++ esac ++done ++ ++if test -n "$ac_prev"; then ++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` ++ { echo "$as_me: error: missing argument to $ac_option" >&2 ++ { (exit 1); exit 1; }; } ++fi ++ ++# Be sure to have absolute directory names. ++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ++ datadir sysconfdir sharedstatedir localstatedir includedir \ ++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ++ libdir localedir mandir ++do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; ++ esac ++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { (exit 1); exit 1; }; } ++done ++ ++# There might be people who depend on the old broken behavior: `$host' ++# used to hold the argument of --host etc. ++# FIXME: To remove some day. ++build=$build_alias ++host=$host_alias ++target=$target_alias ++ ++# FIXME: To remove some day. ++if test "x$host_alias" != x; then ++ if test "x$build_alias" = x; then ++ cross_compiling=maybe ++ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used." >&2 ++ elif test "x$build_alias" != "x$host_alias"; then ++ cross_compiling=yes ++ fi ++fi ++ ++ac_tool_prefix= ++test -n "$host_alias" && ac_tool_prefix=$host_alias- ++ ++test "$silent" = yes && exec 6>/dev/null ++ ++ ++ac_pwd=`pwd` && test -n "$ac_pwd" && ++ac_ls_di=`ls -di .` && ++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ++ { echo "$as_me: error: Working directory cannot be determined" >&2 ++ { (exit 1); exit 1; }; } ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ { echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { (exit 1); exit 1; }; } ++ ++ ++# Find the source files, if location was not specified. ++if test -z "$srcdir"; then ++ ac_srcdir_defaulted=yes ++ # Try the directory containing this script, then the parent directory. ++ ac_confdir=`$as_dirname -- "$0" || ++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$0" : 'X\(//\)[^/]' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$0" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ srcdir=$ac_confdir ++ if test ! -r "$srcdir/$ac_unique_file"; then ++ srcdir=.. ++ fi ++else ++ ac_srcdir_defaulted=no ++fi ++if test ! -r "$srcdir/$ac_unique_file"; then ++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++ { (exit 1); exit 1; }; } ++fi ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 ++ { (exit 1); exit 1; }; } ++ pwd)` ++# When building in place, set srcdir=. ++if test "$ac_abs_confdir" = "$ac_pwd"; then ++ srcdir=. ++fi ++# Remove unnecessary trailing slashes from srcdir. ++# Double slashes in file names in object file debugging info ++# mess up M-x gdb in Emacs. ++case $srcdir in ++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; ++esac ++for ac_var in $ac_precious_vars; do ++ eval ac_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_env_${ac_var}_value=\$${ac_var} ++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_cv_env_${ac_var}_value=\$${ac_var} ++done ++ ++# ++# Report the --help message. ++# ++if test "$ac_init_help" = "long"; then ++ # Omit some internal or obsolete options to make the list less imposing. ++ # This message is too long to be a string in the A/UX 3.1 sh. ++ cat <<_ACEOF ++\`configure' configures gtk+ 2.14.4 to adapt to many kinds of systems. ++ ++Usage: $0 [OPTION]... [VAR=VALUE]... ++ ++To assign environment variables (e.g., CC, CFLAGS...), specify them as ++VAR=VALUE. See below for descriptions of some of the useful variables. ++ ++Defaults for the options are specified in brackets. ++ ++Configuration: ++ -h, --help display this help and exit ++ --help=short display options specific to this package ++ --help=recursive display the short help of all the included packages ++ -V, --version display version information and exit ++ -q, --quiet, --silent do not print \`checking...' messages ++ --cache-file=FILE cache test results in FILE [disabled] ++ -C, --config-cache alias for \`--cache-file=config.cache' ++ -n, --no-create do not create output files ++ --srcdir=DIR find the sources in DIR [configure dir or \`..'] ++ ++Installation directories: ++ --prefix=PREFIX install architecture-independent files in PREFIX ++ [$ac_default_prefix] ++ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX ++ [PREFIX] ++ ++By default, \`make install' will install all the files in ++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify ++an installation prefix other than \`$ac_default_prefix' using \`--prefix', ++for instance \`--prefix=\$HOME'. ++ ++For better control, use the options below. ++ ++Fine tuning of the installation directories: ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root @<:@DATAROOTDIR/doc/gtk+@:>@ ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] ++_ACEOF ++ ++ cat <<\_ACEOF ++ ++Program names: ++ --program-prefix=PREFIX prepend PREFIX to installed program names ++ --program-suffix=SUFFIX append SUFFIX to installed program names ++ --program-transform-name=PROGRAM run sed PROGRAM on installed program names ++ ++X features: ++ --x-includes=DIR X include files are in DIR ++ --x-libraries=DIR X library files are in DIR ++ ++System types: ++ --build=BUILD configure for building on BUILD [guessed] ++ --host=HOST cross-compile to build programs to run on HOST [BUILD] ++_ACEOF ++fi ++ ++if test -n "$ac_init_help"; then ++ case $ac_init_help in ++ short | recursive ) echo "Configuration of gtk+ 2.14.4:";; ++ esac ++ cat <<\_ACEOF ++ ++Optional Features: ++ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ++ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --disable-dependency-tracking Speeds up one-time builds ++ --enable-dependency-tracking Do not reject slow dependency extractors ++ --enable-static@<:@=PKGS@:>@ build static libraries @<:@default=no@:>@ ++ --enable-shared@<:@=PKGS@:>@ build shared libraries @<:@default=yes@:>@ ++ --enable-fast-install@<:@=PKGS@:>@ ++ optimize for fast installation @<:@default=yes@:>@ ++ --disable-libtool-lock avoid locking (might break parallel builds) ++ --disable-largefile omit support for large files ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer ++ --enable-debug=@<:@no/minimum/yes@:>@ ++ turn on debugging @<:@default=minimum@:>@ ++ --enable-shm support shared memory if available [default=yes] ++ --enable-xkb support XKB [default=maybe] ++ --enable-xinerama support xinerama extension if available ++ [default=yes] ++ --disable-rebuilds disable all source autogeneration rules ++ --disable-visibility don't use ELF visibility attributes ++ --enable-explicit-deps=@<:@yes/no/auto@:>@ ++ use explicit dependencies in .pc files ++ [default=auto] ++ --disable-glibtest do not try to compile and run a test GLIB program ++ --disable-modules disable dynamic module loading ++ --disable-gdiplus disable GDI+ loaders for gdk-pixbuf ++ --disable-cups ++ disable cups print backend ++ ++ --enable-test-print-backend ++ build test print backend ++ --enable-gtk-doc use gtk-doc to build documentation [default=no] ++ --enable-man regenerate man pages from Docbook [default=no] ++ ++Optional Packages: ++ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] ++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-gnu-ld assume the C compiler uses GNU ld @<:@default=no@:>@ ++ --with-pic try to use only PIC/non-PIC objects @<:@default=use ++ both@:>@ ++ --with-tags@<:@=TAGS@:>@ include additional configurations @<:@automatic@:>@ ++ --with-xinput=@<:@no/yes@:>@ support XInput ++ --with-gdktarget=[x11/win32/quartz/directfb] select non-default GDK target ++ --without-libpng disable PNG loader for gdk-pixbuf ++ --without-libjpeg disable JPEG loader for gdk-pixbuf ++ --without-libtiff disable TIFF loader for gdk-pixbuf ++ --without-libjasper disable JPEG2000 loader for gdk-pixbuf ++ --with-included-loaders=LOADER1,LOADER2,... ++ build the specified loaders into gdk-pixbuf ++ --with-included-immodules=MODULE1,MODULE2,... ++ build the specified input methods into gtk ++ --with-x use the X Window System ++ --with-html-dir=PATH path to installed docs ++ --with-xml-catalog=CATALOG ++ path to xml catalog to use ++ ++Some influential environment variables: ++ CC C compiler command ++ CFLAGS C compiler flags ++ LDFLAGS linker flags, e.g. -L if you have libraries in a ++ nonstandard directory ++ LIBS libraries to pass to the linker, e.g. -l ++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ you have headers in a nonstandard directory ++ CXX C++ compiler command ++ CXXFLAGS C++ compiler flags ++ CPP C preprocessor ++ CXXCPP C++ preprocessor ++ F77 Fortran 77 compiler command ++ FFLAGS Fortran 77 compiler flags ++ PKG_CONFIG path to pkg-config utility ++ BASE_DEPENDENCIES_CFLAGS ++ C compiler flags for BASE_DEPENDENCIES, overriding pkg-config ++ BASE_DEPENDENCIES_LIBS ++ linker flags for BASE_DEPENDENCIES, overriding pkg-config ++ XMKMF Path to xmkmf, Makefile generator for X Window System ++ ++Use these variables to override the choices made by `configure' or to help ++it to find libraries and programs with nonstandard names/locations. ++ ++Report bugs to . ++_ACEOF ++ac_status=$? ++fi ++ ++if test "$ac_init_help" = "recursive"; then ++ # If there are subdirs, report their specific --help. ++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue ++ test -d "$ac_dir" || continue ++ ac_builddir=. ++ ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix ++ ++case $srcdir in ++ .) # We are building in place. ++ ac_srcdir=. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ ++ cd "$ac_dir" || { ac_status=$?; continue; } ++ # Check for guested configure. ++ if test -f "$ac_srcdir/configure.gnu"; then ++ echo && ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive ++ elif test -f "$ac_srcdir/configure"; then ++ echo && ++ $SHELL "$ac_srcdir/configure" --help=recursive ++ else ++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ fi || ac_status=$? ++ cd "$ac_pwd" || { ac_status=$?; break; } ++ done ++fi ++ ++test -n "$ac_init_help" && exit $ac_status ++if $ac_init_version; then ++ cat <<\_ACEOF ++gtk+ configure 2.14.4 ++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. ++This configure script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it. ++_ACEOF ++ exit ++fi ++cat >config.log <<_ACEOF ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. ++ ++It was created by gtk+ $as_me 2.14.4, which was ++generated by GNU Autoconf 2.61. Invocation command line was ++ ++ $ $0 $@ ++ ++_ACEOF ++exec 5>>config.log ++{ ++cat <<_ASUNAME ++@%:@@%:@ --------- @%:@@%:@ ++@%:@@%:@ Platform. @%:@@%:@ ++@%:@@%:@ --------- @%:@@%:@ ++ ++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` ++ ++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` ++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` ++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` ++ ++_ASUNAME ++ ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ echo "PATH: $as_dir" ++done ++IFS=$as_save_IFS ++ ++} >&5 ++ ++cat >&5 <<_ACEOF ++ ++ ++@%:@@%:@ ----------- @%:@@%:@ ++@%:@@%:@ Core tests. @%:@@%:@ ++@%:@@%:@ ----------- @%:@@%:@ ++ ++_ACEOF ++ ++ ++# Keep a trace of the command line. ++# Strip out --no-create and --no-recursion so they do not pile up. ++# Strip out --silent because we don't want to record it for future runs. ++# Also quote any args containing shell meta-characters. ++# Make two passes to allow for proper duplicate-argument suppression. ++ac_configure_args= ++ac_configure_args0= ++ac_configure_args1= ++ac_must_keep_next=false ++for ac_pass in 1 2 ++do ++ for ac_arg ++ do ++ case $ac_arg in ++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ continue ;; ++ *\'*) ++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 2) ++ ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ if test $ac_must_keep_next = true; then ++ ac_must_keep_next=false # Got value, back to normal. ++ else ++ case $ac_arg in ++ *=* | --config-cache | -C | -disable-* | --disable-* \ ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ++ | -with-* | --with-* | -without-* | --without-* | --x) ++ case "$ac_configure_args0 " in ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ++ esac ++ ;; ++ -* ) ac_must_keep_next=true ;; ++ esac ++ fi ++ ac_configure_args="$ac_configure_args '$ac_arg'" ++ ;; ++ esac ++ done ++done ++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } ++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++ ++# When interrupted or exit'd, cleanup temporary files, and complete ++# config.log. We remove comments because anyway the quotes in there ++# would cause problems or look ugly. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. ++trap 'exit_status=$? ++ # Save into config.log some information that might help in debugging. ++ { ++ echo ++ ++ cat <<\_ASBOX ++@%:@@%:@ ---------------- @%:@@%:@ ++@%:@@%:@ Cache variables. @%:@@%:@ ++@%:@@%:@ ---------------- @%:@@%:@ ++_ASBOX ++ echo ++ # The following way of writing the cache mishandles newlines in values, ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done ++ (set) 2>&1 | ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ sed -n \ ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( ++ *) ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) ++ echo ++ ++ cat <<\_ASBOX ++@%:@@%:@ ----------------- @%:@@%:@ ++@%:@@%:@ Output variables. @%:@@%:@ ++@%:@@%:@ ----------------- @%:@@%:@ ++_ASBOX ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ ++ if test -n "$ac_subst_files"; then ++ cat <<\_ASBOX ++@%:@@%:@ ------------------- @%:@@%:@ ++@%:@@%:@ File substitutions. @%:@@%:@ ++@%:@@%:@ ------------------- @%:@@%:@ ++_ASBOX ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ fi ++ ++ if test -s confdefs.h; then ++ cat <<\_ASBOX ++@%:@@%:@ ----------- @%:@@%:@ ++@%:@@%:@ confdefs.h. @%:@@%:@ ++@%:@@%:@ ----------- @%:@@%:@ ++_ASBOX ++ echo ++ cat confdefs.h ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ echo "$as_me: caught signal $ac_signal" ++ echo "$as_me: exit $exit_status" ++ } >&5 ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && ++ exit $exit_status ++' 0 ++for ac_signal in 1 2 13 15; do ++ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++done ++ac_signal=0 ++ ++# confdefs.h avoids OS command line length limits that DEFS can exceed. ++rm -f -r conftest* confdefs.h ++ ++# Predefined preprocessor variables. ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define PACKAGE_NAME "$PACKAGE_NAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define PACKAGE_VERSION "$PACKAGE_VERSION" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define PACKAGE_STRING "$PACKAGE_STRING" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++_ACEOF ++ ++ ++# Let the site file select an alternate cache file if it wants to. ++# Prefer explicitly selected file to automatically selected ones. ++if test -n "$CONFIG_SITE"; then ++ set x "$CONFIG_SITE" ++elif test "x$prefix" != xNONE; then ++ set x "$prefix/share/config.site" "$prefix/etc/config.site" ++else ++ set x "$ac_default_prefix/share/config.site" \ ++ "$ac_default_prefix/etc/config.site" ++fi ++shift ++for ac_site_file ++do ++ if test -r "$ac_site_file"; then ++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++echo "$as_me: loading site script $ac_site_file" >&6;} ++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" ++ fi ++done ++ ++if test -r "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special ++ # files actually), so we avoid doing that. ++ if test -f "$cache_file"; then ++ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++echo "$as_me: loading cache $cache_file" >&6;} ++ case $cache_file in ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; ++ esac ++ fi ++else ++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++echo "$as_me: creating cache $cache_file" >&6;} ++ >$cache_file ++fi ++ ++# Check that the precious variables saved in the cache have kept the same ++# value. ++ac_cache_corrupted=false ++for ac_var in $ac_precious_vars; do ++ eval ac_old_set=\$ac_cv_env_${ac_var}_set ++ eval ac_new_set=\$ac_env_${ac_var}_set ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value ++ case $ac_old_set,$ac_new_set in ++ set,) ++ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,set) ++ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,);; ++ *) ++ if test "x$ac_old_val" != "x$ac_new_val"; then ++ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 ++echo "$as_me: former value: $ac_old_val" >&2;} ++ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 ++echo "$as_me: current value: $ac_new_val" >&2;} ++ ac_cache_corrupted=: ++ fi;; ++ esac ++ # Pass precious variables to config.status. ++ if test "$ac_new_set" = set; then ++ case $ac_new_val in ++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *) ac_arg=$ac_var=$ac_new_val ;; ++ esac ++ case " $ac_configure_args " in ++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ++ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 ++echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ ++ ++ ++# Save this value here, since automake will set cflags later ++cflags_set=${CFLAGS+set} ++ ++am__api_version="1.7" ++ac_aux_dir= ++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do ++ if test -f "$ac_dir/install-sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install-sh -c" ++ break ++ elif test -f "$ac_dir/install.sh"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi ++done ++if test -z "$ac_aux_dir"; then ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 ++echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++# These three variables are undocumented and unsupported, ++# and are intended to be withdrawn in a future Autoconf release. ++# They can cause serious problems if a builder's source tree is in a directory ++# whose full name contains unusual characters. ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ++ ++ ++# Find a good install program. We prefer a C program (faster), ++# so one script is as good as another. But avoid the broken or ++# incompatible versions: ++# SysV /etc/install, /usr/sbin/install ++# SunOS /usr/etc/install ++# IRIX /sbin/install ++# AIX /bin/install ++# AmigaOS /C/install, which installs bootblocks on floppy discs ++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag ++# AFS /usr/afsws/bin/install, which mishandles nonexistent args ++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" ++# OS/2's system install, which has a completely different semantic ++# ./install, which can be erroneously created by make from ./install.sh. ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } ++if test -z "$INSTALL"; then ++if test "${ac_cv_path_install+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in ++ ./ | .// | /cC/* | \ ++ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ++ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ /usr/ucb/* ) ;; ++ *) ++ # OSF1 and SCO ODT 3.0 have their own names for install. ++ # Don't use installbsd from OSF since it installs stuff as root ++ # 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_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. ++ : ++ elif test $ac_prog = install && ++ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # program-specific install script used by HP pwplus--don't use. ++ : ++ else ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi ++ fi ++ done ++ done ++ ;; ++esac ++done ++IFS=$as_save_IFS ++ ++ ++fi ++ if test "${ac_cv_path_install+set}" = set; then ++ INSTALL=$ac_cv_path_install ++ else ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for INSTALL within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ INSTALL=$ac_install_sh ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } ++ ++# Use test -z because SunOS4 sh mishandles braces in ${var-val}. ++# It thinks the first close brace ends the variable substitution. ++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' ++ ++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' ++ ++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ++ ++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$*" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$*" != "X $srcdir/configure conftest.file" \ ++ && test "$*" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken ++alias in your environment" >&5 ++echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken ++alias in your environment" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ test "$2" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! ++Check your system clock" >&5 ++echo "$as_me: error: newly created file is older than distributed files! ++Check your system clock" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++test "$program_prefix" != NONE && ++ program_transform_name="s&^&$program_prefix&;$program_transform_name" ++# Use a double $ so make ignores it. ++test "$program_suffix" != NONE && ++ program_transform_name="s&\$&$program_suffix&;$program_transform_name" ++# Double any \ or $. echo might interpret backslashes. ++# By default was `s,x,x', remove it if useless. ++cat <<\_ACEOF >conftest.sed ++s/[\\$]/&&/g;s/;s,x,x,$// ++_ACEOF ++program_transform_name=`echo $program_transform_name | sed -f conftest.sed` ++rm -f conftest.sed ++ ++ ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++ ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++fi ++ ++for ac_prog in gawk mawk nawk awk ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_AWK+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$AWK"; then ++ ac_cv_prog_AWK="$AWK" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++AWK=$ac_cv_prog_AWK ++if test -n "$AWK"; then ++ { echo "$as_me:$LINENO: result: $AWK" >&5 ++echo "${ECHO_T}$AWK" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$AWK" && break ++done ++ ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh ++all: ++ @echo '@@@%%%=$(MAKE)=@@@%%%' ++_ACEOF ++# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac ++rm -f conftest.make ++fi ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ SET_MAKE= ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ SET_MAKE="MAKE=${MAKE-make}" ++fi ++ ++rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++ ++ # test to see if srcdir already configured ++if test "`cd $srcdir && pwd`" != "`pwd`" && ++ test -f $srcdir/config.status; then ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++ ++ ++# Define the identity of the package. ++ PACKAGE='gtk+' ++ VERSION='2.14.4' ++ ++ ++# Some tools Automake needs. ++ ++ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} ++ ++ ++AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} ++ ++ ++AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} ++ ++ ++AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} ++ ++ ++MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} ++ ++ ++AMTAR=${AMTAR-"${am_missing_run}tar"} ++ ++install_sh=${install_sh-"$am_aux_dir/install-sh"} ++ ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++if test "$cross_compiling" != no; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ++set dummy ${ac_tool_prefix}strip; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$STRIP"; then ++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++STRIP=$ac_cv_prog_STRIP ++if test -n "$STRIP"; then ++ { echo "$as_me:$LINENO: result: $STRIP" >&5 ++echo "${ECHO_T}$STRIP" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_STRIP"; then ++ ac_ct_STRIP=$STRIP ++ # Extract the first word of "strip", so it can be a program name with args. ++set dummy strip; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_STRIP"; then ++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP ++if test -n "$ac_ct_STRIP"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++echo "${ECHO_T}$ac_ct_STRIP" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++fi ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++ ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++ ++ ++ ++ac_config_headers="$ac_config_headers config.h" ++ ++ ++# ++# For each of the libraries we build, we define the following ++ ++# substituted variables: ++# ++# foo_PACKAGES: pkg-config packages this library requires ++# foo_EXTRA_LIBS: Libraries this module requires not pulled in by pkg-config ++# foo_EXTRA_CFLAGS: cflags this module requires not pulled in by pkg-config ++# foo_DEP_LIBS: All libraries this module requires ++# foo_DEP_CFLAGS: All cflags this module requires ++ ++ ++GTK_MAJOR_VERSION=2 ++GTK_MINOR_VERSION=14 ++GTK_MICRO_VERSION=4 ++GTK_INTERFACE_AGE=4 ++GTK_BINARY_AGE=1404 ++GTK_VERSION=2.14.4 ++GTK_API_VERSION=2.0 ++GTK_BINARY_VERSION=2.10.0 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# libtool versioning ++#LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION ++#LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE` ++#LT_REVISION=$GTK_INTERFACE_AGE ++#LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE` ++#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` ++ ++ ++ ++ ++LT_VERSION_INFO="1400:4:1400" ++LT_CURRENT_MINUS_AGE=0 ++ ++ ++ ++ ++ ++ ++ ++ ++GAIL_LT_VERSION_INFO=18:1:0 ++ ++GAIL_LT_CURRENT_MINUS_AGE=18 ++ ++ ++# ++# gdk-pixbuf gets versioned separately, and for now, using standard ++# libtool versioning, not GTK+-style versioning ++# ++GDK_PIXBUF_MAJOR=2 ++GDK_PIXBUF_MINOR=14 ++GDK_PIXBUF_MICRO=4 ++GDK_PIXBUF_VERSION="${GDK_PIXBUF_MAJOR}.${GDK_PIXBUF_MINOR}.${GDK_PIXBUF_MICRO}" ++ ++ ++ ++ ++ ++GETTEXT_PACKAGE=gtk20 ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" ++_ACEOF ++ ++ ++# Make sure we can run config.sub. ++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || ++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 ++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} ++ { (exit 1); exit 1; }; } ++ ++{ echo "$as_me:$LINENO: checking build system type" >&5 ++echo $ECHO_N "checking build system type... $ECHO_C" >&6; } ++if test "${ac_cv_build+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_build_alias=$build_alias ++test "x$ac_build_alias" = x && ++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` ++test "x$ac_build_alias" = x && ++ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 ++echo "$as_me: error: cannot guess build type; you must specify one" >&2;} ++ { (exit 1); exit 1; }; } ++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} ++ { (exit 1); exit 1; }; } ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++echo "${ECHO_T}$ac_cv_build" >&6; } ++case $ac_cv_build in ++*-*-*) ;; ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 ++echo "$as_me: error: invalid value of canonical build" >&2;} ++ { (exit 1); exit 1; }; };; ++esac ++build=$ac_cv_build ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_build ++shift ++build_cpu=$1 ++build_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++build_os=$* ++IFS=$ac_save_IFS ++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac ++ ++ ++{ echo "$as_me:$LINENO: checking host system type" >&5 ++echo $ECHO_N "checking host system type... $ECHO_C" >&6; } ++if test "${ac_cv_host+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "x$host_alias" = x; then ++ ac_cv_host=$ac_cv_build ++else ++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++echo "${ECHO_T}$ac_cv_host" >&6; } ++case $ac_cv_host in ++*-*-*) ;; ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 ++echo "$as_me: error: invalid value of canonical host" >&2;} ++ { (exit 1); exit 1; }; };; ++esac ++host=$ac_cv_host ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_host ++shift ++host_cpu=$1 ++host_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++host_os=$* ++IFS=$ac_save_IFS ++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ++ ++ ++ ++MATH_LIB=-lm ++{ echo "$as_me:$LINENO: checking for native Win32" >&5 ++echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } ++LIB_EXE_MACHINE_FLAG=X86 ++case "$host" in ++ *-*-mingw*) ++ os_win32=yes ++ gio_can_sniff=no ++ MATH_LIB= ++ case "$host" in ++ x86_64-*-*) ++ LIB_EXE_MACHINE_FLAG=X64 ++ ;; ++ esac ++ ;; ++ *) ++ os_win32=no ++ ;; ++esac ++{ echo "$as_me:$LINENO: result: $os_win32" >&5 ++echo "${ECHO_T}$os_win32" >&6; } ++ ++ ++ ++case $host in ++ *-*-linux*) ++ os_linux=yes ++ ;; ++esac ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ fi ++fi ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ ac_prog_rejected=no ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++ ac_cv_prog_CC="cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $@%:@ != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi ++fi ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&5 ++echo "$as_me: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ ++# Provide some information about the compiler. ++echo "$as_me:$LINENO: checking for C compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files a.out a.exe b.out" ++# Try to create an executable without -o first, disregard a.out. ++# It will help us diagnose broken compilers, and finding out an intuition ++# of exeext. ++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++# ++# List of possible output files, starting from the most likely. ++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) ++# only as a last resort. b.out is created by i960 compilers. ++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' ++# ++# The IRIX 6 linker writes into existing files which may not be ++# executable, retaining their permissions. Remove them first so a ++# subsequent execution test works. ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { (ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link_default") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# 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 '' ++do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ++ ;; ++ [ab].out ) ++ # We found the default executable, but exeext='' is most ++ # certainly right. ++ break;; ++ *.* ) ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. ++ break;; ++ * ) ++ break;; ++ esac ++done ++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 ++ ++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C compiler cannot create executables ++See \`config.log' for more details." >&2;} ++ { (exit 77); exit 77; }; } ++fi ++ ++ac_exeext=$ac_cv_exeext ++ ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } ++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 ++# If not cross compiling, check that we can run a simple program. ++if test "$cross_compiling" != yes; then ++ if { ac_try='./$ac_file' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$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 ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ fi ++fi ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ ++rm -f a.out a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++echo "${ECHO_T}$cross_compiling" >&6; } ++ ++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # If both `conftest.exe' and `conftest' are `present' (well, observable) ++# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will ++# work properly (i.e., refer to `conftest.exe'), while it won't with ++# `rm'. ++for ac_file in conftest.exe conftest conftest.*; do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ break;; ++ * ) break;; ++ esac ++done ++else ++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f conftest$ac_cv_exeext ++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++echo "${ECHO_T}$ac_cv_exeext" >&6; } ++ ++rm -f conftest.$ac_ext ++EXEEXT=$ac_cv_exeext ++ac_exeext=$EXEEXT ++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } ++if test "${ac_cv_objext+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.o conftest.obj ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; ++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` ++ break;; ++ esac ++done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f conftest.$ac_cv_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++echo "${ECHO_T}$ac_cv_objext" >&6; } ++OBJEXT=$ac_cv_objext ++ac_objext=$OBJEXT ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_compiler_gnu=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } ++GCC=`test $ac_compiler_gnu = yes && echo yes` ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#include ++#include ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; ++int ++main () ++{ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ return 0; ++} ++_ACEOF ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC ++ ++fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; ++ xno) ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++esac ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++DEPDIR="${am__leading_dot}deps" ++ ++ac_config_commands="$ac_config_commands depfiles" ++ ++ ++am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi ++fi ++ ++ ++{ echo "$as_me:$LINENO: result: $_am_result" >&5 ++echo "${ECHO_T}$_am_result" >&6; } ++rm -f confinc confmf ++ ++# Check whether --enable-dependency-tracking was given. ++if test "${enable_dependency_tracking+set}" = set; then ++ enableval=$enable_dependency_tracking; ++fi ++ ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++ ++ ++if test "x$enable_dependency_tracking" != xno; then ++ AMDEP_TRUE= ++ AMDEP_FALSE='#' ++else ++ AMDEP_TRUE='#' ++ AMDEP_FALSE= ++fi ++ ++ ++ ++ ++depcc="$CC" am_compiler_list= ++ ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CC_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ : > sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored. ++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CC_dependencies_compiler_type=none ++fi ++ ++fi ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ ++ ++if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ ++ ++# Check whether --enable-static was given. ++if test "${enable_static+set}" = set; then ++ enableval=$enable_static; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_static=no ++fi ++ ++ ++ ++ ++ ++if test "$enable_static" = yes; then ++ ENABLE_STATIC_TRUE= ++ ENABLE_STATIC_FALSE='#' ++else ++ ENABLE_STATIC_TRUE='#' ++ ENABLE_STATIC_FALSE= ++fi ++ ++ ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CXX+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CXX"; then ++ ac_cv_prog_CXX="$CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CXX=$ac_cv_prog_CXX ++if test -n "$CXX"; then ++ { echo "$as_me:$LINENO: result: $CXX" >&5 ++echo "${ECHO_T}$CXX" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$CXX" && break ++ done ++fi ++if test -z "$CXX"; then ++ ac_ct_CXX=$CXX ++ 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. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CXX"; then ++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX ++if test -n "$ac_ct_CXX"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++echo "${ECHO_T}$ac_ct_CXX" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CXX" && break ++done ++ ++ if test "x$ac_ct_CXX" = x; then ++ CXX="gcc" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CXX=$ac_ct_CXX ++ fi ++fi ++ ++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++if test -z "$CXX"; then ++ if test -n "$CCC"; then ++ CXX=$CCC ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CXX+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CXX"; then ++ ac_cv_prog_CXX="$CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CXX=$ac_cv_prog_CXX ++if test -n "$CXX"; then ++ { echo "$as_me:$LINENO: result: $CXX" >&5 ++echo "${ECHO_T}$CXX" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$CXX" && break ++ done ++fi ++if test -z "$CXX"; then ++ ac_ct_CXX=$CXX ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CXX"; then ++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX ++if test -n "$ac_ct_CXX"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++echo "${ECHO_T}$ac_ct_CXX" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CXX" && break ++done ++ ++ if test "x$ac_ct_CXX" = x; then ++ CXX="g++" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CXX=$ac_ct_CXX ++ fi ++fi ++ ++ fi ++fi ++# Provide some information about the compiler. ++echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } ++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_compiler_gnu=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } ++GXX=`test $ac_compiler_gnu = yes && echo yes` ++ac_test_CXXFLAGS=${CXXFLAGS+set} ++ac_save_CXXFLAGS=$CXXFLAGS ++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 ++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cxx_g+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++ ac_cxx_werror_flag=yes ++ ac_cv_prog_cxx_g=no ++ CXXFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ CXXFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++ CXXFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } ++if test "$ac_test_CXXFLAGS" = set; then ++ CXXFLAGS=$ac_save_CXXFLAGS ++elif test $ac_cv_prog_cxx_g = yes; then ++ if test "$GXX" = yes; then ++ CXXFLAGS="-g -O2" ++ else ++ CXXFLAGS="-g" ++ fi ++else ++ if test "$GXX" = yes; then ++ CXXFLAGS="-O2" ++ else ++ CXXFLAGS= ++ fi ++fi ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++depcc="$CXX" am_compiler_list= ++ ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CXX_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ : > sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored. ++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ++ am_cv_CXX_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CXX_dependencies_compiler_type=none ++fi ++ ++fi ++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } ++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type ++ ++ ++ ++if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then ++ am__fastdepCXX_TRUE= ++ am__fastdepCXX_FALSE='#' ++else ++ am__fastdepCXX_TRUE='#' ++ am__fastdepCXX_FALSE= ++fi ++ ++ ++ ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++class a { int b; } c; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ CXX= ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++ ++if test "$CXX" != ""; then ++ HAVE_CXX_TRUE= ++ HAVE_CXX_FALSE='#' ++else ++ HAVE_CXX_TRUE='#' ++ HAVE_CXX_FALSE= ++fi ++ ++ ++gtk_save_cxxflags="$CXXFLAGS" ++CXXFLAGS="$CXXFLAGS -x objective-c++" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@interface Foo @end ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ OBJC=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++ ++if test "$OBJC" = "yes"; then ++ HAVE_OBJC_TRUE= ++ HAVE_OBJC_FALSE='#' ++else ++ HAVE_OBJC_TRUE='#' ++ HAVE_OBJC_FALSE= ++fi ++ ++CXXFLAGS="$gtk_save_cxxflags" ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++if test "$os_win32" = "yes"; then ++ if test x$enable_static = xyes -o x$enable_static = x; then ++ { echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 ++echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} ++ enable_static=no ++ fi ++ if test x$enable_shared = xno; then ++ { echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 ++echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} ++ fi ++ enable_shared=yes ++fi ++ ++ ++ ++# Check whether --enable-shared was given. ++if test "${enable_shared+set}" = set; then ++ enableval=$enable_shared; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_shared=yes ++fi ++ ++ ++# Check whether --enable-fast-install was given. ++if test "${enable_fast_install+set}" = set; then ++ enableval=$enable_fast_install; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_fast_install=yes ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } ++if test "${lt_cv_path_SED+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH @@ -1755,7 +4882,7 @@ Index: gtk+2.0-2.14.3/aclocal.m4 + 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 @@ -1792,15 +4919,6602 @@ Index: gtk+2.0-2.14.3/aclocal.m4 + fi + done +done -+]) -+SED=$lt_cv_path_SED -+AC_SUBST([SED]) -+AC_MSG_RESULT([$SED]) -+]) + -+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -+# -+# Copyright © 2004 Scott James Remnant . ++fi ++ ++SED=$lt_cv_path_SED ++ ++{ echo "$as_me:$LINENO: result: $SED" >&5 ++echo "${ECHO_T}$SED" >&6; } ++ ++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Extract the first word of "grep ggrep" to use in msg output ++if test -z "$GREP"; then ++set dummy grep ggrep; ac_prog_name=$2 ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_path_GREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ 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_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 ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ ++ $ac_path_GREP_found && break 3 ++ done ++done ++ ++done ++IFS=$as_save_IFS ++ ++ ++fi ++ ++GREP="$ac_cv_path_GREP" ++if test -z "$GREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++else ++ ac_cv_path_GREP=$GREP ++fi ++ ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++echo "${ECHO_T}$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ echo "$as_me:$LINENO: checking for egrep" >&5 ++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ # Extract the first word of "egrep" to use in msg output ++if test -z "$EGREP"; then ++set dummy egrep; ac_prog_name=$2 ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_path_EGREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ 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_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 ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ ++ $ac_path_EGREP_found && break 3 ++ done ++done ++ ++done ++IFS=$as_save_IFS ++ ++ ++fi ++ ++EGREP="$ac_cv_path_EGREP" ++if test -z "$EGREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++else ++ ac_cv_path_EGREP=$EGREP ++fi ++ ++ ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" ++ ++ ++ ++# Check whether --with-gnu-ld was given. ++if test "${with_gnu_ld+set}" = set; then ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes ++else ++ with_gnu_ld=no ++fi ++ ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [\\/]* | ?:[\\/]*) ++ re_direlt='/[^/][^/]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` ++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ { echo "$as_me:$LINENO: checking for GNU ld" >&5 ++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } ++else ++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } ++fi ++if test "${lt_cv_path_LD+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 &5 ++echo "${ECHO_T}$LD" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 ++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ++ { (exit 1); exit 1; }; } ++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } ++if test "${lt_cv_prog_gnu_ld+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. ++case `$LD -v 2>&1 &5 ++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } ++with_gnu_ld=$lt_cv_prog_gnu_ld ++ ++ ++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } ++if test "${lt_cv_ld_reload_flag+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_ld_reload_flag='-r' ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } ++reload_flag=$lt_cv_ld_reload_flag ++case $reload_flag in ++"" | " "*) ;; ++*) reload_flag=" $reload_flag" ;; ++esac ++reload_cmds='$LD$reload_flag -o $output$reload_objs' ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ else ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' ++ fi ++ ;; ++esac ++ ++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 ++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } ++if test "${lt_cv_path_NM+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ 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 ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++fi ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++echo "${ECHO_T}$lt_cv_path_NM" >&6; } ++NM="$lt_cv_path_NM" ++ ++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } ++LN_S=$as_ln_s ++if test "$LN_S" = "ln -s"; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++echo "${ECHO_T}no, using $LN_S" >&6; } ++fi ++ ++{ 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 ++ lt_cv_file_magic_cmd='$MAGIC_CMD' ++lt_cv_file_magic_test_file= ++lt_cv_deplibs_check_method='unknown' ++# Need to set the preceding variable on all platforms that support ++# interlibrary dependencies. ++# 'none' -- dependencies not supported. ++# `unknown' -- same as none, but documents that we really don't know. ++# 'pass_all' -- all dependencies passed with no checks. ++# 'test_compile' -- check by making test program. ++# 'file_magic [[regex]]' -- check by looking for files in library path ++# which responds to the $file_magic_cmd with a given extended regex. ++# If you have `file' or equivalent on your system and you're not sure ++# whether `pass_all' will *always* work, you probably want this one. ++ ++case $host_os in ++aix[4-9]*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++beos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++bsdi[45]*) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' ++ lt_cv_file_magic_cmd='/usr/bin/file -L' ++ lt_cv_file_magic_test_file=/shlib/libc.so ++ ;; ++ ++cygwin*) ++ # func_win32_libid is a shell function defined in ltmain.sh ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ ;; ++ ++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', ++ # 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* | dragonfly*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ case $host_cpu in ++ i*86 ) ++ # Not sure whether the presence of OpenBSD here was a mistake. ++ # Let's accept both of them until this is cleared up. ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ ;; ++ esac ++ else ++ lt_cv_deplibs_check_method=pass_all ++ fi ++ ;; ++ ++gnu*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++hpux10.20* | hpux11*) ++ lt_cv_file_magic_cmd=/usr/bin/file ++ case $host_cpu in ++ ia64*) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' ++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ ;; ++ hppa*64*) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' ++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ ;; ++ *) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' ++ lt_cv_file_magic_test_file=/usr/lib/libc.sl ++ ;; ++ esac ++ ;; ++ ++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)$' ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; ++ esac ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++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 ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' ++ fi ++ ;; ++ ++newos6*) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=/usr/lib/libnls.so ++ ;; ++ ++nto-qnx*) ++ lt_cv_deplibs_check_method=unknown ++ ;; ++ ++openbsd*) ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' ++ fi ++ ;; ++ ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++solaris*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv4 | sysv4.3*) ++ case $host_vendor in ++ motorola) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ ;; ++ ncr) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ sequent) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ++ ;; ++ sni) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" ++ lt_cv_file_magic_test_file=/lib/libc.so ++ ;; ++ siemens) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ esac ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++esac ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } ++file_magic_cmd=$lt_cv_file_magic_cmd ++deplibs_check_method=$lt_cv_deplibs_check_method ++test -z "$deplibs_check_method" && deplibs_check_method=unknown ++ ++ ++ ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++# Check whether --enable-libtool-lock was given. ++if test "${enable_libtool_lock+set}" = set; then ++ enableval=$enable_libtool_lock; ++fi ++ ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > 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 ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '#line __oline__ "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 ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++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 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; 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" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *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" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } ++if test "${lt_cv_cc_needs_belf+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ lt_cv_cc_needs_belf=no ++fi ++ ++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' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > 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.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 ++echo "${ECHO_T}$DLLTOOL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 ++echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. ++set dummy ${ac_tool_prefix}as; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_AS+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$AS"; then ++ ac_cv_prog_AS="$AS" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++AS=$ac_cv_prog_AS ++if test -n "$AS"; then ++ { echo "$as_me:$LINENO: result: $AS" >&5 ++echo "${ECHO_T}$AS" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_AS"; then ++ ac_ct_AS=$AS ++ # Extract the first word of "as", so it can be a program name with args. ++set dummy as; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_AS"; then ++ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_AS=$ac_cv_prog_ac_ct_AS ++if test -n "$ac_ct_AS"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 ++echo "${ECHO_T}$ac_ct_AS" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_AS" = x; then ++ AS="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ AS=$ac_ct_AS ++ fi ++else ++ AS="$ac_cv_prog_AS" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. ++set dummy ${ac_tool_prefix}objdump; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$OBJDUMP"; then ++ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++OBJDUMP=$ac_cv_prog_OBJDUMP ++if test -n "$OBJDUMP"; then ++ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++echo "${ECHO_T}$OBJDUMP" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OBJDUMP"; then ++ ac_ct_OBJDUMP=$OBJDUMP ++ # Extract the first word of "objdump", so it can be a program name with args. ++set dummy objdump; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_OBJDUMP"; then ++ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP ++if test -n "$ac_ct_OBJDUMP"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_OBJDUMP" = x; then ++ OBJDUMP="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ OBJDUMP=$ac_ct_OBJDUMP ++ fi ++else ++ OBJDUMP="$ac_cv_prog_OBJDUMP" ++fi ++ ++ ;; ++ ++esac ++ ++need_locks="$enable_libtool_lock" ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++ if test "${ac_cv_prog_CPP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Double quotes because CPP needs to be expanded ++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@ifdef __STDC__ ++@%:@ include ++@%:@else ++@%:@ include ++@%:@endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ break ++fi ++ ++ done ++ ac_cv_prog_CPP=$CPP ++ ++fi ++ CPP=$ac_cv_prog_CPP ++else ++ ac_cv_prog_CPP=$CPP ++fi ++{ echo "$as_me:$LINENO: result: $CPP" >&5 ++echo "${ECHO_T}$CPP" >&6; } ++ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@ifdef __STDC__ ++@%:@ include ++@%:@else ++@%:@ include ++@%:@endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#include ++#include ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_stdc=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then ++ : ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then ++ : ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then ++ : ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./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 ++ : ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define STDC_HEADERS 1 ++_ACEOF ++ ++fi ++ ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ ++@%:@include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_Header=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++for ac_header in dlfcn.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 ++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } ++if test -z "$CXXCPP"; then ++ if test "${ac_cv_prog_CXXCPP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Double quotes because CXXCPP needs to be expanded ++ for CXXCPP in "$CXX -E" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@ifdef __STDC__ ++@%:@ include ++@%:@else ++@%:@ include ++@%:@endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ break ++fi ++ ++ done ++ ac_cv_prog_CXXCPP=$CXXCPP ++ ++fi ++ CXXCPP=$ac_cv_prog_CXXCPP ++else ++ ac_cv_prog_CXXCPP=$CXXCPP ++fi ++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 ++echo "${ECHO_T}$CXXCPP" >&6; } ++ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@ifdef __STDC__ ++@%:@ include ++@%:@else ++@%:@ include ++@%:@endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++fi ++ ++ac_ext=f ++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ++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 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_F77+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$F77"; then ++ ac_cv_prog_F77="$F77" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++F77=$ac_cv_prog_F77 ++if test -n "$F77"; then ++ { echo "$as_me:$LINENO: result: $F77" >&5 ++echo "${ECHO_T}$F77" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$F77" && break ++ done ++fi ++if test -z "$F77"; then ++ ac_ct_F77=$F77 ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_F77+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_F77"; then ++ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_F77=$ac_cv_prog_ac_ct_F77 ++if test -n "$ac_ct_F77"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 ++echo "${ECHO_T}$ac_ct_F77" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_F77" && break ++done ++ ++ if test "x$ac_ct_F77" = x; then ++ F77="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ F77=$ac_ct_F77 ++ fi ++fi ++ ++ ++# Provide some information about the compiler. ++echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++rm -f a.out ++ ++# If we don't use `.F' as extension, the preprocessor is not run on the ++# input file. (Note that this only needs to work for GNU compilers.) ++ac_save_ext=$ac_ext ++ac_ext=F ++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } ++if test "${ac_cv_f77_compiler_gnu+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++ program main ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ end ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_compiler_gnu=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_f77_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ++ac_ext=$ac_save_ext ++ac_test_FFLAGS=${FFLAGS+set} ++ac_save_FFLAGS=$FFLAGS ++FFLAGS= ++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 ++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } ++if test "${ac_cv_prog_f77_g+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ FFLAGS=-g ++cat >conftest.$ac_ext <<_ACEOF ++ program main ++ ++ end ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_prog_f77_g=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } ++if test "$ac_test_FFLAGS" = set; then ++ FFLAGS=$ac_save_FFLAGS ++elif test $ac_cv_prog_f77_g = yes; then ++ if test "x$ac_cv_f77_compiler_gnu" = xyes; then ++ FFLAGS="-g -O2" ++ else ++ FFLAGS="-g" ++ fi ++else ++ if test "x$ac_cv_f77_compiler_gnu" = xyes; then ++ FFLAGS="-O2" ++ else ++ FFLAGS= ++ fi ++fi ++ ++G77=`test $ac_compiler_gnu = yes && echo yes` ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ ++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! ++# find the maximum length of command line arguments ++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ i=0 ++ teststring="ABCD" ++ ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; ++ ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; ++ ++ cygwin* | mingw*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ 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` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ 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` ++ fi ++ ;; ++ esac ++ ++fi ++ ++if test -n $lt_cv_sys_max_cmd_len ; then ++ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } ++else ++ { echo "$as_me:$LINENO: result: none" >&5 ++echo "${ECHO_T}none" >&6; } ++fi ++ ++ ++ ++ ++ ++# 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; } ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++# These are sane defaults that work on at least a few old systems. ++# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++ ++# Character class describing NM global symbol codes. ++symcode='[BCDEGRST]' ++ ++# Regexp to match symbols that can be accessed directly from C. ++sympat='\([_A-Za-z][_A-Za-z0-9]*\)' ++ ++# Transform an extracted symbol line into a proper C declaration ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" ++ ++# Transform an extracted symbol line into symbol name and symbol address ++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'" ++ ++# Define system-specific variables. ++case $host_os in ++aix*) ++ symcode='[BCDT]' ++ ;; ++cygwin* | mingw* | pw32*) ++ symcode='[ABCDGISTW]' ++ ;; ++hpux*) # Its linker distinguishes data from code symbols ++ if test "$host_cpu" = ia64; then ++ symcode='[ABCDEGRST]' ++ fi ++ 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* | 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'" ++ 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'" ++ fi ++ ;; ++irix* | nonstopux*) ++ symcode='[BCDEGRST]' ++ ;; ++osf*) ++ symcode='[BCDEGQRST]' ++ ;; ++solaris*) ++ symcode='[BDRT]' ++ ;; ++sco3.2v5*) ++ symcode='[DT]' ++ ;; ++sysv4.2uw2*) ++ symcode='[DT]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[ABDT]' ++ ;; ++sysv4) ++ symcode='[DFNSTU]' ++ ;; ++esac ++ ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac ++ ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[ABCDGIRSTW]' ;; ++esac ++ ++# Try without a prefix undercore, then with it. ++for ac_symprfx in "" "_"; do ++ ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" ++ ++ # Write the raw and C identifiers. ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ ++ # Check to see that the pipe works correctly. ++ pipe_works=no ++ ++ rm -f conftest* ++ cat > conftest.$ac_ext <&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # Now try to grab the symbols. ++ nlist=conftest.nm ++ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 ++ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && test -s "$nlist"; then ++ # Try sorting and uniquifying the output. ++ if sort "$nlist" | uniq > "$nlist"T; then ++ mv -f "$nlist"T "$nlist" ++ else ++ rm -f "$nlist"T ++ fi ++ ++ # Make sure that we snagged all the symbols we need. ++ if grep ' nm_test_var$' "$nlist" >/dev/null; then ++ if grep ' nm_test_func$' "$nlist" >/dev/null; then ++ cat < conftest.$ac_ext ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++EOF ++ # Now generate the symbol file. ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' ++ ++ cat <> conftest.$ac_ext ++#if defined (__STDC__) && __STDC__ ++# define lt_ptr_t void * ++#else ++# define lt_ptr_t char * ++# define const ++#endif ++ ++/* The mapping between symbol names and symbols. */ ++const struct { ++ const char *name; ++ lt_ptr_t address; ++} ++lt_preloaded_symbols[] = ++{ ++EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext ++ cat <<\EOF >> conftest.$ac_ext ++ {0, (lt_ptr_t) 0} ++}; ++ ++#ifdef __cplusplus ++} ++#endif ++EOF ++ # Now try linking the two files. ++ mv conftest.$ac_objext conftstm.$ac_objext ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" ++ LIBS="conftstm.$ac_objext" ++ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" ++ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && test -s conftest${ac_exeext}; then ++ pipe_works=yes ++ fi ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" ++ else ++ echo "cannot find nm_test_func in $nlist" >&5 ++ fi ++ else ++ echo "cannot find nm_test_var in $nlist" >&5 ++ fi ++ else ++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 ++ fi ++ else ++ echo "$progname: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ fi ++ rm -rf conftest* conftst* ++ ++ # Do not use the global_symbol_pipe unless it works. ++ if test "$pipe_works" = yes; then ++ break ++ else ++ lt_cv_sys_global_symbol_pipe= ++ fi ++done ++ ++fi ++ ++if test -z "$lt_cv_sys_global_symbol_pipe"; then ++ lt_cv_sys_global_symbol_to_cdecl= ++fi ++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++ { echo "$as_me:$LINENO: result: failed" >&5 ++echo "${ECHO_T}failed" >&6; } ++else ++ { echo "$as_me:$LINENO: result: ok" >&5 ++echo "${ECHO_T}ok" >&6; } ++fi ++ ++{ echo "$as_me:$LINENO: checking for objdir" >&5 ++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } ++if test "${lt_cv_objdir+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++echo "${ECHO_T}$lt_cv_objdir" >&6; } ++objdir=$lt_cv_objdir ++ ++ ++ ++ ++ ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi ++ ;; ++esac ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='sed -e 1s/^X//' ++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' ++ ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ ++# Constants: ++rm="rm -f" ++ ++# Global variables: ++default_ofile=libtool ++can_build_shared=yes ++ ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ltmain="$ac_aux_dir/ltmain.sh" ++ofile="$default_ofile" ++with_gnu_ld="$lt_cv_prog_gnu_ld" ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. ++set dummy ${ac_tool_prefix}ar; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_AR+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$AR"; then ++ ac_cv_prog_AR="$AR" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++AR=$ac_cv_prog_AR ++if test -n "$AR"; then ++ { echo "$as_me:$LINENO: result: $AR" >&5 ++echo "${ECHO_T}$AR" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_AR"; then ++ ac_ct_AR=$AR ++ # Extract the first word of "ar", so it can be a program name with args. ++set dummy ar; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_AR"; then ++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_AR=$ac_cv_prog_ac_ct_AR ++if test -n "$ac_ct_AR"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++echo "${ECHO_T}$ac_ct_AR" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_AR" = x; then ++ AR="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ AR=$ac_ct_AR ++ fi ++else ++ AR="$ac_cv_prog_AR" ++fi ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. ++set dummy ${ac_tool_prefix}ranlib; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_RANLIB+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$RANLIB"; then ++ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++RANLIB=$ac_cv_prog_RANLIB ++if test -n "$RANLIB"; then ++ { echo "$as_me:$LINENO: result: $RANLIB" >&5 ++echo "${ECHO_T}$RANLIB" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_RANLIB"; then ++ ac_ct_RANLIB=$RANLIB ++ # Extract the first word of "ranlib", so it can be a program name with args. ++set dummy ranlib; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_RANLIB"; then ++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB ++if test -n "$ac_ct_RANLIB"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++echo "${ECHO_T}$ac_ct_RANLIB" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ RANLIB=$ac_ct_RANLIB ++ fi ++else ++ RANLIB="$ac_cv_prog_RANLIB" ++fi ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ++set dummy ${ac_tool_prefix}strip; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$STRIP"; then ++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++STRIP=$ac_cv_prog_STRIP ++if test -n "$STRIP"; then ++ { echo "$as_me:$LINENO: result: $STRIP" >&5 ++echo "${ECHO_T}$STRIP" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_STRIP"; then ++ ac_ct_STRIP=$STRIP ++ # Extract the first word of "strip", so it can be a program name with args. ++set dummy strip; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_STRIP"; then ++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP ++if test -n "$ac_ct_STRIP"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++echo "${ECHO_T}$ac_ct_STRIP" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++ ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" ++ ++# Set sane defaults for various variables ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++test -z "$AS" && AS=as ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$LD" && LD=ld ++test -z "$LN_S" && LN_S="ln -s" ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++test -z "$NM" && NM=nm ++test -z "$SED" && SED=sed ++test -z "$OBJDUMP" && OBJDUMP=objdump ++test -z "$RANLIB" && RANLIB=: ++test -z "$STRIP" && STRIP=: ++test -z "$ac_objext" && ac_objext=o ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++ ++for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ ++# Only perform the check for file, if the check method requires it ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $MAGIC_CMD in ++[\\/*] | ?:[\\/]*) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/${ac_tool_prefix}file; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac ++fi ++ ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++echo "${ECHO_T}$MAGIC_CMD" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++if test -z "$lt_cv_path_MAGIC_CMD"; then ++ if test -n "$ac_tool_prefix"; then ++ { echo "$as_me:$LINENO: checking for file" >&5 ++echo $ECHO_N "checking for file... $ECHO_C" >&6; } ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $MAGIC_CMD in ++[\\/*] | ?:[\\/]*) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/file; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/file" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac ++fi ++ ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++echo "${ECHO_T}$MAGIC_CMD" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ else ++ MAGIC_CMD=: ++ fi ++fi ++ ++ fi ++ ;; ++esac ++ ++ ++ case $host_os in ++ rhapsody* | darwin*) ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$DSYMUTIL"; then ++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++DSYMUTIL=$ac_cv_prog_DSYMUTIL ++if test -n "$DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++echo "${ECHO_T}$DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DSYMUTIL"; then ++ ac_ct_DSYMUTIL=$DSYMUTIL ++ # Extract the first word of "dsymutil", so it can be a program name with args. ++set dummy dsymutil; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_DSYMUTIL"; then ++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL ++if test -n "$ac_ct_DSYMUTIL"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_DSYMUTIL" = x; then ++ DSYMUTIL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ DSYMUTIL=$ac_ct_DSYMUTIL ++ fi ++else ++ DSYMUTIL="$ac_cv_prog_DSYMUTIL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. ++set dummy ${ac_tool_prefix}nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NMEDIT"; then ++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++NMEDIT=$ac_cv_prog_NMEDIT ++if test -n "$NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++echo "${ECHO_T}$NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_NMEDIT"; then ++ ac_ct_NMEDIT=$NMEDIT ++ # Extract the first word of "nmedit", so it can be a program name with args. ++set dummy nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_NMEDIT"; then ++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_NMEDIT="nmedit" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT ++if test -n "$ac_ct_NMEDIT"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_NMEDIT" = x; then ++ NMEDIT=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ NMEDIT=$ac_ct_NMEDIT ++ fi ++else ++ NMEDIT="$ac_cv_prog_NMEDIT" ++fi ++ ++ ++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* ++ fi ++ rm conftest.c ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } ++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ lt_cv_ld_exported_symbols_list=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ lt_cv_ld_exported_symbols_list=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } ++ case $host_os in ++ rhapsody* | darwin1.[0123]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[012]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++ ++ ++enable_dlopen=no ++enable_win32_dll=yes ++ ++# Check whether --enable-libtool-lock was given. ++if test "${enable_libtool_lock+set}" = set; then ++ enableval=$enable_libtool_lock; ++fi ++ ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++ ++# Check whether --with-pic was given. ++if test "${with_pic+set}" = set; then ++ withval=$with_pic; pic_mode="$withval" ++else ++ pic_mode=default ++fi ++ ++test -z "$pic_mode" && pic_mode=default ++ ++# Use C for the default configuration in the libtool script ++tagname= ++lt_save_CC="$CC" ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++# Source file extension for C test sources. ++ac_ext=c ++ ++# Object file extension for compiled C test sources. ++objext=o ++objext=$objext ++ ++# Code to be used in simple compile tests ++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);}' ++ ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++# save warnings/boilerplate of simple test code ++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* ++ ++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 -r conftest* ++ ++ ++ ++lt_prog_compiler_no_builtin_flag= ++ ++if test "$GCC" = yes; then ++ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ++ ++ ++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_rtti_exceptions=no ++ ac_outfile=conftest.$ac_objext ++ 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. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:__oline__: \$? = $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. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_rtti_exceptions=yes ++ fi ++ fi ++ $rm conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++ ++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then ++ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" ++else ++ : ++fi ++ ++fi ++ ++lt_prog_compiler_wl= ++lt_prog_compiler_pic= ++lt_prog_compiler_static= ++ ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++ ++ if test "$GCC" = yes; then ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_static='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ 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' ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic='-fno-common' ++ ;; ++ ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ lt_prog_compiler_can_build_shared=no ++ enable_shared=no ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic=-Kconform_pic ++ fi ++ ;; ++ ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ lt_prog_compiler_wl='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static='-Bstatic' ++ else ++ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ lt_prog_compiler_pic='-qnocommon' ++ lt_prog_compiler_wl='-Wl,' ++ ;; ++ esac ++ ;; ++ ++ 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' ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ lt_prog_compiler_wl='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ lt_prog_compiler_static='${wl}-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ lt_prog_compiler_wl='-Wl,' ++ # PIC (with -KPIC) is the default. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ newsos6) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ icc* | ecc*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fpic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ccc*) ++ lt_prog_compiler_wl='-Wl,' ++ # 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 ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ lt_prog_compiler_wl='-Wl,' ++ # All OSF/1 code is PIC. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ rdos*) ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ solaris*) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ lt_prog_compiler_wl='-Qoption ld ';; ++ *) ++ lt_prog_compiler_wl='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ lt_prog_compiler_wl='-Qoption ld ' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ lt_prog_compiler_pic='-Kconform_pic' ++ lt_prog_compiler_static='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ unicos*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_can_build_shared=no ++ ;; ++ ++ uts4*) ++ lt_prog_compiler_pic='-pic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ *) ++ lt_prog_compiler_can_build_shared=no ++ ;; ++ esac ++ fi ++ ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$lt_prog_compiler_pic"; then ++ ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_pic_works=no ++ ac_outfile=conftest.$ac_objext ++ 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. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:__oline__: \$? = $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. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works=yes ++ fi ++ fi ++ $rm conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } ++ ++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then ++ case $lt_prog_compiler_pic in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; ++ esac ++else ++ lt_prog_compiler_pic= ++ lt_prog_compiler_can_build_shared=no ++fi ++ ++fi ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic= ++ ;; ++ *) ++ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ++ ;; ++esac ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_static_works=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ 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 ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works=yes ++ fi ++ fi ++ $rm -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } ++ ++if test x"$lt_cv_prog_compiler_static_works" = xyes; then ++ : ++else ++ lt_prog_compiler_static= ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_c_o=no ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ 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 ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:__oline__: \$? = $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 ++ # So say no if there are warnings ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out ++ cd .. ++ rmdir conftest ++ $rm conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } ++ ++ ++hard_links="nottested" ++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ hard_links=yes ++ $rm conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } ++ if test "$hard_links" = no; then ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++ ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++ ++ runpath_var= ++ allow_undefined_flag= ++ enable_shared_with_static_runtimes=no ++ archive_cmds= ++ archive_expsym_cmds= ++ old_archive_From_new_cmds= ++ old_archive_from_expsyms_cmds= ++ export_dynamic_flag_spec= ++ whole_archive_flag_spec= ++ thread_safe_flag_spec= ++ hardcode_libdir_flag_spec= ++ hardcode_libdir_flag_spec_ld= ++ hardcode_libdir_separator= ++ hardcode_direct=no ++ hardcode_minus_L=no ++ hardcode_shlibpath_var=unsupported ++ link_all_deplibs=unknown ++ hardcode_automatic=no ++ module_cmds= ++ module_expsym_cmds= ++ always_export_symbols=no ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ include_expsyms= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # it will be wrapped by ` (' and `)$', so one must not match beginning or ++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++ # as well as any symbol that contains `d'. ++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++ # platforms (ab)use it in PIC code, but their linkers get confused if ++ # the symbol is explicitly referenced. Since portable code cannot ++ # rely on this symbol name, it's probably fine to never include it in ++ # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++ extract_expsyms_cmds= ++ # Just being paranoid about ensuring that cc_basename is set. ++ for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ case $host_os in ++ cygwin* | mingw* | pw32*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac ++ ++ ld_shlibs=yes ++ if test "$with_gnu_ld" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' ++ ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' ++ export_dynamic_flag_spec='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>/dev/null` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix[3-9]*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ ld_shlibs=no ++ cat <&2 ++ ++*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. ++ ++EOF ++ fi ++ ;; ++ ++ amigaos*) ++ archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ ++ # Samuel A. Falvo II reports ++ # that the semantics of dynamic libraries on AmigaOS, at least up ++ # to version 4, is to share data among multiple programs linked ++ # with the same dynamic library. Since this doesn't match the ++ # behavior of shared libraries on other platforms, we can't use ++ # them. ++ ld_shlibs=no ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec='-L$libdir' ++ 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/'\'' -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' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ interix[3-9]*) ++ hardcode_direct=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ 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' ++ ;; ++ ++ 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 ++ pgcc*) # Portland Group C compiler ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ esac ++ 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 '"$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* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; ++ ++ solaris*) ++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++ ld_shlibs=no ++ cat <&2 ++ ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++EOF ++ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) ++ ld_shlibs=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ sunos4*) ++ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ esac ++ ++ if test "$ld_shlibs" = no; then ++ runpath_var= ++ hardcode_libdir_flag_spec= ++ export_dynamic_flag_spec= ++ whole_archive_flag_spec= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ hardcode_minus_L=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ hardcode_direct=unsupported ++ fi ++ ;; ++ ++ aix[4-9]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ else ++ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ archive_cmds='' ++ hardcode_direct=yes ++ hardcode_libdir_separator=':' ++ link_all_deplibs=yes ++ ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[012]|aix4.[012].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ hardcode_direct=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L=yes ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_libdir_separator= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ always_export_symbols=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ allow_undefined_flag='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 "$lt_aix_libpath_sed"` ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++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 ++ ++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" ++ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag="-z nodefs" ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 "$lt_aix_libpath_sed"` ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++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 ++ ++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ no_undefined_flag=' ${wl}-bernotok' ++ allow_undefined_flag=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec='$convenience' ++ archive_cmds_need_lc=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ amigaos*) ++ archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ # see comment about different semantics on the GNU ld section ++ ld_shlibs=no ++ ;; ++ ++ bsdi[45]*) ++ export_dynamic_flag_spec=-rdynamic ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # 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' ++ fix_srcfile_path='`cygpath -w "$srcfile"`' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[012]) ++ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ archive_cmds_need_lc=no ++ hardcode_direct=no ++ hardcode_automatic=yes ++ hardcode_shlibpath_var=unsupported ++ whole_archive_flag_spec='' ++ link_all_deplibs=yes ++ if test "$GCC" = yes ; then ++ output_verbose_link_cmd='echo' ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ else ++ 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` $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 $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}' ++ ;; ++ *) ++ ld_shlibs=no ++ ;; ++ esac ++ fi ++ ;; ++ ++ dgux*) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_shlibpath_var=no ++ ;; ++ ++ freebsd1*) ++ ld_shlibs=no ++ ;; ++ ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes ++ hardcode_minus_L=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ hpux9*) ++ if test "$GCC" = yes; then ++ archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ hardcode_direct=yes ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ export_dynamic_flag_spec='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ++ hardcode_direct=yes ++ export_dynamic_flag_spec='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_libdir_flag_spec_ld='+b $libdir' ++ hardcode_direct=no ++ hardcode_shlibpath_var=no ++ ;; ++ *) ++ hardcode_direct=yes ++ export_dynamic_flag_spec='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ ;; ++ esac ++ fi ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec_ld='-rpath $libdir' ++ fi ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ link_all_deplibs=yes ++ ;; ++ ++ 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 ++ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ newsos6) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ hardcode_shlibpath_var=no ++ ;; ++ ++ openbsd*) ++ 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 ++ ld_shlibs=no ++ fi ++ ;; ++ ++ os2*) ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ allow_undefined_flag=unsupported ++ archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ ;; ++ ++ osf3*) ++ if test "$GCC" = yes; then ++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ allow_undefined_flag=' -expect_unresolved \*' ++ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ;; ++ ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ else ++ allow_undefined_flag=' -expect_unresolved \*' ++ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++ ++ # Both c and cxx compiler support -rpath directly ++ hardcode_libdir_flag_spec='-rpath $libdir' ++ fi ++ hardcode_libdir_separator=: ++ ;; ++ ++ solaris*) ++ no_undefined_flag=' -z text' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ else ++ wlarc='' ++ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ fi ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_shlibpath_var=no ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ # 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?) ++ 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 ++ ;; ++ ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_direct=yes ++ hardcode_minus_L=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ sysv4) ++ case $host_vendor in ++ sni) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ reload_cmds='$CC -r -o $output$reload_objs' ++ hardcode_direct=no ++ ;; ++ motorola) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ hardcode_shlibpath_var=no ++ ;; ++ ++ sysv4.3*) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var=no ++ export_dynamic_flag_spec='-Bexport' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ ld_shlibs=yes ++ fi ++ ;; ++ ++ 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 ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ no_undefined_flag='${wl}-z,text' ++ allow_undefined_flag='${wl}-z,nodefs' ++ archive_cmds_need_lc=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ hardcode_libdir_separator=':' ++ link_all_deplibs=yes ++ export_dynamic_flag_spec='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ uts4*) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_shlibpath_var=no ++ ;; ++ ++ *) ++ ld_shlibs=no ++ ;; ++ esac ++ fi ++ ++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++echo "${ECHO_T}$ld_shlibs" >&6; } ++test "$ld_shlibs" = no && can_build_shared=no ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$archive_cmds_need_lc" in ++x|xyes) ++ # Assume -lc should be added ++ archive_cmds_need_lc=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $archive_cmds in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ { 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* ++ echo "$lt_simple_compile_test_code" > 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); } 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$lt_prog_compiler_wl ++ pic_flag=$lt_prog_compiler_pic ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$allow_undefined_flag ++ allow_undefined_flag= ++ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ then ++ archive_cmds_need_lc=no ++ else ++ archive_cmds_need_lc=yes ++ fi ++ allow_undefined_flag=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $rm conftest* ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ++ ;; ++ esac ++ fi ++ ;; ++esac ++ ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++ ++if test "$GCC" = yes; 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. ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ 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 ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix[4-9]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[01] | aix4.[01].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[45]*) ++ version_type=linux ++ 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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $rm \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++ ;; ++ mingw*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ 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 ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ 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 ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ 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 ++ ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[01]* | freebsdelf3.[01]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ ++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++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 ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; ++ ++interix[3-9]*) ++ 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' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # 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>/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 ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++netbsdelf*-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='NetBSD ld.elf_so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++nto-qnx*) ++ 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=yes ++ ;; ++ ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[89] | openbsd2.[89].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; ++ ++rdos*) ++ dynamic_linker=no ++ ;; ++ ++solaris*) ++ 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=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ 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 ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++uts4*) ++ version_type=linux ++ 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 ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } ++test "$dynamic_linker" = no && can_build_shared=no ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++hardcode_action= ++if test -n "$hardcode_libdir_flag_spec" || \ ++ test -n "$runpath_var" || \ ++ test "X$hardcode_automatic" = "Xyes" ; then ++ ++ # We can hardcode non-existant directories. ++ if test "$hardcode_direct" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && ++ test "$hardcode_minus_L" != no; then ++ # Linking always hardcodes the temporary library directory. ++ hardcode_action=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ hardcode_action=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ hardcode_action=unsupported ++fi ++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++echo "${ECHO_T}$hardcode_action" >&6; } ++ ++if test "$hardcode_action" = relink; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++ ++striplib= ++old_striplib= ++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } ++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ 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 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ;; ++ *) ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ ;; ++ esac ++fi ++ ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= ++ ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; ++ ++ mingw* | pw32*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ darwin*) ++ # if libdl is installed we need to link against it ++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_dl_dlopen=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } ++if test $ac_cv_lib_dl_dlopen = yes; then ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++else ++ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ++fi ++ ++ ;; ++ ++ *) ++ { echo "$as_me:$LINENO: checking for shl_load" >&5 ++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } ++if test "${ac_cv_func_shl_load+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define shl_load to an innocuous variant, in case declares shl_load. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define shl_load innocuous_shl_load ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char shl_load (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef shl_load ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char shl_load (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_shl_load || defined __stub___shl_load ++choke me ++#endif ++ ++int ++main () ++{ ++return shl_load (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_shl_load=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } ++if test $ac_cv_func_shl_load = yes; then ++ lt_cv_dlopen="shl_load" ++else ++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 ++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char shl_load (); ++int ++main () ++{ ++return shl_load (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_dld_shl_load=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 ++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } ++if test $ac_cv_lib_dld_shl_load = yes; then ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++else ++ { echo "$as_me:$LINENO: checking for dlopen" >&5 ++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } ++if test "${ac_cv_func_dlopen+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define dlopen to an innocuous variant, in case declares dlopen. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define dlopen innocuous_dlopen ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char dlopen (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef dlopen ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_dlopen || defined __stub___dlopen ++choke me ++#endif ++ ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_dlopen=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } ++if test $ac_cv_func_dlopen = yes; then ++ lt_cv_dlopen="dlopen" ++else ++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_dl_dlopen=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } ++if test $ac_cv_lib_dl_dlopen = yes; then ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++else ++ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 ++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsvld $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_svld_dlopen=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } ++if test $ac_cv_lib_svld_dlopen = yes; then ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" ++else ++ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dld_link (); ++int ++main () ++{ ++return dld_link (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_dld_dld_link=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } ++if test $ac_cv_lib_dld_dld_link = yes; then ++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ;; ++ esac ++ ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi ++ ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" ++ ++ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } ++if test "${lt_cv_dlopen_self+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ lt_cv_dlopen_self=cross ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext < ++#endif ++ ++#include ++ ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif ++ ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++#ifdef __cplusplus ++extern "C" void exit (int); ++#endif ++ ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ exit (status); ++} ++EOF ++ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&5 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; ++ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; ++ esac ++ else : ++ # compilation failed ++ lt_cv_dlopen_self=no ++ fi ++fi ++rm -fr conftest* ++ ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } ++ ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } ++if test "${lt_cv_dlopen_self_static+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ lt_cv_dlopen_self_static=cross ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext < ++#endif ++ ++#include ++ ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif ++ ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++#ifdef __cplusplus ++extern "C" void exit (int); ++#endif ++ ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ exit (status); ++} ++EOF ++ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&5 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; ++ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; ++ esac ++ else : ++ # compilation failed ++ lt_cv_dlopen_self_static=no ++ fi ++fi ++rm -fr conftest* ++ ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } ++ fi ++ ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac ++ ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac ++ ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++ ++ ++# Report which library types will actually be built ++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++echo "${ECHO_T}$can_build_shared" >&6; } ++ ++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } ++test "$can_build_shared" = "no" && enable_shared=no ++ ++# On AIX, shared libraries and static libraries use the same namespace, and ++# are all built from PIC. ++case $host_os in ++aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ ++aix[4-9]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++esac ++{ echo "$as_me:$LINENO: result: $enable_shared" >&5 ++echo "${ECHO_T}$enable_shared" >&6; } ++ ++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } ++# Make sure either enable_shared or enable_static is yes. ++test "$enable_shared" = yes || enable_static=yes ++{ echo "$as_me:$LINENO: result: $enable_static" >&5 ++echo "${ECHO_T}$enable_static" >&6; } ++ ++# The else clause should only fire when bootstrapping the ++# libtool distribution, otherwise you forgot to ship ltmain.sh ++# with your package, and you will get complaints that there are ++# no rules to generate ltmain.sh. ++if test -f "$ltmain"; then ++ # 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 ++ setopt NO_GLOB_SUBST ++ fi ++ # Now quote all the things that may contain metacharacters while being ++ # careful not to overquote the AC_SUBSTed values. We take copies of the ++ # variables and quote the copies for generation of the libtool script. ++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ ++ SED SHELL STRIP \ ++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ ++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ ++ deplibs_check_method reload_flag reload_cmds need_locks \ ++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ ++ lt_cv_sys_global_symbol_to_c_name_address \ ++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ ++ old_postinstall_cmds old_postuninstall_cmds \ ++ compiler \ ++ CC \ ++ LD \ ++ lt_prog_compiler_wl \ ++ lt_prog_compiler_pic \ ++ lt_prog_compiler_static \ ++ lt_prog_compiler_no_builtin_flag \ ++ export_dynamic_flag_spec \ ++ thread_safe_flag_spec \ ++ whole_archive_flag_spec \ ++ enable_shared_with_static_runtimes \ ++ old_archive_cmds \ ++ old_archive_from_new_cmds \ ++ predep_objects \ ++ postdep_objects \ ++ predeps \ ++ postdeps \ ++ compiler_lib_search_path \ ++ compiler_lib_search_dirs \ ++ archive_cmds \ ++ archive_expsym_cmds \ ++ postinstall_cmds \ ++ postuninstall_cmds \ ++ old_archive_from_expsyms_cmds \ ++ allow_undefined_flag \ ++ no_undefined_flag \ ++ export_symbols_cmds \ ++ hardcode_libdir_flag_spec \ ++ hardcode_libdir_flag_spec_ld \ ++ hardcode_libdir_separator \ ++ hardcode_automatic \ ++ module_cmds \ ++ module_expsym_cmds \ ++ lt_cv_prog_compiler_c_o \ ++ fix_srcfile_path \ ++ exclude_expsyms \ ++ include_expsyms; do ++ ++ case $var in ++ old_archive_cmds | \ ++ old_archive_from_new_cmds | \ ++ archive_cmds | \ ++ archive_expsym_cmds | \ ++ module_cmds | \ ++ module_expsym_cmds | \ ++ old_archive_from_expsyms_cmds | \ ++ export_symbols_cmds | \ ++ extract_expsyms_cmds | reload_cmds | finish_cmds | \ ++ postinstall_cmds | postuninstall_cmds | \ ++ old_postinstall_cmds | old_postuninstall_cmds | \ ++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) ++ # Double-quote double-evaled strings. ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ++ ;; ++ *) ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ++ ;; ++ esac ++ done ++ ++ case $lt_echo in ++ *'\$0 --fallback-echo"') ++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` ++ ;; ++ esac ++ ++cfgfile="${ofile}T" ++ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 ++ $rm -f "$cfgfile" ++ { echo "$as_me:$LINENO: creating $ofile" >&5 ++echo "$as_me: creating $ofile" >&6;} ++ ++ cat <<__EOF__ >> "$cfgfile" ++#! $SHELL ++ ++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is part of GNU Libtool: ++# Originally by Gordon Matzigkeit , 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by @@ -1814,1740 +11528,9996 @@ Index: gtk+2.0-2.14.3/aclocal.m4 +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + -+# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -+# ---------------------------------- -+AC_DEFUN([PKG_PROG_PKG_CONFIG], -+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++# A sed program that does not truncate output. ++SED=$lt_SED ++ ++# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++Xsed="$SED -e 1s/^X//" ++ ++# 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 ++ ++# The names of the tagged configurations supported by this script. ++available_tags= ++ ++# ### BEGIN LIBTOOL CONFIG ++ ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++ ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared ++ ++# Whether or not to build static libraries. ++build_old_libs=$enable_static ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc ++ ++# Whether or not to disallow shared libs when runtime libs are static ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes ++ ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install ++ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os ++ ++# An echo program that does not interpret backslashes. ++echo=$lt_echo ++ ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS ++ ++# A C compiler. ++LTCC=$lt_LTCC ++ ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ ++# A language-specific compiler. ++CC=$lt_compiler ++ ++# Is the compiler the GNU C compiler? ++with_gcc=$GCC ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# The linker used to build libraries. ++LD=$lt_LD ++ ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S ++ ++# A BSD-compatible nm program. ++NM=$lt_NM ++ ++# A symbol stripping program ++STRIP=$lt_STRIP ++ ++# Used to examine libraries when file_magic_cmd begins "file" ++MAGIC_CMD=$MAGIC_CMD ++ ++# Used on cygwin: DLL creation program. ++DLLTOOL="$DLLTOOL" ++ ++# Used on cygwin: object dumper. ++OBJDUMP="$OBJDUMP" ++ ++# Used on cygwin: assembler. ++AS="$AS" ++ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++ ++# Object file suffix (normally "o"). ++objext="$ac_objext" ++ ++# Old archive suffix (normally "a"). ++libext="$libext" ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds='$shrext_cmds' ++ ++# Executable file suffix (normally ""). ++exeext="$exeext" ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic ++pic_mode=$pic_mode ++ ++# What is the maximum length of a command? ++max_cmd_len=$lt_cv_sys_max_cmd_len ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o ++ ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Do we need the lib prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec ++ ++# Compiler flag to generate thread-safe objects. ++thread_safe_flag_spec=$lt_thread_safe_flag_spec ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME. ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Commands used to build and install an old-style archive. ++RANLIB=$lt_RANLIB ++old_archive_cmds=$lt_old_archive_cmds ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds ++ ++# Commands used to build and install a shared archive. ++archive_cmds=$lt_archive_cmds ++archive_expsym_cmds=$lt_archive_expsym_cmds ++postinstall_cmds=$lt_postinstall_cmds ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to build a loadable module (assumed same as above if empty) ++module_cmds=$lt_module_cmds ++module_expsym_cmds=$lt_module_expsym_cmds ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predep_objects=$lt_predep_objects ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdep_objects=$lt_postdep_objects ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predeps=$lt_predeps ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdeps=$lt_postdeps ++ ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == file_magic. ++file_magic_cmd=$lt_file_magic_cmd ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag ++ ++# Flag that forces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# Same as above, but a single script fragment to be evaled but not shown. ++finish_eval=$lt_finish_eval ++ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ ++# Transform the output of nm in a proper C declaration ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ ++# Transform the output of nm in a C name address pair ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ ++# This is the shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# This is the shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec ++ ++# If ld is used when linking, flag to hardcode \$libdir into ++# a binary during linking. This must work even if \$libdir does ++# not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld ++ ++# Whether we need a single -rpath flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator ++ ++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++# resulting binary. ++hardcode_direct=$hardcode_direct ++ ++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the ++# resulting binary. ++hardcode_minus_L=$hardcode_minus_L ++ ++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into ++# the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var ++ ++# Set to yes if building a shared library automatically hardcodes DIR into the library ++# and all subsequent libraries and executables linked against it. ++hardcode_automatic=$hardcode_automatic ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at relink time. ++variables_saved_for_relink="$variables_saved_for_relink" ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs ++ ++# Compile-time system search path for libraries ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path ++ ++# Set to yes if exported symbols are required. ++always_export_symbols=$always_export_symbols ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms ++ ++# ### END LIBTOOL CONFIG ++ ++__EOF__ ++ ++ ++ case $host_os in ++ aix3*) ++ cat <<\EOF >> "$cfgfile" ++ ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES +fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=m4_default([$1], [0.9.0]) -+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ PKG_CONFIG="" -+ fi -+ -+fi[]dnl -+])# PKG_PROG_PKG_CONFIG ++EOF ++ ;; ++ esac + -+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# -+# Check to see whether a particular set of modules exists. Similar -+# to PKG_CHECK_MODULES(), but does not set variables or print errors. -+# -+# -+# Similar to PKG_CHECK_MODULES, make sure that the first instance of -+# this or PKG_CHECK_MODULES is called, or make sure to call -+# PKG_CHECK_EXISTS manually -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_EXISTS], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+if test -n "$PKG_CONFIG" && \ -+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -+ m4_ifval([$2], [$2], [:]) -+m4_ifvaln([$3], [else -+ $3])dnl -+fi]) ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || \ ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++ ++else ++ # If there is no Makefile yet, we rely on a make rule to execute ++ # `config.status --recheck' to rerun these tests and create the ++ # libtool script then. ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi ++fi + + -+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -+# --------------------------------------------- -+m4_define([_PKG_CONFIG], -+[if test -n "$PKG_CONFIG"; then -+ if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++CC="$lt_save_CC" ++ ++ ++# Check whether --with-tags was given. ++if test "${with_tags+set}" = set; then ++ withval=$with_tags; tagnames="$withval" ++fi ++ ++ ++if test -f "$ltmain" && test -n "$tagnames"; then ++ if test ! -f "${ofile}"; then ++ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 ++echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} ++ fi ++ ++ if test -z "$LTCC"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" ++ if test -z "$LTCC"; then ++ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 ++echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} + else -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -+ [pkg_failed=yes]) ++ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 ++echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} + fi -+else -+ pkg_failed=untried -+fi[]dnl -+])# _PKG_CONFIG -+ -+# _PKG_SHORT_ERRORS_SUPPORTED -+# ----------------------------- -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])# _PKG_SHORT_ERRORS_SUPPORTED -+ -+ -+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+# [ACTION-IF-NOT-FOUND]) -+# -+# -+# Note that if there is a possibility the first call to -+# PKG_CHECK_MODULES might not happen, you should be sure to include an -+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -+# -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_MODULES], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -+ -+pkg_failed=no -+AC_MSG_CHECKING([for $1]) -+ -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) - --# old names --AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) --AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) --AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) --AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) --AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) --AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) --AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -+if test $pkg_failed = yes; then -+ _PKG_SHORT_ERRORS_SUPPORTED -+ if test $_pkg_short_errors_supported = yes; then -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` -+ else -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - --# This is just to silence aclocal about the macro not being used --ifelse([AC_DISABLE_FAST_INSTALL]) -+ ifelse([$4], , [AC_MSG_ERROR(dnl -+[Package requirements ($2) were not met: - --AC_DEFUN([LT_AC_PROG_GCJ], --[AC_CHECK_TOOL(GCJ, gcj, no) -- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -- AC_SUBST(GCJFLAGS) --]) -+$$1_PKG_ERRORS - --AC_DEFUN([LT_AC_PROG_RC], --[AC_CHECK_TOOL(RC, windres, no) --]) -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -+_PKG_TEXT -+])], -+ [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 -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - --# Cheap backport of AS_EXECUTABLE_P and required macros --# from Autoconf 2.59; we should not use $as_executable_p directly. -+_PKG_TEXT - --# _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' -+To get pkg-config, see .])], -+ [$4]) - else -- as_executable_p='test -f' --fi --])])# _AS_TEST_PREPARE -+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -+ AC_MSG_RESULT([yes]) -+ ifelse([$3], , :, [$3]) -+fi[]dnl -+])# PKG_CHECK_MODULES - --# 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 -+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# 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 # --# macro and use it instead. # --# LT_AC_PROG_SED --# -------------- --# Check for a fully-functional sed program, that truncates --# as few characters as possible. Prefer GNU sed if found. --AC_DEFUN([LT_AC_PROG_SED], --[AC_MSG_CHECKING([for a sed that does not truncate output]) --AC_CACHE_VAL(lt_cv_path_SED, --[# Loop through the user's path and test for sed and gsed. --# Then use that list of sed's as ones to test for truncation. --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- 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 -- 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 --# along with /bin/sed that truncates output. --for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -- test ! -f $lt_ac_sed && continue -- cat /dev/null > conftest.in -- lt_ac_count=0 -- echo $ECHO_N "0123456789$ECHO_C" >conftest.in -- # Check for GNU sed and select it if it is found. -- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -- lt_cv_path_SED=$lt_ac_sed -- break -- fi -- while true; do -- cat conftest.in conftest.in >conftest.tmp -- mv conftest.tmp conftest.in -- cp conftest.in conftest.nl -- echo >>conftest.nl -- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -- cmp -s conftest.out conftest.nl || break -- # 10000 chars as input seems more than enough -- test $lt_ac_count -gt 10 && break -- lt_ac_count=`expr $lt_ac_count + 1` -- if test $lt_ac_count -gt $lt_ac_max; then -- lt_ac_max=$lt_ac_count -- lt_cv_path_SED=$lt_ac_sed -- fi -- done --done --]) --SED=$lt_cv_path_SED --AC_SUBST([SED]) --AC_MSG_RESULT([$SED]) -+# AM_AUTOMAKE_VERSION(VERSION) -+# ---------------------------- -+# Automake X.Y traces this macro to ensure aclocal.m4 has been -+# generated from the m4 files accompanying Automake X.Y. -+# (This private macro should not be called outside this file.) -+AC_DEFUN([AM_AUTOMAKE_VERSION], -+[am__api_version='1.10' -+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -+dnl require some minimum version. Point them to the right macro. -+m4_if([$1], [1.10.1], [], -+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - --# Figure out how to run the assembler. -*- Autoconf -*- -- --# serial 2 -+# _AM_AUTOCONF_VERSION(VERSION) -+# ----------------------------- -+# aclocal traces this macro to find the Autoconf version. -+# This is a private macro too. Using m4_define simplifies -+# the logic in aclocal, which can simply ignore this definition. -+m4_define([_AM_AUTOCONF_VERSION], []) - --# Copyright 2001 Free Software Foundation, Inc. -+# AM_SET_CURRENT_AUTOMAKE_VERSION -+# ------------------------------- -+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -+[AM_AUTOMAKE_VERSION([1.10.1])dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+# Figure out how to run the assembler. -*- Autoconf -*- - --# This program 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 General Public License for more details. -+# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# serial 5 - - # AM_PROG_AS - # ---------- - AC_DEFUN([AM_PROG_AS], - [# By default we simply use the C compiler to build assembly code. - AC_REQUIRE([AC_PROG_CC]) --: ${CCAS='$(CC)'} --# Set ASFLAGS if not already set. --: ${CCASFLAGS='$(CFLAGS)'} --AC_SUBST(CCAS) --AC_SUBST(CCASFLAGS)]) -+test "${CCAS+set}" = set || CCAS=$CC -+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS -+AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) -+AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) -+_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl -+]) - --# Add --enable-maintainer-mode option to configure. --# From Jim Meyering -+# AM_AUX_DIR_EXPAND -*- Autoconf -*- - --# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -+# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -+# -+# Of course, Automake must honor this variable whenever it calls a -+# tool from the auxiliary directory. The problem is that $srcdir (and -+# therefore $ac_aux_dir as well) can be either absolute or relative, -+# depending on how configure is run. This is pretty annoying, since -+# it makes $ac_aux_dir quite unusable in subdirectories: in the top -+# source directory, any form will work fine, but in subdirectories a -+# relative path needs to be adjusted first. -+# -+# $ac_aux_dir/missing -+# fails when called from a subdirectory if $ac_aux_dir is relative -+# $top_srcdir/$ac_aux_dir/missing -+# fails if $ac_aux_dir is absolute, -+# fails when called from a subdirectory in a VPATH build with -+# a relative $ac_aux_dir -+# -+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -+# are both prefixed by $srcdir. In an in-source build this is usually -+# harmless because $srcdir is `.', but things will broke when you -+# start a VPATH build or use an absolute $srcdir. -+# -+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -+# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -+# and then we would define $MISSING as -+# MISSING="\${SHELL} $am_aux_dir/missing" -+# This will work as long as MISSING is not called from configure, because -+# unfortunately $(top_srcdir) has no meaning in configure. -+# However there are other variables, like CC, which are often used in -+# configure, and could therefore not use this "fixed" $ac_aux_dir. -+# -+# Another solution, used here, is to always expand $ac_aux_dir to an -+# absolute PATH. The drawback is that using absolute paths prevent a -+# configured tree to be moved without reconfiguration. - --# This program 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 General Public License for more details. -+AC_DEFUN([AM_AUX_DIR_EXPAND], -+[dnl Rely on autoconf to set up CDPATH properly. -+AC_PREREQ([2.50])dnl -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+]) - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. - --# serial 2 -+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+# This was merged into AC_PROG_CC in Autoconf. -+ -+AU_DEFUN([AM_PROG_CC_STDC], -+[AC_PROG_CC -+AC_DIAGNOSE([obsolete], [$0: -+ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon -+ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when -+ you adjust the code. You can also remove the above call to -+ AC_PROG_CC if you already called it elsewhere.]) -+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -+]) -+AU_DEFUN([fp_PROG_CC_STDC]) -+ -+# AM_CONDITIONAL -*- Autoconf -*- -+ -+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 8 -+ -+# AM_CONDITIONAL(NAME, SHELL-CONDITION) -+# ------------------------------------- -+# Define a conditional. -+AC_DEFUN([AM_CONDITIONAL], -+[AC_PREREQ(2.52)dnl -+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+AC_SUBST([$1_TRUE])dnl -+AC_SUBST([$1_FALSE])dnl -+_AM_SUBST_NOTMAKE([$1_TRUE])dnl -+_AM_SUBST_NOTMAKE([$1_FALSE])dnl -+if $2; then -+ $1_TRUE= -+ $1_FALSE='#' -+else -+ $1_TRUE='#' -+ $1_FALSE= -+fi -+AC_CONFIG_COMMANDS_PRE( -+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -+ AC_MSG_ERROR([[conditional "$1" was never defined. -+Usually this means the macro was only invoked conditionally.]]) -+fi])]) -+ -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --AC_DEFUN([AM_MAINTAINER_MODE], --[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -- dnl maintainer-mode is disabled by default -- AC_ARG_ENABLE(maintainer-mode, --[ --enable-maintainer-mode enable make rules and dependencies not useful -- (and sometimes confusing) to the casual installer], -- USE_MAINTAINER_MODE=$enableval, -- USE_MAINTAINER_MODE=no) -- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -- MAINT=$MAINTAINER_MODE_TRUE -- AC_SUBST(MAINT)dnl --] --) -+# serial 9 - --AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -+# written in clear, in which case automake, when reading aclocal.m4, -+# will think it sees a *use*, and therefore will trigger all it's -+# C support machinery. Also note that it means that autoscan, seeing -+# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - --# Copyright 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. -+# _AM_DEPENDENCIES(NAME) -+# ---------------------- -+# See how the compiler implements dependency checking. -+# NAME is "CC", "CXX", "GCJ", or "OBJC". -+# We try a few techniques and use that to set a single cache variable. -+# -+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -+# dependency, and given that the user is not expected to run this macro, -+# just rely on AC_PROG_CC. -+AC_DEFUN([_AM_DEPENDENCIES], -+[AC_REQUIRE([AM_SET_DEPDIR])dnl -+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -+AC_REQUIRE([AM_MAKE_INCLUDE])dnl -+AC_REQUIRE([AM_DEP_TRACK])dnl - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -+ [$1], CXX, [depcc="$CXX" am_compiler_list=], -+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -+ [$1], UPC, [depcc="$UPC" am_compiler_list=], -+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -+ [depcc="$$1" am_compiler_list=]) - --# This program 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 General Public License for more details. -+AC_CACHE_CHECK([dependency style of $depcc], -+ [am_cv_$1_dependencies_compiler_type], -+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+ am_cv_$1_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - --# serial 2 -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; ++ if test -z "$LTCFLAGS"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++ fi ++ ++ # Extract list of available tagged configurations in $ofile. ++ # Note that this assumes the entire list is on one line. ++ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` ++ ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for tagname in $tagnames; do ++ IFS="$lt_save_ifs" ++ # Check whether tagname contains only valid characters ++ case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in ++ "") ;; ++ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 ++echo "$as_me: error: invalid tag name: $tagname" >&2;} ++ { (exit 1); exit 1; }; } ++ ;; + esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_$1_dependencies_compiler_type=$depmode -+ break -+ fi ++ ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null ++ then ++ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 ++echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} ++ { (exit 1); exit 1; }; } + fi -+ done - --# @defmac AC_PROG_CC_STDC --# @maindex PROG_CC_STDC --# @ovindex CC --# If the C compiler in not in ANSI C mode by default, try to add an option --# to output variable @code{CC} to make it so. This macro tries various --# options that select ANSI C on some system or another. It considers the --# compiler to be in ANSI C mode if it handles function prototypes correctly. --# --# If you use this macro, you should check after calling it whether the C --# compiler has been set to accept ANSI C; if not, the shell variable --# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source --# code in ANSI C, you can make an un-ANSIfied copy of it by using the --# program @code{ansi2knr}, which comes with Ghostscript. --# @end defmac -- --AC_DEFUN([AM_PROG_CC_STDC], --[AC_REQUIRE([AC_PROG_CC]) --AC_BEFORE([$0], [AC_C_INLINE]) --AC_BEFORE([$0], [AC_C_CONST]) --dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require --dnl a magic option to avoid problems with ANSI preprocessor commands --dnl like #elif. --dnl FIXME: can't do this because then AC_AIX won't work due to a --dnl circular dependency. --dnl AC_BEFORE([$0], [AC_PROG_CPP]) --AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) --AC_CACHE_VAL(am_cv_prog_cc_stdc, --[am_cv_prog_cc_stdc=no --ac_save_CC="$CC" --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" --do -- CC="$ac_save_CC $ac_arg" -- AC_TRY_COMPILE( --[#include --#include --#include --#include --/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ --struct buf { int x; }; --FILE * (*rcsopen) (struct buf *, struct stat *, int); --static char *e (p, i) -- char **p; -- int i; --{ -- return p[i]; --} --static char *f (char * (*g) (char **, int), char **p, ...) --{ -- char *s; -- va_list v; -- va_start (v,p); -- s = g (p, va_arg (v,int)); -- va_end (v); -- return s; --} --int test (int i, double x); --struct s1 {int (*f) (int a);}; --struct s2 {int (*f) (double a);}; --int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); --int argc; --char **argv; --], [ --return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; --], --[am_cv_prog_cc_stdc="$ac_arg"; break]) --done --CC="$ac_save_CC" --]) --if test -z "$am_cv_prog_cc_stdc"; then -- AC_MSG_RESULT([none needed]) -+ cd .. -+ rm -rf conftest.dir - else -- AC_MSG_RESULT([$am_cv_prog_cc_stdc]) -+ am_cv_$1_dependencies_compiler_type=none - fi --case "x$am_cv_prog_cc_stdc" in -- x|xno) ;; -- *) CC="$CC $am_cv_prog_cc_stdc" ;; --esac -+]) -+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -+AM_CONDITIONAL([am__fastdep$1], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) - ]) - --AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC]) - --# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- --# --# Copyright © 2004 Scott James Remnant . --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program 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 --# General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -+# AM_SET_DEPDIR -+# ------------- -+# Choose a directory name for dependency files. -+# This macro is AC_REQUIREd in _AM_DEPENDENCIES -+AC_DEFUN([AM_SET_DEPDIR], -+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -+]) - --# PKG_PROG_PKG_CONFIG([MIN-VERSION]) --# ---------------------------------- --AC_DEFUN([PKG_PROG_PKG_CONFIG], --[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) --m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) --AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl --if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + -+# AM_DEP_TRACK -+# ------------ -+AC_DEFUN([AM_DEP_TRACK], -+[AC_ARG_ENABLE(dependency-tracking, -+[ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors]) -+if test "x$enable_dependency_tracking" != xno; then -+ am_depcomp="$ac_aux_dir/depcomp" -+ AMDEPBACKSLASH='\' - fi --if test -n "$PKG_CONFIG"; then -- _pkg_min_version=m4_default([$1], [0.9.0]) -- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- PKG_CONFIG="" -- fi -- --fi[]dnl --])# PKG_PROG_PKG_CONFIG -+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -+AC_SUBST([AMDEPBACKSLASH])dnl -+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -+]) - --# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) --# --# Check to see whether a particular set of modules exists. Similar --# to PKG_CHECK_MODULES(), but does not set variables or print errors. --# --# --# Similar to PKG_CHECK_MODULES, make sure that the first instance of --# this or PKG_CHECK_MODULES is called, or make sure to call --# PKG_CHECK_EXISTS manually --# -------------------------------------------------------------- --AC_DEFUN([PKG_CHECK_EXISTS], --[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl --if test -n "$PKG_CONFIG" && \ -- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -- m4_ifval([$2], [$2], [:]) --m4_ifvaln([$3], [else -- $3])dnl --fi]) -+# Generate code to set up dependency tracking. -*- Autoconf -*- - -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) --# --------------------------------------------- --m4_define([_PKG_CONFIG], --[if test -n "$$1"; then -- pkg_cv_[]$1="$$1" -- elif test -n "$PKG_CONFIG"; then -- PKG_CHECK_EXISTS([$3], -- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -- [pkg_failed=yes]) -- else -- pkg_failed=untried --fi[]dnl --])# _PKG_CONFIG -+#serial 3 - --# _PKG_SHORT_ERRORS_SUPPORTED --# ----------------------------- --AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], --[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi[]dnl --])# _PKG_SHORT_ERRORS_SUPPORTED -+# _AM_OUTPUT_DEPENDENCY_COMMANDS -+# ------------------------------ -+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -+[for mf in $CONFIG_FILES; do -+ # Strip MF so we end up with the name of the file. -+ mf=`echo "$mf" | sed -e 's/:.*$//'` -+ # Check whether this is an Automake generated Makefile or not. -+ # We used to match only the files named `Makefile.in', but -+ # some people rename them; so instead we look at the file content. -+ # Grep'ing the first line is not enough: some people post-process -+ # each Makefile.in and add a new line on top of each file to say so. -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then -+ dirpart=`AS_DIRNAME("$mf")` -+ else -+ continue -+ fi -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -+ # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n 's/^U = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`AS_DIRNAME(["$file"])` -+ AS_MKDIR_P([$dirpart/$fdir]) -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" -+ done -+done -+])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - --# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], --# [ACTION-IF-NOT-FOUND]) --# --# --# Note that if there is a possibility the first call to --# PKG_CHECK_MODULES might not happen, you should be sure to include an --# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac --# -+# AM_OUTPUT_DEPENDENCY_COMMANDS -+# ----------------------------- -+# This macro should only be invoked once -- use via AC_REQUIRE. - # --# -------------------------------------------------------------- --AC_DEFUN([PKG_CHECK_MODULES], --[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl --AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl --AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -- --pkg_failed=no --AC_MSG_CHECKING([for $1]) -- --_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) --_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+# This code is only required when automatic dependency tracking -+# is enabled. FIXME. This creates each `.P' file that we will -+# need in order to bootstrap the dependency handling code. -+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -+[AC_CONFIG_COMMANDS([depfiles], -+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -+]) - --m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS --and $1[]_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details.]) -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --if test $pkg_failed = yes; then -- _PKG_SHORT_ERRORS_SUPPORTED -- if test $_pkg_short_errors_supported = yes; then -- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` -- else -- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -+# serial 8 - -- ifelse([$4], , [AC_MSG_ERROR(dnl --[Package requirements ($2) were not met: -+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - --$$1_PKG_ERRORS -+# Do all the work for Automake. -*- Autoconf -*- - --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -+# 2005, 2006, 2008 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --_PKG_TEXT --])], -- [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 --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -+# serial 13 - --_PKG_TEXT -+# This macro actually does too much. Some checks are only needed if -+# your package does certain things. But this isn't really a big deal. - --To get pkg-config, see .])], -- [$4]) --else -- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -- AC_MSG_RESULT([yes]) -- ifelse([$3], , :, [$3]) --fi[]dnl --])# PKG_CHECK_MODULES -+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -+# AM_INIT_AUTOMAKE([OPTIONS]) -+# ----------------------------------------------- -+# The call with PACKAGE and VERSION arguments is the old style -+# call (pre autoconf-2.50), which is being phased out. PACKAGE -+# and VERSION should now be passed to AC_INIT and removed from -+# the call to AM_INIT_AUTOMAKE. -+# We support both call styles for the transition. After -+# the next Automake release, Autoconf can make the AC_INIT -+# arguments mandatory, and then we can depend on a new Autoconf -+# release and drop the old call support. -+AC_DEFUN([AM_INIT_AUTOMAKE], -+[AC_PREREQ([2.60])dnl -+dnl Autoconf wants to disallow AM_ names. We explicitly allow -+dnl the ones we care about. -+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -+AC_REQUIRE([AC_PROG_INSTALL])dnl -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -+ # test to see if srcdir already configured -+ if test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+ fi -+fi - --# Copyright (C) 1995-2002 Free Software Foundation, Inc. --# Copyright (C) 2001-2003,2004 Red Hat, Inc. --# --# This file is free software, distributed under the terms of the GNU --# General Public License. As a special exception to the GNU General --# Public License, this file may be distributed as part of a program --# that contains a configuration script generated by Autoconf, under --# the same distribution terms as the rest of that program. --# --# This file can be copied and used freely without restrictions. It can --# be used in projects which are not available under the GNU Public License --# but which still want to provide support for the GNU gettext functionality. --# --# Macro to add for using GNU gettext. --# Ulrich Drepper , 1995, 1996 --# --# Modified to never use included libintl. --# Owen Taylor , 12/15/1998 --# --# Major rework to remove unused code --# Owen Taylor , 12/11/2002 --# --# Added better handling of ALL_LINGUAS from GNU gettext version --# written by Bruno Haible, Owen Taylor 5/30/3002 --# --# Modified to require ngettext --# Matthias Clasen 08/06/2004 --# --# We need this here as well, since someone might use autoconf-2.5x --# to configure GLib then an older version to configure a package --# using AM_GLIB_GNU_GETTEXT --AC_PREREQ(2.53) -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi -+fi -+AC_SUBST([CYGPATH_W]) - --dnl --dnl We go to great lengths to make sure that aclocal won't --dnl try to pull in the installed version of these macros --dnl when running aclocal in the glib directory. --dnl --m4_copy([AC_DEFUN],[glib_DEFUN]) --m4_copy([AC_REQUIRE],[glib_REQUIRE]) --dnl --dnl At the end, if we're not within glib, we'll define the public --dnl definitions in terms of our private definitions. --dnl -+# Define the identity of the package. -+dnl Distinguish between old-style and new-style calls. -+m4_ifval([$2], -+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -+ AC_SUBST([PACKAGE], [$1])dnl -+ AC_SUBST([VERSION], [$2])], -+[_AM_SET_OPTIONS([$1])dnl -+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl -+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - --# GLIB_LC_MESSAGES --#-------------------- --glib_DEFUN([GLIB_LC_MESSAGES], -- [AC_CHECK_HEADERS([locale.h]) -- if test $ac_cv_header_locale_h = yes; then -- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -- [AC_TRY_LINK([#include ], [return LC_MESSAGES], -- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -- if test $am_cv_val_LC_MESSAGES = yes; then -- AC_DEFINE(HAVE_LC_MESSAGES, 1, -- [Define if your file defines LC_MESSAGES.]) -- fi -- fi]) -+_AM_IF_OPTION([no-define],, -+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - --# GLIB_PATH_PROG_WITH_TEST --#---------------------------- --dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, --dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) --glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], --[# Extract the first word of "$2", so it can be a program name with args. --set dummy $2; ac_word=[$]2 --AC_MSG_CHECKING([for $ac_word]) --AC_CACHE_VAL(ac_cv_path_$1, --[case "[$]$1" in -- /*) -- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in ifelse([$5], , $PATH, [$5]); do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if [$3]; then -- ac_cv_path_$1="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" --dnl If no 4th arg is given, leave the cache variable unset, --dnl so AC_PATH_PROGS will keep looking. --ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" --])dnl -- ;; --esac])dnl --$1="$ac_cv_path_$1" --if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then -- AC_MSG_RESULT([$]$1) --else -- AC_MSG_RESULT(no) --fi --AC_SUBST($1)dnl -+# Some tools Automake needs. -+AC_REQUIRE([AM_SANITY_CHECK])dnl -+AC_REQUIRE([AC_ARG_PROGRAM])dnl -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -+AM_MISSING_PROG(AUTOCONF, autoconf) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -+AM_MISSING_PROG(AUTOHEADER, autoheader) -+AM_MISSING_PROG(MAKEINFO, makeinfo) -+AM_PROG_INSTALL_SH -+AM_PROG_INSTALL_STRIP -+AC_REQUIRE([AM_PROG_MKDIR_P])dnl -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+AC_REQUIRE([AC_PROG_AWK])dnl -+AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], -+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], -+ [_AM_PROG_TAR([v7])])]) -+_AM_IF_OPTION([no-dependencies],, -+[AC_PROVIDE_IFELSE([AC_PROG_CC], -+ [_AM_DEPENDENCIES(CC)], -+ [define([AC_PROG_CC], -+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [_AM_DEPENDENCIES(CXX)], -+ [define([AC_PROG_CXX], -+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_OBJC], -+ [_AM_DEPENDENCIES(OBJC)], -+ [define([AC_PROG_OBJC], -+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -+]) - ]) - --# GLIB_WITH_NLS --#----------------- --glib_DEFUN([GLIB_WITH_NLS], -- dnl NLS is obligatory -- [USE_NLS=yes -- AC_SUBST(USE_NLS) - -- gt_cv_have_gettext=no -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. The stamp files are numbered to have different names. ++ # Update the list of available tags. ++ if test -n "$tagname"; then ++ echo appending configuration tag \"$tagname\" to $ofile + -+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -+# loop where config.status creates the headers, so we can generate -+# our stamp files there. -+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -+[# Compute $1's index in $config_headers. -+_am_arg=$1 -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $_am_arg | $_am_arg:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ case $tagname in ++ CXX) ++ if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++ ++ ++ ++archive_cmds_need_lc_CXX=no ++allow_undefined_flag_CXX= ++always_export_symbols_CXX=no ++archive_expsym_cmds_CXX= ++export_dynamic_flag_spec_CXX= ++hardcode_direct_CXX=no ++hardcode_libdir_flag_spec_CXX= ++hardcode_libdir_flag_spec_ld_CXX= ++hardcode_libdir_separator_CXX= ++hardcode_minus_L_CXX=no ++hardcode_shlibpath_var_CXX=unsupported ++hardcode_automatic_CXX=no ++module_cmds_CXX= ++module_expsym_cmds_CXX= ++link_all_deplibs_CXX=unknown ++old_archive_cmds_CXX=$old_archive_cmds ++no_undefined_flag_CXX= ++whole_archive_flag_spec_CXX= ++enable_shared_with_static_runtimes_CXX=no ++ ++# Dependencies to place before and after the object being linked: ++predep_objects_CXX= ++postdep_objects_CXX= ++predeps_CXX= ++postdeps_CXX= ++compiler_lib_search_path_CXX= ++compiler_lib_search_dirs_CXX= ++ ++# Source file extension for C++ test sources. ++ac_ext=cpp ++ ++# Object file extension for compiled C++ test sources. ++objext=o ++objext_CXX=$objext ++ ++# Code to be used in simple compile tests ++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); }' ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++# save warnings/boilerplate of simple test code ++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* ++ ++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 -r conftest* ++ ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC=$CC ++lt_save_LD=$LD ++lt_save_GCC=$GCC ++GCC=$GXX ++lt_save_with_gnu_ld=$with_gnu_ld ++lt_save_path_LD=$lt_cv_path_LD ++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++else ++ $as_unset lt_cv_prog_gnu_ld ++fi ++if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++else ++ $as_unset lt_cv_path_LD ++fi ++test -z "${LDCXX+set}" || LD=$LDCXX ++CC=${CXX-"c++"} ++compiler=$CC ++compiler_CXX=$CC ++for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; + esac +done -+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -- CATOBJEXT=NONE -- XGETTEXT=: -- INTLLIBS= -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -- AC_CHECK_HEADER(libintl.h, -- [gt_cv_func_dgettext_libintl="no" -- libintl_extra_libs="" -+# AM_PROG_INSTALL_SH -+# ------------------ -+# Define $install_sh. -+AC_DEFUN([AM_PROG_INSTALL_SH], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -+AC_SUBST(install_sh)]) - -- # -- # First check in libc -- # -- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, -- [AC_TRY_LINK([ --#include --], -- [return !ngettext ("","", 1)], -- gt_cv_func_ngettext_libc=yes, -- gt_cv_func_ngettext_libc=no) -- ]) -- -- if test "$gt_cv_func_ngettext_libc" = "yes" ; then -- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, -- [AC_TRY_LINK([ --#include --], -- [return !dgettext ("","")], -- gt_cv_func_dgettext_libc=yes, -- gt_cv_func_dgettext_libc=no) -- ]) -- fi -- -- if test "$gt_cv_func_ngettext_libc" = "yes" ; then -- AC_CHECK_FUNCS(bind_textdomain_codeset) -- fi -+# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -- # -- # If we don't have everything we want, check in libintl -- # -- if test "$gt_cv_func_dgettext_libc" != "yes" \ -- || test "$gt_cv_func_ngettext_libc" != "yes" \ -- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -- -- AC_CHECK_LIB(intl, bindtextdomain, -- [AC_CHECK_LIB(intl, ngettext, -- [AC_CHECK_LIB(intl, dgettext, -- gt_cv_func_dgettext_libintl=yes)])]) -+# serial 2 - -- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -- AC_MSG_CHECKING([if -liconv is needed to use gettext]) -- AC_MSG_RESULT([]) -- AC_CHECK_LIB(intl, ngettext, -- [AC_CHECK_LIB(intl, dcgettext, -- [gt_cv_func_dgettext_libintl=yes -- libintl_extra_libs=-liconv], -- :,-liconv)], -- :,-liconv) -- fi -+# Check whether the underlying file-system supports filenames -+# with a leading dot. For instance MS-DOS doesn't. -+AC_DEFUN([AM_SET_LEADING_DOT], -+[rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ ++# We don't want -fno-exception wen compiling C++ code, so set the ++# no_builtin_flag separately ++if test "$GXX" = yes; then ++ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' +else -+ am__leading_dot=_ ++ lt_prog_compiler_no_builtin_flag_CXX= +fi -+rmdir .tst 2>/dev/null -+AC_SUBST([am__leading_dot])]) - -- # -- # If we found libintl, then check in it for bind_textdomain_codeset(); -- # we'll prefer libc if neither have bind_textdomain_codeset(), -- # and both have dgettext and ngettext -- # -- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -- glib_save_LIBS="$LIBS" -- LIBS="$LIBS -lintl $libintl_extra_libs" -- unset ac_cv_func_bind_textdomain_codeset -- AC_CHECK_FUNCS(bind_textdomain_codeset) -- LIBS="$glib_save_LIBS" -+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -+# From Jim Meyering - -- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -- gt_cv_func_dgettext_libc=no -- else -- if test "$gt_cv_func_dgettext_libc" = "yes" \ -- && test "$gt_cv_func_ngettext_libc" = "yes"; then -- gt_cv_func_dgettext_libintl=no -- fi -- fi -- fi -- fi -+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -- if test "$gt_cv_func_dgettext_libc" = "yes" \ -- || test "$gt_cv_func_dgettext_libintl" = "yes"; then -- gt_cv_have_gettext=yes -- fi -- -- if test "$gt_cv_func_dgettext_libintl" = "yes"; then -- INTLLIBS="-lintl $libintl_extra_libs" -- fi -- -- if test "$gt_cv_have_gettext" = "yes"; then -- AC_DEFINE(HAVE_GETTEXT,1, -- [Define if the GNU gettext() function is already present or preinstalled.]) -- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl -- if test "$MSGFMT" != "no"; then -- glib_save_LIBS="$LIBS" -- LIBS="$LIBS $INTLLIBS" -- AC_CHECK_FUNCS(dcgettext) -- MSGFMT_OPTS= -- AC_MSG_CHECKING([if msgfmt accepts -c]) -- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ --msgid "" --msgstr "" --"Content-Type: text/plain; charset=UTF-8\n" --"Project-Id-Version: test 1.0\n" --"PO-Revision-Date: 2007-02-15 12:01+0100\n" --"Last-Translator: test \n" --"Language-Team: C \n" --"MIME-Version: 1.0\n" --"Content-Transfer-Encoding: 8bit\n" --], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) -- AC_SUBST(MSGFMT_OPTS) -- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; -- return _nl_msg_cat_cntr], -- [CATOBJEXT=.gmo -- DATADIRNAME=share], -- [case $host in -- *-*-solaris*) -- dnl On Solaris, if bind_textdomain_codeset is in libc, -- dnl GNU format message catalog is always supported, -- dnl since both are added to the libc all together. -- dnl Hence, we'd like to go with DATADIRNAME=share and -- dnl and CATOBJEXT=.gmo in this case. -- AC_CHECK_FUNC(bind_textdomain_codeset, -- [CATOBJEXT=.gmo -- DATADIRNAME=share], -- [CATOBJEXT=.mo -- DATADIRNAME=lib]) -- ;; -- *) -- CATOBJEXT=.mo -- DATADIRNAME=lib -- ;; -- esac]) -- LIBS="$glib_save_LIBS" -- INSTOBJEXT=.mo -- else -- gt_cv_have_gettext=no -- fi -- fi -- ]) -+# serial 4 - -- if test "$gt_cv_have_gettext" = "yes" ; then -- AC_DEFINE(ENABLE_NLS, 1, -- [always defined to indicate that i18n is enabled]) -- fi -+AC_DEFUN([AM_MAINTAINER_MODE], -+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -+ dnl maintainer-mode is disabled by default -+ AC_ARG_ENABLE(maintainer-mode, -+[ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer], -+ USE_MAINTAINER_MODE=$enableval, -+ USE_MAINTAINER_MODE=no) -+ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -+ MAINT=$MAINTAINER_MODE_TRUE -+ AC_SUBST(MAINT)dnl -+] -+) - -- dnl Test whether we really found GNU xgettext. -- if test "$XGETTEXT" != ":"; then -- dnl If it is not GNU xgettext we define it as : so that the -- dnl Makefiles still can work. -- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -- : ; -- else -- AC_MSG_RESULT( -- [found xgettext program is not GNU xgettext; ignore it]) -- XGETTEXT=":" -- fi -- fi -+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -- # We need to process the po/ directory. -- POSUB=po -+# Check to see how 'make' treats includes. -*- Autoconf -*- - -- AC_OUTPUT_COMMANDS( -- [case "$CONFIG_FILES" in *po/Makefile.in*) -- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -- esac]) -+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -- dnl These rules are solely for the distribution goal. While doing this -- dnl we only have to keep exactly one list of the available catalogs -- dnl in configure.in. -- for lang in $ALL_LINGUAS; do -- GMOFILES="$GMOFILES $lang.gmo" -- POFILES="$POFILES $lang.po" -- done -+# serial 3 - -- dnl Make all variables we use known to autoconf. -- AC_SUBST(CATALOGS) -- AC_SUBST(CATOBJEXT) -- AC_SUBST(DATADIRNAME) -- AC_SUBST(GMOFILES) -- AC_SUBST(INSTOBJEXT) -- AC_SUBST(INTLLIBS) -- AC_SUBST(PO_IN_DATADIR_TRUE) -- AC_SUBST(PO_IN_DATADIR_FALSE) -- AC_SUBST(POFILES) -- AC_SUBST(POSUB) -- ]) -+# AM_MAKE_INCLUDE() -+# ----------------- -+# Check to see how make treats includes. -+AC_DEFUN([AM_MAKE_INCLUDE], -+[am_make=${MAKE-make} -+cat > confinc << 'END' -+am__doit: -+ @echo done -+.PHONY: am__doit -+END -+# If we don't find an include directive, just comment out the code. -+AC_MSG_CHECKING([for style of include used by $am_make]) -+am__include="#" -+am__quote= -+_am_result=none -+# First try GNU make style include. -+echo "include confinc" > confmf -+# We grep out `Entering directory' and `Leaving directory' -+# messages which can occur if `w' ends up in MAKEFLAGS. -+# In particular we don't look at `^make:' because GNU make might -+# be invoked under some other name (usually "gmake"), in which -+# case it prints its new name instead of `make'. -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -+ am__include=include -+ am__quote= -+ _am_result=GNU ++ ++if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration ++ ++ ++# Check whether --with-gnu-ld was given. ++if test "${with_gnu_ld+set}" = set; then ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes ++else ++ with_gnu_ld=no +fi -+# Now try BSD make style include. -+if test "$am__include" = "#"; then -+ echo '.include "confinc"' > confmf -+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -+ am__include=.include -+ am__quote="\"" -+ _am_result=BSD -+ fi ++ ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [\\/]* | ?:[\\/]*) ++ re_direlt='/[^/][^/]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` ++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ { echo "$as_me:$LINENO: checking for GNU ld" >&5 ++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } ++else ++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } +fi -+AC_SUBST([am__include]) -+AC_SUBST([am__quote]) -+AC_MSG_RESULT([$_am_result]) -+rm -f confinc confmf -+]) - --# AM_GLIB_GNU_GETTEXT --# ------------------- --# Do checks necessary for use of gettext. If a suitable implementation --# of gettext is found in either in libintl or in the C library, --# it will set INTLLIBS to the libraries needed for use of gettext --# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable --# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() --# on various variables needed by the Makefile.in.in installed by --# glib-gettextize. --dnl --glib_DEFUN([GLIB_GNU_GETTEXT], -- [AC_REQUIRE([AC_PROG_CC])dnl -- AC_REQUIRE([AC_HEADER_STDC])dnl -- -- GLIB_LC_MESSAGES -- GLIB_WITH_NLS -+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -- if test "$gt_cv_have_gettext" = "yes"; then -- if test "x$ALL_LINGUAS" = "x"; then -- LINGUAS= -- else -- AC_MSG_CHECKING(for catalogs to be installed) -- NEW_LINGUAS= -- for presentlang in $ALL_LINGUAS; do -- useit=no -- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -- desiredlanguages="$LINGUAS" -- else -- desiredlanguages="$ALL_LINGUAS" -- fi -- for desiredlang in $desiredlanguages; do -- # Use the presentlang catalog if desiredlang is -- # a. equal to presentlang, or -- # b. a variant of presentlang (because in this case, -- # presentlang can be used as a fallback for messages -- # which are not translated in the desiredlang catalog). -- case "$desiredlang" in -- "$presentlang"*) useit=yes;; -- esac -- done -- if test $useit = yes; then -- NEW_LINGUAS="$NEW_LINGUAS $presentlang" -- fi -- done -- LINGUAS=$NEW_LINGUAS -- AC_MSG_RESULT($LINGUAS) -- fi -+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -- dnl Construct list of names of catalog files to be constructed. -- if test -n "$LINGUAS"; then -- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -- fi -- fi -+# serial 5 - -- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). -- dnl Try to locate is. -- MKINSTALLDIRS= -- if test -n "$ac_aux_dir"; then -- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -- fi -- if test -z "$MKINSTALLDIRS"; then -- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -- fi -- AC_SUBST(MKINSTALLDIRS) -+# AM_MISSING_PROG(NAME, PROGRAM) -+# ------------------------------ -+AC_DEFUN([AM_MISSING_PROG], -+[AC_REQUIRE([AM_MISSING_HAS_RUN]) -+$1=${$1-"${am_missing_run}$2"} -+AC_SUBST($1)]) - -- dnl Generate list of files to be processed by xgettext which will -- dnl be included in po/Makefile. -- test -d po || mkdir po -- if test "x$srcdir" != "x."; then -- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -- posrcprefix="$srcdir/" -- else -- posrcprefix="../$srcdir/" -- fi -- else -- posrcprefix="../" -- fi -- rm -f po/POTFILES -- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -- < $srcdir/po/POTFILES.in > po/POTFILES -- ]) - --# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) --# ------------------------------- --# Define VARIABLE to the location where catalog files will --# be installed by po/Makefile. --glib_DEFUN([GLIB_DEFINE_LOCALEDIR], --[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl --glib_save_prefix="$prefix" --glib_save_exec_prefix="$exec_prefix" --glib_save_datarootdir="$datarootdir" --test "x$prefix" = xNONE && prefix=$ac_default_prefix --test "x$exec_prefix" = xNONE && exec_prefix=$prefix --datarootdir=`eval echo "${datarootdir}"` --if test "x$CATOBJEXT" = "x.mo" ; then -- localedir=`eval echo "${libdir}/locale"` -+# AM_MISSING_HAS_RUN -+# ------------------ -+# Define MISSING if not defined so far and test if it supports --run. -+# If it does, set am_missing_run to use it, otherwise, to nothing. -+AC_DEFUN([AM_MISSING_HAS_RUN], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+AC_REQUIRE_AUX_FILE([missing])dnl -+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run true"; then -+ am_missing_run="$MISSING --run " - else -- localedir=`eval echo "${datadir}/locale"` -+ am_missing_run= -+ AC_MSG_WARN([`missing' script is too old or missing]) - fi --prefix="$glib_save_prefix" --exec_prefix="$glib_save_exec_prefix" --datarootdir="$glib_save_datarootdir" --AC_DEFINE_UNQUOTED($1, "$localedir", -- [Define the location where the catalogs will be installed]) - ]) - --dnl --dnl Now the definitions that aclocal will find --dnl --ifdef(glib_configure_in,[],[ --AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) --AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) --])dnl -+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) --# --# Create a temporary file with TEST-FILE as its contents and pass the --# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with --# 0 and perform ACTION-IF-FAIL for any other exit status. --AC_DEFUN([GLIB_RUN_PROG], --[cat >conftest.foo <<_ACEOF --$2 --_ACEOF --if AC_RUN_LOG([$1 conftest.foo]); then -- m4_ifval([$3], [$3], [:]) --m4_ifvaln([$4], [else $4])dnl --echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD --sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD --fi]) -+# AM_PROG_MKDIR_P -+# --------------- -+# Check for `mkdir -p'. -+AC_DEFUN([AM_PROG_MKDIR_P], -+[AC_PREREQ([2.60])dnl -+AC_REQUIRE([AC_PROG_MKDIR_P])dnl -+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -+dnl while keeping a definition of mkdir_p for backward compatibility. -+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -+dnl Makefile.ins that do not define MKDIR_P, so we do our own -+dnl adjustment using top_builddir (which is defined more often than -+dnl MKDIR_P). -+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -+case $mkdir_p in -+ [[\\/$]]* | ?:[[\\/]]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++if test "${lt_cv_path_LD+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 &5 ++echo "${ECHO_T}$LD" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 ++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ++ { (exit 1); exit 1; }; } ++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } ++if test "${lt_cv_prog_gnu_ld+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. ++case `$LD -v 2>&1 = $min_glib_version) -+# Check to make sure that the build environment is sane. -*- Autoconf -*- - -- if test x$PKG_CONFIG != xno ; then -- ## don't try to run the test against uninstalled libtool libs -- if $PKG_CONFIG --uninstalled $pkg_config_args; then -- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" -- enable_glibtest=no -- fi -+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } ++with_gnu_ld=$lt_cv_prog_gnu_ld + -+# serial 4 + -+# AM_SANITY_CHECK -+# --------------- -+AC_DEFUN([AM_SANITY_CHECK], -+[AC_MSG_CHECKING([whether build environment is sane]) ++ ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test "$with_gnu_ld" = yes; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' ++ ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ ++ grep 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec_CXX= ++ fi ++ else ++ with_gnu_ld=no ++ wlarc= ++ ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ fi ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++ ++else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++fi ++ ++# PORTME: fill in a description of your system's C++ link characteristics ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++ld_shlibs_CXX=yes ++case $host_os in ++ aix3*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aix[4-9]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ archive_cmds_CXX='' ++ hardcode_direct_CXX=yes ++ hardcode_libdir_separator_CXX=':' ++ link_all_deplibs_CXX=yes ++ ++ if test "$GXX" = yes; then ++ case $host_os in aix4.[012]|aix4.[012].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ hardcode_direct_CXX=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L_CXX=yes ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ hardcode_libdir_separator_CXX= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ always_export_symbols_CXX=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ allow_undefined_flag_CXX='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 "$lt_aix_libpath_sed"` ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++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 ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" ++ ++ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag_CXX="-z nodefs" ++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 "$lt_aix_libpath_sed"` ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++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 ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ no_undefined_flag_CXX=' ${wl}-bernotok' ++ allow_undefined_flag_CXX=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec_CXX='$convenience' ++ archive_cmds_need_lc_CXX=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag_CXX=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ allow_undefined_flag_CXX=unsupported ++ always_export_symbols_CXX=no ++ enable_shared_with_static_runtimes_CXX=yes ++ ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ darwin* | rhapsody*) ++ archive_cmds_need_lc_CXX=no ++ hardcode_direct_CXX=no ++ hardcode_automatic_CXX=yes ++ hardcode_shlibpath_var_CXX=unsupported ++ whole_archive_flag_spec_CXX='' ++ link_all_deplibs_CXX=yes ++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" ++ if test "$GXX" = yes ; then ++ output_verbose_link_cmd='echo' ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi ++ else ++ 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` $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 $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}' ++ ;; ++ *) ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ fi ++ ;; ++ ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ freebsd[12]*) ++ # C++ shared libraries reported to be fairly broken before switch to ELF ++ ld_shlibs_CXX=no ++ ;; ++ freebsd-elf*) ++ archive_cmds_need_lc_CXX=no ++ ;; ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ ld_shlibs_CXX=yes ++ ;; ++ gnu*) ++ ;; ++ hpux9*) ++ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ hardcode_direct_CXX=yes ++ hardcode_minus_L_CXX=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aCC*) ++ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ;; ++ *) ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_direct_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ ;; ++ *) ++ hardcode_direct_CXX=yes ++ hardcode_minus_L_CXX=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ interix[3-9]*) ++ hardcode_direct_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ archive_expsym_cmds_CXX='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' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++ fi ++ fi ++ link_all_deplibs_CXX=yes ++ ;; ++ esac ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ ;; ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc*) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ archive_cmds_need_lc_CXX=no ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ ++ runpath_var=LD_RUN_PATH ++ hardcode_libdir_flag_spec_CXX='-rpath $libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # 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*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ m88k*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ 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= ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ hardcode_direct_CXX=yes ++ hardcode_shlibpath_var_CXX=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ ld_shlibs_CXX=no ++ ;; ++ openbsd*) ++ 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 ++ ;; ++ osf3*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ++ ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ cxx*) ++ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++ ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ cxx*) ++ allow_undefined_flag_CXX=' -expect_unresolved \*' ++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $rm $lib.exp' ++ ++ hardcode_libdir_flag_spec_CXX='-rpath $libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++ ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ psos*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ archive_cmds_need_lc_CXX=yes ++ 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='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++ ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ hardcode_shlibpath_var_CXX=no ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ # 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='-z allextract$convenience -z defaultextract' ++ ;; ++ esac ++ link_all_deplibs_CXX=yes ++ ++ 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' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ ++ # The C++ compiler must be used to create the archive. ++ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ no_undefined_flag_CXX=' ${wl}-z ${wl}defs' ++ if $CC --version | grep -v '^2\.7' > /dev/null; then ++ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ 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 ++ ;; ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ++ no_undefined_flag_CXX='${wl}-z,text' ++ archive_cmds_need_lc_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ # So that behaviour is only enabled if SCOABSPATH is set to a ++ # non-empty value in the environment. Most likely only useful for ++ # creating official distributions of packages. ++ # This is a hack until libtool officially supports absolute path ++ # names for shared libraries. ++ no_undefined_flag_CXX='${wl}-z,text' ++ allow_undefined_flag_CXX='${wl}-z,nodefs' ++ archive_cmds_need_lc_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ hardcode_libdir_separator_CXX=':' ++ link_all_deplibs_CXX=yes ++ export_dynamic_flag_spec_CXX='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++esac ++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++echo "${ECHO_T}$ld_shlibs_CXX" >&6; } ++test "$ld_shlibs_CXX" = no && can_build_shared=no ++ ++GCC_CXX="$GXX" ++LD_CXX="$LD" ++ ++cat > conftest.$ac_ext <&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # Parse the compiler output and extract the necessary ++ # objects, libraries and library flags. ++ ++ # Sentinel used to keep track of whether or not we are before ++ # the conftest object file. ++ pre_test_object_deps_done=no ++ ++ # The `*' in the case matches for architectures that use `case' in ++ # $output_verbose_cmd can trigger glob expansion during the loop ++ # eval without this substitution. ++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` ++ ++ for p in `eval $output_verbose_link_cmd`; do ++ case $p in ++ ++ -L* | -R* | -l*) ++ # Some compilers place space between "-{L,R}" and the path. ++ # Remove the space. ++ if test $p = "-L" \ ++ || test $p = "-R"; then ++ prev=$p ++ continue ++ else ++ prev= ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ case $p in ++ -L* | -R*) ++ # Internal compiler library paths should come after those ++ # provided the user. The postdeps already come after the ++ # user supplied libs so there is no need to process them. ++ if test -z "$compiler_lib_search_path_CXX"; then ++ compiler_lib_search_path_CXX="${prev}${p}" ++ else ++ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" ++ fi ++ ;; ++ # The "-l" case would never come before the object being ++ # linked, so don't bother handling this case. ++ esac ++ else ++ if test -z "$postdeps_CXX"; then ++ postdeps_CXX="${prev}${p}" ++ else ++ postdeps_CXX="${postdeps_CXX} ${prev}${p}" ++ fi ++ fi ++ ;; ++ ++ *.$objext) ++ # This assumes that the test object file only shows up ++ # once in the compiler output. ++ if test "$p" = "conftest.$objext"; then ++ pre_test_object_deps_done=yes ++ continue ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ if test -z "$predep_objects_CXX"; then ++ predep_objects_CXX="$p" ++ else ++ predep_objects_CXX="$predep_objects_CXX $p" ++ fi ++ else ++ if test -z "$postdep_objects_CXX"; then ++ postdep_objects_CXX="$p" ++ else ++ postdep_objects_CXX="$postdep_objects_CXX $p" ++ fi ++ fi ++ ;; ++ ++ *) ;; # Ignore the rest. ++ ++ esac ++ done ++ ++ # Clean up. ++ rm -f a.out a.exe ++else ++ echo "libtool.m4: error: problem compiling CXX test program" ++fi ++ ++$rm -f confest.$objext ++ ++compiler_lib_search_dirs_CXX= ++if test -n "$compiler_lib_search_path_CXX"; then ++ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++ ++# PORTME: override above test on systems where it is broken ++case $host_os in ++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= ++ postdep_objects_CXX= ++ 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. ++ if test "$solaris_use_stlport4" != yes; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++esac ++ ++case " $postdeps_CXX " in ++*" -lc "*) archive_cmds_need_lc_CXX=no ;; ++esac ++ ++lt_prog_compiler_wl_CXX= ++lt_prog_compiler_pic_CXX= ++lt_prog_compiler_static_CXX= ++ ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++ ++ # C++ specific cases for pic, static, wl, etc. ++ if test "$GXX" = yes; then ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_CXX='-Bstatic' ++ fi ++ ;; ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ 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*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic_CXX='-fno-common' ++ ;; ++ *djgpp*) ++ # DJGPP does not support shared libraries at all ++ lt_prog_compiler_pic_CXX= ++ ;; ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic_CXX=-Kconform_pic ++ fi ++ ;; ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ esac ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ esac ++ else ++ case $host_os in ++ aix[4-9]*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_CXX='-Bstatic' ++ else ++ lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ chorus*) ++ case $cc_basename in ++ cxch68*) ++ # Green Hills C++ Compiler ++ # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ ;; ++ esac ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ lt_prog_compiler_pic_CXX='-qnocommon' ++ lt_prog_compiler_wl_CXX='-Wl,' ++ ;; ++ esac ++ ;; ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ lt_prog_compiler_pic_CXX='-KPIC' ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ freebsd* | dragonfly*) ++ # FreeBSD uses GNU C++ ++ ;; ++ hpux9* | hpux10* | hpux11*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' ++ if test "$host_cpu" != ia64; then ++ lt_prog_compiler_pic_CXX='+Z' ++ fi ++ ;; ++ aCC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='+Z' ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; ++ irix5* | irix6* | nonstopux*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='-non_shared' ++ # CC pic flag -KPIC is the default. ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # KAI C++ Compiler ++ lt_prog_compiler_wl_CXX='--backend -Wl,' ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ icpc* | ecpc*) ++ # Intel C++ ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-static' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler. ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-fpic' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ cxx*) ++ # Compaq C++ ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ lt_prog_compiler_pic_CXX= ++ 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 ++ ;; ++ lynxos*) ++ ;; ++ m88k*) ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ lt_prog_compiler_pic_CXX='-W c,exportall' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ netbsd* | netbsdelf*-gnu) ++ ;; ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ lt_prog_compiler_wl_CXX='--backend -Wl,' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ cxx*) ++ # Digital/Compaq C++ ++ lt_prog_compiler_wl_CXX='-Wl,' ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_static_CXX='-non_shared' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ psos*) ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ lt_prog_compiler_wl_CXX='-Qoption ld ' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ lt_prog_compiler_pic_CXX='-PIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ lt_prog_compiler_pic_CXX='-pic' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ lcc*) ++ # Lucid ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ lt_prog_compiler_pic_CXX='-KPIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ esac ++ ;; ++ vxworks*) ++ ;; ++ *) ++ lt_prog_compiler_can_build_shared_CXX=no ++ ;; ++ esac ++ fi ++ ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$lt_prog_compiler_pic_CXX"; then ++ ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_pic_works_CXX=no ++ ac_outfile=conftest.$ac_objext ++ 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. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:__oline__: \$? = $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. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works_CXX=yes ++ fi ++ fi ++ $rm conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } ++ ++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then ++ case $lt_prog_compiler_pic_CXX in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; ++ esac ++else ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_can_build_shared_CXX=no ++fi ++ ++fi ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic_CXX= ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ++ ;; ++esac ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_static_works_CXX=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ 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 ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works_CXX=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works_CXX=yes ++ fi ++ fi ++ $rm -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } ++ ++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then ++ : ++else ++ lt_prog_compiler_static_CXX= ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_c_o_CXX=no ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ 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 ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:__oline__: \$? = $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 ++ # So say no if there are warnings ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o_CXX=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out ++ cd .. ++ rmdir conftest ++ $rm conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } ++ ++ ++hard_links="nottested" ++if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ hard_links=yes ++ $rm conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } ++ if test "$hard_links" = no; then ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++ ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++ ++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ case $host_os in ++ aix[4-9]*) ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ else ++ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ fi ++ ;; ++ pw32*) ++ 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' ++ ;; ++ 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' ++ ;; ++ esac ++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ ++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++echo "${ECHO_T}$ld_shlibs_CXX" >&6; } ++test "$ld_shlibs_CXX" = no && can_build_shared=no ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$archive_cmds_need_lc_CXX" in ++x|xyes) ++ # Assume -lc should be added ++ archive_cmds_need_lc_CXX=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $archive_cmds_CXX in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ { 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* ++ echo "$lt_simple_compile_test_code" > 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); } 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$lt_prog_compiler_wl_CXX ++ pic_flag=$lt_prog_compiler_pic_CXX ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX ++ allow_undefined_flag_CXX= ++ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ then ++ archive_cmds_need_lc_CXX=no ++ else ++ archive_cmds_need_lc_CXX=yes ++ fi ++ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $rm conftest* ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ++ ;; ++ esac ++ fi ++ ;; ++esac ++ ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++ ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix[4-9]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[01] | aix4.[01].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[45]*) ++ version_type=linux ++ 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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $rm \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++ ;; ++ mingw*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ 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 ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ 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 ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ 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 ++ ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[01]* | freebsdelf3.[01]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ ++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++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 ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; ++ ++interix[3-9]*) ++ 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' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # 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>/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 ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++netbsdelf*-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='NetBSD ld.elf_so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++nto-qnx*) ++ 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=yes ++ ;; ++ ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[89] | openbsd2.[89].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; ++ ++rdos*) ++ dynamic_linker=no ++ ;; ++ ++solaris*) ++ 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=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ 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 ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++uts4*) ++ version_type=linux ++ 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 ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } ++test "$dynamic_linker" = no && can_build_shared=no ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++hardcode_action_CXX= ++if test -n "$hardcode_libdir_flag_spec_CXX" || \ ++ test -n "$runpath_var_CXX" || \ ++ test "X$hardcode_automatic_CXX" = "Xyes" ; then ++ ++ # We can hardcode non-existant directories. ++ if test "$hardcode_direct_CXX" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && ++ test "$hardcode_minus_L_CXX" != no; then ++ # Linking always hardcodes the temporary library directory. ++ hardcode_action_CXX=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ hardcode_action_CXX=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ hardcode_action_CXX=unsupported ++fi ++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 ++echo "${ECHO_T}$hardcode_action_CXX" >&6; } ++ ++if test "$hardcode_action_CXX" = relink; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++ ++ ++# The else clause should only fire when bootstrapping the ++# libtool distribution, otherwise you forgot to ship ltmain.sh ++# with your package, and you will get complaints that there are ++# no rules to generate ltmain.sh. ++if test -f "$ltmain"; then ++ # 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 ++ setopt NO_GLOB_SUBST ++ fi ++ # Now quote all the things that may contain metacharacters while being ++ # careful not to overquote the AC_SUBSTed values. We take copies of the ++ # variables and quote the copies for generation of the libtool script. ++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ ++ SED SHELL STRIP \ ++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ ++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ ++ deplibs_check_method reload_flag reload_cmds need_locks \ ++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ ++ lt_cv_sys_global_symbol_to_c_name_address \ ++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ ++ old_postinstall_cmds old_postuninstall_cmds \ ++ compiler_CXX \ ++ CC_CXX \ ++ LD_CXX \ ++ lt_prog_compiler_wl_CXX \ ++ lt_prog_compiler_pic_CXX \ ++ lt_prog_compiler_static_CXX \ ++ lt_prog_compiler_no_builtin_flag_CXX \ ++ export_dynamic_flag_spec_CXX \ ++ thread_safe_flag_spec_CXX \ ++ whole_archive_flag_spec_CXX \ ++ enable_shared_with_static_runtimes_CXX \ ++ old_archive_cmds_CXX \ ++ old_archive_from_new_cmds_CXX \ ++ predep_objects_CXX \ ++ postdep_objects_CXX \ ++ predeps_CXX \ ++ postdeps_CXX \ ++ compiler_lib_search_path_CXX \ ++ compiler_lib_search_dirs_CXX \ ++ archive_cmds_CXX \ ++ archive_expsym_cmds_CXX \ ++ postinstall_cmds_CXX \ ++ postuninstall_cmds_CXX \ ++ old_archive_from_expsyms_cmds_CXX \ ++ allow_undefined_flag_CXX \ ++ no_undefined_flag_CXX \ ++ export_symbols_cmds_CXX \ ++ hardcode_libdir_flag_spec_CXX \ ++ hardcode_libdir_flag_spec_ld_CXX \ ++ hardcode_libdir_separator_CXX \ ++ hardcode_automatic_CXX \ ++ 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 ++ ++ case $var in ++ old_archive_cmds_CXX | \ ++ old_archive_from_new_cmds_CXX | \ ++ archive_cmds_CXX | \ ++ archive_expsym_cmds_CXX | \ ++ module_cmds_CXX | \ ++ module_expsym_cmds_CXX | \ ++ old_archive_from_expsyms_cmds_CXX | \ ++ export_symbols_cmds_CXX | \ ++ extract_expsyms_cmds | reload_cmds | finish_cmds | \ ++ postinstall_cmds | postuninstall_cmds | \ ++ old_postinstall_cmds | old_postuninstall_cmds | \ ++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) ++ # Double-quote double-evaled strings. ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ++ ;; ++ *) ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ++ ;; ++ esac ++ done ++ ++ case $lt_echo in ++ *'\$0 --fallback-echo"') ++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` ++ ;; ++ esac ++ ++cfgfile="$ofile" ++ ++ cat <<__EOF__ >> "$cfgfile" ++# ### BEGIN LIBTOOL TAG CONFIG: $tagname ++ ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++ ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared ++ ++# Whether or not to build static libraries. ++build_old_libs=$enable_static ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc_CXX ++ ++# Whether or not to disallow shared libs when runtime libs are static ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX ++ ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install ++ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os ++ ++# An echo program that does not interpret backslashes. ++echo=$lt_echo ++ ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS ++ ++# A C compiler. ++LTCC=$lt_LTCC ++ ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ ++# A language-specific compiler. ++CC=$lt_compiler_CXX ++ ++# Is the compiler the GNU C compiler? ++with_gcc=$GCC_CXX ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# The linker used to build libraries. ++LD=$lt_LD_CXX ++ ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S ++ ++# A BSD-compatible nm program. ++NM=$lt_NM ++ ++# A symbol stripping program ++STRIP=$lt_STRIP ++ ++# Used to examine libraries when file_magic_cmd begins "file" ++MAGIC_CMD=$MAGIC_CMD ++ ++# Used on cygwin: DLL creation program. ++DLLTOOL="$DLLTOOL" ++ ++# Used on cygwin: object dumper. ++OBJDUMP="$OBJDUMP" ++ ++# Used on cygwin: assembler. ++AS="$AS" ++ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_CXX ++ ++# Object file suffix (normally "o"). ++objext="$ac_objext" ++ ++# Old archive suffix (normally "a"). ++libext="$libext" ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds='$shrext_cmds' ++ ++# Executable file suffix (normally ""). ++exeext="$exeext" ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic_CXX ++pic_mode=$pic_mode ++ ++# What is the maximum length of a command? ++max_cmd_len=$lt_cv_sys_max_cmd_len ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX ++ ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Do we need the lib prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static_CXX ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX ++ ++# Compiler flag to generate thread-safe objects. ++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME. ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Commands used to build and install an old-style archive. ++RANLIB=$lt_RANLIB ++old_archive_cmds=$lt_old_archive_cmds_CXX ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX ++ ++# Commands used to build and install a shared archive. ++archive_cmds=$lt_archive_cmds_CXX ++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX ++postinstall_cmds=$lt_postinstall_cmds ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to build a loadable module (assumed same as above if empty) ++module_cmds=$lt_module_cmds_CXX ++module_expsym_cmds=$lt_module_expsym_cmds_CXX ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predep_objects=$lt_predep_objects_CXX ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdep_objects=$lt_postdep_objects_CXX ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predeps=$lt_predeps_CXX ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdeps=$lt_postdeps_CXX ++ ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == file_magic. ++file_magic_cmd=$lt_file_magic_cmd ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag_CXX ++ ++# Flag that forces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag_CXX ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# Same as above, but a single script fragment to be evaled but not shown. ++finish_eval=$lt_finish_eval ++ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ ++# Transform the output of nm in a proper C declaration ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ ++# Transform the output of nm in a C name address pair ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ ++# This is the shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# This is the shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action_CXX ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX ++ ++# If ld is used when linking, flag to hardcode \$libdir into ++# a binary during linking. This must work even if \$libdir does ++# not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX ++ ++# Whether we need a single -rpath flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX ++ ++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++# resulting binary. ++hardcode_direct=$hardcode_direct_CXX ++ ++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the ++# resulting binary. ++hardcode_minus_L=$hardcode_minus_L_CXX ++ ++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into ++# the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX ++ ++# Set to yes if building a shared library automatically hardcodes DIR into the library ++# and all subsequent libraries and executables linked against it. ++hardcode_automatic=$hardcode_automatic_CXX ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at relink time. ++variables_saved_for_relink="$variables_saved_for_relink" ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs_CXX ++ ++# Compile-time system search path for libraries ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path ++ ++# Set to yes if exported symbols are required. ++always_export_symbols=$always_export_symbols_CXX ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds_CXX ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms_CXX ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms_CXX ++ ++# ### END LIBTOOL TAG CONFIG: $tagname ++ ++__EOF__ ++ ++ ++else ++ # If there is no Makefile yet, we rely on a make rule to execute ++ # `config.status --recheck' to rerun these tests and create the ++ # libtool script then. ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi ++fi ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++CC=$lt_save_CC ++LDCXX=$LD ++LD=$lt_save_LD ++GCC=$lt_save_GCC ++with_gnu_ldcxx=$with_gnu_ld ++with_gnu_ld=$lt_save_with_gnu_ld ++lt_cv_path_LDCXX=$lt_cv_path_LD ++lt_cv_path_LD=$lt_save_path_LD ++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++ ++ else ++ tagname="" ++ fi ++ ;; ++ ++ F77) ++ if test -n "$F77" && test "X$F77" != "Xno"; then ++ ++ac_ext=f ++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_f77_compiler_gnu ++ ++ ++archive_cmds_need_lc_F77=no ++allow_undefined_flag_F77= ++always_export_symbols_F77=no ++archive_expsym_cmds_F77= ++export_dynamic_flag_spec_F77= ++hardcode_direct_F77=no ++hardcode_libdir_flag_spec_F77= ++hardcode_libdir_flag_spec_ld_F77= ++hardcode_libdir_separator_F77= ++hardcode_minus_L_F77=no ++hardcode_automatic_F77=no ++module_cmds_F77= ++module_expsym_cmds_F77= ++link_all_deplibs_F77=unknown ++old_archive_cmds_F77=$old_archive_cmds ++no_undefined_flag_F77= ++whole_archive_flag_spec_F77= ++enable_shared_with_static_runtimes_F77=no ++ ++# Source file extension for f77 test sources. ++ac_ext=f ++ ++# Object file extension for compiled f77 test sources. ++objext=o ++objext_F77=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code="\ ++ program t ++ end ++" ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++# save warnings/boilerplate of simple test code ++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* ++ ++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 -r conftest* ++ ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${F77-"f77"} ++compiler=$CC ++compiler_F77=$CC ++for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ ++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++echo "${ECHO_T}$can_build_shared" >&6; } ++ ++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } ++test "$can_build_shared" = "no" && enable_shared=no ++ ++# On AIX, shared libraries and static libraries use the same namespace, and ++# are all built from PIC. ++case $host_os in ++aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++aix[4-9]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++esac ++{ echo "$as_me:$LINENO: result: $enable_shared" >&5 ++echo "${ECHO_T}$enable_shared" >&6; } ++ ++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } ++# Make sure either enable_shared or enable_static is yes. ++test "$enable_shared" = yes || enable_static=yes ++{ echo "$as_me:$LINENO: result: $enable_static" >&5 ++echo "${ECHO_T}$enable_static" >&6; } ++ ++GCC_F77="$G77" ++LD_F77="$LD" ++ ++lt_prog_compiler_wl_F77= ++lt_prog_compiler_pic_F77= ++lt_prog_compiler_static_F77= ++ ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++ ++ if test "$GCC" = yes; then ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_static_F77='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_F77='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ 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' ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic_F77='-fno-common' ++ ;; ++ ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ lt_prog_compiler_can_build_shared_F77=no ++ enable_shared=no ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic_F77=-Kconform_pic ++ fi ++ ;; ++ ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic_F77='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ *) ++ lt_prog_compiler_pic_F77='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_F77='-Bstatic' ++ else ++ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ lt_prog_compiler_pic_F77='-qnocommon' ++ lt_prog_compiler_wl_F77='-Wl,' ++ ;; ++ esac ++ ;; ++ ++ 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' ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic_F77='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ lt_prog_compiler_static_F77='${wl}-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ # PIC (with -KPIC) is the default. ++ lt_prog_compiler_static_F77='-non_shared' ++ ;; ++ ++ newsos6) ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ icc* | ecc*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_pic_F77='-fpic' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; ++ ccc*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ # 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 ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ # All OSF/1 code is PIC. ++ 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' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ lt_prog_compiler_wl_F77='-Qoption ld ';; ++ *) ++ lt_prog_compiler_wl_F77='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ lt_prog_compiler_wl_F77='-Qoption ld ' ++ lt_prog_compiler_pic_F77='-PIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ lt_prog_compiler_pic_F77='-Kconform_pic' ++ lt_prog_compiler_static_F77='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_pic_F77='-KPIC' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; ++ ++ unicos*) ++ lt_prog_compiler_wl_F77='-Wl,' ++ lt_prog_compiler_can_build_shared_F77=no ++ ;; ++ ++ uts4*) ++ lt_prog_compiler_pic_F77='-pic' ++ lt_prog_compiler_static_F77='-Bstatic' ++ ;; ++ ++ *) ++ lt_prog_compiler_can_build_shared_F77=no ++ ;; ++ esac ++ fi ++ ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$lt_prog_compiler_pic_F77"; then ++ ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_pic_works_F77=no ++ ac_outfile=conftest.$ac_objext ++ 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. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:__oline__: \$? = $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. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works_F77=yes ++ fi ++ fi ++ $rm conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } ++ ++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then ++ case $lt_prog_compiler_pic_F77 in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; ++ esac ++else ++ lt_prog_compiler_pic_F77= ++ lt_prog_compiler_can_build_shared_F77=no ++fi ++ ++fi ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic_F77= ++ ;; ++ *) ++ lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" ++ ;; ++esac ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_static_works_F77=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ 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 ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works_F77=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works_F77=yes ++ fi ++ fi ++ $rm -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } ++ ++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then ++ : ++else ++ lt_prog_compiler_static_F77= ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_c_o_F77=no ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ 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 ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:__oline__: \$? = $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 ++ # So say no if there are warnings ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o_F77=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out ++ cd .. ++ rmdir conftest ++ $rm conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } ++ ++ ++hard_links="nottested" ++if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ hard_links=yes ++ $rm conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } ++ if test "$hard_links" = no; then ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++ ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++ ++ runpath_var= ++ allow_undefined_flag_F77= ++ enable_shared_with_static_runtimes_F77=no ++ archive_cmds_F77= ++ archive_expsym_cmds_F77= ++ old_archive_From_new_cmds_F77= ++ old_archive_from_expsyms_cmds_F77= ++ export_dynamic_flag_spec_F77= ++ whole_archive_flag_spec_F77= ++ thread_safe_flag_spec_F77= ++ hardcode_libdir_flag_spec_F77= ++ hardcode_libdir_flag_spec_ld_F77= ++ hardcode_libdir_separator_F77= ++ hardcode_direct_F77=no ++ hardcode_minus_L_F77=no ++ hardcode_shlibpath_var_F77=unsupported ++ link_all_deplibs_F77=unknown ++ hardcode_automatic_F77=no ++ module_cmds_F77= ++ module_expsym_cmds_F77= ++ always_export_symbols_F77=no ++ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ include_expsyms_F77= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # it will be wrapped by ` (' and `)$', so one must not match beginning or ++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++ # as well as any symbol that contains `d'. ++ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++ # platforms (ab)use it in PIC code, but their linkers get confused if ++ # the symbol is explicitly referenced. Since portable code cannot ++ # rely on this symbol name, it's probably fine to never include it in ++ # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++ extract_expsyms_cmds= ++ # Just being paranoid about ensuring that cc_basename is set. ++ for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ case $host_os in ++ cygwin* | mingw* | pw32*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac ++ ++ ld_shlibs_F77=yes ++ if test "$with_gnu_ld" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' ++ ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' ++ export_dynamic_flag_spec_F77='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec_F77= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>/dev/null` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix[3-9]*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ ld_shlibs_F77=no ++ cat <&2 ++ ++*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. ++ ++EOF ++ fi ++ ;; ++ ++ amigaos*) ++ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ hardcode_minus_L_F77=yes ++ ++ # Samuel A. Falvo II reports ++ # that the semantics of dynamic libraries on AmigaOS, at least up ++ # to version 4, is to share data among multiple programs linked ++ # with the same dynamic library. Since this doesn't match the ++ # behavior of shared libraries on other platforms, we can't use ++ # them. ++ ld_shlibs_F77=no ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag_F77=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ ld_shlibs_F77=no ++ fi ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ 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/'\'' -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' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ ld_shlibs_F77=no ++ fi ++ ;; ++ ++ interix[3-9]*) ++ hardcode_direct_F77=no ++ hardcode_shlibpath_var_F77=no ++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_F77='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ 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' ++ ;; ++ ++ 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 ++ pgcc*) # Portland Group C compiler ++ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ esac ++ 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 '"$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* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; ++ ++ solaris*) ++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++ ld_shlibs_F77=no ++ cat <&2 ++ ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++EOF ++ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs_F77=no ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) ++ ld_shlibs_F77=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ ld_shlibs_F77=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ sunos4*) ++ archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no ++ ;; ++ ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs_F77=no ++ fi ++ ;; ++ esac ++ ++ if test "$ld_shlibs_F77" = no; then ++ runpath_var= ++ hardcode_libdir_flag_spec_F77= ++ export_dynamic_flag_spec_F77= ++ whole_archive_flag_spec_F77= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ allow_undefined_flag_F77=unsupported ++ always_export_symbols_F77=yes ++ archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ hardcode_minus_L_F77=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ hardcode_direct_F77=unsupported ++ fi ++ ;; ++ ++ aix[4-9]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ else ++ export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ archive_cmds_F77='' ++ hardcode_direct_F77=yes ++ hardcode_libdir_separator_F77=':' ++ link_all_deplibs_F77=yes ++ ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[012]|aix4.[012].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ hardcode_direct_F77=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L_F77=yes ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ hardcode_libdir_separator_F77= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ always_export_symbols_F77=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ allow_undefined_flag_F77='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ cat >conftest.$ac_ext <<_ACEOF ++ program main ++ ++ end ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 "$lt_aix_libpath_sed"` ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++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 ++ ++ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" ++ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag_F77="-z nodefs" ++ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ cat >conftest.$ac_ext <<_ACEOF ++ program main ++ ++ end ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 "$lt_aix_libpath_sed"` ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++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 ++ ++ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ no_undefined_flag_F77=' ${wl}-bernotok' ++ allow_undefined_flag_F77=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec_F77='$convenience' ++ archive_cmds_need_lc_F77=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ amigaos*) ++ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ hardcode_minus_L_F77=yes ++ # see comment about different semantics on the GNU ld section ++ ld_shlibs_F77=no ++ ;; ++ ++ bsdi[45]*) ++ export_dynamic_flag_spec_F77=-rdynamic ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ hardcode_libdir_flag_spec_F77=' ' ++ allow_undefined_flag_F77=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # 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' ++ fix_srcfile_path_F77='`cygpath -w "$srcfile"`' ++ enable_shared_with_static_runtimes_F77=yes ++ ;; ++ ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[012]) ++ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ archive_cmds_need_lc_F77=no ++ hardcode_direct_F77=no ++ hardcode_automatic_F77=yes ++ hardcode_shlibpath_var_F77=unsupported ++ whole_archive_flag_spec_F77='' ++ link_all_deplibs_F77=yes ++ if test "$GCC" = yes ; then ++ output_verbose_link_cmd='echo' ++ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ else ++ 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` $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 $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}' ++ ;; ++ *) ++ ld_shlibs_F77=no ++ ;; ++ esac ++ fi ++ ;; ++ ++ dgux*) ++ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ hardcode_shlibpath_var_F77=no ++ ;; ++ ++ freebsd1*) ++ ld_shlibs_F77=no ++ ;; ++ ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no ++ ;; ++ ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct_F77=yes ++ hardcode_minus_L_F77=yes ++ hardcode_shlibpath_var_F77=no ++ ;; ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no ++ ;; ++ ++ hpux9*) ++ if test "$GCC" = yes; then ++ archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_F77=: ++ hardcode_direct_F77=yes ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L_F77=yes ++ export_dynamic_flag_spec_F77='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_F77=: ++ ++ hardcode_direct_F77=yes ++ export_dynamic_flag_spec_F77='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L_F77=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_F77=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_libdir_flag_spec_ld_F77='+b $libdir' ++ hardcode_direct_F77=no ++ hardcode_shlibpath_var_F77=no ++ ;; ++ *) ++ hardcode_direct_F77=yes ++ export_dynamic_flag_spec_F77='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L_F77=yes ++ ;; ++ esac ++ fi ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' ++ fi ++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_F77=: ++ link_all_deplibs_F77=yes ++ ;; ++ ++ 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 ++ archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ hardcode_direct_F77=yes ++ hardcode_shlibpath_var_F77=no ++ ;; ++ ++ newsos6) ++ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct_F77=yes ++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_F77=: ++ hardcode_shlibpath_var_F77=no ++ ;; ++ ++ openbsd*) ++ 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 ++ ld_shlibs_F77=no ++ fi ++ ;; ++ ++ os2*) ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ hardcode_minus_L_F77=yes ++ allow_undefined_flag_F77=unsupported ++ archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ ;; ++ ++ osf3*) ++ if test "$GCC" = yes; then ++ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ allow_undefined_flag_F77=' -expect_unresolved \*' ++ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_F77=: ++ ;; ++ ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' ++ else ++ allow_undefined_flag_F77=' -expect_unresolved \*' ++ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++ ++ # Both c and cxx compiler support -rpath directly ++ hardcode_libdir_flag_spec_F77='-rpath $libdir' ++ fi ++ hardcode_libdir_separator_F77=: ++ ;; ++ ++ solaris*) ++ no_undefined_flag_F77=' -z text' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ else ++ wlarc='' ++ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ fi ++ hardcode_libdir_flag_spec_F77='-R$libdir' ++ hardcode_shlibpath_var_F77=no ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ # 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?) ++ 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 ++ ;; ++ ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ hardcode_direct_F77=yes ++ hardcode_minus_L_F77=yes ++ hardcode_shlibpath_var_F77=no ++ ;; ++ ++ sysv4) ++ case $host_vendor in ++ sni) ++ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct_F77=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ reload_cmds_F77='$CC -r -o $output$reload_objs' ++ hardcode_direct_F77=no ++ ;; ++ motorola) ++ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ hardcode_shlibpath_var_F77=no ++ ;; ++ ++ sysv4.3*) ++ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var_F77=no ++ export_dynamic_flag_spec_F77='-Bexport' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var_F77=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ ld_shlibs_F77=yes ++ fi ++ ;; ++ ++ 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 ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ no_undefined_flag_F77='${wl}-z,text' ++ allow_undefined_flag_F77='${wl}-z,nodefs' ++ archive_cmds_need_lc_F77=no ++ hardcode_shlibpath_var_F77=no ++ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ hardcode_libdir_separator_F77=':' ++ link_all_deplibs_F77=yes ++ export_dynamic_flag_spec_F77='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ uts4*) ++ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_F77='-L$libdir' ++ hardcode_shlibpath_var_F77=no ++ ;; ++ ++ *) ++ ld_shlibs_F77=no ++ ;; ++ esac ++ fi ++ ++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 ++echo "${ECHO_T}$ld_shlibs_F77" >&6; } ++test "$ld_shlibs_F77" = no && can_build_shared=no ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$archive_cmds_need_lc_F77" in ++x|xyes) ++ # Assume -lc should be added ++ archive_cmds_need_lc_F77=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $archive_cmds_F77 in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ { 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* ++ echo "$lt_simple_compile_test_code" > 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); } 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$lt_prog_compiler_wl_F77 ++ pic_flag=$lt_prog_compiler_pic_F77 ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$allow_undefined_flag_F77 ++ allow_undefined_flag_F77= ++ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ then ++ archive_cmds_need_lc_F77=no ++ else ++ archive_cmds_need_lc_F77=yes ++ fi ++ allow_undefined_flag_F77=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $rm conftest* ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ++ ;; ++ esac ++ fi ++ ;; ++esac ++ ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++ ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix[4-9]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[01] | aix4.[01].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[45]*) ++ version_type=linux ++ 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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $rm \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++ ;; ++ mingw*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ 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 ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ 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 ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ 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 ++ ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[01]* | freebsdelf3.[01]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ ++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++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 ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; ++ ++interix[3-9]*) ++ 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' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # 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>/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 ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++netbsdelf*-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='NetBSD ld.elf_so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++nto-qnx*) ++ 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=yes ++ ;; ++ ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[89] | openbsd2.[89].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; ++ ++rdos*) ++ dynamic_linker=no ++ ;; ++ ++solaris*) ++ 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=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ 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 ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++uts4*) ++ version_type=linux ++ 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 ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } ++test "$dynamic_linker" = no && can_build_shared=no ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++hardcode_action_F77= ++if test -n "$hardcode_libdir_flag_spec_F77" || \ ++ test -n "$runpath_var_F77" || \ ++ test "X$hardcode_automatic_F77" = "Xyes" ; then ++ ++ # We can hardcode non-existant directories. ++ if test "$hardcode_direct_F77" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && ++ test "$hardcode_minus_L_F77" != no; then ++ # Linking always hardcodes the temporary library directory. ++ hardcode_action_F77=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ hardcode_action_F77=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ hardcode_action_F77=unsupported ++fi ++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 ++echo "${ECHO_T}$hardcode_action_F77" >&6; } ++ ++if test "$hardcode_action_F77" = relink; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++ ++ ++# The else clause should only fire when bootstrapping the ++# libtool distribution, otherwise you forgot to ship ltmain.sh ++# with your package, and you will get complaints that there are ++# no rules to generate ltmain.sh. ++if test -f "$ltmain"; then ++ # 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 ++ setopt NO_GLOB_SUBST ++ fi ++ # Now quote all the things that may contain metacharacters while being ++ # careful not to overquote the AC_SUBSTed values. We take copies of the ++ # variables and quote the copies for generation of the libtool script. ++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ ++ SED SHELL STRIP \ ++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ ++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ ++ deplibs_check_method reload_flag reload_cmds need_locks \ ++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ ++ lt_cv_sys_global_symbol_to_c_name_address \ ++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ ++ old_postinstall_cmds old_postuninstall_cmds \ ++ compiler_F77 \ ++ CC_F77 \ ++ LD_F77 \ ++ lt_prog_compiler_wl_F77 \ ++ lt_prog_compiler_pic_F77 \ ++ lt_prog_compiler_static_F77 \ ++ lt_prog_compiler_no_builtin_flag_F77 \ ++ export_dynamic_flag_spec_F77 \ ++ thread_safe_flag_spec_F77 \ ++ whole_archive_flag_spec_F77 \ ++ enable_shared_with_static_runtimes_F77 \ ++ old_archive_cmds_F77 \ ++ old_archive_from_new_cmds_F77 \ ++ predep_objects_F77 \ ++ postdep_objects_F77 \ ++ predeps_F77 \ ++ postdeps_F77 \ ++ compiler_lib_search_path_F77 \ ++ compiler_lib_search_dirs_F77 \ ++ archive_cmds_F77 \ ++ archive_expsym_cmds_F77 \ ++ postinstall_cmds_F77 \ ++ postuninstall_cmds_F77 \ ++ old_archive_from_expsyms_cmds_F77 \ ++ allow_undefined_flag_F77 \ ++ no_undefined_flag_F77 \ ++ export_symbols_cmds_F77 \ ++ hardcode_libdir_flag_spec_F77 \ ++ hardcode_libdir_flag_spec_ld_F77 \ ++ hardcode_libdir_separator_F77 \ ++ hardcode_automatic_F77 \ ++ 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 ++ ++ case $var in ++ old_archive_cmds_F77 | \ ++ old_archive_from_new_cmds_F77 | \ ++ archive_cmds_F77 | \ ++ archive_expsym_cmds_F77 | \ ++ module_cmds_F77 | \ ++ module_expsym_cmds_F77 | \ ++ old_archive_from_expsyms_cmds_F77 | \ ++ export_symbols_cmds_F77 | \ ++ extract_expsyms_cmds | reload_cmds | finish_cmds | \ ++ postinstall_cmds | postuninstall_cmds | \ ++ old_postinstall_cmds | old_postuninstall_cmds | \ ++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) ++ # Double-quote double-evaled strings. ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ++ ;; ++ *) ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ++ ;; ++ esac ++ done ++ ++ case $lt_echo in ++ *'\$0 --fallback-echo"') ++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` ++ ;; ++ esac ++ ++cfgfile="$ofile" ++ ++ cat <<__EOF__ >> "$cfgfile" ++# ### BEGIN LIBTOOL TAG CONFIG: $tagname ++ ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++ ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared ++ ++# Whether or not to build static libraries. ++build_old_libs=$enable_static ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc_F77 ++ ++# Whether or not to disallow shared libs when runtime libs are static ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 ++ ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install ++ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os ++ ++# An echo program that does not interpret backslashes. ++echo=$lt_echo ++ ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS ++ ++# A C compiler. ++LTCC=$lt_LTCC ++ ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ ++# A language-specific compiler. ++CC=$lt_compiler_F77 ++ ++# Is the compiler the GNU C compiler? ++with_gcc=$GCC_F77 ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# The linker used to build libraries. ++LD=$lt_LD_F77 ++ ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S ++ ++# A BSD-compatible nm program. ++NM=$lt_NM ++ ++# A symbol stripping program ++STRIP=$lt_STRIP ++ ++# Used to examine libraries when file_magic_cmd begins "file" ++MAGIC_CMD=$MAGIC_CMD ++ ++# Used on cygwin: DLL creation program. ++DLLTOOL="$DLLTOOL" ++ ++# Used on cygwin: object dumper. ++OBJDUMP="$OBJDUMP" ++ ++# Used on cygwin: assembler. ++AS="$AS" ++ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_F77 ++ ++# Object file suffix (normally "o"). ++objext="$ac_objext" ++ ++# Old archive suffix (normally "a"). ++libext="$libext" ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds='$shrext_cmds' ++ ++# Executable file suffix (normally ""). ++exeext="$exeext" ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic_F77 ++pic_mode=$pic_mode ++ ++# What is the maximum length of a command? ++max_cmd_len=$lt_cv_sys_max_cmd_len ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 ++ ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Do we need the lib prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static_F77 ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 ++ ++# Compiler flag to generate thread-safe objects. ++thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME. ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Commands used to build and install an old-style archive. ++RANLIB=$lt_RANLIB ++old_archive_cmds=$lt_old_archive_cmds_F77 ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 ++ ++# Commands used to build and install a shared archive. ++archive_cmds=$lt_archive_cmds_F77 ++archive_expsym_cmds=$lt_archive_expsym_cmds_F77 ++postinstall_cmds=$lt_postinstall_cmds ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to build a loadable module (assumed same as above if empty) ++module_cmds=$lt_module_cmds_F77 ++module_expsym_cmds=$lt_module_expsym_cmds_F77 ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predep_objects=$lt_predep_objects_F77 ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdep_objects=$lt_postdep_objects_F77 ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predeps=$lt_predeps_F77 ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdeps=$lt_postdeps_F77 ++ ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path_F77 ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == file_magic. ++file_magic_cmd=$lt_file_magic_cmd ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag_F77 ++ ++# Flag that forces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag_F77 ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# Same as above, but a single script fragment to be evaled but not shown. ++finish_eval=$lt_finish_eval ++ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ ++# Transform the output of nm in a proper C declaration ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ ++# Transform the output of nm in a C name address pair ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ ++# This is the shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# This is the shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action_F77 ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 ++ ++# If ld is used when linking, flag to hardcode \$libdir into ++# a binary during linking. This must work even if \$libdir does ++# not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 ++ ++# Whether we need a single -rpath flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 ++ ++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++# resulting binary. ++hardcode_direct=$hardcode_direct_F77 ++ ++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the ++# resulting binary. ++hardcode_minus_L=$hardcode_minus_L_F77 ++ ++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into ++# the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 ++ ++# Set to yes if building a shared library automatically hardcodes DIR into the library ++# and all subsequent libraries and executables linked against it. ++hardcode_automatic=$hardcode_automatic_F77 ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at relink time. ++variables_saved_for_relink="$variables_saved_for_relink" ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs_F77 ++ ++# Compile-time system search path for libraries ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path ++ ++# Set to yes if exported symbols are required. ++always_export_symbols=$always_export_symbols_F77 ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds_F77 ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms_F77 ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms_F77 ++ ++# ### END LIBTOOL TAG CONFIG: $tagname ++ ++__EOF__ ++ ++ ++else ++ # If there is no Makefile yet, we rely on a make rule to execute ++ # `config.status --recheck' to rerun these tests and create the ++ # libtool script then. ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi ++fi ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++CC="$lt_save_CC" ++ ++ else ++ tagname="" ++ fi ++ ;; ++ ++ GCJ) ++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then ++ ++ ++# Source file extension for Java test sources. ++ac_ext=java ++ ++# Object file extension for compiled Java test sources. ++objext=o ++objext_GCJ=$objext ++ ++# Code to be used in simple compile tests ++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) {}; }' ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++# save warnings/boilerplate of simple test code ++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* ++ ++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 -r conftest* ++ ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${GCJ-"gcj"} ++compiler=$CC ++compiler_GCJ=$CC ++for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ ++# GCJ did not exist at the time GCC didn't implicitly link libc in. ++archive_cmds_need_lc_GCJ=no ++ ++old_archive_cmds_GCJ=$old_archive_cmds ++ ++ ++lt_prog_compiler_no_builtin_flag_GCJ= ++ ++if test "$GCC" = yes; then ++ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' ++ ++ ++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_rtti_exceptions=no ++ ac_outfile=conftest.$ac_objext ++ 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. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:__oline__: \$? = $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. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_rtti_exceptions=yes ++ fi ++ fi ++ $rm conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++ ++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then ++ lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" ++else ++ : ++fi ++ ++fi ++ ++lt_prog_compiler_wl_GCJ= ++lt_prog_compiler_pic_GCJ= ++lt_prog_compiler_static_GCJ= ++ ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ++ ++ if test "$GCC" = yes; then ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ lt_prog_compiler_static_GCJ='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ 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 ++ ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic_GCJ='-fno-common' ++ ;; ++ ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ lt_prog_compiler_can_build_shared_GCJ=no ++ enable_shared=no ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic_GCJ=-Kconform_pic ++ fi ++ ;; ++ ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic_GCJ='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ *) ++ lt_prog_compiler_pic_GCJ='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ else ++ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ lt_prog_compiler_pic_GCJ='-qnocommon' ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ ;; ++ esac ++ ;; ++ ++ 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). ++ ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic_GCJ='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ # PIC (with -KPIC) is the default. ++ lt_prog_compiler_static_GCJ='-non_shared' ++ ;; ++ ++ newsos6) ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ icc* | ecc*) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ lt_prog_compiler_pic_GCJ='-fpic' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ ;; ++ ccc*) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ # 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 ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ # All OSF/1 code is PIC. ++ 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' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ lt_prog_compiler_wl_GCJ='-Qoption ld ';; ++ *) ++ lt_prog_compiler_wl_GCJ='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ lt_prog_compiler_wl_GCJ='-Qoption ld ' ++ lt_prog_compiler_pic_GCJ='-PIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ lt_prog_compiler_pic_GCJ='-Kconform_pic' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ lt_prog_compiler_pic_GCJ='-KPIC' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ ;; ++ ++ unicos*) ++ lt_prog_compiler_wl_GCJ='-Wl,' ++ lt_prog_compiler_can_build_shared_GCJ=no ++ ;; ++ ++ uts4*) ++ lt_prog_compiler_pic_GCJ='-pic' ++ lt_prog_compiler_static_GCJ='-Bstatic' ++ ;; ++ ++ *) ++ lt_prog_compiler_can_build_shared_GCJ=no ++ ;; ++ esac ++ fi ++ ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$lt_prog_compiler_pic_GCJ"; then ++ ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_pic_works_GCJ=no ++ ac_outfile=conftest.$ac_objext ++ 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. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:__oline__: \$? = $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. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works_GCJ=yes ++ fi ++ fi ++ $rm conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } ++ ++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then ++ case $lt_prog_compiler_pic_GCJ in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; ++ esac ++else ++ lt_prog_compiler_pic_GCJ= ++ lt_prog_compiler_can_build_shared_GCJ=no ++fi ++ ++fi ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic_GCJ= ++ ;; ++ *) ++ lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" ++ ;; ++esac ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_static_works_GCJ=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ 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 ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works_GCJ=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works_GCJ=yes ++ fi ++ fi ++ $rm -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } ++ ++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then ++ : ++else ++ lt_prog_compiler_static_GCJ= ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } ++if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_prog_compiler_c_o_GCJ=no ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ 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 ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:__oline__: \$? = $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 ++ # So say no if there are warnings ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o_GCJ=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out ++ cd .. ++ rmdir conftest ++ $rm conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } ++ ++ ++hard_links="nottested" ++if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ hard_links=yes ++ $rm conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } ++ if test "$hard_links" = no; then ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++ ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ++ ++ runpath_var= ++ allow_undefined_flag_GCJ= ++ enable_shared_with_static_runtimes_GCJ=no ++ archive_cmds_GCJ= ++ archive_expsym_cmds_GCJ= ++ old_archive_From_new_cmds_GCJ= ++ old_archive_from_expsyms_cmds_GCJ= ++ export_dynamic_flag_spec_GCJ= ++ whole_archive_flag_spec_GCJ= ++ thread_safe_flag_spec_GCJ= ++ hardcode_libdir_flag_spec_GCJ= ++ hardcode_libdir_flag_spec_ld_GCJ= ++ hardcode_libdir_separator_GCJ= ++ hardcode_direct_GCJ=no ++ hardcode_minus_L_GCJ=no ++ hardcode_shlibpath_var_GCJ=unsupported ++ link_all_deplibs_GCJ=unknown ++ hardcode_automatic_GCJ=no ++ module_cmds_GCJ= ++ module_expsym_cmds_GCJ= ++ always_export_symbols_GCJ=no ++ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ include_expsyms_GCJ= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # it will be wrapped by ` (' and `)$', so one must not match beginning or ++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++ # as well as any symbol that contains `d'. ++ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++ # platforms (ab)use it in PIC code, but their linkers get confused if ++ # the symbol is explicitly referenced. Since portable code cannot ++ # rely on this symbol name, it's probably fine to never include it in ++ # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++ extract_expsyms_cmds= ++ # Just being paranoid about ensuring that cc_basename is set. ++ for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ case $host_os in ++ cygwin* | mingw* | pw32*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac ++ ++ ld_shlibs_GCJ=yes ++ if test "$with_gnu_ld" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' ++ ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' ++ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec_GCJ= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>/dev/null` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix[3-9]*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ ld_shlibs_GCJ=no ++ cat <&2 ++ ++*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. ++ ++EOF ++ fi ++ ;; ++ ++ amigaos*) ++ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec_GCJ='-L$libdir' ++ hardcode_minus_L_GCJ=yes ++ ++ # Samuel A. Falvo II reports ++ # that the semantics of dynamic libraries on AmigaOS, at least up ++ # to version 4, is to share data among multiple programs linked ++ # with the same dynamic library. Since this doesn't match the ++ # behavior of shared libraries on other platforms, we can't use ++ # them. ++ ld_shlibs_GCJ=no ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag_GCJ=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ ld_shlibs_GCJ=no ++ fi ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec_GCJ='-L$libdir' ++ 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/'\'' -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' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ ld_shlibs_GCJ=no ++ fi ++ ;; ++ ++ interix[3-9]*) ++ hardcode_direct_GCJ=no ++ hardcode_shlibpath_var_GCJ=no ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_GCJ='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ 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' ++ ;; ++ ++ 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 ++ pgcc*) # Portland Group C compiler ++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ esac ++ 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 '"$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* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; ++ ++ solaris*) ++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++ ld_shlibs_GCJ=no ++ cat <&2 ++ ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++EOF ++ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs_GCJ=no ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) ++ ld_shlibs_GCJ=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ ld_shlibs_GCJ=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ sunos4*) ++ archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ hardcode_direct_GCJ=yes ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs_GCJ=no ++ fi ++ ;; ++ esac ++ ++ if test "$ld_shlibs_GCJ" = no; then ++ runpath_var= ++ hardcode_libdir_flag_spec_GCJ= ++ export_dynamic_flag_spec_GCJ= ++ whole_archive_flag_spec_GCJ= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ allow_undefined_flag_GCJ=unsupported ++ always_export_symbols_GCJ=yes ++ archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ hardcode_minus_L_GCJ=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ hardcode_direct_GCJ=unsupported ++ fi ++ ;; ++ ++ aix[4-9]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ else ++ export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ archive_cmds_GCJ='' ++ hardcode_direct_GCJ=yes ++ hardcode_libdir_separator_GCJ=':' ++ link_all_deplibs_GCJ=yes ++ ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[012]|aix4.[012].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ hardcode_direct_GCJ=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L_GCJ=yes ++ hardcode_libdir_flag_spec_GCJ='-L$libdir' ++ hardcode_libdir_separator_GCJ= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ always_export_symbols_GCJ=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ allow_undefined_flag_GCJ='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 "$lt_aix_libpath_sed"` ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++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 ++ ++ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" ++ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag_GCJ="-z nodefs" ++ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 "$lt_aix_libpath_sed"` ++fi ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++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 ++ ++ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ no_undefined_flag_GCJ=' ${wl}-bernotok' ++ allow_undefined_flag_GCJ=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec_GCJ='$convenience' ++ archive_cmds_need_lc_GCJ=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ amigaos*) ++ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec_GCJ='-L$libdir' ++ hardcode_minus_L_GCJ=yes ++ # see comment about different semantics on the GNU ld section ++ ld_shlibs_GCJ=no ++ ;; ++ ++ bsdi[45]*) ++ export_dynamic_flag_spec_GCJ=-rdynamic ++ ;; ++ ++ cygwin* | mingw* | pw32*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ hardcode_libdir_flag_spec_GCJ=' ' ++ allow_undefined_flag_GCJ=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # 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' ++ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' ++ enable_shared_with_static_runtimes_GCJ=yes ++ ;; ++ ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[012]) ++ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[012]) ++ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ archive_cmds_need_lc_GCJ=no ++ hardcode_direct_GCJ=no ++ hardcode_automatic_GCJ=yes ++ hardcode_shlibpath_var_GCJ=unsupported ++ whole_archive_flag_spec_GCJ='' ++ link_all_deplibs_GCJ=yes ++ if test "$GCC" = yes ; then ++ output_verbose_link_cmd='echo' ++ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ else ++ 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` $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 $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}' ++ ;; ++ *) ++ ld_shlibs_GCJ=no ++ ;; ++ esac ++ fi ++ ;; ++ ++ dgux*) ++ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_GCJ='-L$libdir' ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ freebsd1*) ++ ld_shlibs_GCJ=no ++ ;; ++ ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ hardcode_libdir_flag_spec_GCJ='-R$libdir' ++ hardcode_direct_GCJ=yes ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct_GCJ=yes ++ hardcode_minus_L_GCJ=yes ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec_GCJ='-R$libdir' ++ hardcode_direct_GCJ=yes ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ hpux9*) ++ if test "$GCC" = yes; then ++ archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_GCJ=: ++ hardcode_direct_GCJ=yes ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L_GCJ=yes ++ export_dynamic_flag_spec_GCJ='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_GCJ=: ++ ++ hardcode_direct_GCJ=yes ++ export_dynamic_flag_spec_GCJ='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L_GCJ=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_GCJ=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' ++ hardcode_direct_GCJ=no ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ *) ++ hardcode_direct_GCJ=yes ++ export_dynamic_flag_spec_GCJ='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L_GCJ=yes ++ ;; ++ esac ++ fi ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' ++ fi ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_GCJ=: ++ link_all_deplibs_GCJ=yes ++ ;; ++ ++ 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 ++ archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ hardcode_libdir_flag_spec_GCJ='-R$libdir' ++ hardcode_direct_GCJ=yes ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ newsos6) ++ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct_GCJ=yes ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_GCJ=: ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ openbsd*) ++ 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 ++ ld_shlibs_GCJ=no ++ fi ++ ;; ++ ++ os2*) ++ hardcode_libdir_flag_spec_GCJ='-L$libdir' ++ hardcode_minus_L_GCJ=yes ++ allow_undefined_flag_GCJ=unsupported ++ archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ ;; ++ ++ osf3*) ++ if test "$GCC" = yes; then ++ allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ allow_undefined_flag_GCJ=' -expect_unresolved \*' ++ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_GCJ=: ++ ;; ++ ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' ++ else ++ allow_undefined_flag_GCJ=' -expect_unresolved \*' ++ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++ ++ # Both c and cxx compiler support -rpath directly ++ hardcode_libdir_flag_spec_GCJ='-rpath $libdir' ++ fi ++ hardcode_libdir_separator_GCJ=: ++ ;; ++ ++ solaris*) ++ no_undefined_flag_GCJ=' -z text' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ else ++ wlarc='' ++ archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ fi ++ hardcode_libdir_flag_spec_GCJ='-R$libdir' ++ hardcode_shlibpath_var_GCJ=no ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ # 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?) ++ 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 ++ ;; ++ ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ hardcode_libdir_flag_spec_GCJ='-L$libdir' ++ hardcode_direct_GCJ=yes ++ hardcode_minus_L_GCJ=yes ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ sysv4) ++ case $host_vendor in ++ sni) ++ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct_GCJ=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ reload_cmds_GCJ='$CC -r -o $output$reload_objs' ++ hardcode_direct_GCJ=no ++ ;; ++ motorola) ++ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ sysv4.3*) ++ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var_GCJ=no ++ export_dynamic_flag_spec_GCJ='-Bexport' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var_GCJ=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ ld_shlibs_GCJ=yes ++ fi ++ ;; ++ ++ 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 ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ no_undefined_flag_GCJ='${wl}-z,text' ++ allow_undefined_flag_GCJ='${wl}-z,nodefs' ++ archive_cmds_need_lc_GCJ=no ++ hardcode_shlibpath_var_GCJ=no ++ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ hardcode_libdir_separator_GCJ=':' ++ link_all_deplibs_GCJ=yes ++ export_dynamic_flag_spec_GCJ='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ uts4*) ++ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec_GCJ='-L$libdir' ++ hardcode_shlibpath_var_GCJ=no ++ ;; ++ ++ *) ++ ld_shlibs_GCJ=no ++ ;; ++ esac ++ fi ++ ++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 ++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } ++test "$ld_shlibs_GCJ" = no && can_build_shared=no ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$archive_cmds_need_lc_GCJ" in ++x|xyes) ++ # Assume -lc should be added ++ archive_cmds_need_lc_GCJ=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $archive_cmds_GCJ in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ { 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* ++ echo "$lt_simple_compile_test_code" > 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); } 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$lt_prog_compiler_wl_GCJ ++ pic_flag=$lt_prog_compiler_pic_GCJ ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ ++ allow_undefined_flag_GCJ= ++ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ then ++ archive_cmds_need_lc_GCJ=no ++ else ++ archive_cmds_need_lc_GCJ=yes ++ fi ++ allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $rm conftest* ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ++ ;; ++ esac ++ fi ++ ;; ++esac ++ ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++ ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix[4-9]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[01] | aix4.[01].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[45]*) ++ version_type=linux ++ 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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $rm \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++ ;; ++ mingw*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ 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 ';[c-zC-Z]:/' >/dev/null; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ 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 ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ 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 ++ ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[01]* | freebsdelf3.[01]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ ++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++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 ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; ++ ++interix[3-9]*) ++ 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' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # 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>/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 ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++netbsdelf*-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='NetBSD ld.elf_so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++nto-qnx*) ++ 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=yes ++ ;; ++ ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[89] | openbsd2.[89].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; ++ ++rdos*) ++ dynamic_linker=no ++ ;; ++ ++solaris*) ++ 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=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ 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 ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++uts4*) ++ version_type=linux ++ 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 ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } ++test "$dynamic_linker" = no && can_build_shared=no ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++fi ++ ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++fi ++ ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } ++hardcode_action_GCJ= ++if test -n "$hardcode_libdir_flag_spec_GCJ" || \ ++ test -n "$runpath_var_GCJ" || \ ++ test "X$hardcode_automatic_GCJ" = "Xyes" ; then ++ ++ # We can hardcode non-existant directories. ++ if test "$hardcode_direct_GCJ" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && ++ test "$hardcode_minus_L_GCJ" != no; then ++ # Linking always hardcodes the temporary library directory. ++ hardcode_action_GCJ=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ hardcode_action_GCJ=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ hardcode_action_GCJ=unsupported ++fi ++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 ++echo "${ECHO_T}$hardcode_action_GCJ" >&6; } ++ ++if test "$hardcode_action_GCJ" = relink; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++ ++ ++# The else clause should only fire when bootstrapping the ++# libtool distribution, otherwise you forgot to ship ltmain.sh ++# with your package, and you will get complaints that there are ++# no rules to generate ltmain.sh. ++if test -f "$ltmain"; then ++ # 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 ++ setopt NO_GLOB_SUBST ++ fi ++ # Now quote all the things that may contain metacharacters while being ++ # careful not to overquote the AC_SUBSTed values. We take copies of the ++ # variables and quote the copies for generation of the libtool script. ++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ ++ SED SHELL STRIP \ ++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ ++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ ++ deplibs_check_method reload_flag reload_cmds need_locks \ ++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ ++ lt_cv_sys_global_symbol_to_c_name_address \ ++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ ++ old_postinstall_cmds old_postuninstall_cmds \ ++ compiler_GCJ \ ++ CC_GCJ \ ++ LD_GCJ \ ++ lt_prog_compiler_wl_GCJ \ ++ lt_prog_compiler_pic_GCJ \ ++ lt_prog_compiler_static_GCJ \ ++ lt_prog_compiler_no_builtin_flag_GCJ \ ++ export_dynamic_flag_spec_GCJ \ ++ thread_safe_flag_spec_GCJ \ ++ whole_archive_flag_spec_GCJ \ ++ enable_shared_with_static_runtimes_GCJ \ ++ old_archive_cmds_GCJ \ ++ old_archive_from_new_cmds_GCJ \ ++ predep_objects_GCJ \ ++ postdep_objects_GCJ \ ++ predeps_GCJ \ ++ postdeps_GCJ \ ++ compiler_lib_search_path_GCJ \ ++ compiler_lib_search_dirs_GCJ \ ++ archive_cmds_GCJ \ ++ archive_expsym_cmds_GCJ \ ++ postinstall_cmds_GCJ \ ++ postuninstall_cmds_GCJ \ ++ old_archive_from_expsyms_cmds_GCJ \ ++ allow_undefined_flag_GCJ \ ++ no_undefined_flag_GCJ \ ++ export_symbols_cmds_GCJ \ ++ hardcode_libdir_flag_spec_GCJ \ ++ hardcode_libdir_flag_spec_ld_GCJ \ ++ hardcode_libdir_separator_GCJ \ ++ hardcode_automatic_GCJ \ ++ 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 ++ ++ case $var in ++ old_archive_cmds_GCJ | \ ++ old_archive_from_new_cmds_GCJ | \ ++ archive_cmds_GCJ | \ ++ archive_expsym_cmds_GCJ | \ ++ module_cmds_GCJ | \ ++ module_expsym_cmds_GCJ | \ ++ old_archive_from_expsyms_cmds_GCJ | \ ++ export_symbols_cmds_GCJ | \ ++ extract_expsyms_cmds | reload_cmds | finish_cmds | \ ++ postinstall_cmds | postuninstall_cmds | \ ++ old_postinstall_cmds | old_postuninstall_cmds | \ ++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) ++ # Double-quote double-evaled strings. ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ++ ;; ++ *) ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ++ ;; ++ esac ++ done ++ ++ case $lt_echo in ++ *'\$0 --fallback-echo"') ++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` ++ ;; ++ esac ++ ++cfgfile="$ofile" ++ ++ cat <<__EOF__ >> "$cfgfile" ++# ### BEGIN LIBTOOL TAG CONFIG: $tagname ++ ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++ ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared ++ ++# Whether or not to build static libraries. ++build_old_libs=$enable_static ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc_GCJ ++ ++# Whether or not to disallow shared libs when runtime libs are static ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ ++ ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install ++ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os ++ ++# An echo program that does not interpret backslashes. ++echo=$lt_echo ++ ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS ++ ++# A C compiler. ++LTCC=$lt_LTCC ++ ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ ++# A language-specific compiler. ++CC=$lt_compiler_GCJ ++ ++# Is the compiler the GNU C compiler? ++with_gcc=$GCC_GCJ ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# The linker used to build libraries. ++LD=$lt_LD_GCJ ++ ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S ++ ++# A BSD-compatible nm program. ++NM=$lt_NM ++ ++# A symbol stripping program ++STRIP=$lt_STRIP ++ ++# Used to examine libraries when file_magic_cmd begins "file" ++MAGIC_CMD=$MAGIC_CMD ++ ++# Used on cygwin: DLL creation program. ++DLLTOOL="$DLLTOOL" ++ ++# Used on cygwin: object dumper. ++OBJDUMP="$OBJDUMP" ++ ++# Used on cygwin: assembler. ++AS="$AS" ++ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_GCJ ++ ++# Object file suffix (normally "o"). ++objext="$ac_objext" ++ ++# Old archive suffix (normally "a"). ++libext="$libext" ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds='$shrext_cmds' ++ ++# Executable file suffix (normally ""). ++exeext="$exeext" ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic_GCJ ++pic_mode=$pic_mode ++ ++# What is the maximum length of a command? ++max_cmd_len=$lt_cv_sys_max_cmd_len ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ ++ ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Do we need the lib prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static_GCJ ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ ++ ++# Compiler flag to generate thread-safe objects. ++thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME. ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Commands used to build and install an old-style archive. ++RANLIB=$lt_RANLIB ++old_archive_cmds=$lt_old_archive_cmds_GCJ ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ ++ ++# Commands used to build and install a shared archive. ++archive_cmds=$lt_archive_cmds_GCJ ++archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ ++postinstall_cmds=$lt_postinstall_cmds ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to build a loadable module (assumed same as above if empty) ++module_cmds=$lt_module_cmds_GCJ ++module_expsym_cmds=$lt_module_expsym_cmds_GCJ ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predep_objects=$lt_predep_objects_GCJ ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdep_objects=$lt_postdep_objects_GCJ ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predeps=$lt_predeps_GCJ ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdeps=$lt_postdeps_GCJ ++ ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == file_magic. ++file_magic_cmd=$lt_file_magic_cmd ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag_GCJ ++ ++# Flag that forces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag_GCJ ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# Same as above, but a single script fragment to be evaled but not shown. ++finish_eval=$lt_finish_eval ++ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ ++# Transform the output of nm in a proper C declaration ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ ++# Transform the output of nm in a C name address pair ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ ++# This is the shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# This is the shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action_GCJ ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ ++ ++# If ld is used when linking, flag to hardcode \$libdir into ++# a binary during linking. This must work even if \$libdir does ++# not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ ++ ++# Whether we need a single -rpath flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ ++ ++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++# resulting binary. ++hardcode_direct=$hardcode_direct_GCJ ++ ++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the ++# resulting binary. ++hardcode_minus_L=$hardcode_minus_L_GCJ ++ ++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into ++# the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ ++ ++# Set to yes if building a shared library automatically hardcodes DIR into the library ++# and all subsequent libraries and executables linked against it. ++hardcode_automatic=$hardcode_automatic_GCJ ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at relink time. ++variables_saved_for_relink="$variables_saved_for_relink" ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs_GCJ ++ ++# Compile-time system search path for libraries ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path ++ ++# Set to yes if exported symbols are required. ++always_export_symbols=$always_export_symbols_GCJ ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds_GCJ ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms_GCJ ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms_GCJ ++ ++# ### END LIBTOOL TAG CONFIG: $tagname ++ ++__EOF__ ++ ++ ++else ++ # If there is no Makefile yet, we rely on a make rule to execute ++ # `config.status --recheck' to rerun these tests and create the ++ # libtool script then. ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi ++fi ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++CC="$lt_save_CC" ++ ++ else ++ tagname="" ++ fi ++ ;; ++ ++ RC) ++ ++ ++# Source file extension for RC test sources. ++ac_ext=rc ++ ++# Object file extension for compiled RC test sources. ++objext=o ++objext_RC=$objext ++ ++# Code to be used in simple compile tests ++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" ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++# save warnings/boilerplate of simple test code ++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* ++ ++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 -r conftest* ++ ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${RC-"windres"} ++compiler=$CC ++compiler_RC=$CC ++for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++lt_cv_prog_compiler_c_o_RC=yes ++ ++# The else clause should only fire when bootstrapping the ++# libtool distribution, otherwise you forgot to ship ltmain.sh ++# with your package, and you will get complaints that there are ++# no rules to generate ltmain.sh. ++if test -f "$ltmain"; then ++ # 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 ++ setopt NO_GLOB_SUBST ++ fi ++ # Now quote all the things that may contain metacharacters while being ++ # careful not to overquote the AC_SUBSTed values. We take copies of the ++ # variables and quote the copies for generation of the libtool script. ++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ ++ SED SHELL STRIP \ ++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ ++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ ++ deplibs_check_method reload_flag reload_cmds need_locks \ ++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ ++ lt_cv_sys_global_symbol_to_c_name_address \ ++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ ++ old_postinstall_cmds old_postuninstall_cmds \ ++ compiler_RC \ ++ CC_RC \ ++ LD_RC \ ++ lt_prog_compiler_wl_RC \ ++ lt_prog_compiler_pic_RC \ ++ lt_prog_compiler_static_RC \ ++ lt_prog_compiler_no_builtin_flag_RC \ ++ export_dynamic_flag_spec_RC \ ++ thread_safe_flag_spec_RC \ ++ whole_archive_flag_spec_RC \ ++ enable_shared_with_static_runtimes_RC \ ++ old_archive_cmds_RC \ ++ old_archive_from_new_cmds_RC \ ++ predep_objects_RC \ ++ postdep_objects_RC \ ++ predeps_RC \ ++ postdeps_RC \ ++ compiler_lib_search_path_RC \ ++ compiler_lib_search_dirs_RC \ ++ archive_cmds_RC \ ++ archive_expsym_cmds_RC \ ++ postinstall_cmds_RC \ ++ postuninstall_cmds_RC \ ++ old_archive_from_expsyms_cmds_RC \ ++ allow_undefined_flag_RC \ ++ no_undefined_flag_RC \ ++ export_symbols_cmds_RC \ ++ hardcode_libdir_flag_spec_RC \ ++ hardcode_libdir_flag_spec_ld_RC \ ++ hardcode_libdir_separator_RC \ ++ hardcode_automatic_RC \ ++ 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 ++ ++ case $var in ++ old_archive_cmds_RC | \ ++ old_archive_from_new_cmds_RC | \ ++ archive_cmds_RC | \ ++ archive_expsym_cmds_RC | \ ++ module_cmds_RC | \ ++ module_expsym_cmds_RC | \ ++ old_archive_from_expsyms_cmds_RC | \ ++ export_symbols_cmds_RC | \ ++ extract_expsyms_cmds | reload_cmds | finish_cmds | \ ++ postinstall_cmds | postuninstall_cmds | \ ++ old_postinstall_cmds | old_postuninstall_cmds | \ ++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) ++ # Double-quote double-evaled strings. ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ++ ;; ++ *) ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ++ ;; ++ esac ++ done ++ ++ case $lt_echo in ++ *'\$0 --fallback-echo"') ++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` ++ ;; ++ esac ++ ++cfgfile="$ofile" ++ ++ cat <<__EOF__ >> "$cfgfile" ++# ### BEGIN LIBTOOL TAG CONFIG: $tagname ++ ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++ ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared ++ ++# Whether or not to build static libraries. ++build_old_libs=$enable_static ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc_RC ++ ++# Whether or not to disallow shared libs when runtime libs are static ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC ++ ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install ++ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os ++ ++# An echo program that does not interpret backslashes. ++echo=$lt_echo ++ ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS ++ ++# A C compiler. ++LTCC=$lt_LTCC ++ ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS ++ ++# A language-specific compiler. ++CC=$lt_compiler_RC ++ ++# Is the compiler the GNU C compiler? ++with_gcc=$GCC_RC ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# The linker used to build libraries. ++LD=$lt_LD_RC ++ ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S ++ ++# A BSD-compatible nm program. ++NM=$lt_NM ++ ++# A symbol stripping program ++STRIP=$lt_STRIP ++ ++# Used to examine libraries when file_magic_cmd begins "file" ++MAGIC_CMD=$MAGIC_CMD ++ ++# Used on cygwin: DLL creation program. ++DLLTOOL="$DLLTOOL" ++ ++# Used on cygwin: object dumper. ++OBJDUMP="$OBJDUMP" ++ ++# Used on cygwin: assembler. ++AS="$AS" ++ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_RC ++ ++# Object file suffix (normally "o"). ++objext="$ac_objext" ++ ++# Old archive suffix (normally "a"). ++libext="$libext" ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds='$shrext_cmds' ++ ++# Executable file suffix (normally ""). ++exeext="$exeext" ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic_RC ++pic_mode=$pic_mode ++ ++# What is the maximum length of a command? ++max_cmd_len=$lt_cv_sys_max_cmd_len ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC ++ ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Do we need the lib prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static_RC ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC ++ ++# Compiler flag to generate thread-safe objects. ++thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME. ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Commands used to build and install an old-style archive. ++RANLIB=$lt_RANLIB ++old_archive_cmds=$lt_old_archive_cmds_RC ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC ++ ++# Commands used to build and install a shared archive. ++archive_cmds=$lt_archive_cmds_RC ++archive_expsym_cmds=$lt_archive_expsym_cmds_RC ++postinstall_cmds=$lt_postinstall_cmds ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to build a loadable module (assumed same as above if empty) ++module_cmds=$lt_module_cmds_RC ++module_expsym_cmds=$lt_module_expsym_cmds_RC ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predep_objects=$lt_predep_objects_RC ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdep_objects=$lt_postdep_objects_RC ++ ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predeps=$lt_predeps_RC ++ ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdeps=$lt_postdeps_RC ++ ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path_RC ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == file_magic. ++file_magic_cmd=$lt_file_magic_cmd ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag_RC ++ ++# Flag that forces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag_RC ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# Same as above, but a single script fragment to be evaled but not shown. ++finish_eval=$lt_finish_eval ++ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ ++# Transform the output of nm in a proper C declaration ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ ++# Transform the output of nm in a C name address pair ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ ++# This is the shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# This is the shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action_RC ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC ++ ++# If ld is used when linking, flag to hardcode \$libdir into ++# a binary during linking. This must work even if \$libdir does ++# not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC ++ ++# Whether we need a single -rpath flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC ++ ++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++# resulting binary. ++hardcode_direct=$hardcode_direct_RC ++ ++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the ++# resulting binary. ++hardcode_minus_L=$hardcode_minus_L_RC ++ ++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into ++# the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var_RC ++ ++# Set to yes if building a shared library automatically hardcodes DIR into the library ++# and all subsequent libraries and executables linked against it. ++hardcode_automatic=$hardcode_automatic_RC ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at relink time. ++variables_saved_for_relink="$variables_saved_for_relink" ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs_RC ++ ++# Compile-time system search path for libraries ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path ++ ++# Set to yes if exported symbols are required. ++always_export_symbols=$always_export_symbols_RC ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds_RC ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms_RC ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms_RC ++ ++# ### END LIBTOOL TAG CONFIG: $tagname ++ ++__EOF__ ++ ++ ++else ++ # If there is no Makefile yet, we rely on a make rule to execute ++ # `config.status --recheck' to rerun these tests and create the ++ # libtool script then. ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi ++fi ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++CC="$lt_save_CC" ++ ++ ;; ++ ++ *) ++ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 ++echo "$as_me: error: Unsupported tag name: $tagname" >&2;} ++ { (exit 1); exit 1; }; } ++ ;; ++ esac ++ ++ # Append the new tag name to the list of available tags. ++ if test -n "$tagname" ; then ++ available_tags="$available_tags $tagname" ++ fi ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ++ # Now substitute the updated list of available tags. ++ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then ++ mv "${ofile}T" "$ofile" ++ chmod +x "$ofile" ++ else ++ rm -f "${ofile}T" ++ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 ++echo "$as_me: error: unable to update list of available tagged configurations." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++fi ++ ++ ++ ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++ ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++ ++# Prevent multiple expansion ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# Make sure we use 64-bit versions of various file stuff. ++# Check whether --enable-largefile was given. ++if test "${enable_largefile+set}" = set; then ++ enableval=$enable_largefile; ++fi ++ ++if test "$enable_largefile" != no; then ++ ++ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 ++echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } ++if test "${ac_cv_sys_largefile_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_sys_largefile_CC=no ++ if test "$GCC" != yes; then ++ ac_save_CC=$CC ++ while :; do ++ # IRIX 6.2 and later do not support large files by default, ++ # so use the C compiler's -n32 option if that helps. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext ++ CC="$CC -n32" ++ rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext ++ break ++ done ++ CC=$ac_save_CC ++ rm -f conftest.$ac_ext ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 ++echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } ++ if test "$ac_cv_sys_largefile_CC" != no; then ++ CC=$CC$ac_cv_sys_largefile_CC ++ fi ++ ++ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } ++if test "${ac_cv_sys_file_offset_bits+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@define _FILE_OFFSET_BITS 64 ++@%:@include ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++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; } ++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 ++;; ++esac ++rm -f conftest* ++ 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 ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@define _LARGE_FILES 1 ++@%:@include ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++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; } ++case $ac_cv_sys_large_files in #( ++ no | unknown) ;; ++ *) ++cat >>confdefs.h <<_ACEOF ++@%:@define _LARGE_FILES $ac_cv_sys_large_files ++_ACEOF ++;; ++esac ++rm -f conftest* ++ fi ++fi ++ ++ ++# By default we simply use the C compiler to build assembly code. ++ ++: ${CCAS='$(CC)'} ++# Set ASFLAGS if not already set. ++: ${CCASFLAGS='$(CFLAGS)'} ++ ++ ++# Extract the first word of "nm", so it can be a program name with args. ++set dummy nm; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_NM+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $NM in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_NM="$NM" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" ++ ;; ++esac ++fi ++NM=$ac_cv_path_NM ++if test -n "$NM"; then ++ { echo "$as_me:$LINENO: result: $NM" >&5 ++echo "${ECHO_T}$NM" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ ++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } ++ # Check whether --enable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi ++ ++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } ++ ++ ++if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ ++ MAINT=$MAINTAINER_MODE_TRUE ++ ++ ++ ++{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 ++echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } ++case "$host" in ++ *-*-mingw*|*-*-cygwin*) ++ platform_win32=yes ++ ;; ++ *) ++ platform_win32=no ++ ;; ++esac ++{ echo "$as_me:$LINENO: result: $platform_win32" >&5 ++echo "${ECHO_T}$platform_win32" >&6; } ++ ++ ++if test "$platform_win32" = "yes"; then ++ PLATFORM_WIN32_TRUE= ++ PLATFORM_WIN32_FALSE='#' ++else ++ PLATFORM_WIN32_TRUE='#' ++ PLATFORM_WIN32_FALSE= ++fi ++ ++ ++ ++ ++if test "$os_win32" = "yes"; then ++ OS_WIN32_TRUE= ++ OS_WIN32_FALSE='#' ++else ++ OS_WIN32_TRUE='#' ++ OS_WIN32_FALSE= ++fi ++ ++ ++ ++if test "$os_win32" != "yes"; then ++ OS_UNIX_TRUE= ++ OS_UNIX_FALSE='#' ++else ++ OS_UNIX_TRUE='#' ++ OS_UNIX_FALSE= ++fi ++ ++ ++ ++if test "$os_linux" = "yes"; then ++ OS_LINUX_TRUE= ++ OS_LINUX_FALSE='#' ++else ++ OS_LINUX_TRUE='#' ++ OS_LINUX_FALSE= ++fi ++ ++ ++if test "$os_win32" = "yes"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. ++set dummy ${ac_tool_prefix}windres; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_WINDRES+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$WINDRES"; then ++ ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++WINDRES=$ac_cv_prog_WINDRES ++if test -n "$WINDRES"; then ++ { echo "$as_me:$LINENO: result: $WINDRES" >&5 ++echo "${ECHO_T}$WINDRES" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_WINDRES"; then ++ ac_ct_WINDRES=$WINDRES ++ # Extract the first word of "windres", so it can be a program name with args. ++set dummy windres; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_WINDRES"; then ++ ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES ++if test -n "$ac_ct_WINDRES"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 ++echo "${ECHO_T}$ac_ct_WINDRES" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_WINDRES" = x; then ++ WINDRES="no" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ WINDRES=$ac_ct_WINDRES ++ fi ++else ++ WINDRES="$ac_cv_prog_WINDRES" ++fi ++ ++ if test "$WINDRES" = no; then ++ { { echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 ++echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ # Extract the first word of "lib.exe", so it can be a program name with args. ++set dummy lib.exe; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ms_librarian+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ms_librarian"; then ++ ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" ++fi ++fi ++ms_librarian=$ac_cv_prog_ms_librarian ++if test -n "$ms_librarian"; then ++ { echo "$as_me:$LINENO: result: $ms_librarian" >&5 ++echo "${ECHO_T}$ms_librarian" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++ ++ ++if test x$ms_librarian = xyes; then ++ MS_LIB_AVAILABLE_TRUE= ++ MS_LIB_AVAILABLE_FALSE='#' ++else ++ MS_LIB_AVAILABLE_TRUE='#' ++ MS_LIB_AVAILABLE_FALSE= ++fi ++ ++ ++ ++ ++# Check whether --enable-debug was given. ++if test "${enable_debug+set}" = set; then ++ enableval=$enable_debug; ++else ++ enable_debug=minimum ++fi ++ ++# Check whether --enable-shm was given. ++if test "${enable_shm+set}" = set; then ++ enableval=$enable_shm; ++else ++ enable_shm="yes" ++fi ++ ++# Check whether --enable-xkb was given. ++if test "${enable_xkb+set}" = set; then ++ enableval=$enable_xkb; ++else ++ enable_xkb="maybe" ++fi ++ ++# Check whether --enable-xinerama was given. ++if test "${enable_xinerama+set}" = set; then ++ enableval=$enable_xinerama; ++else ++ enable_xinerama="yes" ++fi ++ ++# Check whether --enable-rebuilds was given. ++if test "${enable_rebuilds+set}" = set; then ++ enableval=$enable_rebuilds; ++else ++ enable_rebuilds=yes ++fi ++ ++# Check whether --enable-visibility was given. ++if test "${enable_visibility+set}" = set; then ++ enableval=$enable_visibility; ++else ++ enable_visibility=yes ++fi ++ ++ ++ ++# Check whether --with-xinput was given. ++if test "${with_xinput+set}" = set; then ++ withval=$with_xinput; ++fi ++ ++ ++if test "$platform_win32" = yes; then ++ gdktarget=win32 ++else ++ gdktarget=x11 ++fi ++ ++ ++# Check whether --with-gdktarget was given. ++if test "${with_gdktarget+set}" = set; then ++ withval=$with_gdktarget; gdktarget=$with_gdktarget ++fi ++ ++ ++ ++case $gdktarget in ++ x11|win32|quartz|directfb) ;; ++ *) { { echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 ++echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} ++ { (exit 1); exit 1; }; };; ++esac ++ ++gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la ++gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la ++ ++ ++ ++ ++if test "x$enable_debug" = "xyes"; then ++ test "$cflags_set" = set || CFLAGS="$CFLAGS -g" ++ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" ++else ++ if test "x$enable_debug" = "xno"; then ++ GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" ++ else ++ GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS" ++ fi ++fi ++ ++ ++if test "x$enable_visibility" = "xno"; then ++ GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY" ++fi ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}" ++_ACEOF ++ ++ ++ ++# Build time sanity check... ++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } +# Just in case +sleep 1 +echo timestamp > conftest.file @@ -3558,362 +21528,18238 @@ Index: gtk+2.0-2.14.3/aclocal.m4 +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ if test "$[*]" = "X"; then ++ if test "$*" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file -+ if test "$[*]" != "X $srcdir/configure conftest.file" \ -+ && test "$[*]" != "X conftest.file $srcdir/configure"; then - -- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then -- : -- else -- no_glib=yes -- fi -- fi ++ if test "$*" != "X $srcdir/configure conftest.file" \ ++ && test "$*" != "X conftest.file $srcdir/configure"; then ++ + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+alias in your environment]) ++ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken ++alias in your environment" >&5 ++echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken ++alias in your environment" >&2;} ++ { (exit 1); exit 1; }; } + fi - -- if test x"$no_glib" = x ; then -- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` -- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -+ test "$[2]" = conftest.file ++ ++ test "$2" = conftest.file + ) +then + # Ok. + : +else -+ AC_MSG_ERROR([newly created file is older than distributed files! -+Check your system clock]) ++ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! ++Check your system clock" >&5 ++echo "$as_me: error: newly created file is older than distributed files! ++Check your system clock" >&2;} ++ { (exit 1); exit 1; }; } +fi -+AC_MSG_RESULT(yes)]) - -- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- if test "x$enable_glibtest" = "xyes" ; then -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $GLIB_CFLAGS" -- LIBS="$GLIB_LIBS $LIBS" --dnl --dnl Now check if the installed GLIB is sufficiently new. (Also sanity --dnl checks the results of pkg-config to some extent) --dnl -- rm -f conf.glibtest -- AC_TRY_RUN([ --#include --#include --#include -+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --int --main () --{ -- int major, minor, micro; -- char *tmp_version; -+# AM_PROG_INSTALL_STRIP -+# --------------------- -+# One issue with vendor `install' (even GNU) is that you can't -+# specify the program used to strip binaries. This is especially -+# annoying in cross-compiling environments, where the build's strip -+# is unlikely to handle the host's binaries. -+# Fortunately install-sh will honor a STRIPPROG variable, so we -+# always use install-sh in `make install-strip', and initialize -+# STRIPPROG with the value of the STRIP variable (set by the user). -+AC_DEFUN([AM_PROG_INSTALL_STRIP], -+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -+if test "$cross_compiling" != no; then -+ AC_CHECK_TOOL([STRIP], [strip], :) ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ ++# Checks for programs. ++{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } ++if test "${ac_cv_search_strerror+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char strerror (); ++int ++main () ++{ ++return strerror (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' cposix; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ +fi -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -+AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -- system ("touch conf.glibtest"); -+# Copyright (C) 2006 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - -- /* HP/UX 9 (%@#!) writes to sscanf strings */ -- tmp_version = g_strdup("$min_glib_version"); -- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", "$min_glib_version"); -- exit(1); -- } -+# _AM_SUBST_NOTMAKE(VARIABLE) -+# --------------------------- -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -+# This macro is traced by Automake. -+AC_DEFUN([_AM_SUBST_NOTMAKE]) - -- if ((glib_major_version != $glib_config_major_version) || -- (glib_minor_version != $glib_config_minor_version) || -- (glib_micro_version != $glib_config_micro_version)) -- { -- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -- glib_major_version, glib_minor_version, glib_micro_version); -- printf ("*** was found! If pkg-config was correct, then it is best\n"); -- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); -- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -- printf("*** required on your system.\n"); -- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -- printf("*** to point to the correct configuration files\n"); -- } -- else if ((glib_major_version != GLIB_MAJOR_VERSION) || -- (glib_minor_version != GLIB_MINOR_VERSION) || -- (glib_micro_version != GLIB_MICRO_VERSION)) -- { -- printf("*** GLIB header files (version %d.%d.%d) do not match\n", -- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -- printf("*** library (version %d.%d.%d)\n", -- glib_major_version, glib_minor_version, glib_micro_version); -- } -- else -- { -- if ((glib_major_version > major) || -- ((glib_major_version == major) && (glib_minor_version > minor)) || -- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -- { -- return 0; -- } -- else -- { -- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -- glib_major_version, glib_minor_version, glib_micro_version); -- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -- major, minor, micro); -- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -- printf("***\n"); -- printf("*** If you have already installed a sufficiently new version, this error\n"); -- printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -- printf("*** being found. The easiest way to fix this is to remove the old version\n"); -- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); -- printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -- printf("*** so that the correct libraries are found at run-time))\n"); -- } -- } -- return 1; --} --],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- if test "x$no_glib" = x ; then -- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) -- ifelse([$2], , :, [$2]) -- else -- AC_MSG_RESULT(no) -- if test "$PKG_CONFIG" = "no" ; then -- echo "*** A new enough version of pkg-config was not found." -- echo "*** See http://www.freedesktop.org/software/pkgconfig/" -- else -- if test -f conf.glibtest ; then -- : -- else -- echo "*** Could not run GLIB test program, checking why..." -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $GLIB_CFLAGS" -- LIBS="$LIBS $GLIB_LIBS" -- AC_TRY_LINK([ --#include --#include --], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -- [ 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" -- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -- echo "*** to the installed location Also, make sure you have run ldconfig if that" -- echo "*** is required on your system" -- echo "***" -- echo "*** If you have an old version installed, it is best to remove it, although" -- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -- [ echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- GLIB_CFLAGS="" -- GLIB_LIBS="" -- GLIB_GENMARSHAL="" -- GOBJECT_QUERY="" -- GLIB_MKENUMS="" -- ifelse([$3], , :, [$3]) -- fi -- AC_SUBST(GLIB_CFLAGS) -- AC_SUBST(GLIB_LIBS) -- AC_SUBST(GLIB_GENMARSHAL) -- AC_SUBST(GOBJECT_QUERY) -- AC_SUBST(GLIB_MKENUMS) -- rm -f conf.glibtest --]) -+# Check how to create a tarball. -*- Autoconf -*- - --dnl -*- mode: autoconf -*- -+# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - --# serial 1 -+# serial 2 - --dnl Usage: --dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) --AC_DEFUN([GTK_DOC_CHECK], --[ -- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -- dnl for overriding the documentation installation directory -- 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]) -+# _AM_PROG_TAR(FORMAT) -+# -------------------- -+# Check how to create a tarball in format FORMAT. -+# FORMAT should be one of `v7', `ustar', or `pax'. -+# -+# Substitute a variable $(am__tar) that is a command -+# writing to stdout a FORMAT-tarball containing the directory -+# $tardir. -+# tardir=directory && $(am__tar) > result.tar -+# -+# Substitute a variable $(am__untar) that extract such -+# a tarball read from stdin. -+# $(am__untar) < result.tar -+AC_DEFUN([_AM_PROG_TAR], -+[# Always define AMTAR for backward compatibility. -+AM_MISSING_PROG([AMTAR], [tar]) -+m4_if([$1], [v7], -+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], -+ [m4_case([$1], [ustar],, [pax],, -+ [m4_fatal([Unknown tar format])]) -+AC_MSG_CHECKING([how to create a $1 tar archive]) -+# Loop over all known methods to create a tar archive until one works. -+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -+_am_tools=${am_cv_prog_tar_$1-$_am_tools} -+# Do not fold the above two line into one, because Tru64 sh and -+# Solaris sh will not grok spaces in the rhs of `-'. -+for _am_tool in $_am_tools ++ ++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 ++fi ++done ++if test "${ac_cv_search_strerror+set}" = set; then ++ : ++else ++ ac_cv_search_strerror=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++echo "${ECHO_T}$ac_cv_search_strerror" >&6; } ++ac_res=$ac_cv_search_strerror ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ ++fi ++ ++ ++ ++ ++{ echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 ++echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6; } ++if test "${am_cv_prog_cc_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ am_cv_prog_cc_stdc=no ++ac_save_CC="$CC" ++# Don't try gcc -ansi; that turns off useful extensions and ++# breaks some systems' header files. ++# AIX -qlanglvl=ansi ++# Ultrix and OSF/1 -std1 ++# HP-UX 10.20 and later -Ae ++# HP-UX older versions -Aa -D_HPUX_SOURCE ++# SVR4 -Xc -D__EXTENSIONS__ ++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do -+ case $_am_tool in -+ gnutar) -+ for _am_tar in tar gnutar gtar; -+ do -+ AM_RUN_LOG([$_am_tar --version]) && break ++ CC="$ac_save_CC $ac_arg" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#include ++#include ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; ++ ++int ++main () ++{ ++ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++done ++CC="$ac_save_CC" ++ ++fi ++ ++if test -z "$am_cv_prog_cc_stdc"; then ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ++else ++ { echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 ++echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6; } ++fi ++case "x$am_cv_prog_cc_stdc" in ++ x|xno) ;; ++ *) CC="$CC $am_cv_prog_cc_stdc" ;; ++esac ++ ++# Find a good install program. We prefer a C program (faster), ++# so one script is as good as another. But avoid the broken or ++# incompatible versions: ++# SysV /etc/install, /usr/sbin/install ++# SunOS /usr/etc/install ++# IRIX /sbin/install ++# AIX /bin/install ++# AmigaOS /C/install, which installs bootblocks on floppy discs ++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag ++# AFS /usr/afsws/bin/install, which mishandles nonexistent args ++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" ++# OS/2's system install, which has a completely different semantic ++# ./install, which can be erroneously created by make from ./install.sh. ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } ++if test -z "$INSTALL"; then ++if test "${ac_cv_path_install+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in ++ ./ | .// | /cC/* | \ ++ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ++ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ /usr/ucb/* ) ;; ++ *) ++ # OSF1 and SCO ODT 3.0 have their own names for install. ++ # Don't use installbsd from OSF since it installs stuff as root ++ # 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_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. ++ : ++ elif test $ac_prog = install && ++ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # program-specific install script used by HP pwplus--don't use. ++ : ++ else ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi ++ fi ++ done + done -+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' -+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' -+ am__untar="$_am_tar -xf -" + ;; -+ plaintar) -+ # Must skip GNU tar: if it does not support --format= it doesn't create -+ # ustar tarball either. -+ (tar --version) >/dev/null 2>&1 && continue -+ am__tar='tar chf - "$$tardir"' -+ am__tar_='tar chf - "$tardir"' -+ am__untar='tar xf -' ++esac ++done ++IFS=$as_save_IFS ++ ++ ++fi ++ if test "${ac_cv_path_install+set}" = set; then ++ INSTALL=$ac_cv_path_install ++ else ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for INSTALL within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ INSTALL=$ac_install_sh ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } ++ ++# Use test -z because SunOS4 sh mishandles braces in ${var-val}. ++# It thinks the first close brace ends the variable substitution. ++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' ++ ++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' ++ ++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ++ ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh ++all: ++ @echo '@@@%%%=$(MAKE)=@@@%%%' ++_ACEOF ++# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac ++rm -f conftest.make ++fi ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ SET_MAKE= ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ SET_MAKE="MAKE=${MAKE-make}" ++fi ++ ++ ++if test "x$GCC" = "xyes"; then ++ case " $CFLAGS " in ++ *[\ \ ]-Wall[\ \ ]*) ;; ++ *) CFLAGS="$CFLAGS -Wall" ;; ++ esac ++ ++ if test "x$enable_ansi" = "xyes"; then ++ case " $CFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) CFLAGS="$CFLAGS -ansi" ;; ++ esac ++ ++ case " $CFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) CFLAGS="$CFLAGS -pedantic" ;; ++ esac ++ fi ++fi ++ ++CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" ++ ++# Ensure MSVC-compatible struct packing convention is used when ++# compiling for Win32 with gcc. ++# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while ++# gcc2 uses "-fnative-struct". ++if test x"$os_win32" = xyes; then ++ if test x"$GCC" = xyes; then ++ msnative_struct='' ++ { echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 ++echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6; } ++ if test -z "$ac_cv_prog_CC"; then ++ our_gcc="$CC" ++ else ++ our_gcc="$ac_cv_prog_CC" ++ fi ++ case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in ++ 2.) ++ if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then ++ msnative_struct='-fnative-struct' ++ fi ++ ;; ++ *) ++ if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then ++ msnative_struct='-mms-bitfields' ++ fi ++ ;; ++ esac ++ if test x"$msnative_struct" = x ; then ++ { echo "$as_me:$LINENO: result: no way" >&5 ++echo "${ECHO_T}no way" >&6; } ++ { echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 ++echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} ++ else ++ CFLAGS="$CFLAGS $msnative_struct" ++ { echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 ++echo "${ECHO_T}${msnative_struct}" >&6; } ++ fi ++ fi ++fi ++ ++# Honor aclocal flags ++ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" ++ ++## Initial sanity check, done here so that users get told they ++## have the wrong dependencies as early in the process as possible. ++## Later on we actually use the cflags/libs from separate pkg-config ++## calls. Oh, also the later pkg-config calls don't include ++## the version requirements since those make the module lists ++## annoying to construct ++ ++ ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++if test -n "$ac_pt_PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++ fi ++else ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++fi ++ ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.9.0 ++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ PKG_CONFIG="" ++ fi ++ ++fi ++ ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 ++echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then ++ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BASE_DEPENDENCIES_LIBS"; then ++ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` ++ else ++ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: ++ ++$BASE_DEPENDENCIES_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS ++and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&5 ++echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: ++ ++$BASE_DEPENDENCIES_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS ++and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} ++ { (exit 1); exit 1; }; } ++elif test $pkg_failed = untried; then ++ { { echo "$as_me:$LINENO: 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 ++path to pkg-config. ++ ++Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS ++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 . ++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 ++path to pkg-config. ++ ++Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS ++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 . ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++else ++ BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS ++ BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ : ++fi ++ ++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 "^[^_].*"' ++else ++ # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk) ++ LIBTOOL_EXPORT_OPTIONS= ++fi ++ ++ ++ ++# Check whether --enable-explicit-deps was given. ++if test "${enable_explicit_deps+set}" = set; then ++ enableval=$enable_explicit_deps; ++else ++ enable_explicit_deps=auto ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 ++echo $ECHO_N "checking Whether to write dependencies into .pc files... $ECHO_C" >&6; } ++case $enable_explicit_deps in ++ auto) ++ export SED ++ deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` ++ if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then ++ enable_explicit_deps=yes ++ else ++ enable_explicit_deps=no ++ fi ++ ;; ++ yes|no) ++ ;; ++ *) { { echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 ++echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} ++ { (exit 1); exit 1; }; } ++ ;; ++esac ++{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 ++echo "${ECHO_T}$enable_explicit_deps" >&6; } ++ ++ ++ ++if test $enable_explicit_deps = no; then ++ DISABLE_EXPLICIT_DEPS_TRUE= ++ DISABLE_EXPLICIT_DEPS_FALSE='#' ++else ++ DISABLE_EXPLICIT_DEPS_TRUE='#' ++ DISABLE_EXPLICIT_DEPS_FALSE= ++fi ++ ++ ++# define a MAINT-like variable REBUILD which is set if Perl ++# and awk are found, so autogenerated sources can be rebuilt ++ ++for ac_prog in perl5 perl ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_PERL+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PERL in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++PERL=$ac_cv_path_PERL ++if test -n "$PERL"; then ++ { echo "$as_me:$LINENO: result: $PERL" >&5 ++echo "${ECHO_T}$PERL" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$PERL" && break ++done ++ ++ ++# We would like indent, but don't require it. ++# Extract the first word of "indent", so it can be a program name with args. ++set dummy indent; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_INDENT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$INDENT"; then ++ ac_cv_prog_INDENT="$INDENT" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++INDENT=$ac_cv_prog_INDENT ++if test -n "$INDENT"; then ++ { echo "$as_me:$LINENO: result: $INDENT" >&5 ++echo "${ECHO_T}$INDENT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ ++REBUILD=\# ++if test "x$enable_rebuilds" = "xyes" && \ ++ test -n "$PERL" && \ ++ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then ++ REBUILD= ++fi ++ ++ ++ ++ ++ ++ ++for ac_func in lstat mkstemp flockfile getc_unlocked ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++for ac_func in localtime_r ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++# _NL_TIME_FIRST_WEEKDAY is an enum and not a define ++{ echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 ++echo $ECHO_N "checking for _NL_TIME_FIRST_WEEKDAY... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++ ++char c; ++c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY)); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gtk_ok=no ++fi ++ ++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; } ++if test "$gtk_ok" = "yes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE__NL_TIME_FIRST_WEEKDAY 1 ++_ACEOF ++ ++fi ++ ++# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define ++{ echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 ++echo $ECHO_N "checking for _NL_MEASUREMENT_MEASUREMENT... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++ ++char c; ++c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT)); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gtk_ok=no ++fi ++ ++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; } ++if test "$gtk_ok" = "yes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE__NL_MEASUREMENT_MEASUREMENT 1 ++_ACEOF ++ ++fi ++ ++# _NL_PAPER_HEIGHT is an enum and not a define ++{ echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 ++echo $ECHO_N "checking for _NL_PAPER_HEIGHT... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++ ++char c; ++c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT)); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gtk_ok=no ++fi ++ ++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; } ++if test "$gtk_ok" = "yes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE__NL_PAPER_HEIGHT 1 ++_ACEOF ++ ++fi ++ ++# _NL_PAPER_WIDTH is an enum and not a define ++{ echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 ++echo $ECHO_N "checking for _NL_PAPER_WIDTH... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++ ++char c; ++c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH)); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gtk_ok=no ++fi ++ ++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; } ++if test "$gtk_ok" = "yes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE__NL_PAPER_WIDTH 1 ++_ACEOF ++ ++fi ++ ++# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable ++{ echo "$as_me:$LINENO: checking for sigsetjmp" >&5 ++echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++ ++sigjmp_buf env; ++sigsetjmp(env, 0); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gtk_ok=no ++fi ++ ++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; } ++if test "$gtk_ok" = "yes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_SIGSETJMP 1 ++_ACEOF ++ ++fi ++ ++# i18n stuff ++ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" ++ ++ ++for ac_header in locale.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; -+ pax) -+ am__tar='pax -L -x $1 -w "$$tardir"' -+ am__tar_='pax -L -x $1 -w "$tardir"' -+ am__untar='pax -r' ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; -+ cpio) -+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' -+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' -+ am__untar='cpio -i -H $1 -d' ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ if test $ac_cv_header_locale_h = yes; then ++ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ++echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } ++if test "${am_cv_val_LC_MESSAGES+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++return LC_MESSAGES ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ am_cv_val_LC_MESSAGES=no ++fi ++ ++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 ++echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_LC_MESSAGES 1 ++_ACEOF ++ ++ fi ++ fi ++ USE_NLS=yes ++ ++ ++ gt_cv_have_gettext=no ++ ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= ++ ++ if test "${ac_cv_header_libintl_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for libintl.h" >&5 ++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_libintl_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 ++echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 ++echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes + ;; -+ none) -+ am__tar=false -+ am__tar_=false -+ am__untar=false ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for libintl.h" >&5 ++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_libintl_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_libintl_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } ++ ++fi ++if test $ac_cv_header_libintl_h = yes; then ++ gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" ++ ++ # ++ # First check in libc ++ # ++ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 ++echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } ++if test "${gt_cv_func_ngettext_libc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include ++ ++int ++main () ++{ ++return !ngettext ("","", 1) ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gt_cv_func_ngettext_libc=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi ++{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 ++echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 ++echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } ++if test "${gt_cv_func_dgettext_libc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include ++ ++int ++main () ++{ ++return !dgettext ("","") ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gt_cv_func_dgettext_libc=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi ++{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 ++echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } ++ fi ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ ++for ac_func in bind_textdomain_codeset ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ fi ++ ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 ++echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char bindtextdomain (); ++int ++main () ++{ ++return bindtextdomain (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_intl_bindtextdomain=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } ++if test $ac_cv_lib_intl_bindtextdomain = yes; then ++ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char ngettext (); ++int ++main () ++{ ++return ngettext (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_intl_ngettext=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } ++if test $ac_cv_lib_intl_ngettext = yes; then ++ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 ++echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_intl_dgettext+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dgettext (); ++int ++main () ++{ ++return dgettext (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_intl_dgettext=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } ++if test $ac_cv_lib_intl_dgettext = yes; then ++ gt_cv_func_dgettext_libintl=yes ++fi ++ ++fi ++ ++fi ++ ++ ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 ++echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: " >&5 ++echo "${ECHO_T}" >&6; } ++ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl -liconv $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char ngettext (); ++int ++main () ++{ ++return ngettext (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_intl_ngettext=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } ++if test $ac_cv_lib_intl_ngettext = yes; then ++ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 ++echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl -liconv $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dcgettext (); ++int ++main () ++{ ++return dcgettext (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_intl_dcgettext=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } ++if test $ac_cv_lib_intl_dcgettext = yes; then ++ gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv ++else ++ : ++fi ++ ++else ++ : ++fi ++ ++ fi ++ ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ ++for ac_func in bind_textdomain_codeset ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ LIBS="$glib_save_LIBS" ++ ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi ++ fi ++ ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_GETTEXT 1 ++_ACEOF ++ ++ # Extract the first word of "msgfmt", so it can be a program name with args. ++set dummy msgfmt; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_MSGFMT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case "$MSGFMT" in ++ /*) ++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then ++ ac_cv_path_MSGFMT="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" ++ ;; ++esac ++fi ++MSGFMT="$ac_cv_path_MSGFMT" ++if test "$MSGFMT" != "no"; then ++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++echo "${ECHO_T}$MSGFMT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ ++for ac_func in dcgettext ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ MSGFMT_OPTS= ++ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 ++echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } ++ cat >conftest.foo <<_ACEOF ++ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"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 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++echo "$as_me: failed input was:" >&5 ++sed 's/^/| /' conftest.foo >&5 ++fi ++ ++ # Extract the first word of "gmsgfmt", so it can be a program name with args. ++set dummy gmsgfmt; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_GMSGFMT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $GMSGFMT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ++ ;; ++esac ++fi ++GMSGFMT=$ac_cv_path_GMSGFMT ++if test -n "$GMSGFMT"; then ++ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++echo "${ECHO_T}$GMSGFMT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ # Extract the first word of "xgettext", so it can be a program name with args. ++set dummy xgettext; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_XGETTEXT+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case "$XGETTEXT" in ++ /*) ++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then ++ ac_cv_path_XGETTEXT="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ++ ;; ++esac ++fi ++XGETTEXT="$ac_cv_path_XGETTEXT" ++if test "$XGETTEXT" != ":"; then ++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++echo "${ECHO_T}$XGETTEXT" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ case $host in ++ *-*-solaris*) ++ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 ++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } ++if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define bind_textdomain_codeset innocuous_bind_textdomain_codeset ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char bind_textdomain_codeset (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef bind_textdomain_codeset ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char bind_textdomain_codeset (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset ++choke me ++#endif ++ ++int ++main () ++{ ++return bind_textdomain_codeset (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_bind_textdomain_codeset=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } ++if test $ac_cv_func_bind_textdomain_codeset = yes; then ++ CATOBJEXT=.gmo ++ DATADIRNAME=share ++else ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++fi ++ ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ++fi ++ ++ ++ ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define ENABLE_NLS 1 ++_ACEOF ++ ++ fi ++ ++ if test "$XGETTEXT" != ":"; then ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } ++ XGETTEXT=":" ++ fi ++ fi ++ ++ # We need to process the po/ directory. ++ POSUB=po ++ ++ ac_config_commands="$ac_config_commands default-1" ++ ++ ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 ++echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ { echo "$as_me:$LINENO: result: $LINGUAS" >&5 ++echo "${ECHO_T}$LINGUAS" >&6; } ++ fi ++ ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi ++ ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ ++ ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ++LIBS="$LIBS $INTLLIBS" ++ac_config_commands="$ac_config_commands default-2" ++ ++ ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` ++else ++ localedir=`eval echo "${datadir}/locale"` ++fi ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GTK_LOCALEDIR "$localedir" ++_ACEOF ++ ++ ++ ++{ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 ++echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6; } ++ ++gtk_save_LIBS=$LIBS ++LIBS="$LIBS -lm" ++if test "$cross_compiling" = yes; then ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ++ ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ int main (void) { return (log(1) != log(1.)); } ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./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 ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++gtk_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -std1" ++ if test "$cross_compiling" = yes; then ++ true ++ ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ int main (void) { return (log(1) != log(1.)); } ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./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 ++ { echo "$as_me:$LINENO: result: -std1" >&5 ++echo "${ECHO_T}-std1" >&6; } ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++{ echo "$as_me:$LINENO: result: " >&5 ++echo "${ECHO_T}" >&6; } ++ CFLAGS="$gtk_save_CFLAGS" ++ { echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 ++echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++LIBS=$gtk_save_LIBS ++ ++{ echo "$as_me:$LINENO: checking for the BeOS" >&5 ++echo $ECHO_N "checking for the BeOS... $ECHO_C" >&6; } ++case $host in ++ *-*-beos*) ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ MATH_LIB= ++ ;; ++ *) ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ ;; ++esac ++ ++# ++# see bug 162979 ++# ++{ echo "$as_me:$LINENO: checking for HP-UX" >&5 ++echo $ECHO_N "checking for HP-UX... $ECHO_C" >&6; } ++case $host_os in ++ hpux9* | hpux10* | hpux11*) ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ CFLAGS="$CFLAGS -DHPPEX -DSHMLINK" ++ ;; ++ *) ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ ;; ++esac ++ ++{ echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 ++echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++DIR *dir; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gtk_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -posix" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++DIR *dir; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ { echo "$as_me:$LINENO: result: " >&5 ++echo "${ECHO_T}" >&6; } ++ CFLAGS="$gtk_save_CFLAGS" ++ { echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 ++echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++# ++# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working ++# ++ ++GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0" ++ ++# Check whether --enable-glibtest was given. ++if test "${enable_glibtest+set}" = set; then ++ enableval=$enable_glibtest; ++else ++ enable_glibtest=yes ++fi ++ ++ ++ pkg_config_args=glib-2.0 ++ for module in . gobject gmodule-no-export gthread ++ do ++ case "$module" in ++ gmodule) ++ pkg_config_args="$pkg_config_args gmodule-2.0" ++ ;; ++ gmodule-no-export) ++ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" ++ ;; ++ gobject) ++ pkg_config_args="$pkg_config_args gobject-2.0" ++ ;; ++ gthread) ++ pkg_config_args="$pkg_config_args gthread-2.0" ++ ;; ++ gio*) ++ pkg_config_args="$pkg_config_args $module-2.0" ++ ;; ++ esac ++ done ++ ++ ++ ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++if test -n "$ac_pt_PKG_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++ fi ++else ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++fi ++ ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.16 ++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ PKG_CONFIG="" ++ fi ++ ++fi ++ ++ no_glib="" ++ ++ if test "x$PKG_CONFIG" = x ; then ++ no_glib=yes ++ PKG_CONFIG=no ++ fi ++ ++ min_glib_version=2.17.6 ++ { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 ++echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; } ++ ++ if test x$PKG_CONFIG != xno ; then ++ ## don't try to run the test against uninstalled libtool libs ++ if $PKG_CONFIG --uninstalled $pkg_config_args; then ++ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" ++ enable_glibtest=no ++ fi ++ ++ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then ++ : ++ else ++ no_glib=yes ++ fi ++ fi ++ ++ if test x"$no_glib" = x ; then ++ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` ++ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` ++ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` ++ ++ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` ++ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` ++ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` ++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` ++ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++ rm -f conf.glibtest ++ if test "$cross_compiling" = yes; then ++ echo $ac_n "cross compiling; assumed OK... $ac_c" ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include ++#include ++#include ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.glibtest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } ++ ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If pkg-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); ++ printf("*** to point to the correct configuration files\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } ++ else ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); ++ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++ ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./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 ++ : ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++no_glib=yes ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_glib" = x ; then ++ { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 ++echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } ++ : ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include ++#include ++ ++int ++main () ++{ ++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed." ++fi ++ ++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" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ GOBJECT_QUERY="" ++ GLIB_MKENUMS="" ++ { { echo "$as_me:$LINENO: error: ++*** GLIB 2.17.6 or better is required. The latest version of ++*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5 ++echo "$as_me: error: ++*** GLIB 2.17.6 or better is required. The latest version of ++*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ ++ ++ ++ ++ rm -f conf.glibtest ++ ++ ++# See if it's safe to turn G_DISABLE_DEPRECATED on. ++GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"` ++GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.17.6 | sed "s/\.@<:@^.@:>@*\$//"` ++if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then ++ CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" ++fi ++ ++CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS" ++ ++ ++gtk_save_LIBS=$LIBS ++LIBS="$LIBS $GLIB_LIBS" ++ ++for ac_func in bind_textdomain_codeset ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++LIBS=$gtk_save_LIBS ++ ++ ++for ac_header in pwd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_PWD_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++for ac_header in sys/time.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_SYS_TIME_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++for ac_header in unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_UNISTD_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++for ac_header in ftw.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_FTW_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++{ echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 ++echo $ECHO_N "checking for GNU ftw extensions... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#define _XOPEN_SOURCE 500 ++#define _GNU_SOURCE ++#include ++int ++main () ++{ ++int flags = FTW_ACTIONRETVAL; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gtk_ok=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++if test $gtk_ok = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_GNU_FTW 1 ++_ACEOF ++ ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++saved_cflags="$CFLAGS" ++saved_ldflags="$LDFLAGS" ++ ++ ++# Checks for header files. ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#include ++#include ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_stdc=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then ++ : ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then ++ : ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then ++ : ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./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 ++ : ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define STDC_HEADERS 1 ++_ACEOF ++ ++fi ++ ++ ++# Checks for typedefs, structures, and compiler characteristics. ++{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 ++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } ++if test "${ac_cv_c_const+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++/* FIXME: Include the comments suggested by Paul. */ ++#ifndef __cplusplus ++ /* Ultrix mips cc rejects this. */ ++ typedef int charset[2]; ++ const charset cs; ++ /* SunOS 4.1.1 cc rejects this. */ ++ 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}; ++ /* AIX XL C 1.02.0.0 rejects this. ++ It does not let you subtract one const X* pointer from another in ++ an arm of an if-expression whose if-part is not a constant ++ expression */ ++ const char *g = "string"; ++ pcpcc = &g + (g ? g-g : 0); ++ /* HPUX 7.0 cc rejects these. */ ++ ++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; ++ ++ *t++ = 0; ++ if (s) return 0; ++ } ++ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ ++ int x[] = {25, 17}; ++ const int *foo = &x[0]; ++ ++foo; ++ } ++ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ ++ typedef const int *iptr; ++ iptr p = 0; ++ ++p; ++ } ++ { /* AIX XL C 1.02.0.0 rejects this saying ++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ ++ struct s { int j; const int *ap[3]; }; ++ struct s *b; b->j = 5; ++ } ++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ ++ const int foo = 10; ++ if (!foo) return 0; ++ } ++ return !cs[0] && !zero.x; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_c_const=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 ++echo "${ECHO_T}$ac_cv_c_const" >&6; } ++if test $ac_cv_c_const = no; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define const ++_ACEOF ++ ++fi ++ ++ ++# Checks for library functions. ++{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 ++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } ++if test "${ac_cv_type_signal+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++ ++int ++main () ++{ ++return *(signal (0, 0)) (0) == 1; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_type_signal=void ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 ++echo "${ECHO_T}$ac_cv_type_signal" >&6; } ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define RETSIGTYPE $ac_cv_type_signal ++_ACEOF ++ ++ ++ ++ ++for ac_header in stdlib.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++for ac_func in getpagesize ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++{ echo "$as_me:$LINENO: checking for working mmap" >&5 ++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } ++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_func_mmap_fixed_mapped=no ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++/* malloc might have been renamed as rpl_malloc. */ ++#undef malloc ++ ++/* Thanks to Mike Haertel and Jim Avera for this test. ++ Here is a matrix of mmap possibilities: ++ mmap private not fixed ++ mmap private fixed at somewhere currently unmapped ++ mmap private fixed at somewhere already mapped ++ mmap shared not fixed ++ mmap shared fixed at somewhere currently unmapped ++ mmap shared fixed at somewhere already mapped ++ For private mappings, we should verify that changes cannot be read() ++ back from the file, nor mmap's back from the file at a different ++ address. (There have been systems where private was not correctly ++ implemented like the infamous i386 svr4.0, and systems where the ++ VM page cache was not coherent with the file system buffer cache ++ like early versions of FreeBSD and possibly contemporary NetBSD.) ++ For shared mappings, we should conversely verify that changes get ++ propagated back to all the places they're supposed to be. ++ ++ Grep wants private fixed already mapped. ++ The main things grep needs to know about mmap are: ++ * does it exist and is it safe to write into the mmap'd area ++ * how to use it (BSD variants) */ ++ ++#include ++#include ++ ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H ++char *malloc (); ++#endif ++ ++/* This mess was copied from the GNU getpagesize.h. */ ++#ifndef HAVE_GETPAGESIZE ++/* Assume that all systems that can run configure 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 */ ++# ifdef HAVE_SYS_PARAM_H ++# include ++# ifdef EXEC_PAGESIZE ++# define getpagesize() EXEC_PAGESIZE ++# else /* no EXEC_PAGESIZE */ ++# ifdef NBPG ++# define getpagesize() NBPG * CLSIZE ++# ifndef CLSIZE ++# define CLSIZE 1 ++# endif /* no CLSIZE */ ++# else /* no NBPG */ ++# ifdef NBPC ++# define getpagesize() NBPC ++# else /* no NBPC */ ++# ifdef PAGESIZE ++# define getpagesize() PAGESIZE ++# endif /* PAGESIZE */ ++# endif /* no NBPC */ ++# endif /* no NBPG */ ++# endif /* no EXEC_PAGESIZE */ ++# else /* no HAVE_SYS_PARAM_H */ ++# define getpagesize() 8192 /* punt totally */ ++# endif /* no HAVE_SYS_PARAM_H */ ++# endif /* no _SC_PAGESIZE */ ++ ++#endif /* no HAVE_GETPAGESIZE */ ++ ++int ++main () ++{ ++ char *data, *data2, *data3; ++ int i, pagesize; ++ int fd; ++ ++ pagesize = getpagesize (); ++ ++ /* First, make a file with some known garbage in it. */ ++ data = (char *) malloc (pagesize); ++ if (!data) ++ return 1; ++ for (i = 0; i < pagesize; ++i) ++ *(data + i) = rand (); ++ umask (0); ++ fd = creat ("conftest.mmap", 0600); ++ if (fd < 0) ++ return 1; ++ if (write (fd, data, pagesize) != pagesize) ++ return 1; ++ close (fd); ++ ++ /* Next, try to mmap the file at a fixed address which already has ++ something else allocated at it. If we can, also make sure that ++ we see the same garbage. */ ++ fd = open ("conftest.mmap", O_RDWR); ++ if (fd < 0) ++ return 1; ++ data2 = (char *) malloc (2 * pagesize); ++ if (!data2) ++ return 1; ++ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); ++ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_FIXED, fd, 0L)) ++ return 1; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data2 + i)) ++ return 1; ++ ++ /* Finally, make sure that changes to the mapped area do not ++ percolate back to the file as seen by read(). (This is a bug on ++ some variants of i386 svr4.0.) */ ++ for (i = 0; i < pagesize; ++i) ++ *(data2 + i) = *(data2 + i) + 1; ++ data3 = (char *) malloc (pagesize); ++ if (!data3) ++ return 1; ++ if (read (fd, data3, pagesize) != pagesize) ++ return 1; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data3 + i)) ++ return 1; ++ close (fd); ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./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_cv_func_mmap_fixed_mapped=yes ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_mmap_fixed_mapped=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 ++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } ++if test $ac_cv_func_mmap_fixed_mapped = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_MMAP 1 ++_ACEOF ++ ++fi ++rm -f conftest.mmap ++ ++ ++ ++for ac_func in mallinfo ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++for ac_func in getresuid ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 ++echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } ++if test "${ac_cv_type_uid_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "uid_t" >/dev/null 2>&1; then ++ ac_cv_type_uid_t=yes ++else ++ ac_cv_type_uid_t=no ++fi ++rm -f conftest* ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 ++echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } ++if test $ac_cv_type_uid_t = no; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define uid_t int ++_ACEOF ++ ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define gid_t int ++_ACEOF ++ ++fi ++ ++ ++# Check if needs to be included for fd_set ++{ echo "$as_me:$LINENO: checking for fd_set" >&5 ++echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++fd_set readMask, writeMask; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gtk_ok=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++if test $gtk_ok = yes; then ++ { echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 ++echo "${ECHO_T}yes, found in sys/types.h" >&6; } ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "fd_mask" >/dev/null 2>&1; then ++ gtk_ok=yes ++fi ++rm -f conftest* ++ ++ if test $gtk_ok = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_SYS_SELECT_H 1 ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 ++echo "${ECHO_T}yes, found in sys/select.h" >&6; } ++ else ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define NO_FD_SET 1 ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ fi ++fi ++ ++# `widechar' tests for gdki18n.h ++{ echo "$as_me:$LINENO: checking for wchar.h" >&5 ++echo $ECHO_N "checking for wchar.h... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gdk_wchar_h=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++if test $gdk_wchar_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_WCHAR_H 1 ++_ACEOF ++ ++fi ++{ echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 ++echo "${ECHO_T}$gdk_wchar_h" >&6; } ++ ++# Check for wctype.h (for iswalnum) ++{ echo "$as_me:$LINENO: checking for wctype.h" >&5 ++echo $ECHO_N "checking for wctype.h... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gdk_wctype_h=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++if test $gdk_wctype_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_WCTYPE_H 1 ++_ACEOF ++ ++fi ++{ echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 ++echo "${ECHO_T}$gdk_wctype_h" >&6; } ++ ++# in Solaris 2.5, `iswalnum' is in -lw ++GDK_WLIBS= ++{ echo "$as_me:$LINENO: checking for iswalnum" >&5 ++echo $ECHO_N "checking for iswalnum... $ECHO_C" >&6; } ++if test "${ac_cv_func_iswalnum+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define iswalnum to an innocuous variant, in case declares iswalnum. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define iswalnum innocuous_iswalnum ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char iswalnum (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef iswalnum ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char iswalnum (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_iswalnum || defined __stub___iswalnum ++choke me ++#endif ++ ++int ++main () ++{ ++return iswalnum (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_iswalnum=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_iswalnum" >&6; } ++if test $ac_cv_func_iswalnum = yes; then ++ : ++else ++ { echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 ++echo $ECHO_N "checking for iswalnum in -lw... $ECHO_C" >&6; } ++if test "${ac_cv_lib_w_iswalnum+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lw $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char iswalnum (); ++int ++main () ++{ ++return iswalnum (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_w_iswalnum=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 ++echo "${ECHO_T}$ac_cv_lib_w_iswalnum" >&6; } ++if test $ac_cv_lib_w_iswalnum = yes; then ++ GDK_WLIBS=-lw ++fi ++ ++fi ++ ++ ++oLIBS="$LIBS" ++LIBS="$LIBS $GDK_WLIBS" ++# The following is necessary for Linux libc-5.4.38 ++{ echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5 ++echo $ECHO_N "checking if iswalnum() and friends are properly defined... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++ ++#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) ++# ifdef HAVE_WCTYPE_H ++# include ++# else ++# ifdef HAVE_WCHAR_H ++# include ++# endif ++# endif ++#else ++# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) ++#endif ++iswalnum((wchar_t) 0); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gdk_working_wctype=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS="$oLIBS" ++ ++if test $gdk_working_wctype = no; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_BROKEN_WCTYPE 1 ++_ACEOF ++ ++ GDK_WLIBS= ++fi ++{ echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 ++echo "${ECHO_T}$gdk_working_wctype" >&6; } ++ ++ ++# Check for uxtheme.h (for MS-Windows Engine) ++{ echo "$as_me:$LINENO: checking for uxtheme.h" >&5 ++echo $ECHO_N "checking for uxtheme.h... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gtk_uxtheme_h=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++if test $gtk_uxtheme_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_UXTHEME_H 1 ++_ACEOF ++ ++fi ++{ echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 ++echo "${ECHO_T}$gtk_uxtheme_h" >&6; } ++ ++# Checks for gdkspawn ++ ++for ac_header in crt_externs.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++for ac_func in _NSGetEnviron ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++ ++################################################## ++# Checks for gdk-pixbuf ++################################################## ++ ++ ++use_la_modules=false ++case $host in ++ *-aix*) use_la_modules=true ++esac ++ ++if $use_la_modules ; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define USE_LA_MODULES 1 ++_ACEOF ++ ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 ++echo $ECHO_N "checking whether to build gmodulized gdk-pixbuf... $ECHO_C" >&6; } ++ ++# Check whether --enable-modules was given. ++if test "${enable_modules+set}" = set; then ++ enableval=$enable_modules; ++fi ++ ++ ++dynworks=false ++deps= ++if test x$enable_modules = xno; then ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++else ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ { echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 ++echo $ECHO_N "checking whether dynamic modules work... $ECHO_C" >&6; } ++ ## for loop is to strip newline ++ tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` ++ for I in $tmp; do ++ dynworks=$I ++ done ++ ++ if $dynworks; then ++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" ++ pixbuf_deplibs_check=`$pixbuf_libtool_config | \ ++ grep '^[a-z_]*check[a-z_]*_method=['\''"]' | \ ++ sed 's/.*['\''"]\(.*\)['\''"]$/\1/'` ++ if test "x$pixbuf_deplibs_check" = "xnone" || \ ++ test "x$pixbuf_deplibs_check" = "xunknown" || \ ++ test "x$pixbuf_deplibs_check" = "x"; then ++ dynworks=false ++ fi ++ fi ++ ++ if $dynworks; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define USE_GMODULE 1 ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ fi ++fi ++ ++ ++ ++# Check whether --with-libpng was given. ++if test "${with_libpng+set}" = set; then ++ withval=$with_libpng; ++fi ++ ++ ++# Check whether --with-libjpeg was given. ++if test "${with_libjpeg+set}" = set; then ++ withval=$with_libjpeg; ++fi ++ ++ ++# Check whether --with-libtiff was given. ++if test "${with_libtiff+set}" = set; then ++ withval=$with_libtiff; ++fi ++ ++ ++# Check whether --with-libjasper was given. ++if test "${with_libjasper+set}" = set; then ++ withval=$with_libjasper; ++fi ++ ++ ++# Check whether --enable-gdiplus was given. ++if test "${enable_gdiplus+set}" = set; then ++ enableval=$enable_gdiplus; ++fi ++ ++ ++ ++ ++if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then ++ BUILD_GDIPLUS_LOADERS_TRUE= ++ BUILD_GDIPLUS_LOADERS_FALSE='#' ++else ++ BUILD_GDIPLUS_LOADERS_TRUE='#' ++ BUILD_GDIPLUS_LOADERS_FALSE= ++fi ++ ++ ++if test x$os_win32 = xno || test x$enable_gdiplus = xno; then ++ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then ++ { echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 ++echo $ECHO_N "checking for TIFFReadRGBAImageOriented in -ltiff... $ECHO_C" >&6; } ++if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltiff -lm $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char TIFFReadRGBAImageOriented (); ++int ++main () ++{ ++return TIFFReadRGBAImageOriented (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 ++echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } ++if test $ac_cv_lib_tiff_TIFFReadRGBAImageOriented = yes; then ++ if test "${ac_cv_header_tiffio_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_tiffio_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 ++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 ++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_tiffio_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_tiffio_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } ++ ++fi ++if test $ac_cv_header_tiffio_h = yes; then ++ TIFF='tiff'; LIBTIFF='-ltiff' ++else ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} ++fi ++ ++ ++else ++ { echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 ++echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6; } ++if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltiff -ljpeg -lz -lm $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char TIFFWriteScanline (); ++int ++main () ++{ ++return TIFFWriteScanline (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_tiff_TIFFWriteScanline=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 ++echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } ++if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then ++ if test "${ac_cv_header_tiffio_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_tiffio_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 ++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 ++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_tiffio_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_tiffio_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } ++ ++fi ++if test $ac_cv_header_tiffio_h = yes; then ++ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' ++else ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} ++fi ++ ++ ++else ++ { echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 ++echo $ECHO_N "checking for TIFFFlushData in -ltiff34... $ECHO_C" >&6; } ++if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char TIFFFlushData (); ++int ++main () ++{ ++return TIFFFlushData (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_tiff34_TIFFFlushData=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 ++echo "${ECHO_T}$ac_cv_lib_tiff34_TIFFFlushData" >&6; } ++if test $ac_cv_lib_tiff34_TIFFFlushData = yes; then ++ if test "${ac_cv_header_tiffio_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_tiffio_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 ++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 ++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_tiffio_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_tiffio_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } ++ ++fi ++if test $ac_cv_header_tiffio_h = yes; then ++ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' ++else ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} ++fi ++ ++ ++else ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} ++fi ++ ++fi ++ ++fi ++ ++ fi ++ ++ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then ++ { { echo "$as_me:$LINENO: error: ++*** Checks for TIFF loader failed. You can build without it by passing ++*** --without-libtiff to configure but some programs using GTK+ may ++*** not work properly" >&5 ++echo "$as_me: error: ++*** Checks for TIFF loader failed. You can build without it by passing ++*** --without-libtiff to configure but some programs using GTK+ may ++*** not work properly" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++fi ++ ++if test x$os_win32 = xno || test x$enable_gdiplus = xno; then ++ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then ++ { echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 ++echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; } ++if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ljpeg $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char jpeg_destroy_decompress (); ++int ++main () ++{ ++return jpeg_destroy_decompress (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_jpeg_jpeg_destroy_decompress=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 ++echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } ++if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then ++ jpeg_ok=yes ++else ++ jpeg_ok=no ++ { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 ++echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} ++fi ++ ++ if test "$jpeg_ok" = yes; then ++ { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 ++echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#undef PACKAGE ++#undef VERSION ++#undef HAVE_STDLIB_H ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ jpeg_ok=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ { echo "$as_me:$LINENO: result: $jpeg_ok" >&5 ++echo "${ECHO_T}$jpeg_ok" >&6; } ++ if test "$jpeg_ok" = yes; then ++ LIBJPEG='-ljpeg' ++ { echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 ++echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6; } ++if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ljpeg $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char jpeg_simple_progression (); ++int ++main () ++{ ++return jpeg_simple_progression (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_jpeg_jpeg_simple_progression=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 ++echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } ++if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_PROGRESSIVE_JPEG 1 ++_ACEOF ++ ++else ++ { echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 ++echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} ++fi ++ ++ else ++ { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 ++echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} ++ fi ++ fi ++ fi ++ ++ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then ++ { { echo "$as_me:$LINENO: error: ++*** Checks for JPEG loader failed. You can build without it by passing ++*** --without-libjpeg to configure but some programs using GTK+ may ++*** not work properly" >&5 ++echo "$as_me: error: ++*** Checks for JPEG loader failed. You can build without it by passing ++*** --without-libjpeg to configure but some programs using GTK+ may ++*** not work properly" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++fi ++ ++ if test x$with_libpng != xno && test -z "$LIBPNG"; then ++ { echo "$as_me:$LINENO: checking for libpng12" >&5 ++echo $ECHO_N "checking for libpng12... $ECHO_C" >&6; } ++ if $PKG_CONFIG --exists libpng12 ; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ PNG='png' ++ PNG_DEP_CFLAGS_PACKAGES=libpng12 ++ LIBPNG=`$PKG_CONFIG --libs libpng12` ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 ++echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; } ++if test "${ac_cv_lib_png_png_read_info+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lpng -lz -lm $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char png_read_info (); ++int ++main () ++{ ++return png_read_info (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_png_png_read_info=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 ++echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; } ++if test $ac_cv_lib_png_png_read_info = yes; then ++ if test "${ac_cv_header_png_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for png.h" >&5 ++echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_png_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 ++echo "${ECHO_T}$ac_cv_header_png_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking png.h usability" >&5 ++echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking png.h presence" >&5 ++echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for png.h" >&5 ++echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_png_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_png_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 ++echo "${ECHO_T}$ac_cv_header_png_h" >&6; } ++ ++fi ++if test $ac_cv_header_png_h = yes; then ++ png_ok=yes ++else ++ png_ok=no ++fi ++ ++ ++else ++ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 ++echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} ++fi ++ ++ if test "$png_ok" = yes; then ++ { echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 ++echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6; } ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ png_ok=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ { echo "$as_me:$LINENO: result: $png_ok" >&5 ++echo "${ECHO_T}$png_ok" >&6; } ++ if test "$png_ok" = yes; then ++ PNG='png'; LIBPNG='-lpng -lz' ++ else ++ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 ++echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} ++ fi ++ else ++ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 ++echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} ++ fi ++ fi ++ fi ++ ++ if test x$with_libpng != xno && test -z "$LIBPNG"; then ++ { { echo "$as_me:$LINENO: error: ++*** Checks for PNG loader failed. You can build without it by passing ++*** --without-libpng to configure but many programs using GTK+ will ++*** not work properly. The PNG loader is also needed if you are compiling ++*** from CVS." >&5 ++echo "$as_me: error: ++*** Checks for PNG loader failed. You can build without it by passing ++*** --without-libpng to configure but many programs using GTK+ will ++*** not work properly. The PNG loader is also needed if you are compiling ++*** from CVS." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ if test x$with_libjasper != xno && test -z "$LIBJASPER"; then ++ { echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 ++echo $ECHO_N "checking for jas_init in -ljasper... $ECHO_C" >&6; } ++if test "${ac_cv_lib_jasper_jas_init+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ljasper -ljpeg $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char jas_init (); ++int ++main () ++{ ++return jas_init (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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_jasper_jas_init=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_jasper_jas_init=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 ++echo "${ECHO_T}$ac_cv_lib_jasper_jas_init" >&6; } ++if test $ac_cv_lib_jasper_jas_init = yes; then ++ LIBJASPER=-ljasper ++fi ++ ++ fi ++ ++ if test x$with_libjasper != xno && test -z "$LIBJASPER"; then ++ { { echo "$as_me:$LINENO: error: ++*** Checks for JPEG2000 loader failed. You can build without it by passing ++*** --without-libjasper to configure" >&5 ++echo "$as_me: error: ++*** Checks for JPEG2000 loader failed. You can build without it by passing ++*** --without-libjasper to configure" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ ++ ++ ++ ++ ++ ++ ++if $dynworks; then ++ BUILD_DYNAMIC_MODULES_TRUE= ++ BUILD_DYNAMIC_MODULES_FALSE='#' ++else ++ BUILD_DYNAMIC_MODULES_TRUE='#' ++ BUILD_DYNAMIC_MODULES_FALSE= ++fi ++ ++ ++# ++# Allow building some or all gdk-pixbuf loaders included ++# ++{ echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 ++echo $ECHO_N "checking pixbuf loaders to build... $ECHO_C" >&6; } ++ ++ ++# Check whether --with-included_loaders was given. ++if test "${with_included_loaders+set}" = set; then ++ withval=$with_included_loaders; ++fi ++ ++ ++if $dynworks; then ++ : ++else ++ ## if the option was specified, leave it; otherwise disable included loaders ++ if test x$with_included_loaders = xno; then ++ with_included_loaders=yes ++ fi ++fi ++ ++# Use the traditional png loader instead of the GDI+ one on Windows, ++# because some important apps like GIMP need to read and write ++# arbitrary tEXt chunks which doesn't seem to be possible through GDI+ ++ ++all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm" ++if test x$with_libjasper != xno; then ++ all_loaders="$all_loaders,jasper" ++fi ++if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then ++ # Skip PNG, see comment above ++ gdip_formats="bmp emf gif ico jpeg tiff wmf" ++ for f in $gdip_formats; do ++ all_loaders="$all_loaders,gdip-$f" ++ done ++else ++ all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff" ++fi ++included_loaders="" ++# If no loaders specified, include all ++if test "x$with_included_loaders" = xyes ; then ++ included_loaders="$all_loaders" ++else ++ included_loaders="$with_included_loaders" ++fi ++ ++{ echo "$as_me:$LINENO: result: $included_loaders" >&5 ++echo "${ECHO_T}$included_loaders" >&6; } ++ ++INCLUDED_LOADER_OBJ= ++INCLUDED_LOADER_DEFINE= ++ ++IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," ++for loader in $included_loaders; do ++ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then ++ : ++ else ++ { { echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 ++echo "$as_me: error: the specified loader $loader does not exist" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ loader_underscores=`echo $loader | sed -e 's/-/_/g'` ++ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la" ++ ++ # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader ++ case $loader in ++ gdip-*) ;; ++ *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";; ++ esac ++ eval INCLUDE_$loader_underscores=yes ++done ++ ++# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders ++# (except gdip-png, which isn't built at all) ++if test x"$INCLUDE_gdip_ico" = xyes; then ++ INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus" ++fi ++ ++IFS="$gtk_save_ifs" ++ ++ ++ ++ ++ ++if test x"$INCLUDE_png" = xyes; then ++ INCLUDE_PNG_TRUE= ++ INCLUDE_PNG_FALSE='#' ++else ++ INCLUDE_PNG_TRUE='#' ++ INCLUDE_PNG_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_bmp" = xyes; then ++ INCLUDE_BMP_TRUE= ++ INCLUDE_BMP_FALSE='#' ++else ++ INCLUDE_BMP_TRUE='#' ++ INCLUDE_BMP_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_wbmp" = xyes; then ++ INCLUDE_WBMP_TRUE= ++ INCLUDE_WBMP_FALSE='#' ++else ++ INCLUDE_WBMP_TRUE='#' ++ INCLUDE_WBMP_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_gif" = xyes; then ++ INCLUDE_GIF_TRUE= ++ INCLUDE_GIF_FALSE='#' ++else ++ INCLUDE_GIF_TRUE='#' ++ INCLUDE_GIF_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_ico" = xyes; then ++ INCLUDE_ICO_TRUE= ++ INCLUDE_ICO_FALSE='#' ++else ++ INCLUDE_ICO_TRUE='#' ++ INCLUDE_ICO_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_ani" = xyes; then ++ INCLUDE_ANI_TRUE= ++ INCLUDE_ANI_FALSE='#' ++else ++ INCLUDE_ANI_TRUE='#' ++ INCLUDE_ANI_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_jpeg" = xyes; then ++ INCLUDE_JPEG_TRUE= ++ INCLUDE_JPEG_FALSE='#' ++else ++ INCLUDE_JPEG_TRUE='#' ++ INCLUDE_JPEG_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_pnm" = xyes; then ++ INCLUDE_PNM_TRUE= ++ INCLUDE_PNM_FALSE='#' ++else ++ INCLUDE_PNM_TRUE='#' ++ INCLUDE_PNM_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_ras" = xyes; then ++ INCLUDE_RAS_TRUE= ++ INCLUDE_RAS_FALSE='#' ++else ++ INCLUDE_RAS_TRUE='#' ++ INCLUDE_RAS_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_tiff" = xyes; then ++ INCLUDE_TIFF_TRUE= ++ INCLUDE_TIFF_FALSE='#' ++else ++ INCLUDE_TIFF_TRUE='#' ++ INCLUDE_TIFF_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_xpm" = xyes; then ++ INCLUDE_XPM_TRUE= ++ INCLUDE_XPM_FALSE='#' ++else ++ INCLUDE_XPM_TRUE='#' ++ INCLUDE_XPM_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_xbm" = xyes; then ++ INCLUDE_XBM_TRUE= ++ INCLUDE_XBM_FALSE='#' ++else ++ INCLUDE_XBM_TRUE='#' ++ INCLUDE_XBM_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_tga" = xyes; then ++ INCLUDE_TGA_TRUE= ++ INCLUDE_TGA_FALSE='#' ++else ++ INCLUDE_TGA_TRUE='#' ++ INCLUDE_TGA_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_pcx" = xyes; then ++ INCLUDE_PCX_TRUE= ++ INCLUDE_PCX_FALSE='#' ++else ++ INCLUDE_PCX_TRUE='#' ++ INCLUDE_PCX_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_icns" = xyes; then ++ INCLUDE_ICNS_TRUE= ++ INCLUDE_ICNS_FALSE='#' ++else ++ INCLUDE_ICNS_TRUE='#' ++ INCLUDE_ICNS_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_jasper" = xyes; then ++ INCLUDE_JASPER_TRUE= ++ INCLUDE_JASPER_FALSE='#' ++else ++ INCLUDE_JASPER_TRUE='#' ++ INCLUDE_JASPER_FALSE= ++fi ++ ++# As all GDI+ loaders are either built-in or not, arbitrarily just ++# check one of the variables here ++ ++ ++if test x"$INCLUDE_gdip_ico" = xyes; then ++ INCLUDE_GDIPLUS_TRUE= ++ INCLUDE_GDIPLUS_FALSE='#' ++else ++ INCLUDE_GDIPLUS_TRUE='#' ++ INCLUDE_GDIPLUS_FALSE= ++fi ++ ++ ++if test x$gio_can_sniff = x; then ++ { echo "$as_me:$LINENO: checking if gio can sniff png" >&5 ++echo $ECHO_N "checking if gio can sniff png... $ECHO_C" >&6; } ++ gtk_save_LIBS="$LIBS" ++ gtk_save_CFLAGS="$CFLAGS" ++ LIBS="`$PKG_CONFIG --libs gio-2.0`" ++ CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" ++ if test "$cross_compiling" = yes; then ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot run test program while cross compiling ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++ #include ++ static const gsize data_size = 159; ++ static const guint8 data[] = ++ { ++ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, ++ 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, ++ 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, ++ 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, ++ 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, ++ 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, ++ 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, ++ 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, ++ 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, ++ 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, ++ 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, ++ 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, ++ 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, ++ 0x42, 0x60, 0x82 ++ }; ++ int ++ main (int argc, char **argv) ++ { ++ char *content_type; ++ char *image_png; ++ content_type = g_content_type_guess (NULL, data, data_size, NULL); ++ image_png = g_content_type_from_mime_type ("image/png"); ++ return !!strcmp (content_type, image_png); ++ } ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./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 ++ gio_can_sniff=yes ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define GDK_PIXBUF_USE_GIO_MIME 1 ++_ACEOF ++ ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++gio_can_sniff=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++ { echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 ++echo "${ECHO_T}$gio_can_sniff" >&6; } ++ LIBS="$gtk_save_LIBS" ++ CFLAGS="$gtk_save_CFLAGS" ++fi ++ ++# ++# Allow building some or all immodules included ++# ++{ echo "$as_me:$LINENO: checking immodules to build" >&5 ++echo $ECHO_N "checking immodules to build... $ECHO_C" >&6; } ++ ++ ++# Check whether --with-included_immodules was given. ++if test "${with_included_immodules+set}" = set; then ++ withval=$with_included_immodules; ++fi ++ ++ ++if $dynworks; then ++ : ++else ++ ## if the option was specified, leave it; otherwise disable included immodules ++ if test x$with_included_immodules = xno; then ++ with_included_immodules=yes ++ fi ++fi ++ ++all_immodules="am-et,cedilla,cyrillic-translit" ++if test "$gdktarget" = "win32"; then ++ all_immodules="${all_immodules},ime" ++fi ++all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr" ++if test "$gdktarget" = "x11"; then ++ all_immodules="${all_immodules},xim" ++fi ++ ++included_immodules="" ++# If the switch specified without listing any specific ones, include all ++if test "x$with_included_immodules" = xyes ; then ++ included_immodules="$all_immodules" ++else ++ included_immodules="$with_included_immodules" ++fi ++ ++{ echo "$as_me:$LINENO: result: $included_immodules" >&5 ++echo "${ECHO_T}$included_immodules" >&6; } ++ ++ ++if test "x$included_immodules" != x; then ++ HAVE_INCLUDED_IMMMODULES_TRUE= ++ HAVE_INCLUDED_IMMMODULES_FALSE='#' ++else ++ HAVE_INCLUDED_IMMMODULES_TRUE='#' ++ HAVE_INCLUDED_IMMMODULES_FALSE= ++fi ++ ++ ++INCLUDED_IMMODULE_OBJ= ++INCLUDED_IMMODULE_DEFINE= ++ ++IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," ++for immodule in $included_immodules; do ++ immodule_underscores=`echo $immodule | sed -e 's/-/_/g'` ++ if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then ++ : ++ else ++ { { echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 ++echo "$as_me: error: the specified input method $immodule does not exist" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la" ++ INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores" ++ eval INCLUDE_$immodule_underscores=yes ++done ++IFS="$gtk_save_ifs" ++ ++ ++ ++ ++ ++if test x"$INCLUDE_am_et" = xyes; then ++ INCLUDE_IM_AM_ET_TRUE= ++ INCLUDE_IM_AM_ET_FALSE='#' ++else ++ INCLUDE_IM_AM_ET_TRUE='#' ++ INCLUDE_IM_AM_ET_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_cedilla" = xyes; then ++ INCLUDE_IM_CEDILLA_TRUE= ++ INCLUDE_IM_CEDILLA_FALSE='#' ++else ++ INCLUDE_IM_CEDILLA_TRUE='#' ++ INCLUDE_IM_CEDILLA_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_cyrillic_translit" = xyes; then ++ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= ++ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' ++else ++ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#' ++ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_ime" = xyes; then ++ INCLUDE_IM_IME_TRUE= ++ INCLUDE_IM_IME_FALSE='#' ++else ++ INCLUDE_IM_IME_TRUE='#' ++ INCLUDE_IM_IME_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_inuktitut" = xyes; then ++ INCLUDE_IM_INUKTITUT_TRUE= ++ INCLUDE_IM_INUKTITUT_FALSE='#' ++else ++ INCLUDE_IM_INUKTITUT_TRUE='#' ++ INCLUDE_IM_INUKTITUT_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_ipa" = xyes; then ++ INCLUDE_IM_IPA_TRUE= ++ INCLUDE_IM_IPA_FALSE='#' ++else ++ INCLUDE_IM_IPA_TRUE='#' ++ INCLUDE_IM_IPA_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_multipress" = xyes; then ++ INCLUDE_IM_MULTIPRESS_TRUE= ++ INCLUDE_IM_MULTIPRESS_FALSE='#' ++else ++ INCLUDE_IM_MULTIPRESS_TRUE='#' ++ INCLUDE_IM_MULTIPRESS_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_thai" = xyes; then ++ INCLUDE_IM_THAI_TRUE= ++ INCLUDE_IM_THAI_FALSE='#' ++else ++ INCLUDE_IM_THAI_TRUE='#' ++ INCLUDE_IM_THAI_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_ti_er" = xyes; then ++ INCLUDE_IM_TI_ER_TRUE= ++ INCLUDE_IM_TI_ER_FALSE='#' ++else ++ INCLUDE_IM_TI_ER_TRUE='#' ++ INCLUDE_IM_TI_ER_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_ti_et" = xyes; then ++ INCLUDE_IM_TI_ET_TRUE= ++ INCLUDE_IM_TI_ET_FALSE='#' ++else ++ INCLUDE_IM_TI_ET_TRUE='#' ++ INCLUDE_IM_TI_ET_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_viqr" = xyes; then ++ INCLUDE_IM_VIQR_TRUE= ++ INCLUDE_IM_VIQR_FALSE='#' ++else ++ INCLUDE_IM_VIQR_TRUE='#' ++ INCLUDE_IM_VIQR_FALSE= ++fi ++ ++ ++ ++if test x"$INCLUDE_xim" = xyes; then ++ INCLUDE_IM_XIM_TRUE= ++ INCLUDE_IM_XIM_FALSE='#' ++else ++ INCLUDE_IM_XIM_TRUE='#' ++ INCLUDE_IM_XIM_FALSE= ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_wait_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#ifndef WEXITSTATUS ++# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) ++#endif ++#ifndef WIFEXITED ++# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) ++#endif ++ ++int ++main () ++{ ++ int s; ++ wait (&s); ++ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_sys_wait_h=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } ++if test $ac_cv_header_sys_wait_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_SYS_WAIT_H 1 ++_ACEOF ++ ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 ++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } ++if test "${ac_cv_type_signal+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++ ++int ++main () ++{ ++return *(signal (0, 0)) (0) == 1; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_type_signal=void ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 ++echo "${ECHO_T}$ac_cv_type_signal" >&6; } ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define RETSIGTYPE $ac_cv_type_signal ++_ACEOF ++ ++ ++ ++ ++ ++if test "x$LIBTIFF" != x; then ++ HAVE_TIFF_TRUE= ++ HAVE_TIFF_FALSE='#' ++else ++ HAVE_TIFF_TRUE='#' ++ HAVE_TIFF_FALSE= ++fi ++ ++ ++ ++if test "x$LIBPNG" != x; then ++ HAVE_PNG_TRUE= ++ HAVE_PNG_FALSE='#' ++else ++ HAVE_PNG_TRUE='#' ++ HAVE_PNG_FALSE= ++fi ++ ++ ++ ++if test "x$LIBJPEG" != x; then ++ HAVE_JPEG_TRUE= ++ HAVE_JPEG_FALSE='#' ++else ++ HAVE_JPEG_TRUE='#' ++ HAVE_JPEG_FALSE= ++fi ++ ++ ++ ++if test "x$LIBJASPER" != x; then ++ HAVE_JASPER_TRUE= ++ HAVE_JASPER_FALSE='#' ++else ++ HAVE_JASPER_TRUE='#' ++ HAVE_JASPER_FALSE= ++fi ++ ++ ++if $dynworks ; then ++ STATIC_LIB_DEPS= ++ if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF" ++ fi ++ if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG" ++ fi ++ if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" ++ fi ++else ++ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG" ++fi ++ ++# Checks to see whether we should include mediaLib ++# support. ++# ++if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 ++echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 ++echo $ECHO_N "checking sys/systeminfo.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking sys/systeminfo.h presence" >&5 ++echo $ECHO_N "checking sys/systeminfo.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 ++echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_sys_systeminfo_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } ++ ++fi ++if test $ac_cv_header_sys_systeminfo_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_SYS_SYSTEMINFO_H 1 ++_ACEOF ++ ++fi ++ ++ ++if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 ++echo $ECHO_N "checking for sys/sysinfo.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 ++echo $ECHO_N "checking sys/sysinfo.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 ++echo $ECHO_N "checking sys/sysinfo.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 ++echo $ECHO_N "checking for sys/sysinfo.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_sys_sysinfo_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } ++ ++fi ++if test $ac_cv_header_sys_sysinfo_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_SYS_SYSINFO_H 1 ++_ACEOF ++ ++fi ++ ++ ++ ++{ echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 ++echo $ECHO_N "checking for mediaLib 2.3... $ECHO_C" >&6; } ++use_mlib25=no ++# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib ++# patch requires. ++{ echo "$as_me:$LINENO: checking for mlib_ImageSetStruct in -lmlib" >&5 ++echo $ECHO_N "checking for mlib_ImageSetStruct in -lmlib... $ECHO_C" >&6; } ++if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lmlib $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char mlib_ImageSetStruct (); ++int ++main () ++{ ++return mlib_ImageSetStruct (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_mlib_mlib_ImageSetStruct=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 ++echo "${ECHO_T}$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } ++if test $ac_cv_lib_mlib_mlib_ImageSetStruct = yes; then ++ use_mlib=yes ++else ++ use_mlib=no ++fi ++ ++if test $use_mlib = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define USE_MEDIALIB 1 ++_ACEOF ++ ++ MEDIA_LIB=-lmlib ++ ++ { echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 ++echo $ECHO_N "checking for mediaLib 2.5... $ECHO_C" >&6; } ++ # Check for a mediaLib 2.5 function since that is what is needed for ++ # gdk_rgb_convert integration. ++ { echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 ++echo $ECHO_N "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... $ECHO_C" >&6; } ++if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lmlib $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char mlib_VideoColorRGBint_to_BGRAint (); ++int ++main () ++{ ++return mlib_VideoColorRGBint_to_BGRAint (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 ++echo "${ECHO_T}$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } ++if test $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint = yes; then ++ use_mlib25=yes ++else ++ use_mlib25=no ++fi ++ ++ if test $use_mlib25 = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define USE_MEDIALIB25 1 ++_ACEOF ++ ++ fi ++fi ++ ++ ++if test $use_mlib = yes; then ++ USE_MEDIALIB_TRUE= ++ USE_MEDIALIB_FALSE='#' ++else ++ USE_MEDIALIB_TRUE='#' ++ USE_MEDIALIB_FALSE= ++fi ++ ++ ++ ++if test $use_mlib25 = yes; then ++ USE_MEDIALIB25_TRUE= ++ USE_MEDIALIB25_FALSE='#' ++else ++ USE_MEDIALIB25_TRUE='#' ++ USE_MEDIALIB25_FALSE= ++fi ++ ++ ++# Checks to see if we should compile in MMX support (there will be ++# a runtime test when the code is actually run to see if it should ++# be used - this just checks if we can compile it.) ++# ++# This code is partially taken from Mesa ++# ++{ echo "$as_me:$LINENO: checking for x86 platform" >&5 ++echo $ECHO_N "checking for x86 platform... $ECHO_C" >&6; } ++case $host_cpu in ++ i386|i486|i586|i686|i786|k6|k7) ++ use_x86_asm=yes ++ ;; ++ *) ++ use_x86_asm=no ++esac ++{ echo "$as_me:$LINENO: result: $use_x86_asm" >&5 ++echo "${ECHO_T}$use_x86_asm" >&6; } ++ ++use_mmx_asm=no ++if test $use_x86_asm = yes; then ++ save_ac_ext=$ac_ext ++ ac_ext=S ++ ++ { echo "$as_me:$LINENO: checking compiler support for MMX" >&5 ++echo $ECHO_N "checking compiler support for MMX... $ECHO_C" >&6; } ++ cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S ++ 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 ++ use_mmx_asm=yes ++ fi ++ ++ rm -rf conftest* ++ ++ ac_ext=$save_ac_ext ++ if test $use_mmx_asm = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define USE_MMX 1 ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ fi ++fi ++ ++ ++ ++if test x$use_mmx_asm = xyes; then ++ USE_MMX_TRUE= ++ USE_MMX_FALSE='#' ++else ++ USE_MMX_TRUE='#' ++ USE_MMX_FALSE= ++fi ++ ++ ++REBUILD_PNGS= ++if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then ++ REBUILD_PNGS=# ++fi ++ ++ ++ ++ ++if test $cross_compiling = yes; then ++ CROSS_COMPILING_TRUE= ++ CROSS_COMPILING_FALSE='#' ++else ++ CROSS_COMPILING_TRUE='#' ++ CROSS_COMPILING_FALSE= ++fi ++ ++ ++if test $cross_compiling = yes; then ++ # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. ++set dummy gdk-pixbuf-csource; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $GDK_PIXBUF_CSOURCE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" ++ ;; ++esac ++fi ++GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE ++if test -n "$GDK_PIXBUF_CSOURCE"; then ++ { echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 ++echo "${ECHO_T}$GDK_PIXBUF_CSOURCE" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. ++set dummy gtk-update-icon-cache; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $GTK_UPDATE_ICON_CACHE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GTK_UPDATE_ICON_CACHE="$GTK_UPDATE_ICON_CACHE" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no" ++ ;; ++esac ++fi ++GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE ++if test -n "$GTK_UPDATE_ICON_CACHE"; then ++ { echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 ++echo "${ECHO_T}$GTK_UPDATE_ICON_CACHE" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ if test x$GTK_UPDATE_ICON_CACHE = xno; then ++ REBUILD_PNGS=# ++ fi ++fi ++ ++if test ! -f $srcdir/gtk/gtkbuiltincache.h && ++ test "x$REBUILD_PNGS" = "x#" ; then ++ { { echo "$as_me:$LINENO: error: ++*** gtkbuiltincache.h is not in the tree, and cannot be built ++*** because you don't have libpng, or (when cross-compiling) you ++*** don't have a prebuilt gtk-update-icon-cache on the build system." >&5 ++echo "$as_me: error: ++*** gtkbuiltincache.h is not in the tree, and cannot be built ++*** because you don't have libpng, or (when cross-compiling) you ++*** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ ++ ++GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" ++GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" ++GDK_PIXBUF_EXTRA_CFLAGS= ++GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" ++GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" ++ ++######################################## ++# Windowing system checks ++######################################## ++ ++GDK_PIXBUF_XLIB_PACKAGES= ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS= ++GDK_PIXBUF_XLIB_EXTRA_LIBS= ++ ++X_PACKAGES=fontconfig ++GDK_EXTRA_LIBS="$GDK_WLIBS" ++GDK_EXTRA_CFLAGS= ++ ++# GTK+ uses some X calls, so needs to link against X directly ++GTK_DEP_PACKAGES_FOR_X= ++GTK_DEP_LIBS_FOR_X= ++ ++if test "x$gdktarget" = "xx11"; then ++ # ++ # We use fontconfig very peripherally when decoding the default ++ # settings. ++ # ++ if $PKG_CONFIG --exists fontconfig; then : ; else ++ { { echo "$as_me:$LINENO: error: ++*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&5 ++echo "$as_me: error: ++*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ # ++ # Check for basic X packages; we use pkg-config if available ++ # ++ if $PKG_CONFIG --exists x11 xext xrender; then ++ have_base_x_pc=true ++ X_PACKAGES="$X_PACKAGES x11 xext xrender" ++ x_libs="`$PKG_CONFIG --libs x11 xext xrender`" ++ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" ++ ++ # Strip out any .la files that pkg-config might give us (this happens ++ # with -uninstalled.pc files) ++ x_libs_for_checks= ++ for I in $x_libs ; do ++ case $I in ++ *.la) ;; ++ *) x_libs_for_checks="$x_libs_for_checks $I" ;; ++ esac ++ done ++ ++ GDK_PIXBUF_XLIB_PACKAGES="x11" ++ GTK_PACKAGES_FOR_X="x11" ++ else ++ have_base_x_pc=false ++ { echo "$as_me:$LINENO: checking for X" >&5 ++echo $ECHO_N "checking for X... $ECHO_C" >&6; } ++ ++ ++# Check whether --with-x was given. ++if test "${with_x+set}" = set; then ++ withval=$with_x; ++fi ++ ++# $have_x is `yes', `no', `disabled', or empty when we do not yet know. ++if test "x$with_x" = xno; then ++ # The user explicitly disabled X. ++ have_x=disabled ++else ++ case $x_includes,$x_libraries in #( ++ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 ++echo "$as_me: error: Cannot use X directory names containing '" >&2;} ++ { (exit 1); exit 1; }; };; #( ++ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # One or both of the vars are not set, and there is no cached value. ++ac_x_includes=no ac_x_libraries=no ++rm -f -r conftest.dir ++if mkdir conftest.dir; then ++ cd conftest.dir ++ cat >Imakefile <<'_ACEOF' ++incroot: ++ @echo incroot='${INCROOT}' ++usrlibdir: ++ @echo usrlibdir='${USRLIBDIR}' ++libdir: ++ @echo libdir='${LIBDIR}' ++_ACEOF ++ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then ++ # GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++ for ac_var in incroot usrlibdir libdir; do ++ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" ++ done ++ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. ++ for ac_extension in a so sl; do ++ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && ++ test -f "$ac_im_libdir/libX11.$ac_extension"; then ++ ac_im_usrlibdir=$ac_im_libdir; break ++ fi ++ done ++ # Screen out bogus values from the imake configuration. They are ++ # bogus both because they are the default anyway, and because ++ # using them would break gcc on systems where it needs fixed includes. ++ case $ac_im_incroot in ++ /usr/include) ac_x_includes= ;; ++ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; ++ esac ++ case $ac_im_usrlibdir in ++ /usr/lib | /lib) ;; ++ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; ++ esac ++ fi ++ cd .. ++ rm -f -r conftest.dir ++fi ++ ++# Standard set of common directories for X headers. ++# Check X11 before X11Rn because it is often a symlink to the current release. ++ac_x_header_dirs=' ++/usr/X11/include ++/usr/X11R6/include ++/usr/X11R5/include ++/usr/X11R4/include ++ ++/usr/include/X11 ++/usr/include/X11R6 ++/usr/include/X11R5 ++/usr/include/X11R4 ++ ++/usr/local/X11/include ++/usr/local/X11R6/include ++/usr/local/X11R5/include ++/usr/local/X11R4/include ++ ++/usr/local/include/X11 ++/usr/local/include/X11R6 ++/usr/local/include/X11R5 ++/usr/local/include/X11R4 ++ ++/usr/X386/include ++/usr/x386/include ++/usr/XFree86/include/X11 ++ ++/usr/include ++/usr/local/include ++/usr/unsupported/include ++/usr/athena/include ++/usr/local/x11r5/include ++/usr/lpp/Xamples/include ++ ++/usr/openwin/include ++/usr/openwin/share/include' ++ ++if test "$ac_x_includes" = no; then ++ # Guess where to find include files, by looking for Xlib.h. ++ # First, try using that file with no special directory specified. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ for ac_dir in $ac_x_header_dirs; do ++ if test -r "$ac_dir/X11/Xlib.h"; then ++ ac_x_includes=$ac_dir ++ break ++ fi ++done ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++fi # $ac_x_includes = no ++ ++if test "$ac_x_libraries" = no; then ++ # Check for the libraries. ++ # See if we find them without any special options. ++ # Don't add to $LIBS permanently. ++ ac_save_LIBS=$LIBS ++ LIBS="-lX11 $LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++int ++main () ++{ ++XrmInitialize () ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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= ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ LIBS=$ac_save_LIBS ++for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` ++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/libX11.$ac_extension"; then ++ ac_x_libraries=$ac_dir ++ break 2 ++ fi ++ done ++done ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi # $ac_x_libraries = no ++ ++case $ac_x_includes,$ac_x_libraries in #( ++ no,* | *,no | *\'*) ++ # Didn't find X, or a directory has "'" in its name. ++ ac_cv_have_x="have_x=no";; #( ++ *) ++ # Record where we found X for the cache. ++ ac_cv_have_x="have_x=yes\ ++ ac_x_includes='$ac_x_includes'\ ++ ac_x_libraries='$ac_x_libraries'" ++esac ++fi ++;; #( ++ *) have_x=yes;; ++ esac ++ eval "$ac_cv_have_x" ++fi # $with_x != no ++ ++if test "$have_x" != yes; then ++ { echo "$as_me:$LINENO: result: $have_x" >&5 ++echo "${ECHO_T}$have_x" >&6; } ++ no_x=yes ++else ++ # If each of the values was on the command line, it overrides each guess. ++ test "x$x_includes" = xNONE && x_includes=$ac_x_includes ++ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries ++ # Update the cache value to reflect the command line values. ++ ac_cv_have_x="have_x=yes\ ++ ac_x_includes='$x_includes'\ ++ ac_x_libraries='$x_libraries'" ++ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 ++echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } ++fi ++ ++if test "$no_x" = yes; then ++ # Not all programs may use this symbol, but it does not hurt to define it. ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define X_DISPLAY_MISSING 1 ++_ACEOF ++ ++ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= ++else ++ if test -n "$x_includes"; then ++ X_CFLAGS="$X_CFLAGS -I$x_includes" ++ fi ++ ++ # It would also be nice to do this for all -L options, not just this one. ++ if test -n "$x_libraries"; then ++ 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 . . . . ++ { 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" ++ 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 ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++ ++ LIBS="$ac_xsave_LIBS -R $x_libraries" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++ ++ { echo "$as_me:$LINENO: result: neither works" >&5 ++echo "${ECHO_T}neither works" >&6; } ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++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. ++ # Do this before checking for the system-independent R6 libraries ++ # (-lICE), since we may need -lsocket or whatever for X linking. ++ ++ if test "$ISC" = yes; then ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" ++ else ++ # Martyn Johnson says this is needed for Ultrix, if the X ++ # libraries were built with DECnet support. And Karl Berry says ++ # the Alpha needs dnet_stub (dnet does not exist). ++ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XOpenDisplay (); ++int ++main () ++{ ++return XOpenDisplay (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 ++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } ++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldnet $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dnet_ntoa (); ++int ++main () ++{ ++return dnet_ntoa (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_dnet_dnet_ntoa=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } ++if test $ac_cv_lib_dnet_dnet_ntoa = yes; then ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" ++fi ++ ++ if test $ac_cv_lib_dnet_dnet_ntoa = no; then ++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } ++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldnet_stub $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dnet_ntoa (); ++int ++main () ++{ ++return dnet_ntoa (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_dnet_stub_dnet_ntoa=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } ++if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" ++fi ++ ++ fi ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LIBS="$ac_xsave_LIBS" ++ ++ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, ++ # to get the SysV transport functions. ++ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) ++ # needs -lnsl. ++ # The nsl library prevents programs from opening the X display ++ # on Irix 5.2, according to T.E. Dickey. ++ # The functions gethostbyname, getservbyname, and inet_addr are ++ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. ++ { echo "$as_me:$LINENO: checking for gethostbyname" >&5 ++echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } ++if test "${ac_cv_func_gethostbyname+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define gethostbyname innocuous_gethostbyname ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char gethostbyname (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef gethostbyname ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char gethostbyname (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_gethostbyname || defined __stub___gethostbyname ++choke me ++#endif ++ ++int ++main () ++{ ++return gethostbyname (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_gethostbyname=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } ++ ++ if test $ac_cv_func_gethostbyname = no; then ++ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 ++echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lnsl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char gethostbyname (); ++int ++main () ++{ ++return gethostbyname (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_nsl_gethostbyname=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } ++if test $ac_cv_lib_nsl_gethostbyname = yes; then ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" ++fi ++ ++ if test $ac_cv_lib_nsl_gethostbyname = no; then ++ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 ++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } ++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lbsd $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char gethostbyname (); ++int ++main () ++{ ++return gethostbyname (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_bsd_gethostbyname=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } ++if test $ac_cv_lib_bsd_gethostbyname = yes; then ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" ++fi ++ ++ fi ++ fi ++ ++ # lieder@skyler.mavd.honeywell.com says without -lsocket, ++ # socket/setsockopt and other routines are undefined under SCO ODT ++ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary ++ # on later versions), says Simon Leinen: it contains gethostby* ++ # variants that don't use the name server (or something). -lsocket ++ # must be given before -lnsl if both are needed. We assume that ++ # if connect needs -lnsl, so does gethostbyname. ++ { echo "$as_me:$LINENO: checking for connect" >&5 ++echo $ECHO_N "checking for connect... $ECHO_C" >&6; } ++if test "${ac_cv_func_connect+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define connect to an innocuous variant, in case declares connect. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define connect innocuous_connect ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char connect (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef connect ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char connect (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_connect || defined __stub___connect ++choke me ++#endif ++ ++int ++main () ++{ ++return connect (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_connect=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_connect" >&6; } ++ ++ if test $ac_cv_func_connect = no; then ++ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 ++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } ++if test "${ac_cv_lib_socket_connect+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsocket $X_EXTRA_LIBS $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char connect (); ++int ++main () ++{ ++return connect (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_socket_connect=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 ++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } ++if test $ac_cv_lib_socket_connect = yes; then ++ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" ++fi ++ ++ fi ++ ++ # Guillermo Gomez says -lposix is necessary on A/UX. ++ { echo "$as_me:$LINENO: checking for remove" >&5 ++echo $ECHO_N "checking for remove... $ECHO_C" >&6; } ++if test "${ac_cv_func_remove+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define remove to an innocuous variant, in case declares remove. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define remove innocuous_remove ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char remove (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef remove ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char remove (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_remove || defined __stub___remove ++choke me ++#endif ++ ++int ++main () ++{ ++return remove (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_remove=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_remove" >&6; } ++ ++ if test $ac_cv_func_remove = no; then ++ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 ++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } ++if test "${ac_cv_lib_posix_remove+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lposix $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char remove (); ++int ++main () ++{ ++return remove (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_posix_remove=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 ++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } ++if test $ac_cv_lib_posix_remove = yes; then ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" ++fi ++ ++ fi ++ ++ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ++ { echo "$as_me:$LINENO: checking for shmat" >&5 ++echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } ++if test "${ac_cv_func_shmat+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define shmat to an innocuous variant, in case declares shmat. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define shmat innocuous_shmat ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char shmat (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef shmat ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char shmat (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_shmat || defined __stub___shmat ++choke me ++#endif ++ ++int ++main () ++{ ++return shmat (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_shmat=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_shmat" >&6; } ++ ++ if test $ac_cv_func_shmat = no; then ++ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 ++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } ++if test "${ac_cv_lib_ipc_shmat+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lipc $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char shmat (); ++int ++main () ++{ ++return shmat (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_ipc_shmat=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 ++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } ++if test $ac_cv_lib_ipc_shmat = yes; then ++ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" ++fi ++ ++ fi ++ fi ++ ++ # Check for libraries that X11R6 Xt/Xaw programs need. ++ ac_save_LDFLAGS=$LDFLAGS ++ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" ++ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to ++ # check for ICE first), but we must link in the order -lSM -lICE or ++ # we get undefined symbols. So assume we have SM if we have ICE. ++ # These have to be linked with before -lX11, unlike the other ++ # libraries we check for below, so use a different variable. ++ # John Interrante, Karl Berry ++ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 ++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } ++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lICE $X_EXTRA_LIBS $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char IceConnectionNumber (); ++int ++main () ++{ ++return IceConnectionNumber (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_ICE_IceConnectionNumber=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } ++if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then ++ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" ++fi ++ ++ LDFLAGS=$ac_save_LDFLAGS ++ ++fi ++ ++ if test x$no_x = xyes ; then ++ { { echo "$as_me:$LINENO: error: X development libraries not found" >&5 ++echo "$as_me: error: X development libraries not found" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ x_cflags="$X_CFLAGS" ++ x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS" ++ ++ GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags" ++ GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" ++ GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS" ++ fi ++ ++ # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. ++ x_extra_libs= ++ ++ gtk_save_cppflags="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $X_CFLAGS" ++ ++ gtk_save_LIBS=$LIBS ++ LIBS="$x_libs_for_checks $LIBS" ++ ++ # Sanity check for the X11 and Xext libraries. While everything we need from ++ # Xext is optional, the chances a system has *none* of these things is so ++ # small that we just unconditionally require it. ++ { echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 ++echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6; } ++if test "${ac_cv_func_XOpenDisplay+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define XOpenDisplay to an innocuous variant, in case declares XOpenDisplay. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define XOpenDisplay innocuous_XOpenDisplay ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char XOpenDisplay (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef XOpenDisplay ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XOpenDisplay (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_XOpenDisplay || defined __stub___XOpenDisplay ++choke me ++#endif ++ ++int ++main () ++{ ++return XOpenDisplay (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_XOpenDisplay=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6; } ++if test $ac_cv_func_XOpenDisplay = yes; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 ++echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ { echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 ++echo $ECHO_N "checking for XextFindDisplay... $ECHO_C" >&6; } ++if test "${ac_cv_func_XextFindDisplay+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define XextFindDisplay to an innocuous variant, in case declares XextFindDisplay. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define XextFindDisplay innocuous_XextFindDisplay ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char XextFindDisplay (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef XextFindDisplay ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XextFindDisplay (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_XextFindDisplay || defined __stub___XextFindDisplay ++choke me ++#endif ++ ++int ++main () ++{ ++return XextFindDisplay (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_XextFindDisplay=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_XextFindDisplay" >&6; } ++if test $ac_cv_func_XextFindDisplay = yes; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 ++echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ { echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 ++echo $ECHO_N "checking for XRenderQueryExtension... $ECHO_C" >&6; } ++if test "${ac_cv_func_XRenderQueryExtension+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define XRenderQueryExtension to an innocuous variant, in case declares XRenderQueryExtension. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define XRenderQueryExtension innocuous_XRenderQueryExtension ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char XRenderQueryExtension (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef XRenderQueryExtension ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XRenderQueryExtension (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_XRenderQueryExtension || defined __stub___XRenderQueryExtension ++choke me ++#endif ++ ++int ++main () ++{ ++return XRenderQueryExtension (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_XRenderQueryExtension=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_XRenderQueryExtension" >&6; } ++if test $ac_cv_func_XRenderQueryExtension = yes; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 ++echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ ++ # Check for xReply ++ ++ { echo "$as_me:$LINENO: checking if is needed for xReply" >&5 ++echo $ECHO_N "checking if is needed for xReply... $ECHO_C" >&6; } ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++xReply *rep; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++int ++main () ++{ ++xReply *rep; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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; } ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define NEED_XIPROTO_H_FOR_XREPLY 1 ++_ACEOF ++ ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ { echo "$as_me:$LINENO: result: unknown" >&5 ++echo "${ECHO_T}unknown" >&6; } ++ { { echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 ++echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++ # Check for XConvertCase, XInternAtoms (X11R6 specific) ++ ++ ++ ++for ac_func in XConvertCase XInternAtoms ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++ # Generic X11R6 check needed for XIM support; we could ++ # probably use this to replace the above, but we'll ++ # leave the separate checks for XConvertCase and XInternAtoms ++ # for clarity ++ ++ have_x11r6=false ++ { echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 ++echo $ECHO_N "checking for XAddConnectionWatch... $ECHO_C" >&6; } ++if test "${ac_cv_func_XAddConnectionWatch+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define XAddConnectionWatch to an innocuous variant, in case declares XAddConnectionWatch. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define XAddConnectionWatch innocuous_XAddConnectionWatch ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char XAddConnectionWatch (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef XAddConnectionWatch ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XAddConnectionWatch (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_XAddConnectionWatch || defined __stub___XAddConnectionWatch ++choke me ++#endif ++ ++int ++main () ++{ ++return XAddConnectionWatch (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_XAddConnectionWatch=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_XAddConnectionWatch" >&6; } ++if test $ac_cv_func_XAddConnectionWatch = yes; then ++ have_x11r6=true ++fi ++ ++ ++ if $have_x11r6; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_X11R6 1 ++_ACEOF ++ ++ fi ++ ++ ++if $have_x11r6; then ++ HAVE_X11R6_TRUE= ++ HAVE_X11R6_FALSE='#' ++else ++ HAVE_X11R6_TRUE='#' ++ HAVE_X11R6_FALSE= ++fi ++ ++ ++ # Check for XKB support. ++ ++ if test "x$enable_xkb" = "xyes"; then ++ { echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 ++echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XKB 1 ++_ACEOF ++ ++ elif test "x$enable_xkb" = "xmaybe"; then ++ { echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 ++echo $ECHO_N "checking for XkbQueryExtension... $ECHO_C" >&6; } ++if test "${ac_cv_func_XkbQueryExtension+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define XkbQueryExtension to an innocuous variant, in case declares XkbQueryExtension. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define XkbQueryExtension innocuous_XkbQueryExtension ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char XkbQueryExtension (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef XkbQueryExtension ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XkbQueryExtension (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_XkbQueryExtension || defined __stub___XkbQueryExtension ++choke me ++#endif ++ ++int ++main () ++{ ++return XkbQueryExtension (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_XkbQueryExtension=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_XkbQueryExtension" >&6; } ++if test $ac_cv_func_XkbQueryExtension = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XKB 1 ++_ACEOF ++ ++fi ++ ++ else ++ { echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 ++echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} ++ fi ++ ++ # Check for shaped window extension ++ ++ { echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 ++echo $ECHO_N "checking for XShapeCombineMask... $ECHO_C" >&6; } ++if test "${ac_cv_func_XShapeCombineMask+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define XShapeCombineMask to an innocuous variant, in case declares XShapeCombineMask. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define XShapeCombineMask innocuous_XShapeCombineMask ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char XShapeCombineMask (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef XShapeCombineMask ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XShapeCombineMask (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_XShapeCombineMask || defined __stub___XShapeCombineMask ++choke me ++#endif ++ ++int ++main () ++{ ++return XShapeCombineMask (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_XShapeCombineMask=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_XShapeCombineMask" >&6; } ++if test $ac_cv_func_XShapeCombineMask = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_SHAPE_EXT 1 ++_ACEOF ++ ++fi ++ ++ ++ # X SYNC check ++ gtk_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $x_cflags" ++ ++ { echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 ++echo $ECHO_N "checking for XSyncQueryExtension... $ECHO_C" >&6; } ++if test "${ac_cv_func_XSyncQueryExtension+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define XSyncQueryExtension to an innocuous variant, in case declares XSyncQueryExtension. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define XSyncQueryExtension innocuous_XSyncQueryExtension ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char XSyncQueryExtension (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef XSyncQueryExtension ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XSyncQueryExtension (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_XSyncQueryExtension || defined __stub___XSyncQueryExtension ++choke me ++#endif ++ ++int ++main () ++{ ++return XSyncQueryExtension (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_XSyncQueryExtension=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_XSyncQueryExtension" >&6; } ++if test $ac_cv_func_XSyncQueryExtension = yes; then ++ { echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 ++echo $ECHO_N "checking for X11/extensions/sync.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_X11_extensions_sync_h=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_sync_h" >&6; } ++if test $ac_cv_header_X11_extensions_sync_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XSYNC 1 ++_ACEOF ++ ++else ++ : ++fi ++ ++ ++fi ++ ++ ++ CFLAGS="$gtk_save_CFLAGS" ++ ++ # Xshm checks ++ ++ if test "x$enable_shm" = "xyes"; then ++ # Check for the XShm extension, normally in Xext ++ { echo "$as_me:$LINENO: checking for XShmAttach" >&5 ++echo $ECHO_N "checking for XShmAttach... $ECHO_C" >&6; } ++if test "${ac_cv_func_XShmAttach+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define XShmAttach to an innocuous variant, in case declares XShmAttach. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define XShmAttach innocuous_XShmAttach ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char XShmAttach (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef XShmAttach ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XShmAttach (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_XShmAttach || defined __stub___XShmAttach ++choke me ++#endif ++ ++int ++main () ++{ ++return XShmAttach (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_XShmAttach=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_XShmAttach" >&6; } ++if test $ac_cv_func_XShmAttach = yes; then ++ : ++else ++ # On AIX, it is in XextSam instead ++ { echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 ++echo $ECHO_N "checking for XShmAttach in -lXextSam... $ECHO_C" >&6; } ++if test "${ac_cv_lib_XextSam_XShmAttach+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lXextSam $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XShmAttach (); ++int ++main () ++{ ++return XShmAttach (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_XextSam_XShmAttach=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 ++echo "${ECHO_T}$ac_cv_lib_XextSam_XShmAttach" >&6; } ++if test $ac_cv_lib_XextSam_XShmAttach = yes; then ++ case "$x_extra_libs " in ++ *-lXextSam[\ \ ]*) ;; ++ *) x_extra_libs="-lXextSam $x_extra_libs" ;; ++ esac ++ ++fi ++ ++fi ++ ++ fi ++ ++ if test "x$enable_shm" = "xyes"; then ++ # Check for shared memory ++ if test "${ac_cv_header_sys_ipc_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 ++echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_ipc_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 ++echo $ECHO_N "checking sys/ipc.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 ++echo $ECHO_N "checking sys/ipc.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 ++echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_ipc_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_sys_ipc_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } ++ ++fi ++if test $ac_cv_header_sys_ipc_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_IPC_H 1 ++_ACEOF ++ ++else ++ no_sys_ipc=yes ++fi ++ ++ ++ if test "${ac_cv_header_sys_shm_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for sys/shm.h" >&5 ++echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_shm_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 ++echo $ECHO_N "checking sys/shm.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 ++echo $ECHO_N "checking sys/shm.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for sys/shm.h" >&5 ++echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_shm_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_sys_shm_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } ++ ++fi ++if test $ac_cv_header_sys_shm_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_SHM_H 1 ++_ACEOF ++ ++else ++ no_sys_shm=yes ++fi ++ ++ ++ ++ # Check for the X shared memory extension header file ++ have_xshm=no ++ { echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 ++echo $ECHO_N "checking X11/extensions/XShm.h... $ECHO_C" >&6; } ++ if test "x$no_xext_lib" = "xyes"; then ++ : ++ else ++ gtk_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $x_cflags" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++int ++main () ++{ ++XShmSegmentInfo *x_shm_info; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$gtk_save_CFLAGS" ++ fi ++ { echo "$as_me:$LINENO: result: $have_xshm" >&5 ++echo "${ECHO_T}$have_xshm" >&6; } ++ if test $have_xshm = yes ; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XSHM_H 1 ++_ACEOF ++ ++ fi ++ fi ++ ++ if test "x$enable_xinerama" = "xyes"; then ++ # Check for Xinerama extension (Solaris impl or Xfree impl) ++ gtk_save_cppflags="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $x_cflags" ++ ++ case "$host" in ++ *-*-solaris*) ++ # Check for solaris ++ { echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 ++echo $ECHO_N "checking for Xinerama support on Solaris... $ECHO_C" >&6; } ++ ++ have_solaris_xinerama=false ++ { echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 ++echo $ECHO_N "checking for XineramaGetInfo... $ECHO_C" >&6; } ++if test "${ac_cv_func_XineramaGetInfo+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define XineramaGetInfo to an innocuous variant, in case declares XineramaGetInfo. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define XineramaGetInfo innocuous_XineramaGetInfo ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char XineramaGetInfo (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef XineramaGetInfo ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XineramaGetInfo (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_XineramaGetInfo || defined __stub___XineramaGetInfo ++choke me ++#endif ++ ++int ++main () ++{ ++return XineramaGetInfo (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_XineramaGetInfo=no ++fi ++ ++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 ++echo "${ECHO_T}$ac_cv_func_XineramaGetInfo" >&6; } ++if test $ac_cv_func_XineramaGetInfo = yes; then ++ { echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 ++echo $ECHO_N "checking for X11/extensions/xinerama.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_X11_extensions_xinerama_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_X11_extensions_xinerama_h=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_xinerama_h" >&6; } ++if test $ac_cv_header_X11_extensions_xinerama_h = yes; then ++ have_solaris_xinerama=true ++else ++ : ++fi ++ ++ ++fi ++ ++ ++ if $have_solaris_xinerama ; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_SOLARIS_XINERAMA 1 ++_ACEOF ++ ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XINERAMA 1 ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ fi ++ ;; ++ *) ++ # Check for XFree ++ { echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 ++echo $ECHO_N "checking for Xinerama support on XFree86... $ECHO_C" >&6; } ++ ++ have_xfree_xinerama=false ++ if $PKG_CONFIG --exists xinerama ; then ++ have_xfree_xinerama=true ++ X_PACKAGES="$X_PACKAGES xinerama" ++ else ++ { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 ++echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; } ++if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lXinerama $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XineramaQueryExtension (); ++int ++main () ++{ ++return XineramaQueryExtension (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_Xinerama_XineramaQueryExtension=no ++fi ++ ++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 ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } ++if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then ++ { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 ++echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_X11_extensions_Xinerama_h=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } ++if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then ++ case "$x_extra_libs " in ++ *-lXinerama[\ \ ]*) ;; ++ *) x_extra_libs="-lXinerama $x_extra_libs" ;; ++ esac ++ ++ have_xfree_xinerama=true ++else ++ : ++fi ++ ++ ++fi ++ ++ fi ++ ++ if $have_xfree_xinerama ; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XFREE_XINERAMA 1 ++_ACEOF ++ ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XINERAMA 1 ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ fi ++ ;; ++ esac ++ fi ++ ++ # set up things for XInput ++ ++ if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define XINPUT_XFREE 1 ++_ACEOF ++ ++ ++ if $PKG_CONFIG --exists xi ; then ++ X_PACKAGES="$X_PACKAGES xi" ++ else ++ case "$x_extra_libs " in ++ *-lXi[\ \ ]*) ;; ++ *) x_extra_libs="-lXi $x_extra_libs" ;; ++ esac ++ ++ fi ++ else ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define XINPUT_NONE 1 ++_ACEOF ++ ++ fi ++ ++ ++ ++if test x$with_xinput = xxfree || test x$with_xinput = xyes; then ++ XINPUT_XFREE_TRUE= ++ XINPUT_XFREE_FALSE='#' ++else ++ XINPUT_XFREE_TRUE='#' ++ XINPUT_XFREE_FALSE= ++fi ++ ++ ++ # Check for the RANDR extension ++ if $PKG_CONFIG --exists "xrandr >= 1.2" ; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_RANDR 1 ++_ACEOF ++ ++ ++ X_PACKAGES="$X_PACKAGES xrandr" ++ fi ++ ++ # Checks for Xcursor library ++ ++ if $PKG_CONFIG --exists xcursor ; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XCURSOR 1 ++_ACEOF ++ ++ ++ X_PACKAGES="$X_PACKAGES xcursor" ++ fi ++ ++ # Checks for XFixes extension ++ ++ if $PKG_CONFIG --exists xfixes ; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XFIXES 1 ++_ACEOF ++ ++ ++ X_PACKAGES="$X_PACKAGES xfixes" ++ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" ++ fi ++ ++ # Checks for Xcomposite extension ++ ++ if $PKG_CONFIG --exists xcomposite ; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XCOMPOSITE 1 ++_ACEOF ++ ++ ++ X_PACKAGES="$X_PACKAGES xcomposite" ++ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite" ++ fi ++ ++ # Checks for Xdamage extension ++ ++ if $PKG_CONFIG --exists xdamage ; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_XDAMAGE 1 ++_ACEOF ++ ++ ++ X_PACKAGES="$X_PACKAGES xdamage" ++ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" ++ fi ++ ++ if $have_base_x_pc ; then ++ GDK_EXTRA_LIBS="$x_extra_libs" ++ else ++ GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" ++ fi ++ ++ CPPFLAGS="$gtk_save_cppflags" ++ LIBS="$gtk_save_libs" ++ ++ ++ ++if true; then ++ USE_X11_TRUE= ++ USE_X11_FALSE='#' ++else ++ USE_X11_TRUE='#' ++ USE_X11_FALSE= ++fi ++ ++else ++ ++ ++if false; then ++ XINPUT_XFREE_TRUE= ++ XINPUT_XFREE_FALSE='#' ++else ++ XINPUT_XFREE_TRUE='#' ++ XINPUT_XFREE_FALSE= ++fi ++ ++ ++ ++if false; then ++ USE_X11_TRUE= ++ USE_X11_FALSE='#' ++else ++ USE_X11_TRUE='#' ++ USE_X11_FALSE= ++fi ++ ++ ++ ++if false; then ++ HAVE_X11R6_TRUE= ++ HAVE_X11R6_FALSE='#' ++else ++ HAVE_X11R6_TRUE='#' ++ HAVE_X11R6_FALSE= ++fi ++ ++fi ++ ++if test "x$gdktarget" = "xwin32"; then ++ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" ++ ++ ++if true; then ++ USE_WIN32_TRUE= ++ USE_WIN32_FALSE='#' ++else ++ USE_WIN32_TRUE='#' ++ USE_WIN32_FALSE= ++fi ++ ++else ++ ++ ++if false; then ++ USE_WIN32_TRUE= ++ USE_WIN32_FALSE='#' ++else ++ USE_WIN32_TRUE='#' ++ USE_WIN32_FALSE= ++fi ++ ++fi ++ ++if test "x$gdktarget" = "xquartz"; then ++ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" ++ ++ ++if true; then ++ USE_QUARTZ_TRUE= ++ USE_QUARTZ_FALSE='#' ++else ++ USE_QUARTZ_TRUE='#' ++ USE_QUARTZ_FALSE= ++fi ++ ++else ++ ++ ++if false; then ++ USE_QUARTZ_TRUE= ++ USE_QUARTZ_FALSE='#' ++else ++ USE_QUARTZ_TRUE='#' ++ USE_QUARTZ_FALSE= ++fi ++ ++fi ++ ++GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" ++GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" ++ ++ ++ ++ ++ ++ ++ ++if test "x$gdktarget" = "xdirectfb"; then ++ DIRECTFB_REQUIRED_VERSION=0.9.26 ++ { echo "$as_me:$LINENO: checking for DirectFB" >&5 ++echo $ECHO_N "checking for DirectFB... $ECHO_C" >&6; } ++ ++ 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; } ++ # 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 ++*** are required. The latest version of DirectFB is always available ++*** from http://www.directfb.org/. ++ " >&5 ++echo "$as_me: error: ++*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend ++*** are required. The latest version of DirectFB is always available ++*** from http://www.directfb.org/. ++ " >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ ++ ++if true; then ++ USE_DIRECTFB_TRUE= ++ USE_DIRECTFB_FALSE='#' ++else ++ USE_DIRECTFB_TRUE='#' ++ USE_DIRECTFB_FALSE= ++fi ++ ++else ++ ++ ++if false; then ++ USE_DIRECTFB_TRUE= ++ USE_DIRECTFB_FALSE='#' ++else ++ USE_DIRECTFB_TRUE='#' ++ USE_DIRECTFB_FALSE= ++fi ++ ++fi ++ ++ ++# Check for Pango flags ++ ++if test "x$gdktarget" = "xwin32"; then ++ PANGO_PACKAGES="pangowin32 pangocairo" ++else ++ PANGO_PACKAGES="pango pangocairo" ++fi ++ ++{ echo "$as_me:$LINENO: checking Pango flags" >&5 ++echo $ECHO_N "checking Pango flags... $ECHO_C" >&6; } ++if $PKG_CONFIG --exists $PANGO_PACKAGES ; then ++ PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` ++ PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` ++ ++ { echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 ++echo "${ECHO_T}$PANGO_CFLAGS $PANGO_LIBS" >&6; } ++else ++ { { echo "$as_me:$LINENO: error: ++*** Pango not found. Pango built with Cairo support is required ++*** to build GTK+. See http://www.pango.org for Pango information. ++" >&5 ++echo "$as_me: error: ++*** Pango not found. Pango built with Cairo support is required ++*** to build GTK+. See http://www.pango.org for Pango information. ++" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++CFLAGS="$CFLAGS $PANGO_CFLAGS" ++ ++if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then ++ : ++else ++ gtk_save_LIBS="$LIBS" ++ LIBS="$PANGO_LIBS $LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char pango_context_new (); ++int ++main () ++{ ++return pango_context_new (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ { { echo "$as_me:$LINENO: error: ++*** Can't link to Pango. Pango is required to build ++*** GTK+. For more information see http://www.pango.org" >&5 ++echo "$as_me: error: ++*** Can't link to Pango. Pango is required to build ++*** GTK+. For more information see http://www.pango.org" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LIBS="$gtk_save_LIBS" ++fi ++ ++CFLAGS="$saved_cflags" ++LDFLAGS="$saved_ldflags" ++ ++GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES gio-2.0" ++if test "x$gdktarget" = "xx11"; then ++ GDK_PRIVATE_PACKAGES="$X_PACKAGES" ++fi ++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" ++GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" ++ ++# ++# If we aren't writing explicit dependencies, then don't put the extra libraries we need ++# into the pkg-config files ++# ++if test $enable_explicit_deps != yes ; then ++ GDK_EXTRA_LIBS= ++else ++ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++######################################## ++# Check for Accessibility Toolkit flags ++######################################## ++ ++ATK_PACKAGES=atk ++{ echo "$as_me:$LINENO: checking ATK flags" >&5 ++echo $ECHO_N "checking ATK flags... $ECHO_C" >&6; } ++if $PKG_CONFIG --exists $ATK_PACKAGES ; then ++ ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` ++ ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` ++ ++ { echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 ++echo "${ECHO_T}$ATK_CFLAGS $ATK_LIBS" >&6; } ++else ++ { { echo "$as_me:$LINENO: error: ++*** Accessibility Toolkit not found. Accessibility Toolkit is required ++*** to build GTK+. ++" >&5 ++echo "$as_me: error: ++*** Accessibility Toolkit not found. Accessibility Toolkit is required ++*** to build GTK+. ++" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then ++ : ++else ++ gtk_save_LIBS="$LIBS" ++ LIBS="$ATK_LIBS $LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char atk_object_get_type (); ++int ++main () ++{ ++return atk_object_get_type (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ { { echo "$as_me:$LINENO: error: ++ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required ++ *** to build GTK+" >&5 ++echo "$as_me: error: ++ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required ++ *** to build GTK+" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LIBS="$gtk_save_LIBS" ++fi ++ ++GTK_PACKAGES="atk cairo gio-2.0" ++if test "x$gdktarget" = "xx11"; then ++ GTK_PACKAGES="$GTK_PACKAGES pangoft2" ++fi ++GTK_EXTRA_LIBS= ++GTK_EXTRA_CFLAGS= ++GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" ++GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" ++ ++if test x"$os_win32" = xyes; then ++ GTK_EXTRA_CFLAGS="$msnative_struct" ++fi ++ ++GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" ++ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" ++PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" ++CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" ++ ++if test $enable_explicit_deps != yes ; then ++ GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++######################## ++# Checks needed for gail ++######################## ++ ++old_LIBS="$LIBS" ++{ echo "$as_me:$LINENO: checking for library containing gethostent" >&5 ++echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6; } ++if test "${ac_cv_search_gethostent+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char gethostent (); ++int ++main () ++{ ++return gethostent (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' nsl; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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_gethostent=$ac_res ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_gethostent+set}" = set; then ++ break ++fi ++done ++if test "${ac_cv_search_gethostent+set}" = set; then ++ : ++else ++ ac_cv_search_gethostent=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 ++echo "${ECHO_T}$ac_cv_search_gethostent" >&6; } ++ac_res=$ac_cv_search_gethostent ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ ++fi ++ ++{ echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 ++echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } ++if test "${ac_cv_search_setsockopt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char setsockopt (); ++int ++main () ++{ ++return setsockopt (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' socket; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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_setsockopt=$ac_res ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_setsockopt+set}" = set; then ++ break ++fi ++done ++if test "${ac_cv_search_setsockopt+set}" = set; then ++ : ++else ++ ac_cv_search_setsockopt=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 ++echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } ++ac_res=$ac_cv_search_setsockopt ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ ++fi ++ ++{ echo "$as_me:$LINENO: checking for library containing connect" >&5 ++echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; } ++if test "${ac_cv_search_connect+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char connect (); ++int ++main () ++{ ++return connect (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' inet; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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_connect=$ac_res ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_connect+set}" = set; then ++ break ++fi ++done ++if test "${ac_cv_search_connect+set}" = set; then ++ : ++else ++ ac_cv_search_connect=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 ++echo "${ECHO_T}$ac_cv_search_connect" >&6; } ++ac_res=$ac_cv_search_connect ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ ++fi ++ ++ ++{ echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 ++echo $ECHO_N "checking for struct sockaddr_un.sun_len... $ECHO_C" >&6; } ++if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ #include ++ ++ ++int ++main () ++{ ++static struct sockaddr_un ac_aggr; ++if (ac_aggr.sun_len) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_member_struct_sockaddr_un_sun_len=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ #include ++ ++ ++int ++main () ++{ ++static struct sockaddr_un ac_aggr; ++if (sizeof ac_aggr.sun_len) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_member_struct_sockaddr_un_sun_len=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_member_struct_sockaddr_un_sun_len=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 ++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } ++if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then ++ struct_sockaddr_un_sun_len=true ++else ++ struct_sockaddr_un_suin_len=false ++fi ++ ++case $struct_sockaddr_un_sun_len in ++ true) ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_SOCKADDR_UN_SUN_LEN 1 ++_ACEOF ++ ++ ;; ++ *) ++ ;; ++esac ++ ++GAIL_INET_LIBS="$LIBS" ++ ++ ++LIBS="$old_LIBS" ++ ++################################################################ ++# Printing system checks ++################################################################ ++ ++# Check whether --enable-cups was given. ++if test "${enable_cups+set}" = set; then ++ enableval=$enable_cups; ++else ++ enable_cups=auto ++fi ++ ++ ++if test "x$enable_cups" = "xauto" ++then ++ # Extract the first word of "cups-config", so it can be a program name with args. ++set dummy cups-config; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $CUPS_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no" ++ ;; ++esac ++fi ++CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG ++if test -n "$CUPS_CONFIG"; then ++ { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 ++echo "${ECHO_T}$CUPS_CONFIG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ if test "x$CUPS_CONFIG" != "xno"; then ++ CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'` ++ CUPS_LIBS=`$CUPS_CONFIG --libs` ++ ++ CUPS_API_VERSION=`$CUPS_CONFIG --api-version` ++ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` ++ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` ++ ++ if test $CUPS_API_MAJOR -gt 1 -o \ ++ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_CUPS_API_1_2 1 ++_ACEOF ++ ++ fi ++ ++ ++ ++ ++ ++ ++ if test "${ac_cv_header_cups_cups_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for cups/cups.h" >&5 ++echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_cups_cups_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 ++echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 ++echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for cups/cups.h" >&5 ++echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_cups_cups_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_cups_cups_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } ++ ++fi ++if test $ac_cv_header_cups_cups_h = yes; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 ++echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ ++ fi ++ ++ ++if test "x$CUPS_CONFIG" != "xno"; then ++ HAVE_CUPS_TRUE= ++ HAVE_CUPS_FALSE='#' ++else ++ HAVE_CUPS_TRUE='#' ++ HAVE_CUPS_FALSE= ++fi ++ ++ ++ gtk_save_cflags="$CFLAGS" ++ CFLAGS="$CUPS_CFLAGS" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++http_t http; char *s = http.authstring; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ++cat >>confdefs.h <<\_ACEOF ++@%:@define HAVE_HTTP_AUTHSTRING ++_ACEOF ++ ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$gtk_save_cflags" ++ ++ ++ ++ gtk_save_libs="$LIBS" ++ LIBS="$CUPS_LIBS" ++ ++for ac_func in httpGetAuthString ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$ac_func || defined __stub___$ac_func ++choke me ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++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); } && { ++ 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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++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'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ LIBS="$gtk_save_libs" ++ ++else ++ ++ ++if false; then ++ HAVE_CUPS_TRUE= ++ HAVE_CUPS_FALSE='#' ++else ++ HAVE_CUPS_TRUE='#' ++ HAVE_CUPS_FALSE= ++fi ++ ++fi ++ ++gtk_save_cppflags="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" ++ ++if test "${ac_cv_header_cairo_pdf_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 ++echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_cairo_pdf_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking cairo-pdf.h usability" >&5 ++echo $ECHO_N "checking cairo-pdf.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 ++echo $ECHO_N "checking cairo-pdf.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 ++echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_cairo_pdf_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_cairo_pdf_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } ++ ++fi ++if test $ac_cv_header_cairo_pdf_h = yes; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: ++*** Can't find cairo-pdf.h. You must build Cairo with the pdf ++*** backend enabled." >&5 ++echo "$as_me: error: ++*** Can't find cairo-pdf.h. You must build Cairo with the pdf ++*** backend enabled." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ ++ ++if test "$os_win32" != "yes"; then ++ if test "${ac_cv_header_cairo_ps_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 ++echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_cairo_ps_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 ++echo $ECHO_N "checking cairo-ps.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++@%:@include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 ++echo $ECHO_N "checking cairo-ps.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++@%:@include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: cairo-ps.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: cairo-ps.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: cairo-ps.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ ++@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 ++echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_cairo_ps_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_cairo_ps_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } ++ ++fi ++if test $ac_cv_header_cairo_ps_h = yes; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: ++*** Can't find cairo-ps.h. You must build Cairo with the ++*** postscript backend enabled." >&5 ++echo "$as_me: error: ++*** Can't find cairo-ps.h. You must build Cairo with the ++*** postscript backend enabled." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ ++fi ++ ++CPPFLAGS="$gtk_save_cppflags" ++ ++ ++# Check whether --enable-test-print-backend was given. ++if test "${enable_test_print_backend+set}" = set; then ++ enableval=$enable_test_print_backend; ++else ++ enable_test_print_backend=no ++fi ++ ++ ++ ++if test "x$enable_test_print_backend" != "xno"; then ++ TEST_PRINT_BACKEND_TRUE= ++ TEST_PRINT_BACKEND_FALSE='#' ++else ++ TEST_PRINT_BACKEND_TRUE='#' ++ TEST_PRINT_BACKEND_FALSE= ++fi ++ ++ ++ ++################################################################ ++# Strip -export-dynamic from the link lines of various libraries ++################################################################ ++ ++# ++# pkg-config --libs gmodule includes the "export_dynamic" flag, ++# but this flag is only meaningful for executables. For libraries ++# the effect is undefined; what it causes on Linux is that the ++# export list from -export-symbols-regex is ignored and everything ++# is exported ++# ++# We are using gmodule-no-export now, but I'm leaving the stripping ++# code in place for now, since pango and atk still require gmodule. ++export SED ++export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++if test -n "$export_dynamic"; then ++ GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` ++ GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` ++ GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` ++ GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` ++fi ++ ++ ++################################################## ++# Checks for gtk-doc and docbook-tools ++################################################## ++ ++ ++ ++# Check whether --with-html-dir was given. ++if test "${with_html_dir+set}" = set; then ++ withval=$with_html_dir; ++else ++ with_html_dir='${datadir}/gtk-doc/html' ++fi ++ ++ HTML_DIR="$with_html_dir" ++ ++ ++ # Check whether --enable-gtk-doc was given. ++if test "${enable_gtk_doc+set}" = set; then ++ enableval=$enable_gtk_doc; ++else ++ enable_gtk_doc=no ++fi ++ ++ ++ if test x$enable_gtk_doc = xyes; then ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.8") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 ++echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ fi ++ ++ { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 ++echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 ++echo "${ECHO_T}$enable_gtk_doc" >&6; } ++ ++ for ac_prog in gtkdoc-check ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $GTKDOC_CHECK in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK ++if test -n "$GTKDOC_CHECK"; then ++ { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 ++echo "${ECHO_T}$GTKDOC_CHECK" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$GTKDOC_CHECK" && break ++done ++ ++ ++ ++ ++if test x$enable_gtk_doc = xyes; then ++ ENABLE_GTK_DOC_TRUE= ++ ENABLE_GTK_DOC_FALSE='#' ++else ++ ENABLE_GTK_DOC_TRUE='#' ++ ENABLE_GTK_DOC_FALSE= ++fi ++ ++ ++ ++if test -n "$LIBTOOL"; then ++ GTK_DOC_USE_LIBTOOL_TRUE= ++ GTK_DOC_USE_LIBTOOL_FALSE='#' ++else ++ GTK_DOC_USE_LIBTOOL_TRUE='#' ++ GTK_DOC_USE_LIBTOOL_FALSE= ++fi ++ ++ ++ ++# Extract the first word of "db2html", so it can be a program name with args. ++set dummy db2html; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_DB2HTML+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$DB2HTML"; then ++ ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false" ++fi ++fi ++DB2HTML=$ac_cv_prog_DB2HTML ++if test -n "$DB2HTML"; then ++ { echo "$as_me:$LINENO: result: $DB2HTML" >&5 ++echo "${ECHO_T}$DB2HTML" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ ++ ++if $DB2HTML; then ++ HAVE_DOCBOOK_TRUE= ++ HAVE_DOCBOOK_FALSE='#' ++else ++ HAVE_DOCBOOK_TRUE='#' ++ HAVE_DOCBOOK_FALSE= ++fi ++ ++ ++# Check whether --enable-man was given. ++if test "${enable_man+set}" = set; then ++ enableval=$enable_man; enable_man=yes ++else ++ enable_man=no ++fi ++ ++ ++if test "${enable_man}" != no; then ++ # Extract the first word of "xsltproc", so it can be a program name with args. ++set dummy xsltproc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_XSLTPROC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $XSLTPROC in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++XSLTPROC=$ac_cv_path_XSLTPROC ++if test -n "$XSLTPROC"; then ++ { echo "$as_me:$LINENO: result: $XSLTPROC" >&5 ++echo "${ECHO_T}$XSLTPROC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ if test -z "$XSLTPROC"; then ++ enable_man=no ++ fi ++ ++ ++ # check for the presence of the XML catalog ++ ++# Check whether --with-xml-catalog was given. ++if test "${with_xml_catalog+set}" = set; then ++ withval=$with_xml_catalog; ++else ++ with_xml_catalog=/etc/xml/catalog ++fi ++ ++ jh_found_xmlcatalog=true ++ XML_CATALOG_FILE="$with_xml_catalog" ++ ++ { echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 ++echo $ECHO_N "checking for XML catalog ($XML_CATALOG_FILE)... $ECHO_C" >&6; } ++ if test -f "$XML_CATALOG_FILE"; then ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } ++ else ++ jh_found_xmlcatalog=false ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } ++ fi ++ ++ # check for the xmlcatalog program ++ # Extract the first word of "xmlcatalog", so it can be a program name with args. ++set dummy xmlcatalog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_path_XMLCATALOG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $XMLCATALOG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_XMLCATALOG="$XMLCATALOG" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" ++ ;; ++esac ++fi ++XMLCATALOG=$ac_cv_path_XMLCATALOG ++if test -n "$XMLCATALOG"; then ++ { echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 ++echo "${ECHO_T}$XMLCATALOG" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ if test "x$XMLCATALOG" = xno; then ++ jh_found_xmlcatalog=false ++ fi ++ ++ if $jh_found_xmlcatalog; then ++ : ++ else ++ : ++ fi ++ ++ ++ { echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 ++echo $ECHO_N "checking for DocBook XML DTD V4.1.2 in XML catalog... $ECHO_C" >&6; } ++ if $jh_found_xmlcatalog && \ ++ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 ++ ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.1.2//EN" >&2) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } ++ enable_man=no ++ fi ++ ++ ++ { echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 ++echo $ECHO_N "checking for DocBook XSL Stylesheets in XML catalog... $ECHO_C" >&6; } ++ if $jh_found_xmlcatalog && \ ++ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 ++ ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" >&2) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } ++ else ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } ++ enable_man=no ++ fi ++ ++fi ++ ++ ++ ++if test x$enable_man != xno; then ++ ENABLE_MAN_TRUE= ++ ENABLE_MAN_FALSE='#' ++else ++ ENABLE_MAN_TRUE='#' ++ ENABLE_MAN_FALSE= ++fi ++ ++ ++ ++################################################## ++# Output commands ++################################################## ++ ++ac_config_commands="$ac_config_commands gdk/gdkconfig.h" ++ ++ ++ac_config_files="$ac_config_files config.h.win32 gtk-zip.sh Makefile gdk-pixbuf-2.0.pc gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc gdk-pixbuf-2.0-uninstalled.pc gdk-2.0-uninstalled.pc gtk+-2.0-uninstalled.pc gail-uninstalled.pc m4macros/Makefile po/Makefile.in po-properties/Makefile.in demos/Makefile demos/gtk-demo/Makefile demos/gtk-demo/geninclude.pl tests/Makefile docs/Makefile docs/reference/Makefile docs/reference/gdk-pixbuf/Makefile docs/reference/gdk-pixbuf/version.xml docs/reference/gdk/Makefile docs/reference/gdk/version.xml docs/reference/gtk/Makefile docs/reference/gtk/version.xml docs/reference/libgail-util/Makefile docs/faq/Makefile docs/tools/Makefile docs/tutorial/Makefile gdk-pixbuf/Makefile gdk-pixbuf/gdk_pixbuf.rc gdk-pixbuf/gdk-pixbuf-features.h gdk-pixbuf/pixops/Makefile gdk/Makefile gdk/x11/Makefile gdk/win32/Makefile gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc gdk/quartz/Makefile gdk/directfb/Makefile gdk/tests/Makefile gtk/Makefile gtk/makefile.msc gtk/gtkversion.h gtk/gtk-win32.rc gtk/theme-bits/Makefile gtk/tests/Makefile modules/Makefile modules/other/Makefile modules/other/gail/Makefile modules/other/gail/libgail-util/Makefile modules/other/gail/tests/Makefile modules/engines/Makefile modules/engines/pixbuf/Makefile modules/engines/ms-windows/Makefile modules/engines/ms-windows/Theme/Makefile modules/engines/ms-windows/Theme/gtk-2.0/Makefile modules/input/Makefile modules/printbackends/Makefile modules/printbackends/cups/Makefile modules/printbackends/lpr/Makefile modules/printbackends/file/Makefile modules/printbackends/test/Makefile perf/Makefile contrib/Makefile contrib/gdk-pixbuf-xlib/Makefile contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ++ ++ ++cat >confcache <<\_ACEOF ++# This file is a shell script that caches the results of configure ++# tests run on this system so they can be shared between configure ++# scripts and configure runs, see configure's option --config-cache. ++# It is not useful on other systems. If it contains results you don't ++# want to keep, you may remove or edit it. ++# ++# config.status only pays attention to the cache file if you give it ++# the --recheck option to rerun configure. ++# ++# `ac_cv_env_foo' variables (set or unset) will be overridden when ++# loading this file, other *unset* `ac_cv_foo' will be assigned the ++# following values. ++ ++_ACEOF ++ ++# The following way of writing the cache mishandles newlines in values, ++# but we know of no workaround that is simple, portable, and efficient. ++# So, we kill variables containing newlines. ++# Ultrix sh set writes to stderr and can't be redirected directly, ++# and sets the high bit in the cache file unless we assign to the vars. ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done ++ ++ (set) 2>&1 | ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes (double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \). ++ sed -n \ ++ "s/'/'\\\\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ++ ;; #( ++ *) ++ # `set' quotes correctly as required by POSIX, so do not add quotes. ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | ++ sed ' ++ /^ac_cv_env_/b end ++ t clear ++ :clear ++ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ ++ t end ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++echo "$as_me: updating cache $cache_file" >&6;} ++ cat confcache >$cache_file ++ else ++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++echo "$as_me: not updating unwritable cache $cache_file" >&6;} ++ fi ++fi ++rm -f confcache ++ ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++# Let make expand exec_prefix. ++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' ++ ++DEFS=-DHAVE_CONFIG_H ++ ++ac_libobjs= ++ac_ltlibobjs= ++for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue ++ # 1. Remove the extension, and $U if already installed. ++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ++ ac_i=`echo "$ac_i" | sed "$ac_script"` ++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR ++ # will be set to the directory where LIBOBJS objects are built. ++ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++done ++LIB@&t@OBJS=$ac_libobjs ++ ++LTLIBOBJS=$ac_ltlibobjs ++ ++ ++if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++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 ++echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"OS_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"OS_UNIX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"OS_LINUX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${BUILD_GDIPLUS_LOADERS_TRUE}" && test -z "${BUILD_GDIPLUS_LOADERS_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${BUILD_DYNAMIC_MODULES_TRUE}" && test -z "${BUILD_DYNAMIC_MODULES_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_PNG_TRUE}" && test -z "${INCLUDE_PNG_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_PNG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_BMP_TRUE}" && test -z "${INCLUDE_BMP_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_BMP\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_BMP\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_WBMP_TRUE}" && test -z "${INCLUDE_WBMP_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_WBMP\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_WBMP\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_GIF_TRUE}" && test -z "${INCLUDE_GIF_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GIF\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_GIF\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_ICO_TRUE}" && test -z "${INCLUDE_ICO_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICO\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_ICO\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_ANI_TRUE}" && test -z "${INCLUDE_ANI_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ANI\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_ANI\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_JPEG_TRUE}" && test -z "${INCLUDE_JPEG_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JPEG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_JPEG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_PNM_TRUE}" && test -z "${INCLUDE_PNM_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNM\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_PNM\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_RAS_TRUE}" && test -z "${INCLUDE_RAS_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_RAS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_RAS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_TIFF_TRUE}" && test -z "${INCLUDE_TIFF_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIFF\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_TIFF\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_XPM_TRUE}" && test -z "${INCLUDE_XPM_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_XPM\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_XPM\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_XBM_TRUE}" && test -z "${INCLUDE_XBM_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_XBM\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_XBM\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_TGA_TRUE}" && test -z "${INCLUDE_TGA_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TGA\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_TGA\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_PCX_TRUE}" && test -z "${INCLUDE_PCX_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PCX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_ICNS_TRUE}" && test -z "${INCLUDE_ICNS_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_JASPER_TRUE}" && test -z "${INCLUDE_JASPER_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_GDIPLUS_TRUE}" && test -z "${INCLUDE_GDIPLUS_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_TIFF_TRUE}" && test -z "${HAVE_TIFF_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_TIFF\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_JPEG_TRUE}" && test -z "${HAVE_JPEG_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JPEG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_JASPER_TRUE}" && test -z "${HAVE_JASPER_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_MEDIALIB_TRUE}" && test -z "${USE_MEDIALIB_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_MEDIALIB\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_MEDIALIB25_TRUE}" && test -z "${USE_MEDIALIB25_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB25\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_MEDIALIB25\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_MMX_TRUE}" && test -z "${USE_MMX_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_MMX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_X11\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_X11\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_WIN32\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${TEST_PRINT_BACKEND_TRUE}" && test -z "${TEST_PRINT_BACKEND_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"TEST_PRINT_BACKEND\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"TEST_PRINT_BACKEND\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++: ${CONFIG_STATUS=./config.status} ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files $CONFIG_STATUS" ++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++echo "$as_me: creating $CONFIG_STATUS" >&6;} ++cat >$CONFIG_STATUS <<_ACEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate the current configuration. ++# Compiler output produced by configure, useful for debugging ++# configure, is in config.log if it exists. ++ ++debug=false ++ac_cs_recheck=false ++ac_cs_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# 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=: ++ # 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 ++ ++ ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi ++ ++# Support unset when possible. ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ fi ++done ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# CDPATH. ++$as_unset CDPATH ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | ++ sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno ++ N ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ ++ t loop ++ s/-\n.*// ++ ' >$as_me.lineno && ++ chmod +x "$as_me.lineno" || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false ++fi ++ ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' ++else ++ 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 ++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'" ++ ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" ++ ++ ++exec 6>&1 ++ ++# Save the log message, to keep $[0] and so on meaningful, and to ++# report actual input values of CONFIG_FILES etc. instead of their ++# values after options handling. ++ac_log=" ++This file was extended by gtk+ $as_me 2.14.4, which was ++generated by GNU Autoconf 2.61. Invocation command line was ++ ++ CONFIG_FILES = $CONFIG_FILES ++ CONFIG_HEADERS = $CONFIG_HEADERS ++ CONFIG_LINKS = $CONFIG_LINKS ++ CONFIG_COMMANDS = $CONFIG_COMMANDS ++ $ $0 $@ ++ ++on `(hostname || uname -n) 2>/dev/null | sed 1q` ++" ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++# Files that config.status was made for. ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" ++config_commands="$ac_config_commands" ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++ac_cs_usage="\ ++\`$as_me' instantiates files from templates according to the ++current configuration. ++ ++Usage: $0 [OPTIONS] [FILE]... ++ ++ -h, --help print this help, 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 ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE ++ ++Configuration files: ++$config_files ++ ++Configuration headers: ++$config_headers ++ ++Configuration commands: ++$config_commands ++ ++Report bugs to ." ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++ac_cs_version="\\ ++gtk+ config.status 2.14.4 ++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. ++This config.status script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it." ++ ++ac_pwd='$ac_pwd' ++srcdir='$srcdir' ++INSTALL='$INSTALL' ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If no file are specified by the user, then we need to provide default ++# value. By we need to know if files were specified by the user. ++ac_need_defaults=: ++while test $# != 0 ++do ++ case $1 in ++ --*=*) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ++ ac_shift=: ++ ;; ++ *) ++ ac_option=$1 ++ ac_optarg=$2 ++ ac_shift=shift + ;; + esac - -- dnl enable/disable documentation building -- AC_ARG_ENABLE([gtk-doc], -- AS_HELP_STRING([--enable-gtk-doc], -- [use gtk-doc to build documentation [[default=no]]]),, -- [enable_gtk_doc=no]) -+ # If the value was cached, stop now. We just wanted to have am__tar -+ # and am__untar set. -+ test -n "${am_cv_prog_tar_$1}" && break - -- if test x$enable_gtk_doc = xyes; then -- ifelse([$1],[], -- [PKG_CHECK_EXISTS([gtk-doc],, -- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], -- [PKG_CHECK_EXISTS([gtk-doc >= $1],, -- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) -+ # tar/untar a dummy directory, and stop if the command works -+ rm -rf conftest.dir -+ mkdir conftest.dir -+ echo GrepMe > conftest.dir/file -+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) -+ rm -rf conftest.dir -+ if test -s conftest.tar; then -+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi ++ ++ case $ac_option in ++ # Handling of the options. ++ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ ac_cs_recheck=: ;; ++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) ++ echo "$ac_cs_version"; exit ;; ++ --debug | --debu | --deb | --de | --d | -d ) ++ debug=: ;; ++ --file | --fil | --fi | --f ) ++ $ac_shift ++ CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ ac_need_defaults=false;; ++ --header | --heade | --head | --hea ) ++ $ac_shift ++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ++ ac_need_defaults=false;; ++ --he | --h) ++ # Conflict between --help and --header ++ { echo "$as_me: error: ambiguous option: $1 ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; };; ++ --help | --hel | -h ) ++ echo "$ac_cs_usage"; exit ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil | --si | --s) ++ ac_cs_silent=: ;; ++ ++ # This is an error. ++ -*) { echo "$as_me: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; } ;; ++ ++ *) ac_config_targets="$ac_config_targets $1" ++ ac_need_defaults=false ;; ++ ++ esac ++ shift +done -+rm -rf conftest.dir - -- AC_MSG_CHECKING([whether to build gtk-doc documentation]) -- AC_MSG_RESULT($enable_gtk_doc) -- -- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) -- -- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) --]) -+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -+AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -+AC_SUBST([am__tar]) -+AC_SUBST([am__untar]) -+]) # _AM_PROG_TAR - -+m4_include([acinclude.m4]) -Index: gtk+2.0-2.14.3/configure -=================================================================== ---- gtk+2.0-2.14.3.orig/configure 2008-09-24 00:11:45.000000000 -0300 -+++ gtk+2.0-2.14.3/configure 2008-09-24 19:56:20.000000000 -0300 ++ ++ac_configure_extra_args= ++ ++if $ac_cs_silent; then ++ exec 6>/dev/null ++ ac_configure_extra_args="$ac_configure_extra_args --silent" ++fi ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++if \$ac_cs_recheck; then ++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 ++ CONFIG_SHELL=$SHELL ++ export CONFIG_SHELL ++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++fi ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX ++@%:@@%:@ Running $as_me. @%:@@%:@ ++_ASBOX ++ echo "$ac_log" ++} >&5 ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++# ++# INIT-COMMANDS ++# ++AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" ++ ++ ++ ++if test "x$gdktarget" = "xx11" ; then ++ gdk_windowing=' ++#define GDK_WINDOWING_X11' ++elif test "x$gdktarget" = "xwin32" ; then ++ gdk_windowing=' ++#define GDK_NATIVE_WINDOW_POINTER ++ ++#define GDK_WINDOWING_WIN32' ++elif test "x$gdktarget" = "xquartz" ; then ++ gdk_windowing=' ++#define GDK_WINDOWING_QUARTZ' ++elif test "x$gdktarget" = "xdirectfb" ; then ++ gdk_windowing=' ++#define GDK_WINDOWING_DIRECTFB' ++fi ++ ++if test x$gdk_wchar_h = xyes; then ++ gdk_wc=' ++#define GDK_HAVE_WCHAR_H 1' ++fi ++if test x$gdk_wctype_h = xyes; then ++ gdk_wc="\$gdk_wc ++#define GDK_HAVE_WCTYPE_H 1" ++fi ++if test x$gdk_working_wctype = xno; then ++ gdk_wc="\$gdk_wc ++#define GDK_HAVE_BROKEN_WCTYPE 1" ++fi ++ ++ ++ ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++ ++# Handling of arguments. ++for ac_config_target in $ac_config_targets ++do ++ case $ac_config_target in ++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ++ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; ++ "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; ++ "gdk/gdkconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gdk/gdkconfig.h" ;; ++ "config.h.win32") CONFIG_FILES="$CONFIG_FILES config.h.win32" ;; ++ "gtk-zip.sh") CONFIG_FILES="$CONFIG_FILES gtk-zip.sh" ;; ++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "gdk-pixbuf-2.0.pc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf-2.0.pc" ;; ++ "gdk-2.0.pc") CONFIG_FILES="$CONFIG_FILES gdk-2.0.pc" ;; ++ "gtk+-2.0.pc") CONFIG_FILES="$CONFIG_FILES gtk+-2.0.pc" ;; ++ "gtk+-unix-print-2.0.pc") CONFIG_FILES="$CONFIG_FILES gtk+-unix-print-2.0.pc" ;; ++ "gail.pc") CONFIG_FILES="$CONFIG_FILES gail.pc" ;; ++ "gdk-pixbuf-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf-2.0-uninstalled.pc" ;; ++ "gdk-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gdk-2.0-uninstalled.pc" ;; ++ "gtk+-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gtk+-2.0-uninstalled.pc" ;; ++ "gail-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gail-uninstalled.pc" ;; ++ "m4macros/Makefile") CONFIG_FILES="$CONFIG_FILES m4macros/Makefile" ;; ++ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; ++ "po-properties/Makefile.in") CONFIG_FILES="$CONFIG_FILES po-properties/Makefile.in" ;; ++ "demos/Makefile") CONFIG_FILES="$CONFIG_FILES demos/Makefile" ;; ++ "demos/gtk-demo/Makefile") CONFIG_FILES="$CONFIG_FILES demos/gtk-demo/Makefile" ;; ++ "demos/gtk-demo/geninclude.pl") CONFIG_FILES="$CONFIG_FILES demos/gtk-demo/geninclude.pl" ;; ++ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; ++ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; ++ "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; ++ "docs/reference/gdk-pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk-pixbuf/Makefile" ;; ++ "docs/reference/gdk-pixbuf/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk-pixbuf/version.xml" ;; ++ "docs/reference/gdk/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk/Makefile" ;; ++ "docs/reference/gdk/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk/version.xml" ;; ++ "docs/reference/gtk/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gtk/Makefile" ;; ++ "docs/reference/gtk/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gtk/version.xml" ;; ++ "docs/reference/libgail-util/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/libgail-util/Makefile" ;; ++ "docs/faq/Makefile") CONFIG_FILES="$CONFIG_FILES docs/faq/Makefile" ;; ++ "docs/tools/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tools/Makefile" ;; ++ "docs/tutorial/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tutorial/Makefile" ;; ++ "gdk-pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/Makefile" ;; ++ "gdk-pixbuf/gdk_pixbuf.rc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/gdk_pixbuf.rc" ;; ++ "gdk-pixbuf/gdk-pixbuf-features.h") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/gdk-pixbuf-features.h" ;; ++ "gdk-pixbuf/pixops/Makefile") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/pixops/Makefile" ;; ++ "gdk/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/Makefile" ;; ++ "gdk/x11/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/x11/Makefile" ;; ++ "gdk/win32/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/win32/Makefile" ;; ++ "gdk/win32/rc/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/win32/rc/Makefile" ;; ++ "gdk/win32/rc/gdk.rc") CONFIG_FILES="$CONFIG_FILES gdk/win32/rc/gdk.rc" ;; ++ "gdk/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/quartz/Makefile" ;; ++ "gdk/directfb/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/directfb/Makefile" ;; ++ "gdk/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/tests/Makefile" ;; ++ "gtk/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/Makefile" ;; ++ "gtk/makefile.msc") CONFIG_FILES="$CONFIG_FILES gtk/makefile.msc" ;; ++ "gtk/gtkversion.h") CONFIG_FILES="$CONFIG_FILES gtk/gtkversion.h" ;; ++ "gtk/gtk-win32.rc") CONFIG_FILES="$CONFIG_FILES gtk/gtk-win32.rc" ;; ++ "gtk/theme-bits/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/theme-bits/Makefile" ;; ++ "gtk/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/tests/Makefile" ;; ++ "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; ++ "modules/other/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/Makefile" ;; ++ "modules/other/gail/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/Makefile" ;; ++ "modules/other/gail/libgail-util/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/libgail-util/Makefile" ;; ++ "modules/other/gail/tests/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/tests/Makefile" ;; ++ "modules/engines/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/Makefile" ;; ++ "modules/engines/pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/pixbuf/Makefile" ;; ++ "modules/engines/ms-windows/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Makefile" ;; ++ "modules/engines/ms-windows/Theme/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Theme/Makefile" ;; ++ "modules/engines/ms-windows/Theme/gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Theme/gtk-2.0/Makefile" ;; ++ "modules/input/Makefile") CONFIG_FILES="$CONFIG_FILES modules/input/Makefile" ;; ++ "modules/printbackends/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/Makefile" ;; ++ "modules/printbackends/cups/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/cups/Makefile" ;; ++ "modules/printbackends/lpr/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/lpr/Makefile" ;; ++ "modules/printbackends/file/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/file/Makefile" ;; ++ "modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;; ++ "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;; ++ "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; ++ "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; ++ "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; ++ ++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 ++echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++ { (exit 1); exit 1; }; };; ++ esac ++done ++ ++ ++# If the user did not use the arguments to specify the items to instantiate, ++# then the envvar interface is used. Set only those that are not. ++# We use the long form for the default assignment because of an extremely ++# bizarre bug on SunOS 4.1.3. ++if $ac_need_defaults; then ++ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files ++ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers ++ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands ++fi ++ ++# Have a temporary directory for convenience. Make it in the build tree ++# simply because there is no reason against having it here, and in addition, ++# creating and moving files from /tmp can sometimes cause problems. ++# Hook for its removal unless debugging. ++# Note that there is a small window in which the directory will not be cleaned: ++# after its creation but before its name has been assigned to `$tmp'. ++$debug || ++{ ++ tmp= ++ trap 'exit_status=$? ++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++' 0 ++ trap '{ (exit 1); exit 1; }' 1 2 13 15 ++} ++# Create a (secure) tmp directory for tmp files. ++ ++{ ++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && ++ test -n "$tmp" && test -d "$tmp" ++} || ++{ ++ tmp=./conf$$-$RANDOM ++ (umask 077 && mkdir "$tmp") ++} || ++{ ++ echo "$me: cannot create a temporary directory in ." >&2 ++ { (exit 1); exit 1; } ++} ++ ++# ++# Set up the sed scripts for CONFIG_FILES section. ++# ++ ++# No need to generate the scripts if there are no CONFIG_FILES. ++# This happens for instance when ./config.status config.h ++if test -n "$CONFIG_FILES"; then ++ ++_ACEOF ++ ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++SHELL!$SHELL$ac_delim ++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim ++PACKAGE_NAME!$PACKAGE_NAME$ac_delim ++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim ++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim ++PACKAGE_STRING!$PACKAGE_STRING$ac_delim ++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim ++exec_prefix!$exec_prefix$ac_delim ++prefix!$prefix$ac_delim ++program_transform_name!$program_transform_name$ac_delim ++bindir!$bindir$ac_delim ++sbindir!$sbindir$ac_delim ++libexecdir!$libexecdir$ac_delim ++datarootdir!$datarootdir$ac_delim ++datadir!$datadir$ac_delim ++sysconfdir!$sysconfdir$ac_delim ++sharedstatedir!$sharedstatedir$ac_delim ++localstatedir!$localstatedir$ac_delim ++includedir!$includedir$ac_delim ++oldincludedir!$oldincludedir$ac_delim ++docdir!$docdir$ac_delim ++infodir!$infodir$ac_delim ++htmldir!$htmldir$ac_delim ++dvidir!$dvidir$ac_delim ++pdfdir!$pdfdir$ac_delim ++psdir!$psdir$ac_delim ++libdir!$libdir$ac_delim ++localedir!$localedir$ac_delim ++mandir!$mandir$ac_delim ++DEFS!$DEFS$ac_delim ++ECHO_C!$ECHO_C$ac_delim ++ECHO_N!$ECHO_N$ac_delim ++ECHO_T!$ECHO_T$ac_delim ++LIBS!$LIBS$ac_delim ++build_alias!$build_alias$ac_delim ++host_alias!$host_alias$ac_delim ++target_alias!$target_alias$ac_delim ++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim ++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim ++INSTALL_DATA!$INSTALL_DATA$ac_delim ++CYGPATH_W!$CYGPATH_W$ac_delim ++PACKAGE!$PACKAGE$ac_delim ++VERSION!$VERSION$ac_delim ++ACLOCAL!$ACLOCAL$ac_delim ++AUTOCONF!$AUTOCONF$ac_delim ++AUTOMAKE!$AUTOMAKE$ac_delim ++AUTOHEADER!$AUTOHEADER$ac_delim ++MAKEINFO!$MAKEINFO$ac_delim ++AMTAR!$AMTAR$ac_delim ++install_sh!$install_sh$ac_delim ++STRIP!$STRIP$ac_delim ++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim ++AWK!$AWK$ac_delim ++SET_MAKE!$SET_MAKE$ac_delim ++am__leading_dot!$am__leading_dot$ac_delim ++GTK_MAJOR_VERSION!$GTK_MAJOR_VERSION$ac_delim ++GTK_MINOR_VERSION!$GTK_MINOR_VERSION$ac_delim ++GTK_MICRO_VERSION!$GTK_MICRO_VERSION$ac_delim ++GTK_INTERFACE_AGE!$GTK_INTERFACE_AGE$ac_delim ++GTK_BINARY_AGE!$GTK_BINARY_AGE$ac_delim ++GTK_API_VERSION!$GTK_API_VERSION$ac_delim ++GTK_VERSION!$GTK_VERSION$ac_delim ++GTK_BINARY_VERSION!$GTK_BINARY_VERSION$ac_delim ++LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim ++LT_CURRENT_MINUS_AGE!$LT_CURRENT_MINUS_AGE$ac_delim ++GAIL_LT_VERSION_INFO!$GAIL_LT_VERSION_INFO$ac_delim ++GAIL_LT_CURRENT_MINUS_AGE!$GAIL_LT_CURRENT_MINUS_AGE$ac_delim ++GDK_PIXBUF_MAJOR!$GDK_PIXBUF_MAJOR$ac_delim ++GDK_PIXBUF_MINOR!$GDK_PIXBUF_MINOR$ac_delim ++GDK_PIXBUF_MICRO!$GDK_PIXBUF_MICRO$ac_delim ++GDK_PIXBUF_VERSION!$GDK_PIXBUF_VERSION$ac_delim ++GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim ++build!$build$ac_delim ++build_cpu!$build_cpu$ac_delim ++build_vendor!$build_vendor$ac_delim ++build_os!$build_os$ac_delim ++host!$host$ac_delim ++host_cpu!$host_cpu$ac_delim ++host_vendor!$host_vendor$ac_delim ++host_os!$host_os$ac_delim ++LIB_EXE_MACHINE_FLAG!$LIB_EXE_MACHINE_FLAG$ac_delim ++CC!$CC$ac_delim ++CFLAGS!$CFLAGS$ac_delim ++LDFLAGS!$LDFLAGS$ac_delim ++CPPFLAGS!$CPPFLAGS$ac_delim ++ac_ct_CC!$ac_ct_CC$ac_delim ++EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++DEPDIR!$DEPDIR$ac_delim ++am__include!$am__include$ac_delim ++am__quote!$am__quote$ac_delim ++AMDEP_TRUE!$AMDEP_TRUE$ac_delim ++AMDEP_FALSE!$AMDEP_FALSE$ac_delim ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim ++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim ++_ACEOF ++ ++ 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 ++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-1.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++_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 >$CONFIG_STATUS <<_ACEOF ++CEOF$ac_eof ++_ACEOF ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim ++ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim ++CXX!$CXX$ac_delim ++ac_ct_CXX!$ac_ct_CXX$ac_delim ++CXXFLAGS!$CXXFLAGS$ac_delim ++CXXDEPMODE!$CXXDEPMODE$ac_delim ++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim ++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim ++HAVE_CXX_TRUE!$HAVE_CXX_TRUE$ac_delim ++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 ++ECHO!$ECHO$ac_delim ++AR!$AR$ac_delim ++RANLIB!$RANLIB$ac_delim ++DSYMUTIL!$DSYMUTIL$ac_delim ++NMEDIT!$NMEDIT$ac_delim ++DLLTOOL!$DLLTOOL$ac_delim ++AS!$AS$ac_delim ++OBJDUMP!$OBJDUMP$ac_delim ++CPP!$CPP$ac_delim ++CXXCPP!$CXXCPP$ac_delim ++F77!$F77$ac_delim ++FFLAGS!$FFLAGS$ac_delim ++ac_ct_F77!$ac_ct_F77$ac_delim ++LIBTOOL!$LIBTOOL$ac_delim ++CCAS!$CCAS$ac_delim ++CCASFLAGS!$CCASFLAGS$ac_delim ++NM!$NM$ac_delim ++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim ++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim ++MAINT!$MAINT$ac_delim ++PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim ++PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim ++OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim ++OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim ++OS_UNIX_TRUE!$OS_UNIX_TRUE$ac_delim ++OS_UNIX_FALSE!$OS_UNIX_FALSE$ac_delim ++OS_LINUX_TRUE!$OS_LINUX_TRUE$ac_delim ++OS_LINUX_FALSE!$OS_LINUX_FALSE$ac_delim ++WINDRES!$WINDRES$ac_delim ++ms_librarian!$ms_librarian$ac_delim ++MS_LIB_AVAILABLE_TRUE!$MS_LIB_AVAILABLE_TRUE$ac_delim ++MS_LIB_AVAILABLE_FALSE!$MS_LIB_AVAILABLE_FALSE$ac_delim ++gdktarget!$gdktarget$ac_delim ++gdktargetlib!$gdktargetlib$ac_delim ++gtktargetlib!$gtktargetlib$ac_delim ++PKG_CONFIG!$PKG_CONFIG$ac_delim ++BASE_DEPENDENCIES_CFLAGS!$BASE_DEPENDENCIES_CFLAGS$ac_delim ++BASE_DEPENDENCIES_LIBS!$BASE_DEPENDENCIES_LIBS$ac_delim ++LIBTOOL_EXPORT_OPTIONS!$LIBTOOL_EXPORT_OPTIONS$ac_delim ++DISABLE_EXPLICIT_DEPS_TRUE!$DISABLE_EXPLICIT_DEPS_TRUE$ac_delim ++DISABLE_EXPLICIT_DEPS_FALSE!$DISABLE_EXPLICIT_DEPS_FALSE$ac_delim ++PERL!$PERL$ac_delim ++INDENT!$INDENT$ac_delim ++REBUILD!$REBUILD$ac_delim ++USE_NLS!$USE_NLS$ac_delim ++MSGFMT!$MSGFMT$ac_delim ++MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim ++GMSGFMT!$GMSGFMT$ac_delim ++XGETTEXT!$XGETTEXT$ac_delim ++CATALOGS!$CATALOGS$ac_delim ++CATOBJEXT!$CATOBJEXT$ac_delim ++DATADIRNAME!$DATADIRNAME$ac_delim ++GMOFILES!$GMOFILES$ac_delim ++INSTOBJEXT!$INSTOBJEXT$ac_delim ++INTLLIBS!$INTLLIBS$ac_delim ++PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim ++PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim ++POFILES!$POFILES$ac_delim ++POSUB!$POSUB$ac_delim ++MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim ++GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim ++GLIB_LIBS!$GLIB_LIBS$ac_delim ++GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim ++GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim ++GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim ++GDK_WLIBS!$GDK_WLIBS$ac_delim ++BUILD_GDIPLUS_LOADERS_TRUE!$BUILD_GDIPLUS_LOADERS_TRUE$ac_delim ++BUILD_GDIPLUS_LOADERS_FALSE!$BUILD_GDIPLUS_LOADERS_FALSE$ac_delim ++LIBTIFF!$LIBTIFF$ac_delim ++LIBJPEG!$LIBJPEG$ac_delim ++LIBPNG!$LIBPNG$ac_delim ++LIBJASPER!$LIBJASPER$ac_delim ++BUILD_DYNAMIC_MODULES_TRUE!$BUILD_DYNAMIC_MODULES_TRUE$ac_delim ++BUILD_DYNAMIC_MODULES_FALSE!$BUILD_DYNAMIC_MODULES_FALSE$ac_delim ++INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim ++INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim ++INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim ++INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim ++INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim ++INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim ++INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim ++_ACEOF ++ ++ 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 ++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-2.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++_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 >$CONFIG_STATUS <<_ACEOF ++CEOF$ac_eof ++_ACEOF ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++INCLUDE_WBMP_FALSE!$INCLUDE_WBMP_FALSE$ac_delim ++INCLUDE_GIF_TRUE!$INCLUDE_GIF_TRUE$ac_delim ++INCLUDE_GIF_FALSE!$INCLUDE_GIF_FALSE$ac_delim ++INCLUDE_ICO_TRUE!$INCLUDE_ICO_TRUE$ac_delim ++INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_delim ++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 ++INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim ++INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim ++INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim ++INCLUDE_TIFF_FALSE!$INCLUDE_TIFF_FALSE$ac_delim ++INCLUDE_XPM_TRUE!$INCLUDE_XPM_TRUE$ac_delim ++INCLUDE_XPM_FALSE!$INCLUDE_XPM_FALSE$ac_delim ++INCLUDE_XBM_TRUE!$INCLUDE_XBM_TRUE$ac_delim ++INCLUDE_XBM_FALSE!$INCLUDE_XBM_FALSE$ac_delim ++INCLUDE_TGA_TRUE!$INCLUDE_TGA_TRUE$ac_delim ++INCLUDE_TGA_FALSE!$INCLUDE_TGA_FALSE$ac_delim ++INCLUDE_PCX_TRUE!$INCLUDE_PCX_TRUE$ac_delim ++INCLUDE_PCX_FALSE!$INCLUDE_PCX_FALSE$ac_delim ++INCLUDE_ICNS_TRUE!$INCLUDE_ICNS_TRUE$ac_delim ++INCLUDE_ICNS_FALSE!$INCLUDE_ICNS_FALSE$ac_delim ++INCLUDE_JASPER_TRUE!$INCLUDE_JASPER_TRUE$ac_delim ++INCLUDE_JASPER_FALSE!$INCLUDE_JASPER_FALSE$ac_delim ++INCLUDE_GDIPLUS_TRUE!$INCLUDE_GDIPLUS_TRUE$ac_delim ++INCLUDE_GDIPLUS_FALSE!$INCLUDE_GDIPLUS_FALSE$ac_delim ++HAVE_INCLUDED_IMMMODULES_TRUE!$HAVE_INCLUDED_IMMMODULES_TRUE$ac_delim ++HAVE_INCLUDED_IMMMODULES_FALSE!$HAVE_INCLUDED_IMMMODULES_FALSE$ac_delim ++INCLUDED_IMMODULE_OBJ!$INCLUDED_IMMODULE_OBJ$ac_delim ++INCLUDED_IMMODULE_DEFINE!$INCLUDED_IMMODULE_DEFINE$ac_delim ++INCLUDE_IM_AM_ET_TRUE!$INCLUDE_IM_AM_ET_TRUE$ac_delim ++INCLUDE_IM_AM_ET_FALSE!$INCLUDE_IM_AM_ET_FALSE$ac_delim ++INCLUDE_IM_CEDILLA_TRUE!$INCLUDE_IM_CEDILLA_TRUE$ac_delim ++INCLUDE_IM_CEDILLA_FALSE!$INCLUDE_IM_CEDILLA_FALSE$ac_delim ++INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE!$INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE$ac_delim ++INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE!$INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE$ac_delim ++INCLUDE_IM_IME_TRUE!$INCLUDE_IM_IME_TRUE$ac_delim ++INCLUDE_IM_IME_FALSE!$INCLUDE_IM_IME_FALSE$ac_delim ++INCLUDE_IM_INUKTITUT_TRUE!$INCLUDE_IM_INUKTITUT_TRUE$ac_delim ++INCLUDE_IM_INUKTITUT_FALSE!$INCLUDE_IM_INUKTITUT_FALSE$ac_delim ++INCLUDE_IM_IPA_TRUE!$INCLUDE_IM_IPA_TRUE$ac_delim ++INCLUDE_IM_IPA_FALSE!$INCLUDE_IM_IPA_FALSE$ac_delim ++INCLUDE_IM_MULTIPRESS_TRUE!$INCLUDE_IM_MULTIPRESS_TRUE$ac_delim ++INCLUDE_IM_MULTIPRESS_FALSE!$INCLUDE_IM_MULTIPRESS_FALSE$ac_delim ++INCLUDE_IM_THAI_TRUE!$INCLUDE_IM_THAI_TRUE$ac_delim ++INCLUDE_IM_THAI_FALSE!$INCLUDE_IM_THAI_FALSE$ac_delim ++INCLUDE_IM_TI_ER_TRUE!$INCLUDE_IM_TI_ER_TRUE$ac_delim ++INCLUDE_IM_TI_ER_FALSE!$INCLUDE_IM_TI_ER_FALSE$ac_delim ++INCLUDE_IM_TI_ET_TRUE!$INCLUDE_IM_TI_ET_TRUE$ac_delim ++INCLUDE_IM_TI_ET_FALSE!$INCLUDE_IM_TI_ET_FALSE$ac_delim ++INCLUDE_IM_VIQR_TRUE!$INCLUDE_IM_VIQR_TRUE$ac_delim ++INCLUDE_IM_VIQR_FALSE!$INCLUDE_IM_VIQR_FALSE$ac_delim ++INCLUDE_IM_XIM_TRUE!$INCLUDE_IM_XIM_TRUE$ac_delim ++INCLUDE_IM_XIM_FALSE!$INCLUDE_IM_XIM_FALSE$ac_delim ++HAVE_TIFF_TRUE!$HAVE_TIFF_TRUE$ac_delim ++HAVE_TIFF_FALSE!$HAVE_TIFF_FALSE$ac_delim ++HAVE_PNG_TRUE!$HAVE_PNG_TRUE$ac_delim ++HAVE_PNG_FALSE!$HAVE_PNG_FALSE$ac_delim ++HAVE_JPEG_TRUE!$HAVE_JPEG_TRUE$ac_delim ++HAVE_JPEG_FALSE!$HAVE_JPEG_FALSE$ac_delim ++HAVE_JASPER_TRUE!$HAVE_JASPER_TRUE$ac_delim ++HAVE_JASPER_FALSE!$HAVE_JASPER_FALSE$ac_delim ++USE_MEDIALIB_TRUE!$USE_MEDIALIB_TRUE$ac_delim ++USE_MEDIALIB_FALSE!$USE_MEDIALIB_FALSE$ac_delim ++USE_MEDIALIB25_TRUE!$USE_MEDIALIB25_TRUE$ac_delim ++USE_MEDIALIB25_FALSE!$USE_MEDIALIB25_FALSE$ac_delim ++USE_MMX_TRUE!$USE_MMX_TRUE$ac_delim ++USE_MMX_FALSE!$USE_MMX_FALSE$ac_delim ++CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim ++CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim ++GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim ++GTK_UPDATE_ICON_CACHE!$GTK_UPDATE_ICON_CACHE$ac_delim ++REBUILD_PNGS!$REBUILD_PNGS$ac_delim ++XMKMF!$XMKMF$ac_delim ++X_CFLAGS!$X_CFLAGS$ac_delim ++X_PRE_LIBS!$X_PRE_LIBS$ac_delim ++X_LIBS!$X_LIBS$ac_delim ++X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim ++HAVE_X11R6_TRUE!$HAVE_X11R6_TRUE$ac_delim ++HAVE_X11R6_FALSE!$HAVE_X11R6_FALSE$ac_delim ++XINPUT_XFREE_TRUE!$XINPUT_XFREE_TRUE$ac_delim ++XINPUT_XFREE_FALSE!$XINPUT_XFREE_FALSE$ac_delim ++USE_X11_TRUE!$USE_X11_TRUE$ac_delim ++USE_X11_FALSE!$USE_X11_FALSE$ac_delim ++USE_WIN32_TRUE!$USE_WIN32_TRUE$ac_delim ++USE_WIN32_FALSE!$USE_WIN32_FALSE$ac_delim ++USE_QUARTZ_TRUE!$USE_QUARTZ_TRUE$ac_delim ++USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim ++GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim ++GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim ++USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim ++_ACEOF ++ ++ 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 ++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-3.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++_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 >$CONFIG_STATUS <<_ACEOF ++CEOF$ac_eof ++_ACEOF ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim ++GDK_PACKAGES!$GDK_PACKAGES$ac_delim ++GDK_PRIVATE_PACKAGES!$GDK_PRIVATE_PACKAGES$ac_delim ++GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim ++GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim ++GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim ++GDK_DEP_CFLAGS!$GDK_DEP_CFLAGS$ac_delim ++GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim ++GDK_PIXBUF_EXTRA_LIBS!$GDK_PIXBUF_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_EXTRA_CFLAGS!$GDK_PIXBUF_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_DEP_LIBS!$GDK_PIXBUF_DEP_LIBS$ac_delim ++GDK_PIXBUF_DEP_CFLAGS!$GDK_PIXBUF_DEP_CFLAGS$ac_delim ++GTK_PACKAGES!$GTK_PACKAGES$ac_delim ++GTK_EXTRA_LIBS!$GTK_EXTRA_LIBS$ac_delim ++GTK_EXTRA_CFLAGS!$GTK_EXTRA_CFLAGS$ac_delim ++GTK_DEP_LIBS!$GTK_DEP_LIBS$ac_delim ++GTK_DEP_CFLAGS!$GTK_DEP_CFLAGS$ac_delim ++GLIB_PREFIX!$GLIB_PREFIX$ac_delim ++ATK_PREFIX!$ATK_PREFIX$ac_delim ++PANGO_PREFIX!$PANGO_PREFIX$ac_delim ++CAIRO_PREFIX!$CAIRO_PREFIX$ac_delim ++GTK_DEBUG_FLAGS!$GTK_DEBUG_FLAGS$ac_delim ++GTK_XIM_FLAGS!$GTK_XIM_FLAGS$ac_delim ++GAIL_INET_LIBS!$GAIL_INET_LIBS$ac_delim ++CUPS_CONFIG!$CUPS_CONFIG$ac_delim ++CUPS_API_MAJOR!$CUPS_API_MAJOR$ac_delim ++CUPS_API_MINOR!$CUPS_API_MINOR$ac_delim ++CUPS_CFLAGS!$CUPS_CFLAGS$ac_delim ++CUPS_LIBS!$CUPS_LIBS$ac_delim ++HAVE_CUPS_TRUE!$HAVE_CUPS_TRUE$ac_delim ++HAVE_CUPS_FALSE!$HAVE_CUPS_FALSE$ac_delim ++HAVE_HTTP_AUTHSTRING!$HAVE_HTTP_AUTHSTRING$ac_delim ++TEST_PRINT_BACKEND_TRUE!$TEST_PRINT_BACKEND_TRUE$ac_delim ++TEST_PRINT_BACKEND_FALSE!$TEST_PRINT_BACKEND_FALSE$ac_delim ++HTML_DIR!$HTML_DIR$ac_delim ++GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim ++ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim ++ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim ++GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim ++GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim ++DB2HTML!$DB2HTML$ac_delim ++HAVE_DOCBOOK_TRUE!$HAVE_DOCBOOK_TRUE$ac_delim ++HAVE_DOCBOOK_FALSE!$HAVE_DOCBOOK_FALSE$ac_delim ++XSLTPROC!$XSLTPROC$ac_delim ++XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim ++XMLCATALOG!$XMLCATALOG$ac_delim ++ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim ++ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim ++LIB@&t@OBJS!$LIB@&t@OBJS$ac_delim ++LTLIBOBJS!$LTLIBOBJS$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; 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 >$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 ++# (actually we leave an empty line to preserve line numbers). ++if test "x$srcdir" = x.; then ++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ ++s/:*\$(srcdir):*/:/ ++s/:*\${srcdir}:*/:/ ++s/:*@srcdir@:*/:/ ++s/^\([^=]*=[ ]*\):*/\1/ ++s/:*$// ++s/^[^=]*=[ ]*$// ++}' ++fi ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++fi # test -n "$CONFIG_FILES" ++ ++ ++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 ++echo "$as_me: error: Invalid tag $ac_tag." >&2;} ++ { (exit 1); exit 1; }; };; ++ :[FH]-) ac_tag=-:-;; ++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; ++ esac ++ ac_save_IFS=$IFS ++ IFS=: ++ set x $ac_tag ++ IFS=$ac_save_IFS ++ shift ++ ac_file=$1 ++ shift ++ ++ case $ac_mode in ++ :L) ac_source=$1;; ++ :[FH]) ++ ac_file_inputs= ++ for ac_f ++ do ++ case $ac_f in ++ -) ac_f="$tmp/stdin";; ++ *) # Look for the file first in the build tree, then in the source tree ++ # (if the path is not absolute). The absolute path cannot be DOS-style, ++ # because $ac_f cannot contain `:'. ++ test -f "$ac_f" || ++ case $ac_f in ++ [\\/$]*) false;; ++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; ++ esac || ++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 ++echo "$as_me: error: cannot find input file: $ac_f" >&2;} ++ { (exit 1); exit 1; }; };; ++ esac ++ ac_file_inputs="$ac_file_inputs $ac_f" ++ done ++ ++ # Let's still pretend it is `configure' which instantiates (i.e., don't ++ # use $as_me), people would be surprised to read: ++ # /* config.h. Generated by config.status. */ ++ configure_input="Generated from "`IFS=: ++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." ++ if test x"$ac_file" != x-; then ++ configure_input="$ac_file. $configure_input" ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ fi ++ ++ case $ac_tag in ++ *:-:* | *:-) cat >"$tmp/stdin";; ++ esac ++ ;; ++ esac ++ ++ ac_dir=`$as_dirname -- "$ac_file" || ++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$ac_file" : 'X\(//\)[^/]' \| \ ++ X"$ac_file" : 'X\(//\)$' \| \ ++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$ac_file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ { as_dir="$ac_dir" ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ { (exit 1); exit 1; }; }; } ++ ac_builddir=. ++ ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix ++ ++case $srcdir in ++ .) # We are building in place. ++ ac_srcdir=. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ ++ ++ case $ac_mode in ++ :F) ++ # ++ # CONFIG_FILE ++ # ++ ++ case $INSTALL in ++ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; ++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; ++ esac ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If the template does not know about datarootdir, expand it. ++# FIXME: This hack should be removed a few years after 2.60. ++ac_datarootdir_hack=; ac_datarootdir_seen= ++ ++case `sed -n '/datarootdir/ { ++ p ++ q ++} ++/@datadir@/p ++/@docdir@/p ++/@infodir@/p ++/@localedir@/p ++/@mandir@/p ++' $ac_file_inputs` in ++*datarootdir*) ac_datarootdir_seen=yes;; ++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) ++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++ ac_datarootdir_hack=' ++ s&@datadir@&$datadir&g ++ s&@docdir@&$docdir&g ++ s&@infodir@&$infodir&g ++ s&@localedir@&$localedir&g ++ s&@mandir@&$mandir&g ++ s&\\\${datarootdir}&$datarootdir&g' ;; ++esac ++_ACEOF ++ ++# Neutralize VPATH when `$srcdir' = `.'. ++# Shell code in configure.ac might set extrasub. ++# FIXME: do we really want to maintain this feature? ++cat >>$CONFIG_STATUS <<_ACEOF ++ sed "$ac_vpsub ++$extrasub ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++:t ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++s&@configure_input@&$configure_input&;t t ++s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@srcdir@&$ac_srcdir&;t t ++s&@abs_srcdir@&$ac_abs_srcdir&;t t ++s&@top_srcdir@&$ac_top_srcdir&;t t ++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t ++s&@builddir@&$ac_builddir&;t t ++s&@abs_builddir@&$ac_abs_builddir&;t t ++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t ++s&@INSTALL@&$ac_INSTALL&;t t ++$ac_datarootdir_hack ++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -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"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&5 ++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&2;} ++ ++ rm -f "$tmp/stdin" ++ case $ac_file in ++ -) cat "$tmp/out"; rm -f "$tmp/out";; ++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; ++ esac ++ ;; ++ :H) ++ # ++ # CONFIG_HEADER ++ # ++_ACEOF ++ ++# Transform confdefs.h into a sed script `conftest.defines', that ++# substitutes the proper values into config.h.in to produce config.h. ++rm -f conftest.defines conftest.tail ++# First, append a space to every undef/define line, to ease matching. ++echo 's/$/ /' >conftest.defines ++# Then, protect against being on the right side of a sed subst, or in ++# an unquoted here document, in config.status. If some macros were ++# called several times there might be several #defines for the same ++# symbol, which is useless. But do not sort them, since the last ++# AC_DEFINE must be honored. ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where ++# NAME is the cpp macro being defined, VALUE is the value it is being given. ++# PARAMS is the parameter list in the macro definition--in most cases, it's ++# just an empty string. ++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' ++ac_dB='\\)[ (].*,\\1define\\2' ++ac_dC=' ' ++ac_dD=' ,' ++ ++uniq confdefs.h | ++ sed -n ' ++ t rset ++ :rset ++ s/^[ ]*#[ ]*define[ ][ ]*// ++ t ok ++ d ++ :ok ++ s/[\\&,]/\\&/g ++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p ++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p ++ ' >>conftest.defines ++ ++# Remove the space that was appended to ease matching. ++# Then replace #undef with comments. This is necessary, for ++# example, in the case of _POSIX_SOURCE, which is predefined and required ++# on some systems where configure will not decide to define it. ++# (The regexp can be short, since the line contains either #define or #undef.) ++echo 's/ $// ++s,^[ #]*u.*,/* & */,' >>conftest.defines ++ ++# Break up conftest.defines: ++ac_max_sed_lines=50 ++ ++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" ++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" ++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" ++# et cetera. ++ac_in='$ac_file_inputs' ++ac_out='"$tmp/out1"' ++ac_nxt='"$tmp/out2"' ++ ++while : ++do ++ # Write a here document: ++ cat >>$CONFIG_STATUS <<_ACEOF ++ # First, check the format of the line: ++ cat >"\$tmp/defines.sed" <<\\CEOF ++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def ++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def ++b ++:def ++_ACEOF ++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS ++ echo 'CEOF ++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS ++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in ++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail ++ grep . conftest.tail >/dev/null || break ++ rm -f conftest.defines ++ mv conftest.tail conftest.defines ++done ++rm -f conftest.defines conftest.tail ++ ++echo "ac_result=$ac_in" >>$CONFIG_STATUS ++cat >>$CONFIG_STATUS <<\_ACEOF ++ if test x"$ac_file" != x-; then ++ echo "/* $configure_input */" >"$tmp/config.h" ++ cat "$ac_result" >>"$tmp/config.h" ++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then ++ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++echo "$as_me: $ac_file is unchanged" >&6;} ++ else ++ rm -f $ac_file ++ mv "$tmp/config.h" $ac_file ++ fi ++ else ++ echo "/* $configure_input */" ++ cat "$ac_result" ++ fi ++ rm -f "$tmp/out12" ++# Compute $ac_file's index in $config_headers. ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $ac_file | $ac_file:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || ++$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X$ac_file : 'X\(//\)[^/]' \| \ ++ X$ac_file : 'X\(//\)$' \| \ ++ X$ac_file : 'X\(/\)' \| . 2>/dev/null || ++echo X$ac_file | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'`/stamp-h$_am_stamp_count ++ ;; ++ ++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++echo "$as_me: executing $ac_file commands" >&6;} ++ ;; ++ esac ++ ++ ++ case $ac_file$ac_mode in ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # So let's grep whole file. ++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ dirpart=`$as_dirname -- "$mf" || ++$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$mf" : 'X\(//\)[^/]' \| \ ++ X"$mf" : 'X\(//\)$' \| \ ++ X"$mf" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$mf" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ else ++ continue ++ fi ++ grep '^DEP_FILES *= *[^ @%:@]' < "$mf" > /dev/null || continue ++ # Extract the definition of DEP_FILES from the Makefile without ++ # running `make'. ++ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n -e '/^U = / s///p' < "$mf"` ++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ++ # We invoke sed twice because it is the simplest approach to ++ # changing $(DEPDIR) to its actual value in the expansion. ++ for file in `sed -n -e ' ++ /^DEP_FILES = .*\\\\$/ { ++ s/^DEP_FILES = // ++ :loop ++ s/\\\\$// ++ p ++ n ++ /\\\\$/ b loop ++ p ++ } ++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`$as_dirname -- "$file" || ++$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$file" : 'X\(//\)[^/]' \| \ ++ X"$file" : 'X\(//\)$' \| \ ++ X"$file" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ { as_dir=$dirpart/$fdir ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ { (exit 1); exit 1; }; }; } ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++ ;; ++ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac ;; ++ "default-2":C) case "$CONFIG_FILES" in *po-properties/Makefile.in*) ++ sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile ++ esac ;; ++ "gdk/gdkconfig.h":C) ++ outfile=gdkconfig.h-tmp ++ cat > $outfile <<\_______EOF ++/* gdkconfig.h ++ * ++ * This is a generated file. Please modify `configure.in' ++ */ ++ ++#ifndef GDKCONFIG_H ++#define GDKCONFIG_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif /* __cplusplus */ ++ ++#ifndef GSEAL ++/* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */ ++# ifdef GSEAL_ENABLE ++# define GSEAL(ident) _g_sealed__ ## ident ++# else ++# define GSEAL(ident) ident ++# endif ++#endif /* !GSEAL */ ++ ++_______EOF ++ ++ cat >>$outfile <<_______EOF ++$gdk_windowing ++$gdk_wc ++_______EOF ++ ++ cat >>$outfile <<_______EOF ++ ++#ifdef __cplusplus ++} ++#endif /* __cplusplus */ ++ ++#endif /* GDKCONFIG_H */ ++_______EOF ++ ++ ++ if cmp -s $outfile gdk/gdkconfig.h; then ++ { echo "$as_me:$LINENO: gdk/gdkconfig.h is unchanged" >&5 ++echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} ++ rm -f $outfile ++ else ++ mv $outfile gdk/gdkconfig.h ++ fi ++ ;; ++ ++ esac ++done # for ac_tag ++ ++ ++{ (exit 0); exit 0; } ++_ACEOF ++chmod +x $CONFIG_STATUS ++ac_clean_files=$ac_clean_files_save ++ ++ ++# configure is writing to config.log, and then calls config.status. ++# config.status does its own redirection, appending to config.log. ++# Unfortunately, on DOS this fails, as config.log is still kept open ++# by configure, so config.status won't be able to write to it; its ++# output is simply discarded. So we exec the FD to /dev/null, ++# effectively closing config.log, so it can be properly (re)opened and ++# appended to by config.status. When coming back to configure, we ++# need to make the FD available again. ++if test "$no_create" != yes; then ++ ac_cs_success=: ++ ac_config_status_args= ++ test "$silent" = yes && ++ ac_config_status_args="$ac_config_status_args --quiet" ++ exec 5>/dev/null ++ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false ++ exec 5>>config.log ++ # Use ||, not &&, to avoid exiting from the if with $? = 1, which ++ # would make configure fail if this is the last instruction. ++ $ac_cs_success || { (exit 1); exit 1; } ++fi ++ ++ ++echo "configuration: ++ target: $gdktarget" +diff -urN gtk+2.0-2.14.4.old/autom4te.cache/requests gtk+2.0-2.14.4/autom4te.cache/requests +--- gtk+2.0-2.14.4.old/autom4te.cache/requests 1969-12-31 21:00:00.000000000 -0300 ++++ gtk+2.0-2.14.4/autom4te.cache/requests 2008-11-04 15:37:03.000000000 -0200 +@@ -0,0 +1,64 @@ ++# This file was generated by Autom4te Mon Aug 11 20:59:21 PDT 2008. ++# It contains the lists of macros which have been traced. ++# It can be safely removed. ++ ++@request = ( ++ bless( [ ++ '0', ++ 1, ++ [ ++ '/usr/share/autoconf' ++ ], ++ [ ++ '/usr/share/autoconf/autoconf/autoconf.m4f', ++ 'aclocal.m4', ++ 'configure.in' ++ ], ++ { ++ 'AM_PROG_F77_C_O' => 1, ++ '_LT_AC_TAGCONFIG' => 1, ++ 'm4_pattern_forbid' => 1, ++ 'AC_INIT' => 1, ++ 'AC_CANONICAL_TARGET' => 1, ++ 'AC_CONFIG_LIBOBJ_DIR' => 1, ++ 'AC_SUBST' => 1, ++ 'AC_CANONICAL_HOST' => 1, ++ 'AC_FC_SRCEXT' => 1, ++ 'AC_PROG_LIBTOOL' => 1, ++ 'AM_INIT_AUTOMAKE' => 1, ++ 'AC_CONFIG_SUBDIRS' => 1, ++ 'AM_AUTOMAKE_VERSION' => 1, ++ 'LT_CONFIG_LTDL_DIR' => 1, ++ 'AC_REQUIRE_AUX_FILE' => 1, ++ 'AC_CONFIG_LINKS' => 1, ++ 'LT_SUPPORTED_TAG' => 1, ++ 'm4_sinclude' => 1, ++ 'AM_MAINTAINER_MODE' => 1, ++ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, ++ '_m4_warn' => 1, ++ 'AM_PROG_CXX_C_O' => 1, ++ 'AM_ENABLE_MULTILIB' => 1, ++ 'AC_CONFIG_FILES' => 1, ++ 'include' => 1, ++ 'LT_INIT' => 1, ++ 'AM_GNU_GETTEXT' => 1, ++ 'AC_LIBSOURCE' => 1, ++ 'AM_PROG_FC_C_O' => 1, ++ 'AC_CANONICAL_BUILD' => 1, ++ 'AC_FC_FREEFORM' => 1, ++ 'AH_OUTPUT' => 1, ++ '_AM_SUBST_NOTMAKE' => 1, ++ 'AC_CONFIG_AUX_DIR' => 1, ++ 'AM_PROG_CC_C_O' => 1, ++ 'm4_pattern_allow' => 1, ++ 'sinclude' => 1, ++ 'AM_CONDITIONAL' => 1, ++ 'AC_CANONICAL_SYSTEM' => 1, ++ 'AC_CONFIG_HEADERS' => 1, ++ 'AC_DEFINE_TRACE_LITERAL' => 1, ++ 'm4_include' => 1, ++ 'AC_SUBST_TRACE' => 1 ++ } ++ ], 'Autom4te::Request' ) ++ ); ++ +diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cache/traces.0 +--- gtk+2.0-2.14.4.old/autom4te.cache/traces.0 1969-12-31 21:00:00.000000000 -0300 ++++ gtk+2.0-2.14.4/autom4te.cache/traces.0 2008-11-04 15:37:01.000000000 -0200 +@@ -0,0 +1,2037 @@ ++m4trace:aclocal.m4:123: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) ++m4trace:configure.in:40: -1- AC_INIT([gtk+], [gtk_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B], [gtk+]) ++m4trace:configure.in:40: -1- m4_pattern_forbid([^_?A[CHUM]_]) ++m4trace:configure.in:40: -1- m4_pattern_forbid([_AC_]) ++m4trace:configure.in:40: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) ++m4trace:configure.in:40: -1- m4_pattern_allow([^AS_FLAGS$]) ++m4trace:configure.in:40: -1- m4_pattern_forbid([^_?m4_]) ++m4trace:configure.in:40: -1- m4_pattern_forbid([^dnl$]) ++m4trace:configure.in:40: -1- m4_pattern_forbid([^_?AS_]) ++m4trace:configure.in:40: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([SHELL]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^SHELL$]) ++m4trace:configure.in:40: -1- AC_SUBST([PATH_SEPARATOR]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([PATH_SEPARATOR]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PATH_SEPARATOR$]) ++m4trace:configure.in:40: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([PACKAGE_NAME]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_NAME$]) ++m4trace:configure.in:40: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([PACKAGE_TARNAME]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) ++m4trace:configure.in:40: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([PACKAGE_VERSION]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_VERSION$]) ++m4trace:configure.in:40: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([PACKAGE_STRING]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_STRING$]) ++m4trace:configure.in:40: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) ++m4trace:configure.in:40: -1- AC_SUBST([exec_prefix], [NONE]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([exec_prefix]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^exec_prefix$]) ++m4trace:configure.in:40: -1- AC_SUBST([prefix], [NONE]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([prefix]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^prefix$]) ++m4trace:configure.in:40: -1- AC_SUBST([program_transform_name], [s,x,x,]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([program_transform_name]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^program_transform_name$]) ++m4trace:configure.in:40: -1- AC_SUBST([bindir], ['${exec_prefix}/bin']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([bindir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^bindir$]) ++m4trace:configure.in:40: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([sbindir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^sbindir$]) ++m4trace:configure.in:40: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([libexecdir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^libexecdir$]) ++m4trace:configure.in:40: -1- AC_SUBST([datarootdir], ['${prefix}/share']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([datarootdir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^datarootdir$]) ++m4trace:configure.in:40: -1- AC_SUBST([datadir], ['${datarootdir}']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([datadir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^datadir$]) ++m4trace:configure.in:40: -1- AC_SUBST([sysconfdir], ['${prefix}/etc']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([sysconfdir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^sysconfdir$]) ++m4trace:configure.in:40: -1- AC_SUBST([sharedstatedir], ['${prefix}/com']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([sharedstatedir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^sharedstatedir$]) ++m4trace:configure.in:40: -1- AC_SUBST([localstatedir], ['${prefix}/var']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([localstatedir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^localstatedir$]) ++m4trace:configure.in:40: -1- AC_SUBST([includedir], ['${prefix}/include']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([includedir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^includedir$]) ++m4trace:configure.in:40: -1- AC_SUBST([oldincludedir], ['/usr/include']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([oldincludedir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^oldincludedir$]) ++m4trace:configure.in:40: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], ++ ['${datarootdir}/doc/${PACKAGE_TARNAME}'], ++ ['${datarootdir}/doc/${PACKAGE}'])]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([docdir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^docdir$]) ++m4trace:configure.in:40: -1- AC_SUBST([infodir], ['${datarootdir}/info']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([infodir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^infodir$]) ++m4trace:configure.in:40: -1- AC_SUBST([htmldir], ['${docdir}']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([htmldir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^htmldir$]) ++m4trace:configure.in:40: -1- AC_SUBST([dvidir], ['${docdir}']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([dvidir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^dvidir$]) ++m4trace:configure.in:40: -1- AC_SUBST([pdfdir], ['${docdir}']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([pdfdir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^pdfdir$]) ++m4trace:configure.in:40: -1- AC_SUBST([psdir], ['${docdir}']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([psdir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^psdir$]) ++m4trace:configure.in:40: -1- AC_SUBST([libdir], ['${exec_prefix}/lib']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([libdir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^libdir$]) ++m4trace:configure.in:40: -1- AC_SUBST([localedir], ['${datarootdir}/locale']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([localedir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^localedir$]) ++m4trace:configure.in:40: -1- AC_SUBST([mandir], ['${datarootdir}/man']) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([mandir]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^mandir$]) ++m4trace:configure.in:40: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_NAME$]) ++m4trace:configure.in:40: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */ ++#undef PACKAGE_NAME]) ++m4trace:configure.in:40: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) ++m4trace:configure.in:40: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME]) ++m4trace:configure.in:40: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_VERSION$]) ++m4trace:configure.in:40: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */ ++#undef PACKAGE_VERSION]) ++m4trace:configure.in:40: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_STRING$]) ++m4trace:configure.in:40: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING]) ++m4trace:configure.in:40: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) ++m4trace:configure.in:40: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT]) ++m4trace:configure.in:40: -1- AC_SUBST([DEFS]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([DEFS]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^DEFS$]) ++m4trace:configure.in:40: -1- AC_SUBST([ECHO_C]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([ECHO_C]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^ECHO_C$]) ++m4trace:configure.in:40: -1- AC_SUBST([ECHO_N]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([ECHO_N]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^ECHO_N$]) ++m4trace:configure.in:40: -1- AC_SUBST([ECHO_T]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([ECHO_T]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^ECHO_T$]) ++m4trace:configure.in:40: -1- AC_SUBST([LIBS]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([LIBS]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.in:40: -1- AC_SUBST([build_alias]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([build_alias]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^build_alias$]) ++m4trace:configure.in:40: -1- AC_SUBST([host_alias]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([host_alias]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^host_alias$]) ++m4trace:configure.in:40: -1- AC_SUBST([target_alias]) ++m4trace:configure.in:40: -1- AC_SUBST_TRACE([target_alias]) ++m4trace:configure.in:40: -1- m4_pattern_allow([^target_alias$]) ++m4trace:configure.in:49: -1- AM_INIT_AUTOMAKE([no-define]) ++m4trace:configure.in:49: -1- AM_AUTOMAKE_VERSION([1.7.9]) ++m4trace:configure.in:49: -1- AC_REQUIRE_AUX_FILE([install-sh]) ++m4trace:configure.in:49: -1- AC_SUBST([INSTALL_PROGRAM]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_PROGRAM]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^INSTALL_PROGRAM$]) ++m4trace:configure.in:49: -1- AC_SUBST([INSTALL_SCRIPT]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_SCRIPT]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^INSTALL_SCRIPT$]) ++m4trace:configure.in:49: -1- AC_SUBST([INSTALL_DATA]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_DATA]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^INSTALL_DATA$]) ++m4trace:configure.in:49: -1- AC_SUBST([CYGPATH_W]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([CYGPATH_W]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^CYGPATH_W$]) ++m4trace:configure.in:49: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from... ++aclocal.m4:283: _AM_SET_OPTIONS is expanded from... ++aclocal.m4:136: AM_INIT_AUTOMAKE is expanded from... ++configure.in:49: the top level]) ++m4trace:configure.in:49: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME']) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE$]) ++m4trace:configure.in:49: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION']) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([VERSION]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^VERSION$]) ++m4trace:configure.in:49: -1- AC_SUBST([ACLOCAL]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([ACLOCAL]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^ACLOCAL$]) ++m4trace:configure.in:49: -1- AC_SUBST([AUTOCONF]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([AUTOCONF]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^AUTOCONF$]) ++m4trace:configure.in:49: -1- AC_SUBST([AUTOMAKE]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([AUTOMAKE]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^AUTOMAKE$]) ++m4trace:configure.in:49: -1- AC_SUBST([AUTOHEADER]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([AUTOHEADER]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^AUTOHEADER$]) ++m4trace:configure.in:49: -1- AC_SUBST([MAKEINFO]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([MAKEINFO]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^MAKEINFO$]) ++m4trace:configure.in:49: -1- AC_SUBST([AMTAR]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([AMTAR]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^AMTAR$]) ++m4trace:configure.in:49: -1- AC_SUBST([install_sh]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([install_sh]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^install_sh$]) ++m4trace:configure.in:49: -1- AC_SUBST([STRIP]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([STRIP]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^STRIP$]) ++m4trace:configure.in:49: -1- AC_SUBST([INSTALL_STRIP_PROGRAM]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$]) ++m4trace:configure.in:49: -1- AC_SUBST([AWK]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([AWK]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^AWK$]) ++m4trace:configure.in:49: -1- AC_SUBST([SET_MAKE]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([SET_MAKE]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^SET_MAKE$]) ++m4trace:configure.in:49: -1- AC_SUBST([am__leading_dot]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([am__leading_dot]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^am__leading_dot$]) ++m4trace:configure.in:50: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete. ++You should run autoupdate.], [aclocal.m4:940: AM_CONFIG_HEADER is expanded from... ++configure.in:50: the top level]) ++m4trace:configure.in:50: -1- AC_CONFIG_HEADERS([config.h]) ++m4trace:configure.in:72: -1- AC_SUBST([GTK_MAJOR_VERSION]) ++m4trace:configure.in:72: -1- AC_SUBST_TRACE([GTK_MAJOR_VERSION]) ++m4trace:configure.in:72: -1- m4_pattern_allow([^GTK_MAJOR_VERSION$]) ++m4trace:configure.in:73: -1- AC_SUBST([GTK_MINOR_VERSION]) ++m4trace:configure.in:73: -1- AC_SUBST_TRACE([GTK_MINOR_VERSION]) ++m4trace:configure.in:73: -1- m4_pattern_allow([^GTK_MINOR_VERSION$]) ++m4trace:configure.in:74: -1- AC_SUBST([GTK_MICRO_VERSION]) ++m4trace:configure.in:74: -1- AC_SUBST_TRACE([GTK_MICRO_VERSION]) ++m4trace:configure.in:74: -1- m4_pattern_allow([^GTK_MICRO_VERSION$]) ++m4trace:configure.in:75: -1- AC_SUBST([GTK_INTERFACE_AGE]) ++m4trace:configure.in:75: -1- AC_SUBST_TRACE([GTK_INTERFACE_AGE]) ++m4trace:configure.in:75: -1- m4_pattern_allow([^GTK_INTERFACE_AGE$]) ++m4trace:configure.in:76: -1- AC_SUBST([GTK_BINARY_AGE]) ++m4trace:configure.in:76: -1- AC_SUBST_TRACE([GTK_BINARY_AGE]) ++m4trace:configure.in:76: -1- m4_pattern_allow([^GTK_BINARY_AGE$]) ++m4trace:configure.in:77: -1- AC_SUBST([GTK_API_VERSION]) ++m4trace:configure.in:77: -1- AC_SUBST_TRACE([GTK_API_VERSION]) ++m4trace:configure.in:77: -1- m4_pattern_allow([^GTK_API_VERSION$]) ++m4trace:configure.in:78: -1- AC_SUBST([GTK_VERSION]) ++m4trace:configure.in:78: -1- AC_SUBST_TRACE([GTK_VERSION]) ++m4trace:configure.in:78: -1- m4_pattern_allow([^GTK_VERSION$]) ++m4trace:configure.in:79: -1- AC_SUBST([GTK_BINARY_VERSION]) ++m4trace:configure.in:79: -1- AC_SUBST_TRACE([GTK_BINARY_VERSION]) ++m4trace:configure.in:79: -1- m4_pattern_allow([^GTK_BINARY_VERSION$]) ++m4trace:configure.in:93: -1- AC_SUBST([LT_VERSION_INFO]) ++m4trace:configure.in:93: -1- AC_SUBST_TRACE([LT_VERSION_INFO]) ++m4trace:configure.in:93: -1- m4_pattern_allow([^LT_VERSION_INFO$]) ++m4trace:configure.in:94: -1- AC_SUBST([LT_CURRENT_MINUS_AGE]) ++m4trace:configure.in:94: -1- AC_SUBST_TRACE([LT_CURRENT_MINUS_AGE]) ++m4trace:configure.in:94: -1- m4_pattern_allow([^LT_CURRENT_MINUS_AGE$]) ++m4trace:configure.in:101: -1- AC_SUBST([GAIL_LT_VERSION_INFO], [gail_lt_version_info]) ++m4trace:configure.in:101: -1- AC_SUBST_TRACE([GAIL_LT_VERSION_INFO]) ++m4trace:configure.in:101: -1- m4_pattern_allow([^GAIL_LT_VERSION_INFO$]) ++m4trace:configure.in:102: -1- AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE], [gail_lt_current_minus_age]) ++m4trace:configure.in:102: -1- AC_SUBST_TRACE([GAIL_LT_CURRENT_MINUS_AGE]) ++m4trace:configure.in:102: -1- m4_pattern_allow([^GAIL_LT_CURRENT_MINUS_AGE$]) ++m4trace:configure.in:112: -1- AC_SUBST([GDK_PIXBUF_MAJOR]) ++m4trace:configure.in:112: -1- AC_SUBST_TRACE([GDK_PIXBUF_MAJOR]) ++m4trace:configure.in:112: -1- m4_pattern_allow([^GDK_PIXBUF_MAJOR$]) ++m4trace:configure.in:113: -1- AC_SUBST([GDK_PIXBUF_MINOR]) ++m4trace:configure.in:113: -1- AC_SUBST_TRACE([GDK_PIXBUF_MINOR]) ++m4trace:configure.in:113: -1- m4_pattern_allow([^GDK_PIXBUF_MINOR$]) ++m4trace:configure.in:114: -1- AC_SUBST([GDK_PIXBUF_MICRO]) ++m4trace:configure.in:114: -1- AC_SUBST_TRACE([GDK_PIXBUF_MICRO]) ++m4trace:configure.in:114: -1- m4_pattern_allow([^GDK_PIXBUF_MICRO$]) ++m4trace:configure.in:115: -1- AC_SUBST([GDK_PIXBUF_VERSION]) ++m4trace:configure.in:115: -1- AC_SUBST_TRACE([GDK_PIXBUF_VERSION]) ++m4trace:configure.in:115: -1- m4_pattern_allow([^GDK_PIXBUF_VERSION$]) ++m4trace:configure.in:118: -1- AC_SUBST([GETTEXT_PACKAGE]) ++m4trace:configure.in:118: -1- AC_SUBST_TRACE([GETTEXT_PACKAGE]) ++m4trace:configure.in:118: -1- m4_pattern_allow([^GETTEXT_PACKAGE$]) ++m4trace:configure.in:119: -1- AC_DEFINE_TRACE_LITERAL([GETTEXT_PACKAGE]) ++m4trace:configure.in:119: -1- m4_pattern_allow([^GETTEXT_PACKAGE$]) ++m4trace:configure.in:119: -1- AH_OUTPUT([GETTEXT_PACKAGE], [/* The prefix for our gettext translation domains. */ ++#undef GETTEXT_PACKAGE]) ++m4trace:configure.in:122: -1- AC_CANONICAL_HOST ++m4trace:configure.in:122: -1- AC_CANONICAL_BUILD ++m4trace:configure.in:122: -1- AC_REQUIRE_AUX_FILE([config.sub]) ++m4trace:configure.in:122: -1- AC_REQUIRE_AUX_FILE([config.guess]) ++m4trace:configure.in:122: -1- AC_SUBST([build], [$ac_cv_build]) ++m4trace:configure.in:122: -1- AC_SUBST_TRACE([build]) ++m4trace:configure.in:122: -1- m4_pattern_allow([^build$]) ++m4trace:configure.in:122: -1- AC_SUBST([build_cpu], [$[1]]) ++m4trace:configure.in:122: -1- AC_SUBST_TRACE([build_cpu]) ++m4trace:configure.in:122: -1- m4_pattern_allow([^build_cpu$]) ++m4trace:configure.in:122: -1- AC_SUBST([build_vendor], [$[2]]) ++m4trace:configure.in:122: -1- AC_SUBST_TRACE([build_vendor]) ++m4trace:configure.in:122: -1- m4_pattern_allow([^build_vendor$]) ++m4trace:configure.in:122: -1- AC_SUBST([build_os]) ++m4trace:configure.in:122: -1- AC_SUBST_TRACE([build_os]) ++m4trace:configure.in:122: -1- m4_pattern_allow([^build_os$]) ++m4trace:configure.in:122: -1- AC_SUBST([host], [$ac_cv_host]) ++m4trace:configure.in:122: -1- AC_SUBST_TRACE([host]) ++m4trace:configure.in:122: -1- m4_pattern_allow([^host$]) ++m4trace:configure.in:122: -1- AC_SUBST([host_cpu], [$[1]]) ++m4trace:configure.in:122: -1- AC_SUBST_TRACE([host_cpu]) ++m4trace:configure.in:122: -1- m4_pattern_allow([^host_cpu$]) ++m4trace:configure.in:122: -1- AC_SUBST([host_vendor], [$[2]]) ++m4trace:configure.in:122: -1- AC_SUBST_TRACE([host_vendor]) ++m4trace:configure.in:122: -1- m4_pattern_allow([^host_vendor$]) ++m4trace:configure.in:122: -1- AC_SUBST([host_os]) ++m4trace:configure.in:122: -1- AC_SUBST_TRACE([host_os]) ++m4trace:configure.in:122: -1- m4_pattern_allow([^host_os$]) ++m4trace:configure.in:144: -1- AC_SUBST([LIB_EXE_MACHINE_FLAG]) ++m4trace:configure.in:144: -1- AC_SUBST_TRACE([LIB_EXE_MACHINE_FLAG]) ++m4trace:configure.in:144: -1- m4_pattern_allow([^LIB_EXE_MACHINE_FLAG$]) ++m4trace:configure.in:153: -1- AC_SUBST([CC]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.in:153: -1- AC_SUBST([CFLAGS]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([CFLAGS]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^CFLAGS$]) ++m4trace:configure.in:153: -1- AC_SUBST([LDFLAGS]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([LDFLAGS]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^LDFLAGS$]) ++m4trace:configure.in:153: -1- AC_SUBST([LIBS]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([LIBS]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.in:153: -1- AC_SUBST([CPPFLAGS]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([CPPFLAGS]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.in:153: -1- AC_SUBST([CC]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.in:153: -1- AC_SUBST([CC]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.in:153: -1- AC_SUBST([CC]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.in:153: -1- AC_SUBST([CC]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.in:153: -1- AC_SUBST([ac_ct_CC]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([ac_ct_CC]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^ac_ct_CC$]) ++m4trace:configure.in:153: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([EXEEXT]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^EXEEXT$]) ++m4trace:configure.in:153: -1- AC_SUBST([OBJEXT], [$ac_cv_objext]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([OBJEXT]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^OBJEXT$]) ++m4trace:configure.in:153: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([DEPDIR]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^DEPDIR$]) ++m4trace:configure.in:153: -1- AC_SUBST([am__include]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([am__include]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^am__include$]) ++m4trace:configure.in:153: -1- AC_SUBST([am__quote]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([am__quote]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^am__quote$]) ++m4trace:configure.in:153: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++m4trace:configure.in:153: -1- AC_SUBST([AMDEP_TRUE]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([AMDEP_TRUE]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^AMDEP_TRUE$]) ++m4trace:configure.in:153: -1- AC_SUBST([AMDEP_FALSE]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([AMDEP_FALSE]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^AMDEP_FALSE$]) ++m4trace:configure.in:153: -1- AC_SUBST([AMDEPBACKSLASH]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([AMDEPBACKSLASH]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^AMDEPBACKSLASH$]) ++m4trace:configure.in:153: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([CCDEPMODE]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^CCDEPMODE$]) ++m4trace:configure.in:153: -1- AM_CONDITIONAL([am__fastdepCC], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) ++m4trace:configure.in:153: -1- AC_SUBST([am__fastdepCC_TRUE]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) ++m4trace:configure.in:153: -1- AC_SUBST([am__fastdepCC_FALSE]) ++m4trace:configure.in:153: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE]) ++m4trace:configure.in:153: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) ++m4trace:configure.in:154: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++aclocal.m4:3016: AC_ENABLE_STATIC is expanded from... ++aclocal.m4:3045: AC_DISABLE_STATIC is expanded from... ++aclocal.m4:7490: AM_DISABLE_STATIC is expanded from... ++configure.in:154: the top level]) ++m4trace:configure.in:155: -1- AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes]) ++m4trace:configure.in:155: -1- AC_SUBST([ENABLE_STATIC_TRUE]) ++m4trace:configure.in:155: -1- AC_SUBST_TRACE([ENABLE_STATIC_TRUE]) ++m4trace:configure.in:155: -1- m4_pattern_allow([^ENABLE_STATIC_TRUE$]) ++m4trace:configure.in:155: -1- AC_SUBST([ENABLE_STATIC_FALSE]) ++m4trace:configure.in:155: -1- AC_SUBST_TRACE([ENABLE_STATIC_FALSE]) ++m4trace:configure.in:155: -1- m4_pattern_allow([^ENABLE_STATIC_FALSE$]) ++m4trace:configure.in:161: -1- AC_SUBST([CXX]) ++m4trace:configure.in:161: -1- AC_SUBST_TRACE([CXX]) ++m4trace:configure.in:161: -1- m4_pattern_allow([^CXX$]) ++m4trace:configure.in:161: -1- AC_SUBST([ac_ct_CXX]) ++m4trace:configure.in:161: -1- AC_SUBST_TRACE([ac_ct_CXX]) ++m4trace:configure.in:161: -1- m4_pattern_allow([^ac_ct_CXX$]) ++m4trace:configure.in:162: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from... ++configure.in:162: the top level]) ++m4trace:configure.in:163: -1- _m4_warn([obsolete], [The macro `AC_LANG_CPLUSPLUS' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/c.m4:105: AC_LANG_CPLUSPLUS is expanded from... ++configure.in:163: the top level]) ++m4trace:configure.in:165: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:165: the top level]) ++m4trace:configure.in:165: -1- AC_SUBST([CXX]) ++m4trace:configure.in:165: -1- AC_SUBST_TRACE([CXX]) ++m4trace:configure.in:165: -1- m4_pattern_allow([^CXX$]) ++m4trace:configure.in:165: -1- AC_SUBST([CXXFLAGS]) ++m4trace:configure.in:165: -1- AC_SUBST_TRACE([CXXFLAGS]) ++m4trace:configure.in:165: -1- m4_pattern_allow([^CXXFLAGS$]) ++m4trace:configure.in:165: -1- AC_SUBST([LDFLAGS]) ++m4trace:configure.in:165: -1- AC_SUBST_TRACE([LDFLAGS]) ++m4trace:configure.in:165: -1- m4_pattern_allow([^LDFLAGS$]) ++m4trace:configure.in:165: -1- AC_SUBST([LIBS]) ++m4trace:configure.in:165: -1- AC_SUBST_TRACE([LIBS]) ++m4trace:configure.in:165: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.in:165: -1- AC_SUBST([CPPFLAGS]) ++m4trace:configure.in:165: -1- AC_SUBST_TRACE([CPPFLAGS]) ++m4trace:configure.in:165: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.in:165: -1- AC_SUBST([CXX]) ++m4trace:configure.in:165: -1- AC_SUBST_TRACE([CXX]) ++m4trace:configure.in:165: -1- m4_pattern_allow([^CXX$]) ++m4trace:configure.in:165: -1- AC_SUBST([ac_ct_CXX]) ++m4trace:configure.in:165: -1- AC_SUBST_TRACE([ac_ct_CXX]) ++m4trace:configure.in:165: -1- m4_pattern_allow([^ac_ct_CXX$]) ++m4trace:configure.in:165: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type]) ++m4trace:configure.in:165: -1- AC_SUBST_TRACE([CXXDEPMODE]) ++m4trace:configure.in:165: -1- m4_pattern_allow([^CXXDEPMODE$]) ++m4trace:configure.in:165: -1- AM_CONDITIONAL([am__fastdepCXX], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3]) ++m4trace:configure.in:165: -1- AC_SUBST([am__fastdepCXX_TRUE]) ++m4trace:configure.in:165: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE]) ++m4trace:configure.in:165: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$]) ++m4trace:configure.in:165: -1- AC_SUBST([am__fastdepCXX_FALSE]) ++m4trace:configure.in:165: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE]) ++m4trace:configure.in:165: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$]) ++m4trace:configure.in:166: -1- AM_CONDITIONAL([HAVE_CXX], [test "$CXX" != ""]) ++m4trace:configure.in:166: -1- AC_SUBST([HAVE_CXX_TRUE]) ++m4trace:configure.in:166: -1- AC_SUBST_TRACE([HAVE_CXX_TRUE]) ++m4trace:configure.in:166: -1- m4_pattern_allow([^HAVE_CXX_TRUE$]) ++m4trace:configure.in:166: -1- AC_SUBST([HAVE_CXX_FALSE]) ++m4trace:configure.in:166: -1- AC_SUBST_TRACE([HAVE_CXX_FALSE]) ++m4trace:configure.in:166: -1- m4_pattern_allow([^HAVE_CXX_FALSE$]) ++m4trace:configure.in:170: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:170: the top level]) ++m4trace:configure.in:171: -1- AM_CONDITIONAL([HAVE_OBJC], [test "$OBJC" = "yes"]) ++m4trace:configure.in:171: -1- AC_SUBST([HAVE_OBJC_TRUE]) ++m4trace:configure.in:171: -1- AC_SUBST_TRACE([HAVE_OBJC_TRUE]) ++m4trace:configure.in:171: -1- m4_pattern_allow([^HAVE_OBJC_TRUE$]) ++m4trace:configure.in:171: -1- AC_SUBST([HAVE_OBJC_FALSE]) ++m4trace:configure.in:171: -1- AC_SUBST_TRACE([HAVE_OBJC_FALSE]) ++m4trace:configure.in:171: -1- m4_pattern_allow([^HAVE_OBJC_FALSE$]) ++m4trace:configure.in:173: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from... ++configure.in:173: the top level]) ++m4trace:configure.in:187: -1- AC_PROG_LIBTOOL ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++aclocal.m4:2977: AC_ENABLE_SHARED is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++aclocal.m4:3055: AC_ENABLE_FAST_INSTALL is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... ++aclocal.m4:3196: AC_PROG_LD is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- AC_SUBST([SED]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([SED]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^SED$]) ++m4trace:configure.in:187: -1- AC_SUBST([GREP]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([GREP]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^GREP$]) ++m4trace:configure.in:187: -1- AC_SUBST([GREP]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([GREP]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^GREP$]) ++m4trace:configure.in:187: -1- AC_SUBST([EGREP]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([EGREP]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^EGREP$]) ++m4trace:configure.in:187: -1- AC_SUBST([EGREP]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([EGREP]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^EGREP$]) ++m4trace:configure.in:187: -1- AC_SUBST([LN_S], [$as_ln_s]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([LN_S]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^LN_S$]) ++m4trace:configure.in:187: -1- AC_SUBST([ECHO]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([ECHO]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^ECHO$]) ++m4trace:configure.in:187: -1- AC_SUBST([AR]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([AR]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^AR$]) ++m4trace:configure.in:187: -1- AC_SUBST([RANLIB]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([RANLIB]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^RANLIB$]) ++m4trace:configure.in:187: -1- AC_SUBST([STRIP]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([STRIP]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^STRIP$]) ++m4trace:configure.in:187: -1- AC_SUBST([DSYMUTIL]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([DSYMUTIL]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^DSYMUTIL$]) ++m4trace:configure.in:187: -1- AC_SUBST([NMEDIT]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([NMEDIT]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^NMEDIT$]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... ++../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... ++../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... ++aclocal.m4:1485: _LT_AC_LOCK is expanded from... ++aclocal.m4:2105: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from... ++aclocal.m4:3729: _LT_AC_LANG_C_CONFIG is expanded from... ++aclocal.m4:3728: AC_LIBTOOL_LANG_C_CONFIG is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- AC_SUBST([DLLTOOL]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([DLLTOOL]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^DLLTOOL$]) ++m4trace:configure.in:187: -1- AC_SUBST([AS]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([AS]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^AS$]) ++m4trace:configure.in:187: -1- AC_SUBST([OBJDUMP]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([OBJDUMP]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^OBJDUMP$]) ++m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_DLFCN_H]) ++m4trace:configure.in:187: -1- AC_SUBST([CPP]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([CPP]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^CPP$]) ++m4trace:configure.in:187: -1- AC_SUBST([CPPFLAGS]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([CPPFLAGS]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.in:187: -1- AC_SUBST([CPP]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([CPP]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^CPP$]) ++m4trace:configure.in:187: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^STDC_HEADERS$]) ++m4trace:configure.in:187: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS]) ++m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H]) ++m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H]) ++m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H]) ++m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H]) ++m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H]) ++m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H]) ++m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H]) ++m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H]) ++m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H]) ++m4trace:configure.in:187: -1- _LT_AC_TAGCONFIG ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... ++aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- AC_SUBST([CXXCPP]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([CXXCPP]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^CXXCPP$]) ++m4trace:configure.in:187: -1- AC_SUBST([CPPFLAGS]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([CPPFLAGS]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.in:187: -1- AC_SUBST([CXXCPP]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([CXXCPP]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^CXXCPP$]) ++m4trace:configure.in:187: -1- AC_SUBST([F77]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([F77]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^F77$]) ++m4trace:configure.in:187: -1- AC_SUBST([FFLAGS]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([FFLAGS]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^FFLAGS$]) ++m4trace:configure.in:187: -1- AC_SUBST([LDFLAGS]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([LDFLAGS]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^LDFLAGS$]) ++m4trace:configure.in:187: -1- AC_SUBST([LIBS]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([LIBS]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.in:187: -1- AC_SUBST([F77]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([F77]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^F77$]) ++m4trace:configure.in:187: -1- AC_SUBST([ac_ct_F77]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([ac_ct_F77]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^ac_ct_F77$]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from... ++aclocal.m4:5115: _LT_AC_LANG_GCJ_CONFIG is expanded from... ++aclocal.m4:5114: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... ++aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from... ++aclocal.m4:5115: _LT_AC_LANG_GCJ_CONFIG is expanded from... ++aclocal.m4:5114: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... ++aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from... ++aclocal.m4:5171: _LT_AC_LANG_RC_CONFIG is expanded from... ++aclocal.m4:5170: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... ++aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from... ++aclocal.m4:5171: _LT_AC_LANG_RC_CONFIG is expanded from... ++aclocal.m4:5170: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... ++aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++configure.in:187: the top level]) ++m4trace:configure.in:187: -1- AC_SUBST([LIBTOOL]) ++m4trace:configure.in:187: -1- AC_SUBST_TRACE([LIBTOOL]) ++m4trace:configure.in:187: -1- m4_pattern_allow([^LIBTOOL$]) ++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([_FILE_OFFSET_BITS]) ++m4trace:configure.in:193: -1- m4_pattern_allow([^_FILE_OFFSET_BITS$]) ++m4trace:configure.in:193: -1- AH_OUTPUT([_FILE_OFFSET_BITS], [/* Number of bits in a file offset, on hosts where this is settable. */ ++#undef _FILE_OFFSET_BITS]) ++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([_LARGE_FILES]) ++m4trace:configure.in:193: -1- m4_pattern_allow([^_LARGE_FILES$]) ++m4trace:configure.in:193: -1- AH_OUTPUT([_LARGE_FILES], [/* Define for large files, on AIX-style hosts. */ ++#undef _LARGE_FILES]) ++m4trace:configure.in:195: -1- AC_SUBST([CCAS]) ++m4trace:configure.in:195: -1- AC_SUBST_TRACE([CCAS]) ++m4trace:configure.in:195: -1- m4_pattern_allow([^CCAS$]) ++m4trace:configure.in:195: -1- AC_SUBST([CCASFLAGS]) ++m4trace:configure.in:195: -1- AC_SUBST_TRACE([CCASFLAGS]) ++m4trace:configure.in:195: -1- m4_pattern_allow([^CCASFLAGS$]) ++m4trace:configure.in:196: -1- AC_SUBST([NM]) ++m4trace:configure.in:196: -1- AC_SUBST_TRACE([NM]) ++m4trace:configure.in:196: -1- m4_pattern_allow([^NM$]) ++m4trace:configure.in:199: -1- AM_MAINTAINER_MODE ++m4trace:configure.in:199: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++m4trace:configure.in:199: -1- AC_SUBST([MAINTAINER_MODE_TRUE]) ++m4trace:configure.in:199: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE]) ++m4trace:configure.in:199: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$]) ++m4trace:configure.in:199: -1- AC_SUBST([MAINTAINER_MODE_FALSE]) ++m4trace:configure.in:199: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE]) ++m4trace:configure.in:199: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$]) ++m4trace:configure.in:199: -1- AC_SUBST([MAINT]) ++m4trace:configure.in:199: -1- AC_SUBST_TRACE([MAINT]) ++m4trace:configure.in:199: -1- m4_pattern_allow([^MAINT$]) ++m4trace:configure.in:211: -1- AM_CONDITIONAL([PLATFORM_WIN32], [test "$platform_win32" = "yes"]) ++m4trace:configure.in:211: -1- AC_SUBST([PLATFORM_WIN32_TRUE]) ++m4trace:configure.in:211: -1- AC_SUBST_TRACE([PLATFORM_WIN32_TRUE]) ++m4trace:configure.in:211: -1- m4_pattern_allow([^PLATFORM_WIN32_TRUE$]) ++m4trace:configure.in:211: -1- AC_SUBST([PLATFORM_WIN32_FALSE]) ++m4trace:configure.in:211: -1- AC_SUBST_TRACE([PLATFORM_WIN32_FALSE]) ++m4trace:configure.in:211: -1- m4_pattern_allow([^PLATFORM_WIN32_FALSE$]) ++m4trace:configure.in:213: -1- AM_CONDITIONAL([OS_WIN32], [test "$os_win32" = "yes"]) ++m4trace:configure.in:213: -1- AC_SUBST([OS_WIN32_TRUE]) ++m4trace:configure.in:213: -1- AC_SUBST_TRACE([OS_WIN32_TRUE]) ++m4trace:configure.in:213: -1- m4_pattern_allow([^OS_WIN32_TRUE$]) ++m4trace:configure.in:213: -1- AC_SUBST([OS_WIN32_FALSE]) ++m4trace:configure.in:213: -1- AC_SUBST_TRACE([OS_WIN32_FALSE]) ++m4trace:configure.in:213: -1- m4_pattern_allow([^OS_WIN32_FALSE$]) ++m4trace:configure.in:214: -1- AM_CONDITIONAL([OS_UNIX], [test "$os_win32" != "yes"]) ++m4trace:configure.in:214: -1- AC_SUBST([OS_UNIX_TRUE]) ++m4trace:configure.in:214: -1- AC_SUBST_TRACE([OS_UNIX_TRUE]) ++m4trace:configure.in:214: -1- m4_pattern_allow([^OS_UNIX_TRUE$]) ++m4trace:configure.in:214: -1- AC_SUBST([OS_UNIX_FALSE]) ++m4trace:configure.in:214: -1- AC_SUBST_TRACE([OS_UNIX_FALSE]) ++m4trace:configure.in:214: -1- m4_pattern_allow([^OS_UNIX_FALSE$]) ++m4trace:configure.in:215: -1- AM_CONDITIONAL([OS_LINUX], [test "$os_linux" = "yes"]) ++m4trace:configure.in:215: -1- AC_SUBST([OS_LINUX_TRUE]) ++m4trace:configure.in:215: -1- AC_SUBST_TRACE([OS_LINUX_TRUE]) ++m4trace:configure.in:215: -1- m4_pattern_allow([^OS_LINUX_TRUE$]) ++m4trace:configure.in:215: -1- AC_SUBST([OS_LINUX_FALSE]) ++m4trace:configure.in:215: -1- AC_SUBST_TRACE([OS_LINUX_FALSE]) ++m4trace:configure.in:215: -1- m4_pattern_allow([^OS_LINUX_FALSE$]) ++m4trace:configure.in:218: -1- AC_SUBST([WINDRES]) ++m4trace:configure.in:218: -1- AC_SUBST_TRACE([WINDRES]) ++m4trace:configure.in:218: -1- m4_pattern_allow([^WINDRES$]) ++m4trace:configure.in:222: -1- AC_SUBST([ms_librarian]) ++m4trace:configure.in:222: -1- AC_SUBST_TRACE([ms_librarian]) ++m4trace:configure.in:222: -1- m4_pattern_allow([^ms_librarian$]) ++m4trace:configure.in:224: -1- AM_CONDITIONAL([MS_LIB_AVAILABLE], [test x$ms_librarian = xyes]) ++m4trace:configure.in:224: -1- AC_SUBST([MS_LIB_AVAILABLE_TRUE]) ++m4trace:configure.in:224: -1- AC_SUBST_TRACE([MS_LIB_AVAILABLE_TRUE]) ++m4trace:configure.in:224: -1- m4_pattern_allow([^MS_LIB_AVAILABLE_TRUE$]) ++m4trace:configure.in:224: -1- AC_SUBST([MS_LIB_AVAILABLE_FALSE]) ++m4trace:configure.in:224: -1- AC_SUBST_TRACE([MS_LIB_AVAILABLE_FALSE]) ++m4trace:configure.in:224: -1- m4_pattern_allow([^MS_LIB_AVAILABLE_FALSE$]) ++m4trace:configure.in:231: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++configure.in:231: the top level]) ++m4trace:configure.in:234: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:234: the top level]) ++m4trace:configure.in:238: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:238: the top level]) ++m4trace:configure.in:242: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:242: the top level]) ++m4trace:configure.in:246: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:246: the top level]) ++m4trace:configure.in:250: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:250: the top level]) ++m4trace:configure.in:255: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... ++configure.in:255: the top level]) ++m4trace:configure.in:267: -1- AC_SUBST([gdktarget]) ++m4trace:configure.in:267: -1- AC_SUBST_TRACE([gdktarget]) ++m4trace:configure.in:267: -1- m4_pattern_allow([^gdktarget$]) ++m4trace:configure.in:276: -1- AC_SUBST([gdktargetlib]) ++m4trace:configure.in:276: -1- AC_SUBST_TRACE([gdktargetlib]) ++m4trace:configure.in:276: -1- m4_pattern_allow([^gdktargetlib$]) ++m4trace:configure.in:277: -1- AC_SUBST([gtktargetlib]) ++m4trace:configure.in:277: -1- AC_SUBST_TRACE([gtktargetlib]) ++m4trace:configure.in:277: -1- m4_pattern_allow([^gtktargetlib$]) ++m4trace:configure.in:296: -1- AC_DEFINE_TRACE_LITERAL([GTK_COMPILED_WITH_DEBUGGING]) ++m4trace:configure.in:296: -1- m4_pattern_allow([^GTK_COMPILED_WITH_DEBUGGING$]) ++m4trace:configure.in:296: -1- AH_OUTPUT([GTK_COMPILED_WITH_DEBUGGING], [/* Define if debugging is enabled */ ++#undef GTK_COMPILED_WITH_DEBUGGING]) ++m4trace:configure.in:305: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... ++../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... ++aclocal.m4:7700: AM_PROG_CC_STDC is expanded from... ++configure.in:305: the top level]) ++m4trace:configure.in:306: -1- AC_REQUIRE_AUX_FILE([install-sh]) ++m4trace:configure.in:306: -1- AC_SUBST([INSTALL_PROGRAM]) ++m4trace:configure.in:306: -1- AC_SUBST_TRACE([INSTALL_PROGRAM]) ++m4trace:configure.in:306: -1- m4_pattern_allow([^INSTALL_PROGRAM$]) ++m4trace:configure.in:306: -1- AC_SUBST([INSTALL_SCRIPT]) ++m4trace:configure.in:306: -1- AC_SUBST_TRACE([INSTALL_SCRIPT]) ++m4trace:configure.in:306: -1- m4_pattern_allow([^INSTALL_SCRIPT$]) ++m4trace:configure.in:306: -1- AC_SUBST([INSTALL_DATA]) ++m4trace:configure.in:306: -1- AC_SUBST_TRACE([INSTALL_DATA]) ++m4trace:configure.in:306: -1- m4_pattern_allow([^INSTALL_DATA$]) ++m4trace:configure.in:307: -1- AC_SUBST([SET_MAKE]) ++m4trace:configure.in:307: -1- AC_SUBST_TRACE([SET_MAKE]) ++m4trace:configure.in:307: -1- m4_pattern_allow([^SET_MAKE$]) ++m4trace:configure.in:376: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4trace:configure.in:376: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++m4trace:configure.in:376: -1- AC_SUBST([PKG_CONFIG]) ++m4trace:configure.in:376: -1- AC_SUBST_TRACE([PKG_CONFIG]) ++m4trace:configure.in:376: -1- m4_pattern_allow([^PKG_CONFIG$]) ++m4trace:configure.in:376: -1- AC_SUBST([PKG_CONFIG]) ++m4trace:configure.in:376: -1- AC_SUBST_TRACE([PKG_CONFIG]) ++m4trace:configure.in:376: -1- m4_pattern_allow([^PKG_CONFIG$]) ++m4trace:configure.in:376: -1- AC_SUBST([BASE_DEPENDENCIES_CFLAGS]) ++m4trace:configure.in:376: -1- AC_SUBST_TRACE([BASE_DEPENDENCIES_CFLAGS]) ++m4trace:configure.in:376: -1- m4_pattern_allow([^BASE_DEPENDENCIES_CFLAGS$]) ++m4trace:configure.in:376: -1- AC_SUBST([BASE_DEPENDENCIES_LIBS]) ++m4trace:configure.in:376: -1- AC_SUBST_TRACE([BASE_DEPENDENCIES_LIBS]) ++m4trace:configure.in:376: -1- m4_pattern_allow([^BASE_DEPENDENCIES_LIBS$]) ++m4trace:configure.in:390: -1- AC_SUBST([LIBTOOL_EXPORT_OPTIONS]) ++m4trace:configure.in:390: -1- AC_SUBST_TRACE([LIBTOOL_EXPORT_OPTIONS]) ++m4trace:configure.in:390: -1- m4_pattern_allow([^LIBTOOL_EXPORT_OPTIONS$]) ++m4trace:configure.in:396: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:396: the top level]) ++m4trace:configure.in:419: -1- AM_CONDITIONAL([DISABLE_EXPLICIT_DEPS], [test $enable_explicit_deps = no]) ++m4trace:configure.in:419: -1- AC_SUBST([DISABLE_EXPLICIT_DEPS_TRUE]) ++m4trace:configure.in:419: -1- AC_SUBST_TRACE([DISABLE_EXPLICIT_DEPS_TRUE]) ++m4trace:configure.in:419: -1- m4_pattern_allow([^DISABLE_EXPLICIT_DEPS_TRUE$]) ++m4trace:configure.in:419: -1- AC_SUBST([DISABLE_EXPLICIT_DEPS_FALSE]) ++m4trace:configure.in:419: -1- AC_SUBST_TRACE([DISABLE_EXPLICIT_DEPS_FALSE]) ++m4trace:configure.in:419: -1- m4_pattern_allow([^DISABLE_EXPLICIT_DEPS_FALSE$]) ++m4trace:configure.in:424: -1- AC_SUBST([PERL]) ++m4trace:configure.in:424: -1- AC_SUBST_TRACE([PERL]) ++m4trace:configure.in:424: -1- m4_pattern_allow([^PERL$]) ++m4trace:configure.in:427: -1- AC_SUBST([INDENT]) ++m4trace:configure.in:427: -1- AC_SUBST_TRACE([INDENT]) ++m4trace:configure.in:427: -1- m4_pattern_allow([^INDENT$]) ++m4trace:configure.in:435: -1- AC_SUBST([REBUILD]) ++m4trace:configure.in:435: -1- AC_SUBST_TRACE([REBUILD]) ++m4trace:configure.in:435: -1- m4_pattern_allow([^REBUILD$]) ++m4trace:configure.in:437: -1- AH_OUTPUT([HAVE_LSTAT], [/* Define to 1 if you have the `lstat\' function. */ ++#undef HAVE_LSTAT]) ++m4trace:configure.in:437: -1- AH_OUTPUT([HAVE_MKSTEMP], [/* Define to 1 if you have the `mkstemp\' function. */ ++#undef HAVE_MKSTEMP]) ++m4trace:configure.in:437: -1- AH_OUTPUT([HAVE_FLOCKFILE], [/* Define to 1 if you have the `flockfile\' function. */ ++#undef HAVE_FLOCKFILE]) ++m4trace:configure.in:437: -1- AH_OUTPUT([HAVE_GETC_UNLOCKED], [/* Define to 1 if you have the `getc_unlocked\' function. */ ++#undef HAVE_GETC_UNLOCKED]) ++m4trace:configure.in:438: -1- AH_OUTPUT([HAVE_LOCALTIME_R], [/* Define to 1 if you have the `localtime_r\' function. */ ++#undef HAVE_LOCALTIME_R]) ++m4trace:configure.in:442: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++configure.in:442: the top level]) ++m4trace:configure.in:448: -1- AC_DEFINE_TRACE_LITERAL([HAVE__NL_TIME_FIRST_WEEKDAY]) ++m4trace:configure.in:448: -1- m4_pattern_allow([^HAVE__NL_TIME_FIRST_WEEKDAY$]) ++m4trace:configure.in:448: -1- AH_OUTPUT([HAVE__NL_TIME_FIRST_WEEKDAY], [/* Define if _NL_TIME_FIRST_WEEKDAY is available */ ++#undef HAVE__NL_TIME_FIRST_WEEKDAY]) ++m4trace:configure.in:454: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++configure.in:454: the top level]) ++m4trace:configure.in:460: -1- AC_DEFINE_TRACE_LITERAL([HAVE__NL_MEASUREMENT_MEASUREMENT]) ++m4trace:configure.in:460: -1- m4_pattern_allow([^HAVE__NL_MEASUREMENT_MEASUREMENT$]) ++m4trace:configure.in:460: -1- AH_OUTPUT([HAVE__NL_MEASUREMENT_MEASUREMENT], [/* Define if _NL_MEASUREMENT_MEASUREMENT is available */ ++#undef HAVE__NL_MEASUREMENT_MEASUREMENT]) ++m4trace:configure.in:466: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++configure.in:466: the top level]) ++m4trace:configure.in:472: -1- AC_DEFINE_TRACE_LITERAL([HAVE__NL_PAPER_HEIGHT]) ++m4trace:configure.in:472: -1- m4_pattern_allow([^HAVE__NL_PAPER_HEIGHT$]) ++m4trace:configure.in:472: -1- AH_OUTPUT([HAVE__NL_PAPER_HEIGHT], [/* Define if _NL_PAPER_HEIGHT is available */ ++#undef HAVE__NL_PAPER_HEIGHT]) ++m4trace:configure.in:478: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++configure.in:478: the top level]) ++m4trace:configure.in:484: -1- AC_DEFINE_TRACE_LITERAL([HAVE__NL_PAPER_WIDTH]) ++m4trace:configure.in:484: -1- m4_pattern_allow([^HAVE__NL_PAPER_WIDTH$]) ++m4trace:configure.in:484: -1- AH_OUTPUT([HAVE__NL_PAPER_WIDTH], [/* Define if _NL_PAPER_WIDTH is available */ ++#undef HAVE__NL_PAPER_WIDTH]) ++m4trace:configure.in:490: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++configure.in:490: the top level]) ++m4trace:configure.in:496: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SIGSETJMP]) ++m4trace:configure.in:496: -1- m4_pattern_allow([^HAVE_SIGSETJMP$]) ++m4trace:configure.in:496: -1- AH_OUTPUT([HAVE_SIGSETJMP], [/* Define to 1 if sigsetjmp is available */ ++#undef HAVE_SIGSETJMP]) ++m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H]) ++m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... ++../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... ++../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... ++aclocal.m4:7978: GLIB_LC_MESSAGES is expanded from... ++aclocal.m4:8242: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:8342: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.in:502: the top level]) ++m4trace:configure.in:502: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^HAVE_LC_MESSAGES$]) ++m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your file defines LC_MESSAGES. */ ++#undef HAVE_LC_MESSAGES]) ++m4trace:configure.in:502: -1- AC_SUBST([USE_NLS]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([USE_NLS]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^USE_NLS$]) ++m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... ++../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... ++../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... ++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... ++../../lib/autoconf/headers.m4:87: AC_CHECK_HEADER is expanded from... ++aclocal.m4:8032: GLIB_WITH_NLS is expanded from... ++aclocal.m4:8242: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:8342: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.in:502: the top level]) ++m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... ++../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... ++../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... ++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... ++../../lib/autoconf/headers.m4:87: AC_CHECK_HEADER is expanded from... ++aclocal.m4:8032: GLIB_WITH_NLS is expanded from... ++aclocal.m4:8242: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:8342: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.in:502: the top level]) ++m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET]) ++m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET]) ++m4trace:configure.in:502: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^HAVE_GETTEXT$]) ++m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */ ++#undef HAVE_GETTEXT]) ++m4trace:configure.in:502: -1- AC_SUBST([MSGFMT]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([MSGFMT]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^MSGFMT$]) ++m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define to 1 if you have the `dcgettext\' function. */ ++#undef HAVE_DCGETTEXT]) ++m4trace:configure.in:502: -1- AC_SUBST([MSGFMT_OPTS]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([MSGFMT_OPTS]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^MSGFMT_OPTS$]) ++m4trace:configure.in:502: -1- AC_SUBST([GMSGFMT]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([GMSGFMT]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^GMSGFMT$]) ++m4trace:configure.in:502: -1- AC_SUBST([XGETTEXT]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([XGETTEXT]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^XGETTEXT$]) ++m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... ++../../lib/autoconf/headers.m4:87: AC_CHECK_HEADER is expanded from... ++aclocal.m4:8032: GLIB_WITH_NLS is expanded from... ++aclocal.m4:8242: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:8342: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.in:502: the top level]) ++m4trace:configure.in:502: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^ENABLE_NLS$]) ++m4trace:configure.in:502: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */ ++#undef ENABLE_NLS]) ++m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/status.m4:848: AC_OUTPUT_COMMANDS is expanded from... ++aclocal.m4:8032: GLIB_WITH_NLS is expanded from... ++aclocal.m4:8242: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:8342: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.in:502: the top level]) ++m4trace:configure.in:502: -1- AC_SUBST([CATALOGS]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([CATALOGS]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^CATALOGS$]) ++m4trace:configure.in:502: -1- AC_SUBST([CATOBJEXT]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([CATOBJEXT]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^CATOBJEXT$]) ++m4trace:configure.in:502: -1- AC_SUBST([DATADIRNAME]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([DATADIRNAME]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^DATADIRNAME$]) ++m4trace:configure.in:502: -1- AC_SUBST([GMOFILES]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([GMOFILES]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^GMOFILES$]) ++m4trace:configure.in:502: -1- AC_SUBST([INSTOBJEXT]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([INSTOBJEXT]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^INSTOBJEXT$]) ++m4trace:configure.in:502: -1- AC_SUBST([INTLLIBS]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([INTLLIBS]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^INTLLIBS$]) ++m4trace:configure.in:502: -1- AC_SUBST([PO_IN_DATADIR_TRUE]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([PO_IN_DATADIR_TRUE]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^PO_IN_DATADIR_TRUE$]) ++m4trace:configure.in:502: -1- AC_SUBST([PO_IN_DATADIR_FALSE]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([PO_IN_DATADIR_FALSE]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^PO_IN_DATADIR_FALSE$]) ++m4trace:configure.in:502: -1- AC_SUBST([POFILES]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([POFILES]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^POFILES$]) ++m4trace:configure.in:502: -1- AC_SUBST([POSUB]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([POSUB]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^POSUB$]) ++m4trace:configure.in:502: -1- AC_SUBST([MKINSTALLDIRS]) ++m4trace:configure.in:502: -1- AC_SUBST_TRACE([MKINSTALLDIRS]) ++m4trace:configure.in:502: -1- m4_pattern_allow([^MKINSTALLDIRS$]) ++m4trace:configure.in:504: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/status.m4:848: AC_OUTPUT_COMMANDS is expanded from... ++configure.in:504: the top level]) ++m4trace:configure.in:508: -1- AC_DEFINE_TRACE_LITERAL([GTK_LOCALEDIR]) ++m4trace:configure.in:508: -1- m4_pattern_allow([^GTK_LOCALEDIR$]) ++m4trace:configure.in:508: -1- AH_OUTPUT([GTK_LOCALEDIR], [/* Define the location where the catalogs will be installed */ ++#undef GTK_LOCALEDIR]) ++m4trace:configure.in:521: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2478: AC_TRY_RUN is expanded from... ++configure.in:521: the top level]) ++m4trace:configure.in:516: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2478: AC_TRY_RUN is expanded from... ++configure.in:516: the top level]) ++m4trace:configure.in:565: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:565: the top level]) ++m4trace:configure.in:561: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:561: the top level]) ++m4trace:configure.in:577: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4trace:configure.in:577: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++m4trace:configure.in:577: -1- AC_SUBST([PKG_CONFIG]) ++m4trace:configure.in:577: -1- AC_SUBST_TRACE([PKG_CONFIG]) ++m4trace:configure.in:577: -1- m4_pattern_allow([^PKG_CONFIG$]) ++m4trace:configure.in:577: -1- AC_SUBST([PKG_CONFIG]) ++m4trace:configure.in:577: -1- AC_SUBST_TRACE([PKG_CONFIG]) ++m4trace:configure.in:577: -1- m4_pattern_allow([^PKG_CONFIG$]) ++m4trace:configure.in:577: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2478: AC_TRY_RUN is expanded from... ++aclocal.m4:8371: AM_PATH_GLIB_2_0 is expanded from... ++configure.in:577: the top level]) ++m4trace:configure.in:577: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++aclocal.m4:8371: AM_PATH_GLIB_2_0 is expanded from... ++configure.in:577: the top level]) ++m4trace:configure.in:577: -1- AC_SUBST([GLIB_CFLAGS]) ++m4trace:configure.in:577: -1- AC_SUBST_TRACE([GLIB_CFLAGS]) ++m4trace:configure.in:577: -1- m4_pattern_allow([^GLIB_CFLAGS$]) ++m4trace:configure.in:577: -1- AC_SUBST([GLIB_LIBS]) ++m4trace:configure.in:577: -1- AC_SUBST_TRACE([GLIB_LIBS]) ++m4trace:configure.in:577: -1- m4_pattern_allow([^GLIB_LIBS$]) ++m4trace:configure.in:577: -1- AC_SUBST([GLIB_GENMARSHAL]) ++m4trace:configure.in:577: -1- AC_SUBST_TRACE([GLIB_GENMARSHAL]) ++m4trace:configure.in:577: -1- m4_pattern_allow([^GLIB_GENMARSHAL$]) ++m4trace:configure.in:577: -1- AC_SUBST([GOBJECT_QUERY]) ++m4trace:configure.in:577: -1- AC_SUBST_TRACE([GOBJECT_QUERY]) ++m4trace:configure.in:577: -1- m4_pattern_allow([^GOBJECT_QUERY$]) ++m4trace:configure.in:577: -1- AC_SUBST([GLIB_MKENUMS]) ++m4trace:configure.in:577: -1- AC_SUBST_TRACE([GLIB_MKENUMS]) ++m4trace:configure.in:577: -1- m4_pattern_allow([^GLIB_MKENUMS$]) ++m4trace:configure.in:598: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET]) ++m4trace:configure.in:602: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PWD_H]) ++m4trace:configure.in:602: -2- m4_pattern_allow([^HAVE_PWD_H$]) ++m4trace:configure.in:602: -2- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if pwd.h is available */ ++#undef HAVE_PWD_H]) ++m4trace:configure.in:601: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_PWD_H]) ++m4trace:configure.in:605: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TIME_H]) ++m4trace:configure.in:605: -2- m4_pattern_allow([^HAVE_SYS_TIME_H$]) ++m4trace:configure.in:605: -2- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if time.h is available */ ++#undef HAVE_SYS_TIME_H]) ++m4trace:configure.in:604: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TIME_H]) ++m4trace:configure.in:608: -2- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H]) ++m4trace:configure.in:608: -2- m4_pattern_allow([^HAVE_UNISTD_H$]) ++m4trace:configure.in:608: -2- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if unistd.h is available */ ++#undef HAVE_UNISTD_H]) ++m4trace:configure.in:607: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H]) ++m4trace:configure.in:611: -2- AC_DEFINE_TRACE_LITERAL([HAVE_FTW_H]) ++m4trace:configure.in:611: -2- m4_pattern_allow([^HAVE_FTW_H$]) ++m4trace:configure.in:611: -2- AH_OUTPUT([HAVE_FTW_H], [/* Define to 1 if ftw.h is available */ ++#undef HAVE_FTW_H]) ++m4trace:configure.in:610: -1- AH_OUTPUT([HAVE_FTW_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_FTW_H]) ++m4trace:configure.in:615: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:615: the top level]) ++m4trace:configure.in:620: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GNU_FTW]) ++m4trace:configure.in:620: -1- m4_pattern_allow([^HAVE_GNU_FTW$]) ++m4trace:configure.in:620: -1- AH_OUTPUT([HAVE_GNU_FTW], [/* Have GNU ftw */ ++#undef HAVE_GNU_FTW]) ++m4trace:configure.in:630: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS]) ++m4trace:configure.in:630: -1- m4_pattern_allow([^STDC_HEADERS$]) ++m4trace:configure.in:630: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS]) ++m4trace:configure.in:633: -1- AC_DEFINE_TRACE_LITERAL([const]) ++m4trace:configure.in:633: -1- m4_pattern_allow([^const$]) ++m4trace:configure.in:633: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */ ++#undef const]) ++m4trace:configure.in:636: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE]) ++m4trace:configure.in:636: -1- m4_pattern_allow([^RETSIGTYPE$]) ++m4trace:configure.in:636: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */ ++#undef RETSIGTYPE]) ++m4trace:configure.in:637: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H]) ++m4trace:configure.in:637: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H]) ++m4trace:configure.in:637: -1- AH_OUTPUT([HAVE_GETPAGESIZE], [/* Define to 1 if you have the `getpagesize\' function. */ ++#undef HAVE_GETPAGESIZE]) ++m4trace:configure.in:637: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MMAP]) ++m4trace:configure.in:637: -1- m4_pattern_allow([^HAVE_MMAP$]) ++m4trace:configure.in:637: -1- AH_OUTPUT([HAVE_MMAP], [/* Define to 1 if you have a working `mmap\' system call. */ ++#undef HAVE_MMAP]) ++m4trace:configure.in:639: -1- AH_OUTPUT([HAVE_MALLINFO], [/* Define to 1 if you have the `mallinfo\' function. */ ++#undef HAVE_MALLINFO]) ++m4trace:configure.in:640: -1- AH_OUTPUT([HAVE_GETRESUID], [/* Define to 1 if you have the `getresuid\' function. */ ++#undef HAVE_GETRESUID]) ++m4trace:configure.in:641: -1- AC_DEFINE_TRACE_LITERAL([uid_t]) ++m4trace:configure.in:641: -1- m4_pattern_allow([^uid_t$]) ++m4trace:configure.in:641: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if doesn\'t define. */ ++#undef uid_t]) ++m4trace:configure.in:641: -1- AC_DEFINE_TRACE_LITERAL([gid_t]) ++m4trace:configure.in:641: -1- m4_pattern_allow([^gid_t$]) ++m4trace:configure.in:641: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if doesn\'t define. */ ++#undef gid_t]) ++m4trace:configure.in:645: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:645: the top level]) ++m4trace:configure.in:650: -1- _m4_warn([obsolete], [The macro `AC_HEADER_EGREP' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/oldnames.m4:58: AC_HEADER_EGREP is expanded from... ++configure.in:650: the top level]) ++m4trace:configure.in:652: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_SELECT_H]) ++m4trace:configure.in:652: -1- m4_pattern_allow([^HAVE_SYS_SELECT_H$]) ++m4trace:configure.in:652: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if sys/select.h is available */ ++#undef HAVE_SYS_SELECT_H]) ++m4trace:configure.in:656: -1- AC_DEFINE_TRACE_LITERAL([NO_FD_SET]) ++m4trace:configure.in:656: -1- m4_pattern_allow([^NO_FD_SET$]) ++m4trace:configure.in:656: -1- AH_OUTPUT([NO_FD_SET], [/* Define to 1 if fd_set is not available */ ++#undef NO_FD_SET]) ++m4trace:configure.in:664: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2296: AC_TRY_CPP is expanded from... ++configure.in:664: the top level]) ++m4trace:configure.in:666: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WCHAR_H]) ++m4trace:configure.in:666: -1- m4_pattern_allow([^HAVE_WCHAR_H$]) ++m4trace:configure.in:666: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Have wchar.h include file */ ++#undef HAVE_WCHAR_H]) ++m4trace:configure.in:672: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2296: AC_TRY_CPP is expanded from... ++configure.in:672: the top level]) ++m4trace:configure.in:674: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WCTYPE_H]) ++m4trace:configure.in:674: -1- m4_pattern_allow([^HAVE_WCTYPE_H$]) ++m4trace:configure.in:674: -1- AH_OUTPUT([HAVE_WCTYPE_H], [/* Have wctype.h include file */ ++#undef HAVE_WCTYPE_H]) ++m4trace:configure.in:686: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... ++configure.in:686: the top level]) ++m4trace:configure.in:703: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BROKEN_WCTYPE]) ++m4trace:configure.in:703: -1- m4_pattern_allow([^HAVE_BROKEN_WCTYPE$]) ++m4trace:configure.in:703: -1- AH_OUTPUT([HAVE_BROKEN_WCTYPE], [/* Is the wctype implementation broken */ ++#undef HAVE_BROKEN_WCTYPE]) ++m4trace:configure.in:707: -1- AC_SUBST([GDK_WLIBS]) ++m4trace:configure.in:707: -1- AC_SUBST_TRACE([GDK_WLIBS]) ++m4trace:configure.in:707: -1- m4_pattern_allow([^GDK_WLIBS$]) ++m4trace:configure.in:711: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2296: AC_TRY_CPP is expanded from... ++configure.in:711: the top level]) ++m4trace:configure.in:713: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UXTHEME_H]) ++m4trace:configure.in:713: -1- m4_pattern_allow([^HAVE_UXTHEME_H$]) ++m4trace:configure.in:713: -1- AH_OUTPUT([HAVE_UXTHEME_H], [/* Have uxtheme.h include file */ ++#undef HAVE_UXTHEME_H]) ++m4trace:configure.in:718: -1- AH_OUTPUT([HAVE_CRT_EXTERNS_H], [/* Define to 1 if you have the header file. */ ++#undef HAVE_CRT_EXTERNS_H]) ++m4trace:configure.in:719: -1- AH_OUTPUT([HAVE__NSGETENVIRON], [/* Define to 1 if you have the `_NSGetEnviron\' function. */ ++#undef HAVE__NSGETENVIRON]) ++m4trace:configure.in:736: -1- AC_DEFINE_TRACE_LITERAL([USE_LA_MODULES]) ++m4trace:configure.in:736: -1- m4_pattern_allow([^USE_LA_MODULES$]) ++m4trace:configure.in:736: -1- AH_OUTPUT([USE_LA_MODULES], [/* Whether to load modules via .la files rather than directly */ ++#undef USE_LA_MODULES]) ++m4trace:configure.in:743: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:743: the top level]) ++m4trace:configure.in:775: -1- AC_DEFINE_TRACE_LITERAL([USE_GMODULE]) ++m4trace:configure.in:775: -1- m4_pattern_allow([^USE_GMODULE$]) ++m4trace:configure.in:775: -1- AH_OUTPUT([USE_GMODULE], [/* Define to 1 if gmodule works and should be used */ ++#undef USE_GMODULE]) ++m4trace:configure.in:786: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... ++configure.in:786: the top level]) ++m4trace:configure.in:789: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... ++configure.in:789: the top level]) ++m4trace:configure.in:792: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... ++configure.in:792: the top level]) ++m4trace:configure.in:795: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... ++configure.in:795: the top level]) ++m4trace:configure.in:799: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:799: the top level]) ++m4trace:configure.in:803: -1- AM_CONDITIONAL([BUILD_GDIPLUS_LOADERS], [ test x$os_win32 = xyes && test x$enable_gdiplus != xno ]) ++m4trace:configure.in:803: -1- AC_SUBST([BUILD_GDIPLUS_LOADERS_TRUE]) ++m4trace:configure.in:803: -1- AC_SUBST_TRACE([BUILD_GDIPLUS_LOADERS_TRUE]) ++m4trace:configure.in:803: -1- m4_pattern_allow([^BUILD_GDIPLUS_LOADERS_TRUE$]) ++m4trace:configure.in:803: -1- AC_SUBST([BUILD_GDIPLUS_LOADERS_FALSE]) ++m4trace:configure.in:803: -1- AC_SUBST_TRACE([BUILD_GDIPLUS_LOADERS_FALSE]) ++m4trace:configure.in:803: -1- m4_pattern_allow([^BUILD_GDIPLUS_LOADERS_FALSE$]) ++m4trace:configure.in:840: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2296: AC_TRY_CPP is expanded from... ++configure.in:840: the top level]) ++m4trace:configure.in:852: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PROGRESSIVE_JPEG]) ++m4trace:configure.in:852: -2- m4_pattern_allow([^HAVE_PROGRESSIVE_JPEG$]) ++m4trace:configure.in:852: -2- AH_OUTPUT([HAVE_PROGRESSIVE_JPEG], [/* Define to 1 is libjpeg supports progressive JPEG */ ++#undef HAVE_PROGRESSIVE_JPEG]) ++m4trace:configure.in:886: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:886: the top level]) ++m4trace:configure.in:921: -1- AC_SUBST([LIBTIFF]) ++m4trace:configure.in:921: -1- AC_SUBST_TRACE([LIBTIFF]) ++m4trace:configure.in:921: -1- m4_pattern_allow([^LIBTIFF$]) ++m4trace:configure.in:922: -1- AC_SUBST([LIBJPEG]) ++m4trace:configure.in:922: -1- AC_SUBST_TRACE([LIBJPEG]) ++m4trace:configure.in:922: -1- m4_pattern_allow([^LIBJPEG$]) ++m4trace:configure.in:923: -1- AC_SUBST([LIBPNG]) ++m4trace:configure.in:923: -1- AC_SUBST_TRACE([LIBPNG]) ++m4trace:configure.in:923: -1- m4_pattern_allow([^LIBPNG$]) ++m4trace:configure.in:924: -1- AC_SUBST([LIBJASPER]) ++m4trace:configure.in:924: -1- AC_SUBST_TRACE([LIBJASPER]) ++m4trace:configure.in:924: -1- m4_pattern_allow([^LIBJASPER$]) ++m4trace:configure.in:926: -1- AM_CONDITIONAL([BUILD_DYNAMIC_MODULES], [$dynworks]) ++m4trace:configure.in:926: -1- AC_SUBST([BUILD_DYNAMIC_MODULES_TRUE]) ++m4trace:configure.in:926: -1- AC_SUBST_TRACE([BUILD_DYNAMIC_MODULES_TRUE]) ++m4trace:configure.in:926: -1- m4_pattern_allow([^BUILD_DYNAMIC_MODULES_TRUE$]) ++m4trace:configure.in:926: -1- AC_SUBST([BUILD_DYNAMIC_MODULES_FALSE]) ++m4trace:configure.in:926: -1- AC_SUBST_TRACE([BUILD_DYNAMIC_MODULES_FALSE]) ++m4trace:configure.in:926: -1- m4_pattern_allow([^BUILD_DYNAMIC_MODULES_FALSE$]) ++m4trace:configure.in:1006: -1- AC_SUBST([INCLUDED_LOADER_OBJ]) ++m4trace:configure.in:1006: -1- AC_SUBST_TRACE([INCLUDED_LOADER_OBJ]) ++m4trace:configure.in:1006: -1- m4_pattern_allow([^INCLUDED_LOADER_OBJ$]) ++m4trace:configure.in:1007: -1- AC_SUBST([INCLUDED_LOADER_DEFINE]) ++m4trace:configure.in:1007: -1- AC_SUBST_TRACE([INCLUDED_LOADER_DEFINE]) ++m4trace:configure.in:1007: -1- m4_pattern_allow([^INCLUDED_LOADER_DEFINE$]) ++m4trace:configure.in:1009: -1- AM_CONDITIONAL([INCLUDE_PNG], [test x"$INCLUDE_png" = xyes]) ++m4trace:configure.in:1009: -1- AC_SUBST([INCLUDE_PNG_TRUE]) ++m4trace:configure.in:1009: -1- AC_SUBST_TRACE([INCLUDE_PNG_TRUE]) ++m4trace:configure.in:1009: -1- m4_pattern_allow([^INCLUDE_PNG_TRUE$]) ++m4trace:configure.in:1009: -1- AC_SUBST([INCLUDE_PNG_FALSE]) ++m4trace:configure.in:1009: -1- AC_SUBST_TRACE([INCLUDE_PNG_FALSE]) ++m4trace:configure.in:1009: -1- m4_pattern_allow([^INCLUDE_PNG_FALSE$]) ++m4trace:configure.in:1010: -1- AM_CONDITIONAL([INCLUDE_BMP], [test x"$INCLUDE_bmp" = xyes]) ++m4trace:configure.in:1010: -1- AC_SUBST([INCLUDE_BMP_TRUE]) ++m4trace:configure.in:1010: -1- AC_SUBST_TRACE([INCLUDE_BMP_TRUE]) ++m4trace:configure.in:1010: -1- m4_pattern_allow([^INCLUDE_BMP_TRUE$]) ++m4trace:configure.in:1010: -1- AC_SUBST([INCLUDE_BMP_FALSE]) ++m4trace:configure.in:1010: -1- AC_SUBST_TRACE([INCLUDE_BMP_FALSE]) ++m4trace:configure.in:1010: -1- m4_pattern_allow([^INCLUDE_BMP_FALSE$]) ++m4trace:configure.in:1011: -1- AM_CONDITIONAL([INCLUDE_WBMP], [test x"$INCLUDE_wbmp" = xyes]) ++m4trace:configure.in:1011: -1- AC_SUBST([INCLUDE_WBMP_TRUE]) ++m4trace:configure.in:1011: -1- AC_SUBST_TRACE([INCLUDE_WBMP_TRUE]) ++m4trace:configure.in:1011: -1- m4_pattern_allow([^INCLUDE_WBMP_TRUE$]) ++m4trace:configure.in:1011: -1- AC_SUBST([INCLUDE_WBMP_FALSE]) ++m4trace:configure.in:1011: -1- AC_SUBST_TRACE([INCLUDE_WBMP_FALSE]) ++m4trace:configure.in:1011: -1- m4_pattern_allow([^INCLUDE_WBMP_FALSE$]) ++m4trace:configure.in:1012: -1- AM_CONDITIONAL([INCLUDE_GIF], [test x"$INCLUDE_gif" = xyes]) ++m4trace:configure.in:1012: -1- AC_SUBST([INCLUDE_GIF_TRUE]) ++m4trace:configure.in:1012: -1- AC_SUBST_TRACE([INCLUDE_GIF_TRUE]) ++m4trace:configure.in:1012: -1- m4_pattern_allow([^INCLUDE_GIF_TRUE$]) ++m4trace:configure.in:1012: -1- AC_SUBST([INCLUDE_GIF_FALSE]) ++m4trace:configure.in:1012: -1- AC_SUBST_TRACE([INCLUDE_GIF_FALSE]) ++m4trace:configure.in:1012: -1- m4_pattern_allow([^INCLUDE_GIF_FALSE$]) ++m4trace:configure.in:1013: -1- AM_CONDITIONAL([INCLUDE_ICO], [test x"$INCLUDE_ico" = xyes]) ++m4trace:configure.in:1013: -1- AC_SUBST([INCLUDE_ICO_TRUE]) ++m4trace:configure.in:1013: -1- AC_SUBST_TRACE([INCLUDE_ICO_TRUE]) ++m4trace:configure.in:1013: -1- m4_pattern_allow([^INCLUDE_ICO_TRUE$]) ++m4trace:configure.in:1013: -1- AC_SUBST([INCLUDE_ICO_FALSE]) ++m4trace:configure.in:1013: -1- AC_SUBST_TRACE([INCLUDE_ICO_FALSE]) ++m4trace:configure.in:1013: -1- m4_pattern_allow([^INCLUDE_ICO_FALSE$]) ++m4trace:configure.in:1014: -1- AM_CONDITIONAL([INCLUDE_ANI], [test x"$INCLUDE_ani" = xyes]) ++m4trace:configure.in:1014: -1- AC_SUBST([INCLUDE_ANI_TRUE]) ++m4trace:configure.in:1014: -1- AC_SUBST_TRACE([INCLUDE_ANI_TRUE]) ++m4trace:configure.in:1014: -1- m4_pattern_allow([^INCLUDE_ANI_TRUE$]) ++m4trace:configure.in:1014: -1- AC_SUBST([INCLUDE_ANI_FALSE]) ++m4trace:configure.in:1014: -1- AC_SUBST_TRACE([INCLUDE_ANI_FALSE]) ++m4trace:configure.in:1014: -1- m4_pattern_allow([^INCLUDE_ANI_FALSE$]) ++m4trace:configure.in:1015: -1- AM_CONDITIONAL([INCLUDE_JPEG], [test x"$INCLUDE_jpeg" = xyes]) ++m4trace:configure.in:1015: -1- AC_SUBST([INCLUDE_JPEG_TRUE]) ++m4trace:configure.in:1015: -1- AC_SUBST_TRACE([INCLUDE_JPEG_TRUE]) ++m4trace:configure.in:1015: -1- m4_pattern_allow([^INCLUDE_JPEG_TRUE$]) ++m4trace:configure.in:1015: -1- AC_SUBST([INCLUDE_JPEG_FALSE]) ++m4trace:configure.in:1015: -1- AC_SUBST_TRACE([INCLUDE_JPEG_FALSE]) ++m4trace:configure.in:1015: -1- m4_pattern_allow([^INCLUDE_JPEG_FALSE$]) ++m4trace:configure.in:1016: -1- AM_CONDITIONAL([INCLUDE_PNM], [test x"$INCLUDE_pnm" = xyes]) ++m4trace:configure.in:1016: -1- AC_SUBST([INCLUDE_PNM_TRUE]) ++m4trace:configure.in:1016: -1- AC_SUBST_TRACE([INCLUDE_PNM_TRUE]) ++m4trace:configure.in:1016: -1- m4_pattern_allow([^INCLUDE_PNM_TRUE$]) ++m4trace:configure.in:1016: -1- AC_SUBST([INCLUDE_PNM_FALSE]) ++m4trace:configure.in:1016: -1- AC_SUBST_TRACE([INCLUDE_PNM_FALSE]) ++m4trace:configure.in:1016: -1- m4_pattern_allow([^INCLUDE_PNM_FALSE$]) ++m4trace:configure.in:1017: -1- AM_CONDITIONAL([INCLUDE_RAS], [test x"$INCLUDE_ras" = xyes]) ++m4trace:configure.in:1017: -1- AC_SUBST([INCLUDE_RAS_TRUE]) ++m4trace:configure.in:1017: -1- AC_SUBST_TRACE([INCLUDE_RAS_TRUE]) ++m4trace:configure.in:1017: -1- m4_pattern_allow([^INCLUDE_RAS_TRUE$]) ++m4trace:configure.in:1017: -1- AC_SUBST([INCLUDE_RAS_FALSE]) ++m4trace:configure.in:1017: -1- AC_SUBST_TRACE([INCLUDE_RAS_FALSE]) ++m4trace:configure.in:1017: -1- m4_pattern_allow([^INCLUDE_RAS_FALSE$]) ++m4trace:configure.in:1018: -1- AM_CONDITIONAL([INCLUDE_TIFF], [test x"$INCLUDE_tiff" = xyes]) ++m4trace:configure.in:1018: -1- AC_SUBST([INCLUDE_TIFF_TRUE]) ++m4trace:configure.in:1018: -1- AC_SUBST_TRACE([INCLUDE_TIFF_TRUE]) ++m4trace:configure.in:1018: -1- m4_pattern_allow([^INCLUDE_TIFF_TRUE$]) ++m4trace:configure.in:1018: -1- AC_SUBST([INCLUDE_TIFF_FALSE]) ++m4trace:configure.in:1018: -1- AC_SUBST_TRACE([INCLUDE_TIFF_FALSE]) ++m4trace:configure.in:1018: -1- m4_pattern_allow([^INCLUDE_TIFF_FALSE$]) ++m4trace:configure.in:1019: -1- AM_CONDITIONAL([INCLUDE_XPM], [test x"$INCLUDE_xpm" = xyes]) ++m4trace:configure.in:1019: -1- AC_SUBST([INCLUDE_XPM_TRUE]) ++m4trace:configure.in:1019: -1- AC_SUBST_TRACE([INCLUDE_XPM_TRUE]) ++m4trace:configure.in:1019: -1- m4_pattern_allow([^INCLUDE_XPM_TRUE$]) ++m4trace:configure.in:1019: -1- AC_SUBST([INCLUDE_XPM_FALSE]) ++m4trace:configure.in:1019: -1- AC_SUBST_TRACE([INCLUDE_XPM_FALSE]) ++m4trace:configure.in:1019: -1- m4_pattern_allow([^INCLUDE_XPM_FALSE$]) ++m4trace:configure.in:1020: -1- AM_CONDITIONAL([INCLUDE_XBM], [test x"$INCLUDE_xbm" = xyes]) ++m4trace:configure.in:1020: -1- AC_SUBST([INCLUDE_XBM_TRUE]) ++m4trace:configure.in:1020: -1- AC_SUBST_TRACE([INCLUDE_XBM_TRUE]) ++m4trace:configure.in:1020: -1- m4_pattern_allow([^INCLUDE_XBM_TRUE$]) ++m4trace:configure.in:1020: -1- AC_SUBST([INCLUDE_XBM_FALSE]) ++m4trace:configure.in:1020: -1- AC_SUBST_TRACE([INCLUDE_XBM_FALSE]) ++m4trace:configure.in:1020: -1- m4_pattern_allow([^INCLUDE_XBM_FALSE$]) ++m4trace:configure.in:1021: -1- AM_CONDITIONAL([INCLUDE_TGA], [test x"$INCLUDE_tga" = xyes]) ++m4trace:configure.in:1021: -1- AC_SUBST([INCLUDE_TGA_TRUE]) ++m4trace:configure.in:1021: -1- AC_SUBST_TRACE([INCLUDE_TGA_TRUE]) ++m4trace:configure.in:1021: -1- m4_pattern_allow([^INCLUDE_TGA_TRUE$]) ++m4trace:configure.in:1021: -1- AC_SUBST([INCLUDE_TGA_FALSE]) ++m4trace:configure.in:1021: -1- AC_SUBST_TRACE([INCLUDE_TGA_FALSE]) ++m4trace:configure.in:1021: -1- m4_pattern_allow([^INCLUDE_TGA_FALSE$]) ++m4trace:configure.in:1022: -1- AM_CONDITIONAL([INCLUDE_PCX], [test x"$INCLUDE_pcx" = xyes]) ++m4trace:configure.in:1022: -1- AC_SUBST([INCLUDE_PCX_TRUE]) ++m4trace:configure.in:1022: -1- AC_SUBST_TRACE([INCLUDE_PCX_TRUE]) ++m4trace:configure.in:1022: -1- m4_pattern_allow([^INCLUDE_PCX_TRUE$]) ++m4trace:configure.in:1022: -1- AC_SUBST([INCLUDE_PCX_FALSE]) ++m4trace:configure.in:1022: -1- AC_SUBST_TRACE([INCLUDE_PCX_FALSE]) ++m4trace:configure.in:1022: -1- m4_pattern_allow([^INCLUDE_PCX_FALSE$]) ++m4trace:configure.in:1023: -1- AM_CONDITIONAL([INCLUDE_ICNS], [test x"$INCLUDE_icns" = xyes]) ++m4trace:configure.in:1023: -1- AC_SUBST([INCLUDE_ICNS_TRUE]) ++m4trace:configure.in:1023: -1- AC_SUBST_TRACE([INCLUDE_ICNS_TRUE]) ++m4trace:configure.in:1023: -1- m4_pattern_allow([^INCLUDE_ICNS_TRUE$]) ++m4trace:configure.in:1023: -1- AC_SUBST([INCLUDE_ICNS_FALSE]) ++m4trace:configure.in:1023: -1- AC_SUBST_TRACE([INCLUDE_ICNS_FALSE]) ++m4trace:configure.in:1023: -1- m4_pattern_allow([^INCLUDE_ICNS_FALSE$]) ++m4trace:configure.in:1024: -1- AM_CONDITIONAL([INCLUDE_JASPER], [test x"$INCLUDE_jasper" = xyes]) ++m4trace:configure.in:1024: -1- AC_SUBST([INCLUDE_JASPER_TRUE]) ++m4trace:configure.in:1024: -1- AC_SUBST_TRACE([INCLUDE_JASPER_TRUE]) ++m4trace:configure.in:1024: -1- m4_pattern_allow([^INCLUDE_JASPER_TRUE$]) ++m4trace:configure.in:1024: -1- AC_SUBST([INCLUDE_JASPER_FALSE]) ++m4trace:configure.in:1024: -1- AC_SUBST_TRACE([INCLUDE_JASPER_FALSE]) ++m4trace:configure.in:1024: -1- m4_pattern_allow([^INCLUDE_JASPER_FALSE$]) ++m4trace:configure.in:1027: -1- AM_CONDITIONAL([INCLUDE_GDIPLUS], [test x"$INCLUDE_gdip_ico" = xyes]) ++m4trace:configure.in:1027: -1- AC_SUBST([INCLUDE_GDIPLUS_TRUE]) ++m4trace:configure.in:1027: -1- AC_SUBST_TRACE([INCLUDE_GDIPLUS_TRUE]) ++m4trace:configure.in:1027: -1- m4_pattern_allow([^INCLUDE_GDIPLUS_TRUE$]) ++m4trace:configure.in:1027: -1- AC_SUBST([INCLUDE_GDIPLUS_FALSE]) ++m4trace:configure.in:1027: -1- AC_SUBST_TRACE([INCLUDE_GDIPLUS_FALSE]) ++m4trace:configure.in:1027: -1- m4_pattern_allow([^INCLUDE_GDIPLUS_FALSE$]) ++m4trace:configure.in:1035: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2462: AC_RUN_IFELSE is expanded from... ++configure.in:1035: the top level]) ++m4trace:configure.in:1035: -1- AC_DEFINE_TRACE_LITERAL([GDK_PIXBUF_USE_GIO_MIME]) ++m4trace:configure.in:1035: -1- m4_pattern_allow([^GDK_PIXBUF_USE_GIO_MIME$]) ++m4trace:configure.in:1035: -1- AH_OUTPUT([GDK_PIXBUF_USE_GIO_MIME], [/* Define if gio can sniff image data */ ++#undef GDK_PIXBUF_USE_GIO_MIME]) ++m4trace:configure.in:1112: -1- AM_CONDITIONAL([HAVE_INCLUDED_IMMMODULES], [test "x$included_immodules" != x]) ++m4trace:configure.in:1112: -1- AC_SUBST([HAVE_INCLUDED_IMMMODULES_TRUE]) ++m4trace:configure.in:1112: -1- AC_SUBST_TRACE([HAVE_INCLUDED_IMMMODULES_TRUE]) ++m4trace:configure.in:1112: -1- m4_pattern_allow([^HAVE_INCLUDED_IMMMODULES_TRUE$]) ++m4trace:configure.in:1112: -1- AC_SUBST([HAVE_INCLUDED_IMMMODULES_FALSE]) ++m4trace:configure.in:1112: -1- AC_SUBST_TRACE([HAVE_INCLUDED_IMMMODULES_FALSE]) ++m4trace:configure.in:1112: -1- m4_pattern_allow([^HAVE_INCLUDED_IMMMODULES_FALSE$]) ++m4trace:configure.in:1131: -1- AC_SUBST([INCLUDED_IMMODULE_OBJ]) ++m4trace:configure.in:1131: -1- AC_SUBST_TRACE([INCLUDED_IMMODULE_OBJ]) ++m4trace:configure.in:1131: -1- m4_pattern_allow([^INCLUDED_IMMODULE_OBJ$]) ++m4trace:configure.in:1132: -1- AC_SUBST([INCLUDED_IMMODULE_DEFINE]) ++m4trace:configure.in:1132: -1- AC_SUBST_TRACE([INCLUDED_IMMODULE_DEFINE]) ++m4trace:configure.in:1132: -1- m4_pattern_allow([^INCLUDED_IMMODULE_DEFINE$]) ++m4trace:configure.in:1134: -1- AM_CONDITIONAL([INCLUDE_IM_AM_ET], [test x"$INCLUDE_am_et" = xyes]) ++m4trace:configure.in:1134: -1- AC_SUBST([INCLUDE_IM_AM_ET_TRUE]) ++m4trace:configure.in:1134: -1- AC_SUBST_TRACE([INCLUDE_IM_AM_ET_TRUE]) ++m4trace:configure.in:1134: -1- m4_pattern_allow([^INCLUDE_IM_AM_ET_TRUE$]) ++m4trace:configure.in:1134: -1- AC_SUBST([INCLUDE_IM_AM_ET_FALSE]) ++m4trace:configure.in:1134: -1- AC_SUBST_TRACE([INCLUDE_IM_AM_ET_FALSE]) ++m4trace:configure.in:1134: -1- m4_pattern_allow([^INCLUDE_IM_AM_ET_FALSE$]) ++m4trace:configure.in:1135: -1- AM_CONDITIONAL([INCLUDE_IM_CEDILLA], [test x"$INCLUDE_cedilla" = xyes]) ++m4trace:configure.in:1135: -1- AC_SUBST([INCLUDE_IM_CEDILLA_TRUE]) ++m4trace:configure.in:1135: -1- AC_SUBST_TRACE([INCLUDE_IM_CEDILLA_TRUE]) ++m4trace:configure.in:1135: -1- m4_pattern_allow([^INCLUDE_IM_CEDILLA_TRUE$]) ++m4trace:configure.in:1135: -1- AC_SUBST([INCLUDE_IM_CEDILLA_FALSE]) ++m4trace:configure.in:1135: -1- AC_SUBST_TRACE([INCLUDE_IM_CEDILLA_FALSE]) ++m4trace:configure.in:1135: -1- m4_pattern_allow([^INCLUDE_IM_CEDILLA_FALSE$]) ++m4trace:configure.in:1136: -1- AM_CONDITIONAL([INCLUDE_IM_CYRILLIC_TRANSLIT], [test x"$INCLUDE_cyrillic_translit" = xyes]) ++m4trace:configure.in:1136: -1- AC_SUBST([INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE]) ++m4trace:configure.in:1136: -1- AC_SUBST_TRACE([INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE]) ++m4trace:configure.in:1136: -1- m4_pattern_allow([^INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE$]) ++m4trace:configure.in:1136: -1- AC_SUBST([INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE]) ++m4trace:configure.in:1136: -1- AC_SUBST_TRACE([INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE]) ++m4trace:configure.in:1136: -1- m4_pattern_allow([^INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE$]) ++m4trace:configure.in:1137: -1- AM_CONDITIONAL([INCLUDE_IM_IME], [test x"$INCLUDE_ime" = xyes]) ++m4trace:configure.in:1137: -1- AC_SUBST([INCLUDE_IM_IME_TRUE]) ++m4trace:configure.in:1137: -1- AC_SUBST_TRACE([INCLUDE_IM_IME_TRUE]) ++m4trace:configure.in:1137: -1- m4_pattern_allow([^INCLUDE_IM_IME_TRUE$]) ++m4trace:configure.in:1137: -1- AC_SUBST([INCLUDE_IM_IME_FALSE]) ++m4trace:configure.in:1137: -1- AC_SUBST_TRACE([INCLUDE_IM_IME_FALSE]) ++m4trace:configure.in:1137: -1- m4_pattern_allow([^INCLUDE_IM_IME_FALSE$]) ++m4trace:configure.in:1138: -1- AM_CONDITIONAL([INCLUDE_IM_INUKTITUT], [test x"$INCLUDE_inuktitut" = xyes]) ++m4trace:configure.in:1138: -1- AC_SUBST([INCLUDE_IM_INUKTITUT_TRUE]) ++m4trace:configure.in:1138: -1- AC_SUBST_TRACE([INCLUDE_IM_INUKTITUT_TRUE]) ++m4trace:configure.in:1138: -1- m4_pattern_allow([^INCLUDE_IM_INUKTITUT_TRUE$]) ++m4trace:configure.in:1138: -1- AC_SUBST([INCLUDE_IM_INUKTITUT_FALSE]) ++m4trace:configure.in:1138: -1- AC_SUBST_TRACE([INCLUDE_IM_INUKTITUT_FALSE]) ++m4trace:configure.in:1138: -1- m4_pattern_allow([^INCLUDE_IM_INUKTITUT_FALSE$]) ++m4trace:configure.in:1139: -1- AM_CONDITIONAL([INCLUDE_IM_IPA], [test x"$INCLUDE_ipa" = xyes]) ++m4trace:configure.in:1139: -1- AC_SUBST([INCLUDE_IM_IPA_TRUE]) ++m4trace:configure.in:1139: -1- AC_SUBST_TRACE([INCLUDE_IM_IPA_TRUE]) ++m4trace:configure.in:1139: -1- m4_pattern_allow([^INCLUDE_IM_IPA_TRUE$]) ++m4trace:configure.in:1139: -1- AC_SUBST([INCLUDE_IM_IPA_FALSE]) ++m4trace:configure.in:1139: -1- AC_SUBST_TRACE([INCLUDE_IM_IPA_FALSE]) ++m4trace:configure.in:1139: -1- m4_pattern_allow([^INCLUDE_IM_IPA_FALSE$]) ++m4trace:configure.in:1140: -1- AM_CONDITIONAL([INCLUDE_IM_MULTIPRESS], [test x"$INCLUDE_multipress" = xyes]) ++m4trace:configure.in:1140: -1- AC_SUBST([INCLUDE_IM_MULTIPRESS_TRUE]) ++m4trace:configure.in:1140: -1- AC_SUBST_TRACE([INCLUDE_IM_MULTIPRESS_TRUE]) ++m4trace:configure.in:1140: -1- m4_pattern_allow([^INCLUDE_IM_MULTIPRESS_TRUE$]) ++m4trace:configure.in:1140: -1- AC_SUBST([INCLUDE_IM_MULTIPRESS_FALSE]) ++m4trace:configure.in:1140: -1- AC_SUBST_TRACE([INCLUDE_IM_MULTIPRESS_FALSE]) ++m4trace:configure.in:1140: -1- m4_pattern_allow([^INCLUDE_IM_MULTIPRESS_FALSE$]) ++m4trace:configure.in:1141: -1- AM_CONDITIONAL([INCLUDE_IM_THAI], [test x"$INCLUDE_thai" = xyes]) ++m4trace:configure.in:1141: -1- AC_SUBST([INCLUDE_IM_THAI_TRUE]) ++m4trace:configure.in:1141: -1- AC_SUBST_TRACE([INCLUDE_IM_THAI_TRUE]) ++m4trace:configure.in:1141: -1- m4_pattern_allow([^INCLUDE_IM_THAI_TRUE$]) ++m4trace:configure.in:1141: -1- AC_SUBST([INCLUDE_IM_THAI_FALSE]) ++m4trace:configure.in:1141: -1- AC_SUBST_TRACE([INCLUDE_IM_THAI_FALSE]) ++m4trace:configure.in:1141: -1- m4_pattern_allow([^INCLUDE_IM_THAI_FALSE$]) ++m4trace:configure.in:1142: -1- AM_CONDITIONAL([INCLUDE_IM_TI_ER], [test x"$INCLUDE_ti_er" = xyes]) ++m4trace:configure.in:1142: -1- AC_SUBST([INCLUDE_IM_TI_ER_TRUE]) ++m4trace:configure.in:1142: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ER_TRUE]) ++m4trace:configure.in:1142: -1- m4_pattern_allow([^INCLUDE_IM_TI_ER_TRUE$]) ++m4trace:configure.in:1142: -1- AC_SUBST([INCLUDE_IM_TI_ER_FALSE]) ++m4trace:configure.in:1142: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ER_FALSE]) ++m4trace:configure.in:1142: -1- m4_pattern_allow([^INCLUDE_IM_TI_ER_FALSE$]) ++m4trace:configure.in:1143: -1- AM_CONDITIONAL([INCLUDE_IM_TI_ET], [test x"$INCLUDE_ti_et" = xyes]) ++m4trace:configure.in:1143: -1- AC_SUBST([INCLUDE_IM_TI_ET_TRUE]) ++m4trace:configure.in:1143: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ET_TRUE]) ++m4trace:configure.in:1143: -1- m4_pattern_allow([^INCLUDE_IM_TI_ET_TRUE$]) ++m4trace:configure.in:1143: -1- AC_SUBST([INCLUDE_IM_TI_ET_FALSE]) ++m4trace:configure.in:1143: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ET_FALSE]) ++m4trace:configure.in:1143: -1- m4_pattern_allow([^INCLUDE_IM_TI_ET_FALSE$]) ++m4trace:configure.in:1144: -1- AM_CONDITIONAL([INCLUDE_IM_VIQR], [test x"$INCLUDE_viqr" = xyes]) ++m4trace:configure.in:1144: -1- AC_SUBST([INCLUDE_IM_VIQR_TRUE]) ++m4trace:configure.in:1144: -1- AC_SUBST_TRACE([INCLUDE_IM_VIQR_TRUE]) ++m4trace:configure.in:1144: -1- m4_pattern_allow([^INCLUDE_IM_VIQR_TRUE$]) ++m4trace:configure.in:1144: -1- AC_SUBST([INCLUDE_IM_VIQR_FALSE]) ++m4trace:configure.in:1144: -1- AC_SUBST_TRACE([INCLUDE_IM_VIQR_FALSE]) ++m4trace:configure.in:1144: -1- m4_pattern_allow([^INCLUDE_IM_VIQR_FALSE$]) ++m4trace:configure.in:1145: -1- AM_CONDITIONAL([INCLUDE_IM_XIM], [test x"$INCLUDE_xim" = xyes]) ++m4trace:configure.in:1145: -1- AC_SUBST([INCLUDE_IM_XIM_TRUE]) ++m4trace:configure.in:1145: -1- AC_SUBST_TRACE([INCLUDE_IM_XIM_TRUE]) ++m4trace:configure.in:1145: -1- m4_pattern_allow([^INCLUDE_IM_XIM_TRUE$]) ++m4trace:configure.in:1145: -1- AC_SUBST([INCLUDE_IM_XIM_FALSE]) ++m4trace:configure.in:1145: -1- AC_SUBST_TRACE([INCLUDE_IM_XIM_FALSE]) ++m4trace:configure.in:1145: -1- m4_pattern_allow([^INCLUDE_IM_XIM_FALSE$]) ++m4trace:configure.in:1147: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H]) ++m4trace:configure.in:1147: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$]) ++m4trace:configure.in:1147: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have that is POSIX.1 compatible. */ ++#undef HAVE_SYS_WAIT_H]) ++m4trace:configure.in:1149: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE]) ++m4trace:configure.in:1149: -1- m4_pattern_allow([^RETSIGTYPE$]) ++m4trace:configure.in:1149: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */ ++#undef RETSIGTYPE]) ++m4trace:configure.in:1151: -1- AM_CONDITIONAL([HAVE_TIFF], [test "x$LIBTIFF" != x]) ++m4trace:configure.in:1151: -1- AC_SUBST([HAVE_TIFF_TRUE]) ++m4trace:configure.in:1151: -1- AC_SUBST_TRACE([HAVE_TIFF_TRUE]) ++m4trace:configure.in:1151: -1- m4_pattern_allow([^HAVE_TIFF_TRUE$]) ++m4trace:configure.in:1151: -1- AC_SUBST([HAVE_TIFF_FALSE]) ++m4trace:configure.in:1151: -1- AC_SUBST_TRACE([HAVE_TIFF_FALSE]) ++m4trace:configure.in:1151: -1- m4_pattern_allow([^HAVE_TIFF_FALSE$]) ++m4trace:configure.in:1152: -1- AM_CONDITIONAL([HAVE_PNG], [test "x$LIBPNG" != x]) ++m4trace:configure.in:1152: -1- AC_SUBST([HAVE_PNG_TRUE]) ++m4trace:configure.in:1152: -1- AC_SUBST_TRACE([HAVE_PNG_TRUE]) ++m4trace:configure.in:1152: -1- m4_pattern_allow([^HAVE_PNG_TRUE$]) ++m4trace:configure.in:1152: -1- AC_SUBST([HAVE_PNG_FALSE]) ++m4trace:configure.in:1152: -1- AC_SUBST_TRACE([HAVE_PNG_FALSE]) ++m4trace:configure.in:1152: -1- m4_pattern_allow([^HAVE_PNG_FALSE$]) ++m4trace:configure.in:1153: -1- AM_CONDITIONAL([HAVE_JPEG], [test "x$LIBJPEG" != x]) ++m4trace:configure.in:1153: -1- AC_SUBST([HAVE_JPEG_TRUE]) ++m4trace:configure.in:1153: -1- AC_SUBST_TRACE([HAVE_JPEG_TRUE]) ++m4trace:configure.in:1153: -1- m4_pattern_allow([^HAVE_JPEG_TRUE$]) ++m4trace:configure.in:1153: -1- AC_SUBST([HAVE_JPEG_FALSE]) ++m4trace:configure.in:1153: -1- AC_SUBST_TRACE([HAVE_JPEG_FALSE]) ++m4trace:configure.in:1153: -1- m4_pattern_allow([^HAVE_JPEG_FALSE$]) ++m4trace:configure.in:1154: -1- AM_CONDITIONAL([HAVE_JASPER], [test "x$LIBJASPER" != x]) ++m4trace:configure.in:1154: -1- AC_SUBST([HAVE_JASPER_TRUE]) ++m4trace:configure.in:1154: -1- AC_SUBST_TRACE([HAVE_JASPER_TRUE]) ++m4trace:configure.in:1154: -1- m4_pattern_allow([^HAVE_JASPER_TRUE$]) ++m4trace:configure.in:1154: -1- AC_SUBST([HAVE_JASPER_FALSE]) ++m4trace:configure.in:1154: -1- AC_SUBST_TRACE([HAVE_JASPER_FALSE]) ++m4trace:configure.in:1154: -1- m4_pattern_allow([^HAVE_JASPER_FALSE$]) ++m4trace:configure.in:1175: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_SYSTEMINFO_H]) ++m4trace:configure.in:1175: -2- m4_pattern_allow([^HAVE_SYS_SYSTEMINFO_H$]) ++m4trace:configure.in:1175: -2- AH_OUTPUT([HAVE_SYS_SYSTEMINFO_H], [/* Define to 1 if sys/systeminfo.h is available */ ++#undef HAVE_SYS_SYSTEMINFO_H]) ++m4trace:configure.in:1178: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_SYSINFO_H]) ++m4trace:configure.in:1178: -2- m4_pattern_allow([^HAVE_SYS_SYSINFO_H$]) ++m4trace:configure.in:1178: -2- AH_OUTPUT([HAVE_SYS_SYSINFO_H], [/* Define to 1 if sys/sysinfo.h is available */ ++#undef HAVE_SYS_SYSINFO_H]) ++m4trace:configure.in:1187: -1- AC_DEFINE_TRACE_LITERAL([USE_MEDIALIB]) ++m4trace:configure.in:1187: -1- m4_pattern_allow([^USE_MEDIALIB$]) ++m4trace:configure.in:1187: -1- AH_OUTPUT([USE_MEDIALIB], [/* Define to 1 if medialib is available and should be used */ ++#undef USE_MEDIALIB]) ++m4trace:configure.in:1196: -1- AC_DEFINE_TRACE_LITERAL([USE_MEDIALIB25]) ++m4trace:configure.in:1196: -1- m4_pattern_allow([^USE_MEDIALIB25$]) ++m4trace:configure.in:1196: -1- AH_OUTPUT([USE_MEDIALIB25], [/* Define to 1 if medialib 2.5 is available */ ++#undef USE_MEDIALIB25]) ++m4trace:configure.in:1200: -1- AM_CONDITIONAL([USE_MEDIALIB], [test $use_mlib = yes]) ++m4trace:configure.in:1200: -1- AC_SUBST([USE_MEDIALIB_TRUE]) ++m4trace:configure.in:1200: -1- AC_SUBST_TRACE([USE_MEDIALIB_TRUE]) ++m4trace:configure.in:1200: -1- m4_pattern_allow([^USE_MEDIALIB_TRUE$]) ++m4trace:configure.in:1200: -1- AC_SUBST([USE_MEDIALIB_FALSE]) ++m4trace:configure.in:1200: -1- AC_SUBST_TRACE([USE_MEDIALIB_FALSE]) ++m4trace:configure.in:1200: -1- m4_pattern_allow([^USE_MEDIALIB_FALSE$]) ++m4trace:configure.in:1201: -1- AM_CONDITIONAL([USE_MEDIALIB25], [test $use_mlib25 = yes]) ++m4trace:configure.in:1201: -1- AC_SUBST([USE_MEDIALIB25_TRUE]) ++m4trace:configure.in:1201: -1- AC_SUBST_TRACE([USE_MEDIALIB25_TRUE]) ++m4trace:configure.in:1201: -1- m4_pattern_allow([^USE_MEDIALIB25_TRUE$]) ++m4trace:configure.in:1201: -1- AC_SUBST([USE_MEDIALIB25_FALSE]) ++m4trace:configure.in:1201: -1- AC_SUBST_TRACE([USE_MEDIALIB25_FALSE]) ++m4trace:configure.in:1201: -1- m4_pattern_allow([^USE_MEDIALIB25_FALSE$]) ++m4trace:configure.in:1234: -1- AC_DEFINE_TRACE_LITERAL([USE_MMX]) ++m4trace:configure.in:1234: -1- m4_pattern_allow([^USE_MMX$]) ++m4trace:configure.in:1234: -1- AH_OUTPUT([USE_MMX], [/* Define to 1 if XXM is available and should be used */ ++#undef USE_MMX]) ++m4trace:configure.in:1242: -1- AM_CONDITIONAL([USE_MMX], [test x$use_mmx_asm = xyes]) ++m4trace:configure.in:1242: -1- AC_SUBST([USE_MMX_TRUE]) ++m4trace:configure.in:1242: -1- AC_SUBST_TRACE([USE_MMX_TRUE]) ++m4trace:configure.in:1242: -1- m4_pattern_allow([^USE_MMX_TRUE$]) ++m4trace:configure.in:1242: -1- AC_SUBST([USE_MMX_FALSE]) ++m4trace:configure.in:1242: -1- AC_SUBST_TRACE([USE_MMX_FALSE]) ++m4trace:configure.in:1242: -1- m4_pattern_allow([^USE_MMX_FALSE$]) ++m4trace:configure.in:1251: -1- AM_CONDITIONAL([CROSS_COMPILING], [test $cross_compiling = yes]) ++m4trace:configure.in:1251: -1- AC_SUBST([CROSS_COMPILING_TRUE]) ++m4trace:configure.in:1251: -1- AC_SUBST_TRACE([CROSS_COMPILING_TRUE]) ++m4trace:configure.in:1251: -1- m4_pattern_allow([^CROSS_COMPILING_TRUE$]) ++m4trace:configure.in:1251: -1- AC_SUBST([CROSS_COMPILING_FALSE]) ++m4trace:configure.in:1251: -1- AC_SUBST_TRACE([CROSS_COMPILING_FALSE]) ++m4trace:configure.in:1251: -1- m4_pattern_allow([^CROSS_COMPILING_FALSE$]) ++m4trace:configure.in:1254: -1- AC_SUBST([GDK_PIXBUF_CSOURCE]) ++m4trace:configure.in:1254: -1- AC_SUBST_TRACE([GDK_PIXBUF_CSOURCE]) ++m4trace:configure.in:1254: -1- m4_pattern_allow([^GDK_PIXBUF_CSOURCE$]) ++m4trace:configure.in:1255: -1- AC_SUBST([GTK_UPDATE_ICON_CACHE]) ++m4trace:configure.in:1255: -1- AC_SUBST_TRACE([GTK_UPDATE_ICON_CACHE]) ++m4trace:configure.in:1255: -1- m4_pattern_allow([^GTK_UPDATE_ICON_CACHE$]) ++m4trace:configure.in:1269: -1- AC_SUBST([REBUILD_PNGS]) ++m4trace:configure.in:1269: -1- AC_SUBST_TRACE([REBUILD_PNGS]) ++m4trace:configure.in:1269: -1- m4_pattern_allow([^REBUILD_PNGS$]) ++m4trace:configure.in:1326: -1- AC_SUBST([XMKMF]) ++m4trace:configure.in:1326: -1- AC_SUBST_TRACE([XMKMF]) ++m4trace:configure.in:1326: -1- m4_pattern_allow([^XMKMF$]) ++m4trace:configure.in:1326: -1- AC_DEFINE_TRACE_LITERAL([X_DISPLAY_MISSING]) ++m4trace:configure.in:1326: -1- m4_pattern_allow([^X_DISPLAY_MISSING$]) ++m4trace:configure.in:1326: -1- AH_OUTPUT([X_DISPLAY_MISSING], [/* Define to 1 if the X Window System is missing or not being used. */ ++#undef X_DISPLAY_MISSING]) ++m4trace:configure.in:1326: -1- AC_SUBST([X_CFLAGS]) ++m4trace:configure.in:1326: -1- AC_SUBST_TRACE([X_CFLAGS]) ++m4trace:configure.in:1326: -1- m4_pattern_allow([^X_CFLAGS$]) ++m4trace:configure.in:1326: -1- AC_SUBST([X_PRE_LIBS]) ++m4trace:configure.in:1326: -1- AC_SUBST_TRACE([X_PRE_LIBS]) ++m4trace:configure.in:1326: -1- m4_pattern_allow([^X_PRE_LIBS$]) ++m4trace:configure.in:1326: -1- AC_SUBST([X_LIBS]) ++m4trace:configure.in:1326: -1- AC_SUBST_TRACE([X_LIBS]) ++m4trace:configure.in:1326: -1- m4_pattern_allow([^X_LIBS$]) ++m4trace:configure.in:1326: -1- AC_SUBST([X_EXTRA_LIBS]) ++m4trace:configure.in:1326: -1- AC_SUBST_TRACE([X_EXTRA_LIBS]) ++m4trace:configure.in:1326: -1- m4_pattern_allow([^X_EXTRA_LIBS$]) ++m4trace:configure.in:1361: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:1361: the top level]) ++m4trace:configure.in:1361: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... ++../../lib/autoconf/general.m4:2359: AC_COMPILE_IFELSE is expanded from... ++../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:1361: the top level]) ++m4trace:configure.in:1361: -1- AC_DEFINE_TRACE_LITERAL([NEED_XIPROTO_H_FOR_XREPLY]) ++m4trace:configure.in:1361: -1- m4_pattern_allow([^NEED_XIPROTO_H_FOR_XREPLY$]) ++m4trace:configure.in:1361: -1- AH_OUTPUT([NEED_XIPROTO_H_FOR_XREPLY], [/* Define if needed for xReply */ ++#undef NEED_XIPROTO_H_FOR_XREPLY]) ++m4trace:configure.in:1375: -1- AH_OUTPUT([HAVE_XCONVERTCASE], [/* Define to 1 if you have the `XConvertCase\' function. */ ++#undef HAVE_XCONVERTCASE]) ++m4trace:configure.in:1375: -1- AH_OUTPUT([HAVE_XINTERNATOMS], [/* Define to 1 if you have the `XInternAtoms\' function. */ ++#undef HAVE_XINTERNATOMS]) ++m4trace:configure.in:1387: -1- AC_DEFINE_TRACE_LITERAL([HAVE_X11R6]) ++m4trace:configure.in:1387: -1- m4_pattern_allow([^HAVE_X11R6$]) ++m4trace:configure.in:1387: -1- AH_OUTPUT([HAVE_X11R6], [/* Define if we have X11R6 */ ++#undef HAVE_X11R6]) ++m4trace:configure.in:1389: -1- AM_CONDITIONAL([HAVE_X11R6], [$have_x11r6]) ++m4trace:configure.in:1389: -1- AC_SUBST([HAVE_X11R6_TRUE]) ++m4trace:configure.in:1389: -1- AC_SUBST_TRACE([HAVE_X11R6_TRUE]) ++m4trace:configure.in:1389: -1- m4_pattern_allow([^HAVE_X11R6_TRUE$]) ++m4trace:configure.in:1389: -1- AC_SUBST([HAVE_X11R6_FALSE]) ++m4trace:configure.in:1389: -1- AC_SUBST_TRACE([HAVE_X11R6_FALSE]) ++m4trace:configure.in:1389: -1- m4_pattern_allow([^HAVE_X11R6_FALSE$]) ++m4trace:configure.in:1395: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XKB]) ++m4trace:configure.in:1395: -1- m4_pattern_allow([^HAVE_XKB$]) ++m4trace:configure.in:1395: -1- AH_OUTPUT([HAVE_XKB], [/* Define to use XKB extension */ ++#undef HAVE_XKB]) ++m4trace:configure.in:1398: -2- AC_DEFINE_TRACE_LITERAL([HAVE_XKB]) ++m4trace:configure.in:1398: -2- m4_pattern_allow([^HAVE_XKB$]) ++m4trace:configure.in:1398: -2- AH_OUTPUT([HAVE_XKB], [/* Define to use XKB extension */ ++#undef HAVE_XKB]) ++m4trace:configure.in:1406: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SHAPE_EXT]) ++m4trace:configure.in:1406: -2- m4_pattern_allow([^HAVE_SHAPE_EXT$]) ++m4trace:configure.in:1406: -2- AH_OUTPUT([HAVE_SHAPE_EXT], [/* Define to 1 if the XShape extension is available */ ++#undef HAVE_SHAPE_EXT]) ++m4trace:configure.in:1413: -2- AC_DEFINE_TRACE_LITERAL([HAVE_XSYNC]) ++m4trace:configure.in:1413: -2- m4_pattern_allow([^HAVE_XSYNC$]) ++m4trace:configure.in:1413: -2- AH_OUTPUT([HAVE_XSYNC], [/* Have the SYNC extension library */ ++#undef HAVE_XSYNC]) ++m4trace:configure.in:1434: -2- AC_DEFINE_TRACE_LITERAL([HAVE_IPC_H]) ++m4trace:configure.in:1434: -2- m4_pattern_allow([^HAVE_IPC_H$]) ++m4trace:configure.in:1434: -2- AH_OUTPUT([HAVE_IPC_H], [/* Define to 1 if ipc.h is available */ ++#undef HAVE_IPC_H]) ++m4trace:configure.in:1438: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SHM_H]) ++m4trace:configure.in:1438: -2- m4_pattern_allow([^HAVE_SHM_H$]) ++m4trace:configure.in:1438: -2- AH_OUTPUT([HAVE_SHM_H], [/* Define to 1 if shm.h is available */ ++#undef HAVE_SHM_H]) ++m4trace:configure.in:1450: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:1450: the top level]) ++m4trace:configure.in:1463: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XSHM_H]) ++m4trace:configure.in:1463: -1- m4_pattern_allow([^HAVE_XSHM_H$]) ++m4trace:configure.in:1463: -1- AH_OUTPUT([HAVE_XSHM_H], [/* Define to 1 if xshm.h is available */ ++#undef HAVE_XSHM_H]) ++m4trace:configure.in:1485: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOLARIS_XINERAMA]) ++m4trace:configure.in:1485: -1- m4_pattern_allow([^HAVE_SOLARIS_XINERAMA$]) ++m4trace:configure.in:1485: -1- AH_OUTPUT([HAVE_SOLARIS_XINERAMA], [/* Define to 1 if solaris xinerama is available */ ++#undef HAVE_SOLARIS_XINERAMA]) ++m4trace:configure.in:1487: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XINERAMA]) ++m4trace:configure.in:1487: -1- m4_pattern_allow([^HAVE_XINERAMA$]) ++m4trace:configure.in:1487: -1- AH_OUTPUT([HAVE_XINERAMA], [/* Define to 1 if xinerama is available */ ++#undef HAVE_XINERAMA]) ++m4trace:configure.in:1511: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XFREE_XINERAMA]) ++m4trace:configure.in:1511: -1- m4_pattern_allow([^HAVE_XFREE_XINERAMA$]) ++m4trace:configure.in:1511: -1- AH_OUTPUT([HAVE_XFREE_XINERAMA], [/* Define to 1 if XFree Xinerama is available */ ++#undef HAVE_XFREE_XINERAMA]) ++m4trace:configure.in:1513: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XINERAMA]) ++m4trace:configure.in:1513: -1- m4_pattern_allow([^HAVE_XINERAMA$]) ++m4trace:configure.in:1513: -1- AH_OUTPUT([HAVE_XINERAMA], [/* Define to 1 is Xinerama is available */ ++#undef HAVE_XINERAMA]) ++m4trace:configure.in:1526: -1- AC_DEFINE_TRACE_LITERAL([XINPUT_XFREE]) ++m4trace:configure.in:1526: -1- m4_pattern_allow([^XINPUT_XFREE$]) ++m4trace:configure.in:1526: -1- AH_OUTPUT([XINPUT_XFREE], [/* Define to 1 if XFree XInput should be used */ ++#undef XINPUT_XFREE]) ++m4trace:configure.in:1535: -1- AC_DEFINE_TRACE_LITERAL([XINPUT_NONE]) ++m4trace:configure.in:1535: -1- m4_pattern_allow([^XINPUT_NONE$]) ++m4trace:configure.in:1535: -1- AH_OUTPUT([XINPUT_NONE], [/* Define to 1 if no XInput should be used */ ++#undef XINPUT_NONE]) ++m4trace:configure.in:1539: -1- AM_CONDITIONAL([XINPUT_XFREE], [test x$with_xinput = xxfree || test x$with_xinput = xyes]) ++m4trace:configure.in:1539: -1- AC_SUBST([XINPUT_XFREE_TRUE]) ++m4trace:configure.in:1539: -1- AC_SUBST_TRACE([XINPUT_XFREE_TRUE]) ++m4trace:configure.in:1539: -1- m4_pattern_allow([^XINPUT_XFREE_TRUE$]) ++m4trace:configure.in:1539: -1- AC_SUBST([XINPUT_XFREE_FALSE]) ++m4trace:configure.in:1539: -1- AC_SUBST_TRACE([XINPUT_XFREE_FALSE]) ++m4trace:configure.in:1539: -1- m4_pattern_allow([^XINPUT_XFREE_FALSE$]) ++m4trace:configure.in:1543: -1- AC_DEFINE_TRACE_LITERAL([HAVE_RANDR]) ++m4trace:configure.in:1543: -1- m4_pattern_allow([^HAVE_RANDR$]) ++m4trace:configure.in:1543: -1- AH_OUTPUT([HAVE_RANDR], [/* Have the Xrandr extension library */ ++#undef HAVE_RANDR]) ++m4trace:configure.in:1551: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XCURSOR]) ++m4trace:configure.in:1551: -1- m4_pattern_allow([^HAVE_XCURSOR$]) ++m4trace:configure.in:1551: -1- AH_OUTPUT([HAVE_XCURSOR], [/* Have the Xcursor library */ ++#undef HAVE_XCURSOR]) ++m4trace:configure.in:1559: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XFIXES]) ++m4trace:configure.in:1559: -1- m4_pattern_allow([^HAVE_XFIXES$]) ++m4trace:configure.in:1559: -1- AH_OUTPUT([HAVE_XFIXES], [/* Have the XFIXES X extension */ ++#undef HAVE_XFIXES]) ++m4trace:configure.in:1568: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XCOMPOSITE]) ++m4trace:configure.in:1568: -1- m4_pattern_allow([^HAVE_XCOMPOSITE$]) ++m4trace:configure.in:1568: -1- AH_OUTPUT([HAVE_XCOMPOSITE], [/* Have the XCOMPOSITE X extension */ ++#undef HAVE_XCOMPOSITE]) ++m4trace:configure.in:1577: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XDAMAGE]) ++m4trace:configure.in:1577: -1- m4_pattern_allow([^HAVE_XDAMAGE$]) ++m4trace:configure.in:1577: -1- AH_OUTPUT([HAVE_XDAMAGE], [/* Have the XDAMAGE X extension */ ++#undef HAVE_XDAMAGE]) ++m4trace:configure.in:1592: -1- AM_CONDITIONAL([USE_X11], [true]) ++m4trace:configure.in:1592: -1- AC_SUBST([USE_X11_TRUE]) ++m4trace:configure.in:1592: -1- AC_SUBST_TRACE([USE_X11_TRUE]) ++m4trace:configure.in:1592: -1- m4_pattern_allow([^USE_X11_TRUE$]) ++m4trace:configure.in:1592: -1- AC_SUBST([USE_X11_FALSE]) ++m4trace:configure.in:1592: -1- AC_SUBST_TRACE([USE_X11_FALSE]) ++m4trace:configure.in:1592: -1- m4_pattern_allow([^USE_X11_FALSE$]) ++m4trace:configure.in:1594: -1- AM_CONDITIONAL([XINPUT_XFREE], [false]) ++m4trace:configure.in:1594: -1- AC_SUBST([XINPUT_XFREE_TRUE]) ++m4trace:configure.in:1594: -1- AC_SUBST_TRACE([XINPUT_XFREE_TRUE]) ++m4trace:configure.in:1594: -1- m4_pattern_allow([^XINPUT_XFREE_TRUE$]) ++m4trace:configure.in:1594: -1- AC_SUBST([XINPUT_XFREE_FALSE]) ++m4trace:configure.in:1594: -1- AC_SUBST_TRACE([XINPUT_XFREE_FALSE]) ++m4trace:configure.in:1594: -1- m4_pattern_allow([^XINPUT_XFREE_FALSE$]) ++m4trace:configure.in:1595: -1- AM_CONDITIONAL([USE_X11], [false]) ++m4trace:configure.in:1595: -1- AC_SUBST([USE_X11_TRUE]) ++m4trace:configure.in:1595: -1- AC_SUBST_TRACE([USE_X11_TRUE]) ++m4trace:configure.in:1595: -1- m4_pattern_allow([^USE_X11_TRUE$]) ++m4trace:configure.in:1595: -1- AC_SUBST([USE_X11_FALSE]) ++m4trace:configure.in:1595: -1- AC_SUBST_TRACE([USE_X11_FALSE]) ++m4trace:configure.in:1595: -1- m4_pattern_allow([^USE_X11_FALSE$]) ++m4trace:configure.in:1596: -1- AM_CONDITIONAL([HAVE_X11R6], [false]) ++m4trace:configure.in:1596: -1- AC_SUBST([HAVE_X11R6_TRUE]) ++m4trace:configure.in:1596: -1- AC_SUBST_TRACE([HAVE_X11R6_TRUE]) ++m4trace:configure.in:1596: -1- m4_pattern_allow([^HAVE_X11R6_TRUE$]) ++m4trace:configure.in:1596: -1- AC_SUBST([HAVE_X11R6_FALSE]) ++m4trace:configure.in:1596: -1- AC_SUBST_TRACE([HAVE_X11R6_FALSE]) ++m4trace:configure.in:1596: -1- m4_pattern_allow([^HAVE_X11R6_FALSE$]) ++m4trace:configure.in:1601: -1- AM_CONDITIONAL([USE_WIN32], [true]) ++m4trace:configure.in:1601: -1- AC_SUBST([USE_WIN32_TRUE]) ++m4trace:configure.in:1601: -1- AC_SUBST_TRACE([USE_WIN32_TRUE]) ++m4trace:configure.in:1601: -1- m4_pattern_allow([^USE_WIN32_TRUE$]) ++m4trace:configure.in:1601: -1- AC_SUBST([USE_WIN32_FALSE]) ++m4trace:configure.in:1601: -1- AC_SUBST_TRACE([USE_WIN32_FALSE]) ++m4trace:configure.in:1601: -1- m4_pattern_allow([^USE_WIN32_FALSE$]) ++m4trace:configure.in:1603: -1- AM_CONDITIONAL([USE_WIN32], [false]) ++m4trace:configure.in:1603: -1- AC_SUBST([USE_WIN32_TRUE]) ++m4trace:configure.in:1603: -1- AC_SUBST_TRACE([USE_WIN32_TRUE]) ++m4trace:configure.in:1603: -1- m4_pattern_allow([^USE_WIN32_TRUE$]) ++m4trace:configure.in:1603: -1- AC_SUBST([USE_WIN32_FALSE]) ++m4trace:configure.in:1603: -1- AC_SUBST_TRACE([USE_WIN32_FALSE]) ++m4trace:configure.in:1603: -1- m4_pattern_allow([^USE_WIN32_FALSE$]) ++m4trace:configure.in:1608: -1- AM_CONDITIONAL([USE_QUARTZ], [true]) ++m4trace:configure.in:1608: -1- AC_SUBST([USE_QUARTZ_TRUE]) ++m4trace:configure.in:1608: -1- AC_SUBST_TRACE([USE_QUARTZ_TRUE]) ++m4trace:configure.in:1608: -1- m4_pattern_allow([^USE_QUARTZ_TRUE$]) ++m4trace:configure.in:1608: -1- AC_SUBST([USE_QUARTZ_FALSE]) ++m4trace:configure.in:1608: -1- AC_SUBST_TRACE([USE_QUARTZ_FALSE]) ++m4trace:configure.in:1608: -1- m4_pattern_allow([^USE_QUARTZ_FALSE$]) ++m4trace:configure.in:1610: -1- AM_CONDITIONAL([USE_QUARTZ], [false]) ++m4trace:configure.in:1610: -1- AC_SUBST([USE_QUARTZ_TRUE]) ++m4trace:configure.in:1610: -1- AC_SUBST_TRACE([USE_QUARTZ_TRUE]) ++m4trace:configure.in:1610: -1- m4_pattern_allow([^USE_QUARTZ_TRUE$]) ++m4trace:configure.in:1610: -1- AC_SUBST([USE_QUARTZ_FALSE]) ++m4trace:configure.in:1610: -1- AC_SUBST_TRACE([USE_QUARTZ_FALSE]) ++m4trace:configure.in:1610: -1- m4_pattern_allow([^USE_QUARTZ_FALSE$]) ++m4trace:configure.in:1616: -1- AC_SUBST([GDK_PIXBUF_XLIB_PACKAGES]) ++m4trace:configure.in:1616: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_PACKAGES]) ++m4trace:configure.in:1616: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_PACKAGES$]) ++m4trace:configure.in:1617: -1- AC_SUBST([GDK_PIXBUF_XLIB_EXTRA_LIBS]) ++m4trace:configure.in:1617: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_EXTRA_LIBS]) ++m4trace:configure.in:1617: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_EXTRA_LIBS$]) ++m4trace:configure.in:1618: -1- AC_SUBST([GDK_PIXBUF_XLIB_EXTRA_CFLAGS]) ++m4trace:configure.in:1618: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_EXTRA_CFLAGS]) ++m4trace:configure.in:1618: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_EXTRA_CFLAGS$]) ++m4trace:configure.in:1619: -1- AC_SUBST([GDK_PIXBUF_XLIB_DEP_LIBS]) ++m4trace:configure.in:1619: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_DEP_LIBS]) ++m4trace:configure.in:1619: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_DEP_LIBS$]) ++m4trace:configure.in:1620: -1- AC_SUBST([GDK_PIXBUF_XLIB_DEP_CFLAGS]) ++m4trace:configure.in:1620: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_DEP_CFLAGS]) ++m4trace:configure.in:1620: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_DEP_CFLAGS$]) ++m4trace:configure.in:1648: -1- AM_CONDITIONAL([USE_DIRECTFB], [true]) ++m4trace:configure.in:1648: -1- AC_SUBST([USE_DIRECTFB_TRUE]) ++m4trace:configure.in:1648: -1- AC_SUBST_TRACE([USE_DIRECTFB_TRUE]) ++m4trace:configure.in:1648: -1- m4_pattern_allow([^USE_DIRECTFB_TRUE$]) ++m4trace:configure.in:1648: -1- AC_SUBST([USE_DIRECTFB_FALSE]) ++m4trace:configure.in:1648: -1- AC_SUBST_TRACE([USE_DIRECTFB_FALSE]) ++m4trace:configure.in:1648: -1- m4_pattern_allow([^USE_DIRECTFB_FALSE$]) ++m4trace:configure.in:1650: -1- AM_CONDITIONAL([USE_DIRECTFB], [false]) ++m4trace:configure.in:1650: -1- AC_SUBST([USE_DIRECTFB_TRUE]) ++m4trace:configure.in:1650: -1- AC_SUBST_TRACE([USE_DIRECTFB_TRUE]) ++m4trace:configure.in:1650: -1- m4_pattern_allow([^USE_DIRECTFB_TRUE$]) ++m4trace:configure.in:1650: -1- AC_SUBST([USE_DIRECTFB_FALSE]) ++m4trace:configure.in:1650: -1- AC_SUBST_TRACE([USE_DIRECTFB_FALSE]) ++m4trace:configure.in:1650: -1- m4_pattern_allow([^USE_DIRECTFB_FALSE$]) ++m4trace:configure.in:1708: -1- AC_SUBST([GDK_PACKAGES]) ++m4trace:configure.in:1708: -1- AC_SUBST_TRACE([GDK_PACKAGES]) ++m4trace:configure.in:1708: -1- m4_pattern_allow([^GDK_PACKAGES$]) ++m4trace:configure.in:1709: -1- AC_SUBST([GDK_PRIVATE_PACKAGES]) ++m4trace:configure.in:1709: -1- AC_SUBST_TRACE([GDK_PRIVATE_PACKAGES]) ++m4trace:configure.in:1709: -1- m4_pattern_allow([^GDK_PRIVATE_PACKAGES$]) ++m4trace:configure.in:1710: -1- AC_SUBST([GDK_EXTRA_LIBS]) ++m4trace:configure.in:1710: -1- AC_SUBST_TRACE([GDK_EXTRA_LIBS]) ++m4trace:configure.in:1710: -1- m4_pattern_allow([^GDK_EXTRA_LIBS$]) ++m4trace:configure.in:1711: -1- AC_SUBST([GDK_EXTRA_CFLAGS]) ++m4trace:configure.in:1711: -1- AC_SUBST_TRACE([GDK_EXTRA_CFLAGS]) ++m4trace:configure.in:1711: -1- m4_pattern_allow([^GDK_EXTRA_CFLAGS$]) ++m4trace:configure.in:1712: -1- AC_SUBST([GDK_DEP_LIBS]) ++m4trace:configure.in:1712: -1- AC_SUBST_TRACE([GDK_DEP_LIBS]) ++m4trace:configure.in:1712: -1- m4_pattern_allow([^GDK_DEP_LIBS$]) ++m4trace:configure.in:1713: -1- AC_SUBST([GDK_DEP_CFLAGS]) ++m4trace:configure.in:1713: -1- AC_SUBST_TRACE([GDK_DEP_CFLAGS]) ++m4trace:configure.in:1713: -1- m4_pattern_allow([^GDK_DEP_CFLAGS$]) ++m4trace:configure.in:1767: -1- AC_SUBST([GDK_PIXBUF_PACKAGES]) ++m4trace:configure.in:1767: -1- AC_SUBST_TRACE([GDK_PIXBUF_PACKAGES]) ++m4trace:configure.in:1767: -1- m4_pattern_allow([^GDK_PIXBUF_PACKAGES$]) ++m4trace:configure.in:1768: -1- AC_SUBST([GDK_PIXBUF_EXTRA_LIBS]) ++m4trace:configure.in:1768: -1- AC_SUBST_TRACE([GDK_PIXBUF_EXTRA_LIBS]) ++m4trace:configure.in:1768: -1- m4_pattern_allow([^GDK_PIXBUF_EXTRA_LIBS$]) ++m4trace:configure.in:1769: -1- AC_SUBST([GDK_PIXBUF_EXTRA_CFLAGS]) ++m4trace:configure.in:1769: -1- AC_SUBST_TRACE([GDK_PIXBUF_EXTRA_CFLAGS]) ++m4trace:configure.in:1769: -1- m4_pattern_allow([^GDK_PIXBUF_EXTRA_CFLAGS$]) ++m4trace:configure.in:1770: -1- AC_SUBST([GDK_PIXBUF_DEP_LIBS]) ++m4trace:configure.in:1770: -1- AC_SUBST_TRACE([GDK_PIXBUF_DEP_LIBS]) ++m4trace:configure.in:1770: -1- m4_pattern_allow([^GDK_PIXBUF_DEP_LIBS$]) ++m4trace:configure.in:1771: -1- AC_SUBST([GDK_PIXBUF_DEP_CFLAGS]) ++m4trace:configure.in:1771: -1- AC_SUBST_TRACE([GDK_PIXBUF_DEP_CFLAGS]) ++m4trace:configure.in:1771: -1- m4_pattern_allow([^GDK_PIXBUF_DEP_CFLAGS$]) ++m4trace:configure.in:1773: -1- AC_SUBST([GTK_PACKAGES]) ++m4trace:configure.in:1773: -1- AC_SUBST_TRACE([GTK_PACKAGES]) ++m4trace:configure.in:1773: -1- m4_pattern_allow([^GTK_PACKAGES$]) ++m4trace:configure.in:1774: -1- AC_SUBST([GTK_EXTRA_LIBS]) ++m4trace:configure.in:1774: -1- AC_SUBST_TRACE([GTK_EXTRA_LIBS]) ++m4trace:configure.in:1774: -1- m4_pattern_allow([^GTK_EXTRA_LIBS$]) ++m4trace:configure.in:1775: -1- AC_SUBST([GTK_EXTRA_CFLAGS]) ++m4trace:configure.in:1775: -1- AC_SUBST_TRACE([GTK_EXTRA_CFLAGS]) ++m4trace:configure.in:1775: -1- m4_pattern_allow([^GTK_EXTRA_CFLAGS$]) ++m4trace:configure.in:1776: -1- AC_SUBST([GTK_DEP_LIBS]) ++m4trace:configure.in:1776: -1- AC_SUBST_TRACE([GTK_DEP_LIBS]) ++m4trace:configure.in:1776: -1- m4_pattern_allow([^GTK_DEP_LIBS$]) ++m4trace:configure.in:1777: -1- AC_SUBST([GTK_DEP_CFLAGS]) ++m4trace:configure.in:1777: -1- AC_SUBST_TRACE([GTK_DEP_CFLAGS]) ++m4trace:configure.in:1777: -1- m4_pattern_allow([^GTK_DEP_CFLAGS$]) ++m4trace:configure.in:1779: -1- AC_SUBST([GLIB_PREFIX]) ++m4trace:configure.in:1779: -1- AC_SUBST_TRACE([GLIB_PREFIX]) ++m4trace:configure.in:1779: -1- m4_pattern_allow([^GLIB_PREFIX$]) ++m4trace:configure.in:1780: -1- AC_SUBST([ATK_PREFIX]) ++m4trace:configure.in:1780: -1- AC_SUBST_TRACE([ATK_PREFIX]) ++m4trace:configure.in:1780: -1- m4_pattern_allow([^ATK_PREFIX$]) ++m4trace:configure.in:1781: -1- AC_SUBST([PANGO_PREFIX]) ++m4trace:configure.in:1781: -1- AC_SUBST_TRACE([PANGO_PREFIX]) ++m4trace:configure.in:1781: -1- m4_pattern_allow([^PANGO_PREFIX$]) ++m4trace:configure.in:1782: -1- AC_SUBST([CAIRO_PREFIX]) ++m4trace:configure.in:1782: -1- AC_SUBST_TRACE([CAIRO_PREFIX]) ++m4trace:configure.in:1782: -1- m4_pattern_allow([^CAIRO_PREFIX$]) ++m4trace:configure.in:1784: -1- AC_SUBST([GTK_DEBUG_FLAGS]) ++m4trace:configure.in:1784: -1- AC_SUBST_TRACE([GTK_DEBUG_FLAGS]) ++m4trace:configure.in:1784: -1- m4_pattern_allow([^GTK_DEBUG_FLAGS$]) ++m4trace:configure.in:1785: -1- AC_SUBST([GTK_XIM_FLAGS]) ++m4trace:configure.in:1785: -1- AC_SUBST_TRACE([GTK_XIM_FLAGS]) ++m4trace:configure.in:1785: -1- m4_pattern_allow([^GTK_XIM_FLAGS$]) ++m4trace:configure.in:1806: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_UN_SUN_LEN]) ++m4trace:configure.in:1806: -1- m4_pattern_allow([^HAVE_SOCKADDR_UN_SUN_LEN$]) ++m4trace:configure.in:1806: -1- AH_OUTPUT([HAVE_SOCKADDR_UN_SUN_LEN], [/* Have the sockaddr_un.sun_len member */ ++#undef HAVE_SOCKADDR_UN_SUN_LEN]) ++m4trace:configure.in:1814: -1- AC_SUBST([GAIL_INET_LIBS]) ++m4trace:configure.in:1814: -1- AC_SUBST_TRACE([GAIL_INET_LIBS]) ++m4trace:configure.in:1814: -1- m4_pattern_allow([^GAIL_INET_LIBS$]) ++m4trace:configure.in:1822: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:1822: the top level]) ++m4trace:configure.in:1829: -1- AC_SUBST([CUPS_CONFIG]) ++m4trace:configure.in:1829: -1- AC_SUBST_TRACE([CUPS_CONFIG]) ++m4trace:configure.in:1829: -1- m4_pattern_allow([^CUPS_CONFIG$]) ++m4trace:configure.in:1840: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CUPS_API_1_2]) ++m4trace:configure.in:1840: -1- m4_pattern_allow([^HAVE_CUPS_API_1_2$]) ++m4trace:configure.in:1840: -1- AH_OUTPUT([HAVE_CUPS_API_1_2], [/* Define to 1 if CUPS 1.2 API is available */ ++#undef HAVE_CUPS_API_1_2]) ++m4trace:configure.in:1844: -1- AC_SUBST([CUPS_API_MAJOR]) ++m4trace:configure.in:1844: -1- AC_SUBST_TRACE([CUPS_API_MAJOR]) ++m4trace:configure.in:1844: -1- m4_pattern_allow([^CUPS_API_MAJOR$]) ++m4trace:configure.in:1845: -1- AC_SUBST([CUPS_API_MINOR]) ++m4trace:configure.in:1845: -1- AC_SUBST_TRACE([CUPS_API_MINOR]) ++m4trace:configure.in:1845: -1- m4_pattern_allow([^CUPS_API_MINOR$]) ++m4trace:configure.in:1846: -1- AC_SUBST([CUPS_CFLAGS]) ++m4trace:configure.in:1846: -1- AC_SUBST_TRACE([CUPS_CFLAGS]) ++m4trace:configure.in:1846: -1- m4_pattern_allow([^CUPS_CFLAGS$]) ++m4trace:configure.in:1847: -1- AC_SUBST([CUPS_LIBS]) ++m4trace:configure.in:1847: -1- AC_SUBST_TRACE([CUPS_LIBS]) ++m4trace:configure.in:1847: -1- m4_pattern_allow([^CUPS_LIBS$]) ++m4trace:configure.in:1851: -1- AM_CONDITIONAL([HAVE_CUPS], [test "x$CUPS_CONFIG" != "xno"]) ++m4trace:configure.in:1851: -1- AC_SUBST([HAVE_CUPS_TRUE]) ++m4trace:configure.in:1851: -1- AC_SUBST_TRACE([HAVE_CUPS_TRUE]) ++m4trace:configure.in:1851: -1- m4_pattern_allow([^HAVE_CUPS_TRUE$]) ++m4trace:configure.in:1851: -1- AC_SUBST([HAVE_CUPS_FALSE]) ++m4trace:configure.in:1851: -1- AC_SUBST_TRACE([HAVE_CUPS_FALSE]) ++m4trace:configure.in:1851: -1- m4_pattern_allow([^HAVE_CUPS_FALSE$]) ++m4trace:configure.in:1855: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... ++configure.in:1855: the top level]) ++m4trace:configure.in:1855: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HTTP_AUTHSTRING]) ++m4trace:configure.in:1855: -1- m4_pattern_allow([^HAVE_HTTP_AUTHSTRING$]) ++m4trace:configure.in:1855: -1- AH_OUTPUT([HAVE_HTTP_AUTHSTRING], [/* Define if cups http_t authstring field is accessible */ ++#undef HAVE_HTTP_AUTHSTRING]) ++m4trace:configure.in:1861: -1- AC_SUBST([HAVE_HTTP_AUTHSTRING]) ++m4trace:configure.in:1861: -1- AC_SUBST_TRACE([HAVE_HTTP_AUTHSTRING]) ++m4trace:configure.in:1861: -1- m4_pattern_allow([^HAVE_HTTP_AUTHSTRING$]) ++m4trace:configure.in:1865: -1- AH_OUTPUT([HAVE_HTTPGETAUTHSTRING], [/* Define to 1 if you have the `httpGetAuthString\' function. */ ++#undef HAVE_HTTPGETAUTHSTRING]) ++m4trace:configure.in:1869: -1- AM_CONDITIONAL([HAVE_CUPS], [false]) ++m4trace:configure.in:1869: -1- AC_SUBST([HAVE_CUPS_TRUE]) ++m4trace:configure.in:1869: -1- AC_SUBST_TRACE([HAVE_CUPS_TRUE]) ++m4trace:configure.in:1869: -1- m4_pattern_allow([^HAVE_CUPS_TRUE$]) ++m4trace:configure.in:1869: -1- AC_SUBST([HAVE_CUPS_FALSE]) ++m4trace:configure.in:1869: -1- AC_SUBST_TRACE([HAVE_CUPS_FALSE]) ++m4trace:configure.in:1869: -1- m4_pattern_allow([^HAVE_CUPS_FALSE$]) ++m4trace:configure.in:1888: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:1888: the top level]) ++m4trace:configure.in:1892: -1- AM_CONDITIONAL([TEST_PRINT_BACKEND], [test "x$enable_test_print_backend" != "xno"]) ++m4trace:configure.in:1892: -1- AC_SUBST([TEST_PRINT_BACKEND_TRUE]) ++m4trace:configure.in:1892: -1- AC_SUBST_TRACE([TEST_PRINT_BACKEND_TRUE]) ++m4trace:configure.in:1892: -1- m4_pattern_allow([^TEST_PRINT_BACKEND_TRUE$]) ++m4trace:configure.in:1892: -1- AC_SUBST([TEST_PRINT_BACKEND_FALSE]) ++m4trace:configure.in:1892: -1- AC_SUBST_TRACE([TEST_PRINT_BACKEND_FALSE]) ++m4trace:configure.in:1892: -1- m4_pattern_allow([^TEST_PRINT_BACKEND_FALSE$]) ++m4trace:configure.in:1922: -1- AC_SUBST([HTML_DIR]) ++m4trace:configure.in:1922: -1- AC_SUBST_TRACE([HTML_DIR]) ++m4trace:configure.in:1922: -1- m4_pattern_allow([^HTML_DIR$]) ++m4trace:configure.in:1922: -1- AC_SUBST([GTKDOC_CHECK]) ++m4trace:configure.in:1922: -1- AC_SUBST_TRACE([GTKDOC_CHECK]) ++m4trace:configure.in:1922: -1- m4_pattern_allow([^GTKDOC_CHECK$]) ++m4trace:configure.in:1922: -1- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++m4trace:configure.in:1922: -1- AC_SUBST([ENABLE_GTK_DOC_TRUE]) ++m4trace:configure.in:1922: -1- AC_SUBST_TRACE([ENABLE_GTK_DOC_TRUE]) ++m4trace:configure.in:1922: -1- m4_pattern_allow([^ENABLE_GTK_DOC_TRUE$]) ++m4trace:configure.in:1922: -1- AC_SUBST([ENABLE_GTK_DOC_FALSE]) ++m4trace:configure.in:1922: -1- AC_SUBST_TRACE([ENABLE_GTK_DOC_FALSE]) ++m4trace:configure.in:1922: -1- m4_pattern_allow([^ENABLE_GTK_DOC_FALSE$]) ++m4trace:configure.in:1922: -1- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++m4trace:configure.in:1922: -1- AC_SUBST([GTK_DOC_USE_LIBTOOL_TRUE]) ++m4trace:configure.in:1922: -1- AC_SUBST_TRACE([GTK_DOC_USE_LIBTOOL_TRUE]) ++m4trace:configure.in:1922: -1- m4_pattern_allow([^GTK_DOC_USE_LIBTOOL_TRUE$]) ++m4trace:configure.in:1922: -1- AC_SUBST([GTK_DOC_USE_LIBTOOL_FALSE]) ++m4trace:configure.in:1922: -1- AC_SUBST_TRACE([GTK_DOC_USE_LIBTOOL_FALSE]) ++m4trace:configure.in:1922: -1- m4_pattern_allow([^GTK_DOC_USE_LIBTOOL_FALSE$]) ++m4trace:configure.in:1924: -1- AC_SUBST([DB2HTML]) ++m4trace:configure.in:1924: -1- AC_SUBST_TRACE([DB2HTML]) ++m4trace:configure.in:1924: -1- m4_pattern_allow([^DB2HTML$]) ++m4trace:configure.in:1925: -1- AM_CONDITIONAL([HAVE_DOCBOOK], [$DB2HTML]) ++m4trace:configure.in:1925: -1- AC_SUBST([HAVE_DOCBOOK_TRUE]) ++m4trace:configure.in:1925: -1- AC_SUBST_TRACE([HAVE_DOCBOOK_TRUE]) ++m4trace:configure.in:1925: -1- m4_pattern_allow([^HAVE_DOCBOOK_TRUE$]) ++m4trace:configure.in:1925: -1- AC_SUBST([HAVE_DOCBOOK_FALSE]) ++m4trace:configure.in:1925: -1- AC_SUBST_TRACE([HAVE_DOCBOOK_FALSE]) ++m4trace:configure.in:1925: -1- m4_pattern_allow([^HAVE_DOCBOOK_FALSE$]) ++m4trace:configure.in:1927: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... ++configure.in:1927: the top level]) ++m4trace:configure.in:1936: -1- AC_SUBST([XSLTPROC]) ++m4trace:configure.in:1936: -1- AC_SUBST_TRACE([XSLTPROC]) ++m4trace:configure.in:1936: -1- m4_pattern_allow([^XSLTPROC$]) ++m4trace:configure.in:1942: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++aclocal.m4:43: JH_PATH_XML_CATALOG is expanded from... ++aclocal.m4:77: JH_CHECK_XML_CATALOG is expanded from... ++configure.in:1942: the top level]) ++m4trace:configure.in:1942: -1- AC_SUBST([XML_CATALOG_FILE]) ++m4trace:configure.in:1942: -1- AC_SUBST_TRACE([XML_CATALOG_FILE]) ++m4trace:configure.in:1942: -1- m4_pattern_allow([^XML_CATALOG_FILE$]) ++m4trace:configure.in:1942: -1- AC_SUBST([XMLCATALOG]) ++m4trace:configure.in:1942: -1- AC_SUBST_TRACE([XMLCATALOG]) ++m4trace:configure.in:1942: -1- m4_pattern_allow([^XMLCATALOG$]) ++m4trace:configure.in:1948: -1- AM_CONDITIONAL([ENABLE_MAN], [test x$enable_man != xno]) ++m4trace:configure.in:1948: -1- AC_SUBST([ENABLE_MAN_TRUE]) ++m4trace:configure.in:1948: -1- AC_SUBST_TRACE([ENABLE_MAN_TRUE]) ++m4trace:configure.in:1948: -1- m4_pattern_allow([^ENABLE_MAN_TRUE$]) ++m4trace:configure.in:1948: -1- AC_SUBST([ENABLE_MAN_FALSE]) ++m4trace:configure.in:1948: -1- AC_SUBST_TRACE([ENABLE_MAN_FALSE]) ++m4trace:configure.in:1948: -1- m4_pattern_allow([^ENABLE_MAN_FALSE$]) ++m4trace:configure.in:2035: -1- AC_CONFIG_FILES([ ++config.h.win32 ++gtk-zip.sh ++Makefile ++gdk-pixbuf-2.0.pc ++gdk-2.0.pc ++gtk+-2.0.pc ++gtk+-unix-print-2.0.pc ++gail.pc ++gdk-pixbuf-2.0-uninstalled.pc ++gdk-2.0-uninstalled.pc ++gtk+-2.0-uninstalled.pc ++gail-uninstalled.pc ++m4macros/Makefile ++po/Makefile.in ++po-properties/Makefile.in ++demos/Makefile ++demos/gtk-demo/Makefile ++demos/gtk-demo/geninclude.pl ++tests/Makefile ++docs/Makefile ++docs/reference/Makefile ++docs/reference/gdk-pixbuf/Makefile ++docs/reference/gdk-pixbuf/version.xml ++docs/reference/gdk/Makefile ++docs/reference/gdk/version.xml ++docs/reference/gtk/Makefile ++docs/reference/gtk/version.xml ++docs/reference/libgail-util/Makefile ++docs/faq/Makefile ++docs/tools/Makefile ++docs/tutorial/Makefile ++gdk-pixbuf/Makefile ++gdk-pixbuf/gdk_pixbuf.rc ++gdk-pixbuf/gdk-pixbuf-features.h ++gdk-pixbuf/pixops/Makefile ++gdk/Makefile ++gdk/x11/Makefile ++gdk/win32/Makefile ++gdk/win32/rc/Makefile ++gdk/win32/rc/gdk.rc ++gdk/quartz/Makefile ++gdk/directfb/Makefile ++gdk/tests/Makefile ++gtk/Makefile ++gtk/makefile.msc ++gtk/gtkversion.h ++gtk/gtk-win32.rc ++gtk/theme-bits/Makefile ++gtk/tests/Makefile ++modules/Makefile ++modules/other/Makefile ++modules/other/gail/Makefile ++modules/other/gail/libgail-util/Makefile ++modules/other/gail/tests/Makefile ++modules/engines/Makefile ++modules/engines/pixbuf/Makefile ++modules/engines/ms-windows/Makefile ++modules/engines/ms-windows/Theme/Makefile ++modules/engines/ms-windows/Theme/gtk-2.0/Makefile ++modules/input/Makefile ++modules/printbackends/Makefile ++modules/printbackends/cups/Makefile ++modules/printbackends/lpr/Makefile ++modules/printbackends/file/Makefile ++modules/printbackends/test/Makefile ++perf/Makefile ++contrib/Makefile ++contrib/gdk-pixbuf-xlib/Makefile ++contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc ++]) ++m4trace:configure.in:2107: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) ++m4trace:configure.in:2107: -1- m4_pattern_allow([^LIB@&t@OBJS$]) ++m4trace:configure.in:2107: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([LTLIBOBJS]) ++m4trace:configure.in:2107: -1- m4_pattern_allow([^LTLIBOBJS$]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([top_builddir]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([srcdir]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([abs_srcdir]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([top_srcdir]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([abs_top_srcdir]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([builddir]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([abs_builddir]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([abs_top_builddir]) ++m4trace:configure.in:2107: -1- AC_SUBST_TRACE([INSTALL]) +diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +--- gtk+2.0-2.14.4.old/configure 2008-10-17 01:07:22.000000000 -0300 ++++ gtk+2.0-2.14.4/configure 2008-11-04 15:37:03.000000000 -0200 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.63 for gtk+ 2.14.3. -+# Generated by GNU Autoconf 2.61 for gtk+ 2.14.3. +-# Generated by GNU Autoconf 2.63 for gtk+ 2.14.4. ++# Generated by GNU Autoconf 2.61 for gtk+ 2.14.4. # # Report bugs to . # @@ -4156,7 +40002,7 @@ Index: gtk+2.0-2.14.3/configure esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi -@@ -791,424 +769,396 @@ +@@ -791,383 +769,348 @@ # include #endif" @@ -4499,46 +40345,6 @@ Index: gtk+2.0-2.14.3/configure +ac_subst_vars='SHELL PATH_SEPARATOR -SHELL' --ac_subst_files='' --ac_user_opts=' --enable_option_checking --enable_dependency_tracking --enable_static --enable_shared --enable_fast_install --with_gnu_ld --enable_libtool_lock --with_pic --with_tags --enable_largefile --enable_maintainer_mode --enable_debug --enable_shm --enable_xkb --enable_xinerama --enable_rebuilds --enable_visibility --with_xinput --with_gdktarget --enable_explicit_deps --enable_glibtest --enable_modules --with_libpng --with_libjpeg --with_libtiff --with_libjasper --enable_gdiplus --with_included_loaders --with_included_immodules --with_x --enable_cups --enable_test_print_backend --with_html_dir --enable_gtk_doc --enable_man --with_xml_catalog --' -- ac_precious_vars='build_alias +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION @@ -4572,12 +40378,11 @@ Index: gtk+2.0-2.14.3/configure +ECHO_T +LIBS +build_alias - host_alias - target_alias ++host_alias ++target_alias +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA -+am__isrc +CYGPATH_W +PACKAGE +VERSION @@ -4586,16 +40391,13 @@ Index: gtk+2.0-2.14.3/configure +AUTOMAKE +AUTOHEADER +MAKEINFO ++AMTAR +install_sh +STRIP +INSTALL_STRIP_PROGRAM -+mkdir_p +AWK +SET_MAKE +am__leading_dot -+AMTAR -+am__tar -+am__untar +GTK_MAJOR_VERSION +GTK_MINOR_VERSION +GTK_MICRO_VERSION @@ -4622,11 +40424,10 @@ Index: gtk+2.0-2.14.3/configure +host_vendor +host_os +LIB_EXE_MACHINE_FLAG - CC - CFLAGS - LDFLAGS --LIBS - CPPFLAGS ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT @@ -4641,10 +40442,9 @@ Index: gtk+2.0-2.14.3/configure +am__fastdepCC_FALSE +ENABLE_STATIC_TRUE +ENABLE_STATIC_FALSE - CXX ++CXX +ac_ct_CXX - CXXFLAGS --CCC ++CXXFLAGS +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE @@ -4664,17 +40464,14 @@ Index: gtk+2.0-2.14.3/configure +DLLTOOL +AS +OBJDUMP - CPP - CXXCPP - F77 - FFLAGS ++CPP ++CXXCPP ++F77 ++FFLAGS +ac_ct_F77 +LIBTOOL +CCAS +CCASFLAGS -+CCASDEPMODE -+am__fastdepCCAS_TRUE -+am__fastdepCCAS_FALSE +NM +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE @@ -4694,32 +40491,9 @@ Index: gtk+2.0-2.14.3/configure +gdktarget +gdktargetlib +gtktargetlib - PKG_CONFIG - BASE_DEPENDENCIES_CFLAGS - BASE_DEPENDENCIES_LIBS --XMKMF' -- -- --# Initialize some variables set by options. --ac_init_help= --ac_init_version=false --ac_unrecognized_opts= --ac_unrecognized_sep= --# The variables have the same names as the options, with --# dashes changed to underlines. --cache_file=/dev/null --exec_prefix=NONE --no_create= --no_recursion= --prefix=NONE --program_prefix=NONE --program_suffix=NONE --program_transform_name=s,x,x, --silent= --site= --srcdir= --verbose= --x_includes=NONE ++PKG_CONFIG ++BASE_DEPENDENCIES_CFLAGS ++BASE_DEPENDENCIES_LIBS +LIBTOOL_EXPORT_OPTIONS +DISABLE_EXPLICIT_DEPS_TRUE +DISABLE_EXPLICIT_DEPS_FALSE @@ -4910,52 +40684,58 @@ Index: gtk+2.0-2.14.3/configure +ENABLE_MAN_FALSE +LIBOBJS +LTLIBOBJS' -+ac_subst_files='' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CXX -+CXXFLAGS -+CCC -+CPP -+CXXCPP -+F77 -+FFLAGS -+CCAS -+CCASFLAGS -+PKG_CONFIG -+BASE_DEPENDENCIES_CFLAGS -+BASE_DEPENDENCIES_LIBS -+XMKMF' -+ -+ -+# Initialize some variables set by options. -+ac_init_help= -+ac_init_version=false -+# The variables have the same names as the options, with -+# dashes changed to underlines. -+cache_file=/dev/null -+exec_prefix=NONE -+no_create= -+no_recursion= -+prefix=NONE -+program_prefix=NONE -+program_suffix=NONE -+program_transform_name=s,x,x, -+silent= -+site= -+srcdir= -+verbose= -+x_includes=NONE - x_libraries=NONE - - # Installation directory options. -@@ -1292,21 +1242,13 @@ + ac_subst_files='' +-ac_user_opts=' +-enable_option_checking +-enable_dependency_tracking +-enable_static +-enable_shared +-enable_fast_install +-with_gnu_ld +-enable_libtool_lock +-with_pic +-with_tags +-enable_largefile +-enable_maintainer_mode +-enable_debug +-enable_shm +-enable_xkb +-enable_xinerama +-enable_rebuilds +-enable_visibility +-with_xinput +-with_gdktarget +-enable_explicit_deps +-enable_glibtest +-enable_modules +-with_libpng +-with_libjpeg +-with_libtiff +-with_libjasper +-enable_gdiplus +-with_included_loaders +-with_included_immodules +-with_x +-enable_cups +-enable_test_print_backend +-with_html_dir +-enable_gtk_doc +-enable_man +-with_xml_catalog +-' + ac_precious_vars='build_alias + host_alias + target_alias +@@ -1192,8 +1135,6 @@ + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false +-ac_unrecognized_opts= +-ac_unrecognized_sep= + # The variables have the same names as the options, with + # dashes changed to underlines. + cache_file=/dev/null +@@ -1292,21 +1233,13 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) @@ -4982,7 +40762,7 @@ Index: gtk+2.0-2.14.3/configure -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; -@@ -1319,21 +1261,13 @@ +@@ -1319,21 +1252,13 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) @@ -5009,7 +40789,7 @@ Index: gtk+2.0-2.14.3/configure -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -1524,38 +1458,22 @@ +@@ -1524,38 +1449,22 @@ ac_init_version=: ;; -with-* | --with-*) @@ -5058,7 +40838,7 @@ Index: gtk+2.0-2.14.3/configure --x) # Obsolete; use --with-x. -@@ -1575,7 +1493,7 @@ +@@ -1575,7 +1484,7 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -5067,7 +40847,7 @@ Index: gtk+2.0-2.14.3/configure Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; -@@ -1584,16 +1502,16 @@ +@@ -1584,16 +1493,16 @@ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && @@ -5087,7 +40867,7 @@ Index: gtk+2.0-2.14.3/configure : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; -@@ -1602,38 +1520,22 @@ +@@ -1602,38 +1511,22 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -5129,7 +40909,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } done -@@ -1648,7 +1550,7 @@ +@@ -1648,7 +1541,7 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -5138,7 +40918,7 @@ Index: gtk+2.0-2.14.3/configure If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes -@@ -1664,10 +1566,10 @@ +@@ -1664,10 +1557,10 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || @@ -5151,7 +40931,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } -@@ -1675,12 +1577,12 @@ +@@ -1675,12 +1568,12 @@ if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. @@ -5170,7 +40950,7 @@ Index: gtk+2.0-2.14.3/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -1707,12 +1609,12 @@ +@@ -1707,12 +1600,12 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." @@ -5185,7 +40965,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. -@@ -1761,9 +1663,9 @@ +@@ -1761,9 +1654,9 @@ Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -5197,7 +40977,7 @@ Index: gtk+2.0-2.14.3/configure By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -1773,25 +1675,25 @@ +@@ -1773,25 +1666,25 @@ For better control, use the options below. Fine tuning of the installation directories: @@ -5242,40 +41022,15 @@ Index: gtk+2.0-2.14.3/configure _ACEOF cat <<\_ACEOF -@@ -1818,19 +1720,18 @@ +@@ -1818,7 +1711,6 @@ cat <<\_ACEOF Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -- --disable-dependency-tracking Speeds up one-time builds -- --enable-dependency-tracking Do not reject slow dependency extractors -+ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors - --enable-static[=PKGS] build static libraries [default=no] - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --disable-largefile omit support for large files -- --enable-maintainer-mode enable make rules and dependencies not useful -- (and sometimes confusing) to the casual installer -+ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer - --enable-debug=[no/minimum/yes] - turn on debugging [default=minimum] - --enable-shm support shared memory if available [default=yes] -@@ -1889,6 +1790,8 @@ - CXXCPP C++ preprocessor - F77 Fortran 77 compiler command - FFLAGS Fortran 77 compiler flags -+ CCAS assembler compiler command (defaults to CC) -+ CCASFLAGS assembler compiler flags (defaults to CFLAGS) - PKG_CONFIG path to pkg-config utility - BASE_DEPENDENCIES_CFLAGS - C compiler flags for BASE_DEPENDENCIES, overriding pkg-config -@@ -1907,17 +1810,15 @@ + --disable-dependency-tracking Speeds up one-time builds +@@ -1907,17 +1799,15 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue @@ -5296,7 +41051,7 @@ Index: gtk+2.0-2.14.3/configure case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -1953,7 +1854,7 @@ +@@ -1953,7 +1843,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else @@ -5305,10 +41060,10 @@ Index: gtk+2.0-2.14.3/configure fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done -@@ -1963,10 +1864,10 @@ +@@ -1963,10 +1853,10 @@ if $ac_init_version; then cat <<\_ACEOF - gtk+ configure 2.14.3 + gtk+ configure 2.14.4 -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.61 @@ -5318,16 +41073,16 @@ Index: gtk+2.0-2.14.3/configure This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF -@@ -1977,7 +1878,7 @@ +@@ -1977,7 +1867,7 @@ running configure, to aid debugging if configure makes a mistake. - It was created by gtk+ $as_me 2.14.3, which was + It was created by gtk+ $as_me 2.14.4, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ -@@ -2013,7 +1914,7 @@ +@@ -2013,7 +1903,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5336,7 +41091,7 @@ Index: gtk+2.0-2.14.3/configure done IFS=$as_save_IFS -@@ -2048,7 +1949,7 @@ +@@ -2048,7 +1938,7 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) @@ -5345,7 +41100,7 @@ Index: gtk+2.0-2.14.3/configure esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -@@ -2100,12 +2001,11 @@ +@@ -2100,12 +1990,11 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -5360,7 +41115,7 @@ Index: gtk+2.0-2.14.3/configure *) $as_unset $ac_var ;; esac ;; esac -@@ -2135,9 +2035,9 @@ +@@ -2135,9 +2024,9 @@ do eval ac_val=\$$ac_var case $ac_val in @@ -5372,7 +41127,7 @@ Index: gtk+2.0-2.14.3/configure done | sort echo -@@ -2152,9 +2052,9 @@ +@@ -2152,9 +2041,9 @@ do eval ac_val=\$$ac_var case $ac_val in @@ -5384,7 +41139,7 @@ Index: gtk+2.0-2.14.3/configure done | sort echo fi -@@ -2170,8 +2070,8 @@ +@@ -2170,8 +2059,8 @@ echo fi test "$ac_signal" != 0 && @@ -5395,7 +41150,7 @@ Index: gtk+2.0-2.14.3/configure } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -@@ -2213,24 +2113,21 @@ +@@ -2213,24 +2102,21 @@ # Let the site file select an alternate cache file if it wants to. @@ -5429,7 +41184,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi -@@ -2240,16 +2137,16 @@ +@@ -2240,16 +2126,16 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then @@ -5450,7 +41205,7 @@ Index: gtk+2.0-2.14.3/configure >$cache_file fi -@@ -2263,38 +2160,29 @@ +@@ -2263,38 +2149,29 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) @@ -5501,7 +41256,7 @@ Index: gtk+2.0-2.14.3/configure *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in -@@ -2304,12 +2192,10 @@ +@@ -2304,12 +2181,10 @@ fi done if $ac_cache_corrupted; then @@ -5518,17 +41273,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } fi -@@ -2350,7 +2236,8 @@ - # Save this value here, since automake will set cflags later - cflags_set=${CFLAGS+set} - --am__api_version="1.7" -+am__api_version='1.10' -+ - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then -@@ -2368,8 +2255,8 @@ +@@ -2368,8 +2243,8 @@ fi done if test -z "$ac_aux_dir"; then @@ -5539,7 +41284,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } fi -@@ -2395,12 +2282,11 @@ +@@ -2395,12 +2270,11 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. @@ -5555,7 +41300,7 @@ Index: gtk+2.0-2.14.3/configure else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -2429,29 +2315,17 @@ +@@ -2429,29 +2303,17 @@ # program-specific install script used by HP pwplus--don't use. : else @@ -5587,7 +41332,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "${ac_cv_path_install+set}" = set; then -@@ -2464,8 +2338,8 @@ +@@ -2464,8 +2326,8 @@ INSTALL=$ac_install_sh fi fi @@ -5598,7 +41343,7 @@ Index: gtk+2.0-2.14.3/configure # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. -@@ -2475,8 +2349,8 @@ +@@ -2475,8 +2337,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -5609,7 +41354,7 @@ Index: gtk+2.0-2.14.3/configure # Just in case sleep 1 echo timestamp > conftest.file -@@ -2499,9 +2373,9 @@ +@@ -2499,9 +2361,9 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -5621,7 +41366,7 @@ Index: gtk+2.0-2.14.3/configure alias in your environment" >&2;} { (exit 1); exit 1; }; } fi -@@ -2512,24 +2386,26 @@ +@@ -2512,23 +2374,26 @@ # Ok. : else @@ -5647,16 +41392,15 @@ Index: gtk+2.0-2.14.3/configure # By default was `s,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -- +cat <<\_ACEOF >conftest.sed +s/[\\$]/&&/g;s/;s,x,x,$// +_ACEOF +program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +rm -f conftest.sed + # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` -@@ -2540,18 +2416,66 @@ +@@ -2540,18 +2405,18 @@ am_missing_run="$MISSING --run " else am_missing_run= @@ -5666,54 +41410,6 @@ Index: gtk+2.0-2.14.3/configure +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -+if test -z "$MKDIR_P"; then -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in mkdir gmkdir; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -+ 'mkdir (GNU coreutils) '* | \ -+ 'mkdir (coreutils) '* | \ -+ 'mkdir (fileutils) '4.1*) -+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext -+ break 3;; -+ esac -+ done -+ done -+done -+IFS=$as_save_IFS -+ -+fi -+ -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ MKDIR_P="$ac_cv_path_mkdir -p" -+ else -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for MKDIR_P within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ test -d ./--version && rmdir ./--version -+ MKDIR_P="$ac_install_sh -d" -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -+echo "${ECHO_T}$MKDIR_P" >&6; } -+ -+mkdir_p="$MKDIR_P" -+case $mkdir_p in -+ [\\/$]* | ?:[\\/]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac -+ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -5728,7 +41424,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. -@@ -2564,7 +2488,7 @@ +@@ -2564,7 +2429,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -5737,7 +41433,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -2575,23 +2499,22 @@ +@@ -2575,23 +2440,22 @@ fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then @@ -5769,7 +41465,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.make <<\_ACEOF SHELL = /bin/sh -@@ -2608,12 +2531,12 @@ +@@ -2608,12 +2472,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -5786,41 +41482,18 @@ Index: gtk+2.0-2.14.3/configure SET_MAKE="MAKE=${MAKE-make}" fi -@@ -2626,12 +2549,16 @@ - fi - rmdir .tst 2>/dev/null - -- # test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then +@@ -2629,8 +2493,8 @@ + # test to see if srcdir already configured + if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ am__isrc=' -I$(srcdir)' -+ # test to see if srcdir already configured -+ if test -f $srcdir/config.status; then -+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } -+ fi fi - # test whether we have cygpath -@@ -2665,10 +2592,7 @@ - - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -- --AMTAR=${AMTAR-"${am_missing_run}tar"} -- --install_sh=${install_sh-"$am_aux_dir/install-sh"} -+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - - # Installed binaries are usually stripped using `strip' when the user - # run `make install-strip'. However `strip' might not be the right -@@ -2678,10 +2602,10 @@ +@@ -2678,10 +2542,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -5834,7 +41507,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -2694,7 +2618,7 @@ +@@ -2694,7 +2558,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -5843,7 +41516,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -2705,11 +2629,11 @@ +@@ -2705,11 +2569,11 @@ fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then @@ -5859,7 +41532,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -2718,10 +2642,10 @@ +@@ -2718,10 +2582,10 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -5873,7 +41546,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -2734,7 +2658,7 @@ +@@ -2734,7 +2598,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -5882,7 +41555,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -2745,11 +2669,11 @@ +@@ -2745,11 +2609,11 @@ fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then @@ -5898,7 +41571,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_STRIP" = x; then -@@ -2757,8 +2681,12 @@ +@@ -2757,8 +2621,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5913,26 +41586,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP -@@ -2768,10 +2696,17 @@ - fi - - fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. -+# Always define AMTAR for backward compatibility. -+ -+AMTAR=${AMTAR-"${am_missing_run}tar"} -+ -+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -+ -+ - - - -@@ -2855,34 +2790,34 @@ +@@ -2855,34 +2723,34 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -5980,7 +41634,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; };; esac build=$ac_cv_build -@@ -2899,27 +2834,27 @@ +@@ -2899,27 +2767,27 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -6017,7 +41671,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; };; esac host=$ac_cv_host -@@ -2938,8 +2873,8 @@ +@@ -2938,8 +2806,8 @@ MATH_LIB=-lm @@ -6028,7 +41682,7 @@ Index: gtk+2.0-2.14.3/configure LIB_EXE_MACHINE_FLAG=X86 case "$host" in *-*-mingw*) -@@ -2956,8 +2891,8 @@ +@@ -2956,8 +2824,8 @@ os_win32=no ;; esac @@ -6039,7 +41693,7 @@ Index: gtk+2.0-2.14.3/configure -@@ -2975,10 +2910,10 @@ +@@ -2975,10 +2843,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -6053,7 +41707,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2991,7 +2926,7 @@ +@@ -2991,7 +2859,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -6062,7 +41716,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -3002,11 +2937,11 @@ +@@ -3002,11 +2870,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -6078,7 +41732,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -3015,10 +2950,10 @@ +@@ -3015,10 +2883,10 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -6092,7 +41746,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3031,7 +2966,7 @@ +@@ -3031,7 +2899,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -6101,7 +41755,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -3042,11 +2977,11 @@ +@@ -3042,11 +2910,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -6117,7 +41771,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_CC" = x; then -@@ -3054,8 +2989,12 @@ +@@ -3054,8 +2922,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6132,7 +41786,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac CC=$ac_ct_CC -@@ -3068,10 +3007,10 @@ +@@ -3068,10 +2940,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -6146,7 +41800,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3084,7 +3023,7 @@ +@@ -3084,7 +2956,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -6155,7 +41809,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -3095,11 +3034,11 @@ +@@ -3095,11 +2967,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -6171,7 +41825,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -3108,10 +3047,10 @@ +@@ -3108,10 +2980,10 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -6185,7 +41839,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3129,7 +3068,7 @@ +@@ -3129,7 +3001,7 @@ continue fi ac_cv_prog_CC="cc" @@ -6194,7 +41848,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -3152,11 +3091,11 @@ +@@ -3152,11 +3024,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -6210,7 +41864,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -3167,10 +3106,10 @@ +@@ -3167,10 +3039,10 @@ 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 @@ -6224,7 +41878,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3183,7 +3122,7 @@ +@@ -3183,7 +3055,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -6233,7 +41887,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -3194,11 +3133,11 @@ +@@ -3194,11 +3066,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -6249,7 +41903,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -3211,10 +3150,10 @@ +@@ -3211,10 +3083,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6263,7 +41917,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3227,7 +3166,7 @@ +@@ -3227,7 +3099,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -6272,7 +41926,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -3238,11 +3177,11 @@ +@@ -3238,11 +3110,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -6288,7 +41942,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -3254,8 +3193,12 @@ +@@ -3254,8 +3126,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6303,7 +41957,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac CC=$ac_ct_CC -@@ -3265,50 +3208,44 @@ +@@ -3265,50 +3141,44 @@ fi @@ -6365,7 +42019,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -@@ -3327,22 +3264,27 @@ +@@ -3327,22 +3197,27 @@ } _ACEOF ac_clean_files_save=$ac_clean_files @@ -6402,7 +42056,7 @@ Index: gtk+2.0-2.14.3/configure * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done -@@ -3353,11 +3295,10 @@ +@@ -3353,11 +3228,10 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6416,7 +42070,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); }; then # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -@@ -3368,7 +3309,7 @@ +@@ -3368,7 +3242,7 @@ do test -f "$ac_file" || continue case $ac_file in @@ -6425,7 +42079,7 @@ Index: gtk+2.0-2.14.3/configure ;; [ab].out ) # We found the default executable, but exeext='' is most -@@ -3395,27 +3336,25 @@ +@@ -3395,27 +3269,25 @@ ac_file='' fi @@ -6461,7 +42115,7 @@ Index: gtk+2.0-2.14.3/configure # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then -@@ -3424,53 +3363,49 @@ +@@ -3424,53 +3296,49 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6531,7 +42185,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -@@ -3479,33 +3414,31 @@ +@@ -3479,33 +3347,31 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -6574,7 +42228,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -3528,43 +3461,40 @@ +@@ -3528,43 +3394,40 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6630,7 +42284,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -3590,21 +3520,20 @@ +@@ -3590,21 +3453,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6655,7 +42309,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no -@@ -3614,19 +3543,15 @@ +@@ -3614,19 +3476,15 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -6681,7 +42335,7 @@ Index: gtk+2.0-2.14.3/configure else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes -@@ -3653,21 +3578,20 @@ +@@ -3653,21 +3511,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6706,7 +42360,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 CFLAGS="" -@@ -3692,21 +3616,20 @@ +@@ -3692,21 +3549,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6731,7 +42385,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_c_werror_flag=$ac_save_c_werror_flag -@@ -3732,21 +3655,20 @@ +@@ -3732,21 +3588,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6756,7 +42410,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -3761,8 +3683,8 @@ +@@ -3761,8 +3616,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi @@ -6767,7 +42421,7 @@ Index: gtk+2.0-2.14.3/configure if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then -@@ -3778,10 +3700,10 @@ +@@ -3778,10 +3633,10 @@ CFLAGS= fi fi @@ -6781,7 +42435,7 @@ Index: gtk+2.0-2.14.3/configure else ac_cv_prog_cc_c89=no ac_save_CC=$CC -@@ -3852,21 +3774,20 @@ +@@ -3852,21 +3707,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -6806,7 +42460,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -3882,15 +3803,15 @@ +@@ -3882,15 +3736,15 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -6828,7 +42482,7 @@ Index: gtk+2.0-2.14.3/configure esac -@@ -3911,8 +3832,8 @@ +@@ -3911,8 +3765,8 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -6839,7 +42493,7 @@ Index: gtk+2.0-2.14.3/configure am__include="#" am__quote= _am_result=none -@@ -3939,8 +3860,8 @@ +@@ -3939,8 +3793,8 @@ fi @@ -6850,22 +42504,8 @@ Index: gtk+2.0-2.14.3/configure rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -@@ -3952,9 +3873,7 @@ - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - fi -- -- --if test "x$enable_dependency_tracking" != xno; then -+ if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' - else -@@ -3964,13 +3883,12 @@ +@@ -3967,10 +3821,10 @@ - - -- depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 @@ -6878,41 +42518,7 @@ Index: gtk+2.0-2.14.3/configure else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up -@@ -4006,7 +3924,9 @@ - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- : > sub/conftst$i.h -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -@@ -4030,13 +3950,19 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi -@@ -4050,13 +3976,11 @@ +@@ -4050,8 +3904,8 @@ fi fi @@ -6922,18 +42528,13 @@ Index: gtk+2.0-2.14.3/configure +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -- -- --if -+ if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= -@@ -4092,16 +4016,24 @@ + +@@ -4093,15 +3947,25 @@ -+ if test "$enable_static" = yes; then ++ ++if test "$enable_static" = yes; then + ENABLE_STATIC_TRUE= + ENABLE_STATIC_FALSE='#' +else @@ -6941,7 +42542,7 @@ Index: gtk+2.0-2.14.3/configure + ENABLE_STATIC_FALSE= +fi + - ++ if test -n "$ac_tool_prefix"; then for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl do @@ -6957,7 +42558,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -4114,7 +4046,7 @@ +@@ -4114,7 +3978,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -6966,7 +42567,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -4125,11 +4057,11 @@ +@@ -4125,11 +3989,11 @@ fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then @@ -6982,7 +42583,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -4142,10 +4074,10 @@ +@@ -4142,10 +4006,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -6996,7 +42597,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -4158,7 +4090,7 @@ +@@ -4158,7 +4022,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -7005,7 +42606,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -4169,11 +4101,11 @@ +@@ -4169,11 +4033,11 @@ fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then @@ -7021,7 +42622,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -4185,8 +4117,12 @@ +@@ -4185,8 +4049,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -7036,7 +42637,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX -@@ -4215,10 +4151,10 @@ +@@ -4215,10 +4083,10 @@ 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 @@ -7050,7 +42651,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -4231,7 +4167,7 @@ +@@ -4231,7 +4099,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -7059,7 +42660,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -4242,11 +4178,11 @@ +@@ -4242,11 +4110,11 @@ fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then @@ -7075,7 +42676,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -4259,10 +4195,10 @@ +@@ -4259,10 +4127,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7089,7 +42690,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -4275,7 +4211,7 @@ +@@ -4275,7 +4143,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -7098,7 +42699,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -4286,11 +4222,11 @@ +@@ -4286,11 +4154,11 @@ fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then @@ -7114,7 +42715,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -4302,8 +4238,12 @@ +@@ -4302,8 +4170,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -7129,7 +42730,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX -@@ -4313,47 +4253,43 @@ +@@ -4313,47 +4185,43 @@ fi fi # Provide some information about the compiler. @@ -7188,7 +42789,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -4379,21 +4315,20 @@ +@@ -4379,21 +4247,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7213,7 +42814,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no -@@ -4403,19 +4338,15 @@ +@@ -4403,19 +4270,15 @@ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -7239,7 +42840,7 @@ Index: gtk+2.0-2.14.3/configure else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes -@@ -4442,21 +4373,20 @@ +@@ -4442,21 +4305,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7264,7 +42865,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 CXXFLAGS="" -@@ -4481,21 +4411,20 @@ +@@ -4481,21 +4343,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7289,7 +42890,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cxx_werror_flag=$ac_save_cxx_werror_flag -@@ -4521,21 +4450,20 @@ +@@ -4521,21 +4382,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7314,7 +42915,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -4550,8 +4478,8 @@ +@@ -4550,8 +4410,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi @@ -7325,7 +42926,7 @@ Index: gtk+2.0-2.14.3/configure if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then -@@ -4575,10 +4503,10 @@ +@@ -4575,10 +4435,10 @@ depcc="$CXX" am_compiler_list= @@ -7339,41 +42940,7 @@ Index: gtk+2.0-2.14.3/configure else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up -@@ -4614,7 +4542,9 @@ - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- : > sub/conftst$i.h -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -@@ -4638,13 +4568,19 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi -@@ -4658,13 +4594,11 @@ +@@ -4658,8 +4518,8 @@ fi fi @@ -7383,14 +42950,8 @@ Index: gtk+2.0-2.14.3/configure +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -- -- --if -+ if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= -@@ -4697,30 +4631,27 @@ + +@@ -4697,21 +4557,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7415,17 +42976,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 CXX= - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- -- --if test "$CXX" != ""; then -+ if test "$CXX" != ""; then - HAVE_CXX_TRUE= - HAVE_CXX_FALSE='#' - else -@@ -4752,30 +4683,27 @@ +@@ -4752,21 +4611,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7450,17 +43001,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 OBJC=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- -- --if test "$OBJC" = "yes"; then -+ if test "$OBJC" = "yes"; then - HAVE_OBJC_TRUE= - HAVE_OBJC_FALSE='#' - else -@@ -4793,13 +4721,13 @@ +@@ -4793,13 +4651,13 @@ if test "$os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -7478,7 +43019,7 @@ Index: gtk+2.0-2.14.3/configure fi enable_shared=yes fi -@@ -4854,10 +4782,10 @@ +@@ -4854,10 +4712,10 @@ fi @@ -7492,7 +43033,7 @@ Index: gtk+2.0-2.14.3/configure else # Loop through the user's path and test for sed and gsed. # Then use that list of sed's as ones to test for truncation. -@@ -4910,40 +4838,45 @@ +@@ -4910,40 +4768,45 @@ SED=$lt_cv_path_SED @@ -7505,14 +43046,14 @@ Index: gtk+2.0-2.14.3/configure -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then + if test "${ac_cv_path_GREP+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 - if test "${ac_cv_path_GREP+set}" = set; then -- $as_echo_n "(cached) " >&6 ++if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -z "$GREP"; then @@ -7552,7 +43093,7 @@ Index: gtk+2.0-2.14.3/configure "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` -@@ -4958,60 +4891,74 @@ +@@ -4958,60 +4821,74 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac @@ -7647,7 +43188,7 @@ Index: gtk+2.0-2.14.3/configure "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` -@@ -5026,24 +4973,33 @@ +@@ -5026,24 +4903,33 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac @@ -7689,7 +43230,7 @@ Index: gtk+2.0-2.14.3/configure EGREP="$ac_cv_path_EGREP" -@@ -5058,8 +5014,8 @@ +@@ -5058,8 +4944,8 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -7700,7 +43241,7 @@ Index: gtk+2.0-2.14.3/configure case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw -@@ -5088,14 +5044,14 @@ +@@ -5088,14 +4974,14 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -7720,7 +43261,7 @@ Index: gtk+2.0-2.14.3/configure else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -5125,19 +5081,19 @@ +@@ -5125,19 +5011,19 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -7749,7 +43290,7 @@ Index: gtk+2.0-2.14.3/configure else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else -@@ -5429,8 +5385,8 @@ +@@ -5429,8 +5315,8 @@ esac fi @@ -7848,7 +43389,7 @@ Index: gtk+2.0-2.14.3/configure file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5464,7 +5420,7 @@ +@@ -5464,7 +5350,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7857,12 +43398,12 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) -@@ -5479,11 +5435,11 @@ +@@ -5479,11 +5365,11 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5482 "configure"' > conftest.$ac_ext -+ echo '#line 5438 "configure"' > conftest.$ac_ext ++ echo '#line 5368 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7871,7 +43412,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in -@@ -5521,7 +5477,7 @@ +@@ -5521,7 +5407,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7880,7 +43421,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); }; then case `/usr/bin/file conftest.o` in *32-bit*) -@@ -5544,7 +5500,6 @@ +@@ -5544,7 +5430,6 @@ esac ;; *64-bit*) @@ -7888,7 +43429,7 @@ Index: gtk+2.0-2.14.3/configure case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -5572,10 +5527,10 @@ +@@ -5572,10 +5457,10 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" @@ -7902,7 +43443,7 @@ Index: gtk+2.0-2.14.3/configure else ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -5604,30 +5559,26 @@ +@@ -5604,30 +5489,26 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -7938,7 +43479,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c -@@ -5637,8 +5588,8 @@ +@@ -5637,8 +5518,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi @@ -7949,7 +43490,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" -@@ -5650,7 +5601,7 @@ +@@ -5650,7 +5531,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7958,7 +43499,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); }; then case `/usr/bin/file conftest.o` in *64-bit*) -@@ -5672,10 +5623,10 @@ +@@ -5672,10 +5553,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 @@ -7972,7 +43513,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -@@ -5688,7 +5639,7 @@ +@@ -5688,7 +5569,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -7981,7 +43522,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -5699,11 +5650,11 @@ +@@ -5699,11 +5580,11 @@ fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then @@ -7997,7 +43538,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -5712,10 +5663,10 @@ +@@ -5712,10 +5593,10 @@ ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 @@ -8011,7 +43552,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -@@ -5728,7 +5679,7 @@ +@@ -5728,7 +5609,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -8020,7 +43561,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -5739,11 +5690,11 @@ +@@ -5739,11 +5620,11 @@ fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then @@ -8036,7 +43577,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_DLLTOOL" = x; then -@@ -5751,8 +5702,12 @@ +@@ -5751,8 +5632,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -8051,7 +43592,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL -@@ -5764,10 +5719,10 @@ +@@ -5764,10 +5649,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 @@ -8065,7 +43606,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. -@@ -5780,7 +5735,7 @@ +@@ -5780,7 +5665,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -8074,7 +43615,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -5791,11 +5746,11 @@ +@@ -5791,11 +5676,11 @@ fi AS=$ac_cv_prog_AS if test -n "$AS"; then @@ -8090,7 +43631,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -5804,10 +5759,10 @@ +@@ -5804,10 +5689,10 @@ ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 @@ -8104,7 +43645,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_AS"; then ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -@@ -5820,7 +5775,7 @@ +@@ -5820,7 +5705,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -8113,7 +43654,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -5831,11 +5786,11 @@ +@@ -5831,11 +5716,11 @@ fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then @@ -8129,7 +43670,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_AS" = x; then -@@ -5843,8 +5798,12 @@ +@@ -5843,8 +5728,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -8144,7 +43685,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac AS=$ac_ct_AS -@@ -5856,10 +5815,10 @@ +@@ -5856,10 +5745,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -8158,7 +43699,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -@@ -5872,7 +5831,7 @@ +@@ -5872,7 +5761,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -8167,7 +43708,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -5883,11 +5842,11 @@ +@@ -5883,11 +5772,11 @@ fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then @@ -8183,7 +43724,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -5896,10 +5855,10 @@ +@@ -5896,10 +5785,10 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 @@ -8197,7 +43738,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -@@ -5912,7 +5871,7 @@ +@@ -5912,7 +5801,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -8206,7 +43747,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -5923,11 +5882,11 @@ +@@ -5923,11 +5812,11 @@ fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then @@ -8222,7 +43763,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_OBJDUMP" = x; then -@@ -5935,8 +5894,12 @@ +@@ -5935,8 +5824,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -8237,7 +43778,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP -@@ -5957,15 +5920,15 @@ +@@ -5957,15 +5850,15 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -8256,7 +43797,7 @@ Index: gtk+2.0-2.14.3/configure else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -5997,21 +5960,20 @@ +@@ -5997,21 +5890,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8281,7 +43822,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6035,14 +5997,13 @@ +@@ -6035,14 +5927,13 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8298,7 +43839,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -6050,7 +6011,7 @@ +@@ -6050,7 +5941,7 @@ # Broken: success on invalid input. continue else @@ -8307,7 +43848,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6075,8 +6036,8 @@ +@@ -6075,8 +5966,8 @@ else ac_cv_prog_CPP=$CPP fi @@ -8318,7 +43859,7 @@ Index: gtk+2.0-2.14.3/configure ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do -@@ -6104,21 +6065,20 @@ +@@ -6104,21 +5995,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8343,7 +43884,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6142,14 +6102,13 @@ +@@ -6142,14 +6032,13 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8360,7 +43901,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -6157,7 +6116,7 @@ +@@ -6157,7 +6046,7 @@ # Broken: success on invalid input. continue else @@ -8369,7 +43910,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6173,13 +6132,11 @@ +@@ -6173,13 +6062,11 @@ if $ac_preproc_ok; then : else @@ -8386,7 +43927,7 @@ Index: gtk+2.0-2.14.3/configure fi ac_ext=c -@@ -6189,10 +6146,10 @@ +@@ -6189,10 +6076,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -8400,7 +43941,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -6219,21 +6176,20 @@ +@@ -6219,21 +6106,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8425,7 +43966,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no -@@ -6325,40 +6281,37 @@ +@@ -6325,40 +6211,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8474,7 +44015,7 @@ Index: gtk+2.0-2.14.3/configure if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF -@@ -6380,11 +6333,11 @@ +@@ -6380,11 +6263,11 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do @@ -8490,7 +44031,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -6402,21 +6355,20 @@ +@@ -6402,21 +6285,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8515,7 +44056,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" -@@ -6424,15 +6376,12 @@ +@@ -6424,15 +6306,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -8536,7 +44077,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -6443,21 +6392,20 @@ +@@ -6443,21 +6322,20 @@ for ac_header in dlfcn.h do @@ -8567,7 +44108,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -6473,33 +6421,32 @@ +@@ -6473,33 +6351,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8608,7 +44149,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -6513,52 +6460,51 @@ +@@ -6513,52 +6390,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8682,7 +44223,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -6567,24 +6513,21 @@ +@@ -6567,24 +6443,21 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -8715,7 +44256,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -6601,11 +6544,11 @@ +@@ -6601,11 +6474,11 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -8730,7 +44271,7 @@ Index: gtk+2.0-2.14.3/configure else # Double quotes because CXXCPP needs to be expanded for CXXCPP in "$CXX -E" "/lib/cpp" -@@ -6637,21 +6580,20 @@ +@@ -6637,21 +6510,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8755,7 +44296,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6675,14 +6617,13 @@ +@@ -6675,14 +6547,13 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8772,7 +44313,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err -@@ -6690,7 +6631,7 @@ +@@ -6690,7 +6561,7 @@ # Broken: success on invalid input. continue else @@ -8781,7 +44322,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6715,8 +6656,8 @@ +@@ -6715,8 +6586,8 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi @@ -8792,7 +44333,7 @@ Index: gtk+2.0-2.14.3/configure ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do -@@ -6744,21 +6685,20 @@ +@@ -6744,21 +6615,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8817,7 +44358,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6782,14 +6722,13 @@ +@@ -6782,14 +6652,13 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -8834,7 +44375,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err -@@ -6797,7 +6736,7 @@ +@@ -6797,7 +6666,7 @@ # Broken: success on invalid input. continue else @@ -8843,7 +44384,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6813,13 +6752,11 @@ +@@ -6813,13 +6682,11 @@ if $ac_preproc_ok; then : else @@ -8860,7 +44401,7 @@ Index: gtk+2.0-2.14.3/configure fi ac_ext=cpp -@@ -6839,10 +6776,10 @@ +@@ -6839,10 +6706,10 @@ 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 @@ -8874,7 +44415,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$F77"; then ac_cv_prog_F77="$F77" # Let the user override the test. -@@ -6855,7 +6792,7 @@ +@@ -6855,7 +6722,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -8883,7 +44424,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -6866,11 +6803,11 @@ +@@ -6866,11 +6733,11 @@ fi F77=$ac_cv_prog_F77 if test -n "$F77"; then @@ -8899,7 +44440,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -6883,10 +6820,10 @@ +@@ -6883,10 +6750,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -8913,7 +44454,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_F77"; then ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -@@ -6899,7 +6836,7 @@ +@@ -6899,7 +6766,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -8922,7 +44463,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -6910,11 +6847,11 @@ +@@ -6910,11 +6777,11 @@ fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then @@ -8938,7 +44479,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -6926,8 +6863,12 @@ +@@ -6926,8 +6793,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -8953,7 +44494,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac F77=$ac_ct_F77 -@@ -6936,41 +6877,37 @@ +@@ -6936,41 +6807,37 @@ # Provide some information about the compiler. @@ -9003,7 +44544,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } rm -f a.out -@@ -6978,10 +6915,10 @@ +@@ -6978,10 +6845,10 @@ # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F @@ -9017,7 +44558,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF program main -@@ -6997,21 +6934,20 @@ +@@ -6997,21 +6864,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9042,7 +44583,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no -@@ -7021,16 +6957,16 @@ +@@ -7021,16 +6887,16 @@ ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi @@ -9064,7 +44605,7 @@ Index: gtk+2.0-2.14.3/configure else FFLAGS=-g cat >conftest.$ac_ext <<_ACEOF -@@ -7044,21 +6980,20 @@ +@@ -7044,21 +6910,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9089,7 +44630,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_f77_g=no -@@ -7067,8 +7002,8 @@ +@@ -7067,8 +6932,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9100,7 +44641,7 @@ Index: gtk+2.0-2.14.3/configure if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then -@@ -7085,11 +7020,7 @@ +@@ -7085,11 +6950,7 @@ fi fi @@ -9113,7 +44654,7 @@ Index: gtk+2.0-2.14.3/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7100,10 +7031,10 @@ +@@ -7100,10 +6961,10 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments @@ -9127,7 +44668,7 @@ Index: gtk+2.0-2.14.3/configure else i=0 teststring="ABCD" -@@ -7212,11 +7143,11 @@ +@@ -7212,11 +7073,11 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then @@ -9143,7 +44684,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -7224,10 +7155,10 @@ +@@ -7224,10 +7085,10 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -9157,7 +44698,7 @@ Index: gtk+2.0-2.14.3/configure else # These are sane defaults that work on at least a few old systems. -@@ -7332,14 +7263,14 @@ +@@ -7332,14 +7193,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9174,7 +44715,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then -@@ -7394,7 +7325,7 @@ +@@ -7394,7 +7255,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? @@ -9183,7 +44724,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } && test -s conftest${ac_exeext}; then pipe_works=yes fi -@@ -7429,17 +7360,17 @@ +@@ -7429,17 +7290,17 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then @@ -9208,7 +44749,7 @@ Index: gtk+2.0-2.14.3/configure else rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null -@@ -7451,8 +7382,8 @@ +@@ -7451,8 +7312,8 @@ fi rmdir .libs 2>/dev/null fi @@ -9219,7 +44760,7 @@ Index: gtk+2.0-2.14.3/configure objdir=$lt_cv_objdir -@@ -7503,10 +7434,10 @@ +@@ -7503,10 +7364,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -9233,7 +44774,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. -@@ -7519,7 +7450,7 @@ +@@ -7519,7 +7380,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -9242,7 +44783,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -7530,11 +7461,11 @@ +@@ -7530,11 +7391,11 @@ fi AR=$ac_cv_prog_AR if test -n "$AR"; then @@ -9258,7 +44799,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -7543,10 +7474,10 @@ +@@ -7543,10 +7404,10 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 @@ -9272,7 +44813,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -@@ -7559,7 +7490,7 @@ +@@ -7559,7 +7420,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -9281,7 +44822,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -7570,11 +7501,11 @@ +@@ -7570,11 +7431,11 @@ fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then @@ -9297,7 +44838,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_AR" = x; then -@@ -7582,8 +7513,12 @@ +@@ -7582,8 +7443,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -9312,7 +44853,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac AR=$ac_ct_AR -@@ -7595,10 +7530,10 @@ +@@ -7595,10 +7460,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -9326,7 +44867,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -7611,7 +7546,7 @@ +@@ -7611,7 +7476,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -9335,7 +44876,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -7622,11 +7557,11 @@ +@@ -7622,11 +7487,11 @@ fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then @@ -9351,7 +44892,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -7635,10 +7570,10 @@ +@@ -7635,10 +7500,10 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @@ -9365,7 +44906,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -7651,7 +7586,7 @@ +@@ -7651,7 +7516,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -9374,7 +44915,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -7662,11 +7597,11 @@ +@@ -7662,11 +7527,11 @@ fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then @@ -9390,7 +44931,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_RANLIB" = x; then -@@ -7674,8 +7609,12 @@ +@@ -7674,8 +7539,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -9405,7 +44946,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB -@@ -7687,10 +7626,10 @@ +@@ -7687,10 +7556,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -9419,7 +44960,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -7703,7 +7642,7 @@ +@@ -7703,7 +7572,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -9428,7 +44969,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -7714,11 +7653,11 @@ +@@ -7714,11 +7583,11 @@ fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then @@ -9444,7 +44985,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -7727,10 +7666,10 @@ +@@ -7727,10 +7596,10 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -9458,7 +44999,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -7743,7 +7682,7 @@ +@@ -7743,7 +7612,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -9467,7 +45008,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -7754,11 +7693,11 @@ +@@ -7754,11 +7623,11 @@ fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then @@ -9483,7 +45024,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_STRIP" = x; then -@@ -7766,8 +7705,12 @@ +@@ -7766,8 +7635,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -9498,7 +45039,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP -@@ -7830,10 +7773,10 @@ +@@ -7830,10 +7703,10 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -9512,7 +45053,7 @@ Index: gtk+2.0-2.14.3/configure else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) -@@ -7883,19 +7826,19 @@ +@@ -7883,19 +7756,19 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -9539,7 +45080,7 @@ Index: gtk+2.0-2.14.3/configure else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) -@@ -7945,11 +7888,11 @@ +@@ -7945,11 +7818,11 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -9555,7 +45096,7 @@ Index: gtk+2.0-2.14.3/configure fi else -@@ -7967,10 +7910,10 @@ +@@ -7967,10 +7840,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 @@ -9569,7 +45110,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -@@ -7983,7 +7926,7 @@ +@@ -7983,7 +7856,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" @@ -9578,7 +45119,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -7994,11 +7937,11 @@ +@@ -7994,11 +7867,11 @@ fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then @@ -9594,7 +45135,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -8007,10 +7950,10 @@ +@@ -8007,10 +7880,10 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 @@ -9608,7 +45149,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -@@ -8023,7 +7966,7 @@ +@@ -8023,7 +7896,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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_DSYMUTIL="dsymutil" @@ -9617,7 +45158,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -8034,11 +7977,11 @@ +@@ -8034,11 +7907,11 @@ fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then @@ -9633,7 +45174,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_DSYMUTIL" = x; then -@@ -8046,8 +7989,12 @@ +@@ -8046,8 +7919,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -9648,7 +45189,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL -@@ -8059,10 +8006,10 @@ +@@ -8059,10 +7936,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 @@ -9662,7 +45203,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -@@ -8075,7 +8022,7 @@ +@@ -8075,7 +7952,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" @@ -9671,7 +45212,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -8086,11 +8033,11 @@ +@@ -8086,11 +7963,11 @@ fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then @@ -9687,7 +45228,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -8099,10 +8046,10 @@ +@@ -8099,10 +7976,10 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 @@ -9701,7 +45242,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -@@ -8115,7 +8062,7 @@ +@@ -8115,7 +7992,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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_NMEDIT="nmedit" @@ -9710,7 +45251,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -8126,11 +8073,11 @@ +@@ -8126,11 +8003,11 @@ fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then @@ -9726,7 +45267,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_NMEDIT" = x; then -@@ -8138,8 +8085,12 @@ +@@ -8138,8 +8015,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -9741,7 +45282,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT -@@ -8149,10 +8100,10 @@ +@@ -8149,10 +8030,10 @@ fi @@ -9755,7 +45296,7 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then -@@ -8170,12 +8121,12 @@ +@@ -8170,12 +8051,12 @@ rm conftest.c fi fi @@ -9773,7 +45314,7 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS -@@ -8202,37 +8153,33 @@ +@@ -8202,37 +8083,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -9818,7 +45359,7 @@ Index: gtk+2.0-2.14.3/configure case $host_os in rhapsody* | darwin1.[0123]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -@@ -8344,10 +8291,10 @@ +@@ -8344,10 +8221,10 @@ lt_prog_compiler_no_builtin_flag=' -fno-builtin' @@ -9832,21 +45373,21 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext -@@ -8362,11 +8309,11 @@ +@@ -8362,11 +8239,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:8365: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8312: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8242: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8369: \$? = $ac_status" >&5 -+ echo "$as_me:8316: \$? = $ac_status" >&5 ++ echo "$as_me:8246: \$? = $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. -@@ -8379,8 +8326,8 @@ +@@ -8379,8 +8256,8 @@ $rm conftest* fi @@ -9857,7 +45398,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -@@ -8394,8 +8341,8 @@ +@@ -8394,8 +8271,8 @@ lt_prog_compiler_pic= lt_prog_compiler_static= @@ -9868,7 +45409,7 @@ Index: gtk+2.0-2.14.3/configure if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8626,18 +8573,18 @@ +@@ -8626,18 +8503,18 @@ esac fi @@ -9892,21 +45433,21 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext -@@ -8652,11 +8599,11 @@ +@@ -8652,11 +8529,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:8655: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8602: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8532: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8659: \$? = $ac_status" >&5 -+ echo "$as_me:8606: \$? = $ac_status" >&5 ++ echo "$as_me:8536: \$? = $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. -@@ -8669,8 +8616,8 @@ +@@ -8669,8 +8546,8 @@ $rm conftest* fi @@ -9917,7 +45458,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in -@@ -8697,10 +8644,10 @@ +@@ -8697,10 +8574,10 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" @@ -9931,7 +45472,7 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" -@@ -8725,8 +8672,8 @@ +@@ -8725,8 +8602,8 @@ LDFLAGS="$save_LDFLAGS" fi @@ -9942,7 +45483,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_prog_compiler_static_works" = xyes; then : -@@ -8735,10 +8682,10 @@ +@@ -8735,10 +8612,10 @@ fi @@ -9956,21 +45497,21 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_c_o=no $rm -r conftest 2>/dev/null -@@ -8756,11 +8703,11 @@ +@@ -8756,11 +8633,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:8759: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8706: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8636: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8763: \$? = $ac_status" >&5 -+ echo "$as_me:8710: \$? = $ac_status" >&5 ++ echo "$as_me:8640: \$? = $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 -@@ -8782,34 +8729,34 @@ +@@ -8782,34 +8659,34 @@ $rm conftest* fi @@ -10015,7 +45556,7 @@ Index: gtk+2.0-2.14.3/configure runpath_var= allow_undefined_flag= -@@ -9021,12 +8968,13 @@ +@@ -9021,12 +8898,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -10030,7 +45571,7 @@ Index: gtk+2.0-2.14.3/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -9239,21 +9187,18 @@ +@@ -9239,21 +9117,18 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10056,7 +45597,7 @@ Index: gtk+2.0-2.14.3/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -9268,13 +9213,12 @@ +@@ -9268,13 +9143,12 @@ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -10071,7 +45612,7 @@ Index: gtk+2.0-2.14.3/configure 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 -@@ -9309,21 +9253,18 @@ +@@ -9309,21 +9183,18 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10097,7 +45638,7 @@ Index: gtk+2.0-2.14.3/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -9338,13 +9279,12 @@ +@@ -9338,13 +9209,12 @@ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -10112,7 +45653,7 @@ Index: gtk+2.0-2.14.3/configure 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 -@@ -9577,7 +9517,7 @@ +@@ -9577,7 +9447,7 @@ link_all_deplibs=yes ;; @@ -10121,7 +45662,7 @@ Index: gtk+2.0-2.14.3/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -9796,8 +9736,8 @@ +@@ -9796,8 +9666,8 @@ esac fi @@ -10132,7 +45673,7 @@ Index: gtk+2.0-2.14.3/configure test "$ld_shlibs" = no && can_build_shared=no # -@@ -9817,15 +9757,15 @@ +@@ -9817,15 +9687,15 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -10151,7 +45692,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -9843,7 +9783,7 @@ +@@ -9843,7 +9713,7 @@ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -10160,7 +45701,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } then archive_cmds_need_lc=no -@@ -9855,16 +9795,16 @@ +@@ -9855,16 +9725,16 @@ cat conftest.err 1>&5 fi $rm conftest* @@ -10181,7 +45722,7 @@ Index: gtk+2.0-2.14.3/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -10272,13 +10212,11 @@ +@@ -10272,13 +10142,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -10196,7 +45737,7 @@ Index: gtk+2.0-2.14.3/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -10290,6 +10228,18 @@ +@@ -10290,6 +10158,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -10215,7 +45756,7 @@ Index: gtk+2.0-2.14.3/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -10467,19 +10417,19 @@ +@@ -10467,19 +10347,19 @@ dynamic_linker=no ;; esac @@ -10239,7 +45780,7 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -10491,8 +10441,8 @@ +@@ -10491,8 +10371,8 @@ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -10250,7 +45791,7 @@ Index: gtk+2.0-2.14.3/configure hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ -@@ -10516,8 +10466,8 @@ +@@ -10516,8 +10396,8 @@ # directories. hardcode_action=unsupported fi @@ -10261,7 +45802,7 @@ Index: gtk+2.0-2.14.3/configure if test "$hardcode_action" = relink; then # Fast installation is not supported -@@ -10530,13 +10480,13 @@ +@@ -10530,13 +10410,13 @@ striplib= old_striplib= @@ -10279,7 +45820,7 @@ Index: gtk+2.0-2.14.3/configure else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in -@@ -10544,16 +10494,16 @@ +@@ -10544,16 +10424,16 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" @@ -10302,7 +45843,7 @@ Index: gtk+2.0-2.14.3/configure ;; esac fi -@@ -10585,10 +10535,10 @@ +@@ -10585,10 +10465,10 @@ darwin*) # if libdl is installed we need to link against it @@ -10316,7 +45857,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -@@ -10620,37 +10570,33 @@ +@@ -10620,37 +10500,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10362,7 +45903,7 @@ Index: gtk+2.0-2.14.3/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else -@@ -10663,10 +10609,10 @@ +@@ -10663,10 +10539,10 @@ ;; *) @@ -10376,7 +45917,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -10719,42 +10665,38 @@ +@@ -10719,42 +10595,38 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10430,7 +45971,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -@@ -10786,43 +10728,39 @@ +@@ -10786,43 +10658,39 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10485,7 +46026,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -10875,42 +10813,38 @@ +@@ -10875,42 +10743,38 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10539,7 +46080,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -@@ -10942,43 +10876,39 @@ +@@ -10942,43 +10806,39 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10594,7 +46135,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -@@ -11010,43 +10940,39 @@ +@@ -11010,43 +10870,39 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10649,7 +46190,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -@@ -11078,37 +11004,33 @@ +@@ -11078,37 +10934,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -10695,7 +46236,7 @@ Index: gtk+2.0-2.14.3/configure lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -@@ -11147,10 +11069,10 @@ +@@ -11147,10 +10999,10 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -10709,16 +46250,16 @@ Index: gtk+2.0-2.14.3/configure else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross -@@ -11158,7 +11080,7 @@ +@@ -11158,7 +11010,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? @@ -10727,7 +46268,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? -@@ -11242,15 +11164,15 @@ +@@ -11242,15 +11094,15 @@ fi @@ -10748,16 +46289,16 @@ Index: gtk+2.0-2.14.3/configure else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross -@@ -11258,7 +11180,7 @@ +@@ -11258,7 +11110,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? @@ -10766,7 +46307,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? -@@ -11342,8 +11264,8 @@ +@@ -11342,8 +11194,8 @@ fi @@ -10777,7 +46318,7 @@ Index: gtk+2.0-2.14.3/configure fi CPPFLAGS="$save_CPPFLAGS" -@@ -11365,13 +11287,13 @@ +@@ -11365,13 +11217,13 @@ # Report which library types will actually be built @@ -10797,7 +46338,7 @@ Index: gtk+2.0-2.14.3/configure test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and -@@ -11391,15 +11313,15 @@ +@@ -11391,15 +11243,15 @@ fi ;; esac @@ -10819,7 +46360,7 @@ Index: gtk+2.0-2.14.3/configure # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh -@@ -11492,8 +11414,8 @@ +@@ -11492,8 +11344,8 @@ cfgfile="${ofile}T" trap "$rm \"$cfgfile\"; exit 1" 1 2 15 $rm -f "$cfgfile" @@ -10830,7 +46371,7 @@ Index: gtk+2.0-2.14.3/configure cat <<__EOF__ >> "$cfgfile" #! $SHELL -@@ -11905,18 +11827,18 @@ +@@ -11905,18 +11757,18 @@ if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -10855,7 +46396,7 @@ Index: gtk+2.0-2.14.3/configure fi fi if test -z "$LTCFLAGS"; then -@@ -11933,16 +11855,16 @@ +@@ -11933,16 +11785,16 @@ # Check whether tagname contains only valid characters case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in "") ;; @@ -10876,7 +46417,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } fi -@@ -12085,8 +12007,8 @@ +@@ -12085,8 +11937,8 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -10887,7 +46428,7 @@ Index: gtk+2.0-2.14.3/configure case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw -@@ -12115,14 +12037,14 @@ +@@ -12115,14 +11967,14 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -10907,7 +46448,7 @@ Index: gtk+2.0-2.14.3/configure else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -12152,19 +12074,19 @@ +@@ -12152,19 +12004,19 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -10936,7 +46477,7 @@ Index: gtk+2.0-2.14.3/configure else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 /dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -11040,7 +46581,7 @@ Index: gtk+2.0-2.14.3/configure 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 -@@ -12854,7 +12768,7 @@ +@@ -12854,7 +12698,7 @@ ;; esac ;; @@ -11049,7 +46590,7 @@ Index: gtk+2.0-2.14.3/configure 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= -@@ -13181,8 +13095,8 @@ +@@ -13181,8 +13025,8 @@ ld_shlibs_CXX=no ;; esac @@ -11060,7 +46601,7 @@ Index: gtk+2.0-2.14.3/configure test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" -@@ -13201,7 +13115,7 @@ +@@ -13201,7 +13045,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -11069,7 +46610,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. -@@ -13357,8 +13271,8 @@ +@@ -13357,8 +13201,8 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -11080,7 +46621,7 @@ Index: gtk+2.0-2.14.3/configure # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -13558,7 +13472,7 @@ +@@ -13558,7 +13402,7 @@ ;; esac ;; @@ -11089,7 +46630,7 @@ Index: gtk+2.0-2.14.3/configure ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -13641,18 +13555,18 @@ +@@ -13641,18 +13485,18 @@ esac fi @@ -11113,21 +46654,21 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext -@@ -13667,11 +13581,11 @@ +@@ -13667,11 +13511,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:13670: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13584: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13514: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13674: \$? = $ac_status" >&5 -+ echo "$as_me:13588: \$? = $ac_status" >&5 ++ echo "$as_me:13518: \$? = $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. -@@ -13684,8 +13598,8 @@ +@@ -13684,8 +13528,8 @@ $rm conftest* fi @@ -11138,7 +46679,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in -@@ -13712,10 +13626,10 @@ +@@ -13712,10 +13556,10 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" @@ -11152,7 +46693,7 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" -@@ -13740,8 +13654,8 @@ +@@ -13740,8 +13584,8 @@ LDFLAGS="$save_LDFLAGS" fi @@ -11163,7 +46704,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : -@@ -13750,10 +13664,10 @@ +@@ -13750,10 +13594,10 @@ fi @@ -11177,21 +46718,21 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_c_o_CXX=no $rm -r conftest 2>/dev/null -@@ -13771,11 +13685,11 @@ +@@ -13771,11 +13615,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:13774: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13688: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13618: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13778: \$? = $ac_status" >&5 -+ echo "$as_me:13692: \$? = $ac_status" >&5 ++ echo "$as_me:13622: \$? = $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 -@@ -13797,34 +13711,34 @@ +@@ -13797,34 +13641,34 @@ $rm conftest* fi @@ -11236,7 +46777,7 @@ Index: gtk+2.0-2.14.3/configure export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in -@@ -13843,14 +13757,17 @@ +@@ -13843,14 +13687,17 @@ 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' ;; @@ -11256,7 +46797,7 @@ Index: gtk+2.0-2.14.3/configure test "$ld_shlibs_CXX" = no && can_build_shared=no # -@@ -13870,15 +13787,15 @@ +@@ -13870,15 +13717,15 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -11275,7 +46816,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -13896,7 +13813,7 @@ +@@ -13896,7 +13743,7 @@ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -11284,7 +46825,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } then archive_cmds_need_lc_CXX=no -@@ -13908,16 +13825,16 @@ +@@ -13908,16 +13755,16 @@ cat conftest.err 1>&5 fi $rm conftest* @@ -11305,7 +46846,7 @@ Index: gtk+2.0-2.14.3/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -14273,13 +14190,11 @@ +@@ -14273,13 +14120,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -11320,7 +46861,7 @@ Index: gtk+2.0-2.14.3/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -14291,6 +14206,18 @@ +@@ -14291,6 +14136,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -11339,7 +46880,7 @@ Index: gtk+2.0-2.14.3/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -14468,19 +14395,19 @@ +@@ -14468,19 +14325,19 @@ dynamic_linker=no ;; esac @@ -11363,7 +46904,7 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -14492,8 +14419,8 @@ +@@ -14492,8 +14349,8 @@ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -11374,7 +46915,7 @@ Index: gtk+2.0-2.14.3/configure hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ -@@ -14517,8 +14444,8 @@ +@@ -14517,8 +14374,8 @@ # directories. hardcode_action_CXX=unsupported fi @@ -11385,7 +46926,7 @@ Index: gtk+2.0-2.14.3/configure if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported -@@ -15056,13 +14983,13 @@ +@@ -15056,13 +14913,13 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` @@ -11405,7 +46946,7 @@ Index: gtk+2.0-2.14.3/configure test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and -@@ -15081,15 +15008,15 @@ +@@ -15081,15 +14938,15 @@ fi ;; esac @@ -11427,7 +46968,7 @@ Index: gtk+2.0-2.14.3/configure GCC_F77="$G77" LD_F77="$LD" -@@ -15098,8 +15025,8 @@ +@@ -15098,8 +14955,8 @@ lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= @@ -11438,7 +46979,7 @@ Index: gtk+2.0-2.14.3/configure if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' -@@ -15330,18 +15257,18 @@ +@@ -15330,18 +15187,18 @@ esac fi @@ -11462,21 +47003,21 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext -@@ -15356,11 +15283,11 @@ +@@ -15356,11 +15213,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:15359: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15286: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15216: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15363: \$? = $ac_status" >&5 -+ echo "$as_me:15290: \$? = $ac_status" >&5 ++ echo "$as_me:15220: \$? = $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. -@@ -15373,8 +15300,8 @@ +@@ -15373,8 +15230,8 @@ $rm conftest* fi @@ -11487,7 +47028,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in -@@ -15401,10 +15328,10 @@ +@@ -15401,10 +15258,10 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" @@ -11501,7 +47042,7 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" -@@ -15429,8 +15356,8 @@ +@@ -15429,8 +15286,8 @@ LDFLAGS="$save_LDFLAGS" fi @@ -11512,7 +47053,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then : -@@ -15439,10 +15366,10 @@ +@@ -15439,10 +15296,10 @@ fi @@ -11526,21 +47067,21 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_c_o_F77=no $rm -r conftest 2>/dev/null -@@ -15460,11 +15387,11 @@ +@@ -15460,11 +15317,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:15463: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15390: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15320: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15467: \$? = $ac_status" >&5 -+ echo "$as_me:15394: \$? = $ac_status" >&5 ++ echo "$as_me:15324: \$? = $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 -@@ -15486,34 +15413,34 @@ +@@ -15486,34 +15343,34 @@ $rm conftest* fi @@ -11585,7 +47126,7 @@ Index: gtk+2.0-2.14.3/configure runpath_var= allow_undefined_flag_F77= -@@ -15725,12 +15652,13 @@ +@@ -15725,12 +15582,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -11600,7 +47141,7 @@ Index: gtk+2.0-2.14.3/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -15933,21 +15861,18 @@ +@@ -15933,21 +15791,18 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11626,7 +47167,7 @@ Index: gtk+2.0-2.14.3/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -15962,13 +15887,12 @@ +@@ -15962,13 +15817,12 @@ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -11641,7 +47182,7 @@ Index: gtk+2.0-2.14.3/configure 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 -@@ -15993,21 +15917,18 @@ +@@ -15993,21 +15847,18 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -11667,7 +47208,7 @@ Index: gtk+2.0-2.14.3/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -16022,13 +15943,12 @@ +@@ -16022,13 +15873,12 @@ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -11682,7 +47223,7 @@ Index: gtk+2.0-2.14.3/configure 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 -@@ -16261,7 +16181,7 @@ +@@ -16261,7 +16111,7 @@ link_all_deplibs_F77=yes ;; @@ -11691,7 +47232,7 @@ Index: gtk+2.0-2.14.3/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -16480,8 +16400,8 @@ +@@ -16480,8 +16330,8 @@ esac fi @@ -11702,7 +47243,7 @@ Index: gtk+2.0-2.14.3/configure test "$ld_shlibs_F77" = no && can_build_shared=no # -@@ -16501,15 +16421,15 @@ +@@ -16501,15 +16351,15 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -11721,7 +47262,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -16527,7 +16447,7 @@ +@@ -16527,7 +16377,7 @@ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -11730,7 +47271,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } then archive_cmds_need_lc_F77=no -@@ -16539,16 +16459,16 @@ +@@ -16539,16 +16389,16 @@ cat conftest.err 1>&5 fi $rm conftest* @@ -11751,7 +47292,7 @@ Index: gtk+2.0-2.14.3/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -16904,13 +16824,11 @@ +@@ -16904,13 +16754,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -11766,7 +47307,7 @@ Index: gtk+2.0-2.14.3/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -16922,6 +16840,18 @@ +@@ -16922,6 +16770,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -11785,7 +47326,7 @@ Index: gtk+2.0-2.14.3/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -17099,19 +17029,19 @@ +@@ -17099,19 +16959,19 @@ dynamic_linker=no ;; esac @@ -11809,7 +47350,7 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -17123,8 +17053,8 @@ +@@ -17123,8 +16983,8 @@ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -11820,7 +47361,7 @@ Index: gtk+2.0-2.14.3/configure hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var_F77" || \ -@@ -17148,8 +17078,8 @@ +@@ -17148,8 +17008,8 @@ # directories. hardcode_action_F77=unsupported fi @@ -11831,7 +47372,7 @@ Index: gtk+2.0-2.14.3/configure if test "$hardcode_action_F77" = relink; then # Fast installation is not supported -@@ -17659,10 +17589,10 @@ +@@ -17659,10 +17519,10 @@ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' @@ -11845,21 +47386,21 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext -@@ -17677,11 +17607,11 @@ +@@ -17677,11 +17537,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:17680: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17610: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17540: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17684: \$? = $ac_status" >&5 -+ echo "$as_me:17614: \$? = $ac_status" >&5 ++ echo "$as_me:17544: \$? = $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. -@@ -17694,8 +17624,8 @@ +@@ -17694,8 +17554,8 @@ $rm conftest* fi @@ -11870,7 +47411,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -@@ -17709,8 +17639,8 @@ +@@ -17709,8 +17569,8 @@ lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= @@ -11881,7 +47422,7 @@ Index: gtk+2.0-2.14.3/configure if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' -@@ -17941,18 +17871,18 @@ +@@ -17941,18 +17801,18 @@ esac fi @@ -11905,21 +47446,21 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext -@@ -17967,11 +17897,11 @@ +@@ -17967,11 +17827,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:17970: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17900: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17830: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17974: \$? = $ac_status" >&5 -+ echo "$as_me:17904: \$? = $ac_status" >&5 ++ echo "$as_me:17834: \$? = $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. -@@ -17984,8 +17914,8 @@ +@@ -17984,8 +17844,8 @@ $rm conftest* fi @@ -11930,7 +47471,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in -@@ -18012,10 +17942,10 @@ +@@ -18012,10 +17872,10 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" @@ -11944,7 +47485,7 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" -@@ -18040,8 +17970,8 @@ +@@ -18040,8 +17900,8 @@ LDFLAGS="$save_LDFLAGS" fi @@ -11955,7 +47496,7 @@ Index: gtk+2.0-2.14.3/configure if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then : -@@ -18050,10 +17980,10 @@ +@@ -18050,10 +17910,10 @@ fi @@ -11969,21 +47510,21 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_prog_compiler_c_o_GCJ=no $rm -r conftest 2>/dev/null -@@ -18071,11 +18001,11 @@ +@@ -18071,11 +17931,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:18074: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18004: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17934: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18078: \$? = $ac_status" >&5 -+ echo "$as_me:18008: \$? = $ac_status" >&5 ++ echo "$as_me:17938: \$? = $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 -@@ -18097,34 +18027,34 @@ +@@ -18097,34 +17957,34 @@ $rm conftest* fi @@ -12028,7 +47569,7 @@ Index: gtk+2.0-2.14.3/configure runpath_var= allow_undefined_flag_GCJ= -@@ -18336,12 +18266,13 @@ +@@ -18336,12 +18196,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -12043,7 +47584,7 @@ Index: gtk+2.0-2.14.3/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -18554,21 +18485,18 @@ +@@ -18554,21 +18415,18 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12069,7 +47610,7 @@ Index: gtk+2.0-2.14.3/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -18583,13 +18511,12 @@ +@@ -18583,13 +18441,12 @@ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -12084,7 +47625,7 @@ Index: gtk+2.0-2.14.3/configure 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 -@@ -18624,21 +18551,18 @@ +@@ -18624,21 +18481,18 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12110,7 +47651,7 @@ Index: gtk+2.0-2.14.3/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -18653,13 +18577,12 @@ +@@ -18653,13 +18507,12 @@ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -12125,7 +47666,7 @@ Index: gtk+2.0-2.14.3/configure 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 -@@ -18892,7 +18815,7 @@ +@@ -18892,7 +18745,7 @@ link_all_deplibs_GCJ=yes ;; @@ -12134,7 +47675,7 @@ Index: gtk+2.0-2.14.3/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -19111,8 +19034,8 @@ +@@ -19111,8 +18964,8 @@ esac fi @@ -12145,7 +47686,7 @@ Index: gtk+2.0-2.14.3/configure test "$ld_shlibs_GCJ" = no && can_build_shared=no # -@@ -19132,15 +19055,15 @@ +@@ -19132,15 +18985,15 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -12164,7 +47705,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -19158,7 +19081,7 @@ +@@ -19158,7 +19011,7 @@ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -12173,7 +47714,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } then archive_cmds_need_lc_GCJ=no -@@ -19170,16 +19093,16 @@ +@@ -19170,16 +19023,16 @@ cat conftest.err 1>&5 fi $rm conftest* @@ -12194,7 +47735,7 @@ Index: gtk+2.0-2.14.3/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -19535,13 +19458,11 @@ +@@ -19535,13 +19388,11 @@ # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -12209,7 +47750,7 @@ Index: gtk+2.0-2.14.3/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -19553,6 +19474,18 @@ +@@ -19553,6 +19404,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -12228,7 +47769,7 @@ Index: gtk+2.0-2.14.3/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -19730,19 +19663,19 @@ +@@ -19730,19 +19593,19 @@ dynamic_linker=no ;; esac @@ -12252,7 +47793,7 @@ Index: gtk+2.0-2.14.3/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -19754,8 +19687,8 @@ +@@ -19754,8 +19617,8 @@ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -12263,7 +47804,7 @@ Index: gtk+2.0-2.14.3/configure hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ test -n "$runpath_var_GCJ" || \ -@@ -19779,8 +19712,8 @@ +@@ -19779,8 +19642,8 @@ # directories. hardcode_action_GCJ=unsupported fi @@ -12274,7 +47815,7 @@ Index: gtk+2.0-2.14.3/configure if test "$hardcode_action_GCJ" = relink; then # Fast installation is not supported -@@ -20703,8 +20636,8 @@ +@@ -20703,8 +20566,8 @@ ;; *) @@ -12285,7 +47826,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } ;; esac -@@ -20723,8 +20656,8 @@ +@@ -20723,8 +20586,8 @@ chmod +x "$ofile" else rm -f "${ofile}T" @@ -12296,7 +47837,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } fi fi -@@ -20769,10 +20702,10 @@ +@@ -20769,10 +20632,10 @@ if test "$enable_largefile" != no; then @@ -12310,7 +47851,7 @@ Index: gtk+2.0-2.14.3/configure else ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then -@@ -20809,21 +20742,20 @@ +@@ -20809,21 +20672,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12335,7 +47876,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20837,21 +20769,20 @@ +@@ -20837,21 +20699,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12360,7 +47901,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20864,16 +20795,16 @@ +@@ -20864,16 +20725,16 @@ rm -f conftest.$ac_ext fi fi @@ -12382,7 +47923,7 @@ Index: gtk+2.0-2.14.3/configure else while :; do cat >conftest.$ac_ext <<_ACEOF -@@ -20905,21 +20836,20 @@ +@@ -20905,21 +20766,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12407,7 +47948,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20956,21 +20886,20 @@ +@@ -20956,21 +20816,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12432,7 +47973,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20981,8 +20910,8 @@ +@@ -20981,8 +20840,8 @@ break done fi @@ -12443,7 +47984,7 @@ Index: gtk+2.0-2.14.3/configure case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -@@ -20991,12 +20920,12 @@ +@@ -20991,12 +20850,12 @@ _ACEOF ;; esac @@ -12460,7 +48001,7 @@ Index: gtk+2.0-2.14.3/configure else while :; do cat >conftest.$ac_ext <<_ACEOF -@@ -21028,21 +20957,20 @@ +@@ -21028,21 +20887,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12485,7 +48026,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21079,21 +21007,20 @@ +@@ -21079,21 +20937,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -12510,7 +48051,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21104,8 +21031,8 @@ +@@ -21104,8 +20961,8 @@ break done fi @@ -12521,7 +48062,7 @@ Index: gtk+2.0-2.14.3/configure case $ac_cv_sys_large_files in #( no | unknown) ;; *) -@@ -21114,24 +21041,132 @@ +@@ -21114,7 +20971,7 @@ _ACEOF ;; esac @@ -12530,124 +48071,7 @@ Index: gtk+2.0-2.14.3/configure fi fi - - # By default we simply use the C compiler to build assembly code. - --: ${CCAS='$(CC)'} --# Set ASFLAGS if not already set. --: ${CCASFLAGS='$(CFLAGS)'} -+test "${CCAS+set}" = set || CCAS=$CC -+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS -+ -+ -+ -+depcc="$CCAS" am_compiler_list= -+ -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_CCAS_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CCAS_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_CCAS_dependencies_compiler_type=none -+fi -+ -+fi -+{ echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CCAS_dependencies_compiler_type" >&6; } -+CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type -+ -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then -+ am__fastdepCCAS_TRUE= -+ am__fastdepCCAS_FALSE='#' -+else -+ am__fastdepCCAS_TRUE='#' -+ am__fastdepCCAS_FALSE= -+fi - +@@ -21128,10 +20985,10 @@ # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 @@ -12661,7 +48085,7 @@ Index: gtk+2.0-2.14.3/configure else case $NM in [\\/]* | ?:[\\/]*) -@@ -21146,7 +21181,7 @@ +@@ -21146,7 +21003,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -12670,7 +48094,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -21159,17 +21194,17 @@ +@@ -21159,17 +21016,17 @@ fi NM=$ac_cv_path_NM if test -n "$NM"; then @@ -12694,22 +48118,18 @@ Index: gtk+2.0-2.14.3/configure # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -@@ -21177,11 +21212,9 @@ +@@ -21177,8 +21034,8 @@ USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } -- -- --if test $USE_MAINTAINER_MODE = yes; then + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } -+ if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' - else -@@ -21193,8 +21226,8 @@ + + + if test $USE_MAINTAINER_MODE = yes; then +@@ -21193,8 +21050,8 @@ @@ -12720,55 +48140,18 @@ Index: gtk+2.0-2.14.3/configure case "$host" in *-*-mingw*|*-*-cygwin*) platform_win32=yes -@@ -21203,11 +21236,9 @@ +@@ -21203,8 +21060,8 @@ platform_win32=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 -$as_echo "$platform_win32" >&6; } -- -- --if test "$platform_win32" = "yes"; then +{ echo "$as_me:$LINENO: result: $platform_win32" >&5 +echo "${ECHO_T}$platform_win32" >&6; } -+ if test "$platform_win32" = "yes"; then - PLATFORM_WIN32_TRUE= - PLATFORM_WIN32_FALSE='#' - else -@@ -21216,9 +21247,7 @@ - fi -- -- --if test "$os_win32" = "yes"; then -+ if test "$os_win32" = "yes"; then - OS_WIN32_TRUE= - OS_WIN32_FALSE='#' - else -@@ -21226,9 +21255,7 @@ - OS_WIN32_FALSE= - fi - -- -- --if test "$os_win32" != "yes"; then -+ if test "$os_win32" != "yes"; then - OS_UNIX_TRUE= - OS_UNIX_FALSE='#' - else -@@ -21236,9 +21263,7 @@ - OS_UNIX_FALSE= - fi - -- -- --if test "$os_linux" = "yes"; then -+ if test "$os_linux" = "yes"; then - OS_LINUX_TRUE= - OS_LINUX_FALSE='#' - else -@@ -21251,10 +21276,10 @@ + if test "$platform_win32" = "yes"; then +@@ -21251,10 +21108,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 @@ -12782,7 +48165,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. -@@ -21267,7 +21292,7 @@ +@@ -21267,7 +21124,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -12791,7 +48174,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -21278,11 +21303,11 @@ +@@ -21278,11 +21135,11 @@ fi WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then @@ -12807,7 +48190,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -21291,10 +21316,10 @@ +@@ -21291,10 +21148,10 @@ ac_ct_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 @@ -12821,7 +48204,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ac_ct_WINDRES"; then ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -@@ -21307,7 +21332,7 @@ +@@ -21307,7 +21164,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -12830,7 +48213,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -21318,11 +21343,11 @@ +@@ -21318,11 +21175,11 @@ fi ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES if test -n "$ac_ct_WINDRES"; then @@ -12846,7 +48229,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_ct_WINDRES" = x; then -@@ -21330,8 +21355,12 @@ +@@ -21330,8 +21187,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -12861,7 +48244,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac WINDRES=$ac_ct_WINDRES -@@ -21341,16 +21370,16 @@ +@@ -21341,16 +21202,16 @@ fi if test "$WINDRES" = no; then @@ -12883,7 +48266,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$ms_librarian"; then ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. -@@ -21363,7 +21392,7 @@ +@@ -21363,7 +21224,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -12892,7 +48275,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -21375,18 +21404,16 @@ +@@ -21375,11 +21236,11 @@ fi ms_librarian=$ac_cv_prog_ms_librarian if test -n "$ms_librarian"; then @@ -12908,15 +48291,7 @@ Index: gtk+2.0-2.14.3/configure fi - fi -- -- --if test x$ms_librarian = xyes; then -+ if test x$ms_librarian = xyes; then - MS_LIB_AVAILABLE_TRUE= - MS_LIB_AVAILABLE_FALSE='#' - else -@@ -21463,8 +21490,8 @@ +@@ -21463,8 +21324,8 @@ case $gdktarget in x11|win32|quartz|directfb) ;; @@ -12927,7 +48302,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; };; esac -@@ -21499,8 +21526,8 @@ +@@ -21499,8 +21360,8 @@ # Build time sanity check... @@ -12938,7 +48313,7 @@ Index: gtk+2.0-2.14.3/configure # Just in case sleep 1 echo timestamp > conftest.file -@@ -21523,9 +21550,9 @@ +@@ -21523,9 +21384,9 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -12950,7 +48325,7 @@ Index: gtk+2.0-2.14.3/configure alias in your environment" >&2;} { (exit 1); exit 1; }; } fi -@@ -21536,20 +21563,20 @@ +@@ -21536,20 +21397,20 @@ # Ok. : else @@ -12978,7 +48353,7 @@ Index: gtk+2.0-2.14.3/configure else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -21587,30 +21614,26 @@ +@@ -21587,30 +21448,26 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13014,7 +48389,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_strerror+set}" = set; then -@@ -21625,40 +21648,582 @@ +@@ -21625,8 +21482,8 @@ rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi @@ -13025,640 +48400,21 @@ Index: gtk+2.0-2.14.3/configure ac_res=$ac_cv_search_strerror if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +@@ -21636,10 +21493,10 @@ - fi -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}gcc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ - -+fi -+if test -z "$ac_cv_prog_CC"; then -+ ac_ct_CC=$CC -+ # Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 -$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; } --if test "${am_cv_prog_cc_stdc+set}" = set; then ++{ echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 ++echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6; } + if test "${am_cv_prog_cc_stdc+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- am_cv_prog_cc_stdc=no --ac_save_CC="$CC" --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi -+else -+ CC="$ac_cv_prog_CC" -+fi -+ -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}cc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH - do -- CC="$ac_save_CC $ac_arg" -+ 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_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ fi -+fi -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ ac_prog_rejected=no -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+ ac_cv_prog_CC="cc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# != 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -+ fi -+fi -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in cl.exe -+ 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$CC" && break -+ done -+fi -+if test -z "$CC"; then -+ ac_ct_CC=$CC -+ for ac_prog in cl.exe -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_CC" && break -+done -+ -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi -+fi -+ -+fi -+ -+ -+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&5 -+echo "$as_me: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+ -+# Provide some information about the compiler. -+echo "$as_me:$LINENO: checking for C compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -+if test "${ac_cv_c_compiler_gnu+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+ -+int -+main () -+{ -+#ifndef __GNUC__ -+ choke me -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_compiler_gnu=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_c_compiler_gnu=$ac_compiler_gnu -+ -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -+GCC=`test $ac_compiler_gnu = yes && echo yes` -+ac_test_CFLAGS=${CFLAGS+set} -+ac_save_CFLAGS=$CFLAGS -+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_g+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS=$ac_save_CFLAGS -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" -+ fi -+else -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi -+fi -+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_prog_cc_c89=no -+ac_save_CC=$CC -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include - #include - #include -@@ -21681,66 +22246,202 @@ - va_end (v); - return s; - } -+ -+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has -+ function prototypes and stuff, but not '\xHH' hex character constants. -+ These don't provoke an error unfortunately, instead are silently treated -+ as 'x'. The following induces an error, until -std is added to get -+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an -+ array size at least. It's necessary to write '\x00'==0 to get something -+ that's true only with -std. */ -+int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -+ -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; - int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); - int argc; - char **argv; -- - int - main () - { -- - return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -- - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+do -+ CC="$ac_save_CC $ac_arg" -+ rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" - case "(($ac_try" in + else + am_cv_prog_cc_stdc=no + ac_save_CC="$CC" +@@ -21704,21 +21561,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -13676,169 +48432,30 @@ Index: gtk+2.0-2.14.3/configure test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then -- am_cv_prog_cc_stdc="$ac_arg"; break -+ ac_cv_prog_cc_c89=$ac_arg + am_cv_prog_cc_stdc="$ac_arg"; break else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +@@ -21731,11 +21587,11 @@ fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --CC="$ac_save_CC" -+rm -f conftest.$ac_ext -+CC=$ac_save_CC - - fi -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; -+ xno) -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&6; } ;; -+ *) -+ CC="$CC $ac_cv_prog_cc_c89" -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -+esac -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+depcc="$CC" am_compiler_list= -+ -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_CC_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CC_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done - --if test -z "$am_cv_prog_cc_stdc"; then + if test -z "$am_cv_prog_cc_stdc"; then - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } -+ cd .. -+ rm -rf conftest.dir ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } else - { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 -$as_echo "$am_cv_prog_cc_stdc" >&6; } -+ am_cv_CC_dependencies_compiler_type=none ++ { echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 ++echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6; } fi --case "x$am_cv_prog_cc_stdc" in -- x|xno) ;; -- *) CC="$CC $am_cv_prog_cc_stdc" ;; --esac -+ -+fi -+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -+ -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then -+ am__fastdepCC_TRUE= -+ am__fastdepCC_FALSE='#' -+else -+ am__fastdepCC_TRUE='#' -+ am__fastdepCC_FALSE= -+fi -+ -+ -+ -+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc - - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or -@@ -21755,12 +22456,11 @@ + case "x$am_cv_prog_cc_stdc" in + x|xno) ;; +@@ -21755,12 +21611,11 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. @@ -13854,7 +48471,7 @@ Index: gtk+2.0-2.14.3/configure else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -21789,29 +22489,17 @@ +@@ -21789,29 +21644,17 @@ # program-specific install script used by HP pwplus--don't use. : else @@ -13886,7 +48503,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "${ac_cv_path_install+set}" = set; then -@@ -21824,8 +22512,8 @@ +@@ -21824,8 +21667,8 @@ INSTALL=$ac_install_sh fi fi @@ -13897,7 +48514,7 @@ Index: gtk+2.0-2.14.3/configure # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. -@@ -21835,12 +22523,11 @@ +@@ -21835,12 +21678,11 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -13914,7 +48531,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.make <<\_ACEOF SHELL = /bin/sh -@@ -21857,12 +22544,12 @@ +@@ -21857,12 +21699,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -13931,7 +48548,7 @@ Index: gtk+2.0-2.14.3/configure SET_MAKE="MAKE=${MAKE-make}" fi -@@ -21895,8 +22582,8 @@ +@@ -21895,8 +21737,8 @@ if test x"$os_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' @@ -13942,7 +48559,7 @@ Index: gtk+2.0-2.14.3/configure if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" else -@@ -21915,14 +22602,14 @@ +@@ -21915,14 +21757,14 @@ ;; esac if test x"$msnative_struct" = x ; then @@ -13963,7 +48580,7 @@ Index: gtk+2.0-2.14.3/configure fi fi fi -@@ -21942,10 +22629,10 @@ +@@ -21942,10 +21784,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -13977,7 +48594,7 @@ Index: gtk+2.0-2.14.3/configure else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -21960,7 +22647,7 @@ +@@ -21960,7 +21802,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -13986,7 +48603,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -21972,11 +22659,11 @@ +@@ -21972,11 +21814,11 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -14002,7 +48619,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -21985,10 +22672,10 @@ +@@ -21985,10 +21827,10 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -14016,7 +48633,7 @@ Index: gtk+2.0-2.14.3/configure else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -22003,7 +22690,7 @@ +@@ -22003,7 +21845,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -14025,7 +48642,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -22015,11 +22702,11 @@ +@@ -22015,11 +21857,11 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -14041,7 +48658,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -22027,8 +22714,12 @@ +@@ -22027,8 +21869,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -14056,7 +48673,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG -@@ -22040,54 +22731,58 @@ +@@ -22040,54 +21886,58 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 @@ -14139,7 +48756,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -22100,14 +22795,14 @@ +@@ -22100,14 +21950,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -14157,7 +48774,7 @@ Index: gtk+2.0-2.14.3/configure $BASE_DEPENDENCIES_PKG_ERRORS -@@ -22118,7 +22813,7 @@ +@@ -22118,7 +21968,7 @@ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 @@ -14166,7 +48783,7 @@ Index: gtk+2.0-2.14.3/configure $BASE_DEPENDENCIES_PKG_ERRORS -@@ -22131,9 +22826,7 @@ +@@ -22131,9 +21981,7 @@ " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then @@ -14177,7 +48794,7 @@ Index: gtk+2.0-2.14.3/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -22143,7 +22836,7 @@ +@@ -22143,7 +21991,7 @@ To get pkg-config, see . See \`config.log' for more details." >&5 @@ -14186,7 +48803,7 @@ Index: gtk+2.0-2.14.3/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -22153,12 +22846,12 @@ +@@ -22153,12 +22001,12 @@ To get pkg-config, see . See \`config.log' for more details." >&2;} @@ -14202,7 +48819,7 @@ Index: gtk+2.0-2.14.3/configure : fi -@@ -22181,8 +22874,8 @@ +@@ -22181,8 +22029,8 @@ fi @@ -14213,7 +48830,7 @@ Index: gtk+2.0-2.14.3/configure case $enable_explicit_deps in auto) export SED -@@ -22195,17 +22888,15 @@ +@@ -22195,13 +22043,13 @@ ;; yes|no) ;; @@ -14226,17 +48843,12 @@ Index: gtk+2.0-2.14.3/configure esac -{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 -$as_echo "$enable_explicit_deps" >&6; } -- +{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 +echo "${ECHO_T}$enable_explicit_deps" >&6; } -- --if test $enable_explicit_deps = no; then -+ if test $enable_explicit_deps = no; then - DISABLE_EXPLICIT_DEPS_TRUE= - DISABLE_EXPLICIT_DEPS_FALSE='#' - else -@@ -22221,10 +22912,10 @@ + + +@@ -22221,10 +22069,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -14250,7 +48862,7 @@ Index: gtk+2.0-2.14.3/configure else case $PERL in [\\/]* | ?:[\\/]*) -@@ -22239,7 +22930,7 @@ +@@ -22239,7 +22087,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -14259,7 +48871,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -22251,11 +22942,11 @@ +@@ -22251,11 +22099,11 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then @@ -14275,7 +48887,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -22266,10 +22957,10 @@ +@@ -22266,10 +22114,10 @@ # We would like indent, but don't require it. # Extract the first word of "indent", so it can be a program name with args. set dummy indent; ac_word=$2 @@ -14289,7 +48901,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$INDENT"; then ac_cv_prog_INDENT="$INDENT" # Let the user override the test. -@@ -22282,7 +22973,7 @@ +@@ -22282,7 +22130,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -14298,7 +48910,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -22293,11 +22984,11 @@ +@@ -22293,11 +22141,11 @@ fi INDENT=$ac_cv_prog_INDENT if test -n "$INDENT"; then @@ -14314,7 +48926,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -22316,11 +23007,11 @@ +@@ -22316,11 +22164,11 @@ for ac_func in lstat mkstemp flockfile getc_unlocked do @@ -14330,7 +48942,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -22373,42 +23064,35 @@ +@@ -22373,42 +22221,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14383,7 +48995,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -22417,11 +23101,11 @@ +@@ -22417,11 +22258,11 @@ for ac_func in localtime_r do @@ -14399,7 +49011,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -22474,42 +23158,35 @@ +@@ -22474,42 +22315,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14452,7 +49064,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -22517,8 +23194,8 @@ +@@ -22517,8 +22351,8 @@ # _NL_TIME_FIRST_WEEKDAY is an enum and not a define @@ -14463,7 +49075,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22543,34 +23220,30 @@ +@@ -22543,34 +22377,30 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14505,7 +49117,7 @@ Index: gtk+2.0-2.14.3/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22580,8 +23253,8 @@ +@@ -22580,8 +22410,8 @@ fi # _NL_MEASUREMENT_MEASUREMENT is an enum and not a define @@ -14516,7 +49128,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22606,34 +23279,30 @@ +@@ -22606,34 +22436,30 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14558,7 +49170,7 @@ Index: gtk+2.0-2.14.3/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22643,8 +23312,8 @@ +@@ -22643,8 +22469,8 @@ fi # _NL_PAPER_HEIGHT is an enum and not a define @@ -14569,7 +49181,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22669,34 +23338,30 @@ +@@ -22669,34 +22495,30 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14611,7 +49223,7 @@ Index: gtk+2.0-2.14.3/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22706,8 +23371,8 @@ +@@ -22706,8 +22528,8 @@ fi # _NL_PAPER_WIDTH is an enum and not a define @@ -14622,7 +49234,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22732,34 +23397,30 @@ +@@ -22732,34 +22554,30 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14664,7 +49276,7 @@ Index: gtk+2.0-2.14.3/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22769,8 +23430,8 @@ +@@ -22769,8 +22587,8 @@ fi # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable @@ -14675,7 +49287,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22795,34 +23456,30 @@ +@@ -22795,34 +22613,30 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14717,7 +49329,7 @@ Index: gtk+2.0-2.14.3/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22837,21 +23494,20 @@ +@@ -22837,21 +22651,20 @@ for ac_header in locale.h do @@ -14748,7 +49360,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22867,33 +23523,32 @@ +@@ -22867,33 +22680,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14789,7 +49401,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22907,52 +23562,51 @@ +@@ -22907,52 +22719,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14863,7 +49475,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -22961,24 +23615,21 @@ +@@ -22961,24 +22772,21 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -14896,7 +49508,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -22986,10 +23637,10 @@ +@@ -22986,10 +22794,10 @@ done if test $ac_cv_header_locale_h = yes; then @@ -14910,7 +49522,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23012,35 +23663,31 @@ +@@ -23012,35 +22820,31 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -14953,7 +49565,7 @@ Index: gtk+2.0-2.14.3/configure if test $am_cv_val_LC_MESSAGES = yes; then cat >>confdefs.h <<\_ACEOF -@@ -23059,17 +23706,17 @@ +@@ -23059,17 +22863,17 @@ INTLLIBS= if test "${ac_cv_header_libintl_h+set}" = set; then @@ -14978,7 +49590,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23085,33 +23732,32 @@ +@@ -23085,33 +22889,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15019,7 +49631,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23125,52 +23771,51 @@ +@@ -23125,52 +22928,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15093,7 +49705,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -23179,28 +23824,28 @@ +@@ -23179,28 +22981,28 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -15131,7 +49743,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23225,42 +23870,38 @@ +@@ -23225,42 +23027,38 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15184,7 +49796,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23285,47 +23926,43 @@ +@@ -23285,47 +23083,43 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15243,7 +49855,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23378,42 +24015,35 @@ +@@ -23378,42 +23172,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15296,7 +49908,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -23428,10 +24058,10 @@ +@@ -23428,10 +23215,10 @@ || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then @@ -15310,7 +49922,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -23463,41 +24093,37 @@ +@@ -23463,41 +23250,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15363,7 +49975,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -23529,41 +24155,37 @@ +@@ -23529,41 +23312,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15416,7 +50028,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -23595,37 +24217,33 @@ +@@ -23595,37 +23374,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15462,7 +50074,7 @@ Index: gtk+2.0-2.14.3/configure gt_cv_func_dgettext_libintl=yes fi -@@ -23635,14 +24253,14 @@ +@@ -23635,14 +23410,14 @@ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then @@ -15484,7 +50096,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -@@ -23674,41 +24292,37 @@ +@@ -23674,41 +23449,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15537,7 +50149,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -@@ -23740,37 +24354,33 @@ +@@ -23740,37 +23511,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15583,7 +50195,7 @@ Index: gtk+2.0-2.14.3/configure gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else -@@ -23795,11 +24405,11 @@ +@@ -23795,11 +23562,11 @@ for ac_func in bind_textdomain_codeset do @@ -15599,7 +50211,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23852,42 +24462,35 @@ +@@ -23852,42 +23619,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15652,7 +50264,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -23923,10 +24526,10 @@ +@@ -23923,10 +23683,10 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 @@ -15666,7 +50278,7 @@ Index: gtk+2.0-2.14.3/configure else case "$MSGFMT" in /*) -@@ -23950,11 +24553,11 @@ +@@ -23950,11 +23710,11 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then @@ -15682,7 +50294,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" -@@ -23962,11 +24565,11 @@ +@@ -23962,11 +23722,11 @@ for ac_func in dcgettext do @@ -15698,7 +50310,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24019,50 +24622,43 @@ +@@ -24019,50 +23779,43 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15761,7 +50373,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.foo <<_ACEOF msgid "" -@@ -24076,25 +24672,25 @@ +@@ -24076,25 +23829,25 @@ "Content-Transfer-Encoding: 8bit\n" _ACEOF @@ -15796,7 +50408,7 @@ Index: gtk+2.0-2.14.3/configure else case $GMSGFMT in [\\/]* | ?:[\\/]*) -@@ -24109,7 +24705,7 @@ +@@ -24109,7 +23862,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -15805,7 +50417,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -24122,20 +24718,20 @@ +@@ -24122,20 +23875,20 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -15833,7 +50445,7 @@ Index: gtk+2.0-2.14.3/configure else case "$XGETTEXT" in /*) -@@ -24159,11 +24755,11 @@ +@@ -24159,11 +23912,11 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -15849,7 +50461,7 @@ Index: gtk+2.0-2.14.3/configure fi cat >conftest.$ac_ext <<_ACEOF -@@ -24188,33 +24784,30 @@ +@@ -24188,33 +23941,30 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15891,7 +50503,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24267,36 +24860,32 @@ +@@ -24267,36 +24017,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -15936,7 +50548,7 @@ Index: gtk+2.0-2.14.3/configure CATOBJEXT=.gmo DATADIRNAME=share else -@@ -24312,7 +24901,6 @@ +@@ -24312,7 +24058,6 @@ esac fi @@ -15944,7 +50556,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" -@@ -24338,8 +24926,8 @@ +@@ -24338,8 +24083,8 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else @@ -15955,7 +50567,7 @@ Index: gtk+2.0-2.14.3/configure XGETTEXT=":" fi fi -@@ -24371,8 +24959,8 @@ +@@ -24371,8 +24116,8 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else @@ -15966,7 +50578,7 @@ Index: gtk+2.0-2.14.3/configure NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no -@@ -24396,8 +24984,8 @@ +@@ -24396,8 +24141,8 @@ fi done LINGUAS=$NEW_LINGUAS @@ -15977,7 +50589,7 @@ Index: gtk+2.0-2.14.3/configure fi if test -n "$LINGUAS"; then -@@ -24453,14 +25041,14 @@ +@@ -24453,14 +24198,14 @@ @@ -15996,7 +50608,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF -@@ -24478,27 +25066,25 @@ +@@ -24478,27 +24223,25 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16032,7 +50644,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -@@ -24523,82 +25109,78 @@ +@@ -24523,82 +24266,78 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16141,7 +50753,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24620,22 +25202,21 @@ +@@ -24620,22 +24359,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16169,7 +50781,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_save_CFLAGS="$CFLAGS" -@@ -24661,29 +25242,28 @@ +@@ -24661,29 +24399,28 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16208,7 +50820,7 @@ Index: gtk+2.0-2.14.3/configure fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -@@ -24733,10 +25313,10 @@ +@@ -24733,10 +24470,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -16222,7 +50834,7 @@ Index: gtk+2.0-2.14.3/configure else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -24751,7 +25331,7 @@ +@@ -24751,7 +24488,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -16231,7 +50843,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -24763,11 +25343,11 @@ +@@ -24763,11 +24500,11 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -16247,7 +50859,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -24776,10 +25356,10 @@ +@@ -24776,10 +24513,10 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -16261,7 +50873,7 @@ Index: gtk+2.0-2.14.3/configure else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -24794,7 +25374,7 @@ +@@ -24794,7 +24531,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -16270,7 +50882,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -24806,11 +25386,11 @@ +@@ -24806,11 +24543,11 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -16286,7 +50898,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -24818,8 +25398,12 @@ +@@ -24818,8 +24555,12 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -16301,7 +50913,7 @@ Index: gtk+2.0-2.14.3/configure ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG -@@ -24831,14 +25415,14 @@ +@@ -24831,14 +24572,14 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.16 @@ -16322,7 +50934,7 @@ Index: gtk+2.0-2.14.3/configure PKG_CONFIG="" fi -@@ -24852,8 +25436,8 @@ +@@ -24852,8 +24593,8 @@ fi min_glib_version=2.17.6 @@ -16333,7 +50945,7 @@ Index: gtk+2.0-2.14.3/configure if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs -@@ -24976,32 +25560,29 @@ +@@ -24976,32 +24717,29 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16372,7 +50984,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -@@ -25011,12 +25592,12 @@ +@@ -25011,12 +24749,12 @@ fi fi if test "x$no_glib" = x ; then @@ -16389,7 +51001,7 @@ Index: gtk+2.0-2.14.3/configure if test "$PKG_CONFIG" = "no" ; then echo "*** A new enough version of pkg-config was not found." echo "*** See http://www.freedesktop.org/software/pkgconfig/" -@@ -25053,21 +25634,18 @@ +@@ -25053,21 +24791,18 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16415,7 +51027,7 @@ Index: gtk+2.0-2.14.3/configure 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" -@@ -25078,14 +25656,13 @@ +@@ -25078,14 +24813,13 @@ echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else @@ -16431,7 +51043,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" -@@ -25097,10 +25674,10 @@ +@@ -25097,10 +24831,10 @@ GLIB_GENMARSHAL="" GOBJECT_QUERY="" GLIB_MKENUMS="" @@ -16444,7 +51056,7 @@ Index: gtk+2.0-2.14.3/configure *** GLIB 2.17.6 or better is required. The latest version of *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} { (exit 1); exit 1; }; } -@@ -25128,11 +25705,11 @@ +@@ -25128,11 +24862,11 @@ for ac_func in bind_textdomain_codeset do @@ -16460,7 +51072,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25185,42 +25762,35 @@ +@@ -25185,42 +24919,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16513,7 +51125,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -25231,21 +25801,20 @@ +@@ -25231,21 +24958,20 @@ for ac_header in pwd.h do @@ -16544,7 +51156,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25261,33 +25830,32 @@ +@@ -25261,33 +24987,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16585,7 +51197,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25301,52 +25869,51 @@ +@@ -25301,52 +25026,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16659,7 +51271,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25355,24 +25922,21 @@ +@@ -25355,24 +25079,21 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -16692,7 +51304,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF cat >>confdefs.h <<\_ACEOF -@@ -25386,21 +25950,20 @@ +@@ -25386,21 +25107,20 @@ for ac_header in sys/time.h do @@ -16723,7 +51335,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25416,33 +25979,32 @@ +@@ -25416,33 +25136,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16764,7 +51376,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25456,52 +26018,51 @@ +@@ -25456,52 +25175,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16838,7 +51450,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25510,24 +26071,21 @@ +@@ -25510,24 +25228,21 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -16871,7 +51483,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF cat >>confdefs.h <<\_ACEOF -@@ -25541,21 +26099,20 @@ +@@ -25541,21 +25256,20 @@ for ac_header in unistd.h do @@ -16902,7 +51514,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25571,33 +26128,32 @@ +@@ -25571,33 +25285,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -16943,7 +51555,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25611,52 +26167,51 @@ +@@ -25611,52 +25324,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17017,7 +51629,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25665,24 +26220,21 @@ +@@ -25665,24 +25377,21 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -17050,7 +51662,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF cat >>confdefs.h <<\_ACEOF -@@ -25696,21 +26248,20 @@ +@@ -25696,21 +25405,20 @@ for ac_header in ftw.h do @@ -17081,7 +51693,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25726,33 +26277,32 @@ +@@ -25726,33 +25434,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17122,7 +51734,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25766,52 +26316,51 @@ +@@ -25766,52 +25473,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17196,7 +51808,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25820,24 +26369,21 @@ +@@ -25820,24 +25526,21 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -17229,7 +51841,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF cat >>confdefs.h <<\_ACEOF -@@ -25849,8 +26395,8 @@ +@@ -25849,8 +25552,8 @@ done @@ -17240,7 +51852,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25874,21 +26420,20 @@ +@@ -25874,21 +25577,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17265,7 +51877,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_ok=no -@@ -25896,16 +26441,16 @@ +@@ -25896,16 +25598,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $gtk_ok = yes; then @@ -17286,7 +51898,7 @@ Index: gtk+2.0-2.14.3/configure fi saved_cflags="$CFLAGS" -@@ -25913,10 +26458,10 @@ +@@ -25913,10 +25615,10 @@ # Checks for header files. @@ -17300,7 +51912,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25943,21 +26488,20 @@ +@@ -25943,21 +25645,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17325,7 +51937,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no -@@ -26049,40 +26593,37 @@ +@@ -26049,40 +25750,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17374,7 +51986,7 @@ Index: gtk+2.0-2.14.3/configure if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF -@@ -26093,10 +26634,10 @@ +@@ -26093,10 +25791,10 @@ # Checks for typedefs, structures, and compiler characteristics. @@ -17388,7 +52000,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26168,21 +26709,20 @@ +@@ -26168,21 +25866,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17413,7 +52025,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_c_const=no -@@ -26190,22 +26730,22 @@ +@@ -26190,22 +25887,22 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -17442,7 +52054,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26230,21 +26770,20 @@ +@@ -26230,21 +25927,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17467,7 +52079,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_signal=void -@@ -26252,8 +26791,8 @@ +@@ -26252,8 +25948,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -17478,7 +52090,7 @@ Index: gtk+2.0-2.14.3/configure cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -@@ -26264,21 +26803,20 @@ +@@ -26264,21 +25960,20 @@ for ac_header in stdlib.h unistd.h do @@ -17509,7 +52121,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26294,33 +26832,32 @@ +@@ -26294,33 +25989,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17550,7 +52162,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26334,52 +26871,51 @@ +@@ -26334,52 +26028,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17624,7 +52236,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -26388,24 +26924,21 @@ +@@ -26388,24 +26081,21 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -17657,7 +52269,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -26415,11 +26948,11 @@ +@@ -26415,11 +26105,11 @@ for ac_func in getpagesize do @@ -17673,7 +52285,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26472,51 +27005,44 @@ +@@ -26472,51 +26162,44 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17738,7 +52350,7 @@ Index: gtk+2.0-2.14.3/configure else if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no -@@ -26660,39 +27186,36 @@ +@@ -26660,39 +26343,36 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17786,7 +52398,7 @@ Index: gtk+2.0-2.14.3/configure if test $ac_cv_func_mmap_fixed_mapped = yes; then cat >>confdefs.h <<\_ACEOF -@@ -26706,11 +27229,11 @@ +@@ -26706,11 +26386,11 @@ for ac_func in mallinfo do @@ -17802,7 +52414,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26763,42 +27286,35 @@ +@@ -26763,42 +26443,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17855,7 +52467,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -26807,11 +27323,11 @@ +@@ -26807,11 +26480,11 @@ for ac_func in getresuid do @@ -17871,7 +52483,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26864,51 +27380,44 @@ +@@ -26864,51 +26537,44 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17936,7 +52548,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26928,8 +27437,8 @@ +@@ -26928,8 +26594,8 @@ rm -f conftest* fi @@ -17947,7 +52559,7 @@ Index: gtk+2.0-2.14.3/configure if test $ac_cv_type_uid_t = no; then cat >>confdefs.h <<\_ACEOF -@@ -26945,8 +27454,8 @@ +@@ -26945,8 +26611,8 @@ # Check if needs to be included for fd_set @@ -17958,7 +52570,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26968,21 +27477,20 @@ +@@ -26968,21 +26634,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -17983,7 +52595,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_ok=no -@@ -26990,8 +27498,8 @@ +@@ -26990,8 +26655,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $gtk_ok = yes; then @@ -17994,7 +52606,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27014,22 +27522,22 @@ +@@ -27014,22 +26679,22 @@ #define HAVE_SYS_SELECT_H 1 _ACEOF @@ -18023,7 +52635,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27043,21 +27551,20 @@ +@@ -27043,21 +26708,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18048,7 +52660,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 gdk_wchar_h=no -@@ -27071,12 +27578,12 @@ +@@ -27071,12 +26735,12 @@ _ACEOF fi @@ -18065,7 +52677,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27090,21 +27597,20 @@ +@@ -27090,21 +26754,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18090,7 +52702,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 gdk_wctype_h=no -@@ -27118,15 +27624,15 @@ +@@ -27118,15 +26781,15 @@ _ACEOF fi @@ -18111,7 +52723,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27179,42 +27685,38 @@ +@@ -27179,42 +26842,38 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18165,7 +52777,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lw $LIBS" -@@ -27246,37 +27748,33 @@ +@@ -27246,37 +26905,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18211,7 +52823,7 @@ Index: gtk+2.0-2.14.3/configure GDK_WLIBS=-lw fi -@@ -27286,8 +27784,8 @@ +@@ -27286,8 +26941,8 @@ oLIBS="$LIBS" LIBS="$LIBS $GDK_WLIBS" # The following is necessary for Linux libc-5.4.38 @@ -18222,7 +52834,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27322,30 +27820,26 @@ +@@ -27322,30 +26977,26 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18258,7 +52870,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$oLIBS" -@@ -27358,13 +27852,13 @@ +@@ -27358,13 +27009,13 @@ GDK_WLIBS= fi @@ -18276,7 +52888,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27378,21 +27872,20 @@ +@@ -27378,21 +27029,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18301,7 +52913,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_uxtheme_h=no -@@ -27406,28 +27899,27 @@ +@@ -27406,28 +27056,27 @@ _ACEOF fi @@ -18341,7 +52953,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27443,33 +27935,32 @@ +@@ -27443,33 +27092,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18382,7 +52994,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27483,52 +27974,51 @@ +@@ -27483,52 +27131,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18456,7 +53068,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -27537,24 +28027,21 @@ +@@ -27537,24 +27184,21 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -18489,7 +53101,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -27564,11 +28051,11 @@ +@@ -27564,11 +27208,11 @@ for ac_func in _NSGetEnviron do @@ -18505,7 +53117,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27621,42 +28108,35 @@ +@@ -27621,42 +27265,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18558,7 +53170,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -27683,8 +28163,8 @@ +@@ -27683,8 +27320,8 @@ fi @@ -18569,7 +53181,7 @@ Index: gtk+2.0-2.14.3/configure # Check whether --enable-modules was given. if test "${enable_modules+set}" = set; then -@@ -27695,13 +28175,13 @@ +@@ -27695,13 +27332,13 @@ dynworks=false deps= if test x$enable_modules = xno; then @@ -18589,7 +53201,7 @@ Index: gtk+2.0-2.14.3/configure ## for loop is to strip newline tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` for I in $tmp; do -@@ -27726,11 +28206,11 @@ +@@ -27726,11 +27363,11 @@ #define USE_GMODULE 1 _ACEOF @@ -18605,18 +53217,7 @@ Index: gtk+2.0-2.14.3/configure fi fi -@@ -27766,9 +28246,7 @@ - fi - - -- -- --if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then -+ if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then - BUILD_GDIPLUS_LOADERS_TRUE= - BUILD_GDIPLUS_LOADERS_FALSE='#' - else -@@ -27779,10 +28257,10 @@ +@@ -27779,10 +27416,10 @@ if test x$os_win32 = xno || test x$enable_gdiplus = xno; then if test x$with_libtiff != xno && test -z "$LIBTIFF"; then @@ -18630,7 +53231,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff -lm $LIBS" -@@ -27814,49 +28292,45 @@ +@@ -27814,49 +27451,45 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18695,7 +53296,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27872,33 +28346,32 @@ +@@ -27872,33 +27505,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18736,7 +53337,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27912,52 +28385,51 @@ +@@ -27912,52 +27544,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18810,7 +53411,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -27966,30 +28438,30 @@ +@@ -27966,30 +27597,30 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -18852,7 +53453,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff -ljpeg -lz -lm $LIBS" -@@ -28021,49 +28493,45 @@ +@@ -28021,49 +27652,45 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18917,7 +53518,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28079,33 +28547,32 @@ +@@ -28079,33 +27706,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -18958,7 +53559,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28119,52 +28586,51 @@ +@@ -28119,52 +27745,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19032,7 +53633,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28173,30 +28639,30 @@ +@@ -28173,30 +27798,30 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -19074,7 +53675,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" -@@ -28228,49 +28694,45 @@ +@@ -28228,49 +27853,45 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19139,7 +53740,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28286,33 +28748,32 @@ +@@ -28286,33 +27907,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19180,7 +53781,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28326,52 +28787,51 @@ +@@ -28326,52 +27946,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19254,7 +53855,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28380,28 +28840,28 @@ +@@ -28380,28 +27999,28 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -19293,7 +53894,7 @@ Index: gtk+2.0-2.14.3/configure fi fi -@@ -28411,11 +28871,11 @@ +@@ -28411,11 +28030,11 @@ fi if test x$with_libtiff != xno && test -z "$LIBTIFF"; then @@ -19307,7 +53908,7 @@ Index: gtk+2.0-2.14.3/configure *** Checks for TIFF loader failed. You can build without it by passing *** --without-libtiff to configure but some programs using GTK+ may *** not work properly" >&2;} -@@ -28425,10 +28885,10 @@ +@@ -28425,10 +28044,10 @@ if test x$os_win32 = xno || test x$enable_gdiplus = xno; then if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then @@ -19321,7 +53922,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" -@@ -28460,47 +28920,43 @@ +@@ -28460,47 +28079,43 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19381,7 +53982,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28518,35 +28974,34 @@ +@@ -28518,35 +28133,34 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19425,7 +54026,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" -@@ -28578,60 +29033,56 @@ +@@ -28578,60 +28192,56 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19500,7 +54101,7 @@ Index: gtk+2.0-2.14.3/configure *** Checks for JPEG loader failed. You can build without it by passing *** --without-libjpeg to configure but some programs using GTK+ may *** not work properly" >&2;} -@@ -28640,21 +29091,21 @@ +@@ -28640,21 +28250,21 @@ fi if test x$with_libpng != xno && test -z "$LIBPNG"; then @@ -19531,7 +54132,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lpng -lz -lm $LIBS" -@@ -28686,49 +29137,45 @@ +@@ -28686,49 +28296,45 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19596,7 +54197,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28744,33 +29191,32 @@ +@@ -28744,33 +28350,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19637,7 +54238,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28784,52 +29230,51 @@ +@@ -28784,52 +28389,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19711,7 +54312,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28838,18 +29283,18 @@ +@@ -28838,18 +28442,18 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -19736,7 +54337,7 @@ Index: gtk+2.0-2.14.3/configure png_ok=yes else png_ok=no -@@ -28857,13 +29302,13 @@ +@@ -28857,13 +28461,13 @@ else @@ -19754,7 +54355,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28885,49 +29330,48 @@ +@@ -28885,49 +28489,48 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19815,7 +54416,7 @@ Index: gtk+2.0-2.14.3/configure *** Checks for PNG loader failed. You can build without it by passing *** --without-libpng to configure but many programs using GTK+ will *** not work properly. The PNG loader is also needed if you are compiling -@@ -28936,10 +29380,10 @@ +@@ -28936,10 +28539,10 @@ fi if test x$with_libjasper != xno && test -z "$LIBJASPER"; then @@ -19829,7 +54430,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ljasper -ljpeg $LIBS" -@@ -28971,47 +29415,43 @@ +@@ -28971,47 +28574,43 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -19887,18 +54488,7 @@ Index: gtk+2.0-2.14.3/configure *** Checks for JPEG2000 loader failed. You can build without it by passing *** --without-libjasper to configure" >&2;} { (exit 1); exit 1; }; } -@@ -29022,9 +29462,7 @@ - - - -- -- --if $dynworks; then -+ if $dynworks; then - BUILD_DYNAMIC_MODULES_TRUE= - BUILD_DYNAMIC_MODULES_FALSE='#' - else -@@ -29036,8 +29474,8 @@ +@@ -29036,8 +28635,8 @@ # # Allow building some or all gdk-pixbuf loaders included # @@ -19909,7 +54499,7 @@ Index: gtk+2.0-2.14.3/configure # Check whether --with-included_loaders was given. -@@ -29080,8 +29518,8 @@ +@@ -29080,8 +28679,8 @@ included_loaders="$with_included_loaders" fi @@ -19920,7 +54510,7 @@ Index: gtk+2.0-2.14.3/configure INCLUDED_LOADER_OBJ= INCLUDED_LOADER_DEFINE= -@@ -29091,8 +29529,8 @@ +@@ -29091,8 +28690,8 @@ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then : else @@ -19931,194 +54521,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } fi -@@ -29117,9 +29555,7 @@ - - - -- -- --if test x"$INCLUDE_png" = xyes; then -+ if test x"$INCLUDE_png" = xyes; then - INCLUDE_PNG_TRUE= - INCLUDE_PNG_FALSE='#' - else -@@ -29127,9 +29563,7 @@ - INCLUDE_PNG_FALSE= - fi - -- -- --if test x"$INCLUDE_bmp" = xyes; then -+ if test x"$INCLUDE_bmp" = xyes; then - INCLUDE_BMP_TRUE= - INCLUDE_BMP_FALSE='#' - else -@@ -29137,9 +29571,7 @@ - INCLUDE_BMP_FALSE= - fi - -- -- --if test x"$INCLUDE_wbmp" = xyes; then -+ if test x"$INCLUDE_wbmp" = xyes; then - INCLUDE_WBMP_TRUE= - INCLUDE_WBMP_FALSE='#' - else -@@ -29147,9 +29579,7 @@ - INCLUDE_WBMP_FALSE= - fi - -- -- --if test x"$INCLUDE_gif" = xyes; then -+ if test x"$INCLUDE_gif" = xyes; then - INCLUDE_GIF_TRUE= - INCLUDE_GIF_FALSE='#' - else -@@ -29157,9 +29587,7 @@ - INCLUDE_GIF_FALSE= - fi - -- -- --if test x"$INCLUDE_ico" = xyes; then -+ if test x"$INCLUDE_ico" = xyes; then - INCLUDE_ICO_TRUE= - INCLUDE_ICO_FALSE='#' - else -@@ -29167,9 +29595,7 @@ - INCLUDE_ICO_FALSE= - fi - -- -- --if test x"$INCLUDE_ani" = xyes; then -+ if test x"$INCLUDE_ani" = xyes; then - INCLUDE_ANI_TRUE= - INCLUDE_ANI_FALSE='#' - else -@@ -29177,9 +29603,7 @@ - INCLUDE_ANI_FALSE= - fi - -- -- --if test x"$INCLUDE_jpeg" = xyes; then -+ if test x"$INCLUDE_jpeg" = xyes; then - INCLUDE_JPEG_TRUE= - INCLUDE_JPEG_FALSE='#' - else -@@ -29187,9 +29611,7 @@ - INCLUDE_JPEG_FALSE= - fi - -- -- --if test x"$INCLUDE_pnm" = xyes; then -+ if test x"$INCLUDE_pnm" = xyes; then - INCLUDE_PNM_TRUE= - INCLUDE_PNM_FALSE='#' - else -@@ -29197,9 +29619,7 @@ - INCLUDE_PNM_FALSE= - fi - -- -- --if test x"$INCLUDE_ras" = xyes; then -+ if test x"$INCLUDE_ras" = xyes; then - INCLUDE_RAS_TRUE= - INCLUDE_RAS_FALSE='#' - else -@@ -29207,9 +29627,7 @@ - INCLUDE_RAS_FALSE= - fi - -- -- --if test x"$INCLUDE_tiff" = xyes; then -+ if test x"$INCLUDE_tiff" = xyes; then - INCLUDE_TIFF_TRUE= - INCLUDE_TIFF_FALSE='#' - else -@@ -29217,9 +29635,7 @@ - INCLUDE_TIFF_FALSE= - fi - -- -- --if test x"$INCLUDE_xpm" = xyes; then -+ if test x"$INCLUDE_xpm" = xyes; then - INCLUDE_XPM_TRUE= - INCLUDE_XPM_FALSE='#' - else -@@ -29227,9 +29643,7 @@ - INCLUDE_XPM_FALSE= - fi - -- -- --if test x"$INCLUDE_xbm" = xyes; then -+ if test x"$INCLUDE_xbm" = xyes; then - INCLUDE_XBM_TRUE= - INCLUDE_XBM_FALSE='#' - else -@@ -29237,9 +29651,7 @@ - INCLUDE_XBM_FALSE= - fi - -- -- --if test x"$INCLUDE_tga" = xyes; then -+ if test x"$INCLUDE_tga" = xyes; then - INCLUDE_TGA_TRUE= - INCLUDE_TGA_FALSE='#' - else -@@ -29247,9 +29659,7 @@ - INCLUDE_TGA_FALSE= - fi - -- -- --if test x"$INCLUDE_pcx" = xyes; then -+ if test x"$INCLUDE_pcx" = xyes; then - INCLUDE_PCX_TRUE= - INCLUDE_PCX_FALSE='#' - else -@@ -29257,9 +29667,7 @@ - INCLUDE_PCX_FALSE= - fi - -- -- --if test x"$INCLUDE_icns" = xyes; then -+ if test x"$INCLUDE_icns" = xyes; then - INCLUDE_ICNS_TRUE= - INCLUDE_ICNS_FALSE='#' - else -@@ -29267,9 +29675,7 @@ - INCLUDE_ICNS_FALSE= - fi - -- -- --if test x"$INCLUDE_jasper" = xyes; then -+ if test x"$INCLUDE_jasper" = xyes; then - INCLUDE_JASPER_TRUE= - INCLUDE_JASPER_FALSE='#' - else -@@ -29279,9 +29685,7 @@ - - # As all GDI+ loaders are either built-in or not, arbitrarily just - # check one of the variables here -- -- --if test x"$INCLUDE_gdip_ico" = xyes; then -+ if test x"$INCLUDE_gdip_ico" = xyes; then - INCLUDE_GDIPLUS_TRUE= - INCLUDE_GDIPLUS_FALSE='#' - else -@@ -29291,20 +29695,18 @@ +@@ -29291,20 +28890,18 @@ if test x$gio_can_sniff = x; then @@ -20144,7 +54547,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29348,21 +29750,19 @@ +@@ -29348,21 +28945,19 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20170,7 +54573,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); }; }; then gio_can_sniff=yes -@@ -29371,20 +29771,19 @@ +@@ -29371,20 +28966,19 @@ _ACEOF else @@ -20195,7 +54598,7 @@ Index: gtk+2.0-2.14.3/configure LIBS="$gtk_save_LIBS" CFLAGS="$gtk_save_CFLAGS" fi -@@ -29392,8 +29791,8 @@ +@@ -29392,8 +28986,8 @@ # # Allow building some or all immodules included # @@ -20206,22 +54609,18 @@ Index: gtk+2.0-2.14.3/configure # Check whether --with-included_immodules was given. -@@ -29428,11 +29827,9 @@ +@@ -29428,8 +29022,8 @@ included_immodules="$with_included_immodules" fi -{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 -$as_echo "$included_immodules" >&6; } -- -- --if test "x$included_immodules" != x; then +{ echo "$as_me:$LINENO: result: $included_immodules" >&5 +echo "${ECHO_T}$included_immodules" >&6; } -+ if test "x$included_immodules" != x; then - HAVE_INCLUDED_IMMMODULES_TRUE= - HAVE_INCLUDED_IMMMODULES_FALSE='#' - else -@@ -29450,8 +29847,8 @@ + + + if test "x$included_immodules" != x; then +@@ -29450,8 +29044,8 @@ if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then : else @@ -20232,139 +54631,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } fi -@@ -29463,9 +29860,7 @@ - - - -- -- --if test x"$INCLUDE_am_et" = xyes; then -+ if test x"$INCLUDE_am_et" = xyes; then - INCLUDE_IM_AM_ET_TRUE= - INCLUDE_IM_AM_ET_FALSE='#' - else -@@ -29473,9 +29868,7 @@ - INCLUDE_IM_AM_ET_FALSE= - fi - -- -- --if test x"$INCLUDE_cedilla" = xyes; then -+ if test x"$INCLUDE_cedilla" = xyes; then - INCLUDE_IM_CEDILLA_TRUE= - INCLUDE_IM_CEDILLA_FALSE='#' - else -@@ -29483,9 +29876,7 @@ - INCLUDE_IM_CEDILLA_FALSE= - fi - -- -- --if test x"$INCLUDE_cyrillic_translit" = xyes; then -+ if test x"$INCLUDE_cyrillic_translit" = xyes; then - INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= - INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' - else -@@ -29493,9 +29884,7 @@ - INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= - fi - -- -- --if test x"$INCLUDE_ime" = xyes; then -+ if test x"$INCLUDE_ime" = xyes; then - INCLUDE_IM_IME_TRUE= - INCLUDE_IM_IME_FALSE='#' - else -@@ -29503,9 +29892,7 @@ - INCLUDE_IM_IME_FALSE= - fi - -- -- --if test x"$INCLUDE_inuktitut" = xyes; then -+ if test x"$INCLUDE_inuktitut" = xyes; then - INCLUDE_IM_INUKTITUT_TRUE= - INCLUDE_IM_INUKTITUT_FALSE='#' - else -@@ -29513,9 +29900,7 @@ - INCLUDE_IM_INUKTITUT_FALSE= - fi - -- -- --if test x"$INCLUDE_ipa" = xyes; then -+ if test x"$INCLUDE_ipa" = xyes; then - INCLUDE_IM_IPA_TRUE= - INCLUDE_IM_IPA_FALSE='#' - else -@@ -29523,9 +29908,7 @@ - INCLUDE_IM_IPA_FALSE= - fi - -- -- --if test x"$INCLUDE_multipress" = xyes; then -+ if test x"$INCLUDE_multipress" = xyes; then - INCLUDE_IM_MULTIPRESS_TRUE= - INCLUDE_IM_MULTIPRESS_FALSE='#' - else -@@ -29533,9 +29916,7 @@ - INCLUDE_IM_MULTIPRESS_FALSE= - fi - -- -- --if test x"$INCLUDE_thai" = xyes; then -+ if test x"$INCLUDE_thai" = xyes; then - INCLUDE_IM_THAI_TRUE= - INCLUDE_IM_THAI_FALSE='#' - else -@@ -29543,9 +29924,7 @@ - INCLUDE_IM_THAI_FALSE= - fi - -- -- --if test x"$INCLUDE_ti_er" = xyes; then -+ if test x"$INCLUDE_ti_er" = xyes; then - INCLUDE_IM_TI_ER_TRUE= - INCLUDE_IM_TI_ER_FALSE='#' - else -@@ -29553,9 +29932,7 @@ - INCLUDE_IM_TI_ER_FALSE= - fi - -- -- --if test x"$INCLUDE_ti_et" = xyes; then -+ if test x"$INCLUDE_ti_et" = xyes; then - INCLUDE_IM_TI_ET_TRUE= - INCLUDE_IM_TI_ET_FALSE='#' - else -@@ -29563,9 +29940,7 @@ - INCLUDE_IM_TI_ET_FALSE= - fi - -- -- --if test x"$INCLUDE_viqr" = xyes; then -+ if test x"$INCLUDE_viqr" = xyes; then - INCLUDE_IM_VIQR_TRUE= - INCLUDE_IM_VIQR_FALSE='#' - else -@@ -29573,9 +29948,7 @@ - INCLUDE_IM_VIQR_FALSE= - fi - -- -- --if test x"$INCLUDE_xim" = xyes; then -+ if test x"$INCLUDE_xim" = xyes; then - INCLUDE_IM_XIM_TRUE= - INCLUDE_IM_XIM_FALSE='#' - else -@@ -29584,10 +29957,10 @@ +@@ -29584,10 +29178,10 @@ fi @@ -20378,7 +54645,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29620,21 +29993,20 @@ +@@ -29620,21 +29214,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20403,7 +54670,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_sys_wait_h=no -@@ -29642,8 +30014,8 @@ +@@ -29642,8 +29235,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -20414,7 +54681,7 @@ Index: gtk+2.0-2.14.3/configure if test $ac_cv_header_sys_wait_h = yes; then cat >>confdefs.h <<\_ACEOF -@@ -29653,10 +30025,10 @@ +@@ -29653,10 +29246,10 @@ fi @@ -20428,7 +54695,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29681,21 +30053,20 @@ +@@ -29681,21 +29274,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20453,7 +54720,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_signal=void -@@ -29703,8 +30074,8 @@ +@@ -29703,8 +29295,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -20464,51 +54731,7 @@ Index: gtk+2.0-2.14.3/configure cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -@@ -29712,9 +30083,7 @@ - - - -- -- --if test "x$LIBTIFF" != x; then -+ if test "x$LIBTIFF" != x; then - HAVE_TIFF_TRUE= - HAVE_TIFF_FALSE='#' - else -@@ -29722,9 +30091,7 @@ - HAVE_TIFF_FALSE= - fi - -- -- --if test "x$LIBPNG" != x; then -+ if test "x$LIBPNG" != x; then - HAVE_PNG_TRUE= - HAVE_PNG_FALSE='#' - else -@@ -29732,9 +30099,7 @@ - HAVE_PNG_FALSE= - fi - -- -- --if test "x$LIBJPEG" != x; then -+ if test "x$LIBJPEG" != x; then - HAVE_JPEG_TRUE= - HAVE_JPEG_FALSE='#' - else -@@ -29742,9 +30107,7 @@ - HAVE_JPEG_FALSE= - fi - -- -- --if test "x$LIBJASPER" != x; then -+ if test "x$LIBJASPER" != x; then - HAVE_JASPER_TRUE= - HAVE_JASPER_FALSE='#' - else -@@ -29772,17 +30135,17 @@ +@@ -29772,17 +29364,17 @@ # support. # if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then @@ -20533,7 +54756,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29798,33 +30161,32 @@ +@@ -29798,33 +29390,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20574,7 +54797,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29838,52 +30200,51 @@ +@@ -29838,52 +29429,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20648,7 +54871,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -29892,18 +30253,18 @@ +@@ -29892,18 +29482,18 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -20673,7 +54896,7 @@ Index: gtk+2.0-2.14.3/configure cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_SYSTEMINFO_H 1 -@@ -29913,17 +30274,17 @@ +@@ -29913,17 +29503,17 @@ if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then @@ -20698,7 +54921,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29939,33 +30300,32 @@ +@@ -29939,33 +29529,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20739,7 +54962,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29979,52 +30339,51 @@ +@@ -29979,52 +29568,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20813,7 +55036,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -30033,18 +30392,18 @@ +@@ -30033,18 +29621,18 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -20838,7 +55061,7 @@ Index: gtk+2.0-2.14.3/configure cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_SYSINFO_H 1 -@@ -30054,15 +30413,15 @@ +@@ -30054,15 +29642,15 @@ @@ -20859,7 +55082,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lmlib $LIBS" -@@ -30094,37 +30453,33 @@ +@@ -30094,37 +29682,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20905,7 +55128,7 @@ Index: gtk+2.0-2.14.3/configure use_mlib=yes else use_mlib=no -@@ -30138,14 +30493,14 @@ +@@ -30138,14 +29722,14 @@ MEDIA_LIB=-lmlib @@ -20925,7 +55148,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lmlib $LIBS" -@@ -30177,37 +30532,33 @@ +@@ -30177,37 +29761,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -20971,29 +55194,7 @@ Index: gtk+2.0-2.14.3/configure use_mlib25=yes else use_mlib25=no -@@ -30221,9 +30572,7 @@ - - fi - fi -- -- --if test $use_mlib = yes; then -+ if test $use_mlib = yes; then - USE_MEDIALIB_TRUE= - USE_MEDIALIB_FALSE='#' - else -@@ -30231,9 +30580,7 @@ - USE_MEDIALIB_FALSE= - fi - -- -- --if test $use_mlib25 = yes; then -+ if test $use_mlib25 = yes; then - USE_MEDIALIB25_TRUE= - USE_MEDIALIB25_FALSE='#' - else -@@ -30248,8 +30595,8 @@ +@@ -30248,8 +29828,8 @@ # # This code is partially taken from Mesa # @@ -21004,7 +55205,7 @@ Index: gtk+2.0-2.14.3/configure case $host_cpu in i386|i486|i586|i686|i786|k6|k7) use_x86_asm=yes -@@ -30257,21 +30604,21 @@ +@@ -30257,21 +29837,21 @@ *) use_x86_asm=no esac @@ -21031,7 +55232,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); }; then use_mmx_asm=yes fi -@@ -30285,17 +30632,15 @@ +@@ -30285,11 +29865,11 @@ #define USE_MMX 1 _ACEOF @@ -21047,25 +55248,7 @@ Index: gtk+2.0-2.14.3/configure fi fi -- -- --if test x$use_mmx_asm = xyes; then -+ if test x$use_mmx_asm = xyes; then - USE_MMX_TRUE= - USE_MMX_FALSE='#' - else -@@ -30310,9 +30655,7 @@ - fi - - -- -- --if test $cross_compiling = yes; then -+ if test $cross_compiling = yes; then - CROSS_COMPILING_TRUE= - CROSS_COMPILING_FALSE='#' - else -@@ -30324,10 +30667,10 @@ +@@ -30324,10 +29904,10 @@ if test $cross_compiling = yes; then # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. set dummy gdk-pixbuf-csource; ac_word=$2 @@ -21079,7 +55262,7 @@ Index: gtk+2.0-2.14.3/configure else case $GDK_PIXBUF_CSOURCE in [\\/]* | ?:[\\/]*) -@@ -30342,7 +30685,7 @@ +@@ -30342,7 +29922,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -21088,7 +55271,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -30355,20 +30698,20 @@ +@@ -30355,20 +29935,20 @@ fi GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE if test -n "$GDK_PIXBUF_CSOURCE"; then @@ -21116,7 +55299,7 @@ Index: gtk+2.0-2.14.3/configure else case $GTK_UPDATE_ICON_CACHE in [\\/]* | ?:[\\/]*) -@@ -30383,7 +30726,7 @@ +@@ -30383,7 +29963,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -21125,7 +55308,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -30396,11 +30739,11 @@ +@@ -30396,11 +29976,11 @@ fi GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE if test -n "$GTK_UPDATE_ICON_CACHE"; then @@ -21141,7 +55324,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -30411,11 +30754,11 @@ +@@ -30411,11 +29991,11 @@ if test ! -f $srcdir/gtk/gtkbuiltincache.h && test "x$REBUILD_PNGS" = "x#" ; then @@ -21155,7 +55338,7 @@ Index: gtk+2.0-2.14.3/configure *** gtkbuiltincache.h is not in the tree, and cannot be built *** because you don't have libpng, or (when cross-compiling) you *** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} -@@ -30452,9 +30795,9 @@ +@@ -30452,9 +30032,9 @@ # settings. # if $PKG_CONFIG --exists fontconfig; then : ; else @@ -21167,7 +55350,7 @@ Index: gtk+2.0-2.14.3/configure *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} { (exit 1); exit 1; }; } fi -@@ -30482,8 +30825,8 @@ +@@ -30482,8 +30062,8 @@ GTK_PACKAGES_FOR_X="x11" else have_base_x_pc=false @@ -21178,7 +55361,7 @@ Index: gtk+2.0-2.14.3/configure # Check whether --with-x was given. -@@ -30497,11 +30840,11 @@ +@@ -30497,11 +30077,11 @@ have_x=disabled else case $x_includes,$x_libraries in #( @@ -21193,7 +55376,7 @@ Index: gtk+2.0-2.14.3/configure else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -@@ -30522,7 +30865,7 @@ +@@ -30522,7 +30102,7 @@ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. @@ -21202,7 +55385,7 @@ Index: gtk+2.0-2.14.3/configure if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break -@@ -30536,7 +30879,7 @@ +@@ -30536,7 +30116,7 @@ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -21211,7 +55394,7 @@ Index: gtk+2.0-2.14.3/configure *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi -@@ -30597,14 +30940,13 @@ +@@ -30597,14 +30177,13 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21228,7 +55411,7 @@ Index: gtk+2.0-2.14.3/configure (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -30612,7 +30954,7 @@ +@@ -30612,7 +30191,7 @@ # We can compile using X headers with no special include directory. ac_x_includes= else @@ -21237,7 +55420,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do -@@ -30653,33 +30995,30 @@ +@@ -30653,33 +30232,30 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21278,7 +55461,7 @@ Index: gtk+2.0-2.14.3/configure if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 -@@ -30688,7 +31027,6 @@ +@@ -30688,7 +30264,6 @@ done fi @@ -21286,7 +55469,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -@@ -30711,8 +31049,8 @@ +@@ -30711,8 +30286,8 @@ fi # $with_x != no if test "$have_x" != yes; then @@ -21297,7 +55480,7 @@ Index: gtk+2.0-2.14.3/configure no_x=yes else # If each of the values was on the command line, it overrides each guess. -@@ -30722,8 +31060,8 @@ +@@ -30722,8 +30297,8 @@ ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" @@ -21308,7 +55491,7 @@ Index: gtk+2.0-2.14.3/configure fi if test "$no_x" = yes; then -@@ -30744,8 +31082,8 @@ +@@ -30744,8 +30319,8 @@ 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 . . . . @@ -21319,7 +55502,7 @@ Index: gtk+2.0-2.14.3/configure ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes -@@ -30770,26 +31108,23 @@ +@@ -30770,26 +30345,23 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21353,7 +55536,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 LIBS="$ac_xsave_LIBS -R $x_libraries" -@@ -30814,38 +31149,33 @@ +@@ -30814,38 +30386,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21401,7 +55584,7 @@ Index: gtk+2.0-2.14.3/configure 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 -@@ -30891,30 +31221,27 @@ +@@ -30891,30 +30458,27 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21440,7 +55623,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -@@ -30946,45 +31273,41 @@ +@@ -30946,45 +30510,41 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21497,7 +55680,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -@@ -31016,44 +31339,39 @@ +@@ -31016,44 +30576,39 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21550,7 +55733,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" -@@ -31066,10 +31384,10 @@ +@@ -31066,10 +30621,10 @@ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. @@ -21564,7 +55747,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31122,41 +31440,37 @@ +@@ -31122,41 +30677,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21616,7 +55799,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -@@ -31188,45 +31502,41 @@ +@@ -31188,45 +30739,41 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21673,7 +55856,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" -@@ -31258,37 +31568,33 @@ +@@ -31258,37 +30805,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21719,7 +55902,7 @@ Index: gtk+2.0-2.14.3/configure X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi -@@ -31302,10 +31608,10 @@ +@@ -31302,10 +30845,10 @@ # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. @@ -21733,7 +55916,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31358,41 +31664,37 @@ +@@ -31358,41 +30901,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21785,7 +55968,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -@@ -31424,47 +31726,43 @@ +@@ -31424,47 +30963,43 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21844,7 +56027,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31517,41 +31815,37 @@ +@@ -31517,41 +31052,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21896,7 +56079,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -@@ -31583,47 +31877,43 @@ +@@ -31583,47 +31114,43 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -21955,7 +56138,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31676,41 +31966,37 @@ +@@ -31676,41 +31203,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22007,7 +56190,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -@@ -31742,37 +32028,33 @@ +@@ -31742,37 +31265,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22053,7 +56236,7 @@ Index: gtk+2.0-2.14.3/configure X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi -@@ -31788,10 +32070,10 @@ +@@ -31788,10 +31307,10 @@ # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry @@ -22067,7 +56250,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -@@ -31823,37 +32105,33 @@ +@@ -31823,37 +31342,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22113,7 +56296,7 @@ Index: gtk+2.0-2.14.3/configure X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi -@@ -31862,8 +32140,8 @@ +@@ -31862,8 +31377,8 @@ fi if test x$no_x = xyes ; then @@ -22124,7 +56307,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } fi -@@ -31887,10 +32165,10 @@ +@@ -31887,10 +31402,10 @@ # Sanity check for the X11 and Xext libraries. While everything we need from # Xext is optional, the chances a system has *none* of these things is so # small that we just unconditionally require it. @@ -22138,7 +56321,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31943,47 +32221,43 @@ +@@ -31943,47 +31458,43 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22199,7 +56382,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32036,47 +32310,43 @@ +@@ -32036,47 +31547,43 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22260,7 +56443,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32129,48 +32399,44 @@ +@@ -32129,48 +31636,44 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22321,7 +56504,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -32192,22 +32458,21 @@ +@@ -32192,22 +31695,21 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22349,7 +56532,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -@@ -32232,33 +32497,32 @@ +@@ -32232,33 +31734,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22392,7 +56575,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } fi -@@ -32273,11 +32537,11 @@ +@@ -32273,11 +31774,11 @@ for ac_func in XConvertCase XInternAtoms do @@ -22408,7 +56591,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32330,42 +32594,35 @@ +@@ -32330,42 +31831,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22461,7 +56644,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -32378,10 +32635,10 @@ +@@ -32378,10 +31872,10 @@ # for clarity have_x11r6=false @@ -22475,7 +56658,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32434,36 +32691,32 @@ +@@ -32434,36 +31928,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22520,18 +56703,7 @@ Index: gtk+2.0-2.14.3/configure have_x11r6=true fi -@@ -32475,9 +32728,7 @@ - _ACEOF - - fi -- -- --if $have_x11r6; then -+ if $have_x11r6; then - HAVE_X11R6_TRUE= - HAVE_X11R6_FALSE='#' - else -@@ -32489,18 +32740,18 @@ +@@ -32489,18 +31979,18 @@ # Check for XKB support. if test "x$enable_xkb" = "xyes"; then @@ -22555,7 +56727,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32553,36 +32804,32 @@ +@@ -32553,36 +32043,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22600,7 +56772,7 @@ Index: gtk+2.0-2.14.3/configure cat >>confdefs.h <<\_ACEOF #define HAVE_XKB 1 -@@ -32591,16 +32838,16 @@ +@@ -32591,16 +32077,16 @@ fi else @@ -22622,7 +56794,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32653,36 +32900,32 @@ +@@ -32653,36 +32139,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22667,7 +56839,7 @@ Index: gtk+2.0-2.14.3/configure cat >>confdefs.h <<\_ACEOF #define HAVE_SHAPE_EXT 1 -@@ -32695,10 +32938,10 @@ +@@ -32695,10 +32177,10 @@ gtk_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $x_cflags" @@ -22681,7 +56853,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32751,40 +32994,36 @@ +@@ -32751,40 +32233,36 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22733,7 +56905,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32802,21 +33041,20 @@ +@@ -32802,21 +32280,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22758,7 +56930,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_X11_extensions_sync_h=no -@@ -32824,9 +33062,9 @@ +@@ -32824,9 +32301,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -22771,7 +56943,7 @@ Index: gtk+2.0-2.14.3/configure cat >>confdefs.h <<\_ACEOF #define HAVE_XSYNC 1 -@@ -32846,10 +33084,10 @@ +@@ -32846,10 +32323,10 @@ if test "x$enable_shm" = "xyes"; then # Check for the XShm extension, normally in Xext @@ -22785,7 +56957,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32902,43 +33140,39 @@ +@@ -32902,43 +32379,39 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22840,7 +57012,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lXextSam $LIBS" -@@ -32970,37 +33204,33 @@ +@@ -32970,37 +32443,33 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22886,7 +57058,7 @@ Index: gtk+2.0-2.14.3/configure case "$x_extra_libs " in *-lXextSam[\ \ ]*) ;; *) x_extra_libs="-lXextSam $x_extra_libs" ;; -@@ -33015,17 +33245,17 @@ +@@ -33015,17 +32484,17 @@ if test "x$enable_shm" = "xyes"; then # Check for shared memory if test "${ac_cv_header_sys_ipc_h+set}" = set; then @@ -22911,7 +57083,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33041,33 +33271,32 @@ +@@ -33041,33 +32510,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -22952,7 +57124,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33081,52 +33310,51 @@ +@@ -33081,52 +32549,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23026,7 +57198,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -33135,18 +33363,18 @@ +@@ -33135,18 +32602,18 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -23051,7 +57223,7 @@ Index: gtk+2.0-2.14.3/configure cat >>confdefs.h <<\_ACEOF #define HAVE_IPC_H 1 -@@ -33158,17 +33386,17 @@ +@@ -33158,17 +32625,17 @@ if test "${ac_cv_header_sys_shm_h+set}" = set; then @@ -23076,7 +57248,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33184,33 +33412,32 @@ +@@ -33184,33 +32651,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23117,7 +57289,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33224,52 +33451,51 @@ +@@ -33224,52 +32690,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23191,7 +57363,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -33278,18 +33504,18 @@ +@@ -33278,18 +32743,18 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -23216,7 +57388,7 @@ Index: gtk+2.0-2.14.3/configure cat >>confdefs.h <<\_ACEOF #define HAVE_SHM_H 1 -@@ -33303,8 +33529,8 @@ +@@ -33303,8 +32768,8 @@ # Check for the X shared memory extension header file have_xshm=no @@ -23227,7 +57399,7 @@ Index: gtk+2.0-2.14.3/configure if test "x$no_xext_lib" = "xyes"; then : else -@@ -33339,21 +33565,20 @@ +@@ -33339,21 +32804,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23252,7 +57424,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -33362,8 +33587,8 @@ +@@ -33362,8 +32826,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gtk_save_CFLAGS" fi @@ -23263,7 +57435,7 @@ Index: gtk+2.0-2.14.3/configure if test $have_xshm = yes ; then cat >>confdefs.h <<\_ACEOF -@@ -33381,14 +33606,14 @@ +@@ -33381,14 +32845,14 @@ case "$host" in *-*-solaris*) # Check for solaris @@ -23283,7 +57455,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -33441,40 +33666,36 @@ +@@ -33441,40 +32905,36 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23335,7 +57507,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -33492,21 +33713,20 @@ +@@ -33492,21 +32952,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23360,7 +57532,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_X11_extensions_xinerama_h=no -@@ -33514,9 +33734,9 @@ +@@ -33514,9 +32973,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -23373,7 +57545,7 @@ Index: gtk+2.0-2.14.3/configure have_solaris_xinerama=true else : -@@ -33537,27 +33757,27 @@ +@@ -33537,27 +32996,27 @@ #define HAVE_XINERAMA 1 _ACEOF @@ -23410,7 +57582,7 @@ Index: gtk+2.0-2.14.3/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lXinerama $LIBS" -@@ -33589,41 +33809,37 @@ +@@ -33589,41 +33048,37 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23463,7 +57635,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -33641,21 +33857,20 @@ +@@ -33641,21 +33096,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23488,7 +57660,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_X11_extensions_Xinerama_h=no -@@ -33663,9 +33878,9 @@ +@@ -33663,9 +33117,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -23501,7 +57673,7 @@ Index: gtk+2.0-2.14.3/configure case "$x_extra_libs " in *-lXinerama[\ \ ]*) ;; *) x_extra_libs="-lXinerama $x_extra_libs" ;; -@@ -33692,11 +33907,11 @@ +@@ -33692,11 +33146,11 @@ #define HAVE_XINERAMA 1 _ACEOF @@ -23517,106 +57689,7 @@ Index: gtk+2.0-2.14.3/configure fi ;; esac -@@ -33728,9 +33943,7 @@ - - fi - -- -- --if test x$with_xinput = xxfree || test x$with_xinput = xyes; then -+ if test x$with_xinput = xxfree || test x$with_xinput = xyes; then - XINPUT_XFREE_TRUE= - XINPUT_XFREE_FALSE='#' - else -@@ -33810,9 +34023,7 @@ - CPPFLAGS="$gtk_save_cppflags" - LIBS="$gtk_save_libs" - -- -- --if true; then -+ if true; then - USE_X11_TRUE= - USE_X11_FALSE='#' - else -@@ -33821,9 +34032,7 @@ - fi - - else -- -- --if false; then -+ if false; then - XINPUT_XFREE_TRUE= - XINPUT_XFREE_FALSE='#' - else -@@ -33831,9 +34040,7 @@ - XINPUT_XFREE_FALSE= - fi - -- -- --if false; then -+ if false; then - USE_X11_TRUE= - USE_X11_FALSE='#' - else -@@ -33841,9 +34048,7 @@ - USE_X11_FALSE= - fi - -- -- --if false; then -+ if false; then - HAVE_X11R6_TRUE= - HAVE_X11R6_FALSE='#' - else -@@ -33855,9 +34060,7 @@ - - if test "x$gdktarget" = "xwin32"; then - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" -- -- --if true; then -+ if true; then - USE_WIN32_TRUE= - USE_WIN32_FALSE='#' - else -@@ -33866,9 +34069,7 @@ - fi - - else -- -- --if false; then -+ if false; then - USE_WIN32_TRUE= - USE_WIN32_FALSE='#' - else -@@ -33880,9 +34081,7 @@ - - if test "x$gdktarget" = "xquartz"; then - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" -- -- --if true; then -+ if true; then - USE_QUARTZ_TRUE= - USE_QUARTZ_FALSE='#' - else -@@ -33891,9 +34090,7 @@ - fi - - else -- -- --if false; then -+ if false; then - USE_QUARTZ_TRUE= - USE_QUARTZ_FALSE='#' - else -@@ -33913,22 +34110,32 @@ +@@ -33913,22 +33367,32 @@ if test "x$gdktarget" = "xdirectfb"; then @@ -23658,29 +57731,7 @@ Index: gtk+2.0-2.14.3/configure *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend *** are required. The latest version of DirectFB is always available *** from http://www.directfb.org/. -@@ -33936,9 +34143,7 @@ - { (exit 1); exit 1; }; } - fi - -- -- --if true; then -+ if true; then - USE_DIRECTFB_TRUE= - USE_DIRECTFB_FALSE='#' - else -@@ -33947,9 +34152,7 @@ - fi - - else -- -- --if false; then -+ if false; then - USE_DIRECTFB_TRUE= - USE_DIRECTFB_FALSE='#' - else -@@ -33968,20 +34171,20 @@ +@@ -33968,20 +33432,20 @@ PANGO_PACKAGES="pango pangocairo" fi @@ -23707,7 +57758,7 @@ Index: gtk+2.0-2.14.3/configure *** Pango not found. Pango built with Cairo support is required *** to build GTK+. See http://www.pango.org for Pango information. " >&2;} -@@ -34023,36 +34226,32 @@ +@@ -34023,36 +33487,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23751,7 +57802,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$gtk_save_LIBS" -@@ -34061,20 +34260,21 @@ +@@ -34061,20 +33521,21 @@ CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" @@ -23778,7 +57829,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -34084,25 +34284,26 @@ +@@ -34084,25 +33545,26 @@ @@ -23811,7 +57862,7 @@ Index: gtk+2.0-2.14.3/configure *** Accessibility Toolkit not found. Accessibility Toolkit is required *** to build GTK+. " >&2;} -@@ -34142,36 +34343,32 @@ +@@ -34142,36 +33604,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23855,7 +57906,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$gtk_save_LIBS" -@@ -34196,7 +34393,7 @@ +@@ -34196,7 +33654,7 @@ CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" if test $enable_explicit_deps != yes ; then @@ -23864,7 +57915,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -34224,10 +34421,10 @@ +@@ -34224,10 +33682,10 @@ ######################## old_LIBS="$LIBS" @@ -23878,7 +57929,7 @@ Index: gtk+2.0-2.14.3/configure else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -34265,30 +34462,26 @@ +@@ -34265,30 +33723,26 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23914,7 +57965,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_gethostent+set}" = set; then -@@ -34303,18 +34496,18 @@ +@@ -34303,18 +33757,18 @@ rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi @@ -23938,7 +57989,7 @@ Index: gtk+2.0-2.14.3/configure else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -34352,30 +34545,26 @@ +@@ -34352,30 +33806,26 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -23974,7 +58025,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_setsockopt+set}" = set; then -@@ -34390,18 +34579,18 @@ +@@ -34390,18 +33840,18 @@ rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi @@ -23998,7 +58049,7 @@ Index: gtk+2.0-2.14.3/configure else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -34439,30 +34628,26 @@ +@@ -34439,30 +33889,26 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24034,7 +58085,7 @@ Index: gtk+2.0-2.14.3/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_connect+set}" = set; then -@@ -34477,8 +34662,8 @@ +@@ -34477,8 +33923,8 @@ rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi @@ -24045,7 +58096,7 @@ Index: gtk+2.0-2.14.3/configure ac_res=$ac_cv_search_connect if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -34486,10 +34671,10 @@ +@@ -34486,10 +33932,10 @@ fi @@ -24059,7 +58110,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -34517,21 +34702,20 @@ +@@ -34517,21 +33963,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24084,7 +58135,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -@@ -34560,21 +34744,20 @@ +@@ -34560,21 +34005,20 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24109,7 +58160,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_member_struct_sockaddr_un_sun_len=no -@@ -34585,9 +34768,9 @@ +@@ -34585,9 +34029,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -24122,7 +58173,7 @@ Index: gtk+2.0-2.14.3/configure struct_sockaddr_un_sun_len=true else struct_sockaddr_un_suin_len=false -@@ -34626,10 +34809,10 @@ +@@ -34626,10 +34070,10 @@ then # Extract the first word of "cups-config", so it can be a program name with args. set dummy cups-config; ac_word=$2 @@ -24136,7 +58187,7 @@ Index: gtk+2.0-2.14.3/configure else case $CUPS_CONFIG in [\\/]* | ?:[\\/]*) -@@ -34644,7 +34827,7 @@ +@@ -34644,7 +34088,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -24145,7 +58196,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -34657,11 +34840,11 @@ +@@ -34657,11 +34101,11 @@ fi CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG if test -n "$CUPS_CONFIG"; then @@ -24161,7 +58212,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -34688,17 +34871,17 @@ +@@ -34688,17 +34132,17 @@ if test "${ac_cv_header_cups_cups_h+set}" = set; then @@ -24186,7 +58237,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -34714,33 +34897,32 @@ +@@ -34714,33 +34158,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24227,7 +58278,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -34754,52 +34936,51 @@ +@@ -34754,52 +34197,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24301,7 +58352,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -34808,30 +34989,28 @@ +@@ -34808,22 +34250,22 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -24332,16 +58383,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } fi - - fi -- -- --if test "x$CUPS_CONFIG" != "xno"; then -+ if test "x$CUPS_CONFIG" != "xno"; then - HAVE_CUPS_TRUE= - HAVE_CUPS_FALSE='#' - else -@@ -34863,25 +35042,24 @@ +@@ -34863,25 +34305,24 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24371,7 +58413,7 @@ Index: gtk+2.0-2.14.3/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -34897,11 +35075,11 @@ +@@ -34897,11 +34338,11 @@ for ac_func in httpGetAuthString do @@ -24387,7 +58429,7 @@ Index: gtk+2.0-2.14.3/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -34954,42 +35132,35 @@ +@@ -34954,42 +34395,35 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24440,18 +58482,7 @@ Index: gtk+2.0-2.14.3/configure _ACEOF fi -@@ -34998,9 +35169,7 @@ - LIBS="$gtk_save_libs" - - else -- -- --if false; then -+ if false; then - HAVE_CUPS_TRUE= - HAVE_CUPS_FALSE='#' - else -@@ -35014,17 +35183,17 @@ +@@ -35014,17 +34448,17 @@ CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" if test "${ac_cv_header_cairo_pdf_h+set}" = set; then @@ -24476,7 +58507,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -35040,33 +35209,32 @@ +@@ -35040,33 +34474,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24517,7 +58548,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -35080,52 +35248,51 @@ +@@ -35080,52 +34513,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24591,7 +58622,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -35134,24 +35301,24 @@ +@@ -35134,24 +34566,24 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -24624,7 +58655,7 @@ Index: gtk+2.0-2.14.3/configure *** Can't find cairo-pdf.h. You must build Cairo with the pdf *** backend enabled." >&2;} { (exit 1); exit 1; }; } -@@ -35161,17 +35328,17 @@ +@@ -35161,17 +34593,17 @@ if test "$os_win32" != "yes"; then if test "${ac_cv_header_cairo_ps_h+set}" = set; then @@ -24649,7 +58680,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -35187,33 +35354,32 @@ +@@ -35187,33 +34619,32 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24690,7 +58721,7 @@ Index: gtk+2.0-2.14.3/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -35227,52 +35393,51 @@ +@@ -35227,52 +34658,51 @@ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -24764,7 +58795,7 @@ Index: gtk+2.0-2.14.3/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -35281,24 +35446,24 @@ +@@ -35281,24 +34711,24 @@ ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -24797,18 +58828,7 @@ Index: gtk+2.0-2.14.3/configure *** Can't find cairo-ps.h. You must build Cairo with the *** postscript backend enabled." >&2;} { (exit 1); exit 1; }; } -@@ -35317,9 +35482,7 @@ - enable_test_print_backend=no - fi - -- -- --if test "x$enable_test_print_backend" != "xno"; then -+ if test "x$enable_test_print_backend" != "xno"; then - TEST_PRINT_BACKEND_TRUE= - TEST_PRINT_BACKEND_FALSE='#' - else -@@ -35378,32 +35541,32 @@ +@@ -35378,32 +34808,32 @@ if test x$enable_gtk_doc = xyes; then if test -n "$PKG_CONFIG" && \ @@ -24852,7 +58872,7 @@ Index: gtk+2.0-2.14.3/configure else case $GTKDOC_CHECK in [\\/]* | ?:[\\/]*) -@@ -35418,7 +35581,7 @@ +@@ -35418,7 +34848,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" @@ -24861,7 +58881,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -35430,11 +35593,11 @@ +@@ -35430,11 +34860,11 @@ fi GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK if test -n "$GTKDOC_CHECK"; then @@ -24877,29 +58897,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -35442,9 +35605,7 @@ - done - - -- -- --if test x$enable_gtk_doc = xyes; then -+ if test x$enable_gtk_doc = xyes; then - ENABLE_GTK_DOC_TRUE= - ENABLE_GTK_DOC_FALSE='#' - else -@@ -35452,9 +35613,7 @@ - ENABLE_GTK_DOC_FALSE= - fi - -- -- --if test -n "$LIBTOOL"; then -+ if test -n "$LIBTOOL"; then - GTK_DOC_USE_LIBTOOL_TRUE= - GTK_DOC_USE_LIBTOOL_FALSE='#' - else -@@ -35466,10 +35625,10 @@ +@@ -35466,10 +34896,10 @@ # Extract the first word of "db2html", so it can be a program name with args. set dummy db2html; ac_word=$2 @@ -24913,7 +58911,7 @@ Index: gtk+2.0-2.14.3/configure else if test -n "$DB2HTML"; then ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test. -@@ -35482,7 +35641,7 @@ +@@ -35482,7 +34912,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -24922,7 +58920,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -35494,17 +35653,15 @@ +@@ -35494,11 +34924,11 @@ fi DB2HTML=$ac_cv_prog_DB2HTML if test -n "$DB2HTML"; then @@ -24938,14 +58936,7 @@ Index: gtk+2.0-2.14.3/configure fi -- -- --if $DB2HTML; then -+ if $DB2HTML; then - HAVE_DOCBOOK_TRUE= - HAVE_DOCBOOK_FALSE='#' - else -@@ -35524,10 +35681,10 @@ +@@ -35524,10 +34954,10 @@ if test "${enable_man}" != no; then # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 @@ -24959,7 +58950,7 @@ Index: gtk+2.0-2.14.3/configure else case $XSLTPROC in [\\/]* | ?:[\\/]*) -@@ -35542,7 +35699,7 @@ +@@ -35542,7 +34972,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -24968,7 +58959,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -35554,11 +35711,11 @@ +@@ -35554,11 +34984,11 @@ fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then @@ -24984,7 +58975,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -35579,24 +35736,24 @@ +@@ -35579,24 +35009,24 @@ jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" @@ -25018,7 +59009,7 @@ Index: gtk+2.0-2.14.3/configure else case $XMLCATALOG in [\\/]* | ?:[\\/]*) -@@ -35611,7 +35768,7 @@ +@@ -35611,7 +35041,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -25027,7 +59018,7 @@ Index: gtk+2.0-2.14.3/configure break 2 fi done -@@ -35624,11 +35781,11 @@ +@@ -35624,11 +35054,11 @@ fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then @@ -25043,7 +59034,7 @@ Index: gtk+2.0-2.14.3/configure fi -@@ -35643,44 +35800,42 @@ +@@ -35643,36 +35073,36 @@ fi @@ -25096,16 +59087,7 @@ Index: gtk+2.0-2.14.3/configure enable_man=no fi - fi - -- -- --if test x$enable_man != xno; then -+ if test x$enable_man != xno; then - ENABLE_MAN_TRUE= - ENABLE_MAN_FALSE='#' - else -@@ -35727,12 +35882,11 @@ +@@ -35727,12 +35157,11 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -25120,7 +59102,7 @@ Index: gtk+2.0-2.14.3/configure *) $as_unset $ac_var ;; esac ;; esac -@@ -35765,12 +35919,12 @@ +@@ -35765,12 +35194,12 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -25137,7 +59119,7 @@ Index: gtk+2.0-2.14.3/configure fi fi rm -f confcache -@@ -35786,7 +35940,7 @@ +@@ -35786,7 +35215,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -25146,7 +59128,7 @@ Index: gtk+2.0-2.14.3/configure # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -@@ -35798,510 +35952,530 @@ +@@ -35798,510 +35227,516 @@ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -25195,16 +59177,9 @@ Index: gtk+2.0-2.14.3/configure if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. + { { echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. -+echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. ++echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -25256,16 +59231,9 @@ Index: gtk+2.0-2.14.3/configure if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. + { { echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. -+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -25823,7 +59791,7 @@ Index: gtk+2.0-2.14.3/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -36314,7 +36488,7 @@ +@@ -36314,7 +35749,7 @@ SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF @@ -25832,7 +59800,7 @@ Index: gtk+2.0-2.14.3/configure ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -@@ -36324,7 +36498,7 @@ +@@ -36324,7 +35759,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -25841,7 +59809,7 @@ Index: gtk+2.0-2.14.3/configure # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -@@ -36346,45 +36520,17 @@ +@@ -36346,45 +35781,17 @@ as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits @@ -25896,7 +59864,7 @@ Index: gtk+2.0-2.14.3/configure fi # Support unset when possible. -@@ -36400,6 +36546,8 @@ +@@ -36400,6 +35807,8 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) @@ -25905,7 +59873,7 @@ Index: gtk+2.0-2.14.3/configure IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -@@ -36422,7 +36570,7 @@ +@@ -36422,7 +35831,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then @@ -25914,7 +59882,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; } fi -@@ -36435,10 +36583,17 @@ +@@ -36435,10 +35844,17 @@ PS4='+ ' # NLS nuisances. @@ -25936,7 +59904,7 @@ Index: gtk+2.0-2.14.3/configure # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -36460,7 +36615,7 @@ +@@ -36460,7 +35876,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || @@ -25945,7 +59913,7 @@ Index: gtk+2.0-2.14.3/configure sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q -@@ -36511,7 +36666,7 @@ +@@ -36511,7 +35927,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || @@ -25954,7 +59922,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems -@@ -36539,6 +36694,7 @@ +@@ -36539,6 +35955,7 @@ *) ECHO_N='-n';; esac @@ -25962,7 +59930,7 @@ Index: gtk+2.0-2.14.3/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -36551,22 +36707,19 @@ +@@ -36551,22 +35968,19 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir @@ -25996,7 +59964,7 @@ Index: gtk+2.0-2.14.3/configure else as_ln_s='cp -p' fi -@@ -36591,10 +36744,10 @@ +@@ -36591,10 +36005,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then @@ -26009,16 +59977,16 @@ Index: gtk+2.0-2.14.3/configure esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi -@@ -36617,7 +36770,7 @@ +@@ -36617,7 +36031,7 @@ # values after options handling. ac_log=" - This file was extended by gtk+ $as_me 2.14.3, which was + This file was extended by gtk+ $as_me 2.14.4, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -36630,16 +36783,7 @@ +@@ -36630,16 +36044,7 @@ _ACEOF @@ -26036,7 +60004,7 @@ Index: gtk+2.0-2.14.3/configure # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" -@@ -36647,23 +36791,22 @@ +@@ -36647,23 +36052,22 @@ _ACEOF @@ -26067,14 +60035,14 @@ Index: gtk+2.0-2.14.3/configure Configuration files: $config_files -@@ -36677,25 +36820,25 @@ +@@ -36677,25 +36081,24 @@ Report bugs to ." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ - gtk+ config.status 2.14.3 + gtk+ config.status 2.14.4 -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, @@ -26090,7 +60058,6 @@ Index: gtk+2.0-2.14.3/configure INSTALL='$INSTALL' -AWK='$AWK' -test -n "\$AWK" || AWK=awk -+MKDIR_P='$MKDIR_P' _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -26101,7 +60068,7 @@ Index: gtk+2.0-2.14.3/configure ac_need_defaults=: while test $# != 0 do -@@ -36717,36 +36860,30 @@ +@@ -36717,36 +36120,30 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) @@ -26144,7 +60111,7 @@ Index: gtk+2.0-2.14.3/configure Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; -@@ -36765,29 +36902,27 @@ +@@ -36765,29 +36162,27 @@ fi _ACEOF @@ -26181,7 +60148,7 @@ Index: gtk+2.0-2.14.3/configure # # INIT-COMMANDS # -@@ -36829,7 +36964,7 @@ +@@ -36829,7 +36224,7 @@ _ACEOF @@ -26190,7 +60157,7 @@ Index: gtk+2.0-2.14.3/configure # Handling of arguments. for ac_config_target in $ac_config_targets -@@ -36910,8 +37045,8 @@ +@@ -36910,8 +36305,8 @@ "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; @@ -26201,7 +60168,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; };; esac done -@@ -36952,144 +37087,536 @@ +@@ -36952,144 +36347,529 @@ (umask 077 && mkdir "$tmp") } || { @@ -26222,6 +60189,7 @@ Index: gtk+2.0-2.14.3/configure if test -n "$CONFIG_FILES"; then +_ACEOF ++ -ac_cr=' ' -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` @@ -26230,7 +60198,6 @@ Index: gtk+2.0-2.14.3/configure -else - ac_cs_awk_cr=$ac_cr + -+ +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF @@ -26274,7 +60241,6 @@ Index: gtk+2.0-2.14.3/configure +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim -+am__isrc!$am__isrc$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim @@ -26283,16 +60249,13 @@ Index: gtk+2.0-2.14.3/configure +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim ++AMTAR!$AMTAR$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -+mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim -+AMTAR!$AMTAR$ac_delim -+am__tar!$am__tar$ac_delim -+am__untar!$am__untar$ac_delim +GTK_MAJOR_VERSION!$GTK_MAJOR_VERSION$ac_delim +GTK_MINOR_VERSION!$GTK_MINOR_VERSION$ac_delim +GTK_MICRO_VERSION!$GTK_MICRO_VERSION$ac_delim @@ -26331,6 +60294,10 @@ Index: gtk+2.0-2.14.3/configure +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim ++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -26386,10 +60353,6 @@ Index: gtk+2.0-2.14.3/configure -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + cat >conf$$subs.sed <<_ACEOF -+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -+CCDEPMODE!$CCDEPMODE$ac_delim -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim +ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim +CXX!$CXX$ac_delim @@ -26422,9 +60385,6 @@ Index: gtk+2.0-2.14.3/configure +LIBTOOL!$LIBTOOL$ac_delim +CCAS!$CCAS$ac_delim +CCASFLAGS!$CCASFLAGS$ac_delim -+CCASDEPMODE!$CCASDEPMODE$ac_delim -+am__fastdepCCAS_TRUE!$am__fastdepCCAS_TRUE$ac_delim -+am__fastdepCCAS_FALSE!$am__fastdepCCAS_FALSE$ac_delim +NM!$NM$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim @@ -26483,6 +60443,13 @@ Index: gtk+2.0-2.14.3/configure +LIBJASPER!$LIBJASPER$ac_delim +BUILD_DYNAMIC_MODULES_TRUE!$BUILD_DYNAMIC_MODULES_TRUE$ac_delim +BUILD_DYNAMIC_MODULES_FALSE!$BUILD_DYNAMIC_MODULES_FALSE$ac_delim ++INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim ++INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim ++INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim ++INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim ++INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim ++INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim ++INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim +_ACEOF - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` @@ -26599,13 +60566,6 @@ Index: gtk+2.0-2.14.3/configure +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF -+INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim -+INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim -+INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim -+INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim -+INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim -+INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim -+INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim +INCLUDE_WBMP_FALSE!$INCLUDE_WBMP_FALSE$ac_delim +INCLUDE_GIF_TRUE!$INCLUDE_GIF_TRUE$ac_delim +INCLUDE_GIF_FALSE!$INCLUDE_GIF_FALSE$ac_delim @@ -26696,9 +60656,15 @@ Index: gtk+2.0-2.14.3/configure +USE_WIN32_TRUE!$USE_WIN32_TRUE$ac_delim +USE_WIN32_FALSE!$USE_WIN32_FALSE$ac_delim +USE_QUARTZ_TRUE!$USE_QUARTZ_TRUE$ac_delim ++USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim ++GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim ++GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim ++USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim +_ACEOF - --_ACAWK ++ + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then @@ -26715,7 +60681,8 @@ Index: gtk+2.0-2.14.3/configure + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi -+ + +-_ACAWK +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b @@ -26746,13 +60713,6 @@ Index: gtk+2.0-2.14.3/configure +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF -+USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim -+GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim -+GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim -+GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim -+USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim +USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim +GDK_PACKAGES!$GDK_PACKAGES$ac_delim +GDK_PRIVATE_PACKAGES!$GDK_PRIVATE_PACKAGES$ac_delim @@ -26805,7 +60765,7 @@ Index: gtk+2.0-2.14.3/configure +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -26846,7 +60806,7 @@ Index: gtk+2.0-2.14.3/configure # 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 -@@ -37105,133 +37632,19 @@ +@@ -37105,133 +36885,19 @@ }' fi @@ -26984,7 +60944,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -@@ -37260,38 +37673,26 @@ +@@ -37260,38 +36926,26 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -27031,7 +60991,7 @@ Index: gtk+2.0-2.14.3/configure esac ;; esac -@@ -37301,7 +37702,7 @@ +@@ -37301,7 +36955,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || @@ -27040,7 +61000,7 @@ Index: gtk+2.0-2.14.3/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37327,7 +37728,7 @@ +@@ -37327,7 +36981,7 @@ as_dirs= while :; do case $as_dir in #( @@ -27049,7 +61009,7 @@ Index: gtk+2.0-2.14.3/configure *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" -@@ -37336,7 +37737,7 @@ +@@ -37336,7 +36990,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || @@ -27058,7 +61018,7 @@ Index: gtk+2.0-2.14.3/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37357,17 +37758,17 @@ +@@ -37357,17 +37011,17 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -27080,15 +61040,8 @@ Index: gtk+2.0-2.14.3/configure case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -37405,15 +37806,19 @@ - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; +@@ -37407,13 +37061,12 @@ esac -+ ac_MKDIR_P=$MKDIR_P -+ case $MKDIR_P in -+ [\\/$]* | ?:[\\/]* ) ;; -+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; -+ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -27103,7 +61056,7 @@ Index: gtk+2.0-2.14.3/configure p q } -@@ -37422,14 +37827,13 @@ +@@ -37422,14 +37075,13 @@ /@infodir@/p /@localedir@/p /@mandir@/p @@ -27122,7 +61075,7 @@ Index: gtk+2.0-2.14.3/configure ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g -@@ -37443,16 +37847,15 @@ +@@ -37443,16 +37095,15 @@ # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? @@ -27143,11 +61096,9 @@ Index: gtk+2.0-2.14.3/configure s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t -@@ -37461,75 +37864,138 @@ - s&@abs_builddir@&$ac_abs_builddir&;t t +@@ -37462,74 +37113,135 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t -+s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ @@ -27297,12 +61248,11 @@ Index: gtk+2.0-2.14.3/configure -# Compute "$ac_file"'s index in $config_headers. + rm -f "$tmp/out12" +# Compute $ac_file's index in $config_headers. -+_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - "$ac_file" | "$ac_file":* ) -+ $_am_arg | $_am_arg:* ) ++ $ac_file | $ac_file:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; @@ -27314,16 +61264,16 @@ Index: gtk+2.0-2.14.3/configure - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | -+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$_am_arg" : 'X\(//\)[^/]' \| \ -+ X"$_am_arg" : 'X\(//\)$' \| \ -+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$_am_arg" | ++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || ++$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X$ac_file : 'X\(//\)[^/]' \| \ ++ X$ac_file : 'X\(//\)$' \| \ ++ X$ac_file : 'X\(/\)' \| . 2>/dev/null || ++echo X$ac_file | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37549,8 +38015,8 @@ +@@ -37549,8 +37261,8 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -27334,17 +61284,7 @@ Index: gtk+2.0-2.14.3/configure ;; esac -@@ -37564,14 +38030,15 @@ - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. -- # So let's grep whole file. -- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -37571,7 +37283,7 @@ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || @@ -27353,48 +61293,7 @@ Index: gtk+2.0-2.14.3/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37592,27 +38059,21 @@ - else - continue - fi -- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n -e '/^U = / s///p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n -e ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -+ U=`sed -n 's/^U = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue -@@ -37621,7 +38082,7 @@ +@@ -37621,7 +37333,7 @@ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || @@ -27403,7 +61302,7 @@ Index: gtk+2.0-2.14.3/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37647,7 +38108,7 @@ +@@ -37647,7 +37359,7 @@ as_dirs= while :; do case $as_dir in #( @@ -27412,7 +61311,7 @@ Index: gtk+2.0-2.14.3/configure *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" -@@ -37656,7 +38117,7 @@ +@@ -37656,7 +37368,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || @@ -27421,7 +61320,7 @@ Index: gtk+2.0-2.14.3/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37677,8 +38138,8 @@ +@@ -37677,8 +37389,8 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -27432,7 +61331,7 @@ Index: gtk+2.0-2.14.3/configure { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" -@@ -37733,8 +38194,8 @@ +@@ -37733,8 +37445,8 @@ if cmp -s $outfile gdk/gdkconfig.h; then @@ -27443,7 +61342,7 @@ Index: gtk+2.0-2.14.3/configure rm -f $outfile else mv $outfile gdk/gdkconfig.h -@@ -37750,11 +38211,6 @@ +@@ -37750,11 +37462,6 @@ chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save @@ -27455,7 +61354,7 @@ Index: gtk+2.0-2.14.3/configure # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. -@@ -37776,10 +38232,6 @@ +@@ -37776,10 +37483,6 @@ # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi @@ -27466,154 +61365,19 @@ Index: gtk+2.0-2.14.3/configure echo "configuration: -Index: gtk+2.0-2.14.3/contrib/gdk-pixbuf-xlib/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2008-09-24 00:11:35.000000000 -0300 -+++ gtk+2.0-2.14.3/contrib/gdk-pixbuf-xlib/Makefile.in 2008-09-24 19:56:49.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,13 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +34,65 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(libgdk_pixbuf_xlibinclude_HEADERS) \ -+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/gdk-pixbuf-xlib-2.0.pc.in \ -+ $(top_srcdir)/Makefile.decl ChangeLog -+subdir = contrib/gdk-pixbuf-xlib -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = gdk-pixbuf-xlib-2.0.pc -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ -+ "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)" -+libLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(lib_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+libgdk_pixbuf_xlib_2_0_la_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(am__DEPENDENCIES_1) -+am_libgdk_pixbuf_xlib_2_0_la_OBJECTS = gdk-pixbuf-xlib.lo \ -+ gdk-pixbuf-xlib-render.lo gdk-pixbuf-xlib-drawable.lo \ -+ gdk-pixbuf-xlibrgb.lo -+libgdk_pixbuf_xlib_2_0_la_OBJECTS = \ -+ $(am_libgdk_pixbuf_xlib_2_0_la_OBJECTS) -+libgdk_pixbuf_xlib_2_0_la_LINK = $(LIBTOOL) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(libgdk_pixbuf_xlib_2_0_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libgdk_pixbuf_xlib_2_0_la_SOURCES) -+DIST_SOURCES = $(libgdk_pixbuf_xlib_2_0_la_SOURCES) -+pkgconfigDATA_INSTALL = $(INSTALL_DATA) -+DATA = $(pkgconfig_DATA) -+libgdk_pixbuf_xlibincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(libgdk_pixbuf_xlibinclude_HEADERS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +103,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +128,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +135,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in +--- gtk+2.0-2.14.4.old/contrib/gdk-pixbuf-xlib/Makefile.in 2008-10-17 01:07:13.000000000 -0300 ++++ gtk+2.0-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in 2008-11-04 15:37:04.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +161,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -27621,814 +61385,19 @@ Index: gtk+2.0-2.14.3/contrib/gdk-pixbuf-xlib/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +180,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +190,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +219,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +238,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +249,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +261,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +302,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +311,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,29 +346,23 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -- - lib_LTLIBRARIES = libgdk_pixbuf_xlib-2.0.la -- - INCLUDES = \ - -I$(top_srcdir) -I$(top_builddir) \ - -I$(top_srcdir)/gdk-pixbuf \ - -I$(top_srcdir)/contrib \ - $(GDK_PIXBUF_XLIB_DEP_CFLAGS) - -- - libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \ - -export-dynamic \ - $(no_undefined) \ - -version-info $(LT_VERSION_INFO) - -- - libgdk_pixbuf_xlib_2_0_la_LIBADD = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(GDK_PIXBUF_XLIB_DEP_LIBS) - -- - libgdk_pixbuf_xlib_2_0_la_SOURCES = \ - gdk-pixbuf-xlib-private.h \ - gdk-pixbuf-xlib.c \ -@@ -436,99 +370,80 @@ - gdk-pixbuf-xlib-drawable.c \ - gdk-pixbuf-xlibrgb.c - -- - libgdk_pixbuf_xlibincludedir = $(includedir)/gtk-2.0/gdk-pixbuf-xlib -- - libgdk_pixbuf_xlibinclude_HEADERS = \ - gdk-pixbuf-xlib.h \ - gdk-pixbuf-xlibrgb.h - -- - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc --subdir = contrib/gdk-pixbuf-xlib --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = gdk-pixbuf-xlib-2.0.pc --LTLIBRARIES = $(lib_LTLIBRARIES) -- --libgdk_pixbuf_xlib_2_0_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --am_libgdk_pixbuf_xlib_2_0_la_OBJECTS = gdk-pixbuf-xlib.lo \ -- gdk-pixbuf-xlib-render.lo gdk-pixbuf-xlib-drawable.lo \ -- gdk-pixbuf-xlibrgb.lo --libgdk_pixbuf_xlib_2_0_la_OBJECTS = \ -- $(am_libgdk_pixbuf_xlib_2_0_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk-pixbuf-xlib-drawable.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-xlib-render.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-xlib.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-xlibrgb.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libgdk_pixbuf_xlib_2_0_la_SOURCES) --DATA = $(pkgconfig_DATA) -- --HEADERS = $(libgdk_pixbuf_xlibinclude_HEADERS) -- --DIST_COMMON = $(libgdk_pixbuf_xlibinclude_HEADERS) \ -- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog \ -- Makefile.am gdk-pixbuf-xlib-2.0.pc.in --SOURCES = $(libgdk_pixbuf_xlib_2_0_la_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/gdk-pixbuf-xlib/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu contrib/gdk-pixbuf-xlib/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --gdk-pixbuf-xlib-2.0.pc: $(top_builddir)/config.status gdk-pixbuf-xlib-2.0.pc.in -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+gdk-pixbuf-xlib-2.0.pc: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-xlib-2.0.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --libLTLIBRARIES_INSTALL = $(INSTALL) - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libdir) -+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - - uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgdk_pixbuf_xlib-2.0.la: $(libgdk_pixbuf_xlib_2_0_la_OBJECTS) $(libgdk_pixbuf_xlib_2_0_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgdk_pixbuf_xlib_2_0_la_LDFLAGS) $(libgdk_pixbuf_xlib_2_0_la_OBJECTS) $(libgdk_pixbuf_xlib_2_0_la_LIBADD) $(LIBS) -+ $(libgdk_pixbuf_xlib_2_0_la_LINK) -rpath $(libdir) $(libgdk_pixbuf_xlib_2_0_la_OBJECTS) $(libgdk_pixbuf_xlib_2_0_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -539,100 +454,75 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdk-pixbuf-xlibrgb.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --pkgconfigDATA_INSTALL = $(INSTALL_DATA) - install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) -+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ -- $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ -+ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done - - uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ -- rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done --libgdk_pixbuf_xlibincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-libgdk_pixbuf_xlibincludeHEADERS: $(libgdk_pixbuf_xlibinclude_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libgdk_pixbuf_xlibincludedir) -+ test -z "$(libgdk_pixbuf_xlibincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)" - @list='$(libgdk_pixbuf_xlibinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(libgdk_pixbuf_xlibincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f"; \ -- $(libgdk_pixbuf_xlibincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(libgdk_pixbuf_xlibincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f'"; \ -+ $(libgdk_pixbuf_xlibincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f"; \ - done - - uninstall-libgdk_pixbuf_xlibincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libgdk_pixbuf_xlibinclude_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f"; \ -- rm -f $(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f"; \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -642,23 +532,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -670,29 +560,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -707,9 +591,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libgdk_pixbuf_xlibincludedir) -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -729,7 +614,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -743,12 +628,14 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: -@@ -756,12 +643,20 @@ - install-data-am: install-libgdk_pixbuf_xlibincludeHEADERS \ - install-pkgconfigDATA - -+install-dvi: install-dvi-am -+ - install-exec-am: install-libLTLIBRARIES - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -782,23 +677,27 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ -+uninstall-am: uninstall-libLTLIBRARIES \ - uninstall-libgdk_pixbuf_xlibincludeHEADERS \ - uninstall-pkgconfigDATA - -+.MAKE: install-am install-strip -+ - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-generic clean-libLTLIBRARIES clean-libtool ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-libLTLIBRARIES install-libgdk_pixbuf_xlibincludeHEADERS \ -- install-man install-pkgconfigDATA install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-info-am \ -- uninstall-libLTLIBRARIES \ -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-libLTLIBRARIES \ -+ install-libgdk_pixbuf_xlibincludeHEADERS install-man \ -+ install-pdf install-pdf-am install-pkgconfigDATA install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-libLTLIBRARIES \ - uninstall-libgdk_pixbuf_xlibincludeHEADERS \ - uninstall-pkgconfigDATA - -Index: gtk+2.0-2.14.3/contrib/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/contrib/Makefile.in 2008-09-24 00:11:35.000000000 -0300 -+++ gtk+2.0-2.14.3/contrib/Makefile.in 2008-09-24 19:56:49.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,17 +15,11 @@ - @SET_MAKE@ - - # GTK+ - The GIMP Toolkit -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +31,36 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl - @USE_X11_TRUE@am__append_1 = gdk-pixbuf-xlib -+subdir = contrib -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = gdk-pixbuf-xlib -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -52,22 +71,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,8 +96,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -91,10 +103,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/contrib/Makefile.in gtk+2.0-2.14.4/contrib/Makefile.in +--- gtk+2.0-2.14.4.old/contrib/Makefile.in 2008-10-17 01:07:13.000000000 -0300 ++++ gtk+2.0-2.14.4/contrib/Makefile.in 2008-11-04 15:37:04.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@ -@@ -121,6 +129,7 @@ +@@ -121,6 +123,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -28436,727 +61405,19 @@ Index: gtk+2.0-2.14.3/contrib/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +148,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,91 +158,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -257,24 +187,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +206,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +217,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +229,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -366,6 +270,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -374,9 +279,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -407,31 +314,39 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - SUBDIRS = $(am__append_1) --subdir = contrib --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --DIST_SUBDIRS = gdk-pixbuf-xlib - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu contrib/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo -@@ -439,10 +354,6 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, -@@ -450,7 +361,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -462,15 +379,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -491,7 +413,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -502,35 +424,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -538,23 +455,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -566,29 +483,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -601,13 +512,17 @@ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d $(distdir)/$$subdir \ -- || mkdir $(distdir)/$$subdir \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -618,7 +533,6 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -- - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -638,7 +552,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -649,25 +563,34 @@ - - distclean: distclean-recursive - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -686,26 +609,24 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-generic clean-libtool clean-recursive \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am dvi-recursive info info-am info-recursive install \ -- install-am install-data install-data-am install-data-recursive \ -- install-exec install-exec-am install-exec-recursive \ -- install-info install-info-am install-info-recursive install-man \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am check-local clean clean-generic \ -+ clean-libtool ctags ctags-recursive distclean \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/demos/gtk-demo/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/demos/gtk-demo/Makefile.in 2008-09-24 00:11:36.000000000 -0300 -+++ gtk+2.0-2.14.3/demos/gtk-demo/Makefile.in 2008-09-24 19:56:50.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,12 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,65 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/geninclude.pl.in $(top_srcdir)/Makefile.decl -+bin_PROGRAMS = gtk-demo$(EXEEXT) -+subdir = demos/gtk-demo -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = geninclude.pl -+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(democodedir)" -+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+PROGRAMS = $(bin_PROGRAMS) -+am__objects_1 = appwindow.$(OBJEXT) assistant.$(OBJEXT) \ -+ builder.$(OBJEXT) button_box.$(OBJEXT) changedisplay.$(OBJEXT) \ -+ clipboard.$(OBJEXT) colorsel.$(OBJEXT) combobox.$(OBJEXT) \ -+ dialog.$(OBJEXT) drawingarea.$(OBJEXT) \ -+ editable_cells.$(OBJEXT) entry_completion.$(OBJEXT) \ -+ expander.$(OBJEXT) hypertext.$(OBJEXT) iconview.$(OBJEXT) \ -+ iconview_edit.$(OBJEXT) images.$(OBJEXT) list_store.$(OBJEXT) \ -+ menus.$(OBJEXT) panes.$(OBJEXT) pickers.$(OBJEXT) \ -+ pixbufs.$(OBJEXT) printing.$(OBJEXT) rotated_text.$(OBJEXT) \ -+ sizegroup.$(OBJEXT) stock_browser.$(OBJEXT) textview.$(OBJEXT) \ -+ textscroll.$(OBJEXT) tree_store.$(OBJEXT) ui_manager.$(OBJEXT) -+am_gtk_demo_OBJECTS = $(am__objects_1) main.$(OBJEXT) -+gtk_demo_OBJECTS = $(am_gtk_demo_OBJECTS) -+gtk_demo_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gtk_demo_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(gtk_demo_SOURCES) -+DIST_SOURCES = $(gtk_demo_SOURCES) -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+democodeDATA_INSTALL = $(INSTALL_DATA) -+DATA = $(democode_DATA) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +102,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +127,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +134,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.4/demos/gtk-demo/Makefile.in +--- gtk+2.0-2.14.4.old/demos/gtk-demo/Makefile.in 2008-10-17 01:07:13.000000000 -0300 ++++ gtk+2.0-2.14.4/demos/gtk-demo/Makefile.in 2008-11-04 15:37:04.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +160,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -29164,864 +61425,19 @@ Index: gtk+2.0-2.14.3/demos/gtk-demo/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +179,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +189,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +218,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +237,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +248,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +260,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +301,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,17 +310,16 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- $(IMAGEFILES) \ -- demo.ui -- -+EXTRA_DIST = $(IMAGEFILES) demo.ui - TEST_PROGS = - - ### testing rules -@@ -409,9 +345,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - democodedir = $(datadir)/gtk-2.0/demo -- - demos = \ - appwindow.c \ - assistant.c \ -@@ -444,7 +378,6 @@ - tree_store.c \ - ui_manager.c - -- - INCLUDES = \ - -DDEMOCODEDIR="\"$(democodedir)\"" \ - -I$(top_srcdir) \ -@@ -454,34 +387,26 @@ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -- - DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- - LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- --bin_PROGRAMS = gtk-demo -- - BUILT_SOURCES = demos.h -- - gtk_demo_SOURCES = \ - $(demos) \ - demo-common.h \ - main.c \ - demos.h - -- - gtk_demo_DEPENDENCIES = $(DEPS) - gtk_demo_LDADD = $(LDADDS) - gtk_demo_LDFLAGS = -export-dynamic -- - IMAGEFILES = alphatest.png \ - apple-red.png \ - background.jpg \ -@@ -497,93 +422,55 @@ - gnu-keys.png \ - gtk-logo-rgb.gif - -- - democode_DATA = $(demos) $(IMAGEFILES) demo.ui -- - DISTCLEANFILES = demos.h --subdir = demos/gtk-demo --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = geninclude.pl --bin_PROGRAMS = gtk-demo$(EXEEXT) --PROGRAMS = $(bin_PROGRAMS) -- --am__objects_1 = appwindow.$(OBJEXT) assistant.$(OBJEXT) \ -- builder.$(OBJEXT) button_box.$(OBJEXT) changedisplay.$(OBJEXT) \ -- clipboard.$(OBJEXT) colorsel.$(OBJEXT) combobox.$(OBJEXT) \ -- dialog.$(OBJEXT) drawingarea.$(OBJEXT) editable_cells.$(OBJEXT) \ -- entry_completion.$(OBJEXT) expander.$(OBJEXT) \ -- hypertext.$(OBJEXT) iconview.$(OBJEXT) iconview_edit.$(OBJEXT) \ -- images.$(OBJEXT) list_store.$(OBJEXT) menus.$(OBJEXT) \ -- panes.$(OBJEXT) pickers.$(OBJEXT) pixbufs.$(OBJEXT) \ -- printing.$(OBJEXT) rotated_text.$(OBJEXT) sizegroup.$(OBJEXT) \ -- stock_browser.$(OBJEXT) textview.$(OBJEXT) textscroll.$(OBJEXT) \ -- tree_store.$(OBJEXT) ui_manager.$(OBJEXT) --am_gtk_demo_OBJECTS = $(am__objects_1) main.$(OBJEXT) --gtk_demo_OBJECTS = $(am_gtk_demo_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/appwindow.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/assistant.Po ./$(DEPDIR)/builder.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/button_box.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/changedisplay.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/clipboard.Po ./$(DEPDIR)/colorsel.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/combobox.Po ./$(DEPDIR)/dialog.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/drawingarea.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/editable_cells.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/entry_completion.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/expander.Po ./$(DEPDIR)/hypertext.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/iconview.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/iconview_edit.Po ./$(DEPDIR)/images.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/list_store.Po ./$(DEPDIR)/main.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/menus.Po ./$(DEPDIR)/panes.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/pickers.Po ./$(DEPDIR)/pixbufs.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/printing.Po ./$(DEPDIR)/rotated_text.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/sizegroup.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/stock_browser.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/textscroll.Po ./$(DEPDIR)/textview.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/tree_store.Po ./$(DEPDIR)/ui_manager.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(gtk_demo_SOURCES) --DATA = $(democode_DATA) -- --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am geninclude.pl.in --SOURCES = $(gtk_demo_SOURCES) -- - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu demos/gtk-demo/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu demos/gtk-demo/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --geninclude.pl: $(top_builddir)/config.status geninclude.pl.in -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+geninclude.pl: $(top_builddir)/config.status $(srcdir)/geninclude.pl.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(bindir) -+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -591,8 +478,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -- rm -f $(DESTDIR)$(bindir)/$$f; \ -+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - - clean-binPROGRAMS: -@@ -603,10 +490,10 @@ - done - gtk-demo$(EXEEXT): $(gtk_demo_OBJECTS) $(gtk_demo_DEPENDENCIES) - @rm -f gtk-demo$(EXEEXT) -- $(LINK) $(gtk_demo_LDFLAGS) $(gtk_demo_OBJECTS) $(gtk_demo_LDADD) $(LIBS) -+ $(gtk_demo_LINK) $(gtk_demo_OBJECTS) $(gtk_demo_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -644,82 +531,58 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_manager.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --democodeDATA_INSTALL = $(INSTALL_DATA) - install-democodeDATA: $(democode_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(democodedir) -+ test -z "$(democodedir)" || $(MKDIR_P) "$(DESTDIR)$(democodedir)" - @list='$(democode_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(democodeDATA_INSTALL) $$d$$p $(DESTDIR)$(democodedir)/$$f"; \ -- $(democodeDATA_INSTALL) $$d$$p $(DESTDIR)$(democodedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(democodeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(democodedir)/$$f'"; \ -+ $(democodeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(democodedir)/$$f"; \ - done - - uninstall-democodeDATA: - @$(NORMAL_UNINSTALL) - @list='$(democode_DATA)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(democodedir)/$$f"; \ -- rm -f $(DESTDIR)$(democodedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(democodedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(democodedir)/$$f"; \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -729,23 +592,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -757,29 +620,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -795,9 +652,10 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(PROGRAMS) $(DATA) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(democodedir) -+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(democodedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am - install-exec: install-exec-am -@@ -818,7 +676,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -833,24 +691,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-democodeDATA - -+install-dvi: install-dvi-am -+ - install-exec-am: install-binPROGRAMS - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -871,21 +739,24 @@ - - ps-am: - --uninstall-am: uninstall-binPROGRAMS uninstall-democodeDATA \ -- uninstall-info-am -+uninstall-am: uninstall-binPROGRAMS uninstall-democodeDATA -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-binPROGRAMS clean-generic clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-binPROGRAMS install-data install-data-am \ -- install-democodeDATA install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-binPROGRAMS \ -- uninstall-democodeDATA uninstall-info-am -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-binPROGRAMS install-data \ -+ install-data-am install-democodeDATA install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am \ -+ uninstall-binPROGRAMS uninstall-democodeDATA - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/demos/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/demos/Makefile.in 2008-09-24 00:11:35.000000000 -0300 -+++ gtk+2.0-2.14.3/demos/Makefile.in 2008-09-24 19:56:50.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +32,74 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+noinst_PROGRAMS = testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \ -+ testpixbuf-save$(EXEEXT) testpixbuf-scale$(EXEEXT) \ -+ pixbuf-demo$(EXEEXT) $(am__EXEEXT_1) -+ -+# Need to build test-inline-pixbufs.h for testpixbuf - @HAVE_PNG_TRUE@am__append_1 = testpixbuf -+subdir = demos -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+@HAVE_PNG_TRUE@am__EXEEXT_1 = testpixbuf$(EXEEXT) -+PROGRAMS = $(noinst_PROGRAMS) -+am_pixbuf_demo_OBJECTS = pixbuf-demo.$(OBJEXT) pixbuf-init.$(OBJEXT) -+pixbuf_demo_OBJECTS = $(am_pixbuf_demo_OBJECTS) -+am_testanimation_OBJECTS = testanimation.$(OBJEXT) \ -+ pixbuf-init.$(OBJEXT) -+testanimation_OBJECTS = $(am_testanimation_OBJECTS) -+am_testpixbuf_OBJECTS = testpixbuf.$(OBJEXT) pixbuf-init.$(OBJEXT) -+testpixbuf_OBJECTS = $(am_testpixbuf_OBJECTS) -+am_testpixbuf_drawable_OBJECTS = testpixbuf-drawable.$(OBJEXT) \ -+ pixbuf-init.$(OBJEXT) -+testpixbuf_drawable_OBJECTS = $(am_testpixbuf_drawable_OBJECTS) -+am_testpixbuf_save_OBJECTS = testpixbuf-save.$(OBJEXT) -+testpixbuf_save_OBJECTS = $(am_testpixbuf_save_OBJECTS) -+am_testpixbuf_scale_OBJECTS = testpixbuf-scale.$(OBJEXT) \ -+ pixbuf-init.$(OBJEXT) -+testpixbuf_scale_OBJECTS = $(am_testpixbuf_scale_OBJECTS) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(pixbuf_demo_SOURCES) $(testanimation_SOURCES) \ -+ $(testpixbuf_SOURCES) $(testpixbuf_drawable_SOURCES) \ -+ $(testpixbuf_save_SOURCES) $(testpixbuf_scale_SOURCES) -+DIST_SOURCES = $(pixbuf_demo_SOURCES) $(testanimation_SOURCES) \ -+ $(testpixbuf_SOURCES) $(testpixbuf_drawable_SOURCES) \ -+ $(testpixbuf_save_SOURCES) $(testpixbuf_scale_SOURCES) -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -52,22 +110,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,8 +135,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -91,10 +142,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/demos/Makefile.in gtk+2.0-2.14.4/demos/Makefile.in +--- gtk+2.0-2.14.4.old/demos/Makefile.in 2008-10-17 01:07:13.000000000 -0300 ++++ gtk+2.0-2.14.4/demos/Makefile.in 2008-11-04 15:37:04.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@ -@@ -121,6 +168,7 @@ +@@ -121,6 +123,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -30029,902 +61445,19 @@ Index: gtk+2.0-2.14.3/demos/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +187,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,91 +197,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -257,24 +226,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +245,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +256,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +268,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -366,6 +309,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -374,24 +318,18 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- apple-red.png \ -- background.jpg \ -- gnome-applets.png \ -- gnome-calendar.png \ -- gnome-foot.png \ -- gnome-gimp.png \ -- gnome-gmush.png \ -- gnome-gsame.png \ -- gnu-keys.png -- -+EXTRA_DIST = apple-red.png background.jpg gnome-applets.png \ -+ gnome-calendar.png gnome-foot.png gnome-gimp.png \ -+ gnome-gmush.png gnome-gsame.png gnu-keys.png - TEST_PROGS = - - ### testing rules -@@ -417,9 +355,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - SUBDIRS = gtk-demo -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ -@@ -428,131 +364,74 @@ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -- - DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- - LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- --noinst_PROGRAMS = \ -- testpixbuf-drawable \ -- testanimation \ -- testpixbuf-save \ -- testpixbuf-scale \ -- pixbuf-demo\ --$(am__append_1) - @HAVE_PNG_TRUE@BUILT_SOURCES = test-inline-pixbufs.h -- --@CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE) - @CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource --@CROSS_COMPILING_TRUE@pixbuf_csource_deps = -+@CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE) - @CROSS_COMPILING_FALSE@pixbuf_csource_deps = $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders -- -+@CROSS_COMPILING_TRUE@pixbuf_csource_deps = - testpixbuf_DEPENDENCIES = $(DEPS) - testpixbuf_drawable_DEPENDENCIES = $(DEPS) - testpixbuf_save_DEPENDENCIES = $(DEPS) - testpixbuf_scale_DEPENDENCIES = $(DEPS) - testanimation_DEPENDENCIES = $(DEPS) - pixbuf_demo_DEPENDENCIES = $(DEPS) -- - testpixbuf_LDADD = $(LDADDS) - testpixbuf_drawable_LDADD = $(LDADDS) - testpixbuf_save_LDADD = $(LDADDS) - testpixbuf_scale_LDADD = $(LDADDS) - testanimation_LDADD = $(LDADDS) - pixbuf_demo_LDADD = $(LDADDS) -- - testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c - testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c - testpixbuf_save_SOURCES = testpixbuf-save.c - testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c - testanimation_SOURCES = testanimation.c pixbuf-init.c - pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c -- - DISTCLEANFILES = test-inline-pixbufs.h --subdir = demos --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --@HAVE_PNG_TRUE@noinst_PROGRAMS = testpixbuf-drawable$(EXEEXT) \ --@HAVE_PNG_TRUE@ testanimation$(EXEEXT) testpixbuf-save$(EXEEXT) \ --@HAVE_PNG_TRUE@ testpixbuf-scale$(EXEEXT) pixbuf-demo$(EXEEXT) \ --@HAVE_PNG_TRUE@ testpixbuf$(EXEEXT) --@HAVE_PNG_FALSE@noinst_PROGRAMS = testpixbuf-drawable$(EXEEXT) \ --@HAVE_PNG_FALSE@ testanimation$(EXEEXT) testpixbuf-save$(EXEEXT) \ --@HAVE_PNG_FALSE@ testpixbuf-scale$(EXEEXT) pixbuf-demo$(EXEEXT) --PROGRAMS = $(noinst_PROGRAMS) -- --am_pixbuf_demo_OBJECTS = pixbuf-demo.$(OBJEXT) pixbuf-init.$(OBJEXT) --pixbuf_demo_OBJECTS = $(am_pixbuf_demo_OBJECTS) --pixbuf_demo_LDFLAGS = --am_testanimation_OBJECTS = testanimation.$(OBJEXT) pixbuf-init.$(OBJEXT) --testanimation_OBJECTS = $(am_testanimation_OBJECTS) --testanimation_LDFLAGS = --am_testpixbuf_OBJECTS = testpixbuf.$(OBJEXT) pixbuf-init.$(OBJEXT) --testpixbuf_OBJECTS = $(am_testpixbuf_OBJECTS) --testpixbuf_LDFLAGS = --am_testpixbuf_drawable_OBJECTS = testpixbuf-drawable.$(OBJEXT) \ -- pixbuf-init.$(OBJEXT) --testpixbuf_drawable_OBJECTS = $(am_testpixbuf_drawable_OBJECTS) --testpixbuf_drawable_LDFLAGS = --am_testpixbuf_save_OBJECTS = testpixbuf-save.$(OBJEXT) --testpixbuf_save_OBJECTS = $(am_testpixbuf_save_OBJECTS) --testpixbuf_save_LDFLAGS = --am_testpixbuf_scale_OBJECTS = testpixbuf-scale.$(OBJEXT) \ -- pixbuf-init.$(OBJEXT) --testpixbuf_scale_OBJECTS = $(am_testpixbuf_scale_OBJECTS) --testpixbuf_scale_LDFLAGS = -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pixbuf-demo.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-init.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testanimation.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testpixbuf-drawable.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testpixbuf-save.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testpixbuf-scale.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testpixbuf.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(pixbuf_demo_SOURCES) $(testanimation_SOURCES) \ -- $(testpixbuf_SOURCES) $(testpixbuf_drawable_SOURCES) \ -- $(testpixbuf_save_SOURCES) $(testpixbuf_scale_SOURCES) -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(pixbuf_demo_SOURCES) $(testanimation_SOURCES) $(testpixbuf_SOURCES) $(testpixbuf_drawable_SOURCES) $(testpixbuf_save_SOURCES) $(testpixbuf_scale_SOURCES) -- - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu demos/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu demos/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -562,25 +441,25 @@ - done - pixbuf-demo$(EXEEXT): $(pixbuf_demo_OBJECTS) $(pixbuf_demo_DEPENDENCIES) - @rm -f pixbuf-demo$(EXEEXT) -- $(LINK) $(pixbuf_demo_LDFLAGS) $(pixbuf_demo_OBJECTS) $(pixbuf_demo_LDADD) $(LIBS) -+ $(LINK) $(pixbuf_demo_OBJECTS) $(pixbuf_demo_LDADD) $(LIBS) - testanimation$(EXEEXT): $(testanimation_OBJECTS) $(testanimation_DEPENDENCIES) - @rm -f testanimation$(EXEEXT) -- $(LINK) $(testanimation_LDFLAGS) $(testanimation_OBJECTS) $(testanimation_LDADD) $(LIBS) -+ $(LINK) $(testanimation_OBJECTS) $(testanimation_LDADD) $(LIBS) - testpixbuf$(EXEEXT): $(testpixbuf_OBJECTS) $(testpixbuf_DEPENDENCIES) - @rm -f testpixbuf$(EXEEXT) -- $(LINK) $(testpixbuf_LDFLAGS) $(testpixbuf_OBJECTS) $(testpixbuf_LDADD) $(LIBS) -+ $(LINK) $(testpixbuf_OBJECTS) $(testpixbuf_LDADD) $(LIBS) - testpixbuf-drawable$(EXEEXT): $(testpixbuf_drawable_OBJECTS) $(testpixbuf_drawable_DEPENDENCIES) - @rm -f testpixbuf-drawable$(EXEEXT) -- $(LINK) $(testpixbuf_drawable_LDFLAGS) $(testpixbuf_drawable_OBJECTS) $(testpixbuf_drawable_LDADD) $(LIBS) -+ $(LINK) $(testpixbuf_drawable_OBJECTS) $(testpixbuf_drawable_LDADD) $(LIBS) - testpixbuf-save$(EXEEXT): $(testpixbuf_save_OBJECTS) $(testpixbuf_save_DEPENDENCIES) - @rm -f testpixbuf-save$(EXEEXT) -- $(LINK) $(testpixbuf_save_LDFLAGS) $(testpixbuf_save_OBJECTS) $(testpixbuf_save_LDADD) $(LIBS) -+ $(LINK) $(testpixbuf_save_OBJECTS) $(testpixbuf_save_LDADD) $(LIBS) - testpixbuf-scale$(EXEEXT): $(testpixbuf_scale_OBJECTS) $(testpixbuf_scale_DEPENDENCIES) - @rm -f testpixbuf-scale$(EXEEXT) -- $(LINK) $(testpixbuf_scale_LDFLAGS) $(testpixbuf_scale_OBJECTS) $(testpixbuf_scale_LDADD) $(LIBS) -+ $(LINK) $(testpixbuf_scale_OBJECTS) $(testpixbuf_scale_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -594,37 +473,25 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpixbuf.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -632,10 +499,6 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, -@@ -643,7 +506,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -655,15 +524,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -684,7 +558,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -695,35 +569,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -731,23 +600,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -759,29 +628,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -792,15 +655,19 @@ - || 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 \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -812,7 +679,6 @@ - all-am: Makefile $(PROGRAMS) - installdirs: installdirs-recursive - installdirs-am: -- - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive -@@ -833,7 +699,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -849,24 +715,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -887,27 +763,25 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-generic clean-libtool \ -- clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-recursive \ -- install-exec install-exec-am install-exec-recursive \ -- install-info install-info-am install-info-recursive install-man \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -- tags-recursive uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am check-local clean clean-generic \ -+ clean-libtool clean-noinstPROGRAMS ctags ctags-recursive \ -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/docs/faq/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/docs/faq/Makefile.in 2008-09-24 00:11:36.000000000 -0300 -+++ gtk+2.0-2.14.3/docs/faq/Makefile.in 2008-09-24 19:56:50.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,17 +15,11 @@ - @SET_MAKE@ - - # GTK+ - The GIMP Toolkit -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,23 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+subdir = docs/faq -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +58,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +83,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +90,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/docs/faq/Makefile.in gtk+2.0-2.14.4/docs/faq/Makefile.in +--- gtk+2.0-2.14.4.old/docs/faq/Makefile.in 2008-10-17 01:07:14.000000000 -0300 ++++ gtk+2.0-2.14.4/docs/faq/Makefile.in 2008-11-04 15:37:04.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +116,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -30932,536 +61465,19 @@ Index: gtk+2.0-2.14.3/docs/faq/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +135,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +145,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +174,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +193,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +204,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +216,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +257,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,16 +266,16 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- gtk-faq.sgml -- -+EXTRA_DIST = gtk-faq.sgml - TEST_PROGS = - - ### testing rules -@@ -408,61 +301,67 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - --subdir = docs/faq --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/faq/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/faq/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: - tags: TAGS - TAGS: - - ctags: CTAGS - CTAGS: - --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -480,7 +379,6 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile -- - installdirs: - install: install-am - install-exec: install-exec-am -@@ -501,7 +399,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -512,7 +410,7 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool -+distclean-am: clean-am distclean-generic - - dvi: dvi-am - -@@ -524,12 +422,20 @@ - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -540,25 +446,27 @@ - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - --pdf: pdf-am -- - pdf-am: - - ps: ps-am - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: all all-am check check-am check-local clean clean-generic \ -- clean-libtool distclean distclean-generic distclean-libtool \ -- distdir dvi dvi-am info info-am install install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-info-am -+ clean-libtool dist-hook distclean distclean-generic \ -+ distclean-libtool distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/docs/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/docs/Makefile.in 2008-09-24 00:11:36.000000000 -0300 -+++ gtk+2.0-2.14.3/docs/Makefile.in 2008-09-24 19:56:50.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,17 +15,11 @@ - @SET_MAKE@ - - # GTK+ - The GIMP Toolkit -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+subdir = docs -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +70,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +95,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +102,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/docs/Makefile.in gtk+2.0-2.14.4/docs/Makefile.in +--- gtk+2.0-2.14.4.old/docs/Makefile.in 2008-10-17 01:07:13.000000000 -0300 ++++ gtk+2.0-2.14.4/docs/Makefile.in 2008-11-04 15:37:04.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +128,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -31469,715 +61485,19 @@ Index: gtk+2.0-2.14.3/docs/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +147,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +157,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +186,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +205,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +216,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +228,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +269,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,30 +278,20 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- defsformat.txt \ -- developers.txt \ -- dnd_internals.txt \ -- make-todo \ -- refcounting.txt \ -- sizing-test.txt \ -- styles.txt \ -- text_widget.txt \ -- text_widget_internals.txt \ -- tree-column-sizing.txt \ -- widget_geometry.txt \ -- widget_system.txt \ -- generation.txt \ -- gtkdocs_fix \ -- RELEASE-HOWTO -- -+EXTRA_DIST = defsformat.txt developers.txt dnd_internals.txt make-todo \ -+ refcounting.txt sizing-test.txt styles.txt text_widget.txt \ -+ text_widget_internals.txt tree-column-sizing.txt \ -+ widget_geometry.txt widget_system.txt generation.txt \ -+ gtkdocs_fix RELEASE-HOWTO - TEST_PROGS = - - ### testing rules -@@ -422,31 +317,39 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - SUBDIRS = tutorial faq reference tools --subdir = docs --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo -@@ -454,10 +357,6 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, -@@ -465,7 +364,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -477,15 +382,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -506,7 +416,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -517,35 +427,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -553,23 +458,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -581,29 +486,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -614,15 +513,19 @@ - || 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 \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -633,7 +536,6 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -- - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -653,7 +555,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -664,25 +566,34 @@ - - distclean: distclean-recursive - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -701,26 +612,24 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-generic clean-libtool clean-recursive \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am dvi-recursive info info-am info-recursive install \ -- install-am install-data install-data-am install-data-recursive \ -- install-exec install-exec-am install-exec-recursive \ -- install-info install-info-am install-info-recursive install-man \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am check-local clean clean-generic \ -+ clean-libtool ctags ctags-recursive distclean \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/docs/reference/gdk/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/docs/reference/gdk/Makefile.in 2008-09-24 00:11:36.000000000 -0300 -+++ gtk+2.0-2.14.3/docs/reference/gdk/Makefile.in 2008-09-24 19:56:50.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -21,17 +21,11 @@ - #################################### - # Everything below here is generic # - #################################### -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,24 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/version.xml.in $(top_srcdir)/Makefile.decl \ -+ $(top_srcdir)/gtk-doc.make -+subdir = docs/reference/gdk -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = version.xml -+SOURCES = -+DIST_SOURCES = -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -57,22 +65,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,8 +90,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -96,10 +97,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.4/docs/reference/gdk/Makefile.in +--- gtk+2.0-2.14.4.old/docs/reference/gdk/Makefile.in 2008-10-17 01:07:14.000000000 -0300 ++++ gtk+2.0-2.14.4/docs/reference/gdk/Makefile.in 2008-11-04 15:37:05.000000000 -0200 +@@ -100,6 +100,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@ -@@ -126,6 +123,7 @@ +@@ -126,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -32185,588 +61505,19 @@ Index: gtk+2.0-2.14.3/docs/reference/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -144,8 +142,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -156,91 +152,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -262,24 +181,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -290,8 +200,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -303,28 +211,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -333,22 +223,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -371,6 +264,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -379,22 +273,18 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - --# initialize variables for unconditional += appending -- - # Other files to distribute --EXTRA_DIST = \ -- $(content_files) \ -- $(HTML_IMAGES) \ -- $(DOC_MAIN_SGML_FILE) \ -- $(DOC_MODULE)-sections.txt \ -- $(DOC_MODULE)-overrides.txt\ --version.xml.in -+EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ -+ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ -+ version.xml.in - TEST_PROGS = - - ### testing rules -@@ -420,7 +310,6 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - AUTOMAKE_OPTIONS = 1.6 - - # The name of the module. -@@ -470,7 +359,6 @@ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) - -- - GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib) - - # Extra options to supply to gtkdoc-mkdb -@@ -572,7 +460,6 @@ - --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo - - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -- - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -583,13 +470,10 @@ - # searched for in VPATH/GPATH. - # - GPATH = $(srcdir) -- - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) -- - DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -- - SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ -@@ -597,31 +481,45 @@ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -- - REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -- - CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) --subdir = docs/reference/gdk --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = version.xml --DIST_SOURCES = --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- $(top_srcdir)/gtk-doc.make Makefile.am version.xml.in - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/gdk/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/reference/gdk/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --version.xml: $(top_builddir)/config.status version.xml.in -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - - mostlyclean-libtool: -@@ -629,39 +527,29 @@ - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: - tags: TAGS - TAGS: - - ctags: CTAGS - CTAGS: - --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../.. $(distdir)/images -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -679,7 +567,6 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile all-local -- - installdirs: - install: install-am - install-exec: install-exec-am -@@ -701,7 +588,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -712,25 +599,34 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-local -+distclean-am: clean-am distclean-generic distclean-local - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-data-local - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -750,18 +646,23 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-local -+uninstall-am: uninstall-local -+ -+.MAKE: install-am install-strip - - .PHONY: all all-am all-local check check-am check-local clean \ -- clean-generic clean-libtool clean-local distclean \ -- distclean-generic distclean-libtool distclean-local distdir dvi \ -- dvi-am info info-am install install-am install-data \ -- install-data-am install-data-local install-exec install-exec-am \ -- install-info install-info-am install-man install-strip \ -- installcheck installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic maintainer-clean-local mostlyclean \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- uninstall uninstall-am uninstall-info-am uninstall-local -+ clean-generic clean-libtool clean-local dist-hook distclean \ -+ distclean-generic distclean-libtool distclean-local distdir \ -+ dvi dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-data-local install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-local mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-local - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/docs/reference/gdk-pixbuf/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/docs/reference/gdk-pixbuf/Makefile.in 2008-09-24 00:11:36.000000000 -0300 -+++ gtk+2.0-2.14.3/docs/reference/gdk-pixbuf/Makefile.in 2008-09-24 19:56:50.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -21,17 +21,11 @@ - #################################### - # Everything below here is generic # - #################################### -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,28 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/version.xml.in $(top_srcdir)/Makefile.decl \ -+ $(top_srcdir)/gtk-doc.make -+subdir = docs/reference/gdk-pixbuf -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = version.xml -+SOURCES = -+DIST_SOURCES = -+man1dir = $(mandir)/man1 -+am__installdirs = "$(DESTDIR)$(man1dir)" -+NROFF = nroff -+MANS = $(man_MANS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -57,22 +69,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,8 +94,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -96,10 +101,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14.4/docs/reference/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.14.4.old/docs/reference/gdk-pixbuf/Makefile.in 2008-10-17 01:07:14.000000000 -0300 ++++ gtk+2.0-2.14.4/docs/reference/gdk-pixbuf/Makefile.in 2008-11-04 15:37:05.000000000 -0200 +@@ -100,6 +100,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@ -@@ -126,6 +127,7 @@ +@@ -126,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -32774,651 +61525,19 @@ Index: gtk+2.0-2.14.3/docs/reference/gdk-pixbuf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -144,8 +146,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -156,91 +156,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -262,24 +185,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -290,8 +204,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -303,28 +215,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -333,22 +227,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -371,6 +268,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -379,28 +277,19 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - --# initialize variables for unconditional += appending -- - # Other files to distribute --EXTRA_DIST = \ -- $(content_files) \ -- $(HTML_IMAGES) \ -- $(DOC_MAIN_SGML_FILE) \ -- $(DOC_MODULE)-sections.txt \ -- $(DOC_MODULE)-overrides.txt\ --version.xml.in \ -- composite.png \ -- composite.dia \ -- apple-red-1a.png \ -- apple-red-2c.png \ -- gnome-gmush-1.png -- -+EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ -+ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ -+ version.xml.in composite.png composite.dia apple-red-1a.png \ -+ apple-red-2c.png gnome-gmush-1.png - TEST_PROGS = - - ### testing rules -@@ -426,7 +315,6 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - AUTOMAKE_OPTIONS = 1.6 - - # The name of the module. -@@ -458,7 +346,6 @@ - xpm-color-table.h \ - test-images.h - -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ -@@ -466,7 +353,6 @@ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -- - GTKDOC_LIBS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -496,7 +382,6 @@ - --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib - - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -- - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -507,13 +392,10 @@ - # searched for in VPATH/GPATH. - # - GPATH = $(srcdir) -- - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) -- - DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -- - SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ -@@ -521,40 +403,49 @@ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -- - REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -- - CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - -- - ######################################################################## - man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 -- - BUILT_EXTRA_DIST = $(man_MANS) --subdir = docs/reference/gdk-pixbuf --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = version.xml --DIST_SOURCES = -- --NROFF = nroff --MANS = $(man_MANS) --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- $(top_srcdir)/gtk-doc.make Makefile.am version.xml.in - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/gdk-pixbuf/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/reference/gdk-pixbuf/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --version.xml: $(top_builddir)/config.status version.xml.in -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - - mostlyclean-libtool: -@@ -562,15 +453,9 @@ - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --man1dir = $(mandir)/man1 - install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(man1dir) -+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ -@@ -589,8 +474,8 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ -+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done - uninstall-man1: - @$(NORMAL_UNINSTALL) -@@ -610,8 +495,8 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ -- rm -f $(DESTDIR)$(man1dir)/$$inst; \ -+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done - tags: TAGS - TAGS: -@@ -619,29 +504,23 @@ - ctags: CTAGS - CTAGS: - --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -659,9 +538,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(MANS) all-local -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(man1dir) -+ for dir in "$(DESTDIR)$(man1dir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -682,7 +562,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -693,25 +573,34 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-local -+distclean-am: clean-am distclean-generic distclean-local - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-data-local install-man - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: install-man1 - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -731,21 +620,25 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-local uninstall-man -+uninstall-am: uninstall-local uninstall-man - - uninstall-man: uninstall-man1 - -+.MAKE: install-am install-strip -+ - .PHONY: all all-am all-local check check-am check-local clean \ -- clean-generic clean-libtool clean-local distclean \ -- distclean-generic distclean-libtool distclean-local distdir dvi \ -- dvi-am info info-am install install-am install-data \ -- install-data-am install-data-local install-exec install-exec-am \ -- install-info install-info-am install-man install-man1 \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic \ -+ clean-generic clean-libtool clean-local dist-hook distclean \ -+ distclean-generic distclean-libtool distclean-local distdir \ -+ dvi dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-data-local install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-man1 install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ - maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-info-am uninstall-local uninstall-man uninstall-man1 -+ uninstall-local uninstall-man uninstall-man1 - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/docs/reference/gtk/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/docs/reference/gtk/Makefile.in 2008-09-24 00:11:36.000000000 -0300 -+++ gtk+2.0-2.14.3/docs/reference/gtk/Makefile.in 2008-09-24 19:56:51.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -21,17 +21,11 @@ - #################################### - # Everything below here is generic # - #################################### -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,28 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/version.xml.in $(top_srcdir)/Makefile.decl \ -+ $(top_srcdir)/gtk-doc.make -+subdir = docs/reference/gtk -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = version.xml -+SOURCES = -+DIST_SOURCES = -+man1dir = $(mandir)/man1 -+am__installdirs = "$(DESTDIR)$(man1dir)" -+NROFF = nroff -+MANS = $(man_MANS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -57,25 +69,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ -- --CPPFLAGS = @CPPFLAGS@ \ -- -UGTK_DISABLE_SINGLE_INCLUDES -- --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ -+CPPFLAGS = @CPPFLAGS@ -UGTK_DISABLE_SINGLE_INCLUDES - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -90,8 +94,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -99,10 +101,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.4/docs/reference/gtk/Makefile.in +--- gtk+2.0-2.14.4.old/docs/reference/gtk/Makefile.in 2008-10-17 01:07:14.000000000 -0300 ++++ gtk+2.0-2.14.4/docs/reference/gtk/Makefile.in 2008-11-04 15:37:05.000000000 -0200 +@@ -103,6 +103,8 @@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ + ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ + ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ ++ENABLE_STATIC_FALSE = @ENABLE_STATIC_FALSE@ ++ENABLE_STATIC_TRUE = @ENABLE_STATIC_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -129,6 +127,7 @@ +@@ -129,6 +131,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -33426,647 +61545,19 @@ Index: gtk+2.0-2.14.3/docs/reference/gtk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -147,8 +146,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -159,91 +156,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -265,24 +185,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,8 +204,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -306,28 +215,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -336,22 +227,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -374,6 +268,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -382,22 +277,18 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - --# initialize variables for unconditional += appending -- - # Other files to distribute --EXTRA_DIST = \ -- $(content_files) \ -- $(HTML_IMAGES) \ -- $(DOC_MAIN_SGML_FILE) \ -- $(DOC_MODULE)-sections.txt \ -- $(DOC_MODULE)-overrides.txt\ --version.xml.in -+EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ -+ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ -+ version.xml.in - TEST_PROGS = - - ### testing rules -@@ -423,7 +314,6 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - AUTOMAKE_OPTIONS = 1.6 - - # The name of the module. -@@ -531,7 +421,6 @@ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -- - GTKDOC_LIBS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -576,7 +465,6 @@ - gtk-builder-convert.xml \ - visual_index.xml - -- - expand_content_files = \ - glossary.xml \ - migrating-checklist.sgml \ -@@ -766,7 +654,6 @@ - --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo - - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -- - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) - @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -777,13 +664,10 @@ - # searched for in VPATH/GPATH. - # - GPATH = $(srcdir) -- - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) -- - DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -- - SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ -@@ -791,40 +675,49 @@ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -- - REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -- - CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - -- - ######################################################################## - man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 -- - BUILT_EXTRA_DIST = $(man_MANS) --subdir = docs/reference/gtk --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = version.xml --DIST_SOURCES = -- --NROFF = nroff --MANS = $(man_MANS) --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- $(top_srcdir)/gtk-doc.make Makefile.am version.xml.in - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/gtk/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/reference/gtk/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --version.xml: $(top_builddir)/config.status version.xml.in -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - - mostlyclean-libtool: -@@ -832,15 +725,9 @@ - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --man1dir = $(mandir)/man1 - install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(man1dir) -+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ -@@ -859,8 +746,8 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ -+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done - uninstall-man1: - @$(NORMAL_UNINSTALL) -@@ -880,8 +767,8 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ -- rm -f $(DESTDIR)$(man1dir)/$$inst; \ -+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done - tags: TAGS - TAGS: -@@ -889,29 +776,23 @@ - ctags: CTAGS - CTAGS: - --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/$(srcdir)/images $(distdir)/$(top_srcdir)/gtk/stock-icons/20 $(distdir)/$(top_srcdir)/gtk/stock-icons/24 $(distdir)/$(top_srcdir)/gtk/stock-icons/32 $(distdir)/$(top_srcdir)/gtk/stock-icons/48 $(distdir)/../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -929,9 +810,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(MANS) all-local -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(man1dir) -+ for dir in "$(DESTDIR)$(man1dir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -952,7 +834,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -963,25 +845,34 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-local -+distclean-am: clean-am distclean-generic distclean-local - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-data-local install-man - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: install-man1 - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -1001,21 +892,25 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-local uninstall-man -+uninstall-am: uninstall-local uninstall-man - - uninstall-man: uninstall-man1 - -+.MAKE: install-am install-strip -+ - .PHONY: all all-am all-local check check-am check-local clean \ -- clean-generic clean-libtool clean-local distclean \ -- distclean-generic distclean-libtool distclean-local distdir dvi \ -- dvi-am info info-am install install-am install-data \ -- install-data-am install-data-local install-exec install-exec-am \ -- install-info install-info-am install-man install-man1 \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic \ -+ clean-generic clean-libtool clean-local dist-hook distclean \ -+ distclean-generic distclean-libtool distclean-local distdir \ -+ dvi dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-data-local install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-man1 install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ - maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-info-am uninstall-local uninstall-man uninstall-man1 -+ uninstall-local uninstall-man uninstall-man1 - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/docs/reference/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/docs/reference/Makefile.in 2008-09-24 00:11:36.000000000 -0300 -+++ gtk+2.0-2.14.3/docs/reference/Makefile.in 2008-09-24 19:56:50.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,17 +15,11 @@ - @SET_MAKE@ - - # GTK+ - The GIMP Toolkit -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog -+subdir = docs/reference -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +70,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +95,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +102,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.14.4/docs/reference/libgail-util/Makefile.in +--- gtk+2.0-2.14.4.old/docs/reference/libgail-util/Makefile.in 2008-10-17 01:07:14.000000000 -0300 ++++ gtk+2.0-2.14.4/docs/reference/libgail-util/Makefile.in 2008-11-04 15:37:05.000000000 -0200 +@@ -100,6 +100,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@ -@@ -120,6 +128,7 @@ +@@ -126,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -34074,710 +61565,19 @@ Index: gtk+2.0-2.14.3/docs/reference/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +147,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +157,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +186,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +205,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +216,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +228,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +269,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +278,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,31 +313,39 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - SUBDIRS = gdk-pixbuf gdk gtk libgail-util --subdir = docs/reference --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- AUTHORS COPYING ChangeLog Makefile.am --DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/reference/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo -@@ -438,10 +353,6 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, -@@ -449,7 +360,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -461,15 +378,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -490,7 +412,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -501,35 +423,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -537,23 +454,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -565,29 +482,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -598,15 +509,19 @@ - || 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 \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -617,7 +532,6 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -- - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -637,7 +551,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -648,25 +562,34 @@ - - distclean: distclean-recursive - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -685,26 +608,24 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-generic clean-libtool clean-recursive \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am dvi-recursive info info-am info-recursive install \ -- install-am install-data install-data-am install-data-recursive \ -- install-exec install-exec-am install-exec-recursive \ -- install-info install-info-am install-info-recursive install-man \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am check-local clean clean-generic \ -+ clean-libtool ctags ctags-recursive distclean \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/docs/tools/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/docs/tools/Makefile.in 2008-09-24 00:11:37.000000000 -0300 -+++ gtk+2.0-2.14.3/docs/tools/Makefile.in 2008-09-24 19:56:51.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,46 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+@USE_X11_TRUE@noinst_PROGRAMS = doc-shooter$(EXEEXT) -+subdir = docs/tools -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+PROGRAMS = $(noinst_PROGRAMS) -+am_doc_shooter_OBJECTS = shadow.$(OBJEXT) shooter.$(OBJEXT) \ -+ widgets.$(OBJEXT) -+doc_shooter_OBJECTS = $(am_doc_shooter_OBJECTS) -+am__DEPENDENCIES_1 = -+am__DEPENDENCIES_2 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(top_builddir)/gdk/$(gdktargetlib) \ -+ $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(doc_shooter_SOURCES) -+DIST_SOURCES = $(doc_shooter_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +82,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +107,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +114,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/docs/reference/Makefile.in gtk+2.0-2.14.4/docs/reference/Makefile.in +--- gtk+2.0-2.14.4.old/docs/reference/Makefile.in 2008-10-17 01:07:14.000000000 -0300 ++++ gtk+2.0-2.14.4/docs/reference/Makefile.in 2008-11-04 15:37:05.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +140,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -34785,690 +61585,19 @@ Index: gtk+2.0-2.14.3/docs/tools/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +159,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +169,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +198,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +217,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +228,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +240,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +281,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +290,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,7 +325,6 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ -@@ -415,24 +333,17 @@ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -- - DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- - LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) \ - $(GTK_DEP_LIBS) - -- --@USE_X11_TRUE@noinst_PROGRAMS = \ --@USE_X11_TRUE@ doc-shooter -- -- - doc_shooter_DEPENDENCIES = $(DEPS) - doc_shooter_LDADD = $(LDADDS) - doc_shooter_SOURCES = \ -@@ -442,46 +353,39 @@ - widgets.c \ - widgets.h - --subdir = docs/tools --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --@USE_X11_TRUE@noinst_PROGRAMS = doc-shooter$(EXEEXT) --@USE_X11_FALSE@noinst_PROGRAMS = --PROGRAMS = $(noinst_PROGRAMS) -- --am_doc_shooter_OBJECTS = shadow.$(OBJEXT) shooter.$(OBJEXT) \ -- widgets.$(OBJEXT) --doc_shooter_OBJECTS = $(am_doc_shooter_OBJECTS) --doc_shooter_LDFLAGS = -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/shadow.Po ./$(DEPDIR)/shooter.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/widgets.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(doc_shooter_SOURCES) --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --SOURCES = $(doc_shooter_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/tools/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/tools/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -491,10 +395,10 @@ - done - doc-shooter$(EXEEXT): $(doc_shooter_OBJECTS) $(doc_shooter_DEPENDENCIES) - @rm -f doc-shooter$(EXEEXT) -- $(LINK) $(doc_shooter_LDFLAGS) $(doc_shooter_OBJECTS) $(doc_shooter_LDADD) $(LIBS) -+ $(LINK) $(doc_shooter_OBJECTS) $(doc_shooter_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -504,37 +408,25 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widgets.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -542,26 +434,15 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -571,23 +452,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -599,29 +480,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -636,7 +511,6 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(PROGRAMS) -- - installdirs: - install: install-am - install-exec: install-exec-am -@@ -657,7 +531,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -671,24 +545,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -709,19 +593,23 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ - ctags distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-tags distdir dvi dvi-am info \ -- info-am install install-am install-data install-data-am \ -- install-exec install-exec-am install-info install-info-am \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/docs/tutorial/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/docs/tutorial/Makefile.in 2008-09-24 00:11:37.000000000 -0300 -+++ gtk+2.0-2.14.3/docs/tutorial/Makefile.in 2008-09-24 19:56:51.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,17 +15,11 @@ - @SET_MAKE@ - - # GTK+ - The GIMP Toolkit -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,23 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+subdir = docs/tutorial -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +58,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +83,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +90,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/docs/tools/Makefile.in gtk+2.0-2.14.4/docs/tools/Makefile.in +--- gtk+2.0-2.14.4.old/docs/tools/Makefile.in 2008-10-17 01:07:14.000000000 -0300 ++++ gtk+2.0-2.14.4/docs/tools/Makefile.in 2008-11-04 15:37:05.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +116,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -35476,602 +61605,19 @@ Index: gtk+2.0-2.14.3/docs/tutorial/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +135,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +145,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +174,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +193,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +204,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +216,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +257,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,47 +266,27 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- gtk-tut.sgml \ -- images/arrow.png \ -- images/aspectframe.png \ -- images/base.png \ -- images/buttonbox.png \ -- images/buttons.png \ -- images/calendar.png \ -- images/colorsel.png \ -- images/entry.png \ -- images/eventbox.png \ -- images/filesel.png \ -- images/fixed.png \ -- images/frame.png \ -- images/gtkdial.png \ -- images/helloworld.png \ -- images/helloworld2.png \ -- images/label.png \ -- images/menu.png \ -- images/notebook.png \ -- images/packbox1.png \ -- images/packbox2.png \ -- images/paned.png \ -- images/progressbar.png \ -- images/radiobuttons.png \ -- images/rangewidgets.png \ -- images/rulers.png \ -- images/scribble.png \ -- images/scrolledwin.png \ -- images/spinbutton.png \ -- images/statusbar.png \ -- images/table.png \ -+EXTRA_DIST = gtk-tut.sgml images/arrow.png images/aspectframe.png \ -+ images/base.png images/buttonbox.png images/buttons.png \ -+ images/calendar.png images/colorsel.png images/entry.png \ -+ images/eventbox.png images/filesel.png images/fixed.png \ -+ images/frame.png images/gtkdial.png images/helloworld.png \ -+ images/helloworld2.png images/label.png images/menu.png \ -+ images/notebook.png images/packbox1.png images/packbox2.png \ -+ images/paned.png images/progressbar.png \ -+ images/radiobuttons.png images/rangewidgets.png \ -+ images/rulers.png images/scribble.png images/scrolledwin.png \ -+ images/spinbutton.png images/statusbar.png images/table.png \ - images/tictactoe.png -- - TEST_PROGS = - - ### testing rules -@@ -439,61 +312,67 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - --subdir = docs/tutorial --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/tutorial/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/tutorial/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: - tags: TAGS - TAGS: - - ctags: CTAGS - CTAGS: - --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. $(distdir)/images -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -511,7 +390,6 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile -- - installdirs: - install: install-am - install-exec: install-exec-am -@@ -532,7 +410,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -543,7 +421,7 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool -+distclean-am: clean-am distclean-generic - - dvi: dvi-am - -@@ -555,12 +433,20 @@ - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -571,25 +457,27 @@ - - mostlyclean-am: mostlyclean-generic mostlyclean-libtool - --pdf: pdf-am -- - pdf-am: - - ps: ps-am - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: all all-am check check-am check-local clean clean-generic \ -- clean-libtool distclean distclean-generic distclean-libtool \ -- distdir dvi dvi-am info info-am install install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-info-am -+ clean-libtool dist-hook distclean distclean-generic \ -+ distclean-libtool distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/gdk/directfb/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/gdk/directfb/Makefile.in 2008-09-24 00:11:38.000000000 -0300 -+++ gtk+2.0-2.14.3/gdk/directfb/Makefile.in 2008-09-24 19:56:52.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,12 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,60 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = README $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO -+subdir = gdk/directfb -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+libgdk_directfb_la_LIBADD = -+am_libgdk_directfb_la_OBJECTS = gdkapplaunchcontext-directfb.lo \ -+ gdkcolor-directfb.lo gdkcursor-directfb.lo gdkdnd-directfb.lo \ -+ gdkdisplay-directfb.lo gdkdrawable-directfb.lo \ -+ gdkevents-directfb.lo gdkfont-directfb.lo gdkgc-directfb.lo \ -+ gdkgeometry-directfb.lo gdkglobals-directfb.lo \ -+ gdkim-directfb.lo gdkimage-directfb.lo gdkinput-directfb.lo \ -+ gdkkeys-directfb.lo gdkmain-directfb.lo gdkpixmap-directfb.lo \ -+ gdkproperty-directfb.lo gdkscreen-directfb.lo \ -+ gdkselection-directfb.lo gdkspawn-directfb.lo \ -+ gdktestutils-directfb.lo gdkvisual-directfb.lo \ -+ gdkwindow-directfb.lo gdkwindowid.lo -+libgdk_directfb_la_OBJECTS = $(am_libgdk_directfb_la_OBJECTS) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libgdk_directfb_la_SOURCES) -+DIST_SOURCES = $(libgdk_directfb_la_SOURCES) -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libgdkincludedir)" -+libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(libgdkinclude_HEADERS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +97,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +122,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +129,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/docs/tutorial/Makefile.in gtk+2.0-2.14.4/docs/tutorial/Makefile.in +--- gtk+2.0-2.14.4.old/docs/tutorial/Makefile.in 2008-10-17 01:07:14.000000000 -0300 ++++ gtk+2.0-2.14.4/docs/tutorial/Makefile.in 2008-11-04 15:37:05.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +155,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -36079,881 +61625,19 @@ Index: gtk+2.0-2.14.3/gdk/directfb/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +174,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +184,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +213,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +232,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +243,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +255,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +296,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,14 +305,16 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = AUTHORS README TODO -+EXTRA_DIST = AUTHORS README TODO - TEST_PROGS = - - ### testing rules -@@ -406,9 +340,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - libgdkincludedir = $(includedir)/gtk-2.0/gdk -- - INCLUDES = \ - -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \ - -DGDK_COMPILATION \ -@@ -419,13 +351,10 @@ - @GTK_DEBUG_FLAGS@ \ - @GDK_DEP_CFLAGS@ - -- - LDADDS = \ - @GDK_DEP_LIBS@ - -- - noinst_LTLIBRARIES = libgdk-directfb.la -- - libgdk_directfb_la_SOURCES = \ - gdkapplaunchcontext-directfb.c \ - gdkcolor-directfb.c \ -@@ -458,98 +387,57 @@ - gdkwindowid.c \ - x-cursors.xbm - -- - libgdkinclude_HEADERS = \ - gdkdirectfb.h \ - gdkprivate-directfb.h - --subdir = gdk/directfb --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) -- --libgdk_directfb_la_LDFLAGS = --libgdk_directfb_la_LIBADD = --am_libgdk_directfb_la_OBJECTS = gdkapplaunchcontext-directfb.lo \ -- gdkcolor-directfb.lo gdkcursor-directfb.lo gdkdnd-directfb.lo \ -- gdkdisplay-directfb.lo gdkdrawable-directfb.lo \ -- gdkevents-directfb.lo gdkfont-directfb.lo gdkgc-directfb.lo \ -- gdkgeometry-directfb.lo gdkglobals-directfb.lo \ -- gdkim-directfb.lo gdkimage-directfb.lo gdkinput-directfb.lo \ -- gdkkeys-directfb.lo gdkmain-directfb.lo gdkpixmap-directfb.lo \ -- gdkproperty-directfb.lo gdkscreen-directfb.lo \ -- gdkselection-directfb.lo gdkspawn-directfb.lo \ -- gdktestutils-directfb.lo gdkvisual-directfb.lo \ -- gdkwindow-directfb.lo gdkwindowid.lo --libgdk_directfb_la_OBJECTS = $(am_libgdk_directfb_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkapplaunchcontext-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkim-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-directfb.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindowid.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libgdk_directfb_la_SOURCES) --HEADERS = $(libgdkinclude_HEADERS) -- --DIST_COMMON = README $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ -- $(top_srcdir)/Makefile.decl AUTHORS Makefile.am TODO --SOURCES = $(libgdk_directfb_la_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/directfb/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gdk/directfb/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgdk-directfb.la: $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_DEPENDENCIES) -- $(LINK) $(libgdk_directfb_la_LDFLAGS) $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_LIBADD) $(LIBS) -+ $(LINK) $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -581,82 +469,58 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowid.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) -+ test -z "$(libgdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdkincludedir)" - @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f"; \ -- $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(libgdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ -+ $(libgdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdkincludedir)/$$f"; \ - done - - uninstall-libgdkincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(libgdkincludedir)/$$f"; \ -- rm -f $(DESTDIR)$(libgdkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(libgdkincludedir)/$$f"; \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -666,23 +530,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -694,29 +558,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -731,9 +589,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(LTLIBRARIES) $(HEADERS) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) -+ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -753,7 +612,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -767,24 +626,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-libgdkincludeHEADERS - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -805,19 +674,23 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-libgdkincludeHEADERS -+uninstall-am: uninstall-libgdkincludeHEADERS -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-libgdkincludeHEADERS install-man install-strip \ -- installcheck installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-info-am \ -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-libgdkincludeHEADERS install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libgdkincludeHEADERS - - # call as: $(XVFB_START) && someprogram -Index: gtk+2.0-2.14.3/gdk/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/gdk/Makefile.in 2008-09-24 00:11:38.000000000 -0300 -+++ gtk+2.0-2.14.3/gdk/Makefile.in 2008-09-24 19:56:52.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,13 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +34,143 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl COPYING -+subdir = gdk -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gdkincludedir)" -+libLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(lib_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+libgdk_directfb_2_0_la_DEPENDENCIES = directfb/libgdk-directfb.la \ -+ $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+am__libgdk_directfb_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ -+ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ -+ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ -+ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ -+ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ -+ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ -+ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ -+ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ -+ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ -+ gdkenumtypes.c gdkmarshalers.h -+@USE_MEDIALIB_TRUE@am__objects_1 = gdkmedialib.lo -+am__objects_2 = $(am__objects_1) gdk.lo gdkapplaunchcontext.lo \ -+ gdkcairo.lo gdkcolor.lo gdkcursor.lo gdkdisplay.lo \ -+ gdkdisplaymanager.lo gdkdnd.lo gdkdraw.lo gdkevents.lo \ -+ gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo gdkkeys.lo \ -+ gdkkeyuni.lo gdkpango.lo gdkpixbuf-drawable.lo \ -+ gdkpixbuf-render.lo gdkpixmap.lo gdkpolyreg-generic.lo \ -+ gdkrectangle.lo gdkregion-generic.lo gdkrgb.lo gdkscreen.lo \ -+ gdkselection.lo gdkvisual.lo gdkwindow.lo gdkwindowimpl.lo -+am__objects_3 = $(am__objects_2) gdkenumtypes.lo -+am_libgdk_directfb_2_0_la_OBJECTS = $(am__objects_3) -+libgdk_directfb_2_0_la_OBJECTS = $(am_libgdk_directfb_2_0_la_OBJECTS) -+libgdk_directfb_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgdk_directfb_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+libgdk_quartz_2_0_la_DEPENDENCIES = quartz/libgdk-quartz.la \ -+ $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+am__libgdk_quartz_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ -+ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ -+ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ -+ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ -+ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ -+ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ -+ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ -+ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ -+ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ -+ gdkenumtypes.c gdkmarshalers.h gdkkeynames.c -+am_libgdk_quartz_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo -+libgdk_quartz_2_0_la_OBJECTS = $(am_libgdk_quartz_2_0_la_OBJECTS) -+libgdk_quartz_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgdk_quartz_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+am__libgdk_win32_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ -+ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ -+ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ -+ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ -+ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ -+ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ -+ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ -+ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ -+ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ -+ gdkenumtypes.c gdkmarshalers.h gdkkeynames.c -+am_libgdk_win32_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo -+libgdk_win32_2_0_la_OBJECTS = $(am_libgdk_win32_2_0_la_OBJECTS) -+libgdk_win32_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgdk_win32_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+libgdk_x11_2_0_la_DEPENDENCIES = x11/libgdk-x11.la \ -+ $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+am__libgdk_x11_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ -+ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ -+ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ -+ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ -+ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ -+ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ -+ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ -+ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ -+ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ -+ gdkenumtypes.c gdkmarshalers.h -+am_libgdk_x11_2_0_la_OBJECTS = $(am__objects_3) -+libgdk_x11_2_0_la_OBJECTS = $(am_libgdk_x11_2_0_la_OBJECTS) -+libgdk_x11_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgdk_x11_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libgdk_directfb_2_0_la_SOURCES) \ -+ $(libgdk_quartz_2_0_la_SOURCES) $(libgdk_win32_2_0_la_SOURCES) \ -+ $(libgdk_x11_2_0_la_SOURCES) -+DIST_SOURCES = $(am__libgdk_directfb_2_0_la_SOURCES_DIST) \ -+ $(am__libgdk_quartz_2_0_la_SOURCES_DIST) \ -+ $(am__libgdk_win32_2_0_la_SOURCES_DIST) \ -+ $(am__libgdk_x11_2_0_la_SOURCES_DIST) -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+DATA = $(noinst_DATA) -+gdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(gdkinclude_HEADERS) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +181,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +206,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +213,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/gdk/directfb/Makefile.in gtk+2.0-2.14.4/gdk/directfb/Makefile.in +--- gtk+2.0-2.14.4.old/gdk/directfb/Makefile.in 2008-10-17 01:07:15.000000000 -0300 ++++ gtk+2.0-2.14.4/gdk/directfb/Makefile.in 2008-11-04 15:37:06.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +239,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -36961,1185 +61645,19 @@ Index: gtk+2.0-2.14.3/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +258,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +268,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +297,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +316,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +327,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +339,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +380,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,31 +389,21 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- keynames.txt \ -- keyname-table.h \ -- gen-keyname-table.pl \ -- gdkconfig.h.win32 \ -- gdkkeysyms-update.pl \ -- gdk.def \ -- gdkmarshalers.list \ -- gdkmedialib.h \ -- makeenums.pl \ -- makefile.msc \ -- gdk.symbols \ -- makegdkalias.pl \ -- gdkenumtypes.c.template \ -- gdkenumtypes.h.template \ -- abicheck.sh \ -- pltcheck.sh\ --$(gdk_built_sources) -+EXTRA_DIST = keynames.txt keyname-table.h gen-keyname-table.pl \ -+ gdkconfig.h.win32 gdkkeysyms-update.pl gdk.def \ -+ gdkmarshalers.list gdkmedialib.h makeenums.pl makefile.msc \ -+ gdk.symbols makegdkalias.pl gdkenumtypes.c.template \ -+ gdkenumtypes.h.template abicheck.sh pltcheck.sh \ -+ $(gdk_built_sources) - TEST_PROGS = - - ### testing rules -@@ -423,10 +429,8 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - SUBDIRS = $(gdktarget) . tests - DIST_SUBDIRS = win32 x11 quartz directfb tests -- - INCLUDES = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DGDK_COMPILATION \ -@@ -436,9 +440,7 @@ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) - -- - gtarget = $(gdktarget) -- - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - - # libtool stuff: set version and export symbols for resolving -@@ -452,7 +454,6 @@ - $(LIBTOOL_EXPORT_OPTIONS) - - @USE_MEDIALIB_FALSE@medialib_sources = -- - @USE_MEDIALIB_TRUE@medialib_sources = \ - @USE_MEDIALIB_TRUE@ gdkmedialib.c - -@@ -496,17 +497,14 @@ - gdkvisual.h \ - gdkwindow.h - -- - gdk_built_public_sources = \ - gdkenumtypes.h - -- - gdk_built_private_headers = \ - gdkprivate.h \ - gdkwindowimpl.h \ - gdkalias.h - -- - gdk_c_sources = \ - $(medialib_sources) \ - gdk.c \ -@@ -543,7 +541,6 @@ - gdkwindow.c \ - gdkwindowimpl.c - -- - gdk_built_sources = \ - gdkaliasdef.c \ - gdkenumtypes.c \ -@@ -553,7 +550,6 @@ - $(gdk_built_private_headers) - - -- - # - # setup GDK sources and their dependencies - # -@@ -566,40 +562,31 @@ - gdkenumtypes.c \ - gdkmarshalers.h - -- - libgdk_directfb_2_0_la_SOURCES = $(common_sources) - libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la - - libgdk_directfb_2_0_la_LDFLAGS = $(LDADD) -- - libgdk_x11_2_0_la_SOURCES = $(common_sources) - libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la - - libgdk_x11_2_0_la_LDFLAGS = $(LDADD) -- - libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c - libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la - - libgdk_quartz_2_0_la_LDFLAGS = $(LDADD) -- - libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c - libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la - - libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def - libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD) -- - @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib -- - @OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh -- - lib_LTLIBRARIES = $(gdktargetlib) -- - EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la -- - MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h - EXTRA_HEADERS = - -@@ -613,183 +600,79 @@ - $(gdk_built_sources) \ - gdkconfig.h - -- - DISTCLEANFILES = gdkconfig.h stamp-gc-h --subdir = gdk --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(lib_LTLIBRARIES) -- --libgdk_directfb_2_0_la_DEPENDENCIES = directfb/libgdk-directfb.la \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --am__libgdk_directfb_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ -- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ -- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ -- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ -- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ -- gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ -- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ -- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ -- gdkmarshalers.h --@USE_MEDIALIB_TRUE@am__objects_1 = gdkmedialib.lo --@USE_MEDIALIB_FALSE@am__objects_1 = --am__objects_2 = $(am__objects_1) gdk.lo gdkapplaunchcontext.lo \ -- gdkcairo.lo gdkcolor.lo gdkcursor.lo gdkdisplay.lo \ -- gdkdisplaymanager.lo gdkdnd.lo gdkdraw.lo gdkevents.lo \ -- gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo gdkkeys.lo \ -- gdkkeyuni.lo gdkpango.lo gdkpixbuf-drawable.lo \ -- gdkpixbuf-render.lo gdkpixmap.lo gdkpolyreg-generic.lo \ -- gdkrectangle.lo gdkregion-generic.lo gdkrgb.lo gdkscreen.lo \ -- gdkselection.lo gdkvisual.lo gdkwindow.lo gdkwindowimpl.lo --am__objects_3 = $(am__objects_2) gdkenumtypes.lo --am_libgdk_directfb_2_0_la_OBJECTS = $(am__objects_3) --libgdk_directfb_2_0_la_OBJECTS = $(am_libgdk_directfb_2_0_la_OBJECTS) --libgdk_quartz_2_0_la_DEPENDENCIES = quartz/libgdk-quartz.la \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --am__libgdk_quartz_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ -- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ -- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ -- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ -- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ -- gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ -- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ -- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ -- gdkmarshalers.h gdkkeynames.c --am_libgdk_quartz_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo --libgdk_quartz_2_0_la_OBJECTS = $(am_libgdk_quartz_2_0_la_OBJECTS) --am__libgdk_win32_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ -- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ -- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ -- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ -- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ -- gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ -- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ -- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ -- gdkmarshalers.h gdkkeynames.c --am_libgdk_win32_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo --libgdk_win32_2_0_la_OBJECTS = $(am_libgdk_win32_2_0_la_OBJECTS) --libgdk_x11_2_0_la_DEPENDENCIES = x11/libgdk-x11.la \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --am__libgdk_x11_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ -- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ -- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ -- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ -- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ -- gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ -- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ -- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ -- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ -- gdkmarshalers.h --am_libgdk_x11_2_0_la_OBJECTS = $(am__objects_3) --libgdk_x11_2_0_la_OBJECTS = $(am_libgdk_x11_2_0_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcairo.Plo ./$(DEPDIR)/gdkcolor.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplaymanager.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd.Plo ./$(DEPDIR)/gdkdraw.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkenumtypes.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkevents.Plo ./$(DEPDIR)/gdkfont.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkgc.Plo ./$(DEPDIR)/gdkglobals.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkimage.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeynames.Plo ./$(DEPDIR)/gdkkeys.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeyuni.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkmedialib.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkpango.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixbuf-drawable.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixbuf-render.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkpolyreg-generic.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkrectangle.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkregion-generic.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkrgb.Plo ./$(DEPDIR)/gdkscreen.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual.Plo ./$(DEPDIR)/gdkwindow.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindowimpl.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(am__libgdk_directfb_2_0_la_SOURCES_DIST) \ -- $(am__libgdk_quartz_2_0_la_SOURCES_DIST) \ -- $(am__libgdk_win32_2_0_la_SOURCES_DIST) \ -- $(am__libgdk_x11_2_0_la_SOURCES_DIST) --DATA = $(noinst_DATA) -- --HEADERS = $(gdkinclude_HEADERS) -- -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.in \ -- $(top_srcdir)/Makefile.decl COPYING Makefile.am --SOURCES = $(libgdk_directfb_2_0_la_SOURCES) $(libgdk_quartz_2_0_la_SOURCES) $(libgdk_win32_2_0_la_SOURCES) $(libgdk_x11_2_0_la_SOURCES) -- - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gdk/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --libLTLIBRARIES_INSTALL = $(INSTALL) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libdir) -+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - - uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgdk-directfb-2.0.la: $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_DEPENDENCIES) -- $(LINK) $(libgdk_directfb_2_0_la_LDFLAGS) $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_LIBADD) $(LIBS) -+ $(libgdk_directfb_2_0_la_LINK) $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_LIBADD) $(LIBS) - libgdk-quartz-2.0.la: $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_DEPENDENCIES) -- $(LINK) $(libgdk_quartz_2_0_la_LDFLAGS) $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_LIBADD) $(LIBS) -+ $(libgdk_quartz_2_0_la_LINK) $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_LIBADD) $(LIBS) - libgdk-win32-2.0.la: $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_DEPENDENCIES) -- $(LINK) $(libgdk_win32_2_0_la_LDFLAGS) $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_LIBADD) $(LIBS) -+ $(libgdk_win32_2_0_la_LINK) $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_LIBADD) $(LIBS) - libgdk-x11-2.0.la: $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_DEPENDENCIES) -- $(LINK) $(libgdk_x11_2_0_la_LDFLAGS) $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_LIBADD) $(LIBS) -+ $(libgdk_x11_2_0_la_LINK) $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -828,64 +711,47 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowimpl.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --gdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-gdkincludeHEADERS: $(gdkinclude_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(gdkincludedir) -+ test -z "$(gdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gdkincludedir)" - @list='$(gdkinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(gdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gdkincludedir)/$$f"; \ -- $(gdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gdkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(gdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gdkincludedir)/$$f'"; \ -+ $(gdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gdkincludedir)/$$f"; \ - done - - uninstall-gdkincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(gdkinclude_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(gdkincludedir)/$$f"; \ -- rm -f $(DESTDIR)$(gdkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(gdkincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(gdkincludedir)/$$f"; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -895,7 +761,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -907,15 +779,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -936,7 +813,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -947,35 +824,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -983,23 +855,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -1013,9 +885,9 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - check-TESTS: $(TESTS) -- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ -+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ -- list='$(TESTS)'; \ -+ list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ -@@ -1024,25 +896,25 @@ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xpass=`expr $$xpass + 1`; \ -- failed=`expr $$failed + 1`; \ -- echo "XPASS: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xpass=`expr $$xpass + 1`; \ -+ failed=`expr $$failed + 1`; \ -+ echo "XPASS: $$tst"; \ - ;; \ - *) \ -- echo "PASS: $$tst"; \ -+ echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xfail=`expr $$xfail + 1`; \ -- echo "XFAIL: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xfail=`expr $$xfail + 1`; \ -+ echo "XFAIL: $$tst"; \ - ;; \ - *) \ -- failed=`expr $$failed + 1`; \ -- echo "FAIL: $$tst"; \ -+ failed=`expr $$failed + 1`; \ -+ echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ -@@ -1067,46 +939,40 @@ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ -- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ -- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ -- test -n "$$skipped" && echo "$$skipped"; \ -- test -n "$$report" && echo "$$report"; \ -+ test -z "$$skipped" || echo "$$skipped"; \ -+ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -1119,13 +985,17 @@ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d $(distdir)/$$subdir \ -- || mkdir $(distdir)/$$subdir \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -1137,8 +1007,9 @@ - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - installdirs: installdirs-recursive - installdirs-am: -- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(gdkincludedir) -- -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gdkincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive -@@ -1159,14 +1030,14 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - clean: clean-recursive - - clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ -@@ -1176,26 +1047,36 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-local distclean-tags -+ distclean-local distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: install-data-local install-gdkincludeHEADERS - -+install-dvi: install-dvi-recursive -+ - install-exec-am: install-exec-local install-libLTLIBRARIES - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -1216,32 +1097,30 @@ - - ps-am: - --uninstall-am: uninstall-gdkincludeHEADERS uninstall-info-am \ -- uninstall-libLTLIBRARIES uninstall-local -+uninstall-am: uninstall-gdkincludeHEADERS uninstall-libLTLIBRARIES \ -+ uninstall-local - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-exec-am install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \ -- check-am check-local clean clean-generic clean-libLTLIBRARIES \ -- clean-libtool clean-recursive ctags ctags-recursive distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-local distclean-recursive distclean-tags distdir dvi \ -- dvi-am dvi-recursive info info-am info-recursive install \ -- install-am install-data install-data-am install-data-local \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-local install-exec-recursive \ -- install-gdkincludeHEADERS install-info install-info-am \ -- install-info-recursive install-libLTLIBRARIES install-man \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -- tags-recursive uninstall uninstall-am \ -- uninstall-gdkincludeHEADERS uninstall-info-am \ -- uninstall-info-recursive uninstall-libLTLIBRARIES \ -- uninstall-local uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-TESTS check-am check-local clean \ -+ clean-generic clean-libLTLIBRARIES clean-libtool ctags \ -+ ctags-recursive distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-local distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-data-local install-dvi \ -+ install-dvi-am install-exec install-exec-am install-exec-hook \ -+ install-exec-local install-gdkincludeHEADERS install-html \ -+ install-html-am install-info install-info-am \ -+ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am \ -+ uninstall-gdkincludeHEADERS uninstall-libLTLIBRARIES \ -+ uninstall-local - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/gdk/quartz/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/gdk/quartz/Makefile.in 2008-09-24 00:11:38.000000000 -0300 -+++ gtk+2.0-2.14.3/gdk/quartz/Makefile.in 2008-09-24 19:56:52.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,12 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl -+subdir = gdk/quartz -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+libgdk_quartz_la_LIBADD = -+am_libgdk_quartz_la_OBJECTS = GdkQuartzView.lo GdkQuartzWindow.lo \ -+ gdkapplaunchcontext-quartz.lo gdkcolor-quartz.lo \ -+ gdkcursor-quartz.lo gdkdisplay-quartz.lo gdkdnd-quartz.lo \ -+ gdkdrawable-quartz.lo gdkevents-quartz.lo \ -+ gdkeventloop-quartz.lo gdkfont-quartz.lo gdkgc-quartz.lo \ -+ gdkgeometry-quartz.lo gdkglobals-quartz.lo gdkim-quartz.lo \ -+ gdkimage-quartz.lo gdkinput.lo gdkkeys-quartz.lo \ -+ gdkmain-quartz.lo gdkpixmap-quartz.lo gdkproperty-quartz.lo \ -+ gdkscreen-quartz.lo gdkselection-quartz.lo gdkspawn-quartz.lo \ -+ gdktestutils-quartz.lo gdkvisual-quartz.lo gdkwindow-quartz.lo -+libgdk_quartz_la_OBJECTS = $(am_libgdk_quartz_la_OBJECTS) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libgdk_quartz_la_SOURCES) -+DIST_SOURCES = $(libgdk_quartz_la_SOURCES) -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libgdkincludedir)" -+libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(libgdkinclude_HEADERS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +96,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +121,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +128,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/gdk/Makefile.in gtk+2.0-2.14.4/gdk/Makefile.in +--- gtk+2.0-2.14.4.old/gdk/Makefile.in 2008-10-17 01:07:15.000000000 -0300 ++++ gtk+2.0-2.14.4/gdk/Makefile.in 2008-11-04 15:37:06.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +154,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -38147,798 +61665,19 @@ Index: gtk+2.0-2.14.3/gdk/quartz/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +173,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +183,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +212,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +231,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +242,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +254,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +295,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +304,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,9 +339,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - libgdkincludedir = $(includedir)/gtk-2.0/gdk -- - INCLUDES = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DGDK_COMPILATION \ -@@ -419,11 +350,8 @@ - $(GDK_DEP_CFLAGS) \ - "-xobjective-c" - -- - LDADDS = $(GDK_DEP_LIBS) -- - noinst_LTLIBRARIES = libgdk-quartz.la -- - libgdk_quartz_la_SOURCES = \ - GdkQuartzView.c \ - GdkQuartzView.h \ -@@ -462,98 +390,56 @@ - gdkwindow-quartz.h \ - xcursors.h - -- - libgdkinclude_HEADERS = \ - gdkquartz.h - --subdir = gdk/quartz --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) -- --libgdk_quartz_la_LDFLAGS = --libgdk_quartz_la_LIBADD = --am_libgdk_quartz_la_OBJECTS = GdkQuartzView.lo GdkQuartzWindow.lo \ -- gdkapplaunchcontext-quartz.lo gdkcolor-quartz.lo \ -- gdkcursor-quartz.lo gdkdisplay-quartz.lo gdkdnd-quartz.lo \ -- gdkdrawable-quartz.lo gdkevents-quartz.lo \ -- gdkeventloop-quartz.lo gdkfont-quartz.lo gdkgc-quartz.lo \ -- gdkgeometry-quartz.lo gdkglobals-quartz.lo gdkim-quartz.lo \ -- gdkimage-quartz.lo gdkinput.lo gdkkeys-quartz.lo \ -- gdkmain-quartz.lo gdkpixmap-quartz.lo gdkproperty-quartz.lo \ -- gdkscreen-quartz.lo gdkselection-quartz.lo gdkspawn-quartz.lo \ -- gdktestutils-quartz.lo gdkvisual-quartz.lo gdkwindow-quartz.lo --libgdk_quartz_la_OBJECTS = $(am_libgdk_quartz_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/GdkQuartzView.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/GdkQuartzWindow.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkeventloop-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkim-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-quartz.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libgdk_quartz_la_SOURCES) --HEADERS = $(libgdkinclude_HEADERS) -- --DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ -- $(top_srcdir)/Makefile.decl Makefile.am --SOURCES = $(libgdk_quartz_la_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/quartz/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gdk/quartz/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgdk-quartz.la: $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_DEPENDENCIES) -- $(LINK) $(libgdk_quartz_la_LDFLAGS) $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_LIBADD) $(LIBS) -+ $(LINK) $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -587,82 +473,58 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-quartz.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) -+ test -z "$(libgdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdkincludedir)" - @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f"; \ -- $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(libgdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ -+ $(libgdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdkincludedir)/$$f"; \ - done - - uninstall-libgdkincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(libgdkincludedir)/$$f"; \ -- rm -f $(DESTDIR)$(libgdkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(libgdkincludedir)/$$f"; \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -672,23 +534,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -700,29 +562,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -737,9 +593,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(LTLIBRARIES) $(HEADERS) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) -+ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -759,7 +616,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -773,24 +630,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-libgdkincludeHEADERS - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -811,19 +678,23 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-libgdkincludeHEADERS -+uninstall-am: uninstall-libgdkincludeHEADERS -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-libgdkincludeHEADERS install-man install-strip \ -- installcheck installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-info-am \ -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-libgdkincludeHEADERS install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libgdkincludeHEADERS - - # call as: $(XVFB_START) && someprogram -Index: gtk+2.0-2.14.3/gdk/win32/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/gdk/win32/Makefile.in 2008-09-24 00:11:38.000000000 -0300 -+++ gtk+2.0-2.14.3/gdk/win32/Makefile.in 2008-09-24 19:56:52.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,12 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,69 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl -+subdir = gdk/win32 -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+libgdk_win32_la_LIBADD = -+am_libgdk_win32_la_OBJECTS = gdkapplaunchcontext-win32.lo \ -+ gdkcolor-win32.lo gdkcursor-win32.lo gdkdisplay-win32.lo \ -+ gdkdnd-win32.lo gdkdrawable-win32.lo gdkevents-win32.lo \ -+ gdkfont-win32.lo gdkgc-win32.lo gdkgeometry-win32.lo \ -+ gdkglobals-win32.lo gdkim-win32.lo gdkimage-win32.lo \ -+ gdkinput.lo gdkinput-win32.lo gdkkeys-win32.lo \ -+ gdkmain-win32.lo gdkpixmap-win32.lo gdkproperty-win32.lo \ -+ gdkscreen-win32.lo gdkselection-win32.lo gdkspawn-win32.lo \ -+ gdktestutils-win32.lo gdkvisual-win32.lo gdkwin32id.lo \ -+ gdkwindow-win32.lo -+libgdk_win32_la_OBJECTS = $(am_libgdk_win32_la_OBJECTS) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libgdk_win32_la_SOURCES) -+DIST_SOURCES = $(libgdk_win32_la_SOURCES) -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libgdkincludedir)" -+libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(libgdkinclude_HEADERS) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +106,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +131,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +138,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/gdk/quartz/Makefile.in gtk+2.0-2.14.4/gdk/quartz/Makefile.in +--- gtk+2.0-2.14.4.old/gdk/quartz/Makefile.in 2008-10-17 01:07:16.000000000 -0300 ++++ gtk+2.0-2.14.4/gdk/quartz/Makefile.in 2008-11-04 15:37:07.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +164,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -38946,875 +61685,19 @@ Index: gtk+2.0-2.14.3/gdk/win32/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +183,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +193,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +222,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +241,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +252,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +264,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +305,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,17 +314,16 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- bdfcursor.c \ -- makefile.msc -- -+EXTRA_DIST = bdfcursor.c makefile.msc - TEST_PROGS = - - ### testing rules -@@ -409,9 +349,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - libgdkincludedir = $(includedir)/gtk-2.0/gdk -- - INCLUDES = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DINSIDE_GDK_WIN32 \ -@@ -423,13 +361,9 @@ - $(GDK_WIN32_EXTRA_CFLAGS)\ - -DGDK_COMPILATION - -- - LDADDS = $(GDK_DEP_LIBS) -- - noinst_LTLIBRARIES = libgdk-win32.la -- - SUBDIRS = rc -- - libgdk_win32_la_SOURCES = \ - xcursors.h \ - gdkapplaunchcontext-win32.c \ -@@ -467,103 +401,56 @@ - wintab.h \ - pktdef.h - -- - libgdkinclude_HEADERS = \ - gdkwin32.h - --subdir = gdk/win32 --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) -- --libgdk_win32_la_LDFLAGS = --libgdk_win32_la_LIBADD = --am_libgdk_win32_la_OBJECTS = gdkapplaunchcontext-win32.lo \ -- gdkcolor-win32.lo gdkcursor-win32.lo gdkdisplay-win32.lo \ -- gdkdnd-win32.lo gdkdrawable-win32.lo gdkevents-win32.lo \ -- gdkfont-win32.lo gdkgc-win32.lo gdkgeometry-win32.lo \ -- gdkglobals-win32.lo gdkim-win32.lo gdkimage-win32.lo \ -- gdkinput.lo gdkinput-win32.lo gdkkeys-win32.lo gdkmain-win32.lo \ -- gdkpixmap-win32.lo gdkproperty-win32.lo gdkscreen-win32.lo \ -- gdkselection-win32.lo gdkspawn-win32.lo gdktestutils-win32.lo \ -- gdkvisual-win32.lo gdkwin32id.lo gdkwindow-win32.lo --libgdk_win32_la_OBJECTS = $(am_libgdk_win32_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkapplaunchcontext-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkim-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkwin32id.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-win32.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libgdk_win32_la_SOURCES) --HEADERS = $(libgdkinclude_HEADERS) -- -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ -- $(top_srcdir)/Makefile.decl Makefile.am --DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(libgdk_win32_la_SOURCES) -- - all: all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/win32/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gdk/win32/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgdk-win32.la: $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_DEPENDENCIES) -- $(LINK) $(libgdk_win32_la_LDFLAGS) $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_LIBADD) $(LIBS) -+ $(LINK) $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -596,64 +483,47 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-win32.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) -+ test -z "$(libgdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdkincludedir)" - @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f"; \ -- $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(libgdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ -+ $(libgdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdkincludedir)/$$f"; \ - done - - uninstall-libgdkincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(libgdkincludedir)/$$f"; \ -- rm -f $(DESTDIR)$(libgdkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(libgdkincludedir)/$$f"; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -663,7 +533,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -675,15 +551,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -704,7 +585,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -715,35 +596,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -751,23 +627,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -779,29 +655,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -812,15 +682,19 @@ - || 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 \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -831,8 +705,9 @@ - all-am: Makefile $(LTLIBRARIES) $(HEADERS) - installdirs: installdirs-recursive - installdirs-am: -- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) -- -+ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -852,7 +727,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -866,24 +741,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: install-libgdkincludeHEADERS - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -904,28 +789,26 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-libgdkincludeHEADERS -+uninstall-am: uninstall-libgdkincludeHEADERS - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-generic clean-libtool \ -- clean-noinstLTLIBRARIES clean-recursive ctags ctags-recursive \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-recursive \ -- install-exec install-exec-am install-exec-recursive \ -- install-info install-info-am install-info-recursive \ -- install-libgdkincludeHEADERS install-man install-recursive \ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am check-local clean clean-generic \ -+ clean-libtool clean-noinstLTLIBRARIES ctags ctags-recursive \ -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-libgdkincludeHEADERS install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ -- installdirs-am installdirs-recursive maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ -- ps-recursive tags tags-recursive uninstall uninstall-am \ -- uninstall-info-am uninstall-info-recursive \ -- uninstall-libgdkincludeHEADERS uninstall-recursive -+ installdirs-am maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -+ uninstall uninstall-am uninstall-libgdkincludeHEADERS - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/gdk/win32/rc/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/gdk/win32/rc/Makefile.in 2008-09-24 00:11:38.000000000 -0300 -+++ gtk+2.0-2.14.3/gdk/win32/rc/Makefile.in 2008-09-24 19:56:53.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,24 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/gdk.rc.in $(top_srcdir)/Makefile.decl -+subdir = gdk/win32/rc -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = gdk.rc -+SOURCES = -+DIST_SOURCES = -+DATA = $(noinst_DATA) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +60,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +85,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +92,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/gdk/tests/Makefile.in gtk+2.0-2.14.4/gdk/tests/Makefile.in +--- gtk+2.0-2.14.4.old/gdk/tests/Makefile.in 2008-10-17 01:07:16.000000000 -0300 ++++ gtk+2.0-2.14.4/gdk/tests/Makefile.in 2008-11-04 15:37:07.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +118,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -39822,594 +61705,19 @@ Index: gtk+2.0-2.14.3/gdk/win32/rc/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +137,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +147,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +176,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +195,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +206,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +218,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +259,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,18 +268,16 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- gdk.rc \ -- gdk.rc.in \ -- gtk.ico -- -+EXTRA_DIST = gdk.rc gdk.rc.in gtk.ico - TEST_PROGS = - - ### testing rules -@@ -410,27 +303,40 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - @USE_WIN32_TRUE@noinst_DATA = gdk-win32-res.o --subdir = gdk/win32/rc --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = gdk.rc --DIST_SOURCES = --DATA = $(noinst_DATA) -- --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am gdk.rc.in - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/win32/rc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gdk/win32/rc/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --gdk.rc: $(top_builddir)/config.status gdk.rc.in -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+gdk.rc: $(top_builddir)/config.status $(srcdir)/gdk.rc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - - mostlyclean-libtool: -@@ -438,39 +344,29 @@ - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: - tags: TAGS - TAGS: - - ctags: CTAGS - CTAGS: - --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -485,7 +381,6 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(DATA) -- - installdirs: - install: install-am - install-exec: install-exec-am -@@ -506,7 +401,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -517,24 +412,34 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool -+distclean-am: clean-am distclean-generic - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -553,17 +458,21 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: all all-am check check-am check-local clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ -- distdir dvi dvi-am info info-am install install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-info-am -+ distdir dvi dvi-am html html-am info info-am install \ -+ install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/gdk/x11/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/gdk/x11/Makefile.in 2008-09-24 00:11:39.000000000 -0300 -+++ gtk+2.0-2.14.3/gdk/x11/Makefile.in 2008-09-24 19:56:53.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,13 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,12 +34,86 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl - @XINPUT_XFREE_TRUE@am__append_1 = gdkinput-x11.c gdkinput-xfree.c - @XINPUT_XFREE_FALSE@am__append_2 = gdkinput-none.c -+noinst_PROGRAMS = checksettings$(EXEEXT) -+TESTS = checksettings$(EXEEXT) -+subdir = gdk/x11 -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+libgdk_x11_la_LIBADD = -+am__libgdk_x11_la_SOURCES_DIST = MwmUtil.h gdkapplaunchcontext-x11.c \ -+ gdkasync.c gdkasync.h gdkcolor-x11.c gdkcursor-x11.c \ -+ gdkdisplay-x11.c gdkdisplay-x11.h gdkdnd-x11.c \ -+ gdkdrawable-x11.c gdkdrawable-x11.h gdkevents-x11.c \ -+ gdkfont-x11.c gdkgc-x11.c gdkgeometry-x11.c gdkglobals-x11.c \ -+ gdkim-x11.c gdkimage-x11.c gdkinput.c gdkkeys-x11.c \ -+ gdkmain-x11.c gdkpixmap-x11.c gdkpixmap-x11.h \ -+ gdkproperty-x11.c gdkscreen-x11.c gdkscreen-x11.h \ -+ gdkselection-x11.c gdkspawn-x11.c gdktestutils-x11.c \ -+ gdkvisual-x11.c gdkwindow-x11.c gdkwindow-x11.h \ -+ gdkxftdefaults.c gdkxid.c gdkx.h gdkprivate-x11.h \ -+ gdkinputprivate.h xsettings-client.h xsettings-client.c \ -+ xsettings-common.h xsettings-common.c gdkinput-x11.c \ -+ gdkinput-xfree.c gdkinput-none.c -+@XINPUT_XFREE_TRUE@am__objects_1 = gdkinput-x11.lo gdkinput-xfree.lo -+@XINPUT_XFREE_FALSE@am__objects_2 = gdkinput-none.lo -+am_libgdk_x11_la_OBJECTS = gdkapplaunchcontext-x11.lo gdkasync.lo \ -+ gdkcolor-x11.lo gdkcursor-x11.lo gdkdisplay-x11.lo \ -+ gdkdnd-x11.lo gdkdrawable-x11.lo gdkevents-x11.lo \ -+ gdkfont-x11.lo gdkgc-x11.lo gdkgeometry-x11.lo \ -+ gdkglobals-x11.lo gdkim-x11.lo gdkimage-x11.lo gdkinput.lo \ -+ gdkkeys-x11.lo gdkmain-x11.lo gdkpixmap-x11.lo \ -+ gdkproperty-x11.lo gdkscreen-x11.lo gdkselection-x11.lo \ -+ gdkspawn-x11.lo gdktestutils-x11.lo gdkvisual-x11.lo \ -+ gdkwindow-x11.lo gdkxftdefaults.lo gdkxid.lo \ -+ xsettings-client.lo xsettings-common.lo $(am__objects_1) \ -+ $(am__objects_2) -+libgdk_x11_la_OBJECTS = $(am_libgdk_x11_la_OBJECTS) -+PROGRAMS = $(noinst_PROGRAMS) -+checksettings_SOURCES = checksettings.c -+checksettings_OBJECTS = checksettings.$(OBJEXT) -+am__DEPENDENCIES_1 = -+checksettings_DEPENDENCIES = libgdk-x11.la $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libgdk_x11_la_SOURCES) checksettings.c -+DIST_SOURCES = $(am__libgdk_x11_la_SOURCES_DIST) checksettings.c -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libgdkincludedir)" -+libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(libgdkinclude_HEADERS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -53,22 +124,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,8 +149,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -92,10 +156,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/gdk/win32/Makefile.in gtk+2.0-2.14.4/gdk/win32/Makefile.in +--- gtk+2.0-2.14.4.old/gdk/win32/Makefile.in 2008-10-17 01:07:16.000000000 -0300 ++++ gtk+2.0-2.14.4/gdk/win32/Makefile.in 2008-11-04 15:37:07.000000000 -0200 +@@ -94,6 +94,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@ -@@ -122,6 +182,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -40417,4388 +61725,96 @@ Index: gtk+2.0-2.14.3/gdk/x11/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -140,8 +201,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -152,91 +211,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -258,24 +240,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -286,8 +259,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -299,28 +270,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -329,22 +282,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -367,6 +323,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -375,9 +332,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -385,12 +344,8 @@ - - # We need to include all these C files here since the conditionals - # don't seem to be correctly expanded for the dist files. --EXTRA_DIST = \ -- gdkinput-x11.c \ -- gdkinput-xfree.c \ -- gdkinput-none.c \ -+EXTRA_DIST = gdkinput-x11.c gdkinput-xfree.c gdkinput-none.c \ - gdksettings.c -- - TEST_PROGS = - - ### testing rules -@@ -416,9 +371,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - libgdkincludedir = $(includedir)/gtk-2.0/gdk -- - INCLUDES = \ - -DG_LOG_DOMAIN=\"Gdk\" \ - -DGDK_COMPILATION \ -@@ -428,178 +381,69 @@ - $(GTK_DEBUG_FLAGS) \ - $(GDK_DEP_CFLAGS) - -- - LDADDS = $(GDK_DEP_LIBS) -- - noinst_LTLIBRARIES = libgdk-x11.la -- --libgdk_x11_la_SOURCES = \ -- MwmUtil.h \ -- gdkapplaunchcontext-x11.c \ -- gdkasync.c \ -- gdkasync.h \ -- gdkcolor-x11.c \ -- gdkcursor-x11.c \ -- gdkdisplay-x11.c \ -- gdkdisplay-x11.h \ -- gdkdnd-x11.c \ -- gdkdrawable-x11.c \ -- gdkdrawable-x11.h \ -- gdkevents-x11.c \ -- gdkfont-x11.c \ -- gdkgc-x11.c \ -- gdkgeometry-x11.c \ -- gdkglobals-x11.c \ -- gdkim-x11.c \ -- gdkimage-x11.c \ -- gdkinput.c \ -- gdkkeys-x11.c \ -- gdkmain-x11.c \ -- gdkpixmap-x11.c \ -- gdkpixmap-x11.h \ -- gdkproperty-x11.c \ -- gdkscreen-x11.c \ -- gdkscreen-x11.h \ -- gdkselection-x11.c \ -- gdkspawn-x11.c \ -- gdktestutils-x11.c \ -- gdkvisual-x11.c \ -- gdkwindow-x11.c \ -- gdkwindow-x11.h \ -- gdkxftdefaults.c \ -- gdkxid.c \ -- gdkx.h \ -- gdkprivate-x11.h \ -- gdkinputprivate.h \ -- xsettings-client.h \ -- xsettings-client.c \ -- xsettings-common.h \ -- xsettings-common.c\ --$(am__append_1) $(am__append_2) -- -+libgdk_x11_la_SOURCES = MwmUtil.h gdkapplaunchcontext-x11.c gdkasync.c \ -+ gdkasync.h gdkcolor-x11.c gdkcursor-x11.c gdkdisplay-x11.c \ -+ gdkdisplay-x11.h gdkdnd-x11.c gdkdrawable-x11.c \ -+ gdkdrawable-x11.h gdkevents-x11.c gdkfont-x11.c gdkgc-x11.c \ -+ gdkgeometry-x11.c gdkglobals-x11.c gdkim-x11.c gdkimage-x11.c \ -+ gdkinput.c gdkkeys-x11.c gdkmain-x11.c gdkpixmap-x11.c \ -+ gdkpixmap-x11.h gdkproperty-x11.c gdkscreen-x11.c \ -+ gdkscreen-x11.h gdkselection-x11.c gdkspawn-x11.c \ -+ gdktestutils-x11.c gdkvisual-x11.c gdkwindow-x11.c \ -+ gdkwindow-x11.h gdkxftdefaults.c gdkxid.c gdkx.h \ -+ gdkprivate-x11.h gdkinputprivate.h xsettings-client.h \ -+ xsettings-client.c xsettings-common.h xsettings-common.c \ -+ $(am__append_1) $(am__append_2) - libgdkinclude_HEADERS = \ - gdkx.h - -- --noinst_PROGRAMS = checksettings - checksettings_LDADD = libgdk-x11.la $(GLIB_LIBS) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -- --TESTS = checksettings --subdir = gdk/x11 --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) -- --libgdk_x11_la_LDFLAGS = --libgdk_x11_la_LIBADD = --am__libgdk_x11_la_SOURCES_DIST = MwmUtil.h gdkapplaunchcontext-x11.c \ -- gdkasync.c gdkasync.h gdkcolor-x11.c gdkcursor-x11.c \ -- gdkdisplay-x11.c gdkdisplay-x11.h gdkdnd-x11.c \ -- gdkdrawable-x11.c gdkdrawable-x11.h gdkevents-x11.c \ -- gdkfont-x11.c gdkgc-x11.c gdkgeometry-x11.c gdkglobals-x11.c \ -- gdkim-x11.c gdkimage-x11.c gdkinput.c gdkkeys-x11.c \ -- gdkmain-x11.c gdkpixmap-x11.c gdkpixmap-x11.h gdkproperty-x11.c \ -- gdkscreen-x11.c gdkscreen-x11.h gdkselection-x11.c \ -- gdkspawn-x11.c gdktestutils-x11.c gdkvisual-x11.c \ -- gdkwindow-x11.c gdkwindow-x11.h gdkxftdefaults.c gdkxid.c \ -- gdkx.h gdkprivate-x11.h gdkinputprivate.h xsettings-client.h \ -- xsettings-client.c xsettings-common.h xsettings-common.c \ -- gdkinput-x11.c gdkinput-xfree.c gdkinput-none.c --@XINPUT_XFREE_TRUE@am__objects_1 = gdkinput-x11.lo gdkinput-xfree.lo --@XINPUT_XFREE_FALSE@am__objects_2 = gdkinput-none.lo --am_libgdk_x11_la_OBJECTS = gdkapplaunchcontext-x11.lo gdkasync.lo \ -- gdkcolor-x11.lo gdkcursor-x11.lo gdkdisplay-x11.lo \ -- gdkdnd-x11.lo gdkdrawable-x11.lo gdkevents-x11.lo \ -- gdkfont-x11.lo gdkgc-x11.lo gdkgeometry-x11.lo \ -- gdkglobals-x11.lo gdkim-x11.lo gdkimage-x11.lo gdkinput.lo \ -- gdkkeys-x11.lo gdkmain-x11.lo gdkpixmap-x11.lo \ -- gdkproperty-x11.lo gdkscreen-x11.lo gdkselection-x11.lo \ -- gdkspawn-x11.lo gdktestutils-x11.lo gdkvisual-x11.lo \ -- gdkwindow-x11.lo gdkxftdefaults.lo gdkxid.lo \ -- xsettings-client.lo xsettings-common.lo $(am__objects_1) \ -- $(am__objects_2) --libgdk_x11_la_OBJECTS = $(am_libgdk_x11_la_OBJECTS) --noinst_PROGRAMS = checksettings$(EXEEXT) --PROGRAMS = $(noinst_PROGRAMS) -- --checksettings_SOURCES = checksettings.c --checksettings_OBJECTS = checksettings.$(OBJEXT) --checksettings_DEPENDENCIES = libgdk-x11.la \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --checksettings_LDFLAGS = -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/checksettings.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkasync.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkim-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-none.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-xfree.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkxftdefaults.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdkxid.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/xsettings-client.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/xsettings-common.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(am__libgdk_x11_la_SOURCES_DIST) checksettings.c --HEADERS = $(libgdkinclude_HEADERS) -- --DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ -- $(top_srcdir)/Makefile.decl Makefile.am --SOURCES = $(libgdk_x11_la_SOURCES) checksettings.c -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/x11/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gdk/x11/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgdk-x11.la: $(libgdk_x11_la_OBJECTS) $(libgdk_x11_la_DEPENDENCIES) -- $(LINK) $(libgdk_x11_la_LDFLAGS) $(libgdk_x11_la_OBJECTS) $(libgdk_x11_la_LIBADD) $(LIBS) -+ $(LINK) $(libgdk_x11_la_OBJECTS) $(libgdk_x11_la_LIBADD) $(LIBS) - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -609,10 +453,10 @@ - done - checksettings$(EXEEXT): $(checksettings_OBJECTS) $(checksettings_DEPENDENCIES) - @rm -f checksettings$(EXEEXT) -- $(LINK) $(checksettings_LDFLAGS) $(checksettings_OBJECTS) $(checksettings_LDADD) $(LIBS) -+ $(LINK) $(checksettings_OBJECTS) $(checksettings_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -652,82 +496,58 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsettings-common.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) -+ test -z "$(libgdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdkincludedir)" - @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f"; \ -- $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(libgdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ -+ $(libgdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdkincludedir)/$$f"; \ - done - - uninstall-libgdkincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(libgdkincludedir)/$$f"; \ -- rm -f $(DESTDIR)$(libgdkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(libgdkincludedir)/$$f"; \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -737,23 +557,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -767,9 +587,9 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - check-TESTS: $(TESTS) -- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ -+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ -- list='$(TESTS)'; \ -+ list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ -@@ -778,25 +598,25 @@ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xpass=`expr $$xpass + 1`; \ -- failed=`expr $$failed + 1`; \ -- echo "XPASS: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xpass=`expr $$xpass + 1`; \ -+ failed=`expr $$failed + 1`; \ -+ echo "XPASS: $$tst"; \ - ;; \ - *) \ -- echo "PASS: $$tst"; \ -+ echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xfail=`expr $$xfail + 1`; \ -- echo "XFAIL: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xfail=`expr $$xfail + 1`; \ -+ echo "XFAIL: $$tst"; \ - ;; \ - *) \ -- failed=`expr $$failed + 1`; \ -- echo "FAIL: $$tst"; \ -+ failed=`expr $$failed + 1`; \ -+ echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ -@@ -821,46 +641,40 @@ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ -- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ -- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ -- test -n "$$skipped" && echo "$$skipped"; \ -- test -n "$$report" && echo "$$report"; \ -+ test -z "$$skipped" || echo "$$skipped"; \ -+ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -875,9 +689,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local - check: check-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) -+ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -897,7 +712,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -911,24 +726,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-libgdkincludeHEADERS - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -949,20 +774,24 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-libgdkincludeHEADERS -+uninstall-am: uninstall-libgdkincludeHEADERS -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ - clean clean-generic clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ -- dvi-am info info-am install install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-libgdkincludeHEADERS install-man \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ -- uninstall-libgdkincludeHEADERS -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-libgdkincludeHEADERS \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-libgdkincludeHEADERS - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/gdk-pixbuf/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/gdk-pixbuf/Makefile.in 2008-09-24 00:11:37.000000000 -0300 -+++ gtk+2.0-2.14.3/gdk-pixbuf/Makefile.in 2008-09-24 19:56:51.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,14 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ -+ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,1440 +35,1367 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --AS = @AS@ --ATK_PREFIX = @ATK_PREFIX@ --AUTOCONF = @AUTOCONF@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ --BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ --CAIRO_PREFIX = @CAIRO_PREFIX@ --CATALOGS = @CATALOGS@ --CATOBJEXT = @CATOBJEXT@ --CC = @CC@ --CCAS = @CCAS@ --CCASFLAGS = @CCASFLAGS@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ --CUPS_API_MAJOR = @CUPS_API_MAJOR@ --CUPS_API_MINOR = @CUPS_API_MINOR@ --CUPS_CFLAGS = @CUPS_CFLAGS@ --CUPS_CONFIG = @CUPS_CONFIG@ --CUPS_LIBS = @CUPS_LIBS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DATADIRNAME = @DATADIRNAME@ --DB2HTML = @DB2HTML@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ --DLLTOOL = @DLLTOOL@ --DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ --EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --GAIL_INET_LIBS = @GAIL_INET_LIBS@ --GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ --GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ --GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ --GDK_DEP_LIBS = @GDK_DEP_LIBS@ --GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ --GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@ --GDK_PACKAGES = @GDK_PACKAGES@ --GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ --GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@ --GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@ --GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@ --GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@ --GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@ --GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@ --GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@ --GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@ --GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@ --GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@ --GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@ --GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ --GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ --GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ --GDK_WLIBS = @GDK_WLIBS@ --GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --GLIB_CFLAGS = @GLIB_CFLAGS@ --GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ --GLIB_LIBS = @GLIB_LIBS@ --GLIB_MKENUMS = @GLIB_MKENUMS@ --GLIB_PREFIX = @GLIB_PREFIX@ --GMOFILES = @GMOFILES@ --GMSGFMT = @GMSGFMT@ --GOBJECT_QUERY = @GOBJECT_QUERY@ --GREP = @GREP@ --GTKDOC_CHECK = @GTKDOC_CHECK@ --GTK_API_VERSION = @GTK_API_VERSION@ --GTK_BINARY_AGE = @GTK_BINARY_AGE@ --GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ --GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ --GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ --GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ --GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ --GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ --GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ --GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@ --GTK_MICRO_VERSION = @GTK_MICRO_VERSION@ --GTK_MINOR_VERSION = @GTK_MINOR_VERSION@ --GTK_PACKAGES = @GTK_PACKAGES@ --GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ --GTK_VERSION = @GTK_VERSION@ --GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ --HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ --HTML_DIR = @HTML_DIR@ --INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ --INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ --INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ --INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ --INDENT = @INDENT@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --INSTOBJEXT = @INSTOBJEXT@ --INTLLIBS = @INTLLIBS@ --LDFLAGS = @LDFLAGS@ --LIBJASPER = @LIBJASPER@ --LIBJPEG = @LIBJPEG@ --LIBOBJS = @LIBOBJS@ --LIBPNG = @LIBPNG@ --LIBS = @LIBS@ --LIBTIFF = @LIBTIFF@ --LIBTOOL = @LIBTOOL@ --LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ --LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ --LT_VERSION_INFO = @LT_VERSION_INFO@ --MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ --MAKEINFO = @MAKEINFO@ --MKINSTALLDIRS = @MKINSTALLDIRS@ --MSGFMT = @MSGFMT@ --MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ --NM = @NM@ --NMEDIT = @NMEDIT@ --OBJDUMP = @OBJDUMP@ --OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PANGO_PREFIX = @PANGO_PREFIX@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ --POFILES = @POFILES@ --POSUB = @POSUB@ --PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ --PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ --RANLIB = @RANLIB@ --REBUILD = @REBUILD@ --REBUILD_PNGS = @REBUILD_PNGS@ --SED = @SED@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ --USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ --VERSION = @VERSION@ --WINDRES = @WINDRES@ --XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ --XMKMF = @XMKMF@ --XMLCATALOG = @XMLCATALOG@ --XML_CATALOG_FILE = @XML_CATALOG_FILE@ --XSLTPROC = @XSLTPROC@ --X_CFLAGS = @X_CFLAGS@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_LIBS = @X_LIBS@ --X_PRE_LIBS = @X_PRE_LIBS@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --datarootdir = @datarootdir@ --docdir = @docdir@ --dvidir = @dvidir@ --exec_prefix = @exec_prefix@ --gdktarget = @gdktarget@ --gdktargetlib = @gdktargetlib@ --gtktargetlib = @gtktargetlib@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --htmldir = @htmldir@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --libdir = @libdir@ --libexecdir = @libexecdir@ --localedir = @localedir@ --localstatedir = @localstatedir@ --mandir = @mandir@ --ms_librarian = @ms_librarian@ --oldincludedir = @oldincludedir@ --pdfdir = @pdfdir@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --psdir = @psdir@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --sysconfdir = @sysconfdir@ --target_alias = @target_alias@ -- --GTESTER = gtester # in $PATH for non-GLIB packages --GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -- --# initialize variables for unconditional += appending --EXTRA_DIST = \ -- gdk-pixbuf-csource.1 \ -- makefile.msc \ -- gdk-pixbuf.symbols \ -- makegdkpixbufalias.pl \ -- abicheck.sh \ -- pltcheck.sh \ -- gdk_pixbuf.def \ -- gdk_pixbuf.rc \ -- gdk-pixbuf-marshal.c \ -- gdk-pixbuf-marshal.list \ -- gdk-pixbuf-enum-types.c.template \ -- gdk-pixbuf-enum-types.h.template \ -- gen-color-table.pl -- --TEST_PROGS = -- --### testing rules -- --# Xvfb based test rules --XVFB = Xvfb -screen 0 800x600x16 --XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ -- 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ -- 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ -- 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ -- 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ -- 9995 9996 9997 9998 9999 -- --SKIP_GDKTARGET = \ -- test "$(gdktarget)" != "x11" \ -- && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." -- --XVFB_START = \ -- ${XVFB} -help 2>/dev/null 1>&2 \ -- && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ -- && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ -- trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ -- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ -- && DISPLAY=:$$XID && export DISPLAY -- -- --SUBDIRS = pixops -- --@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -- --@OS_WIN32_TRUE@gdk_pixbuf_def = gdk_pixbuf.def --@OS_WIN32_TRUE@gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def -- --@OS_WIN32_TRUE@gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o --@OS_WIN32_TRUE@gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o -- --@OS_WIN32_TRUE@libole32 = -lole32 -- --@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib -- --@OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh -- --lib_LTLIBRARIES = \ -- libgdk_pixbuf-2.0.la -- -- --loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders -- --module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) -- --# --# The PNG loader --# --libstatic_pixbufloader_png_la_SOURCES = io-png.c --libpixbufloader_png_la_SOURCES = io-png.c --libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs) -- --# --# The BMP loader --# --libstatic_pixbufloader_bmp_la_SOURCES = io-bmp.c --libpixbufloader_bmp_la_SOURCES = io-bmp.c --libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_bmp_la_LIBADD = $(module_libs) -- --# --# The WBMP loader --# --libstatic_pixbufloader_wbmp_la_SOURCES = io-wbmp.c --libpixbufloader_wbmp_la_SOURCES = io-wbmp.c --libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_wbmp_la_LIBADD = $(module_libs) -- --# --# The GIF loader --# --libstatic_pixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h --libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h --libpixbufloader_gif_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_gif_la_LIBADD = $(module_libs) -- --# --# The ICO loader --# --libstatic_pixbufloader_ico_la_SOURCES = io-ico.c --libpixbufloader_ico_la_SOURCES = io-ico.c --libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_ico_la_LIBADD = $(module_libs) -- --# --# The ANI loader --# --libstatic_pixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h --libpixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h --libpixbufloader_ani_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_ani_la_LIBADD = $(module_libs) -- --# --# The JPEG loader --# --libstatic_pixbufloader_jpeg_la_SOURCES = io-jpeg.c --libpixbufloader_jpeg_la_SOURCES = io-jpeg.c --libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs) -- --# --# The PNM loader --# --libstatic_pixbufloader_pnm_la_SOURCES = io-pnm.c --libpixbufloader_pnm_la_SOURCES = io-pnm.c --libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_pnm_la_LIBADD = $(module_libs) -- --# --# The RAS loader --# --libstatic_pixbufloader_ras_la_SOURCES = io-ras.c --libpixbufloader_ras_la_SOURCES = io-ras.c --libpixbufloader_ras_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_ras_la_LIBADD = $(module_libs) -- --# --# The TIFF loader --# --libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c --libpixbufloader_tiff_la_SOURCES = io-tiff.c --libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs) -- --# --# The XPM loader --# --libstatic_pixbufloader_xpm_la_SOURCES = io-xpm.c --libpixbufloader_xpm_la_SOURCES = io-xpm.c --libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_xpm_la_LIBADD = $(module_libs) -- --# --# The XBM loader --# --libstatic_pixbufloader_xbm_la_SOURCES = io-xbm.c --libpixbufloader_xbm_la_SOURCES = io-xbm.c --libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_xbm_la_LIBADD = $(module_libs) -- --# --# The TGA loader --# --libstatic_pixbufloader_tga_la_SOURCES = io-tga.c --libpixbufloader_tga_la_SOURCES = io-tga.c --libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_tga_la_LIBADD = $(module_libs) -- --# --# The .icns loader --# --libstatic_pixbufloader_icns_la_SOURCES = io-icns.c --libpixbufloader_icns_la_SOURCES = io-icns.c --libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_icns_la_LIBADD = $(module_libs) -- --# --# The PCX loader --# --libstatic_pixbufloader_pcx_la_SOURCES = io-pcx.c --libpixbufloader_pcx_la_SOURCES = io-pcx.c --libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_pcx_la_LIBADD = $(module_libs) -- --# --# The JPEG2000 loader --# --libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c --libpixbufloader_jasper_la_SOURCES = io-jasper.c --libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined) --libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs) -- -- --# When building the GDI+ loader statically, we put the "common" objects --# only in one of the archives to avoid duplicate definitions --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@STATIC_GDIPLUS_LIBS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-ico.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-wmf.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-emf.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-bmp.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-gif.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-jpeg.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-tiff.la -- -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_ico_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-native.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-propertytags.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.c -- -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_wmf_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.c -- -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_emf_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.c -- -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_bmp_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.c -- -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_gif_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.c -- -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_jpeg_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.c -- -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_png_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-png.c -- -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_tiff_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.c -- -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@GDIPLUS_LIBS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-ico.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-wmf.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-emf.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-bmp.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-gif.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-jpeg.la \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-tiff.la -- -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.c -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32) -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.c -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32) -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.c -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32) -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.c -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32) -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.c -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32) -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.c -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32) -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-png.c -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32) -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_SOURCES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.c -- --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32) -- -- --# Loaders that aren't built if we build the GDI+ loader --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE@STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@BMP_LIB = libpixbufloader-bmp.la -- --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE@STATIC_GIF_LIB = libstatic-pixbufloader-gif.la --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@GIF_LIB = libpixbufloader-gif.la -+DIST_COMMON = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) \ -+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(srcdir)/gdk-pixbuf-features.h.in $(srcdir)/gdk_pixbuf.rc.in \ -+ $(top_srcdir)/Makefile.decl ChangeLog -+noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) -+bin_PROGRAMS = gdk-pixbuf-csource$(EXEEXT) \ -+ gdk-pixbuf-query-loaders$(EXEEXT) -+subdir = gdk-pixbuf -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(loaderdir)" \ -+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libgdk_pixbufincludedir)" -+libLTLIBRARIES_INSTALL = $(INSTALL) -+loaderLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(lib_LTLIBRARIES) $(loader_LTLIBRARIES) \ -+ $(noinst_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+am_libgdk_pixbuf_2_0_la_OBJECTS = gdk-pixbuf.lo \ -+ gdk-pixbuf-animation.lo gdk-pixbuf-data.lo gdk-pixbuf-io.lo \ -+ gdk-pixbuf-loader.lo gdk-pixbuf-scale.lo \ -+ gdk-pixbuf-simple-anim.lo gdk-pixbuf-scaled-anim.lo \ -+ gdk-pixbuf-util.lo gdk-pixdata.lo gdk-pixbuf-enum-types.lo -+libgdk_pixbuf_2_0_la_OBJECTS = $(am_libgdk_pixbuf_2_0_la_OBJECTS) -+libgdk_pixbuf_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgdk_pixbuf_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+am__DEPENDENCIES_2 = libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(am__DEPENDENCIES_1) -+libpixbufloader_ani_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo -+libpixbufloader_ani_la_OBJECTS = $(am_libpixbufloader_ani_la_OBJECTS) -+libpixbufloader_ani_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_ani_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@am_libpixbufloader_ani_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@ $(loaderdir) -+libpixbufloader_bmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_bmp_la_OBJECTS = io-bmp.lo -+libpixbufloader_bmp_la_OBJECTS = $(am_libpixbufloader_bmp_la_OBJECTS) -+libpixbufloader_bmp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_bmp_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@am_libpixbufloader_bmp_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@ $(loaderdir) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) -+am__libpixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-native.h \ -+ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -+ io-gdip-animation.c io-gdip-animation.h io-gdip-bmp.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_bmp_la_OBJECTS = io-gdip-utils.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.lo -+libpixbufloader_gdip_bmp_la_OBJECTS = \ -+ $(am_libpixbufloader_gdip_bmp_la_OBJECTS) -+libpixbufloader_gdip_bmp_la_LINK = $(LIBTOOL) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_bmp_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_bmp_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) -+am__libpixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-native.h \ -+ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -+ io-gdip-animation.c io-gdip-animation.h io-gdip-emf.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_emf_la_OBJECTS = io-gdip-utils.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.lo -+libpixbufloader_gdip_emf_la_OBJECTS = \ -+ $(am_libpixbufloader_gdip_emf_la_OBJECTS) -+libpixbufloader_gdip_emf_la_LINK = $(LIBTOOL) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_emf_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_emf_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) -+am__libpixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-native.h \ -+ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -+ io-gdip-animation.c io-gdip-animation.h io-gdip-gif.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_gif_la_OBJECTS = io-gdip-utils.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.lo -+libpixbufloader_gdip_gif_la_OBJECTS = \ -+ $(am_libpixbufloader_gdip_gif_la_OBJECTS) -+libpixbufloader_gdip_gif_la_LINK = $(LIBTOOL) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_gif_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_gif_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) -+am__libpixbufloader_gdip_ico_la_SOURCES_DIST = io-gdip-native.h \ -+ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -+ io-gdip-animation.c io-gdip-animation.h io-gdip-ico.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_ico_la_OBJECTS = io-gdip-utils.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.lo -+libpixbufloader_gdip_ico_la_OBJECTS = \ -+ $(am_libpixbufloader_gdip_ico_la_OBJECTS) -+libpixbufloader_gdip_ico_la_LINK = $(LIBTOOL) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_ico_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_ico_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) -+am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-native.h \ -+ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -+ io-gdip-animation.c io-gdip-animation.h io-gdip-jpeg.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_jpeg_la_OBJECTS = io-gdip-utils.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.lo -+libpixbufloader_gdip_jpeg_la_OBJECTS = \ -+ $(am_libpixbufloader_gdip_jpeg_la_OBJECTS) -+libpixbufloader_gdip_jpeg_la_LINK = $(LIBTOOL) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_jpeg_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_jpeg_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) -+am__libpixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-native.h \ -+ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -+ io-gdip-animation.c io-gdip-animation.h io-gdip-tiff.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_tiff_la_OBJECTS = io-gdip-utils.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.lo -+libpixbufloader_gdip_tiff_la_OBJECTS = \ -+ $(am_libpixbufloader_gdip_tiff_la_OBJECTS) -+libpixbufloader_gdip_tiff_la_LINK = $(LIBTOOL) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_tiff_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_tiff_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) -+am__libpixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-native.h \ -+ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -+ io-gdip-animation.c io-gdip-animation.h io-gdip-wmf.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_wmf_la_OBJECTS = io-gdip-utils.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.lo -+libpixbufloader_gdip_wmf_la_OBJECTS = \ -+ $(am_libpixbufloader_gdip_wmf_la_OBJECTS) -+libpixbufloader_gdip_wmf_la_LINK = $(LIBTOOL) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_wmf_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_wmf_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) -+libpixbufloader_gif_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo -+libpixbufloader_gif_la_OBJECTS = $(am_libpixbufloader_gif_la_OBJECTS) -+libpixbufloader_gif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_gif_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@am_libpixbufloader_gif_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@ $(loaderdir) -+libpixbufloader_icns_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_icns_la_OBJECTS = io-icns.lo -+libpixbufloader_icns_la_OBJECTS = \ -+ $(am_libpixbufloader_icns_la_OBJECTS) -+libpixbufloader_icns_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_icns_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICNS_FALSE@am_libpixbufloader_icns_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICNS_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICNS_FALSE@ $(loaderdir) -+libpixbufloader_ico_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_ico_la_OBJECTS = io-ico.lo -+libpixbufloader_ico_la_OBJECTS = $(am_libpixbufloader_ico_la_OBJECTS) -+libpixbufloader_ico_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_ico_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@am_libpixbufloader_ico_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ $(loaderdir) -+libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) -+am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo -+libpixbufloader_jasper_la_OBJECTS = \ -+ $(am_libpixbufloader_jasper_la_OBJECTS) -+libpixbufloader_jasper_la_LINK = $(LIBTOOL) --tag=CC \ -+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_jasper_la_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@am_libpixbufloader_jasper_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@ $(loaderdir) -+libpixbufloader_jpeg_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) -+am_libpixbufloader_jpeg_la_OBJECTS = io-jpeg.lo -+libpixbufloader_jpeg_la_OBJECTS = \ -+ $(am_libpixbufloader_jpeg_la_OBJECTS) -+libpixbufloader_jpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_jpeg_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@am_libpixbufloader_jpeg_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@ $(loaderdir) -+libpixbufloader_pcx_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_pcx_la_OBJECTS = io-pcx.lo -+libpixbufloader_pcx_la_OBJECTS = $(am_libpixbufloader_pcx_la_OBJECTS) -+libpixbufloader_pcx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_pcx_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@am_libpixbufloader_pcx_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@ $(loaderdir) -+libpixbufloader_png_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) -+am_libpixbufloader_png_la_OBJECTS = io-png.lo -+libpixbufloader_png_la_OBJECTS = $(am_libpixbufloader_png_la_OBJECTS) -+libpixbufloader_png_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_png_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@am_libpixbufloader_png_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@ $(loaderdir) -+libpixbufloader_pnm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_pnm_la_OBJECTS = io-pnm.lo -+libpixbufloader_pnm_la_OBJECTS = $(am_libpixbufloader_pnm_la_OBJECTS) -+libpixbufloader_pnm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_pnm_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@am_libpixbufloader_pnm_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@ $(loaderdir) -+libpixbufloader_ras_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_ras_la_OBJECTS = io-ras.lo -+libpixbufloader_ras_la_OBJECTS = $(am_libpixbufloader_ras_la_OBJECTS) -+libpixbufloader_ras_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_ras_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@am_libpixbufloader_ras_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@ $(loaderdir) -+libpixbufloader_tga_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_tga_la_OBJECTS = io-tga.lo -+libpixbufloader_tga_la_OBJECTS = $(am_libpixbufloader_tga_la_OBJECTS) -+libpixbufloader_tga_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_tga_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@am_libpixbufloader_tga_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@ $(loaderdir) -+libpixbufloader_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) -+am_libpixbufloader_tiff_la_OBJECTS = io-tiff.lo -+libpixbufloader_tiff_la_OBJECTS = \ -+ $(am_libpixbufloader_tiff_la_OBJECTS) -+libpixbufloader_tiff_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_tiff_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@am_libpixbufloader_tiff_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@ $(loaderdir) -+libpixbufloader_wbmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_wbmp_la_OBJECTS = io-wbmp.lo -+libpixbufloader_wbmp_la_OBJECTS = \ -+ $(am_libpixbufloader_wbmp_la_OBJECTS) -+libpixbufloader_wbmp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_wbmp_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@am_libpixbufloader_wbmp_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@ $(loaderdir) -+libpixbufloader_xbm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_xbm_la_OBJECTS = io-xbm.lo -+libpixbufloader_xbm_la_OBJECTS = $(am_libpixbufloader_xbm_la_OBJECTS) -+libpixbufloader_xbm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_xbm_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@am_libpixbufloader_xbm_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@ $(loaderdir) -+libpixbufloader_xpm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixbufloader_xpm_la_OBJECTS = io-xpm.lo -+libpixbufloader_xpm_la_OBJECTS = $(am_libpixbufloader_xpm_la_OBJECTS) -+libpixbufloader_xpm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixbufloader_xpm_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@am_libpixbufloader_xpm_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@ $(loaderdir) -+libstatic_pixbufloader_ani_la_LIBADD = -+am_libstatic_pixbufloader_ani_la_OBJECTS = io-ani.lo \ -+ io-ani-animation.lo -+libstatic_pixbufloader_ani_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_ani_la_OBJECTS) -+@INCLUDE_ANI_TRUE@am_libstatic_pixbufloader_ani_la_rpath = -+libstatic_pixbufloader_bmp_la_LIBADD = -+am_libstatic_pixbufloader_bmp_la_OBJECTS = io-bmp.lo -+libstatic_pixbufloader_bmp_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_bmp_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE@am_libstatic_pixbufloader_bmp_la_rpath = -+libstatic_pixbufloader_gdip_bmp_la_LIBADD = -+am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-bmp.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS = io-gdip-bmp.lo -+libstatic_pixbufloader_gdip_bmp_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_bmp_la_rpath = -+libstatic_pixbufloader_gdip_emf_la_LIBADD = -+am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-emf.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_emf_la_OBJECTS = io-gdip-emf.lo -+libstatic_pixbufloader_gdip_emf_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_gdip_emf_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_emf_la_rpath = -+libstatic_pixbufloader_gdip_gif_la_LIBADD = -+am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-gif.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_gif_la_OBJECTS = io-gdip-gif.lo -+libstatic_pixbufloader_gdip_gif_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_gdip_gif_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_gif_la_rpath = -+libstatic_pixbufloader_gdip_ico_la_LIBADD = -+am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST = \ -+ io-gdip-native.h io-gdip-propertytags.h io-gdip-utils.h \ -+ io-gdip-utils.c io-gdip-animation.c io-gdip-animation.h \ -+ io-gdip-ico.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_ico_la_OBJECTS = io-gdip-utils.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.lo \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.lo -+libstatic_pixbufloader_gdip_ico_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_gdip_ico_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_ico_la_rpath = -+libstatic_pixbufloader_gdip_jpeg_la_LIBADD = -+am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-jpeg.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = io-gdip-jpeg.lo -+libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_jpeg_la_rpath = -+libstatic_pixbufloader_gdip_tiff_la_LIBADD = -+am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-tiff.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS = io-gdip-tiff.lo -+libstatic_pixbufloader_gdip_tiff_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_tiff_la_rpath = -+libstatic_pixbufloader_gdip_wmf_la_LIBADD = -+am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-wmf.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS = io-gdip-wmf.lo -+libstatic_pixbufloader_gdip_wmf_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_wmf_la_rpath = -+libstatic_pixbufloader_gif_la_LIBADD = -+am_libstatic_pixbufloader_gif_la_OBJECTS = io-gif.lo \ -+ io-gif-animation.lo -+libstatic_pixbufloader_gif_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_gif_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE@am_libstatic_pixbufloader_gif_la_rpath = -+libstatic_pixbufloader_icns_la_LIBADD = -+am_libstatic_pixbufloader_icns_la_OBJECTS = io-icns.lo -+libstatic_pixbufloader_icns_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_icns_la_OBJECTS) -+@INCLUDE_ICNS_TRUE@am_libstatic_pixbufloader_icns_la_rpath = -+libstatic_pixbufloader_ico_la_LIBADD = -+am_libstatic_pixbufloader_ico_la_OBJECTS = io-ico.lo -+libstatic_pixbufloader_ico_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_ico_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE@am_libstatic_pixbufloader_ico_la_rpath = -+libstatic_pixbufloader_jasper_la_LIBADD = -+am_libstatic_pixbufloader_jasper_la_OBJECTS = io-jasper.lo -+libstatic_pixbufloader_jasper_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_jasper_la_OBJECTS) -+@HAVE_JASPER_TRUE@@INCLUDE_JASPER_TRUE@am_libstatic_pixbufloader_jasper_la_rpath = -+libstatic_pixbufloader_jpeg_la_LIBADD = -+am_libstatic_pixbufloader_jpeg_la_OBJECTS = io-jpeg.lo -+libstatic_pixbufloader_jpeg_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_jpeg_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@am_libstatic_pixbufloader_jpeg_la_rpath = -+libstatic_pixbufloader_pcx_la_LIBADD = -+am_libstatic_pixbufloader_pcx_la_OBJECTS = io-pcx.lo -+libstatic_pixbufloader_pcx_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_pcx_la_OBJECTS) -+@INCLUDE_PCX_TRUE@am_libstatic_pixbufloader_pcx_la_rpath = -+libstatic_pixbufloader_png_la_LIBADD = -+am_libstatic_pixbufloader_png_la_OBJECTS = io-png.lo -+libstatic_pixbufloader_png_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_png_la_OBJECTS) -+@HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@am_libstatic_pixbufloader_png_la_rpath = -+libstatic_pixbufloader_pnm_la_LIBADD = -+am_libstatic_pixbufloader_pnm_la_OBJECTS = io-pnm.lo -+libstatic_pixbufloader_pnm_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_pnm_la_OBJECTS) -+@INCLUDE_PNM_TRUE@am_libstatic_pixbufloader_pnm_la_rpath = -+libstatic_pixbufloader_ras_la_LIBADD = -+am_libstatic_pixbufloader_ras_la_OBJECTS = io-ras.lo -+libstatic_pixbufloader_ras_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_ras_la_OBJECTS) -+@INCLUDE_RAS_TRUE@am_libstatic_pixbufloader_ras_la_rpath = -+libstatic_pixbufloader_tga_la_LIBADD = -+am_libstatic_pixbufloader_tga_la_OBJECTS = io-tga.lo -+libstatic_pixbufloader_tga_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_tga_la_OBJECTS) -+@INCLUDE_TGA_TRUE@am_libstatic_pixbufloader_tga_la_rpath = -+libstatic_pixbufloader_tiff_la_LIBADD = -+am_libstatic_pixbufloader_tiff_la_OBJECTS = io-tiff.lo -+libstatic_pixbufloader_tiff_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_tiff_la_OBJECTS) -+@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@am_libstatic_pixbufloader_tiff_la_rpath = -+libstatic_pixbufloader_wbmp_la_LIBADD = -+am_libstatic_pixbufloader_wbmp_la_OBJECTS = io-wbmp.lo -+libstatic_pixbufloader_wbmp_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_wbmp_la_OBJECTS) -+@INCLUDE_WBMP_TRUE@am_libstatic_pixbufloader_wbmp_la_rpath = -+libstatic_pixbufloader_xbm_la_LIBADD = -+am_libstatic_pixbufloader_xbm_la_OBJECTS = io-xbm.lo -+libstatic_pixbufloader_xbm_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_xbm_la_OBJECTS) -+@INCLUDE_XBM_TRUE@am_libstatic_pixbufloader_xbm_la_rpath = -+libstatic_pixbufloader_xpm_la_LIBADD = -+am_libstatic_pixbufloader_xpm_la_OBJECTS = io-xpm.lo -+libstatic_pixbufloader_xpm_la_OBJECTS = \ -+ $(am_libstatic_pixbufloader_xpm_la_OBJECTS) -+@INCLUDE_XPM_TRUE@am_libstatic_pixbufloader_xpm_la_rpath = -+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -+am_gdk_pixbuf_csource_OBJECTS = gdk-pixbuf-csource.$(OBJEXT) -+gdk_pixbuf_csource_OBJECTS = $(am_gdk_pixbuf_csource_OBJECTS) -+gdk_pixbuf_csource_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT) -+gdk_pixbuf_query_loaders_OBJECTS = \ -+ $(am_gdk_pixbuf_query_loaders_OBJECTS) -+test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c -+test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT) -+test_gdk_pixbuf_DEPENDENCIES = $(am__DEPENDENCIES_2) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ -+ $(libpixbufloader_ani_la_SOURCES) \ -+ $(libpixbufloader_bmp_la_SOURCES) \ -+ $(libpixbufloader_gdip_bmp_la_SOURCES) \ -+ $(libpixbufloader_gdip_emf_la_SOURCES) \ -+ $(libpixbufloader_gdip_gif_la_SOURCES) \ -+ $(libpixbufloader_gdip_ico_la_SOURCES) \ -+ $(libpixbufloader_gdip_jpeg_la_SOURCES) \ -+ $(libpixbufloader_gdip_tiff_la_SOURCES) \ -+ $(libpixbufloader_gdip_wmf_la_SOURCES) \ -+ $(libpixbufloader_gif_la_SOURCES) \ -+ $(libpixbufloader_icns_la_SOURCES) \ -+ $(libpixbufloader_ico_la_SOURCES) \ -+ $(libpixbufloader_jasper_la_SOURCES) \ -+ $(libpixbufloader_jpeg_la_SOURCES) \ -+ $(libpixbufloader_pcx_la_SOURCES) \ -+ $(libpixbufloader_png_la_SOURCES) \ -+ $(libpixbufloader_pnm_la_SOURCES) \ -+ $(libpixbufloader_ras_la_SOURCES) \ -+ $(libpixbufloader_tga_la_SOURCES) \ -+ $(libpixbufloader_tiff_la_SOURCES) \ -+ $(libpixbufloader_wbmp_la_SOURCES) \ -+ $(libpixbufloader_xbm_la_SOURCES) \ -+ $(libpixbufloader_xpm_la_SOURCES) \ -+ $(libstatic_pixbufloader_ani_la_SOURCES) \ -+ $(libstatic_pixbufloader_bmp_la_SOURCES) \ -+ $(libstatic_pixbufloader_gdip_bmp_la_SOURCES) \ -+ $(libstatic_pixbufloader_gdip_emf_la_SOURCES) \ -+ $(libstatic_pixbufloader_gdip_gif_la_SOURCES) \ -+ $(libstatic_pixbufloader_gdip_ico_la_SOURCES) \ -+ $(libstatic_pixbufloader_gdip_jpeg_la_SOURCES) \ -+ $(libstatic_pixbufloader_gdip_tiff_la_SOURCES) \ -+ $(libstatic_pixbufloader_gdip_wmf_la_SOURCES) \ -+ $(libstatic_pixbufloader_gif_la_SOURCES) \ -+ $(libstatic_pixbufloader_icns_la_SOURCES) \ -+ $(libstatic_pixbufloader_ico_la_SOURCES) \ -+ $(libstatic_pixbufloader_jasper_la_SOURCES) \ -+ $(libstatic_pixbufloader_jpeg_la_SOURCES) \ -+ $(libstatic_pixbufloader_pcx_la_SOURCES) \ -+ $(libstatic_pixbufloader_png_la_SOURCES) \ -+ $(libstatic_pixbufloader_pnm_la_SOURCES) \ -+ $(libstatic_pixbufloader_ras_la_SOURCES) \ -+ $(libstatic_pixbufloader_tga_la_SOURCES) \ -+ $(libstatic_pixbufloader_tiff_la_SOURCES) \ -+ $(libstatic_pixbufloader_wbmp_la_SOURCES) \ -+ $(libstatic_pixbufloader_xbm_la_SOURCES) \ -+ $(libstatic_pixbufloader_xpm_la_SOURCES) \ -+ $(gdk_pixbuf_csource_SOURCES) \ -+ $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c -+DIST_SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ -+ $(libpixbufloader_ani_la_SOURCES) \ -+ $(libpixbufloader_bmp_la_SOURCES) \ -+ $(am__libpixbufloader_gdip_bmp_la_SOURCES_DIST) \ -+ $(am__libpixbufloader_gdip_emf_la_SOURCES_DIST) \ -+ $(am__libpixbufloader_gdip_gif_la_SOURCES_DIST) \ -+ $(am__libpixbufloader_gdip_ico_la_SOURCES_DIST) \ -+ $(am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST) \ -+ $(am__libpixbufloader_gdip_tiff_la_SOURCES_DIST) \ -+ $(am__libpixbufloader_gdip_wmf_la_SOURCES_DIST) \ -+ $(libpixbufloader_gif_la_SOURCES) \ -+ $(libpixbufloader_icns_la_SOURCES) \ -+ $(libpixbufloader_ico_la_SOURCES) \ -+ $(libpixbufloader_jasper_la_SOURCES) \ -+ $(libpixbufloader_jpeg_la_SOURCES) \ -+ $(libpixbufloader_pcx_la_SOURCES) \ -+ $(libpixbufloader_png_la_SOURCES) \ -+ $(libpixbufloader_pnm_la_SOURCES) \ -+ $(libpixbufloader_ras_la_SOURCES) \ -+ $(libpixbufloader_tga_la_SOURCES) \ -+ $(libpixbufloader_tiff_la_SOURCES) \ -+ $(libpixbufloader_wbmp_la_SOURCES) \ -+ $(libpixbufloader_xbm_la_SOURCES) \ -+ $(libpixbufloader_xpm_la_SOURCES) \ -+ $(libstatic_pixbufloader_ani_la_SOURCES) \ -+ $(libstatic_pixbufloader_bmp_la_SOURCES) \ -+ $(am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST) \ -+ $(am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST) \ -+ $(am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST) \ -+ $(am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST) \ -+ $(am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST) \ -+ $(am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST) \ -+ $(am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST) \ -+ $(libstatic_pixbufloader_gif_la_SOURCES) \ -+ $(libstatic_pixbufloader_icns_la_SOURCES) \ -+ $(libstatic_pixbufloader_ico_la_SOURCES) \ -+ $(libstatic_pixbufloader_jasper_la_SOURCES) \ -+ $(libstatic_pixbufloader_jpeg_la_SOURCES) \ -+ $(libstatic_pixbufloader_pcx_la_SOURCES) \ -+ $(libstatic_pixbufloader_png_la_SOURCES) \ -+ $(libstatic_pixbufloader_pnm_la_SOURCES) \ -+ $(libstatic_pixbufloader_ras_la_SOURCES) \ -+ $(libstatic_pixbufloader_tga_la_SOURCES) \ -+ $(libstatic_pixbufloader_tiff_la_SOURCES) \ -+ $(libstatic_pixbufloader_wbmp_la_SOURCES) \ -+ $(libstatic_pixbufloader_xbm_la_SOURCES) \ -+ $(libstatic_pixbufloader_xpm_la_SOURCES) \ -+ $(gdk_pixbuf_csource_SOURCES) \ -+ $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+DATA = $(noinst_DATA) -+libgdk_pixbufincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AS = @AS@ -+ATK_PREFIX = @ATK_PREFIX@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ -+BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -+CAIRO_PREFIX = @CAIRO_PREFIX@ -+CATALOGS = @CATALOGS@ -+CATOBJEXT = @CATOBJEXT@ -+CC = @CC@ -+CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ -+CCASFLAGS = @CCASFLAGS@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CUPS_API_MAJOR = @CUPS_API_MAJOR@ -+CUPS_API_MINOR = @CUPS_API_MINOR@ -+CUPS_CFLAGS = @CUPS_CFLAGS@ -+CUPS_CONFIG = @CUPS_CONFIG@ -+CUPS_LIBS = @CUPS_LIBS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DATADIRNAME = @DATADIRNAME@ -+DB2HTML = @DB2HTML@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ -+ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+GAIL_INET_LIBS = @GAIL_INET_LIBS@ -+GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ -+GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -+GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ -+GDK_DEP_LIBS = @GDK_DEP_LIBS@ -+GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ -+GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@ -+GDK_PACKAGES = @GDK_PACKAGES@ -+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ -+GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@ -+GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@ -+GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@ -+GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@ -+GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@ -+GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@ -+GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@ -+GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@ -+GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@ -+GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@ -+GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@ -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ -+GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ -+GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +diff -urN gtk+2.0-2.14.4.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.4/gdk/win32/rc/Makefile.in +--- gtk+2.0-2.14.4.old/gdk/win32/rc/Makefile.in 2008-10-17 01:07:16.000000000 -0300 ++++ gtk+2.0-2.14.4/gdk/win32/rc/Makefile.in 2008-11-04 15:37:07.000000000 -0200 +@@ -94,6 +94,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@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ -+GDK_WLIBS = @GDK_WLIBS@ -+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -+GLIB_CFLAGS = @GLIB_CFLAGS@ -+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -+GLIB_LIBS = @GLIB_LIBS@ -+GLIB_MKENUMS = @GLIB_MKENUMS@ -+GLIB_PREFIX = @GLIB_PREFIX@ -+GMOFILES = @GMOFILES@ -+GMSGFMT = @GMSGFMT@ -+GOBJECT_QUERY = @GOBJECT_QUERY@ -+GREP = @GREP@ -+GTKDOC_CHECK = @GTKDOC_CHECK@ -+GTK_API_VERSION = @GTK_API_VERSION@ -+GTK_BINARY_AGE = @GTK_BINARY_AGE@ -+GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -+GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ -+GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ -+GTK_DEP_LIBS = @GTK_DEP_LIBS@ -+GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ -+GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ -+GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -+GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@ -+GTK_MICRO_VERSION = @GTK_MICRO_VERSION@ -+GTK_MINOR_VERSION = @GTK_MINOR_VERSION@ -+GTK_PACKAGES = @GTK_PACKAGES@ -+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ -+GTK_VERSION = @GTK_VERSION@ -+GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ -+HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ -+HTML_DIR = @HTML_DIR@ -+INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ -+INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ -+INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ -+INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -+INDENT = @INDENT@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+INSTOBJEXT = @INSTOBJEXT@ -+INTLLIBS = @INTLLIBS@ -+LDFLAGS = @LDFLAGS@ -+LIBJASPER = @LIBJASPER@ -+LIBJPEG = @LIBJPEG@ -+LIBOBJS = @LIBOBJS@ -+LIBPNG = @LIBPNG@ -+LIBS = @LIBS@ -+LIBTIFF = @LIBTIFF@ -+LIBTOOL = @LIBTOOL@ -+LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ -+LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ -+LT_VERSION_INFO = @LT_VERSION_INFO@ -+MAINT = @MAINT@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+MKINSTALLDIRS = @MKINSTALLDIRS@ -+MSGFMT = @MSGFMT@ -+MSGFMT_OPTS = @MSGFMT_OPTS@ -+NM = @NM@ -+NMEDIT = @NMEDIT@ -+OBJDUMP = @OBJDUMP@ -+OBJEXT = @OBJEXT@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PANGO_PREFIX = @PANGO_PREFIX@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PERL = @PERL@ -+PKG_CONFIG = @PKG_CONFIG@ -+POFILES = @POFILES@ -+POSUB = @POSUB@ -+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -+RANLIB = @RANLIB@ -+REBUILD = @REBUILD@ -+REBUILD_PNGS = @REBUILD_PNGS@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+USE_NLS = @USE_NLS@ -+VERSION = @VERSION@ -+WINDRES = @WINDRES@ -+XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ -+XMLCATALOG = @XMLCATALOG@ -+XML_CATALOG_FILE = @XML_CATALOG_FILE@ -+XSLTPROC = @XSLTPROC@ -+X_CFLAGS = @X_CFLAGS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_LIBS = @X_LIBS@ -+X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+gdktarget = @gdktarget@ -+gdktargetlib = @gdktargetlib@ -+gtktargetlib = @gtktargetlib@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+ms_librarian = @ms_librarian@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ -+GTESTER = gtester # in $PATH for non-GLIB packages -+GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN gtk+2.0-2.14.4.old/gdk/x11/Makefile.in gtk+2.0-2.14.4/gdk/x11/Makefile.in +--- gtk+2.0-2.14.4.old/gdk/x11/Makefile.in 2008-10-17 01:07:16.000000000 -0300 ++++ gtk+2.0-2.14.4/gdk/x11/Makefile.in 2008-11-04 15:37:07.000000000 -0200 +@@ -96,6 +96,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@ +@@ -122,6 +124,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN gtk+2.0-2.14.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.4/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.14.4.old/gdk-pixbuf/Makefile.in 2008-10-17 01:07:15.000000000 -0300 ++++ gtk+2.0-2.14.4/gdk-pixbuf/Makefile.in 2008-11-04 15:37:06.000000000 -0200 +@@ -94,6 +94,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@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -442,6 +445,7 @@ --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE@STATIC_ICO_LIB = libstatic-pixbufloader-ico.la --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ICO_LIB = libpixbufloader-ico.la -+# initialize variables for unconditional += appending -+EXTRA_DIST = gdk-pixbuf-csource.1 makefile.msc gdk-pixbuf.symbols \ -+ makegdkpixbufalias.pl abicheck.sh pltcheck.sh gdk_pixbuf.def \ -+ gdk_pixbuf.rc gdk-pixbuf-marshal.c gdk-pixbuf-marshal.list \ -+ gdk-pixbuf-enum-types.c.template \ -+ gdk-pixbuf-enum-types.h.template gen-color-table.pl -+TEST_PROGS = --@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la --@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@JPEG_LIB = libpixbufloader-jpeg.la -+### testing rules - --@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la --@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@TIFF_LIB = libpixbufloader-tiff.la -+# Xvfb based test rules -+XVFB = Xvfb -screen 0 800x600x16 -+XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ -+ 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ -+ 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ -+ 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ -+ 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ -+ 9995 9996 9997 9998 9999 - -+SKIP_GDKTARGET = \ -+ test "$(gdktarget)" != "x11" \ -+ && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." - --# End of loaders not built if building GDI+ loader --@HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@STATIC_PNG_LIB = libstatic-pixbufloader-png.la --@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@PNG_LIB = libpixbufloader-png.la -+XVFB_START = \ -+ ${XVFB} -help 2>/dev/null 1>&2 \ -+ && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ -+ && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ -+ trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ -+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ -+ && DISPLAY=:$$XID && export DISPLAY - --@INCLUDE_WBMP_TRUE@STATIC_WBMP_LIB = libstatic-pixbufloader-wbmp.la --@INCLUDE_WBMP_FALSE@WBMP_LIB = libpixbufloader-wbmp.la -+SUBDIRS = pixops -+@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -+@OS_WIN32_TRUE@gdk_pixbuf_def = gdk_pixbuf.def -+@OS_WIN32_TRUE@gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def -+@OS_WIN32_TRUE@gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o -+@OS_WIN32_TRUE@gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o -+@OS_WIN32_TRUE@libole32 = -lole32 -+@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib -+@OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh -+lib_LTLIBRARIES = \ -+ libgdk_pixbuf-2.0.la - --@INCLUDE_ANI_TRUE@STATIC_ANI_LIB = libstatic-pixbufloader-ani.la --@INCLUDE_ANI_FALSE@ANI_LIB = libpixbufloader-ani.la -+loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders + loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders +loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d -+module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) --@INCLUDE_PNM_TRUE@STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la --@INCLUDE_PNM_FALSE@PNM_LIB = libpixbufloader-pnm.la -+# -+# The PNG loader -+# -+libstatic_pixbufloader_png_la_SOURCES = io-png.c -+libpixbufloader_png_la_SOURCES = io-png.c -+libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs) + module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) --@INCLUDE_RAS_TRUE@STATIC_RAS_LIB = libstatic-pixbufloader-ras.la --@INCLUDE_RAS_FALSE@RAS_LIB = libpixbufloader-ras.la -+# -+# The BMP loader -+# -+libstatic_pixbufloader_bmp_la_SOURCES = io-bmp.c -+libpixbufloader_bmp_la_SOURCES = io-bmp.c -+libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_bmp_la_LIBADD = $(module_libs) +@@ -841,7 +845,7 @@ + -DGDK_PIXBUF_ENABLE_BACKEND --@INCLUDE_XPM_TRUE@STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la --@INCLUDE_XPM_FALSE@XPM_LIB = libpixbufloader-xpm.la -+# -+# The WBMP loader -+# -+libstatic_pixbufloader_wbmp_la_SOURCES = io-wbmp.c -+libpixbufloader_wbmp_la_SOURCES = io-wbmp.c -+libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_wbmp_la_LIBADD = $(module_libs) - --@INCLUDE_XBM_TRUE@STATIC_XBM_LIB = libstatic-pixbufloader-xbm.la --@INCLUDE_XBM_FALSE@XBM_LIB = libpixbufloader-xbm.la -+# -+# The GIF loader -+# -+libstatic_pixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h -+libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h -+libpixbufloader_gif_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_gif_la_LIBADD = $(module_libs) - --@INCLUDE_TGA_TRUE@STATIC_TGA_LIB = libstatic-pixbufloader-tga.la --@INCLUDE_TGA_FALSE@TGA_LIB = libpixbufloader-tga.la -+# -+# The ICO loader -+# -+libstatic_pixbufloader_ico_la_SOURCES = io-ico.c -+libpixbufloader_ico_la_SOURCES = io-ico.c -+libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_ico_la_LIBADD = $(module_libs) - --@INCLUDE_PCX_TRUE@STATIC_PCX_LIB = libstatic-pixbufloader-pcx.la --@INCLUDE_PCX_FALSE@PCX_LIB = libpixbufloader-pcx.la -+# -+# The ANI loader -+# -+libstatic_pixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h -+libpixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h -+libpixbufloader_ani_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_ani_la_LIBADD = $(module_libs) - --@INCLUDE_ICNS_TRUE@STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la --@INCLUDE_ICNS_FALSE@ICNS_LIB = libpixbufloader-icns.la -+# -+# The JPEG loader -+# -+libstatic_pixbufloader_jpeg_la_SOURCES = io-jpeg.c -+libpixbufloader_jpeg_la_SOURCES = io-jpeg.c -+libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs) - --@HAVE_JASPER_TRUE@@INCLUDE_JASPER_TRUE@STATIC_JASPER_LIB = libstatic-pixbufloader-jasper.la --@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@JASPER_LIB = libpixbufloader-jasper.la -+# -+# The PNM loader -+# -+libstatic_pixbufloader_pnm_la_SOURCES = io-pnm.c -+libpixbufloader_pnm_la_SOURCES = io-pnm.c -+libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_pnm_la_LIBADD = $(module_libs) - --@BUILD_DYNAMIC_MODULES_TRUE@loader_LTLIBRARIES = \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(PNG_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(BMP_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(WBMP_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(GIF_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(ICO_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(ANI_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(JPEG_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(PNM_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(RAS_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(TIFF_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(XPM_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(XBM_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(TGA_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(ICNS_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(PCX_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(JASPER_LIB) \ --@BUILD_DYNAMIC_MODULES_TRUE@ $(GDIPLUS_LIBS) -+# -+# The RAS loader -+# -+libstatic_pixbufloader_ras_la_SOURCES = io-ras.c -+libpixbufloader_ras_la_SOURCES = io-ras.c -+libpixbufloader_ras_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_ras_la_LIBADD = $(module_libs) - -+# -+# The TIFF loader -+# -+libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c -+libpixbufloader_tiff_la_SOURCES = io-tiff.c -+libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs) - --noinst_LTLIBRARIES = \ -- $(STATIC_PNG_LIB) \ -- $(STATIC_BMP_LIB) \ -- $(STATIC_WBMP_LIB) \ -- $(STATIC_GIF_LIB) \ -- $(STATIC_ICO_LIB) \ -- $(STATIC_ANI_LIB) \ -- $(STATIC_JPEG_LIB) \ -- $(STATIC_PNM_LIB) \ -- $(STATIC_RAS_LIB) \ -- $(STATIC_TIFF_LIB) \ -- $(STATIC_XPM_LIB) \ -- $(STATIC_XBM_LIB) \ -- $(STATIC_TGA_LIB) \ -- $(STATIC_ICNS_LIB) \ -- $(STATIC_PCX_LIB) \ -- $(STATIC_JASPER_LIB) \ -- $(STATIC_GDIPLUS_LIBS) -+# -+# The XPM loader -+# -+libstatic_pixbufloader_xpm_la_SOURCES = io-xpm.c -+libpixbufloader_xpm_la_SOURCES = io-xpm.c -+libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_xpm_la_LIBADD = $(module_libs) - -+# -+# The XBM loader -+# -+libstatic_pixbufloader_xbm_la_SOURCES = io-xbm.c -+libpixbufloader_xbm_la_SOURCES = io-xbm.c -+libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_xbm_la_LIBADD = $(module_libs) - --builtin_objs = @INCLUDED_LOADER_OBJ@ -+# -+# The TGA loader -+# -+libstatic_pixbufloader_tga_la_SOURCES = io-tga.c -+libpixbufloader_tga_la_SOURCES = io-tga.c -+libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_tga_la_LIBADD = $(module_libs) - --DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la --INCLUDES = \ -- -DG_LOG_DOMAIN=\"GdkPixbuf\" \ -- -DGDK_PIXBUF_COMPILATION \ -- -I$(top_srcdir) -I$(top_builddir) \ -- -I$(top_srcdir)/gdk-pixbuf \ -- -I$(top_builddir)/gdk-pixbuf \ -- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -- -DGTK_VERSION=\"$(GTK_VERSION)\" \ -- -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ -- -DGTK_PREFIX=\"$(prefix)\" \ -- $(INCLUDED_LOADER_DEFINE) \ -- $(GTK_DEBUG_FLAGS) \ -- $(GDK_PIXBUF_DEP_CFLAGS) \ -- -DGDK_PIXBUF_ENABLE_BACKEND -+# -+# The .icns loader -+# -+libstatic_pixbufloader_icns_la_SOURCES = io-icns.c -+libpixbufloader_icns_la_SOURCES = io-icns.c -+libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_icns_la_LIBADD = $(module_libs) - -+# -+# The PCX loader -+# -+libstatic_pixbufloader_pcx_la_SOURCES = io-pcx.c -+libpixbufloader_pcx_la_SOURCES = io-pcx.c -+libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_pcx_la_LIBADD = $(module_libs) -AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" --LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) -+# -+# The JPEG2000 loader -+# -+libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c -+libpixbufloader_jasper_la_SOURCES = io-jasper.c -+libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined) -+libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs) - --noinst_PROGRAMS = test-gdk-pixbuf --test_gdk_pixbuf_LDADD = $(LDADDS) -+# When building the GDI+ loader statically, we put the "common" objects -+# only in one of the archives to avoid duplicate definitions -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@STATIC_GDIPLUS_LIBS = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-ico.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-wmf.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-emf.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-bmp.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-gif.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-jpeg.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-tiff.la - --bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders --gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c --gdk_pixbuf_csource_LDADD = $(LDADDS) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_ico_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-native.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-propertytags.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.c - --gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) --gdk_pixbuf_query_loaders_LDADD = $(LDADDS) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_wmf_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.c - --gdk_pixbuf_query_loaders_SOURCES = queryloaders.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_emf_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.c - --# --# The GdkPixBuf library --# --libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf --libgdk_pixbuf_2_0_la_SOURCES = \ -- gdk-pixbuf-i18n.h \ -- gdk-pixbuf.c \ -- gdk-pixbuf-animation.c \ -- gdk-pixbuf-data.c \ -- gdk-pixbuf-io.c \ -- gdk-pixbuf-loader.c \ -- gdk-pixbuf-scale.c \ -- gdk-pixbuf-simple-anim.c \ -- gdk-pixbuf-scaled-anim.c \ -- gdk-pixbuf-util.c \ -- gdk-pixdata.c \ -- gdk-pixbuf-enum-types.c -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_bmp_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.c - -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_gif_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.c - --libgdk_pixbuf_2_0_la_LDFLAGS = \ -- $(gdk_pixbuf_win32_res_ldflag) \ -- -version-info $(LT_VERSION_INFO) \ -- $(LIBTOOL_EXPORT_OPTIONS) \ -- $(no_undefined) \ -- $(gdk_pixbuf_symbols) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_jpeg_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.c - -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_png_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-png.c - --libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32) --libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_tiff_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.c - --gdk_pixbuf_headers = \ -- gdk-pixbuf.h \ -- gdk-pixbuf-core.h \ -- gdk-pixbuf-transform.h \ -- gdk-pixbuf-io.h \ -- gdk-pixbuf-animation.h \ -- gdk-pixbuf-simple-anim.h \ -- gdk-pixbuf-loader.h -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@GDIPLUS_LIBS = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-ico.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-wmf.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-emf.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-bmp.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-gif.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-jpeg.la \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-tiff.la - -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.c - --libgdk_pixbufinclude_HEADERS = \ -- $(gdk_pixbuf_headers) \ -- gdk-pixbuf-enum-types.h \ -- gdk-pixbuf-marshal.h \ -- gdk-pixbuf-features.h \ -- gdk-pixdata.h -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.c - -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.c - --noinst_HEADERS = \ -- gdk-pixbuf-alias.h \ -- gdk-pixbuf-private.h \ -- gdk-pixbuf-scaled-anim.h \ -- xpm-color-table.h -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.c - -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.c - --BUILT_SOURCES = \ -- gdk-pixbuf-alias.h \ -- gdk-pixbuf-aliasdef.c \ -- gdk-pixbuf-enum-types.h \ -- gdk-pixbuf-enum-types.c \ -- gdk-pixbuf-marshal.h \ -- gdk-pixbuf-marshal.c \ -- gdk-pixbuf-features.h -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.c - -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-png.c - --CLEANFILES = tmp-gdk-pixbuf-enum-types.h xgen-gmh xgen-gmc --MAINTAINERCLEANFILES = \ -- gdk-pixbuf-aliasdef.c \ -- gdk-pixbuf-enum-types.h \ -- gdk-pixbuf-enum-types.c \ -- gdk-pixbuf-marshal.h \ -- gdk-pixbuf-marshal.c \ -- gdk-pixbuf.loaders\ --s-enum-types-h stamp-gdk-pixbuf-marshal.h -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_SOURCES = \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.c - --@CROSS_COMPILING_TRUE@RUN_QUERY_LOADER_TEST = false --@CROSS_COMPILING_FALSE@RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)" --subdir = gdk-pixbuf --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h --LTLIBRARIES = $(lib_LTLIBRARIES) $(loader_LTLIBRARIES) \ -- $(noinst_LTLIBRARIES) -+@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32) - --am_libgdk_pixbuf_2_0_la_OBJECTS = gdk-pixbuf.lo gdk-pixbuf-animation.lo \ -- gdk-pixbuf-data.lo gdk-pixbuf-io.lo gdk-pixbuf-loader.lo \ -- gdk-pixbuf-scale.lo gdk-pixbuf-simple-anim.lo \ -- gdk-pixbuf-scaled-anim.lo gdk-pixbuf-util.lo gdk-pixdata.lo \ -- gdk-pixbuf-enum-types.lo --libgdk_pixbuf_2_0_la_OBJECTS = $(am_libgdk_pixbuf_2_0_la_OBJECTS) --libpixbufloader_ani_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo --libpixbufloader_ani_la_OBJECTS = $(am_libpixbufloader_ani_la_OBJECTS) --libpixbufloader_bmp_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_bmp_la_OBJECTS = io-bmp.lo --libpixbufloader_bmp_la_OBJECTS = $(am_libpixbufloader_bmp_la_OBJECTS) --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = --am__libpixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-native.h \ -- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -- io-gdip-animation.c io-gdip-animation.h io-gdip-bmp.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_bmp_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.lo --libpixbufloader_gdip_bmp_la_OBJECTS = \ -- $(am_libpixbufloader_gdip_bmp_la_OBJECTS) --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = --am__libpixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-native.h \ -- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -- io-gdip-animation.c io-gdip-animation.h io-gdip-emf.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_emf_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.lo --libpixbufloader_gdip_emf_la_OBJECTS = \ -- $(am_libpixbufloader_gdip_emf_la_OBJECTS) --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = --am__libpixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-native.h \ -- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -- io-gdip-animation.c io-gdip-animation.h io-gdip-gif.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_gif_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.lo --libpixbufloader_gdip_gif_la_OBJECTS = \ -- $(am_libpixbufloader_gdip_gif_la_OBJECTS) --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = --am__libpixbufloader_gdip_ico_la_SOURCES_DIST = io-gdip-native.h \ -- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -- io-gdip-animation.c io-gdip-animation.h io-gdip-ico.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_ico_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.lo --libpixbufloader_gdip_ico_la_OBJECTS = \ -- $(am_libpixbufloader_gdip_ico_la_OBJECTS) --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = --am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-native.h \ -- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -- io-gdip-animation.c io-gdip-animation.h io-gdip-jpeg.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_jpeg_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.lo --libpixbufloader_gdip_jpeg_la_OBJECTS = \ -- $(am_libpixbufloader_gdip_jpeg_la_OBJECTS) --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = --am__libpixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-native.h \ -- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -- io-gdip-animation.c io-gdip-animation.h io-gdip-tiff.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_tiff_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.lo --libpixbufloader_gdip_tiff_la_OBJECTS = \ -- $(am_libpixbufloader_gdip_tiff_la_OBJECTS) --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = --am__libpixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-native.h \ -- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -- io-gdip-animation.c io-gdip-animation.h io-gdip-wmf.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_wmf_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.lo --libpixbufloader_gdip_wmf_la_OBJECTS = \ -- $(am_libpixbufloader_gdip_wmf_la_OBJECTS) --libpixbufloader_gif_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo --libpixbufloader_gif_la_OBJECTS = $(am_libpixbufloader_gif_la_OBJECTS) --libpixbufloader_icns_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_icns_la_OBJECTS = io-icns.lo --libpixbufloader_icns_la_OBJECTS = $(am_libpixbufloader_icns_la_OBJECTS) --libpixbufloader_ico_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_ico_la_OBJECTS = io-ico.lo --libpixbufloader_ico_la_OBJECTS = $(am_libpixbufloader_ico_la_OBJECTS) --libpixbufloader_jasper_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo --libpixbufloader_jasper_la_OBJECTS = \ -- $(am_libpixbufloader_jasper_la_OBJECTS) --libpixbufloader_jpeg_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_jpeg_la_OBJECTS = io-jpeg.lo --libpixbufloader_jpeg_la_OBJECTS = $(am_libpixbufloader_jpeg_la_OBJECTS) --libpixbufloader_pcx_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_pcx_la_OBJECTS = io-pcx.lo --libpixbufloader_pcx_la_OBJECTS = $(am_libpixbufloader_pcx_la_OBJECTS) --libpixbufloader_png_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_png_la_OBJECTS = io-png.lo --libpixbufloader_png_la_OBJECTS = $(am_libpixbufloader_png_la_OBJECTS) --libpixbufloader_pnm_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_pnm_la_OBJECTS = io-pnm.lo --libpixbufloader_pnm_la_OBJECTS = $(am_libpixbufloader_pnm_la_OBJECTS) --libpixbufloader_ras_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_ras_la_OBJECTS = io-ras.lo --libpixbufloader_ras_la_OBJECTS = $(am_libpixbufloader_ras_la_OBJECTS) --libpixbufloader_tga_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_tga_la_OBJECTS = io-tga.lo --libpixbufloader_tga_la_OBJECTS = $(am_libpixbufloader_tga_la_OBJECTS) --libpixbufloader_tiff_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_tiff_la_OBJECTS = io-tiff.lo --libpixbufloader_tiff_la_OBJECTS = $(am_libpixbufloader_tiff_la_OBJECTS) --libpixbufloader_wbmp_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_wbmp_la_OBJECTS = io-wbmp.lo --libpixbufloader_wbmp_la_OBJECTS = $(am_libpixbufloader_wbmp_la_OBJECTS) --libpixbufloader_xbm_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_xbm_la_OBJECTS = io-xbm.lo --libpixbufloader_xbm_la_OBJECTS = $(am_libpixbufloader_xbm_la_OBJECTS) --libpixbufloader_xpm_la_DEPENDENCIES = \ -- libgdk_pixbuf-$(GTK_API_VERSION).la --am_libpixbufloader_xpm_la_OBJECTS = io-xpm.lo --libpixbufloader_xpm_la_OBJECTS = $(am_libpixbufloader_xpm_la_OBJECTS) --libstatic_pixbufloader_ani_la_LDFLAGS = --libstatic_pixbufloader_ani_la_LIBADD = --am_libstatic_pixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo --libstatic_pixbufloader_ani_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_ani_la_OBJECTS) --libstatic_pixbufloader_bmp_la_LDFLAGS = --libstatic_pixbufloader_bmp_la_LIBADD = --am_libstatic_pixbufloader_bmp_la_OBJECTS = io-bmp.lo --libstatic_pixbufloader_bmp_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_bmp_la_OBJECTS) --libstatic_pixbufloader_gdip_bmp_la_LDFLAGS = --libstatic_pixbufloader_gdip_bmp_la_LIBADD = --am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-bmp.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.lo --libstatic_pixbufloader_gdip_bmp_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS) --libstatic_pixbufloader_gdip_emf_la_LDFLAGS = --libstatic_pixbufloader_gdip_emf_la_LIBADD = --am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-emf.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_emf_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.lo --libstatic_pixbufloader_gdip_emf_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_gdip_emf_la_OBJECTS) --libstatic_pixbufloader_gdip_gif_la_LDFLAGS = --libstatic_pixbufloader_gdip_gif_la_LIBADD = --am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-gif.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_gif_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.lo --libstatic_pixbufloader_gdip_gif_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_gdip_gif_la_OBJECTS) --libstatic_pixbufloader_gdip_ico_la_LDFLAGS = --libstatic_pixbufloader_gdip_ico_la_LIBADD = --am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST = io-gdip-native.h \ -- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ -- io-gdip-animation.c io-gdip-animation.h io-gdip-ico.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_ico_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.lo \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.lo --libstatic_pixbufloader_gdip_ico_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_gdip_ico_la_OBJECTS) --libstatic_pixbufloader_gdip_jpeg_la_LDFLAGS = --libstatic_pixbufloader_gdip_jpeg_la_LIBADD = --am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-jpeg.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.lo --libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) --libstatic_pixbufloader_gdip_tiff_la_LDFLAGS = --libstatic_pixbufloader_gdip_tiff_la_LIBADD = --am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-tiff.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.lo --libstatic_pixbufloader_gdip_tiff_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS) --libstatic_pixbufloader_gdip_wmf_la_LDFLAGS = --libstatic_pixbufloader_gdip_wmf_la_LIBADD = --am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-wmf.c --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS = \ --@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.lo --libstatic_pixbufloader_gdip_wmf_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS) --libstatic_pixbufloader_gif_la_LDFLAGS = --libstatic_pixbufloader_gif_la_LIBADD = --am_libstatic_pixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo --libstatic_pixbufloader_gif_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_gif_la_OBJECTS) --libstatic_pixbufloader_icns_la_LDFLAGS = --libstatic_pixbufloader_icns_la_LIBADD = --am_libstatic_pixbufloader_icns_la_OBJECTS = io-icns.lo --libstatic_pixbufloader_icns_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_icns_la_OBJECTS) --libstatic_pixbufloader_ico_la_LDFLAGS = --libstatic_pixbufloader_ico_la_LIBADD = --am_libstatic_pixbufloader_ico_la_OBJECTS = io-ico.lo --libstatic_pixbufloader_ico_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_ico_la_OBJECTS) --libstatic_pixbufloader_jasper_la_LDFLAGS = --libstatic_pixbufloader_jasper_la_LIBADD = --am_libstatic_pixbufloader_jasper_la_OBJECTS = io-jasper.lo --libstatic_pixbufloader_jasper_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_jasper_la_OBJECTS) --libstatic_pixbufloader_jpeg_la_LDFLAGS = --libstatic_pixbufloader_jpeg_la_LIBADD = --am_libstatic_pixbufloader_jpeg_la_OBJECTS = io-jpeg.lo --libstatic_pixbufloader_jpeg_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_jpeg_la_OBJECTS) --libstatic_pixbufloader_pcx_la_LDFLAGS = --libstatic_pixbufloader_pcx_la_LIBADD = --am_libstatic_pixbufloader_pcx_la_OBJECTS = io-pcx.lo --libstatic_pixbufloader_pcx_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_pcx_la_OBJECTS) --libstatic_pixbufloader_png_la_LDFLAGS = --libstatic_pixbufloader_png_la_LIBADD = --am_libstatic_pixbufloader_png_la_OBJECTS = io-png.lo --libstatic_pixbufloader_png_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_png_la_OBJECTS) --libstatic_pixbufloader_pnm_la_LDFLAGS = --libstatic_pixbufloader_pnm_la_LIBADD = --am_libstatic_pixbufloader_pnm_la_OBJECTS = io-pnm.lo --libstatic_pixbufloader_pnm_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_pnm_la_OBJECTS) --libstatic_pixbufloader_ras_la_LDFLAGS = --libstatic_pixbufloader_ras_la_LIBADD = --am_libstatic_pixbufloader_ras_la_OBJECTS = io-ras.lo --libstatic_pixbufloader_ras_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_ras_la_OBJECTS) --libstatic_pixbufloader_tga_la_LDFLAGS = --libstatic_pixbufloader_tga_la_LIBADD = --am_libstatic_pixbufloader_tga_la_OBJECTS = io-tga.lo --libstatic_pixbufloader_tga_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_tga_la_OBJECTS) --libstatic_pixbufloader_tiff_la_LDFLAGS = --libstatic_pixbufloader_tiff_la_LIBADD = --am_libstatic_pixbufloader_tiff_la_OBJECTS = io-tiff.lo --libstatic_pixbufloader_tiff_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_tiff_la_OBJECTS) --libstatic_pixbufloader_wbmp_la_LDFLAGS = --libstatic_pixbufloader_wbmp_la_LIBADD = --am_libstatic_pixbufloader_wbmp_la_OBJECTS = io-wbmp.lo --libstatic_pixbufloader_wbmp_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_wbmp_la_OBJECTS) --libstatic_pixbufloader_xbm_la_LDFLAGS = --libstatic_pixbufloader_xbm_la_LIBADD = --am_libstatic_pixbufloader_xbm_la_OBJECTS = io-xbm.lo --libstatic_pixbufloader_xbm_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_xbm_la_OBJECTS) --libstatic_pixbufloader_xpm_la_LDFLAGS = --libstatic_pixbufloader_xpm_la_LIBADD = --am_libstatic_pixbufloader_xpm_la_OBJECTS = io-xpm.lo --libstatic_pixbufloader_xpm_la_OBJECTS = \ -- $(am_libstatic_pixbufloader_xpm_la_OBJECTS) --bin_PROGRAMS = gdk-pixbuf-csource$(EXEEXT) \ -- gdk-pixbuf-query-loaders$(EXEEXT) --noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) --PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -+# Loaders that aren't built if we build the GDI+ loader -+@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE@STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la -+@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@BMP_LIB = libpixbufloader-bmp.la -+@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE@STATIC_GIF_LIB = libstatic-pixbufloader-gif.la -+@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@GIF_LIB = libpixbufloader-gif.la -+@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE@STATIC_ICO_LIB = libstatic-pixbufloader-ico.la -+@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ICO_LIB = libpixbufloader-ico.la -+@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la -+@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@JPEG_LIB = libpixbufloader-jpeg.la -+@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la -+@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@TIFF_LIB = libpixbufloader-tiff.la - --am_gdk_pixbuf_csource_OBJECTS = gdk-pixbuf-csource.$(OBJEXT) --gdk_pixbuf_csource_OBJECTS = $(am_gdk_pixbuf_csource_OBJECTS) --gdk_pixbuf_csource_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la --gdk_pixbuf_csource_LDFLAGS = --am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT) --gdk_pixbuf_query_loaders_OBJECTS = \ -- $(am_gdk_pixbuf_query_loaders_OBJECTS) --gdk_pixbuf_query_loaders_LDFLAGS = --test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c --test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT) --test_gdk_pixbuf_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la --test_gdk_pixbuf_LDFLAGS = -+# End of loaders not built if building GDI+ loader -+@HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@STATIC_PNG_LIB = libstatic-pixbufloader-png.la -+@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@PNG_LIB = libpixbufloader-png.la -+@INCLUDE_WBMP_TRUE@STATIC_WBMP_LIB = libstatic-pixbufloader-wbmp.la -+@INCLUDE_WBMP_FALSE@WBMP_LIB = libpixbufloader-wbmp.la -+@INCLUDE_ANI_TRUE@STATIC_ANI_LIB = libstatic-pixbufloader-ani.la -+@INCLUDE_ANI_FALSE@ANI_LIB = libpixbufloader-ani.la -+@INCLUDE_PNM_TRUE@STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la -+@INCLUDE_PNM_FALSE@PNM_LIB = libpixbufloader-pnm.la -+@INCLUDE_RAS_TRUE@STATIC_RAS_LIB = libstatic-pixbufloader-ras.la -+@INCLUDE_RAS_FALSE@RAS_LIB = libpixbufloader-ras.la -+@INCLUDE_XPM_TRUE@STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la -+@INCLUDE_XPM_FALSE@XPM_LIB = libpixbufloader-xpm.la -+@INCLUDE_XBM_TRUE@STATIC_XBM_LIB = libstatic-pixbufloader-xbm.la -+@INCLUDE_XBM_FALSE@XBM_LIB = libpixbufloader-xbm.la -+@INCLUDE_TGA_TRUE@STATIC_TGA_LIB = libstatic-pixbufloader-tga.la -+@INCLUDE_TGA_FALSE@TGA_LIB = libpixbufloader-tga.la -+@INCLUDE_PCX_TRUE@STATIC_PCX_LIB = libstatic-pixbufloader-pcx.la -+@INCLUDE_PCX_FALSE@PCX_LIB = libpixbufloader-pcx.la -+@INCLUDE_ICNS_TRUE@STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la -+@INCLUDE_ICNS_FALSE@ICNS_LIB = libpixbufloader-icns.la -+@HAVE_JASPER_TRUE@@INCLUDE_JASPER_TRUE@STATIC_JASPER_LIB = libstatic-pixbufloader-jasper.la -+@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@JASPER_LIB = libpixbufloader-jasper.la -+@BUILD_DYNAMIC_MODULES_TRUE@loader_LTLIBRARIES = \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(PNG_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(BMP_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(WBMP_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(GIF_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(ICO_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(ANI_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(JPEG_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(PNM_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(RAS_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(TIFF_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(XPM_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(XBM_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(TGA_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(ICNS_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(PCX_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(JASPER_LIB) \ -+@BUILD_DYNAMIC_MODULES_TRUE@ $(GDIPLUS_LIBS) - --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk-pixbuf-animation.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-csource.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-data.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-enum-types.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-io.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-loader.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-scale.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-scaled-anim.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-simple-anim.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-util.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixdata.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-ani-animation.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-ani.Plo ./$(DEPDIR)/io-bmp.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-animation.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-bmp.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-emf.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-gif.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-ico.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-jpeg.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-tiff.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-utils.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-wmf.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gif-animation.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-gif.Plo ./$(DEPDIR)/io-icns.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-ico.Plo ./$(DEPDIR)/io-jasper.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-jpeg.Plo ./$(DEPDIR)/io-pcx.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-png.Plo ./$(DEPDIR)/io-pnm.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-ras.Plo ./$(DEPDIR)/io-tga.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-tiff.Plo ./$(DEPDIR)/io-wbmp.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/io-xbm.Plo ./$(DEPDIR)/io-xpm.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/queryloaders.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/test-gdk-pixbuf.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ -- $(libpixbufloader_ani_la_SOURCES) \ -- $(libpixbufloader_bmp_la_SOURCES) \ -- $(am__libpixbufloader_gdip_bmp_la_SOURCES_DIST) \ -- $(am__libpixbufloader_gdip_emf_la_SOURCES_DIST) \ -- $(am__libpixbufloader_gdip_gif_la_SOURCES_DIST) \ -- $(am__libpixbufloader_gdip_ico_la_SOURCES_DIST) \ -- $(am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST) \ -- $(am__libpixbufloader_gdip_tiff_la_SOURCES_DIST) \ -- $(am__libpixbufloader_gdip_wmf_la_SOURCES_DIST) \ -- $(libpixbufloader_gif_la_SOURCES) \ -- $(libpixbufloader_icns_la_SOURCES) \ -- $(libpixbufloader_ico_la_SOURCES) \ -- $(libpixbufloader_jasper_la_SOURCES) \ -- $(libpixbufloader_jpeg_la_SOURCES) \ -- $(libpixbufloader_pcx_la_SOURCES) \ -- $(libpixbufloader_png_la_SOURCES) \ -- $(libpixbufloader_pnm_la_SOURCES) \ -- $(libpixbufloader_ras_la_SOURCES) \ -- $(libpixbufloader_tga_la_SOURCES) \ -- $(libpixbufloader_tiff_la_SOURCES) \ -- $(libpixbufloader_wbmp_la_SOURCES) \ -- $(libpixbufloader_xbm_la_SOURCES) \ -- $(libpixbufloader_xpm_la_SOURCES) \ -- $(libstatic_pixbufloader_ani_la_SOURCES) \ -- $(libstatic_pixbufloader_bmp_la_SOURCES) \ -- $(am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST) \ -- $(am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST) \ -- $(am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST) \ -- $(am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST) \ -- $(am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST) \ -- $(am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST) \ -- $(am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST) \ -- $(libstatic_pixbufloader_gif_la_SOURCES) \ -- $(libstatic_pixbufloader_icns_la_SOURCES) \ -- $(libstatic_pixbufloader_ico_la_SOURCES) \ -- $(libstatic_pixbufloader_jasper_la_SOURCES) \ -- $(libstatic_pixbufloader_jpeg_la_SOURCES) \ -- $(libstatic_pixbufloader_pcx_la_SOURCES) \ -- $(libstatic_pixbufloader_png_la_SOURCES) \ -- $(libstatic_pixbufloader_pnm_la_SOURCES) \ -- $(libstatic_pixbufloader_ras_la_SOURCES) \ -- $(libstatic_pixbufloader_tga_la_SOURCES) \ -- $(libstatic_pixbufloader_tiff_la_SOURCES) \ -- $(libstatic_pixbufloader_wbmp_la_SOURCES) \ -- $(libstatic_pixbufloader_xbm_la_SOURCES) \ -- $(libstatic_pixbufloader_xpm_la_SOURCES) \ -- $(gdk_pixbuf_csource_SOURCES) \ -- $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c --DATA = $(noinst_DATA) -+noinst_LTLIBRARIES = \ -+ $(STATIC_PNG_LIB) \ -+ $(STATIC_BMP_LIB) \ -+ $(STATIC_WBMP_LIB) \ -+ $(STATIC_GIF_LIB) \ -+ $(STATIC_ICO_LIB) \ -+ $(STATIC_ANI_LIB) \ -+ $(STATIC_JPEG_LIB) \ -+ $(STATIC_PNM_LIB) \ -+ $(STATIC_RAS_LIB) \ -+ $(STATIC_TIFF_LIB) \ -+ $(STATIC_XPM_LIB) \ -+ $(STATIC_XBM_LIB) \ -+ $(STATIC_TGA_LIB) \ -+ $(STATIC_ICNS_LIB) \ -+ $(STATIC_PCX_LIB) \ -+ $(STATIC_JASPER_LIB) \ -+ $(STATIC_GDIPLUS_LIBS) - --HEADERS = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) -+builtin_objs = @INCLUDED_LOADER_OBJ@ -+DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la -+INCLUDES = \ -+ -DG_LOG_DOMAIN=\"GdkPixbuf\" \ -+ -DGDK_PIXBUF_COMPILATION \ -+ -I$(top_srcdir) -I$(top_builddir) \ -+ -I$(top_srcdir)/gdk-pixbuf \ -+ -I$(top_builddir)/gdk-pixbuf \ -+ -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DGTK_VERSION=\"$(GTK_VERSION)\" \ -+ -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ -+ -DGTK_PREFIX=\"$(prefix)\" \ -+ $(INCLUDED_LOADER_DEFINE) \ -+ $(GTK_DEBUG_FLAGS) \ -+ $(GDK_PIXBUF_DEP_CFLAGS) \ -+ -DGDK_PIXBUF_ENABLE_BACKEND - +AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" -+LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) -+test_gdk_pixbuf_LDADD = $(LDADDS) -+gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c -+gdk_pixbuf_csource_LDADD = $(LDADDS) -+gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) -+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) -+gdk_pixbuf_query_loaders_SOURCES = queryloaders.c + LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) \ -- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog \ -- Makefile.am gdk-pixbuf-features.h.in gdk_pixbuf.rc.in --DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) $(libpixbufloader_ani_la_SOURCES) $(libpixbufloader_bmp_la_SOURCES) $(libpixbufloader_gdip_bmp_la_SOURCES) $(libpixbufloader_gdip_emf_la_SOURCES) $(libpixbufloader_gdip_gif_la_SOURCES) $(libpixbufloader_gdip_ico_la_SOURCES) $(libpixbufloader_gdip_jpeg_la_SOURCES) $(libpixbufloader_gdip_tiff_la_SOURCES) $(libpixbufloader_gdip_wmf_la_SOURCES) $(libpixbufloader_gif_la_SOURCES) $(libpixbufloader_icns_la_SOURCES) $(libpixbufloader_ico_la_SOURCES) $(libpixbufloader_jasper_la_SOURCES) $(libpixbufloader_jpeg_la_SOURCES) $(libpixbufloader_pcx_la_SOURCES) $(libpixbufloader_png_la_SOURCES) $(libpixbufloader_pnm_la_SOURCES) $(libpixbufloader_ras_la_SOURCES) $(libpixbufloader_tga_la_SOURCES) $(libpixbufloader_tiff_la_SOURCES) $(libpixbufloader_wbmp_la_SOURCES) $(libpixbufloader_xbm_la_SOURCES) $(libpixbufloader_xpm_la_SOURCES) $(libstatic_pixbufloader_ani_la_SOURCES) $(libstatic_pixbufloader_bmp_la_SOURCES) $(libstatic_pixbufloader_gdip_bmp_la_SOURCES) $(libstatic_pixbufloader_gdip_emf_la_SOURCES) $(libstatic_pixbufloader_gdip_gif_la_SOURCES) $(libstatic_pixbufloader_gdip_ico_la_SOURCES) $(libstatic_pixbufloader_gdip_jpeg_la_SOURCES) $(libstatic_pixbufloader_gdip_tiff_la_SOURCES) $(libstatic_pixbufloader_gdip_wmf_la_SOURCES) $(libstatic_pixbufloader_gif_la_SOURCES) $(libstatic_pixbufloader_icns_la_SOURCES) $(libstatic_pixbufloader_ico_la_SOURCES) $(libstatic_pixbufloader_jasper_la_SOURCES) $(libstatic_pixbufloader_jpeg_la_SOURCES) $(libstatic_pixbufloader_pcx_la_SOURCES) $(libstatic_pixbufloader_png_la_SOURCES) $(libstatic_pixbufloader_pnm_la_SOURCES) $(libstatic_pixbufloader_ras_la_SOURCES) $(libstatic_pixbufloader_tga_la_SOURCES) $(libstatic_pixbufloader_tiff_la_SOURCES) $(libstatic_pixbufloader_wbmp_la_SOURCES) $(libstatic_pixbufloader_xbm_la_SOURCES) $(libstatic_pixbufloader_xpm_la_SOURCES) $(gdk_pixbuf_csource_SOURCES) $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c -+# -+# The GdkPixBuf library -+# -+libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf -+libgdk_pixbuf_2_0_la_SOURCES = \ -+ gdk-pixbuf-i18n.h \ -+ gdk-pixbuf.c \ -+ gdk-pixbuf-animation.c \ -+ gdk-pixbuf-data.c \ -+ gdk-pixbuf-io.c \ -+ gdk-pixbuf-loader.c \ -+ gdk-pixbuf-scale.c \ -+ gdk-pixbuf-simple-anim.c \ -+ gdk-pixbuf-scaled-anim.c \ -+ gdk-pixbuf-util.c \ -+ gdk-pixdata.c \ -+ gdk-pixbuf-enum-types.c -+ -+libgdk_pixbuf_2_0_la_LDFLAGS = \ -+ $(gdk_pixbuf_win32_res_ldflag) \ -+ -version-info $(LT_VERSION_INFO) \ -+ $(LIBTOOL_EXPORT_OPTIONS) \ -+ $(no_undefined) \ -+ $(gdk_pixbuf_symbols) -+ -+libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32) -+libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) -+gdk_pixbuf_headers = \ -+ gdk-pixbuf.h \ -+ gdk-pixbuf-core.h \ -+ gdk-pixbuf-transform.h \ -+ gdk-pixbuf-io.h \ -+ gdk-pixbuf-animation.h \ -+ gdk-pixbuf-simple-anim.h \ -+ gdk-pixbuf-loader.h -+ -+libgdk_pixbufinclude_HEADERS = \ -+ $(gdk_pixbuf_headers) \ -+ gdk-pixbuf-enum-types.h \ -+ gdk-pixbuf-marshal.h \ -+ gdk-pixbuf-features.h \ -+ gdk-pixdata.h -+ -+noinst_HEADERS = \ -+ gdk-pixbuf-alias.h \ -+ gdk-pixbuf-private.h \ -+ gdk-pixbuf-scaled-anim.h \ -+ xpm-color-table.h -+ -+BUILT_SOURCES = \ -+ gdk-pixbuf-alias.h \ -+ gdk-pixbuf-aliasdef.c \ -+ gdk-pixbuf-enum-types.h \ -+ gdk-pixbuf-enum-types.c \ -+ gdk-pixbuf-marshal.h \ -+ gdk-pixbuf-marshal.c \ -+ gdk-pixbuf-features.h - -+CLEANFILES = tmp-gdk-pixbuf-enum-types.h xgen-gmh xgen-gmc -+MAINTAINERCLEANFILES = gdk-pixbuf-aliasdef.c gdk-pixbuf-enum-types.h \ -+ gdk-pixbuf-enum-types.c gdk-pixbuf-marshal.h \ -+ gdk-pixbuf-marshal.c gdk-pixbuf.loaders s-enum-types-h \ -+ stamp-gdk-pixbuf-marshal.h -+@CROSS_COMPILING_FALSE@RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)" -+@CROSS_COMPILING_TRUE@RUN_QUERY_LOADER_TEST = false - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk-pixbuf/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gdk-pixbuf/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --gdk_pixbuf.rc: $(top_builddir)/config.status gdk_pixbuf.rc.in -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+gdk_pixbuf.rc: $(top_builddir)/config.status $(srcdir)/gdk_pixbuf.rc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --gdk-pixbuf-features.h: $(top_builddir)/config.status gdk-pixbuf-features.h.in -+gdk-pixbuf-features.h: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-features.h.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --libLTLIBRARIES_INSTALL = $(INSTALL) - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libdir) -+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - - uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done --loaderLTLIBRARIES_INSTALL = $(INSTALL) - install-loaderLTLIBRARIES: $(loader_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(loaderdir) -+ test -z "$(loaderdir)" || $(MKDIR_P) "$(DESTDIR)$(loaderdir)" - @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(loaderdir)/$$f"; \ -- $(LIBTOOL) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(loaderdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(loaderdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(loaderdir)/$$f"; \ - else :; fi; \ - done - - uninstall-loaderLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(loaderdir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(loaderdir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(loaderdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(loaderdir)/$$p"; \ - done - - clean-loaderLTLIBRARIES: - -test -z "$(loader_LTLIBRARIES)" || rm -f $(loader_LTLIBRARIES) - @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -@@ -1479,116 +1404,115 @@ - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgdk_pixbuf-2.0.la: $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgdk_pixbuf_2_0_la_LDFLAGS) $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_LIBADD) $(LIBS) -+ $(libgdk_pixbuf_2_0_la_LINK) -rpath $(libdir) $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_LIBADD) $(LIBS) - libpixbufloader-ani.la: $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ani_la_LDFLAGS) $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_LIBADD) $(LIBS) -+ $(libpixbufloader_ani_la_LINK) $(am_libpixbufloader_ani_la_rpath) $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_LIBADD) $(LIBS) - libpixbufloader-bmp.la: $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_bmp_la_LDFLAGS) $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_LIBADD) $(LIBS) -+ $(libpixbufloader_bmp_la_LINK) $(am_libpixbufloader_bmp_la_rpath) $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_LIBADD) $(LIBS) - libpixbufloader-gdip-bmp.la: $(libpixbufloader_gdip_bmp_la_OBJECTS) $(libpixbufloader_gdip_bmp_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_bmp_la_LDFLAGS) $(libpixbufloader_gdip_bmp_la_OBJECTS) $(libpixbufloader_gdip_bmp_la_LIBADD) $(LIBS) -+ $(libpixbufloader_gdip_bmp_la_LINK) $(am_libpixbufloader_gdip_bmp_la_rpath) $(libpixbufloader_gdip_bmp_la_OBJECTS) $(libpixbufloader_gdip_bmp_la_LIBADD) $(LIBS) - libpixbufloader-gdip-emf.la: $(libpixbufloader_gdip_emf_la_OBJECTS) $(libpixbufloader_gdip_emf_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_emf_la_LDFLAGS) $(libpixbufloader_gdip_emf_la_OBJECTS) $(libpixbufloader_gdip_emf_la_LIBADD) $(LIBS) -+ $(libpixbufloader_gdip_emf_la_LINK) $(am_libpixbufloader_gdip_emf_la_rpath) $(libpixbufloader_gdip_emf_la_OBJECTS) $(libpixbufloader_gdip_emf_la_LIBADD) $(LIBS) - libpixbufloader-gdip-gif.la: $(libpixbufloader_gdip_gif_la_OBJECTS) $(libpixbufloader_gdip_gif_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_gif_la_LDFLAGS) $(libpixbufloader_gdip_gif_la_OBJECTS) $(libpixbufloader_gdip_gif_la_LIBADD) $(LIBS) -+ $(libpixbufloader_gdip_gif_la_LINK) $(am_libpixbufloader_gdip_gif_la_rpath) $(libpixbufloader_gdip_gif_la_OBJECTS) $(libpixbufloader_gdip_gif_la_LIBADD) $(LIBS) - libpixbufloader-gdip-ico.la: $(libpixbufloader_gdip_ico_la_OBJECTS) $(libpixbufloader_gdip_ico_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_ico_la_LDFLAGS) $(libpixbufloader_gdip_ico_la_OBJECTS) $(libpixbufloader_gdip_ico_la_LIBADD) $(LIBS) -+ $(libpixbufloader_gdip_ico_la_LINK) $(am_libpixbufloader_gdip_ico_la_rpath) $(libpixbufloader_gdip_ico_la_OBJECTS) $(libpixbufloader_gdip_ico_la_LIBADD) $(LIBS) - libpixbufloader-gdip-jpeg.la: $(libpixbufloader_gdip_jpeg_la_OBJECTS) $(libpixbufloader_gdip_jpeg_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_jpeg_la_LDFLAGS) $(libpixbufloader_gdip_jpeg_la_OBJECTS) $(libpixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) -+ $(libpixbufloader_gdip_jpeg_la_LINK) $(am_libpixbufloader_gdip_jpeg_la_rpath) $(libpixbufloader_gdip_jpeg_la_OBJECTS) $(libpixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) - libpixbufloader-gdip-tiff.la: $(libpixbufloader_gdip_tiff_la_OBJECTS) $(libpixbufloader_gdip_tiff_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_tiff_la_LDFLAGS) $(libpixbufloader_gdip_tiff_la_OBJECTS) $(libpixbufloader_gdip_tiff_la_LIBADD) $(LIBS) -+ $(libpixbufloader_gdip_tiff_la_LINK) $(am_libpixbufloader_gdip_tiff_la_rpath) $(libpixbufloader_gdip_tiff_la_OBJECTS) $(libpixbufloader_gdip_tiff_la_LIBADD) $(LIBS) - libpixbufloader-gdip-wmf.la: $(libpixbufloader_gdip_wmf_la_OBJECTS) $(libpixbufloader_gdip_wmf_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_wmf_la_LDFLAGS) $(libpixbufloader_gdip_wmf_la_OBJECTS) $(libpixbufloader_gdip_wmf_la_LIBADD) $(LIBS) -+ $(libpixbufloader_gdip_wmf_la_LINK) $(am_libpixbufloader_gdip_wmf_la_rpath) $(libpixbufloader_gdip_wmf_la_OBJECTS) $(libpixbufloader_gdip_wmf_la_LIBADD) $(LIBS) - libpixbufloader-gif.la: $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gif_la_LDFLAGS) $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_LIBADD) $(LIBS) -+ $(libpixbufloader_gif_la_LINK) $(am_libpixbufloader_gif_la_rpath) $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_LIBADD) $(LIBS) - libpixbufloader-icns.la: $(libpixbufloader_icns_la_OBJECTS) $(libpixbufloader_icns_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_icns_la_LDFLAGS) $(libpixbufloader_icns_la_OBJECTS) $(libpixbufloader_icns_la_LIBADD) $(LIBS) -+ $(libpixbufloader_icns_la_LINK) $(am_libpixbufloader_icns_la_rpath) $(libpixbufloader_icns_la_OBJECTS) $(libpixbufloader_icns_la_LIBADD) $(LIBS) - libpixbufloader-ico.la: $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ico_la_LDFLAGS) $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_LIBADD) $(LIBS) -+ $(libpixbufloader_ico_la_LINK) $(am_libpixbufloader_ico_la_rpath) $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_LIBADD) $(LIBS) - libpixbufloader-jasper.la: $(libpixbufloader_jasper_la_OBJECTS) $(libpixbufloader_jasper_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_jasper_la_LDFLAGS) $(libpixbufloader_jasper_la_OBJECTS) $(libpixbufloader_jasper_la_LIBADD) $(LIBS) -+ $(libpixbufloader_jasper_la_LINK) $(am_libpixbufloader_jasper_la_rpath) $(libpixbufloader_jasper_la_OBJECTS) $(libpixbufloader_jasper_la_LIBADD) $(LIBS) - libpixbufloader-jpeg.la: $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_jpeg_la_LDFLAGS) $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_LIBADD) $(LIBS) -+ $(libpixbufloader_jpeg_la_LINK) $(am_libpixbufloader_jpeg_la_rpath) $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_LIBADD) $(LIBS) - libpixbufloader-pcx.la: $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_pcx_la_LDFLAGS) $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_LIBADD) $(LIBS) -+ $(libpixbufloader_pcx_la_LINK) $(am_libpixbufloader_pcx_la_rpath) $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_LIBADD) $(LIBS) - libpixbufloader-png.la: $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_png_la_LDFLAGS) $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_LIBADD) $(LIBS) -+ $(libpixbufloader_png_la_LINK) $(am_libpixbufloader_png_la_rpath) $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_LIBADD) $(LIBS) - libpixbufloader-pnm.la: $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_pnm_la_LDFLAGS) $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_LIBADD) $(LIBS) -+ $(libpixbufloader_pnm_la_LINK) $(am_libpixbufloader_pnm_la_rpath) $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_LIBADD) $(LIBS) - libpixbufloader-ras.la: $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ras_la_LDFLAGS) $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_LIBADD) $(LIBS) -+ $(libpixbufloader_ras_la_LINK) $(am_libpixbufloader_ras_la_rpath) $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_LIBADD) $(LIBS) - libpixbufloader-tga.la: $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_tga_la_LDFLAGS) $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_LIBADD) $(LIBS) -+ $(libpixbufloader_tga_la_LINK) $(am_libpixbufloader_tga_la_rpath) $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_LIBADD) $(LIBS) - libpixbufloader-tiff.la: $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_tiff_la_LDFLAGS) $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_LIBADD) $(LIBS) -+ $(libpixbufloader_tiff_la_LINK) $(am_libpixbufloader_tiff_la_rpath) $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_LIBADD) $(LIBS) - libpixbufloader-wbmp.la: $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_wbmp_la_LDFLAGS) $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_LIBADD) $(LIBS) -+ $(libpixbufloader_wbmp_la_LINK) $(am_libpixbufloader_wbmp_la_rpath) $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_LIBADD) $(LIBS) - libpixbufloader-xbm.la: $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_xbm_la_LDFLAGS) $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_LIBADD) $(LIBS) -+ $(libpixbufloader_xbm_la_LINK) $(am_libpixbufloader_xbm_la_rpath) $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_LIBADD) $(LIBS) - libpixbufloader-xpm.la: $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_DEPENDENCIES) -- $(LINK) -rpath $(loaderdir) $(libpixbufloader_xpm_la_LDFLAGS) $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_LIBADD) $(LIBS) -+ $(libpixbufloader_xpm_la_LINK) $(am_libpixbufloader_xpm_la_rpath) $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_LIBADD) $(LIBS) - libstatic-pixbufloader-ani.la: $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_ani_la_LDFLAGS) $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_ani_la_rpath) $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_LIBADD) $(LIBS) - libstatic-pixbufloader-bmp.la: $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_bmp_la_LDFLAGS) $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_bmp_la_rpath) $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_LIBADD) $(LIBS) - libstatic-pixbufloader-gdip-bmp.la: $(libstatic_pixbufloader_gdip_bmp_la_OBJECTS) $(libstatic_pixbufloader_gdip_bmp_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_gdip_bmp_la_LDFLAGS) $(libstatic_pixbufloader_gdip_bmp_la_OBJECTS) $(libstatic_pixbufloader_gdip_bmp_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_gdip_bmp_la_rpath) $(libstatic_pixbufloader_gdip_bmp_la_OBJECTS) $(libstatic_pixbufloader_gdip_bmp_la_LIBADD) $(LIBS) - libstatic-pixbufloader-gdip-emf.la: $(libstatic_pixbufloader_gdip_emf_la_OBJECTS) $(libstatic_pixbufloader_gdip_emf_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_gdip_emf_la_LDFLAGS) $(libstatic_pixbufloader_gdip_emf_la_OBJECTS) $(libstatic_pixbufloader_gdip_emf_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_gdip_emf_la_rpath) $(libstatic_pixbufloader_gdip_emf_la_OBJECTS) $(libstatic_pixbufloader_gdip_emf_la_LIBADD) $(LIBS) - libstatic-pixbufloader-gdip-gif.la: $(libstatic_pixbufloader_gdip_gif_la_OBJECTS) $(libstatic_pixbufloader_gdip_gif_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_gdip_gif_la_LDFLAGS) $(libstatic_pixbufloader_gdip_gif_la_OBJECTS) $(libstatic_pixbufloader_gdip_gif_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_gdip_gif_la_rpath) $(libstatic_pixbufloader_gdip_gif_la_OBJECTS) $(libstatic_pixbufloader_gdip_gif_la_LIBADD) $(LIBS) - libstatic-pixbufloader-gdip-ico.la: $(libstatic_pixbufloader_gdip_ico_la_OBJECTS) $(libstatic_pixbufloader_gdip_ico_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_gdip_ico_la_LDFLAGS) $(libstatic_pixbufloader_gdip_ico_la_OBJECTS) $(libstatic_pixbufloader_gdip_ico_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_gdip_ico_la_rpath) $(libstatic_pixbufloader_gdip_ico_la_OBJECTS) $(libstatic_pixbufloader_gdip_ico_la_LIBADD) $(LIBS) - libstatic-pixbufloader-gdip-jpeg.la: $(libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) $(libstatic_pixbufloader_gdip_jpeg_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_gdip_jpeg_la_LDFLAGS) $(libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) $(libstatic_pixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_gdip_jpeg_la_rpath) $(libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) $(libstatic_pixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) - libstatic-pixbufloader-gdip-tiff.la: $(libstatic_pixbufloader_gdip_tiff_la_OBJECTS) $(libstatic_pixbufloader_gdip_tiff_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_gdip_tiff_la_LDFLAGS) $(libstatic_pixbufloader_gdip_tiff_la_OBJECTS) $(libstatic_pixbufloader_gdip_tiff_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_gdip_tiff_la_rpath) $(libstatic_pixbufloader_gdip_tiff_la_OBJECTS) $(libstatic_pixbufloader_gdip_tiff_la_LIBADD) $(LIBS) - libstatic-pixbufloader-gdip-wmf.la: $(libstatic_pixbufloader_gdip_wmf_la_OBJECTS) $(libstatic_pixbufloader_gdip_wmf_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_gdip_wmf_la_LDFLAGS) $(libstatic_pixbufloader_gdip_wmf_la_OBJECTS) $(libstatic_pixbufloader_gdip_wmf_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_gdip_wmf_la_rpath) $(libstatic_pixbufloader_gdip_wmf_la_OBJECTS) $(libstatic_pixbufloader_gdip_wmf_la_LIBADD) $(LIBS) - libstatic-pixbufloader-gif.la: $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_gif_la_LDFLAGS) $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_gif_la_rpath) $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_LIBADD) $(LIBS) - libstatic-pixbufloader-icns.la: $(libstatic_pixbufloader_icns_la_OBJECTS) $(libstatic_pixbufloader_icns_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_icns_la_LDFLAGS) $(libstatic_pixbufloader_icns_la_OBJECTS) $(libstatic_pixbufloader_icns_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_icns_la_rpath) $(libstatic_pixbufloader_icns_la_OBJECTS) $(libstatic_pixbufloader_icns_la_LIBADD) $(LIBS) - libstatic-pixbufloader-ico.la: $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_ico_la_LDFLAGS) $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_ico_la_rpath) $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_LIBADD) $(LIBS) - libstatic-pixbufloader-jasper.la: $(libstatic_pixbufloader_jasper_la_OBJECTS) $(libstatic_pixbufloader_jasper_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_jasper_la_LDFLAGS) $(libstatic_pixbufloader_jasper_la_OBJECTS) $(libstatic_pixbufloader_jasper_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_jasper_la_rpath) $(libstatic_pixbufloader_jasper_la_OBJECTS) $(libstatic_pixbufloader_jasper_la_LIBADD) $(LIBS) - libstatic-pixbufloader-jpeg.la: $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_jpeg_la_LDFLAGS) $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_jpeg_la_rpath) $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_LIBADD) $(LIBS) - libstatic-pixbufloader-pcx.la: $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_pcx_la_LDFLAGS) $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_pcx_la_rpath) $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_LIBADD) $(LIBS) - libstatic-pixbufloader-png.la: $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_png_la_LDFLAGS) $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_png_la_rpath) $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_LIBADD) $(LIBS) - libstatic-pixbufloader-pnm.la: $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_pnm_la_LDFLAGS) $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_pnm_la_rpath) $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_LIBADD) $(LIBS) - libstatic-pixbufloader-ras.la: $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_ras_la_LDFLAGS) $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_ras_la_rpath) $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_LIBADD) $(LIBS) - libstatic-pixbufloader-tga.la: $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_tga_la_LDFLAGS) $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_tga_la_rpath) $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_LIBADD) $(LIBS) - libstatic-pixbufloader-tiff.la: $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_tiff_la_LDFLAGS) $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_tiff_la_rpath) $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_LIBADD) $(LIBS) - libstatic-pixbufloader-wbmp.la: $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_wbmp_la_LDFLAGS) $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_wbmp_la_rpath) $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_LIBADD) $(LIBS) - libstatic-pixbufloader-xbm.la: $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_xbm_la_LDFLAGS) $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_pixbufloader_xbm_la_rpath) $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_LIBADD) $(LIBS) - libstatic-pixbufloader-xpm.la: $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_DEPENDENCIES) -- $(LINK) $(libstatic_pixbufloader_xpm_la_LDFLAGS) $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_LIBADD) $(LIBS) --binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+ $(LINK) $(am_libstatic_pixbufloader_xpm_la_rpath) $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_LIBADD) $(LIBS) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(bindir) -+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -1596,8 +1520,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -- rm -f $(DESTDIR)$(bindir)/$$f; \ -+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - - clean-binPROGRAMS: -@@ -1615,16 +1539,16 @@ - done - gdk-pixbuf-csource$(EXEEXT): $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_DEPENDENCIES) - @rm -f gdk-pixbuf-csource$(EXEEXT) -- $(LINK) $(gdk_pixbuf_csource_LDFLAGS) $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_LDADD) $(LIBS) -+ $(LINK) $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_LDADD) $(LIBS) - gdk-pixbuf-query-loaders$(EXEEXT): $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_DEPENDENCIES) - @rm -f gdk-pixbuf-query-loaders$(EXEEXT) -- $(LINK) $(gdk_pixbuf_query_loaders_LDFLAGS) $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_LDADD) $(LIBS) -+ $(LINK) $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_LDADD) $(LIBS) - test-gdk-pixbuf$(EXEEXT): $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_DEPENDENCIES) - @rm -f test-gdk-pixbuf$(EXEEXT) -- $(LINK) $(test_gdk_pixbuf_LDFLAGS) $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_LDADD) $(LIBS) -+ $(LINK) $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -1672,64 +1596,47 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gdk-pixbuf.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --libgdk_pixbufincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-libgdk_pixbufincludeHEADERS: $(libgdk_pixbufinclude_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libgdk_pixbufincludedir) -+ test -z "$(libgdk_pixbufincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdk_pixbufincludedir)" - @list='$(libgdk_pixbufinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(libgdk_pixbufincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ -- $(libgdk_pixbufincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbufincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(libgdk_pixbufincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdk_pixbufincludedir)/$$f'"; \ -+ $(libgdk_pixbufincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ - done - - uninstall-libgdk_pixbufincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libgdk_pixbufinclude_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ -- rm -f $(DESTDIR)$(libgdk_pixbufincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(libgdk_pixbufincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -1739,7 +1646,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1751,15 +1664,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -1780,7 +1698,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1791,35 +1709,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -1827,23 +1740,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -1857,9 +1770,9 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - check-TESTS: $(TESTS) -- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ -+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ -- list='$(TESTS)'; \ -+ list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ -@@ -1868,25 +1781,25 @@ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xpass=`expr $$xpass + 1`; \ -- failed=`expr $$failed + 1`; \ -- echo "XPASS: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xpass=`expr $$xpass + 1`; \ -+ failed=`expr $$failed + 1`; \ -+ echo "XPASS: $$tst"; \ - ;; \ - *) \ -- echo "PASS: $$tst"; \ -+ echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xfail=`expr $$xfail + 1`; \ -- echo "XFAIL: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xfail=`expr $$xfail + 1`; \ -+ echo "XFAIL: $$tst"; \ - ;; \ - *) \ -- failed=`expr $$failed + 1`; \ -- echo "FAIL: $$tst"; \ -+ failed=`expr $$failed + 1`; \ -+ echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ -@@ -1911,46 +1824,40 @@ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ -- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ -- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ -- test -n "$$skipped" && echo "$$skipped"; \ -- test -n "$$report" && echo "$$report"; \ -+ test -z "$$skipped" || echo "$$skipped"; \ -+ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -1961,15 +1868,19 @@ - || 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 \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -1978,13 +1889,16 @@ - $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-recursive --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local -+@CROSS_COMPILING_TRUE@all-local: -+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ -+ all-local - install-binPROGRAMS: install-libLTLIBRARIES - - installdirs: installdirs-recursive - installdirs-am: -- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(loaderdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libgdk_pixbufincludedir) -- -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(loaderdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libgdk_pixbufincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive -@@ -2006,13 +1920,13 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - clean: clean-recursive - - clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -@@ -2023,12 +1937,14 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-local distclean-tags -+ distclean-local distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: -@@ -2038,12 +1954,20 @@ - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - -+install-dvi: install-dvi-recursive -+ - install-exec-am: install-binPROGRAMS install-libLTLIBRARIES - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -2064,35 +1988,34 @@ - - ps-am: - --uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ -- uninstall-libLTLIBRARIES uninstall-libgdk_pixbufincludeHEADERS \ -+uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ -+ uninstall-libgdk_pixbufincludeHEADERS \ - uninstall-loaderLTLIBRARIES uninstall-local - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-data-am install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ -- check-TESTS check-am check-local clean clean-binPROGRAMS \ -- clean-generic clean-libLTLIBRARIES clean-libtool \ -- clean-loaderLTLIBRARIES clean-noinstLTLIBRARIES \ -- clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-local distclean-recursive distclean-tags distdir dvi \ -- dvi-am dvi-recursive info info-am info-recursive install \ -- install-am install-binPROGRAMS install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-libLTLIBRARIES \ -- install-libgdk_pixbufincludeHEADERS install-loaderLTLIBRARIES \ -- install-man install-recursive install-strip installcheck \ -- installcheck-am installdirs installdirs-am \ -- installdirs-recursive maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -- tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ -- uninstall-info-am uninstall-info-recursive \ -- uninstall-libLTLIBRARIES uninstall-libgdk_pixbufincludeHEADERS \ -- uninstall-loaderLTLIBRARIES uninstall-local uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am all-local check check-TESTS check-am check-local \ -+ clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -+ clean-libtool clean-loaderLTLIBRARIES clean-noinstLTLIBRARIES \ -+ clean-noinstPROGRAMS ctags ctags-recursive distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-local distclean-tags distdir dvi dvi-am html html-am \ -+ info info-am install install-am install-binPROGRAMS \ -+ install-data install-data-am install-data-hook install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am \ -+ install-libLTLIBRARIES install-libgdk_pixbufincludeHEADERS \ -+ install-loaderLTLIBRARIES install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ -+ uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ -+ uninstall-libgdk_pixbufincludeHEADERS \ -+ uninstall-loaderLTLIBRARIES uninstall-local - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/gdk-pixbuf/pixops/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/gdk-pixbuf/pixops/Makefile.in 2008-09-24 00:11:37.000000000 -0300 -+++ gtk+2.0-2.14.3/gdk-pixbuf/pixops/Makefile.in 2008-09-24 19:56:52.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,12 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+noinst_PROGRAMS = timescale$(EXEEXT) -+subdir = gdk-pixbuf/pixops -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+libpixops_la_LIBADD = -+am__libpixops_la_SOURCES_DIST = pixops.c pixops.h pixops-internal.h \ -+ have_mmx.S scale_line_22_33_mmx.S composite_line_22_4a4_mmx.S \ -+ composite_line_color_22_4a4_mmx.S -+@USE_MMX_TRUE@am__objects_1 = have_mmx.lo scale_line_22_33_mmx.lo \ -+@USE_MMX_TRUE@ composite_line_22_4a4_mmx.lo \ -+@USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.lo -+am_libpixops_la_OBJECTS = pixops.lo $(am__objects_1) -+libpixops_la_OBJECTS = $(am_libpixops_la_OBJECTS) -+PROGRAMS = $(noinst_PROGRAMS) -+am_timescale_OBJECTS = timescale.$(OBJEXT) -+timescale_OBJECTS = $(am_timescale_OBJECTS) -+am__DEPENDENCIES_1 = -+timescale_DEPENDENCIES = libpixops.la $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_1) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -+LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libpixops_la_SOURCES) $(timescale_SOURCES) -+DIST_SOURCES = $(am__libpixops_la_SOURCES_DIST) $(timescale_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +96,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +121,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +128,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + noinst_PROGRAMS = test-gdk-pixbuf +diff -urN gtk+2.0-2.14.4.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.4/gdk-pixbuf/pixops/Makefile.in +--- gtk+2.0-2.14.4.old/gdk-pixbuf/pixops/Makefile.in 2008-10-17 01:07:15.000000000 -0300 ++++ gtk+2.0-2.14.4/gdk-pixbuf/pixops/Makefile.in 2008-11-04 15:37:06.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +154,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -44806,3351 +61822,40 @@ Index: gtk+2.0-2.14.3/gdk-pixbuf/pixops/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +173,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +183,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +212,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +231,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +242,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +254,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +295,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,18 +304,16 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- DETAILS \ -- pixbuf-transform-math.ltx \ -- makefile.msc -- -+EXTRA_DIST = DETAILS pixbuf-transform-math.ltx makefile.msc - TEST_PROGS = - - ### testing rules -@@ -410,97 +339,70 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - noinst_LTLIBRARIES = libpixops.la -- - INCLUDES = \ - -I$(top_srcdir) -I$(top_builddir) \ - $(GTK_DEBUG_FLAGS) \ - $(GDK_PIXBUF_DEP_CFLAGS) - -- --noinst_PROGRAMS = timescale -- - timescale_SOURCES = timescale.c - timescale_LDADD = libpixops.la $(GLIB_LIBS) $(GDK_PIXBUF_DEP_LIBS) -- - @USE_MMX_TRUE@mmx_sources = \ - @USE_MMX_TRUE@ have_mmx.S \ - @USE_MMX_TRUE@ scale_line_22_33_mmx.S \ - @USE_MMX_TRUE@ composite_line_22_4a4_mmx.S \ - @USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.S - -- - libpixops_la_SOURCES = \ - pixops.c \ - pixops.h \ - pixops-internal.h \ - $(mmx_sources) - --subdir = gdk-pixbuf/pixops --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(noinst_LTLIBRARIES) -- --libpixops_la_LDFLAGS = --libpixops_la_LIBADD = --am__libpixops_la_SOURCES_DIST = pixops.c pixops.h pixops-internal.h \ -- have_mmx.S scale_line_22_33_mmx.S composite_line_22_4a4_mmx.S \ -- composite_line_color_22_4a4_mmx.S --@USE_MMX_TRUE@am__objects_1 = have_mmx.lo scale_line_22_33_mmx.lo \ --@USE_MMX_TRUE@ composite_line_22_4a4_mmx.lo \ --@USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.lo --am_libpixops_la_OBJECTS = pixops.lo $(am__objects_1) --libpixops_la_OBJECTS = $(am_libpixops_la_OBJECTS) --noinst_PROGRAMS = timescale$(EXEEXT) --PROGRAMS = $(noinst_PROGRAMS) -- --am_timescale_OBJECTS = timescale.$(OBJEXT) --timescale_OBJECTS = $(am_timescale_OBJECTS) --timescale_DEPENDENCIES = libpixops.la --timescale_LDFLAGS = -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pixops.Plo ./$(DEPDIR)/timescale.Po --CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) --LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ -- $(CCASFLAGS) --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(am__libpixops_la_SOURCES_DIST) $(timescale_SOURCES) --DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --SOURCES = $(libpixops_la_SOURCES) $(timescale_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk-pixbuf/pixops/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gdk-pixbuf/pixops/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libpixops.la: $(libpixops_la_OBJECTS) $(libpixops_la_DEPENDENCIES) -- $(LINK) $(libpixops_la_LDFLAGS) $(libpixops_la_OBJECTS) $(libpixops_la_LIBADD) $(LIBS) -+ $(LINK) $(libpixops_la_OBJECTS) $(libpixops_la_LIBADD) $(LIBS) - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -510,58 +412,62 @@ - done - timescale$(EXEEXT): $(timescale_OBJECTS) $(timescale_DEPENDENCIES) - @rm -f timescale$(EXEEXT) -- $(LINK) $(timescale_LDFLAGS) $(timescale_OBJECTS) $(timescale_LDADD) $(LIBS) -+ $(LINK) $(timescale_OBJECTS) $(timescale_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c - -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite_line_22_4a4_mmx.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite_line_color_22_4a4_mmx.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/have_mmx.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixops.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale_line_22_33_mmx.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timescale.Po@am__quote@ - - .S.o: -- $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ $< - - .S.obj: -- $(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .S.lo: -- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@am__fastdepCCAS_TRUE@ $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCCAS_FALSE@ $(LTCPPASCOMPILE) -c -o $@ $< - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -569,26 +475,15 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -598,23 +493,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -626,29 +521,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -663,7 +552,6 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) -- - installdirs: - install: install-am - install-exec: install-exec-am -@@ -684,7 +572,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -698,24 +586,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -736,19 +634,23 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ -- dvi-am info info-am install install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-info-am -+ tags uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/gtk/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/gtk/Makefile.in 2008-09-24 00:11:39.000000000 -0300 -+++ gtk+2.0-2.14.3/gtk/Makefile.in 2008-09-24 19:56:53.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,15 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ -+ -+ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,7 +36,13 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(am__gtkunixprintinclude_HEADERS_DIST) \ -+ $(gtkinclude_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(srcdir)/gtk-win32.rc.in \ -+ $(srcdir)/gtkversion.h.in $(srcdir)/makefile.msc.in \ -+ $(top_srcdir)/Makefile.decl - @OS_LINUX_TRUE@am__append_1 = abicheck.sh pltcheck.sh - @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_2 = $(INCLUDED_IMMODULE_OBJ) - @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_3 = $(INCLUDED_IMMODULE_OBJ) -@@ -61,1756 +66,945 @@ - @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_12 = gtksearchenginequartz.h - @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_quartz_c_sources) - @USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_14 = $(gtk_use_stub_c_sources) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --AS = @AS@ --ATK_PREFIX = @ATK_PREFIX@ --AUTOCONF = @AUTOCONF@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ --BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ --CAIRO_PREFIX = @CAIRO_PREFIX@ --CATALOGS = @CATALOGS@ --CATOBJEXT = @CATOBJEXT@ --CC = @CC@ --CCAS = @CCAS@ --CCASFLAGS = @CCASFLAGS@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ --CUPS_API_MAJOR = @CUPS_API_MAJOR@ --CUPS_API_MINOR = @CUPS_API_MINOR@ --CUPS_CFLAGS = @CUPS_CFLAGS@ --CUPS_CONFIG = @CUPS_CONFIG@ --CUPS_LIBS = @CUPS_LIBS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DATADIRNAME = @DATADIRNAME@ --DB2HTML = @DB2HTML@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ --DLLTOOL = @DLLTOOL@ --DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ --EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --GAIL_INET_LIBS = @GAIL_INET_LIBS@ --GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ --GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ --GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ --GDK_DEP_LIBS = @GDK_DEP_LIBS@ --GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ --GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@ --GDK_PACKAGES = @GDK_PACKAGES@ --GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ --GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@ --GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@ --GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@ --GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@ --GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@ --GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@ --GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@ --GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@ --GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@ --GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@ --GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@ --GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ --GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ --GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ --GDK_WLIBS = @GDK_WLIBS@ --GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --GLIB_CFLAGS = @GLIB_CFLAGS@ --GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ --GLIB_LIBS = @GLIB_LIBS@ --GLIB_MKENUMS = @GLIB_MKENUMS@ --GLIB_PREFIX = @GLIB_PREFIX@ --GMOFILES = @GMOFILES@ --GMSGFMT = @GMSGFMT@ --GOBJECT_QUERY = @GOBJECT_QUERY@ --GREP = @GREP@ --GTKDOC_CHECK = @GTKDOC_CHECK@ --GTK_API_VERSION = @GTK_API_VERSION@ --GTK_BINARY_AGE = @GTK_BINARY_AGE@ --GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ --GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ --GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ --GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ --GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ --GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ --GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ --GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@ --GTK_MICRO_VERSION = @GTK_MICRO_VERSION@ --GTK_MINOR_VERSION = @GTK_MINOR_VERSION@ --GTK_PACKAGES = @GTK_PACKAGES@ --GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ --GTK_VERSION = @GTK_VERSION@ --GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ --HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ --HTML_DIR = @HTML_DIR@ --INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ --INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ --INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ --INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ --INDENT = @INDENT@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --INSTOBJEXT = @INSTOBJEXT@ --INTLLIBS = @INTLLIBS@ --LDFLAGS = @LDFLAGS@ --LIBJASPER = @LIBJASPER@ --LIBJPEG = @LIBJPEG@ --LIBOBJS = @LIBOBJS@ --LIBPNG = @LIBPNG@ --LIBS = @LIBS@ --LIBTIFF = @LIBTIFF@ --LIBTOOL = @LIBTOOL@ --LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ --LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ --LT_VERSION_INFO = @LT_VERSION_INFO@ --MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ --MAKEINFO = @MAKEINFO@ --MKINSTALLDIRS = @MKINSTALLDIRS@ --MSGFMT = @MSGFMT@ --MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ --NM = @NM@ --NMEDIT = @NMEDIT@ --OBJDUMP = @OBJDUMP@ --OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PANGO_PREFIX = @PANGO_PREFIX@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ --POFILES = @POFILES@ --POSUB = @POSUB@ --PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ --PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ --RANLIB = @RANLIB@ --REBUILD = @REBUILD@ --REBUILD_PNGS = @REBUILD_PNGS@ --SED = @SED@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ --USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ --VERSION = @VERSION@ --WINDRES = @WINDRES@ --XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ --XMKMF = @XMKMF@ --XMLCATALOG = @XMLCATALOG@ --XML_CATALOG_FILE = @XML_CATALOG_FILE@ --XSLTPROC = @XSLTPROC@ --X_CFLAGS = @X_CFLAGS@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_LIBS = @X_LIBS@ --X_PRE_LIBS = @X_PRE_LIBS@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --datarootdir = @datarootdir@ --docdir = @docdir@ --dvidir = @dvidir@ --exec_prefix = @exec_prefix@ --gdktarget = @gdktarget@ --gdktargetlib = @gdktargetlib@ --gtktargetlib = @gtktargetlib@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --htmldir = @htmldir@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --libdir = @libdir@ --libexecdir = @libexecdir@ --localedir = @localedir@ --localstatedir = @localstatedir@ --mandir = @mandir@ --ms_librarian = @ms_librarian@ --oldincludedir = @oldincludedir@ --pdfdir = @pdfdir@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --psdir = @psdir@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --sysconfdir = @sysconfdir@ --target_alias = @target_alias@ -- --GTESTER = gtester # in $PATH for non-GLIB packages --GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -- --# initialize variables for unconditional += appending --EXTRA_DIST = gtkquartz.h $(gtk_private_h_sources) $(gtk_extra_sources) $(gtk_built_sources) $(STOCK_ICONS) \ -- $(STOCK_ICONS) \ -- $(GENERATED_ICONS) \ -- line-arrow.xbm \ -- line-wrap.xbm \ -- tree_plus.xbm \ -- tree_minus.xbm \ -- tree_minus.xpm \ -- tree_plus.xpm \ -- gtk.def \ -- gtk-builder-convert \ -- gtk-win32.rc \ -- gtk-win32.rc.in \ -- gtkwin32embed.h \ -- gtkwin32embedwidget.h \ -- gtkwin32embedwidget.c \ -- gtkprint-win32.h \ -- gtkprint-win32.c \ -- gtksearchenginequartz.h \ -- gtkrc.default \ -- gtkrc.key.default \ -- gtkrc.key.emacs \ -- makefile.msc \ -- makefile.msc.in \ -- makegtkalias.pl \ -- aliasfilescheck.sh \ -- abicheck.sh \ -- pltcheck.sh \ -- gtktypebuiltins.c.template \ -- gtktypebuiltins.h.template -- --TEST_PROGS = -- --### testing rules -- --# Xvfb based test rules --XVFB = Xvfb -screen 0 800x600x16 --XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ -- 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ -- 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ -- 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ -- 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ -- 9995 9996 9997 9998 9999 -- --SKIP_GDKTARGET = \ -- test "$(gdktarget)" != "x11" \ -- && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." -- --XVFB_START = \ -- ${XVFB} -help 2>/dev/null 1>&2 \ -- && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ -- && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ -- trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ -- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ -- && DISPLAY=:$$XID && export DISPLAY -- -- -- --# Makefile.am for gtk+/gtk --@USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f" --@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f" -- --SUBDIRS = theme-bits . tests --DIST_SUBDIRS = theme-bits tests --@HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr -- --@HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups -- --INCLUDES = \ -- -DG_LOG_DOMAIN=\"Gtk\" \ -- -DGTK_LIBDIR=\"$(libdir)\" \ -- -DGTK_DATADIR=\"$(datadir)\" \ -- -DGTK_DATA_PREFIX=\"$(prefix)\" \ -- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -- -DGTK_VERSION=\"$(GTK_VERSION)\" \ -- -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ -- -DGTK_HOST=\"$(host)\" \ -- -DGTK_COMPILATION \ -- -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \ -- -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\" \ -- -I$(top_builddir) \ -- -I$(top_builddir)/gtk \ -- -I$(top_srcdir) -I../gdk \ -- -I$(top_srcdir)/gdk \ -- -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -- -DGDK_DISABLE_DEPRECATED \ -- -DGTK_DISABLE_DEPRECATED \ -- -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -- -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -- $(GTK_DEBUG_FLAGS) \ -- $(GTK_DEP_CFLAGS) \ -- $(gtk_clipboard_dnd_c_sources_CFLAGS) \ -- $(INCLUDED_IMMODULE_DEFINE) -- -- --gtarget = $(gdktarget) -- --@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -- --@OS_WIN32_TRUE@gtk_def = gtk.def --@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def -- --@OS_WIN32_TRUE@gtk_win32_res = gtk-win32-res.o --@OS_WIN32_TRUE@gtk_win32_res_ldflag = -Wl,gtk-win32-res.o -- --@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib -- --TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)" --TESTS = aliasfilescheck.sh $(am__append_1) -- --libgtkincludedir = $(includedir)/gtk-2.0/gtk --libadd = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(GTK_DEP_LIBS)\ --$(am__append_2) --deps = $(am__append_3) -- --# libtool stuff: set version and export symbols for resolving --# since automake doesn't support conditionalized libsomething_la_LDFLAGS --# we use the general approach here --libtool_opts = \ -- -version-info $(LT_VERSION_INFO) \ -- -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \ -- -rpath $(libdir) $(libgtk_target_ldflags) -- -- --# --# setup source file variables --# -- --# GTK+ header files for public installation (non-generated, or generated --# by configure) -- --# Broken -- --# Deprecated --gtk_public_h_sources = \ -- gtk.h \ -- gtkaboutdialog.h \ -- gtkaccelgroup.h \ -- gtkaccellabel.h \ -- gtkaccelmap.h \ -- gtkaccessible.h \ -- gtkaction.h \ -- gtkactiongroup.h \ -- gtkadjustment.h \ -- gtkalignment.h \ -- gtkarrow.h \ -- gtkaspectframe.h \ -- gtkassistant.h \ -- gtkbbox.h \ -- gtkbin.h \ -- gtkbindings.h \ -- gtkbox.h \ -- gtkbuilder.h \ -- gtkbuildable.h \ -- gtkbutton.h \ -- gtkcalendar.h \ -- gtkcelleditable.h \ -- gtkcelllayout.h \ -- gtkcellrenderer.h \ -- gtkcellrendereraccel.h \ -- gtkcellrenderercombo.h \ -- gtkcellrendererpixbuf.h \ -- gtkcellrendererprogress.h \ -- gtkcellrendererspin.h \ -- gtkcellrenderertext.h \ -- gtkcellrenderertoggle.h \ -- gtkcellview.h \ -- gtkcheckbutton.h \ -- gtkcheckmenuitem.h \ -- gtkclipboard.h \ -- gtkcolorbutton.h \ -- gtkcolorsel.h \ -- gtkcolorseldialog.h \ -- gtkcombobox.h \ -- gtkcomboboxentry.h \ -- gtkcontainer.h \ -- gtkcurve.h \ -- gtkdebug.h \ -- gtkdialog.h \ -- gtkdnd.h \ -- gtkdrawingarea.h \ -- gtkeditable.h \ -- gtkentry.h \ -- gtkentrycompletion.h \ -- gtkenums.h \ -- gtkeventbox.h \ -- gtkexpander.h \ -- gtkfilechooser.h \ -- gtkfilechooserbutton.h \ -- gtkfilechooserdialog.h \ -- gtkfilechooserwidget.h \ -- gtkfilefilter.h \ -- gtkfixed.h \ -- gtkfontbutton.h \ -- gtkfontsel.h \ -- gtkframe.h \ -- gtkgamma.h \ -- gtkgc.h \ -- gtkhandlebox.h \ -- gtkhbbox.h \ -- gtkhbox.h \ -- gtkhpaned.h \ -- gtkhruler.h \ -- gtkhscale.h \ -- gtkhscrollbar.h \ -- gtkhseparator.h \ -- gtkhsv.h \ -- gtkiconfactory.h \ -- gtkicontheme.h \ -- gtkiconview.h \ -- gtkimage.h \ -- gtkimagemenuitem.h \ -- gtkimcontext.h \ -- gtkimcontextsimple.h \ -- gtkimmodule.h \ -- gtkimmulticontext.h \ -- gtkinputdialog.h \ -- gtkinvisible.h \ -- gtkitem.h \ -- gtklabel.h \ -- gtklayout.h \ -- gtklinkbutton.h \ -- gtkliststore.h \ -- gtkmain.h \ -- gtkmenu.h \ -- gtkmenubar.h \ -- gtkmenuitem.h \ -- gtkmenushell.h \ -- gtkmenutoolbutton.h \ -- gtkmessagedialog.h \ -- gtkmisc.h \ -- gtkmodules.h \ -- gtkmountoperation.h \ -- gtknotebook.h \ -- gtkobject.h \ -- gtkpagesetup.h \ -- gtkpaned.h \ -- gtkpapersize.h \ -- gtkplug.h \ -- gtkprintcontext.h \ -- gtkprintoperation.h \ -- gtkprintoperationpreview.h \ -- gtkprintsettings.h \ -- gtkprivate.h \ -- gtkprogressbar.h \ -- gtkradioaction.h \ -- gtkradiobutton.h \ -- gtkradiomenuitem.h \ -- gtkradiotoolbutton.h \ -- gtkrange.h \ -- gtkrc.h \ -- gtkrecentaction.h \ -- gtkrecentchooser.h \ -- gtkrecentchooserdialog.h \ -- gtkrecentchoosermenu.h \ -- gtkrecentchooserwidget.h \ -- gtkrecentfilter.h \ -- gtkrecentmanager.h \ -- gtkruler.h \ -- gtkscale.h \ -- gtkscalebutton.h \ -- gtkscrollbar.h \ -- gtkscrolledwindow.h \ -- gtkselection.h \ -- gtkseparator.h \ -- gtkseparatormenuitem.h \ -- gtkseparatortoolitem.h \ -- gtkshow.h \ -- gtksettings.h \ -- gtksizegroup.h \ -- gtksocket.h \ -- gtkspinbutton.h \ -- gtkstatusbar.h \ -- gtkstatusicon.h \ -- gtkstock.h \ -- gtkstyle.h \ -- gtktable.h \ -- gtktearoffmenuitem.h \ -- gtktestutils.h \ -- gtktextbuffer.h \ -- gtktextbufferrichtext.h \ -- gtktextchild.h \ -- gtktextdisplay.h \ -- gtktextiter.h \ -- gtktextmark.h \ -- gtktexttag.h \ -- gtktexttagtable.h \ -- gtktextview.h \ -- gtktoggleaction.h \ -- gtktogglebutton.h \ -- gtktoggletoolbutton.h \ -- gtktoolbar.h \ -- gtktoolbutton.h \ -- gtktoolitem.h \ -- gtktoolshell.h \ -- gtktooltip.h \ -- gtktreednd.h \ -- gtktreemodel.h \ -- gtktreemodelfilter.h \ -- gtktreemodelsort.h \ -- gtktreeselection.h \ -- gtktreesortable.h \ -- gtktreestore.h \ -- gtktreeview.h \ -- gtktreeviewcolumn.h \ -- gtktypeutils.h \ -- gtkuimanager.h \ -- gtkvbbox.h \ -- gtkvbox.h \ -- gtkviewport.h \ -- gtkvolumebutton.h \ -- gtkvpaned.h \ -- gtkvruler.h \ -- gtkvscale.h \ -- gtkvscrollbar.h \ -- gtkvseparator.h \ -- gtkwidget.h \ -- gtkwindow.h\ --\ -- gtktext.h \ -- gtktree.h \ -- gtktreeitem.h\ --\ -- gtkclist.h \ -- gtkcombo.h \ -- gtkctree.h \ -- gtkfilesel.h \ -- gtkitemfactory.h \ -- gtklist.h \ -- gtklistitem.h \ -- gtkoldeditable.h \ -- gtkoptionmenu.h \ -- gtkpixmap.h \ -- gtkpreview.h \ -- gtkprogress.h \ -- gtksignal.h \ -- gtktipsquery.h \ -- gtktooltips.h -- -- --@OS_UNIX_TRUE@gtk_unix_print_public_h_sources = \ --@OS_UNIX_TRUE@ gtkpagesetupunixdialog.h \ --@OS_UNIX_TRUE@ gtkprintunixdialog.h \ --@OS_UNIX_TRUE@ gtkprinter.h \ --@OS_UNIX_TRUE@ gtkprintjob.h \ --@OS_UNIX_TRUE@ gtkunixprint.h -- -- --# Installed header files without compatibility guarantees --# that are not included in gtk/gtk.h --gtk_semi_private_h_sources = \ -- gtktextlayout.h -- -- --# GTK+ header files that don't get installed --gtk_private_h_sources = \ -- gtkquery.h \ -- gtksearchengine.h \ -- gtksearchenginesimple.h \ -- gtkdndcursors.h \ -- gtkentryprivate.h \ -- gtkbuilderprivate.h \ -- gtkfilechooserdefault.h \ -- gtkfilechooserembed.h \ -- gtkfilechooserentry.h \ -- gtkfilechooserprivate.h \ -- gtkfilechoosersettings.h \ -- gtkfilechooserutils.h \ -- gtkfilesystem.h \ -- gtkfilesystemmodel.h \ -- gtkiconcache.h \ -- gtkintl.h \ -- gtkkeyhash.h \ -- gtkmnemonichash.h \ -- gtkpathbar.h \ -- gtkplugprivate.h \ -- gtkprintoperation-private.h\ -- gtkprintutils.h \ -- gtkrbtree.h \ -- gtkrecentchooserdefault.h \ -- gtkrecentchooserprivate.h \ -- gtkrecentchooserutils.h \ -- gtksocketprivate.h \ -- gtktextbtree.h \ -- gtktextbufferserialize.h\ -- gtktextchildprivate.h \ -- gtktextiterprivate.h \ -- gtktextmarkprivate.h \ -- gtktextsegment.h \ -- gtktexttagprivate.h \ -- gtktexttypes.h \ -- gtktextutil.h \ -- gtkthemes.h \ -- gtktoggleactionprivate.h\ -- gtktreedatalist.h \ -- gtktreeprivate.h \ -- gtkwindow-decorate.h \ -- $(gtk_clipboard_dnd_h_sources)\ --$(am__append_4) $(am__append_6) $(am__append_8) $(am__append_10) $(am__append_12) -- --# GTK+ C sources to build the library from --gtk_base_c_sources = \ -- gtkquery.c \ -- gtksearchengine.c \ -- gtksearchenginesimple.c \ -- fnmatch.c \ -- gtkaboutdialog.c \ -- gtkaccelgroup.c \ -- gtkaccellabel.c \ -- gtkaccelmap.c \ -- gtkaccessible.c \ -- gtkaction.c \ -- gtkactiongroup.c \ -- gtkadjustment.c \ -- gtkalignment.c \ -- gtkarrow.c \ -- gtkaspectframe.c \ -- gtkassistant.c \ -- gtkbbox.c \ -- gtkbin.c \ -- gtkbindings.c \ -- gtkbox.c \ -- gtkbuildable.c \ -- gtkbuilder.c \ -- gtkbuilderparser.c \ -- gtkbutton.c \ -- gtkcalendar.c \ -- gtkcelleditable.c \ -- gtkcelllayout.c \ -- gtkcellrenderer.c \ -- gtkcellrendereraccel.c \ -- gtkcellrenderercombo.c \ -- gtkcellrendererpixbuf.c \ -- gtkcellrendererprogress.c \ -- gtkcellrendererspin.c \ -- gtkcellrenderertext.c \ -- gtkcellrenderertoggle.c \ -- gtkcellview.c \ -- gtkcheckbutton.c \ -- gtkcheckmenuitem.c \ -- gtkcolorbutton.c \ -- gtkcolorsel.c \ -- gtkcolorseldialog.c \ -- gtkcombobox.c \ -- gtkcomboboxentry.c \ -- gtkcontainer.c \ -- gtkcurve.c \ -- gtkdialog.c \ -- gtkdrawingarea.c \ -- gtkeditable.c \ -- gtkentry.c \ -- gtkentrycompletion.c \ -- gtkeventbox.c \ -- gtkexpander.c \ -- gtkfilechooser.c \ -- gtkfilechooserbutton.c \ -- gtkfilechooserdefault.c \ -- gtkfilechooserdialog.c \ -- gtkfilechooserembed.c \ -- gtkfilechooserentry.c \ -- gtkfilechoosersettings.c \ -- gtkfilechooserutils.c \ -- gtkfilechooserwidget.c \ -- gtkfilefilter.c \ -- gtkfilesystem.c \ -- gtkfilesystemmodel.c \ -- gtkfixed.c \ -- gtkfontbutton.c \ -- gtkfontsel.c \ -- gtkframe.c \ -- gtkgamma.c \ -- gtkgc.c \ -- gtkhandlebox.c \ -- gtkhbbox.c \ -- gtkhbox.c \ -- gtkhpaned.c \ -- gtkhruler.c \ -- gtkhscale.c \ -- gtkhscrollbar.c \ -- gtkhseparator.c \ -- gtkhsv.c \ -- gtkiconcache.c \ -- gtkiconcachevalidator.c \ -- gtkiconfactory.c \ -- gtkicontheme.c \ -- gtkiconview.c \ -- gtkimage.c \ -- gtkimagemenuitem.c \ -- gtkimcontext.c \ -- gtkimcontextsimple.c \ -- gtkimmodule.c \ -- gtkimmulticontext.c \ -- gtkinputdialog.c \ -- gtkinvisible.c \ -- gtkitem.c \ -- gtkkeyhash.c \ -- gtklabel.c \ -- gtklayout.c \ -- gtklinkbutton.c \ -- gtkliststore.c \ -- gtkmain.c \ -- gtkmarshal.c \ -- gtkmarshalers.c \ -- gtkmenu.c \ -- gtkmenubar.c \ -- gtkmenuitem.c \ -- gtkmenushell.c \ -- gtkmenutoolbutton.c \ -- gtkmessagedialog.c \ -- gtkmisc.c \ -- gtkmnemonichash.c \ -- gtkmodules.c \ -- gtkmountoperation.c \ -- gtknotebook.c \ -- gtkobject.c \ -- gtkpagesetup.c \ -- gtkpaned.c \ -- gtkpapersize.c \ -- gtkpathbar.c \ -- gtkplug.c \ -- gtkprintcontext.c \ -- gtkprintoperation.c \ -- gtkprintoperationpreview.c \ -- gtkprintsettings.c \ -- gtkprintutils.c \ -- gtkprogressbar.c \ -- gtkradioaction.c \ -- gtkradiobutton.c \ -- gtkradiomenuitem.c \ -- gtkradiotoolbutton.c \ -- gtkrange.c \ -- gtkrbtree.c \ -- gtkrc.c \ -- gtkrecentaction.c \ -- gtkrecentchooserdefault.c \ -- gtkrecentchooserdialog.c \ -- gtkrecentchoosermenu.c \ -- gtkrecentchooserwidget.c \ -- gtkrecentchooserutils.c \ -- gtkrecentchooser.c \ -- gtkrecentfilter.c \ -- gtkrecentmanager.c \ -- gtkruler.c \ -- gtkscale.c \ -- gtkscalebutton.c \ -- gtkscrollbar.c \ -- gtkscrolledwindow.c \ -- gtkselection.c \ -- gtkseparator.c \ -- gtkseparatormenuitem.c \ -- gtkseparatortoolitem.c \ -- gtksettings.c \ -- gtksizegroup.c \ -- gtkshow.c \ -- gtksocket.c \ -- gtkspinbutton.c \ -- gtkstatusbar.c \ -- gtkstatusicon.c \ -- gtkstock.c \ -- gtkstyle.c \ -- gtktable.c \ -- gtktearoffmenuitem.c \ -- gtktestutils.c \ -- gtktextbtree.c \ -- gtktextbuffer.c \ -- gtktextbufferrichtext.c \ -- gtktextbufferserialize.c\ -- gtktextchild.c \ -- gtktextdisplay.c \ -- gtktextiter.c \ -- gtktextlayout.c \ -- gtktextmark.c \ -- gtktextsegment.c \ -- gtktexttag.c \ -- gtktexttagtable.c \ -- gtktexttypes.c \ -- gtktextutil.c \ -- gtktextview.c \ -- gtkthemes.c \ -- gtktoggleaction.c \ -- gtktogglebutton.c \ -- gtktoggletoolbutton.c \ -- gtktoolbar.c \ -- gtktoolbutton.c \ -- gtktoolitem.c \ -- gtktoolshell.c \ -- gtktooltip.c \ -- gtktreedatalist.c \ -- gtktreednd.c \ -- gtktreemodel.c \ -- gtktreemodelfilter.c \ -- gtktreemodelsort.c \ -- gtktreeselection.c \ -- gtktreesortable.c \ -- gtktreestore.c \ -- gtktreeview.c \ -- gtktreeviewcolumn.c \ -- gtktypebuiltins.c \ -- gtktypeutils.c \ -- gtkuimanager.c \ -- gtkvbbox.c \ -- gtkvbox.c \ -- gtkvolumebutton.c \ -- gtkviewport.c \ -- gtkvpaned.c \ -- gtkvruler.c \ -- gtkvscale.c \ -- gtkvscrollbar.c \ -- gtkvseparator.c \ -- gtkwidget.c \ -- gtkwindow-decorate.c \ -- gtkwindow.c \ -- $(gtk_clipboard_dnd_c_sources)\ --\ -- gtktext.c \ -- gtktree.c \ -- gtktreeitem.c\ --\ -- gtkclist.c \ -- gtkcombo.c \ -- gtkctree.c \ -- gtkfilesel.c \ -- gtkitemfactory.c \ -- gtklist.c \ -- gtklistitem.c \ -- gtkoldeditable.c \ -- gtkoptionmenu.c \ -- gtkpixmap.c \ -- gtkpreview.c \ -- gtkprogress.c \ -- gtksignal.c \ -- gtktipsquery.c \ -- gtktooltips.c -- -- --gtk_c_sources = $(gtk_base_c_sources) $(am__append_5) $(am__append_7) $(am__append_9) $(am__append_11) $(am__append_13) $(am__append_14) --gtk_all_c_sources = $(gtk_base_c_sources) $(gtk_os_unix_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources) -- --gtk_os_unix_c_sources = \ -- gtkpagesetupunixdialog.c \ -- gtkprinter.c \ -- gtkprinteroption.c \ -- gtkprinteroptionset.c \ -- gtkprinteroptionwidget.c \ -- gtkprintjob.c \ -- gtkprintoperation-unix.c \ -- gtkprintunixdialog.c \ -- gtkprintbackend.c \ -- gtksearchenginebeagle.c \ -- gtksearchenginetracker.c -- -- --gtk_os_win32_c_sources = \ -- gtkprint-win32.c \ -- gtkprintoperation-win32.c -- -- --gtk_use_x11_c_sources = \ -- gtkplug-x11.c \ -- gtksocket-x11.c \ -- gtkxembed.c \ -- gtktrayicon-x11.c -- --gtk_use_win32_c_sources = \ -- gtkplug-win32.c \ -- gtksocket-win32.c \ -- gtkwin32embed.c \ -- gtkwin32embedwidget.c -- --gtk_use_quartz_c_sources = \ -- gtksearchenginequartz.c \ -- gtkplug-stub.c \ -- gtksocket-stub.c -- --gtk_use_stub_c_sources = \ -- gtkplug-stub.c \ -- gtksocket-stub.c -- --@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c" -- --@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c --@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c --@USE_QUARTZ_TRUE@gtk_clipboard_dnd_h_sources = gtkquartz.h --@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c" --@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources_CFLAGS = -- --# we use our own built_sources variable rules to avoid automake's --# BUILT_SOURCES oddities --# we generate frequently rebuild files piggyback on a stamp file, so sources --# depending on them only get rebuild when the built source actually changed --# content -- --# built sources that get installed with the header files --gtk_built_public_sources = \ -- gtkmarshal.h \ -- gtktypebuiltins.h -- -- --# built headers that don't get installed --gtk_built_private_headers = \ -- gtkalias.h \ -- gtkmarshalers.h \ -- gtkbuiltincache.h \ -- gtkimcontextsimpleseqs.h -- -- --gtk_built_sources = \ -- gtkaliasdef.c \ -- gtktypebuiltins.c \ -- gtktypefuncs.c \ -- gtkmarshalers.c \ -- gtkmarshal.c \ -- ${gtk_built_private_headers} \ -- ${gtk_built_public_sources} -- -- --stamp_files = \ -- stamp-gtkmarshalers.h \ -- stamp-gtkmarshal.h \ -- stamp-gtktypebuiltins.h \ -- stamp-icons -- -- --# non-header sources (headers should be specified in the above variables) --# that don't serve as direct make target sources, i.e. they don't have --# their own .lo rules and don't get publically installed --gtk_extra_sources = \ -- paper_names.c \ -- paper_names_offsets.c \ -- gen-paper-names.c \ -- gtkstatusicon-quartz.c \ -- gtk.symbols \ -- gtkversion.h.in \ -- gtkmarshalers.list \ -- gtkmarshal.list -- -- --# --# setup GTK+ sources and their dependencies --# --MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) --EXTRA_HEADERS = -- --# --# rules to generate built sources --# --# setup autogeneration dependencies --gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf --CLEANFILES = $(gen_sources) -- --BUILT_SOURCES = $(gtk_built_sources) -- --# target platform: --lib_LTLIBRARIES = $(gtktargetlib) -- --gtkincludedir = $(includedir)/gtk-2.0/gtk --gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h -- --gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk --gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) -- --libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) --libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources) --libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources) --libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) -- --libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) --libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid --libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) --libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) -- --libgtk_x11_2_0_la_LIBADD = $(libadd) --libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 --libgtk_quartz_2_0_la_LIBADD = $(libadd) --libgtk_directfb_2_0_la_LIBADD = $(libadd) -- --libgtk_x11_2_0_la_DEPENDENCIES = $(deps) --libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps) --libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) --libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) -- --@USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) --EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la -- --DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) -- --TEST_DEPS = $(DEPS) gtk.immodules -- --LDADDS = \ -- $(gtktargetlib) \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) -- -- --# --# Installed tools --# --bin_PROGRAMS = \ -- gtk-query-immodules-2.0 \ -- gtk-update-icon-cache -- --bin_SCRIPTS = gtk-builder-convert -- --gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) --gtk_query_immodules_2_0_LDADD = $(LDADDS) -- --gtk_query_immodules_2_0_SOURCES = queryimmodules.c -- --gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -- --gtk_update_icon_cache_SOURCES = \ -- updateiconcache.c -- -- --STOCK_ICONS = \ -- stock-icons/16/document-open-recent.png \ -- stock-icons/16/gtk-about.png \ -- stock-icons/16/gtk-add.png \ -- stock-icons/16/gtk-cdrom.png \ -- stock-icons/16/gtk-close.png \ -- stock-icons/16/gtk-connect.png \ -- stock-icons/16/gtk-convert.png \ -- stock-icons/16/gtk-copy.png \ -- stock-icons/16/gtk-cut.png \ -- stock-icons/16/gtk-delete.png \ -- stock-icons/16/gtk-directory.png \ -- stock-icons/16/gtk-disconnect.png \ -- stock-icons/16/gtk-edit.png \ -- stock-icons/16/gtk-execute.png \ -- stock-icons/16/gtk-file.png \ -- stock-icons/16/gtk-find-and-replace.png \ -- stock-icons/16/gtk-find.png \ -- stock-icons/16/gtk-floppy.png \ -- stock-icons/16/gtk-fullscreen.png \ -- stock-icons/16/gtk-go-back-ltr.png \ -- stock-icons/16/gtk-go-down.png \ -- stock-icons/16/gtk-go-forward-ltr.png \ -- stock-icons/16/gtk-goto-bottom.png \ -- stock-icons/16/gtk-goto-first-ltr.png \ -- stock-icons/16/gtk-goto-last-ltr.png \ -- stock-icons/16/gtk-goto-top.png \ -- stock-icons/16/gtk-go-up.png \ -- stock-icons/16/gtk-harddisk.png \ -- stock-icons/16/gtk-help.png \ -- stock-icons/16/gtk-home.png \ -- stock-icons/16/gtk-indent-ltr.png \ -- stock-icons/16/gtk-indent-rtl.png \ -- stock-icons/16/gtk-index.png \ -- stock-icons/16/gtk-info.png \ -- stock-icons/16/gtk-jump-to-ltr.png \ -- stock-icons/16/gtk-jump-to-rtl.png \ -- stock-icons/16/gtk-justify-center.png \ -- stock-icons/16/gtk-justify-fill.png \ -- stock-icons/16/gtk-justify-left.png \ -- stock-icons/16/gtk-justify-right.png \ -- stock-icons/16/gtk-leave-fullscreen.png \ -- stock-icons/16/gtk-media-forward-ltr.png \ -- stock-icons/16/gtk-media-next-ltr.png \ -- stock-icons/16/gtk-media-pause.png \ -- stock-icons/16/gtk-media-play-ltr.png \ -- stock-icons/16/gtk-media-play-rtl.png \ -- stock-icons/16/gtk-media-previous-ltr.png \ -- stock-icons/16/gtk-media-record.png \ -- stock-icons/16/gtk-media-rewind-ltr.png \ -- stock-icons/16/gtk-media-stop.png \ -- stock-icons/16/gtk-missing-image.png \ -- stock-icons/16/gtk-network.png \ -- stock-icons/16/gtk-new.png \ -- stock-icons/16/gtk-open.png \ -- stock-icons/16/gtk-page-setup.png \ -- stock-icons/16/gtk-paste.png \ -- stock-icons/16/gtk-preferences.png \ -- stock-icons/16/gtk-print.png \ -- stock-icons/16/gtk-print-error.png \ -- stock-icons/16/gtk-print-paused.png \ -- stock-icons/16/gtk-print-preview.png \ -- stock-icons/16/gtk-print-report.png \ -- stock-icons/16/gtk-print-warning.png \ -- stock-icons/16/gtk-properties.png \ -- stock-icons/16/gtk-quit.png \ -- stock-icons/16/gtk-redo-ltr.png \ -- stock-icons/16/gtk-redo-rtl.png \ -- stock-icons/16/gtk-refresh.png \ -- stock-icons/16/gtk-remove.png \ -- stock-icons/16/gtk-revert-to-saved-ltr.png \ -- stock-icons/16/gtk-revert-to-saved-rtl.png \ -- stock-icons/16/gtk-save-as.png \ -- stock-icons/16/gtk-select-all.png \ -- stock-icons/16/gtk-select-color.png \ -- stock-icons/16/gtk-select-font.png \ -- stock-icons/16/gtk-sort-ascending.png \ -- stock-icons/16/gtk-sort-descending.png \ -- stock-icons/16/gtk-spell-check.png \ -- stock-icons/16/gtk-stop.png \ -- stock-icons/16/gtk-strikethrough.png \ -- stock-icons/16/gtk-font.png \ -- stock-icons/16/gtk-undelete-ltr.png \ -- stock-icons/16/gtk-undelete-rtl.png \ -- stock-icons/16/gtk-underline.png \ -- stock-icons/16/gtk-undo-ltr.png \ -- stock-icons/16/gtk-undo-rtl.png \ -- stock-icons/16/gtk-unindent-ltr.png \ -- stock-icons/16/gtk-unindent-rtl.png \ -- stock-icons/16/gtk-zoom-100.png \ -- stock-icons/16/gtk-zoom-fit.png \ -- stock-icons/16/gtk-zoom-in.png \ -- stock-icons/16/gtk-zoom-out.png \ -- stock-icons/16/gtk-italic.png \ -- stock-icons/16/gtk-bold.png \ -- stock-icons/20/gtk-apply.png \ -- stock-icons/20/gtk-cancel.png \ -- stock-icons/20/gtk-close.png \ -- stock-icons/20/gtk-no.png \ -- stock-icons/20/gtk-ok.png \ -- stock-icons/20/gtk-yes.png \ -- stock-icons/24/audio-volume-high.png \ -- stock-icons/24/audio-volume-low.png \ -- stock-icons/24/audio-volume-medium.png \ -- stock-icons/24/audio-volume-muted.png \ -- stock-icons/24/document-open-recent.png \ -- stock-icons/24/gtk-about.png \ -- stock-icons/24/gtk-add.png \ -- stock-icons/24/gtk-bold.png \ -- stock-icons/24/gtk-cdrom.png \ -- stock-icons/24/gtk-clear.png \ -- stock-icons/24/gtk-close.png \ -- stock-icons/24/gtk-color-picker.png \ -- stock-icons/24/gtk-connect.png \ -- stock-icons/24/gtk-convert.png \ -- stock-icons/24/gtk-copy.png \ -- stock-icons/24/gtk-cut.png \ -- stock-icons/24/gtk-directory.png \ -- stock-icons/24/gtk-disconnect.png \ -- stock-icons/24/gtk-edit.png \ -- stock-icons/24/gtk-execute.png \ -- stock-icons/24/gtk-file.png \ -- stock-icons/24/gtk-find-and-replace.png \ -- stock-icons/24/gtk-find.png \ -- stock-icons/24/gtk-font.png \ -- stock-icons/24/gtk-fullscreen.png \ -- stock-icons/24/gtk-go-back-ltr.png \ -- stock-icons/24/gtk-goto-top.png \ -- stock-icons/24/gtk-go-down.png \ -- stock-icons/24/gtk-goto-bottom.png \ -- stock-icons/24/gtk-goto-first-ltr.png \ -- stock-icons/24/gtk-goto-last-ltr.png \ -- stock-icons/24/gtk-go-up.png \ -- stock-icons/24/gtk-harddisk.png \ -- stock-icons/24/gtk-help.png \ -- stock-icons/24/gtk-home.png \ -- stock-icons/24/gtk-indent-ltr.png \ -- stock-icons/24/gtk-indent-rtl.png \ -- stock-icons/24/gtk-index.png \ -- stock-icons/24/gtk-info.png \ -- stock-icons/24/gtk-italic.png \ -- stock-icons/24/gtk-jump-to-ltr.png \ -- stock-icons/24/gtk-jump-to-rtl.png \ -- stock-icons/24/gtk-justify-center.png \ -- stock-icons/24/gtk-justify-fill.png \ -- stock-icons/24/gtk-justify-left.png \ -- stock-icons/24/gtk-justify-right.png \ -- stock-icons/24/gtk-leave-fullscreen.png \ -- stock-icons/24/gtk-media-forward-ltr.png \ -- stock-icons/24/gtk-media-next-ltr.png \ -- stock-icons/24/gtk-media-pause.png \ -- stock-icons/24/gtk-media-play-ltr.png \ -- stock-icons/24/gtk-media-play-rtl.png \ -- stock-icons/24/gtk-media-previous-ltr.png \ -- stock-icons/24/gtk-media-record.png \ -- stock-icons/24/gtk-media-rewind-ltr.png \ -- stock-icons/24/gtk-media-stop.png \ -- stock-icons/24/gtk-missing-image.png \ -- stock-icons/24/gtk-network.png \ -- stock-icons/24/gtk-new.png \ -- stock-icons/24/gtk-open.png \ -- stock-icons/24/gtk-orientation-reverse-landscape.png \ -- stock-icons/24/gtk-orientation-landscape.png \ -- stock-icons/24/gtk-orientation-reverse-portrait.png \ -- stock-icons/24/gtk-orientation-portrait.png \ -- stock-icons/24/gtk-page-setup.png \ -- stock-icons/24/gtk-paste.png \ -- stock-icons/24/gtk-preferences.png \ -- stock-icons/24/gtk-print.png \ -- stock-icons/24/gtk-print-error.png \ -- stock-icons/24/gtk-print-paused.png \ -- stock-icons/24/gtk-print-preview.png \ -- stock-icons/24/gtk-print-report.png \ -- stock-icons/24/gtk-print-warning.png \ -- stock-icons/24/gtk-properties.png \ -- stock-icons/24/gtk-quit.png \ -- stock-icons/24/gtk-redo-ltr.png \ -- stock-icons/24/gtk-redo-rtl.png \ -- stock-icons/24/gtk-refresh.png \ -- stock-icons/24/gtk-remove.png \ -- stock-icons/24/gtk-revert-to-saved-ltr.png \ -- stock-icons/24/gtk-revert-to-saved-rtl.png \ -- stock-icons/24/gtk-select-font.png \ -- stock-icons/24/gtk-save-as.png \ -- stock-icons/24/gtk-floppy.png \ -- stock-icons/24/gtk-select-all.png \ -- stock-icons/24/gtk-select-color.png \ -- stock-icons/24/gtk-sort-ascending.png \ -- stock-icons/24/gtk-sort-descending.png \ -- stock-icons/24/gtk-spell-check.png \ -- stock-icons/24/gtk-stop.png \ -- stock-icons/24/gtk-strikethrough.png \ -- stock-icons/24/gtk-delete.png \ -- stock-icons/24/gtk-undelete-ltr.png \ -- stock-icons/24/gtk-undelete-rtl.png \ -- stock-icons/24/gtk-underline.png \ -- stock-icons/24/gtk-undo-ltr.png \ -- stock-icons/24/gtk-undo-rtl.png \ -- stock-icons/24/gtk-unindent-ltr.png \ -- stock-icons/24/gtk-unindent-rtl.png \ -- stock-icons/24/gtk-zoom-100.png \ -- stock-icons/24/gtk-zoom-fit.png \ -- stock-icons/24/gtk-zoom-in.png \ -- stock-icons/24/gtk-zoom-out.png \ -- stock-icons/24/gtk-go-forward-ltr.png \ -- stock-icons/32/gtk-dnd-multiple.png \ -- stock-icons/32/gtk-dnd.png \ -- stock-icons/48/gtk-dialog-authentication.png \ -- stock-icons/48/gtk-dialog-error.png \ -- stock-icons/48/gtk-dialog-info.png \ -- stock-icons/48/gtk-dialog-question.png \ -- stock-icons/48/gtk-dialog-warning.png -+bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \ -+ gtk-update-icon-cache$(EXEEXT) -+subdir = gtk -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ -+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gtkincludedir)" \ -+ "$(DESTDIR)$(gtkunixprintincludedir)" -+libLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(lib_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+@HAVE_INCLUDED_IMMMODULES_TRUE@am__DEPENDENCIES_2 = \ -+@HAVE_INCLUDED_IMMMODULES_TRUE@ $(am__DEPENDENCIES_1) -+am__DEPENDENCIES_3 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) -+am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ -+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ -+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -+ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -+ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ -+ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ -+ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ -+ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ -+ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ -+ gtkcellrendererprogress.c gtkcellrendererspin.c \ -+ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -+ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ -+ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ -+ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ -+ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ -+ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ -+ gtkfilechooserbutton.c gtkfilechooserdefault.c \ -+ gtkfilechooserdialog.c gtkfilechooserembed.c \ -+ gtkfilechooserentry.c gtkfilechoosersettings.c \ -+ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -+ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -+ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ -+ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ -+ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -+ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ -+ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ -+ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ -+ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ -+ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ -+ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ -+ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ -+ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ -+ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ -+ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ -+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ -+ gtkprintoperation.c gtkprintoperationpreview.c \ -+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ -+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ -+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ -+ gtkrecentaction.c gtkrecentchooserdefault.c \ -+ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ -+ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ -+ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -+ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ -+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ -+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ -+ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ -+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ -+ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ -+ gtktextbuffer.c gtktextbufferrichtext.c \ -+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -+ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ -+ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ -+ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ -+ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ -+ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -+ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -+ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -+ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -+ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -+ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ -+ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ -+ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ -+ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ -+ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ -+ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ -+ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ -+ gtkprinteroption.c gtkprinteroptionset.c \ -+ gtkprinteroptionwidget.c gtkprintjob.c \ -+ gtkprintoperation-unix.c gtkprintunixdialog.c \ -+ gtkprintbackend.c gtksearchenginebeagle.c \ -+ gtksearchenginetracker.c gtkprint-win32.c \ -+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ -+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ -+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c -+@USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo -+@USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo \ -+@USE_QUARTZ_TRUE@ gtkdnd-quartz.lo gtkquartz.lo -+am__objects_2 = gtkquery.lo gtksearchengine.lo \ -+ gtksearchenginesimple.lo fnmatch.lo gtkaboutdialog.lo \ -+ gtkaccelgroup.lo gtkaccellabel.lo gtkaccelmap.lo \ -+ gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \ -+ gtkadjustment.lo gtkalignment.lo gtkarrow.lo gtkaspectframe.lo \ -+ gtkassistant.lo gtkbbox.lo gtkbin.lo gtkbindings.lo gtkbox.lo \ -+ gtkbuildable.lo gtkbuilder.lo gtkbuilderparser.lo gtkbutton.lo \ -+ gtkcalendar.lo gtkcelleditable.lo gtkcelllayout.lo \ -+ gtkcellrenderer.lo gtkcellrendereraccel.lo \ -+ gtkcellrenderercombo.lo gtkcellrendererpixbuf.lo \ -+ gtkcellrendererprogress.lo gtkcellrendererspin.lo \ -+ gtkcellrenderertext.lo gtkcellrenderertoggle.lo gtkcellview.lo \ -+ gtkcheckbutton.lo gtkcheckmenuitem.lo gtkcolorbutton.lo \ -+ gtkcolorsel.lo gtkcolorseldialog.lo gtkcombobox.lo \ -+ gtkcomboboxentry.lo gtkcontainer.lo gtkcurve.lo gtkdialog.lo \ -+ gtkdrawingarea.lo gtkeditable.lo gtkentry.lo \ -+ gtkentrycompletion.lo gtkeventbox.lo gtkexpander.lo \ -+ gtkfilechooser.lo gtkfilechooserbutton.lo \ -+ gtkfilechooserdefault.lo gtkfilechooserdialog.lo \ -+ gtkfilechooserembed.lo gtkfilechooserentry.lo \ -+ gtkfilechoosersettings.lo gtkfilechooserutils.lo \ -+ gtkfilechooserwidget.lo gtkfilefilter.lo gtkfilesystem.lo \ -+ gtkfilesystemmodel.lo gtkfixed.lo gtkfontbutton.lo \ -+ gtkfontsel.lo gtkframe.lo gtkgamma.lo gtkgc.lo gtkhandlebox.lo \ -+ gtkhbbox.lo gtkhbox.lo gtkhpaned.lo gtkhruler.lo gtkhscale.lo \ -+ gtkhscrollbar.lo gtkhseparator.lo gtkhsv.lo gtkiconcache.lo \ -+ gtkiconcachevalidator.lo gtkiconfactory.lo gtkicontheme.lo \ -+ gtkiconview.lo gtkimage.lo gtkimagemenuitem.lo gtkimcontext.lo \ -+ gtkimcontextsimple.lo gtkimmodule.lo gtkimmulticontext.lo \ -+ gtkinputdialog.lo gtkinvisible.lo gtkitem.lo gtkkeyhash.lo \ -+ gtklabel.lo gtklayout.lo gtklinkbutton.lo gtkliststore.lo \ -+ gtkmain.lo gtkmarshal.lo gtkmarshalers.lo gtkmenu.lo \ -+ gtkmenubar.lo gtkmenuitem.lo gtkmenushell.lo \ -+ gtkmenutoolbutton.lo gtkmessagedialog.lo gtkmisc.lo \ -+ gtkmnemonichash.lo gtkmodules.lo gtkmountoperation.lo \ -+ gtknotebook.lo gtkobject.lo gtkpagesetup.lo gtkpaned.lo \ -+ gtkpapersize.lo gtkpathbar.lo gtkplug.lo gtkprintcontext.lo \ -+ gtkprintoperation.lo gtkprintoperationpreview.lo \ -+ gtkprintsettings.lo gtkprintutils.lo gtkprogressbar.lo \ -+ gtkradioaction.lo gtkradiobutton.lo gtkradiomenuitem.lo \ -+ gtkradiotoolbutton.lo gtkrange.lo gtkrbtree.lo gtkrc.lo \ -+ gtkrecentaction.lo gtkrecentchooserdefault.lo \ -+ gtkrecentchooserdialog.lo gtkrecentchoosermenu.lo \ -+ gtkrecentchooserwidget.lo gtkrecentchooserutils.lo \ -+ gtkrecentchooser.lo gtkrecentfilter.lo gtkrecentmanager.lo \ -+ gtkruler.lo gtkscale.lo gtkscalebutton.lo gtkscrollbar.lo \ -+ gtkscrolledwindow.lo gtkselection.lo gtkseparator.lo \ -+ gtkseparatormenuitem.lo gtkseparatortoolitem.lo gtksettings.lo \ -+ gtksizegroup.lo gtkshow.lo gtksocket.lo gtkspinbutton.lo \ -+ gtkstatusbar.lo gtkstatusicon.lo gtkstock.lo gtkstyle.lo \ -+ gtktable.lo gtktearoffmenuitem.lo gtktestutils.lo \ -+ gtktextbtree.lo gtktextbuffer.lo gtktextbufferrichtext.lo \ -+ gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \ -+ gtktextiter.lo gtktextlayout.lo gtktextmark.lo \ -+ gtktextsegment.lo gtktexttag.lo gtktexttagtable.lo \ -+ gtktexttypes.lo gtktextutil.lo gtktextview.lo gtkthemes.lo \ -+ gtktoggleaction.lo gtktogglebutton.lo gtktoggletoolbutton.lo \ -+ gtktoolbar.lo gtktoolbutton.lo gtktoolitem.lo gtktoolshell.lo \ -+ gtktooltip.lo gtktreedatalist.lo gtktreednd.lo gtktreemodel.lo \ -+ gtktreemodelfilter.lo gtktreemodelsort.lo gtktreeselection.lo \ -+ gtktreesortable.lo gtktreestore.lo gtktreeview.lo \ -+ gtktreeviewcolumn.lo gtktypebuiltins.lo gtktypeutils.lo \ -+ gtkuimanager.lo gtkvbbox.lo gtkvbox.lo gtkvolumebutton.lo \ -+ gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \ -+ gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \ -+ gtkwindow-decorate.lo gtkwindow.lo $(am__objects_1) gtktext.lo \ -+ gtktree.lo gtktreeitem.lo gtkclist.lo gtkcombo.lo gtkctree.lo \ -+ gtkfilesel.lo gtkitemfactory.lo gtklist.lo gtklistitem.lo \ -+ gtkoldeditable.lo gtkoptionmenu.lo gtkpixmap.lo gtkpreview.lo \ -+ gtkprogress.lo gtksignal.lo gtktipsquery.lo gtktooltips.lo -+am__objects_3 = gtkpagesetupunixdialog.lo gtkprinter.lo \ -+ gtkprinteroption.lo gtkprinteroptionset.lo \ -+ gtkprinteroptionwidget.lo gtkprintjob.lo \ -+ gtkprintoperation-unix.lo gtkprintunixdialog.lo \ -+ gtkprintbackend.lo gtksearchenginebeagle.lo \ -+ gtksearchenginetracker.lo -+@OS_UNIX_TRUE@am__objects_4 = $(am__objects_3) -+am__objects_5 = gtkprint-win32.lo gtkprintoperation-win32.lo -+@OS_WIN32_TRUE@am__objects_6 = $(am__objects_5) -+am__objects_7 = gtkplug-x11.lo gtksocket-x11.lo gtkxembed.lo \ -+ gtktrayicon-x11.lo -+@USE_X11_TRUE@am__objects_8 = $(am__objects_7) -+am__objects_9 = gtkplug-win32.lo gtksocket-win32.lo gtkwin32embed.lo \ -+ gtkwin32embedwidget.lo -+@USE_WIN32_TRUE@@USE_X11_FALSE@am__objects_10 = $(am__objects_9) -+am__objects_11 = gtksearchenginequartz.lo gtkplug-stub.lo \ -+ gtksocket-stub.lo -+@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_12 = $(am__objects_11) -+am__objects_13 = gtkplug-stub.lo gtksocket-stub.lo -+@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_14 = $(am__objects_13) -+am__objects_15 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \ -+ $(am__objects_8) $(am__objects_10) $(am__objects_12) \ -+ $(am__objects_14) -+am_libgtk_directfb_2_0_la_OBJECTS = $(am__objects_15) -+libgtk_directfb_2_0_la_OBJECTS = $(am_libgtk_directfb_2_0_la_OBJECTS) -+libgtk_directfb_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgtk_directfb_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+am__libgtk_quartz_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ -+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ -+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -+ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -+ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ -+ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ -+ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ -+ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ -+ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ -+ gtkcellrendererprogress.c gtkcellrendererspin.c \ -+ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -+ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ -+ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ -+ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ -+ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ -+ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ -+ gtkfilechooserbutton.c gtkfilechooserdefault.c \ -+ gtkfilechooserdialog.c gtkfilechooserembed.c \ -+ gtkfilechooserentry.c gtkfilechoosersettings.c \ -+ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -+ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -+ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ -+ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ -+ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -+ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ -+ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ -+ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ -+ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ -+ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ -+ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ -+ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ -+ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ -+ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ -+ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ -+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ -+ gtkprintoperation.c gtkprintoperationpreview.c \ -+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ -+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ -+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ -+ gtkrecentaction.c gtkrecentchooserdefault.c \ -+ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ -+ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ -+ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -+ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ -+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ -+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ -+ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ -+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ -+ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ -+ gtktextbuffer.c gtktextbufferrichtext.c \ -+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -+ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ -+ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ -+ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ -+ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ -+ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -+ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -+ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -+ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -+ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -+ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ -+ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ -+ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ -+ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ -+ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ -+ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ -+ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ -+ gtkprinteroption.c gtkprinteroptionset.c \ -+ gtkprinteroptionwidget.c gtkprintjob.c \ -+ gtkprintoperation-unix.c gtkprintunixdialog.c \ -+ gtkprintbackend.c gtksearchenginebeagle.c \ -+ gtksearchenginetracker.c gtkprint-win32.c \ -+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ -+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ -+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c -+am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_15) -+libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS) -+libgtk_quartz_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgtk_quartz_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+am__libgtk_win32_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ -+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ -+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -+ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -+ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ -+ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ -+ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ -+ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ -+ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ -+ gtkcellrendererprogress.c gtkcellrendererspin.c \ -+ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -+ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ -+ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ -+ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ -+ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ -+ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ -+ gtkfilechooserbutton.c gtkfilechooserdefault.c \ -+ gtkfilechooserdialog.c gtkfilechooserembed.c \ -+ gtkfilechooserentry.c gtkfilechoosersettings.c \ -+ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -+ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -+ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ -+ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ -+ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -+ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ -+ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ -+ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ -+ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ -+ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ -+ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ -+ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ -+ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ -+ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ -+ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ -+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ -+ gtkprintoperation.c gtkprintoperationpreview.c \ -+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ -+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ -+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ -+ gtkrecentaction.c gtkrecentchooserdefault.c \ -+ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ -+ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ -+ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -+ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ -+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ -+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ -+ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ -+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ -+ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ -+ gtktextbuffer.c gtktextbufferrichtext.c \ -+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -+ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ -+ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ -+ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ -+ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ -+ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -+ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -+ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -+ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -+ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -+ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ -+ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ -+ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ -+ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ -+ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ -+ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ -+ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ -+ gtkprinteroption.c gtkprinteroptionset.c \ -+ gtkprinteroptionwidget.c gtkprintjob.c \ -+ gtkprintoperation-unix.c gtkprintunixdialog.c \ -+ gtkprintbackend.c gtksearchenginebeagle.c \ -+ gtksearchenginetracker.c gtkprint-win32.c \ -+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ -+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ -+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c -+am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15) -+libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS) -+libgtk_win32_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgtk_win32_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ -+ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ -+ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -+ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -+ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ -+ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ -+ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ -+ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ -+ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ -+ gtkcellrendererprogress.c gtkcellrendererspin.c \ -+ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -+ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ -+ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ -+ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ -+ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ -+ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ -+ gtkfilechooserbutton.c gtkfilechooserdefault.c \ -+ gtkfilechooserdialog.c gtkfilechooserembed.c \ -+ gtkfilechooserentry.c gtkfilechoosersettings.c \ -+ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -+ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -+ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ -+ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ -+ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -+ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ -+ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ -+ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ -+ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ -+ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ -+ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ -+ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ -+ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ -+ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ -+ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ -+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ -+ gtkprintoperation.c gtkprintoperationpreview.c \ -+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ -+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ -+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ -+ gtkrecentaction.c gtkrecentchooserdefault.c \ -+ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ -+ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ -+ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -+ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ -+ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ -+ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ -+ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ -+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ -+ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ -+ gtktextbuffer.c gtktextbufferrichtext.c \ -+ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -+ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -+ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -+ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ -+ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ -+ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ -+ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ -+ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -+ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -+ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -+ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -+ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -+ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ -+ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ -+ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ -+ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ -+ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ -+ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ -+ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ -+ gtkprinteroption.c gtkprinteroptionset.c \ -+ gtkprinteroptionwidget.c gtkprintjob.c \ -+ gtkprintoperation-unix.c gtkprintunixdialog.c \ -+ gtkprintbackend.c gtksearchenginebeagle.c \ -+ gtksearchenginetracker.c gtkprint-win32.c \ -+ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -+ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ -+ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ -+ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c -+am_libgtk_x11_2_0_la_OBJECTS = $(am__objects_15) -+libgtk_x11_2_0_la_OBJECTS = $(am_libgtk_x11_2_0_la_OBJECTS) -+libgtk_x11_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libgtk_x11_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ -+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+PROGRAMS = $(bin_PROGRAMS) -+am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT) -+gtk_query_immodules_2_0_OBJECTS = \ -+ $(am_gtk_query_immodules_2_0_OBJECTS) -+am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(top_builddir)/gdk/$(gdktargetlib) -+am_gtk_update_icon_cache_OBJECTS = updateiconcache.$(OBJEXT) -+gtk_update_icon_cache_OBJECTS = $(am_gtk_update_icon_cache_OBJECTS) -+gtk_update_icon_cache_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -+SCRIPTS = $(bin_SCRIPTS) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libgtk_directfb_2_0_la_SOURCES) \ -+ $(libgtk_quartz_2_0_la_SOURCES) $(libgtk_win32_2_0_la_SOURCES) \ -+ $(libgtk_x11_2_0_la_SOURCES) \ -+ $(gtk_query_immodules_2_0_SOURCES) \ -+ $(gtk_update_icon_cache_SOURCES) -+DIST_SOURCES = $(am__libgtk_directfb_2_0_la_SOURCES_DIST) \ -+ $(am__libgtk_quartz_2_0_la_SOURCES_DIST) \ -+ $(am__libgtk_win32_2_0_la_SOURCES_DIST) \ -+ $(am__libgtk_x11_2_0_la_SOURCES_DIST) \ -+ $(gtk_query_immodules_2_0_SOURCES) \ -+ $(gtk_update_icon_cache_SOURCES) -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+DATA = $(noinst_DATA) -+gtkincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+am__gtkunixprintinclude_HEADERS_DIST = gtkpagesetupunixdialog.h \ -+ gtkprintunixdialog.h gtkprinter.h gtkprintjob.h gtkunixprint.h -+gtkunixprintincludeHEADERS_INSTALL = $(INSTALL_HEADER) -+HEADERS = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AS = @AS@ -+ATK_PREFIX = @ATK_PREFIX@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ -+BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ -+CAIRO_PREFIX = @CAIRO_PREFIX@ -+CATALOGS = @CATALOGS@ -+CATOBJEXT = @CATOBJEXT@ -+CC = @CC@ -+CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ -+CCASFLAGS = @CCASFLAGS@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CUPS_API_MAJOR = @CUPS_API_MAJOR@ -+CUPS_API_MINOR = @CUPS_API_MINOR@ -+CUPS_CFLAGS = @CUPS_CFLAGS@ -+CUPS_CONFIG = @CUPS_CONFIG@ -+CUPS_LIBS = @CUPS_LIBS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DATADIRNAME = @DATADIRNAME@ -+DB2HTML = @DB2HTML@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+DLLTOOL = @DLLTOOL@ -+DSYMUTIL = @DSYMUTIL@ -+ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+GAIL_INET_LIBS = @GAIL_INET_LIBS@ -+GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ -+GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -+GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ -+GDK_DEP_LIBS = @GDK_DEP_LIBS@ -+GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ -+GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@ -+GDK_PACKAGES = @GDK_PACKAGES@ -+GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ -+GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@ -+GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@ -+GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@ -+GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@ -+GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@ -+GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@ -+GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@ -+GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@ -+GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@ -+GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@ -+GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@ -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ -+GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ -+GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +diff -urN gtk+2.0-2.14.4.old/gtk/Makefile.in gtk+2.0-2.14.4/gtk/Makefile.in +--- gtk+2.0-2.14.4.old/gtk/Makefile.in 2008-10-17 01:07:17.000000000 -0300 ++++ gtk+2.0-2.14.4/gtk/Makefile.in 2008-11-04 15:37:08.000000000 -0200 +@@ -117,6 +117,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@ +@@ -143,6 +145,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ -+GDK_WLIBS = @GDK_WLIBS@ -+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -+GLIB_CFLAGS = @GLIB_CFLAGS@ -+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -+GLIB_LIBS = @GLIB_LIBS@ -+GLIB_MKENUMS = @GLIB_MKENUMS@ -+GLIB_PREFIX = @GLIB_PREFIX@ -+GMOFILES = @GMOFILES@ -+GMSGFMT = @GMSGFMT@ -+GOBJECT_QUERY = @GOBJECT_QUERY@ -+GREP = @GREP@ -+GTKDOC_CHECK = @GTKDOC_CHECK@ -+GTK_API_VERSION = @GTK_API_VERSION@ -+GTK_BINARY_AGE = @GTK_BINARY_AGE@ -+GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ -+GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ -+GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ -+GTK_DEP_LIBS = @GTK_DEP_LIBS@ -+GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ -+GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ -+GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -+GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@ -+GTK_MICRO_VERSION = @GTK_MICRO_VERSION@ -+GTK_MINOR_VERSION = @GTK_MINOR_VERSION@ -+GTK_PACKAGES = @GTK_PACKAGES@ -+GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ -+GTK_VERSION = @GTK_VERSION@ -+GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ -+HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ -+HTML_DIR = @HTML_DIR@ -+INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ -+INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ -+INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ -+INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ -+INDENT = @INDENT@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+INSTOBJEXT = @INSTOBJEXT@ -+INTLLIBS = @INTLLIBS@ -+LDFLAGS = @LDFLAGS@ -+LIBJASPER = @LIBJASPER@ -+LIBJPEG = @LIBJPEG@ -+LIBOBJS = @LIBOBJS@ -+LIBPNG = @LIBPNG@ -+LIBS = @LIBS@ -+LIBTIFF = @LIBTIFF@ -+LIBTOOL = @LIBTOOL@ -+LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ -+LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ -+LT_VERSION_INFO = @LT_VERSION_INFO@ -+MAINT = @MAINT@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+MKINSTALLDIRS = @MKINSTALLDIRS@ -+MSGFMT = @MSGFMT@ -+MSGFMT_OPTS = @MSGFMT_OPTS@ -+NM = @NM@ -+NMEDIT = @NMEDIT@ -+OBJDUMP = @OBJDUMP@ -+OBJEXT = @OBJEXT@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PANGO_PREFIX = @PANGO_PREFIX@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PERL = @PERL@ -+PKG_CONFIG = @PKG_CONFIG@ -+POFILES = @POFILES@ -+POSUB = @POSUB@ -+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -+RANLIB = @RANLIB@ -+REBUILD = @REBUILD@ -+REBUILD_PNGS = @REBUILD_PNGS@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+USE_NLS = @USE_NLS@ -+VERSION = @VERSION@ -+WINDRES = @WINDRES@ -+XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ -+XMLCATALOG = @XMLCATALOG@ -+XML_CATALOG_FILE = @XML_CATALOG_FILE@ -+XSLTPROC = @XSLTPROC@ -+X_CFLAGS = @X_CFLAGS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_LIBS = @X_LIBS@ -+X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+gdktarget = @gdktarget@ -+gdktargetlib = @gdktargetlib@ -+gtktargetlib = @gtktargetlib@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+ms_librarian = @ms_librarian@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ -+GTESTER = gtester # in $PATH for non-GLIB packages -+GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -+# initialize variables for unconditional += appending -+EXTRA_DIST = gtkquartz.h $(gtk_private_h_sources) $(gtk_extra_sources) \ -+ $(gtk_built_sources) $(STOCK_ICONS) $(STOCK_ICONS) \ -+ $(GENERATED_ICONS) line-arrow.xbm line-wrap.xbm tree_plus.xbm \ -+ tree_minus.xbm tree_minus.xpm tree_plus.xpm gtk.def \ -+ gtk-builder-convert gtk-win32.rc gtk-win32.rc.in \ -+ gtkwin32embed.h gtkwin32embedwidget.h gtkwin32embedwidget.c \ -+ gtkprint-win32.h gtkprint-win32.c gtksearchenginequartz.h \ -+ gtkrc.default gtkrc.key.default gtkrc.key.emacs makefile.msc \ -+ makefile.msc.in makegtkalias.pl aliasfilescheck.sh abicheck.sh \ -+ pltcheck.sh gtktypebuiltins.c.template \ -+ gtktypebuiltins.h.template -+TEST_PROGS = - --GENERATED_ICONS = \ -- stock-icons/16/gtk-go-back-rtl.png \ -- stock-icons/16/gtk-go-forward-rtl.png \ -- stock-icons/16/gtk-goto-first-rtl.png \ -- stock-icons/16/gtk-goto-last-rtl.png \ -- stock-icons/16/gtk-media-forward-rtl.png \ -- stock-icons/16/gtk-media-next-rtl.png \ -- stock-icons/16/gtk-media-previous-rtl.png \ -- stock-icons/16/gtk-media-rewind-rtl.png \ -- stock-icons/16/gtk-save.png \ -- stock-icons/16/drive-harddisk.png \ -- stock-icons/16/folder.png \ -- stock-icons/16/folder-remote.png \ -- stock-icons/16/user-home.png \ -- stock-icons/16/user-desktop.png \ -- stock-icons/16/text-x-generic.png \ -- stock-icons/24/gtk-go-back-rtl.png \ -- stock-icons/24/gtk-go-forward-rtl.png \ -- stock-icons/24/gtk-goto-first-rtl.png \ -- stock-icons/24/gtk-goto-last-rtl.png \ -- stock-icons/24/gtk-media-forward-rtl.png \ -- stock-icons/24/gtk-media-next-rtl.png \ -- stock-icons/24/gtk-media-previous-rtl.png \ -- stock-icons/24/gtk-media-rewind-rtl.png \ -- stock-icons/24/gtk-save.png \ -- stock-icons/24/drive-harddisk.png \ -- stock-icons/24/folder.png \ -- stock-icons/24/folder-remote.png \ -- stock-icons/24/user-home.png \ -- stock-icons/24/user-desktop.png \ -- stock-icons/24/text-x-generic.png -+### testing rules -+ -+# Xvfb based test rules -+XVFB = Xvfb -screen 0 800x600x16 -+XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ -+ 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ -+ 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ -+ 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ -+ 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ -+ 9995 9996 9997 9998 9999 - -+SKIP_GDKTARGET = \ -+ test "$(gdktarget)" != "x11" \ -+ && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." - --@CROSS_COMPILING_TRUE@gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) --@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ --@CROSS_COMPILING_FALSE@ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ --@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache -+XVFB_START = \ -+ ${XVFB} -help 2>/dev/null 1>&2 \ -+ && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ -+ && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ -+ trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ -+ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ -+ && DISPLAY=:$$XID && export DISPLAY - --subdir = gtk --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc --LTLIBRARIES = $(lib_LTLIBRARIES) -+@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f" - --am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ -- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ -- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -- gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -- gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ -- gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ -- gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ -- gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ -- gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ -- gtkcellrendererprogress.c gtkcellrendererspin.c \ -- gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -- gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ -- gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ -- gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ -- gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ -- gtkeventbox.c gtkexpander.c gtkfilechooser.c \ -- gtkfilechooserbutton.c gtkfilechooserdefault.c \ -- gtkfilechooserdialog.c gtkfilechooserembed.c \ -- gtkfilechooserentry.c gtkfilechoosersettings.c \ -- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ -- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ -- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ -- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ -- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ -- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ -- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ -- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ -- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ -- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ -- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ -- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ -- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ -- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ -- gtkprintcontext.c gtkprintoperation.c \ -- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ -- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ -- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ -- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ -- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ -- gtkrecentchooserwidget.c gtkrecentchooserutils.c \ -- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ -- gtkscrolledwindow.c gtkselection.c gtkseparator.c \ -- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ -- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ -- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ -- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ -- gtktextbuffer.c gtktextbufferrichtext.c \ -- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ -- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ -- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ -- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ -- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ -- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ -- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ -- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ -- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ -- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ -- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ -- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ -- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ -- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ -- gtksearchenginetracker.c gtkprint-win32.c \ -- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ -- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ -- gtkplug-stub.c gtksocket-stub.c --@USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo gtkdnd-quartz.lo \ --@USE_QUARTZ_TRUE@ gtkquartz.lo --@USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo --am__objects_2 = gtkquery.lo gtksearchengine.lo gtksearchenginesimple.lo \ -- fnmatch.lo gtkaboutdialog.lo gtkaccelgroup.lo gtkaccellabel.lo \ -- gtkaccelmap.lo gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \ -- gtkadjustment.lo gtkalignment.lo gtkarrow.lo gtkaspectframe.lo \ -- gtkassistant.lo gtkbbox.lo gtkbin.lo gtkbindings.lo gtkbox.lo \ -- gtkbuildable.lo gtkbuilder.lo gtkbuilderparser.lo gtkbutton.lo \ -- gtkcalendar.lo gtkcelleditable.lo gtkcelllayout.lo \ -- gtkcellrenderer.lo gtkcellrendereraccel.lo \ -- gtkcellrenderercombo.lo gtkcellrendererpixbuf.lo \ -- gtkcellrendererprogress.lo gtkcellrendererspin.lo \ -- gtkcellrenderertext.lo gtkcellrenderertoggle.lo gtkcellview.lo \ -- gtkcheckbutton.lo gtkcheckmenuitem.lo gtkcolorbutton.lo \ -- gtkcolorsel.lo gtkcolorseldialog.lo gtkcombobox.lo \ -- gtkcomboboxentry.lo gtkcontainer.lo gtkcurve.lo gtkdialog.lo \ -- gtkdrawingarea.lo gtkeditable.lo gtkentry.lo \ -- gtkentrycompletion.lo gtkeventbox.lo gtkexpander.lo \ -- gtkfilechooser.lo gtkfilechooserbutton.lo \ -- gtkfilechooserdefault.lo gtkfilechooserdialog.lo \ -- gtkfilechooserembed.lo gtkfilechooserentry.lo \ -- gtkfilechoosersettings.lo gtkfilechooserutils.lo \ -- gtkfilechooserwidget.lo gtkfilefilter.lo gtkfilesystem.lo \ -- gtkfilesystemmodel.lo gtkfixed.lo gtkfontbutton.lo \ -- gtkfontsel.lo gtkframe.lo gtkgamma.lo gtkgc.lo gtkhandlebox.lo \ -- gtkhbbox.lo gtkhbox.lo gtkhpaned.lo gtkhruler.lo gtkhscale.lo \ -- gtkhscrollbar.lo gtkhseparator.lo gtkhsv.lo gtkiconcache.lo \ -- gtkiconcachevalidator.lo gtkiconfactory.lo gtkicontheme.lo \ -- gtkiconview.lo gtkimage.lo gtkimagemenuitem.lo gtkimcontext.lo \ -- gtkimcontextsimple.lo gtkimmodule.lo gtkimmulticontext.lo \ -- gtkinputdialog.lo gtkinvisible.lo gtkitem.lo gtkkeyhash.lo \ -- gtklabel.lo gtklayout.lo gtklinkbutton.lo gtkliststore.lo \ -- gtkmain.lo gtkmarshal.lo gtkmarshalers.lo gtkmenu.lo \ -- gtkmenubar.lo gtkmenuitem.lo gtkmenushell.lo \ -- gtkmenutoolbutton.lo gtkmessagedialog.lo gtkmisc.lo \ -- gtkmnemonichash.lo gtkmodules.lo gtkmountoperation.lo \ -- gtknotebook.lo gtkobject.lo gtkpagesetup.lo gtkpaned.lo \ -- gtkpapersize.lo gtkpathbar.lo gtkplug.lo gtkprintcontext.lo \ -- gtkprintoperation.lo gtkprintoperationpreview.lo \ -- gtkprintsettings.lo gtkprintutils.lo gtkprogressbar.lo \ -- gtkradioaction.lo gtkradiobutton.lo gtkradiomenuitem.lo \ -- gtkradiotoolbutton.lo gtkrange.lo gtkrbtree.lo gtkrc.lo \ -- gtkrecentaction.lo gtkrecentchooserdefault.lo \ -- gtkrecentchooserdialog.lo gtkrecentchoosermenu.lo \ -- gtkrecentchooserwidget.lo gtkrecentchooserutils.lo \ -- gtkrecentchooser.lo gtkrecentfilter.lo gtkrecentmanager.lo \ -- gtkruler.lo gtkscale.lo gtkscalebutton.lo gtkscrollbar.lo \ -- gtkscrolledwindow.lo gtkselection.lo gtkseparator.lo \ -- gtkseparatormenuitem.lo gtkseparatortoolitem.lo gtksettings.lo \ -- gtksizegroup.lo gtkshow.lo gtksocket.lo gtkspinbutton.lo \ -- gtkstatusbar.lo gtkstatusicon.lo gtkstock.lo gtkstyle.lo \ -- gtktable.lo gtktearoffmenuitem.lo gtktestutils.lo \ -- gtktextbtree.lo gtktextbuffer.lo gtktextbufferrichtext.lo \ -- gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \ -- gtktextiter.lo gtktextlayout.lo gtktextmark.lo \ -- gtktextsegment.lo gtktexttag.lo gtktexttagtable.lo \ -- gtktexttypes.lo gtktextutil.lo gtktextview.lo gtkthemes.lo \ -- gtktoggleaction.lo gtktogglebutton.lo gtktoggletoolbutton.lo \ -- gtktoolbar.lo gtktoolbutton.lo gtktoolitem.lo gtktoolshell.lo \ -- gtktooltip.lo gtktreedatalist.lo gtktreednd.lo gtktreemodel.lo \ -- gtktreemodelfilter.lo gtktreemodelsort.lo gtktreeselection.lo \ -- gtktreesortable.lo gtktreestore.lo gtktreeview.lo \ -- gtktreeviewcolumn.lo gtktypebuiltins.lo gtktypeutils.lo \ -- gtkuimanager.lo gtkvbbox.lo gtkvbox.lo gtkvolumebutton.lo \ -- gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \ -- gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \ -- gtkwindow-decorate.lo gtkwindow.lo $(am__objects_1) gtktext.lo \ -- gtktree.lo gtktreeitem.lo gtkclist.lo gtkcombo.lo gtkctree.lo \ -- gtkfilesel.lo gtkitemfactory.lo gtklist.lo gtklistitem.lo \ -- gtkoldeditable.lo gtkoptionmenu.lo gtkpixmap.lo gtkpreview.lo \ -- gtkprogress.lo gtksignal.lo gtktipsquery.lo gtktooltips.lo --am__objects_3 = gtkpagesetupunixdialog.lo gtkprinter.lo \ -- gtkprinteroption.lo gtkprinteroptionset.lo \ -- gtkprinteroptionwidget.lo gtkprintjob.lo \ -- gtkprintoperation-unix.lo gtkprintunixdialog.lo \ -- gtkprintbackend.lo gtksearchenginebeagle.lo \ -- gtksearchenginetracker.lo --@OS_UNIX_TRUE@am__objects_4 = $(am__objects_3) --am__objects_5 = gtkprint-win32.lo gtkprintoperation-win32.lo --@OS_WIN32_TRUE@am__objects_6 = $(am__objects_5) --am__objects_7 = gtkplug-x11.lo gtksocket-x11.lo gtkxembed.lo \ -- gtktrayicon-x11.lo --@USE_X11_TRUE@am__objects_8 = $(am__objects_7) --am__objects_9 = gtkplug-win32.lo gtksocket-win32.lo gtkwin32embed.lo \ -- gtkwin32embedwidget.lo --@USE_WIN32_TRUE@@USE_X11_FALSE@am__objects_10 = $(am__objects_9) --am__objects_11 = gtksearchenginequartz.lo gtkplug-stub.lo \ -- gtksocket-stub.lo --@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_12 = \ --@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_11) --am__objects_13 = gtkplug-stub.lo gtksocket-stub.lo --@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_14 = \ --@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_13) --am__objects_15 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \ -- $(am__objects_8) $(am__objects_10) $(am__objects_12) \ -- $(am__objects_14) --am_libgtk_directfb_2_0_la_OBJECTS = $(am__objects_15) --libgtk_directfb_2_0_la_OBJECTS = $(am_libgtk_directfb_2_0_la_OBJECTS) --am__libgtk_quartz_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ -- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ -- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -- gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -- gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ -- gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ -- gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ -- gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ -- gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ -- gtkcellrendererprogress.c gtkcellrendererspin.c \ -- gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -- gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ -- gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ -- gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ -- gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ -- gtkeventbox.c gtkexpander.c gtkfilechooser.c \ -- gtkfilechooserbutton.c gtkfilechooserdefault.c \ -- gtkfilechooserdialog.c gtkfilechooserembed.c \ -- gtkfilechooserentry.c gtkfilechoosersettings.c \ -- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ -- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ -- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ -- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ -- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ -- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ -- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ -- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ -- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ -- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ -- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ -- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ -- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ -- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ -- gtkprintcontext.c gtkprintoperation.c \ -- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ -- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ -- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ -- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ -- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ -- gtkrecentchooserwidget.c gtkrecentchooserutils.c \ -- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ -- gtkscrolledwindow.c gtkselection.c gtkseparator.c \ -- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ -- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ -- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ -- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ -- gtktextbuffer.c gtktextbufferrichtext.c \ -- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ -- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ -- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ -- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ -- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ -- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ -- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ -- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ -- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ -- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ -- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ -- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ -- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ -- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ -- gtksearchenginetracker.c gtkprint-win32.c \ -- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ -- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ -- gtkplug-stub.c gtksocket-stub.c --am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_15) --libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS) --am__libgtk_win32_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ -- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ -- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ -- gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -- gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ -- gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ -- gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ -- gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ -- gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ -- gtkcellrendererprogress.c gtkcellrendererspin.c \ -- gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ -- gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ -- gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ -- gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ -- gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ -- gtkeventbox.c gtkexpander.c gtkfilechooser.c \ -- gtkfilechooserbutton.c gtkfilechooserdefault.c \ -- gtkfilechooserdialog.c gtkfilechooserembed.c \ -- gtkfilechooserentry.c gtkfilechoosersettings.c \ -- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ -- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ -- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ -- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ -- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ -- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ -- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ -- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ -- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ -- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ -- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ -- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ -- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ -- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ -- gtkprintcontext.c gtkprintoperation.c \ -- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ -- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ -- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ -- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ -- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ -- gtkrecentchooserwidget.c gtkrecentchooserutils.c \ -- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ -- gtkscrolledwindow.c gtkselection.c gtkseparator.c \ -- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ -- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ -- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ -- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ -- gtktextbuffer.c gtktextbufferrichtext.c \ -- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ -- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ -- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ -- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ -- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ -- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ -- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ -- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ -- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ -- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ -- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ -- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ -- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ -- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ -- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ -- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ -- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ -- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ -- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ -- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ -- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ -- gtksearchenginetracker.c gtkprint-win32.c \ -- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ -- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ -- gtkplug-stub.c gtksocket-stub.c --am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15) --libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS) --am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ -+# Makefile.am for gtk+/gtk -+@USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f" -+SUBDIRS = theme-bits . tests -+DIST_SUBDIRS = theme-bits tests -+@HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr -+@HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups -+INCLUDES = \ -+ -DG_LOG_DOMAIN=\"Gtk\" \ -+ -DGTK_LIBDIR=\"$(libdir)\" \ -+ -DGTK_DATADIR=\"$(datadir)\" \ -+ -DGTK_DATA_PREFIX=\"$(prefix)\" \ -+ -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DGTK_VERSION=\"$(GTK_VERSION)\" \ -+ -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ -+ -DGTK_HOST=\"$(host)\" \ -+ -DGTK_COMPILATION \ -+ -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \ -+ -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\" \ -+ -I$(top_builddir) \ -+ -I$(top_builddir)/gtk \ -+ -I$(top_srcdir) -I../gdk \ -+ -I$(top_srcdir)/gdk \ -+ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ -+ -DGDK_DISABLE_DEPRECATED \ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -489,6 +492,8 @@ + -I$(top_srcdir)/gdk \ + -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ + -DGDK_DISABLE_DEPRECATED \ + -DMAEMO_CHANGES \ + -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \ -+ -DGTK_DISABLE_DEPRECATED \ -+ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -+ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -+ $(GTK_DEBUG_FLAGS) \ -+ $(GTK_DEP_CFLAGS) \ -+ $(gtk_clipboard_dnd_c_sources_CFLAGS) \ -+ $(INCLUDED_IMMODULE_DEFINE) -+ -+gtarget = $(gdktarget) -+@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -+@OS_WIN32_TRUE@gtk_def = gtk.def -+@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def -+@OS_WIN32_TRUE@gtk_win32_res = gtk-win32-res.o -+@OS_WIN32_TRUE@gtk_win32_res_ldflag = -Wl,gtk-win32-res.o -+@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib -+TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)" -+TESTS = aliasfilescheck.sh $(am__append_1) -+libgtkincludedir = $(includedir)/gtk-2.0/gtk -+libadd = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(top_builddir)/gdk/$(gdktargetlib) $(GTK_DEP_LIBS) \ -+ $(am__append_2) -+deps = $(am__append_3) -+ -+# libtool stuff: set version and export symbols for resolving -+# since automake doesn't support conditionalized libsomething_la_LDFLAGS -+# we use the general approach here -+libtool_opts = \ -+ -version-info $(LT_VERSION_INFO) \ -+ -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \ -+ -rpath $(libdir) $(libgtk_target_ldflags) -+ -+ -+# -+# setup source file variables -+# -+ -+# GTK+ header files for public installation (non-generated, or generated -+# by configure) -+ -+# Broken -+ -+# Deprecated -+gtk_public_h_sources = gtk.h gtkaboutdialog.h gtkaccelgroup.h \ -+ gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkaction.h \ -+ gtkactiongroup.h gtkadjustment.h gtkalignment.h gtkarrow.h \ -+ gtkaspectframe.h gtkassistant.h gtkbbox.h gtkbin.h \ -+ gtkbindings.h gtkbox.h gtkbuilder.h gtkbuildable.h gtkbutton.h \ -+ gtkcalendar.h gtkcelleditable.h gtkcelllayout.h \ -+ gtkcellrenderer.h gtkcellrendereraccel.h \ -+ gtkcellrenderercombo.h gtkcellrendererpixbuf.h \ -+ gtkcellrendererprogress.h gtkcellrendererspin.h \ -+ gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcellview.h \ -+ gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h \ -+ gtkcolorbutton.h gtkcolorsel.h gtkcolorseldialog.h \ -+ gtkcombobox.h gtkcomboboxentry.h gtkcontainer.h gtkcurve.h \ -+ gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h \ -+ gtkentry.h gtkentrycompletion.h gtkenums.h gtkeventbox.h \ -+ gtkexpander.h gtkfilechooser.h gtkfilechooserbutton.h \ -+ gtkfilechooserdialog.h gtkfilechooserwidget.h gtkfilefilter.h \ -+ gtkfixed.h gtkfontbutton.h gtkfontsel.h gtkframe.h gtkgamma.h \ -+ gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h \ -+ gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h \ -+ gtkhsv.h gtkiconfactory.h gtkicontheme.h gtkiconview.h \ -+ gtkimage.h gtkimagemenuitem.h gtkimcontext.h \ -+ gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h \ -+ gtkinputdialog.h gtkinvisible.h gtkitem.h gtklabel.h \ -+ gtklayout.h gtklinkbutton.h gtkliststore.h gtkmain.h gtkmenu.h \ -+ gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmenutoolbutton.h \ -+ gtkmessagedialog.h gtkmisc.h gtkmodules.h gtkmountoperation.h \ -+ gtknotebook.h gtkobject.h gtkpagesetup.h gtkpaned.h \ -+ gtkpapersize.h gtkplug.h gtkprintcontext.h gtkprintoperation.h \ -+ gtkprintoperationpreview.h gtkprintsettings.h gtkprivate.h \ -+ gtkprogressbar.h gtkradioaction.h gtkradiobutton.h \ -+ gtkradiomenuitem.h gtkradiotoolbutton.h gtkrange.h gtkrc.h \ -+ gtkrecentaction.h gtkrecentchooser.h gtkrecentchooserdialog.h \ -+ gtkrecentchoosermenu.h gtkrecentchooserwidget.h \ -+ gtkrecentfilter.h gtkrecentmanager.h gtkruler.h gtkscale.h \ -+ gtkscalebutton.h gtkscrollbar.h gtkscrolledwindow.h \ -+ gtkselection.h gtkseparator.h gtkseparatormenuitem.h \ -+ gtkseparatortoolitem.h gtkshow.h gtksettings.h gtksizegroup.h \ -+ gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstatusicon.h \ -+ gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h \ -+ gtktestutils.h gtktextbuffer.h gtktextbufferrichtext.h \ -+ gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextmark.h \ -+ gtktexttag.h gtktexttagtable.h gtktextview.h gtktoggleaction.h \ -+ gtktogglebutton.h gtktoggletoolbutton.h gtktoolbar.h \ -+ gtktoolbutton.h gtktoolitem.h gtktoolshell.h gtktooltip.h \ -+ gtktreednd.h gtktreemodel.h gtktreemodelfilter.h \ -+ gtktreemodelsort.h gtktreeselection.h gtktreesortable.h \ -+ gtktreestore.h gtktreeview.h gtktreeviewcolumn.h \ -+ gtktypeutils.h gtkuimanager.h gtkvbbox.h gtkvbox.h \ -+ gtkviewport.h gtkvolumebutton.h gtkvpaned.h gtkvruler.h \ -+ gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h \ -+ gtkwindow.h gtktext.h gtktree.h gtktreeitem.h gtkclist.h \ -+ gtkcombo.h gtkctree.h gtkfilesel.h gtkitemfactory.h gtklist.h \ -+ gtklistitem.h gtkoldeditable.h gtkoptionmenu.h gtkpixmap.h \ -+ gtkpreview.h gtkprogress.h gtksignal.h gtktipsquery.h \ -+ gtktooltips.h -+@OS_UNIX_TRUE@gtk_unix_print_public_h_sources = \ -+@OS_UNIX_TRUE@ gtkpagesetupunixdialog.h \ -+@OS_UNIX_TRUE@ gtkprintunixdialog.h \ -+@OS_UNIX_TRUE@ gtkprinter.h \ -+@OS_UNIX_TRUE@ gtkprintjob.h \ -+@OS_UNIX_TRUE@ gtkunixprint.h -+ -+ -+# Installed header files without compatibility guarantees -+# that are not included in gtk/gtk.h -+gtk_semi_private_h_sources = \ + -DGTK_DISABLE_DEPRECATED \ + -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ +@@ -757,13 +762,17 @@ + # Installed header files without compatibility guarantees + # that are not included in gtk/gtk.h + gtk_semi_private_h_sources = \ +- gtktextlayout.h + gtktextlayout.h \ + gtkfilesystem.h \ + gtkfilesystemmodel.h \ @@ -48158,1576 +61863,40 @@ Index: gtk+2.0-2.14.3/gtk/Makefile.in + gtkfilechooserutils.h \ + gtkquery.h \ + gtksearchengine.h -+ -+ -+# GTK+ header files that don't get installed -+gtk_private_h_sources = gtksearchenginesimple.h gtkdndcursors.h \ -+ gtkentryprivate.h gtkbuilderprivate.h gtkfilechooserdefault.h \ -+ gtkfilechooserembed.h gtkfilechooserentry.h \ -+ gtkfilechoosersettings.h gtkiconcache.h gtkintl.h gtkkeyhash.h \ -+ gtkmnemonichash.h gtkpathbar.h gtkplugprivate.h \ -+ gtkprintoperation-private.h gtkprintutils.h gtkrbtree.h \ -+ gtkrecentchooserdefault.h gtkrecentchooserprivate.h \ -+ gtkrecentchooserutils.h gtksocketprivate.h gtktextbtree.h \ -+ gtktextbufferserialize.h gtktextchildprivate.h \ -+ gtktextiterprivate.h gtktextmarkprivate.h gtktextsegment.h \ -+ gtktexttagprivate.h gtktexttypes.h gtktextutil.h gtkthemes.h \ -+ gtktoggleactionprivate.h gtktreedatalist.h gtktreeprivate.h \ -+ gtkwindow-decorate.h $(gtk_clipboard_dnd_h_sources) \ -+ $(am__append_4) $(am__append_6) $(am__append_8) \ -+ $(am__append_10) $(am__append_12) -+ -+# GTK+ C sources to build the library from -+gtk_base_c_sources = gtkquery.c gtksearchengine.c \ - gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ - gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ - gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -@@ -1830,25 +1024,26 @@ - gtkfilechooserdialog.c gtkfilechooserembed.c \ - gtkfilechooserentry.c gtkfilechoosersettings.c \ - gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ -- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ -- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ -- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ -- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ -- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ -- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ -- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ -- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ -- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ -- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ -- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ -- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ -- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ -- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ -- gtkprintcontext.c gtkprintoperation.c \ -- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ -- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ -- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ -- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ -+ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ -+ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ -+ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ -+ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ -+ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ -+ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ -+ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ -+ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ -+ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ -+ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ -+ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ -+ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ -+ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ -+ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ -+ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ -+ gtkprintoperation.c gtkprintoperationpreview.c \ -+ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ -+ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ -+ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ -+ gtkrecentaction.c gtkrecentchooserdefault.c \ - gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ - gtkrecentchooserwidget.c gtkrecentchooserutils.c \ - gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -@@ -1856,8 +1051,8 @@ - gtkscrolledwindow.c gtkselection.c gtkseparator.c \ - gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ - gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ -- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ -- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ -+ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ -+ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ - gtktextbuffer.c gtktextbufferrichtext.c \ - gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ - gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -@@ -1872,370 +1067,501 @@ - gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ - gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ - gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ -- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ -- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ -- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ -- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ -- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ -- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ -- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ -- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ -- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ -- gtksearchenginetracker.c gtkprint-win32.c \ -- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ -- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ -- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ -- gtkplug-stub.c gtksocket-stub.c --am_libgtk_x11_2_0_la_OBJECTS = $(am__objects_15) --libgtk_x11_2_0_la_OBJECTS = $(am_libgtk_x11_2_0_la_OBJECTS) --bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \ -- gtk-update-icon-cache$(EXEEXT) --PROGRAMS = $(bin_PROGRAMS) -+ $(gtk_clipboard_dnd_c_sources) gtktext.c gtktree.c \ -+ gtktreeitem.c gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c \ -+ gtkitemfactory.c gtklist.c gtklistitem.c gtkoldeditable.c \ -+ gtkoptionmenu.c gtkpixmap.c gtkpreview.c gtkprogress.c \ -+ gtksignal.c gtktipsquery.c gtktooltips.c -+gtk_c_sources = $(gtk_base_c_sources) $(am__append_5) $(am__append_7) \ -+ $(am__append_9) $(am__append_11) $(am__append_13) \ -+ $(am__append_14) -+gtk_all_c_sources = $(gtk_base_c_sources) $(gtk_os_unix_c_sources) \ -+ $(gtk_os_win32_c_sources) $(gtk_use_x11_c_sources) \ -+ $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) \ -+ $(gtk_use_stub_c_sources) -+gtk_os_unix_c_sources = \ -+ gtkpagesetupunixdialog.c \ -+ gtkprinter.c \ -+ gtkprinteroption.c \ -+ gtkprinteroptionset.c \ -+ gtkprinteroptionwidget.c \ -+ gtkprintjob.c \ -+ gtkprintoperation-unix.c \ -+ gtkprintunixdialog.c \ -+ gtkprintbackend.c \ -+ gtksearchenginebeagle.c \ -+ gtksearchenginetracker.c --am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT) --gtk_query_immodules_2_0_OBJECTS = $(am_gtk_query_immodules_2_0_OBJECTS) --gtk_query_immodules_2_0_LDFLAGS = --am_gtk_update_icon_cache_OBJECTS = updateiconcache.$(OBJEXT) --gtk_update_icon_cache_OBJECTS = $(am_gtk_update_icon_cache_OBJECTS) --gtk_update_icon_cache_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --gtk_update_icon_cache_LDFLAGS = --SCRIPTS = $(bin_SCRIPTS) -+gtk_os_win32_c_sources = \ -+ gtkprint-win32.c \ -+ gtkprintoperation-win32.c -+gtk_use_x11_c_sources = \ -+ gtkplug-x11.c \ -+ gtksocket-x11.c \ -+ gtkxembed.c \ -+ gtktrayicon-x11.c - --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fnmatch.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkaboutdialog.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkaccelgroup.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkaccellabel.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkaccelmap.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkaccessible.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkaction.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkactiongroup.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkadjustment.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkalignment.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkarrow.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkaspectframe.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkassistant.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkbbox.Plo ./$(DEPDIR)/gtkbin.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkbindings.Plo ./$(DEPDIR)/gtkbox.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkbuildable.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkbuilder.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkbuilderparser.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcalendar.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcelleditable.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcelllayout.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrenderer.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrendereraccel.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrenderercombo.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrendererpixbuf.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrendererprogress.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrendererspin.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrenderertext.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrenderertoggle.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellview.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcheckbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcheckmenuitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkclipboard-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkclipboard.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkclist.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcolorbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcolorsel.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcolorseldialog.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcombo.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcombobox.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcomboboxentry.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkcontainer.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkctree.Plo ./$(DEPDIR)/gtkcurve.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkdialog.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkdnd-quartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkdnd.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkdrawingarea.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkeditable.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkentry.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkentrycompletion.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkeventbox.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkexpander.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooser.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserdefault.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserdialog.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserembed.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserentry.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechoosersettings.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserutils.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserwidget.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilefilter.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesel.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesystem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesystemmodel.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfixed.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfontbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkfontsel.Plo ./$(DEPDIR)/gtkframe.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkgamma.Plo ./$(DEPDIR)/gtkgc.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkhandlebox.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkhbbox.Plo ./$(DEPDIR)/gtkhbox.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkhpaned.Plo ./$(DEPDIR)/gtkhruler.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkhscale.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkhscrollbar.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkhseparator.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkhsv.Plo ./$(DEPDIR)/gtkiconcache.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkiconcachevalidator.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkiconfactory.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkicontheme.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkiconview.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkimage.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkimagemenuitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkimcontext.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkimcontextsimple.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkimmodule.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkimmulticontext.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkinputdialog.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkinvisible.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkitemfactory.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkkeyhash.Plo ./$(DEPDIR)/gtklabel.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtklayout.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtklinkbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtklist.Plo ./$(DEPDIR)/gtklistitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkliststore.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmain.Plo ./$(DEPDIR)/gtkmarshal.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmarshalers.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmenu.Plo ./$(DEPDIR)/gtkmenubar.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmenuitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmenushell.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmenutoolbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmessagedialog.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmisc.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmnemonichash.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmodules.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkmountoperation.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtknotebook.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkobject.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkoldeditable.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkoptionmenu.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkpagesetup.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkpagesetupunixdialog.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkpaned.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkpapersize.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkpathbar.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkpixmap.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkplug-stub.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkplug-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkplug-x11.Plo ./$(DEPDIR)/gtkplug.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkpreview.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprint-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintbackend.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintcontext.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprinter.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprinteroption.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprinteroptionset.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprinteroptionwidget.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintjob.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintoperation-unix.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintoperation-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintoperation.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintoperationpreview.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintsettings.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintunixdialog.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintutils.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprogress.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprogressbar.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkquartz.Plo ./$(DEPDIR)/gtkquery.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkradioaction.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkradiobutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkradiomenuitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkradiotoolbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrange.Plo ./$(DEPDIR)/gtkrbtree.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrc.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentaction.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchooser.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchooserdefault.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchooserdialog.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchoosermenu.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchooserutils.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchooserwidget.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentfilter.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentmanager.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkruler.Plo ./$(DEPDIR)/gtkscale.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkscalebutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkscrollbar.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkscrolledwindow.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksearchengine.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksearchenginebeagle.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksearchenginequartz.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksearchenginesimple.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksearchenginetracker.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkselection.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkseparator.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkseparatormenuitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkseparatortoolitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksettings.Plo ./$(DEPDIR)/gtkshow.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksignal.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksizegroup.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket-stub.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket-win32.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkspinbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkstatusbar.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkstatusicon.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkstock.Plo ./$(DEPDIR)/gtkstyle.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktable.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktearoffmenuitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktestutils.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktext.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextbtree.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextbuffer.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextbufferrichtext.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextbufferserialize.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextchild.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextdisplay.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextiter.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextlayout.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextmark.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextsegment.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktexttag.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktexttagtable.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktexttypes.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextutil.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktextview.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkthemes.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktipsquery.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktoggleaction.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktogglebutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktoggletoolbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolbar.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolbutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolshell.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktooltip.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktooltips.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktrayicon-x11.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktree.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreedatalist.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreednd.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreeitem.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreemodel.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreemodelfilter.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreemodelsort.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreeselection.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreesortable.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreestore.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreeview.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktreeviewcolumn.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktypebuiltins.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtktypeutils.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkuimanager.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkvbbox.Plo ./$(DEPDIR)/gtkvbox.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkviewport.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkvolumebutton.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkvpaned.Plo ./$(DEPDIR)/gtkvruler.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkvscale.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkvscrollbar.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkvseparator.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkwidget.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkwin32embed.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkwin32embedwidget.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkwindow-decorate.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkwindow.Plo ./$(DEPDIR)/gtkxembed.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/queryimmodules.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/updateiconcache.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(am__libgtk_directfb_2_0_la_SOURCES_DIST) \ -- $(am__libgtk_quartz_2_0_la_SOURCES_DIST) \ -- $(am__libgtk_win32_2_0_la_SOURCES_DIST) \ -- $(am__libgtk_x11_2_0_la_SOURCES_DIST) \ -- $(gtk_query_immodules_2_0_SOURCES) \ -- $(gtk_update_icon_cache_SOURCES) --DATA = $(noinst_DATA) -+gtk_use_win32_c_sources = \ -+ gtkplug-win32.c \ -+ gtksocket-win32.c \ -+ gtkwin32embed.c \ -+ gtkwin32embedwidget.c - --HEADERS = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) -+gtk_use_quartz_c_sources = \ -+ gtksearchenginequartz.c \ -+ gtkplug-stub.c \ -+ gtksocket-stub.c -+ -+gtk_use_stub_c_sources = \ -+ gtkplug-stub.c \ -+ gtksocket-stub.c -+ -+@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c" -+@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c -+@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c -+@USE_QUARTZ_TRUE@gtk_clipboard_dnd_h_sources = gtkquartz.h -+@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources_CFLAGS = -+@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c" -+ -+# we use our own built_sources variable rules to avoid automake's -+# BUILT_SOURCES oddities -+# we generate frequently rebuild files piggyback on a stamp file, so sources -+# depending on them only get rebuild when the built source actually changed -+# content -+ -+# built sources that get installed with the header files -+gtk_built_public_sources = \ -+ gtkmarshal.h \ -+ gtktypebuiltins.h -+ -+ -+# built headers that don't get installed -+gtk_built_private_headers = \ -+ gtkalias.h \ -+ gtkmarshalers.h \ -+ gtkbuiltincache.h \ -+ gtkimcontextsimpleseqs.h -+ -+gtk_built_sources = \ -+ gtkaliasdef.c \ -+ gtktypebuiltins.c \ -+ gtktypefuncs.c \ -+ gtkmarshalers.c \ -+ gtkmarshal.c \ -+ ${gtk_built_private_headers} \ -+ ${gtk_built_public_sources} -+ -+stamp_files = \ -+ stamp-gtkmarshalers.h \ -+ stamp-gtkmarshal.h \ -+ stamp-gtktypebuiltins.h \ -+ stamp-icons -+ -+ -+# non-header sources (headers should be specified in the above variables) -+# that don't serve as direct make target sources, i.e. they don't have -+# their own .lo rules and don't get publically installed -+gtk_extra_sources = \ -+ paper_names.c \ -+ paper_names_offsets.c \ -+ gen-paper-names.c \ -+ gtkstatusicon-quartz.c \ -+ gtk.symbols \ -+ gtkversion.h.in \ -+ gtkmarshalers.list \ -+ gtkmarshal.list -+ -+ -+# -+# setup GTK+ sources and their dependencies -+# -+MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) -+EXTRA_HEADERS = -+ -+# -+# rules to generate built sources -+# -+# setup autogeneration dependencies -+gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf -+CLEANFILES = $(gen_sources) -+BUILT_SOURCES = $(gtk_built_sources) -+ -+# target platform: -+lib_LTLIBRARIES = $(gtktargetlib) -+gtkincludedir = $(includedir)/gtk-2.0/gtk -+gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h -+gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk -+gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) -+libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) -+libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources) -+libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources) -+libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) -+libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) -+libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid -+libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -+libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) -+libgtk_x11_2_0_la_LIBADD = $(libadd) -+libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -+libgtk_quartz_2_0_la_LIBADD = $(libadd) -+libgtk_directfb_2_0_la_LIBADD = $(libadd) -+libgtk_x11_2_0_la_DEPENDENCIES = $(deps) -+libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps) -+libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) -+libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) -+@USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) -+EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la -+DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) -+TEST_DEPS = $(DEPS) gtk.immodules -+LDADDS = \ -+ $(gtktargetlib) \ -+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(top_builddir)/gdk/$(gdktargetlib) -+ -+bin_SCRIPTS = gtk-builder-convert -+gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) -+gtk_query_immodules_2_0_LDADD = $(LDADDS) -+gtk_query_immodules_2_0_SOURCES = queryimmodules.c -+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+gtk_update_icon_cache_SOURCES = \ -+ updateiconcache.c -+ -+STOCK_ICONS = \ -+ stock-icons/16/document-open-recent.png \ -+ stock-icons/16/gtk-about.png \ -+ stock-icons/16/gtk-add.png \ -+ stock-icons/16/gtk-cdrom.png \ -+ stock-icons/16/gtk-close.png \ -+ stock-icons/16/gtk-connect.png \ -+ stock-icons/16/gtk-convert.png \ -+ stock-icons/16/gtk-copy.png \ -+ stock-icons/16/gtk-cut.png \ -+ stock-icons/16/gtk-delete.png \ -+ stock-icons/16/gtk-directory.png \ -+ stock-icons/16/gtk-disconnect.png \ -+ stock-icons/16/gtk-edit.png \ -+ stock-icons/16/gtk-execute.png \ -+ stock-icons/16/gtk-file.png \ -+ stock-icons/16/gtk-find-and-replace.png \ -+ stock-icons/16/gtk-find.png \ -+ stock-icons/16/gtk-floppy.png \ -+ stock-icons/16/gtk-fullscreen.png \ -+ stock-icons/16/gtk-go-back-ltr.png \ -+ stock-icons/16/gtk-go-down.png \ -+ stock-icons/16/gtk-go-forward-ltr.png \ -+ stock-icons/16/gtk-goto-bottom.png \ -+ stock-icons/16/gtk-goto-first-ltr.png \ -+ stock-icons/16/gtk-goto-last-ltr.png \ -+ stock-icons/16/gtk-goto-top.png \ -+ stock-icons/16/gtk-go-up.png \ -+ stock-icons/16/gtk-harddisk.png \ -+ stock-icons/16/gtk-help.png \ -+ stock-icons/16/gtk-home.png \ -+ stock-icons/16/gtk-indent-ltr.png \ -+ stock-icons/16/gtk-indent-rtl.png \ -+ stock-icons/16/gtk-index.png \ -+ stock-icons/16/gtk-info.png \ -+ stock-icons/16/gtk-jump-to-ltr.png \ -+ stock-icons/16/gtk-jump-to-rtl.png \ -+ stock-icons/16/gtk-justify-center.png \ -+ stock-icons/16/gtk-justify-fill.png \ -+ stock-icons/16/gtk-justify-left.png \ -+ stock-icons/16/gtk-justify-right.png \ -+ stock-icons/16/gtk-leave-fullscreen.png \ -+ stock-icons/16/gtk-media-forward-ltr.png \ -+ stock-icons/16/gtk-media-next-ltr.png \ -+ stock-icons/16/gtk-media-pause.png \ -+ stock-icons/16/gtk-media-play-ltr.png \ -+ stock-icons/16/gtk-media-play-rtl.png \ -+ stock-icons/16/gtk-media-previous-ltr.png \ -+ stock-icons/16/gtk-media-record.png \ -+ stock-icons/16/gtk-media-rewind-ltr.png \ -+ stock-icons/16/gtk-media-stop.png \ -+ stock-icons/16/gtk-missing-image.png \ -+ stock-icons/16/gtk-network.png \ -+ stock-icons/16/gtk-new.png \ -+ stock-icons/16/gtk-open.png \ -+ stock-icons/16/gtk-page-setup.png \ -+ stock-icons/16/gtk-paste.png \ -+ stock-icons/16/gtk-preferences.png \ -+ stock-icons/16/gtk-print.png \ -+ stock-icons/16/gtk-print-error.png \ -+ stock-icons/16/gtk-print-paused.png \ -+ stock-icons/16/gtk-print-preview.png \ -+ stock-icons/16/gtk-print-report.png \ -+ stock-icons/16/gtk-print-warning.png \ -+ stock-icons/16/gtk-properties.png \ -+ stock-icons/16/gtk-quit.png \ -+ stock-icons/16/gtk-redo-ltr.png \ -+ stock-icons/16/gtk-redo-rtl.png \ -+ stock-icons/16/gtk-refresh.png \ -+ stock-icons/16/gtk-remove.png \ -+ stock-icons/16/gtk-revert-to-saved-ltr.png \ -+ stock-icons/16/gtk-revert-to-saved-rtl.png \ -+ stock-icons/16/gtk-save-as.png \ -+ stock-icons/16/gtk-select-all.png \ -+ stock-icons/16/gtk-select-color.png \ -+ stock-icons/16/gtk-select-font.png \ -+ stock-icons/16/gtk-sort-ascending.png \ -+ stock-icons/16/gtk-sort-descending.png \ -+ stock-icons/16/gtk-spell-check.png \ -+ stock-icons/16/gtk-stop.png \ -+ stock-icons/16/gtk-strikethrough.png \ -+ stock-icons/16/gtk-font.png \ -+ stock-icons/16/gtk-undelete-ltr.png \ -+ stock-icons/16/gtk-undelete-rtl.png \ -+ stock-icons/16/gtk-underline.png \ -+ stock-icons/16/gtk-undo-ltr.png \ -+ stock-icons/16/gtk-undo-rtl.png \ -+ stock-icons/16/gtk-unindent-ltr.png \ -+ stock-icons/16/gtk-unindent-rtl.png \ -+ stock-icons/16/gtk-zoom-100.png \ -+ stock-icons/16/gtk-zoom-fit.png \ -+ stock-icons/16/gtk-zoom-in.png \ -+ stock-icons/16/gtk-zoom-out.png \ -+ stock-icons/16/gtk-italic.png \ -+ stock-icons/16/gtk-bold.png \ -+ stock-icons/20/gtk-apply.png \ -+ stock-icons/20/gtk-cancel.png \ -+ stock-icons/20/gtk-close.png \ -+ stock-icons/20/gtk-no.png \ -+ stock-icons/20/gtk-ok.png \ -+ stock-icons/20/gtk-yes.png \ -+ stock-icons/24/audio-volume-high.png \ -+ stock-icons/24/audio-volume-low.png \ -+ stock-icons/24/audio-volume-medium.png \ -+ stock-icons/24/audio-volume-muted.png \ -+ stock-icons/24/document-open-recent.png \ -+ stock-icons/24/gtk-about.png \ -+ stock-icons/24/gtk-add.png \ -+ stock-icons/24/gtk-bold.png \ -+ stock-icons/24/gtk-cdrom.png \ -+ stock-icons/24/gtk-clear.png \ -+ stock-icons/24/gtk-close.png \ -+ stock-icons/24/gtk-color-picker.png \ -+ stock-icons/24/gtk-connect.png \ -+ stock-icons/24/gtk-convert.png \ -+ stock-icons/24/gtk-copy.png \ -+ stock-icons/24/gtk-cut.png \ -+ stock-icons/24/gtk-directory.png \ -+ stock-icons/24/gtk-disconnect.png \ -+ stock-icons/24/gtk-edit.png \ -+ stock-icons/24/gtk-execute.png \ -+ stock-icons/24/gtk-file.png \ -+ stock-icons/24/gtk-find-and-replace.png \ -+ stock-icons/24/gtk-find.png \ -+ stock-icons/24/gtk-font.png \ -+ stock-icons/24/gtk-fullscreen.png \ -+ stock-icons/24/gtk-go-back-ltr.png \ -+ stock-icons/24/gtk-goto-top.png \ -+ stock-icons/24/gtk-go-down.png \ -+ stock-icons/24/gtk-goto-bottom.png \ -+ stock-icons/24/gtk-goto-first-ltr.png \ -+ stock-icons/24/gtk-goto-last-ltr.png \ -+ stock-icons/24/gtk-go-up.png \ -+ stock-icons/24/gtk-harddisk.png \ -+ stock-icons/24/gtk-help.png \ -+ stock-icons/24/gtk-home.png \ -+ stock-icons/24/gtk-indent-ltr.png \ -+ stock-icons/24/gtk-indent-rtl.png \ -+ stock-icons/24/gtk-index.png \ -+ stock-icons/24/gtk-info.png \ -+ stock-icons/24/gtk-italic.png \ -+ stock-icons/24/gtk-jump-to-ltr.png \ -+ stock-icons/24/gtk-jump-to-rtl.png \ -+ stock-icons/24/gtk-justify-center.png \ -+ stock-icons/24/gtk-justify-fill.png \ -+ stock-icons/24/gtk-justify-left.png \ -+ stock-icons/24/gtk-justify-right.png \ -+ stock-icons/24/gtk-leave-fullscreen.png \ -+ stock-icons/24/gtk-media-forward-ltr.png \ -+ stock-icons/24/gtk-media-next-ltr.png \ -+ stock-icons/24/gtk-media-pause.png \ -+ stock-icons/24/gtk-media-play-ltr.png \ -+ stock-icons/24/gtk-media-play-rtl.png \ -+ stock-icons/24/gtk-media-previous-ltr.png \ -+ stock-icons/24/gtk-media-record.png \ -+ stock-icons/24/gtk-media-rewind-ltr.png \ -+ stock-icons/24/gtk-media-stop.png \ -+ stock-icons/24/gtk-missing-image.png \ -+ stock-icons/24/gtk-network.png \ -+ stock-icons/24/gtk-new.png \ -+ stock-icons/24/gtk-open.png \ -+ stock-icons/24/gtk-orientation-reverse-landscape.png \ -+ stock-icons/24/gtk-orientation-landscape.png \ -+ stock-icons/24/gtk-orientation-reverse-portrait.png \ -+ stock-icons/24/gtk-orientation-portrait.png \ -+ stock-icons/24/gtk-page-setup.png \ -+ stock-icons/24/gtk-paste.png \ -+ stock-icons/24/gtk-preferences.png \ -+ stock-icons/24/gtk-print.png \ -+ stock-icons/24/gtk-print-error.png \ -+ stock-icons/24/gtk-print-paused.png \ -+ stock-icons/24/gtk-print-preview.png \ -+ stock-icons/24/gtk-print-report.png \ -+ stock-icons/24/gtk-print-warning.png \ -+ stock-icons/24/gtk-properties.png \ -+ stock-icons/24/gtk-quit.png \ -+ stock-icons/24/gtk-redo-ltr.png \ -+ stock-icons/24/gtk-redo-rtl.png \ -+ stock-icons/24/gtk-refresh.png \ -+ stock-icons/24/gtk-remove.png \ -+ stock-icons/24/gtk-revert-to-saved-ltr.png \ -+ stock-icons/24/gtk-revert-to-saved-rtl.png \ -+ stock-icons/24/gtk-select-font.png \ -+ stock-icons/24/gtk-save-as.png \ -+ stock-icons/24/gtk-floppy.png \ -+ stock-icons/24/gtk-select-all.png \ -+ stock-icons/24/gtk-select-color.png \ -+ stock-icons/24/gtk-sort-ascending.png \ -+ stock-icons/24/gtk-sort-descending.png \ -+ stock-icons/24/gtk-spell-check.png \ -+ stock-icons/24/gtk-stop.png \ -+ stock-icons/24/gtk-strikethrough.png \ -+ stock-icons/24/gtk-delete.png \ -+ stock-icons/24/gtk-undelete-ltr.png \ -+ stock-icons/24/gtk-undelete-rtl.png \ -+ stock-icons/24/gtk-underline.png \ -+ stock-icons/24/gtk-undo-ltr.png \ -+ stock-icons/24/gtk-undo-rtl.png \ -+ stock-icons/24/gtk-unindent-ltr.png \ -+ stock-icons/24/gtk-unindent-rtl.png \ -+ stock-icons/24/gtk-zoom-100.png \ -+ stock-icons/24/gtk-zoom-fit.png \ -+ stock-icons/24/gtk-zoom-in.png \ -+ stock-icons/24/gtk-zoom-out.png \ -+ stock-icons/24/gtk-go-forward-ltr.png \ -+ stock-icons/32/gtk-dnd-multiple.png \ -+ stock-icons/32/gtk-dnd.png \ -+ stock-icons/48/gtk-dialog-authentication.png \ -+ stock-icons/48/gtk-dialog-error.png \ -+ stock-icons/48/gtk-dialog-info.png \ -+ stock-icons/48/gtk-dialog-question.png \ -+ stock-icons/48/gtk-dialog-warning.png - -+GENERATED_ICONS = \ -+ stock-icons/16/gtk-go-back-rtl.png \ -+ stock-icons/16/gtk-go-forward-rtl.png \ -+ stock-icons/16/gtk-goto-first-rtl.png \ -+ stock-icons/16/gtk-goto-last-rtl.png \ -+ stock-icons/16/gtk-media-forward-rtl.png \ -+ stock-icons/16/gtk-media-next-rtl.png \ -+ stock-icons/16/gtk-media-previous-rtl.png \ -+ stock-icons/16/gtk-media-rewind-rtl.png \ -+ stock-icons/16/gtk-save.png \ -+ stock-icons/16/drive-harddisk.png \ -+ stock-icons/16/folder.png \ -+ stock-icons/16/folder-remote.png \ -+ stock-icons/16/user-home.png \ -+ stock-icons/16/user-desktop.png \ -+ stock-icons/16/text-x-generic.png \ -+ stock-icons/24/gtk-go-back-rtl.png \ -+ stock-icons/24/gtk-go-forward-rtl.png \ -+ stock-icons/24/gtk-goto-first-rtl.png \ -+ stock-icons/24/gtk-goto-last-rtl.png \ -+ stock-icons/24/gtk-media-forward-rtl.png \ -+ stock-icons/24/gtk-media-next-rtl.png \ -+ stock-icons/24/gtk-media-previous-rtl.png \ -+ stock-icons/24/gtk-media-rewind-rtl.png \ -+ stock-icons/24/gtk-save.png \ -+ stock-icons/24/drive-harddisk.png \ -+ stock-icons/24/folder.png \ -+ stock-icons/24/folder-remote.png \ -+ stock-icons/24/user-home.png \ -+ stock-icons/24/user-desktop.png \ -+ stock-icons/24/text-x-generic.png - --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) \ -- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl Makefile.am \ -- gtk-win32.rc.in gtkversion.h.in makefile.msc.in --SOURCES = $(libgtk_directfb_2_0_la_SOURCES) $(libgtk_quartz_2_0_la_SOURCES) $(libgtk_win32_2_0_la_SOURCES) $(libgtk_x11_2_0_la_SOURCES) $(gtk_query_immodules_2_0_SOURCES) $(gtk_update_icon_cache_SOURCES) -+@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ -+@CROSS_COMPILING_FALSE@ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ -+@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache - -+@CROSS_COMPILING_TRUE@gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gtk/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --makefile.msc: $(top_builddir)/config.status makefile.msc.in -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+makefile.msc: $(top_builddir)/config.status $(srcdir)/makefile.msc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --gtkversion.h: $(top_builddir)/config.status gtkversion.h.in -+gtkversion.h: $(top_builddir)/config.status $(srcdir)/gtkversion.h.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --gtk-win32.rc: $(top_builddir)/config.status gtk-win32.rc.in -+gtk-win32.rc: $(top_builddir)/config.status $(srcdir)/gtk-win32.rc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --libLTLIBRARIES_INSTALL = $(INSTALL) - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(libdir) -+ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - - uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libgtk-directfb-2.0.la: $(libgtk_directfb_2_0_la_OBJECTS) $(libgtk_directfb_2_0_la_DEPENDENCIES) -- $(LINK) $(libgtk_directfb_2_0_la_LDFLAGS) $(libgtk_directfb_2_0_la_OBJECTS) $(libgtk_directfb_2_0_la_LIBADD) $(LIBS) -+ $(libgtk_directfb_2_0_la_LINK) $(libgtk_directfb_2_0_la_OBJECTS) $(libgtk_directfb_2_0_la_LIBADD) $(LIBS) - libgtk-quartz-2.0.la: $(libgtk_quartz_2_0_la_OBJECTS) $(libgtk_quartz_2_0_la_DEPENDENCIES) -- $(LINK) $(libgtk_quartz_2_0_la_LDFLAGS) $(libgtk_quartz_2_0_la_OBJECTS) $(libgtk_quartz_2_0_la_LIBADD) $(LIBS) -+ $(libgtk_quartz_2_0_la_LINK) $(libgtk_quartz_2_0_la_OBJECTS) $(libgtk_quartz_2_0_la_LIBADD) $(LIBS) - libgtk-win32-2.0.la: $(libgtk_win32_2_0_la_OBJECTS) $(libgtk_win32_2_0_la_DEPENDENCIES) -- $(LINK) $(libgtk_win32_2_0_la_LDFLAGS) $(libgtk_win32_2_0_la_OBJECTS) $(libgtk_win32_2_0_la_LIBADD) $(LIBS) -+ $(libgtk_win32_2_0_la_LINK) $(libgtk_win32_2_0_la_OBJECTS) $(libgtk_win32_2_0_la_LIBADD) $(LIBS) - libgtk-x11-2.0.la: $(libgtk_x11_2_0_la_OBJECTS) $(libgtk_x11_2_0_la_DEPENDENCIES) -- $(LINK) $(libgtk_x11_2_0_la_LDFLAGS) $(libgtk_x11_2_0_la_OBJECTS) $(libgtk_x11_2_0_la_LIBADD) $(LIBS) --binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -+ $(libgtk_x11_2_0_la_LINK) $(libgtk_x11_2_0_la_OBJECTS) $(libgtk_x11_2_0_la_LIBADD) $(LIBS) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(bindir) -+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -2243,8 +1569,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -- rm -f $(DESTDIR)$(bindir)/$$f; \ -+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - - clean-binPROGRAMS: -@@ -2255,20 +1581,19 @@ - done - gtk-query-immodules-2.0$(EXEEXT): $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_DEPENDENCIES) - @rm -f gtk-query-immodules-2.0$(EXEEXT) -- $(LINK) $(gtk_query_immodules_2_0_LDFLAGS) $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_LDADD) $(LIBS) -+ $(LINK) $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_LDADD) $(LIBS) - gtk-update-icon-cache$(EXEEXT): $(gtk_update_icon_cache_OBJECTS) $(gtk_update_icon_cache_DEPENDENCIES) - @rm -f gtk-update-icon-cache$(EXEEXT) -- $(LINK) $(gtk_update_icon_cache_LDFLAGS) $(gtk_update_icon_cache_OBJECTS) $(gtk_update_icon_cache_LDADD) $(LIBS) --binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -+ $(LINK) $(gtk_update_icon_cache_OBJECTS) $(gtk_update_icon_cache_LDADD) $(LIBS) - install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(bindir) -+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -- echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ -- $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ -+ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -@@ -2276,12 +1601,12 @@ - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ -- rm -f $(DESTDIR)$(bindir)/$$f; \ -+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -2547,82 +1872,64 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updateiconcache.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --gtkincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-gtkincludeHEADERS: $(gtkinclude_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(gtkincludedir) -+ test -z "$(gtkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gtkincludedir)" - @list='$(gtkinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(gtkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gtkincludedir)/$$f"; \ -- $(gtkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gtkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(gtkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gtkincludedir)/$$f'"; \ -+ $(gtkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gtkincludedir)/$$f"; \ - done - - uninstall-gtkincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(gtkinclude_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(gtkincludedir)/$$f"; \ -- rm -f $(DESTDIR)$(gtkincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(gtkincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(gtkincludedir)/$$f"; \ - done --gtkunixprintincludeHEADERS_INSTALL = $(INSTALL_HEADER) - install-gtkunixprintincludeHEADERS: $(gtkunixprintinclude_HEADERS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(gtkunixprintincludedir) -+ test -z "$(gtkunixprintincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gtkunixprintincludedir)" - @list='$(gtkunixprintinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(gtkunixprintincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gtkunixprintincludedir)/$$f"; \ -- $(gtkunixprintincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gtkunixprintincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(gtkunixprintincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gtkunixprintincludedir)/$$f'"; \ -+ $(gtkunixprintincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gtkunixprintincludedir)/$$f"; \ - done - - uninstall-gtkunixprintincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(gtkunixprintinclude_HEADERS)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(gtkunixprintincludedir)/$$f"; \ -- rm -f $(DESTDIR)$(gtkunixprintincludedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(gtkunixprintincludedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(gtkunixprintincludedir)/$$f"; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -2632,7 +1939,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2644,15 +1957,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -2673,7 +1991,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2684,35 +2002,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -2720,23 +2033,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -2750,9 +2063,9 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - check-TESTS: $(TESTS) -- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ -+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ -- list='$(TESTS)'; \ -+ list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ -@@ -2761,25 +2074,25 @@ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xpass=`expr $$xpass + 1`; \ -- failed=`expr $$failed + 1`; \ -- echo "XPASS: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xpass=`expr $$xpass + 1`; \ -+ failed=`expr $$failed + 1`; \ -+ echo "XPASS: $$tst"; \ - ;; \ - *) \ -- echo "PASS: $$tst"; \ -+ echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xfail=`expr $$xfail + 1`; \ -- echo "XFAIL: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xfail=`expr $$xfail + 1`; \ -+ echo "XFAIL: $$tst"; \ - ;; \ - *) \ -- failed=`expr $$failed + 1`; \ -- echo "FAIL: $$tst"; \ -+ failed=`expr $$failed + 1`; \ -+ echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ -@@ -2804,46 +2117,40 @@ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ -- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ -- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ -- test -n "$$skipped" && echo "$$skipped"; \ -- test -n "$$report" && echo "$$report"; \ -+ test -z "$$skipped" || echo "$$skipped"; \ -+ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/.. $(distdir)/stock-icons/16 $(distdir)/stock-icons/20 $(distdir)/stock-icons/24 $(distdir)/stock-icons/32 $(distdir)/stock-icons/48 -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -2856,13 +2163,17 @@ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d $(distdir)/$$subdir \ -- || mkdir $(distdir)/$$subdir \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -2877,8 +2188,9 @@ - - installdirs: installdirs-recursive - installdirs-am: -- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) $(DESTDIR)$(gtkincludedir) $(DESTDIR)$(gtkunixprintincludedir) -- -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gtkincludedir)" "$(DESTDIR)$(gtkunixprintincludedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive -@@ -2900,13 +2212,13 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - clean: clean-recursive - - clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -@@ -2916,12 +2228,14 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-local distclean-tags -+ distclean-local distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: -@@ -2929,15 +2243,23 @@ - install-data-am: install-data-local install-gtkincludeHEADERS \ - install-gtkunixprintincludeHEADERS - -+install-dvi: install-dvi-recursive -+ - install-exec-am: install-binPROGRAMS install-binSCRIPTS \ - install-libLTLIBRARIES - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -2960,35 +2282,34 @@ - - uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-gtkincludeHEADERS \ -- uninstall-gtkunixprintincludeHEADERS uninstall-info-am \ -- uninstall-libLTLIBRARIES uninstall-local -+ uninstall-gtkunixprintincludeHEADERS uninstall-libLTLIBRARIES \ -+ uninstall-local - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-exec-am install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \ -- check-am check-local clean clean-binPROGRAMS clean-generic \ -- clean-libLTLIBRARIES clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-local distclean-recursive \ -- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-binPROGRAMS \ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-TESTS check-am check-local clean \ -+ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -+ clean-libtool ctags ctags-recursive distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-local distclean-tags distdir dvi dvi-am html html-am \ -+ info info-am install install-am install-binPROGRAMS \ - install-binSCRIPTS install-data install-data-am \ -- install-data-local install-data-recursive install-exec \ -- install-exec-am install-exec-recursive \ -- install-gtkincludeHEADERS install-gtkunixprintincludeHEADERS \ -- install-info install-info-am install-info-recursive \ -- install-libLTLIBRARIES install-man install-recursive \ -- install-strip installcheck installcheck-am installdirs \ -- installdirs-am installdirs-recursive maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ -- ps-recursive tags tags-recursive uninstall uninstall-am \ -+ install-data-local install-dvi install-dvi-am install-exec \ -+ install-exec-am install-exec-hook install-gtkincludeHEADERS \ -+ install-gtkunixprintincludeHEADERS install-html \ -+ install-html-am install-info install-info-am \ -+ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-gtkincludeHEADERS \ -- uninstall-gtkunixprintincludeHEADERS uninstall-info-am \ -- uninstall-info-recursive uninstall-libLTLIBRARIES \ -- uninstall-local uninstall-recursive -+ uninstall-gtkunixprintincludeHEADERS uninstall-libLTLIBRARIES \ -+ uninstall-local - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/gtk/theme-bits/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/gtk/theme-bits/Makefile.in 2008-09-24 00:11:39.000000000 -0300 -+++ gtk+2.0-2.14.3/gtk/theme-bits/Makefile.in 2008-09-24 19:56:54.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,42 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+noinst_PROGRAMS = decompose-bits$(EXEEXT) -+subdir = gtk/theme-bits -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+PROGRAMS = $(noinst_PROGRAMS) -+am_decompose_bits_OBJECTS = decompose-bits.$(OBJEXT) -+decompose_bits_OBJECTS = $(am_decompose_bits_OBJECTS) -+decompose_bits_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(decompose_bits_SOURCES) -+DIST_SOURCES = $(decompose_bits_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +78,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +103,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +110,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + # GTK+ header files that don't get installed + gtk_private_h_sources = \ +- gtkquery.h \ +- gtksearchengine.h \ + gtksearchenginesimple.h \ + gtkdndcursors.h \ + gtkentryprivate.h \ +@@ -771,11 +780,7 @@ + gtkfilechooserdefault.h \ + gtkfilechooserembed.h \ + gtkfilechooserentry.h \ +- gtkfilechooserprivate.h \ + gtkfilechoosersettings.h \ +- gtkfilechooserutils.h \ +- gtkfilesystem.h \ +- gtkfilesystemmodel.h \ + gtkiconcache.h \ + gtkintl.h \ + gtkkeyhash.h \ +diff -urN gtk+2.0-2.14.4.old/gtk/tests/Makefile.in gtk+2.0-2.14.4/gtk/tests/Makefile.in +--- gtk+2.0-2.14.4.old/gtk/tests/Makefile.in 2008-10-17 01:07:17.000000000 -0300 ++++ gtk+2.0-2.14.4/gtk/tests/Makefile.in 2008-11-04 15:37:08.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@ -@@ -120,6 +136,7 @@ +@@ -121,6 +123,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -49735,573 +61904,29 @@ Index: gtk+2.0-2.14.3/gtk/theme-bits/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +155,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +165,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +194,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +213,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +224,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +236,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +277,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,14 +286,17 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png -+EXTRA_DIST = check-13.png check-13-inconsistent.png radio-13.png \ -+ radio-13-inconsistent.png - TEST_PROGS = - - ### testing rules -@@ -406,56 +322,46 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(GDK_PIXBUF_DEP_CFLAGS) - -- --noinst_PROGRAMS = decompose-bits -- - decompose_bits_SOURCES = decompose-bits.c - decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --subdir = gtk/theme-bits --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --noinst_PROGRAMS = decompose-bits$(EXEEXT) --PROGRAMS = $(noinst_PROGRAMS) -- --am_decompose_bits_OBJECTS = decompose-bits.$(OBJEXT) --decompose_bits_OBJECTS = $(am_decompose_bits_OBJECTS) --decompose_bits_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la --decompose_bits_LDFLAGS = -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/decompose-bits.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(decompose_bits_SOURCES) --DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --SOURCES = $(decompose_bits_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/theme-bits/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu gtk/theme-bits/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -465,10 +371,10 @@ - done - decompose-bits$(EXEEXT): $(decompose_bits_OBJECTS) $(decompose_bits_DEPENDENCIES) - @rm -f decompose-bits$(EXEEXT) -- $(LINK) $(decompose_bits_LDFLAGS) $(decompose_bits_OBJECTS) $(decompose_bits_LDADD) $(LIBS) -+ $(LINK) $(decompose_bits_OBJECTS) $(decompose_bits_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -476,37 +382,25 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decompose-bits.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -514,26 +408,15 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -543,23 +426,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -571,29 +454,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -608,7 +485,6 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(PROGRAMS) -- - installdirs: - install: install-am - install-exec: install-exec-am -@@ -629,7 +505,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -643,24 +519,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -681,18 +567,23 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am install-man \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/ltmain.sh -=================================================================== ---- gtk+2.0-2.14.3.orig/ltmain.sh 2008-08-29 19:27:25.000000000 -0300 -+++ gtk+2.0-2.14.3/ltmain.sh 2008-04-29 18:33:55.000000000 -0300 +diff -urN gtk+2.0-2.14.4.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.4/gtk/theme-bits/Makefile.in +--- gtk+2.0-2.14.4.old/gtk/theme-bits/Makefile.in 2008-10-17 01:07:17.000000000 -0300 ++++ gtk+2.0-2.14.4/gtk/theme-bits/Makefile.in 2008-11-04 15:37:08.000000000 -0200 +@@ -94,6 +94,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@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN gtk+2.0-2.14.4.old/ltmain.sh gtk+2.0-2.14.4/ltmain.sh +--- gtk+2.0-2.14.4.old/ltmain.sh 2008-08-29 19:27:25.000000000 -0300 ++++ gtk+2.0-2.14.4/ltmain.sh 2008-04-29 18:33:55.000000000 -0300 @@ -43,7 +43,7 @@ PROGRAM=ltmain.sh @@ -50335,119 +61960,19 @@ Index: gtk+2.0-2.14.3/ltmain.sh esac ;; no) -Index: gtk+2.0-2.14.3/m4macros/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/m4macros/Makefile.in 2008-09-24 00:11:40.000000000 -0300 -+++ gtk+2.0-2.14.3/m4macros/Makefile.in 2008-09-24 19:56:54.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,32 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+subdir = m4macros -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(m4datadir)" -+m4dataDATA_INSTALL = $(INSTALL_DATA) -+DATA = $(m4data_DATA) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +68,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +93,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +100,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/m4macros/Makefile.in gtk+2.0-2.14.4/m4macros/Makefile.in +--- gtk+2.0-2.14.4.old/m4macros/Makefile.in 2008-10-17 01:07:17.000000000 -0300 ++++ gtk+2.0-2.14.4/m4macros/Makefile.in 2008-11-04 15:37:08.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +126,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -50455,596 +61980,19 @@ Index: gtk+2.0-2.14.3/m4macros/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +145,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +155,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +184,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +203,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +214,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +226,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +267,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +276,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,56 +311,63 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - installed_m4 = gtk-2.0.m4 -- - m4datadir = $(datadir)/aclocal - m4data_DATA = $(installed_m4) --subdir = m4macros --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = --DATA = $(m4data_DATA) -- --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4macros/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu m4macros/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --m4dataDATA_INSTALL = $(INSTALL_DATA) - install-m4dataDATA: $(m4data_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(m4datadir) -+ test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" - @list='$(m4data_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \ -- $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \ -+ $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \ - done - - uninstall-m4dataDATA: - @$(NORMAL_UNINSTALL) - @list='$(m4data_DATA)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(m4datadir)/$$f"; \ -- rm -f $(DESTDIR)$(m4datadir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(m4datadir)/$$f"; \ - done - tags: TAGS - TAGS: -@@ -463,29 +375,23 @@ - ctags: CTAGS - CTAGS: - --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -500,9 +406,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(DATA) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(m4datadir) -+ for dir in "$(DESTDIR)$(m4datadir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -522,7 +429,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -533,24 +440,34 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool -+distclean-am: clean-am distclean-generic - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-m4dataDATA - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -569,17 +486,22 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-m4dataDATA -+uninstall-am: uninstall-m4dataDATA -+ -+.MAKE: install-am install-strip - - .PHONY: all all-am check check-am check-local clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ -- distdir dvi dvi-am info info-am install install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-m4dataDATA install-man install-strip \ -- installcheck installcheck-am installdirs maintainer-clean \ -+ distdir dvi dvi-am html html-am info info-am install \ -+ install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am \ -+ install-m4dataDATA install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-info-am uninstall-m4dataDATA -+ uninstall-m4dataDATA - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/Makefile.in 2008-09-24 00:11:35.000000000 -0300 -+++ gtk+2.0-2.14.3/Makefile.in 2008-09-24 19:56:58.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = . -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +32,71 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ -+ $(srcdir)/config.h.win32.in $(srcdir)/gail-uninstalled.pc.in \ -+ $(srcdir)/gail.pc.in $(srcdir)/gdk-2.0-uninstalled.pc.in \ -+ $(srcdir)/gdk-2.0.pc.in \ -+ $(srcdir)/gdk-pixbuf-2.0-uninstalled.pc.in \ -+ $(srcdir)/gdk-pixbuf-2.0.pc.in \ -+ $(srcdir)/gtk+-2.0-uninstalled.pc.in $(srcdir)/gtk+-2.0.pc.in \ -+ $(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \ -+ $(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \ -+ COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \ -+ depcomp install-sh ltmain.sh missing mkinstalldirs - @OS_UNIX_TRUE@am__append_1 = gtk+-unix-print-2.0.pc -+subdir = . -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -+ configure.lineno config.status.lineno -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = config.h -+CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-pixbuf-2.0.pc \ -+ gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc \ -+ gdk-pixbuf-2.0-uninstalled.pc gdk-2.0-uninstalled.pc \ -+ gtk+-2.0-uninstalled.pc gail-uninstalled.pc -+SOURCES = -+DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" -+pkgconfigDATA_INSTALL = $(INSTALL_DATA) -+DATA = $(pkgconfig_DATA) -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \ -+ perf contrib docs m4macros -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+distdir = $(PACKAGE)-$(VERSION) -+top_distdir = $(distdir) -+am__remove_distdir = \ -+ { test ! -d $(distdir) \ -+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr $(distdir); }; } -+DIST_ARCHIVES = $(distdir).tar.gz -+GZIP_ENV = --best -+distuninstallcheck_listfiles = find . -type f -print -+distcleancheck_listfiles = find . -type f -print - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -52,22 +107,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,8 +132,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -91,10 +139,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/Makefile.in gtk+2.0-2.14.4/Makefile.in +--- gtk+2.0-2.14.4.old/Makefile.in 2008-10-17 01:07:13.000000000 -0300 ++++ gtk+2.0-2.14.4/Makefile.in 2008-11-04 15:37:04.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@ -@@ -121,6 +165,7 @@ +@@ -121,6 +123,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -51052,1104 +62000,61 @@ Index: gtk+2.0-2.14.3/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +184,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,91 +194,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -257,24 +223,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +242,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +253,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +265,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -366,6 +306,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -374,122 +315,70 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- HACKING \ -- makecopyright \ -- NEWS.pre-1-0 \ -- ChangeLog.pre-1-0 \ -- ChangeLog.pre-1-2 \ -- ChangeLog.pre-2-0 \ -- ChangeLog.pre-2-2 \ -- ChangeLog.pre-2-4 \ -- ChangeLog.pre-2-6 \ -- ChangeLog.pre-2-8 \ -- ChangeLog.pre-2-10 \ -- ChangeLog.gtk-async-file-chooser \ -- ChangeLog.gtk-printing \ -- README.commits \ -- README.win32 \ -- config.h.win32 \ -- makefile.msc \ -- gtk-zip.sh.in \ -- sanitize-la.sh \ -- po/README.translators \ -- po/po2tbl.sed.in \ -- examples/aspectframe/Makefile \ -- examples/aspectframe/aspectframe.c \ -- examples/Makefile \ -- examples/README.1ST \ -- examples/extract.awk \ -- examples/extract.sh \ -- examples/arrow/Makefile \ -- examples/arrow/arrow.c \ -- examples/base/Makefile \ -- examples/base/base.c \ -- examples/buttonbox/Makefile \ -- examples/buttonbox/buttonbox.c \ -- examples/buttons/Makefile \ -- examples/buttons/buttons.c \ -- examples/buttons/info.xpm \ -- examples/calendar/Makefile \ -- examples/calendar/calendar.c \ -- examples/clist/Makefile \ -- examples/clist/clist.c \ -- examples/entry/Makefile \ -- examples/entry/entry.c \ -- examples/eventbox/Makefile \ -- examples/eventbox/eventbox.c \ -- examples/filesel/Makefile \ -- examples/filesel/filesel.c \ -- examples/gtkdial/Makefile \ -- examples/gtkdial/dial_test.c \ -- examples/gtkdial/gtkdial.c \ -- examples/gtkdial/gtkdial.h \ -- examples/helloworld/Makefile \ -- examples/helloworld/helloworld.c \ -- examples/helloworld2/Makefile \ -- examples/helloworld2/helloworld2.c \ -- examples/label/Makefile \ -- examples/label/label.c \ -- examples/list/Makefile \ -- examples/list/list.c \ -- examples/menu/Makefile \ -- examples/menu/menu.c \ -- examples/menu/itemfactory.c \ -- examples/notebook/Makefile \ -- examples/notebook/notebook.c \ -- examples/packbox/Makefile \ -- examples/packbox/packbox.c \ -- examples/paned/Makefile \ -- examples/paned/paned.c \ -- examples/pixmap/Makefile \ -- examples/pixmap/pixmap.c \ -- examples/progressbar/Makefile \ -- examples/progressbar/progressbar.c \ -- examples/radiobuttons/Makefile \ -- examples/radiobuttons/radiobuttons.c \ -- examples/rangewidgets/Makefile \ -- examples/rangewidgets/rangewidgets.c \ -- examples/rulers/Makefile \ -- examples/rulers/rulers.c \ -- examples/scribble-simple/Makefile \ -- examples/scribble-simple/scribble-simple.c \ -- examples/scribble-xinput/Makefile \ -- examples/scribble-xinput/scribble-xinput.c \ -- examples/scrolledwin/Makefile \ -- examples/scrolledwin/scrolledwin.c \ -- examples/selection/Makefile \ -- examples/selection/gettargets.c \ -- examples/selection/setselection.c \ -- examples/statusbar/Makefile \ -- examples/statusbar/statusbar.c \ -- examples/table/Makefile \ -- examples/table/table.c \ -- examples/text/Makefile \ -- examples/text/text.c \ -- examples/tictactoe/Makefile \ -- examples/tictactoe/tictactoe.c \ -- examples/tictactoe/tictactoe.h \ -- examples/tictactoe/ttt_test.c \ -- examples/tree/Makefile \ -- examples/tree/tree.c \ -- examples/wheelbarrow/Makefile \ -- examples/wheelbarrow/wheelbarrow.c \ -- examples/fixed/fixed.c \ -- examples/fixed/Makefile \ -- examples/frame/frame.c \ -- examples/frame/Makefile \ -- examples/spinbutton/spinbutton.c \ -- examples/spinbutton/Makefile \ -- examples/find-examples.sh -- -+EXTRA_DIST = HACKING makecopyright NEWS.pre-1-0 ChangeLog.pre-1-0 \ -+ ChangeLog.pre-1-2 ChangeLog.pre-2-0 ChangeLog.pre-2-2 \ -+ ChangeLog.pre-2-4 ChangeLog.pre-2-6 ChangeLog.pre-2-8 \ -+ ChangeLog.pre-2-10 ChangeLog.gtk-async-file-chooser \ -+ ChangeLog.gtk-printing README.commits README.win32 \ -+ config.h.win32 makefile.msc gtk-zip.sh.in sanitize-la.sh \ -+ po/README.translators po/po2tbl.sed.in \ -+ examples/aspectframe/Makefile \ -+ examples/aspectframe/aspectframe.c examples/Makefile \ -+ examples/README.1ST examples/extract.awk examples/extract.sh \ -+ examples/arrow/Makefile examples/arrow/arrow.c \ -+ examples/base/Makefile examples/base/base.c \ -+ examples/buttonbox/Makefile examples/buttonbox/buttonbox.c \ -+ examples/buttons/Makefile examples/buttons/buttons.c \ -+ examples/buttons/info.xpm examples/calendar/Makefile \ -+ examples/calendar/calendar.c examples/clist/Makefile \ -+ examples/clist/clist.c examples/entry/Makefile \ -+ examples/entry/entry.c examples/eventbox/Makefile \ -+ examples/eventbox/eventbox.c examples/filesel/Makefile \ -+ examples/filesel/filesel.c examples/gtkdial/Makefile \ -+ examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c \ -+ examples/gtkdial/gtkdial.h examples/helloworld/Makefile \ -+ examples/helloworld/helloworld.c examples/helloworld2/Makefile \ -+ examples/helloworld2/helloworld2.c examples/label/Makefile \ -+ examples/label/label.c examples/list/Makefile \ -+ examples/list/list.c examples/menu/Makefile \ -+ examples/menu/menu.c examples/menu/itemfactory.c \ -+ examples/notebook/Makefile examples/notebook/notebook.c \ -+ examples/packbox/Makefile examples/packbox/packbox.c \ -+ examples/paned/Makefile examples/paned/paned.c \ -+ examples/pixmap/Makefile examples/pixmap/pixmap.c \ -+ examples/progressbar/Makefile \ -+ examples/progressbar/progressbar.c \ -+ examples/radiobuttons/Makefile \ -+ examples/radiobuttons/radiobuttons.c \ -+ examples/rangewidgets/Makefile \ -+ examples/rangewidgets/rangewidgets.c examples/rulers/Makefile \ -+ examples/rulers/rulers.c examples/scribble-simple/Makefile \ -+ examples/scribble-simple/scribble-simple.c \ -+ examples/scribble-xinput/Makefile \ -+ examples/scribble-xinput/scribble-xinput.c \ -+ examples/scrolledwin/Makefile \ -+ examples/scrolledwin/scrolledwin.c examples/selection/Makefile \ -+ examples/selection/gettargets.c \ -+ examples/selection/setselection.c examples/statusbar/Makefile \ -+ examples/statusbar/statusbar.c examples/table/Makefile \ -+ examples/table/table.c examples/text/Makefile \ -+ examples/text/text.c examples/tictactoe/Makefile \ -+ examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h \ -+ examples/tictactoe/ttt_test.c examples/tree/Makefile \ -+ examples/tree/tree.c examples/wheelbarrow/Makefile \ -+ examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c \ -+ examples/fixed/Makefile examples/frame/frame.c \ -+ examples/frame/Makefile examples/spinbutton/spinbutton.c \ -+ examples/spinbutton/Makefile examples/find-examples.sh - TEST_PROGS = - - ### testing rules -@@ -516,17 +405,17 @@ +@@ -516,7 +519,10 @@ && DISPLAY=:$$XID && export DISPLAY -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 - AUTOMAKE_OPTIONS = 1.7 -- - GDKTARGET = @gdktarget@ -- - pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc $(am__append_1) -- -+pkgconfig_DATA = gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc \ -+ gtk+-$(GDKTARGET)-2.0.pc gail.pc $(am__append_1) - DISTCLEANFILES = \ - gtk+-unix-print-2.0.pc \ - gtk+-$(GDKTARGET)-2.0.pc \ -@@ -536,96 +425,83 @@ - gdk-$(GDKTARGET)-2.0-uninstalled.pc \ - gail-uninstalled.pc - -- - DEFAULT_GDKTARGET = x11 -- - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds --subdir = . --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-pixbuf-2.0.pc \ -- gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc \ -- gdk-pixbuf-2.0-uninstalled.pc gdk-2.0-uninstalled.pc \ -- gtk+-2.0-uninstalled.pc gail-uninstalled.pc --DIST_SOURCES = --DATA = $(pkgconfig_DATA) -- -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ -- $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog INSTALL \ -- Makefile.am NEWS acinclude.m4 aclocal.m4 compile config.guess \ -- config.h.in config.h.win32.in config.sub configure configure.in \ -- depcomp gail-uninstalled.pc.in gail.pc.in \ -- 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 +@@ -560,13 +566,15 @@ + DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ + $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog INSTALL \ + Makefile.am NEWS acinclude.m4 aclocal.m4 compile config.guess \ +- config.h.in config.h.win32.in config.sub configure.in depcomp \ +- gail-uninstalled.pc.in gail.pc.in 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 \ ++ config.h.in config.h.win32.in config.sub configure configure.in \ ++ depcomp gail-uninstalled.pc.in gail.pc.in \ ++ 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 - .SUFFIXES: -- --am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -- configure.lineno --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+am--refresh: -+ @: -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ -+ cd $(srcdir) && $(AUTOMAKE) --gnu \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ echo ' $(SHELL) ./config.status'; \ -+ $(SHELL) ./config.status;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ -+ esac; - --$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck --$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) -- cd $(srcdir) && $(AUTOCONF) - --$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(srcdir) && $(AUTOCONF) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - - config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ -- $(MAKE) stamp-h1; \ -+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi - - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -- --$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) -- touch $(srcdir)/config.h.in -+ rm -f stamp-h1 -+ touch $@ - - distclean-hdr: - -rm -f config.h stamp-h1 --config.h.win32: $(top_builddir)/config.status config.h.win32.in -+config.h.win32: $(top_builddir)/config.status $(srcdir)/config.h.win32.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --gtk-zip.sh: $(top_builddir)/config.status gtk-zip.sh.in -+gtk-zip.sh: $(top_builddir)/config.status $(srcdir)/gtk-zip.sh.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --gdk-pixbuf-2.0.pc: $(top_builddir)/config.status gdk-pixbuf-2.0.pc.in -+gdk-pixbuf-2.0.pc: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-2.0.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --gdk-2.0.pc: $(top_builddir)/config.status gdk-2.0.pc.in -+gdk-2.0.pc: $(top_builddir)/config.status $(srcdir)/gdk-2.0.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --gtk+-2.0.pc: $(top_builddir)/config.status gtk+-2.0.pc.in -+gtk+-2.0.pc: $(top_builddir)/config.status $(srcdir)/gtk+-2.0.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --gtk+-unix-print-2.0.pc: $(top_builddir)/config.status gtk+-unix-print-2.0.pc.in -+gtk+-unix-print-2.0.pc: $(top_builddir)/config.status $(srcdir)/gtk+-unix-print-2.0.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --gail.pc: $(top_builddir)/config.status gail.pc.in -+gail.pc: $(top_builddir)/config.status $(srcdir)/gail.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --gdk-pixbuf-2.0-uninstalled.pc: $(top_builddir)/config.status gdk-pixbuf-2.0-uninstalled.pc.in -+gdk-pixbuf-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-2.0-uninstalled.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --gdk-2.0-uninstalled.pc: $(top_builddir)/config.status gdk-2.0-uninstalled.pc.in -+gdk-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gdk-2.0-uninstalled.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --gtk+-2.0-uninstalled.pc: $(top_builddir)/config.status gtk+-2.0-uninstalled.pc.in -+gtk+-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gtk+-2.0-uninstalled.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --gail-uninstalled.pc: $(top_builddir)/config.status gail-uninstalled.pc.in -+gail-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gail-uninstalled.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - - mostlyclean-libtool: -@@ -636,24 +512,22 @@ - - distclean-libtool: - -rm -f libtool --uninstall-info-am: --pkgconfigDATA_INSTALL = $(INSTALL_DATA) - install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) -+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ -- $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ -+ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done - - uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ -- rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -663,7 +537,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -675,15 +555,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -704,7 +589,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -715,35 +600,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -751,23 +631,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -779,40 +659,25 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = . --distdir = $(PACKAGE)-$(VERSION) -- --am__remove_distdir = \ -- { test ! -d $(distdir) \ -- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -- && rm -fr $(distdir); }; } -- --GZIP_ENV = --best --distuninstallcheck_listfiles = find . -type f -print --distcleancheck_listfiles = find . -type f -print - - distdir: $(DISTFILES) - $(am__remove_distdir) -- mkdir $(distdir) -- $(mkinstalldirs) $(distdir)/. $(distdir)/contrib/gdk-pixbuf-xlib $(distdir)/demos/gtk-demo $(distdir)/docs/reference/gdk $(distdir)/docs/reference/gdk-pixbuf $(distdir)/docs/reference/gtk $(distdir)/examples $(distdir)/examples/arrow $(distdir)/examples/aspectframe $(distdir)/examples/base $(distdir)/examples/buttonbox $(distdir)/examples/buttons $(distdir)/examples/calendar $(distdir)/examples/clist $(distdir)/examples/entry $(distdir)/examples/eventbox $(distdir)/examples/filesel $(distdir)/examples/fixed $(distdir)/examples/frame $(distdir)/examples/gtkdial $(distdir)/examples/helloworld $(distdir)/examples/helloworld2 $(distdir)/examples/label $(distdir)/examples/list $(distdir)/examples/menu $(distdir)/examples/notebook $(distdir)/examples/packbox $(distdir)/examples/paned $(distdir)/examples/pixmap $(distdir)/examples/progressbar $(distdir)/examples/radiobuttons $(distdir)/examples/rangewidgets $(distdir)/examples/rulers $(distdir)/examples/scribble-simple $(distdir)/examples/scribble-xinput $(distdir)/examples/scrolledwin $(distdir)/examples/selection $(distdir)/examples/spinbutton $(distdir)/examples/statusbar $(distdir)/examples/table $(distdir)/examples/text $(distdir)/examples/tictactoe $(distdir)/examples/tree $(distdir)/examples/wheelbarrow $(distdir)/gdk-pixbuf $(distdir)/gdk/win32/rc $(distdir)/gtk $(distdir)/po $(distdir)/po-properties -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ test -d $(distdir) || mkdir $(distdir) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -823,15 +688,19 @@ +@@ -822,7 +830,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 \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -842,22 +711,55 @@ - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ -+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) - dist-gzip: distdir -- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) -+ -+dist-bzip2: distdir -+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 -+ $(am__remove_distdir) -+ -+dist-lzma: distdir -+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -+ $(am__remove_distdir) -+ -+dist-tarZ: distdir -+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z -+ $(am__remove_distdir) -+ -+dist-shar: distdir -+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz -+ $(am__remove_distdir) -+ -+dist-zip: distdir -+ -rm -f $(distdir).zip -+ zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - - dist dist-all: distdir -- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another - # tarfile. - distcheck: dist -- $(am__remove_distdir) -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - -+ case '$(DIST_ARCHIVES)' in \ -+ *.tar.gz*) \ -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ -+ *.tar.bz2*) \ -+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lzma*) \ -+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ -+ *.tar.Z*) \ -+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ -+ *.shar.gz*) \ -+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ -+ *.zip*) \ -+ unzip $(distdir).zip ;;\ -+ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst -@@ -877,19 +779,20 @@ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ -- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ -+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ -- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ -- && rm -f $(distdir).tar.gz \ -+ && $(MAKE) $(AM_MAKEFLAGS) dist \ -+ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) -- @echo "$(distdir).tar.gz is ready for distribution" | \ -- sed 'h;s/./=/g;p;x;p;x' -+ @(echo "$(distdir) archives ready for distribution: "; \ -+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ -+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' - distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -@@ -914,8 +817,9 @@ - all-am: Makefile $(DATA) config.h - installdirs: installdirs-recursive - installdirs-am: -- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) -- -+ for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -935,7 +839,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - - maintainer-clean-generic: -@@ -948,13 +852,15 @@ - distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-hdr \ -+ distclean-libtool distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: -@@ -963,12 +869,20 @@ - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -989,29 +903,28 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-local uninstall-pkgconfigDATA -+uninstall-am: uninstall-local uninstall-pkgconfigDATA - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-data-am install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-generic clean-libtool clean-recursive \ -- ctags ctags-recursive dist dist-all dist-gzip distcheck \ -- distclean distclean-generic distclean-hdr distclean-libtool \ -- distclean-recursive distclean-tags distcleancheck distdir \ -- distuninstallcheck dvi dvi-am dvi-recursive info info-am \ -- info-recursive install install-am install-data install-data-am \ -- install-data-recursive install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-pkgconfigDATA \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-local \ -- uninstall-pkgconfigDATA uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am am--refresh check check-am check-local clean \ -+ clean-generic clean-libtool ctags ctags-recursive dist \ -+ dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ -+ dist-tarZ dist-zip distcheck distclean distclean-generic \ -+ distclean-hdr distclean-libtool distclean-tags distcleancheck \ -+ distdir distuninstallcheck dvi dvi-am html html-am info \ -+ info-am install install-am install-data install-data-am \ -+ install-data-hook install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-pkgconfigDATA install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am uninstall-local \ -+ uninstall-pkgconfigDATA - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/engines/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/engines/Makefile.in 2008-09-24 00:11:40.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/engines/Makefile.in 2008-09-24 19:56:54.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,17 +15,11 @@ - @SET_MAKE@ - - # GTK+ - The GIMP Toolkit -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+subdir = modules/engines -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = ms-windows pixbuf -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +70,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +95,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +102,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ +diff -urN gtk+2.0-2.14.4.old/modules/engines/Makefile.in gtk+2.0-2.14.4/modules/engines/Makefile.in +--- gtk+2.0-2.14.4.old/modules/engines/Makefile.in 2008-10-17 01:07:17.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/engines/Makefile.in 2008-11-04 15:37:09.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +128,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -52157,730 +62062,19 @@ Index: gtk+2.0-2.14.3/modules/engines/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +147,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +157,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +186,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +205,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +216,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +228,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +269,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +278,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,33 +313,40 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - @USE_WIN32_TRUE@wimp = ms-windows -- - SUBDIRS = $(wimp) pixbuf --subdir = modules/engines --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --DIST_SUBDIRS = ms-windows pixbuf - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/engines/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo -@@ -440,10 +354,6 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, -@@ -451,7 +361,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -463,15 +379,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -492,7 +413,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -503,35 +424,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -539,23 +455,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -567,29 +483,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -602,13 +512,17 @@ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d $(distdir)/$$subdir \ -- || mkdir $(distdir)/$$subdir \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -619,7 +533,6 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -- - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -639,7 +552,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -650,25 +563,34 @@ - - distclean: distclean-recursive - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -687,26 +609,24 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-generic clean-libtool clean-recursive \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am dvi-recursive info info-am info-recursive install \ -- install-am install-data install-data-am install-data-recursive \ -- install-exec install-exec-am install-exec-recursive \ -- install-info install-info-am install-info-recursive install-man \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am check-local clean clean-generic \ -+ clean-libtool ctags ctags-recursive distclean \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/engines/ms-windows/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/engines/ms-windows/Makefile.in 2008-09-24 00:11:40.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/engines/ms-windows/Makefile.in 2008-09-24 19:56:54.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,67 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+subdir = modules/engines/ms-windows -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(enginedir)" -+engineLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(engine_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+am__DEPENDENCIES_2 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ -+ $(top_builddir)/gdk/$(gdktargetlib) \ -+ $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1) -+libwimp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libwimp_la_OBJECTS = msw_rc_style.lo msw_style.lo msw_theme_main.lo \ -+ xp_theme.lo -+libwimp_la_OBJECTS = $(am_libwimp_la_OBJECTS) -+libwimp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libwimp_la_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libwimp_la_SOURCES) -+DIST_SOURCES = $(libwimp_la_SOURCES) -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +103,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +128,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +135,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.14.4/modules/engines/ms-windows/Makefile.in +--- gtk+2.0-2.14.4.old/modules/engines/ms-windows/Makefile.in 2008-10-17 01:07:18.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/engines/ms-windows/Makefile.in 2008-11-04 15:37:09.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +161,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -52888,856 +62082,19 @@ Index: gtk+2.0-2.14.3/modules/engines/ms-windows/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +180,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +190,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +219,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +238,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +249,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +261,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +302,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +311,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,9 +346,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - SUBDIRS = Theme -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ -@@ -416,18 +354,14 @@ - -DGDK_DISABLE_DEPRECATED \ - $(GTK_DEP_CFLAGS) - -- - LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) \ - $(GTK_DEP_LIBS) - -- - enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines -- - engine_LTLIBRARIES = libwimp.la -- - libwimp_la_SOURCES = \ - msw_rc_style.c \ - msw_rc_style.h \ -@@ -438,95 +372,75 @@ - xp_theme_defs.h \ - xp_theme.h - -- - libwimp_la_LDFLAGS = \ - -avoid-version -module -no-undefined -export-dynamic - -- - libwimp_la_LIBADD = $(LDADDS) -lgdi32 --subdir = modules/engines/ms-windows --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(engine_LTLIBRARIES) -- --libwimp_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_libwimp_la_OBJECTS = msw_rc_style.lo msw_style.lo msw_theme_main.lo \ -- xp_theme.lo --libwimp_la_OBJECTS = $(am_libwimp_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/msw_rc_style.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/msw_style.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/msw_theme_main.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/xp_theme.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libwimp_la_SOURCES) -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(libwimp_la_SOURCES) -- - all: all-recursive - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/ms-windows/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/engines/ms-windows/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --engineLTLIBRARIES_INSTALL = $(INSTALL) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-engineLTLIBRARIES: $(engine_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(enginedir) -+ test -z "$(enginedir)" || $(MKDIR_P) "$(DESTDIR)$(enginedir)" - @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(enginedir)/$$f"; \ -- $(LIBTOOL) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(enginedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(enginedir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(enginedir)/$$f"; \ - else :; fi; \ - done - - uninstall-engineLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(enginedir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(enginedir)/$$p"; \ - done - - clean-engineLTLIBRARIES: - -test -z "$(engine_LTLIBRARIES)" || rm -f $(engine_LTLIBRARIES) - @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libwimp.la: $(libwimp_la_OBJECTS) $(libwimp_la_DEPENDENCIES) -- $(LINK) -rpath $(enginedir) $(libwimp_la_LDFLAGS) $(libwimp_la_OBJECTS) $(libwimp_la_LIBADD) $(LIBS) -+ $(libwimp_la_LINK) -rpath $(enginedir) $(libwimp_la_OBJECTS) $(libwimp_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -537,37 +451,25 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xp_theme.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -575,10 +477,6 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, -@@ -586,7 +484,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -598,15 +502,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -627,7 +536,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -638,35 +547,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -674,23 +578,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -702,29 +606,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -735,15 +633,19 @@ - || 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 \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -754,8 +656,9 @@ - all-am: Makefile $(LTLIBRARIES) - installdirs: installdirs-recursive - installdirs-am: -- $(mkinstalldirs) $(DESTDIR)$(enginedir) -- -+ for dir in "$(DESTDIR)$(enginedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -775,7 +678,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -789,24 +692,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: install-engineLTLIBRARIES - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -827,28 +740,27 @@ - - ps-am: - --uninstall-am: uninstall-engineLTLIBRARIES uninstall-info-am -+uninstall-am: uninstall-engineLTLIBRARIES - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-engineLTLIBRARIES clean-generic \ -- clean-libtool clean-recursive ctags ctags-recursive distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-recursive distclean-tags distdir dvi dvi-am \ -- dvi-recursive info info-am info-recursive install install-am \ -- install-data install-data-am install-data-recursive \ -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am check-local clean \ -+ clean-engineLTLIBRARIES clean-generic clean-libtool ctags \ -+ ctags-recursive distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am \ - install-engineLTLIBRARIES install-exec install-exec-am \ -- install-exec-recursive install-info install-info-am \ -- install-info-recursive install-man install-recursive \ -- install-strip installcheck installcheck-am installdirs \ -- installdirs-am installdirs-recursive maintainer-clean \ -- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ -- ps-recursive tags tags-recursive uninstall uninstall-am \ -- uninstall-engineLTLIBRARIES uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+ install-html install-html-am install-info install-info-am \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am \ -+ uninstall-engineLTLIBRARIES - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-09-24 00:11:40.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-09-24 19:56:55.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,32 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+subdir = modules/engines/ms-windows/Theme/gtk-2.0 -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(themedir)" -+themeDATA_INSTALL = $(INSTALL_DATA) -+DATA = $(theme_DATA) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +68,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +93,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +100,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +--- gtk+2.0-2.14.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-10-17 01:07:18.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-11-04 15:37:09.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +126,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -53745,560 +62102,19 @@ Index: gtk+2.0-2.14.3/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +145,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +155,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +184,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +203,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +214,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +226,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +267,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +276,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,54 +311,62 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - themedir = $(datadir)/themes/MS-Windows/gtk-2.0 - theme_DATA = gtkrc --subdir = modules/engines/ms-windows/Theme/gtk-2.0 --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = --DATA = $(theme_DATA) -- --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am - all: all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/ms-windows/Theme/gtk-2.0/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/engines/ms-windows/Theme/gtk-2.0/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --themeDATA_INSTALL = $(INSTALL_DATA) - install-themeDATA: $(theme_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(themedir) -+ test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" - @list='$(theme_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \ -- $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \ -+ $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \ - done - - uninstall-themeDATA: - @$(NORMAL_UNINSTALL) - @list='$(theme_DATA)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(themedir)/$$f"; \ -- rm -f $(DESTDIR)$(themedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(themedir)/$$f"; \ - done - tags: TAGS - TAGS: -@@ -461,29 +374,23 @@ - ctags: CTAGS - CTAGS: - --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -498,9 +405,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(DATA) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(themedir) -+ for dir in "$(DESTDIR)$(themedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -520,7 +428,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -531,24 +439,34 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool -+distclean-am: clean-am distclean-generic - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-themeDATA - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -567,17 +485,21 @@ - - ps-am: - --uninstall-am: uninstall-info-am uninstall-themeDATA -+uninstall-am: uninstall-themeDATA -+ -+.MAKE: install-am install-strip - - .PHONY: all all-am check check-am check-local clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ -- distdir dvi dvi-am info info-am install install-am install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip install-themeDATA \ -- installcheck installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -- uninstall-info-am uninstall-themeDATA -+ distdir dvi dvi-am html html-am info info-am install \ -+ install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip install-themeDATA installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ -+ ps ps-am uninstall uninstall-am uninstall-themeDATA - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/engines/ms-windows/Theme/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/engines/ms-windows/Theme/Makefile.in 2008-09-24 00:11:40.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/engines/ms-windows/Theme/Makefile.in 2008-09-24 19:56:54.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,17 +15,11 @@ - @SET_MAKE@ - - # GTK+ - The GIMP Toolkit -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+subdir = modules/engines/ms-windows/Theme -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = $(SUBDIRS) -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +70,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +95,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +102,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.14.4/modules/engines/ms-windows/Theme/Makefile.in +--- gtk+2.0-2.14.4.old/modules/engines/ms-windows/Theme/Makefile.in 2008-10-17 01:07:18.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/engines/ms-windows/Theme/Makefile.in 2008-11-04 15:37:09.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +128,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -54306,722 +62122,19 @@ Index: gtk+2.0-2.14.3/modules/engines/ms-windows/Theme/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +147,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +157,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +186,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +205,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +216,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +228,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +269,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +278,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,31 +313,39 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - SUBDIRS = gtk-2.0 --subdir = modules/engines/ms-windows/Theme --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --DIST_SUBDIRS = $(SUBDIRS) - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/ms-windows/Theme/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/engines/ms-windows/Theme/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo -@@ -438,10 +353,6 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, -@@ -449,7 +360,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -461,15 +378,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -490,7 +412,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -501,35 +423,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -537,23 +454,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -565,29 +482,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -598,15 +509,19 @@ - || 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 \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -617,7 +532,6 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -- - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -637,7 +551,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -648,25 +562,34 @@ - - distclean: distclean-recursive - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -685,26 +608,24 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-generic clean-libtool clean-recursive \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am dvi-recursive info info-am info-recursive install \ -- install-am install-data install-data-am install-data-recursive \ -- install-exec install-exec-am install-exec-recursive \ -- install-info install-info-am install-info-recursive install-man \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am check-local clean clean-generic \ -+ clean-libtool ctags ctags-recursive distclean \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/engines/pixbuf/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/engines/pixbuf/Makefile.in 2008-09-24 00:11:40.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/engines/pixbuf/Makefile.in 2008-09-24 19:56:55.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,58 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl ChangeLog -+subdir = modules/engines/pixbuf -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(enginedir)" -+engineLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(engine_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ -+ $(top_builddir)/gdk/$(gdktargetlib) \ -+ $(top_builddir)/gtk/$(gtktargetlib) -+libpixmap_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libpixmap_la_OBJECTS = pixbuf-draw.lo pixbuf-main.lo \ -+ pixbuf-render.lo pixbuf-rc-style.lo -+libpixmap_la_OBJECTS = $(am_libpixmap_la_OBJECTS) -+libpixmap_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libpixmap_la_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libpixmap_la_SOURCES) -+DIST_SOURCES = $(libpixmap_la_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +94,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +119,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +126,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.4/modules/engines/pixbuf/Makefile.in +--- gtk+2.0-2.14.4.old/modules/engines/pixbuf/Makefile.in 2008-10-17 01:07:18.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/engines/pixbuf/Makefile.in 2008-11-04 15:37:09.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +152,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -55029,962 +62142,19 @@ Index: gtk+2.0-2.14.3/modules/engines/pixbuf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +171,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +181,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +210,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +229,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +240,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +252,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +293,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +302,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,9 +337,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ -@@ -416,18 +345,14 @@ - -DGDK_DISABLE_DEPRECATED \ - $(GTK_DEP_CFLAGS) - -- - LDADDS = \ - $(GTK_DEP_LIBS) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- - enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines -- - engine_LTLIBRARIES = libpixmap.la -- - libpixmap_la_SOURCES = \ - pixbuf-draw.c \ - pixbuf-main.c \ -@@ -437,85 +362,73 @@ - pixbuf-style.h \ - pixbuf.h - -- - libpixmap_la_LDFLAGS = -avoid-version -module $(no_undefined) - libpixmap_la_LIBADD = $(LDADDS) --subdir = modules/engines/pixbuf --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(engine_LTLIBRARIES) -- --libpixmap_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_libpixmap_la_OBJECTS = pixbuf-draw.lo pixbuf-main.lo pixbuf-render.lo \ -- pixbuf-rc-style.lo --libpixmap_la_OBJECTS = $(am_libpixmap_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pixbuf-draw.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-main.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-rc-style.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-render.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libpixmap_la_SOURCES) --DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- ChangeLog Makefile.am --SOURCES = $(libpixmap_la_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/pixbuf/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/engines/pixbuf/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --engineLTLIBRARIES_INSTALL = $(INSTALL) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-engineLTLIBRARIES: $(engine_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(enginedir) -+ test -z "$(enginedir)" || $(MKDIR_P) "$(DESTDIR)$(enginedir)" - @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(enginedir)/$$f"; \ -- $(LIBTOOL) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(enginedir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(enginedir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(enginedir)/$$f"; \ - else :; fi; \ - done - - uninstall-engineLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(enginedir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(enginedir)/$$p"; \ - done - - clean-engineLTLIBRARIES: - -test -z "$(engine_LTLIBRARIES)" || rm -f $(engine_LTLIBRARIES) - @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libpixmap.la: $(libpixmap_la_OBJECTS) $(libpixmap_la_DEPENDENCIES) -- $(LINK) -rpath $(enginedir) $(libpixmap_la_LDFLAGS) $(libpixmap_la_OBJECTS) $(libpixmap_la_LIBADD) $(LIBS) -+ $(libpixmap_la_LINK) -rpath $(enginedir) $(libpixmap_la_OBJECTS) $(libpixmap_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -526,37 +439,25 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf-render.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -564,26 +465,15 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -593,23 +483,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -621,29 +511,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -658,9 +542,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(LTLIBRARIES) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(enginedir) -+ for dir in "$(DESTDIR)$(enginedir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -680,7 +565,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -694,24 +579,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-engineLTLIBRARIES - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -732,20 +627,24 @@ - - ps-am: - --uninstall-am: uninstall-engineLTLIBRARIES uninstall-info-am -+uninstall-am: uninstall-engineLTLIBRARIES -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-engineLTLIBRARIES clean-generic clean-libtool ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am \ -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am \ - install-engineLTLIBRARIES install-exec install-exec-am \ -- install-info install-info-am install-man install-strip \ -- installcheck installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-engineLTLIBRARIES \ -- uninstall-info-am -+ install-html install-html-am install-info install-info-am \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-engineLTLIBRARIES - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/input/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/input/Makefile.in 2008-09-24 00:11:41.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/input/Makefile.in 2008-09-24 19:56:55.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,12 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,256 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(dist_imconffile_DATA) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl -+subdir = modules/input -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(moduledir)" \ -+ "$(DESTDIR)$(imconffiledir)" -+moduleLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+am__DEPENDENCIES_2 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -+ $(top_builddir)/gdk/$(gdktargetlib) \ -+ $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1) -+im_am_et_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_am_et_la_OBJECTS = imam-et.lo -+im_am_et_la_OBJECTS = $(am_im_am_et_la_OBJECTS) -+im_am_et_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_am_et_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_AM_ET_FALSE@am_im_am_et_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_AM_ET_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_AM_ET_FALSE@ $(moduledir) -+im_cedilla_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_cedilla_la_OBJECTS = imcedilla.lo -+im_cedilla_la_OBJECTS = $(am_im_cedilla_la_OBJECTS) -+im_cedilla_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_cedilla_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CEDILLA_FALSE@am_im_cedilla_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CEDILLA_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CEDILLA_FALSE@ $(moduledir) -+im_cyrillic_translit_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_cyrillic_translit_la_OBJECTS = imcyrillic-translit.lo -+im_cyrillic_translit_la_OBJECTS = \ -+ $(am_im_cyrillic_translit_la_OBJECTS) -+im_cyrillic_translit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_cyrillic_translit_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@am_im_cyrillic_translit_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ $(moduledir) -+im_ime_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_ime_la_OBJECTS = gtkimcontextime.lo imime.lo -+im_ime_la_OBJECTS = $(am_im_ime_la_OBJECTS) -+im_ime_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_ime_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@am_im_ime_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@ $(moduledir) -+im_inuktitut_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_inuktitut_la_OBJECTS = iminuktitut.lo -+im_inuktitut_la_OBJECTS = $(am_im_inuktitut_la_OBJECTS) -+im_inuktitut_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_inuktitut_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_INUKTITUT_FALSE@am_im_inuktitut_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_INUKTITUT_FALSE@ $(moduledir) -+im_ipa_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_ipa_la_OBJECTS = imipa.lo -+im_ipa_la_OBJECTS = $(am_im_ipa_la_OBJECTS) -+im_ipa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_ipa_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IPA_FALSE@am_im_ipa_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IPA_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IPA_FALSE@ $(moduledir) -+im_multipress_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_multipress_la_OBJECTS = \ -+ im_multipress_la-gtkimcontextmultipress.lo \ -+ im_multipress_la-immultipress.lo -+im_multipress_la_OBJECTS = $(am_im_multipress_la_OBJECTS) -+im_multipress_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_multipress_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_MULTIPRESS_FALSE@am_im_multipress_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_MULTIPRESS_FALSE@ $(moduledir) -+im_thai_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_thai_la_OBJECTS = thai-charprop.lo gtkimcontextthai.lo imthai.lo -+im_thai_la_OBJECTS = $(am_im_thai_la_OBJECTS) -+im_thai_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_thai_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_THAI_FALSE@am_im_thai_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_THAI_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_THAI_FALSE@ $(moduledir) -+im_ti_er_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_ti_er_la_OBJECTS = imti-er.lo -+im_ti_er_la_OBJECTS = $(am_im_ti_er_la_OBJECTS) -+im_ti_er_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_ti_er_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ER_FALSE@am_im_ti_er_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ER_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ER_FALSE@ $(moduledir) -+im_ti_et_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_ti_et_la_OBJECTS = imti-et.lo -+im_ti_et_la_OBJECTS = $(am_im_ti_et_la_OBJECTS) -+im_ti_et_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_ti_et_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ET_FALSE@am_im_ti_et_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ET_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ET_FALSE@ $(moduledir) -+im_viqr_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_viqr_la_OBJECTS = imviqr.lo -+im_viqr_la_OBJECTS = $(am_im_viqr_la_OBJECTS) -+im_viqr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_viqr_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_VIQR_FALSE@am_im_viqr_la_rpath = \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_VIQR_FALSE@ -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_VIQR_FALSE@ $(moduledir) -+im_xim_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_im_xim_la_OBJECTS = gtkimcontextxim.lo imxim.lo -+im_xim_la_OBJECTS = $(am_im_xim_la_OBJECTS) -+im_xim_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(im_xim_la_LDFLAGS) $(LDFLAGS) -o $@ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@am_im_xim_la_rpath = -rpath \ -+@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@ $(moduledir) -+libstatic_im_am_et_la_LIBADD = -+am__objects_1 = imam-et.lo -+am_libstatic_im_am_et_la_OBJECTS = $(am__objects_1) -+libstatic_im_am_et_la_OBJECTS = $(am_libstatic_im_am_et_la_OBJECTS) -+@INCLUDE_IM_AM_ET_TRUE@am_libstatic_im_am_et_la_rpath = -+libstatic_im_cedilla_la_LIBADD = -+am__objects_2 = imcedilla.lo -+am_libstatic_im_cedilla_la_OBJECTS = $(am__objects_2) -+libstatic_im_cedilla_la_OBJECTS = \ -+ $(am_libstatic_im_cedilla_la_OBJECTS) -+@INCLUDE_IM_CEDILLA_TRUE@am_libstatic_im_cedilla_la_rpath = -+libstatic_im_cyrillic_translit_la_LIBADD = -+am__objects_3 = imcyrillic-translit.lo -+am_libstatic_im_cyrillic_translit_la_OBJECTS = $(am__objects_3) -+libstatic_im_cyrillic_translit_la_OBJECTS = \ -+ $(am_libstatic_im_cyrillic_translit_la_OBJECTS) -+@INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@am_libstatic_im_cyrillic_translit_la_rpath = -+libstatic_im_ime_la_DEPENDENCIES = -+am__objects_4 = gtkimcontextime.lo imime.lo -+am_libstatic_im_ime_la_OBJECTS = $(am__objects_4) -+libstatic_im_ime_la_OBJECTS = $(am_libstatic_im_ime_la_OBJECTS) -+@INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE@am_libstatic_im_ime_la_rpath = -+libstatic_im_inuktitut_la_LIBADD = -+am__objects_5 = iminuktitut.lo -+am_libstatic_im_inuktitut_la_OBJECTS = $(am__objects_5) -+libstatic_im_inuktitut_la_OBJECTS = \ -+ $(am_libstatic_im_inuktitut_la_OBJECTS) -+@INCLUDE_IM_INUKTITUT_TRUE@am_libstatic_im_inuktitut_la_rpath = -+libstatic_im_ipa_la_LIBADD = -+am__objects_6 = imipa.lo -+am_libstatic_im_ipa_la_OBJECTS = $(am__objects_6) -+libstatic_im_ipa_la_OBJECTS = $(am_libstatic_im_ipa_la_OBJECTS) -+@INCLUDE_IM_IPA_TRUE@am_libstatic_im_ipa_la_rpath = -+libstatic_im_multipress_la_LIBADD = -+am__objects_7 = libstatic_im_multipress_la-gtkimcontextmultipress.lo \ -+ libstatic_im_multipress_la-immultipress.lo -+am_libstatic_im_multipress_la_OBJECTS = $(am__objects_7) -+libstatic_im_multipress_la_OBJECTS = \ -+ $(am_libstatic_im_multipress_la_OBJECTS) -+@INCLUDE_IM_MULTIPRESS_TRUE@am_libstatic_im_multipress_la_rpath = -+libstatic_im_thai_la_LIBADD = -+am__objects_8 = thai-charprop.lo gtkimcontextthai.lo imthai.lo -+am_libstatic_im_thai_la_OBJECTS = $(am__objects_8) -+libstatic_im_thai_la_OBJECTS = $(am_libstatic_im_thai_la_OBJECTS) -+@INCLUDE_IM_THAI_TRUE@am_libstatic_im_thai_la_rpath = -+libstatic_im_ti_er_la_LIBADD = -+am__objects_9 = imti-er.lo -+am_libstatic_im_ti_er_la_OBJECTS = $(am__objects_9) -+libstatic_im_ti_er_la_OBJECTS = $(am_libstatic_im_ti_er_la_OBJECTS) -+@INCLUDE_IM_TI_ER_TRUE@am_libstatic_im_ti_er_la_rpath = -+libstatic_im_ti_et_la_LIBADD = -+am__objects_10 = imti-et.lo -+am_libstatic_im_ti_et_la_OBJECTS = $(am__objects_10) -+libstatic_im_ti_et_la_OBJECTS = $(am_libstatic_im_ti_et_la_OBJECTS) -+@INCLUDE_IM_TI_ET_TRUE@am_libstatic_im_ti_et_la_rpath = -+libstatic_im_viqr_la_LIBADD = -+am__objects_11 = imviqr.lo -+am_libstatic_im_viqr_la_OBJECTS = $(am__objects_11) -+libstatic_im_viqr_la_OBJECTS = $(am_libstatic_im_viqr_la_OBJECTS) -+@INCLUDE_IM_VIQR_TRUE@am_libstatic_im_viqr_la_rpath = -+libstatic_im_xim_la_LIBADD = -+am__objects_12 = gtkimcontextxim.lo imxim.lo -+am_libstatic_im_xim_la_OBJECTS = $(am__objects_12) -+libstatic_im_xim_la_OBJECTS = $(am_libstatic_im_xim_la_OBJECTS) -+@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE@am_libstatic_im_xim_la_rpath = -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) \ -+ $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) \ -+ $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) \ -+ $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) \ -+ $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) \ -+ $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) \ -+ $(libstatic_im_am_et_la_SOURCES) \ -+ $(libstatic_im_cedilla_la_SOURCES) \ -+ $(libstatic_im_cyrillic_translit_la_SOURCES) \ -+ $(libstatic_im_ime_la_SOURCES) \ -+ $(libstatic_im_inuktitut_la_SOURCES) \ -+ $(libstatic_im_ipa_la_SOURCES) \ -+ $(libstatic_im_multipress_la_SOURCES) \ -+ $(libstatic_im_thai_la_SOURCES) \ -+ $(libstatic_im_ti_er_la_SOURCES) \ -+ $(libstatic_im_ti_et_la_SOURCES) \ -+ $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) -+DIST_SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) \ -+ $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) \ -+ $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) \ -+ $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) \ -+ $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) \ -+ $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) \ -+ $(libstatic_im_am_et_la_SOURCES) \ -+ $(libstatic_im_cedilla_la_SOURCES) \ -+ $(libstatic_im_cyrillic_translit_la_SOURCES) \ -+ $(libstatic_im_ime_la_SOURCES) \ -+ $(libstatic_im_inuktitut_la_SOURCES) \ -+ $(libstatic_im_ipa_la_SOURCES) \ -+ $(libstatic_im_multipress_la_SOURCES) \ -+ $(libstatic_im_thai_la_SOURCES) \ -+ $(libstatic_im_ti_er_la_SOURCES) \ -+ $(libstatic_im_ti_et_la_SOURCES) \ -+ $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) -+dist_imconffileDATA_INSTALL = $(INSTALL_DATA) -+DATA = $(dist_imconffile_DATA) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +293,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +318,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +325,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/input/Makefile.in gtk+2.0-2.14.4/modules/input/Makefile.in +--- gtk+2.0-2.14.4.old/modules/input/Makefile.in 2008-10-17 01:07:18.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/input/Makefile.in 2008-11-04 15:37:09.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +351,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -55992,1144 +62162,19 @@ Index: gtk+2.0-2.14.3/modules/input/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +370,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +380,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +409,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +428,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +439,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +451,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +492,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +501,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages +@@ -545,9 +548,10 @@ -@@ -406,9 +536,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ -@@ -420,22 +548,18 @@ - $(GTK_DEP_CFLAGS) \ - $(INCLUDED_IMMODULE_DEFINE) - -- - DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- - LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) \ - $(GTK_DEP_LIBS) - -- - moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules -- - im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_xim_la_SOURCES = \ - gtkimcontextxim.c \ -@@ -446,42 +570,36 @@ - im_xim_la_LIBADD = $(LDADDS) - @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE@STATIC_XIM_MODULE = libstatic-im-xim.la - @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@XIM_MODULE = im-xim.la -- - im_am_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_am_et_la_SOURCES = imam-et.c - libstatic_im_am_et_la_SOURCES = $(im_am_et_la_SOURCES) - im_am_et_la_LIBADD = $(LDADDS) - @INCLUDE_IM_AM_ET_TRUE@STATIC_AM_ET_MODULE = libstatic-im-am-et.la - @INCLUDE_IM_AM_ET_FALSE@AM_ET_MODULE = im-am-et.la -- - im_cedilla_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_cedilla_la_SOURCES = imcedilla.c - libstatic_im_cedilla_la_SOURCES = $(im_cedilla_la_SOURCES) - im_cedilla_la_LIBADD = $(LDADDS) - @INCLUDE_IM_CEDILLA_TRUE@STATIC_CEDILLA_MODULE = libstatic-im-cedilla.la - @INCLUDE_IM_CEDILLA_FALSE@CEDILLA_MODULE = im-cedilla.la -- - im_cyrillic_translit_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_cyrillic_translit_la_SOURCES = imcyrillic-translit.c - libstatic_im_cyrillic_translit_la_SOURCES = $(im_cyrillic_translit_la_SOURCES) - im_cyrillic_translit_la_LIBADD = $(LDADDS) - @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@STATIC_CYRILLIC_TRANSLIT_MODULE = libstatic-im-cyrillic-translit.la - @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@CYRILLIC_TRANSLIT_MODULE = im-cyrillic-translit.la -- - im_ti_er_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_ti_er_la_SOURCES = imti-er.c - libstatic_im_ti_er_la_SOURCES = $(im_ti_er_la_SOURCES) - im_ti_er_la_LIBADD = $(LDADDS) - @INCLUDE_IM_TI_ER_TRUE@STATIC_TI_ER_MODULE = libstatic-im-ti-er.la - @INCLUDE_IM_TI_ER_FALSE@TI_ER_MODULE = im-ti-er.la -- - im_ti_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_ti_et_la_SOURCES = imti-et.c - libstatic_im_ti_et_la_SOURCES = $(im_ti_et_la_SOURCES) - im_ti_et_la_LIBADD = $(LDADDS) - @INCLUDE_IM_TI_ET_TRUE@STATIC_TI_ET_MODULE = libstatic-im-ti-et.la - @INCLUDE_IM_TI_ET_FALSE@TI_ET_MODULE = im-ti-et.la -- - im_thai_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_thai_la_SOURCES = \ - thai-charprop.c \ -@@ -494,28 +612,24 @@ - im_thai_la_LIBADD = $(LDADDS) - @INCLUDE_IM_THAI_TRUE@STATIC_THAI_MODULE = libstatic-im-thai.la - @INCLUDE_IM_THAI_FALSE@THAI_MODULE = im-thai.la -- - im_viqr_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_viqr_la_SOURCES = imviqr.c - libstatic_im_viqr_la_SOURCES = $(im_viqr_la_SOURCES) - im_viqr_la_LIBADD = $(LDADDS) - @INCLUDE_IM_VIQR_TRUE@STATIC_VIQR_MODULE = libstatic-im-viqr.la - @INCLUDE_IM_VIQR_FALSE@VIQR_MODULE = im-viqr.la -- - im_inuktitut_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_inuktitut_la_SOURCES = iminuktitut.c - libstatic_im_inuktitut_la_SOURCES = $(im_inuktitut_la_SOURCES) - im_inuktitut_la_LIBADD = $(LDADDS) - @INCLUDE_IM_INUKTITUT_TRUE@STATIC_INUKTITUT_MODULE = libstatic-im-inuktitut.la - @INCLUDE_IM_INUKTITUT_FALSE@INUKTITUT_MODULE = im-inuktitut.la -- - im_ipa_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_ipa_la_SOURCES = imipa.c - libstatic_im_ipa_la_SOURCES = $(im_ipa_la_SOURCES) - im_ipa_la_LIBADD = $(LDADDS) - @INCLUDE_IM_IPA_TRUE@STATIC_IPA_MODULE = libstatic-im-ipa.la - @INCLUDE_IM_IPA_FALSE@IPA_MODULE = im-ipa.la -- - im_ime_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) - im_ime_la_SOURCES = \ - gtkimcontextime.c \ -@@ -528,7 +642,6 @@ - libstatic_im_ime_la_LIBADD = -limm32 - @INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE@STATIC_IME_MODULE = libstatic-im-ime.la - @INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@IME_MODULE = im-ime.la -- - multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\" - im_multipress_la_CPPFLAGS = $(multipress_defs) - libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS) -@@ -542,13 +655,11 @@ - im_multipress_la_LIBADD = $(LDADDS) - @INCLUDE_IM_MULTIPRESS_TRUE@STATIC_MULTIPRESS_MODULE = libstatic-im-multipress.la - @INCLUDE_IM_MULTIPRESS_FALSE@MULTIPRESS_MODULE = im-multipress.la -- 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_FALSE@@ENABLE_STATIC_TRUE@RUN_QUERY_IMMODULES_TEST = false + @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 + @BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \ @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \ - @BUILD_DYNAMIC_MODULES_TRUE@ $(CEDILLA_MODULE) \ -@@ -563,7 +674,6 @@ - @BUILD_DYNAMIC_MODULES_TRUE@ $(VIQR_MODULE) \ - @BUILD_DYNAMIC_MODULES_TRUE@ $(XIM_MODULE) - -- - noinst_LTLIBRARIES = \ - $(STATIC_AM_ET_MODULE) \ - $(STATIC_CEDILLA_MODULE) \ -@@ -578,234 +688,64 @@ - $(STATIC_VIQR_MODULE) \ - $(STATIC_XIM_MODULE) - -- - CLEANFILES = gtk.immodules --subdir = modules/input --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) -- --im_am_et_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_am_et_la_OBJECTS = imam-et.lo --im_am_et_la_OBJECTS = $(am_im_am_et_la_OBJECTS) --im_cedilla_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_cedilla_la_OBJECTS = imcedilla.lo --im_cedilla_la_OBJECTS = $(am_im_cedilla_la_OBJECTS) --im_cyrillic_translit_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_cyrillic_translit_la_OBJECTS = imcyrillic-translit.lo --im_cyrillic_translit_la_OBJECTS = $(am_im_cyrillic_translit_la_OBJECTS) --im_ime_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_ime_la_OBJECTS = gtkimcontextime.lo imime.lo --im_ime_la_OBJECTS = $(am_im_ime_la_OBJECTS) --im_inuktitut_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_inuktitut_la_OBJECTS = iminuktitut.lo --im_inuktitut_la_OBJECTS = $(am_im_inuktitut_la_OBJECTS) --im_ipa_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_ipa_la_OBJECTS = imipa.lo --im_ipa_la_OBJECTS = $(am_im_ipa_la_OBJECTS) --im_multipress_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_multipress_la_OBJECTS = im_multipress_la-gtkimcontextmultipress.lo \ -- im_multipress_la-immultipress.lo --im_multipress_la_OBJECTS = $(am_im_multipress_la_OBJECTS) --im_thai_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_thai_la_OBJECTS = thai-charprop.lo gtkimcontextthai.lo imthai.lo --im_thai_la_OBJECTS = $(am_im_thai_la_OBJECTS) --im_ti_er_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_ti_er_la_OBJECTS = imti-er.lo --im_ti_er_la_OBJECTS = $(am_im_ti_er_la_OBJECTS) --im_ti_et_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_ti_et_la_OBJECTS = imti-et.lo --im_ti_et_la_OBJECTS = $(am_im_ti_et_la_OBJECTS) --im_viqr_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_viqr_la_OBJECTS = imviqr.lo --im_viqr_la_OBJECTS = $(am_im_viqr_la_OBJECTS) --im_xim_la_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_im_xim_la_OBJECTS = gtkimcontextxim.lo imxim.lo --im_xim_la_OBJECTS = $(am_im_xim_la_OBJECTS) --libstatic_im_am_et_la_LDFLAGS = --libstatic_im_am_et_la_LIBADD = --am__objects_1 = imam-et.lo --am_libstatic_im_am_et_la_OBJECTS = $(am__objects_1) --libstatic_im_am_et_la_OBJECTS = $(am_libstatic_im_am_et_la_OBJECTS) --libstatic_im_cedilla_la_LDFLAGS = --libstatic_im_cedilla_la_LIBADD = --am__objects_2 = imcedilla.lo --am_libstatic_im_cedilla_la_OBJECTS = $(am__objects_2) --libstatic_im_cedilla_la_OBJECTS = $(am_libstatic_im_cedilla_la_OBJECTS) --libstatic_im_cyrillic_translit_la_LDFLAGS = --libstatic_im_cyrillic_translit_la_LIBADD = --am__objects_3 = imcyrillic-translit.lo --am_libstatic_im_cyrillic_translit_la_OBJECTS = $(am__objects_3) --libstatic_im_cyrillic_translit_la_OBJECTS = \ -- $(am_libstatic_im_cyrillic_translit_la_OBJECTS) --libstatic_im_ime_la_LDFLAGS = --libstatic_im_ime_la_DEPENDENCIES = --am__objects_4 = gtkimcontextime.lo imime.lo --am_libstatic_im_ime_la_OBJECTS = $(am__objects_4) --libstatic_im_ime_la_OBJECTS = $(am_libstatic_im_ime_la_OBJECTS) --libstatic_im_inuktitut_la_LDFLAGS = --libstatic_im_inuktitut_la_LIBADD = --am__objects_5 = iminuktitut.lo --am_libstatic_im_inuktitut_la_OBJECTS = $(am__objects_5) --libstatic_im_inuktitut_la_OBJECTS = \ -- $(am_libstatic_im_inuktitut_la_OBJECTS) --libstatic_im_ipa_la_LDFLAGS = --libstatic_im_ipa_la_LIBADD = --am__objects_6 = imipa.lo --am_libstatic_im_ipa_la_OBJECTS = $(am__objects_6) --libstatic_im_ipa_la_OBJECTS = $(am_libstatic_im_ipa_la_OBJECTS) --libstatic_im_multipress_la_LDFLAGS = --libstatic_im_multipress_la_LIBADD = --am__objects_7 = libstatic_im_multipress_la-gtkimcontextmultipress.lo \ -- libstatic_im_multipress_la-immultipress.lo --am_libstatic_im_multipress_la_OBJECTS = $(am__objects_7) --libstatic_im_multipress_la_OBJECTS = \ -- $(am_libstatic_im_multipress_la_OBJECTS) --libstatic_im_thai_la_LDFLAGS = --libstatic_im_thai_la_LIBADD = --am__objects_8 = thai-charprop.lo gtkimcontextthai.lo imthai.lo --am_libstatic_im_thai_la_OBJECTS = $(am__objects_8) --libstatic_im_thai_la_OBJECTS = $(am_libstatic_im_thai_la_OBJECTS) --libstatic_im_ti_er_la_LDFLAGS = --libstatic_im_ti_er_la_LIBADD = --am__objects_9 = imti-er.lo --am_libstatic_im_ti_er_la_OBJECTS = $(am__objects_9) --libstatic_im_ti_er_la_OBJECTS = $(am_libstatic_im_ti_er_la_OBJECTS) --libstatic_im_ti_et_la_LDFLAGS = --libstatic_im_ti_et_la_LIBADD = --am__objects_10 = imti-et.lo --am_libstatic_im_ti_et_la_OBJECTS = $(am__objects_10) --libstatic_im_ti_et_la_OBJECTS = $(am_libstatic_im_ti_et_la_OBJECTS) --libstatic_im_viqr_la_LDFLAGS = --libstatic_im_viqr_la_LIBADD = --am__objects_11 = imviqr.lo --am_libstatic_im_viqr_la_OBJECTS = $(am__objects_11) --libstatic_im_viqr_la_OBJECTS = $(am_libstatic_im_viqr_la_OBJECTS) --libstatic_im_xim_la_LDFLAGS = --libstatic_im_xim_la_LIBADD = --am__objects_12 = gtkimcontextxim.lo imxim.lo --am_libstatic_im_xim_la_OBJECTS = $(am__objects_12) --libstatic_im_xim_la_OBJECTS = $(am_libstatic_im_xim_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkimcontextime.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkimcontextthai.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkimcontextxim.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/im_multipress_la-immultipress.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/imam-et.Plo ./$(DEPDIR)/imcedilla.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/imcyrillic-translit.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/imime.Plo ./$(DEPDIR)/iminuktitut.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/imipa.Plo ./$(DEPDIR)/imthai.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/imti-er.Plo ./$(DEPDIR)/imti-et.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/imviqr.Plo ./$(DEPDIR)/imxim.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/thai-charprop.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) \ -- $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) \ -- $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) \ -- $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) \ -- $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) \ -- $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) \ -- $(libstatic_im_am_et_la_SOURCES) \ -- $(libstatic_im_cedilla_la_SOURCES) \ -- $(libstatic_im_cyrillic_translit_la_SOURCES) \ -- $(libstatic_im_ime_la_SOURCES) \ -- $(libstatic_im_inuktitut_la_SOURCES) \ -- $(libstatic_im_ipa_la_SOURCES) \ -- $(libstatic_im_multipress_la_SOURCES) \ -- $(libstatic_im_thai_la_SOURCES) \ -- $(libstatic_im_ti_er_la_SOURCES) \ -- $(libstatic_im_ti_et_la_SOURCES) \ -- $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) --DATA = $(dist_imconffile_DATA) -- --DIST_COMMON = $(dist_imconffile_DATA) $(srcdir)/Makefile.in \ -- $(top_srcdir)/Makefile.decl Makefile.am --SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) $(libstatic_im_am_et_la_SOURCES) $(libstatic_im_cedilla_la_SOURCES) $(libstatic_im_cyrillic_translit_la_SOURCES) $(libstatic_im_ime_la_SOURCES) $(libstatic_im_inuktitut_la_SOURCES) $(libstatic_im_ipa_la_SOURCES) $(libstatic_im_multipress_la_SOURCES) $(libstatic_im_thai_la_SOURCES) $(libstatic_im_ti_er_la_SOURCES) $(libstatic_im_ti_et_la_SOURCES) $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/input/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/input/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --moduleLTLIBRARIES_INSTALL = $(INSTALL) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-moduleLTLIBRARIES: $(module_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(moduledir) -+ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" - @list='$(module_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f"; \ -- $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ - else :; fi; \ - done - - uninstall-moduleLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(module_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ - done - - clean-moduleLTLIBRARIES: - -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES) - @list='$(module_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -@@ -814,61 +754,61 @@ - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - im-am-et.la: $(im_am_et_la_OBJECTS) $(im_am_et_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_am_et_la_LDFLAGS) $(im_am_et_la_OBJECTS) $(im_am_et_la_LIBADD) $(LIBS) -+ $(im_am_et_la_LINK) $(am_im_am_et_la_rpath) $(im_am_et_la_OBJECTS) $(im_am_et_la_LIBADD) $(LIBS) - im-cedilla.la: $(im_cedilla_la_OBJECTS) $(im_cedilla_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_cedilla_la_LDFLAGS) $(im_cedilla_la_OBJECTS) $(im_cedilla_la_LIBADD) $(LIBS) -+ $(im_cedilla_la_LINK) $(am_im_cedilla_la_rpath) $(im_cedilla_la_OBJECTS) $(im_cedilla_la_LIBADD) $(LIBS) - im-cyrillic-translit.la: $(im_cyrillic_translit_la_OBJECTS) $(im_cyrillic_translit_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_cyrillic_translit_la_LDFLAGS) $(im_cyrillic_translit_la_OBJECTS) $(im_cyrillic_translit_la_LIBADD) $(LIBS) -+ $(im_cyrillic_translit_la_LINK) $(am_im_cyrillic_translit_la_rpath) $(im_cyrillic_translit_la_OBJECTS) $(im_cyrillic_translit_la_LIBADD) $(LIBS) - im-ime.la: $(im_ime_la_OBJECTS) $(im_ime_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_ime_la_LDFLAGS) $(im_ime_la_OBJECTS) $(im_ime_la_LIBADD) $(LIBS) -+ $(im_ime_la_LINK) $(am_im_ime_la_rpath) $(im_ime_la_OBJECTS) $(im_ime_la_LIBADD) $(LIBS) - im-inuktitut.la: $(im_inuktitut_la_OBJECTS) $(im_inuktitut_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_inuktitut_la_LDFLAGS) $(im_inuktitut_la_OBJECTS) $(im_inuktitut_la_LIBADD) $(LIBS) -+ $(im_inuktitut_la_LINK) $(am_im_inuktitut_la_rpath) $(im_inuktitut_la_OBJECTS) $(im_inuktitut_la_LIBADD) $(LIBS) - im-ipa.la: $(im_ipa_la_OBJECTS) $(im_ipa_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_ipa_la_LDFLAGS) $(im_ipa_la_OBJECTS) $(im_ipa_la_LIBADD) $(LIBS) -+ $(im_ipa_la_LINK) $(am_im_ipa_la_rpath) $(im_ipa_la_OBJECTS) $(im_ipa_la_LIBADD) $(LIBS) - im-multipress.la: $(im_multipress_la_OBJECTS) $(im_multipress_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_multipress_la_LDFLAGS) $(im_multipress_la_OBJECTS) $(im_multipress_la_LIBADD) $(LIBS) -+ $(im_multipress_la_LINK) $(am_im_multipress_la_rpath) $(im_multipress_la_OBJECTS) $(im_multipress_la_LIBADD) $(LIBS) - im-thai.la: $(im_thai_la_OBJECTS) $(im_thai_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_thai_la_LDFLAGS) $(im_thai_la_OBJECTS) $(im_thai_la_LIBADD) $(LIBS) -+ $(im_thai_la_LINK) $(am_im_thai_la_rpath) $(im_thai_la_OBJECTS) $(im_thai_la_LIBADD) $(LIBS) - im-ti-er.la: $(im_ti_er_la_OBJECTS) $(im_ti_er_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_ti_er_la_LDFLAGS) $(im_ti_er_la_OBJECTS) $(im_ti_er_la_LIBADD) $(LIBS) -+ $(im_ti_er_la_LINK) $(am_im_ti_er_la_rpath) $(im_ti_er_la_OBJECTS) $(im_ti_er_la_LIBADD) $(LIBS) - im-ti-et.la: $(im_ti_et_la_OBJECTS) $(im_ti_et_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_ti_et_la_LDFLAGS) $(im_ti_et_la_OBJECTS) $(im_ti_et_la_LIBADD) $(LIBS) -+ $(im_ti_et_la_LINK) $(am_im_ti_et_la_rpath) $(im_ti_et_la_OBJECTS) $(im_ti_et_la_LIBADD) $(LIBS) - im-viqr.la: $(im_viqr_la_OBJECTS) $(im_viqr_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_viqr_la_LDFLAGS) $(im_viqr_la_OBJECTS) $(im_viqr_la_LIBADD) $(LIBS) -+ $(im_viqr_la_LINK) $(am_im_viqr_la_rpath) $(im_viqr_la_OBJECTS) $(im_viqr_la_LIBADD) $(LIBS) - im-xim.la: $(im_xim_la_OBJECTS) $(im_xim_la_DEPENDENCIES) -- $(LINK) -rpath $(moduledir) $(im_xim_la_LDFLAGS) $(im_xim_la_OBJECTS) $(im_xim_la_LIBADD) $(LIBS) -+ $(im_xim_la_LINK) $(am_im_xim_la_rpath) $(im_xim_la_OBJECTS) $(im_xim_la_LIBADD) $(LIBS) - libstatic-im-am-et.la: $(libstatic_im_am_et_la_OBJECTS) $(libstatic_im_am_et_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_am_et_la_LDFLAGS) $(libstatic_im_am_et_la_OBJECTS) $(libstatic_im_am_et_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_am_et_la_rpath) $(libstatic_im_am_et_la_OBJECTS) $(libstatic_im_am_et_la_LIBADD) $(LIBS) - libstatic-im-cedilla.la: $(libstatic_im_cedilla_la_OBJECTS) $(libstatic_im_cedilla_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_cedilla_la_LDFLAGS) $(libstatic_im_cedilla_la_OBJECTS) $(libstatic_im_cedilla_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_cedilla_la_rpath) $(libstatic_im_cedilla_la_OBJECTS) $(libstatic_im_cedilla_la_LIBADD) $(LIBS) - libstatic-im-cyrillic-translit.la: $(libstatic_im_cyrillic_translit_la_OBJECTS) $(libstatic_im_cyrillic_translit_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_cyrillic_translit_la_LDFLAGS) $(libstatic_im_cyrillic_translit_la_OBJECTS) $(libstatic_im_cyrillic_translit_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_cyrillic_translit_la_rpath) $(libstatic_im_cyrillic_translit_la_OBJECTS) $(libstatic_im_cyrillic_translit_la_LIBADD) $(LIBS) - libstatic-im-ime.la: $(libstatic_im_ime_la_OBJECTS) $(libstatic_im_ime_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_ime_la_LDFLAGS) $(libstatic_im_ime_la_OBJECTS) $(libstatic_im_ime_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_ime_la_rpath) $(libstatic_im_ime_la_OBJECTS) $(libstatic_im_ime_la_LIBADD) $(LIBS) - libstatic-im-inuktitut.la: $(libstatic_im_inuktitut_la_OBJECTS) $(libstatic_im_inuktitut_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_inuktitut_la_LDFLAGS) $(libstatic_im_inuktitut_la_OBJECTS) $(libstatic_im_inuktitut_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_inuktitut_la_rpath) $(libstatic_im_inuktitut_la_OBJECTS) $(libstatic_im_inuktitut_la_LIBADD) $(LIBS) - libstatic-im-ipa.la: $(libstatic_im_ipa_la_OBJECTS) $(libstatic_im_ipa_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_ipa_la_LDFLAGS) $(libstatic_im_ipa_la_OBJECTS) $(libstatic_im_ipa_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_ipa_la_rpath) $(libstatic_im_ipa_la_OBJECTS) $(libstatic_im_ipa_la_LIBADD) $(LIBS) - libstatic-im-multipress.la: $(libstatic_im_multipress_la_OBJECTS) $(libstatic_im_multipress_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_multipress_la_LDFLAGS) $(libstatic_im_multipress_la_OBJECTS) $(libstatic_im_multipress_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_multipress_la_rpath) $(libstatic_im_multipress_la_OBJECTS) $(libstatic_im_multipress_la_LIBADD) $(LIBS) - libstatic-im-thai.la: $(libstatic_im_thai_la_OBJECTS) $(libstatic_im_thai_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_thai_la_LDFLAGS) $(libstatic_im_thai_la_OBJECTS) $(libstatic_im_thai_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_thai_la_rpath) $(libstatic_im_thai_la_OBJECTS) $(libstatic_im_thai_la_LIBADD) $(LIBS) - libstatic-im-ti-er.la: $(libstatic_im_ti_er_la_OBJECTS) $(libstatic_im_ti_er_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_ti_er_la_LDFLAGS) $(libstatic_im_ti_er_la_OBJECTS) $(libstatic_im_ti_er_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_ti_er_la_rpath) $(libstatic_im_ti_er_la_OBJECTS) $(libstatic_im_ti_er_la_LIBADD) $(LIBS) - libstatic-im-ti-et.la: $(libstatic_im_ti_et_la_OBJECTS) $(libstatic_im_ti_et_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_ti_et_la_LDFLAGS) $(libstatic_im_ti_et_la_OBJECTS) $(libstatic_im_ti_et_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_ti_et_la_rpath) $(libstatic_im_ti_et_la_OBJECTS) $(libstatic_im_ti_et_la_LIBADD) $(LIBS) - libstatic-im-viqr.la: $(libstatic_im_viqr_la_OBJECTS) $(libstatic_im_viqr_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_viqr_la_LDFLAGS) $(libstatic_im_viqr_la_OBJECTS) $(libstatic_im_viqr_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_viqr_la_rpath) $(libstatic_im_viqr_la_OBJECTS) $(libstatic_im_viqr_la_LIBADD) $(LIBS) - libstatic-im-xim.la: $(libstatic_im_xim_la_OBJECTS) $(libstatic_im_xim_la_DEPENDENCIES) -- $(LINK) $(libstatic_im_xim_la_LDFLAGS) $(libstatic_im_xim_la_OBJECTS) $(libstatic_im_xim_la_LIBADD) $(LIBS) -+ $(LINK) $(am_libstatic_im_xim_la_rpath) $(libstatic_im_xim_la_OBJECTS) $(libstatic_im_xim_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -894,214 +834,86 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thai-charprop.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -- --im_multipress_la-gtkimcontextmultipress.o: gtkimcontextmultipress.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-gtkimcontextmultipress.o -MD -MP -MF "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o im_multipress_la-gtkimcontextmultipress.o `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='im_multipress_la-gtkimcontextmultipress.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Po' tmpdepfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-gtkimcontextmultipress.o `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c -- --im_multipress_la-gtkimcontextmultipress.obj: gtkimcontextmultipress.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-gtkimcontextmultipress.obj -MD -MP -MF "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o im_multipress_la-gtkimcontextmultipress.obj `if test -f 'gtkimcontextmultipress.c'; then $(CYGPATH_W) 'gtkimcontextmultipress.c'; else $(CYGPATH_W) '$(srcdir)/gtkimcontextmultipress.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='im_multipress_la-gtkimcontextmultipress.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Po' tmpdepfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-gtkimcontextmultipress.obj `if test -f 'gtkimcontextmultipress.c'; then $(CYGPATH_W) 'gtkimcontextmultipress.c'; else $(CYGPATH_W) '$(srcdir)/gtkimcontextmultipress.c'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - im_multipress_la-gtkimcontextmultipress.lo: gtkimcontextmultipress.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-gtkimcontextmultipress.lo -MD -MP -MF "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-gtkimcontextmultipress.lo -MD -MP -MF $(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo -c -o im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo $(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='im_multipress_la-gtkimcontextmultipress.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Plo' tmpdepfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c -- --im_multipress_la-immultipress.o: immultipress.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-immultipress.o -MD -MP -MF "$(DEPDIR)/im_multipress_la-immultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o im_multipress_la-immultipress.o `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo" "$(DEPDIR)/im_multipress_la-immultipress.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='im_multipress_la-immultipress.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-immultipress.Po' tmpdepfile='$(DEPDIR)/im_multipress_la-immultipress.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-immultipress.o `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c -- --im_multipress_la-immultipress.obj: immultipress.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-immultipress.obj -MD -MP -MF "$(DEPDIR)/im_multipress_la-immultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o im_multipress_la-immultipress.obj `if test -f 'immultipress.c'; then $(CYGPATH_W) 'immultipress.c'; else $(CYGPATH_W) '$(srcdir)/immultipress.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo" "$(DEPDIR)/im_multipress_la-immultipress.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='im_multipress_la-immultipress.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-immultipress.Po' tmpdepfile='$(DEPDIR)/im_multipress_la-immultipress.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-immultipress.obj `if test -f 'immultipress.c'; then $(CYGPATH_W) 'immultipress.c'; else $(CYGPATH_W) '$(srcdir)/immultipress.c'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c - - im_multipress_la-immultipress.lo: immultipress.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-immultipress.lo -MD -MP -MF "$(DEPDIR)/im_multipress_la-immultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo" "$(DEPDIR)/im_multipress_la-immultipress.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-immultipress.lo -MD -MP -MF $(DEPDIR)/im_multipress_la-immultipress.Tpo -c -o im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/im_multipress_la-immultipress.Tpo $(DEPDIR)/im_multipress_la-immultipress.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='im_multipress_la-immultipress.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-immultipress.Plo' tmpdepfile='$(DEPDIR)/im_multipress_la-immultipress.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c -- --libstatic_im_multipress_la-gtkimcontextmultipress.o: gtkimcontextmultipress.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.o -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-gtkimcontextmultipress.o `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='libstatic_im_multipress_la-gtkimcontextmultipress.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.o `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c -- --libstatic_im_multipress_la-gtkimcontextmultipress.obj: gtkimcontextmultipress.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.obj -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-gtkimcontextmultipress.obj `if test -f 'gtkimcontextmultipress.c'; then $(CYGPATH_W) 'gtkimcontextmultipress.c'; else $(CYGPATH_W) '$(srcdir)/gtkimcontextmultipress.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='libstatic_im_multipress_la-gtkimcontextmultipress.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.obj `if test -f 'gtkimcontextmultipress.c'; then $(CYGPATH_W) 'gtkimcontextmultipress.c'; else $(CYGPATH_W) '$(srcdir)/gtkimcontextmultipress.c'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c - - libstatic_im_multipress_la-gtkimcontextmultipress.lo: gtkimcontextmultipress.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.lo -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.lo -MD -MP -MF $(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo $(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='libstatic_im_multipress_la-gtkimcontextmultipress.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c -- --libstatic_im_multipress_la-immultipress.o: immultipress.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.o -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-immultipress.o `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='libstatic_im_multipress_la-immultipress.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.o `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c -- --libstatic_im_multipress_la-immultipress.obj: immultipress.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.obj -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-immultipress.obj `if test -f 'immultipress.c'; then $(CYGPATH_W) 'immultipress.c'; else $(CYGPATH_W) '$(srcdir)/immultipress.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='libstatic_im_multipress_la-immultipress.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.obj `if test -f 'immultipress.c'; then $(CYGPATH_W) 'immultipress.c'; else $(CYGPATH_W) '$(srcdir)/immultipress.c'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c - - libstatic_im_multipress_la-immultipress.lo: immultipress.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.lo -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.lo -MD -MP -MF $(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo $(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='libstatic_im_multipress_la-immultipress.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c - - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --dist_imconffileDATA_INSTALL = $(INSTALL_DATA) - install-dist_imconffileDATA: $(dist_imconffile_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(imconffiledir) -+ test -z "$(imconffiledir)" || $(MKDIR_P) "$(DESTDIR)$(imconffiledir)" - @list='$(dist_imconffile_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(dist_imconffileDATA_INSTALL) $$d$$p $(DESTDIR)$(imconffiledir)/$$f"; \ -- $(dist_imconffileDATA_INSTALL) $$d$$p $(DESTDIR)$(imconffiledir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(dist_imconffileDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imconffiledir)/$$f'"; \ -+ $(dist_imconffileDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imconffiledir)/$$f"; \ - done - - uninstall-dist_imconffileDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_imconffile_DATA)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(imconffiledir)/$$f"; \ -- rm -f $(DESTDIR)$(imconffiledir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " rm -f '$(DESTDIR)$(imconffiledir)/$$f'"; \ -+ rm -f "$(DESTDIR)$(imconffiledir)/$$f"; \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -1111,23 +923,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -1139,29 +951,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -1175,10 +981,12 @@ - check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am -+@CROSS_COMPILING_TRUE@all-local: - all-am: Makefile $(LTLIBRARIES) $(DATA) all-local -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(moduledir) $(DESTDIR)$(imconffiledir) -+ for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(imconffiledir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -1199,7 +1007,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -1213,12 +1021,14 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: -@@ -1227,12 +1037,20 @@ - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -1253,22 +1071,27 @@ - - ps-am: - --uninstall-am: uninstall-dist_imconffileDATA uninstall-info-am \ -- uninstall-local uninstall-moduleLTLIBRARIES -+uninstall-am: uninstall-dist_imconffileDATA uninstall-local \ -+ uninstall-moduleLTLIBRARIES -+ -+.MAKE: install-am install-data-am install-strip - - .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \ - clean clean-generic clean-libtool clean-moduleLTLIBRARIES \ - clean-noinstLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ -- dvi-am info info-am install install-am install-data \ -- install-data-am install-dist_imconffileDATA install-exec \ -- install-exec-am install-info install-info-am install-man \ -- install-moduleLTLIBRARIES install-strip installcheck \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-data-hook \ -+ install-dist_imconffileDATA install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man \ -+ install-moduleLTLIBRARIES install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-dist_imconffileDATA \ -- uninstall-info-am uninstall-local uninstall-moduleLTLIBRARIES -+ uninstall-local uninstall-moduleLTLIBRARIES - - # call as: $(XVFB_START) && someprogram - -@@ -1351,7 +1174,18 @@ +@@ -1351,7 +1355,18 @@ included-modules: $(noinst_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES) @@ -57149,124 +62194,19 @@ Index: gtk+2.0-2.14.3/modules/input/Makefile.in @CROSS_COMPILING_FALSE@all-local: gtk.immodules # Tell versions [3.59,3.63) of GNU make to not export all variables. -Index: gtk+2.0-2.14.3/modules/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/Makefile.in 2008-09-24 00:11:40.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/Makefile.in 2008-09-24 19:56:54.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,17 +15,11 @@ - @SET_MAKE@ - - # GTK+ - The GIMP Toolkit -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +31,36 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl - @OS_UNIX_TRUE@am__append_1 = printbackends -+subdir = modules -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DIST_SUBDIRS = input engines other printbackends -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -52,22 +71,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,8 +96,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -91,10 +103,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/Makefile.in gtk+2.0-2.14.4/modules/Makefile.in +--- gtk+2.0-2.14.4.old/modules/Makefile.in 2008-10-17 01:07:17.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/Makefile.in 2008-11-04 15:37:08.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@ -@@ -121,6 +129,7 @@ +@@ -121,6 +123,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -57274,721 +62214,19 @@ Index: gtk+2.0-2.14.3/modules/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +148,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,91 +158,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -257,24 +187,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +206,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +217,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +229,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -366,6 +270,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -374,9 +279,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -407,31 +314,39 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - SUBDIRS = input engines other $(am__append_1) --subdir = modules --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --DIST_SUBDIRS = input engines other printbackends - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo -@@ -439,10 +354,6 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, -@@ -450,7 +361,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -462,15 +379,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -491,7 +413,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -502,35 +424,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -538,23 +455,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -566,29 +483,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -601,13 +512,17 @@ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d $(distdir)/$$subdir \ -- || mkdir $(distdir)/$$subdir \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -618,7 +533,6 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -- - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -638,7 +552,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -649,25 +563,34 @@ - - distclean: distclean-recursive - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -686,26 +609,24 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-generic clean-libtool clean-recursive \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am dvi-recursive info info-am info-recursive install \ -- install-am install-data install-data-am install-data-recursive \ -- install-exec install-exec-am install-exec-recursive \ -- install-info install-info-am install-info-recursive install-man \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am check-local clean clean-generic \ -+ clean-libtool ctags ctags-recursive distclean \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/printbackends/cups/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/printbackends/cups/Makefile.in 2008-09-24 00:11:42.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/printbackends/cups/Makefile.in 2008-09-24 19:56:56.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,12 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl -+subdir = modules/printbackends/cups -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(backenddir)" -+backendLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(backend_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+am__DEPENDENCIES_2 = $(top_builddir)/gtk/$(gtktargetlib) \ -+ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) -+libprintbackend_cups_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ -+ $(am__DEPENDENCIES_1) -+am_libprintbackend_cups_la_OBJECTS = gtkprintbackendcups.lo \ -+ gtkprintercups.lo gtkcupsutils.lo -+libprintbackend_cups_la_OBJECTS = \ -+ $(am_libprintbackend_cups_la_OBJECTS) -+libprintbackend_cups_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libprintbackend_cups_la_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libprintbackend_cups_la_SOURCES) -+DIST_SOURCES = $(libprintbackend_cups_la_SOURCES) -+HEADERS = $(noinst_HEADERS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +96,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +121,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +128,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.14.4/modules/other/gail/libgail-util/Makefile.in +--- gtk+2.0-2.14.4.old/modules/other/gail/libgail-util/Makefile.in 2008-10-17 01:07:19.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/other/gail/libgail-util/Makefile.in 2008-11-04 15:37:10.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +154,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -57996,769 +62234,19 @@ Index: gtk+2.0-2.14.3/modules/printbackends/cups/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +173,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +183,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +212,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +231,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +242,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +254,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +295,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +304,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,9 +339,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gtk \ -@@ -420,107 +351,90 @@ - $(GTK_DEP_CFLAGS) \ - $(GTK_DEBUG_FLAGS) - -- - LDADDS = \ - $(top_builddir)/gtk/$(gtktargetlib) \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(GTK_DEP_LIBS) - -- - backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends -- - backend_LTLIBRARIES = libprintbackend-cups.la -- - libprintbackend_cups_la_SOURCES = \ - gtkprintbackendcups.c \ - gtkprintercups.c \ - gtkcupsutils.c - -- - noinst_HEADERS = \ - gtkprintbackendcups.h \ - gtkprintercups.h \ - gtkcupsutils.h - -- - libprintbackend_cups_la_LDFLAGS = -avoid-version -module $(no_undefined) - libprintbackend_cups_la_LIBADD = $(LDADDS) $(CUPS_LIBS) --subdir = modules/printbackends/cups --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(backend_LTLIBRARIES) -- --libprintbackend_cups_la_DEPENDENCIES = \ -- $(top_builddir)/gtk/$(gtktargetlib) \ -- $(top_builddir)/gdk/$(gdktargetlib) --am_libprintbackend_cups_la_OBJECTS = gtkprintbackendcups.lo \ -- gtkprintercups.lo gtkcupsutils.lo --libprintbackend_cups_la_OBJECTS = $(am_libprintbackend_cups_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkcupsutils.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintbackendcups.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintercups.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libprintbackend_cups_la_SOURCES) --HEADERS = $(noinst_HEADERS) -- --DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ -- $(top_srcdir)/Makefile.decl Makefile.am --SOURCES = $(libprintbackend_cups_la_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/cups/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/printbackends/cups/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --backendLTLIBRARIES_INSTALL = $(INSTALL) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-backendLTLIBRARIES: $(backend_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(backenddir) -+ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \ -- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ - else :; fi; \ - done - - uninstall-backendLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ - done - - clean-backendLTLIBRARIES: - -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES) - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libprintbackend-cups.la: $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_DEPENDENCIES) -- $(LINK) -rpath $(backenddir) $(libprintbackend_cups_la_LDFLAGS) $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_LIBADD) $(LIBS) -+ $(libprintbackend_cups_la_LINK) -rpath $(backenddir) $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -530,37 +444,25 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintercups.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -568,26 +470,15 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -597,23 +488,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -625,29 +516,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -662,9 +547,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(LTLIBRARIES) $(HEADERS) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(backenddir) -+ for dir in "$(DESTDIR)$(backenddir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -684,7 +570,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -698,24 +584,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-backendLTLIBRARIES - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -736,20 +632,24 @@ - - ps-am: - --uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am -+uninstall-am: uninstall-backendLTLIBRARIES -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-backendLTLIBRARIES install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-backendLTLIBRARIES \ -- uninstall-info-am -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am \ -+ install-backendLTLIBRARIES install-data install-data-am \ -+ install-dvi install-dvi-am install-exec install-exec-am \ -+ install-html install-html-am install-info install-info-am \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-backendLTLIBRARIES - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/printbackends/file/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/printbackends/file/Makefile.in 2008-09-24 00:11:42.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/printbackends/file/Makefile.in 2008-09-24 19:56:57.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,12 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl -+subdir = modules/printbackends/file -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(backenddir)" -+backendLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(backend_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+libprintbackend_file_la_DEPENDENCIES = \ -+ $(top_builddir)/gtk/$(gtktargetlib) \ -+ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) -+am_libprintbackend_file_la_OBJECTS = \ -+ libprintbackend_file_la-gtkprintbackendfile.lo -+libprintbackend_file_la_OBJECTS = \ -+ $(am_libprintbackend_file_la_OBJECTS) -+libprintbackend_file_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(libprintbackend_file_la_CFLAGS) $(CFLAGS) \ -+ $(libprintbackend_file_la_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libprintbackend_file_la_SOURCES) -+DIST_SOURCES = $(libprintbackend_file_la_SOURCES) -+HEADERS = $(noinst_HEADERS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +96,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +121,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +128,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/other/gail/Makefile.in gtk+2.0-2.14.4/modules/other/gail/Makefile.in +--- gtk+2.0-2.14.4.old/modules/other/gail/Makefile.in 2008-10-17 01:07:19.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/other/gail/Makefile.in 2008-11-04 15:37:10.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +154,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -58766,804 +62254,19 @@ Index: gtk+2.0-2.14.3/modules/printbackends/file/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +173,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +183,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +212,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +231,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +242,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +254,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +295,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +304,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,17 +339,12 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -- - backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends -- - backend_LTLIBRARIES = libprintbackend-file.la -- - libprintbackend_file_la_SOURCES = \ - gtkprintbackendfile.c - -- - libprintbackend_file_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gtk \ -@@ -426,100 +354,86 @@ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ - $(AM_CPPFLAGS) - -- - libprintbackend_file_la_CFLAGS = \ - $(GTK_DEP_CFLAGS) \ - $(AM_CFLAGS) - -- - libprintbackend_file_la_LDFLAGS = \ - -avoid-version -module $(no_undefined) - -- - libprintbackend_file_la_LIBADD = \ - $(top_builddir)/gtk/$(gtktargetlib) \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(GTK_DEP_LIBS) - -- - noinst_HEADERS = \ - gtkprintbackendfile.h - --subdir = modules/printbackends/file --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(backend_LTLIBRARIES) -- --libprintbackend_file_la_DEPENDENCIES = \ -- $(top_builddir)/gtk/$(gtktargetlib) \ -- $(top_builddir)/gdk/$(gdktargetlib) --am_libprintbackend_file_la_OBJECTS = \ -- libprintbackend_file_la-gtkprintbackendfile.lo --libprintbackend_file_la_OBJECTS = $(am_libprintbackend_file_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = \ --@AMDEP_TRUE@ ./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libprintbackend_file_la_SOURCES) --HEADERS = $(noinst_HEADERS) -- --DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ -- $(top_srcdir)/Makefile.decl Makefile.am --SOURCES = $(libprintbackend_file_la_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/file/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/printbackends/file/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --backendLTLIBRARIES_INSTALL = $(INSTALL) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-backendLTLIBRARIES: $(backend_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(backenddir) -+ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \ -- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ - else :; fi; \ - done - - uninstall-backendLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ - done - - clean-backendLTLIBRARIES: - -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES) - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libprintbackend-file.la: $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_DEPENDENCIES) -- $(LINK) -rpath $(backenddir) $(libprintbackend_file_la_LDFLAGS) $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_LIBADD) $(LIBS) -+ $(libprintbackend_file_la_LINK) -rpath $(backenddir) $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -527,70 +441,32 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -- --libprintbackend_file_la-gtkprintbackendfile.o: gtkprintbackendfile.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.o -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.o `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.o `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c -- --libprintbackend_file_la-gtkprintbackendfile.obj: gtkprintbackendfile.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.obj -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.obj `if test -f 'gtkprintbackendfile.c'; then $(CYGPATH_W) 'gtkprintbackendfile.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendfile.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.obj `if test -f 'gtkprintbackendfile.c'; then $(CYGPATH_W) 'gtkprintbackendfile.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendfile.c'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - libprintbackend_file_la-gtkprintbackendfile.lo: gtkprintbackendfile.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.lo -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.lo -MD -MP -MF $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c - - mostlyclean-libtool: - -rm -f *.lo -@@ -598,26 +474,15 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -627,23 +492,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -655,29 +520,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -692,9 +551,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(LTLIBRARIES) $(HEADERS) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(backenddir) -+ for dir in "$(DESTDIR)$(backenddir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -714,7 +574,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -728,24 +588,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-backendLTLIBRARIES - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -766,20 +636,24 @@ - - ps-am: - --uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am -+uninstall-am: uninstall-backendLTLIBRARIES -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-backendLTLIBRARIES install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-backendLTLIBRARIES \ -- uninstall-info-am -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am \ -+ install-backendLTLIBRARIES install-data install-data-am \ -+ install-dvi install-dvi-am install-exec install-exec-am \ -+ install-html install-html-am install-info install-info-am \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-backendLTLIBRARIES - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/printbackends/lpr/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/printbackends/lpr/Makefile.in 2008-09-24 00:11:42.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/printbackends/lpr/Makefile.in 2008-09-24 19:56:57.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,12 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,56 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl -+subdir = modules/printbackends/lpr -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(backenddir)" -+backendLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(backend_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ -+ $(top_builddir)/gtk/$(gtktargetlib) -+libprintbackend_lpr_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am_libprintbackend_lpr_la_OBJECTS = gtkprintbackendlpr.lo -+libprintbackend_lpr_la_OBJECTS = $(am_libprintbackend_lpr_la_OBJECTS) -+libprintbackend_lpr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libprintbackend_lpr_la_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libprintbackend_lpr_la_SOURCES) -+DIST_SOURCES = $(libprintbackend_lpr_la_SOURCES) -+HEADERS = $(noinst_HEADERS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +93,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +118,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +125,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14.4/modules/other/gail/tests/Makefile.in +--- gtk+2.0-2.14.4.old/modules/other/gail/tests/Makefile.in 2008-10-17 01:07:19.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/other/gail/tests/Makefile.in 2008-11-04 15:37:11.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +151,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -59571,737 +62274,19 @@ Index: gtk+2.0-2.14.3/modules/printbackends/lpr/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +170,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +180,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +209,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +228,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +239,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +251,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +292,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +301,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,9 +336,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gtk \ -@@ -419,98 +347,85 @@ - $(GTK_DEP_CFLAGS) \ - $(GTK_DEBUG_FLAGS) - -- - LDADDS = \ - $(GTK_DEP_LIBS) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- - backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends -- - backend_LTLIBRARIES = libprintbackend-lpr.la -- - libprintbackend_lpr_la_SOURCES = \ - gtkprintbackendlpr.c - -- - noinst_HEADERS = \ - gtkprintbackendlpr.h - -- - libprintbackend_lpr_la_LDFLAGS = -avoid-version -module $(no_undefined) - libprintbackend_lpr_la_LIBADD = $(LDADDS) --subdir = modules/printbackends/lpr --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(backend_LTLIBRARIES) -- --libprintbackend_lpr_la_DEPENDENCIES = \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_libprintbackend_lpr_la_OBJECTS = gtkprintbackendlpr.lo --libprintbackend_lpr_la_OBJECTS = $(am_libprintbackend_lpr_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkprintbackendlpr.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libprintbackend_lpr_la_SOURCES) --HEADERS = $(noinst_HEADERS) -- --DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ -- $(top_srcdir)/Makefile.decl Makefile.am --SOURCES = $(libprintbackend_lpr_la_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/lpr/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/printbackends/lpr/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --backendLTLIBRARIES_INSTALL = $(INSTALL) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-backendLTLIBRARIES: $(backend_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(backenddir) -+ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \ -- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ - else :; fi; \ - done - - uninstall-backendLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ - done - - clean-backendLTLIBRARIES: - -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES) - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libprintbackend-lpr.la: $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_DEPENDENCIES) -- $(LINK) -rpath $(backenddir) $(libprintbackend_lpr_la_LDFLAGS) $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_LIBADD) $(LIBS) -+ $(libprintbackend_lpr_la_LINK) -rpath $(backenddir) $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -518,37 +433,25 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintbackendlpr.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -556,26 +459,15 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -585,23 +477,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -613,29 +505,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -650,9 +536,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(LTLIBRARIES) $(HEADERS) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(backenddir) -+ for dir in "$(DESTDIR)$(backenddir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -672,7 +559,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -686,24 +573,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-backendLTLIBRARIES - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -724,20 +621,24 @@ - - ps-am: - --uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am -+uninstall-am: uninstall-backendLTLIBRARIES -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-backendLTLIBRARIES install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-backendLTLIBRARIES \ -- uninstall-info-am -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am \ -+ install-backendLTLIBRARIES install-data install-data-am \ -+ install-dvi install-dvi-am install-exec install-exec-am \ -+ install-html install-html-am install-info install-info-am \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-backendLTLIBRARIES - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/printbackends/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/printbackends/Makefile.in 2008-09-24 00:11:42.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/printbackends/Makefile.in 2008-09-24 19:56:56.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,17 +15,11 @@ - @SET_MAKE@ - - # GTK+ - The GIMP Toolkit -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,12 +31,36 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl - @HAVE_CUPS_TRUE@am__append_1 = cups - @TEST_PRINT_BACKEND_TRUE@am__append_2 = test -+subdir = modules/printbackends -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+SOURCES = -+DIST_SOURCES = -+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -+ html-recursive info-recursive install-data-recursive \ -+ install-dvi-recursive install-exec-recursive \ -+ install-html-recursive install-info-recursive \ -+ install-pdf-recursive install-ps-recursive install-recursive \ -+ installcheck-recursive installdirs-recursive pdf-recursive \ -+ ps-recursive uninstall-recursive -+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ -+ distclean-recursive maintainer-clean-recursive -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -53,22 +71,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,8 +96,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -92,10 +103,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/other/Makefile.in gtk+2.0-2.14.4/modules/other/Makefile.in +--- gtk+2.0-2.14.4.old/modules/other/Makefile.in 2008-10-17 01:07:18.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/other/Makefile.in 2008-11-04 15:37:10.000000000 -0200 +@@ -94,6 +94,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@ -@@ -122,6 +129,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -60309,721 +62294,19 @@ Index: gtk+2.0-2.14.3/modules/printbackends/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -140,8 +148,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -152,91 +158,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -258,24 +187,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -286,8 +206,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -299,28 +217,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -329,22 +229,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -367,6 +270,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -375,9 +279,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -408,32 +314,40 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - SUBDIRS = file lpr $(am__append_1) $(am__append_2) -- - DIST_SUBDIRS = cups file lpr test --subdir = modules/printbackends --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --DIST_SOURCES = -- --RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -- ps-recursive install-info-recursive uninstall-info-recursive \ -- all-recursive install-data-recursive install-exec-recursive \ -- installdirs-recursive install-recursive uninstall-recursive \ -- check-recursive installcheck-recursive --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am - all: all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/printbackends/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: - -rm -f *.lo -@@ -441,10 +355,6 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. - # To change the values of `make' variables: instead of editing Makefiles, -@@ -452,7 +362,13 @@ - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. - $(RECURSIVE_TARGETS): -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -464,15 +380,20 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - --mostlyclean-recursive clean-recursive distclean-recursive \ --maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+$(RECURSIVE_CLEAN_TARGETS): -+ @failcom='exit 1'; \ -+ for f in x $$MAKEFLAGS; do \ -+ case $$f in \ -+ *=* | --[!k]*);; \ -+ *k*) failcom='fail=yes';; \ -+ esac; \ -+ done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -493,7 +414,7 @@ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ -- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ -+ || eval $$failcom; \ - done && test -z "$$fail" - tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -504,35 +425,30 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if (etags --etags-include --version) >/dev/null 2>&1; then \ -+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -+ empty_fix=.; \ - else \ - include_option=--include; \ -+ empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -540,23 +456,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -568,29 +484,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -603,13 +513,17 @@ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d $(distdir)/$$subdir \ -- || mkdir $(distdir)/$$subdir \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ -+ distdir=`$(am__cd) $(distdir) && pwd`; \ -+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$(top_distdir)" \ -- distdir=../$(distdir)/$$subdir \ -+ top_distdir="$$top_distdir" \ -+ distdir="$$distdir/$$subdir" \ -+ am__remove_distdir=: \ -+ am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -620,7 +534,6 @@ - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: -- - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -640,7 +553,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -651,25 +564,34 @@ - - distclean: distclean-recursive - -rm -f Makefile --distclean-am: clean-am distclean-generic distclean-libtool \ -- distclean-tags -+distclean-am: clean-am distclean-generic distclean-tags - - dvi: dvi-recursive - - dvi-am: - -+html: html-recursive -+ - info: info-recursive - - info-am: - - install-data-am: - -+install-dvi: install-dvi-recursive -+ - install-exec-am: - -+install-html: install-html-recursive -+ - install-info: install-info-recursive - - install-man: - -+install-pdf: install-pdf-recursive -+ -+install-ps: install-ps-recursive -+ - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -688,26 +610,24 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: - --uninstall-info: uninstall-info-recursive -+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -+ install-strip - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- check-local clean clean-generic clean-libtool clean-recursive \ -- ctags ctags-recursive distclean distclean-generic \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am dvi-recursive info info-am info-recursive install \ -- install-am install-data install-data-am install-data-recursive \ -- install-exec install-exec-am install-exec-recursive \ -- install-info install-info-am install-info-recursive install-man \ -- install-recursive install-strip installcheck installcheck-am \ -- installdirs installdirs-am installdirs-recursive \ -- maintainer-clean maintainer-clean-generic \ -- maintainer-clean-recursive mostlyclean mostlyclean-generic \ -- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ -- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-info-am \ -- uninstall-info-recursive uninstall-recursive -+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ -+ all all-am check check-am check-local clean clean-generic \ -+ clean-libtool ctags ctags-recursive distclean \ -+ distclean-generic distclean-libtool distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs installdirs-am \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/modules/printbackends/test/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/modules/printbackends/test/Makefile.in 2008-09-24 00:11:42.000000000 -0300 -+++ gtk+2.0-2.14.3/modules/printbackends/test/Makefile.in 2008-09-24 19:56:57.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,12 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ -+ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,58 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl -+subdir = modules/printbackends/test -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(backenddir)" -+backendLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(backend_LTLIBRARIES) -+am__DEPENDENCIES_1 = -+libprintbackend_test_la_DEPENDENCIES = \ -+ $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1) -+am_libprintbackend_test_la_OBJECTS = \ -+ libprintbackend_test_la-gtkprintbackendtest.lo -+libprintbackend_test_la_OBJECTS = \ -+ $(am_libprintbackend_test_la_OBJECTS) -+libprintbackend_test_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(libprintbackend_test_la_CFLAGS) $(CFLAGS) \ -+ $(libprintbackend_test_la_LDFLAGS) $(LDFLAGS) -o $@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libprintbackend_test_la_SOURCES) -+DIST_SOURCES = $(libprintbackend_test_la_SOURCES) -+HEADERS = $(noinst_HEADERS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +95,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +120,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +127,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.14.4/modules/printbackends/cups/Makefile.in +--- gtk+2.0-2.14.4.old/modules/printbackends/cups/Makefile.in 2008-10-17 01:07:20.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/printbackends/cups/Makefile.in 2008-11-04 15:37:11.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +153,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61031,788 +62314,19 @@ Index: gtk+2.0-2.14.3/modules/printbackends/test/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +172,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +182,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +211,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +230,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +241,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +253,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +294,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,9 +303,11 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - -@@ -406,17 +338,12 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -- - backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends -- - backend_LTLIBRARIES = libprintbackend-test.la -- - libprintbackend_test_la_SOURCES = \ - gtkprintbackendtest.c - -- - libprintbackend_test_la_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gtk \ -@@ -426,98 +353,85 @@ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ - $(AM_CPPFLAGS) - -- - libprintbackend_test_la_CFLAGS = \ - $(GTK_DEP_CFLAGS) \ - $(AM_CFLAGS) - -- - libprintbackend_test_la_LDFLAGS = \ - -avoid-version -module $(no_undefined) - -- - libprintbackend_test_la_LIBADD = \ - $(top_builddir)/gtk/$(gtktargetlib) \ - $(GTK_DEP_LIBS) - -- - noinst_HEADERS = \ - gtkprintbackendtest.h - --subdir = modules/printbackends/test --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --LTLIBRARIES = $(backend_LTLIBRARIES) -- --libprintbackend_test_la_DEPENDENCIES = \ -- $(top_builddir)/gtk/$(gtktargetlib) --am_libprintbackend_test_la_OBJECTS = \ -- libprintbackend_test_la-gtkprintbackendtest.lo --libprintbackend_test_la_OBJECTS = $(am_libprintbackend_test_la_OBJECTS) -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = \ --@AMDEP_TRUE@ ./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(libprintbackend_test_la_SOURCES) --HEADERS = $(noinst_HEADERS) -- --DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ -- $(top_srcdir)/Makefile.decl Makefile.am --SOURCES = $(libprintbackend_test_la_SOURCES) -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/test/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu modules/printbackends/test/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) --backendLTLIBRARIES_INSTALL = $(INSTALL) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-backendLTLIBRARIES: $(backend_LTLIBRARIES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(backenddir) -+ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \ -- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ - else :; fi; \ - done - - uninstall-backendLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ -- p="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \ -- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ -+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ - done - - clean-backendLTLIBRARIES: - -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES) - @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" = "$$p" && dir=.; \ -+ test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done - libprintbackend-test.la: $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_DEPENDENCIES) -- $(LINK) -rpath $(backenddir) $(libprintbackend_test_la_LDFLAGS) $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_LIBADD) $(LIBS) -+ $(libprintbackend_test_la_LINK) -rpath $(backenddir) $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -525,70 +439,32 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -- --libprintbackend_test_la-gtkprintbackendtest.o: gtkprintbackendtest.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.o -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.o `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.o `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c -- --libprintbackend_test_la-gtkprintbackendtest.obj: gtkprintbackendtest.c --@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.obj -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.obj `if test -f 'gtkprintbackendtest.c'; then $(CYGPATH_W) 'gtkprintbackendtest.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendtest.c'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.obj `if test -f 'gtkprintbackendtest.c'; then $(CYGPATH_W) 'gtkprintbackendtest.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendtest.c'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - libprintbackend_test_la-gtkprintbackendtest.lo: gtkprintbackendtest.c --@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.lo -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \ --@am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.lo -MD -MP -MF $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c - - mostlyclean-libtool: - -rm -f *.lo -@@ -596,26 +472,15 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -625,23 +490,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -653,29 +518,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = ../../.. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/../../.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -690,9 +549,10 @@ - $(MAKE) $(AM_MAKEFLAGS) check-local - check: check-am - all-am: Makefile $(LTLIBRARIES) $(HEADERS) -- - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(backenddir) -+ for dir in "$(DESTDIR)$(backenddir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-am - install-exec: install-exec-am - install-data: install-data-am -@@ -712,7 +572,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -726,24 +586,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: install-backendLTLIBRARIES - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -764,20 +634,24 @@ - - ps-am: - --uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am -+uninstall-am: uninstall-backendLTLIBRARIES -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-backendLTLIBRARIES install-data \ -- install-data-am install-exec install-exec-am install-info \ -- install-info-am install-man install-strip installcheck \ -- installcheck-am installdirs maintainer-clean \ -- maintainer-clean-generic mostlyclean mostlyclean-compile \ -- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -- tags uninstall uninstall-am uninstall-backendLTLIBRARIES \ -- uninstall-info-am -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am \ -+ install-backendLTLIBRARIES install-data install-data-am \ -+ install-dvi install-dvi-am install-exec install-exec-am \ -+ install-html install-html-am install-info install-info-am \ -+ install-man install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-backendLTLIBRARIES - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/perf/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/perf/Makefile.in 2008-09-24 00:11:43.000000000 -0300 -+++ gtk+2.0-2.14.3/perf/Makefile.in 2008-09-24 19:56:57.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,43 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+noinst_PROGRAMS = testperf$(EXEEXT) -+subdir = perf -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+PROGRAMS = $(noinst_PROGRAMS) -+am_testperf_OBJECTS = appwindow.$(OBJEXT) gtkwidgetprofiler.$(OBJEXT) \ -+ main.$(OBJEXT) marshalers.$(OBJEXT) textview.$(OBJEXT) \ -+ treeview.$(OBJEXT) typebuiltins.$(OBJEXT) -+testperf_OBJECTS = $(am_testperf_OBJECTS) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(testperf_SOURCES) -+DIST_SOURCES = $(testperf_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -51,22 +79,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +104,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +111,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/printbackends/file/Makefile.in gtk+2.0-2.14.4/modules/printbackends/file/Makefile.in +--- gtk+2.0-2.14.4.old/modules/printbackends/file/Makefile.in 2008-10-17 01:07:20.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/printbackends/file/Makefile.in 2008-11-04 15:37:11.000000000 -0200 +@@ -94,6 +94,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@ -@@ -120,6 +137,7 @@ +@@ -120,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61820,985 +62334,99 @@ Index: gtk+2.0-2.14.3/perf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +156,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +166,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +195,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +214,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +225,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +237,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -365,6 +278,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -373,20 +287,17 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- README \ -- marshalers.list \ -- typebuiltins.c.template \ -- typebuiltins.h.template \ -- $(BUILT_SOURCES) -- -+EXTRA_DIST = README marshalers.list typebuiltins.c.template \ -+ typebuiltins.h.template $(BUILT_SOURCES) - TEST_PROGS = - - ### testing rules -@@ -412,7 +323,6 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ -@@ -422,27 +332,18 @@ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -- - DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- - LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- --noinst_PROGRAMS = \ -- testperf -- -- - testperf_DEPENDENCIES = $(TEST_DEPS) -- - testperf_LDADD = $(LDADDS) -- - testperf_SOURCES = \ - appwindow.c \ - gtkwidgetprofiler.c \ -@@ -456,68 +357,54 @@ - typebuiltins.h \ - widgets.h - -- - BUILT_SOURCES = \ - marshalers.c \ - marshalers.h \ - typebuiltins.c \ - typebuiltins.h - -- - stamp_files = \ - stamp-marshalers.h \ - stamp-typebuiltins.h - -- - headers_with_enums = \ - gtkwidgetprofiler.h - -- - MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(stamp_files) --subdir = perf --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --noinst_PROGRAMS = testperf$(EXEEXT) --PROGRAMS = $(noinst_PROGRAMS) -- --am_testperf_OBJECTS = appwindow.$(OBJEXT) gtkwidgetprofiler.$(OBJEXT) \ -- main.$(OBJEXT) marshalers.$(OBJEXT) textview.$(OBJEXT) \ -- treeview.$(OBJEXT) typebuiltins.$(OBJEXT) --testperf_OBJECTS = $(am_testperf_OBJECTS) --testperf_LDFLAGS = -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/appwindow.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/gtkwidgetprofiler.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/marshalers.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/textview.Po ./$(DEPDIR)/treeview.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/typebuiltins.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(testperf_SOURCES) --DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --SOURCES = $(testperf_SOURCES) -- - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - - .SUFFIXES: - .SUFFIXES: .c .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu perf/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu perf/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -527,10 +414,10 @@ - done - testperf$(EXEEXT): $(testperf_OBJECTS) $(testperf_DEPENDENCIES) - @rm -f testperf$(EXEEXT) -- $(LINK) $(testperf_LDFLAGS) $(testperf_OBJECTS) $(testperf_LDADD) $(LIBS) -+ $(LINK) $(testperf_OBJECTS) $(testperf_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -544,37 +431,25 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/typebuiltins.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - mostlyclean-libtool: - -rm -f *.lo -@@ -582,26 +457,15 @@ - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -611,23 +475,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -639,29 +503,23 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/.. -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -677,7 +535,6 @@ - check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am - all-am: Makefile $(PROGRAMS) -- - installdirs: - install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -@@ -699,13 +556,13 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - clean: clean-am - - clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ -@@ -715,24 +572,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-local distclean-tags -+ distclean-local distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -753,18 +620,23 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-local distclean-tags distdir dvi dvi-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am install-man \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-local distclean-tags distdir dvi \ -+ dvi-am html html-am info info-am install install-am \ -+ install-data install-data-am install-dvi install-dvi-am \ -+ install-exec install-exec-am install-html install-html-am \ -+ install-info install-info-am install-man install-pdf \ -+ install-pdf-am install-ps install-ps-am install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - -Index: gtk+2.0-2.14.3/tests/Makefile.in -=================================================================== ---- gtk+2.0-2.14.3.orig/tests/Makefile.in 2008-09-24 00:11:43.000000000 -0300 -+++ gtk+2.0-2.14.3/tests/Makefile.in 2008-09-24 19:56:57.000000000 -0300 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# Makefile.in generated by automake 1.10.1 from Makefile.am. - # @configure_input@ - --# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -16,16 +16,11 @@ - - # GTK+ - The GIMP Toolkit - --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = .. -- - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c - install_sh_SCRIPT = $(install_sh) -c -@@ -37,12 +32,274 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+build_triplet = @build@ - host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/Makefile.decl -+noinst_PROGRAMS = $(am__EXEEXT_1) simple$(EXEEXT) \ -+ print-editor$(EXEEXT) testaccel$(EXEEXT) \ -+ testassistant$(EXEEXT) testbbox$(EXEEXT) testcairo$(EXEEXT) \ -+ testcalendar$(EXEEXT) testcombo$(EXEEXT) \ -+ testcombochange$(EXEEXT) testcellrenderertext$(EXEEXT) \ -+ testdnd$(EXEEXT) testellipsise$(EXEEXT) \ -+ testentrycompletion$(EXEEXT) testfilechooser$(EXEEXT) \ -+ testfilechooserbutton$(EXEEXT) testframe$(EXEEXT) \ -+ testgtk$(EXEEXT) testiconview$(EXEEXT) testicontheme$(EXEEXT) \ -+ testimage$(EXEEXT) testinput$(EXEEXT) testmenus$(EXEEXT) \ -+ testmenubars$(EXEEXT) testmountoperation$(EXEEXT) \ -+ testmultidisplay$(EXEEXT) testmultiscreen$(EXEEXT) \ -+ testnotebookdnd$(EXEEXT) testnouiprint$(EXEEXT) \ -+ testprint$(EXEEXT) testrgb$(EXEEXT) testrecentchooser$(EXEEXT) \ -+ testrecentchoosermenu$(EXEEXT) testrichtext$(EXEEXT) \ -+ testselection$(EXEEXT) $(am__EXEEXT_2) testspinbutton$(EXEEXT) \ -+ teststatusicon$(EXEEXT) testtext$(EXEEXT) testtoolbar$(EXEEXT) \ -+ stresstest-toolbar$(EXEEXT) testtreeedit$(EXEEXT) \ -+ testtreemodel$(EXEEXT) testtreeview$(EXEEXT) \ -+ testtreefocus$(EXEEXT) testtreeflow$(EXEEXT) \ -+ testtreecolumns$(EXEEXT) testtreecolumnsizing$(EXEEXT) \ -+ testtreesort$(EXEEXT) treestoretest$(EXEEXT) \ -+ testxinerama$(EXEEXT) pixbuf-read$(EXEEXT) \ -+ pixbuf-lowmem$(EXEEXT) pixbuf-randomly-modified$(EXEEXT) \ -+ pixbuf-random$(EXEEXT) pixbuf-threads$(EXEEXT) \ -+ testmerge$(EXEEXT) testactions$(EXEEXT) testgrouping$(EXEEXT) \ -+ testtooltips$(EXEEXT) testvolumebutton$(EXEEXT) \ -+ $(am__EXEEXT_3) - @HAVE_CXX_TRUE@am__append_1 = autotestkeywords -+@HAVE_CXX_TRUE@TESTS = autotestkeywords$(EXEEXT) - @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@am__append_2 = -DHAVE_OBJC=1 -+subdir = tests -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -+ $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__EXEEXT_1 = -+@USE_X11_TRUE@am__EXEEXT_2 = testsocket$(EXEEXT) \ -+@USE_X11_TRUE@ testsocket_child$(EXEEXT) -+@HAVE_CXX_TRUE@am__EXEEXT_3 = autotestkeywords$(EXEEXT) -+PROGRAMS = $(noinst_PROGRAMS) -+am__autotestkeywords_SOURCES_DIST = autotestkeywords.cc -+@HAVE_CXX_TRUE@am_autotestkeywords_OBJECTS = \ -+@HAVE_CXX_TRUE@ autotestkeywords-autotestkeywords.$(OBJEXT) -+autotestkeywords_OBJECTS = $(am_autotestkeywords_OBJECTS) -+autotestkeywords_LDADD = $(LDADD) -+autotestkeywords_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ -+ $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+pixbuf_lowmem_SOURCES = pixbuf-lowmem.c -+pixbuf_lowmem_OBJECTS = pixbuf-lowmem.$(OBJEXT) -+pixbuf_lowmem_DEPENDENCIES = $(LDADDS) -+pixbuf_random_SOURCES = pixbuf-random.c -+pixbuf_random_OBJECTS = pixbuf-random.$(OBJEXT) -+pixbuf_random_DEPENDENCIES = $(LDADDS) -+pixbuf_randomly_modified_SOURCES = pixbuf-randomly-modified.c -+pixbuf_randomly_modified_OBJECTS = pixbuf-randomly-modified.$(OBJEXT) -+pixbuf_randomly_modified_DEPENDENCIES = $(LDADDS) -+pixbuf_read_SOURCES = pixbuf-read.c -+pixbuf_read_OBJECTS = pixbuf-read.$(OBJEXT) -+pixbuf_read_DEPENDENCIES = $(LDADDS) -+pixbuf_threads_SOURCES = pixbuf-threads.c -+pixbuf_threads_OBJECTS = pixbuf-threads.$(OBJEXT) -+am__DEPENDENCIES_1 = -+pixbuf_threads_DEPENDENCIES = $(LDADDS) $(am__DEPENDENCIES_1) -+print_editor_SOURCES = print-editor.c -+print_editor_OBJECTS = print-editor.$(OBJEXT) -+simple_SOURCES = simple.c -+simple_OBJECTS = simple.$(OBJEXT) -+stresstest_toolbar_SOURCES = stresstest-toolbar.c -+stresstest_toolbar_OBJECTS = stresstest-toolbar.$(OBJEXT) -+stresstest_toolbar_DEPENDENCIES = $(LDADDS) -+testaccel_SOURCES = testaccel.c -+testaccel_OBJECTS = testaccel.$(OBJEXT) -+am_testactions_OBJECTS = testactions.$(OBJEXT) -+testactions_OBJECTS = $(am_testactions_OBJECTS) -+testassistant_SOURCES = testassistant.c -+testassistant_OBJECTS = testassistant.$(OBJEXT) -+am_testbbox_OBJECTS = testbbox.$(OBJEXT) -+testbbox_OBJECTS = $(am_testbbox_OBJECTS) -+testcairo_SOURCES = testcairo.c -+testcairo_OBJECTS = testcairo.$(OBJEXT) -+testcalendar_SOURCES = testcalendar.c -+testcalendar_OBJECTS = testcalendar.$(OBJEXT) -+testcellrenderertext_SOURCES = testcellrenderertext.c -+testcellrenderertext_OBJECTS = testcellrenderertext.$(OBJEXT) -+testcombo_SOURCES = testcombo.c -+testcombo_OBJECTS = testcombo.$(OBJEXT) -+testcombochange_SOURCES = testcombochange.c -+testcombochange_OBJECTS = testcombochange.$(OBJEXT) -+testdnd_SOURCES = testdnd.c -+testdnd_OBJECTS = testdnd.$(OBJEXT) -+testellipsise_SOURCES = testellipsise.c -+testellipsise_OBJECTS = testellipsise.$(OBJEXT) -+am_testentrycompletion_OBJECTS = prop-editor.$(OBJEXT) \ -+ testentrycompletion.$(OBJEXT) -+testentrycompletion_OBJECTS = $(am_testentrycompletion_OBJECTS) -+am_testfilechooser_OBJECTS = prop-editor.$(OBJEXT) \ -+ testfilechooser.$(OBJEXT) -+testfilechooser_OBJECTS = $(am_testfilechooser_OBJECTS) -+am_testfilechooserbutton_OBJECTS = prop-editor.$(OBJEXT) \ -+ testfilechooserbutton.$(OBJEXT) -+testfilechooserbutton_OBJECTS = $(am_testfilechooserbutton_OBJECTS) -+am_testframe_OBJECTS = testframe.$(OBJEXT) -+testframe_OBJECTS = $(am_testframe_OBJECTS) -+am_testgrouping_OBJECTS = testgrouping.$(OBJEXT) -+testgrouping_OBJECTS = $(am_testgrouping_OBJECTS) -+am_testgtk_OBJECTS = prop-editor.$(OBJEXT) testgtk.$(OBJEXT) -+testgtk_OBJECTS = $(am_testgtk_OBJECTS) -+testicontheme_SOURCES = testicontheme.c -+testicontheme_OBJECTS = testicontheme.$(OBJEXT) -+am_testiconview_OBJECTS = testiconview.$(OBJEXT) prop-editor.$(OBJEXT) -+testiconview_OBJECTS = $(am_testiconview_OBJECTS) -+testimage_SOURCES = testimage.c -+testimage_OBJECTS = testimage.$(OBJEXT) -+testinput_SOURCES = testinput.c -+testinput_OBJECTS = testinput.$(OBJEXT) -+testmenubars_SOURCES = testmenubars.c -+testmenubars_OBJECTS = testmenubars.$(OBJEXT) -+testmenus_SOURCES = testmenus.c -+testmenus_OBJECTS = testmenus.$(OBJEXT) -+am_testmerge_OBJECTS = testmerge.$(OBJEXT) -+testmerge_OBJECTS = $(am_testmerge_OBJECTS) -+testmountoperation_SOURCES = testmountoperation.c -+testmountoperation_OBJECTS = testmountoperation.$(OBJEXT) -+testmultidisplay_SOURCES = testmultidisplay.c -+testmultidisplay_OBJECTS = testmultidisplay.$(OBJEXT) -+testmultiscreen_SOURCES = testmultiscreen.c -+testmultiscreen_OBJECTS = testmultiscreen.$(OBJEXT) -+testnotebookdnd_SOURCES = testnotebookdnd.c -+testnotebookdnd_OBJECTS = testnotebookdnd.$(OBJEXT) -+testnouiprint_SOURCES = testnouiprint.c -+testnouiprint_OBJECTS = testnouiprint.$(OBJEXT) -+am_testprint_OBJECTS = testprint.$(OBJEXT) \ -+ testprintfileoperation.$(OBJEXT) -+testprint_OBJECTS = $(am_testprint_OBJECTS) -+am_testrecentchooser_OBJECTS = prop-editor.$(OBJEXT) \ -+ testrecentchooser.$(OBJEXT) -+testrecentchooser_OBJECTS = $(am_testrecentchooser_OBJECTS) -+am_testrecentchoosermenu_OBJECTS = testrecentchoosermenu.$(OBJEXT) -+testrecentchoosermenu_OBJECTS = $(am_testrecentchoosermenu_OBJECTS) -+testrgb_SOURCES = testrgb.c -+testrgb_OBJECTS = testrgb.$(OBJEXT) -+testrichtext_SOURCES = testrichtext.c -+testrichtext_OBJECTS = testrichtext.$(OBJEXT) -+testselection_SOURCES = testselection.c -+testselection_OBJECTS = testselection.$(OBJEXT) -+am_testsocket_OBJECTS = testsocket.$(OBJEXT) \ -+ testsocket_common.$(OBJEXT) -+testsocket_OBJECTS = $(am_testsocket_OBJECTS) -+am_testsocket_child_OBJECTS = testsocket_child.$(OBJEXT) \ -+ testsocket_common.$(OBJEXT) -+testsocket_child_OBJECTS = $(am_testsocket_child_OBJECTS) -+am_testspinbutton_OBJECTS = testspinbutton.$(OBJEXT) -+testspinbutton_OBJECTS = $(am_testspinbutton_OBJECTS) -+am_teststatusicon_OBJECTS = prop-editor.$(OBJEXT) \ -+ teststatusicon.$(OBJEXT) -+teststatusicon_OBJECTS = $(am_teststatusicon_OBJECTS) -+am_testtext_OBJECTS = prop-editor.$(OBJEXT) testtext.$(OBJEXT) -+testtext_OBJECTS = $(am_testtext_OBJECTS) -+am_testtoolbar_OBJECTS = testtoolbar.$(OBJEXT) prop-editor.$(OBJEXT) -+testtoolbar_OBJECTS = $(am_testtoolbar_OBJECTS) -+testtoolbar_DEPENDENCIES = $(LDADDS) -+am_testtooltips_OBJECTS = testtooltips.$(OBJEXT) -+testtooltips_OBJECTS = $(am_testtooltips_OBJECTS) -+testtreecolumns_SOURCES = testtreecolumns.c -+testtreecolumns_OBJECTS = testtreecolumns.$(OBJEXT) -+testtreecolumnsizing_SOURCES = testtreecolumnsizing.c -+testtreecolumnsizing_OBJECTS = testtreecolumnsizing.$(OBJEXT) -+am_testtreeedit_OBJECTS = testtreeedit.$(OBJEXT) -+testtreeedit_OBJECTS = $(am_testtreeedit_OBJECTS) -+testtreeflow_SOURCES = testtreeflow.c -+testtreeflow_OBJECTS = testtreeflow.$(OBJEXT) -+testtreefocus_SOURCES = testtreefocus.c -+testtreefocus_OBJECTS = testtreefocus.$(OBJEXT) -+am_testtreemodel_OBJECTS = testtreemodel.$(OBJEXT) -+testtreemodel_OBJECTS = $(am_testtreemodel_OBJECTS) -+testtreesort_SOURCES = testtreesort.c -+testtreesort_OBJECTS = testtreesort.$(OBJEXT) -+am_testtreeview_OBJECTS = prop-editor.$(OBJEXT) testtreeview.$(OBJEXT) -+testtreeview_OBJECTS = $(am_testtreeview_OBJECTS) -+am_testvolumebutton_OBJECTS = testvolumebutton.$(OBJEXT) -+testvolumebutton_OBJECTS = $(am_testvolumebutton_OBJECTS) -+testxinerama_SOURCES = testxinerama.c -+testxinerama_OBJECTS = testxinerama.$(OBJEXT) -+treestoretest_SOURCES = treestoretest.c -+treestoretest_OBJECTS = treestoretest.$(OBJEXT) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+CXXLD = $(CXX) -+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(autotestkeywords_SOURCES) pixbuf-lowmem.c pixbuf-random.c \ -+ pixbuf-randomly-modified.c pixbuf-read.c pixbuf-threads.c \ -+ print-editor.c simple.c stresstest-toolbar.c testaccel.c \ -+ $(testactions_SOURCES) testassistant.c $(testbbox_SOURCES) \ -+ testcairo.c testcalendar.c testcellrenderertext.c testcombo.c \ -+ testcombochange.c testdnd.c testellipsise.c \ -+ $(testentrycompletion_SOURCES) $(testfilechooser_SOURCES) \ -+ $(testfilechooserbutton_SOURCES) $(testframe_SOURCES) \ -+ $(testgrouping_SOURCES) $(testgtk_SOURCES) testicontheme.c \ -+ $(testiconview_SOURCES) testimage.c testinput.c testmenubars.c \ -+ testmenus.c $(testmerge_SOURCES) testmountoperation.c \ -+ testmultidisplay.c testmultiscreen.c testnotebookdnd.c \ -+ testnouiprint.c $(testprint_SOURCES) \ -+ $(testrecentchooser_SOURCES) $(testrecentchoosermenu_SOURCES) \ -+ testrgb.c testrichtext.c testselection.c $(testsocket_SOURCES) \ -+ $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) \ -+ $(teststatusicon_SOURCES) $(testtext_SOURCES) \ -+ $(testtoolbar_SOURCES) $(testtooltips_SOURCES) \ -+ testtreecolumns.c testtreecolumnsizing.c \ -+ $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c \ -+ $(testtreemodel_SOURCES) testtreesort.c \ -+ $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) \ -+ testxinerama.c treestoretest.c -+DIST_SOURCES = $(am__autotestkeywords_SOURCES_DIST) pixbuf-lowmem.c \ -+ pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c \ -+ pixbuf-threads.c print-editor.c simple.c stresstest-toolbar.c \ -+ testaccel.c $(testactions_SOURCES) testassistant.c \ -+ $(testbbox_SOURCES) testcairo.c testcalendar.c \ -+ testcellrenderertext.c testcombo.c testcombochange.c testdnd.c \ -+ testellipsise.c $(testentrycompletion_SOURCES) \ -+ $(testfilechooser_SOURCES) $(testfilechooserbutton_SOURCES) \ -+ $(testframe_SOURCES) $(testgrouping_SOURCES) \ -+ $(testgtk_SOURCES) testicontheme.c $(testiconview_SOURCES) \ -+ testimage.c testinput.c testmenubars.c testmenus.c \ -+ $(testmerge_SOURCES) testmountoperation.c testmultidisplay.c \ -+ testmultiscreen.c testnotebookdnd.c testnouiprint.c \ -+ $(testprint_SOURCES) $(testrecentchooser_SOURCES) \ -+ $(testrecentchoosermenu_SOURCES) testrgb.c testrichtext.c \ -+ testselection.c $(testsocket_SOURCES) \ -+ $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) \ -+ $(teststatusicon_SOURCES) $(testtext_SOURCES) \ -+ $(testtoolbar_SOURCES) $(testtooltips_SOURCES) \ -+ testtreecolumns.c testtreecolumnsizing.c \ -+ $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c \ -+ $(testtreemodel_SOURCES) testtreesort.c \ -+ $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) \ -+ testxinerama.c treestoretest.c -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -@@ -53,22 +310,17 @@ - AWK = @AWK@ - BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ - BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ --BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ --BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ --BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ --BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ - CAIRO_PREFIX = @CAIRO_PREFIX@ - CATALOGS = @CATALOGS@ - CATOBJEXT = @CATOBJEXT@ - CC = @CC@ - CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ --CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CUPS_API_MAJOR = @CUPS_API_MAJOR@ - CUPS_API_MINOR = @CUPS_API_MINOR@ - CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,8 +335,6 @@ - DB2HTML = @DB2HTML@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ --DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ - DLLTOOL = @DLLTOOL@ - DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -92,10 +342,6 @@ - ECHO_N = @ECHO_N@ - ECHO_T = @ECHO_T@ - EGREP = @EGREP@ --ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ --ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ --ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ --ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +diff -urN gtk+2.0-2.14.4.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14.4/modules/printbackends/lpr/Makefile.in +--- gtk+2.0-2.14.4.old/modules/printbackends/lpr/Makefile.in 2008-10-17 01:07:20.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/printbackends/lpr/Makefile.in 2008-11-04 15:37:11.000000000 -0200 +@@ -94,6 +94,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@ -@@ -122,6 +368,7 @@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN gtk+2.0-2.14.4.old/modules/printbackends/Makefile.in gtk+2.0-2.14.4/modules/printbackends/Makefile.in +--- gtk+2.0-2.14.4.old/modules/printbackends/Makefile.in 2008-10-17 01:07:19.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/printbackends/Makefile.in 2008-11-04 15:37:11.000000000 -0200 +@@ -96,6 +96,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@ +@@ -122,6 +124,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN gtk+2.0-2.14.4.old/modules/printbackends/test/Makefile.in gtk+2.0-2.14.4/modules/printbackends/test/Makefile.in +--- gtk+2.0-2.14.4.old/modules/printbackends/test/Makefile.in 2008-10-17 01:07:20.000000000 -0300 ++++ gtk+2.0-2.14.4/modules/printbackends/test/Makefile.in 2008-11-04 15:37:11.000000000 -0200 +@@ -94,6 +94,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@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN gtk+2.0-2.14.4.old/perf/Makefile.in gtk+2.0-2.14.4/perf/Makefile.in +--- gtk+2.0-2.14.4.old/perf/Makefile.in 2008-10-17 01:07:20.000000000 -0300 ++++ gtk+2.0-2.14.4/perf/Makefile.in 2008-11-04 15:37:12.000000000 -0200 +@@ -94,6 +94,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@ +@@ -120,6 +122,7 @@ + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +diff -urN gtk+2.0-2.14.4.old/tests/Makefile.in gtk+2.0-2.14.4/tests/Makefile.in +--- gtk+2.0-2.14.4.old/tests/Makefile.in 2008-10-17 01:07:21.000000000 -0300 ++++ gtk+2.0-2.14.4/tests/Makefile.in 2008-11-04 15:37:12.000000000 -0200 +@@ -96,6 +96,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@ +@@ -122,6 +124,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62806,1741 +62434,3 @@ Index: gtk+2.0-2.14.3/tests/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -140,8 +387,6 @@ - GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ - GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ - GTK_DEP_LIBS = @GTK_DEP_LIBS@ --GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ --GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ - GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ - GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ - GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -152,91 +397,14 @@ - GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ - GTK_VERSION = @GTK_VERSION@ - GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ --HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ --HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ --HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ --HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ --HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ --HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ - HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ --HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ --HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ --HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ --HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ --HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ --HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ --HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ --HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ --HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ --HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ --HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ --HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ --HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ --HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ - HTML_DIR = @HTML_DIR@ - INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ - INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ - INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ - INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ --INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ --INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ --INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ --INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ --INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ --INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ --INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ --INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ --INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ --INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ --INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ --INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ --INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ --INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ --INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ --INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ --INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ --INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ --INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ --INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ --INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ --INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ --INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ --INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ --INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ --INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ --INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ --INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ --INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ --INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ --INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ --INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ --INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ --INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ --INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ --INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ --INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ --INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ --INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ --INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ --INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ --INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ --INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ --INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ --INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ --INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ --INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ --INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ --INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ --INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ --INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ --INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ --INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ --INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ --INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ --INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ - INDENT = @INDENT@ -+INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -258,24 +426,15 @@ - LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ - LT_VERSION_INFO = @LT_VERSION_INFO@ - MAINT = @MAINT@ --MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ --MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ - MSGFMT_OPTS = @MSGFMT_OPTS@ --MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ --MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ - NM = @NM@ - NMEDIT = @NMEDIT@ - OBJDUMP = @OBJDUMP@ - OBJEXT = @OBJEXT@ --OS_LINUX_FALSE = @OS_LINUX_FALSE@ --OS_LINUX_TRUE = @OS_LINUX_TRUE@ --OS_UNIX_FALSE = @OS_UNIX_FALSE@ --OS_UNIX_TRUE = @OS_UNIX_TRUE@ --OS_WIN32_FALSE = @OS_WIN32_FALSE@ --OS_WIN32_TRUE = @OS_WIN32_TRUE@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -@@ -286,8 +445,6 @@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PERL = @PERL@ - PKG_CONFIG = @PKG_CONFIG@ --PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ --PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ - POFILES = @POFILES@ - POSUB = @POSUB@ - PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -299,28 +456,10 @@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ --TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ --TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ --USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ --USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ --USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ --USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ --USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ --USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ --USE_MMX_FALSE = @USE_MMX_FALSE@ --USE_MMX_TRUE = @USE_MMX_TRUE@ - USE_NLS = @USE_NLS@ --USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ --USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ --USE_WIN32_FALSE = @USE_WIN32_FALSE@ --USE_WIN32_TRUE = @USE_WIN32_TRUE@ --USE_X11_FALSE = @USE_X11_FALSE@ --USE_X11_TRUE = @USE_X11_TRUE@ - VERSION = @VERSION@ - WINDRES = @WINDRES@ - XGETTEXT = @XGETTEXT@ --XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ --XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ - XMKMF = @XMKMF@ - XMLCATALOG = @XMLCATALOG@ - XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -329,22 +468,25 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_LIBS = @X_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ - am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ - bindir = @bindir@ - build = @build@ - build_alias = @build_alias@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ -+builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -367,6 +509,7 @@ - localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ -+mkdir_p = @mkdir_p@ - ms_librarian = @ms_librarian@ - oldincludedir = @oldincludedir@ - pdfdir = @pdfdir@ -@@ -375,37 +518,21 @@ - psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -- -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - GTESTER = gtester # in $PATH for non-GLIB packages - GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages - - # initialize variables for unconditional += appending --EXTRA_DIST = \ -- prop-editor.h \ -- testgtk.1 \ -- testgtkrc \ -- testgtkrc2 \ -- circles.xbm \ -- 3DRings.xpm \ -- FilesQueue.xpm \ -- Modeller.xpm \ -- check-y.xpm \ -- check-n.xpm \ -- marble.xpm \ -- test.xpm \ -- check-y.xpm \ -- check-n.xpm \ -- test.xpm \ -- merge-1.ui \ -- merge-2.ui \ -- merge-3.ui \ -- gnome-textfile.png \ -- makefile.msc \ -- file-chooser-test-dir/empty \ -+EXTRA_DIST = prop-editor.h testgtk.1 testgtkrc testgtkrc2 circles.xbm \ -+ 3DRings.xpm FilesQueue.xpm Modeller.xpm check-y.xpm \ -+ check-n.xpm marble.xpm test.xpm check-y.xpm check-n.xpm \ -+ test.xpm merge-1.ui merge-2.ui merge-3.ui gnome-textfile.png \ -+ makefile.msc file-chooser-test-dir/empty \ - file-chooser-test-dir/text.txt -- - TEST_PROGS = - - ### testing rules -@@ -431,7 +558,6 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - -- - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/gdk \ -@@ -441,89 +567,21 @@ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) - -- - DEPS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- - LDADDS = \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -- - @USE_X11_TRUE@testsocket_programs = testsocket testsocket_child -- --noinst_PROGRAMS = $(TEST_PROGS) \ -- simple \ -- print-editor \ -- testaccel \ -- testassistant \ -- testbbox \ -- testcairo \ -- testcalendar \ -- testcombo \ -- testcombochange \ -- testcellrenderertext \ -- testdnd \ -- testellipsise \ -- testentrycompletion \ -- testfilechooser \ -- testfilechooserbutton \ -- testframe \ -- testgtk \ -- testiconview \ -- testicontheme \ -- testimage \ -- testinput \ -- testmenus \ -- testmenubars \ -- testmountoperation \ -- testmultidisplay \ -- testmultiscreen \ -- testnotebookdnd \ -- testnouiprint \ -- testprint \ -- testrgb \ -- testrecentchooser \ -- testrecentchoosermenu \ -- testrichtext \ -- testselection \ -- $(testsocket_programs) \ -- testspinbutton \ -- teststatusicon \ -- testtext \ -- testtoolbar \ -- stresstest-toolbar \ -- testtreeedit \ -- testtreemodel \ -- testtreeview \ -- testtreefocus \ -- testtreeflow \ -- testtreecolumns \ -- testtreecolumnsizing \ -- testtreesort \ -- treestoretest \ -- testxinerama \ -- pixbuf-read \ -- pixbuf-lowmem \ -- pixbuf-randomly-modified \ -- pixbuf-random \ -- pixbuf-threads \ -- testmerge \ -- testactions \ -- testgrouping \ -- testtooltips \ -- testvolumebutton\ --$(am__append_1) --@HAVE_CXX_TRUE@TESTS = autotestkeywords -- - @HAVE_CXX_TRUE@autotestkeywords_SOURCES = autotestkeywords.cc --@HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers $(am__append_2) -+@HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers \ -+@HAVE_CXX_TRUE@ $(am__append_2) - @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@autotestkeywords_CXXFLAGS = -x objective-c++ -- - simple_DEPENDENCIES = $(TEST_DEPS) - print_editor_DEPENDENCIES = $(TEST_DEPS) - testicontheme_DEPENDENCIES = $(TEST_DEPS) -@@ -578,7 +636,6 @@ - testgrouping_DEPENDENCIES = $(TEST_DEPS) - testtooltips_DEPENDENCIES = $(TEST_DEPS) - testvolumebutton_DEPENDENCIES = $(TEST_DEPS) -- - simple_LDADD = $(LDADDS) - print_editor_LDADD = $(LDADDS) - testaccel_LDADD = $(LDADDS) -@@ -640,700 +697,125 @@ - testgrouping_LDADD = $(LDADDS) - testtooltips_LDADD = $(LDADDS) - testvolumebutton_LDADD = $(LDADDS) -- - testentrycompletion_SOURCES = \ - prop-editor.c \ - testentrycompletion.c - -- - testfilechooser_SOURCES = \ - prop-editor.c \ - testfilechooser.c - -- - testfilechooserbutton_SOURCES = \ - prop-editor.c \ - testfilechooserbutton.c - -- - testgtk_SOURCES = \ - prop-editor.c \ - testgtk.c - -- - testtreeedit_SOURCES = \ - testtreeedit.c - -- - testtreemodel_SOURCES = \ - testtreemodel.c - -- - testtreeview_SOURCES = \ - prop-editor.c \ - testtreeview.c - -- - testtext_SOURCES = \ - prop-editor.c \ - testtext.c - -- - testtoolbar_SOURCES = \ - testtoolbar.c \ - prop-editor.c - -- - testprint_SOURCES = \ - testprint.c \ - testprintfileoperation.h \ - testprintfileoperation.c - -- - testsocket_SOURCES = \ - testsocket.c \ - testsocket_common.c - -- - testsocket_child_SOURCES = \ - testsocket_child.c \ - testsocket_common.c - -- - testspinbutton_SOURCES = \ - testspinbutton.c - -- - teststatusicon_SOURCES = \ - prop-editor.c \ - teststatusicon.c - -- - testmerge_SOURCES = \ - testmerge.c - -- - testactions_SOURCES = \ - testactions.c - -- - testbbox_SOURCES = \ - testbbox.c - -- - testframe_SOURCES = \ - testframe.c - -- - testiconview_SOURCES = \ - testiconview.c \ - prop-editor.c - -- - testrecentchooser_SOURCES = \ - prop-editor.c \ - testrecentchooser.c - -- - testgrouping_SOURCES = \ - testgrouping.c - -- - testtooltips_SOURCES = \ - testtooltips.c - -- - testrecentchoosermenu_SOURCES = \ - testrecentchoosermenu.c - -- - testvolumebutton_SOURCES = \ - testvolumebutton.c - --subdir = tests --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --@HAVE_CXX_FALSE@@USE_X11_TRUE@noinst_PROGRAMS = simple$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ print-editor$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testaccel$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testassistant$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testbbox$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testcairo$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testcalendar$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testcombo$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testcombochange$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testcellrenderertext$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testdnd$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testellipsise$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testentrycompletion$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testfilechooser$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testfilechooserbutton$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testframe$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testgtk$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testiconview$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testicontheme$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testimage$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testinput$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmenus$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmenubars$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmountoperation$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmultidisplay$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmultiscreen$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testnotebookdnd$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testnouiprint$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testprint$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testrgb$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testrecentchooser$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testrecentchoosermenu$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testrichtext$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testselection$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testsocket$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testsocket_child$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testspinbutton$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ teststatusicon$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtext$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtoolbar$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ stresstest-toolbar$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreeedit$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreemodel$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreeview$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreefocus$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreeflow$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreecolumns$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreecolumnsizing$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreesort$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ treestoretest$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testxinerama$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ pixbuf-read$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ pixbuf-lowmem$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ pixbuf-randomly-modified$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ pixbuf-random$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ pixbuf-threads$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmerge$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testactions$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testgrouping$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtooltips$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_TRUE@ testvolumebutton$(EXEEXT) --@HAVE_CXX_FALSE@@USE_X11_FALSE@noinst_PROGRAMS = simple$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ print-editor$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testaccel$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testassistant$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testbbox$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testcairo$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testcalendar$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testcombo$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testcombochange$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testcellrenderertext$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testdnd$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testellipsise$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testentrycompletion$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testfilechooser$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testfilechooserbutton$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testframe$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testgtk$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testiconview$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testicontheme$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testimage$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testinput$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmenus$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmenubars$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmountoperation$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmultidisplay$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmultiscreen$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testnotebookdnd$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testnouiprint$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testprint$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testrgb$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testrecentchooser$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testrecentchoosermenu$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testrichtext$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testselection$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testspinbutton$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ teststatusicon$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtext$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtoolbar$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ stresstest-toolbar$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreeedit$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreemodel$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreeview$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreefocus$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreeflow$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreecolumns$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreecolumnsizing$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreesort$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ treestoretest$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testxinerama$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ pixbuf-read$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ pixbuf-lowmem$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ pixbuf-randomly-modified$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ pixbuf-random$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ pixbuf-threads$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmerge$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testactions$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testgrouping$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtooltips$(EXEEXT) \ --@HAVE_CXX_FALSE@@USE_X11_FALSE@ testvolumebutton$(EXEEXT) --@HAVE_CXX_TRUE@@USE_X11_TRUE@noinst_PROGRAMS = simple$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ print-editor$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testaccel$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testassistant$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testbbox$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testcairo$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testcalendar$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testcombo$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testcombochange$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testcellrenderertext$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testdnd$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testellipsise$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testentrycompletion$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testfilechooser$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testfilechooserbutton$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testframe$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testgtk$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testiconview$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testicontheme$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testimage$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testinput$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmenus$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmenubars$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmountoperation$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmultidisplay$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmultiscreen$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testnotebookdnd$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testnouiprint$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testprint$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testrgb$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testrecentchooser$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testrecentchoosermenu$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testrichtext$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testselection$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testsocket$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testsocket_child$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testspinbutton$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ teststatusicon$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtext$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtoolbar$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ stresstest-toolbar$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreeedit$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreemodel$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreeview$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreefocus$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreeflow$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreecolumns$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreecolumnsizing$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreesort$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ treestoretest$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testxinerama$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ pixbuf-read$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ pixbuf-lowmem$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ pixbuf-randomly-modified$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ pixbuf-random$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ pixbuf-threads$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmerge$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testactions$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testgrouping$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtooltips$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ testvolumebutton$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_TRUE@ autotestkeywords$(EXEEXT) --@HAVE_CXX_TRUE@@USE_X11_FALSE@noinst_PROGRAMS = simple$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ print-editor$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testaccel$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testassistant$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testbbox$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testcairo$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testcalendar$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testcombo$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testcombochange$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testcellrenderertext$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testdnd$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testellipsise$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testentrycompletion$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testfilechooser$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testfilechooserbutton$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testframe$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testgtk$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testiconview$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testicontheme$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testimage$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testinput$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmenus$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmenubars$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmountoperation$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmultidisplay$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmultiscreen$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testnotebookdnd$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testnouiprint$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testprint$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testrgb$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testrecentchooser$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testrecentchoosermenu$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testrichtext$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testselection$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testspinbutton$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ teststatusicon$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtext$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtoolbar$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ stresstest-toolbar$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreeedit$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreemodel$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreeview$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreefocus$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreeflow$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreecolumns$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreecolumnsizing$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreesort$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ treestoretest$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testxinerama$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ pixbuf-read$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ pixbuf-lowmem$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ pixbuf-randomly-modified$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ pixbuf-random$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ pixbuf-threads$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmerge$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testactions$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testgrouping$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtooltips$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ testvolumebutton$(EXEEXT) \ --@HAVE_CXX_TRUE@@USE_X11_FALSE@ autotestkeywords$(EXEEXT) --PROGRAMS = $(noinst_PROGRAMS) -- --am__autotestkeywords_SOURCES_DIST = autotestkeywords.cc --@HAVE_CXX_TRUE@am_autotestkeywords_OBJECTS = \ --@HAVE_CXX_TRUE@ autotestkeywords-autotestkeywords.$(OBJEXT) --autotestkeywords_OBJECTS = $(am_autotestkeywords_OBJECTS) --autotestkeywords_LDADD = $(LDADD) --autotestkeywords_DEPENDENCIES = --autotestkeywords_LDFLAGS = --pixbuf_lowmem_SOURCES = pixbuf-lowmem.c --pixbuf_lowmem_OBJECTS = pixbuf-lowmem.$(OBJEXT) --pixbuf_lowmem_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --pixbuf_lowmem_LDFLAGS = --pixbuf_random_SOURCES = pixbuf-random.c --pixbuf_random_OBJECTS = pixbuf-random.$(OBJEXT) --pixbuf_random_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --pixbuf_random_LDFLAGS = --pixbuf_randomly_modified_SOURCES = pixbuf-randomly-modified.c --pixbuf_randomly_modified_OBJECTS = pixbuf-randomly-modified.$(OBJEXT) --pixbuf_randomly_modified_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --pixbuf_randomly_modified_LDFLAGS = --pixbuf_read_SOURCES = pixbuf-read.c --pixbuf_read_OBJECTS = pixbuf-read.$(OBJEXT) --pixbuf_read_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --pixbuf_read_LDFLAGS = --pixbuf_threads_SOURCES = pixbuf-threads.c --pixbuf_threads_OBJECTS = pixbuf-threads.$(OBJEXT) --pixbuf_threads_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --pixbuf_threads_LDFLAGS = --print_editor_SOURCES = print-editor.c --print_editor_OBJECTS = print-editor.$(OBJEXT) --print_editor_LDFLAGS = --simple_SOURCES = simple.c --simple_OBJECTS = simple.$(OBJEXT) --simple_LDFLAGS = --stresstest_toolbar_SOURCES = stresstest-toolbar.c --stresstest_toolbar_OBJECTS = stresstest-toolbar.$(OBJEXT) --stresstest_toolbar_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --stresstest_toolbar_LDFLAGS = --testaccel_SOURCES = testaccel.c --testaccel_OBJECTS = testaccel.$(OBJEXT) --testaccel_LDFLAGS = --am_testactions_OBJECTS = testactions.$(OBJEXT) --testactions_OBJECTS = $(am_testactions_OBJECTS) --testactions_LDFLAGS = --testassistant_SOURCES = testassistant.c --testassistant_OBJECTS = testassistant.$(OBJEXT) --testassistant_LDFLAGS = --am_testbbox_OBJECTS = testbbox.$(OBJEXT) --testbbox_OBJECTS = $(am_testbbox_OBJECTS) --testbbox_LDFLAGS = --testcairo_SOURCES = testcairo.c --testcairo_OBJECTS = testcairo.$(OBJEXT) --testcairo_LDFLAGS = --testcalendar_SOURCES = testcalendar.c --testcalendar_OBJECTS = testcalendar.$(OBJEXT) --testcalendar_LDFLAGS = --testcellrenderertext_SOURCES = testcellrenderertext.c --testcellrenderertext_OBJECTS = testcellrenderertext.$(OBJEXT) --testcellrenderertext_LDFLAGS = --testcombo_SOURCES = testcombo.c --testcombo_OBJECTS = testcombo.$(OBJEXT) --testcombo_LDFLAGS = --testcombochange_SOURCES = testcombochange.c --testcombochange_OBJECTS = testcombochange.$(OBJEXT) --testcombochange_LDFLAGS = --testdnd_SOURCES = testdnd.c --testdnd_OBJECTS = testdnd.$(OBJEXT) --testdnd_LDFLAGS = --testellipsise_SOURCES = testellipsise.c --testellipsise_OBJECTS = testellipsise.$(OBJEXT) --testellipsise_LDFLAGS = --am_testentrycompletion_OBJECTS = prop-editor.$(OBJEXT) \ -- testentrycompletion.$(OBJEXT) --testentrycompletion_OBJECTS = $(am_testentrycompletion_OBJECTS) --testentrycompletion_LDFLAGS = --am_testfilechooser_OBJECTS = prop-editor.$(OBJEXT) \ -- testfilechooser.$(OBJEXT) --testfilechooser_OBJECTS = $(am_testfilechooser_OBJECTS) --testfilechooser_LDFLAGS = --am_testfilechooserbutton_OBJECTS = prop-editor.$(OBJEXT) \ -- testfilechooserbutton.$(OBJEXT) --testfilechooserbutton_OBJECTS = $(am_testfilechooserbutton_OBJECTS) --testfilechooserbutton_LDFLAGS = --am_testframe_OBJECTS = testframe.$(OBJEXT) --testframe_OBJECTS = $(am_testframe_OBJECTS) --testframe_LDFLAGS = --am_testgrouping_OBJECTS = testgrouping.$(OBJEXT) --testgrouping_OBJECTS = $(am_testgrouping_OBJECTS) --testgrouping_LDFLAGS = --am_testgtk_OBJECTS = prop-editor.$(OBJEXT) testgtk.$(OBJEXT) --testgtk_OBJECTS = $(am_testgtk_OBJECTS) --testgtk_LDFLAGS = --testicontheme_SOURCES = testicontheme.c --testicontheme_OBJECTS = testicontheme.$(OBJEXT) --testicontheme_LDFLAGS = --am_testiconview_OBJECTS = testiconview.$(OBJEXT) prop-editor.$(OBJEXT) --testiconview_OBJECTS = $(am_testiconview_OBJECTS) --testiconview_LDFLAGS = --testimage_SOURCES = testimage.c --testimage_OBJECTS = testimage.$(OBJEXT) --testimage_LDFLAGS = --testinput_SOURCES = testinput.c --testinput_OBJECTS = testinput.$(OBJEXT) --testinput_LDFLAGS = --testmenubars_SOURCES = testmenubars.c --testmenubars_OBJECTS = testmenubars.$(OBJEXT) --testmenubars_LDFLAGS = --testmenus_SOURCES = testmenus.c --testmenus_OBJECTS = testmenus.$(OBJEXT) --testmenus_LDFLAGS = --am_testmerge_OBJECTS = testmerge.$(OBJEXT) --testmerge_OBJECTS = $(am_testmerge_OBJECTS) --testmerge_LDFLAGS = --testmountoperation_SOURCES = testmountoperation.c --testmountoperation_OBJECTS = testmountoperation.$(OBJEXT) --testmountoperation_LDFLAGS = --testmultidisplay_SOURCES = testmultidisplay.c --testmultidisplay_OBJECTS = testmultidisplay.$(OBJEXT) --testmultidisplay_LDFLAGS = --testmultiscreen_SOURCES = testmultiscreen.c --testmultiscreen_OBJECTS = testmultiscreen.$(OBJEXT) --testmultiscreen_LDFLAGS = --testnotebookdnd_SOURCES = testnotebookdnd.c --testnotebookdnd_OBJECTS = testnotebookdnd.$(OBJEXT) --testnotebookdnd_LDFLAGS = --testnouiprint_SOURCES = testnouiprint.c --testnouiprint_OBJECTS = testnouiprint.$(OBJEXT) --testnouiprint_LDFLAGS = --am_testprint_OBJECTS = testprint.$(OBJEXT) \ -- testprintfileoperation.$(OBJEXT) --testprint_OBJECTS = $(am_testprint_OBJECTS) --testprint_LDFLAGS = --am_testrecentchooser_OBJECTS = prop-editor.$(OBJEXT) \ -- testrecentchooser.$(OBJEXT) --testrecentchooser_OBJECTS = $(am_testrecentchooser_OBJECTS) --testrecentchooser_LDFLAGS = --am_testrecentchoosermenu_OBJECTS = testrecentchoosermenu.$(OBJEXT) --testrecentchoosermenu_OBJECTS = $(am_testrecentchoosermenu_OBJECTS) --testrecentchoosermenu_LDFLAGS = --testrgb_SOURCES = testrgb.c --testrgb_OBJECTS = testrgb.$(OBJEXT) --testrgb_LDFLAGS = --testrichtext_SOURCES = testrichtext.c --testrichtext_OBJECTS = testrichtext.$(OBJEXT) --testrichtext_LDFLAGS = --testselection_SOURCES = testselection.c --testselection_OBJECTS = testselection.$(OBJEXT) --testselection_LDFLAGS = --am_testsocket_OBJECTS = testsocket.$(OBJEXT) testsocket_common.$(OBJEXT) --testsocket_OBJECTS = $(am_testsocket_OBJECTS) --testsocket_LDFLAGS = --am_testsocket_child_OBJECTS = testsocket_child.$(OBJEXT) \ -- testsocket_common.$(OBJEXT) --testsocket_child_OBJECTS = $(am_testsocket_child_OBJECTS) --testsocket_child_LDFLAGS = --am_testspinbutton_OBJECTS = testspinbutton.$(OBJEXT) --testspinbutton_OBJECTS = $(am_testspinbutton_OBJECTS) --testspinbutton_LDFLAGS = --am_teststatusicon_OBJECTS = prop-editor.$(OBJEXT) \ -- teststatusicon.$(OBJEXT) --teststatusicon_OBJECTS = $(am_teststatusicon_OBJECTS) --teststatusicon_LDFLAGS = --am_testtext_OBJECTS = prop-editor.$(OBJEXT) testtext.$(OBJEXT) --testtext_OBJECTS = $(am_testtext_OBJECTS) --testtext_LDFLAGS = --am_testtoolbar_OBJECTS = testtoolbar.$(OBJEXT) prop-editor.$(OBJEXT) --testtoolbar_OBJECTS = $(am_testtoolbar_OBJECTS) --testtoolbar_DEPENDENCIES = \ -- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ -- $(top_builddir)/gdk/$(gdktargetlib) \ -- $(top_builddir)/gtk/$(gtktargetlib) --testtoolbar_LDFLAGS = --am_testtooltips_OBJECTS = testtooltips.$(OBJEXT) --testtooltips_OBJECTS = $(am_testtooltips_OBJECTS) --testtooltips_LDFLAGS = --testtreecolumns_SOURCES = testtreecolumns.c --testtreecolumns_OBJECTS = testtreecolumns.$(OBJEXT) --testtreecolumns_LDFLAGS = --testtreecolumnsizing_SOURCES = testtreecolumnsizing.c --testtreecolumnsizing_OBJECTS = testtreecolumnsizing.$(OBJEXT) --testtreecolumnsizing_LDFLAGS = --am_testtreeedit_OBJECTS = testtreeedit.$(OBJEXT) --testtreeedit_OBJECTS = $(am_testtreeedit_OBJECTS) --testtreeedit_LDFLAGS = --testtreeflow_SOURCES = testtreeflow.c --testtreeflow_OBJECTS = testtreeflow.$(OBJEXT) --testtreeflow_LDFLAGS = --testtreefocus_SOURCES = testtreefocus.c --testtreefocus_OBJECTS = testtreefocus.$(OBJEXT) --testtreefocus_LDFLAGS = --am_testtreemodel_OBJECTS = testtreemodel.$(OBJEXT) --testtreemodel_OBJECTS = $(am_testtreemodel_OBJECTS) --testtreemodel_LDFLAGS = --testtreesort_SOURCES = testtreesort.c --testtreesort_OBJECTS = testtreesort.$(OBJEXT) --testtreesort_LDFLAGS = --am_testtreeview_OBJECTS = prop-editor.$(OBJEXT) testtreeview.$(OBJEXT) --testtreeview_OBJECTS = $(am_testtreeview_OBJECTS) --testtreeview_LDFLAGS = --am_testvolumebutton_OBJECTS = testvolumebutton.$(OBJEXT) --testvolumebutton_OBJECTS = $(am_testvolumebutton_OBJECTS) --testvolumebutton_LDFLAGS = --testxinerama_SOURCES = testxinerama.c --testxinerama_OBJECTS = testxinerama.$(OBJEXT) --testxinerama_LDFLAGS = --treestoretest_SOURCES = treestoretest.c --treestoretest_OBJECTS = treestoretest.$(OBJEXT) --treestoretest_LDFLAGS = -- --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/depcomp --am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autotestkeywords-autotestkeywords.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-lowmem.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-random.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-randomly-modified.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-read.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-threads.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/print-editor.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/prop-editor.Po ./$(DEPDIR)/simple.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/stresstest-toolbar.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testaccel.Po ./$(DEPDIR)/testactions.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testassistant.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testbbox.Po ./$(DEPDIR)/testcairo.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testcalendar.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testcellrenderertext.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testcombo.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testcombochange.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testdnd.Po ./$(DEPDIR)/testellipsise.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testentrycompletion.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testfilechooser.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testfilechooserbutton.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testframe.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testgrouping.Po ./$(DEPDIR)/testgtk.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testicontheme.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testiconview.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testimage.Po ./$(DEPDIR)/testinput.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testmenubars.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testmenus.Po ./$(DEPDIR)/testmerge.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testmountoperation.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testmultidisplay.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testmultiscreen.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testnotebookdnd.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testnouiprint.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testprint.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testprintfileoperation.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testrecentchooser.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testrecentchoosermenu.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testrgb.Po ./$(DEPDIR)/testrichtext.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testselection.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testsocket.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testsocket_child.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testsocket_common.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testspinbutton.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/teststatusicon.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtext.Po ./$(DEPDIR)/testtoolbar.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtooltips.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtreecolumns.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtreecolumnsizing.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtreeedit.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtreeflow.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtreefocus.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtreemodel.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtreesort.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testtreeview.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testvolumebutton.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/testxinerama.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/treestoretest.Po --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) --CXXLD = $(CXX) --CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(am__autotestkeywords_SOURCES_DIST) pixbuf-lowmem.c \ -- pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c \ -- pixbuf-threads.c print-editor.c simple.c stresstest-toolbar.c \ -- testaccel.c $(testactions_SOURCES) testassistant.c \ -- $(testbbox_SOURCES) testcairo.c testcalendar.c \ -- testcellrenderertext.c testcombo.c testcombochange.c testdnd.c \ -- testellipsise.c $(testentrycompletion_SOURCES) \ -- $(testfilechooser_SOURCES) $(testfilechooserbutton_SOURCES) \ -- $(testframe_SOURCES) $(testgrouping_SOURCES) $(testgtk_SOURCES) \ -- testicontheme.c $(testiconview_SOURCES) testimage.c testinput.c \ -- testmenubars.c testmenus.c $(testmerge_SOURCES) \ -- testmountoperation.c testmultidisplay.c testmultiscreen.c \ -- testnotebookdnd.c testnouiprint.c $(testprint_SOURCES) \ -- $(testrecentchooser_SOURCES) $(testrecentchoosermenu_SOURCES) \ -- testrgb.c testrichtext.c testselection.c $(testsocket_SOURCES) \ -- $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) \ -- $(teststatusicon_SOURCES) $(testtext_SOURCES) \ -- $(testtoolbar_SOURCES) $(testtooltips_SOURCES) \ -- testtreecolumns.c testtreecolumnsizing.c \ -- $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c \ -- $(testtreemodel_SOURCES) testtreesort.c $(testtreeview_SOURCES) \ -- $(testvolumebutton_SOURCES) testxinerama.c treestoretest.c --DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ -- Makefile.am --SOURCES = $(autotestkeywords_SOURCES) pixbuf-lowmem.c pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c pixbuf-threads.c print-editor.c simple.c stresstest-toolbar.c testaccel.c $(testactions_SOURCES) testassistant.c $(testbbox_SOURCES) testcairo.c testcalendar.c testcellrenderertext.c testcombo.c testcombochange.c testdnd.c testellipsise.c $(testentrycompletion_SOURCES) $(testfilechooser_SOURCES) $(testfilechooserbutton_SOURCES) $(testframe_SOURCES) $(testgrouping_SOURCES) $(testgtk_SOURCES) testicontheme.c $(testiconview_SOURCES) testimage.c testinput.c testmenubars.c testmenus.c $(testmerge_SOURCES) testmountoperation.c testmultidisplay.c testmultiscreen.c testnotebookdnd.c testnouiprint.c $(testprint_SOURCES) $(testrecentchooser_SOURCES) $(testrecentchoosermenu_SOURCES) testrgb.c testrichtext.c testselection.c $(testsocket_SOURCES) $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) $(teststatusicon_SOURCES) $(testtext_SOURCES) $(testtoolbar_SOURCES) $(testtooltips_SOURCES) testtreecolumns.c testtreecolumnsizing.c $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c $(testtreemodel_SOURCES) testtreesort.c $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) testxinerama.c treestoretest.c -- - all: all-am - - .SUFFIXES: - .SUFFIXES: .c .cc .lo .o .obj --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/Makefile --Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -1343,193 +825,193 @@ - done - autotestkeywords$(EXEEXT): $(autotestkeywords_OBJECTS) $(autotestkeywords_DEPENDENCIES) - @rm -f autotestkeywords$(EXEEXT) -- $(CXXLINK) $(autotestkeywords_LDFLAGS) $(autotestkeywords_OBJECTS) $(autotestkeywords_LDADD) $(LIBS) -+ $(autotestkeywords_LINK) $(autotestkeywords_OBJECTS) $(autotestkeywords_LDADD) $(LIBS) - pixbuf-lowmem$(EXEEXT): $(pixbuf_lowmem_OBJECTS) $(pixbuf_lowmem_DEPENDENCIES) - @rm -f pixbuf-lowmem$(EXEEXT) -- $(LINK) $(pixbuf_lowmem_LDFLAGS) $(pixbuf_lowmem_OBJECTS) $(pixbuf_lowmem_LDADD) $(LIBS) -+ $(LINK) $(pixbuf_lowmem_OBJECTS) $(pixbuf_lowmem_LDADD) $(LIBS) - pixbuf-random$(EXEEXT): $(pixbuf_random_OBJECTS) $(pixbuf_random_DEPENDENCIES) - @rm -f pixbuf-random$(EXEEXT) -- $(LINK) $(pixbuf_random_LDFLAGS) $(pixbuf_random_OBJECTS) $(pixbuf_random_LDADD) $(LIBS) -+ $(LINK) $(pixbuf_random_OBJECTS) $(pixbuf_random_LDADD) $(LIBS) - pixbuf-randomly-modified$(EXEEXT): $(pixbuf_randomly_modified_OBJECTS) $(pixbuf_randomly_modified_DEPENDENCIES) - @rm -f pixbuf-randomly-modified$(EXEEXT) -- $(LINK) $(pixbuf_randomly_modified_LDFLAGS) $(pixbuf_randomly_modified_OBJECTS) $(pixbuf_randomly_modified_LDADD) $(LIBS) -+ $(LINK) $(pixbuf_randomly_modified_OBJECTS) $(pixbuf_randomly_modified_LDADD) $(LIBS) - pixbuf-read$(EXEEXT): $(pixbuf_read_OBJECTS) $(pixbuf_read_DEPENDENCIES) - @rm -f pixbuf-read$(EXEEXT) -- $(LINK) $(pixbuf_read_LDFLAGS) $(pixbuf_read_OBJECTS) $(pixbuf_read_LDADD) $(LIBS) -+ $(LINK) $(pixbuf_read_OBJECTS) $(pixbuf_read_LDADD) $(LIBS) - pixbuf-threads$(EXEEXT): $(pixbuf_threads_OBJECTS) $(pixbuf_threads_DEPENDENCIES) - @rm -f pixbuf-threads$(EXEEXT) -- $(LINK) $(pixbuf_threads_LDFLAGS) $(pixbuf_threads_OBJECTS) $(pixbuf_threads_LDADD) $(LIBS) -+ $(LINK) $(pixbuf_threads_OBJECTS) $(pixbuf_threads_LDADD) $(LIBS) - print-editor$(EXEEXT): $(print_editor_OBJECTS) $(print_editor_DEPENDENCIES) - @rm -f print-editor$(EXEEXT) -- $(LINK) $(print_editor_LDFLAGS) $(print_editor_OBJECTS) $(print_editor_LDADD) $(LIBS) -+ $(LINK) $(print_editor_OBJECTS) $(print_editor_LDADD) $(LIBS) - simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES) - @rm -f simple$(EXEEXT) -- $(LINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) -+ $(LINK) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) - stresstest-toolbar$(EXEEXT): $(stresstest_toolbar_OBJECTS) $(stresstest_toolbar_DEPENDENCIES) - @rm -f stresstest-toolbar$(EXEEXT) -- $(LINK) $(stresstest_toolbar_LDFLAGS) $(stresstest_toolbar_OBJECTS) $(stresstest_toolbar_LDADD) $(LIBS) -+ $(LINK) $(stresstest_toolbar_OBJECTS) $(stresstest_toolbar_LDADD) $(LIBS) - testaccel$(EXEEXT): $(testaccel_OBJECTS) $(testaccel_DEPENDENCIES) - @rm -f testaccel$(EXEEXT) -- $(LINK) $(testaccel_LDFLAGS) $(testaccel_OBJECTS) $(testaccel_LDADD) $(LIBS) -+ $(LINK) $(testaccel_OBJECTS) $(testaccel_LDADD) $(LIBS) - testactions$(EXEEXT): $(testactions_OBJECTS) $(testactions_DEPENDENCIES) - @rm -f testactions$(EXEEXT) -- $(LINK) $(testactions_LDFLAGS) $(testactions_OBJECTS) $(testactions_LDADD) $(LIBS) -+ $(LINK) $(testactions_OBJECTS) $(testactions_LDADD) $(LIBS) - testassistant$(EXEEXT): $(testassistant_OBJECTS) $(testassistant_DEPENDENCIES) - @rm -f testassistant$(EXEEXT) -- $(LINK) $(testassistant_LDFLAGS) $(testassistant_OBJECTS) $(testassistant_LDADD) $(LIBS) -+ $(LINK) $(testassistant_OBJECTS) $(testassistant_LDADD) $(LIBS) - testbbox$(EXEEXT): $(testbbox_OBJECTS) $(testbbox_DEPENDENCIES) - @rm -f testbbox$(EXEEXT) -- $(LINK) $(testbbox_LDFLAGS) $(testbbox_OBJECTS) $(testbbox_LDADD) $(LIBS) -+ $(LINK) $(testbbox_OBJECTS) $(testbbox_LDADD) $(LIBS) - testcairo$(EXEEXT): $(testcairo_OBJECTS) $(testcairo_DEPENDENCIES) - @rm -f testcairo$(EXEEXT) -- $(LINK) $(testcairo_LDFLAGS) $(testcairo_OBJECTS) $(testcairo_LDADD) $(LIBS) -+ $(LINK) $(testcairo_OBJECTS) $(testcairo_LDADD) $(LIBS) - testcalendar$(EXEEXT): $(testcalendar_OBJECTS) $(testcalendar_DEPENDENCIES) - @rm -f testcalendar$(EXEEXT) -- $(LINK) $(testcalendar_LDFLAGS) $(testcalendar_OBJECTS) $(testcalendar_LDADD) $(LIBS) -+ $(LINK) $(testcalendar_OBJECTS) $(testcalendar_LDADD) $(LIBS) - testcellrenderertext$(EXEEXT): $(testcellrenderertext_OBJECTS) $(testcellrenderertext_DEPENDENCIES) - @rm -f testcellrenderertext$(EXEEXT) -- $(LINK) $(testcellrenderertext_LDFLAGS) $(testcellrenderertext_OBJECTS) $(testcellrenderertext_LDADD) $(LIBS) -+ $(LINK) $(testcellrenderertext_OBJECTS) $(testcellrenderertext_LDADD) $(LIBS) - testcombo$(EXEEXT): $(testcombo_OBJECTS) $(testcombo_DEPENDENCIES) - @rm -f testcombo$(EXEEXT) -- $(LINK) $(testcombo_LDFLAGS) $(testcombo_OBJECTS) $(testcombo_LDADD) $(LIBS) -+ $(LINK) $(testcombo_OBJECTS) $(testcombo_LDADD) $(LIBS) - testcombochange$(EXEEXT): $(testcombochange_OBJECTS) $(testcombochange_DEPENDENCIES) - @rm -f testcombochange$(EXEEXT) -- $(LINK) $(testcombochange_LDFLAGS) $(testcombochange_OBJECTS) $(testcombochange_LDADD) $(LIBS) -+ $(LINK) $(testcombochange_OBJECTS) $(testcombochange_LDADD) $(LIBS) - testdnd$(EXEEXT): $(testdnd_OBJECTS) $(testdnd_DEPENDENCIES) - @rm -f testdnd$(EXEEXT) -- $(LINK) $(testdnd_LDFLAGS) $(testdnd_OBJECTS) $(testdnd_LDADD) $(LIBS) -+ $(LINK) $(testdnd_OBJECTS) $(testdnd_LDADD) $(LIBS) - testellipsise$(EXEEXT): $(testellipsise_OBJECTS) $(testellipsise_DEPENDENCIES) - @rm -f testellipsise$(EXEEXT) -- $(LINK) $(testellipsise_LDFLAGS) $(testellipsise_OBJECTS) $(testellipsise_LDADD) $(LIBS) -+ $(LINK) $(testellipsise_OBJECTS) $(testellipsise_LDADD) $(LIBS) - testentrycompletion$(EXEEXT): $(testentrycompletion_OBJECTS) $(testentrycompletion_DEPENDENCIES) - @rm -f testentrycompletion$(EXEEXT) -- $(LINK) $(testentrycompletion_LDFLAGS) $(testentrycompletion_OBJECTS) $(testentrycompletion_LDADD) $(LIBS) -+ $(LINK) $(testentrycompletion_OBJECTS) $(testentrycompletion_LDADD) $(LIBS) - testfilechooser$(EXEEXT): $(testfilechooser_OBJECTS) $(testfilechooser_DEPENDENCIES) - @rm -f testfilechooser$(EXEEXT) -- $(LINK) $(testfilechooser_LDFLAGS) $(testfilechooser_OBJECTS) $(testfilechooser_LDADD) $(LIBS) -+ $(LINK) $(testfilechooser_OBJECTS) $(testfilechooser_LDADD) $(LIBS) - testfilechooserbutton$(EXEEXT): $(testfilechooserbutton_OBJECTS) $(testfilechooserbutton_DEPENDENCIES) - @rm -f testfilechooserbutton$(EXEEXT) -- $(LINK) $(testfilechooserbutton_LDFLAGS) $(testfilechooserbutton_OBJECTS) $(testfilechooserbutton_LDADD) $(LIBS) -+ $(LINK) $(testfilechooserbutton_OBJECTS) $(testfilechooserbutton_LDADD) $(LIBS) - testframe$(EXEEXT): $(testframe_OBJECTS) $(testframe_DEPENDENCIES) - @rm -f testframe$(EXEEXT) -- $(LINK) $(testframe_LDFLAGS) $(testframe_OBJECTS) $(testframe_LDADD) $(LIBS) -+ $(LINK) $(testframe_OBJECTS) $(testframe_LDADD) $(LIBS) - testgrouping$(EXEEXT): $(testgrouping_OBJECTS) $(testgrouping_DEPENDENCIES) - @rm -f testgrouping$(EXEEXT) -- $(LINK) $(testgrouping_LDFLAGS) $(testgrouping_OBJECTS) $(testgrouping_LDADD) $(LIBS) -+ $(LINK) $(testgrouping_OBJECTS) $(testgrouping_LDADD) $(LIBS) - testgtk$(EXEEXT): $(testgtk_OBJECTS) $(testgtk_DEPENDENCIES) - @rm -f testgtk$(EXEEXT) -- $(LINK) $(testgtk_LDFLAGS) $(testgtk_OBJECTS) $(testgtk_LDADD) $(LIBS) -+ $(LINK) $(testgtk_OBJECTS) $(testgtk_LDADD) $(LIBS) - testicontheme$(EXEEXT): $(testicontheme_OBJECTS) $(testicontheme_DEPENDENCIES) - @rm -f testicontheme$(EXEEXT) -- $(LINK) $(testicontheme_LDFLAGS) $(testicontheme_OBJECTS) $(testicontheme_LDADD) $(LIBS) -+ $(LINK) $(testicontheme_OBJECTS) $(testicontheme_LDADD) $(LIBS) - testiconview$(EXEEXT): $(testiconview_OBJECTS) $(testiconview_DEPENDENCIES) - @rm -f testiconview$(EXEEXT) -- $(LINK) $(testiconview_LDFLAGS) $(testiconview_OBJECTS) $(testiconview_LDADD) $(LIBS) -+ $(LINK) $(testiconview_OBJECTS) $(testiconview_LDADD) $(LIBS) - testimage$(EXEEXT): $(testimage_OBJECTS) $(testimage_DEPENDENCIES) - @rm -f testimage$(EXEEXT) -- $(LINK) $(testimage_LDFLAGS) $(testimage_OBJECTS) $(testimage_LDADD) $(LIBS) -+ $(LINK) $(testimage_OBJECTS) $(testimage_LDADD) $(LIBS) - testinput$(EXEEXT): $(testinput_OBJECTS) $(testinput_DEPENDENCIES) - @rm -f testinput$(EXEEXT) -- $(LINK) $(testinput_LDFLAGS) $(testinput_OBJECTS) $(testinput_LDADD) $(LIBS) -+ $(LINK) $(testinput_OBJECTS) $(testinput_LDADD) $(LIBS) - testmenubars$(EXEEXT): $(testmenubars_OBJECTS) $(testmenubars_DEPENDENCIES) - @rm -f testmenubars$(EXEEXT) -- $(LINK) $(testmenubars_LDFLAGS) $(testmenubars_OBJECTS) $(testmenubars_LDADD) $(LIBS) -+ $(LINK) $(testmenubars_OBJECTS) $(testmenubars_LDADD) $(LIBS) - testmenus$(EXEEXT): $(testmenus_OBJECTS) $(testmenus_DEPENDENCIES) - @rm -f testmenus$(EXEEXT) -- $(LINK) $(testmenus_LDFLAGS) $(testmenus_OBJECTS) $(testmenus_LDADD) $(LIBS) -+ $(LINK) $(testmenus_OBJECTS) $(testmenus_LDADD) $(LIBS) - testmerge$(EXEEXT): $(testmerge_OBJECTS) $(testmerge_DEPENDENCIES) - @rm -f testmerge$(EXEEXT) -- $(LINK) $(testmerge_LDFLAGS) $(testmerge_OBJECTS) $(testmerge_LDADD) $(LIBS) -+ $(LINK) $(testmerge_OBJECTS) $(testmerge_LDADD) $(LIBS) - testmountoperation$(EXEEXT): $(testmountoperation_OBJECTS) $(testmountoperation_DEPENDENCIES) - @rm -f testmountoperation$(EXEEXT) -- $(LINK) $(testmountoperation_LDFLAGS) $(testmountoperation_OBJECTS) $(testmountoperation_LDADD) $(LIBS) -+ $(LINK) $(testmountoperation_OBJECTS) $(testmountoperation_LDADD) $(LIBS) - testmultidisplay$(EXEEXT): $(testmultidisplay_OBJECTS) $(testmultidisplay_DEPENDENCIES) - @rm -f testmultidisplay$(EXEEXT) -- $(LINK) $(testmultidisplay_LDFLAGS) $(testmultidisplay_OBJECTS) $(testmultidisplay_LDADD) $(LIBS) -+ $(LINK) $(testmultidisplay_OBJECTS) $(testmultidisplay_LDADD) $(LIBS) - testmultiscreen$(EXEEXT): $(testmultiscreen_OBJECTS) $(testmultiscreen_DEPENDENCIES) - @rm -f testmultiscreen$(EXEEXT) -- $(LINK) $(testmultiscreen_LDFLAGS) $(testmultiscreen_OBJECTS) $(testmultiscreen_LDADD) $(LIBS) -+ $(LINK) $(testmultiscreen_OBJECTS) $(testmultiscreen_LDADD) $(LIBS) - testnotebookdnd$(EXEEXT): $(testnotebookdnd_OBJECTS) $(testnotebookdnd_DEPENDENCIES) - @rm -f testnotebookdnd$(EXEEXT) -- $(LINK) $(testnotebookdnd_LDFLAGS) $(testnotebookdnd_OBJECTS) $(testnotebookdnd_LDADD) $(LIBS) -+ $(LINK) $(testnotebookdnd_OBJECTS) $(testnotebookdnd_LDADD) $(LIBS) - testnouiprint$(EXEEXT): $(testnouiprint_OBJECTS) $(testnouiprint_DEPENDENCIES) - @rm -f testnouiprint$(EXEEXT) -- $(LINK) $(testnouiprint_LDFLAGS) $(testnouiprint_OBJECTS) $(testnouiprint_LDADD) $(LIBS) -+ $(LINK) $(testnouiprint_OBJECTS) $(testnouiprint_LDADD) $(LIBS) - testprint$(EXEEXT): $(testprint_OBJECTS) $(testprint_DEPENDENCIES) - @rm -f testprint$(EXEEXT) -- $(LINK) $(testprint_LDFLAGS) $(testprint_OBJECTS) $(testprint_LDADD) $(LIBS) -+ $(LINK) $(testprint_OBJECTS) $(testprint_LDADD) $(LIBS) - testrecentchooser$(EXEEXT): $(testrecentchooser_OBJECTS) $(testrecentchooser_DEPENDENCIES) - @rm -f testrecentchooser$(EXEEXT) -- $(LINK) $(testrecentchooser_LDFLAGS) $(testrecentchooser_OBJECTS) $(testrecentchooser_LDADD) $(LIBS) -+ $(LINK) $(testrecentchooser_OBJECTS) $(testrecentchooser_LDADD) $(LIBS) - testrecentchoosermenu$(EXEEXT): $(testrecentchoosermenu_OBJECTS) $(testrecentchoosermenu_DEPENDENCIES) - @rm -f testrecentchoosermenu$(EXEEXT) -- $(LINK) $(testrecentchoosermenu_LDFLAGS) $(testrecentchoosermenu_OBJECTS) $(testrecentchoosermenu_LDADD) $(LIBS) -+ $(LINK) $(testrecentchoosermenu_OBJECTS) $(testrecentchoosermenu_LDADD) $(LIBS) - testrgb$(EXEEXT): $(testrgb_OBJECTS) $(testrgb_DEPENDENCIES) - @rm -f testrgb$(EXEEXT) -- $(LINK) $(testrgb_LDFLAGS) $(testrgb_OBJECTS) $(testrgb_LDADD) $(LIBS) -+ $(LINK) $(testrgb_OBJECTS) $(testrgb_LDADD) $(LIBS) - testrichtext$(EXEEXT): $(testrichtext_OBJECTS) $(testrichtext_DEPENDENCIES) - @rm -f testrichtext$(EXEEXT) -- $(LINK) $(testrichtext_LDFLAGS) $(testrichtext_OBJECTS) $(testrichtext_LDADD) $(LIBS) -+ $(LINK) $(testrichtext_OBJECTS) $(testrichtext_LDADD) $(LIBS) - testselection$(EXEEXT): $(testselection_OBJECTS) $(testselection_DEPENDENCIES) - @rm -f testselection$(EXEEXT) -- $(LINK) $(testselection_LDFLAGS) $(testselection_OBJECTS) $(testselection_LDADD) $(LIBS) -+ $(LINK) $(testselection_OBJECTS) $(testselection_LDADD) $(LIBS) - testsocket$(EXEEXT): $(testsocket_OBJECTS) $(testsocket_DEPENDENCIES) - @rm -f testsocket$(EXEEXT) -- $(LINK) $(testsocket_LDFLAGS) $(testsocket_OBJECTS) $(testsocket_LDADD) $(LIBS) -+ $(LINK) $(testsocket_OBJECTS) $(testsocket_LDADD) $(LIBS) - testsocket_child$(EXEEXT): $(testsocket_child_OBJECTS) $(testsocket_child_DEPENDENCIES) - @rm -f testsocket_child$(EXEEXT) -- $(LINK) $(testsocket_child_LDFLAGS) $(testsocket_child_OBJECTS) $(testsocket_child_LDADD) $(LIBS) -+ $(LINK) $(testsocket_child_OBJECTS) $(testsocket_child_LDADD) $(LIBS) - testspinbutton$(EXEEXT): $(testspinbutton_OBJECTS) $(testspinbutton_DEPENDENCIES) - @rm -f testspinbutton$(EXEEXT) -- $(LINK) $(testspinbutton_LDFLAGS) $(testspinbutton_OBJECTS) $(testspinbutton_LDADD) $(LIBS) -+ $(LINK) $(testspinbutton_OBJECTS) $(testspinbutton_LDADD) $(LIBS) - teststatusicon$(EXEEXT): $(teststatusicon_OBJECTS) $(teststatusicon_DEPENDENCIES) - @rm -f teststatusicon$(EXEEXT) -- $(LINK) $(teststatusicon_LDFLAGS) $(teststatusicon_OBJECTS) $(teststatusicon_LDADD) $(LIBS) -+ $(LINK) $(teststatusicon_OBJECTS) $(teststatusicon_LDADD) $(LIBS) - testtext$(EXEEXT): $(testtext_OBJECTS) $(testtext_DEPENDENCIES) - @rm -f testtext$(EXEEXT) -- $(LINK) $(testtext_LDFLAGS) $(testtext_OBJECTS) $(testtext_LDADD) $(LIBS) -+ $(LINK) $(testtext_OBJECTS) $(testtext_LDADD) $(LIBS) - testtoolbar$(EXEEXT): $(testtoolbar_OBJECTS) $(testtoolbar_DEPENDENCIES) - @rm -f testtoolbar$(EXEEXT) -- $(LINK) $(testtoolbar_LDFLAGS) $(testtoolbar_OBJECTS) $(testtoolbar_LDADD) $(LIBS) -+ $(LINK) $(testtoolbar_OBJECTS) $(testtoolbar_LDADD) $(LIBS) - testtooltips$(EXEEXT): $(testtooltips_OBJECTS) $(testtooltips_DEPENDENCIES) - @rm -f testtooltips$(EXEEXT) -- $(LINK) $(testtooltips_LDFLAGS) $(testtooltips_OBJECTS) $(testtooltips_LDADD) $(LIBS) -+ $(LINK) $(testtooltips_OBJECTS) $(testtooltips_LDADD) $(LIBS) - testtreecolumns$(EXEEXT): $(testtreecolumns_OBJECTS) $(testtreecolumns_DEPENDENCIES) - @rm -f testtreecolumns$(EXEEXT) -- $(LINK) $(testtreecolumns_LDFLAGS) $(testtreecolumns_OBJECTS) $(testtreecolumns_LDADD) $(LIBS) -+ $(LINK) $(testtreecolumns_OBJECTS) $(testtreecolumns_LDADD) $(LIBS) - testtreecolumnsizing$(EXEEXT): $(testtreecolumnsizing_OBJECTS) $(testtreecolumnsizing_DEPENDENCIES) - @rm -f testtreecolumnsizing$(EXEEXT) -- $(LINK) $(testtreecolumnsizing_LDFLAGS) $(testtreecolumnsizing_OBJECTS) $(testtreecolumnsizing_LDADD) $(LIBS) -+ $(LINK) $(testtreecolumnsizing_OBJECTS) $(testtreecolumnsizing_LDADD) $(LIBS) - testtreeedit$(EXEEXT): $(testtreeedit_OBJECTS) $(testtreeedit_DEPENDENCIES) - @rm -f testtreeedit$(EXEEXT) -- $(LINK) $(testtreeedit_LDFLAGS) $(testtreeedit_OBJECTS) $(testtreeedit_LDADD) $(LIBS) -+ $(LINK) $(testtreeedit_OBJECTS) $(testtreeedit_LDADD) $(LIBS) - testtreeflow$(EXEEXT): $(testtreeflow_OBJECTS) $(testtreeflow_DEPENDENCIES) - @rm -f testtreeflow$(EXEEXT) -- $(LINK) $(testtreeflow_LDFLAGS) $(testtreeflow_OBJECTS) $(testtreeflow_LDADD) $(LIBS) -+ $(LINK) $(testtreeflow_OBJECTS) $(testtreeflow_LDADD) $(LIBS) - testtreefocus$(EXEEXT): $(testtreefocus_OBJECTS) $(testtreefocus_DEPENDENCIES) - @rm -f testtreefocus$(EXEEXT) -- $(LINK) $(testtreefocus_LDFLAGS) $(testtreefocus_OBJECTS) $(testtreefocus_LDADD) $(LIBS) -+ $(LINK) $(testtreefocus_OBJECTS) $(testtreefocus_LDADD) $(LIBS) - testtreemodel$(EXEEXT): $(testtreemodel_OBJECTS) $(testtreemodel_DEPENDENCIES) - @rm -f testtreemodel$(EXEEXT) -- $(LINK) $(testtreemodel_LDFLAGS) $(testtreemodel_OBJECTS) $(testtreemodel_LDADD) $(LIBS) -+ $(LINK) $(testtreemodel_OBJECTS) $(testtreemodel_LDADD) $(LIBS) - testtreesort$(EXEEXT): $(testtreesort_OBJECTS) $(testtreesort_DEPENDENCIES) - @rm -f testtreesort$(EXEEXT) -- $(LINK) $(testtreesort_LDFLAGS) $(testtreesort_OBJECTS) $(testtreesort_LDADD) $(LIBS) -+ $(LINK) $(testtreesort_OBJECTS) $(testtreesort_LDADD) $(LIBS) - testtreeview$(EXEEXT): $(testtreeview_OBJECTS) $(testtreeview_DEPENDENCIES) - @rm -f testtreeview$(EXEEXT) -- $(LINK) $(testtreeview_LDFLAGS) $(testtreeview_OBJECTS) $(testtreeview_LDADD) $(LIBS) -+ $(LINK) $(testtreeview_OBJECTS) $(testtreeview_LDADD) $(LIBS) - testvolumebutton$(EXEEXT): $(testvolumebutton_OBJECTS) $(testvolumebutton_DEPENDENCIES) - @rm -f testvolumebutton$(EXEEXT) -- $(LINK) $(testvolumebutton_LDFLAGS) $(testvolumebutton_OBJECTS) $(testvolumebutton_LDADD) $(LIBS) -+ $(LINK) $(testvolumebutton_OBJECTS) $(testvolumebutton_LDADD) $(LIBS) - testxinerama$(EXEEXT): $(testxinerama_OBJECTS) $(testxinerama_DEPENDENCIES) - @rm -f testxinerama$(EXEEXT) -- $(LINK) $(testxinerama_LDFLAGS) $(testxinerama_OBJECTS) $(testxinerama_LDADD) $(LIBS) -+ $(LINK) $(testxinerama_OBJECTS) $(testxinerama_LDADD) $(LIBS) - treestoretest$(EXEEXT): $(treestoretest_OBJECTS) $(treestoretest_DEPENDENCIES) - @rm -f treestoretest$(EXEEXT) -- $(LINK) $(treestoretest_LDFLAGS) $(treestoretest_OBJECTS) $(treestoretest_LDADD) $(LIBS) -+ $(LINK) $(treestoretest_OBJECTS) $(treestoretest_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) core *.core -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c -@@ -1601,130 +1083,76 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treestoretest.Po@am__quote@ - - .c.o: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: --@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCC_TRUE@ fi -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - .cc.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCXX_TRUE@ fi -+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - - .cc.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ --@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCXX_TRUE@ fi -+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - - .cc.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ --@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ --@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ --@am__fastdepCXX_TRUE@ fi -+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - - autotestkeywords-autotestkeywords.o: autotestkeywords.cc --@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -MT autotestkeywords-autotestkeywords.o -MD -MP -MF "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" \ --@am__fastdepCXX_TRUE@ -c -o autotestkeywords-autotestkeywords.o `test -f 'autotestkeywords.cc' || echo '$(srcdir)/'`autotestkeywords.cc; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" "$(DEPDIR)/autotestkeywords-autotestkeywords.Po"; \ --@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo"; exit 1; \ --@am__fastdepCXX_TRUE@ fi -+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -MT autotestkeywords-autotestkeywords.o -MD -MP -MF $(DEPDIR)/autotestkeywords-autotestkeywords.Tpo -c -o autotestkeywords-autotestkeywords.o `test -f 'autotestkeywords.cc' || echo '$(srcdir)/'`autotestkeywords.cc -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/autotestkeywords-autotestkeywords.Tpo $(DEPDIR)/autotestkeywords-autotestkeywords.Po - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='autotestkeywords.cc' object='autotestkeywords-autotestkeywords.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/autotestkeywords-autotestkeywords.Po' tmpdepfile='$(DEPDIR)/autotestkeywords-autotestkeywords.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -c -o autotestkeywords-autotestkeywords.o `test -f 'autotestkeywords.cc' || echo '$(srcdir)/'`autotestkeywords.cc - - autotestkeywords-autotestkeywords.obj: autotestkeywords.cc --@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -MT autotestkeywords-autotestkeywords.obj -MD -MP -MF "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" \ --@am__fastdepCXX_TRUE@ -c -o autotestkeywords-autotestkeywords.obj `if test -f 'autotestkeywords.cc'; then $(CYGPATH_W) 'autotestkeywords.cc'; else $(CYGPATH_W) '$(srcdir)/autotestkeywords.cc'; fi`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" "$(DEPDIR)/autotestkeywords-autotestkeywords.Po"; \ --@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo"; exit 1; \ --@am__fastdepCXX_TRUE@ fi -+@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -MT autotestkeywords-autotestkeywords.obj -MD -MP -MF $(DEPDIR)/autotestkeywords-autotestkeywords.Tpo -c -o autotestkeywords-autotestkeywords.obj `if test -f 'autotestkeywords.cc'; then $(CYGPATH_W) 'autotestkeywords.cc'; else $(CYGPATH_W) '$(srcdir)/autotestkeywords.cc'; fi` -+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/autotestkeywords-autotestkeywords.Tpo $(DEPDIR)/autotestkeywords-autotestkeywords.Po - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='autotestkeywords.cc' object='autotestkeywords-autotestkeywords.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/autotestkeywords-autotestkeywords.Po' tmpdepfile='$(DEPDIR)/autotestkeywords-autotestkeywords.TPo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -c -o autotestkeywords-autotestkeywords.obj `if test -f 'autotestkeywords.cc'; then $(CYGPATH_W) 'autotestkeywords.cc'; else $(CYGPATH_W) '$(srcdir)/autotestkeywords.cc'; fi` - --autotestkeywords-autotestkeywords.lo: autotestkeywords.cc --@am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -MT autotestkeywords-autotestkeywords.lo -MD -MP -MF "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" \ --@am__fastdepCXX_TRUE@ -c -o autotestkeywords-autotestkeywords.lo `test -f 'autotestkeywords.cc' || echo '$(srcdir)/'`autotestkeywords.cc; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" "$(DEPDIR)/autotestkeywords-autotestkeywords.Plo"; \ --@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo"; exit 1; \ --@am__fastdepCXX_TRUE@ fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='autotestkeywords.cc' object='autotestkeywords-autotestkeywords.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/autotestkeywords-autotestkeywords.Plo' tmpdepfile='$(DEPDIR)/autotestkeywords-autotestkeywords.TPlo' @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -c -o autotestkeywords-autotestkeywords.lo `test -f 'autotestkeywords.cc' || echo '$(srcdir)/'`autotestkeywords.cc -- - mostlyclean-libtool: - -rm -f *.lo - - clean-libtool: - -rm -rf .libs _libs - --distclean-libtool: -- -rm -f libtool --uninstall-info-am: -- --ETAGS = etags --ETAGSFLAGS = -- --CTAGS = ctags --CTAGSFLAGS = -- --tags: TAGS -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -+tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -1734,23 +1162,23 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)$$tags$$unique" \ -- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique -- -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -- here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -1764,9 +1192,9 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - check-TESTS: $(TESTS) -- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ -+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ - srcdir=$(srcdir); export srcdir; \ -- list='$(TESTS)'; \ -+ list=' $(TESTS) '; \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ -@@ -1775,25 +1203,25 @@ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xpass=`expr $$xpass + 1`; \ -- failed=`expr $$failed + 1`; \ -- echo "XPASS: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xpass=`expr $$xpass + 1`; \ -+ failed=`expr $$failed + 1`; \ -+ echo "XPASS: $$tst"; \ - ;; \ - *) \ -- echo "PASS: $$tst"; \ -+ echo "PASS: $$tst"; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ -- *" $$tst "*) \ -- xfail=`expr $$xfail + 1`; \ -- echo "XFAIL: $$tst"; \ -+ *$$ws$$tst$$ws*) \ -+ xfail=`expr $$xfail + 1`; \ -+ echo "XFAIL: $$tst"; \ - ;; \ - *) \ -- failed=`expr $$failed + 1`; \ -- echo "FAIL: $$tst"; \ -+ failed=`expr $$failed + 1`; \ -+ echo "FAIL: $$tst"; \ - ;; \ - esac; \ - else \ -@@ -1818,46 +1246,40 @@ - skipped=""; \ - if test "$$skip" -ne 0; then \ - skipped="($$skip tests were not run)"; \ -- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ -- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ -+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ -- test -n "$$skipped" && echo "$$skipped"; \ -- test -n "$$report" && echo "$$report"; \ -+ test -z "$$skipped" || echo "$$skipped"; \ -+ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0; \ - else :; fi --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -- --top_distdir = .. --distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) -- $(mkinstalldirs) $(distdir)/.. $(distdir)/file-chooser-test-dir -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkinstalldirs) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ - if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -@@ -1872,7 +1294,6 @@ - $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local - check: check-am - all-am: Makefile $(PROGRAMS) -- - installdirs: - install: install-am - install-exec: install-exec-am -@@ -1893,7 +1314,7 @@ - clean-generic: - - distclean-generic: -- -rm -f $(CONFIG_CLEAN_FILES) -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -1907,24 +1328,34 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -+ distclean-tags - - dvi: dvi-am - - dvi-am: - -+html: html-am -+ - info: info-am - - info-am: - - install-data-am: - -+install-dvi: install-dvi-am -+ - install-exec-am: - -+install-html: install-html-am -+ - install-info: install-info-am - - install-man: - -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -1945,18 +1376,23 @@ - - ps-am: - --uninstall-am: uninstall-info-am -+uninstall-am: -+ -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ - clean clean-generic clean-libtool clean-noinstPROGRAMS ctags \ -- distclean distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am info info-am install \ -- install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am install-man \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ -- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am - - # call as: $(XVFB_START) && someprogram - From f908335c05afe36c31ca65e3ef5393e479bcf786 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Tue, 4 Nov 2008 21:53:50 +0000 Subject: [PATCH 06/29] new patch to fix linking with libjasper --- debian/changelog | 2 ++ debian/patches/071_jasper_link_fix.patch | 32 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 35 insertions(+) create mode 100644 debian/patches/071_jasper_link_fix.patch diff --git a/debian/changelog b/debian/changelog index 0eed765980..a7d7e28c7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ gtk+2.0 (2.14.4-1) UNRELEASED; urgency=low JPEG2000 * debian/patches/092_fix_printtest_include.patch: - new patch, to fix build problem in print test + * debian/patches/071_jasper_link_fix.patch: + - make gdk-pixbuf-csource link correctly with libjasper * debian/rules: - FIXME: do not build directfb for now; we need a newer libdirectfb-dev diff --git a/debian/patches/071_jasper_link_fix.patch b/debian/patches/071_jasper_link_fix.patch new file mode 100644 index 0000000000..a337af3c06 --- /dev/null +++ b/debian/patches/071_jasper_link_fix.patch @@ -0,0 +1,32 @@ +diff -urN gtk+-2.14.4.old/configure gtk+-2.14.4/configure +--- gtk+-2.14.4.old/configure 2008-11-04 17:41:20.000000000 -0200 ++++ gtk+-2.14.4/configure 2008-11-04 17:45:07.000000000 -0200 +@@ -29356,8 +29356,11 @@ + if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then + STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" + fi ++ if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER" ++ fi + else +- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG" ++ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" + fi + + # Checks to see whether we should include mediaLib +diff -urN gtk+-2.14.4.old/configure.in gtk+-2.14.4/configure.in +--- gtk+-2.14.4.old/configure.in 2008-10-17 01:06:38.000000000 -0300 ++++ gtk+-2.14.4/configure.in 2008-11-04 17:44:57.000000000 -0200 +@@ -1163,8 +1163,11 @@ + if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then + STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" + fi ++ if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then ++ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER" ++ fi + else +- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG" ++ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER" + fi + + # Checks to see whether we should include mediaLib diff --git a/debian/patches/series b/debian/patches/series index 3195207b3c..050dfbb712 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,5 +18,6 @@ 042_treeview_single-focus.patch 060_ignore-random-icons.patch 070_mandatory-relibtoolize.patch +071_jasper_link_fix.patch 091_workaround_no_gtk_init_incorrect_display.patch 092_fix_printtest_include.patch From fbcaa4828d5901f8e5ed5ff99d5019442a4d02f5 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 4 Nov 2008 22:21:15 +0000 Subject: [PATCH 07/29] * Update build-dependencies for the new version: - libglib2.0-dev >= 2.17.6 - libpango1.0-dev >= 1.20 - libatk1.0-dev >= 1.13.0 - libcairo2-dev >= 1.6.0 --- debian/changelog | 7 +++++++ debian/control | 10 +++++----- debian/control.in | 10 +++++----- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index a7d7e28c7c..5294b1363c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,13 @@ gtk+2.0 (2.14.4-1) UNRELEASED; urgency=low gtk-builder-convert to work and might be relied upon by packages bdeping on libgtk2.0-dev. + [ Emilio Pozuelo Monfort ] + * Update build-dependencies for the new version: + - libglib2.0-dev >= 2.17.6 + - libpango1.0-dev >= 1.20 + - libatk1.0-dev >= 1.13.0 + - libcairo2-dev >= 1.6.0 + -- Gustavo Noronha Silva Wed, 24 Sep 2008 21:38:58 -0300 gtk+2.0 (2.12.11-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 08dc779ec4..96858a4d3f 100644 --- a/debian/control +++ b/debian/control @@ -6,9 +6,9 @@ Uploaders: Debian GNOME Maintainers = 5.0.22), gettext, pkg-config, - libglib2.0-dev (>= 2.13.5), - libpango1.0-dev (>= 1.17.3), - libatk1.0-dev (>= 1.9.0), + libglib2.0-dev (>= 2.17.6), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxi-dev (>= 1:1.0.1-4), @@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 5.0.22), libxkbfile-dev, libxinerama-dev (>= 1:1.0.1-4.1), libxfixes-dev (>= 1:3.0.0-3), - libcairo2-dev (>= 1.2.0), + libcairo2-dev (>= 1.6.0), libcairo-directfb2-dev (>= 1.2.4-4), libtiff4-dev, libjpeg62-dev, @@ -35,7 +35,7 @@ Build-Depends: debhelper (>= 5.0.22), libdirectfb-dev (>= 0.9.26), libcups2-dev (>= 1.2), quilt -Build-Depends-Indep: gtk-doc-tools (>= 1.6), +Build-Depends-Indep: gtk-doc-tools (>= 1.8), docbook-xml Standards-Version: 3.8.0 diff --git a/debian/control.in b/debian/control.in index cc185f15c7..0dc70b1a5a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,9 +6,9 @@ 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), + libglib2.0-dev (>= 2.17.6), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxi-dev (>= 1:1.0.1-4), @@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 5.0.22), libxkbfile-dev, libxinerama-dev (>= 1:1.0.1-4.1), libxfixes-dev (>= 1:3.0.0-3), - libcairo2-dev (>= 1.2.0), + libcairo2-dev (>= 1.6.0), libcairo-directfb2-dev (>= 1.2.4-4), libtiff4-dev, libjpeg62-dev, @@ -35,7 +35,7 @@ Build-Depends: debhelper (>= 5.0.22), libdirectfb-dev (>= 0.9.26), libcups2-dev (>= 1.2), quilt -Build-Depends-Indep: gtk-doc-tools (>= 1.6), +Build-Depends-Indep: gtk-doc-tools (>= 1.8), docbook-xml Standards-Version: 3.8.0 From c34c8604f1aa737b08714b60461ddc01e28ae5c0 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Wed, 5 Nov 2008 00:06:21 +0000 Subject: [PATCH 08/29] reenable directfb, also adopting the recent changes done to libcairo2-dev's way of installing directfb-related files --- debian/changelog | 9 +- debian/control | 8 +- debian/control.in | 8 +- .../071_correct_directfb_declarations.patch | 300 ++++++++++++++++++ .../072_workaround_directfb_build.patch | 20 ++ debian/patches/series | 2 + debian/rules | 7 +- 7 files changed, 337 insertions(+), 17 deletions(-) create mode 100644 debian/patches/071_correct_directfb_declarations.patch create mode 100644 debian/patches/072_workaround_directfb_build.patch diff --git a/debian/changelog b/debian/changelog index 5294b1363c..d4ba1820ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ gtk+2.0 (2.14.4-1) UNRELEASED; urgency=low debian/patches/020_immodules-files-d.patch, debian/patches/021_loader-files-d.patch, - update borrowed from Ubuntu's package + * debian/patches/071_correct_directfb_declarations.patch, + debian/patches/072_workaround_directfb_build.patch: + - borrowed from ubuntu * debian/patches/033_treeview_resizing.patch, debian/patches/095_gtk-im-module-setting.patch: - removed; fixed upstream @@ -21,8 +24,10 @@ gtk+2.0 (2.14.4-1) UNRELEASED; urgency=low - new patch, to fix build problem in print test * debian/patches/071_jasper_link_fix.patch: - make gdk-pixbuf-csource link correctly with libjasper - * debian/rules: - - FIXME: do not build directfb for now; we need a newer libdirectfb-dev + * debian/rules, debian/control: + - newer libcairo2-dev contains everything needed to build the directfb + target, so disable building with the dummy libcairo-directfb2-dev + - this makes us have to build depend on libcairo2-dev >= 1.6.4-6.1 [ Loic Minier ] * Let libgtk2.0-dev recommend debhelper for dh_gtkmodules. diff --git a/debian/control b/debian/control index 96858a4d3f..f3e935332e 100644 --- a/debian/control +++ b/debian/control @@ -22,8 +22,7 @@ Build-Depends: debhelper (>= 5.0.22), libxkbfile-dev, libxinerama-dev (>= 1:1.0.1-4.1), libxfixes-dev (>= 1:3.0.0-3), - libcairo2-dev (>= 1.6.0), - libcairo-directfb2-dev (>= 1.2.4-4), + libcairo2-dev (>= 1.6.4-6.1), libtiff4-dev, libjpeg62-dev, libjasper-dev, @@ -191,7 +190,7 @@ Depends: libgtk2.0-0 (= ${binary:Version}), libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), - libcairo2-dev, + libcairo2-dev (>= 1.6.4-6.1), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxinerama-dev (>= 1:1.0.1-4.1), @@ -225,8 +224,7 @@ Depends: libgtk-directfb-2.0-0 (= ${binary:Version}), ${misc:Depends}, libgtk2.0-dev (= ${binary:Version}), libgtk2.0-common, - libcairo-directfb2-dev, - libcairo2-dev (>= 1.2.0) + libcairo2-dev (>= 1.6.4-6.1) 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 diff --git a/debian/control.in b/debian/control.in index 0dc70b1a5a..a0e61927dd 100644 --- a/debian/control.in +++ b/debian/control.in @@ -22,8 +22,7 @@ Build-Depends: debhelper (>= 5.0.22), libxkbfile-dev, libxinerama-dev (>= 1:1.0.1-4.1), libxfixes-dev (>= 1:3.0.0-3), - libcairo2-dev (>= 1.6.0), - libcairo-directfb2-dev (>= 1.2.4-4), + libcairo2-dev (>= 1.6.4-6.1), libtiff4-dev, libjpeg62-dev, libjasper-dev, @@ -191,7 +190,7 @@ Depends: @SHARED_PKG@ (= ${binary:Version}), libglib2.0-dev (>= 2.12.0), libpango1.0-dev (>= 1.10.0-2), libatk1.0-dev (>= 1.6.1-2), - libcairo2-dev, + libcairo2-dev (>= 1.6.4-6.1), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), libxinerama-dev (>= 1:1.0.1-4.1), @@ -225,8 +224,7 @@ Depends: @DIRECTFB_PKG@ (= ${binary:Version}), ${misc:Depends}, @DEV_PKG@ (= ${binary:Version}), @COMMON_PKG@, - libcairo-directfb2-dev, - libcairo2-dev (>= 1.2.0) + libcairo2-dev (>= 1.6.4-6.1) 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 diff --git a/debian/patches/071_correct_directfb_declarations.patch b/debian/patches/071_correct_directfb_declarations.patch new file mode 100644 index 0000000000..3cf2379248 --- /dev/null +++ b/debian/patches/071_correct_directfb_declarations.patch @@ -0,0 +1,300 @@ +Index: gtk+2.0-2.14.0/gdk/directfb/gdkgeometry-directfb.c +=================================================================== +--- gtk+2.0-2.14.0.orig/gdk/directfb/gdkgeometry-directfb.c 2008-09-04 06:36:10.000000000 +0200 ++++ gtk+2.0-2.14.0/gdk/directfb/gdkgeometry-directfb.c 2008-09-05 00:36:42.000000000 +0200 +@@ -69,7 +69,7 @@ + * brings in from offscreen areas are invalidated. + **/ + void +-gdk_window_scroll (GdkWindow *window, ++_gdk_directfb_window_scroll (GdkWindow *window, + gint dx, + gint dy) + { +@@ -161,7 +161,7 @@ + * Since: 2.8 + **/ + void +-gdk_window_move_region (GdkWindow *window, ++_gdk_directfb_window_move_region (GdkWindow *window, + const GdkRegion *region, + gint dx, + gint dy) +Index: gtk+2.0-2.14.0/gdk/directfb/gdkwindow-directfb.c +=================================================================== +--- gtk+2.0-2.14.0.orig/gdk/directfb/gdkwindow-directfb.c 2008-09-04 06:36:10.000000000 +0200 ++++ gtk+2.0-2.14.0/gdk/directfb/gdkwindow-directfb.c 2008-09-05 00:36:42.000000000 +0200 +@@ -33,6 +33,7 @@ + + #include "config.h" + #include "gdk.h" ++#include "gdkwindowimpl.h" + #include "gdkwindow.h" + + #include "gdkdirectfb.h" +@@ -67,6 +68,8 @@ + static void gdk_window_impl_directfb_class_init (GdkWindowImplDirectFBClass *klass); + static void gdk_window_impl_directfb_finalize (GObject *object); + ++static void gdk_window_impl_iface_init (GdkWindowImplIface *iface); ++ + typedef struct + { + GdkWindowChildChanged changed; +@@ -220,6 +223,13 @@ + NULL + }; + ++ const GInterfaceInfo window_impl_info = ++ { ++ (GInterfaceInitFunc) gdk_window_impl_iface_init, ++ NULL, ++ NULL ++ }; ++ + object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_DIRECTFB, + "GdkWindowImplDirectFB", + &object_info, 0); +@@ -227,6 +237,9 @@ + GDK_TYPE_PAINTABLE, + &paintable_info); + ++ g_type_add_interface_static (object_type, ++ GDK_TYPE_WINDOW_IMPL, ++ &window_impl_info); + } + + return object_type; +@@ -406,6 +419,7 @@ + + _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL); + private = GDK_WINDOW_OBJECT (_gdk_parent_root); ++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL); + impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); + + private->window_type = GDK_WINDOW_ROOT; +@@ -1231,7 +1245,7 @@ + } + + void +-gdk_window_show_unraised (GdkWindow *window) ++gdk_directfb_window_show_unraised (GdkWindow *window) + { + g_return_if_fail (GDK_IS_WINDOW (window)); + +@@ -1241,7 +1255,7 @@ + } + + void +-gdk_window_show (GdkWindow *window) ++gdk_directfb_window_show (GdkWindow *window) + { + g_return_if_fail (GDK_IS_WINDOW (window)); + +@@ -1251,7 +1265,7 @@ + } + + void +-gdk_window_hide (GdkWindow *window) ++gdk_directfb_window_hide (GdkWindow *window) + { + GdkWindowObject *private; + GdkWindowImplDirectFB *impl; +@@ -1300,7 +1314,7 @@ + } + + void +-gdk_window_withdraw (GdkWindow *window) ++gdk_directfb_window_withdraw (GdkWindow *window) + { + g_return_if_fail (GDK_IS_WINDOW (window)); + +@@ -1309,7 +1323,7 @@ + } + + void +-gdk_window_move (GdkWindow *window, ++gdk_directfb_window_move (GdkWindow *window, + gint x, + gint y) + { +@@ -1354,7 +1368,7 @@ + } + + void +-gdk_window_resize (GdkWindow *window, ++gdk_directfb_window_resize (GdkWindow *window, + gint width, + gint height) + { +@@ -1440,7 +1454,7 @@ + } + + void +-gdk_window_move_resize (GdkWindow *window, ++gdk_directfb_window_move_resize (GdkWindow *window, + gint x, + gint y, + gint width, +@@ -1511,7 +1525,7 @@ + } + + void +-_gdk_window_reparent (GdkWindow *window, ++gdk_directfb_window_reparent (GdkWindow *window, + GdkWindow *new_parent, + gint x, + gint y) +@@ -1744,7 +1758,7 @@ + } + + void +-gdk_window_raise (GdkWindow *window) ++gdk_window_directfb_raise (GdkWindow *window) + { + GdkWindowImplDirectFB *impl; + +@@ -1775,7 +1789,7 @@ + } + + void +-gdk_window_lower (GdkWindow *window) ++gdk_window_directfb_lower (GdkWindow *window) + { + GdkWindowImplDirectFB *impl; + +@@ -1908,7 +1922,7 @@ + } + + void +-gdk_window_set_background (GdkWindow *window, ++gdk_directfb_window_set_background (GdkWindow *window, + const GdkColor *color) + { + GdkWindowObject *private; +@@ -1931,7 +1945,7 @@ + } + + void +-gdk_window_set_back_pixmap (GdkWindow *window, ++gdk_directfb_window_set_back_pixmap (GdkWindow *window, + GdkPixmap *pixmap, + gint parent_relative) + { +@@ -1973,7 +1987,7 @@ + } + + void +-gdk_window_set_cursor (GdkWindow *window, ++gdk_directfb_window_set_cursor (GdkWindow *window, + GdkCursor *cursor) + { + GdkWindowImplDirectFB *impl; +@@ -2012,7 +2026,7 @@ + } + + void +-gdk_window_get_geometry (GdkWindow *window, ++gdk_directfb_window_get_geometry (GdkWindow *window, + gint *x, + gint *y, + gint *width, +@@ -2079,7 +2093,7 @@ + } + + gboolean +-gdk_window_get_origin (GdkWindow *window, ++gdk_directfb_window_get_origin (GdkWindow *window, + gint *x, + gint *y) + { +@@ -2216,7 +2230,7 @@ + } + + GdkEventMask +-gdk_window_get_events (GdkWindow *window) ++gdk_directfb_window_get_events (GdkWindow *window) + { + g_return_val_if_fail (GDK_IS_WINDOW (window), 0); + +@@ -2227,7 +2241,7 @@ + } + + void +-gdk_window_set_events (GdkWindow *window, ++gdk_directfb_window_set_events (GdkWindow *window, + GdkEventMask event_mask) + { + g_return_if_fail (GDK_IS_WINDOW (window)); +@@ -2241,7 +2255,7 @@ + } + + void +-gdk_window_shape_combine_mask (GdkWindow *window, ++gdk_directfb_window_shape_combine_mask (GdkWindow *window, + GdkBitmap *mask, + gint x, + gint y) +@@ -2257,7 +2271,7 @@ + } + + void +-gdk_window_shape_combine_region (GdkWindow *window, ++gdk_directfb_window_shape_combine_region (GdkWindow *window, + const GdkRegion *shape_region, + gint offset_x, + gint offset_y) +@@ -2585,12 +2599,12 @@ + } + + void +-gdk_window_set_child_shapes (GdkWindow *window) ++gdk_directfb_window_set_child_shapes (GdkWindow *window) + { + } + + void +-gdk_window_merge_child_shapes (GdkWindow *window) ++gdk_directfb_window_merge_child_shapes (GdkWindow *window) + { + } + +@@ -2605,7 +2619,7 @@ + } + + gboolean +-gdk_window_set_static_gravities (GdkWindow *window, ++gdk_directfb_window_set_static_gravities (GdkWindow *window, + gboolean use_static) + { + g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); +@@ -3281,6 +3295,29 @@ + { + } + ++static void ++gdk_window_impl_iface_init (GdkWindowImplIface *iface) ++{ ++ iface->show = gdk_directfb_window_show; ++ iface->hide = gdk_directfb_window_hide; ++ iface->withdraw = gdk_directfb_window_withdraw; ++ iface->set_events = gdk_directfb_window_set_events; ++ iface->get_events = gdk_directfb_window_get_events; ++ iface->raise = gdk_window_directfb_raise; ++ iface->lower = gdk_window_directfb_lower; ++ iface->move_resize = gdk_directfb_window_move_resize; ++ iface->set_background = gdk_directfb_window_set_background; ++ iface->set_back_pixmap = gdk_directfb_window_set_back_pixmap; ++ iface->reparent = gdk_directfb_window_reparent; ++ iface->set_cursor = gdk_directfb_window_set_cursor; ++ iface->get_geometry = gdk_directfb_window_get_geometry; ++ iface->get_origin = gdk_directfb_window_get_origin; ++ iface->shape_combine_mask = gdk_directfb_window_shape_combine_mask; ++ iface->shape_combine_region = gdk_directfb_window_shape_combine_region; ++ iface->set_child_shapes = gdk_directfb_window_set_child_shapes; ++ iface->merge_child_shapes = gdk_directfb_window_merge_child_shapes; ++ iface->set_static_gravities = gdk_directfb_window_set_static_gravities; ++} + + #define __GDK_WINDOW_X11_C__ + #include "gdkaliasdef.c" diff --git a/debian/patches/072_workaround_directfb_build.patch b/debian/patches/072_workaround_directfb_build.patch new file mode 100644 index 0000000000..71ee8f9634 --- /dev/null +++ b/debian/patches/072_workaround_directfb_build.patch @@ -0,0 +1,20 @@ +Index: gtk+2.0-2.14.0/gdk/directfb/gdktestutils-directfb.c +=================================================================== +--- gtk+2.0-2.14.0.orig/gdk/directfb/gdktestutils-directfb.c 2008-09-04 06:36:10.000000000 +0200 ++++ gtk+2.0-2.14.0/gdk/directfb/gdktestutils-directfb.c 2008-09-05 00:36:44.000000000 +0200 +@@ -175,7 +175,6 @@ + + evt.clazz = DFEC_WINDOW; + evt.type = (key_pressrelease == GDK_KEY_PRESS) ? DWET_KEYDOWN : DWET_KEYUP; +- evt.flags = DWEF_NONE; + evt.window_id = impl->dfb_id; + evt.x = MAX(x, 0); + evt.y = MAX(y, 0); +@@ -241,7 +240,6 @@ + + evt.clazz = DFEC_WINDOW; + evt.type = (button_pressrelease == GDK_BUTTON_PRESS) ? DWET_BUTTONDOWN : DWET_BUTTONUP; +- evt.flags = DWEF_NONE; + evt.window_id = impl->dfb_id; + evt.x = MAX(x, 0); + evt.y = MAX(y, 0); diff --git a/debian/patches/series b/debian/patches/series index 050dfbb712..c2360fb6fa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,5 +19,7 @@ 060_ignore-random-icons.patch 070_mandatory-relibtoolize.patch 071_jasper_link_fix.patch +071_correct_directfb_declarations.patch +072_workaround_directfb_build.patch 091_workaround_no_gtk_init_incorrect_display.patch 092_fix_printtest_include.patch diff --git a/debian/rules b/debian/rules index 840da4ac9e..21e8a17751 100644 --- a/debian/rules +++ b/debian/rules @@ -75,9 +75,7 @@ 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 -# FIXME: readd directfb as soon as libdirectfb-dev is updated to the 1.2.x -# series -FLAVORS := shared static +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 @@ -342,8 +340,7 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK 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/$(LIBDIR)/libcairo-directfb/lib/ + dh_shlibdeps -rm -f debian/shlibs.local dh_gencontrol -s dh_md5sums -s From fa960afb7c3d62f75412552b10615c2dcbb66de4 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Wed, 5 Nov 2008 12:48:15 +0000 Subject: [PATCH 09/29] replace/conflict with gail --- debian/changelog | 2 ++ debian/control | 22 +++++++++++++++------- debian/control.in | 22 +++++++++++++++------- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index d4ba1820ff..ee4e00413a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ gtk+2.0 (2.14.4-1) UNRELEASED; urgency=low * debian/control.in: - added libjasper-dev to the Build-Depends, as GTK+ now supports JPEG2000 + - make GTK+ packages conflict/replace with gail ones, since they are now + included in GTK+ * debian/patches/092_fix_printtest_include.patch: - new patch, to fix build problem in print test * debian/patches/071_jasper_link_fix.patch: diff --git a/debian/control b/debian/control index f3e935332e..222b046811 100644 --- a/debian/control +++ b/debian/control @@ -52,6 +52,7 @@ Conflicts: libgtk2.0-0png3, gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<= 2.14.1-3), + libgail18, gtk2.0-examples (<< 2.2.0), libgdkxft0, openoffice.org-core (<< 2.2.1-8), @@ -96,7 +97,8 @@ Conflicts: libgtk2.0-0png3, libeel2-2.18, xfwm4 (<< 4.4.1-3), metacity (<< 1:2.20.0-1) -Replaces: libgtk2.0-0png3 +Replaces: libgtk2.0-0png3, + libgail18 Recommends: hicolor-icon-theme, libgtk2.0-bin Suggests: librsvg2-common @@ -206,8 +208,10 @@ Recommends: python (>= 2.4), debhelper Suggests: libgtk2.0-doc Replaces: libgtk1.3-dev, - gtk2-engines-pixbuf (<< 2.8.18-5) -Conflicts: libgtk1.3-dev + gtk2-engines-pixbuf (<< 2.8.18-5), + libgail-dev +Conflicts: libgtk1.3-dev, + libgail-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 @@ -243,8 +247,10 @@ Architecture: any Depends: libgtk2.0-0 (= ${binary:Version}), libgtk2.0-common, ${misc:Depends} -Conflicts: libgtk2.0-dbg -Replaces: libgtk2.0-dbg +Conflicts: libgtk2.0-dbg, + libgail-dbg +Replaces: libgtk2.0-dbg, + libgail-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 @@ -260,8 +266,10 @@ Section: doc Architecture: all Depends: lynx | www-browser, ${misc:Depends} -Replaces: libgtk1.3-doc -Conflicts: libgtk1.3-doc +Replaces: libgtk1.3-doc, + libgail-common +Conflicts: libgtk1.3-doc, + libgail-common Recommends: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc diff --git a/debian/control.in b/debian/control.in index a0e61927dd..66f505fe2d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -52,6 +52,7 @@ Conflicts: libgtk2.0-0png3, gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<= 2.14.1-3), + libgail18, gtk2.0-examples (<< 2.2.0), libgdkxft0, openoffice.org-core (<< 2.2.1-8), @@ -96,7 +97,8 @@ Conflicts: libgtk2.0-0png3, libeel2-2.18, xfwm4 (<< 4.4.1-3), metacity (<< 1:2.20.0-1) -Replaces: libgtk2.0-0png3 +Replaces: libgtk2.0-0png3, + libgail18 Recommends: hicolor-icon-theme, @BIN_PKG@ Suggests: librsvg2-common @@ -206,8 +208,10 @@ Recommends: python (>= 2.4), debhelper Suggests: @DOC_PKG@ Replaces: libgtk1.3-dev, - gtk2-engines-pixbuf (<< 2.8.18-5) -Conflicts: libgtk1.3-dev + gtk2-engines-pixbuf (<< 2.8.18-5), + libgail-dev +Conflicts: libgtk1.3-dev, + libgail-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 @@ -243,8 +247,10 @@ Architecture: any Depends: @SHARED_PKG@ (= ${binary:Version}), @COMMON_PKG@, ${misc:Depends} -Conflicts: libgtk2.0-dbg -Replaces: libgtk2.0-dbg +Conflicts: libgtk2.0-dbg, + libgail-dbg +Replaces: libgtk2.0-dbg, + libgail-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 @@ -260,8 +266,10 @@ Section: doc Architecture: all Depends: lynx | www-browser, ${misc:Depends} -Replaces: libgtk1.3-doc -Conflicts: libgtk1.3-doc +Replaces: libgtk1.3-doc, + libgail-common +Conflicts: libgtk1.3-doc, + libgail-common Recommends: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc From cab0124626aaa8687027169a574733d3895f3e5e Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Wed, 5 Nov 2008 16:50:01 +0000 Subject: [PATCH 10/29] upload to experimental --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ee4e00413a..c23e68e727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gtk+2.0 (2.14.4-1) UNRELEASED; urgency=low +gtk+2.0 (2.14.4-1) experimental; urgency=low [ Gustavo Noronha Silva ] * New upstream release From 4ba1bd90ab733b99bfddfaa85db9cc530146abd2 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Thu, 6 Nov 2008 20:46:35 +0000 Subject: [PATCH 11/29] splitting the gail packages, using the gail packaging as base --- debian/changelog | 7 ++ debian/control | 80 ++++++++++++++++++---- debian/control.in | 80 ++++++++++++++++++---- debian/libgail-common.install | 1 + debian/libgail-dbg.dirs | 1 + debian/libgail-dev.install | 4 ++ debian/libgail-doc.doc-base.gail-reference | 10 +++ debian/libgail-doc.install | 1 + debian/libgail18.install | 1 + debian/libgail18.shlibs | 1 + debian/rules | 5 +- 11 files changed, 166 insertions(+), 25 deletions(-) create mode 100644 debian/libgail-common.install create mode 100644 debian/libgail-dbg.dirs create mode 100644 debian/libgail-dev.install create mode 100644 debian/libgail-doc.doc-base.gail-reference create mode 100644 debian/libgail-doc.install create mode 100644 debian/libgail18.install create mode 100644 debian/libgail18.shlibs diff --git a/debian/changelog b/debian/changelog index c23e68e727..c88d103fea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gtk+2.0 (2.14.4-2) UNRELEASED; urgency=low + + * debian/control, debian/rules, debian/libgail*: + - split libgail packages + + -- Gustavo Noronha Silva Wed, 05 Nov 2008 14:54:08 -0200 + gtk+2.0 (2.14.4-1) experimental; urgency=low [ Gustavo Noronha Silva ] diff --git a/debian/control b/debian/control index 222b046811..73b89c5ec4 100644 --- a/debian/control +++ b/debian/control @@ -52,7 +52,7 @@ Conflicts: libgtk2.0-0png3, gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<= 2.14.1-3), - libgail18, + libgail18 (<< 2.14.4), gtk2.0-examples (<< 2.2.0), libgdkxft0, openoffice.org-core (<< 2.2.1-8), @@ -97,8 +97,7 @@ Conflicts: libgtk2.0-0png3, libeel2-2.18, xfwm4 (<< 4.4.1-3), metacity (<< 1:2.20.0-1) -Replaces: libgtk2.0-0png3, - libgail18 +Replaces: libgtk2.0-0png3 Recommends: hicolor-icon-theme, libgtk2.0-bin Suggests: librsvg2-common @@ -208,10 +207,9 @@ Recommends: python (>= 2.4), debhelper Suggests: libgtk2.0-doc Replaces: libgtk1.3-dev, - gtk2-engines-pixbuf (<< 2.8.18-5), - libgail-dev + gtk2-engines-pixbuf (<< 2.8.18-5) Conflicts: libgtk1.3-dev, - libgail-dev + libgail-dev (<< 2.14.4) 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 @@ -248,9 +246,8 @@ Depends: libgtk2.0-0 (= ${binary:Version}), libgtk2.0-common, ${misc:Depends} Conflicts: libgtk2.0-dbg, - libgail-dbg -Replaces: libgtk2.0-dbg, - libgail-dbg + libgail-dbg (<< 2.14.4) +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 @@ -266,10 +263,9 @@ Section: doc Architecture: all Depends: lynx | www-browser, ${misc:Depends} -Replaces: libgtk1.3-doc, - libgail-common +Replaces: libgtk1.3-doc Conflicts: libgtk1.3-doc, - libgail-common + libgail-common (<< 2.14.4) Recommends: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc @@ -316,3 +312,63 @@ Description: Pixbuf-based theme for GTK+ 2.x suites. . This package contains the pixbuf theme engine. + +Package: libgail18 +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Replaces: libgail17 +Description: GNOME Accessibility Implementation Library -- shared libraries + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the shared library. + +Package: libgail-common +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: GNOME Accessibility Implementation Library -- common modules + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains core shared libraries. + +Package: libgail-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, libgail18 (= ${binary:Version}), libgail-common (= ${binary:Version}), libgtk2.0-dev (>= 2.9.4), pkg-config, libatk1.0-dev (>= 1.13.0) +Suggests: libgail-doc +Description: GNOME Accessibility Implementation Library -- development files + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the development files for Gail. + +Package: libgail-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: ${misc:Depends}, libgail18 (= ${binary:Version}) +Description: Gail libraries and debugging symbols + Gail is the "GNOME Accessibility Implementation Library". + . + This package contains detached debugging symbols. + . + Most people will not need this package. + +Package: libgail-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, lynx | www-browser +Description: documentation files of the Gail library + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the documentation files for Gail. diff --git a/debian/control.in b/debian/control.in index 66f505fe2d..91f19738da 100644 --- a/debian/control.in +++ b/debian/control.in @@ -52,7 +52,7 @@ Conflicts: libgtk2.0-0png3, gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<= 2.14.1-3), - libgail18, + libgail18 (<< 2.14.4), gtk2.0-examples (<< 2.2.0), libgdkxft0, openoffice.org-core (<< 2.2.1-8), @@ -97,8 +97,7 @@ Conflicts: libgtk2.0-0png3, libeel2-2.18, xfwm4 (<< 4.4.1-3), metacity (<< 1:2.20.0-1) -Replaces: libgtk2.0-0png3, - libgail18 +Replaces: libgtk2.0-0png3 Recommends: hicolor-icon-theme, @BIN_PKG@ Suggests: librsvg2-common @@ -208,10 +207,9 @@ Recommends: python (>= 2.4), debhelper Suggests: @DOC_PKG@ Replaces: libgtk1.3-dev, - gtk2-engines-pixbuf (<< 2.8.18-5), - libgail-dev + gtk2-engines-pixbuf (<< 2.8.18-5) Conflicts: libgtk1.3-dev, - libgail-dev + libgail-dev (<< 2.14.4) 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 @@ -248,9 +246,8 @@ Depends: @SHARED_PKG@ (= ${binary:Version}), @COMMON_PKG@, ${misc:Depends} Conflicts: libgtk2.0-dbg, - libgail-dbg -Replaces: libgtk2.0-dbg, - libgail-dbg + libgail-dbg (<< 2.14.4) +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 @@ -266,10 +263,9 @@ Section: doc Architecture: all Depends: lynx | www-browser, ${misc:Depends} -Replaces: libgtk1.3-doc, - libgail-common +Replaces: libgtk1.3-doc Conflicts: libgtk1.3-doc, - libgail-common + libgail-common (<< 2.14.4) Recommends: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc @@ -316,3 +312,63 @@ Description: Pixbuf-based theme for GTK+ 2.x suites. . This package contains the pixbuf theme engine. + +Package: libgail18 +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Replaces: libgail17 +Description: GNOME Accessibility Implementation Library -- shared libraries + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the shared library. + +Package: libgail-common +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: GNOME Accessibility Implementation Library -- common modules + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains core shared libraries. + +Package: libgail-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, libgail18 (= ${binary:Version}), libgail-common (= ${binary:Version}), libgtk2.0-dev (>= 2.9.4), pkg-config, libatk1.0-dev (>= 1.13.0) +Suggests: libgail-doc +Description: GNOME Accessibility Implementation Library -- development files + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the development files for Gail. + +Package: libgail-dbg +Architecture: any +Section: libdevel +Priority: extra +Depends: ${misc:Depends}, libgail18 (= ${binary:Version}) +Description: Gail libraries and debugging symbols + Gail is the "GNOME Accessibility Implementation Library". + . + This package contains detached debugging symbols. + . + Most people will not need this package. + +Package: libgail-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, lynx | www-browser +Description: documentation files of the Gail library + Gail implements ATK interfaces for GTK+ widgets which are dynamically + loadable at runtime by a GTK+ application. Once loaded, those parts of + an application that use standard GTK+ widgets will have a basic level + of accessibility, without the need to modify the application at all. + . + This package contains the documentation files for Gail. diff --git a/debian/libgail-common.install b/debian/libgail-common.install new file mode 100644 index 0000000000..dcae270cd0 --- /dev/null +++ b/debian/libgail-common.install @@ -0,0 +1 @@ +debian/install/shared/usr/lib/gtk-*/modules/*.so diff --git a/debian/libgail-dbg.dirs b/debian/libgail-dbg.dirs new file mode 100644 index 0000000000..fca7cfd0a1 --- /dev/null +++ b/debian/libgail-dbg.dirs @@ -0,0 +1 @@ +usr/lib/debug/ diff --git a/debian/libgail-dev.install b/debian/libgail-dev.install new file mode 100644 index 0000000000..d37a5d7c97 --- /dev/null +++ b/debian/libgail-dev.install @@ -0,0 +1,4 @@ +debian/install/shared/usr/include/* +debian/install/shared/usr/lib/lib*.{so,la,a} +debian/install/shared/usr/lib/gtk-2.0/modules/lib*.la +debian/install/shared/usr/lib/pkgconfig/*.pc diff --git a/debian/libgail-doc.doc-base.gail-reference b/debian/libgail-doc.doc-base.gail-reference new file mode 100644 index 0000000000..1dbd1794d5 --- /dev/null +++ b/debian/libgail-doc.doc-base.gail-reference @@ -0,0 +1,10 @@ +Document: gail-reference +Title: Gail Reference Manual +Author: Padraig O'Briain +Abstract: This manual describes APIs for libgail-util +Section: Accessibility + +Format: HTML +Index: /usr/share/gtk-doc/html/gail-libgail-util/index.html +Files: /usr/share/gtk-doc/html/gail-libgail-util/*.html + diff --git a/debian/libgail-doc.install b/debian/libgail-doc.install new file mode 100644 index 0000000000..e0256d842b --- /dev/null +++ b/debian/libgail-doc.install @@ -0,0 +1 @@ +docs/reference/libgail-util/html usr/share/doc/libgail-doc/gail-libgail-util diff --git a/debian/libgail18.install b/debian/libgail18.install new file mode 100644 index 0000000000..cf0e02102e --- /dev/null +++ b/debian/libgail18.install @@ -0,0 +1 @@ +debian/install/shared/usr/lib/libgail*.so.* diff --git a/debian/libgail18.shlibs b/debian/libgail18.shlibs new file mode 100644 index 0000000000..2fe384b0e7 --- /dev/null +++ b/debian/libgail18.shlibs @@ -0,0 +1 @@ +libgailutil 18 libgail18 (>= 1.10.1), libgail-common (>= 1.10.1) diff --git a/debian/rules b/debian/rules index 21e8a17751..c46e5baed3 100644 --- a/debian/rules +++ b/debian/rules @@ -269,6 +269,8 @@ binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_ # install copyright in all packages; the -p is for the special behavior # of dh_installdocs (ship README.Debian etc. in the first package) dh_installdocs -p$(COMMON_PKG) -i + # we will install the gail docs to libgail-doc + rm -rf debian/$(DOC_PKG)/usr/share/doc/$(DOC_PKG)/gail-libgail-util dh_installman -i dh_link -i dh_compress -i -X.sgml -X.devhelp @@ -320,7 +322,8 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK -p$(UDEB_PKG) dh_installexamples -s dh_link -s - dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG) + dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG) -Nlibgail18 + dh_strip -plibgail18 --dbg-package=libgail-dbg dh_strip -p$(UDEB_PKG) dh_compress -s -X.sgml -X.devhelp dh_fixperms -s -X$(LIBDIR)/$(SHARED_PKG) From e0ba8e30228c20316b6be47f47bf156232b90e8c Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Date: Fri, 7 Nov 2008 02:37:45 +0000 Subject: [PATCH 12/29] release to experimental --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c88d103fea..b422be8178 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gtk+2.0 (2.14.4-2) UNRELEASED; urgency=low +gtk+2.0 (2.14.4-2) experimental; urgency=low * debian/control, debian/rules, debian/libgail*: - split libgail packages From e386a5c83e3abf8cdfc90b7ebea7e63b43d08e90 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Mon, 10 Nov 2008 16:03:24 +0000 Subject: [PATCH 13/29] * libgail*.install: fix installation paths. Closes: #505105. * Do not ship .la files for gail modules. --- debian/changelog | 7 +++++++ debian/libgail-common.install | 1 - debian/libgail-common.install.in | 1 + debian/libgail-dev.install | 7 +++---- debian/libgail18.install | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 debian/libgail-common.install create mode 100644 debian/libgail-common.install.in diff --git a/debian/changelog b/debian/changelog index b422be8178..a1e4f76d87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gtk+2.0 (2.14.4-3) UNRELEASED; urgency=low + + * libgail*.install: fix installation paths. Closes: #505105. + * Do not ship .la files for gail modules. + + -- Josselin Mouette Mon, 10 Nov 2008 17:01:46 +0100 + gtk+2.0 (2.14.4-2) experimental; urgency=low * debian/control, debian/rules, debian/libgail*: diff --git a/debian/libgail-common.install b/debian/libgail-common.install deleted file mode 100644 index dcae270cd0..0000000000 --- a/debian/libgail-common.install +++ /dev/null @@ -1 +0,0 @@ -debian/install/shared/usr/lib/gtk-*/modules/*.so diff --git a/debian/libgail-common.install.in b/debian/libgail-common.install.in new file mode 100644 index 0000000000..e2083b2fcd --- /dev/null +++ b/debian/libgail-common.install.in @@ -0,0 +1 @@ +debian/install/shared/@MODULES_BASE_PATH@/modules/*.so @MODULES_BASE_PATH@/modules diff --git a/debian/libgail-dev.install b/debian/libgail-dev.install index d37a5d7c97..94acf11e39 100644 --- a/debian/libgail-dev.install +++ b/debian/libgail-dev.install @@ -1,4 +1,3 @@ -debian/install/shared/usr/include/* -debian/install/shared/usr/lib/lib*.{so,la,a} -debian/install/shared/usr/lib/gtk-2.0/modules/lib*.la -debian/install/shared/usr/lib/pkgconfig/*.pc +debian/install/shared/usr/include/* /usr/include +debian/install/shared/usr/lib/lib*.{so,la,a} /usr/lib +debian/install/shared/usr/lib/pkgconfig/*.pc /usr/lib/pkgconfig diff --git a/debian/libgail18.install b/debian/libgail18.install index cf0e02102e..e852704ac0 100644 --- a/debian/libgail18.install +++ b/debian/libgail18.install @@ -1 +1 @@ -debian/install/shared/usr/lib/libgail*.so.* +debian/install/shared/usr/lib/libgail*.so.* /usr/lib From 95653ce441cc76716d01f9ca6d4dab1ae243966e Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 11 Nov 2008 13:44:57 +0000 Subject: [PATCH 14/29] * Generate shlibs for libgail. * Bump shlibs version to 2.14.0. --- debian/changelog | 6 ++++-- debian/rules | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1e4f76d87..5ebe43b230 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -gtk+2.0 (2.14.4-3) UNRELEASED; urgency=low +gtk+2.0 (2.14.4-3) experimental; urgency=low * libgail*.install: fix installation paths. Closes: #505105. * Do not ship .la files for gail modules. + * Generate shlibs for libgail. + * Bump shlibs version to 2.14.0. - -- Josselin Mouette Mon, 10 Nov 2008 17:01:46 +0100 + -- Josselin Mouette Tue, 11 Nov 2008 14:44:21 +0100 gtk+2.0 (2.14.4-2) experimental; urgency=low diff --git a/debian/rules b/debian/rules index c46e5baed3..b66cef1351 100644 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//') APIVER := 2.0 SONAME := 0 -SHVER := 2.12.0 +SHVER := 2.14.0 # earliest version that this release has backwards binary compatibility for GTK_BINARY_VERSION := 2.10.0 @@ -335,6 +335,10 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK -X$(MODULES_BASE_PATH) \ -V"$(DIRECTFB_PKG) (>= $(SHVER))" \ --add-udeb=$(UDEB_PKG) + dh_makeshlibs -plibgail18 \ + -X$(MODULES_BASE_PATH) \ + -V"libgail18 (>= $(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 From e76457bb96793bb9407e8cdf54c588045acc4197 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 11 Nov 2008 16:24:30 +0000 Subject: [PATCH 15/29] =?UTF-8?q?*=20Do=20not=20install=20libgailutil=20in?= =?UTF-8?q?=20libgtk2.0-0.=20*=20Do=20not=20install=20gtk=20libs=20in=20li?= =?UTF-8?q?bgail-dev.=20*=20Rework=20docs=20installation.=20*=20Add=20doc?= =?UTF-8?q?=20links=20where=20needed.=20*=20Install=20.devhelp=20files=20a?= =?UTF-8?q?t=20the=20correct=20places.=20Closes:=20#504807.=20*=20Bump=20d?= =?UTF-8?q?ependencies=20for=20the=20development=20package.=20*=20Fix=20de?= =?UTF-8?q?pendencies=20of=20gail=20packages.=20*=20Don=E2=80=99t=20instal?= =?UTF-8?q?l=20libgail=20in=20the=20udeb.=20*=20Stop=20shipping=20/usr/lib?= =?UTF-8?q?/pkgconfig/libgtk-directfb-2.0-0/,=20nobody=20uses=20=20=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 10 +++++++++ debian/control | 22 ++++++++++++++------ debian/control.in | 22 ++++++++++++++------ debian/libgail-common.install.in | 2 +- debian/libgail-dev.install | 8 ++++--- debian/libgail-doc.install | 1 + debian/libgail-doc.links | 1 + debian/libgtk-directfb-2.0-0-udeb.install.in | 2 +- debian/libgtk-directfb-2.0-dev.install.in | 1 - debian/libgtk2.0-0.install.in | 3 ++- debian/libgtk2.0-dev.install.in | 10 ++++----- debian/libgtk2.0-doc.install.in | 7 ++++--- debian/libgtk2.0-doc.links.in | 2 ++ debian/rules | 6 +----- 14 files changed, 65 insertions(+), 32 deletions(-) create mode 100644 debian/libgail-doc.links diff --git a/debian/changelog b/debian/changelog index 5ebe43b230..1b8b61a0bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,16 @@ gtk+2.0 (2.14.4-3) experimental; urgency=low * Do not ship .la files for gail modules. * Generate shlibs for libgail. * Bump shlibs version to 2.14.0. + * Do not install libgailutil in libgtk2.0-0. + * Do not install gtk libs in libgail-dev. + * Rework docs installation. + * Add doc links where needed. + * Install .devhelp files at the correct places. Closes: #504807. + * Bump dependencies for the development package. + * Fix dependencies of gail packages. + * Don’t install libgail in the udeb. + * Stop shipping /usr/lib/pkgconfig/libgtk-directfb-2.0-0/, nobody uses + it. -- Josselin Mouette Tue, 11 Nov 2008 14:44:21 +0100 diff --git a/debian/control b/debian/control index 73b89c5ec4..4486b8ecfc 100644 --- a/debian/control +++ b/debian/control @@ -188,9 +188,9 @@ Depends: libgtk2.0-0 (= ${binary:Version}), libgtk2.0-common, ${misc:Depends}, ${shlibs:Depends}, - libglib2.0-dev (>= 2.12.0), - libpango1.0-dev (>= 1.10.0-2), - libatk1.0-dev (>= 1.6.1-2), + libglib2.0-dev (>= 2.17.6), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), libcairo2-dev (>= 1.6.4-6.1), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), @@ -315,7 +315,9 @@ Description: Pixbuf-based theme for GTK+ 2.x Package: libgail18 Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgtk2.0-0 (= ${binary:Version}) Replaces: libgail17 Description: GNOME Accessibility Implementation Library -- shared libraries Gail implements ATK interfaces for GTK+ widgets which are dynamically @@ -327,7 +329,9 @@ Description: GNOME Accessibility Implementation Library -- shared libraries Package: libgail-common Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgail18 (= ${binary:Version}) Description: GNOME Accessibility Implementation Library -- common modules Gail implements ATK interfaces for GTK+ widgets which are dynamically loadable at runtime by a GTK+ application. Once loaded, those parts of @@ -339,7 +343,12 @@ Description: GNOME Accessibility Implementation Library -- common modules Package: libgail-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, libgail18 (= ${binary:Version}), libgail-common (= ${binary:Version}), libgtk2.0-dev (>= 2.9.4), pkg-config, libatk1.0-dev (>= 1.13.0) +Depends: ${misc:Depends}, + libgail18 (= ${binary:Version}), + libgail-common (= ${binary:Version}), + libgtk2.0-dev (= ${binary:Version}), + pkg-config, + libatk1.0-dev (>= 1.13.0) Suggests: libgail-doc Description: GNOME Accessibility Implementation Library -- development files Gail implements ATK interfaces for GTK+ widgets which are dynamically @@ -354,6 +363,7 @@ Architecture: any Section: libdevel Priority: extra Depends: ${misc:Depends}, libgail18 (= ${binary:Version}) +Recommends: libgtk2.0-0-dbg Description: Gail libraries and debugging symbols Gail is the "GNOME Accessibility Implementation Library". . diff --git a/debian/control.in b/debian/control.in index 91f19738da..fcb4d514cc 100644 --- a/debian/control.in +++ b/debian/control.in @@ -188,9 +188,9 @@ Depends: @SHARED_PKG@ (= ${binary:Version}), @COMMON_PKG@, ${misc:Depends}, ${shlibs:Depends}, - libglib2.0-dev (>= 2.12.0), - libpango1.0-dev (>= 1.10.0-2), - libatk1.0-dev (>= 1.6.1-2), + libglib2.0-dev (>= 2.17.6), + libpango1.0-dev (>= 1.20), + libatk1.0-dev (>= 1.13.0), libcairo2-dev (>= 1.6.4-6.1), libx11-dev (>= 2:1.0.0-6), libxext-dev (>= 1:1.0.1-2), @@ -315,7 +315,9 @@ Description: Pixbuf-based theme for GTK+ 2.x Package: libgail18 Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends}, + @SHARED_PKG@ (= ${binary:Version}) Replaces: libgail17 Description: GNOME Accessibility Implementation Library -- shared libraries Gail implements ATK interfaces for GTK+ widgets which are dynamically @@ -327,7 +329,9 @@ Description: GNOME Accessibility Implementation Library -- shared libraries Package: libgail-common Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgail18 (= ${binary:Version}) Description: GNOME Accessibility Implementation Library -- common modules Gail implements ATK interfaces for GTK+ widgets which are dynamically loadable at runtime by a GTK+ application. Once loaded, those parts of @@ -339,7 +343,12 @@ Description: GNOME Accessibility Implementation Library -- common modules Package: libgail-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, libgail18 (= ${binary:Version}), libgail-common (= ${binary:Version}), libgtk2.0-dev (>= 2.9.4), pkg-config, libatk1.0-dev (>= 1.13.0) +Depends: ${misc:Depends}, + libgail18 (= ${binary:Version}), + libgail-common (= ${binary:Version}), + @DEV_PKG@ (= ${binary:Version}), + pkg-config, + libatk1.0-dev (>= 1.13.0) Suggests: libgail-doc Description: GNOME Accessibility Implementation Library -- development files Gail implements ATK interfaces for GTK+ widgets which are dynamically @@ -354,6 +363,7 @@ Architecture: any Section: libdevel Priority: extra Depends: ${misc:Depends}, libgail18 (= ${binary:Version}) +Recommends: @DEBUG_PKG@ Description: Gail libraries and debugging symbols Gail is the "GNOME Accessibility Implementation Library". . diff --git a/debian/libgail-common.install.in b/debian/libgail-common.install.in index e2083b2fcd..ecbb50cb82 100644 --- a/debian/libgail-common.install.in +++ b/debian/libgail-common.install.in @@ -1 +1 @@ -debian/install/shared/@MODULES_BASE_PATH@/modules/*.so @MODULES_BASE_PATH@/modules +debian/install/shared/@LIBDIR@/gtk-@APIVER@/modules/*.so @LIBDIR@/gtk-@APIVER@/modules diff --git a/debian/libgail-dev.install b/debian/libgail-dev.install index 94acf11e39..d3d9ef3271 100644 --- a/debian/libgail-dev.install +++ b/debian/libgail-dev.install @@ -1,3 +1,5 @@ -debian/install/shared/usr/include/* /usr/include -debian/install/shared/usr/lib/lib*.{so,la,a} /usr/lib -debian/install/shared/usr/lib/pkgconfig/*.pc /usr/lib/pkgconfig +debian/install/shared/usr/include/gail* /usr/include +debian/install/shared/usr/lib/libgail*.so /usr/lib +debian/install/shared/usr/lib/libgail*.la /usr/lib +debian/install/static/usr/lib/libgail*.a @LIBDIR@ +debian/install/shared/usr/lib/pkgconfig/gail*.pc /usr/lib/pkgconfig diff --git a/debian/libgail-doc.install b/debian/libgail-doc.install index e0256d842b..3756d85ead 100644 --- a/debian/libgail-doc.install +++ b/debian/libgail-doc.install @@ -1 +1,2 @@ +debian/install/shared/usr/share/gtk-doc/html/gail* usr/share/gtk-doc/html docs/reference/libgail-util/html usr/share/doc/libgail-doc/gail-libgail-util diff --git a/debian/libgail-doc.links b/debian/libgail-doc.links new file mode 100644 index 0000000000..fd2bd875db --- /dev/null +++ b/debian/libgail-doc.links @@ -0,0 +1 @@ +/usr/share/gtk-doc/html/gail-libgail-util /usr/share/doc/libgail-doc/html diff --git a/debian/libgtk-directfb-2.0-0-udeb.install.in b/debian/libgtk-directfb-2.0-0-udeb.install.in index c3731925a5..95c0031e51 100644 --- a/debian/libgtk-directfb-2.0-0-udeb.install.in +++ b/debian/libgtk-directfb-2.0-0-udeb.install.in @@ -1,3 +1,3 @@ # from the directfb flavor debian/install/directfb/@MODULES_BASE_PATH@/loaders/libpixbufloader-png.so @MODULES_BASE_PATH@/loaders -debian/install/directfb/@LIBDIR@/*.so.* @LIBDIR@ +debian/install/directfb/@LIBDIR@/libg?k*.so.* @LIBDIR@ diff --git a/debian/libgtk-directfb-2.0-dev.install.in b/debian/libgtk-directfb-2.0-dev.install.in index 3be2c80f53..91e0284dd5 100644 --- a/debian/libgtk-directfb-2.0-dev.install.in +++ b/debian/libgtk-directfb-2.0-dev.install.in @@ -1,6 +1,5 @@ # from the directfb flavor debian/install/directfb/usr/include/gtk-@APIVER@/gdk/*directfb* usr/include/gtk-@APIVER@/gdk debian/install/directfb/@LIBDIR@/*directfb*.so @LIBDIR@ -debian/install/directfb/@LIBDIR@/pkgconfig/* @LIBDIR@/pkgconfig/@DIRECTFB_PKG@ debian/install/directfb/@LIBDIR@/pkgconfig/*directfb* @LIBDIR@/pkgconfig debian/install/directfb/@LIBDIR@/gtk-@APIVER@/include/gdkconfig.h @LIBDIR@/gtk-@APIVER@/include/directfb diff --git a/debian/libgtk2.0-0.install.in b/debian/libgtk2.0-0.install.in index 5c2239a40e..e4f12d93b9 100644 --- a/debian/libgtk2.0-0.install.in +++ b/debian/libgtk2.0-0.install.in @@ -9,4 +9,5 @@ debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@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/@LIBDIR@/*.so.* @LIBDIR@ +debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@ +debian/install/shared/@LIBDIR@/libgdk*.so.* @LIBDIR@ diff --git a/debian/libgtk2.0-dev.install.in b/debian/libgtk2.0-dev.install.in index 01bcab9d05..809d8c18e3 100644 --- a/debian/libgtk2.0-dev.install.in +++ b/debian/libgtk2.0-dev.install.in @@ -3,12 +3,12 @@ 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/@LIBDIR@/*.la @LIBDIR@ -debian/install/shared/@LIBDIR@/*.so @LIBDIR@ -debian/install/shared/@LIBDIR@/pkgconfig @LIBDIR@ +debian/install/shared/usr/include/gtk* usr/include +debian/install/shared/@LIBDIR@/g?k*.la @LIBDIR@ +debian/install/shared/@LIBDIR@/g?k*.so @LIBDIR@ +debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig debian/install/shared/@LIBDIR@/gtk-@APIVER@/include @LIBDIR@/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/@LIBDIR@/*.a @LIBDIR@ +debian/install/static/@LIBDIR@/g?k*.a @LIBDIR@ diff --git a/debian/libgtk2.0-doc.install.in b/debian/libgtk2.0-doc.install.in index 7af20820ad..cd0fd9b4d0 100644 --- a/debian/libgtk2.0-doc.install.in +++ b/debian/libgtk2.0-doc.install.in @@ -1,8 +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 +debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/faq/html +debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/tutorial/html # from the shared flavor -debian/install/shared/usr/share/doc/@DOC_PKG@ usr/share/doc +debian/install/shared/usr/share/gtk-doc/html/gtk* usr/share/doc/@DOC_PKG@ +debian/install/shared/usr/share/gtk-doc/html/gdk* usr/share/doc/@DOC_PKG@ # from the source docs/faq/html usr/share/doc/@DOC_PKG@/faq docs/tutorial/html usr/share/doc/@DOC_PKG@/tutorial diff --git a/debian/libgtk2.0-doc.links.in b/debian/libgtk2.0-doc.links.in index 19af412b8f..a08fa2330f 100644 --- a/debian/libgtk2.0-doc.links.in +++ b/debian/libgtk2.0-doc.links.in @@ -1,6 +1,8 @@ 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/@DOC_PKG@/faq usr/share/gtk-doc/html/gtk-faq +usr/share/doc/@DOC_PKG@/tutorial usr/share/gtk-doc/html/gtk-tutorial 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 diff --git a/debian/rules b/debian/rules index b66cef1351..c4d3ffd9a0 100644 --- a/debian/rules +++ b/debian/rules @@ -118,7 +118,6 @@ common_configure_flags := \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --sysconfdir=/etc \ - --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \ --enable-test-print-backend ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) @@ -269,8 +268,6 @@ binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_ # install copyright in all packages; the -p is for the special behavior # of dh_installdocs (ship README.Debian etc. in the first package) dh_installdocs -p$(COMMON_PKG) -i - # we will install the gail docs to libgail-doc - rm -rf debian/$(DOC_PKG)/usr/share/doc/$(DOC_PKG)/gail-libgail-util dh_installman -i dh_link -i dh_compress -i -X.sgml -X.devhelp @@ -337,8 +334,7 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK --add-udeb=$(UDEB_PKG) dh_makeshlibs -plibgail18 \ -X$(MODULES_BASE_PATH) \ - -V"libgail18 (>= $(SHVER))" \ - --add-udeb=$(UDEB_PKG) + -V"libgail18 (>= $(SHVER))" dh_installdeb -s # override shlibs for libraries from this source before computing # dependencies of packages generated from this source; we already have From 84cdf0889fd8743dc64c1528405e30226b68f118 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 11 Nov 2008 16:55:48 +0000 Subject: [PATCH 16/29] Fix very stupid mistake that will lead to yet another rebuild. --- debian/libgtk2.0-dev.install.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/libgtk2.0-dev.install.in b/debian/libgtk2.0-dev.install.in index 809d8c18e3..841f040cc5 100644 --- a/debian/libgtk2.0-dev.install.in +++ b/debian/libgtk2.0-dev.install.in @@ -4,11 +4,11 @@ debian/dh_gtkmodules usr/bin debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin debian/install/shared/usr/bin/gtk-builder-convert usr/bin debian/install/shared/usr/include/gtk* usr/include -debian/install/shared/@LIBDIR@/g?k*.la @LIBDIR@ -debian/install/shared/@LIBDIR@/g?k*.so @LIBDIR@ +debian/install/shared/@LIBDIR@/libg?k*.la @LIBDIR@ +debian/install/shared/@LIBDIR@/libg?k*.so @LIBDIR@ debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig debian/install/shared/@LIBDIR@/gtk-@APIVER@/include @LIBDIR@/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/@LIBDIR@/g?k*.a @LIBDIR@ +debian/install/static/@LIBDIR@/libg?k*.a @LIBDIR@ From 44c83cfdcdb8989316974095d5e7f5d8bd6191f9 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 11 Nov 2008 17:08:30 +0000 Subject: [PATCH 17/29] Fix a few other build errors --- debian/libgail-dev.install | 2 +- debian/libgail-doc.install | 1 - debian/rules | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/libgail-dev.install b/debian/libgail-dev.install index d3d9ef3271..49cb143a93 100644 --- a/debian/libgail-dev.install +++ b/debian/libgail-dev.install @@ -1,5 +1,5 @@ debian/install/shared/usr/include/gail* /usr/include debian/install/shared/usr/lib/libgail*.so /usr/lib debian/install/shared/usr/lib/libgail*.la /usr/lib -debian/install/static/usr/lib/libgail*.a @LIBDIR@ +debian/install/static/usr/lib/libgail*.a /usr/lib debian/install/shared/usr/lib/pkgconfig/gail*.pc /usr/lib/pkgconfig diff --git a/debian/libgail-doc.install b/debian/libgail-doc.install index 3756d85ead..69c7f65e50 100644 --- a/debian/libgail-doc.install +++ b/debian/libgail-doc.install @@ -1,2 +1 @@ debian/install/shared/usr/share/gtk-doc/html/gail* usr/share/gtk-doc/html -docs/reference/libgail-util/html usr/share/doc/libgail-doc/gail-libgail-util diff --git a/debian/rules b/debian/rules index c4d3ffd9a0..de38643554 100644 --- a/debian/rules +++ b/debian/rules @@ -68,8 +68,8 @@ 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) +BINARY_INDEP_PKGS := $(COMMON_PKG) $(BIN_PKG) $(DOC_PKG) libgail-doc +BINARY_ARCH_PKGS := $(SHARED_PKG) $(DIRECTFB_PKG) $(UDEB_PKG) $(DEV_PKG) $(DIRECTFB_DEV_PKG) $(DEBUG_PKG) $(EXAMPLES_PKG) $(PIXBUF_PKG) libgail18 libgail-dbg libgail-dev libgail-common ALL_PKGS := $(BINARY_INDEP_PKGS) $(BINARY_ARCH_PKGS) # list of flavors we build; each gets a builddir, a configure pass (configure From 1f984d2d5cb115bfc2e4a6d2a7594b76d74b858b Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 11 Nov 2008 17:18:06 +0000 Subject: [PATCH 18/29] * Remove versioned conflicts with libgail packages. * Remove libgail18.shlibs. --- debian/changelog | 2 ++ debian/control | 10 +++------- debian/control.in | 10 +++------- debian/libgail18.shlibs | 1 - debian/rules | 2 +- 5 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 debian/libgail18.shlibs diff --git a/debian/changelog b/debian/changelog index 1b8b61a0bf..3cfb9bf402 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ gtk+2.0 (2.14.4-3) experimental; urgency=low * Don’t install libgail in the udeb. * Stop shipping /usr/lib/pkgconfig/libgtk-directfb-2.0-0/, nobody uses it. + * Remove versioned conflicts with libgail packages. + * Remove libgail18.shlibs. -- Josselin Mouette Tue, 11 Nov 2008 14:44:21 +0100 diff --git a/debian/control b/debian/control index 4486b8ecfc..ed68e0156d 100644 --- a/debian/control +++ b/debian/control @@ -52,7 +52,6 @@ Conflicts: libgtk2.0-0png3, gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<= 2.14.1-3), - libgail18 (<< 2.14.4), gtk2.0-examples (<< 2.2.0), libgdkxft0, openoffice.org-core (<< 2.2.1-8), @@ -208,8 +207,7 @@ Recommends: python (>= 2.4), Suggests: libgtk2.0-doc Replaces: libgtk1.3-dev, gtk2-engines-pixbuf (<< 2.8.18-5) -Conflicts: libgtk1.3-dev, - libgail-dev (<< 2.14.4) +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 @@ -245,8 +243,7 @@ Architecture: any Depends: libgtk2.0-0 (= ${binary:Version}), libgtk2.0-common, ${misc:Depends} -Conflicts: libgtk2.0-dbg, - libgail-dbg (<< 2.14.4) +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 @@ -264,8 +261,7 @@ Architecture: all Depends: lynx | www-browser, ${misc:Depends} Replaces: libgtk1.3-doc -Conflicts: libgtk1.3-doc, - libgail-common (<< 2.14.4) +Conflicts: libgtk1.3-doc Recommends: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc diff --git a/debian/control.in b/debian/control.in index fcb4d514cc..5a9ad05c4d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -52,7 +52,6 @@ Conflicts: libgtk2.0-0png3, gimp1.3 (<< 1.3.7-1.1), metatheme (<< 0.9.7-3), libgnomeui-0 (<= 2.14.1-3), - libgail18 (<< 2.14.4), gtk2.0-examples (<< 2.2.0), libgdkxft0, openoffice.org-core (<< 2.2.1-8), @@ -208,8 +207,7 @@ Recommends: python (>= 2.4), Suggests: @DOC_PKG@ Replaces: libgtk1.3-dev, gtk2-engines-pixbuf (<< 2.8.18-5) -Conflicts: libgtk1.3-dev, - libgail-dev (<< 2.14.4) +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 @@ -245,8 +243,7 @@ Architecture: any Depends: @SHARED_PKG@ (= ${binary:Version}), @COMMON_PKG@, ${misc:Depends} -Conflicts: libgtk2.0-dbg, - libgail-dbg (<< 2.14.4) +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 @@ -264,8 +261,7 @@ Architecture: all Depends: lynx | www-browser, ${misc:Depends} Replaces: libgtk1.3-doc -Conflicts: libgtk1.3-doc, - libgail-common (<< 2.14.4) +Conflicts: libgtk1.3-doc Recommends: libglib2.0-doc, libatk1.0-doc, libpango1.0-doc diff --git a/debian/libgail18.shlibs b/debian/libgail18.shlibs deleted file mode 100644 index 2fe384b0e7..0000000000 --- a/debian/libgail18.shlibs +++ /dev/null @@ -1 +0,0 @@ -libgailutil 18 libgail18 (>= 1.10.1), libgail-common (>= 1.10.1) diff --git a/debian/rules b/debian/rules index de38643554..91486fe924 100644 --- a/debian/rules +++ b/debian/rules @@ -334,7 +334,7 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK --add-udeb=$(UDEB_PKG) dh_makeshlibs -plibgail18 \ -X$(MODULES_BASE_PATH) \ - -V"libgail18 (>= $(SHVER))" + -V"libgail18 (>= $(SHVER)), libgail-common (>= $(SHVER))" dh_installdeb -s # override shlibs for libraries from this source before computing # dependencies of packages generated from this source; we already have From ccfaaaab1c9375d9c275d31eafb3b28db12aa0c1 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 11 Nov 2008 17:56:58 +0000 Subject: [PATCH 19/29] * Put debugging symbols of libgail modules in libgail-dbg. * dh_gtkmodules.in: fix a pod2man error. * Disable 006_proper-directfb-modules.patch. * Update 070_mandatory_relibtoolize.patch accordingly. --- debian/changelog | 4 + debian/dh_gtkmodules.in | 2 + .../patches/070_mandatory-relibtoolize.patch | 55773 +++++++++++++++- debian/patches/series | 2 +- debian/rules | 4 +- 5 files changed, 53419 insertions(+), 2366 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3cfb9bf402..bb12f5d01a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,10 @@ gtk+2.0 (2.14.4-3) experimental; urgency=low it. * Remove versioned conflicts with libgail packages. * Remove libgail18.shlibs. + * Put debugging symbols of libgail modules in libgail-dbg. + * dh_gtkmodules.in: fix a pod2man error. + * Disable 006_proper-directfb-modules.patch. + * Update 070_mandatory_relibtoolize.patch accordingly. -- Josselin Mouette Tue, 11 Nov 2008 14:44:21 +0100 diff --git a/debian/dh_gtkmodules.in b/debian/dh_gtkmodules.in index e592ad4b76..2f3edaf692 100644 --- a/debian/dh_gtkmodules.in +++ b/debian/dh_gtkmodules.in @@ -215,6 +215,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } } +=back + =head1 SEE ALSO L diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index 22609f3879..28726d0084 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -1,7 +1,1571 @@ -diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 ---- gtk+2.0-2.14.4.old/aclocal.m4 2008-10-17 01:07:01.000000000 -0300 -+++ gtk+2.0-2.14.4/aclocal.m4 2008-11-04 15:36:57.000000000 -0200 -@@ -941,7 +941,7 @@ +Index: gtk+-2.14.4/aclocal.m4 +=================================================================== +--- gtk+-2.14.4.orig/aclocal.m4 2008-10-17 06:07:01.000000000 +0200 ++++ gtk+-2.14.4/aclocal.m4 2008-11-11 18:55:51.176636138 +0100 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.7.9 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.1 -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 +-# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -11,937 +11,702 @@ + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + +-# autoconf 2.13 / 2.50 compatibility macro +- +-# GLIB_AC_DIVERT_BEFORE_HELP(STUFF) +-# --------------------------------- +-# Put STUFF early enough so that they are available for $ac_help expansion. +-# Handle both classic (<= v2.13) and modern autoconf +-AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP], +-[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])], +- [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])], +- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl +-$1 +-AC_DIVERT_POP()])])]) ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++m4_if(AC_AUTOCONF_VERSION, [2.61],, ++[m4_warning([this file was generated for autoconf 2.61. ++You have another version of autoconf. It may work, but is not guaranteed to. ++If you have problems, you may need to regenerate the build system entirely. ++To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-# GTK_ADD_LIB(VAR,LIBNAME) +-# --------------------------------- +-# Helper macro to add a -lBlah to a variable, avoiding repeats +-# Note that this needs to be quoted when used in an enclosing macro +-AC_DEFUN([GTK_ADD_LIB], +-[ case "$$1 " in +- *-l$2[[\ \ ]]*) ;; +- *) $1="-l$2 $$1" ;; +- esac +-]) ++# Configure paths for GLIB ++# Owen Taylor 1997-2001 + ++dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, ++dnl gthread, or gio is specified in MODULES, pass to pkg-config ++dnl ++AC_DEFUN([AM_PATH_GLIB_2_0], ++[dnl ++dnl Get the cflags and libraries from pkg-config ++dnl ++AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], ++ , enable_glibtest=yes) + +-# Checks the location of the XML Catalog +-# Usage: +-# JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +-# Defines XMLCATALOG and XML_CATALOG_FILE substitutions +-AC_DEFUN([JH_PATH_XML_CATALOG], +-[ +- # check for the presence of the XML catalog +- AC_ARG_WITH([xml-catalog], +- AC_HELP_STRING([--with-xml-catalog=CATALOG], +- [path to xml catalog to use]),, +- [with_xml_catalog=/etc/xml/catalog]) +- jh_found_xmlcatalog=true +- XML_CATALOG_FILE="$with_xml_catalog" +- AC_SUBST([XML_CATALOG_FILE]) +- AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)]) +- if test -f "$XML_CATALOG_FILE"; then +- AC_MSG_RESULT([found]) +- else +- jh_found_xmlcatalog=false +- AC_MSG_RESULT([not found]) +- fi ++ pkg_config_args=glib-2.0 ++ for module in . $4 ++ do ++ case "$module" in ++ gmodule) ++ pkg_config_args="$pkg_config_args gmodule-2.0" ++ ;; ++ gmodule-no-export) ++ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" ++ ;; ++ gobject) ++ pkg_config_args="$pkg_config_args gobject-2.0" ++ ;; ++ gthread) ++ pkg_config_args="$pkg_config_args gthread-2.0" ++ ;; ++ gio*) ++ pkg_config_args="$pkg_config_args $module-2.0" ++ ;; ++ esac ++ done + +- # check for the xmlcatalog program +- AC_PATH_PROG(XMLCATALOG, xmlcatalog, no) +- if test "x$XMLCATALOG" = xno; then +- jh_found_xmlcatalog=false +- fi ++ PKG_PROG_PKG_CONFIG([0.16]) + +- if $jh_found_xmlcatalog; then +- ifelse([$1],,[:],[$1]) +- else +- ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2]) +- fi +-]) ++ no_glib="" + +-# Checks if a particular URI appears in the XML catalog +-# Usage: +-# JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +-AC_DEFUN([JH_CHECK_XML_CATALOG], +-[ +- AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl +- AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then +- AC_MSG_RESULT([found]) +- ifelse([$3],,,[$3 +-])dnl +- else +- AC_MSG_RESULT([not found]) +- ifelse([$4],, +- [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])], +- [$4]) ++ if test "x$PKG_CONFIG" = x ; then ++ no_glib=yes ++ PKG_CONFIG=no + fi +-]) + +-# Do all the work for Automake. -*- Autoconf -*- +- +-# This macro actually does too much some checks are only needed if +-# your package does certain things. But this isn't really a big deal. +- +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++ min_glib_version=ifelse([$1], ,2.0.0,$1) ++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++ if test x$PKG_CONFIG != xno ; then ++ ## don't try to run the test against uninstalled libtool libs ++ if $PKG_CONFIG --uninstalled $pkg_config_args; then ++ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" ++ enable_glibtest=no ++ fi + +-# This program 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 General Public License for more details. ++ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then ++ : ++ else ++ no_glib=yes ++ fi ++ fi + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++ if test x"$no_glib" = x ; then ++ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` ++ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` ++ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + +-# serial 10 ++ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` ++ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` ++ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++dnl ++dnl Now check if the installed GLIB is sufficiently new. (Also sanity ++dnl checks the results of pkg-config to some extent) ++dnl ++ rm -f conf.glibtest ++ AC_TRY_RUN([ ++#include ++#include ++#include + +-AC_PREREQ([2.54]) ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; + +-# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +-# the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++ system ("touch conf.glibtest"); + +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +- AC_REQUIRE([AC_PROG_INSTALL])dnl +-# test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +-fi ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } + +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If pkg-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); ++ printf("*** to point to the correct configuration files\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } + else +- CYGPATH_W=echo ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); ++ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi + fi +-fi +-AC_SUBST([CYGPATH_W]) +- +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +- +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +- +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_MISSING_PROG(AMTAR, tar) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +- +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-]) +-]) +- +- +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. +- +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $1 | $1:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +- +-# Copyright 2002 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +- +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) +- +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.7.9])]) +- +-# Helper functions for option handling. -*- Autoconf -*- +- +-# Copyright 2001, 2002 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# serial 2 +- +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +- +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +- +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +- +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include ++#include ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ 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" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ GOBJECT_QUERY="" ++ GLIB_MKENUMS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ AC_SUBST(GLIB_GENMARSHAL) ++ AC_SUBST(GOBJECT_QUERY) ++ AC_SUBST(GLIB_MKENUMS) ++ rm -f conf.glibtest ++]) + ++# Copyright (C) 1995-2002 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003,2004 Red Hat, Inc. + # +-# Check to make sure that the build environment is sane. ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. + # +- +-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# serial 3 +- +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then +- +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi +- +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-AC_MSG_RESULT(yes)]) +- +-# -*- Autoconf -*- +- +- +-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# serial 3 +- +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) +- +- +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " +-else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) +-fi +-]) +- +-# AM_AUX_DIR_EXPAND +- +-# Copyright 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# This file can be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU Public License ++# but which still want to provide support for the GNU gettext functionality. + # +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. ++# Macro to add for using GNU gettext. ++# Ulrich Drepper , 1995, 1996 + # +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir ++# Modified to never use included libintl. ++# Owen Taylor , 12/15/1998 + # +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. ++# Major rework to remove unused code ++# Owen Taylor , 12/11/2002 + # +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# Added better handling of ALL_LINGUAS from GNU gettext version ++# written by Bruno Haible, Owen Taylor 5/30/3002 + # +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-# Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50]) +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], [ +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +- +-# Copyright 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} +-AC_SUBST(install_sh)]) +- +-# AM_PROG_INSTALL_STRIP +- +-# Copyright 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) +- +-# -*- Autoconf -*- +-# Copyright (C) 2003 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# serial 1 +- +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) +- +-# serial 5 -*- Autoconf -*- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +- +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +- +- +- +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. ++# Modified to require ngettext ++# Matthias Clasen 08/06/2004 + # +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) ++# We need this here as well, since someone might use autoconf-2.5x ++# to configure GLib then an older version to configure a package ++# using AM_GLIB_GNU_GETTEXT ++AC_PREREQ(2.53) + +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub ++dnl ++dnl We go to great lengths to make sure that aclocal won't ++dnl try to pull in the installed version of these macros ++dnl when running aclocal in the glib directory. ++dnl ++m4_copy([AC_DEFUN],[glib_DEFUN]) ++m4_copy([AC_REQUIRE],[glib_REQUIRE]) ++dnl ++dnl At the end, if we're not within glib, we'll define the public ++dnl definitions in terms of our private definitions. ++dnl + +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- : > sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++# GLIB_LC_MESSAGES ++#-------------------- ++glib_DEFUN([GLIB_LC_MESSAGES], ++ [AC_CHECK_HEADERS([locale.h]) ++ if test $ac_cv_header_locale_h = yes; then ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your file defines LC_MESSAGES.]) ++ fi ++ fi]) + +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else ++# GLIB_PATH_PROG_WITH_TEST ++#---------------------------- ++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], ++[# Extract the first word of "$2", so it can be a program name with args. ++set dummy $2; ac_word=[$]2 ++AC_MSG_CHECKING([for $ac_word]) ++AC_CACHE_VAL(ac_cv_path_$1, ++[case "[$]$1" in ++ /*) ++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in ifelse([$5], , $PATH, [$5]); do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if [$3]; then ++ ac_cv_path_$1="$ac_dir/$ac_word" + break + fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break +- fi + fi + done +- +- cd .. +- rm -rf conftest.dir ++ IFS="$ac_save_ifs" ++dnl If no 4th arg is given, leave the cache variable unset, ++dnl so AC_PATH_PROGS will keep looking. ++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++])dnl ++ ;; ++esac])dnl ++$1="$ac_cv_path_$1" ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++ AC_MSG_RESULT([$]$1) + else +- am_cv_$1_dependencies_compiler_type=none ++ AC_MSG_RESULT(no) + fi ++AC_SUBST($1)dnl + ]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) +- + +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [USE_NLS=yes ++ AC_SUBST(USE_NLS) + ++ gt_cv_have_gettext=no + +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking Speeds up one-time builds +- --enable-dependency-tracking Do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) +-]) ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +-# Generate code to set up dependency tracking. -*- Autoconf -*- ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + +-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. ++ # ++ # First check in libc ++ # ++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !ngettext ("","", 1)], ++ gt_cv_func_ngettext_libc=yes, ++ gt_cv_func_ngettext_libc=no) ++ ]) ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !dgettext ("","")], ++ gt_cv_func_dgettext_libc=yes, ++ gt_cv_func_dgettext_libc=no) ++ ]) ++ fi ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ fi + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ AC_CHECK_LIB(intl, bindtextdomain, ++ [AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dgettext, ++ gt_cv_func_dgettext_libintl=yes)])]) + +-# This program 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 General Public License for more details. ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++ AC_MSG_RESULT([]) ++ AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dcgettext, ++ [gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv], ++ :,-liconv)], ++ :,-liconv) ++ fi + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ LIBS="$glib_save_LIBS" + +-#serial 2 ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi ++ fi + +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue +- # Extract the definition of DEP_FILES from the Makefile without +- # running `make'. +- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` +- test -z "$DEPDIR" && continue +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n -e '/^U = / s///p' < "$mf"` +- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" +- # We invoke sed twice because it is the simplest approach to +- # changing $(DEPDIR) to its actual value in the expansion. +- for file in `sed -n -e ' +- /^DEP_FILES = .*\\\\$/ { +- s/^DEP_FILES = // +- :loop +- s/\\\\$// +- p +- n +- /\\\\$/ b loop +- p +- } +- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +-done +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ AC_CHECK_FUNCS(dcgettext) ++ MSGFMT_OPTS= ++ AC_MSG_CHECKING([if msgfmt accepts -c]) ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++ AC_SUBST(MSGFMT_OPTS) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share and ++ dnl and CATOBJEXT=.gmo in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac]) ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ]) + ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ fi + +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) ++ dnl Test whether we really found GNU xgettext. ++ if test "$XGETTEXT" != ":"; then ++ dnl If it is not GNU xgettext we define it as : so that the ++ dnl Makefiles still can work. ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ AC_MSG_RESULT( ++ [found xgettext program is not GNU xgettext; ignore it]) ++ XGETTEXT=":" ++ fi ++ fi + +-# Check to see how 'make' treats includes. -*- Autoconf -*- ++ # We need to process the po/ directory. ++ POSUB=po + +-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++ dnl These rules are solely for the distribution goal. While doing this ++ dnl we only have to keep exactly one list of the available catalogs ++ dnl in configure.in. ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done + +-# This program 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 General Public License for more details. ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(CATALOGS) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(DATADIRNAME) ++ AC_SUBST(GMOFILES) ++ AC_SUBST(INSTOBJEXT) ++ AC_SUBST(INTLLIBS) ++ AC_SUBST(PO_IN_DATADIR_TRUE) ++ AC_SUBST(PO_IN_DATADIR_FALSE) ++ AC_SUBST(POFILES) ++ AC_SUBST(POSUB) ++ ]) + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# AM_GLIB_GNU_GETTEXT ++# ------------------- ++# Do checks necessary for use of gettext. If a suitable implementation ++# of gettext is found in either in libintl or in the C library, ++# it will set INTLLIBS to the libraries needed for use of gettext ++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable ++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() ++# on various variables needed by the Makefile.in.in installed by ++# glib-gettextize. ++dnl ++glib_DEFUN([GLIB_GNU_GETTEXT], ++ [AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_HEADER_STDC])dnl ++ ++ GLIB_LC_MESSAGES ++ GLIB_WITH_NLS + +-# serial 2 ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ AC_MSG_CHECKING(for catalogs to be installed) ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ AC_MSG_RESULT($LINGUAS) ++ fi + +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo done +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# We grep out `Entering directory' and `Leaving directory' +-# messages which can occur if `w' ends up in MAKEFLAGS. +-# In particular we don't look at `^make:' because GNU make might +-# be invoked under some other name (usually "gmake"), in which +-# case it prints its new name instead of `make'. +-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then +- am__include=include +- am__quote= +- _am_result=GNU +-fi +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then +- am__include=.include +- am__quote="\"" +- _am_result=BSD ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi + fi +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) +- +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# serial 5 ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) + +-AC_PREREQ(2.52) ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) + +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE]) +-AC_SUBST([$1_FALSE]) +-if $2; then +- $1_TRUE= +- $1_FALSE='#' ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` + else +- $1_TRUE='#' +- $1_FALSE= ++ localedir=`eval echo "${datadir}/locale"` + fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]) +-fi])]) ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) ++]) ++ ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl ++ ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) + +-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- + +-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. ++dnl -*- mode: autoconf -*- + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++# serial 1 + +-# This program 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 General Public License for more details. ++dnl Usage: ++dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ++AC_DEFUN([GTK_DOC_CHECK], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ dnl for overriding the documentation installation directory ++ 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]) + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++ dnl enable/disable documentation building ++ AC_ARG_ENABLE([gtk-doc], ++ AS_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [[default=no]]]),, ++ [enable_gtk_doc=no]) + +-AC_PREREQ([2.52]) ++ if test x$enable_gtk_doc = xyes; then ++ ifelse([$1],[], ++ [PKG_CHECK_EXISTS([gtk-doc],, ++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], ++ [PKG_CHECK_EXISTS([gtk-doc >= $1],, ++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) ++ fi + +-# serial 6 ++ AC_MSG_CHECKING([whether to build gtk-doc documentation]) ++ AC_MSG_RESULT($enable_gtk_doc) + +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) ++ ++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- @@ -10,7 +1574,7 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -1565,7 +1565,6 @@ +@@ -1565,7 +1330,6 @@ s390*-*linux*|sparc*-*linux*) esac ;; *64-bit*) @@ -18,7 +1582,7 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -2628,13 +2627,11 @@ +@@ -2628,13 +2392,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -33,7 +1597,7 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -2646,6 +2643,18 @@ +@@ -2646,6 +2408,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -52,7 +1616,7 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 netbsd*) version_type=sunos need_lib_prefix=no -@@ -3427,7 +3436,7 @@ +@@ -3427,7 +3201,7 @@ linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -61,7 +1625,7 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 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 -@@ -4434,7 +4443,7 @@ +@@ -4434,7 +4208,7 @@ case $host_os in ;; esac ;; @@ -70,7 +1634,7 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 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= -@@ -6126,7 +6135,7 @@ +@@ -6126,7 +5900,7 @@ AC_MSG_CHECKING([for $compiler option to ;; esac ;; @@ -79,7 +1643,7 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -6503,6 +6512,9 @@ +@@ -6503,6 +6277,9 @@ ifelse([$1],[CXX],[ cygwin* | mingw*) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; @@ -89,7 +1653,7 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; -@@ -6711,12 +6723,13 @@ +@@ -6711,12 +6488,13 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -104,7 +1668,7 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 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= -@@ -7147,7 +7160,7 @@ +@@ -7147,7 +6925,7 @@ _LT_EOF _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -113,18 +1677,195 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 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 -@@ -7825,14 +7838,16 @@ - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) - # --------------------------------------------- - m4_define([_PKG_CONFIG], --[if test -n "$$1"; then -- pkg_cv_[]$1="$$1" -- elif test -n "$PKG_CONFIG"; then -- PKG_CHECK_EXISTS([$3], -- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -- [pkg_failed=yes]) -- else -- pkg_failed=untried +@@ -7464,1137 +7242,1209 @@ AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ + ])# _LT_AC_FILE_LTDLL_C + + +-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +-# --------------------------------- +-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++# --------------------------------- ++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++ ++ ++# old names ++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) ++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) ++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++ ++# This is just to silence aclocal about the macro not being used ++ifelse([AC_DISABLE_FAST_INSTALL]) ++ ++AC_DEFUN([LT_AC_PROG_GCJ], ++[AC_CHECK_TOOL(GCJ, gcj, no) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS) ++]) ++ ++AC_DEFUN([LT_AC_PROG_RC], ++[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 # ++# macro and use it instead. # ++# LT_AC_PROG_SED ++# -------------- ++# Check for a fully-functional sed program, that truncates ++# as few characters as possible. Prefer GNU sed if found. ++AC_DEFUN([LT_AC_PROG_SED], ++[AC_MSG_CHECKING([for a sed that does not truncate output]) ++AC_CACHE_VAL(lt_cv_path_SED, ++[# Loop through the user's path and test for sed and gsed. ++# Then use that list of sed's as ones to test for truncation. ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ 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 ++ 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 ++# along with /bin/sed that truncates output. ++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++ test ! -f $lt_ac_sed && continue ++ cat /dev/null > conftest.in ++ lt_ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++ # Check for GNU sed and select it if it is found. ++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++ lt_cv_path_SED=$lt_ac_sed ++ break ++ fi ++ while true; do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >>conftest.nl ++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++ cmp -s conftest.out conftest.nl || break ++ # 10000 chars as input seems more than enough ++ test $lt_ac_count -gt 10 && break ++ lt_ac_count=`expr $lt_ac_count + 1` ++ if test $lt_ac_count -gt $lt_ac_max; then ++ lt_ac_max=$lt_ac_count ++ lt_cv_path_SED=$lt_ac_sed ++ fi ++ done ++done ++]) ++SED=$lt_cv_path_SED ++AC_SUBST([SED]) ++AC_MSG_RESULT([$SED]) ++]) ++ ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant . ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program 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 ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG ++ ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) ++ ++ ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" @@ -135,25 +1876,2040 @@ diff -urN gtk+2.0-2.14.4.old/aclocal.m4 gtk+2.0-2.14.4/aclocal.m4 + fi +else + pkg_failed=untried - fi[]dnl - ])# _PKG_CONFIG ++fi[]dnl ++])# _PKG_CONFIG ++ ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED ++ ++ ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -@@ -7876,9 +7891,9 @@ - if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then -- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) + +-# old names +-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else -- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ else + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cache/output.0 ---- gtk+2.0-2.14.4.old/autom4te.cache/output.0 1969-12-31 21:00:00.000000000 -0300 -+++ gtk+2.0-2.14.4/autom4te.cache/output.0 2008-11-04 15:37:01.000000000 -0200 -@@ -0,0 +1,37489 @@ ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + +-# This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL]) ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: + +-AC_DEFUN([LT_AC_PROG_GCJ], +-[AC_CHECK_TOOL(GCJ, gcj, no) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +- AC_SUBST(GCJFLAGS) +-]) ++$$1_PKG_ERRORS + +-AC_DEFUN([LT_AC_PROG_RC], +-[AC_CHECK_TOOL(RC, windres, no) +-]) ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + ++_PKG_TEXT ++])], ++ [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 ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. + +-# Cheap backport of AS_EXECUTABLE_P and required macros +-# from Autoconf 2.59; we should not use $as_executable_p directly. ++_PKG_TEXT + +-# _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' ++To get pkg-config, see .])], ++ [$4]) + else +- as_executable_p='test -f' +-fi +-])])# _AS_TEST_PREPARE ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES + +-# 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 ++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# 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 # +-# macro and use it instead. # +-# LT_AC_PROG_SED +-# -------------- +-# Check for a fully-functional sed program, that truncates +-# as few characters as possible. Prefer GNU sed if found. +-AC_DEFUN([LT_AC_PROG_SED], +-[AC_MSG_CHECKING([for a sed that does not truncate output]) +-AC_CACHE_VAL(lt_cv_path_SED, +-[# Loop through the user's path and test for sed and gsed. +-# Then use that list of sed's as ones to test for truncation. +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- 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 +- 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 +-# along with /bin/sed that truncates output. +-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && continue +- cat /dev/null > conftest.in +- lt_ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >conftest.in +- # Check for GNU sed and select it if it is found. +- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then +- lt_cv_path_SED=$lt_ac_sed +- break +- fi +- while true; do +- cat conftest.in conftest.in >conftest.tmp +- mv conftest.tmp conftest.in +- cp conftest.in conftest.nl +- echo >>conftest.nl +- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break +- cmp -s conftest.out conftest.nl || break +- # 10000 chars as input seems more than enough +- test $lt_ac_count -gt 10 && break +- lt_ac_count=`expr $lt_ac_count + 1` +- if test $lt_ac_count -gt $lt_ac_max; then +- lt_ac_max=$lt_ac_count +- lt_cv_path_SED=$lt_ac_sed +- fi +- done +-done +-]) +-SED=$lt_cv_path_SED +-AC_SUBST([SED]) +-AC_MSG_RESULT([$SED]) ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.10' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.10.1], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +-# Figure out how to run the assembler. -*- Autoconf -*- +- +-# serial 2 ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) + +-# Copyright 2001 Free Software Foundation, Inc. ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++[AM_AUTOMAKE_VERSION([1.10.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++# Figure out how to run the assembler. -*- Autoconf -*- + +-# This program 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 General Public License for more details. ++# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# serial 5 + + # AM_PROG_AS + # ---------- + AC_DEFUN([AM_PROG_AS], + [# By default we simply use the C compiler to build assembly code. + AC_REQUIRE([AC_PROG_CC]) +-: ${CCAS='$(CC)'} +-# Set ASFLAGS if not already set. +-: ${CCASFLAGS='$(CFLAGS)'} +-AC_SUBST(CCAS) +-AC_SUBST(CCASFLAGS)]) ++test "${CCAS+set}" = set || CCAS=$CC ++test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS ++AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) ++AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) ++_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl ++]) + +-# Add --enable-maintainer-mode option to configure. +-# From Jim Meyering ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +-# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. ++# ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. + +-# This program 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 General Public License for more details. ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. + +-# serial 2 ++# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++# This was merged into AC_PROG_CC in Autoconf. ++ ++AU_DEFUN([AM_PROG_CC_STDC], ++[AC_PROG_CC ++AC_DIAGNOSE([obsolete], [$0: ++ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon ++ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when ++ you adjust the code. You can also remove the above call to ++ AC_PROG_CC if you already called it elsewhere.]) ++am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc ++]) ++AU_DEFUN([fp_PROG_CC_STDC]) ++ ++# AM_CONDITIONAL -*- Autoconf -*- ++ ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 8 ++ ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-AC_DEFUN([AM_MAINTAINER_MODE], +-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +- dnl maintainer-mode is disabled by default +- AC_ARG_ENABLE(maintainer-mode, +-[ --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- USE_MAINTAINER_MODE=$enableval, +- USE_MAINTAINER_MODE=no) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST(MAINT)dnl +-] +-) ++# serial 9 + +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +-# Copyright 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) + +-# This program 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 General Public License for more details. ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +-# serial 2 ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + +-# @defmac AC_PROG_CC_STDC +-# @maindex PROG_CC_STDC +-# @ovindex CC +-# If the C compiler in not in ANSI C mode by default, try to add an option +-# to output variable @code{CC} to make it so. This macro tries various +-# options that select ANSI C on some system or another. It considers the +-# compiler to be in ANSI C mode if it handles function prototypes correctly. +-# +-# If you use this macro, you should check after calling it whether the C +-# compiler has been set to accept ANSI C; if not, the shell variable +-# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source +-# code in ANSI C, you can make an un-ANSIfied copy of it by using the +-# program @code{ansi2knr}, which comes with Ghostscript. +-# @end defmac +- +-AC_DEFUN([AM_PROG_CC_STDC], +-[AC_REQUIRE([AC_PROG_CC]) +-AC_BEFORE([$0], [AC_C_INLINE]) +-AC_BEFORE([$0], [AC_C_CONST]) +-dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require +-dnl a magic option to avoid problems with ANSI preprocessor commands +-dnl like #elif. +-dnl FIXME: can't do this because then AC_AIX won't work due to a +-dnl circular dependency. +-dnl AC_BEFORE([$0], [AC_PROG_CPP]) +-AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) +-AC_CACHE_VAL(am_cv_prog_cc_stdc, +-[am_cv_prog_cc_stdc=no +-ac_save_CC="$CC" +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" +- AC_TRY_COMPILE( +-[#include +-#include +-#include +-#include +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv; +-], [ +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +-], +-[am_cv_prog_cc_stdc="$ac_arg"; break]) +-done +-CC="$ac_save_CC" +-]) +-if test -z "$am_cv_prog_cc_stdc"; then +- AC_MSG_RESULT([none needed]) ++ cd .. ++ rm -rf conftest.dir + else +- AC_MSG_RESULT([$am_cv_prog_cc_stdc]) ++ am_cv_$1_dependencies_compiler_type=none + fi +-case "x$am_cv_prog_cc_stdc" in +- x|xno) ;; +- *) CC="$CC $am_cv_prog_cc_stdc" ;; +-esac ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) + ]) + +-AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC]) + +-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +-# +-# Copyright © 2004 Scott James Remnant . +-# +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program 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 +-# General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-# +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) + +-# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +-# ---------------------------------- +-AC_DEFUN([PKG_PROG_PKG_CONFIG], +-[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +-m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++ ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' + fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=m4_default([$1], [0.9.0]) +- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- PKG_CONFIG="" +- fi +- +-fi[]dnl +-])# PKG_PROG_PKG_CONFIG ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++]) + +-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +-# +-# Check to see whether a particular set of modules exists. Similar +-# to PKG_CHECK_MODULES(), but does not set variables or print errors. +-# +-# +-# Similar to PKG_CHECK_MODULES, make sure that the first instance of +-# this or PKG_CHECK_MODULES is called, or make sure to call +-# PKG_CHECK_EXISTS manually +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_EXISTS], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-if test -n "$PKG_CONFIG" && \ +- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then +- m4_ifval([$2], [$2], [:]) +-m4_ifvaln([$3], [else +- $3])dnl +-fi]) ++# Generate code to set up dependency tracking. -*- Autoconf -*- + ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +-# --------------------------------------------- +-m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried +-fi[]dnl +-])# _PKG_CONFIG ++#serial 3 + +-# _PKG_SHORT_ERRORS_SUPPORTED +-# ----------------------------- +-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi[]dnl +-])# _PKG_SHORT_ERRORS_SUPPORTED ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[for mf in $CONFIG_FILES; do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++done ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +-# [ACTION-IF-NOT-FOUND]) +-# +-# +-# Note that if there is a possibility the first call to +-# PKG_CHECK_MODULES might not happen, you should be sure to include an +-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +-# ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. + # +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_MODULES], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +- +-pkg_failed=no +-AC_MSG_CHECKING([for $1]) +- +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) + +-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +-and $1[]_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details.]) ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-if test $pkg_failed = yes; then +- _PKG_SHORT_ERRORS_SUPPORTED +- if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` +- else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++# serial 8 + +- ifelse([$4], , [AC_MSG_ERROR(dnl +-[Package requirements ($2) were not met: ++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +-$$1_PKG_ERRORS ++# Do all the work for Automake. -*- Autoconf -*- + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-_PKG_TEXT +-])], +- [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 +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. ++# serial 13 + +-_PKG_TEXT ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. + +-To get pkg-config, see .])], +- [$4]) +-else +- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS +- AC_MSG_RESULT([yes]) +- ifelse([$3], , :, [$3]) +-fi[]dnl +-])# PKG_CHECK_MODULES ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.60])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi ++fi + +-# Copyright (C) 1995-2002 Free Software Foundation, Inc. +-# Copyright (C) 2001-2003,2004 Red Hat, Inc. +-# +-# This file is free software, distributed under the terms of the GNU +-# General Public License. As a special exception to the GNU General +-# Public License, this file may be distributed as part of a program +-# that contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# This file can be copied and used freely without restrictions. It can +-# be used in projects which are not available under the GNU Public License +-# but which still want to provide support for the GNU gettext functionality. +-# +-# Macro to add for using GNU gettext. +-# Ulrich Drepper , 1995, 1996 +-# +-# Modified to never use included libintl. +-# Owen Taylor , 12/15/1998 +-# +-# Major rework to remove unused code +-# Owen Taylor , 12/11/2002 +-# +-# Added better handling of ALL_LINGUAS from GNU gettext version +-# written by Bruno Haible, Owen Taylor 5/30/3002 +-# +-# Modified to require ngettext +-# Matthias Clasen 08/06/2004 +-# +-# We need this here as well, since someone might use autoconf-2.5x +-# to configure GLib then an older version to configure a package +-# using AM_GLIB_GNU_GETTEXT +-AC_PREREQ(2.53) ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) + +-dnl +-dnl We go to great lengths to make sure that aclocal won't +-dnl try to pull in the installed version of these macros +-dnl when running aclocal in the glib directory. +-dnl +-m4_copy([AC_DEFUN],[glib_DEFUN]) +-m4_copy([AC_REQUIRE],[glib_REQUIRE]) +-dnl +-dnl At the end, if we're not within glib, we'll define the public +-dnl definitions in terms of our private definitions. +-dnl ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +-# GLIB_LC_MESSAGES +-#-------------------- +-glib_DEFUN([GLIB_LC_MESSAGES], +- [AC_CHECK_HEADERS([locale.h]) +- if test $ac_cv_header_locale_h = yes; then +- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, +- [AC_TRY_LINK([#include ], [return LC_MESSAGES], +- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) +- if test $am_cv_val_LC_MESSAGES = yes; then +- AC_DEFINE(HAVE_LC_MESSAGES, 1, +- [Define if your file defines LC_MESSAGES.]) +- fi +- fi]) ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +-# GLIB_PATH_PROG_WITH_TEST +-#---------------------------- +-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +-[# Extract the first word of "$2", so it can be a program name with args. +-set dummy $2; ac_word=[$]2 +-AC_MSG_CHECKING([for $ac_word]) +-AC_CACHE_VAL(ac_cv_path_$1, +-[case "[$]$1" in +- /*) +- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in ifelse([$5], , $PATH, [$5]); do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if [$3]; then +- ac_cv_path_$1="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-dnl If no 4th arg is given, leave the cache variable unset, +-dnl so AC_PATH_PROGS will keep looking. +-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +-])dnl +- ;; +-esac])dnl +-$1="$ac_cv_path_$1" +-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then +- AC_MSG_RESULT([$]$1) +-else +- AC_MSG_RESULT(no) +-fi +-AC_SUBST($1)dnl ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AM_PROG_INSTALL_SH ++AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++]) + ]) + +-# GLIB_WITH_NLS +-#----------------- +-glib_DEFUN([GLIB_WITH_NLS], +- dnl NLS is obligatory +- [USE_NLS=yes +- AC_SUBST(USE_NLS) + +- gt_cv_have_gettext=no ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. ++ ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_arg=$1 ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $_am_arg | $_am_arg:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- AC_CHECK_HEADER(libintl.h, +- [gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++AC_SUBST(install_sh)]) + +- # +- # First check in libc +- # +- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !ngettext ("","", 1)], +- gt_cv_func_ngettext_libc=yes, +- gt_cv_func_ngettext_libc=no) +- ]) +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !dgettext ("","")], +- gt_cv_func_dgettext_libc=yes, +- gt_cv_func_dgettext_libc=no) +- ]) +- fi +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- fi ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- # +- # If we don't have everything we want, check in libintl +- # +- if test "$gt_cv_func_dgettext_libc" != "yes" \ +- || test "$gt_cv_func_ngettext_libc" != "yes" \ +- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then +- +- AC_CHECK_LIB(intl, bindtextdomain, +- [AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dgettext, +- gt_cv_func_dgettext_libintl=yes)])]) ++# serial 2 + +- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- AC_MSG_CHECKING([if -liconv is needed to use gettext]) +- AC_MSG_RESULT([]) +- AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dcgettext, +- [gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv], +- :,-liconv)], +- :,-liconv) +- fi ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) + +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- LIBS="$glib_save_LIBS" ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering + +- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then +- gt_cv_func_dgettext_libc=no +- else +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- && test "$gt_cv_func_ngettext_libc" = "yes"; then +- gt_cv_func_dgettext_libintl=no +- fi +- fi +- fi +- fi ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- || test "$gt_cv_func_dgettext_libintl" = "yes"; then +- gt_cv_have_gettext=yes +- fi +- +- if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" +- fi +- +- if test "$gt_cv_have_gettext" = "yes"; then +- AC_DEFINE(HAVE_GETTEXT,1, +- [Define if the GNU gettext() function is already present or preinstalled.]) +- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl +- if test "$MSGFMT" != "no"; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS $INTLLIBS" +- AC_CHECK_FUNCS(dcgettext) +- MSGFMT_OPTS= +- AC_MSG_CHECKING([if msgfmt accepts -c]) +- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +-msgid "" +-msgstr "" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Project-Id-Version: test 1.0\n" +-"PO-Revision-Date: 2007-02-15 12:01+0100\n" +-"Last-Translator: test \n" +-"Language-Team: C \n" +-"MIME-Version: 1.0\n" +-"Content-Transfer-Encoding: 8bit\n" +-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) +- AC_SUBST(MSGFMT_OPTS) +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr], +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [case $host in +- *-*-solaris*) +- dnl On Solaris, if bind_textdomain_codeset is in libc, +- dnl GNU format message catalog is always supported, +- dnl since both are added to the libc all together. +- dnl Hence, we'd like to go with DATADIRNAME=share and +- dnl and CATOBJEXT=.gmo in this case. +- AC_CHECK_FUNC(bind_textdomain_codeset, +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [CATOBJEXT=.mo +- DATADIRNAME=lib]) +- ;; +- *) +- CATOBJEXT=.mo +- DATADIRNAME=lib +- ;; +- esac]) +- LIBS="$glib_save_LIBS" +- INSTOBJEXT=.mo +- else +- gt_cv_have_gettext=no +- fi +- fi +- ]) ++# serial 4 + +- if test "$gt_cv_have_gettext" = "yes" ; then +- AC_DEFINE(ENABLE_NLS, 1, +- [always defined to indicate that i18n is enabled]) +- fi ++AC_DEFUN([AM_MAINTAINER_MODE], ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST(MAINT)dnl ++] ++) + +- dnl Test whether we really found GNU xgettext. +- if test "$XGETTEXT" != ":"; then +- dnl If it is not GNU xgettext we define it as : so that the +- dnl Makefiles still can work. +- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then +- : ; +- else +- AC_MSG_RESULT( +- [found xgettext program is not GNU xgettext; ignore it]) +- XGETTEXT=":" +- fi +- fi ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +- # We need to process the po/ directory. +- POSUB=po ++# Check to see how 'make' treats includes. -*- Autoconf -*- + +- AC_OUTPUT_COMMANDS( +- [case "$CONFIG_FILES" in *po/Makefile.in*) +- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +- esac]) ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- dnl These rules are solely for the distribution goal. While doing this +- dnl we only have to keep exactly one list of the available catalogs +- dnl in configure.in. +- for lang in $ALL_LINGUAS; do +- GMOFILES="$GMOFILES $lang.gmo" +- POFILES="$POFILES $lang.po" +- done ++# serial 3 + +- dnl Make all variables we use known to autoconf. +- AC_SUBST(CATALOGS) +- AC_SUBST(CATOBJEXT) +- AC_SUBST(DATADIRNAME) +- AC_SUBST(GMOFILES) +- AC_SUBST(INSTOBJEXT) +- AC_SUBST(INTLLIBS) +- AC_SUBST(PO_IN_DATADIR_TRUE) +- AC_SUBST(PO_IN_DATADIR_FALSE) +- AC_SUBST(POFILES) +- AC_SUBST(POSUB) +- ]) ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo done ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) + +-# AM_GLIB_GNU_GETTEXT +-# ------------------- +-# Do checks necessary for use of gettext. If a suitable implementation +-# of gettext is found in either in libintl or in the C library, +-# it will set INTLLIBS to the libraries needed for use of gettext +-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +-# on various variables needed by the Makefile.in.in installed by +-# glib-gettextize. +-dnl +-glib_DEFUN([GLIB_GNU_GETTEXT], +- [AC_REQUIRE([AC_PROG_CC])dnl +- AC_REQUIRE([AC_HEADER_STDC])dnl +- +- GLIB_LC_MESSAGES +- GLIB_WITH_NLS ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +- if test "$gt_cv_have_gettext" = "yes"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- AC_MSG_CHECKING(for catalogs to be installed) +- NEW_LINGUAS= +- for presentlang in $ALL_LINGUAS; do +- useit=no +- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then +- desiredlanguages="$LINGUAS" +- else +- desiredlanguages="$ALL_LINGUAS" +- fi +- for desiredlang in $desiredlanguages; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- NEW_LINGUAS="$NEW_LINGUAS $presentlang" +- fi +- done +- LINGUAS=$NEW_LINGUAS +- AC_MSG_RESULT($LINGUAS) +- fi ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- dnl Construct list of names of catalog files to be constructed. +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +- fi +- fi ++# serial 5 + +- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly +- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). +- dnl Try to locate is. +- MKINSTALLDIRS= +- if test -n "$ac_aux_dir"; then +- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" +- fi +- if test -z "$MKINSTALLDIRS"; then +- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" +- fi +- AC_SUBST(MKINSTALLDIRS) ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) + +- dnl Generate list of files to be processed by xgettext which will +- dnl be included in po/Makefile. +- test -d po || mkdir po +- if test "x$srcdir" != "x."; then +- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then +- posrcprefix="$srcdir/" +- else +- posrcprefix="../$srcdir/" +- fi +- else +- posrcprefix="../" +- fi +- rm -f po/POTFILES +- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ +- < $srcdir/po/POTFILES.in > po/POTFILES +- ]) + +-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +-# ------------------------------- +-# Define VARIABLE to the location where catalog files will +-# be installed by po/Makefile. +-glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +-glib_save_prefix="$prefix" +-glib_save_exec_prefix="$exec_prefix" +-glib_save_datarootdir="$datarootdir" +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " + else +- localedir=`eval echo "${datadir}/locale"` ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) + fi +-prefix="$glib_save_prefix" +-exec_prefix="$glib_save_exec_prefix" +-datarootdir="$glib_save_datarootdir" +-AC_DEFINE_UNQUOTED($1, "$localedir", +- [Define the location where the catalogs will be installed]) + ]) + +-dnl +-dnl Now the definitions that aclocal will find +-dnl +-ifdef(glib_configure_in,[],[ +-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +-])dnl ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +-# +-# Create a temporary file with TEST-FILE as its contents and pass the +-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +-# 0 and perform ACTION-IF-FAIL for any other exit status. +-AC_DEFUN([GLIB_RUN_PROG], +-[cat >conftest.foo <<_ACEOF +-$2 +-_ACEOF +-if AC_RUN_LOG([$1 conftest.foo]); then +- m4_ifval([$3], [$3], [:]) +-m4_ifvaln([$4], [else $4])dnl +-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +-fi]) ++# AM_PROG_MKDIR_P ++# --------------- ++# Check for `mkdir -p'. ++AC_DEFUN([AM_PROG_MKDIR_P], ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) + ++# Helper functions for option handling. -*- Autoconf -*- + +-# Configure paths for GLIB +-# Owen Taylor 1997-2001 ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +-dnl gthread, or gio is specified in MODULES, pass to pkg-config +-dnl +-AC_DEFUN([AM_PATH_GLIB_2_0], +-[dnl +-dnl Get the cflags and libraries from pkg-config +-dnl +-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], +- , enable_glibtest=yes) ++# serial 3 + +- pkg_config_args=glib-2.0 +- for module in . $4 +- do +- case "$module" in +- gmodule) +- pkg_config_args="$pkg_config_args gmodule-2.0" +- ;; +- gmodule-no-export) +- pkg_config_args="$pkg_config_args gmodule-no-export-2.0" +- ;; +- gobject) +- pkg_config_args="$pkg_config_args gobject-2.0" +- ;; +- gthread) +- pkg_config_args="$pkg_config_args gthread-2.0" +- ;; +- gio*) +- pkg_config_args="$pkg_config_args $module-2.0" +- ;; +- esac +- done ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +- PKG_PROG_PKG_CONFIG([0.16]) ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +- no_glib="" ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +- if test "x$PKG_CONFIG" = x ; then +- no_glib=yes +- PKG_CONFIG=no +- fi ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +- min_glib_version=ifelse([$1], ,2.0.0,$1) +- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) ++# Check to make sure that the build environment is sane. -*- Autoconf -*- + +- if test x$PKG_CONFIG != xno ; then +- ## don't try to run the test against uninstalled libtool libs +- if $PKG_CONFIG --uninstalled $pkg_config_args; then +- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" +- enable_glibtest=no +- fi ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then + +- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then +- : +- else +- no_glib=yes +- fi +- fi ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi + +- if test x"$no_glib" = x ; then +- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` +- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` +- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++AC_MSG_RESULT(yes)]) + +- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` +- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` +- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` +- if test "x$enable_glibtest" = "xyes" ; then +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$GLIB_LIBS $LIBS" +-dnl +-dnl Now check if the installed GLIB is sufficiently new. (Also sanity +-dnl checks the results of pkg-config to some extent) +-dnl +- rm -f conf.glibtest +- AC_TRY_RUN([ +-#include +-#include +-#include ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-int +-main () +-{ +- int major, minor, micro; +- char *tmp_version; ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +- system ("touch conf.glibtest"); ++# Copyright (C) 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = g_strdup("$min_glib_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_glib_version"); +- exit(1); +- } ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) + +- if ((glib_major_version != $glib_config_major_version) || +- (glib_minor_version != $glib_config_minor_version) || +- (glib_micro_version != $glib_config_micro_version)) +- { +- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", +- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, +- glib_major_version, glib_minor_version, glib_micro_version); +- printf ("*** was found! If pkg-config was correct, then it is best\n"); +- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); +- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); +- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); +- printf("*** required on your system.\n"); +- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); +- printf("*** to point to the correct configuration files\n"); +- } +- else if ((glib_major_version != GLIB_MAJOR_VERSION) || +- (glib_minor_version != GLIB_MINOR_VERSION) || +- (glib_micro_version != GLIB_MICRO_VERSION)) +- { +- printf("*** GLIB header files (version %d.%d.%d) do not match\n", +- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); +- printf("*** library (version %d.%d.%d)\n", +- glib_major_version, glib_minor_version, glib_micro_version); +- } +- else +- { +- if ((glib_major_version > major) || +- ((glib_major_version == major) && (glib_minor_version > minor)) || +- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", +- glib_major_version, glib_minor_version, glib_micro_version); +- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", +- major, minor, micro); +- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); +- printf("***\n"); +- printf("*** If you have already installed a sufficiently new version, this error\n"); +- printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); +- printf("*** being found. The easiest way to fix this is to remove the old version\n"); +- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); +- printf("*** correct copy of pkg-config. (In this case, you will have to\n"); +- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); +- printf("*** so that the correct libraries are found at run-time))\n"); +- } +- } +- return 1; +-} +-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- if test "x$no_glib" = x ; then +- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) +- ifelse([$2], , :, [$2]) +- else +- AC_MSG_RESULT(no) +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** A new enough version of pkg-config was not found." +- echo "*** See http://www.freedesktop.org/software/pkgconfig/" +- else +- if test -f conf.glibtest ; then +- : +- else +- echo "*** Could not run GLIB test program, checking why..." +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$LIBS $GLIB_LIBS" +- AC_TRY_LINK([ +-#include +-#include +-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], +- [ 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" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- echo "*** If you have an old version installed, it is best to remove it, although" +- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], +- [ echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- GLIB_CFLAGS="" +- GLIB_LIBS="" +- GLIB_GENMARSHAL="" +- GOBJECT_QUERY="" +- GLIB_MKENUMS="" +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(GLIB_CFLAGS) +- AC_SUBST(GLIB_LIBS) +- AC_SUBST(GLIB_GENMARSHAL) +- AC_SUBST(GOBJECT_QUERY) +- AC_SUBST(GLIB_MKENUMS) +- rm -f conf.glibtest +-]) ++# Check how to create a tarball. -*- Autoconf -*- + +-dnl -*- mode: autoconf -*- ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# serial 1 ++# serial 2 + +-dnl Usage: +-dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +-AC_DEFUN([GTK_DOC_CHECK], +-[ +- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first +- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first +- dnl for overriding the documentation installation directory +- 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]) ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac + +- dnl enable/disable documentation building +- AC_ARG_ENABLE([gtk-doc], +- AS_HELP_STRING([--enable-gtk-doc], +- [use gtk-doc to build documentation [[default=no]]]),, +- [enable_gtk_doc=no]) ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break + +- if test x$enable_gtk_doc = xyes; then +- ifelse([$1],[], +- [PKG_CHECK_EXISTS([gtk-doc],, +- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], +- [PKG_CHECK_EXISTS([gtk-doc >= $1],, +- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi ++done ++rm -rf conftest.dir + +- AC_MSG_CHECKING([whether to build gtk-doc documentation]) +- AC_MSG_RESULT($enable_gtk_doc) +- +- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) +- +- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) +- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) +-]) ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR + ++m4_include([acinclude.m4]) +Index: gtk+-2.14.4/autom4te.cache/output.0 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gtk+-2.14.4/autom4te.cache/output.0 2008-11-11 18:55:59.204634667 +0100 +@@ -0,0 +1,38228 @@ +@%:@! /bin/sh +@%:@ Guess values for system-dependent variables and create Makefiles. +@%:@ Generated by GNU Autoconf 2.61 for gtk+ 2.14.4. @@ -965,6 +4721,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA ++am__isrc +CYGPATH_W +PACKAGE +VERSION @@ -973,13 +4730,16 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +AUTOMAKE +AUTOHEADER +MAKEINFO -+AMTAR +install_sh +STRIP +INSTALL_STRIP_PROGRAM ++mkdir_p +AWK +SET_MAKE +am__leading_dot ++AMTAR ++am__tar ++am__untar +GTK_MAJOR_VERSION +GTK_MINOR_VERSION +GTK_MICRO_VERSION @@ -1054,6 +4814,9 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +LIBTOOL +CCAS +CCASFLAGS ++CCASDEPMODE ++am__fastdepCCAS_TRUE ++am__fastdepCCAS_FALSE +NM +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE @@ -1282,6 +5045,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +CXXCPP +F77 +FFLAGS ++CCAS ++CCASFLAGS +PKG_CONFIG +BASE_DEPENDENCIES_CFLAGS +BASE_DEPENDENCIES_LIBS @@ -1869,16 +5634,16 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --disable-dependency-tracking Speeds up one-time builds -+ --enable-dependency-tracking Do not reject slow dependency extractors ++ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors + --enable-static@<:@=PKGS@:>@ build static libraries @<:@default=no@:>@ + --enable-shared@<:@=PKGS@:>@ build shared libraries @<:@default=yes@:>@ + --enable-fast-install@<:@=PKGS@:>@ + optimize for fast installation @<:@default=yes@:>@ + --disable-libtool-lock avoid locking (might break parallel builds) + --disable-largefile omit support for large files -+ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer + --enable-debug=@<:@no/minimum/yes@:>@ + turn on debugging @<:@default=minimum@:>@ + --enable-shm support shared memory if available [default=yes] @@ -1937,6 +5702,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + CXXCPP C++ preprocessor + F77 Fortran 77 compiler command + FFLAGS Fortran 77 compiler flags ++ CCAS assembler compiler command (defaults to CC) ++ CCASFLAGS assembler compiler flags (defaults to CFLAGS) + PKG_CONFIG path to pkg-config utility + BASE_DEPENDENCIES_CFLAGS + C compiler flags for BASE_DEPENDENCIES, overriding pkg-config @@ -2381,7 +6148,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +# Save this value here, since automake will set cflags later +cflags_set=${CFLAGS+set} + -+am__api_version="1.7" ++am__api_version='1.10' ++ +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then @@ -2551,7 +6319,6 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +rm -f conftest.sed + -+ +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + @@ -2565,6 +6332,54 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + ++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } ++if test -z "$MKDIR_P"; then ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in mkdir gmkdir; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( ++ 'mkdir (GNU coreutils) '* | \ ++ 'mkdir (coreutils) '* | \ ++ 'mkdir (fileutils) '4.1*) ++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext ++ break 3;; ++ esac ++ done ++ done ++done ++IFS=$as_save_IFS ++ ++fi ++ ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ MKDIR_P="$ac_cv_path_mkdir -p" ++ else ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for MKDIR_P within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ test -d ./--version && rmdir ./--version ++ MKDIR_P="$ac_install_sh -d" ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++echo "${ECHO_T}$MKDIR_P" >&6; } ++ ++mkdir_p="$MKDIR_P" ++case $mkdir_p in ++ [\\/$]* | ?:[\\/]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++ +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2646,12 +6461,16 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi +rmdir .tst 2>/dev/null + -+ # test to see if srcdir already configured -+if test "`cd $srcdir && pwd`" != "`pwd`" && -+ test -f $srcdir/config.status; then -+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ am__isrc=' -I$(srcdir)' ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } ++ fi +fi + +# test whether we have cygpath @@ -2685,10 +6504,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + -+ -+AMTAR=${AMTAR-"${am_missing_run}tar"} -+ -+install_sh=${install_sh-"$am_aux_dir/install-sh"} ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right @@ -2792,10 +6608,17 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + +fi -+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. ++# Always define AMTAR for backward compatibility. ++ ++AMTAR=${AMTAR-"${am_missing_run}tar"} ++ ++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' ++ ++ + + + @@ -3962,9 +7785,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi -+ -+ -+if test "x$enable_dependency_tracking" != xno; then ++ if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else @@ -3974,7 +7795,6 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + + -+ +depcc="$CC" am_compiler_list= + +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 @@ -4016,7 +7836,9 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ : > sub/conftst$i.h ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + @@ -4040,13 +7862,19 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings -+ # (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored. -+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi @@ -4064,9 +7892,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + -+ -+ -+if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= @@ -4102,9 +7928,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + + -+ -+ -+if test "$enable_static" = yes; then ++ if test "$enable_static" = yes; then + ENABLE_STATIC_TRUE= + ENABLE_STATIC_FALSE='#' +else @@ -4630,7 +8454,9 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ : > sub/conftst$i.h ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + @@ -4654,13 +8480,19 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings -+ # (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored. -+ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi @@ -4678,9 +8510,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + -+ -+ -+if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= @@ -4733,9 +8563,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ -+if test "$CXX" != ""; then ++ if test "$CXX" != ""; then + HAVE_CXX_TRUE= + HAVE_CXX_FALSE='#' +else @@ -4787,9 +8615,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ -+if test "$OBJC" = "yes"; then ++ if test "$OBJC" = "yes"; then + HAVE_OBJC_TRUE= + HAVE_OBJC_FALSE='#' +else @@ -21134,9 +24960,117 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + +# By default we simply use the C compiler to build assembly code. + -+: ${CCAS='$(CC)'} -+# Set ASFLAGS if not already set. -+: ${CCASFLAGS='$(CFLAGS)'} ++test "${CCAS+set}" = set || CCAS=$CC ++test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS ++ ++ ++ ++depcc="$CCAS" am_compiler_list= ++ ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CCAS_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CCAS_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CCAS_dependencies_compiler_type=none ++fi ++ ++fi ++{ echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CCAS_dependencies_compiler_type" >&6; } ++CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then ++ am__fastdepCCAS_TRUE= ++ am__fastdepCCAS_FALSE='#' ++else ++ am__fastdepCCAS_TRUE='#' ++ am__fastdepCCAS_FALSE= ++fi + + +# Extract the first word of "nm", so it can be a program name with args. @@ -21192,9 +25126,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } -+ -+ -+if test $USE_MAINTAINER_MODE = yes; then ++ if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else @@ -21218,9 +25150,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +esac +{ echo "$as_me:$LINENO: result: $platform_win32" >&5 +echo "${ECHO_T}$platform_win32" >&6; } -+ -+ -+if test "$platform_win32" = "yes"; then ++ if test "$platform_win32" = "yes"; then + PLATFORM_WIN32_TRUE= + PLATFORM_WIN32_FALSE='#' +else @@ -21229,9 +25159,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + + -+ -+ -+if test "$os_win32" = "yes"; then ++ if test "$os_win32" = "yes"; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' +else @@ -21239,9 +25167,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + OS_WIN32_FALSE= +fi + -+ -+ -+if test "$os_win32" != "yes"; then ++ if test "$os_win32" != "yes"; then + OS_UNIX_TRUE= + OS_UNIX_FALSE='#' +else @@ -21249,9 +25175,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + OS_UNIX_FALSE= +fi + -+ -+ -+if test "$os_linux" = "yes"; then ++ if test "$os_linux" = "yes"; then + OS_LINUX_TRUE= + OS_LINUX_FALSE='#' +else @@ -21401,9 +25325,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + +fi -+ -+ -+if test x$ms_librarian = xyes; then ++ if test x$ms_librarian = xyes; then + MS_LIB_AVAILABLE_TRUE= + MS_LIB_AVAILABLE_FALSE='#' +else @@ -21646,32 +25568,574 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + +fi + -+ -+ -+ -+{ echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 -+echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6; } -+if test "${am_cv_prog_cc_stdc+set}" = set; then ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -+ am_cv_prog_cc_stdc=no -+ac_save_CC="$CC" -+# Don't try gcc -ansi; that turns off useful extensions and -+# breaks some systems' header files. -+# AIX -qlanglvl=ansi -+# Ultrix and OSF/1 -std1 -+# HP-UX 10.20 and later -Ae -+# HP-UX older versions -Aa -D_HPUX_SOURCE -+# SVR4 -Xc -D__EXTENSIONS__ -+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH +do -+ CC="$ac_save_CC $ac_arg" ++ 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_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ fi ++fi ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ ac_prog_rejected=no ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++ ac_cv_prog_CC="cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $@%:@ != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi ++fi ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&5 ++echo "$as_me: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ ++# Provide some information about the compiler. ++echo "$as_me:$LINENO: checking for C compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_compiler_gnu=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } ++GCC=`test $ac_compiler_gnu = yes && echo yes` ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ +#include +#include +#include @@ -21694,24 +26158,40 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + va_end (v); + return s; +} ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; -+ +int +main () +{ -+ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -+ + ; + return 0; +} +_ACEOF -+rm -f conftest.$ac_objext ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -21728,7 +26208,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then -+ am_cv_prog_cc_stdc="$ac_arg"; break ++ ac_cv_prog_cc_c89=$ac_arg +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 @@ -21736,24 +26216,145 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + +fi + -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break +done -+CC="$ac_save_CC" ++rm -f conftest.$ac_ext ++CC=$ac_save_CC + +fi -+ -+if test -z "$am_cv_prog_cc_stdc"; then -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } -+else -+ { echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 -+echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6; } -+fi -+case "x$am_cv_prog_cc_stdc" in -+ x|xno) ;; -+ *) CC="$CC $am_cv_prog_cc_stdc" ;; ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; ++ xno) ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; +esac + ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++depcc="$CC" am_compiler_list= ++ ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CC_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CC_dependencies_compiler_type=none ++fi ++ ++fi ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ ++ ++ ++am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc ++ +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: @@ -22207,9 +26808,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 +echo "${ECHO_T}$enable_explicit_deps" >&6; } + -+ -+ -+if test $enable_explicit_deps = no; then ++ if test $enable_explicit_deps = no; then + DISABLE_EXPLICIT_DEPS_TRUE= + DISABLE_EXPLICIT_DEPS_FALSE='#' +else @@ -27559,9 +32158,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + + -+ -+ -+if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then ++ if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then + BUILD_GDIPLUS_LOADERS_TRUE= + BUILD_GDIPLUS_LOADERS_FALSE='#' +else @@ -28777,9 +33374,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + + -+ -+ -+if $dynworks; then ++ if $dynworks; then + BUILD_DYNAMIC_MODULES_TRUE= + BUILD_DYNAMIC_MODULES_FALSE='#' +else @@ -28872,9 +33467,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + + -+ -+ -+if test x"$INCLUDE_png" = xyes; then ++ if test x"$INCLUDE_png" = xyes; then + INCLUDE_PNG_TRUE= + INCLUDE_PNG_FALSE='#' +else @@ -28882,9 +33475,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_PNG_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_bmp" = xyes; then ++ if test x"$INCLUDE_bmp" = xyes; then + INCLUDE_BMP_TRUE= + INCLUDE_BMP_FALSE='#' +else @@ -28892,9 +33483,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_BMP_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_wbmp" = xyes; then ++ if test x"$INCLUDE_wbmp" = xyes; then + INCLUDE_WBMP_TRUE= + INCLUDE_WBMP_FALSE='#' +else @@ -28902,9 +33491,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_WBMP_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_gif" = xyes; then ++ if test x"$INCLUDE_gif" = xyes; then + INCLUDE_GIF_TRUE= + INCLUDE_GIF_FALSE='#' +else @@ -28912,9 +33499,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_GIF_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_ico" = xyes; then ++ if test x"$INCLUDE_ico" = xyes; then + INCLUDE_ICO_TRUE= + INCLUDE_ICO_FALSE='#' +else @@ -28922,9 +33507,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_ICO_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_ani" = xyes; then ++ if test x"$INCLUDE_ani" = xyes; then + INCLUDE_ANI_TRUE= + INCLUDE_ANI_FALSE='#' +else @@ -28932,9 +33515,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_ANI_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_jpeg" = xyes; then ++ if test x"$INCLUDE_jpeg" = xyes; then + INCLUDE_JPEG_TRUE= + INCLUDE_JPEG_FALSE='#' +else @@ -28942,9 +33523,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_JPEG_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_pnm" = xyes; then ++ if test x"$INCLUDE_pnm" = xyes; then + INCLUDE_PNM_TRUE= + INCLUDE_PNM_FALSE='#' +else @@ -28952,9 +33531,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_PNM_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_ras" = xyes; then ++ if test x"$INCLUDE_ras" = xyes; then + INCLUDE_RAS_TRUE= + INCLUDE_RAS_FALSE='#' +else @@ -28962,9 +33539,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_RAS_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_tiff" = xyes; then ++ if test x"$INCLUDE_tiff" = xyes; then + INCLUDE_TIFF_TRUE= + INCLUDE_TIFF_FALSE='#' +else @@ -28972,9 +33547,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_TIFF_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_xpm" = xyes; then ++ if test x"$INCLUDE_xpm" = xyes; then + INCLUDE_XPM_TRUE= + INCLUDE_XPM_FALSE='#' +else @@ -28982,9 +33555,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_XPM_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_xbm" = xyes; then ++ if test x"$INCLUDE_xbm" = xyes; then + INCLUDE_XBM_TRUE= + INCLUDE_XBM_FALSE='#' +else @@ -28992,9 +33563,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_XBM_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_tga" = xyes; then ++ if test x"$INCLUDE_tga" = xyes; then + INCLUDE_TGA_TRUE= + INCLUDE_TGA_FALSE='#' +else @@ -29002,9 +33571,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_TGA_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_pcx" = xyes; then ++ if test x"$INCLUDE_pcx" = xyes; then + INCLUDE_PCX_TRUE= + INCLUDE_PCX_FALSE='#' +else @@ -29012,9 +33579,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_PCX_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_icns" = xyes; then ++ if test x"$INCLUDE_icns" = xyes; then + INCLUDE_ICNS_TRUE= + INCLUDE_ICNS_FALSE='#' +else @@ -29022,9 +33587,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_ICNS_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_jasper" = xyes; then ++ if test x"$INCLUDE_jasper" = xyes; then + INCLUDE_JASPER_TRUE= + INCLUDE_JASPER_FALSE='#' +else @@ -29034,9 +33597,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + +# As all GDI+ loaders are either built-in or not, arbitrarily just +# check one of the variables here -+ -+ -+if test x"$INCLUDE_gdip_ico" = xyes; then ++ if test x"$INCLUDE_gdip_ico" = xyes; then + INCLUDE_GDIPLUS_TRUE= + INCLUDE_GDIPLUS_FALSE='#' +else @@ -29180,9 +33741,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + +{ echo "$as_me:$LINENO: result: $included_immodules" >&5 +echo "${ECHO_T}$included_immodules" >&6; } -+ -+ -+if test "x$included_immodules" != x; then ++ if test "x$included_immodules" != x; then + HAVE_INCLUDED_IMMMODULES_TRUE= + HAVE_INCLUDED_IMMMODULES_FALSE='#' +else @@ -29213,9 +33772,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + + -+ -+ -+if test x"$INCLUDE_am_et" = xyes; then ++ if test x"$INCLUDE_am_et" = xyes; then + INCLUDE_IM_AM_ET_TRUE= + INCLUDE_IM_AM_ET_FALSE='#' +else @@ -29223,9 +33780,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_AM_ET_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_cedilla" = xyes; then ++ if test x"$INCLUDE_cedilla" = xyes; then + INCLUDE_IM_CEDILLA_TRUE= + INCLUDE_IM_CEDILLA_FALSE='#' +else @@ -29233,9 +33788,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_CEDILLA_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_cyrillic_translit" = xyes; then ++ if test x"$INCLUDE_cyrillic_translit" = xyes; then + INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= + INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' +else @@ -29243,9 +33796,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_ime" = xyes; then ++ if test x"$INCLUDE_ime" = xyes; then + INCLUDE_IM_IME_TRUE= + INCLUDE_IM_IME_FALSE='#' +else @@ -29253,9 +33804,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_IME_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_inuktitut" = xyes; then ++ if test x"$INCLUDE_inuktitut" = xyes; then + INCLUDE_IM_INUKTITUT_TRUE= + INCLUDE_IM_INUKTITUT_FALSE='#' +else @@ -29263,9 +33812,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_INUKTITUT_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_ipa" = xyes; then ++ if test x"$INCLUDE_ipa" = xyes; then + INCLUDE_IM_IPA_TRUE= + INCLUDE_IM_IPA_FALSE='#' +else @@ -29273,9 +33820,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_IPA_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_multipress" = xyes; then ++ if test x"$INCLUDE_multipress" = xyes; then + INCLUDE_IM_MULTIPRESS_TRUE= + INCLUDE_IM_MULTIPRESS_FALSE='#' +else @@ -29283,9 +33828,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_MULTIPRESS_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_thai" = xyes; then ++ if test x"$INCLUDE_thai" = xyes; then + INCLUDE_IM_THAI_TRUE= + INCLUDE_IM_THAI_FALSE='#' +else @@ -29293,9 +33836,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_THAI_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_ti_er" = xyes; then ++ if test x"$INCLUDE_ti_er" = xyes; then + INCLUDE_IM_TI_ER_TRUE= + INCLUDE_IM_TI_ER_FALSE='#' +else @@ -29303,9 +33844,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_TI_ER_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_ti_et" = xyes; then ++ if test x"$INCLUDE_ti_et" = xyes; then + INCLUDE_IM_TI_ET_TRUE= + INCLUDE_IM_TI_ET_FALSE='#' +else @@ -29313,9 +33852,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_TI_ET_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_viqr" = xyes; then ++ if test x"$INCLUDE_viqr" = xyes; then + INCLUDE_IM_VIQR_TRUE= + INCLUDE_IM_VIQR_FALSE='#' +else @@ -29323,9 +33860,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + INCLUDE_IM_VIQR_FALSE= +fi + -+ -+ -+if test x"$INCLUDE_xim" = xyes; then ++ if test x"$INCLUDE_xim" = xyes; then + INCLUDE_IM_XIM_TRUE= + INCLUDE_IM_XIM_FALSE='#' +else @@ -29460,9 +33995,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + + -+ -+ -+if test "x$LIBTIFF" != x; then ++ if test "x$LIBTIFF" != x; then + HAVE_TIFF_TRUE= + HAVE_TIFF_FALSE='#' +else @@ -29470,9 +34003,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + HAVE_TIFF_FALSE= +fi + -+ -+ -+if test "x$LIBPNG" != x; then ++ if test "x$LIBPNG" != x; then + HAVE_PNG_TRUE= + HAVE_PNG_FALSE='#' +else @@ -29480,9 +34011,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + HAVE_PNG_FALSE= +fi + -+ -+ -+if test "x$LIBJPEG" != x; then ++ if test "x$LIBJPEG" != x; then + HAVE_JPEG_TRUE= + HAVE_JPEG_FALSE='#' +else @@ -29490,9 +34019,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + HAVE_JPEG_FALSE= +fi + -+ -+ -+if test "x$LIBJASPER" != x; then ++ if test "x$LIBJASPER" != x; then + HAVE_JASPER_TRUE= + HAVE_JASPER_FALSE='#' +else @@ -29957,9 +34484,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + fi +fi -+ -+ -+if test $use_mlib = yes; then ++ if test $use_mlib = yes; then + USE_MEDIALIB_TRUE= + USE_MEDIALIB_FALSE='#' +else @@ -29967,9 +34492,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + USE_MEDIALIB_FALSE= +fi + -+ -+ -+if test $use_mlib25 = yes; then ++ if test $use_mlib25 = yes; then + USE_MEDIALIB25_TRUE= + USE_MEDIALIB25_FALSE='#' +else @@ -30029,9 +34552,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + fi +fi + -+ -+ -+if test x$use_mmx_asm = xyes; then ++ if test x$use_mmx_asm = xyes; then + USE_MMX_TRUE= + USE_MMX_FALSE='#' +else @@ -30046,9 +34567,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + + -+ -+ -+if test $cross_compiling = yes; then ++ if test $cross_compiling = yes; then + CROSS_COMPILING_TRUE= + CROSS_COMPILING_FALSE='#' +else @@ -32121,9 +36640,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +_ACEOF + + fi -+ -+ -+if $have_x11r6; then ++ if $have_x11r6; then + HAVE_X11R6_TRUE= + HAVE_X11R6_FALSE='#' +else @@ -33338,9 +37855,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + fi + -+ -+ -+if test x$with_xinput = xxfree || test x$with_xinput = xyes; then ++ if test x$with_xinput = xxfree || test x$with_xinput = xyes; then + XINPUT_XFREE_TRUE= + XINPUT_XFREE_FALSE='#' +else @@ -33420,9 +37935,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + CPPFLAGS="$gtk_save_cppflags" + LIBS="$gtk_save_libs" + -+ -+ -+if true; then ++ if true; then + USE_X11_TRUE= + USE_X11_FALSE='#' +else @@ -33431,9 +37944,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + +else -+ -+ -+if false; then ++ if false; then + XINPUT_XFREE_TRUE= + XINPUT_XFREE_FALSE='#' +else @@ -33441,9 +37952,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + XINPUT_XFREE_FALSE= +fi + -+ -+ -+if false; then ++ if false; then + USE_X11_TRUE= + USE_X11_FALSE='#' +else @@ -33451,9 +37960,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + USE_X11_FALSE= +fi + -+ -+ -+if false; then ++ if false; then + HAVE_X11R6_TRUE= + HAVE_X11R6_FALSE='#' +else @@ -33465,9 +37972,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + +if test "x$gdktarget" = "xwin32"; then + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" -+ -+ -+if true; then ++ if true; then + USE_WIN32_TRUE= + USE_WIN32_FALSE='#' +else @@ -33476,9 +37981,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + +else -+ -+ -+if false; then ++ if false; then + USE_WIN32_TRUE= + USE_WIN32_FALSE='#' +else @@ -33490,9 +37993,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + +if test "x$gdktarget" = "xquartz"; then + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" -+ -+ -+if true; then ++ if true; then + USE_QUARTZ_TRUE= + USE_QUARTZ_FALSE='#' +else @@ -33501,9 +38002,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + +else -+ -+ -+if false; then ++ if false; then + USE_QUARTZ_TRUE= + USE_QUARTZ_FALSE='#' +else @@ -33530,18 +38029,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + 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; } -+ # 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" ++ GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" ++ GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" + else + { { echo "$as_me:$LINENO: error: +*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend @@ -33556,9 +38045,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + { (exit 1); exit 1; }; } + fi + -+ -+ -+if true; then ++ if true; then + USE_DIRECTFB_TRUE= + USE_DIRECTFB_FALSE='#' +else @@ -33567,9 +38054,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + +else -+ -+ -+if false; then ++ if false; then + USE_DIRECTFB_TRUE= + USE_DIRECTFB_FALSE='#' +else @@ -33677,7 +38162,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +CFLAGS="$saved_cflags" +LDFLAGS="$saved_ldflags" + -+GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES gio-2.0" ++GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" +if test "x$gdktarget" = "xx11"; then + GDK_PRIVATE_PACKAGES="$X_PACKAGES" +fi @@ -34427,9 +38912,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + + + fi -+ -+ -+if test "x$CUPS_CONFIG" != "xno"; then ++ if test "x$CUPS_CONFIG" != "xno"; then + HAVE_CUPS_TRUE= + HAVE_CUPS_FALSE='#' +else @@ -34588,9 +39071,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + LIBS="$gtk_save_libs" + +else -+ -+ -+if false; then ++ if false; then + HAVE_CUPS_TRUE= + HAVE_CUPS_FALSE='#' +else @@ -34903,9 +39384,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + enable_test_print_backend=no +fi + -+ -+ -+if test "x$enable_test_print_backend" != "xno"; then ++ if test "x$enable_test_print_backend" != "xno"; then + TEST_PRINT_BACKEND_TRUE= + TEST_PRINT_BACKEND_FALSE='#' +else @@ -35028,9 +39507,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +done + + -+ -+ -+if test x$enable_gtk_doc = xyes; then ++ if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' +else @@ -35038,9 +39515,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + ENABLE_GTK_DOC_FALSE= +fi + -+ -+ -+if test -n "$LIBTOOL"; then ++ if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' +else @@ -35088,9 +39563,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +fi + + -+ -+ -+if $DB2HTML; then ++ if $DB2HTML; then + HAVE_DOCBOOK_TRUE= + HAVE_DOCBOOK_FALSE='#' +else @@ -35264,9 +39737,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + +fi + -+ -+ -+if test x$enable_man != xno; then ++ if test x$enable_man != xno; then + ENABLE_MAN_TRUE= + ENABLE_MAN_FALSE='#' +else @@ -35424,6 +39895,13 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi ++if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 @@ -35466,6 +39944,13 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi +if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 @@ -36250,6 +40735,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' ++MKDIR_P='$MKDIR_P' +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF @@ -36562,6 +41048,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim ++am__isrc!$am__isrc$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim @@ -36570,13 +41057,16 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim -+AMTAR!$AMTAR$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim ++mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim ++AMTAR!$AMTAR$ac_delim ++am__tar!$am__tar$ac_delim ++am__untar!$am__untar$ac_delim +GTK_MAJOR_VERSION!$GTK_MAJOR_VERSION$ac_delim +GTK_MINOR_VERSION!$GTK_MINOR_VERSION$ac_delim +GTK_MICRO_VERSION!$GTK_MICRO_VERSION$ac_delim @@ -36615,10 +41105,6 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim -+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -+CCDEPMODE!$CCDEPMODE$ac_delim -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -36660,6 +41146,10 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim ++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim +ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim +CXX!$CXX$ac_delim @@ -36692,6 +41182,9 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +LIBTOOL!$LIBTOOL$ac_delim +CCAS!$CCAS$ac_delim +CCASFLAGS!$CCASFLAGS$ac_delim ++CCASDEPMODE!$CCASDEPMODE$ac_delim ++am__fastdepCCAS_TRUE!$am__fastdepCCAS_TRUE$ac_delim ++am__fastdepCCAS_FALSE!$am__fastdepCCAS_FALSE$ac_delim +NM!$NM$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim @@ -36750,13 +41243,6 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +LIBJASPER!$LIBJASPER$ac_delim +BUILD_DYNAMIC_MODULES_TRUE!$BUILD_DYNAMIC_MODULES_TRUE$ac_delim +BUILD_DYNAMIC_MODULES_FALSE!$BUILD_DYNAMIC_MODULES_FALSE$ac_delim -+INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim -+INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim -+INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim -+INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim -+INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim -+INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim -+INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -36798,6 +41284,13 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim ++INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim ++INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim ++INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim ++INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim ++INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim ++INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim +INCLUDE_WBMP_FALSE!$INCLUDE_WBMP_FALSE$ac_delim +INCLUDE_GIF_TRUE!$INCLUDE_GIF_TRUE$ac_delim +INCLUDE_GIF_FALSE!$INCLUDE_GIF_FALSE$ac_delim @@ -36888,13 +41381,6 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +USE_WIN32_TRUE!$USE_WIN32_TRUE$ac_delim +USE_WIN32_FALSE!$USE_WIN32_FALSE$ac_delim +USE_QUARTZ_TRUE!$USE_QUARTZ_TRUE$ac_delim -+USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim -+GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim -+GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim -+GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim -+USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -36936,6 +41422,13 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim ++GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim ++GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim ++USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim +USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim +GDK_PACKAGES!$GDK_PACKAGES$ac_delim +GDK_PRIVATE_PACKAGES!$GDK_PRIVATE_PACKAGES$ac_delim @@ -36988,7 +41481,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -37215,6 +41708,11 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF @@ -37268,6 +41766,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t ++s&@MKDIR_P@&$ac_MKDIR_P&;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 -f "$tmp/subs-4.sed" >$tmp/out + @@ -37383,21 +41882,22 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + fi + rm -f "$tmp/out12" +# Compute $ac_file's index in $config_headers. ++_am_arg=$ac_file +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in -+ $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done -+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X$ac_file : 'X\(//\)[^/]' \| \ -+ X$ac_file : 'X\(//\)$' \| \ -+ X$ac_file : 'X\(/\)' \| . 2>/dev/null || -+echo X$ac_file | ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q @@ -37432,8 +41932,9 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. -+ # So let's grep whole file. -+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ @@ -37460,27 +41961,21 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + else + continue + fi -+ grep '^DEP_FILES *= *[^ @%:@]' < "$mf" > /dev/null || continue -+ # Extract the definition of DEP_FILES from the Makefile without -+ # running `make'. -+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it -+ U=`sed -n -e '/^U = / s///p' < "$mf"` -+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -+ # We invoke sed twice because it is the simplest approach to -+ # changing $(DEPDIR) to its actual value in the expansion. -+ for file in `sed -n -e ' -+ /^DEP_FILES = .*\\\\$/ { -+ s/^DEP_FILES = // -+ :loop -+ s/\\\\$// -+ p -+ n -+ /\\\\$/ b loop -+ p -+ } -+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue @@ -37643,10 +42138,11 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/output.0 gtk+2.0-2.14.4/autom4te.cac + +echo "configuration: + target: $gdktarget" -diff -urN gtk+2.0-2.14.4.old/autom4te.cache/requests gtk+2.0-2.14.4/autom4te.cache/requests ---- gtk+2.0-2.14.4.old/autom4te.cache/requests 1969-12-31 21:00:00.000000000 -0300 -+++ gtk+2.0-2.14.4/autom4te.cache/requests 2008-11-04 15:37:03.000000000 -0200 -@@ -0,0 +1,64 @@ +Index: gtk+-2.14.4/autom4te.cache/requests +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gtk+-2.14.4/autom4te.cache/requests 2008-11-11 18:56:18.936634196 +0100 +@@ -0,0 +1,239 @@ +# This file was generated by Autom4te Mon Aug 11 20:59:21 PDT 2008. +# It contains the lists of macros which have been traced. +# It can be safely removed. @@ -37664,15 +42160,15 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/requests gtk+2.0-2.14.4/autom4te.cac + 'configure.in' + ], + { -+ 'AM_PROG_F77_C_O' => 1, + '_LT_AC_TAGCONFIG' => 1, -+ 'm4_pattern_forbid' => 1, ++ 'AM_PROG_F77_C_O' => 1, + 'AC_INIT' => 1, ++ 'm4_pattern_forbid' => 1, + 'AC_CANONICAL_TARGET' => 1, -+ 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_SUBST' => 1, -+ 'AC_CANONICAL_HOST' => 1, ++ 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_FC_SRCEXT' => 1, ++ 'AC_CANONICAL_HOST' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_CONFIG_SUBDIRS' => 1, @@ -37680,8 +42176,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/requests gtk+2.0-2.14.4/autom4te.cac + 'LT_CONFIG_LTDL_DIR' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'AC_CONFIG_LINKS' => 1, -+ 'LT_SUPPORTED_TAG' => 1, + 'm4_sinclude' => 1, ++ 'LT_SUPPORTED_TAG' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + '_m4_warn' => 1, @@ -37698,24 +42194,200 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/requests gtk+2.0-2.14.4/autom4te.cac + 'AH_OUTPUT' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_CONFIG_AUX_DIR' => 1, -+ 'AM_PROG_CC_C_O' => 1, -+ 'm4_pattern_allow' => 1, + 'sinclude' => 1, -+ 'AM_CONDITIONAL' => 1, ++ 'm4_pattern_allow' => 1, ++ 'AM_PROG_CC_C_O' => 1, + 'AC_CANONICAL_SYSTEM' => 1, ++ 'AM_CONDITIONAL' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'm4_include' => 1, + 'AC_SUBST_TRACE' => 1 + } ++ ], 'Autom4te::Request' ), ++ bless( [ ++ '1', ++ 1, ++ [ ++ '/usr/share/autoconf' ++ ], ++ [ ++ '/usr/share/autoconf/autoconf/autoconf.m4f', ++ '/usr/share/aclocal/glib-2.0.m4', ++ '/usr/share/aclocal/glib-gettext.m4', ++ '/usr/share/aclocal/gtk-doc.m4', ++ '/usr/share/aclocal/libtool.m4', ++ '/usr/share/aclocal/pkg.m4', ++ '/usr/share/aclocal-1.10/amversion.m4', ++ '/usr/share/aclocal-1.10/as.m4', ++ '/usr/share/aclocal-1.10/auxdir.m4', ++ '/usr/share/aclocal-1.10/ccstdc.m4', ++ '/usr/share/aclocal-1.10/cond.m4', ++ '/usr/share/aclocal-1.10/depend.m4', ++ '/usr/share/aclocal-1.10/depout.m4', ++ '/usr/share/aclocal-1.10/header.m4', ++ '/usr/share/aclocal-1.10/init.m4', ++ '/usr/share/aclocal-1.10/install-sh.m4', ++ '/usr/share/aclocal-1.10/lead-dot.m4', ++ '/usr/share/aclocal-1.10/maintainer.m4', ++ '/usr/share/aclocal-1.10/make.m4', ++ '/usr/share/aclocal-1.10/missing.m4', ++ '/usr/share/aclocal-1.10/mkdirp.m4', ++ '/usr/share/aclocal-1.10/options.m4', ++ '/usr/share/aclocal-1.10/runlog.m4', ++ '/usr/share/aclocal-1.10/sanity.m4', ++ '/usr/share/aclocal-1.10/strip.m4', ++ '/usr/share/aclocal-1.10/substnot.m4', ++ '/usr/share/aclocal-1.10/tar.m4', ++ 'acinclude.m4', ++ 'configure.in' ++ ], ++ { ++ 'AM_ENABLE_STATIC' => 1, ++ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, ++ '_LT_AC_SHELL_INIT' => 1, ++ 'AC_DEFUN' => 1, ++ 'AC_PROG_LIBTOOL' => 1, ++ '_LT_AC_LANG_CXX_CONFIG' => 1, ++ 'AM_PROG_MKDIR_P' => 1, ++ 'AM_AUTOMAKE_VERSION' => 1, ++ 'AM_MISSING_PROG' => 1, ++ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, ++ '_LT_AC_LANG_C_CONFIG' => 1, ++ 'AM_PROG_INSTALL_STRIP' => 1, ++ '_m4_warn' => 1, ++ 'AC_LIBTOOL_OBJDIR' => 1, ++ 'AM_SANITY_CHECK' => 1, ++ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, ++ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, ++ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, ++ '_LT_AC_CHECK_DLFCN' => 1, ++ '_AM_PROG_TAR' => 1, ++ 'AC_LIBTOOL_GCJ' => 1, ++ '_LT_AC_LANG_F77' => 1, ++ 'AC_LIBTOOL_CONFIG' => 1, ++ '_AM_SUBST_NOTMAKE' => 1, ++ '_AM_AUTOCONF_VERSION' => 1, ++ 'JH_PATH_XML_CATALOG' => 1, ++ 'AM_DISABLE_SHARED' => 1, ++ '_LT_AC_LANG_CXX' => 1, ++ 'AM_PROG_LIBTOOL' => 1, ++ '_LT_AC_FILE_LTDLL_C' => 1, ++ 'AM_PROG_LD' => 1, ++ 'AU_DEFUN' => 1, ++ 'AC_PROG_NM' => 1, ++ 'AC_LIBTOOL_DLOPEN' => 1, ++ 'AC_PROG_LD' => 1, ++ 'AC_ENABLE_FAST_INSTALL' => 1, ++ 'AC_PROG_LD_GNU' => 1, ++ '_AM_SET_OPTION' => 1, ++ '_LT_LINKER_BOILERPLATE' => 1, ++ 'AC_LIBTOOL_PROG_CC_C_O' => 1, ++ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, ++ 'GLIB_RUN_PROG' => 1, ++ 'JH_CHECK_XML_CATALOG' => 1, ++ 'GTK_ADD_LIB' => 1, ++ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, ++ 'AC_DEFUN_ONCE' => 1, ++ '_LT_AC_LANG_GCJ' => 1, ++ 'AM_PATH_GLIB_2_0' => 1, ++ 'fp_PROG_CC_STDC' => 1, ++ 'AC_LIBTOOL_RC' => 1, ++ '_LT_AC_PROG_ECHO_BACKSLASH' => 1, ++ 'AC_DISABLE_FAST_INSTALL' => 1, ++ 'include' => 1, ++ '_LT_AC_SYS_LIBPATH_AIX' => 1, ++ '_LT_AC_TRY_DLOPEN_SELF' => 1, ++ 'LT_AC_PROG_SED' => 1, ++ 'AM_ENABLE_SHARED' => 1, ++ '_LT_AC_LANG_GCJ_CONFIG' => 1, ++ 'AC_ENABLE_SHARED' => 1, ++ '_LT_REQUIRED_DARWIN_CHECKS' => 1, ++ 'AC_ENABLE_STATIC' => 1, ++ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, ++ '_LT_AC_TAGVAR' => 1, ++ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, ++ 'AM_CONDITIONAL' => 1, ++ 'm4_include' => 1, ++ 'AM_PROG_INSTALL_SH' => 1, ++ 'AC_PROG_EGREP' => 1, ++ 'AC_PATH_MAGIC' => 1, ++ '_AC_AM_CONFIG_HEADER_HOOK' => 1, ++ 'AM_MAKE_INCLUDE' => 1, ++ '_LT_AC_TAGCONFIG' => 1, ++ 'm4_pattern_forbid' => 1, ++ 'AC_LIBTOOL_COMPILER_OPTION' => 1, ++ 'AC_DISABLE_SHARED' => 1, ++ '_LT_COMPILER_BOILERPLATE' => 1, ++ 'AC_LIBTOOL_WIN32_DLL' => 1, ++ 'AC_LIBTOOL_SETUP' => 1, ++ 'AM_GLIB_GNU_GETTEXT' => 1, ++ 'AC_PROG_LD_RELOAD_FLAG' => 1, ++ 'AM_MISSING_HAS_RUN' => 1, ++ 'AC_LIBTOOL_DLOPEN_SELF' => 1, ++ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, ++ '_PKG_SHORT_ERRORS_SUPPORTED' => 1, ++ 'AC_LIBTOOL_LINKER_OPTION' => 1, ++ 'PKG_CHECK_EXISTS' => 1, ++ 'LT_AC_PROG_RC' => 1, ++ 'AC_LIBTOOL_CXX' => 1, ++ 'LT_AC_PROG_GCJ' => 1, ++ '_LT_AC_PROG_CXXCPP' => 1, ++ 'AM_DEP_TRACK' => 1, ++ 'AM_DISABLE_STATIC' => 1, ++ '_AC_PROG_LIBTOOL' => 1, ++ 'AM_CONFIG_HEADER' => 1, ++ 'AM_PROG_CC_STDC' => 1, ++ '_AM_IF_OPTION' => 1, ++ 'AC_PATH_TOOL_PREFIX' => 1, ++ 'm4_pattern_allow' => 1, ++ 'AC_LIBTOOL_F77' => 1, ++ 'AM_SET_LEADING_DOT' => 1, ++ '_AM_DEPENDENCIES' => 1, ++ 'AC_LIBTOOL_LANG_C_CONFIG' => 1, ++ '_LT_AC_SYS_COMPILER' => 1, ++ 'AM_PROG_NM' => 1, ++ 'PKG_CHECK_MODULES' => 1, ++ 'AC_LIBLTDL_CONVENIENCE' => 1, ++ 'AC_DEPLIBS_CHECK_METHOD' => 1, ++ 'jm_MAINTAINER_MODE' => 1, ++ 'AC_LIBLTDL_INSTALLABLE' => 1, ++ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, ++ 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, ++ 'AM_GLIB_DEFINE_LOCALEDIR' => 1, ++ 'AM_INIT_AUTOMAKE' => 1, ++ 'AC_DISABLE_STATIC' => 1, ++ 'AM_MAINTAINER_MODE' => 1, ++ '_LT_AC_LOCK' => 1, ++ '_LT_AC_LANG_RC_CONFIG' => 1, ++ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, ++ 'GTK_DOC_CHECK' => 1, ++ 'AM_PROG_AS' => 1, ++ 'AM_AUX_DIR_EXPAND' => 1, ++ '_LT_AC_LANG_F77_CONFIG' => 1, ++ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, ++ '_AM_SET_OPTIONS' => 1, ++ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, ++ 'AM_RUN_LOG' => 1, ++ 'AC_LIBTOOL_PICMODE' => 1, ++ 'AC_CHECK_LIBM' => 1, ++ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, ++ '_AM_MANGLE_OPTION' => 1, ++ 'GLIB_AC_DIVERT_BEFORE_HELP' => 1, ++ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, ++ 'AM_SET_DEPDIR' => 1, ++ '_LT_CC_BASENAME' => 1, ++ 'PKG_PROG_PKG_CONFIG' => 1 ++ } + ], 'Autom4te::Request' ) + ); + -diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cache/traces.0 ---- gtk+2.0-2.14.4.old/autom4te.cache/traces.0 1969-12-31 21:00:00.000000000 -0300 -+++ gtk+2.0-2.14.4/autom4te.cache/traces.0 2008-11-04 15:37:01.000000000 -0200 -@@ -0,0 +1,2037 @@ -+m4trace:aclocal.m4:123: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) +Index: gtk+-2.14.4/autom4te.cache/traces.0 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gtk+-2.14.4/autom4te.cache/traces.0 2008-11-11 18:55:59.200634578 +0100 +@@ -0,0 +1,2260 @@ ++m4trace:aclocal.m4:8450: -1- m4_include([acinclude.m4]) +m4trace:configure.in:40: -1- AC_INIT([gtk+], [gtk_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B], [gtk+]) +m4trace:configure.in:40: -1- m4_pattern_forbid([^_?A[CHUM]_]) +m4trace:configure.in:40: -1- m4_pattern_forbid([_AC_]) @@ -37858,7 +42530,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:40: -1- AC_SUBST_TRACE([target_alias]) +m4trace:configure.in:40: -1- m4_pattern_allow([^target_alias$]) +m4trace:configure.in:49: -1- AM_INIT_AUTOMAKE([no-define]) -+m4trace:configure.in:49: -1- AM_AUTOMAKE_VERSION([1.7.9]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) ++m4trace:configure.in:49: -1- AM_AUTOMAKE_VERSION([1.10.1]) +m4trace:configure.in:49: -1- AC_REQUIRE_AUX_FILE([install-sh]) +m4trace:configure.in:49: -1- AC_SUBST([INSTALL_PROGRAM]) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_PROGRAM]) @@ -37869,13 +42542,17 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:49: -1- AC_SUBST([INSTALL_DATA]) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_DATA]) +m4trace:configure.in:49: -1- m4_pattern_allow([^INSTALL_DATA$]) ++m4trace:configure.in:49: -1- AC_SUBST([am__isrc], [' -I$(srcdir)']) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([am__isrc]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^am__isrc$]) ++m4trace:configure.in:49: -1- _AM_SUBST_NOTMAKE([am__isrc]) +m4trace:configure.in:49: -1- AC_SUBST([CYGPATH_W]) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([CYGPATH_W]) +m4trace:configure.in:49: -1- m4_pattern_allow([^CYGPATH_W$]) +m4trace:configure.in:49: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from... -+aclocal.m4:283: _AM_SET_OPTIONS is expanded from... -+aclocal.m4:136: AM_INIT_AUTOMAKE is expanded from... ++aclocal.m4:8253: _AM_SET_OPTIONS is expanded from... ++aclocal.m4:7950: AM_INIT_AUTOMAKE is expanded from... +configure.in:49: the top level]) +m4trace:configure.in:49: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME']) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE]) @@ -37883,6 +42560,7 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:49: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION']) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([VERSION]) +m4trace:configure.in:49: -1- m4_pattern_allow([^VERSION$]) ++m4trace:configure.in:49: -1- AC_REQUIRE_AUX_FILE([missing]) +m4trace:configure.in:49: -1- AC_SUBST([ACLOCAL]) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([ACLOCAL]) +m4trace:configure.in:49: -1- m4_pattern_allow([^ACLOCAL$]) @@ -37898,9 +42576,6 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:49: -1- AC_SUBST([MAKEINFO]) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([MAKEINFO]) +m4trace:configure.in:49: -1- m4_pattern_allow([^MAKEINFO$]) -+m4trace:configure.in:49: -1- AC_SUBST([AMTAR]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([AMTAR]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^AMTAR$]) +m4trace:configure.in:49: -1- AC_SUBST([install_sh]) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([install_sh]) +m4trace:configure.in:49: -1- m4_pattern_allow([^install_sh$]) @@ -37910,6 +42585,10 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:49: -1- AC_SUBST([INSTALL_STRIP_PROGRAM]) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM]) +m4trace:configure.in:49: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$]) ++m4trace:configure.in:49: -1- AC_REQUIRE_AUX_FILE([install-sh]) ++m4trace:configure.in:49: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([mkdir_p]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^mkdir_p$]) +m4trace:configure.in:49: -1- AC_SUBST([AWK]) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([AWK]) +m4trace:configure.in:49: -1- m4_pattern_allow([^AWK$]) @@ -37919,8 +42598,17 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:49: -1- AC_SUBST([am__leading_dot]) +m4trace:configure.in:49: -1- AC_SUBST_TRACE([am__leading_dot]) +m4trace:configure.in:49: -1- m4_pattern_allow([^am__leading_dot$]) ++m4trace:configure.in:49: -1- AC_SUBST([AMTAR]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([AMTAR]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^AMTAR$]) ++m4trace:configure.in:49: -1- AC_SUBST([am__tar]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([am__tar]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^am__tar$]) ++m4trace:configure.in:49: -1- AC_SUBST([am__untar]) ++m4trace:configure.in:49: -1- AC_SUBST_TRACE([am__untar]) ++m4trace:configure.in:49: -1- m4_pattern_allow([^am__untar$]) +m4trace:configure.in:50: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete. -+You should run autoupdate.], [aclocal.m4:940: AM_CONFIG_HEADER is expanded from... ++You should run autoupdate.], [aclocal.m4:7923: AM_CONFIG_HEADER is expanded from... +configure.in:50: the top level]) +m4trace:configure.in:50: -1- AC_CONFIG_HEADERS([config.h]) +m4trace:configure.in:72: -1- AC_SUBST([GTK_MAJOR_VERSION]) @@ -38061,9 +42749,12 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:153: -1- AC_SUBST([AMDEP_FALSE]) +m4trace:configure.in:153: -1- AC_SUBST_TRACE([AMDEP_FALSE]) +m4trace:configure.in:153: -1- m4_pattern_allow([^AMDEP_FALSE$]) ++m4trace:configure.in:153: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE]) ++m4trace:configure.in:153: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE]) +m4trace:configure.in:153: -1- AC_SUBST([AMDEPBACKSLASH]) +m4trace:configure.in:153: -1- AC_SUBST_TRACE([AMDEPBACKSLASH]) +m4trace:configure.in:153: -1- m4_pattern_allow([^AMDEPBACKSLASH$]) ++m4trace:configure.in:153: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH]) +m4trace:configure.in:153: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type]) +m4trace:configure.in:153: -1- AC_SUBST_TRACE([CCDEPMODE]) +m4trace:configure.in:153: -1- m4_pattern_allow([^CCDEPMODE$]) @@ -38076,12 +42767,14 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:153: -1- AC_SUBST([am__fastdepCC_FALSE]) +m4trace:configure.in:153: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE]) +m4trace:configure.in:153: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) ++m4trace:configure.in:153: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) ++m4trace:configure.in:153: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) +m4trace:configure.in:154: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+aclocal.m4:3016: AC_ENABLE_STATIC is expanded from... -+aclocal.m4:3045: AC_DISABLE_STATIC is expanded from... -+aclocal.m4:7490: AM_DISABLE_STATIC is expanded from... ++aclocal.m4:2781: AC_ENABLE_STATIC is expanded from... ++aclocal.m4:2810: AC_DISABLE_STATIC is expanded from... ++aclocal.m4:7255: AM_DISABLE_STATIC is expanded from... +configure.in:154: the top level]) +m4trace:configure.in:155: -1- AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes]) +m4trace:configure.in:155: -1- AC_SUBST([ENABLE_STATIC_TRUE]) @@ -38090,6 +42783,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:155: -1- AC_SUBST([ENABLE_STATIC_FALSE]) +m4trace:configure.in:155: -1- AC_SUBST_TRACE([ENABLE_STATIC_FALSE]) +m4trace:configure.in:155: -1- m4_pattern_allow([^ENABLE_STATIC_FALSE$]) ++m4trace:configure.in:155: -1- _AM_SUBST_NOTMAKE([ENABLE_STATIC_TRUE]) ++m4trace:configure.in:155: -1- _AM_SUBST_NOTMAKE([ENABLE_STATIC_FALSE]) +m4trace:configure.in:161: -1- AC_SUBST([CXX]) +m4trace:configure.in:161: -1- AC_SUBST_TRACE([CXX]) +m4trace:configure.in:161: -1- m4_pattern_allow([^CXX$]) @@ -38138,6 +42833,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:165: -1- AC_SUBST([am__fastdepCXX_FALSE]) +m4trace:configure.in:165: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE]) +m4trace:configure.in:165: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$]) ++m4trace:configure.in:165: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE]) ++m4trace:configure.in:165: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE]) +m4trace:configure.in:166: -1- AM_CONDITIONAL([HAVE_CXX], [test "$CXX" != ""]) +m4trace:configure.in:166: -1- AC_SUBST([HAVE_CXX_TRUE]) +m4trace:configure.in:166: -1- AC_SUBST_TRACE([HAVE_CXX_TRUE]) @@ -38145,6 +42842,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:166: -1- AC_SUBST([HAVE_CXX_FALSE]) +m4trace:configure.in:166: -1- AC_SUBST_TRACE([HAVE_CXX_FALSE]) +m4trace:configure.in:166: -1- m4_pattern_allow([^HAVE_CXX_FALSE$]) ++m4trace:configure.in:166: -1- _AM_SUBST_NOTMAKE([HAVE_CXX_TRUE]) ++m4trace:configure.in:166: -1- _AM_SUBST_NOTMAKE([HAVE_CXX_FALSE]) +m4trace:configure.in:170: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... +configure.in:170: the top level]) @@ -38155,6 +42854,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:171: -1- AC_SUBST([HAVE_OBJC_FALSE]) +m4trace:configure.in:171: -1- AC_SUBST_TRACE([HAVE_OBJC_FALSE]) +m4trace:configure.in:171: -1- m4_pattern_allow([^HAVE_OBJC_FALSE$]) ++m4trace:configure.in:171: -1- _AM_SUBST_NOTMAKE([HAVE_OBJC_TRUE]) ++m4trace:configure.in:171: -1- _AM_SUBST_NOTMAKE([HAVE_OBJC_FALSE]) +m4trace:configure.in:173: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. +You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from... +configure.in:173: the top level]) @@ -38162,29 +42863,29 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+aclocal.m4:2977: AC_ENABLE_SHARED is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:2742: AC_ENABLE_SHARED is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+aclocal.m4:3055: AC_ENABLE_FAST_INSTALL is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:2820: AC_ENABLE_FAST_INSTALL is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+aclocal.m4:3196: AC_PROG_LD is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:2961: AC_PROG_LD is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- AC_SUBST([SED]) +m4trace:configure.in:187: -1- AC_SUBST_TRACE([SED]) @@ -38225,32 +42926,32 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... +../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... +../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... +../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... -+aclocal.m4:1485: _LT_AC_LOCK is expanded from... -+aclocal.m4:2105: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from... -+aclocal.m4:3729: _LT_AC_LANG_C_CONFIG is expanded from... -+aclocal.m4:3728: AC_LIBTOOL_LANG_C_CONFIG is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:1250: _LT_AC_LOCK is expanded from... ++aclocal.m4:1870: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from... ++aclocal.m4:3494: _LT_AC_LANG_C_CONFIG is expanded from... ++aclocal.m4:3493: AC_LIBTOOL_LANG_C_CONFIG is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- AC_SUBST([DLLTOOL]) +m4trace:configure.in:187: -1- AC_SUBST_TRACE([DLLTOOL]) @@ -38298,23 +42999,23 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++m4trace:configure.in:187: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- AC_SUBST([CXXCPP]) +m4trace:configure.in:187: -1- AC_SUBST_TRACE([CXXCPP]) @@ -38345,43 +43046,43 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:187: -1- m4_pattern_allow([^ac_ct_F77$]) +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete. +You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from... -+aclocal.m4:5115: _LT_AC_LANG_GCJ_CONFIG is expanded from... -+aclocal.m4:5114: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... -+aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:4880: _LT_AC_LANG_GCJ_CONFIG is expanded from... ++aclocal.m4:4879: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... ++aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. +You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from... -+aclocal.m4:5115: _LT_AC_LANG_GCJ_CONFIG is expanded from... -+aclocal.m4:5114: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... -+aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:4880: _LT_AC_LANG_GCJ_CONFIG is expanded from... ++aclocal.m4:4879: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... ++aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete. +You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from... -+aclocal.m4:5171: _LT_AC_LANG_RC_CONFIG is expanded from... -+aclocal.m4:5170: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... -+aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:4936: _LT_AC_LANG_RC_CONFIG is expanded from... ++aclocal.m4:4935: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... ++aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. +You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from... -+aclocal.m4:5171: _LT_AC_LANG_RC_CONFIG is expanded from... -+aclocal.m4:5170: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... -+aclocal.m4:2854: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:1014: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:994: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:959: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7486: AM_PROG_LIBTOOL is expanded from... ++aclocal.m4:4936: _LT_AC_LANG_RC_CONFIG is expanded from... ++aclocal.m4:4935: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... ++aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... ++aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... ++aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... ++aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... +configure.in:187: the top level]) +m4trace:configure.in:187: -1- AC_SUBST([LIBTOOL]) +m4trace:configure.in:187: -1- AC_SUBST_TRACE([LIBTOOL]) @@ -38400,6 +43101,20 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:195: -1- AC_SUBST([CCASFLAGS]) +m4trace:configure.in:195: -1- AC_SUBST_TRACE([CCASFLAGS]) +m4trace:configure.in:195: -1- m4_pattern_allow([^CCASFLAGS$]) ++m4trace:configure.in:195: -1- AC_SUBST([CCASDEPMODE], [depmode=$am_cv_CCAS_dependencies_compiler_type]) ++m4trace:configure.in:195: -1- AC_SUBST_TRACE([CCASDEPMODE]) ++m4trace:configure.in:195: -1- m4_pattern_allow([^CCASDEPMODE$]) ++m4trace:configure.in:195: -1- AM_CONDITIONAL([am__fastdepCCAS], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3]) ++m4trace:configure.in:195: -1- AC_SUBST([am__fastdepCCAS_TRUE]) ++m4trace:configure.in:195: -1- AC_SUBST_TRACE([am__fastdepCCAS_TRUE]) ++m4trace:configure.in:195: -1- m4_pattern_allow([^am__fastdepCCAS_TRUE$]) ++m4trace:configure.in:195: -1- AC_SUBST([am__fastdepCCAS_FALSE]) ++m4trace:configure.in:195: -1- AC_SUBST_TRACE([am__fastdepCCAS_FALSE]) ++m4trace:configure.in:195: -1- m4_pattern_allow([^am__fastdepCCAS_FALSE$]) ++m4trace:configure.in:195: -1- _AM_SUBST_NOTMAKE([am__fastdepCCAS_TRUE]) ++m4trace:configure.in:195: -1- _AM_SUBST_NOTMAKE([am__fastdepCCAS_FALSE]) +m4trace:configure.in:196: -1- AC_SUBST([NM]) +m4trace:configure.in:196: -1- AC_SUBST_TRACE([NM]) +m4trace:configure.in:196: -1- m4_pattern_allow([^NM$]) @@ -38411,6 +43126,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:199: -1- AC_SUBST([MAINTAINER_MODE_FALSE]) +m4trace:configure.in:199: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE]) +m4trace:configure.in:199: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$]) ++m4trace:configure.in:199: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE]) ++m4trace:configure.in:199: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE]) +m4trace:configure.in:199: -1- AC_SUBST([MAINT]) +m4trace:configure.in:199: -1- AC_SUBST_TRACE([MAINT]) +m4trace:configure.in:199: -1- m4_pattern_allow([^MAINT$]) @@ -38421,6 +43138,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:211: -1- AC_SUBST([PLATFORM_WIN32_FALSE]) +m4trace:configure.in:211: -1- AC_SUBST_TRACE([PLATFORM_WIN32_FALSE]) +m4trace:configure.in:211: -1- m4_pattern_allow([^PLATFORM_WIN32_FALSE$]) ++m4trace:configure.in:211: -1- _AM_SUBST_NOTMAKE([PLATFORM_WIN32_TRUE]) ++m4trace:configure.in:211: -1- _AM_SUBST_NOTMAKE([PLATFORM_WIN32_FALSE]) +m4trace:configure.in:213: -1- AM_CONDITIONAL([OS_WIN32], [test "$os_win32" = "yes"]) +m4trace:configure.in:213: -1- AC_SUBST([OS_WIN32_TRUE]) +m4trace:configure.in:213: -1- AC_SUBST_TRACE([OS_WIN32_TRUE]) @@ -38428,6 +43147,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:213: -1- AC_SUBST([OS_WIN32_FALSE]) +m4trace:configure.in:213: -1- AC_SUBST_TRACE([OS_WIN32_FALSE]) +m4trace:configure.in:213: -1- m4_pattern_allow([^OS_WIN32_FALSE$]) ++m4trace:configure.in:213: -1- _AM_SUBST_NOTMAKE([OS_WIN32_TRUE]) ++m4trace:configure.in:213: -1- _AM_SUBST_NOTMAKE([OS_WIN32_FALSE]) +m4trace:configure.in:214: -1- AM_CONDITIONAL([OS_UNIX], [test "$os_win32" != "yes"]) +m4trace:configure.in:214: -1- AC_SUBST([OS_UNIX_TRUE]) +m4trace:configure.in:214: -1- AC_SUBST_TRACE([OS_UNIX_TRUE]) @@ -38435,6 +43156,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:214: -1- AC_SUBST([OS_UNIX_FALSE]) +m4trace:configure.in:214: -1- AC_SUBST_TRACE([OS_UNIX_FALSE]) +m4trace:configure.in:214: -1- m4_pattern_allow([^OS_UNIX_FALSE$]) ++m4trace:configure.in:214: -1- _AM_SUBST_NOTMAKE([OS_UNIX_TRUE]) ++m4trace:configure.in:214: -1- _AM_SUBST_NOTMAKE([OS_UNIX_FALSE]) +m4trace:configure.in:215: -1- AM_CONDITIONAL([OS_LINUX], [test "$os_linux" = "yes"]) +m4trace:configure.in:215: -1- AC_SUBST([OS_LINUX_TRUE]) +m4trace:configure.in:215: -1- AC_SUBST_TRACE([OS_LINUX_TRUE]) @@ -38442,6 +43165,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:215: -1- AC_SUBST([OS_LINUX_FALSE]) +m4trace:configure.in:215: -1- AC_SUBST_TRACE([OS_LINUX_FALSE]) +m4trace:configure.in:215: -1- m4_pattern_allow([^OS_LINUX_FALSE$]) ++m4trace:configure.in:215: -1- _AM_SUBST_NOTMAKE([OS_LINUX_TRUE]) ++m4trace:configure.in:215: -1- _AM_SUBST_NOTMAKE([OS_LINUX_FALSE]) +m4trace:configure.in:218: -1- AC_SUBST([WINDRES]) +m4trace:configure.in:218: -1- AC_SUBST_TRACE([WINDRES]) +m4trace:configure.in:218: -1- m4_pattern_allow([^WINDRES$]) @@ -38455,6 +43180,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:224: -1- AC_SUBST([MS_LIB_AVAILABLE_FALSE]) +m4trace:configure.in:224: -1- AC_SUBST_TRACE([MS_LIB_AVAILABLE_FALSE]) +m4trace:configure.in:224: -1- m4_pattern_allow([^MS_LIB_AVAILABLE_FALSE$]) ++m4trace:configure.in:224: -1- _AM_SUBST_NOTMAKE([MS_LIB_AVAILABLE_TRUE]) ++m4trace:configure.in:224: -1- _AM_SUBST_NOTMAKE([MS_LIB_AVAILABLE_FALSE]) +m4trace:configure.in:231: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +configure.in:231: the top level]) @@ -38495,11 +43222,58 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:296: -1- m4_pattern_allow([^GTK_COMPILED_WITH_DEBUGGING$]) +m4trace:configure.in:296: -1- AH_OUTPUT([GTK_COMPILED_WITH_DEBUGGING], [/* Define if debugging is enabled */ +#undef GTK_COMPILED_WITH_DEBUGGING]) -+m4trace:configure.in:305: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... -+../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... -+aclocal.m4:7700: AM_PROG_CC_STDC is expanded from... ++m4trace:configure.in:305: -1- _m4_warn([obsolete], [The macro `AM_PROG_CC_STDC' is obsolete. ++You should run autoupdate.], [aclocal.m4:7640: AM_PROG_CC_STDC is expanded from... ++configure.in:305: the top level]) ++m4trace:configure.in:305: -1- AC_SUBST([CC]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.in:305: -1- AC_SUBST([CFLAGS]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([CFLAGS]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^CFLAGS$]) ++m4trace:configure.in:305: -1- AC_SUBST([LDFLAGS]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([LDFLAGS]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^LDFLAGS$]) ++m4trace:configure.in:305: -1- AC_SUBST([LIBS]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([LIBS]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.in:305: -1- AC_SUBST([CPPFLAGS]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([CPPFLAGS]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.in:305: -1- AC_SUBST([CC]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.in:305: -1- AC_SUBST([CC]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.in:305: -1- AC_SUBST([CC]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.in:305: -1- AC_SUBST([CC]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.in:305: -1- AC_SUBST([ac_ct_CC]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([ac_ct_CC]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^ac_ct_CC$]) ++m4trace:configure.in:305: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([CCDEPMODE]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^CCDEPMODE$]) ++m4trace:configure.in:305: -1- AM_CONDITIONAL([am__fastdepCC], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) ++m4trace:configure.in:305: -1- AC_SUBST([am__fastdepCC_TRUE]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) ++m4trace:configure.in:305: -1- AC_SUBST([am__fastdepCC_FALSE]) ++m4trace:configure.in:305: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE]) ++m4trace:configure.in:305: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) ++m4trace:configure.in:305: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) ++m4trace:configure.in:305: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) ++m4trace:configure.in:305: -1- _m4_warn([obsolete], [AM_PROG_CC_STDC: ++ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon ++ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when ++ you adjust the code. You can also remove the above call to ++ AC_PROG_CC if you already called it elsewhere.], [aclocal.m4:7640: AM_PROG_CC_STDC is expanded from... +configure.in:305: the top level]) +m4trace:configure.in:306: -1- AC_REQUIRE_AUX_FILE([install-sh]) +m4trace:configure.in:306: -1- AC_SUBST([INSTALL_PROGRAM]) @@ -38542,6 +43316,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:419: -1- AC_SUBST([DISABLE_EXPLICIT_DEPS_FALSE]) +m4trace:configure.in:419: -1- AC_SUBST_TRACE([DISABLE_EXPLICIT_DEPS_FALSE]) +m4trace:configure.in:419: -1- m4_pattern_allow([^DISABLE_EXPLICIT_DEPS_FALSE$]) ++m4trace:configure.in:419: -1- _AM_SUBST_NOTMAKE([DISABLE_EXPLICIT_DEPS_TRUE]) ++m4trace:configure.in:419: -1- _AM_SUBST_NOTMAKE([DISABLE_EXPLICIT_DEPS_FALSE]) +m4trace:configure.in:424: -1- AC_SUBST([PERL]) +m4trace:configure.in:424: -1- AC_SUBST_TRACE([PERL]) +m4trace:configure.in:424: -1- m4_pattern_allow([^PERL$]) @@ -38603,9 +43379,9 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... +../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... +../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... -+aclocal.m4:7978: GLIB_LC_MESSAGES is expanded from... -+aclocal.m4:8242: GLIB_GNU_GETTEXT is expanded from... -+aclocal.m4:8342: AM_GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:281: GLIB_LC_MESSAGES is expanded from... ++aclocal.m4:545: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:645: AM_GLIB_GNU_GETTEXT is expanded from... +configure.in:502: the top level]) +m4trace:configure.in:502: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES]) +m4trace:configure.in:502: -1- m4_pattern_allow([^HAVE_LC_MESSAGES$]) @@ -38621,9 +43397,9 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... +../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... +../../lib/autoconf/headers.m4:87: AC_CHECK_HEADER is expanded from... -+aclocal.m4:8032: GLIB_WITH_NLS is expanded from... -+aclocal.m4:8242: GLIB_GNU_GETTEXT is expanded from... -+aclocal.m4:8342: AM_GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:335: GLIB_WITH_NLS is expanded from... ++aclocal.m4:545: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:645: AM_GLIB_GNU_GETTEXT is expanded from... +configure.in:502: the top level]) +m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... @@ -38632,9 +43408,9 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... +../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... +../../lib/autoconf/headers.m4:87: AC_CHECK_HEADER is expanded from... -+aclocal.m4:8032: GLIB_WITH_NLS is expanded from... -+aclocal.m4:8242: GLIB_GNU_GETTEXT is expanded from... -+aclocal.m4:8342: AM_GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:335: GLIB_WITH_NLS is expanded from... ++aclocal.m4:545: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:645: AM_GLIB_GNU_GETTEXT is expanded from... +configure.in:502: the top level]) +m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ +#undef HAVE_BIND_TEXTDOMAIN_CODESET]) @@ -38662,9 +43438,9 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... +../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... +../../lib/autoconf/headers.m4:87: AC_CHECK_HEADER is expanded from... -+aclocal.m4:8032: GLIB_WITH_NLS is expanded from... -+aclocal.m4:8242: GLIB_GNU_GETTEXT is expanded from... -+aclocal.m4:8342: AM_GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:335: GLIB_WITH_NLS is expanded from... ++aclocal.m4:545: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:645: AM_GLIB_GNU_GETTEXT is expanded from... +configure.in:502: the top level]) +m4trace:configure.in:502: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS]) +m4trace:configure.in:502: -1- m4_pattern_allow([^ENABLE_NLS$]) @@ -38672,9 +43448,9 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +#undef ENABLE_NLS]) +m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. +You should run autoupdate.], [../../lib/autoconf/status.m4:848: AC_OUTPUT_COMMANDS is expanded from... -+aclocal.m4:8032: GLIB_WITH_NLS is expanded from... -+aclocal.m4:8242: GLIB_GNU_GETTEXT is expanded from... -+aclocal.m4:8342: AM_GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:335: GLIB_WITH_NLS is expanded from... ++aclocal.m4:545: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:645: AM_GLIB_GNU_GETTEXT is expanded from... +configure.in:502: the top level]) +m4trace:configure.in:502: -1- AC_SUBST([CATALOGS]) +m4trace:configure.in:502: -1- AC_SUBST_TRACE([CATALOGS]) @@ -38738,11 +43514,11 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:577: -1- m4_pattern_allow([^PKG_CONFIG$]) +m4trace:configure.in:577: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:2478: AC_TRY_RUN is expanded from... -+aclocal.m4:8371: AM_PATH_GLIB_2_0 is expanded from... ++aclocal.m4:29: AM_PATH_GLIB_2_0 is expanded from... +configure.in:577: the top level]) +m4trace:configure.in:577: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+aclocal.m4:8371: AM_PATH_GLIB_2_0 is expanded from... ++aclocal.m4:29: AM_PATH_GLIB_2_0 is expanded from... +configure.in:577: the top level]) +m4trace:configure.in:577: -1- AC_SUBST([GLIB_CFLAGS]) +m4trace:configure.in:577: -1- AC_SUBST_TRACE([GLIB_CFLAGS]) @@ -38914,6 +43690,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:803: -1- AC_SUBST([BUILD_GDIPLUS_LOADERS_FALSE]) +m4trace:configure.in:803: -1- AC_SUBST_TRACE([BUILD_GDIPLUS_LOADERS_FALSE]) +m4trace:configure.in:803: -1- m4_pattern_allow([^BUILD_GDIPLUS_LOADERS_FALSE$]) ++m4trace:configure.in:803: -1- _AM_SUBST_NOTMAKE([BUILD_GDIPLUS_LOADERS_TRUE]) ++m4trace:configure.in:803: -1- _AM_SUBST_NOTMAKE([BUILD_GDIPLUS_LOADERS_FALSE]) +m4trace:configure.in:840: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:2296: AC_TRY_CPP is expanded from... +configure.in:840: the top level]) @@ -38943,6 +43721,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:926: -1- AC_SUBST([BUILD_DYNAMIC_MODULES_FALSE]) +m4trace:configure.in:926: -1- AC_SUBST_TRACE([BUILD_DYNAMIC_MODULES_FALSE]) +m4trace:configure.in:926: -1- m4_pattern_allow([^BUILD_DYNAMIC_MODULES_FALSE$]) ++m4trace:configure.in:926: -1- _AM_SUBST_NOTMAKE([BUILD_DYNAMIC_MODULES_TRUE]) ++m4trace:configure.in:926: -1- _AM_SUBST_NOTMAKE([BUILD_DYNAMIC_MODULES_FALSE]) +m4trace:configure.in:1006: -1- AC_SUBST([INCLUDED_LOADER_OBJ]) +m4trace:configure.in:1006: -1- AC_SUBST_TRACE([INCLUDED_LOADER_OBJ]) +m4trace:configure.in:1006: -1- m4_pattern_allow([^INCLUDED_LOADER_OBJ$]) @@ -38956,6 +43736,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1009: -1- AC_SUBST([INCLUDE_PNG_FALSE]) +m4trace:configure.in:1009: -1- AC_SUBST_TRACE([INCLUDE_PNG_FALSE]) +m4trace:configure.in:1009: -1- m4_pattern_allow([^INCLUDE_PNG_FALSE$]) ++m4trace:configure.in:1009: -1- _AM_SUBST_NOTMAKE([INCLUDE_PNG_TRUE]) ++m4trace:configure.in:1009: -1- _AM_SUBST_NOTMAKE([INCLUDE_PNG_FALSE]) +m4trace:configure.in:1010: -1- AM_CONDITIONAL([INCLUDE_BMP], [test x"$INCLUDE_bmp" = xyes]) +m4trace:configure.in:1010: -1- AC_SUBST([INCLUDE_BMP_TRUE]) +m4trace:configure.in:1010: -1- AC_SUBST_TRACE([INCLUDE_BMP_TRUE]) @@ -38963,6 +43745,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1010: -1- AC_SUBST([INCLUDE_BMP_FALSE]) +m4trace:configure.in:1010: -1- AC_SUBST_TRACE([INCLUDE_BMP_FALSE]) +m4trace:configure.in:1010: -1- m4_pattern_allow([^INCLUDE_BMP_FALSE$]) ++m4trace:configure.in:1010: -1- _AM_SUBST_NOTMAKE([INCLUDE_BMP_TRUE]) ++m4trace:configure.in:1010: -1- _AM_SUBST_NOTMAKE([INCLUDE_BMP_FALSE]) +m4trace:configure.in:1011: -1- AM_CONDITIONAL([INCLUDE_WBMP], [test x"$INCLUDE_wbmp" = xyes]) +m4trace:configure.in:1011: -1- AC_SUBST([INCLUDE_WBMP_TRUE]) +m4trace:configure.in:1011: -1- AC_SUBST_TRACE([INCLUDE_WBMP_TRUE]) @@ -38970,6 +43754,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1011: -1- AC_SUBST([INCLUDE_WBMP_FALSE]) +m4trace:configure.in:1011: -1- AC_SUBST_TRACE([INCLUDE_WBMP_FALSE]) +m4trace:configure.in:1011: -1- m4_pattern_allow([^INCLUDE_WBMP_FALSE$]) ++m4trace:configure.in:1011: -1- _AM_SUBST_NOTMAKE([INCLUDE_WBMP_TRUE]) ++m4trace:configure.in:1011: -1- _AM_SUBST_NOTMAKE([INCLUDE_WBMP_FALSE]) +m4trace:configure.in:1012: -1- AM_CONDITIONAL([INCLUDE_GIF], [test x"$INCLUDE_gif" = xyes]) +m4trace:configure.in:1012: -1- AC_SUBST([INCLUDE_GIF_TRUE]) +m4trace:configure.in:1012: -1- AC_SUBST_TRACE([INCLUDE_GIF_TRUE]) @@ -38977,6 +43763,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1012: -1- AC_SUBST([INCLUDE_GIF_FALSE]) +m4trace:configure.in:1012: -1- AC_SUBST_TRACE([INCLUDE_GIF_FALSE]) +m4trace:configure.in:1012: -1- m4_pattern_allow([^INCLUDE_GIF_FALSE$]) ++m4trace:configure.in:1012: -1- _AM_SUBST_NOTMAKE([INCLUDE_GIF_TRUE]) ++m4trace:configure.in:1012: -1- _AM_SUBST_NOTMAKE([INCLUDE_GIF_FALSE]) +m4trace:configure.in:1013: -1- AM_CONDITIONAL([INCLUDE_ICO], [test x"$INCLUDE_ico" = xyes]) +m4trace:configure.in:1013: -1- AC_SUBST([INCLUDE_ICO_TRUE]) +m4trace:configure.in:1013: -1- AC_SUBST_TRACE([INCLUDE_ICO_TRUE]) @@ -38984,6 +43772,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1013: -1- AC_SUBST([INCLUDE_ICO_FALSE]) +m4trace:configure.in:1013: -1- AC_SUBST_TRACE([INCLUDE_ICO_FALSE]) +m4trace:configure.in:1013: -1- m4_pattern_allow([^INCLUDE_ICO_FALSE$]) ++m4trace:configure.in:1013: -1- _AM_SUBST_NOTMAKE([INCLUDE_ICO_TRUE]) ++m4trace:configure.in:1013: -1- _AM_SUBST_NOTMAKE([INCLUDE_ICO_FALSE]) +m4trace:configure.in:1014: -1- AM_CONDITIONAL([INCLUDE_ANI], [test x"$INCLUDE_ani" = xyes]) +m4trace:configure.in:1014: -1- AC_SUBST([INCLUDE_ANI_TRUE]) +m4trace:configure.in:1014: -1- AC_SUBST_TRACE([INCLUDE_ANI_TRUE]) @@ -38991,6 +43781,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1014: -1- AC_SUBST([INCLUDE_ANI_FALSE]) +m4trace:configure.in:1014: -1- AC_SUBST_TRACE([INCLUDE_ANI_FALSE]) +m4trace:configure.in:1014: -1- m4_pattern_allow([^INCLUDE_ANI_FALSE$]) ++m4trace:configure.in:1014: -1- _AM_SUBST_NOTMAKE([INCLUDE_ANI_TRUE]) ++m4trace:configure.in:1014: -1- _AM_SUBST_NOTMAKE([INCLUDE_ANI_FALSE]) +m4trace:configure.in:1015: -1- AM_CONDITIONAL([INCLUDE_JPEG], [test x"$INCLUDE_jpeg" = xyes]) +m4trace:configure.in:1015: -1- AC_SUBST([INCLUDE_JPEG_TRUE]) +m4trace:configure.in:1015: -1- AC_SUBST_TRACE([INCLUDE_JPEG_TRUE]) @@ -38998,6 +43790,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1015: -1- AC_SUBST([INCLUDE_JPEG_FALSE]) +m4trace:configure.in:1015: -1- AC_SUBST_TRACE([INCLUDE_JPEG_FALSE]) +m4trace:configure.in:1015: -1- m4_pattern_allow([^INCLUDE_JPEG_FALSE$]) ++m4trace:configure.in:1015: -1- _AM_SUBST_NOTMAKE([INCLUDE_JPEG_TRUE]) ++m4trace:configure.in:1015: -1- _AM_SUBST_NOTMAKE([INCLUDE_JPEG_FALSE]) +m4trace:configure.in:1016: -1- AM_CONDITIONAL([INCLUDE_PNM], [test x"$INCLUDE_pnm" = xyes]) +m4trace:configure.in:1016: -1- AC_SUBST([INCLUDE_PNM_TRUE]) +m4trace:configure.in:1016: -1- AC_SUBST_TRACE([INCLUDE_PNM_TRUE]) @@ -39005,6 +43799,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1016: -1- AC_SUBST([INCLUDE_PNM_FALSE]) +m4trace:configure.in:1016: -1- AC_SUBST_TRACE([INCLUDE_PNM_FALSE]) +m4trace:configure.in:1016: -1- m4_pattern_allow([^INCLUDE_PNM_FALSE$]) ++m4trace:configure.in:1016: -1- _AM_SUBST_NOTMAKE([INCLUDE_PNM_TRUE]) ++m4trace:configure.in:1016: -1- _AM_SUBST_NOTMAKE([INCLUDE_PNM_FALSE]) +m4trace:configure.in:1017: -1- AM_CONDITIONAL([INCLUDE_RAS], [test x"$INCLUDE_ras" = xyes]) +m4trace:configure.in:1017: -1- AC_SUBST([INCLUDE_RAS_TRUE]) +m4trace:configure.in:1017: -1- AC_SUBST_TRACE([INCLUDE_RAS_TRUE]) @@ -39012,6 +43808,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1017: -1- AC_SUBST([INCLUDE_RAS_FALSE]) +m4trace:configure.in:1017: -1- AC_SUBST_TRACE([INCLUDE_RAS_FALSE]) +m4trace:configure.in:1017: -1- m4_pattern_allow([^INCLUDE_RAS_FALSE$]) ++m4trace:configure.in:1017: -1- _AM_SUBST_NOTMAKE([INCLUDE_RAS_TRUE]) ++m4trace:configure.in:1017: -1- _AM_SUBST_NOTMAKE([INCLUDE_RAS_FALSE]) +m4trace:configure.in:1018: -1- AM_CONDITIONAL([INCLUDE_TIFF], [test x"$INCLUDE_tiff" = xyes]) +m4trace:configure.in:1018: -1- AC_SUBST([INCLUDE_TIFF_TRUE]) +m4trace:configure.in:1018: -1- AC_SUBST_TRACE([INCLUDE_TIFF_TRUE]) @@ -39019,6 +43817,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1018: -1- AC_SUBST([INCLUDE_TIFF_FALSE]) +m4trace:configure.in:1018: -1- AC_SUBST_TRACE([INCLUDE_TIFF_FALSE]) +m4trace:configure.in:1018: -1- m4_pattern_allow([^INCLUDE_TIFF_FALSE$]) ++m4trace:configure.in:1018: -1- _AM_SUBST_NOTMAKE([INCLUDE_TIFF_TRUE]) ++m4trace:configure.in:1018: -1- _AM_SUBST_NOTMAKE([INCLUDE_TIFF_FALSE]) +m4trace:configure.in:1019: -1- AM_CONDITIONAL([INCLUDE_XPM], [test x"$INCLUDE_xpm" = xyes]) +m4trace:configure.in:1019: -1- AC_SUBST([INCLUDE_XPM_TRUE]) +m4trace:configure.in:1019: -1- AC_SUBST_TRACE([INCLUDE_XPM_TRUE]) @@ -39026,6 +43826,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1019: -1- AC_SUBST([INCLUDE_XPM_FALSE]) +m4trace:configure.in:1019: -1- AC_SUBST_TRACE([INCLUDE_XPM_FALSE]) +m4trace:configure.in:1019: -1- m4_pattern_allow([^INCLUDE_XPM_FALSE$]) ++m4trace:configure.in:1019: -1- _AM_SUBST_NOTMAKE([INCLUDE_XPM_TRUE]) ++m4trace:configure.in:1019: -1- _AM_SUBST_NOTMAKE([INCLUDE_XPM_FALSE]) +m4trace:configure.in:1020: -1- AM_CONDITIONAL([INCLUDE_XBM], [test x"$INCLUDE_xbm" = xyes]) +m4trace:configure.in:1020: -1- AC_SUBST([INCLUDE_XBM_TRUE]) +m4trace:configure.in:1020: -1- AC_SUBST_TRACE([INCLUDE_XBM_TRUE]) @@ -39033,6 +43835,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1020: -1- AC_SUBST([INCLUDE_XBM_FALSE]) +m4trace:configure.in:1020: -1- AC_SUBST_TRACE([INCLUDE_XBM_FALSE]) +m4trace:configure.in:1020: -1- m4_pattern_allow([^INCLUDE_XBM_FALSE$]) ++m4trace:configure.in:1020: -1- _AM_SUBST_NOTMAKE([INCLUDE_XBM_TRUE]) ++m4trace:configure.in:1020: -1- _AM_SUBST_NOTMAKE([INCLUDE_XBM_FALSE]) +m4trace:configure.in:1021: -1- AM_CONDITIONAL([INCLUDE_TGA], [test x"$INCLUDE_tga" = xyes]) +m4trace:configure.in:1021: -1- AC_SUBST([INCLUDE_TGA_TRUE]) +m4trace:configure.in:1021: -1- AC_SUBST_TRACE([INCLUDE_TGA_TRUE]) @@ -39040,6 +43844,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1021: -1- AC_SUBST([INCLUDE_TGA_FALSE]) +m4trace:configure.in:1021: -1- AC_SUBST_TRACE([INCLUDE_TGA_FALSE]) +m4trace:configure.in:1021: -1- m4_pattern_allow([^INCLUDE_TGA_FALSE$]) ++m4trace:configure.in:1021: -1- _AM_SUBST_NOTMAKE([INCLUDE_TGA_TRUE]) ++m4trace:configure.in:1021: -1- _AM_SUBST_NOTMAKE([INCLUDE_TGA_FALSE]) +m4trace:configure.in:1022: -1- AM_CONDITIONAL([INCLUDE_PCX], [test x"$INCLUDE_pcx" = xyes]) +m4trace:configure.in:1022: -1- AC_SUBST([INCLUDE_PCX_TRUE]) +m4trace:configure.in:1022: -1- AC_SUBST_TRACE([INCLUDE_PCX_TRUE]) @@ -39047,6 +43853,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1022: -1- AC_SUBST([INCLUDE_PCX_FALSE]) +m4trace:configure.in:1022: -1- AC_SUBST_TRACE([INCLUDE_PCX_FALSE]) +m4trace:configure.in:1022: -1- m4_pattern_allow([^INCLUDE_PCX_FALSE$]) ++m4trace:configure.in:1022: -1- _AM_SUBST_NOTMAKE([INCLUDE_PCX_TRUE]) ++m4trace:configure.in:1022: -1- _AM_SUBST_NOTMAKE([INCLUDE_PCX_FALSE]) +m4trace:configure.in:1023: -1- AM_CONDITIONAL([INCLUDE_ICNS], [test x"$INCLUDE_icns" = xyes]) +m4trace:configure.in:1023: -1- AC_SUBST([INCLUDE_ICNS_TRUE]) +m4trace:configure.in:1023: -1- AC_SUBST_TRACE([INCLUDE_ICNS_TRUE]) @@ -39054,6 +43862,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1023: -1- AC_SUBST([INCLUDE_ICNS_FALSE]) +m4trace:configure.in:1023: -1- AC_SUBST_TRACE([INCLUDE_ICNS_FALSE]) +m4trace:configure.in:1023: -1- m4_pattern_allow([^INCLUDE_ICNS_FALSE$]) ++m4trace:configure.in:1023: -1- _AM_SUBST_NOTMAKE([INCLUDE_ICNS_TRUE]) ++m4trace:configure.in:1023: -1- _AM_SUBST_NOTMAKE([INCLUDE_ICNS_FALSE]) +m4trace:configure.in:1024: -1- AM_CONDITIONAL([INCLUDE_JASPER], [test x"$INCLUDE_jasper" = xyes]) +m4trace:configure.in:1024: -1- AC_SUBST([INCLUDE_JASPER_TRUE]) +m4trace:configure.in:1024: -1- AC_SUBST_TRACE([INCLUDE_JASPER_TRUE]) @@ -39061,6 +43871,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1024: -1- AC_SUBST([INCLUDE_JASPER_FALSE]) +m4trace:configure.in:1024: -1- AC_SUBST_TRACE([INCLUDE_JASPER_FALSE]) +m4trace:configure.in:1024: -1- m4_pattern_allow([^INCLUDE_JASPER_FALSE$]) ++m4trace:configure.in:1024: -1- _AM_SUBST_NOTMAKE([INCLUDE_JASPER_TRUE]) ++m4trace:configure.in:1024: -1- _AM_SUBST_NOTMAKE([INCLUDE_JASPER_FALSE]) +m4trace:configure.in:1027: -1- AM_CONDITIONAL([INCLUDE_GDIPLUS], [test x"$INCLUDE_gdip_ico" = xyes]) +m4trace:configure.in:1027: -1- AC_SUBST([INCLUDE_GDIPLUS_TRUE]) +m4trace:configure.in:1027: -1- AC_SUBST_TRACE([INCLUDE_GDIPLUS_TRUE]) @@ -39068,6 +43880,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1027: -1- AC_SUBST([INCLUDE_GDIPLUS_FALSE]) +m4trace:configure.in:1027: -1- AC_SUBST_TRACE([INCLUDE_GDIPLUS_FALSE]) +m4trace:configure.in:1027: -1- m4_pattern_allow([^INCLUDE_GDIPLUS_FALSE$]) ++m4trace:configure.in:1027: -1- _AM_SUBST_NOTMAKE([INCLUDE_GDIPLUS_TRUE]) ++m4trace:configure.in:1027: -1- _AM_SUBST_NOTMAKE([INCLUDE_GDIPLUS_FALSE]) +m4trace:configure.in:1035: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2462: AC_RUN_IFELSE is expanded from... +configure.in:1035: the top level]) +m4trace:configure.in:1035: -1- AC_DEFINE_TRACE_LITERAL([GDK_PIXBUF_USE_GIO_MIME]) @@ -39081,6 +43895,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1112: -1- AC_SUBST([HAVE_INCLUDED_IMMMODULES_FALSE]) +m4trace:configure.in:1112: -1- AC_SUBST_TRACE([HAVE_INCLUDED_IMMMODULES_FALSE]) +m4trace:configure.in:1112: -1- m4_pattern_allow([^HAVE_INCLUDED_IMMMODULES_FALSE$]) ++m4trace:configure.in:1112: -1- _AM_SUBST_NOTMAKE([HAVE_INCLUDED_IMMMODULES_TRUE]) ++m4trace:configure.in:1112: -1- _AM_SUBST_NOTMAKE([HAVE_INCLUDED_IMMMODULES_FALSE]) +m4trace:configure.in:1131: -1- AC_SUBST([INCLUDED_IMMODULE_OBJ]) +m4trace:configure.in:1131: -1- AC_SUBST_TRACE([INCLUDED_IMMODULE_OBJ]) +m4trace:configure.in:1131: -1- m4_pattern_allow([^INCLUDED_IMMODULE_OBJ$]) @@ -39094,6 +43910,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1134: -1- AC_SUBST([INCLUDE_IM_AM_ET_FALSE]) +m4trace:configure.in:1134: -1- AC_SUBST_TRACE([INCLUDE_IM_AM_ET_FALSE]) +m4trace:configure.in:1134: -1- m4_pattern_allow([^INCLUDE_IM_AM_ET_FALSE$]) ++m4trace:configure.in:1134: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_AM_ET_TRUE]) ++m4trace:configure.in:1134: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_AM_ET_FALSE]) +m4trace:configure.in:1135: -1- AM_CONDITIONAL([INCLUDE_IM_CEDILLA], [test x"$INCLUDE_cedilla" = xyes]) +m4trace:configure.in:1135: -1- AC_SUBST([INCLUDE_IM_CEDILLA_TRUE]) +m4trace:configure.in:1135: -1- AC_SUBST_TRACE([INCLUDE_IM_CEDILLA_TRUE]) @@ -39101,6 +43919,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1135: -1- AC_SUBST([INCLUDE_IM_CEDILLA_FALSE]) +m4trace:configure.in:1135: -1- AC_SUBST_TRACE([INCLUDE_IM_CEDILLA_FALSE]) +m4trace:configure.in:1135: -1- m4_pattern_allow([^INCLUDE_IM_CEDILLA_FALSE$]) ++m4trace:configure.in:1135: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_CEDILLA_TRUE]) ++m4trace:configure.in:1135: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_CEDILLA_FALSE]) +m4trace:configure.in:1136: -1- AM_CONDITIONAL([INCLUDE_IM_CYRILLIC_TRANSLIT], [test x"$INCLUDE_cyrillic_translit" = xyes]) +m4trace:configure.in:1136: -1- AC_SUBST([INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE]) +m4trace:configure.in:1136: -1- AC_SUBST_TRACE([INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE]) @@ -39108,6 +43928,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1136: -1- AC_SUBST([INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE]) +m4trace:configure.in:1136: -1- AC_SUBST_TRACE([INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE]) +m4trace:configure.in:1136: -1- m4_pattern_allow([^INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE$]) ++m4trace:configure.in:1136: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE]) ++m4trace:configure.in:1136: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE]) +m4trace:configure.in:1137: -1- AM_CONDITIONAL([INCLUDE_IM_IME], [test x"$INCLUDE_ime" = xyes]) +m4trace:configure.in:1137: -1- AC_SUBST([INCLUDE_IM_IME_TRUE]) +m4trace:configure.in:1137: -1- AC_SUBST_TRACE([INCLUDE_IM_IME_TRUE]) @@ -39115,6 +43937,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1137: -1- AC_SUBST([INCLUDE_IM_IME_FALSE]) +m4trace:configure.in:1137: -1- AC_SUBST_TRACE([INCLUDE_IM_IME_FALSE]) +m4trace:configure.in:1137: -1- m4_pattern_allow([^INCLUDE_IM_IME_FALSE$]) ++m4trace:configure.in:1137: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_IME_TRUE]) ++m4trace:configure.in:1137: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_IME_FALSE]) +m4trace:configure.in:1138: -1- AM_CONDITIONAL([INCLUDE_IM_INUKTITUT], [test x"$INCLUDE_inuktitut" = xyes]) +m4trace:configure.in:1138: -1- AC_SUBST([INCLUDE_IM_INUKTITUT_TRUE]) +m4trace:configure.in:1138: -1- AC_SUBST_TRACE([INCLUDE_IM_INUKTITUT_TRUE]) @@ -39122,6 +43946,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1138: -1- AC_SUBST([INCLUDE_IM_INUKTITUT_FALSE]) +m4trace:configure.in:1138: -1- AC_SUBST_TRACE([INCLUDE_IM_INUKTITUT_FALSE]) +m4trace:configure.in:1138: -1- m4_pattern_allow([^INCLUDE_IM_INUKTITUT_FALSE$]) ++m4trace:configure.in:1138: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_INUKTITUT_TRUE]) ++m4trace:configure.in:1138: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_INUKTITUT_FALSE]) +m4trace:configure.in:1139: -1- AM_CONDITIONAL([INCLUDE_IM_IPA], [test x"$INCLUDE_ipa" = xyes]) +m4trace:configure.in:1139: -1- AC_SUBST([INCLUDE_IM_IPA_TRUE]) +m4trace:configure.in:1139: -1- AC_SUBST_TRACE([INCLUDE_IM_IPA_TRUE]) @@ -39129,6 +43955,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1139: -1- AC_SUBST([INCLUDE_IM_IPA_FALSE]) +m4trace:configure.in:1139: -1- AC_SUBST_TRACE([INCLUDE_IM_IPA_FALSE]) +m4trace:configure.in:1139: -1- m4_pattern_allow([^INCLUDE_IM_IPA_FALSE$]) ++m4trace:configure.in:1139: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_IPA_TRUE]) ++m4trace:configure.in:1139: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_IPA_FALSE]) +m4trace:configure.in:1140: -1- AM_CONDITIONAL([INCLUDE_IM_MULTIPRESS], [test x"$INCLUDE_multipress" = xyes]) +m4trace:configure.in:1140: -1- AC_SUBST([INCLUDE_IM_MULTIPRESS_TRUE]) +m4trace:configure.in:1140: -1- AC_SUBST_TRACE([INCLUDE_IM_MULTIPRESS_TRUE]) @@ -39136,6 +43964,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1140: -1- AC_SUBST([INCLUDE_IM_MULTIPRESS_FALSE]) +m4trace:configure.in:1140: -1- AC_SUBST_TRACE([INCLUDE_IM_MULTIPRESS_FALSE]) +m4trace:configure.in:1140: -1- m4_pattern_allow([^INCLUDE_IM_MULTIPRESS_FALSE$]) ++m4trace:configure.in:1140: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_MULTIPRESS_TRUE]) ++m4trace:configure.in:1140: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_MULTIPRESS_FALSE]) +m4trace:configure.in:1141: -1- AM_CONDITIONAL([INCLUDE_IM_THAI], [test x"$INCLUDE_thai" = xyes]) +m4trace:configure.in:1141: -1- AC_SUBST([INCLUDE_IM_THAI_TRUE]) +m4trace:configure.in:1141: -1- AC_SUBST_TRACE([INCLUDE_IM_THAI_TRUE]) @@ -39143,6 +43973,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1141: -1- AC_SUBST([INCLUDE_IM_THAI_FALSE]) +m4trace:configure.in:1141: -1- AC_SUBST_TRACE([INCLUDE_IM_THAI_FALSE]) +m4trace:configure.in:1141: -1- m4_pattern_allow([^INCLUDE_IM_THAI_FALSE$]) ++m4trace:configure.in:1141: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_THAI_TRUE]) ++m4trace:configure.in:1141: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_THAI_FALSE]) +m4trace:configure.in:1142: -1- AM_CONDITIONAL([INCLUDE_IM_TI_ER], [test x"$INCLUDE_ti_er" = xyes]) +m4trace:configure.in:1142: -1- AC_SUBST([INCLUDE_IM_TI_ER_TRUE]) +m4trace:configure.in:1142: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ER_TRUE]) @@ -39150,6 +43982,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1142: -1- AC_SUBST([INCLUDE_IM_TI_ER_FALSE]) +m4trace:configure.in:1142: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ER_FALSE]) +m4trace:configure.in:1142: -1- m4_pattern_allow([^INCLUDE_IM_TI_ER_FALSE$]) ++m4trace:configure.in:1142: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_TI_ER_TRUE]) ++m4trace:configure.in:1142: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_TI_ER_FALSE]) +m4trace:configure.in:1143: -1- AM_CONDITIONAL([INCLUDE_IM_TI_ET], [test x"$INCLUDE_ti_et" = xyes]) +m4trace:configure.in:1143: -1- AC_SUBST([INCLUDE_IM_TI_ET_TRUE]) +m4trace:configure.in:1143: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ET_TRUE]) @@ -39157,6 +43991,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1143: -1- AC_SUBST([INCLUDE_IM_TI_ET_FALSE]) +m4trace:configure.in:1143: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ET_FALSE]) +m4trace:configure.in:1143: -1- m4_pattern_allow([^INCLUDE_IM_TI_ET_FALSE$]) ++m4trace:configure.in:1143: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_TI_ET_TRUE]) ++m4trace:configure.in:1143: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_TI_ET_FALSE]) +m4trace:configure.in:1144: -1- AM_CONDITIONAL([INCLUDE_IM_VIQR], [test x"$INCLUDE_viqr" = xyes]) +m4trace:configure.in:1144: -1- AC_SUBST([INCLUDE_IM_VIQR_TRUE]) +m4trace:configure.in:1144: -1- AC_SUBST_TRACE([INCLUDE_IM_VIQR_TRUE]) @@ -39164,6 +44000,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1144: -1- AC_SUBST([INCLUDE_IM_VIQR_FALSE]) +m4trace:configure.in:1144: -1- AC_SUBST_TRACE([INCLUDE_IM_VIQR_FALSE]) +m4trace:configure.in:1144: -1- m4_pattern_allow([^INCLUDE_IM_VIQR_FALSE$]) ++m4trace:configure.in:1144: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_VIQR_TRUE]) ++m4trace:configure.in:1144: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_VIQR_FALSE]) +m4trace:configure.in:1145: -1- AM_CONDITIONAL([INCLUDE_IM_XIM], [test x"$INCLUDE_xim" = xyes]) +m4trace:configure.in:1145: -1- AC_SUBST([INCLUDE_IM_XIM_TRUE]) +m4trace:configure.in:1145: -1- AC_SUBST_TRACE([INCLUDE_IM_XIM_TRUE]) @@ -39171,6 +44009,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1145: -1- AC_SUBST([INCLUDE_IM_XIM_FALSE]) +m4trace:configure.in:1145: -1- AC_SUBST_TRACE([INCLUDE_IM_XIM_FALSE]) +m4trace:configure.in:1145: -1- m4_pattern_allow([^INCLUDE_IM_XIM_FALSE$]) ++m4trace:configure.in:1145: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_XIM_TRUE]) ++m4trace:configure.in:1145: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_XIM_FALSE]) +m4trace:configure.in:1147: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H]) +m4trace:configure.in:1147: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$]) +m4trace:configure.in:1147: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have that is POSIX.1 compatible. */ @@ -39186,6 +44026,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1151: -1- AC_SUBST([HAVE_TIFF_FALSE]) +m4trace:configure.in:1151: -1- AC_SUBST_TRACE([HAVE_TIFF_FALSE]) +m4trace:configure.in:1151: -1- m4_pattern_allow([^HAVE_TIFF_FALSE$]) ++m4trace:configure.in:1151: -1- _AM_SUBST_NOTMAKE([HAVE_TIFF_TRUE]) ++m4trace:configure.in:1151: -1- _AM_SUBST_NOTMAKE([HAVE_TIFF_FALSE]) +m4trace:configure.in:1152: -1- AM_CONDITIONAL([HAVE_PNG], [test "x$LIBPNG" != x]) +m4trace:configure.in:1152: -1- AC_SUBST([HAVE_PNG_TRUE]) +m4trace:configure.in:1152: -1- AC_SUBST_TRACE([HAVE_PNG_TRUE]) @@ -39193,6 +44035,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1152: -1- AC_SUBST([HAVE_PNG_FALSE]) +m4trace:configure.in:1152: -1- AC_SUBST_TRACE([HAVE_PNG_FALSE]) +m4trace:configure.in:1152: -1- m4_pattern_allow([^HAVE_PNG_FALSE$]) ++m4trace:configure.in:1152: -1- _AM_SUBST_NOTMAKE([HAVE_PNG_TRUE]) ++m4trace:configure.in:1152: -1- _AM_SUBST_NOTMAKE([HAVE_PNG_FALSE]) +m4trace:configure.in:1153: -1- AM_CONDITIONAL([HAVE_JPEG], [test "x$LIBJPEG" != x]) +m4trace:configure.in:1153: -1- AC_SUBST([HAVE_JPEG_TRUE]) +m4trace:configure.in:1153: -1- AC_SUBST_TRACE([HAVE_JPEG_TRUE]) @@ -39200,6 +44044,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1153: -1- AC_SUBST([HAVE_JPEG_FALSE]) +m4trace:configure.in:1153: -1- AC_SUBST_TRACE([HAVE_JPEG_FALSE]) +m4trace:configure.in:1153: -1- m4_pattern_allow([^HAVE_JPEG_FALSE$]) ++m4trace:configure.in:1153: -1- _AM_SUBST_NOTMAKE([HAVE_JPEG_TRUE]) ++m4trace:configure.in:1153: -1- _AM_SUBST_NOTMAKE([HAVE_JPEG_FALSE]) +m4trace:configure.in:1154: -1- AM_CONDITIONAL([HAVE_JASPER], [test "x$LIBJASPER" != x]) +m4trace:configure.in:1154: -1- AC_SUBST([HAVE_JASPER_TRUE]) +m4trace:configure.in:1154: -1- AC_SUBST_TRACE([HAVE_JASPER_TRUE]) @@ -39207,6 +44053,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1154: -1- AC_SUBST([HAVE_JASPER_FALSE]) +m4trace:configure.in:1154: -1- AC_SUBST_TRACE([HAVE_JASPER_FALSE]) +m4trace:configure.in:1154: -1- m4_pattern_allow([^HAVE_JASPER_FALSE$]) ++m4trace:configure.in:1154: -1- _AM_SUBST_NOTMAKE([HAVE_JASPER_TRUE]) ++m4trace:configure.in:1154: -1- _AM_SUBST_NOTMAKE([HAVE_JASPER_FALSE]) +m4trace:configure.in:1175: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_SYSTEMINFO_H]) +m4trace:configure.in:1175: -2- m4_pattern_allow([^HAVE_SYS_SYSTEMINFO_H$]) +m4trace:configure.in:1175: -2- AH_OUTPUT([HAVE_SYS_SYSTEMINFO_H], [/* Define to 1 if sys/systeminfo.h is available */ @@ -39230,6 +44078,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1200: -1- AC_SUBST([USE_MEDIALIB_FALSE]) +m4trace:configure.in:1200: -1- AC_SUBST_TRACE([USE_MEDIALIB_FALSE]) +m4trace:configure.in:1200: -1- m4_pattern_allow([^USE_MEDIALIB_FALSE$]) ++m4trace:configure.in:1200: -1- _AM_SUBST_NOTMAKE([USE_MEDIALIB_TRUE]) ++m4trace:configure.in:1200: -1- _AM_SUBST_NOTMAKE([USE_MEDIALIB_FALSE]) +m4trace:configure.in:1201: -1- AM_CONDITIONAL([USE_MEDIALIB25], [test $use_mlib25 = yes]) +m4trace:configure.in:1201: -1- AC_SUBST([USE_MEDIALIB25_TRUE]) +m4trace:configure.in:1201: -1- AC_SUBST_TRACE([USE_MEDIALIB25_TRUE]) @@ -39237,6 +44087,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1201: -1- AC_SUBST([USE_MEDIALIB25_FALSE]) +m4trace:configure.in:1201: -1- AC_SUBST_TRACE([USE_MEDIALIB25_FALSE]) +m4trace:configure.in:1201: -1- m4_pattern_allow([^USE_MEDIALIB25_FALSE$]) ++m4trace:configure.in:1201: -1- _AM_SUBST_NOTMAKE([USE_MEDIALIB25_TRUE]) ++m4trace:configure.in:1201: -1- _AM_SUBST_NOTMAKE([USE_MEDIALIB25_FALSE]) +m4trace:configure.in:1234: -1- AC_DEFINE_TRACE_LITERAL([USE_MMX]) +m4trace:configure.in:1234: -1- m4_pattern_allow([^USE_MMX$]) +m4trace:configure.in:1234: -1- AH_OUTPUT([USE_MMX], [/* Define to 1 if XXM is available and should be used */ @@ -39248,6 +44100,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1242: -1- AC_SUBST([USE_MMX_FALSE]) +m4trace:configure.in:1242: -1- AC_SUBST_TRACE([USE_MMX_FALSE]) +m4trace:configure.in:1242: -1- m4_pattern_allow([^USE_MMX_FALSE$]) ++m4trace:configure.in:1242: -1- _AM_SUBST_NOTMAKE([USE_MMX_TRUE]) ++m4trace:configure.in:1242: -1- _AM_SUBST_NOTMAKE([USE_MMX_FALSE]) +m4trace:configure.in:1251: -1- AM_CONDITIONAL([CROSS_COMPILING], [test $cross_compiling = yes]) +m4trace:configure.in:1251: -1- AC_SUBST([CROSS_COMPILING_TRUE]) +m4trace:configure.in:1251: -1- AC_SUBST_TRACE([CROSS_COMPILING_TRUE]) @@ -39255,6 +44109,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1251: -1- AC_SUBST([CROSS_COMPILING_FALSE]) +m4trace:configure.in:1251: -1- AC_SUBST_TRACE([CROSS_COMPILING_FALSE]) +m4trace:configure.in:1251: -1- m4_pattern_allow([^CROSS_COMPILING_FALSE$]) ++m4trace:configure.in:1251: -1- _AM_SUBST_NOTMAKE([CROSS_COMPILING_TRUE]) ++m4trace:configure.in:1251: -1- _AM_SUBST_NOTMAKE([CROSS_COMPILING_FALSE]) +m4trace:configure.in:1254: -1- AC_SUBST([GDK_PIXBUF_CSOURCE]) +m4trace:configure.in:1254: -1- AC_SUBST_TRACE([GDK_PIXBUF_CSOURCE]) +m4trace:configure.in:1254: -1- m4_pattern_allow([^GDK_PIXBUF_CSOURCE$]) @@ -39311,6 +44167,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1389: -1- AC_SUBST([HAVE_X11R6_FALSE]) +m4trace:configure.in:1389: -1- AC_SUBST_TRACE([HAVE_X11R6_FALSE]) +m4trace:configure.in:1389: -1- m4_pattern_allow([^HAVE_X11R6_FALSE$]) ++m4trace:configure.in:1389: -1- _AM_SUBST_NOTMAKE([HAVE_X11R6_TRUE]) ++m4trace:configure.in:1389: -1- _AM_SUBST_NOTMAKE([HAVE_X11R6_FALSE]) +m4trace:configure.in:1395: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XKB]) +m4trace:configure.in:1395: -1- m4_pattern_allow([^HAVE_XKB$]) +m4trace:configure.in:1395: -1- AH_OUTPUT([HAVE_XKB], [/* Define to use XKB extension */ @@ -39373,6 +44231,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1539: -1- AC_SUBST([XINPUT_XFREE_FALSE]) +m4trace:configure.in:1539: -1- AC_SUBST_TRACE([XINPUT_XFREE_FALSE]) +m4trace:configure.in:1539: -1- m4_pattern_allow([^XINPUT_XFREE_FALSE$]) ++m4trace:configure.in:1539: -1- _AM_SUBST_NOTMAKE([XINPUT_XFREE_TRUE]) ++m4trace:configure.in:1539: -1- _AM_SUBST_NOTMAKE([XINPUT_XFREE_FALSE]) +m4trace:configure.in:1543: -1- AC_DEFINE_TRACE_LITERAL([HAVE_RANDR]) +m4trace:configure.in:1543: -1- m4_pattern_allow([^HAVE_RANDR$]) +m4trace:configure.in:1543: -1- AH_OUTPUT([HAVE_RANDR], [/* Have the Xrandr extension library */ @@ -39400,6 +44260,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1592: -1- AC_SUBST([USE_X11_FALSE]) +m4trace:configure.in:1592: -1- AC_SUBST_TRACE([USE_X11_FALSE]) +m4trace:configure.in:1592: -1- m4_pattern_allow([^USE_X11_FALSE$]) ++m4trace:configure.in:1592: -1- _AM_SUBST_NOTMAKE([USE_X11_TRUE]) ++m4trace:configure.in:1592: -1- _AM_SUBST_NOTMAKE([USE_X11_FALSE]) +m4trace:configure.in:1594: -1- AM_CONDITIONAL([XINPUT_XFREE], [false]) +m4trace:configure.in:1594: -1- AC_SUBST([XINPUT_XFREE_TRUE]) +m4trace:configure.in:1594: -1- AC_SUBST_TRACE([XINPUT_XFREE_TRUE]) @@ -39407,6 +44269,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1594: -1- AC_SUBST([XINPUT_XFREE_FALSE]) +m4trace:configure.in:1594: -1- AC_SUBST_TRACE([XINPUT_XFREE_FALSE]) +m4trace:configure.in:1594: -1- m4_pattern_allow([^XINPUT_XFREE_FALSE$]) ++m4trace:configure.in:1594: -1- _AM_SUBST_NOTMAKE([XINPUT_XFREE_TRUE]) ++m4trace:configure.in:1594: -1- _AM_SUBST_NOTMAKE([XINPUT_XFREE_FALSE]) +m4trace:configure.in:1595: -1- AM_CONDITIONAL([USE_X11], [false]) +m4trace:configure.in:1595: -1- AC_SUBST([USE_X11_TRUE]) +m4trace:configure.in:1595: -1- AC_SUBST_TRACE([USE_X11_TRUE]) @@ -39414,6 +44278,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1595: -1- AC_SUBST([USE_X11_FALSE]) +m4trace:configure.in:1595: -1- AC_SUBST_TRACE([USE_X11_FALSE]) +m4trace:configure.in:1595: -1- m4_pattern_allow([^USE_X11_FALSE$]) ++m4trace:configure.in:1595: -1- _AM_SUBST_NOTMAKE([USE_X11_TRUE]) ++m4trace:configure.in:1595: -1- _AM_SUBST_NOTMAKE([USE_X11_FALSE]) +m4trace:configure.in:1596: -1- AM_CONDITIONAL([HAVE_X11R6], [false]) +m4trace:configure.in:1596: -1- AC_SUBST([HAVE_X11R6_TRUE]) +m4trace:configure.in:1596: -1- AC_SUBST_TRACE([HAVE_X11R6_TRUE]) @@ -39421,6 +44287,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1596: -1- AC_SUBST([HAVE_X11R6_FALSE]) +m4trace:configure.in:1596: -1- AC_SUBST_TRACE([HAVE_X11R6_FALSE]) +m4trace:configure.in:1596: -1- m4_pattern_allow([^HAVE_X11R6_FALSE$]) ++m4trace:configure.in:1596: -1- _AM_SUBST_NOTMAKE([HAVE_X11R6_TRUE]) ++m4trace:configure.in:1596: -1- _AM_SUBST_NOTMAKE([HAVE_X11R6_FALSE]) +m4trace:configure.in:1601: -1- AM_CONDITIONAL([USE_WIN32], [true]) +m4trace:configure.in:1601: -1- AC_SUBST([USE_WIN32_TRUE]) +m4trace:configure.in:1601: -1- AC_SUBST_TRACE([USE_WIN32_TRUE]) @@ -39428,6 +44296,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1601: -1- AC_SUBST([USE_WIN32_FALSE]) +m4trace:configure.in:1601: -1- AC_SUBST_TRACE([USE_WIN32_FALSE]) +m4trace:configure.in:1601: -1- m4_pattern_allow([^USE_WIN32_FALSE$]) ++m4trace:configure.in:1601: -1- _AM_SUBST_NOTMAKE([USE_WIN32_TRUE]) ++m4trace:configure.in:1601: -1- _AM_SUBST_NOTMAKE([USE_WIN32_FALSE]) +m4trace:configure.in:1603: -1- AM_CONDITIONAL([USE_WIN32], [false]) +m4trace:configure.in:1603: -1- AC_SUBST([USE_WIN32_TRUE]) +m4trace:configure.in:1603: -1- AC_SUBST_TRACE([USE_WIN32_TRUE]) @@ -39435,6 +44305,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1603: -1- AC_SUBST([USE_WIN32_FALSE]) +m4trace:configure.in:1603: -1- AC_SUBST_TRACE([USE_WIN32_FALSE]) +m4trace:configure.in:1603: -1- m4_pattern_allow([^USE_WIN32_FALSE$]) ++m4trace:configure.in:1603: -1- _AM_SUBST_NOTMAKE([USE_WIN32_TRUE]) ++m4trace:configure.in:1603: -1- _AM_SUBST_NOTMAKE([USE_WIN32_FALSE]) +m4trace:configure.in:1608: -1- AM_CONDITIONAL([USE_QUARTZ], [true]) +m4trace:configure.in:1608: -1- AC_SUBST([USE_QUARTZ_TRUE]) +m4trace:configure.in:1608: -1- AC_SUBST_TRACE([USE_QUARTZ_TRUE]) @@ -39442,6 +44314,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1608: -1- AC_SUBST([USE_QUARTZ_FALSE]) +m4trace:configure.in:1608: -1- AC_SUBST_TRACE([USE_QUARTZ_FALSE]) +m4trace:configure.in:1608: -1- m4_pattern_allow([^USE_QUARTZ_FALSE$]) ++m4trace:configure.in:1608: -1- _AM_SUBST_NOTMAKE([USE_QUARTZ_TRUE]) ++m4trace:configure.in:1608: -1- _AM_SUBST_NOTMAKE([USE_QUARTZ_FALSE]) +m4trace:configure.in:1610: -1- AM_CONDITIONAL([USE_QUARTZ], [false]) +m4trace:configure.in:1610: -1- AC_SUBST([USE_QUARTZ_TRUE]) +m4trace:configure.in:1610: -1- AC_SUBST_TRACE([USE_QUARTZ_TRUE]) @@ -39449,6 +44323,8 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1610: -1- AC_SUBST([USE_QUARTZ_FALSE]) +m4trace:configure.in:1610: -1- AC_SUBST_TRACE([USE_QUARTZ_FALSE]) +m4trace:configure.in:1610: -1- m4_pattern_allow([^USE_QUARTZ_FALSE$]) ++m4trace:configure.in:1610: -1- _AM_SUBST_NOTMAKE([USE_QUARTZ_TRUE]) ++m4trace:configure.in:1610: -1- _AM_SUBST_NOTMAKE([USE_QUARTZ_FALSE]) +m4trace:configure.in:1616: -1- AC_SUBST([GDK_PIXBUF_XLIB_PACKAGES]) +m4trace:configure.in:1616: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_PACKAGES]) +m4trace:configure.in:1616: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_PACKAGES$]) @@ -39464,209 +44340,227 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +m4trace:configure.in:1620: -1- AC_SUBST([GDK_PIXBUF_XLIB_DEP_CFLAGS]) +m4trace:configure.in:1620: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_DEP_CFLAGS]) +m4trace:configure.in:1620: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_DEP_CFLAGS$]) -+m4trace:configure.in:1648: -1- AM_CONDITIONAL([USE_DIRECTFB], [true]) -+m4trace:configure.in:1648: -1- AC_SUBST([USE_DIRECTFB_TRUE]) -+m4trace:configure.in:1648: -1- AC_SUBST_TRACE([USE_DIRECTFB_TRUE]) -+m4trace:configure.in:1648: -1- m4_pattern_allow([^USE_DIRECTFB_TRUE$]) -+m4trace:configure.in:1648: -1- AC_SUBST([USE_DIRECTFB_FALSE]) -+m4trace:configure.in:1648: -1- AC_SUBST_TRACE([USE_DIRECTFB_FALSE]) -+m4trace:configure.in:1648: -1- m4_pattern_allow([^USE_DIRECTFB_FALSE$]) -+m4trace:configure.in:1650: -1- AM_CONDITIONAL([USE_DIRECTFB], [false]) -+m4trace:configure.in:1650: -1- AC_SUBST([USE_DIRECTFB_TRUE]) -+m4trace:configure.in:1650: -1- AC_SUBST_TRACE([USE_DIRECTFB_TRUE]) -+m4trace:configure.in:1650: -1- m4_pattern_allow([^USE_DIRECTFB_TRUE$]) -+m4trace:configure.in:1650: -1- AC_SUBST([USE_DIRECTFB_FALSE]) -+m4trace:configure.in:1650: -1- AC_SUBST_TRACE([USE_DIRECTFB_FALSE]) -+m4trace:configure.in:1650: -1- m4_pattern_allow([^USE_DIRECTFB_FALSE$]) -+m4trace:configure.in:1708: -1- AC_SUBST([GDK_PACKAGES]) -+m4trace:configure.in:1708: -1- AC_SUBST_TRACE([GDK_PACKAGES]) -+m4trace:configure.in:1708: -1- m4_pattern_allow([^GDK_PACKAGES$]) -+m4trace:configure.in:1709: -1- AC_SUBST([GDK_PRIVATE_PACKAGES]) -+m4trace:configure.in:1709: -1- AC_SUBST_TRACE([GDK_PRIVATE_PACKAGES]) -+m4trace:configure.in:1709: -1- m4_pattern_allow([^GDK_PRIVATE_PACKAGES$]) -+m4trace:configure.in:1710: -1- AC_SUBST([GDK_EXTRA_LIBS]) -+m4trace:configure.in:1710: -1- AC_SUBST_TRACE([GDK_EXTRA_LIBS]) -+m4trace:configure.in:1710: -1- m4_pattern_allow([^GDK_EXTRA_LIBS$]) -+m4trace:configure.in:1711: -1- AC_SUBST([GDK_EXTRA_CFLAGS]) -+m4trace:configure.in:1711: -1- AC_SUBST_TRACE([GDK_EXTRA_CFLAGS]) -+m4trace:configure.in:1711: -1- m4_pattern_allow([^GDK_EXTRA_CFLAGS$]) -+m4trace:configure.in:1712: -1- AC_SUBST([GDK_DEP_LIBS]) -+m4trace:configure.in:1712: -1- AC_SUBST_TRACE([GDK_DEP_LIBS]) -+m4trace:configure.in:1712: -1- m4_pattern_allow([^GDK_DEP_LIBS$]) -+m4trace:configure.in:1713: -1- AC_SUBST([GDK_DEP_CFLAGS]) -+m4trace:configure.in:1713: -1- AC_SUBST_TRACE([GDK_DEP_CFLAGS]) -+m4trace:configure.in:1713: -1- m4_pattern_allow([^GDK_DEP_CFLAGS$]) -+m4trace:configure.in:1767: -1- AC_SUBST([GDK_PIXBUF_PACKAGES]) -+m4trace:configure.in:1767: -1- AC_SUBST_TRACE([GDK_PIXBUF_PACKAGES]) -+m4trace:configure.in:1767: -1- m4_pattern_allow([^GDK_PIXBUF_PACKAGES$]) -+m4trace:configure.in:1768: -1- AC_SUBST([GDK_PIXBUF_EXTRA_LIBS]) -+m4trace:configure.in:1768: -1- AC_SUBST_TRACE([GDK_PIXBUF_EXTRA_LIBS]) -+m4trace:configure.in:1768: -1- m4_pattern_allow([^GDK_PIXBUF_EXTRA_LIBS$]) -+m4trace:configure.in:1769: -1- AC_SUBST([GDK_PIXBUF_EXTRA_CFLAGS]) -+m4trace:configure.in:1769: -1- AC_SUBST_TRACE([GDK_PIXBUF_EXTRA_CFLAGS]) -+m4trace:configure.in:1769: -1- m4_pattern_allow([^GDK_PIXBUF_EXTRA_CFLAGS$]) -+m4trace:configure.in:1770: -1- AC_SUBST([GDK_PIXBUF_DEP_LIBS]) -+m4trace:configure.in:1770: -1- AC_SUBST_TRACE([GDK_PIXBUF_DEP_LIBS]) -+m4trace:configure.in:1770: -1- m4_pattern_allow([^GDK_PIXBUF_DEP_LIBS$]) -+m4trace:configure.in:1771: -1- AC_SUBST([GDK_PIXBUF_DEP_CFLAGS]) -+m4trace:configure.in:1771: -1- AC_SUBST_TRACE([GDK_PIXBUF_DEP_CFLAGS]) -+m4trace:configure.in:1771: -1- m4_pattern_allow([^GDK_PIXBUF_DEP_CFLAGS$]) -+m4trace:configure.in:1773: -1- AC_SUBST([GTK_PACKAGES]) -+m4trace:configure.in:1773: -1- AC_SUBST_TRACE([GTK_PACKAGES]) -+m4trace:configure.in:1773: -1- m4_pattern_allow([^GTK_PACKAGES$]) -+m4trace:configure.in:1774: -1- AC_SUBST([GTK_EXTRA_LIBS]) -+m4trace:configure.in:1774: -1- AC_SUBST_TRACE([GTK_EXTRA_LIBS]) -+m4trace:configure.in:1774: -1- m4_pattern_allow([^GTK_EXTRA_LIBS$]) -+m4trace:configure.in:1775: -1- AC_SUBST([GTK_EXTRA_CFLAGS]) -+m4trace:configure.in:1775: -1- AC_SUBST_TRACE([GTK_EXTRA_CFLAGS]) -+m4trace:configure.in:1775: -1- m4_pattern_allow([^GTK_EXTRA_CFLAGS$]) -+m4trace:configure.in:1776: -1- AC_SUBST([GTK_DEP_LIBS]) -+m4trace:configure.in:1776: -1- AC_SUBST_TRACE([GTK_DEP_LIBS]) -+m4trace:configure.in:1776: -1- m4_pattern_allow([^GTK_DEP_LIBS$]) -+m4trace:configure.in:1777: -1- AC_SUBST([GTK_DEP_CFLAGS]) -+m4trace:configure.in:1777: -1- AC_SUBST_TRACE([GTK_DEP_CFLAGS]) -+m4trace:configure.in:1777: -1- m4_pattern_allow([^GTK_DEP_CFLAGS$]) -+m4trace:configure.in:1779: -1- AC_SUBST([GLIB_PREFIX]) -+m4trace:configure.in:1779: -1- AC_SUBST_TRACE([GLIB_PREFIX]) -+m4trace:configure.in:1779: -1- m4_pattern_allow([^GLIB_PREFIX$]) -+m4trace:configure.in:1780: -1- AC_SUBST([ATK_PREFIX]) -+m4trace:configure.in:1780: -1- AC_SUBST_TRACE([ATK_PREFIX]) -+m4trace:configure.in:1780: -1- m4_pattern_allow([^ATK_PREFIX$]) -+m4trace:configure.in:1781: -1- AC_SUBST([PANGO_PREFIX]) -+m4trace:configure.in:1781: -1- AC_SUBST_TRACE([PANGO_PREFIX]) -+m4trace:configure.in:1781: -1- m4_pattern_allow([^PANGO_PREFIX$]) -+m4trace:configure.in:1782: -1- AC_SUBST([CAIRO_PREFIX]) -+m4trace:configure.in:1782: -1- AC_SUBST_TRACE([CAIRO_PREFIX]) -+m4trace:configure.in:1782: -1- m4_pattern_allow([^CAIRO_PREFIX$]) -+m4trace:configure.in:1784: -1- AC_SUBST([GTK_DEBUG_FLAGS]) -+m4trace:configure.in:1784: -1- AC_SUBST_TRACE([GTK_DEBUG_FLAGS]) -+m4trace:configure.in:1784: -1- m4_pattern_allow([^GTK_DEBUG_FLAGS$]) -+m4trace:configure.in:1785: -1- AC_SUBST([GTK_XIM_FLAGS]) -+m4trace:configure.in:1785: -1- AC_SUBST_TRACE([GTK_XIM_FLAGS]) -+m4trace:configure.in:1785: -1- m4_pattern_allow([^GTK_XIM_FLAGS$]) -+m4trace:configure.in:1806: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_UN_SUN_LEN]) -+m4trace:configure.in:1806: -1- m4_pattern_allow([^HAVE_SOCKADDR_UN_SUN_LEN$]) -+m4trace:configure.in:1806: -1- AH_OUTPUT([HAVE_SOCKADDR_UN_SUN_LEN], [/* Have the sockaddr_un.sun_len member */ ++m4trace:configure.in:1638: -1- AM_CONDITIONAL([USE_DIRECTFB], [true]) ++m4trace:configure.in:1638: -1- AC_SUBST([USE_DIRECTFB_TRUE]) ++m4trace:configure.in:1638: -1- AC_SUBST_TRACE([USE_DIRECTFB_TRUE]) ++m4trace:configure.in:1638: -1- m4_pattern_allow([^USE_DIRECTFB_TRUE$]) ++m4trace:configure.in:1638: -1- AC_SUBST([USE_DIRECTFB_FALSE]) ++m4trace:configure.in:1638: -1- AC_SUBST_TRACE([USE_DIRECTFB_FALSE]) ++m4trace:configure.in:1638: -1- m4_pattern_allow([^USE_DIRECTFB_FALSE$]) ++m4trace:configure.in:1638: -1- _AM_SUBST_NOTMAKE([USE_DIRECTFB_TRUE]) ++m4trace:configure.in:1638: -1- _AM_SUBST_NOTMAKE([USE_DIRECTFB_FALSE]) ++m4trace:configure.in:1640: -1- AM_CONDITIONAL([USE_DIRECTFB], [false]) ++m4trace:configure.in:1640: -1- AC_SUBST([USE_DIRECTFB_TRUE]) ++m4trace:configure.in:1640: -1- AC_SUBST_TRACE([USE_DIRECTFB_TRUE]) ++m4trace:configure.in:1640: -1- m4_pattern_allow([^USE_DIRECTFB_TRUE$]) ++m4trace:configure.in:1640: -1- AC_SUBST([USE_DIRECTFB_FALSE]) ++m4trace:configure.in:1640: -1- AC_SUBST_TRACE([USE_DIRECTFB_FALSE]) ++m4trace:configure.in:1640: -1- m4_pattern_allow([^USE_DIRECTFB_FALSE$]) ++m4trace:configure.in:1640: -1- _AM_SUBST_NOTMAKE([USE_DIRECTFB_TRUE]) ++m4trace:configure.in:1640: -1- _AM_SUBST_NOTMAKE([USE_DIRECTFB_FALSE]) ++m4trace:configure.in:1698: -1- AC_SUBST([GDK_PACKAGES]) ++m4trace:configure.in:1698: -1- AC_SUBST_TRACE([GDK_PACKAGES]) ++m4trace:configure.in:1698: -1- m4_pattern_allow([^GDK_PACKAGES$]) ++m4trace:configure.in:1699: -1- AC_SUBST([GDK_PRIVATE_PACKAGES]) ++m4trace:configure.in:1699: -1- AC_SUBST_TRACE([GDK_PRIVATE_PACKAGES]) ++m4trace:configure.in:1699: -1- m4_pattern_allow([^GDK_PRIVATE_PACKAGES$]) ++m4trace:configure.in:1700: -1- AC_SUBST([GDK_EXTRA_LIBS]) ++m4trace:configure.in:1700: -1- AC_SUBST_TRACE([GDK_EXTRA_LIBS]) ++m4trace:configure.in:1700: -1- m4_pattern_allow([^GDK_EXTRA_LIBS$]) ++m4trace:configure.in:1701: -1- AC_SUBST([GDK_EXTRA_CFLAGS]) ++m4trace:configure.in:1701: -1- AC_SUBST_TRACE([GDK_EXTRA_CFLAGS]) ++m4trace:configure.in:1701: -1- m4_pattern_allow([^GDK_EXTRA_CFLAGS$]) ++m4trace:configure.in:1702: -1- AC_SUBST([GDK_DEP_LIBS]) ++m4trace:configure.in:1702: -1- AC_SUBST_TRACE([GDK_DEP_LIBS]) ++m4trace:configure.in:1702: -1- m4_pattern_allow([^GDK_DEP_LIBS$]) ++m4trace:configure.in:1703: -1- AC_SUBST([GDK_DEP_CFLAGS]) ++m4trace:configure.in:1703: -1- AC_SUBST_TRACE([GDK_DEP_CFLAGS]) ++m4trace:configure.in:1703: -1- m4_pattern_allow([^GDK_DEP_CFLAGS$]) ++m4trace:configure.in:1757: -1- AC_SUBST([GDK_PIXBUF_PACKAGES]) ++m4trace:configure.in:1757: -1- AC_SUBST_TRACE([GDK_PIXBUF_PACKAGES]) ++m4trace:configure.in:1757: -1- m4_pattern_allow([^GDK_PIXBUF_PACKAGES$]) ++m4trace:configure.in:1758: -1- AC_SUBST([GDK_PIXBUF_EXTRA_LIBS]) ++m4trace:configure.in:1758: -1- AC_SUBST_TRACE([GDK_PIXBUF_EXTRA_LIBS]) ++m4trace:configure.in:1758: -1- m4_pattern_allow([^GDK_PIXBUF_EXTRA_LIBS$]) ++m4trace:configure.in:1759: -1- AC_SUBST([GDK_PIXBUF_EXTRA_CFLAGS]) ++m4trace:configure.in:1759: -1- AC_SUBST_TRACE([GDK_PIXBUF_EXTRA_CFLAGS]) ++m4trace:configure.in:1759: -1- m4_pattern_allow([^GDK_PIXBUF_EXTRA_CFLAGS$]) ++m4trace:configure.in:1760: -1- AC_SUBST([GDK_PIXBUF_DEP_LIBS]) ++m4trace:configure.in:1760: -1- AC_SUBST_TRACE([GDK_PIXBUF_DEP_LIBS]) ++m4trace:configure.in:1760: -1- m4_pattern_allow([^GDK_PIXBUF_DEP_LIBS$]) ++m4trace:configure.in:1761: -1- AC_SUBST([GDK_PIXBUF_DEP_CFLAGS]) ++m4trace:configure.in:1761: -1- AC_SUBST_TRACE([GDK_PIXBUF_DEP_CFLAGS]) ++m4trace:configure.in:1761: -1- m4_pattern_allow([^GDK_PIXBUF_DEP_CFLAGS$]) ++m4trace:configure.in:1763: -1- AC_SUBST([GTK_PACKAGES]) ++m4trace:configure.in:1763: -1- AC_SUBST_TRACE([GTK_PACKAGES]) ++m4trace:configure.in:1763: -1- m4_pattern_allow([^GTK_PACKAGES$]) ++m4trace:configure.in:1764: -1- AC_SUBST([GTK_EXTRA_LIBS]) ++m4trace:configure.in:1764: -1- AC_SUBST_TRACE([GTK_EXTRA_LIBS]) ++m4trace:configure.in:1764: -1- m4_pattern_allow([^GTK_EXTRA_LIBS$]) ++m4trace:configure.in:1765: -1- AC_SUBST([GTK_EXTRA_CFLAGS]) ++m4trace:configure.in:1765: -1- AC_SUBST_TRACE([GTK_EXTRA_CFLAGS]) ++m4trace:configure.in:1765: -1- m4_pattern_allow([^GTK_EXTRA_CFLAGS$]) ++m4trace:configure.in:1766: -1- AC_SUBST([GTK_DEP_LIBS]) ++m4trace:configure.in:1766: -1- AC_SUBST_TRACE([GTK_DEP_LIBS]) ++m4trace:configure.in:1766: -1- m4_pattern_allow([^GTK_DEP_LIBS$]) ++m4trace:configure.in:1767: -1- AC_SUBST([GTK_DEP_CFLAGS]) ++m4trace:configure.in:1767: -1- AC_SUBST_TRACE([GTK_DEP_CFLAGS]) ++m4trace:configure.in:1767: -1- m4_pattern_allow([^GTK_DEP_CFLAGS$]) ++m4trace:configure.in:1769: -1- AC_SUBST([GLIB_PREFIX]) ++m4trace:configure.in:1769: -1- AC_SUBST_TRACE([GLIB_PREFIX]) ++m4trace:configure.in:1769: -1- m4_pattern_allow([^GLIB_PREFIX$]) ++m4trace:configure.in:1770: -1- AC_SUBST([ATK_PREFIX]) ++m4trace:configure.in:1770: -1- AC_SUBST_TRACE([ATK_PREFIX]) ++m4trace:configure.in:1770: -1- m4_pattern_allow([^ATK_PREFIX$]) ++m4trace:configure.in:1771: -1- AC_SUBST([PANGO_PREFIX]) ++m4trace:configure.in:1771: -1- AC_SUBST_TRACE([PANGO_PREFIX]) ++m4trace:configure.in:1771: -1- m4_pattern_allow([^PANGO_PREFIX$]) ++m4trace:configure.in:1772: -1- AC_SUBST([CAIRO_PREFIX]) ++m4trace:configure.in:1772: -1- AC_SUBST_TRACE([CAIRO_PREFIX]) ++m4trace:configure.in:1772: -1- m4_pattern_allow([^CAIRO_PREFIX$]) ++m4trace:configure.in:1774: -1- AC_SUBST([GTK_DEBUG_FLAGS]) ++m4trace:configure.in:1774: -1- AC_SUBST_TRACE([GTK_DEBUG_FLAGS]) ++m4trace:configure.in:1774: -1- m4_pattern_allow([^GTK_DEBUG_FLAGS$]) ++m4trace:configure.in:1775: -1- AC_SUBST([GTK_XIM_FLAGS]) ++m4trace:configure.in:1775: -1- AC_SUBST_TRACE([GTK_XIM_FLAGS]) ++m4trace:configure.in:1775: -1- m4_pattern_allow([^GTK_XIM_FLAGS$]) ++m4trace:configure.in:1796: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_UN_SUN_LEN]) ++m4trace:configure.in:1796: -1- m4_pattern_allow([^HAVE_SOCKADDR_UN_SUN_LEN$]) ++m4trace:configure.in:1796: -1- AH_OUTPUT([HAVE_SOCKADDR_UN_SUN_LEN], [/* Have the sockaddr_un.sun_len member */ +#undef HAVE_SOCKADDR_UN_SUN_LEN]) -+m4trace:configure.in:1814: -1- AC_SUBST([GAIL_INET_LIBS]) -+m4trace:configure.in:1814: -1- AC_SUBST_TRACE([GAIL_INET_LIBS]) -+m4trace:configure.in:1814: -1- m4_pattern_allow([^GAIL_INET_LIBS$]) -+m4trace:configure.in:1822: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++m4trace:configure.in:1804: -1- AC_SUBST([GAIL_INET_LIBS]) ++m4trace:configure.in:1804: -1- AC_SUBST_TRACE([GAIL_INET_LIBS]) ++m4trace:configure.in:1804: -1- m4_pattern_allow([^GAIL_INET_LIBS$]) ++m4trace:configure.in:1812: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:1822: the top level]) -+m4trace:configure.in:1829: -1- AC_SUBST([CUPS_CONFIG]) -+m4trace:configure.in:1829: -1- AC_SUBST_TRACE([CUPS_CONFIG]) -+m4trace:configure.in:1829: -1- m4_pattern_allow([^CUPS_CONFIG$]) -+m4trace:configure.in:1840: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CUPS_API_1_2]) -+m4trace:configure.in:1840: -1- m4_pattern_allow([^HAVE_CUPS_API_1_2$]) -+m4trace:configure.in:1840: -1- AH_OUTPUT([HAVE_CUPS_API_1_2], [/* Define to 1 if CUPS 1.2 API is available */ ++configure.in:1812: the top level]) ++m4trace:configure.in:1819: -1- AC_SUBST([CUPS_CONFIG]) ++m4trace:configure.in:1819: -1- AC_SUBST_TRACE([CUPS_CONFIG]) ++m4trace:configure.in:1819: -1- m4_pattern_allow([^CUPS_CONFIG$]) ++m4trace:configure.in:1830: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CUPS_API_1_2]) ++m4trace:configure.in:1830: -1- m4_pattern_allow([^HAVE_CUPS_API_1_2$]) ++m4trace:configure.in:1830: -1- AH_OUTPUT([HAVE_CUPS_API_1_2], [/* Define to 1 if CUPS 1.2 API is available */ +#undef HAVE_CUPS_API_1_2]) -+m4trace:configure.in:1844: -1- AC_SUBST([CUPS_API_MAJOR]) -+m4trace:configure.in:1844: -1- AC_SUBST_TRACE([CUPS_API_MAJOR]) -+m4trace:configure.in:1844: -1- m4_pattern_allow([^CUPS_API_MAJOR$]) -+m4trace:configure.in:1845: -1- AC_SUBST([CUPS_API_MINOR]) -+m4trace:configure.in:1845: -1- AC_SUBST_TRACE([CUPS_API_MINOR]) -+m4trace:configure.in:1845: -1- m4_pattern_allow([^CUPS_API_MINOR$]) -+m4trace:configure.in:1846: -1- AC_SUBST([CUPS_CFLAGS]) -+m4trace:configure.in:1846: -1- AC_SUBST_TRACE([CUPS_CFLAGS]) -+m4trace:configure.in:1846: -1- m4_pattern_allow([^CUPS_CFLAGS$]) -+m4trace:configure.in:1847: -1- AC_SUBST([CUPS_LIBS]) -+m4trace:configure.in:1847: -1- AC_SUBST_TRACE([CUPS_LIBS]) -+m4trace:configure.in:1847: -1- m4_pattern_allow([^CUPS_LIBS$]) -+m4trace:configure.in:1851: -1- AM_CONDITIONAL([HAVE_CUPS], [test "x$CUPS_CONFIG" != "xno"]) -+m4trace:configure.in:1851: -1- AC_SUBST([HAVE_CUPS_TRUE]) -+m4trace:configure.in:1851: -1- AC_SUBST_TRACE([HAVE_CUPS_TRUE]) -+m4trace:configure.in:1851: -1- m4_pattern_allow([^HAVE_CUPS_TRUE$]) -+m4trace:configure.in:1851: -1- AC_SUBST([HAVE_CUPS_FALSE]) -+m4trace:configure.in:1851: -1- AC_SUBST_TRACE([HAVE_CUPS_FALSE]) -+m4trace:configure.in:1851: -1- m4_pattern_allow([^HAVE_CUPS_FALSE$]) -+m4trace:configure.in:1855: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++m4trace:configure.in:1834: -1- AC_SUBST([CUPS_API_MAJOR]) ++m4trace:configure.in:1834: -1- AC_SUBST_TRACE([CUPS_API_MAJOR]) ++m4trace:configure.in:1834: -1- m4_pattern_allow([^CUPS_API_MAJOR$]) ++m4trace:configure.in:1835: -1- AC_SUBST([CUPS_API_MINOR]) ++m4trace:configure.in:1835: -1- AC_SUBST_TRACE([CUPS_API_MINOR]) ++m4trace:configure.in:1835: -1- m4_pattern_allow([^CUPS_API_MINOR$]) ++m4trace:configure.in:1836: -1- AC_SUBST([CUPS_CFLAGS]) ++m4trace:configure.in:1836: -1- AC_SUBST_TRACE([CUPS_CFLAGS]) ++m4trace:configure.in:1836: -1- m4_pattern_allow([^CUPS_CFLAGS$]) ++m4trace:configure.in:1837: -1- AC_SUBST([CUPS_LIBS]) ++m4trace:configure.in:1837: -1- AC_SUBST_TRACE([CUPS_LIBS]) ++m4trace:configure.in:1837: -1- m4_pattern_allow([^CUPS_LIBS$]) ++m4trace:configure.in:1841: -1- AM_CONDITIONAL([HAVE_CUPS], [test "x$CUPS_CONFIG" != "xno"]) ++m4trace:configure.in:1841: -1- AC_SUBST([HAVE_CUPS_TRUE]) ++m4trace:configure.in:1841: -1- AC_SUBST_TRACE([HAVE_CUPS_TRUE]) ++m4trace:configure.in:1841: -1- m4_pattern_allow([^HAVE_CUPS_TRUE$]) ++m4trace:configure.in:1841: -1- AC_SUBST([HAVE_CUPS_FALSE]) ++m4trace:configure.in:1841: -1- AC_SUBST_TRACE([HAVE_CUPS_FALSE]) ++m4trace:configure.in:1841: -1- m4_pattern_allow([^HAVE_CUPS_FALSE$]) ++m4trace:configure.in:1841: -1- _AM_SUBST_NOTMAKE([HAVE_CUPS_TRUE]) ++m4trace:configure.in:1841: -1- _AM_SUBST_NOTMAKE([HAVE_CUPS_FALSE]) ++m4trace:configure.in:1845: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:1855: the top level]) -+m4trace:configure.in:1855: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HTTP_AUTHSTRING]) -+m4trace:configure.in:1855: -1- m4_pattern_allow([^HAVE_HTTP_AUTHSTRING$]) -+m4trace:configure.in:1855: -1- AH_OUTPUT([HAVE_HTTP_AUTHSTRING], [/* Define if cups http_t authstring field is accessible */ ++configure.in:1845: the top level]) ++m4trace:configure.in:1845: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HTTP_AUTHSTRING]) ++m4trace:configure.in:1845: -1- m4_pattern_allow([^HAVE_HTTP_AUTHSTRING$]) ++m4trace:configure.in:1845: -1- AH_OUTPUT([HAVE_HTTP_AUTHSTRING], [/* Define if cups http_t authstring field is accessible */ +#undef HAVE_HTTP_AUTHSTRING]) -+m4trace:configure.in:1861: -1- AC_SUBST([HAVE_HTTP_AUTHSTRING]) -+m4trace:configure.in:1861: -1- AC_SUBST_TRACE([HAVE_HTTP_AUTHSTRING]) -+m4trace:configure.in:1861: -1- m4_pattern_allow([^HAVE_HTTP_AUTHSTRING$]) -+m4trace:configure.in:1865: -1- AH_OUTPUT([HAVE_HTTPGETAUTHSTRING], [/* Define to 1 if you have the `httpGetAuthString\' function. */ ++m4trace:configure.in:1851: -1- AC_SUBST([HAVE_HTTP_AUTHSTRING]) ++m4trace:configure.in:1851: -1- AC_SUBST_TRACE([HAVE_HTTP_AUTHSTRING]) ++m4trace:configure.in:1851: -1- m4_pattern_allow([^HAVE_HTTP_AUTHSTRING$]) ++m4trace:configure.in:1855: -1- AH_OUTPUT([HAVE_HTTPGETAUTHSTRING], [/* Define to 1 if you have the `httpGetAuthString\' function. */ +#undef HAVE_HTTPGETAUTHSTRING]) -+m4trace:configure.in:1869: -1- AM_CONDITIONAL([HAVE_CUPS], [false]) -+m4trace:configure.in:1869: -1- AC_SUBST([HAVE_CUPS_TRUE]) -+m4trace:configure.in:1869: -1- AC_SUBST_TRACE([HAVE_CUPS_TRUE]) -+m4trace:configure.in:1869: -1- m4_pattern_allow([^HAVE_CUPS_TRUE$]) -+m4trace:configure.in:1869: -1- AC_SUBST([HAVE_CUPS_FALSE]) -+m4trace:configure.in:1869: -1- AC_SUBST_TRACE([HAVE_CUPS_FALSE]) -+m4trace:configure.in:1869: -1- m4_pattern_allow([^HAVE_CUPS_FALSE$]) -+m4trace:configure.in:1888: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++m4trace:configure.in:1859: -1- AM_CONDITIONAL([HAVE_CUPS], [false]) ++m4trace:configure.in:1859: -1- AC_SUBST([HAVE_CUPS_TRUE]) ++m4trace:configure.in:1859: -1- AC_SUBST_TRACE([HAVE_CUPS_TRUE]) ++m4trace:configure.in:1859: -1- m4_pattern_allow([^HAVE_CUPS_TRUE$]) ++m4trace:configure.in:1859: -1- AC_SUBST([HAVE_CUPS_FALSE]) ++m4trace:configure.in:1859: -1- AC_SUBST_TRACE([HAVE_CUPS_FALSE]) ++m4trace:configure.in:1859: -1- m4_pattern_allow([^HAVE_CUPS_FALSE$]) ++m4trace:configure.in:1859: -1- _AM_SUBST_NOTMAKE([HAVE_CUPS_TRUE]) ++m4trace:configure.in:1859: -1- _AM_SUBST_NOTMAKE([HAVE_CUPS_FALSE]) ++m4trace:configure.in:1878: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:1888: the top level]) -+m4trace:configure.in:1892: -1- AM_CONDITIONAL([TEST_PRINT_BACKEND], [test "x$enable_test_print_backend" != "xno"]) -+m4trace:configure.in:1892: -1- AC_SUBST([TEST_PRINT_BACKEND_TRUE]) -+m4trace:configure.in:1892: -1- AC_SUBST_TRACE([TEST_PRINT_BACKEND_TRUE]) -+m4trace:configure.in:1892: -1- m4_pattern_allow([^TEST_PRINT_BACKEND_TRUE$]) -+m4trace:configure.in:1892: -1- AC_SUBST([TEST_PRINT_BACKEND_FALSE]) -+m4trace:configure.in:1892: -1- AC_SUBST_TRACE([TEST_PRINT_BACKEND_FALSE]) -+m4trace:configure.in:1892: -1- m4_pattern_allow([^TEST_PRINT_BACKEND_FALSE$]) -+m4trace:configure.in:1922: -1- AC_SUBST([HTML_DIR]) -+m4trace:configure.in:1922: -1- AC_SUBST_TRACE([HTML_DIR]) -+m4trace:configure.in:1922: -1- m4_pattern_allow([^HTML_DIR$]) -+m4trace:configure.in:1922: -1- AC_SUBST([GTKDOC_CHECK]) -+m4trace:configure.in:1922: -1- AC_SUBST_TRACE([GTKDOC_CHECK]) -+m4trace:configure.in:1922: -1- m4_pattern_allow([^GTKDOC_CHECK$]) -+m4trace:configure.in:1922: -1- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -+m4trace:configure.in:1922: -1- AC_SUBST([ENABLE_GTK_DOC_TRUE]) -+m4trace:configure.in:1922: -1- AC_SUBST_TRACE([ENABLE_GTK_DOC_TRUE]) -+m4trace:configure.in:1922: -1- m4_pattern_allow([^ENABLE_GTK_DOC_TRUE$]) -+m4trace:configure.in:1922: -1- AC_SUBST([ENABLE_GTK_DOC_FALSE]) -+m4trace:configure.in:1922: -1- AC_SUBST_TRACE([ENABLE_GTK_DOC_FALSE]) -+m4trace:configure.in:1922: -1- m4_pattern_allow([^ENABLE_GTK_DOC_FALSE$]) -+m4trace:configure.in:1922: -1- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) -+m4trace:configure.in:1922: -1- AC_SUBST([GTK_DOC_USE_LIBTOOL_TRUE]) -+m4trace:configure.in:1922: -1- AC_SUBST_TRACE([GTK_DOC_USE_LIBTOOL_TRUE]) -+m4trace:configure.in:1922: -1- m4_pattern_allow([^GTK_DOC_USE_LIBTOOL_TRUE$]) -+m4trace:configure.in:1922: -1- AC_SUBST([GTK_DOC_USE_LIBTOOL_FALSE]) -+m4trace:configure.in:1922: -1- AC_SUBST_TRACE([GTK_DOC_USE_LIBTOOL_FALSE]) -+m4trace:configure.in:1922: -1- m4_pattern_allow([^GTK_DOC_USE_LIBTOOL_FALSE$]) -+m4trace:configure.in:1924: -1- AC_SUBST([DB2HTML]) -+m4trace:configure.in:1924: -1- AC_SUBST_TRACE([DB2HTML]) -+m4trace:configure.in:1924: -1- m4_pattern_allow([^DB2HTML$]) -+m4trace:configure.in:1925: -1- AM_CONDITIONAL([HAVE_DOCBOOK], [$DB2HTML]) -+m4trace:configure.in:1925: -1- AC_SUBST([HAVE_DOCBOOK_TRUE]) -+m4trace:configure.in:1925: -1- AC_SUBST_TRACE([HAVE_DOCBOOK_TRUE]) -+m4trace:configure.in:1925: -1- m4_pattern_allow([^HAVE_DOCBOOK_TRUE$]) -+m4trace:configure.in:1925: -1- AC_SUBST([HAVE_DOCBOOK_FALSE]) -+m4trace:configure.in:1925: -1- AC_SUBST_TRACE([HAVE_DOCBOOK_FALSE]) -+m4trace:configure.in:1925: -1- m4_pattern_allow([^HAVE_DOCBOOK_FALSE$]) -+m4trace:configure.in:1927: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++configure.in:1878: the top level]) ++m4trace:configure.in:1882: -1- AM_CONDITIONAL([TEST_PRINT_BACKEND], [test "x$enable_test_print_backend" != "xno"]) ++m4trace:configure.in:1882: -1- AC_SUBST([TEST_PRINT_BACKEND_TRUE]) ++m4trace:configure.in:1882: -1- AC_SUBST_TRACE([TEST_PRINT_BACKEND_TRUE]) ++m4trace:configure.in:1882: -1- m4_pattern_allow([^TEST_PRINT_BACKEND_TRUE$]) ++m4trace:configure.in:1882: -1- AC_SUBST([TEST_PRINT_BACKEND_FALSE]) ++m4trace:configure.in:1882: -1- AC_SUBST_TRACE([TEST_PRINT_BACKEND_FALSE]) ++m4trace:configure.in:1882: -1- m4_pattern_allow([^TEST_PRINT_BACKEND_FALSE$]) ++m4trace:configure.in:1882: -1- _AM_SUBST_NOTMAKE([TEST_PRINT_BACKEND_TRUE]) ++m4trace:configure.in:1882: -1- _AM_SUBST_NOTMAKE([TEST_PRINT_BACKEND_FALSE]) ++m4trace:configure.in:1912: -1- AC_SUBST([HTML_DIR]) ++m4trace:configure.in:1912: -1- AC_SUBST_TRACE([HTML_DIR]) ++m4trace:configure.in:1912: -1- m4_pattern_allow([^HTML_DIR$]) ++m4trace:configure.in:1912: -1- AC_SUBST([GTKDOC_CHECK]) ++m4trace:configure.in:1912: -1- AC_SUBST_TRACE([GTKDOC_CHECK]) ++m4trace:configure.in:1912: -1- m4_pattern_allow([^GTKDOC_CHECK$]) ++m4trace:configure.in:1912: -1- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++m4trace:configure.in:1912: -1- AC_SUBST([ENABLE_GTK_DOC_TRUE]) ++m4trace:configure.in:1912: -1- AC_SUBST_TRACE([ENABLE_GTK_DOC_TRUE]) ++m4trace:configure.in:1912: -1- m4_pattern_allow([^ENABLE_GTK_DOC_TRUE$]) ++m4trace:configure.in:1912: -1- AC_SUBST([ENABLE_GTK_DOC_FALSE]) ++m4trace:configure.in:1912: -1- AC_SUBST_TRACE([ENABLE_GTK_DOC_FALSE]) ++m4trace:configure.in:1912: -1- m4_pattern_allow([^ENABLE_GTK_DOC_FALSE$]) ++m4trace:configure.in:1912: -1- _AM_SUBST_NOTMAKE([ENABLE_GTK_DOC_TRUE]) ++m4trace:configure.in:1912: -1- _AM_SUBST_NOTMAKE([ENABLE_GTK_DOC_FALSE]) ++m4trace:configure.in:1912: -1- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++m4trace:configure.in:1912: -1- AC_SUBST([GTK_DOC_USE_LIBTOOL_TRUE]) ++m4trace:configure.in:1912: -1- AC_SUBST_TRACE([GTK_DOC_USE_LIBTOOL_TRUE]) ++m4trace:configure.in:1912: -1- m4_pattern_allow([^GTK_DOC_USE_LIBTOOL_TRUE$]) ++m4trace:configure.in:1912: -1- AC_SUBST([GTK_DOC_USE_LIBTOOL_FALSE]) ++m4trace:configure.in:1912: -1- AC_SUBST_TRACE([GTK_DOC_USE_LIBTOOL_FALSE]) ++m4trace:configure.in:1912: -1- m4_pattern_allow([^GTK_DOC_USE_LIBTOOL_FALSE$]) ++m4trace:configure.in:1912: -1- _AM_SUBST_NOTMAKE([GTK_DOC_USE_LIBTOOL_TRUE]) ++m4trace:configure.in:1912: -1- _AM_SUBST_NOTMAKE([GTK_DOC_USE_LIBTOOL_FALSE]) ++m4trace:configure.in:1914: -1- AC_SUBST([DB2HTML]) ++m4trace:configure.in:1914: -1- AC_SUBST_TRACE([DB2HTML]) ++m4trace:configure.in:1914: -1- m4_pattern_allow([^DB2HTML$]) ++m4trace:configure.in:1915: -1- AM_CONDITIONAL([HAVE_DOCBOOK], [$DB2HTML]) ++m4trace:configure.in:1915: -1- AC_SUBST([HAVE_DOCBOOK_TRUE]) ++m4trace:configure.in:1915: -1- AC_SUBST_TRACE([HAVE_DOCBOOK_TRUE]) ++m4trace:configure.in:1915: -1- m4_pattern_allow([^HAVE_DOCBOOK_TRUE$]) ++m4trace:configure.in:1915: -1- AC_SUBST([HAVE_DOCBOOK_FALSE]) ++m4trace:configure.in:1915: -1- AC_SUBST_TRACE([HAVE_DOCBOOK_FALSE]) ++m4trace:configure.in:1915: -1- m4_pattern_allow([^HAVE_DOCBOOK_FALSE$]) ++m4trace:configure.in:1915: -1- _AM_SUBST_NOTMAKE([HAVE_DOCBOOK_TRUE]) ++m4trace:configure.in:1915: -1- _AM_SUBST_NOTMAKE([HAVE_DOCBOOK_FALSE]) ++m4trace:configure.in:1917: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... +../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:1927: the top level]) -+m4trace:configure.in:1936: -1- AC_SUBST([XSLTPROC]) -+m4trace:configure.in:1936: -1- AC_SUBST_TRACE([XSLTPROC]) -+m4trace:configure.in:1936: -1- m4_pattern_allow([^XSLTPROC$]) -+m4trace:configure.in:1942: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++configure.in:1917: the top level]) ++m4trace:configure.in:1926: -1- AC_SUBST([XSLTPROC]) ++m4trace:configure.in:1926: -1- AC_SUBST_TRACE([XSLTPROC]) ++m4trace:configure.in:1926: -1- m4_pattern_allow([^XSLTPROC$]) ++m4trace:configure.in:1932: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. +You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+aclocal.m4:43: JH_PATH_XML_CATALOG is expanded from... -+aclocal.m4:77: JH_CHECK_XML_CATALOG is expanded from... -+configure.in:1942: the top level]) -+m4trace:configure.in:1942: -1- AC_SUBST([XML_CATALOG_FILE]) -+m4trace:configure.in:1942: -1- AC_SUBST_TRACE([XML_CATALOG_FILE]) -+m4trace:configure.in:1942: -1- m4_pattern_allow([^XML_CATALOG_FILE$]) -+m4trace:configure.in:1942: -1- AC_SUBST([XMLCATALOG]) -+m4trace:configure.in:1942: -1- AC_SUBST_TRACE([XMLCATALOG]) -+m4trace:configure.in:1942: -1- m4_pattern_allow([^XMLCATALOG$]) -+m4trace:configure.in:1948: -1- AM_CONDITIONAL([ENABLE_MAN], [test x$enable_man != xno]) -+m4trace:configure.in:1948: -1- AC_SUBST([ENABLE_MAN_TRUE]) -+m4trace:configure.in:1948: -1- AC_SUBST_TRACE([ENABLE_MAN_TRUE]) -+m4trace:configure.in:1948: -1- m4_pattern_allow([^ENABLE_MAN_TRUE$]) -+m4trace:configure.in:1948: -1- AC_SUBST([ENABLE_MAN_FALSE]) -+m4trace:configure.in:1948: -1- AC_SUBST_TRACE([ENABLE_MAN_FALSE]) -+m4trace:configure.in:1948: -1- m4_pattern_allow([^ENABLE_MAN_FALSE$]) -+m4trace:configure.in:2035: -1- AC_CONFIG_FILES([ ++acinclude.m4:30: JH_PATH_XML_CATALOG is expanded from... ++acinclude.m4:64: JH_CHECK_XML_CATALOG is expanded from... ++configure.in:1932: the top level]) ++m4trace:configure.in:1932: -1- AC_SUBST([XML_CATALOG_FILE]) ++m4trace:configure.in:1932: -1- AC_SUBST_TRACE([XML_CATALOG_FILE]) ++m4trace:configure.in:1932: -1- m4_pattern_allow([^XML_CATALOG_FILE$]) ++m4trace:configure.in:1932: -1- AC_SUBST([XMLCATALOG]) ++m4trace:configure.in:1932: -1- AC_SUBST_TRACE([XMLCATALOG]) ++m4trace:configure.in:1932: -1- m4_pattern_allow([^XMLCATALOG$]) ++m4trace:configure.in:1938: -1- AM_CONDITIONAL([ENABLE_MAN], [test x$enable_man != xno]) ++m4trace:configure.in:1938: -1- AC_SUBST([ENABLE_MAN_TRUE]) ++m4trace:configure.in:1938: -1- AC_SUBST_TRACE([ENABLE_MAN_TRUE]) ++m4trace:configure.in:1938: -1- m4_pattern_allow([^ENABLE_MAN_TRUE$]) ++m4trace:configure.in:1938: -1- AC_SUBST([ENABLE_MAN_FALSE]) ++m4trace:configure.in:1938: -1- AC_SUBST_TRACE([ENABLE_MAN_FALSE]) ++m4trace:configure.in:1938: -1- m4_pattern_allow([^ENABLE_MAN_FALSE$]) ++m4trace:configure.in:1938: -1- _AM_SUBST_NOTMAKE([ENABLE_MAN_TRUE]) ++m4trace:configure.in:1938: -1- _AM_SUBST_NOTMAKE([ENABLE_MAN_FALSE]) ++m4trace:configure.in:2025: -1- AC_CONFIG_FILES([ +config.h.win32 +gtk-zip.sh +Makefile @@ -39737,24 +44631,26 @@ diff -urN gtk+2.0-2.14.4.old/autom4te.cache/traces.0 gtk+2.0-2.14.4/autom4te.cac +contrib/gdk-pixbuf-xlib/Makefile +contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc +]) -+m4trace:configure.in:2107: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) -+m4trace:configure.in:2107: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -+m4trace:configure.in:2107: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([LTLIBOBJS]) -+m4trace:configure.in:2107: -1- m4_pattern_allow([^LTLIBOBJS$]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([top_builddir]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([srcdir]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([abs_srcdir]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([top_srcdir]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([abs_top_srcdir]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([builddir]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([abs_builddir]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([abs_top_builddir]) -+m4trace:configure.in:2107: -1- AC_SUBST_TRACE([INSTALL]) -diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ---- gtk+2.0-2.14.4.old/configure 2008-10-17 01:07:22.000000000 -0300 -+++ gtk+2.0-2.14.4/configure 2008-11-04 15:37:03.000000000 -0200 ++m4trace:configure.in:2097: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) ++m4trace:configure.in:2097: -1- m4_pattern_allow([^LIB@&t@OBJS$]) ++m4trace:configure.in:2097: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([LTLIBOBJS]) ++m4trace:configure.in:2097: -1- m4_pattern_allow([^LTLIBOBJS$]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([top_builddir]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([srcdir]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([abs_srcdir]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([top_srcdir]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([abs_top_srcdir]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([builddir]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([abs_builddir]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([abs_top_builddir]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([INSTALL]) ++m4trace:configure.in:2097: -1- AC_SUBST_TRACE([MKDIR_P]) +Index: gtk+-2.14.4/configure +=================================================================== +--- gtk+-2.14.4.orig/configure 2008-10-17 06:07:22.000000000 +0200 ++++ gtk+-2.14.4/configure 2008-11-11 18:56:18.936634196 +0100 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -39769,7 +44665,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## -@@ -17,7 +17,7 @@ +@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -39778,7 +44674,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -@@ -39,45 +39,17 @@ +@@ -39,45 +39,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits @@ -39833,7 +44729,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi # Support unset when possible. -@@ -93,6 +65,8 @@ +@@ -93,6 +65,8 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) @@ -39842,7 +44738,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -@@ -115,7 +89,7 @@ +@@ -115,7 +89,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then @@ -39851,7 +44747,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; } fi -@@ -128,10 +102,17 @@ +@@ -128,10 +102,17 @@ PS2='> ' PS4='+ ' # NLS nuisances. @@ -39873,7 +44769,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -153,7 +134,7 @@ +@@ -153,7 +134,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || @@ -39882,7 +44778,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q -@@ -179,7 +160,7 @@ +@@ -179,7 +160,7 @@ else as_have_required=no fi @@ -39891,7 +44787,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (as_func_return () { (exit \$1) } -@@ -261,7 +242,7 @@ +@@ -261,7 +242,7 @@ IFS=$as_save_IFS if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -39900,7 +44796,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -@@ -282,7 +263,7 @@ +@@ -282,7 +263,7 @@ _ASEOF if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -39909,7 +44805,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -@@ -362,10 +343,10 @@ +@@ -362,10 +343,10 @@ fi if test "x$CONFIG_SHELL" != x; then for as_var in BASH_ENV ENV @@ -39924,7 +44820,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -434,10 +415,9 @@ +@@ -434,10 +415,9 @@ fi test \$exitcode = 0") || { echo No shell found that supports shell functions. @@ -39938,7 +44834,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure } -@@ -473,7 +453,7 @@ +@@ -473,7 +453,7 @@ test \$exitcode = 0") || { s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || @@ -39947,7 +44843,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems -@@ -501,6 +481,7 @@ +@@ -501,6 +481,7 @@ case `echo -n x` in *) ECHO_N='-n';; esac @@ -39955,7 +44851,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -513,22 +494,19 @@ +@@ -513,22 +494,19 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir @@ -39989,7 +44885,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else as_ln_s='cp -p' fi -@@ -553,10 +531,10 @@ +@@ -553,10 +531,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then @@ -40002,7 +44898,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi -@@ -791,383 +769,348 @@ +@@ -791,424 +769,396 @@ ac_includes_default="\ # include #endif" @@ -40345,6 +45241,46 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +ac_subst_vars='SHELL PATH_SEPARATOR -SHELL' +-ac_subst_files='' +-ac_user_opts=' +-enable_option_checking +-enable_dependency_tracking +-enable_static +-enable_shared +-enable_fast_install +-with_gnu_ld +-enable_libtool_lock +-with_pic +-with_tags +-enable_largefile +-enable_maintainer_mode +-enable_debug +-enable_shm +-enable_xkb +-enable_xinerama +-enable_rebuilds +-enable_visibility +-with_xinput +-with_gdktarget +-enable_explicit_deps +-enable_glibtest +-enable_modules +-with_libpng +-with_libjpeg +-with_libtiff +-with_libjasper +-enable_gdiplus +-with_included_loaders +-with_included_immodules +-with_x +-enable_cups +-enable_test_print_backend +-with_html_dir +-enable_gtk_doc +-enable_man +-with_xml_catalog +-' +- ac_precious_vars='build_alias +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION @@ -40378,11 +45314,12 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +ECHO_T +LIBS +build_alias -+host_alias -+target_alias + host_alias + target_alias +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA ++am__isrc +CYGPATH_W +PACKAGE +VERSION @@ -40391,13 +45328,16 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +AUTOMAKE +AUTOHEADER +MAKEINFO -+AMTAR +install_sh +STRIP +INSTALL_STRIP_PROGRAM ++mkdir_p +AWK +SET_MAKE +am__leading_dot ++AMTAR ++am__tar ++am__untar +GTK_MAJOR_VERSION +GTK_MINOR_VERSION +GTK_MICRO_VERSION @@ -40424,10 +45364,11 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +host_vendor +host_os +LIB_EXE_MACHINE_FLAG -+CC -+CFLAGS -+LDFLAGS -+CPPFLAGS + CC + CFLAGS + LDFLAGS +-LIBS + CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT @@ -40442,9 +45383,10 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +am__fastdepCC_FALSE +ENABLE_STATIC_TRUE +ENABLE_STATIC_FALSE -+CXX + CXX +ac_ct_CXX -+CXXFLAGS + CXXFLAGS +-CCC +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE @@ -40464,14 +45406,17 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +DLLTOOL +AS +OBJDUMP -+CPP -+CXXCPP -+F77 -+FFLAGS + CPP + CXXCPP + F77 + FFLAGS +ac_ct_F77 +LIBTOOL +CCAS +CCASFLAGS ++CCASDEPMODE ++am__fastdepCCAS_TRUE ++am__fastdepCCAS_FALSE +NM +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE @@ -40491,9 +45436,32 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +gdktarget +gdktargetlib +gtktargetlib -+PKG_CONFIG -+BASE_DEPENDENCIES_CFLAGS -+BASE_DEPENDENCIES_LIBS + PKG_CONFIG + BASE_DEPENDENCIES_CFLAGS + BASE_DEPENDENCIES_LIBS +-XMKMF' +- +- +-# Initialize some variables set by options. +-ac_init_help= +-ac_init_version=false +-ac_unrecognized_opts= +-ac_unrecognized_sep= +-# The variables have the same names as the options, with +-# dashes changed to underlines. +-cache_file=/dev/null +-exec_prefix=NONE +-no_create= +-no_recursion= +-prefix=NONE +-program_prefix=NONE +-program_suffix=NONE +-program_transform_name=s,x,x, +-silent= +-site= +-srcdir= +-verbose= +-x_includes=NONE +LIBTOOL_EXPORT_OPTIONS +DISABLE_EXPLICIT_DEPS_TRUE +DISABLE_EXPLICIT_DEPS_FALSE @@ -40684,58 +45652,52 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +ENABLE_MAN_FALSE +LIBOBJS +LTLIBOBJS' - ac_subst_files='' --ac_user_opts=' --enable_option_checking --enable_dependency_tracking --enable_static --enable_shared --enable_fast_install --with_gnu_ld --enable_libtool_lock --with_pic --with_tags --enable_largefile --enable_maintainer_mode --enable_debug --enable_shm --enable_xkb --enable_xinerama --enable_rebuilds --enable_visibility --with_xinput --with_gdktarget --enable_explicit_deps --enable_glibtest --enable_modules --with_libpng --with_libjpeg --with_libtiff --with_libjasper --enable_gdiplus --with_included_loaders --with_included_immodules --with_x --enable_cups --enable_test_print_backend --with_html_dir --enable_gtk_doc --enable_man --with_xml_catalog --' - ac_precious_vars='build_alias - host_alias - target_alias -@@ -1192,8 +1135,6 @@ - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false --ac_unrecognized_opts= --ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -1292,21 +1233,13 @@ ++ac_subst_files='' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++CXX ++CXXFLAGS ++CCC ++CPP ++CXXCPP ++F77 ++FFLAGS ++CCAS ++CCASFLAGS ++PKG_CONFIG ++BASE_DEPENDENCIES_CFLAGS ++BASE_DEPENDENCIES_LIBS ++XMKMF' ++ ++ ++# Initialize some variables set by options. ++ac_init_help= ++ac_init_version=false ++# The variables have the same names as the options, with ++# dashes changed to underlines. ++cache_file=/dev/null ++exec_prefix=NONE ++no_create= ++no_recursion= ++prefix=NONE ++program_prefix=NONE ++program_suffix=NONE ++program_transform_name=s,x,x, ++silent= ++site= ++srcdir= ++verbose= ++x_includes=NONE + x_libraries=NONE + + # Installation directory options. +@@ -1292,21 +1242,13 @@ do datarootdir=$ac_optarg ;; -disable-* | --disable-*) @@ -40762,7 +45724,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; -@@ -1319,21 +1252,13 @@ +@@ -1319,21 +1261,13 @@ do dvidir=$ac_optarg ;; -enable-* | --enable-*) @@ -40789,7 +45751,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -1524,38 +1449,22 @@ +@@ -1524,38 +1458,22 @@ do ac_init_version=: ;; -with-* | --with-*) @@ -40838,7 +45800,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure --x) # Obsolete; use --with-x. -@@ -1575,7 +1484,7 @@ +@@ -1575,7 +1493,7 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -40847,7 +45809,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; -@@ -1584,16 +1493,16 @@ +@@ -1584,16 +1502,16 @@ Try \`$0 --help' for more information." ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && @@ -40867,7 +45829,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; -@@ -1602,38 +1511,22 @@ +@@ -1602,38 +1520,22 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -40909,7 +45871,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } done -@@ -1648,7 +1541,7 @@ +@@ -1648,7 +1550,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -40918,7 +45880,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes -@@ -1664,10 +1557,10 @@ +@@ -1664,10 +1566,10 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || @@ -40931,7 +45893,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } -@@ -1675,12 +1568,12 @@ +@@ -1675,12 +1577,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. @@ -40950,7 +45912,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -1707,12 +1600,12 @@ +@@ -1707,12 +1609,12 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." @@ -40965,7 +45927,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. -@@ -1761,9 +1654,9 @@ +@@ -1761,9 +1663,9 @@ Configuration: Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX @@ -40977,7 +45939,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -1773,25 +1666,25 @@ +@@ -1773,25 +1675,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: @@ -41022,15 +45984,40 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF cat <<\_ACEOF -@@ -1818,7 +1711,6 @@ +@@ -1818,19 +1720,18 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking Speeds up one-time builds -@@ -1907,17 +1799,15 @@ +- --disable-dependency-tracking Speeds up one-time builds +- --enable-dependency-tracking Do not reject slow dependency extractors ++ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors + --enable-static[=PKGS] build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --disable-largefile omit support for large files +- --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer + --enable-debug=[no/minimum/yes] + turn on debugging [default=minimum] + --enable-shm support shared memory if available [default=yes] +@@ -1889,6 +1790,8 @@ Some influential environment variables: + CXXCPP C++ preprocessor + F77 Fortran 77 compiler command + FFLAGS Fortran 77 compiler flags ++ CCAS assembler compiler command (defaults to CC) ++ CCASFLAGS assembler compiler flags (defaults to CFLAGS) + PKG_CONFIG path to pkg-config utility + BASE_DEPENDENCIES_CFLAGS + C compiler flags for BASE_DEPENDENCIES, overriding pkg-config +@@ -1907,17 +1810,15 @@ fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue @@ -41051,7 +46038,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -1953,7 +1843,7 @@ +@@ -1953,7 +1854,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ echo && $SHELL "$ac_srcdir/configure" --help=recursive else @@ -41060,7 +46047,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done -@@ -1963,10 +1853,10 @@ +@@ -1963,10 +1864,10 @@ test -n "$ac_init_help" && exit $ac_stat if $ac_init_version; then cat <<\_ACEOF gtk+ configure 2.14.4 @@ -41073,7 +46060,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF -@@ -1977,7 +1867,7 @@ +@@ -1977,7 +1878,7 @@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. It was created by gtk+ $as_me 2.14.4, which was @@ -41082,7 +46069,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure $ $0 $@ -@@ -2013,7 +1903,7 @@ +@@ -2013,7 +1914,7 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -41091,7 +46078,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure done IFS=$as_save_IFS -@@ -2048,7 +1938,7 @@ +@@ -2048,7 +1949,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) @@ -41100,7 +46087,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -@@ -2100,12 +1990,11 @@ +@@ -2100,12 +2001,11 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -41115,7 +46102,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *) $as_unset $ac_var ;; esac ;; esac -@@ -2135,9 +2024,9 @@ +@@ -2135,9 +2035,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in @@ -41127,7 +46114,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure done | sort echo -@@ -2152,9 +2041,9 @@ +@@ -2152,9 +2052,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in @@ -41139,7 +46126,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure done | sort echo fi -@@ -2170,8 +2059,8 @@ +@@ -2170,8 +2070,8 @@ _ASBOX echo fi test "$ac_signal" != 0 && @@ -41150,7 +46137,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -@@ -2213,24 +2102,21 @@ +@@ -2213,24 +2113,21 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. @@ -41184,7 +46171,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi -@@ -2240,16 +2126,16 @@ +@@ -2240,16 +2137,16 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then @@ -41205,7 +46192,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure >$cache_file fi -@@ -2263,38 +2149,29 @@ +@@ -2263,38 +2160,29 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) @@ -41256,7 +46243,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in -@@ -2304,12 +2181,10 @@ +@@ -2304,12 +2192,10 @@ $as_echo "$as_me: current value: \`$ac fi done if $ac_cache_corrupted; then @@ -41273,7 +46260,17 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } fi -@@ -2368,8 +2243,8 @@ +@@ -2350,7 +2236,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + # Save this value here, since automake will set cflags later + cflags_set=${CFLAGS+set} + +-am__api_version="1.7" ++am__api_version='1.10' ++ + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then +@@ -2368,8 +2255,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s fi done if test -z "$ac_aux_dir"; then @@ -41284,7 +46281,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } fi -@@ -2395,12 +2270,11 @@ +@@ -2395,12 +2282,11 @@ ac_configure="$SHELL $ac_aux_dir/configu # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. @@ -41300,7 +46297,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -2429,29 +2303,17 @@ +@@ -2429,29 +2315,17 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else @@ -41332,7 +46329,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "${ac_cv_path_install+set}" = set; then -@@ -2464,8 +2326,8 @@ +@@ -2464,8 +2338,8 @@ fi INSTALL=$ac_install_sh fi fi @@ -41343,7 +46340,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. -@@ -2475,8 +2337,8 @@ +@@ -2475,8 +2349,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -41354,7 +46351,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Just in case sleep 1 echo timestamp > conftest.file -@@ -2499,9 +2361,9 @@ +@@ -2499,9 +2373,9 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -41366,7 +46363,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure alias in your environment" >&2;} { (exit 1); exit 1; }; } fi -@@ -2512,23 +2374,26 @@ +@@ -2512,24 +2386,26 @@ then # Ok. : else @@ -41392,15 +46389,16 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # By default was `s,x,x', remove it if useless. -ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +- +cat <<\_ACEOF >conftest.sed +s/[\\$]/&&/g;s/;s,x,x,$// +_ACEOF +program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +rm -f conftest.sed - # expand $ac_aux_dir to an absolute path -@@ -2540,18 +2405,18 @@ + am_aux_dir=`cd $ac_aux_dir && pwd` +@@ -2540,18 +2416,66 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= @@ -41410,6 +46408,54 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi ++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } ++if test -z "$MKDIR_P"; then ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in mkdir gmkdir; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue ++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( ++ 'mkdir (GNU coreutils) '* | \ ++ 'mkdir (coreutils) '* | \ ++ 'mkdir (fileutils) '4.1*) ++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext ++ break 3;; ++ esac ++ done ++ done ++done ++IFS=$as_save_IFS ++ ++fi ++ ++ if test "${ac_cv_path_mkdir+set}" = set; then ++ MKDIR_P="$ac_cv_path_mkdir -p" ++ else ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for MKDIR_P within a source directory, because that will ++ # break other packages using the cache if that directory is ++ # removed, or if the value is a relative name. ++ test -d ./--version && rmdir ./--version ++ MKDIR_P="$ac_install_sh -d" ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++echo "${ECHO_T}$MKDIR_P" >&6; } ++ ++mkdir_p="$MKDIR_P" ++case $mkdir_p in ++ [\\/$]* | ?:[\\/]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -41424,7 +46470,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. -@@ -2564,7 +2429,7 @@ +@@ -2564,7 +2488,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -41433,7 +46479,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -2575,23 +2440,22 @@ +@@ -2575,23 +2499,22 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then @@ -41465,7 +46511,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.make <<\_ACEOF SHELL = /bin/sh -@@ -2608,12 +2472,12 @@ +@@ -2608,12 +2531,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -41482,18 +46528,41 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure SET_MAKE="MAKE=${MAKE-make}" fi -@@ -2629,8 +2493,8 @@ - # test to see if srcdir already configured - if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then +@@ -2626,12 +2549,16 @@ else + fi + rmdir .tst 2>/dev/null + +- # test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ am__isrc=' -I$(srcdir)' ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } ++ fi fi -@@ -2678,10 +2542,10 @@ + # test whether we have cygpath +@@ -2665,10 +2592,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +- +-AMTAR=${AMTAR-"${am_missing_run}tar"} +- +-install_sh=${install_sh-"$am_aux_dir/install-sh"} ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -2678,10 +2602,10 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -41507,7 +46576,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -2694,7 +2558,7 @@ +@@ -2694,7 +2618,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -41516,7 +46585,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -2705,11 +2569,11 @@ +@@ -2705,11 +2629,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then @@ -41532,7 +46601,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -2718,10 +2582,10 @@ +@@ -2718,10 +2642,10 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -41546,7 +46615,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -2734,7 +2598,7 @@ +@@ -2734,7 +2658,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -41555,7 +46624,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -2745,11 +2609,11 @@ +@@ -2745,11 +2669,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then @@ -41571,7 +46640,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_STRIP" = x; then -@@ -2757,8 +2621,12 @@ +@@ -2757,8 +2681,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -41586,7 +46655,26 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP -@@ -2855,34 +2723,34 @@ +@@ -2768,10 +2696,17 @@ else + fi + + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. ++# Always define AMTAR for backward compatibility. ++ ++AMTAR=${AMTAR-"${am_missing_run}tar"} ++ ++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' ++ ++ + + + +@@ -2855,34 +2790,34 @@ _ACEOF # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -41634,7 +46722,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; };; esac build=$ac_cv_build -@@ -2899,27 +2767,27 @@ +@@ -2899,27 +2834,27 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -41671,7 +46759,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; };; esac host=$ac_cv_host -@@ -2938,8 +2806,8 @@ +@@ -2938,8 +2873,8 @@ case $host_os in *\ *) host_os=`echo "$h MATH_LIB=-lm @@ -41682,7 +46770,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure LIB_EXE_MACHINE_FLAG=X86 case "$host" in *-*-mingw*) -@@ -2956,8 +2824,8 @@ +@@ -2956,8 +2891,8 @@ case "$host" in os_win32=no ;; esac @@ -41693,7 +46781,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure -@@ -2975,10 +2843,10 @@ +@@ -2975,10 +2910,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -41707,7 +46795,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2991,7 +2859,7 @@ +@@ -2991,7 +2926,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -41716,7 +46804,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -3002,11 +2870,11 @@ +@@ -3002,11 +2937,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -41732,7 +46820,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -3015,10 +2883,10 @@ +@@ -3015,10 +2950,10 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -41746,7 +46834,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3031,7 +2899,7 @@ +@@ -3031,7 +2966,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -41755,7 +46843,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -3042,11 +2910,11 @@ +@@ -3042,11 +2977,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -41771,7 +46859,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_CC" = x; then -@@ -3054,8 +2922,12 @@ +@@ -3054,8 +2989,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -41786,7 +46874,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac CC=$ac_ct_CC -@@ -3068,10 +2940,10 @@ +@@ -3068,10 +3007,10 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -41800,7 +46888,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3084,7 +2956,7 @@ +@@ -3084,7 +3023,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -41809,7 +46897,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -3095,11 +2967,11 @@ +@@ -3095,11 +3034,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -41825,7 +46913,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -3108,10 +2980,10 @@ +@@ -3108,10 +3047,10 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -41839,7 +46927,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3129,7 +3001,7 @@ +@@ -3129,7 +3068,7 @@ do continue fi ac_cv_prog_CC="cc" @@ -41848,7 +46936,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -3152,11 +3024,11 @@ +@@ -3152,11 +3091,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -41864,7 +46952,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -3167,10 +3039,10 @@ +@@ -3167,10 +3106,10 @@ if test -z "$CC"; then 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 @@ -41878,7 +46966,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3183,7 +3055,7 @@ +@@ -3183,7 +3122,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -41887,7 +46975,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -3194,11 +3066,11 @@ +@@ -3194,11 +3133,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -41903,7 +46991,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -3211,10 +3083,10 @@ +@@ -3211,10 +3150,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -41917,7 +47005,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3227,7 +3099,7 @@ +@@ -3227,7 +3166,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -41926,7 +47014,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -3238,11 +3110,11 @@ +@@ -3238,11 +3177,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then @@ -41942,7 +47030,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -3254,8 +3126,12 @@ +@@ -3254,8 +3193,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) @@ -41957,7 +47045,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac CC=$ac_ct_CC -@@ -3265,50 +3141,44 @@ +@@ -3265,50 +3208,44 @@ fi fi @@ -42019,7 +47107,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -@@ -3327,22 +3197,27 @@ +@@ -3327,22 +3264,27 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files @@ -42056,7 +47144,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done -@@ -3353,11 +3228,10 @@ +@@ -3353,11 +3295,10 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42070,7 +47158,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); }; then # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -@@ -3368,7 +3242,7 @@ +@@ -3368,7 +3309,7 @@ for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -42079,7 +47167,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ;; [ab].out ) # We found the default executable, but exeext='' is most -@@ -3395,27 +3269,25 @@ +@@ -3395,27 +3336,25 @@ else ac_file='' fi @@ -42115,7 +47203,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then -@@ -3424,53 +3296,49 @@ +@@ -3424,53 +3363,49 @@ if test "$cross_compiling" != yes; then *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42185,7 +47273,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -@@ -3479,33 +3347,31 @@ +@@ -3479,33 +3414,31 @@ $as_echo "$ac_try_echo") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in @@ -42228,7 +47316,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -3528,43 +3394,40 @@ +@@ -3528,43 +3461,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42284,7 +47372,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -3590,21 +3453,20 @@ +@@ -3590,21 +3520,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42309,7 +47397,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no -@@ -3614,19 +3476,15 @@ +@@ -3614,19 +3543,15 @@ rm -f core conftest.err conftest.$ac_obj ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -42335,7 +47423,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes -@@ -3653,21 +3511,20 @@ +@@ -3653,21 +3578,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42360,7 +47448,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 CFLAGS="" -@@ -3692,21 +3549,20 @@ +@@ -3692,21 +3616,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42385,7 +47473,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_c_werror_flag=$ac_save_c_werror_flag -@@ -3732,21 +3588,20 @@ +@@ -3732,21 +3655,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42410,7 +47498,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -3761,8 +3616,8 @@ +@@ -3761,8 +3683,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi @@ -42421,7 +47509,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then -@@ -3778,10 +3633,10 @@ +@@ -3778,10 +3700,10 @@ else CFLAGS= fi fi @@ -42435,7 +47523,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_cv_prog_cc_c89=no ac_save_CC=$CC -@@ -3852,21 +3707,20 @@ +@@ -3852,21 +3774,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42460,7 +47548,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -3882,15 +3736,15 @@ +@@ -3882,15 +3803,15 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -42482,7 +47570,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure esac -@@ -3911,8 +3765,8 @@ +@@ -3911,8 +3832,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -42493,7 +47581,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure am__include="#" am__quote= _am_result=none -@@ -3939,8 +3793,8 @@ +@@ -3939,8 +3860,8 @@ if test "$am__include" = "#"; then fi @@ -42504,8 +47592,22 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -@@ -3967,10 +3821,10 @@ +@@ -3952,9 +3873,7 @@ if test "x$enable_dependency_tracking" ! + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi +- +- +-if test "x$enable_dependency_tracking" != xno; then ++ if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else +@@ -3964,13 +3883,12 @@ fi + + +- depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 @@ -42518,7 +47620,41 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up -@@ -4050,8 +3904,8 @@ +@@ -4006,7 +3924,9 @@ else + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- : > sub/conftst$i.h ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +@@ -4030,13 +3950,19 @@ else + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi +@@ -4050,13 +3976,11 @@ else fi fi @@ -42528,13 +47664,18 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -@@ -4093,15 +3947,25 @@ +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -4092,16 +4016,24 @@ fi -+ -+if test "$enable_static" = yes; then ++ if test "$enable_static" = yes; then + ENABLE_STATIC_TRUE= + ENABLE_STATIC_FALSE='#' +else @@ -42542,7 +47683,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure + ENABLE_STATIC_FALSE= +fi + -+ + if test -n "$ac_tool_prefix"; then for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl do @@ -42558,7 +47699,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -4114,7 +3978,7 @@ +@@ -4114,7 +4046,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -42567,7 +47708,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -4125,11 +3989,11 @@ +@@ -4125,11 +4057,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then @@ -42583,7 +47724,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -4142,10 +4006,10 @@ +@@ -4142,10 +4074,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -42597,7 +47738,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -4158,7 +4022,7 @@ +@@ -4158,7 +4090,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -42606,7 +47747,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -4169,11 +4033,11 @@ +@@ -4169,11 +4101,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then @@ -42622,7 +47763,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -4185,8 +4049,12 @@ +@@ -4185,8 +4117,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) @@ -42637,7 +47778,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX -@@ -4215,10 +4083,10 @@ +@@ -4215,10 +4151,10 @@ if test -z "$CXX"; then 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 @@ -42651,7 +47792,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -4231,7 +4099,7 @@ +@@ -4231,7 +4167,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -42660,7 +47801,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -4242,11 +4110,11 @@ +@@ -4242,11 +4178,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then @@ -42676,7 +47817,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -4259,10 +4127,10 @@ +@@ -4259,10 +4195,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -42690,7 +47831,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -4275,7 +4143,7 @@ +@@ -4275,7 +4211,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -42699,7 +47840,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -4286,11 +4154,11 @@ +@@ -4286,11 +4222,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then @@ -42715,7 +47856,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -4302,8 +4170,12 @@ +@@ -4302,8 +4238,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) @@ -42730,7 +47871,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX -@@ -4313,47 +4185,43 @@ +@@ -4313,47 +4253,43 @@ fi fi fi # Provide some information about the compiler. @@ -42789,7 +47930,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -4379,21 +4247,20 @@ +@@ -4379,21 +4315,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42814,7 +47955,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no -@@ -4403,19 +4270,15 @@ +@@ -4403,19 +4338,15 @@ rm -f core conftest.err conftest.$ac_obj ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -42840,7 +47981,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes -@@ -4442,21 +4305,20 @@ +@@ -4442,21 +4373,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42865,7 +48006,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 CXXFLAGS="" -@@ -4481,21 +4343,20 @@ +@@ -4481,21 +4411,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42890,7 +48031,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cxx_werror_flag=$ac_save_cxx_werror_flag -@@ -4521,21 +4382,20 @@ +@@ -4521,21 +4450,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42915,7 +48056,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -4550,8 +4410,8 @@ +@@ -4550,8 +4478,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi @@ -42926,7 +48067,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then -@@ -4575,10 +4435,10 @@ +@@ -4575,10 +4503,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu depcc="$CXX" am_compiler_list= @@ -42940,7 +48081,41 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up -@@ -4658,8 +4518,8 @@ +@@ -4614,7 +4542,9 @@ else + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- : > sub/conftst$i.h ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +@@ -4638,13 +4568,19 @@ else + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi +@@ -4658,13 +4594,11 @@ else fi fi @@ -42950,8 +48125,14 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -@@ -4697,21 +4557,20 @@ +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= +@@ -4697,30 +4631,27 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -42976,7 +48157,17 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 CXX= -@@ -4752,21 +4611,20 @@ + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +- +-if test "$CXX" != ""; then ++ if test "$CXX" != ""; then + HAVE_CXX_TRUE= + HAVE_CXX_FALSE='#' + else +@@ -4752,30 +4683,27 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -43001,7 +48192,17 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 OBJC=no -@@ -4793,13 +4651,13 @@ + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +- +-if test "$OBJC" = "yes"; then ++ if test "$OBJC" = "yes"; then + HAVE_OBJC_TRUE= + HAVE_OBJC_FALSE='#' + else +@@ -4793,13 +4721,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$os_win32" = "yes"; then if test x$enable_static = xyes -o x$enable_static = x; then @@ -43019,7 +48220,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi enable_shared=yes fi -@@ -4854,10 +4712,10 @@ +@@ -4854,10 +4782,10 @@ else fi @@ -43033,7 +48234,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else # Loop through the user's path and test for sed and gsed. # Then use that list of sed's as ones to test for truncation. -@@ -4910,40 +4768,45 @@ +@@ -4910,40 +4838,45 @@ fi SED=$lt_cv_path_SED @@ -43046,14 +48247,14 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } - if test "${ac_cv_path_GREP+set}" = set; then -- $as_echo_n "(cached) " >&6 ++if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 -+if test "${ac_cv_path_GREP+set}" = set; then + if test "${ac_cv_path_GREP+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -z "$GREP"; then @@ -43093,7 +48294,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` -@@ -4958,60 +4821,74 @@ +@@ -4958,60 +4891,74 @@ case `"$ac_path_GREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac @@ -43188,7 +48389,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` -@@ -5026,24 +4903,33 @@ +@@ -5026,24 +4973,33 @@ case `"$ac_path_EGREP" --version 2>&1` i rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac @@ -43230,7 +48431,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure EGREP="$ac_cv_path_EGREP" -@@ -5058,8 +4944,8 @@ +@@ -5058,8 +5014,8 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -43241,7 +48442,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw -@@ -5088,14 +4974,14 @@ +@@ -5088,14 +5044,14 @@ $as_echo_n "checking for ld used by $CC. ;; esac elif test "$with_gnu_ld" = yes; then @@ -43261,7 +48462,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -5125,19 +5011,19 @@ +@@ -5125,19 +5081,19 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -43290,7 +48491,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else -@@ -5429,8 +5315,8 @@ +@@ -5429,8 +5385,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* esac fi @@ -43389,7 +48590,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5464,7 +5350,7 @@ +@@ -5464,7 +5420,7 @@ ia64-*-hpux*) if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -43398,12 +48599,12 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) -@@ -5479,11 +5365,11 @@ +@@ -5479,11 +5435,11 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5482 "configure"' > conftest.$ac_ext -+ echo '#line 5368 "configure"' > conftest.$ac_ext ++ echo '#line 5438 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -43412,7 +48613,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in -@@ -5521,7 +5407,7 @@ +@@ -5521,7 +5477,7 @@ s390*-*linux*|sparc*-*linux*) if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -43421,7 +48622,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); }; then case `/usr/bin/file conftest.o` in *32-bit*) -@@ -5544,7 +5430,6 @@ +@@ -5544,7 +5500,6 @@ s390*-*linux*|sparc*-*linux*) esac ;; *64-bit*) @@ -43429,7 +48630,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -5572,10 +5457,10 @@ +@@ -5572,10 +5527,10 @@ s390*-*linux*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" @@ -43443,7 +48644,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -5604,30 +5489,26 @@ +@@ -5604,30 +5559,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -43479,7 +48680,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c -@@ -5637,8 +5518,8 @@ +@@ -5637,8 +5588,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA ac_compiler_gnu=$ac_cv_c_compiler_gnu fi @@ -43490,7 +48691,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" -@@ -5650,7 +5531,7 @@ +@@ -5650,7 +5601,7 @@ sparc*-*solaris*) if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -43499,7 +48700,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); }; then case `/usr/bin/file conftest.o` in *64-bit*) -@@ -5672,10 +5553,10 @@ +@@ -5672,10 +5623,10 @@ sparc*-*solaris*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 @@ -43513,7 +48714,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -@@ -5688,7 +5569,7 @@ +@@ -5688,7 +5639,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -43522,7 +48723,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -5699,11 +5580,11 @@ +@@ -5699,11 +5650,11 @@ fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then @@ -43538,7 +48739,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -5712,10 +5593,10 @@ +@@ -5712,10 +5663,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 @@ -43552,7 +48753,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -@@ -5728,7 +5609,7 @@ +@@ -5728,7 +5679,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -43561,7 +48762,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -5739,11 +5620,11 @@ +@@ -5739,11 +5690,11 @@ fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then @@ -43577,7 +48778,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_DLLTOOL" = x; then -@@ -5751,8 +5632,12 @@ +@@ -5751,8 +5702,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -43592,7 +48793,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL -@@ -5764,10 +5649,10 @@ +@@ -5764,10 +5719,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 @@ -43606,7 +48807,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. -@@ -5780,7 +5665,7 @@ +@@ -5780,7 +5735,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -43615,7 +48816,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -5791,11 +5676,11 @@ +@@ -5791,11 +5746,11 @@ fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then @@ -43631,7 +48832,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -5804,10 +5689,10 @@ +@@ -5804,10 +5759,10 @@ if test -z "$ac_cv_prog_AS"; then ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 @@ -43645,7 +48846,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_AS"; then ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -@@ -5820,7 +5705,7 @@ +@@ -5820,7 +5775,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -43654,7 +48855,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -5831,11 +5716,11 @@ +@@ -5831,11 +5786,11 @@ fi fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then @@ -43670,7 +48871,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_AS" = x; then -@@ -5843,8 +5728,12 @@ +@@ -5843,8 +5798,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -43685,7 +48886,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac AS=$ac_ct_AS -@@ -5856,10 +5745,10 @@ +@@ -5856,10 +5815,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -43699,7 +48900,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -@@ -5872,7 +5761,7 @@ +@@ -5872,7 +5831,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -43708,7 +48909,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -5883,11 +5772,11 @@ +@@ -5883,11 +5842,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then @@ -43724,7 +48925,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -5896,10 +5785,10 @@ +@@ -5896,10 +5855,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 @@ -43738,7 +48939,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -@@ -5912,7 +5801,7 @@ +@@ -5912,7 +5871,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -43747,7 +48948,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -5923,11 +5812,11 @@ +@@ -5923,11 +5882,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then @@ -43763,7 +48964,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_OBJDUMP" = x; then -@@ -5935,8 +5824,12 @@ +@@ -5935,8 +5894,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -43778,7 +48979,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP -@@ -5957,15 +5850,15 @@ +@@ -5957,15 +5920,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -43797,7 +48998,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -5997,21 +5890,20 @@ +@@ -5997,21 +5960,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -43822,7 +49023,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6035,14 +5927,13 @@ +@@ -6035,14 +5997,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -43839,7 +49040,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -6050,7 +5941,7 @@ +@@ -6050,7 +6011,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else @@ -43848,7 +49049,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6075,8 +5966,8 @@ +@@ -6075,8 +6036,8 @@ fi else ac_cv_prog_CPP=$CPP fi @@ -43859,7 +49060,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do -@@ -6104,21 +5995,20 @@ +@@ -6104,21 +6065,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -43884,7 +49085,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6142,14 +6032,13 @@ +@@ -6142,14 +6102,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -43901,7 +49102,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -6157,7 +6046,7 @@ +@@ -6157,7 +6116,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else @@ -43910,7 +49111,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6173,13 +6062,11 @@ +@@ -6173,13 +6132,11 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else @@ -43927,7 +49128,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi ac_ext=c -@@ -6189,10 +6076,10 @@ +@@ -6189,10 +6146,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -43941,7 +49142,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -6219,21 +6106,20 @@ +@@ -6219,21 +6176,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -43966,7 +49167,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no -@@ -6325,40 +6211,37 @@ +@@ -6325,40 +6281,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -44015,7 +49216,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF -@@ -6380,11 +6263,11 @@ +@@ -6380,11 +6333,11 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do @@ -44031,7 +49232,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -6402,21 +6285,20 @@ +@@ -6402,21 +6355,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -44056,7 +49257,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" -@@ -6424,15 +6306,12 @@ +@@ -6424,15 +6376,12 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -44077,7 +49278,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -6443,21 +6322,20 @@ +@@ -6443,21 +6392,20 @@ done for ac_header in dlfcn.h do @@ -44108,7 +49309,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -6473,33 +6351,32 @@ +@@ -6473,33 +6421,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -44149,7 +49350,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -6513,52 +6390,51 @@ +@@ -6513,52 +6460,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -44223,7 +49424,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -6567,24 +6443,21 @@ +@@ -6567,24 +6513,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -44256,7 +49457,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -6601,11 +6474,11 @@ +@@ -6601,11 +6544,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -44271,7 +49472,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else # Double quotes because CXXCPP needs to be expanded for CXXCPP in "$CXX -E" "/lib/cpp" -@@ -6637,21 +6510,20 @@ +@@ -6637,21 +6580,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -44296,7 +49497,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6675,14 +6547,13 @@ +@@ -6675,14 +6617,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -44313,7 +49514,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err -@@ -6690,7 +6561,7 @@ +@@ -6690,7 +6631,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else @@ -44322,7 +49523,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6715,8 +6586,8 @@ +@@ -6715,8 +6656,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi @@ -44333,7 +49534,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do -@@ -6744,21 +6615,20 @@ +@@ -6744,21 +6685,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -44358,7 +49559,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. -@@ -6782,14 +6652,13 @@ +@@ -6782,14 +6722,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -44375,7 +49576,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err -@@ -6797,7 +6666,7 @@ +@@ -6797,7 +6736,7 @@ $as_echo "$ac_try_echo") >&5 # Broken: success on invalid input. continue else @@ -44384,7 +49585,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. -@@ -6813,13 +6682,11 @@ +@@ -6813,13 +6752,11 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else @@ -44401,7 +49602,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi ac_ext=cpp -@@ -6839,10 +6706,10 @@ +@@ -6839,10 +6776,10 @@ if test -n "$ac_tool_prefix"; then 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 @@ -44415,7 +49616,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$F77"; then ac_cv_prog_F77="$F77" # Let the user override the test. -@@ -6855,7 +6722,7 @@ +@@ -6855,7 +6792,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -44424,7 +49625,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -6866,11 +6733,11 @@ +@@ -6866,11 +6803,11 @@ fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then @@ -44440,7 +49641,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -6883,10 +6750,10 @@ +@@ -6883,10 +6820,10 @@ if test -z "$F77"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -44454,7 +49655,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_F77"; then ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -@@ -6899,7 +6766,7 @@ +@@ -6899,7 +6836,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -44463,7 +49664,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -6910,11 +6777,11 @@ +@@ -6910,11 +6847,11 @@ fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then @@ -44479,7 +49680,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -6926,8 +6793,12 @@ +@@ -6926,8 +6863,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) @@ -44494,7 +49695,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac F77=$ac_ct_F77 -@@ -6936,41 +6807,37 @@ +@@ -6936,41 +6877,37 @@ fi # Provide some information about the compiler. @@ -44544,7 +49745,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } rm -f a.out -@@ -6978,10 +6845,10 @@ +@@ -6978,10 +6915,10 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F @@ -44558,7 +49759,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF program main -@@ -6997,21 +6864,20 @@ +@@ -6997,21 +6934,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -44583,7 +49784,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no -@@ -7021,16 +6887,16 @@ +@@ -7021,16 +6957,16 @@ rm -f core conftest.err conftest.$ac_obj ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi @@ -44605,7 +49806,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else FFLAGS=-g cat >conftest.$ac_ext <<_ACEOF -@@ -7044,21 +6910,20 @@ +@@ -7044,21 +6980,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -44630,7 +49831,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_f77_g=no -@@ -7067,8 +6932,8 @@ +@@ -7067,8 +7002,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -44641,7 +49842,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then -@@ -7085,11 +6950,7 @@ +@@ -7085,11 +7020,7 @@ else fi fi @@ -44654,7 +49855,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7100,10 +6961,10 @@ +@@ -7100,10 +7031,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments @@ -44668,7 +49869,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else i=0 teststring="ABCD" -@@ -7212,11 +7073,11 @@ +@@ -7212,11 +7143,11 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then @@ -44684,7 +49885,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -7224,10 +7085,10 @@ +@@ -7224,10 +7155,10 @@ fi # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -44698,7 +49899,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else # These are sane defaults that work on at least a few old systems. -@@ -7332,14 +7193,14 @@ +@@ -7332,14 +7263,14 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -44715,7 +49916,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then -@@ -7394,7 +7255,7 @@ +@@ -7394,7 +7325,7 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? @@ -44724,7 +49925,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } && test -s conftest${ac_exeext}; then pipe_works=yes fi -@@ -7429,17 +7290,17 @@ +@@ -7429,17 +7360,17 @@ if test -z "$lt_cv_sys_global_symbol_pip lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then @@ -44749,7 +49950,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null -@@ -7451,8 +7312,8 @@ +@@ -7451,8 +7382,8 @@ else fi rmdir .libs 2>/dev/null fi @@ -44760,7 +49961,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure objdir=$lt_cv_objdir -@@ -7503,10 +7364,10 @@ +@@ -7503,10 +7434,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -44774,7 +49975,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. -@@ -7519,7 +7380,7 @@ +@@ -7519,7 +7450,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -44783,7 +49984,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -7530,11 +7391,11 @@ +@@ -7530,11 +7461,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then @@ -44799,7 +50000,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -7543,10 +7404,10 @@ +@@ -7543,10 +7474,10 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 @@ -44813,7 +50014,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -@@ -7559,7 +7420,7 @@ +@@ -7559,7 +7490,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -44822,7 +50023,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -7570,11 +7431,11 @@ +@@ -7570,11 +7501,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then @@ -44838,7 +50039,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_AR" = x; then -@@ -7582,8 +7443,12 @@ +@@ -7582,8 +7513,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -44853,7 +50054,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac AR=$ac_ct_AR -@@ -7595,10 +7460,10 @@ +@@ -7595,10 +7530,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -44867,7 +50068,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -7611,7 +7476,7 @@ +@@ -7611,7 +7546,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -44876,7 +50077,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -7622,11 +7487,11 @@ +@@ -7622,11 +7557,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then @@ -44892,7 +50093,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -7635,10 +7500,10 @@ +@@ -7635,10 +7570,10 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @@ -44906,7 +50107,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -7651,7 +7516,7 @@ +@@ -7651,7 +7586,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -44915,7 +50116,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -7662,11 +7527,11 @@ +@@ -7662,11 +7597,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then @@ -44931,7 +50132,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_RANLIB" = x; then -@@ -7674,8 +7539,12 @@ +@@ -7674,8 +7609,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -44946,7 +50147,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB -@@ -7687,10 +7556,10 @@ +@@ -7687,10 +7626,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -44960,7 +50161,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -7703,7 +7572,7 @@ +@@ -7703,7 +7642,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -44969,7 +50170,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -7714,11 +7583,11 @@ +@@ -7714,11 +7653,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then @@ -44985,7 +50186,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -7727,10 +7596,10 @@ +@@ -7727,10 +7666,10 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -44999,7 +50200,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -7743,7 +7612,7 @@ +@@ -7743,7 +7682,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -45008,7 +50209,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -7754,11 +7623,11 @@ +@@ -7754,11 +7693,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then @@ -45024,7 +50225,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_STRIP" = x; then -@@ -7766,8 +7635,12 @@ +@@ -7766,8 +7705,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -45039,7 +50240,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP -@@ -7830,10 +7703,10 @@ +@@ -7830,10 +7773,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -45053,7 +50254,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) -@@ -7883,19 +7756,19 @@ +@@ -7883,19 +7826,19 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -45080,7 +50281,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) -@@ -7945,11 +7818,11 @@ +@@ -7945,11 +7888,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -45096,7 +50297,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi else -@@ -7967,10 +7840,10 @@ +@@ -7967,10 +7910,10 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 @@ -45110,7 +50311,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -@@ -7983,7 +7856,7 @@ +@@ -7983,7 +7926,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" @@ -45119,7 +50320,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -7994,11 +7867,11 @@ +@@ -7994,11 +7937,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then @@ -45135,7 +50336,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -8007,10 +7880,10 @@ +@@ -8007,10 +7950,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 @@ -45149,7 +50350,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -@@ -8023,7 +7896,7 @@ +@@ -8023,7 +7966,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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_DSYMUTIL="dsymutil" @@ -45158,7 +50359,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -8034,11 +7907,11 @@ +@@ -8034,11 +7977,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then @@ -45174,7 +50375,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_DSYMUTIL" = x; then -@@ -8046,8 +7919,12 @@ +@@ -8046,8 +7989,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -45189,7 +50390,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL -@@ -8059,10 +7936,10 @@ +@@ -8059,10 +8006,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 @@ -45203,7 +50404,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -@@ -8075,7 +7952,7 @@ +@@ -8075,7 +8022,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" @@ -45212,7 +50413,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -8086,11 +7963,11 @@ +@@ -8086,11 +8033,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then @@ -45228,7 +50429,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -8099,10 +7976,10 @@ +@@ -8099,10 +8046,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 @@ -45242,7 +50443,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -@@ -8115,7 +7992,7 @@ +@@ -8115,7 +8062,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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_NMEDIT="nmedit" @@ -45251,7 +50452,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -8126,11 +8003,11 @@ +@@ -8126,11 +8073,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then @@ -45267,7 +50468,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_NMEDIT" = x; then -@@ -8138,8 +8015,12 @@ +@@ -8138,8 +8085,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -45282,7 +50483,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT -@@ -8149,10 +8030,10 @@ +@@ -8149,10 +8100,10 @@ else fi @@ -45296,7 +50497,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then -@@ -8170,12 +8051,12 @@ +@@ -8170,12 +8121,12 @@ else rm conftest.c fi fi @@ -45314,7 +50515,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS -@@ -8202,37 +8083,33 @@ +@@ -8202,37 +8153,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -45359,7 +50560,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case $host_os in rhapsody* | darwin1.[0123]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -@@ -8344,10 +8221,10 @@ +@@ -8344,10 +8291,10 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' @@ -45373,21 +50574,21 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext -@@ -8362,11 +8239,11 @@ +@@ -8362,11 +8309,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8365: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8242: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8312: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8369: \$? = $ac_status" >&5 -+ echo "$as_me:8246: \$? = $ac_status" >&5 ++ echo "$as_me:8316: \$? = $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. -@@ -8379,8 +8256,8 @@ +@@ -8379,8 +8326,8 @@ else $rm conftest* fi @@ -45398,7 +50599,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -@@ -8394,8 +8271,8 @@ +@@ -8394,8 +8341,8 @@ lt_prog_compiler_wl= lt_prog_compiler_pic= lt_prog_compiler_static= @@ -45409,7 +50610,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -8626,18 +8503,18 @@ +@@ -8626,18 +8573,18 @@ $as_echo_n "checking for $compiler optio esac fi @@ -45433,21 +50634,21 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext -@@ -8652,11 +8529,11 @@ +@@ -8652,11 +8599,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8655: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8532: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8602: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8659: \$? = $ac_status" >&5 -+ echo "$as_me:8536: \$? = $ac_status" >&5 ++ echo "$as_me:8606: \$? = $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. -@@ -8669,8 +8546,8 @@ +@@ -8669,8 +8616,8 @@ else $rm conftest* fi @@ -45458,7 +50659,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in -@@ -8697,10 +8574,10 @@ +@@ -8697,10 +8644,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" @@ -45472,7 +50673,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" -@@ -8725,8 +8602,8 @@ +@@ -8725,8 +8672,8 @@ else LDFLAGS="$save_LDFLAGS" fi @@ -45483,7 +50684,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_prog_compiler_static_works" = xyes; then : -@@ -8735,10 +8612,10 @@ +@@ -8735,10 +8682,10 @@ else fi @@ -45497,21 +50698,21 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_c_o=no $rm -r conftest 2>/dev/null -@@ -8756,11 +8633,11 @@ +@@ -8756,11 +8703,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8759: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8636: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8706: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8763: \$? = $ac_status" >&5 -+ echo "$as_me:8640: \$? = $ac_status" >&5 ++ echo "$as_me:8710: \$? = $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 -@@ -8782,34 +8659,34 @@ +@@ -8782,34 +8729,34 @@ else $rm conftest* fi @@ -45556,7 +50757,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure runpath_var= allow_undefined_flag= -@@ -9021,12 +8898,13 @@ +@@ -9021,12 +8968,13 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -45571,7 +50772,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -9239,21 +9117,18 @@ +@@ -9239,21 +9187,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -45597,7 +50798,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -9268,13 +9143,12 @@ +@@ -9268,13 +9213,12 @@ 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 @@ -45612,7 +50813,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure 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 -@@ -9309,21 +9183,18 @@ +@@ -9309,21 +9253,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -45638,7 +50839,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -9338,13 +9209,12 @@ +@@ -9338,13 +9279,12 @@ 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 @@ -45653,7 +50854,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure 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 -@@ -9577,7 +9447,7 @@ +@@ -9577,7 +9517,7 @@ if test -z "$aix_libpath"; then aix_libp link_all_deplibs=yes ;; @@ -45662,7 +50863,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -9796,8 +9666,8 @@ +@@ -9796,8 +9736,8 @@ if test -z "$aix_libpath"; then aix_libp esac fi @@ -45673,7 +50874,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure test "$ld_shlibs" = no && can_build_shared=no # -@@ -9817,15 +9687,15 @@ +@@ -9817,15 +9757,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -45692,7 +50893,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -9843,7 +9713,7 @@ +@@ -9843,7 +9783,7 @@ $as_echo_n "checking whether -lc should if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -45701,7 +50902,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } then archive_cmds_need_lc=no -@@ -9855,16 +9725,16 @@ +@@ -9855,16 +9795,16 @@ $as_echo_n "checking whether -lc should cat conftest.err 1>&5 fi $rm conftest* @@ -45722,7 +50923,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -10272,13 +10142,11 @@ +@@ -10272,13 +10212,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -45737,7 +50938,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -10290,6 +10158,18 @@ +@@ -10290,6 +10228,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -45756,7 +50957,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -10467,19 +10347,19 @@ +@@ -10467,19 +10417,19 @@ uts4*) dynamic_linker=no ;; esac @@ -45780,7 +50981,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -10491,8 +10371,8 @@ +@@ -10491,8 +10441,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -45791,7 +50992,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ -@@ -10516,8 +10396,8 @@ +@@ -10516,8 +10466,8 @@ else # directories. hardcode_action=unsupported fi @@ -45802,7 +51003,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$hardcode_action" = relink; then # Fast installation is not supported -@@ -10530,13 +10410,13 @@ +@@ -10530,13 +10480,13 @@ fi striplib= old_striplib= @@ -45820,7 +51021,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in -@@ -10544,16 +10424,16 @@ +@@ -10544,16 +10494,16 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" @@ -45843,7 +51044,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ;; esac fi -@@ -10585,10 +10465,10 @@ +@@ -10585,10 +10535,10 @@ else darwin*) # if libdl is installed we need to link against it @@ -45857,7 +51058,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -@@ -10620,37 +10500,33 @@ +@@ -10620,37 +10570,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -45903,7 +51104,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else -@@ -10663,10 +10539,10 @@ +@@ -10663,10 +10609,10 @@ fi ;; *) @@ -45917,7 +51118,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -10719,42 +10595,38 @@ +@@ -10719,42 +10665,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -45971,7 +51172,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -@@ -10786,43 +10658,39 @@ +@@ -10786,43 +10728,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -46026,7 +51227,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -10875,42 +10743,38 @@ +@@ -10875,42 +10813,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -46080,7 +51281,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -@@ -10942,43 +10806,39 @@ +@@ -10942,43 +10876,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -46135,7 +51336,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" -@@ -11010,43 +10870,39 @@ +@@ -11010,43 +10940,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -46190,7 +51391,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" -@@ -11078,37 +10934,33 @@ +@@ -11078,37 +11004,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -46236,7 +51437,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -@@ -11147,10 +10999,10 @@ +@@ -11147,10 +11069,10 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -46250,16 +51451,16 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross -@@ -11158,7 +11010,7 @@ +@@ -11158,7 +11080,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? @@ -46268,7 +51469,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? -@@ -11242,15 +11094,15 @@ +@@ -11242,15 +11164,15 @@ rm -fr conftest* fi @@ -46289,16 +51490,16 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross -@@ -11258,7 +11110,7 @@ +@@ -11258,7 +11180,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? @@ -46307,7 +51508,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? -@@ -11342,8 +11194,8 @@ +@@ -11342,8 +11264,8 @@ rm -fr conftest* fi @@ -46318,7 +51519,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi CPPFLAGS="$save_CPPFLAGS" -@@ -11365,13 +11217,13 @@ +@@ -11365,13 +11287,13 @@ fi # Report which library types will actually be built @@ -46338,7 +51539,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and -@@ -11391,15 +11243,15 @@ +@@ -11391,15 +11313,15 @@ aix[4-9]*) fi ;; esac @@ -46360,7 +51561,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh -@@ -11492,8 +11344,8 @@ +@@ -11492,8 +11414,8 @@ if test -f "$ltmain"; then cfgfile="${ofile}T" trap "$rm \"$cfgfile\"; exit 1" 1 2 15 $rm -f "$cfgfile" @@ -46371,7 +51572,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat <<__EOF__ >> "$cfgfile" #! $SHELL -@@ -11905,18 +11757,18 @@ +@@ -11905,18 +11827,18 @@ fi if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -46396,7 +51597,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi fi if test -z "$LTCFLAGS"; then -@@ -11933,16 +11785,16 @@ +@@ -11933,16 +11855,16 @@ $as_echo "$as_me: WARNING: using \`LTCC= # Check whether tagname contains only valid characters case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in "") ;; @@ -46417,7 +51618,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } fi -@@ -12085,8 +11937,8 @@ +@@ -12085,8 +12007,8 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -46428,7 +51629,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw -@@ -12115,14 +11967,14 @@ +@@ -12115,14 +12037,14 @@ $as_echo_n "checking for ld used by $CC. ;; esac elif test "$with_gnu_ld" = yes; then @@ -46448,7 +51649,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -12152,19 +12004,19 @@ +@@ -12152,19 +12074,19 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -46477,7 +51678,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 /dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else @@ -46581,7 +51782,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure 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 -@@ -12854,7 +12698,7 @@ +@@ -12854,7 +12768,7 @@ if test -z "$aix_libpath"; then aix_libp ;; esac ;; @@ -46590,7 +51791,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure 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= -@@ -13181,8 +13025,8 @@ +@@ -13181,8 +13095,8 @@ if test -z "$aix_libpath"; then aix_libp ld_shlibs_CXX=no ;; esac @@ -46601,7 +51802,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" -@@ -13201,7 +13045,7 @@ +@@ -13201,7 +13115,7 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -46610,7 +51811,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. -@@ -13357,8 +13201,8 @@ +@@ -13357,8 +13271,8 @@ lt_prog_compiler_wl_CXX= lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= @@ -46621,7 +51822,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then -@@ -13558,7 +13402,7 @@ +@@ -13558,7 +13472,7 @@ $as_echo_n "checking for $compiler optio ;; esac ;; @@ -46630,7 +51831,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -13641,18 +13485,18 @@ +@@ -13641,18 +13555,18 @@ $as_echo_n "checking for $compiler optio esac fi @@ -46654,21 +51855,21 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext -@@ -13667,11 +13511,11 @@ +@@ -13667,11 +13581,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13670: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13514: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13584: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13674: \$? = $ac_status" >&5 -+ echo "$as_me:13518: \$? = $ac_status" >&5 ++ echo "$as_me:13588: \$? = $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. -@@ -13684,8 +13528,8 @@ +@@ -13684,8 +13598,8 @@ else $rm conftest* fi @@ -46679,7 +51880,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in -@@ -13712,10 +13556,10 @@ +@@ -13712,10 +13626,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" @@ -46693,7 +51894,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" -@@ -13740,8 +13584,8 @@ +@@ -13740,8 +13654,8 @@ else LDFLAGS="$save_LDFLAGS" fi @@ -46704,7 +51905,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : -@@ -13750,10 +13594,10 @@ +@@ -13750,10 +13664,10 @@ else fi @@ -46718,21 +51919,21 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_c_o_CXX=no $rm -r conftest 2>/dev/null -@@ -13771,11 +13615,11 @@ +@@ -13771,11 +13685,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13774: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13618: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13688: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13778: \$? = $ac_status" >&5 -+ echo "$as_me:13622: \$? = $ac_status" >&5 ++ echo "$as_me:13692: \$? = $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 -@@ -13797,34 +13641,34 @@ +@@ -13797,34 +13711,34 @@ else $rm conftest* fi @@ -46777,7 +51978,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in -@@ -13843,14 +13687,17 @@ +@@ -13843,14 +13757,17 @@ $as_echo_n "checking whether the $compil 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' ;; @@ -46797,7 +51998,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure test "$ld_shlibs_CXX" = no && can_build_shared=no # -@@ -13870,15 +13717,15 @@ +@@ -13870,15 +13787,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -46816,7 +52017,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -13896,7 +13743,7 @@ +@@ -13896,7 +13813,7 @@ $as_echo_n "checking whether -lc should if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -46825,7 +52026,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } then archive_cmds_need_lc_CXX=no -@@ -13908,16 +13755,16 @@ +@@ -13908,16 +13825,16 @@ $as_echo_n "checking whether -lc should cat conftest.err 1>&5 fi $rm conftest* @@ -46846,7 +52047,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -14273,13 +14120,11 @@ +@@ -14273,13 +14190,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -46861,7 +52062,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -14291,6 +14136,18 @@ +@@ -14291,6 +14206,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -46880,7 +52081,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -14468,19 +14325,19 @@ +@@ -14468,19 +14395,19 @@ uts4*) dynamic_linker=no ;; esac @@ -46904,7 +52105,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -14492,8 +14349,8 @@ +@@ -14492,8 +14419,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -46915,7 +52116,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ -@@ -14517,8 +14374,8 @@ +@@ -14517,8 +14444,8 @@ else # directories. hardcode_action_CXX=unsupported fi @@ -46926,7 +52127,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported -@@ -15056,13 +14913,13 @@ +@@ -15056,13 +14983,13 @@ done cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` @@ -46946,7 +52147,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and -@@ -15081,15 +14938,15 @@ +@@ -15081,15 +15008,15 @@ aix[4-9]*) fi ;; esac @@ -46968,7 +52169,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure GCC_F77="$G77" LD_F77="$LD" -@@ -15098,8 +14955,8 @@ +@@ -15098,8 +15025,8 @@ lt_prog_compiler_wl_F77= lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= @@ -46979,7 +52180,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' -@@ -15330,18 +15187,18 @@ +@@ -15330,18 +15257,18 @@ $as_echo_n "checking for $compiler optio esac fi @@ -47003,21 +52204,21 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext -@@ -15356,11 +15213,11 @@ +@@ -15356,11 +15283,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15359: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15216: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15286: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15363: \$? = $ac_status" >&5 -+ echo "$as_me:15220: \$? = $ac_status" >&5 ++ echo "$as_me:15290: \$? = $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. -@@ -15373,8 +15230,8 @@ +@@ -15373,8 +15300,8 @@ else $rm conftest* fi @@ -47028,7 +52229,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in -@@ -15401,10 +15258,10 @@ +@@ -15401,10 +15328,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" @@ -47042,7 +52243,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" -@@ -15429,8 +15286,8 @@ +@@ -15429,8 +15356,8 @@ else LDFLAGS="$save_LDFLAGS" fi @@ -47053,7 +52254,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then : -@@ -15439,10 +15296,10 @@ +@@ -15439,10 +15366,10 @@ else fi @@ -47067,21 +52268,21 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_c_o_F77=no $rm -r conftest 2>/dev/null -@@ -15460,11 +15317,11 @@ +@@ -15460,11 +15387,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15463: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15320: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15390: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15467: \$? = $ac_status" >&5 -+ echo "$as_me:15324: \$? = $ac_status" >&5 ++ echo "$as_me:15394: \$? = $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 -@@ -15486,34 +15343,34 @@ +@@ -15486,34 +15413,34 @@ else $rm conftest* fi @@ -47126,7 +52327,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure runpath_var= allow_undefined_flag_F77= -@@ -15725,12 +15582,13 @@ +@@ -15725,12 +15652,13 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -47141,7 +52342,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -15933,21 +15791,18 @@ +@@ -15933,21 +15861,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -47167,7 +52368,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -15962,13 +15817,12 @@ +@@ -15962,13 +15887,12 @@ 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 @@ -47182,7 +52383,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure 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 -@@ -15993,21 +15847,18 @@ +@@ -15993,21 +15917,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -47208,7 +52409,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -16022,13 +15873,12 @@ +@@ -16022,13 +15943,12 @@ 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 @@ -47223,7 +52424,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure 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 -@@ -16261,7 +16111,7 @@ +@@ -16261,7 +16181,7 @@ if test -z "$aix_libpath"; then aix_libp link_all_deplibs_F77=yes ;; @@ -47232,7 +52433,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -16480,8 +16330,8 @@ +@@ -16480,8 +16400,8 @@ if test -z "$aix_libpath"; then aix_libp esac fi @@ -47243,7 +52444,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure test "$ld_shlibs_F77" = no && can_build_shared=no # -@@ -16501,15 +16351,15 @@ +@@ -16501,15 +16421,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -47262,7 +52463,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -16527,7 +16377,7 @@ +@@ -16527,7 +16447,7 @@ $as_echo_n "checking whether -lc should if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -47271,7 +52472,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } then archive_cmds_need_lc_F77=no -@@ -16539,16 +16389,16 @@ +@@ -16539,16 +16459,16 @@ $as_echo_n "checking whether -lc should cat conftest.err 1>&5 fi $rm conftest* @@ -47292,7 +52493,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -16904,13 +16754,11 @@ +@@ -16904,13 +16824,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -47307,7 +52508,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -16922,6 +16770,18 @@ +@@ -16922,6 +16840,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -47326,7 +52527,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -17099,19 +16959,19 @@ +@@ -17099,19 +17029,19 @@ uts4*) dynamic_linker=no ;; esac @@ -47350,7 +52551,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -17123,8 +16983,8 @@ +@@ -17123,8 +17053,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -47361,7 +52562,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var_F77" || \ -@@ -17148,8 +17008,8 @@ +@@ -17148,8 +17078,8 @@ else # directories. hardcode_action_F77=unsupported fi @@ -47372,7 +52573,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$hardcode_action_F77" = relink; then # Fast installation is not supported -@@ -17659,10 +17519,10 @@ +@@ -17659,10 +17589,10 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' @@ -47386,21 +52587,21 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext -@@ -17677,11 +17537,11 @@ +@@ -17677,11 +17607,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17680: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17540: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17610: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17684: \$? = $ac_status" >&5 -+ echo "$as_me:17544: \$? = $ac_status" >&5 ++ echo "$as_me:17614: \$? = $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. -@@ -17694,8 +17554,8 @@ +@@ -17694,8 +17624,8 @@ else $rm conftest* fi @@ -47411,7 +52612,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -@@ -17709,8 +17569,8 @@ +@@ -17709,8 +17639,8 @@ lt_prog_compiler_wl_GCJ= lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= @@ -47422,7 +52623,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' -@@ -17941,18 +17801,18 @@ +@@ -17941,18 +17871,18 @@ $as_echo_n "checking for $compiler optio esac fi @@ -47446,21 +52647,21 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext -@@ -17967,11 +17827,11 @@ +@@ -17967,11 +17897,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17970: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17830: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17900: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17974: \$? = $ac_status" >&5 -+ echo "$as_me:17834: \$? = $ac_status" >&5 ++ echo "$as_me:17904: \$? = $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. -@@ -17984,8 +17844,8 @@ +@@ -17984,8 +17914,8 @@ else $rm conftest* fi @@ -47471,7 +52672,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in -@@ -18012,10 +17872,10 @@ +@@ -18012,10 +17942,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" @@ -47485,7 +52686,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" -@@ -18040,8 +17900,8 @@ +@@ -18040,8 +17970,8 @@ else LDFLAGS="$save_LDFLAGS" fi @@ -47496,7 +52697,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then : -@@ -18050,10 +17910,10 @@ +@@ -18050,10 +17980,10 @@ else fi @@ -47510,21 +52711,21 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_prog_compiler_c_o_GCJ=no $rm -r conftest 2>/dev/null -@@ -18071,11 +17931,11 @@ +@@ -18071,11 +18001,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18074: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17934: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18004: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18078: \$? = $ac_status" >&5 -+ echo "$as_me:17938: \$? = $ac_status" >&5 ++ echo "$as_me:18008: \$? = $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 -@@ -18097,34 +17957,34 @@ +@@ -18097,34 +18027,34 @@ else $rm conftest* fi @@ -47569,7 +52770,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure runpath_var= allow_undefined_flag_GCJ= -@@ -18336,12 +18196,13 @@ +@@ -18336,12 +18266,13 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -47584,7 +52785,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -18554,21 +18415,18 @@ +@@ -18554,21 +18485,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -47610,7 +52811,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -18583,13 +18441,12 @@ +@@ -18583,13 +18511,12 @@ 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 @@ -47625,7 +52826,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure 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 -@@ -18624,21 +18481,18 @@ +@@ -18624,21 +18551,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -47651,7 +52852,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -18653,13 +18507,12 @@ +@@ -18653,13 +18577,12 @@ 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 @@ -47666,7 +52867,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure 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 -@@ -18892,7 +18745,7 @@ +@@ -18892,7 +18815,7 @@ if test -z "$aix_libpath"; then aix_libp link_all_deplibs_GCJ=yes ;; @@ -47675,7 +52876,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -19111,8 +18964,8 @@ +@@ -19111,8 +19034,8 @@ if test -z "$aix_libpath"; then aix_libp esac fi @@ -47686,7 +52887,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure test "$ld_shlibs_GCJ" = no && can_build_shared=no # -@@ -19132,15 +18985,15 @@ +@@ -19132,15 +19055,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -47705,7 +52906,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest -@@ -19158,7 +19011,7 @@ +@@ -19158,7 +19081,7 @@ $as_echo_n "checking whether -lc should if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? @@ -47714,7 +52915,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } then archive_cmds_need_lc_GCJ=no -@@ -19170,16 +19023,16 @@ +@@ -19170,16 +19093,16 @@ $as_echo_n "checking whether -lc should cat conftest.err 1>&5 fi $rm conftest* @@ -47735,7 +52936,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure library_names_spec= libname_spec='lib$name' soname_spec= -@@ -19535,13 +19388,11 @@ +@@ -19535,13 +19458,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -47750,7 +52951,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -19553,6 +19404,18 @@ +@@ -19553,6 +19474,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -47769,7 +52970,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -19730,19 +19593,19 @@ +@@ -19730,19 +19663,19 @@ uts4*) dynamic_linker=no ;; esac @@ -47793,7 +52994,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi -@@ -19754,8 +19617,8 @@ +@@ -19754,8 +19687,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi @@ -47804,7 +53005,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ test -n "$runpath_var_GCJ" || \ -@@ -19779,8 +19642,8 @@ +@@ -19779,8 +19712,8 @@ else # directories. hardcode_action_GCJ=unsupported fi @@ -47815,7 +53016,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$hardcode_action_GCJ" = relink; then # Fast installation is not supported -@@ -20703,8 +20566,8 @@ +@@ -20703,8 +20636,8 @@ CC="$lt_save_CC" ;; *) @@ -47826,7 +53027,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } ;; esac -@@ -20723,8 +20586,8 @@ +@@ -20723,8 +20656,8 @@ $as_echo "$as_me: error: Unsupported tag chmod +x "$ofile" else rm -f "${ofile}T" @@ -47837,7 +53038,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } fi fi -@@ -20769,10 +20632,10 @@ +@@ -20769,10 +20702,10 @@ fi if test "$enable_largefile" != no; then @@ -47851,7 +53052,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then -@@ -20809,21 +20672,20 @@ +@@ -20809,21 +20742,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -47876,7 +53077,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20837,21 +20699,20 @@ +@@ -20837,21 +20769,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -47901,7 +53102,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20864,16 +20725,16 @@ +@@ -20864,16 +20795,16 @@ rm -f core conftest.err conftest.$ac_obj rm -f conftest.$ac_ext fi fi @@ -47923,7 +53124,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else while :; do cat >conftest.$ac_ext <<_ACEOF -@@ -20905,21 +20766,20 @@ +@@ -20905,21 +20836,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -47948,7 +53149,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20956,21 +20816,20 @@ +@@ -20956,21 +20886,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -47973,7 +53174,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -20981,8 +20840,8 @@ +@@ -20981,8 +20910,8 @@ rm -f core conftest.err conftest.$ac_obj break done fi @@ -47984,7 +53185,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -@@ -20991,12 +20850,12 @@ +@@ -20991,12 +20920,12 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac @@ -48001,7 +53202,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else while :; do cat >conftest.$ac_ext <<_ACEOF -@@ -21028,21 +20887,20 @@ +@@ -21028,21 +20957,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -48026,7 +53227,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21079,21 +20937,20 @@ +@@ -21079,21 +21007,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -48051,7 +53252,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21104,8 +20961,8 @@ +@@ -21104,8 +21031,8 @@ rm -f core conftest.err conftest.$ac_obj break done fi @@ -48062,7 +53263,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case $ac_cv_sys_large_files in #( no | unknown) ;; *) -@@ -21114,7 +20971,7 @@ +@@ -21114,24 +21041,132 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac @@ -48071,7 +53272,124 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi fi -@@ -21128,10 +20985,10 @@ + + # By default we simply use the C compiler to build assembly code. + +-: ${CCAS='$(CC)'} +-# Set ASFLAGS if not already set. +-: ${CCASFLAGS='$(CFLAGS)'} ++test "${CCAS+set}" = set || CCAS=$CC ++test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS ++ ++ ++ ++depcc="$CCAS" am_compiler_list= ++ ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CCAS_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CCAS_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CCAS_dependencies_compiler_type=none ++fi ++ ++fi ++{ echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CCAS_dependencies_compiler_type" >&6; } ++CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then ++ am__fastdepCCAS_TRUE= ++ am__fastdepCCAS_FALSE='#' ++else ++ am__fastdepCCAS_TRUE='#' ++ am__fastdepCCAS_FALSE= ++fi + # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 @@ -48085,7 +53403,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $NM in [\\/]* | ?:[\\/]*) -@@ -21146,7 +21003,7 @@ +@@ -21146,7 +21181,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -48094,7 +53412,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -21159,17 +21016,17 @@ +@@ -21159,17 +21194,17 @@ esac fi NM=$ac_cv_path_NM if test -n "$NM"; then @@ -48118,18 +53436,22 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -@@ -21177,8 +21034,8 @@ +@@ -21177,11 +21212,9 @@ else USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } +- +- +-if test $USE_MAINTAINER_MODE = yes; then + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } - - - if test $USE_MAINTAINER_MODE = yes; then -@@ -21193,8 +21050,8 @@ ++ if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' + else +@@ -21193,8 +21226,8 @@ fi @@ -48140,18 +53462,55 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case "$host" in *-*-mingw*|*-*-cygwin*) platform_win32=yes -@@ -21203,8 +21060,8 @@ +@@ -21203,11 +21236,9 @@ case "$host" in platform_win32=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 -$as_echo "$platform_win32" >&6; } +- +- +-if test "$platform_win32" = "yes"; then +{ echo "$as_me:$LINENO: result: $platform_win32" >&5 +echo "${ECHO_T}$platform_win32" >&6; } ++ if test "$platform_win32" = "yes"; then + PLATFORM_WIN32_TRUE= + PLATFORM_WIN32_FALSE='#' + else +@@ -21216,9 +21247,7 @@ else + fi - if test "$platform_win32" = "yes"; then -@@ -21251,10 +21108,10 @@ +- +- +-if test "$os_win32" = "yes"; then ++ if test "$os_win32" = "yes"; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' + else +@@ -21226,9 +21255,7 @@ else + OS_WIN32_FALSE= + fi + +- +- +-if test "$os_win32" != "yes"; then ++ if test "$os_win32" != "yes"; then + OS_UNIX_TRUE= + OS_UNIX_FALSE='#' + else +@@ -21236,9 +21263,7 @@ else + OS_UNIX_FALSE= + fi + +- +- +-if test "$os_linux" = "yes"; then ++ if test "$os_linux" = "yes"; then + OS_LINUX_TRUE= + OS_LINUX_FALSE='#' + else +@@ -21251,10 +21276,10 @@ if test "$os_win32" = "yes"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 @@ -48165,7 +53524,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. -@@ -21267,7 +21124,7 @@ +@@ -21267,7 +21292,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -48174,7 +53533,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -21278,11 +21135,11 @@ +@@ -21278,11 +21303,11 @@ fi fi WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then @@ -48190,7 +53549,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -21291,10 +21148,10 @@ +@@ -21291,10 +21316,10 @@ if test -z "$ac_cv_prog_WINDRES"; then ac_ct_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 @@ -48204,7 +53563,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ac_ct_WINDRES"; then ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -@@ -21307,7 +21164,7 @@ +@@ -21307,7 +21332,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -48213,7 +53572,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -21318,11 +21175,11 @@ +@@ -21318,11 +21343,11 @@ fi fi ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES if test -n "$ac_ct_WINDRES"; then @@ -48229,7 +53588,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_ct_WINDRES" = x; then -@@ -21330,8 +21187,12 @@ +@@ -21330,8 +21355,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -48244,7 +53603,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac WINDRES=$ac_ct_WINDRES -@@ -21341,16 +21202,16 @@ +@@ -21341,16 +21370,16 @@ else fi if test "$WINDRES" = no; then @@ -48266,7 +53625,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$ms_librarian"; then ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. -@@ -21363,7 +21224,7 @@ +@@ -21363,7 +21392,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -48275,7 +53634,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -21375,11 +21236,11 @@ +@@ -21375,18 +21404,16 @@ fi fi ms_librarian=$ac_cv_prog_ms_librarian if test -n "$ms_librarian"; then @@ -48291,7 +53650,15 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -21463,8 +21324,8 @@ + fi +- +- +-if test x$ms_librarian = xyes; then ++ if test x$ms_librarian = xyes; then + MS_LIB_AVAILABLE_TRUE= + MS_LIB_AVAILABLE_FALSE='#' + else +@@ -21463,8 +21490,8 @@ fi case $gdktarget in x11|win32|quartz|directfb) ;; @@ -48302,7 +53669,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; };; esac -@@ -21499,8 +21360,8 @@ +@@ -21499,8 +21526,8 @@ _ACEOF # Build time sanity check... @@ -48313,7 +53680,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Just in case sleep 1 echo timestamp > conftest.file -@@ -21523,9 +21384,9 @@ +@@ -21523,9 +21550,9 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -48325,7 +53692,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure alias in your environment" >&2;} { (exit 1); exit 1; }; } fi -@@ -21536,20 +21397,20 @@ +@@ -21536,20 +21563,20 @@ then # Ok. : else @@ -48353,7 +53720,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -21587,30 +21448,26 @@ +@@ -21587,30 +21614,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -48389,7 +53756,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_strerror+set}" = set; then -@@ -21625,8 +21482,8 @@ +@@ -21625,40 +21648,582 @@ fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi @@ -48400,21 +53767,640 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_res=$ac_cv_search_strerror if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -21636,10 +21493,10 @@ + fi ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ + ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS + ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi -{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 -$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; } -+{ echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 -+echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6; } - if test "${am_cv_prog_cc_stdc+set}" = set; then +-if test "${am_cv_prog_cc_stdc+set}" = set; then - $as_echo_n "(cached) " >&6 +-else +- am_cv_prog_cc_stdc=no +-ac_save_CC="$CC" +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 - else - am_cv_prog_cc_stdc=no - ac_save_CC="$CC" -@@ -21704,21 +21561,20 @@ ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH + do +- CC="$ac_save_CC $ac_arg" ++ 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_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ fi ++fi ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ ac_prog_rejected=no ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++ ac_cv_prog_CC="cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $# != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi ++fi ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ 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 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&5 ++echo "$as_me: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ ++# Provide some information about the compiler. ++echo "$as_me:$LINENO: checking for C compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_compiler_gnu=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } ++GCC=`test $ac_compiler_gnu = yes && echo yes` ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include + #include + #include +@@ -21681,66 +22246,202 @@ static char *f (char * (*g) (char **, in + va_end (v); + return s; + } ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ + int test (int i, double x); + struct s1 {int (*f) (int a);}; + struct s2 {int (*f) (double a);}; + int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); + int argc; + char **argv; +- + int + main () + { +- + return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +- + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" + case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -48432,30 +54418,169 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - am_cv_prog_cc_stdc="$ac_arg"; break +- am_cv_prog_cc_stdc="$ac_arg"; break ++ ac_cv_prog_cc_c89=$ac_arg else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21731,11 +21587,11 @@ fi - if test -z "$am_cv_prog_cc_stdc"; then +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break + done +-CC="$ac_save_CC" ++rm -f conftest.$ac_ext ++CC=$ac_save_CC + + fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; ++ xno) ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++esac ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++depcc="$CC" am_compiler_list= ++ ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CC_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + +-if test -z "$am_cv_prog_cc_stdc"; then - { $as_echo "$as_me:$LINENO: result: none needed" >&5 -$as_echo "none needed" >&6; } -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ++ cd .. ++ rm -rf conftest.dir else - { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 -$as_echo "$am_cv_prog_cc_stdc" >&6; } -+ { echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 -+echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6; } ++ am_cv_CC_dependencies_compiler_type=none fi - case "x$am_cv_prog_cc_stdc" in - x|xno) ;; -@@ -21755,12 +21611,11 @@ +-case "x$am_cv_prog_cc_stdc" in +- x|xno) ;; +- *) CC="$CC $am_cv_prog_cc_stdc" ;; +-esac ++ ++fi ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ ++ ++ ++am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -21755,12 +22456,11 @@ esac # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. @@ -48471,7 +54596,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -@@ -21789,29 +21644,17 @@ +@@ -21789,29 +22489,17 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else @@ -48503,7 +54628,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "${ac_cv_path_install+set}" = set; then -@@ -21824,8 +21667,8 @@ +@@ -21824,8 +22512,8 @@ fi INSTALL=$ac_install_sh fi fi @@ -48514,7 +54639,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. -@@ -21835,12 +21678,11 @@ +@@ -21835,12 +22523,11 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -48531,7 +54656,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.make <<\_ACEOF SHELL = /bin/sh -@@ -21857,12 +21699,12 @@ +@@ -21857,12 +22544,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -48548,7 +54673,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure SET_MAKE="MAKE=${MAKE-make}" fi -@@ -21895,8 +21737,8 @@ +@@ -21895,8 +22582,8 @@ CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_I if test x"$os_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' @@ -48559,7 +54684,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" else -@@ -21915,14 +21757,14 @@ +@@ -21915,14 +22602,14 @@ $as_echo_n "checking how to get MSVC-com ;; esac if test x"$msnative_struct" = x ; then @@ -48580,7 +54705,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi fi fi -@@ -21942,10 +21784,10 @@ +@@ -21942,10 +22629,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -48594,7 +54719,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -21960,7 +21802,7 @@ +@@ -21960,7 +22647,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -48603,7 +54728,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -21972,11 +21814,11 @@ +@@ -21972,11 +22659,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -48619,7 +54744,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -21985,10 +21827,10 @@ +@@ -21985,10 +22672,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -48633,7 +54758,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -22003,7 +21845,7 @@ +@@ -22003,7 +22690,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -48642,7 +54767,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -22015,11 +21857,11 @@ +@@ -22015,11 +22702,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -48658,7 +54783,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -22027,8 +21869,12 @@ +@@ -22027,8 +22714,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -48673,7 +54798,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG -@@ -22040,54 +21886,58 @@ +@@ -22040,54 +22731,58 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 @@ -48756,7 +54881,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -22100,14 +21950,14 @@ +@@ -22100,14 +22795,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -48774,7 +54899,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure $BASE_DEPENDENCIES_PKG_ERRORS -@@ -22118,7 +21968,7 @@ +@@ -22118,7 +22813,7 @@ Alternatively, you may set the environme and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 @@ -48783,7 +54908,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure $BASE_DEPENDENCIES_PKG_ERRORS -@@ -22131,9 +21981,7 @@ +@@ -22131,9 +22826,7 @@ See the pkg-config man page for more det " >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then @@ -48794,7 +54919,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -22143,7 +21991,7 @@ +@@ -22143,7 +22836,7 @@ See the pkg-config man page for more det To get pkg-config, see . See \`config.log' for more details." >&5 @@ -48803,7 +54928,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -@@ -22153,12 +22001,12 @@ +@@ -22153,12 +22846,12 @@ See the pkg-config man page for more det To get pkg-config, see . See \`config.log' for more details." >&2;} @@ -48819,7 +54944,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure : fi -@@ -22181,8 +22029,8 @@ +@@ -22181,8 +22874,8 @@ else fi @@ -48830,7 +54955,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case $enable_explicit_deps in auto) export SED -@@ -22195,13 +22043,13 @@ +@@ -22195,17 +22888,15 @@ case $enable_explicit_deps in ;; yes|no) ;; @@ -48843,12 +54968,17 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure esac -{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 -$as_echo "$enable_explicit_deps" >&6; } +- +{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 +echo "${ECHO_T}$enable_explicit_deps" >&6; } - - -@@ -22221,10 +22069,10 @@ +- +-if test $enable_explicit_deps = no; then ++ if test $enable_explicit_deps = no; then + DISABLE_EXPLICIT_DEPS_TRUE= + DISABLE_EXPLICIT_DEPS_FALSE='#' + else +@@ -22221,10 +22912,10 @@ for ac_prog in perl5 perl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -48862,7 +54992,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $PERL in [\\/]* | ?:[\\/]*) -@@ -22239,7 +22087,7 @@ +@@ -22239,7 +22930,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -48871,7 +55001,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -22251,11 +22099,11 @@ +@@ -22251,11 +22942,11 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then @@ -48887,7 +55017,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -22266,10 +22114,10 @@ +@@ -22266,10 +22957,10 @@ done # We would like indent, but don't require it. # Extract the first word of "indent", so it can be a program name with args. set dummy indent; ac_word=$2 @@ -48901,7 +55031,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$INDENT"; then ac_cv_prog_INDENT="$INDENT" # Let the user override the test. -@@ -22282,7 +22130,7 @@ +@@ -22282,7 +22973,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -48910,7 +55040,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -22293,11 +22141,11 @@ +@@ -22293,11 +22984,11 @@ fi fi INDENT=$ac_cv_prog_INDENT if test -n "$INDENT"; then @@ -48926,7 +55056,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -22316,11 +22164,11 @@ +@@ -22316,11 +23007,11 @@ fi for ac_func in lstat mkstemp flockfile getc_unlocked do @@ -48942,7 +55072,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -22373,42 +22221,35 @@ +@@ -22373,42 +23064,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -48995,7 +55125,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -22417,11 +22258,11 @@ +@@ -22417,11 +23101,11 @@ done for ac_func in localtime_r do @@ -49011,7 +55141,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -22474,42 +22315,35 @@ +@@ -22474,42 +23158,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49064,7 +55194,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -22517,8 +22351,8 @@ +@@ -22517,8 +23194,8 @@ done # _NL_TIME_FIRST_WEEKDAY is an enum and not a define @@ -49075,7 +55205,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22543,34 +22377,30 @@ +@@ -22543,34 +23220,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49117,7 +55247,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22580,8 +22410,8 @@ +@@ -22580,8 +23253,8 @@ _ACEOF fi # _NL_MEASUREMENT_MEASUREMENT is an enum and not a define @@ -49128,7 +55258,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22606,34 +22436,30 @@ +@@ -22606,34 +23279,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49170,7 +55300,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22643,8 +22469,8 @@ +@@ -22643,8 +23312,8 @@ _ACEOF fi # _NL_PAPER_HEIGHT is an enum and not a define @@ -49181,7 +55311,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22669,34 +22495,30 @@ +@@ -22669,34 +23338,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49223,7 +55353,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22706,8 +22528,8 @@ +@@ -22706,8 +23371,8 @@ _ACEOF fi # _NL_PAPER_WIDTH is an enum and not a define @@ -49234,7 +55364,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22732,34 +22554,30 @@ +@@ -22732,34 +23397,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49276,7 +55406,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22769,8 +22587,8 @@ +@@ -22769,8 +23430,8 @@ _ACEOF fi # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable @@ -49287,7 +55417,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22795,34 +22613,30 @@ +@@ -22795,34 +23456,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49329,7 +55459,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$gtk_ok" = "yes"; then cat >>confdefs.h <<\_ACEOF -@@ -22837,21 +22651,20 @@ +@@ -22837,21 +23494,20 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/L for ac_header in locale.h do @@ -49360,7 +55490,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22867,33 +22680,32 @@ +@@ -22867,33 +23523,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49401,7 +55531,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22907,52 +22719,51 @@ +@@ -22907,52 +23562,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49475,7 +55605,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -22961,24 +22772,21 @@ +@@ -22961,24 +23615,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -49508,7 +55638,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -22986,10 +22794,10 @@ +@@ -22986,10 +23637,10 @@ fi done if test $ac_cv_header_locale_h = yes; then @@ -49522,7 +55652,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23012,35 +22820,31 @@ +@@ -23012,35 +23663,31 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49565,7 +55695,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test $am_cv_val_LC_MESSAGES = yes; then cat >>confdefs.h <<\_ACEOF -@@ -23059,17 +22863,17 @@ +@@ -23059,17 +23706,17 @@ _ACEOF INTLLIBS= if test "${ac_cv_header_libintl_h+set}" = set; then @@ -49590,7 +55720,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23085,33 +22889,32 @@ +@@ -23085,33 +23732,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49631,7 +55761,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23125,52 +22928,51 @@ +@@ -23125,52 +23771,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49705,7 +55835,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -23179,28 +22981,28 @@ +@@ -23179,28 +23824,28 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -49743,7 +55873,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23225,42 +23027,38 @@ +@@ -23225,42 +23870,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49796,7 +55926,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23285,47 +23083,43 @@ +@@ -23285,47 +23926,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49855,7 +55985,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23378,42 +23172,35 @@ +@@ -23378,42 +24015,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49908,7 +56038,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -23428,10 +23215,10 @@ +@@ -23428,10 +24058,10 @@ done || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then @@ -49922,7 +56052,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -23463,41 +23250,37 @@ +@@ -23463,41 +24093,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -49975,7 +56105,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -23529,41 +23312,37 @@ +@@ -23529,41 +24155,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50028,7 +56158,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -@@ -23595,37 +23374,33 @@ +@@ -23595,37 +24217,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50074,7 +56204,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure gt_cv_func_dgettext_libintl=yes fi -@@ -23635,14 +23410,14 @@ +@@ -23635,14 +24253,14 @@ fi if test "$gt_cv_func_dgettext_libintl" != "yes" ; then @@ -50096,7 +56226,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -@@ -23674,41 +23449,37 @@ +@@ -23674,41 +24292,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50149,7 +56279,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -@@ -23740,37 +23511,33 @@ +@@ -23740,37 +24354,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50195,7 +56325,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else -@@ -23795,11 +23562,11 @@ +@@ -23795,11 +24405,11 @@ fi for ac_func in bind_textdomain_codeset do @@ -50211,7 +56341,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -23852,42 +23619,35 @@ +@@ -23852,42 +24462,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50264,7 +56394,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -23923,10 +23683,10 @@ +@@ -23923,10 +24526,10 @@ _ACEOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 @@ -50278,7 +56408,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case "$MSGFMT" in /*) -@@ -23950,11 +23710,11 @@ +@@ -23950,11 +24553,11 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then @@ -50294,7 +56424,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" -@@ -23962,11 +23722,11 @@ +@@ -23962,11 +24565,11 @@ fi for ac_func in dcgettext do @@ -50310,7 +56440,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24019,50 +23779,43 @@ +@@ -24019,50 +24622,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50373,7 +56503,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.foo <<_ACEOF msgid "" -@@ -24076,25 +23829,25 @@ +@@ -24076,25 +24672,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" _ACEOF @@ -50408,7 +56538,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $GMSGFMT in [\\/]* | ?:[\\/]*) -@@ -24109,7 +23862,7 @@ +@@ -24109,7 +24705,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -50417,7 +56547,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -24122,20 +23875,20 @@ +@@ -24122,20 +24718,20 @@ esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -50445,7 +56575,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case "$XGETTEXT" in /*) -@@ -24159,11 +23912,11 @@ +@@ -24159,11 +24755,11 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -50461,7 +56591,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi cat >conftest.$ac_ext <<_ACEOF -@@ -24188,33 +23941,30 @@ +@@ -24188,33 +24784,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50503,7 +56633,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -24267,36 +24017,32 @@ +@@ -24267,36 +24860,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50548,7 +56678,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure CATOBJEXT=.gmo DATADIRNAME=share else -@@ -24312,7 +24058,6 @@ +@@ -24312,7 +24901,6 @@ fi esac fi @@ -50556,7 +56686,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" -@@ -24338,8 +24083,8 @@ +@@ -24338,8 +24926,8 @@ _ACEOF if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else @@ -50567,7 +56697,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure XGETTEXT=":" fi fi -@@ -24371,8 +24116,8 @@ +@@ -24371,8 +24959,8 @@ $as_echo "found xgettext program is not if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else @@ -50578,7 +56708,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no -@@ -24396,8 +24141,8 @@ +@@ -24396,8 +24984,8 @@ $as_echo_n "checking for catalogs to be fi done LINGUAS=$NEW_LINGUAS @@ -50589,7 +56719,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test -n "$LINGUAS"; then -@@ -24453,14 +24198,14 @@ +@@ -24453,14 +25041,14 @@ _ACEOF @@ -50608,7 +56738,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF -@@ -24478,27 +24223,25 @@ +@@ -24478,27 +25066,25 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50644,7 +56774,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -@@ -24523,82 +24266,78 @@ +@@ -24523,82 +25109,78 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50753,7 +56883,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24620,22 +24359,21 @@ +@@ -24620,22 +25202,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50781,7 +56911,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_save_CFLAGS="$CFLAGS" -@@ -24661,29 +24399,28 @@ +@@ -24661,29 +25242,28 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50820,7 +56950,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -@@ -24733,10 +24470,10 @@ +@@ -24733,10 +25313,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -50834,7 +56964,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -24751,7 +24488,7 @@ +@@ -24751,7 +25331,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -50843,7 +56973,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -24763,11 +24500,11 @@ +@@ -24763,11 +25343,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -50859,7 +56989,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -24776,10 +24513,10 @@ +@@ -24776,10 +25356,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -50873,7 +57003,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) -@@ -24794,7 +24531,7 @@ +@@ -24794,7 +25374,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -50882,7 +57012,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -24806,11 +24543,11 @@ +@@ -24806,11 +25386,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -50898,7 +57028,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -24818,8 +24555,12 @@ +@@ -24818,8 +25398,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) @@ -50913,7 +57043,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG -@@ -24831,14 +24572,14 @@ +@@ -24831,14 +25415,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.16 @@ -50934,7 +57064,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure PKG_CONFIG="" fi -@@ -24852,8 +24593,8 @@ +@@ -24852,8 +25436,8 @@ fi fi min_glib_version=2.17.6 @@ -50945,7 +57075,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test x$PKG_CONFIG != xno ; then ## don't try to run the test against uninstalled libtool libs -@@ -24976,32 +24717,29 @@ +@@ -24976,32 +25560,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -50984,7 +57114,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -@@ -25011,12 +24749,12 @@ +@@ -25011,12 +25592,12 @@ fi fi fi if test "x$no_glib" = x ; then @@ -51001,7 +57131,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "$PKG_CONFIG" = "no" ; then echo "*** A new enough version of pkg-config was not found." echo "*** See http://www.freedesktop.org/software/pkgconfig/" -@@ -25053,21 +24791,18 @@ +@@ -25053,21 +25634,18 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51027,7 +57157,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure 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" -@@ -25078,14 +24813,13 @@ +@@ -25078,14 +25656,13 @@ $as_echo "$ac_try_echo") >&5 echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" else @@ -51043,7 +57173,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" -@@ -25097,10 +24831,10 @@ +@@ -25097,10 +25674,10 @@ rm -f core conftest.err conftest.$ac_obj GLIB_GENMARSHAL="" GOBJECT_QUERY="" GLIB_MKENUMS="" @@ -51056,7 +57186,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** GLIB 2.17.6 or better is required. The latest version of *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} { (exit 1); exit 1; }; } -@@ -25128,11 +24862,11 @@ +@@ -25128,11 +25705,11 @@ LIBS="$LIBS $GLIB_LIBS" for ac_func in bind_textdomain_codeset do @@ -51072,7 +57202,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25185,42 +24919,35 @@ +@@ -25185,42 +25762,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51125,7 +57255,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -25231,21 +24958,20 @@ +@@ -25231,21 +25801,20 @@ LIBS=$gtk_save_LIBS for ac_header in pwd.h do @@ -51156,7 +57286,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25261,33 +24987,32 @@ +@@ -25261,33 +25830,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51197,7 +57327,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25301,52 +25026,51 @@ +@@ -25301,52 +25869,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51271,7 +57401,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25355,24 +25079,21 @@ +@@ -25355,24 +25922,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -51304,7 +57434,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF cat >>confdefs.h <<\_ACEOF -@@ -25386,21 +25107,20 @@ +@@ -25386,21 +25950,20 @@ done for ac_header in sys/time.h do @@ -51335,7 +57465,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25416,33 +25136,32 @@ +@@ -25416,33 +25979,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51376,7 +57506,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25456,52 +25175,51 @@ +@@ -25456,52 +26018,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51450,7 +57580,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25510,24 +25228,21 @@ +@@ -25510,24 +26071,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -51483,7 +57613,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF cat >>confdefs.h <<\_ACEOF -@@ -25541,21 +25256,20 @@ +@@ -25541,21 +26099,20 @@ done for ac_header in unistd.h do @@ -51514,7 +57644,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25571,33 +25285,32 @@ +@@ -25571,33 +26128,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51555,7 +57685,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25611,52 +25324,51 @@ +@@ -25611,52 +26167,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51629,7 +57759,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25665,24 +25377,21 @@ +@@ -25665,24 +26220,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -51662,7 +57792,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF cat >>confdefs.h <<\_ACEOF -@@ -25696,21 +25405,20 @@ +@@ -25696,21 +26248,20 @@ done for ac_header in ftw.h do @@ -51693,7 +57823,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25726,33 +25434,32 @@ +@@ -25726,33 +26277,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51734,7 +57864,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25766,52 +25473,51 @@ +@@ -25766,52 +26316,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51808,7 +57938,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25820,24 +25526,21 @@ +@@ -25820,24 +26369,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -51841,7 +57971,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF cat >>confdefs.h <<\_ACEOF -@@ -25849,8 +25552,8 @@ +@@ -25849,8 +26395,8 @@ fi done @@ -51852,7 +57982,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -25874,21 +25577,20 @@ +@@ -25874,21 +26420,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51877,7 +58007,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_ok=no -@@ -25896,16 +25598,16 @@ +@@ -25896,16 +26441,16 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $gtk_ok = yes; then @@ -51898,7 +58028,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi saved_cflags="$CFLAGS" -@@ -25913,10 +25615,10 @@ +@@ -25913,10 +26458,10 @@ saved_ldflags="$LDFLAGS" # Checks for header files. @@ -51912,7 +58042,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -25943,21 +25645,20 @@ +@@ -25943,21 +26488,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51937,7 +58067,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no -@@ -26049,40 +25750,37 @@ +@@ -26049,40 +26593,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -51986,7 +58116,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF -@@ -26093,10 +25791,10 @@ +@@ -26093,10 +26634,10 @@ fi # Checks for typedefs, structures, and compiler characteristics. @@ -52000,7 +58130,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26168,21 +25866,20 @@ +@@ -26168,21 +26709,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52025,7 +58155,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_c_const=no -@@ -26190,22 +25887,22 @@ +@@ -26190,22 +26730,22 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -52054,7 +58184,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26230,21 +25927,20 @@ +@@ -26230,21 +26770,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52079,7 +58209,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_signal=void -@@ -26252,8 +25948,8 @@ +@@ -26252,8 +26791,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -52090,7 +58220,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -@@ -26264,21 +25960,20 @@ +@@ -26264,21 +26803,20 @@ _ACEOF for ac_header in stdlib.h unistd.h do @@ -52121,7 +58251,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26294,33 +25989,32 @@ +@@ -26294,33 +26832,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52162,7 +58292,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26334,52 +26028,51 @@ +@@ -26334,52 +26871,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52236,7 +58366,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -26388,24 +26081,21 @@ +@@ -26388,24 +26924,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -52269,7 +58399,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -26415,11 +26105,11 @@ +@@ -26415,11 +26948,11 @@ done for ac_func in getpagesize do @@ -52285,7 +58415,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26472,51 +26162,44 @@ +@@ -26472,51 +27005,44 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52350,7 +58480,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no -@@ -26660,39 +26343,36 @@ +@@ -26660,39 +27186,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52398,7 +58528,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test $ac_cv_func_mmap_fixed_mapped = yes; then cat >>confdefs.h <<\_ACEOF -@@ -26706,11 +26386,11 @@ +@@ -26706,11 +27229,11 @@ rm -f conftest.mmap for ac_func in mallinfo do @@ -52414,7 +58544,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26763,42 +26443,35 @@ +@@ -26763,42 +27286,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52467,7 +58597,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -26807,11 +26480,11 @@ +@@ -26807,11 +27323,11 @@ done for ac_func in getresuid do @@ -52483,7 +58613,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26864,51 +26537,44 @@ +@@ -26864,51 +27380,44 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52548,7 +58678,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -26928,8 +26594,8 @@ +@@ -26928,8 +27437,8 @@ fi rm -f conftest* fi @@ -52559,7 +58689,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test $ac_cv_type_uid_t = no; then cat >>confdefs.h <<\_ACEOF -@@ -26945,8 +26611,8 @@ +@@ -26945,8 +27454,8 @@ fi # Check if needs to be included for fd_set @@ -52570,7 +58700,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26968,21 +26634,20 @@ +@@ -26968,21 +27477,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52595,7 +58725,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_ok=no -@@ -26990,8 +26655,8 @@ +@@ -26990,8 +27498,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $gtk_ok = yes; then @@ -52606,7 +58736,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27014,22 +26679,22 @@ +@@ -27014,22 +27522,22 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_SELECT_H 1 _ACEOF @@ -52635,7 +58765,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27043,21 +26708,20 @@ +@@ -27043,21 +27551,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52660,7 +58790,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 gdk_wchar_h=no -@@ -27071,12 +26735,12 @@ +@@ -27071,12 +27578,12 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi @@ -52677,7 +58807,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27090,21 +26754,20 @@ +@@ -27090,21 +27597,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52702,7 +58832,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 gdk_wctype_h=no -@@ -27118,15 +26781,15 @@ +@@ -27118,15 +27624,15 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi @@ -52723,7 +58853,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27179,42 +26842,38 @@ +@@ -27179,42 +27685,38 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52777,7 +58907,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lw $LIBS" -@@ -27246,37 +26905,33 @@ +@@ -27246,37 +27748,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52823,7 +58953,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure GDK_WLIBS=-lw fi -@@ -27286,8 +26941,8 @@ +@@ -27286,8 +27784,8 @@ fi oLIBS="$LIBS" LIBS="$LIBS $GDK_WLIBS" # The following is necessary for Linux libc-5.4.38 @@ -52834,7 +58964,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27322,30 +26977,26 @@ +@@ -27322,30 +27820,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52870,7 +59000,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$oLIBS" -@@ -27358,13 +27009,13 @@ +@@ -27358,13 +27852,13 @@ _ACEOF GDK_WLIBS= fi @@ -52888,7 +59018,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27378,21 +27029,20 @@ +@@ -27378,21 +27872,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52913,7 +59043,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 gtk_uxtheme_h=no -@@ -27406,28 +27056,27 @@ +@@ -27406,28 +27899,27 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi @@ -52953,7 +59083,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27443,33 +27092,32 @@ +@@ -27443,33 +27935,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -52994,7 +59124,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27483,52 +27131,51 @@ +@@ -27483,52 +27974,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53068,7 +59198,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -27537,24 +27184,21 @@ +@@ -27537,24 +28027,21 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -53101,7 +59231,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -27564,11 +27208,11 @@ +@@ -27564,11 +28051,11 @@ done for ac_func in _NSGetEnviron do @@ -53117,7 +59247,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -27621,42 +27265,35 @@ +@@ -27621,42 +28108,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53170,7 +59300,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -27683,8 +27320,8 @@ +@@ -27683,8 +28163,8 @@ _ACEOF fi @@ -53181,7 +59311,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Check whether --enable-modules was given. if test "${enable_modules+set}" = set; then -@@ -27695,13 +27332,13 @@ +@@ -27695,13 +28175,13 @@ fi dynworks=false deps= if test x$enable_modules = xno; then @@ -53201,7 +59331,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ## for loop is to strip newline tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` for I in $tmp; do -@@ -27726,11 +27363,11 @@ +@@ -27726,11 +28206,11 @@ cat >>confdefs.h <<\_ACEOF #define USE_GMODULE 1 _ACEOF @@ -53217,7 +59347,18 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi fi -@@ -27779,10 +27416,10 @@ +@@ -27766,9 +28246,7 @@ if test "${enable_gdiplus+set}" = set; t + fi + + +- +- +-if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then ++ if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then + BUILD_GDIPLUS_LOADERS_TRUE= + BUILD_GDIPLUS_LOADERS_FALSE='#' + else +@@ -27779,10 +28257,10 @@ fi if test x$os_win32 = xno || test x$enable_gdiplus = xno; then if test x$with_libtiff != xno && test -z "$LIBTIFF"; then @@ -53231,7 +59372,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff -lm $LIBS" -@@ -27814,49 +27451,45 @@ +@@ -27814,49 +28292,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53296,7 +59437,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27872,33 +27505,32 @@ +@@ -27872,33 +28346,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53337,7 +59478,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27912,52 +27544,51 @@ +@@ -27912,52 +28385,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53411,7 +59552,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -27966,30 +27597,30 @@ +@@ -27966,30 +28438,30 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -53453,7 +59594,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff -ljpeg -lz -lm $LIBS" -@@ -28021,49 +27652,45 @@ +@@ -28021,49 +28493,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53518,7 +59659,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28079,33 +27706,32 @@ +@@ -28079,33 +28547,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53559,7 +59700,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28119,52 +27745,51 @@ +@@ -28119,52 +28586,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53633,7 +59774,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28173,30 +27798,30 @@ +@@ -28173,30 +28639,30 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -53675,7 +59816,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" -@@ -28228,49 +27853,45 @@ +@@ -28228,49 +28694,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53740,7 +59881,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28286,33 +27907,32 @@ +@@ -28286,33 +28748,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53781,7 +59922,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28326,52 +27946,51 @@ +@@ -28326,52 +28787,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53855,7 +59996,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28380,28 +27999,28 @@ +@@ -28380,28 +28840,28 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -53894,7 +60035,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi fi -@@ -28411,11 +28030,11 @@ +@@ -28411,11 +28871,11 @@ fi fi if test x$with_libtiff != xno && test -z "$LIBTIFF"; then @@ -53908,7 +60049,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** Checks for TIFF loader failed. You can build without it by passing *** --without-libtiff to configure but some programs using GTK+ may *** not work properly" >&2;} -@@ -28425,10 +28044,10 @@ +@@ -28425,10 +28885,10 @@ fi if test x$os_win32 = xno || test x$enable_gdiplus = xno; then if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then @@ -53922,7 +60063,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" -@@ -28460,47 +28079,43 @@ +@@ -28460,47 +28920,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -53982,7 +60123,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28518,35 +28133,34 @@ +@@ -28518,35 +28974,34 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54026,7 +60167,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" -@@ -28578,60 +28192,56 @@ +@@ -28578,60 +29033,56 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54101,7 +60242,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** Checks for JPEG loader failed. You can build without it by passing *** --without-libjpeg to configure but some programs using GTK+ may *** not work properly" >&2;} -@@ -28640,21 +28250,21 @@ +@@ -28640,21 +29091,21 @@ $as_echo "$as_me: error: fi if test x$with_libpng != xno && test -z "$LIBPNG"; then @@ -54132,7 +60273,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lpng -lz -lm $LIBS" -@@ -28686,49 +28296,45 @@ +@@ -28686,49 +29137,45 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54197,7 +60338,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28744,33 +28350,32 @@ +@@ -28744,33 +29191,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54238,7 +60379,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28784,52 +28389,51 @@ +@@ -28784,52 +29230,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54312,7 +60453,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28838,18 +28442,18 @@ +@@ -28838,18 +29283,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -54337,7 +60478,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure png_ok=yes else png_ok=no -@@ -28857,13 +28461,13 @@ +@@ -28857,13 +29302,13 @@ fi else @@ -54355,7 +60496,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28885,49 +28489,48 @@ +@@ -28885,49 +29330,48 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54416,7 +60557,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** Checks for PNG loader failed. You can build without it by passing *** --without-libpng to configure but many programs using GTK+ will *** not work properly. The PNG loader is also needed if you are compiling -@@ -28936,10 +28539,10 @@ +@@ -28936,10 +29380,10 @@ $as_echo "$as_me: error: fi if test x$with_libjasper != xno && test -z "$LIBJASPER"; then @@ -54430,7 +60571,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ljasper -ljpeg $LIBS" -@@ -28971,47 +28574,43 @@ +@@ -28971,47 +29415,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54488,7 +60629,18 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** Checks for JPEG2000 loader failed. You can build without it by passing *** --without-libjasper to configure" >&2;} { (exit 1); exit 1; }; } -@@ -29036,8 +28635,8 @@ +@@ -29022,9 +29462,7 @@ $as_echo "$as_me: error: + + + +- +- +-if $dynworks; then ++ if $dynworks; then + BUILD_DYNAMIC_MODULES_TRUE= + BUILD_DYNAMIC_MODULES_FALSE='#' + else +@@ -29036,8 +29474,8 @@ fi # # Allow building some or all gdk-pixbuf loaders included # @@ -54499,7 +60651,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Check whether --with-included_loaders was given. -@@ -29080,8 +28679,8 @@ +@@ -29080,8 +29518,8 @@ else included_loaders="$with_included_loaders" fi @@ -54510,7 +60662,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure INCLUDED_LOADER_OBJ= INCLUDED_LOADER_DEFINE= -@@ -29091,8 +28690,8 @@ +@@ -29091,8 +29529,8 @@ for loader in $included_loaders; do if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then : else @@ -54521,7 +60673,194 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } fi -@@ -29291,20 +28890,18 @@ +@@ -29117,9 +29555,7 @@ IFS="$gtk_save_ifs" + + + +- +- +-if test x"$INCLUDE_png" = xyes; then ++ if test x"$INCLUDE_png" = xyes; then + INCLUDE_PNG_TRUE= + INCLUDE_PNG_FALSE='#' + else +@@ -29127,9 +29563,7 @@ else + INCLUDE_PNG_FALSE= + fi + +- +- +-if test x"$INCLUDE_bmp" = xyes; then ++ if test x"$INCLUDE_bmp" = xyes; then + INCLUDE_BMP_TRUE= + INCLUDE_BMP_FALSE='#' + else +@@ -29137,9 +29571,7 @@ else + INCLUDE_BMP_FALSE= + fi + +- +- +-if test x"$INCLUDE_wbmp" = xyes; then ++ if test x"$INCLUDE_wbmp" = xyes; then + INCLUDE_WBMP_TRUE= + INCLUDE_WBMP_FALSE='#' + else +@@ -29147,9 +29579,7 @@ else + INCLUDE_WBMP_FALSE= + fi + +- +- +-if test x"$INCLUDE_gif" = xyes; then ++ if test x"$INCLUDE_gif" = xyes; then + INCLUDE_GIF_TRUE= + INCLUDE_GIF_FALSE='#' + else +@@ -29157,9 +29587,7 @@ else + INCLUDE_GIF_FALSE= + fi + +- +- +-if test x"$INCLUDE_ico" = xyes; then ++ if test x"$INCLUDE_ico" = xyes; then + INCLUDE_ICO_TRUE= + INCLUDE_ICO_FALSE='#' + else +@@ -29167,9 +29595,7 @@ else + INCLUDE_ICO_FALSE= + fi + +- +- +-if test x"$INCLUDE_ani" = xyes; then ++ if test x"$INCLUDE_ani" = xyes; then + INCLUDE_ANI_TRUE= + INCLUDE_ANI_FALSE='#' + else +@@ -29177,9 +29603,7 @@ else + INCLUDE_ANI_FALSE= + fi + +- +- +-if test x"$INCLUDE_jpeg" = xyes; then ++ if test x"$INCLUDE_jpeg" = xyes; then + INCLUDE_JPEG_TRUE= + INCLUDE_JPEG_FALSE='#' + else +@@ -29187,9 +29611,7 @@ else + INCLUDE_JPEG_FALSE= + fi + +- +- +-if test x"$INCLUDE_pnm" = xyes; then ++ if test x"$INCLUDE_pnm" = xyes; then + INCLUDE_PNM_TRUE= + INCLUDE_PNM_FALSE='#' + else +@@ -29197,9 +29619,7 @@ else + INCLUDE_PNM_FALSE= + fi + +- +- +-if test x"$INCLUDE_ras" = xyes; then ++ if test x"$INCLUDE_ras" = xyes; then + INCLUDE_RAS_TRUE= + INCLUDE_RAS_FALSE='#' + else +@@ -29207,9 +29627,7 @@ else + INCLUDE_RAS_FALSE= + fi + +- +- +-if test x"$INCLUDE_tiff" = xyes; then ++ if test x"$INCLUDE_tiff" = xyes; then + INCLUDE_TIFF_TRUE= + INCLUDE_TIFF_FALSE='#' + else +@@ -29217,9 +29635,7 @@ else + INCLUDE_TIFF_FALSE= + fi + +- +- +-if test x"$INCLUDE_xpm" = xyes; then ++ if test x"$INCLUDE_xpm" = xyes; then + INCLUDE_XPM_TRUE= + INCLUDE_XPM_FALSE='#' + else +@@ -29227,9 +29643,7 @@ else + INCLUDE_XPM_FALSE= + fi + +- +- +-if test x"$INCLUDE_xbm" = xyes; then ++ if test x"$INCLUDE_xbm" = xyes; then + INCLUDE_XBM_TRUE= + INCLUDE_XBM_FALSE='#' + else +@@ -29237,9 +29651,7 @@ else + INCLUDE_XBM_FALSE= + fi + +- +- +-if test x"$INCLUDE_tga" = xyes; then ++ if test x"$INCLUDE_tga" = xyes; then + INCLUDE_TGA_TRUE= + INCLUDE_TGA_FALSE='#' + else +@@ -29247,9 +29659,7 @@ else + INCLUDE_TGA_FALSE= + fi + +- +- +-if test x"$INCLUDE_pcx" = xyes; then ++ if test x"$INCLUDE_pcx" = xyes; then + INCLUDE_PCX_TRUE= + INCLUDE_PCX_FALSE='#' + else +@@ -29257,9 +29667,7 @@ else + INCLUDE_PCX_FALSE= + fi + +- +- +-if test x"$INCLUDE_icns" = xyes; then ++ if test x"$INCLUDE_icns" = xyes; then + INCLUDE_ICNS_TRUE= + INCLUDE_ICNS_FALSE='#' + else +@@ -29267,9 +29675,7 @@ else + INCLUDE_ICNS_FALSE= + fi + +- +- +-if test x"$INCLUDE_jasper" = xyes; then ++ if test x"$INCLUDE_jasper" = xyes; then + INCLUDE_JASPER_TRUE= + INCLUDE_JASPER_FALSE='#' + else +@@ -29279,9 +29685,7 @@ fi + + # As all GDI+ loaders are either built-in or not, arbitrarily just + # check one of the variables here +- +- +-if test x"$INCLUDE_gdip_ico" = xyes; then ++ if test x"$INCLUDE_gdip_ico" = xyes; then + INCLUDE_GDIPLUS_TRUE= + INCLUDE_GDIPLUS_FALSE='#' + else +@@ -29291,20 +29695,18 @@ fi if test x$gio_can_sniff = x; then @@ -54547,7 +60886,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29348,21 +28945,19 @@ +@@ -29348,21 +29750,19 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54573,7 +60912,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); }; }; then gio_can_sniff=yes -@@ -29371,20 +28966,19 @@ +@@ -29371,20 +29771,19 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else @@ -54598,7 +60937,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure LIBS="$gtk_save_LIBS" CFLAGS="$gtk_save_CFLAGS" fi -@@ -29392,8 +28986,8 @@ +@@ -29392,8 +29791,8 @@ fi # # Allow building some or all immodules included # @@ -54609,18 +60948,22 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Check whether --with-included_immodules was given. -@@ -29428,8 +29022,8 @@ +@@ -29428,11 +29827,9 @@ else included_immodules="$with_included_immodules" fi -{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 -$as_echo "$included_immodules" >&6; } +- +- +-if test "x$included_immodules" != x; then +{ echo "$as_me:$LINENO: result: $included_immodules" >&5 +echo "${ECHO_T}$included_immodules" >&6; } - - - if test "x$included_immodules" != x; then -@@ -29450,8 +29044,8 @@ ++ if test "x$included_immodules" != x; then + HAVE_INCLUDED_IMMMODULES_TRUE= + HAVE_INCLUDED_IMMMODULES_FALSE='#' + else +@@ -29450,8 +29847,8 @@ for immodule in $included_immodules; do if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then : else @@ -54631,7 +60974,139 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } fi -@@ -29584,10 +29178,10 @@ +@@ -29463,9 +29860,7 @@ IFS="$gtk_save_ifs" + + + +- +- +-if test x"$INCLUDE_am_et" = xyes; then ++ if test x"$INCLUDE_am_et" = xyes; then + INCLUDE_IM_AM_ET_TRUE= + INCLUDE_IM_AM_ET_FALSE='#' + else +@@ -29473,9 +29868,7 @@ else + INCLUDE_IM_AM_ET_FALSE= + fi + +- +- +-if test x"$INCLUDE_cedilla" = xyes; then ++ if test x"$INCLUDE_cedilla" = xyes; then + INCLUDE_IM_CEDILLA_TRUE= + INCLUDE_IM_CEDILLA_FALSE='#' + else +@@ -29483,9 +29876,7 @@ else + INCLUDE_IM_CEDILLA_FALSE= + fi + +- +- +-if test x"$INCLUDE_cyrillic_translit" = xyes; then ++ if test x"$INCLUDE_cyrillic_translit" = xyes; then + INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= + INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' + else +@@ -29493,9 +29884,7 @@ else + INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= + fi + +- +- +-if test x"$INCLUDE_ime" = xyes; then ++ if test x"$INCLUDE_ime" = xyes; then + INCLUDE_IM_IME_TRUE= + INCLUDE_IM_IME_FALSE='#' + else +@@ -29503,9 +29892,7 @@ else + INCLUDE_IM_IME_FALSE= + fi + +- +- +-if test x"$INCLUDE_inuktitut" = xyes; then ++ if test x"$INCLUDE_inuktitut" = xyes; then + INCLUDE_IM_INUKTITUT_TRUE= + INCLUDE_IM_INUKTITUT_FALSE='#' + else +@@ -29513,9 +29900,7 @@ else + INCLUDE_IM_INUKTITUT_FALSE= + fi + +- +- +-if test x"$INCLUDE_ipa" = xyes; then ++ if test x"$INCLUDE_ipa" = xyes; then + INCLUDE_IM_IPA_TRUE= + INCLUDE_IM_IPA_FALSE='#' + else +@@ -29523,9 +29908,7 @@ else + INCLUDE_IM_IPA_FALSE= + fi + +- +- +-if test x"$INCLUDE_multipress" = xyes; then ++ if test x"$INCLUDE_multipress" = xyes; then + INCLUDE_IM_MULTIPRESS_TRUE= + INCLUDE_IM_MULTIPRESS_FALSE='#' + else +@@ -29533,9 +29916,7 @@ else + INCLUDE_IM_MULTIPRESS_FALSE= + fi + +- +- +-if test x"$INCLUDE_thai" = xyes; then ++ if test x"$INCLUDE_thai" = xyes; then + INCLUDE_IM_THAI_TRUE= + INCLUDE_IM_THAI_FALSE='#' + else +@@ -29543,9 +29924,7 @@ else + INCLUDE_IM_THAI_FALSE= + fi + +- +- +-if test x"$INCLUDE_ti_er" = xyes; then ++ if test x"$INCLUDE_ti_er" = xyes; then + INCLUDE_IM_TI_ER_TRUE= + INCLUDE_IM_TI_ER_FALSE='#' + else +@@ -29553,9 +29932,7 @@ else + INCLUDE_IM_TI_ER_FALSE= + fi + +- +- +-if test x"$INCLUDE_ti_et" = xyes; then ++ if test x"$INCLUDE_ti_et" = xyes; then + INCLUDE_IM_TI_ET_TRUE= + INCLUDE_IM_TI_ET_FALSE='#' + else +@@ -29563,9 +29940,7 @@ else + INCLUDE_IM_TI_ET_FALSE= + fi + +- +- +-if test x"$INCLUDE_viqr" = xyes; then ++ if test x"$INCLUDE_viqr" = xyes; then + INCLUDE_IM_VIQR_TRUE= + INCLUDE_IM_VIQR_FALSE='#' + else +@@ -29573,9 +29948,7 @@ else + INCLUDE_IM_VIQR_FALSE= + fi + +- +- +-if test x"$INCLUDE_xim" = xyes; then ++ if test x"$INCLUDE_xim" = xyes; then + INCLUDE_IM_XIM_TRUE= + INCLUDE_IM_XIM_FALSE='#' + else +@@ -29584,10 +29957,10 @@ else fi @@ -54645,7 +61120,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29620,21 +29214,20 @@ +@@ -29620,21 +29993,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54670,7 +61145,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_sys_wait_h=no -@@ -29642,8 +29235,8 @@ +@@ -29642,8 +30014,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -54681,7 +61156,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test $ac_cv_header_sys_wait_h = yes; then cat >>confdefs.h <<\_ACEOF -@@ -29653,10 +29246,10 @@ +@@ -29653,10 +30025,10 @@ _ACEOF fi @@ -54695,7 +61170,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -29681,21 +29274,20 @@ +@@ -29681,21 +30053,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54720,7 +61195,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_signal=void -@@ -29703,8 +29295,8 @@ +@@ -29703,8 +30074,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -54731,7 +61206,51 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -@@ -29772,17 +29364,17 @@ +@@ -29712,9 +30083,7 @@ _ACEOF + + + +- +- +-if test "x$LIBTIFF" != x; then ++ if test "x$LIBTIFF" != x; then + HAVE_TIFF_TRUE= + HAVE_TIFF_FALSE='#' + else +@@ -29722,9 +30091,7 @@ else + HAVE_TIFF_FALSE= + fi + +- +- +-if test "x$LIBPNG" != x; then ++ if test "x$LIBPNG" != x; then + HAVE_PNG_TRUE= + HAVE_PNG_FALSE='#' + else +@@ -29732,9 +30099,7 @@ else + HAVE_PNG_FALSE= + fi + +- +- +-if test "x$LIBJPEG" != x; then ++ if test "x$LIBJPEG" != x; then + HAVE_JPEG_TRUE= + HAVE_JPEG_FALSE='#' + else +@@ -29742,9 +30107,7 @@ else + HAVE_JPEG_FALSE= + fi + +- +- +-if test "x$LIBJASPER" != x; then ++ if test "x$LIBJASPER" != x; then + HAVE_JASPER_TRUE= + HAVE_JASPER_FALSE='#' + else +@@ -29772,17 +30135,17 @@ fi # support. # if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then @@ -54756,7 +61275,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29798,33 +29390,32 @@ +@@ -29798,33 +30161,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54797,7 +61316,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29838,52 +29429,51 @@ +@@ -29838,52 +30200,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54871,7 +61390,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -29892,18 +29482,18 @@ +@@ -29892,18 +30253,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -54896,7 +61415,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_SYSTEMINFO_H 1 -@@ -29913,17 +29503,17 @@ +@@ -29913,17 +30274,17 @@ fi if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then @@ -54921,7 +61440,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29939,33 +29529,32 @@ +@@ -29939,33 +30300,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -54962,7 +61481,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -29979,52 +29568,51 @@ +@@ -29979,52 +30339,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55036,7 +61555,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -30033,18 +29621,18 @@ +@@ -30033,18 +30392,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -55061,7 +61580,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_SYSINFO_H 1 -@@ -30054,15 +29642,15 @@ +@@ -30054,15 +30413,15 @@ fi @@ -55082,7 +61601,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lmlib $LIBS" -@@ -30094,37 +29682,33 @@ +@@ -30094,37 +30453,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55128,7 +61647,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure use_mlib=yes else use_mlib=no -@@ -30138,14 +29722,14 @@ +@@ -30138,14 +30493,14 @@ _ACEOF MEDIA_LIB=-lmlib @@ -55148,7 +61667,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lmlib $LIBS" -@@ -30177,37 +29761,33 @@ +@@ -30177,37 +30532,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55194,7 +61713,29 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure use_mlib25=yes else use_mlib25=no -@@ -30248,8 +29828,8 @@ +@@ -30221,9 +30572,7 @@ _ACEOF + + fi + fi +- +- +-if test $use_mlib = yes; then ++ if test $use_mlib = yes; then + USE_MEDIALIB_TRUE= + USE_MEDIALIB_FALSE='#' + else +@@ -30231,9 +30580,7 @@ else + USE_MEDIALIB_FALSE= + fi + +- +- +-if test $use_mlib25 = yes; then ++ if test $use_mlib25 = yes; then + USE_MEDIALIB25_TRUE= + USE_MEDIALIB25_FALSE='#' + else +@@ -30248,8 +30595,8 @@ fi # # This code is partially taken from Mesa # @@ -55205,7 +61746,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case $host_cpu in i386|i486|i586|i686|i786|k6|k7) use_x86_asm=yes -@@ -30257,21 +29837,21 @@ +@@ -30257,21 +30604,21 @@ case $host_cpu in *) use_x86_asm=no esac @@ -55232,7 +61773,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); }; then use_mmx_asm=yes fi -@@ -30285,11 +29865,11 @@ +@@ -30285,17 +30632,15 @@ cat >>confdefs.h <<\_ACEOF #define USE_MMX 1 _ACEOF @@ -55248,7 +61789,25 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi fi -@@ -30324,10 +29904,10 @@ +- +- +-if test x$use_mmx_asm = xyes; then ++ if test x$use_mmx_asm = xyes; then + USE_MMX_TRUE= + USE_MMX_FALSE='#' + else +@@ -30310,9 +30655,7 @@ if test -z "$LIBPNG" && test x"$os_win32 + fi + + +- +- +-if test $cross_compiling = yes; then ++ if test $cross_compiling = yes; then + CROSS_COMPILING_TRUE= + CROSS_COMPILING_FALSE='#' + else +@@ -30324,10 +30667,10 @@ fi if test $cross_compiling = yes; then # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. set dummy gdk-pixbuf-csource; ac_word=$2 @@ -55262,7 +61821,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $GDK_PIXBUF_CSOURCE in [\\/]* | ?:[\\/]*) -@@ -30342,7 +29922,7 @@ +@@ -30342,7 +30685,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -55271,7 +61830,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -30355,20 +29935,20 @@ +@@ -30355,20 +30698,20 @@ esac fi GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE if test -n "$GDK_PIXBUF_CSOURCE"; then @@ -55299,7 +61858,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $GTK_UPDATE_ICON_CACHE in [\\/]* | ?:[\\/]*) -@@ -30383,7 +29963,7 @@ +@@ -30383,7 +30726,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -55308,7 +61867,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -30396,11 +29976,11 @@ +@@ -30396,11 +30739,11 @@ esac fi GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE if test -n "$GTK_UPDATE_ICON_CACHE"; then @@ -55324,7 +61883,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -30411,11 +29991,11 @@ +@@ -30411,11 +30754,11 @@ fi if test ! -f $srcdir/gtk/gtkbuiltincache.h && test "x$REBUILD_PNGS" = "x#" ; then @@ -55338,7 +61897,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** gtkbuiltincache.h is not in the tree, and cannot be built *** because you don't have libpng, or (when cross-compiling) you *** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} -@@ -30452,9 +30032,9 @@ +@@ -30452,9 +30795,9 @@ if test "x$gdktarget" = "xx11"; then # settings. # if $PKG_CONFIG --exists fontconfig; then : ; else @@ -55350,7 +61909,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} { (exit 1); exit 1; }; } fi -@@ -30482,8 +30062,8 @@ +@@ -30482,8 +30825,8 @@ $as_echo "$as_me: error: GTK_PACKAGES_FOR_X="x11" else have_base_x_pc=false @@ -55361,7 +61920,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Check whether --with-x was given. -@@ -30497,11 +30077,11 @@ +@@ -30497,11 +30840,11 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( @@ -55376,7 +61935,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -@@ -30522,7 +30102,7 @@ +@@ -30522,7 +30865,7 @@ _ACEOF eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. @@ -55385,7 +61944,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break -@@ -30536,7 +30116,7 @@ +@@ -30536,7 +30879,7 @@ _ACEOF *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -55394,7 +61953,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi -@@ -30597,14 +30177,13 @@ +@@ -30597,14 +30940,13 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55411,7 +61970,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err -@@ -30612,7 +30191,7 @@ +@@ -30612,7 +30954,7 @@ $as_echo "$ac_try_echo") >&5 # We can compile using X headers with no special include directory. ac_x_includes= else @@ -55420,7 +61979,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do -@@ -30653,33 +30232,30 @@ +@@ -30653,33 +30995,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55461,7 +62020,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 -@@ -30688,7 +30264,6 @@ +@@ -30688,7 +31027,6 @@ do done fi @@ -55469,7 +62028,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -@@ -30711,8 +30286,8 @@ +@@ -30711,8 +31049,8 @@ fi fi # $with_x != no if test "$have_x" != yes; then @@ -55480,7 +62039,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure no_x=yes else # If each of the values was on the command line, it overrides each guess. -@@ -30722,8 +30297,8 @@ +@@ -30722,8 +31060,8 @@ else ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" @@ -55491,7 +62050,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi if test "$no_x" = yes; then -@@ -30744,8 +30319,8 @@ +@@ -30744,8 +31082,8 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . @@ -55502,7 +62061,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes -@@ -30770,26 +30345,23 @@ +@@ -30770,26 +31108,23 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55536,7 +62095,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 LIBS="$ac_xsave_LIBS -R $x_libraries" -@@ -30814,38 +30386,33 @@ +@@ -30814,38 +31149,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55584,7 +62143,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure 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 -@@ -30891,30 +30458,27 @@ +@@ -30891,30 +31221,27 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55623,7 +62182,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -@@ -30946,45 +30510,41 @@ +@@ -30946,45 +31273,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55680,7 +62239,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -@@ -31016,44 +30576,39 @@ +@@ -31016,44 +31339,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55733,7 +62292,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" -@@ -31066,10 +30621,10 @@ +@@ -31066,10 +31384,10 @@ rm -f core conftest.err conftest.$ac_obj # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. @@ -55747,7 +62306,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31122,41 +30677,37 @@ +@@ -31122,41 +31440,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55799,7 +62358,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -@@ -31188,45 +30739,41 @@ +@@ -31188,45 +31502,41 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55856,7 +62415,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" -@@ -31258,37 +30805,33 @@ +@@ -31258,37 +31568,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55902,7 +62461,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi -@@ -31302,10 +30845,10 @@ +@@ -31302,10 +31608,10 @@ fi # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. @@ -55916,7 +62475,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31358,41 +30901,37 @@ +@@ -31358,41 +31664,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -55968,7 +62527,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -@@ -31424,47 +30963,43 @@ +@@ -31424,47 +31726,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56027,7 +62586,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31517,41 +31052,37 @@ +@@ -31517,41 +31815,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56079,7 +62638,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -@@ -31583,47 +31114,43 @@ +@@ -31583,47 +31877,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56138,7 +62697,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31676,41 +31203,37 @@ +@@ -31676,41 +31966,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56190,7 +62749,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -@@ -31742,37 +31265,33 @@ +@@ -31742,37 +32028,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56236,7 +62795,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi -@@ -31788,10 +31307,10 @@ +@@ -31788,10 +32070,10 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry @@ -56250,7 +62809,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -@@ -31823,37 +31342,33 @@ +@@ -31823,37 +32105,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56296,7 +62855,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi -@@ -31862,8 +31377,8 @@ +@@ -31862,8 +32140,8 @@ fi fi if test x$no_x = xyes ; then @@ -56307,7 +62866,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } fi -@@ -31887,10 +31402,10 @@ +@@ -31887,10 +32165,10 @@ $as_echo "$as_me: error: X development l # Sanity check for the X11 and Xext libraries. While everything we need from # Xext is optional, the chances a system has *none* of these things is so # small that we just unconditionally require it. @@ -56321,7 +62880,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -31943,47 +31458,43 @@ +@@ -31943,47 +32221,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56382,7 +62941,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32036,47 +31547,43 @@ +@@ -32036,47 +32310,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56443,7 +63002,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32129,48 +31636,44 @@ +@@ -32129,48 +32399,44 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56504,7 +63063,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -32192,22 +31695,21 @@ +@@ -32192,22 +32458,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56532,7 +63091,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -@@ -32232,33 +31734,32 @@ +@@ -32232,33 +32497,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56575,7 +63134,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } fi -@@ -32273,11 +31774,11 @@ +@@ -32273,11 +32537,11 @@ rm -f core conftest.err conftest.$ac_obj for ac_func in XConvertCase XInternAtoms do @@ -56591,7 +63150,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32330,42 +31831,35 @@ +@@ -32330,42 +32594,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56644,7 +63203,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -32378,10 +31872,10 @@ +@@ -32378,10 +32635,10 @@ done # for clarity have_x11r6=false @@ -56658,7 +63217,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32434,36 +31928,32 @@ +@@ -32434,36 +32691,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56703,7 +63262,18 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure have_x11r6=true fi -@@ -32489,18 +31979,18 @@ +@@ -32475,9 +32728,7 @@ cat >>confdefs.h <<\_ACEOF + _ACEOF + + fi +- +- +-if $have_x11r6; then ++ if $have_x11r6; then + HAVE_X11R6_TRUE= + HAVE_X11R6_FALSE='#' + else +@@ -32489,18 +32740,18 @@ fi # Check for XKB support. if test "x$enable_xkb" = "xyes"; then @@ -56727,7 +63297,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32553,36 +32043,32 @@ +@@ -32553,36 +32804,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56772,7 +63342,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >>confdefs.h <<\_ACEOF #define HAVE_XKB 1 -@@ -32591,16 +32077,16 @@ +@@ -32591,16 +32838,16 @@ _ACEOF fi else @@ -56794,7 +63364,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32653,36 +32139,32 @@ +@@ -32653,36 +32900,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56839,7 +63409,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >>confdefs.h <<\_ACEOF #define HAVE_SHAPE_EXT 1 -@@ -32695,10 +32177,10 @@ +@@ -32695,10 +32938,10 @@ fi gtk_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $x_cflags" @@ -56853,7 +63423,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32751,40 +32233,36 @@ +@@ -32751,40 +32994,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56905,7 +63475,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32802,21 +32280,20 @@ +@@ -32802,21 +33041,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -56930,7 +63500,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_X11_extensions_sync_h=no -@@ -32824,9 +32301,9 @@ +@@ -32824,9 +33062,9 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -56943,7 +63513,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >>confdefs.h <<\_ACEOF #define HAVE_XSYNC 1 -@@ -32846,10 +32323,10 @@ +@@ -32846,10 +33084,10 @@ fi if test "x$enable_shm" = "xyes"; then # Check for the XShm extension, normally in Xext @@ -56957,7 +63527,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -32902,43 +32379,39 @@ +@@ -32902,43 +33140,39 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57012,7 +63582,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lXextSam $LIBS" -@@ -32970,37 +32443,33 @@ +@@ -32970,37 +33204,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57058,7 +63628,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case "$x_extra_libs " in *-lXextSam[\ \ ]*) ;; *) x_extra_libs="-lXextSam $x_extra_libs" ;; -@@ -33015,17 +32484,17 @@ +@@ -33015,17 +33245,17 @@ fi if test "x$enable_shm" = "xyes"; then # Check for shared memory if test "${ac_cv_header_sys_ipc_h+set}" = set; then @@ -57083,7 +63653,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33041,33 +32510,32 @@ +@@ -33041,33 +33271,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57124,7 +63694,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33081,52 +32549,51 @@ +@@ -33081,52 +33310,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57198,7 +63768,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -33135,18 +32602,18 @@ +@@ -33135,18 +33363,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -57223,7 +63793,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >>confdefs.h <<\_ACEOF #define HAVE_IPC_H 1 -@@ -33158,17 +32625,17 @@ +@@ -33158,17 +33386,17 @@ fi if test "${ac_cv_header_sys_shm_h+set}" = set; then @@ -57248,7 +63818,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33184,33 +32651,32 @@ +@@ -33184,33 +33412,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57289,7 +63859,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -33224,52 +32690,51 @@ +@@ -33224,52 +33451,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57363,7 +63933,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -33278,18 +32743,18 @@ +@@ -33278,18 +33504,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -57388,7 +63958,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >>confdefs.h <<\_ACEOF #define HAVE_SHM_H 1 -@@ -33303,8 +32768,8 @@ +@@ -33303,8 +33529,8 @@ fi # Check for the X shared memory extension header file have_xshm=no @@ -57399,7 +63969,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test "x$no_xext_lib" = "xyes"; then : else -@@ -33339,21 +32804,20 @@ +@@ -33339,21 +33565,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57424,7 +63994,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -33362,8 +32826,8 @@ +@@ -33362,8 +33587,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$gtk_save_CFLAGS" fi @@ -57435,7 +64005,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test $have_xshm = yes ; then cat >>confdefs.h <<\_ACEOF -@@ -33381,14 +32845,14 @@ +@@ -33381,14 +33606,14 @@ _ACEOF case "$host" in *-*-solaris*) # Check for solaris @@ -57455,7 +64025,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -33441,40 +32905,36 @@ +@@ -33441,40 +33666,36 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57507,7 +64077,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -33492,21 +32952,20 @@ +@@ -33492,21 +33713,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57532,7 +64102,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_X11_extensions_xinerama_h=no -@@ -33514,9 +32973,9 @@ +@@ -33514,9 +33734,9 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -57545,7 +64115,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure have_solaris_xinerama=true else : -@@ -33537,27 +32996,27 @@ +@@ -33537,27 +33757,27 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_XINERAMA 1 _ACEOF @@ -57582,7 +64152,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_check_lib_save_LIBS=$LIBS LIBS="-lXinerama $LIBS" -@@ -33589,41 +33048,37 @@ +@@ -33589,41 +33809,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57635,7 +64205,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -33641,21 +33096,20 @@ +@@ -33641,21 +33857,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57660,7 +64230,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_X11_extensions_Xinerama_h=no -@@ -33663,9 +33117,9 @@ +@@ -33663,9 +33878,9 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -57673,7 +64243,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case "$x_extra_libs " in *-lXinerama[\ \ ]*) ;; *) x_extra_libs="-lXinerama $x_extra_libs" ;; -@@ -33692,11 +33146,11 @@ +@@ -33692,11 +33907,11 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_XINERAMA 1 _ACEOF @@ -57689,7 +64259,106 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi ;; esac -@@ -33913,22 +33367,32 @@ +@@ -33728,9 +33943,7 @@ _ACEOF + + fi + +- +- +-if test x$with_xinput = xxfree || test x$with_xinput = xyes; then ++ if test x$with_xinput = xxfree || test x$with_xinput = xyes; then + XINPUT_XFREE_TRUE= + XINPUT_XFREE_FALSE='#' + else +@@ -33810,9 +34023,7 @@ _ACEOF + CPPFLAGS="$gtk_save_cppflags" + LIBS="$gtk_save_libs" + +- +- +-if true; then ++ if true; then + USE_X11_TRUE= + USE_X11_FALSE='#' + else +@@ -33821,9 +34032,7 @@ else + fi + + else +- +- +-if false; then ++ if false; then + XINPUT_XFREE_TRUE= + XINPUT_XFREE_FALSE='#' + else +@@ -33831,9 +34040,7 @@ else + XINPUT_XFREE_FALSE= + fi + +- +- +-if false; then ++ if false; then + USE_X11_TRUE= + USE_X11_FALSE='#' + else +@@ -33841,9 +34048,7 @@ else + USE_X11_FALSE= + fi + +- +- +-if false; then ++ if false; then + HAVE_X11R6_TRUE= + HAVE_X11R6_FALSE='#' + else +@@ -33855,9 +34060,7 @@ fi + + if test "x$gdktarget" = "xwin32"; then + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" +- +- +-if true; then ++ if true; then + USE_WIN32_TRUE= + USE_WIN32_FALSE='#' + else +@@ -33866,9 +34069,7 @@ else + fi + + else +- +- +-if false; then ++ if false; then + USE_WIN32_TRUE= + USE_WIN32_FALSE='#' + else +@@ -33880,9 +34081,7 @@ fi + + if test "x$gdktarget" = "xquartz"; then + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" +- +- +-if true; then ++ if true; then + USE_QUARTZ_TRUE= + USE_QUARTZ_FALSE='#' + else +@@ -33891,9 +34090,7 @@ else + fi + + else +- +- +-if false; then ++ if false; then + USE_QUARTZ_TRUE= + USE_QUARTZ_FALSE='#' + else +@@ -33913,22 +34110,22 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG if test "x$gdktarget" = "xdirectfb"; then @@ -57703,22 +64372,10 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then - { $as_echo "$as_me:$LINENO: result: found" >&5 -$as_echo "found" >&6; } -- GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" -- GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } -+ # 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" + GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" + GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" else - { { $as_echo "$as_me:$LINENO: error: + { { echo "$as_me:$LINENO: error: @@ -57731,7 +64388,29 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend *** are required. The latest version of DirectFB is always available *** from http://www.directfb.org/. -@@ -33968,20 +33432,20 @@ +@@ -33936,9 +34133,7 @@ $as_echo "$as_me: error: + { (exit 1); exit 1; }; } + fi + +- +- +-if true; then ++ if true; then + USE_DIRECTFB_TRUE= + USE_DIRECTFB_FALSE='#' + else +@@ -33947,9 +34142,7 @@ else + fi + + else +- +- +-if false; then ++ if false; then + USE_DIRECTFB_TRUE= + USE_DIRECTFB_FALSE='#' + else +@@ -33968,20 +34161,20 @@ else PANGO_PACKAGES="pango pangocairo" fi @@ -57758,7 +64437,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** Pango not found. Pango built with Cairo support is required *** to build GTK+. See http://www.pango.org for Pango information. " >&2;} -@@ -34023,36 +33487,32 @@ +@@ -34023,36 +34216,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57802,12 +64481,9 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$gtk_save_LIBS" -@@ -34061,20 +33521,21 @@ - CFLAGS="$saved_cflags" - LDFLAGS="$saved_ldflags" +@@ -34063,18 +34252,19 @@ LDFLAGS="$saved_ldflags" --GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" -+GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES gio-2.0" + GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" if test "x$gdktarget" = "xx11"; then - GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" + GDK_PRIVATE_PACKAGES="$X_PACKAGES" @@ -57829,7 +64505,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -34084,25 +33545,26 @@ +@@ -34084,25 +34274,26 @@ fi @@ -57862,7 +64538,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** Accessibility Toolkit not found. Accessibility Toolkit is required *** to build GTK+. " >&2;} -@@ -34142,36 +33604,32 @@ +@@ -34142,36 +34333,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57906,7 +64582,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$gtk_save_LIBS" -@@ -34196,7 +33654,7 @@ +@@ -34196,7 +34383,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" if test $enable_explicit_deps != yes ; then @@ -57915,7 +64591,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -34224,10 +33682,10 @@ +@@ -34224,10 +34411,10 @@ fi ######################## old_LIBS="$LIBS" @@ -57929,7 +64605,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -34265,30 +33723,26 @@ +@@ -34265,30 +34452,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -57965,7 +64641,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_gethostent+set}" = set; then -@@ -34303,18 +33757,18 @@ +@@ -34303,18 +34486,18 @@ fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi @@ -57989,7 +64665,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -34352,30 +33806,26 @@ +@@ -34352,30 +34535,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58025,7 +64701,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_setsockopt+set}" = set; then -@@ -34390,18 +33840,18 @@ +@@ -34390,18 +34569,18 @@ fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi @@ -58049,7 +64725,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF -@@ -34439,30 +33889,26 @@ +@@ -34439,30 +34618,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58085,7 +64761,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_connect+set}" = set; then -@@ -34477,8 +33923,8 @@ +@@ -34477,8 +34652,8 @@ fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi @@ -58096,7 +64772,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_res=$ac_cv_search_connect if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -34486,10 +33932,10 @@ +@@ -34486,10 +34661,10 @@ if test "$ac_res" != no; then fi @@ -58110,7 +64786,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -34517,21 +33963,20 @@ +@@ -34517,21 +34692,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58135,7 +64811,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -@@ -34560,21 +34005,20 @@ +@@ -34560,21 +34734,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58160,7 +64836,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_member_struct_sockaddr_un_sun_len=no -@@ -34585,9 +34029,9 @@ +@@ -34585,9 +34758,9 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -58173,7 +64849,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure struct_sockaddr_un_sun_len=true else struct_sockaddr_un_suin_len=false -@@ -34626,10 +34070,10 @@ +@@ -34626,10 +34799,10 @@ if test "x$enable_cups" = "xauto" then # Extract the first word of "cups-config", so it can be a program name with args. set dummy cups-config; ac_word=$2 @@ -58187,7 +64863,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $CUPS_CONFIG in [\\/]* | ?:[\\/]*) -@@ -34644,7 +34088,7 @@ +@@ -34644,7 +34817,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -58196,7 +64872,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -34657,11 +34101,11 @@ +@@ -34657,11 +34830,11 @@ esac fi CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG if test -n "$CUPS_CONFIG"; then @@ -58212,7 +64888,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -34688,17 +34132,17 @@ +@@ -34688,17 +34861,17 @@ _ACEOF if test "${ac_cv_header_cups_cups_h+set}" = set; then @@ -58237,7 +64913,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -34714,33 +34158,32 @@ +@@ -34714,33 +34887,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58278,7 +64954,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -34754,52 +34197,51 @@ +@@ -34754,52 +34926,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58352,7 +65028,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -34808,22 +34250,22 @@ +@@ -34808,30 +34979,28 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -58383,7 +65059,16 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } fi -@@ -34863,25 +34305,24 @@ + + fi +- +- +-if test "x$CUPS_CONFIG" != "xno"; then ++ if test "x$CUPS_CONFIG" != "xno"; then + HAVE_CUPS_TRUE= + HAVE_CUPS_FALSE='#' + else +@@ -34863,25 +35032,24 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58413,7 +65098,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed 's/^/| /' conftest.$ac_ext >&5 -@@ -34897,11 +34338,11 @@ +@@ -34897,11 +35065,11 @@ rm -f core conftest.err conftest.$ac_obj for ac_func in httpGetAuthString do @@ -58429,7 +65114,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ -@@ -34954,42 +34395,35 @@ +@@ -34954,42 +35122,35 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58482,7 +65167,18 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure _ACEOF fi -@@ -35014,17 +34448,17 @@ +@@ -34998,9 +35159,7 @@ done + LIBS="$gtk_save_libs" + + else +- +- +-if false; then ++ if false; then + HAVE_CUPS_TRUE= + HAVE_CUPS_FALSE='#' + else +@@ -35014,17 +35173,17 @@ gtk_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" if test "${ac_cv_header_cairo_pdf_h+set}" = set; then @@ -58507,7 +65203,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -35040,33 +34474,32 @@ +@@ -35040,33 +35199,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58548,7 +65244,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -35080,52 +34513,51 @@ +@@ -35080,52 +35238,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58622,7 +65318,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -35134,24 +34566,24 @@ +@@ -35134,24 +35291,24 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -58655,7 +65351,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** Can't find cairo-pdf.h. You must build Cairo with the pdf *** backend enabled." >&2;} { (exit 1); exit 1; }; } -@@ -35161,17 +34593,17 @@ +@@ -35161,17 +35318,17 @@ fi if test "$os_win32" != "yes"; then if test "${ac_cv_header_cairo_ps_h+set}" = set; then @@ -58680,7 +65376,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -35187,33 +34619,32 @@ +@@ -35187,33 +35344,32 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58721,7 +65417,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -35227,52 +34658,51 @@ +@@ -35227,52 +35383,51 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -58795,7 +65491,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ( cat <<\_ASBOX ## --------------------------------------------------------------------- ## ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -35281,24 +34711,24 @@ +@@ -35281,24 +35436,24 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -58828,7 +65524,18 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *** Can't find cairo-ps.h. You must build Cairo with the *** postscript backend enabled." >&2;} { (exit 1); exit 1; }; } -@@ -35378,32 +34808,32 @@ +@@ -35317,9 +35472,7 @@ else + enable_test_print_backend=no + fi + +- +- +-if test "x$enable_test_print_backend" != "xno"; then ++ if test "x$enable_test_print_backend" != "xno"; then + TEST_PRINT_BACKEND_TRUE= + TEST_PRINT_BACKEND_FALSE='#' + else +@@ -35378,32 +35531,32 @@ fi if test x$enable_gtk_doc = xyes; then if test -n "$PKG_CONFIG" && \ @@ -58872,7 +65579,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $GTKDOC_CHECK in [\\/]* | ?:[\\/]*) -@@ -35418,7 +34848,7 @@ +@@ -35418,7 +35571,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" @@ -58881,7 +65588,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -35430,11 +34860,11 @@ +@@ -35430,11 +35583,11 @@ esac fi GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK if test -n "$GTKDOC_CHECK"; then @@ -58897,7 +65604,29 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -35466,10 +34896,10 @@ +@@ -35442,9 +35595,7 @@ fi + done + + +- +- +-if test x$enable_gtk_doc = xyes; then ++ if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' + else +@@ -35452,9 +35603,7 @@ else + ENABLE_GTK_DOC_FALSE= + fi + +- +- +-if test -n "$LIBTOOL"; then ++ if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' + else +@@ -35466,10 +35615,10 @@ fi # Extract the first word of "db2html", so it can be a program name with args. set dummy db2html; ac_word=$2 @@ -58911,7 +65640,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else if test -n "$DB2HTML"; then ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test. -@@ -35482,7 +34912,7 @@ +@@ -35482,7 +35631,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -58920,7 +65649,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -35494,11 +34924,11 @@ +@@ -35494,17 +35643,15 @@ fi fi DB2HTML=$ac_cv_prog_DB2HTML if test -n "$DB2HTML"; then @@ -58936,7 +65665,14 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -35524,10 +34954,10 @@ +- +- +-if $DB2HTML; then ++ if $DB2HTML; then + HAVE_DOCBOOK_TRUE= + HAVE_DOCBOOK_FALSE='#' + else +@@ -35524,10 +35671,10 @@ fi if test "${enable_man}" != no; then # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 @@ -58950,7 +65686,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $XSLTPROC in [\\/]* | ?:[\\/]*) -@@ -35542,7 +34972,7 @@ +@@ -35542,7 +35689,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -58959,7 +65695,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -35554,11 +34984,11 @@ +@@ -35554,11 +35701,11 @@ esac fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then @@ -58975,7 +65711,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -35579,24 +35009,24 @@ +@@ -35579,24 +35726,24 @@ fi jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" @@ -59009,7 +65745,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else case $XMLCATALOG in [\\/]* | ?:[\\/]*) -@@ -35611,7 +35041,7 @@ +@@ -35611,7 +35758,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" @@ -59018,7 +65754,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure break 2 fi done -@@ -35624,11 +35054,11 @@ +@@ -35624,11 +35771,11 @@ esac fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then @@ -59034,7 +65770,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi -@@ -35643,36 +35073,36 @@ +@@ -35643,44 +35790,42 @@ fi fi @@ -59087,7 +65823,16 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure enable_man=no fi -@@ -35727,12 +35157,11 @@ + fi + +- +- +-if test x$enable_man != xno; then ++ if test x$enable_man != xno; then + ENABLE_MAN_TRUE= + ENABLE_MAN_FALSE='#' + else +@@ -35727,12 +35872,11 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -59102,7 +65847,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *) $as_unset $ac_var ;; esac ;; esac -@@ -35765,12 +35194,12 @@ +@@ -35765,12 +35909,12 @@ $as_echo "$as_me: WARNING: cache variabl if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -59119,7 +65864,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi fi rm -f confcache -@@ -35786,7 +35215,7 @@ +@@ -35786,7 +35930,7 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -59128,7 +65873,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -@@ -35798,510 +35227,516 @@ +@@ -35798,510 +35942,530 @@ LTLIBOBJS=$ac_ltlibobjs if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -59177,9 +65922,16 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. + { { echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. -+echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. ++echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -59231,9 +65983,16 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. + { { echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. -+echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. ++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -59791,7 +66550,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -36314,7 +35749,7 @@ +@@ -36314,7 +36478,7 @@ ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF @@ -59800,7 +66559,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -@@ -36324,7 +35759,7 @@ +@@ -36324,7 +36488,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -59809,7 +66568,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -@@ -36346,45 +35781,17 @@ +@@ -36346,45 +36510,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits @@ -59864,7 +66623,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure fi # Support unset when possible. -@@ -36400,6 +35807,8 @@ +@@ -36400,6 +36536,8 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) @@ -59873,7 +66632,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -@@ -36422,7 +35831,7 @@ +@@ -36422,7 +36560,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then @@ -59882,7 +66641,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; } fi -@@ -36435,10 +35844,17 @@ +@@ -36435,10 +36573,17 @@ PS2='> ' PS4='+ ' # NLS nuisances. @@ -59904,7 +66663,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -36460,7 +35876,7 @@ +@@ -36460,7 +36605,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || @@ -59913,7 +66672,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q -@@ -36511,7 +35927,7 @@ +@@ -36511,7 +36656,7 @@ $as_unset CDPATH s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || @@ -59922,7 +66681,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems -@@ -36539,6 +35955,7 @@ +@@ -36539,6 +36684,7 @@ case `echo -n x` in *) ECHO_N='-n';; esac @@ -59930,7 +66689,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -36551,22 +35968,19 @@ +@@ -36551,22 +36697,19 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir @@ -59964,7 +66723,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure else as_ln_s='cp -p' fi -@@ -36591,10 +36005,10 @@ +@@ -36591,10 +36734,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then @@ -59977,7 +66736,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi -@@ -36617,7 +36031,7 @@ +@@ -36617,7 +36760,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by gtk+ $as_me 2.14.4, which was @@ -59986,7 +66745,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -36630,16 +36044,7 @@ +@@ -36630,16 +36773,7 @@ on `(hostname || uname -n) 2>/dev/null | _ACEOF @@ -60004,7 +66763,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" -@@ -36647,23 +36052,22 @@ +@@ -36647,23 +36781,22 @@ config_commands="$ac_config_commands" _ACEOF @@ -60035,7 +66794,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure Configuration files: $config_files -@@ -36677,25 +36081,24 @@ +@@ -36677,25 +36810,25 @@ $config_commands Report bugs to ." _ACEOF @@ -60058,6 +66817,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure INSTALL='$INSTALL' -AWK='$AWK' -test -n "\$AWK" || AWK=awk ++MKDIR_P='$MKDIR_P' _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -60068,7 +66828,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_need_defaults=: while test $# != 0 do -@@ -36717,36 +36120,30 @@ +@@ -36717,36 +36850,30 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) @@ -60111,7 +66871,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; -@@ -36765,29 +36162,27 @@ +@@ -36765,29 +36892,27 @@ if $ac_cs_silent; then fi _ACEOF @@ -60148,7 +66908,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # # INIT-COMMANDS # -@@ -36829,7 +36224,7 @@ +@@ -36829,7 +36954,7 @@ fi _ACEOF @@ -60157,7 +66917,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # Handling of arguments. for ac_config_target in $ac_config_targets -@@ -36910,8 +36305,8 @@ +@@ -36910,8 +37035,8 @@ do "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; @@ -60168,7 +66928,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; };; esac done -@@ -36952,144 +36347,529 @@ +@@ -36952,144 +37077,536 @@ $debug || (umask 077 && mkdir "$tmp") } || { @@ -60189,7 +66949,6 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure if test -n "$CONFIG_FILES"; then +_ACEOF -+ -ac_cr=' ' -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` @@ -60198,6 +66957,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure -else - ac_cs_awk_cr=$ac_cr + ++ +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF @@ -60241,6 +67001,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim ++am__isrc!$am__isrc$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim @@ -60249,13 +67010,16 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim -+AMTAR!$AMTAR$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim ++mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim ++AMTAR!$AMTAR$ac_delim ++am__tar!$am__tar$ac_delim ++am__untar!$am__untar$ac_delim +GTK_MAJOR_VERSION!$GTK_MAJOR_VERSION$ac_delim +GTK_MINOR_VERSION!$GTK_MINOR_VERSION$ac_delim +GTK_MICRO_VERSION!$GTK_MICRO_VERSION$ac_delim @@ -60294,10 +67058,6 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim -+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -+CCDEPMODE!$CCDEPMODE$ac_delim -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -60353,6 +67113,10 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + cat >conf$$subs.sed <<_ACEOF ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim ++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim +ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim +CXX!$CXX$ac_delim @@ -60385,6 +67149,9 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +LIBTOOL!$LIBTOOL$ac_delim +CCAS!$CCAS$ac_delim +CCASFLAGS!$CCASFLAGS$ac_delim ++CCASDEPMODE!$CCASDEPMODE$ac_delim ++am__fastdepCCAS_TRUE!$am__fastdepCCAS_TRUE$ac_delim ++am__fastdepCCAS_FALSE!$am__fastdepCCAS_FALSE$ac_delim +NM!$NM$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim @@ -60443,13 +67210,6 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +LIBJASPER!$LIBJASPER$ac_delim +BUILD_DYNAMIC_MODULES_TRUE!$BUILD_DYNAMIC_MODULES_TRUE$ac_delim +BUILD_DYNAMIC_MODULES_FALSE!$BUILD_DYNAMIC_MODULES_FALSE$ac_delim -+INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim -+INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim -+INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim -+INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim -+INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim -+INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim -+INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim +_ACEOF - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` @@ -60566,6 +67326,13 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim ++INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim ++INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim ++INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim ++INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim ++INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim ++INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim +INCLUDE_WBMP_FALSE!$INCLUDE_WBMP_FALSE$ac_delim +INCLUDE_GIF_TRUE!$INCLUDE_GIF_TRUE$ac_delim +INCLUDE_GIF_FALSE!$INCLUDE_GIF_FALSE$ac_delim @@ -60656,15 +67423,9 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +USE_WIN32_TRUE!$USE_WIN32_TRUE$ac_delim +USE_WIN32_FALSE!$USE_WIN32_FALSE$ac_delim +USE_QUARTZ_TRUE!$USE_QUARTZ_TRUE$ac_delim -+USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim -+GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim -+GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim -+GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim -+USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim +_ACEOF -+ + +-_ACAWK + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then @@ -60681,8 +67442,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi - --_ACAWK ++ +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b @@ -60713,6 +67473,13 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim ++GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim ++GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim ++USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim +USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim +GDK_PACKAGES!$GDK_PACKAGES$ac_delim +GDK_PRIVATE_PACKAGES!$GDK_PRIVATE_PACKAGES$ac_delim @@ -60765,7 +67532,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -60806,7 +67573,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # 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 -@@ -37105,133 +36885,19 @@ +@@ -37105,133 +37622,19 @@ s/^[^=]*=[ ]*$// }' fi @@ -60944,7 +67711,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -@@ -37260,38 +36926,26 @@ +@@ -37260,38 +37663,26 @@ $as_echo "$as_me: error: invalid tag $ac [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -60991,7 +67758,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure esac ;; esac -@@ -37301,7 +36955,7 @@ +@@ -37301,7 +37692,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || @@ -61000,7 +67767,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37327,7 +36981,7 @@ +@@ -37327,7 +37718,7 @@ $as_echo X"$ac_file" | as_dirs= while :; do case $as_dir in #( @@ -61009,7 +67776,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" -@@ -37336,7 +36990,7 @@ +@@ -37336,7 +37727,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || @@ -61018,7 +67785,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37357,17 +37011,17 @@ +@@ -37357,17 +37748,17 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -61040,8 +67807,15 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -37407,13 +37061,12 @@ +@@ -37405,15 +37796,19 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -61056,7 +67830,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure p q } -@@ -37422,14 +37075,13 @@ +@@ -37422,14 +37817,13 @@ ac_sed_dataroot=' /@infodir@/p /@localedir@/p /@mandir@/p @@ -61075,7 +67849,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g -@@ -37443,16 +37095,15 @@ +@@ -37443,16 +37837,15 @@ _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? @@ -61096,9 +67870,11 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t -@@ -37462,74 +37113,135 @@ +@@ -37461,75 +37854,138 @@ s&@builddir@&$ac_builddir&;t t + s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t ++s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ @@ -61248,11 +68024,12 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure -# Compute "$ac_file"'s index in $config_headers. + rm -f "$tmp/out12" +# Compute $ac_file's index in $config_headers. ++_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - "$ac_file" | "$ac_file":* ) -+ $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; @@ -61264,16 +68041,16 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | -+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X$ac_file : 'X\(//\)[^/]' \| \ -+ X$ac_file : 'X\(//\)$' \| \ -+ X$ac_file : 'X\(/\)' \| . 2>/dev/null || -+echo X$ac_file | ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37549,8 +37261,8 @@ +@@ -37549,8 +38005,8 @@ $as_echo X"$ac_file" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -61284,7 +68061,17 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure ;; esac -@@ -37571,7 +37283,7 @@ +@@ -37564,14 +38020,15 @@ $as_echo "$as_me: executing $ac_file com + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || @@ -61293,7 +68080,48 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37621,7 +37333,7 @@ +@@ -37592,27 +38049,21 @@ $as_echo X"$mf" | + else + continue + fi +- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue +- # Extract the definition of DEP_FILES from the Makefile without +- # running `make'. +- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n -e '/^U = / s///p' < "$mf"` +- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" +- # We invoke sed twice because it is the simplest approach to +- # changing $(DEPDIR) to its actual value in the expansion. +- for file in `sed -n -e ' +- /^DEP_FILES = .*\\\\$/ { +- s/^DEP_FILES = // +- :loop +- s/\\\\$// +- p +- n +- /\\\\$/ b loop +- p +- } +- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue +@@ -37621,7 +38072,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || @@ -61302,7 +68130,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37647,7 +37359,7 @@ +@@ -37647,7 +38098,7 @@ $as_echo X"$file" | as_dirs= while :; do case $as_dir in #( @@ -61311,7 +68139,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" -@@ -37656,7 +37368,7 @@ +@@ -37656,7 +38107,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || @@ -61320,7 +68148,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37677,8 +37389,8 @@ +@@ -37677,8 +38128,8 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" @@ -61331,7 +68159,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" -@@ -37733,8 +37445,8 @@ +@@ -37733,8 +38184,8 @@ _______EOF if cmp -s $outfile gdk/gdkconfig.h; then @@ -61342,7 +68170,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure rm -f $outfile else mv $outfile gdk/gdkconfig.h -@@ -37750,11 +37462,6 @@ +@@ -37750,11 +38201,6 @@ _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save @@ -61354,7 +68182,7 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. -@@ -37776,10 +37483,6 @@ +@@ -37776,10 +38222,6 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi @@ -61365,19 +68193,154 @@ diff -urN gtk+2.0-2.14.4.old/configure gtk+2.0-2.14.4/configure echo "configuration: -diff -urN gtk+2.0-2.14.4.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in ---- gtk+2.0-2.14.4.old/contrib/gdk-pixbuf-xlib/Makefile.in 2008-10-17 01:07:13.000000000 -0300 -+++ gtk+2.0-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in 2008-11-04 15:37:04.000000000 -0200 -@@ -94,6 +94,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@ +Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2008-10-17 06:07:13.000000000 +0200 ++++ gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in 2008-11-11 18:55:59.872634930 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,13 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +34,65 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(libgdk_pixbuf_xlibinclude_HEADERS) \ ++ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/gdk-pixbuf-xlib-2.0.pc.in \ ++ $(top_srcdir)/Makefile.decl ChangeLog ++subdir = contrib/gdk-pixbuf-xlib ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = gdk-pixbuf-xlib-2.0.pc ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ ++ "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++libgdk_pixbuf_xlib_2_0_la_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(am__DEPENDENCIES_1) ++am_libgdk_pixbuf_xlib_2_0_la_OBJECTS = gdk-pixbuf-xlib.lo \ ++ gdk-pixbuf-xlib-render.lo gdk-pixbuf-xlib-drawable.lo \ ++ gdk-pixbuf-xlibrgb.lo ++libgdk_pixbuf_xlib_2_0_la_OBJECTS = \ ++ $(am_libgdk_pixbuf_xlib_2_0_la_OBJECTS) ++libgdk_pixbuf_xlib_2_0_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libgdk_pixbuf_xlib_2_0_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgdk_pixbuf_xlib_2_0_la_SOURCES) ++DIST_SOURCES = $(libgdk_pixbuf_xlib_2_0_la_SOURCES) ++pkgconfigDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(pkgconfig_DATA) ++libgdk_pixbuf_xlibincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgdk_pixbuf_xlibinclude_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +103,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +128,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +135,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +161,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61385,19 +68348,814 @@ diff -urN gtk+2.0-2.14.4.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.4/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/contrib/Makefile.in gtk+2.0-2.14.4/contrib/Makefile.in ---- gtk+2.0-2.14.4.old/contrib/Makefile.in 2008-10-17 01:07:13.000000000 -0300 -+++ gtk+2.0-2.14.4/contrib/Makefile.in 2008-11-04 15:37:04.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@ +@@ -138,8 +180,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +190,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +219,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +238,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +249,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +261,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +302,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +311,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,29 +346,23 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined +- + lib_LTLIBRARIES = libgdk_pixbuf_xlib-2.0.la +- + INCLUDES = \ + -I$(top_srcdir) -I$(top_builddir) \ + -I$(top_srcdir)/gdk-pixbuf \ + -I$(top_srcdir)/contrib \ + $(GDK_PIXBUF_XLIB_DEP_CFLAGS) + +- + libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \ + -export-dynamic \ + $(no_undefined) \ + -version-info $(LT_VERSION_INFO) + +- + libgdk_pixbuf_xlib_2_0_la_LIBADD = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(GDK_PIXBUF_XLIB_DEP_LIBS) + +- + libgdk_pixbuf_xlib_2_0_la_SOURCES = \ + gdk-pixbuf-xlib-private.h \ + gdk-pixbuf-xlib.c \ +@@ -436,99 +370,80 @@ libgdk_pixbuf_xlib_2_0_la_SOURCES = \ + gdk-pixbuf-xlib-drawable.c \ + gdk-pixbuf-xlibrgb.c + +- + libgdk_pixbuf_xlibincludedir = $(includedir)/gtk-2.0/gdk-pixbuf-xlib +- + libgdk_pixbuf_xlibinclude_HEADERS = \ + gdk-pixbuf-xlib.h \ + gdk-pixbuf-xlibrgb.h + +- + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc +-subdir = contrib/gdk-pixbuf-xlib +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = gdk-pixbuf-xlib-2.0.pc +-LTLIBRARIES = $(lib_LTLIBRARIES) +- +-libgdk_pixbuf_xlib_2_0_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libgdk_pixbuf_xlib_2_0_la_OBJECTS = gdk-pixbuf-xlib.lo \ +- gdk-pixbuf-xlib-render.lo gdk-pixbuf-xlib-drawable.lo \ +- gdk-pixbuf-xlibrgb.lo +-libgdk_pixbuf_xlib_2_0_la_OBJECTS = \ +- $(am_libgdk_pixbuf_xlib_2_0_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk-pixbuf-xlib-drawable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-xlib-render.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-xlib.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-xlibrgb.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libgdk_pixbuf_xlib_2_0_la_SOURCES) +-DATA = $(pkgconfig_DATA) +- +-HEADERS = $(libgdk_pixbuf_xlibinclude_HEADERS) +- +-DIST_COMMON = $(libgdk_pixbuf_xlibinclude_HEADERS) \ +- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog \ +- Makefile.am gdk-pixbuf-xlib-2.0.pc.in +-SOURCES = $(libgdk_pixbuf_xlib_2_0_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/gdk-pixbuf-xlib/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu contrib/gdk-pixbuf-xlib/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-gdk-pixbuf-xlib-2.0.pc: $(top_builddir)/config.status gdk-pixbuf-xlib-2.0.pc.in ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++gdk-pixbuf-xlib-2.0.pc: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-xlib-2.0.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-libLTLIBRARIES_INSTALL = $(INSTALL) + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libdir) ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgdk_pixbuf_xlib-2.0.la: $(libgdk_pixbuf_xlib_2_0_la_OBJECTS) $(libgdk_pixbuf_xlib_2_0_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libgdk_pixbuf_xlib_2_0_la_LDFLAGS) $(libgdk_pixbuf_xlib_2_0_la_OBJECTS) $(libgdk_pixbuf_xlib_2_0_la_LIBADD) $(LIBS) ++ $(libgdk_pixbuf_xlib_2_0_la_LINK) -rpath $(libdir) $(libgdk_pixbuf_xlib_2_0_la_OBJECTS) $(libgdk_pixbuf_xlib_2_0_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -539,100 +454,75 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdk-pixbuf-xlibrgb.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-pkgconfigDATA_INSTALL = $(INSTALL_DATA) + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ++ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ +- $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ ++ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + + uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ +- rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done +-libgdk_pixbuf_xlibincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgdk_pixbuf_xlibincludeHEADERS: $(libgdk_pixbuf_xlibinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgdk_pixbuf_xlibincludedir) ++ test -z "$(libgdk_pixbuf_xlibincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)" + @list='$(libgdk_pixbuf_xlibinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgdk_pixbuf_xlibincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f"; \ +- $(libgdk_pixbuf_xlibincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgdk_pixbuf_xlibincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f'"; \ ++ $(libgdk_pixbuf_xlibincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f"; \ + done + + uninstall-libgdk_pixbuf_xlibincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgdk_pixbuf_xlibinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)/$$f"; \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -642,23 +532,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -670,29 +560,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -707,9 +591,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libgdk_pixbuf_xlibincludedir) ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libgdk_pixbuf_xlibincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -729,7 +614,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -743,12 +628,14 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: +@@ -756,12 +643,20 @@ info-am: + install-data-am: install-libgdk_pixbuf_xlibincludeHEADERS \ + install-pkgconfigDATA + ++install-dvi: install-dvi-am ++ + install-exec-am: install-libLTLIBRARIES + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -782,23 +677,27 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ ++uninstall-am: uninstall-libLTLIBRARIES \ + uninstall-libgdk_pixbuf_xlibincludeHEADERS \ + uninstall-pkgconfigDATA + ++.MAKE: install-am install-strip ++ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libLTLIBRARIES clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am \ +- install-libLTLIBRARIES install-libgdk_pixbuf_xlibincludeHEADERS \ +- install-man install-pkgconfigDATA install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-info-am \ +- uninstall-libLTLIBRARIES \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libLTLIBRARIES \ ++ install-libgdk_pixbuf_xlibincludeHEADERS install-man \ ++ install-pdf install-pdf-am install-pkgconfigDATA install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-libLTLIBRARIES \ + uninstall-libgdk_pixbuf_xlibincludeHEADERS \ + uninstall-pkgconfigDATA + +Index: gtk+-2.14.4/contrib/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/contrib/Makefile.in 2008-10-17 06:07:13.000000000 +0200 ++++ gtk+-2.14.4/contrib/Makefile.in 2008-11-11 18:55:59.676634461 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,11 +31,36 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl + @USE_X11_TRUE@am__append_1 = gdk-pixbuf-xlib ++subdir = contrib ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = gdk-pixbuf-xlib ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -52,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -82,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -91,10 +103,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -121,6 +123,7 @@ +@@ -121,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61405,19 +69163,727 @@ diff -urN gtk+2.0-2.14.4.old/contrib/Makefile.in gtk+2.0-2.14.4/contrib/Makefile GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.4/demos/gtk-demo/Makefile.in ---- gtk+2.0-2.14.4.old/demos/gtk-demo/Makefile.in 2008-10-17 01:07:13.000000000 -0300 -+++ gtk+2.0-2.14.4/demos/gtk-demo/Makefile.in 2008-11-04 15:37:04.000000000 -0200 -@@ -94,6 +94,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@ +@@ -139,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -151,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -257,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -285,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -298,28 +217,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -328,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -366,6 +270,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -374,9 +279,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -407,31 +314,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = $(am__append_1) +-subdir = contrib +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-DIST_SUBDIRS = gdk-pixbuf-xlib + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu contrib/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo +@@ -439,10 +354,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -450,7 +361,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -462,15 +379,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -491,7 +413,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -502,35 +424,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -538,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -566,29 +483,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -601,13 +512,17 @@ distdir: $(DISTFILES) + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -618,7 +533,6 @@ check: check-recursive + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +- + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -638,7 +552,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -649,25 +563,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -686,26 +609,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ +- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/demos/gtk-demo/Makefile.in 2008-10-17 06:07:13.000000000 +0200 ++++ gtk+-2.14.4/demos/gtk-demo/Makefile.in 2008-11-11 18:56:00.205135150 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,65 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/geninclude.pl.in $(top_srcdir)/Makefile.decl ++bin_PROGRAMS = gtk-demo$(EXEEXT) ++subdir = demos/gtk-demo ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = geninclude.pl ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(democodedir)" ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++PROGRAMS = $(bin_PROGRAMS) ++am__objects_1 = appwindow.$(OBJEXT) assistant.$(OBJEXT) \ ++ builder.$(OBJEXT) button_box.$(OBJEXT) changedisplay.$(OBJEXT) \ ++ clipboard.$(OBJEXT) colorsel.$(OBJEXT) combobox.$(OBJEXT) \ ++ dialog.$(OBJEXT) drawingarea.$(OBJEXT) \ ++ editable_cells.$(OBJEXT) entry_completion.$(OBJEXT) \ ++ expander.$(OBJEXT) hypertext.$(OBJEXT) iconview.$(OBJEXT) \ ++ iconview_edit.$(OBJEXT) images.$(OBJEXT) list_store.$(OBJEXT) \ ++ menus.$(OBJEXT) panes.$(OBJEXT) pickers.$(OBJEXT) \ ++ pixbufs.$(OBJEXT) printing.$(OBJEXT) rotated_text.$(OBJEXT) \ ++ sizegroup.$(OBJEXT) stock_browser.$(OBJEXT) textview.$(OBJEXT) \ ++ textscroll.$(OBJEXT) tree_store.$(OBJEXT) ui_manager.$(OBJEXT) ++am_gtk_demo_OBJECTS = $(am__objects_1) main.$(OBJEXT) ++gtk_demo_OBJECTS = $(am_gtk_demo_OBJECTS) ++gtk_demo_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gtk_demo_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(gtk_demo_SOURCES) ++DIST_SOURCES = $(gtk_demo_SOURCES) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++democodeDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(democode_DATA) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +102,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +127,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +134,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +160,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61425,19 +69891,864 @@ diff -urN gtk+2.0-2.14.4.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.4/demos/gtk GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/demos/Makefile.in gtk+2.0-2.14.4/demos/Makefile.in ---- gtk+2.0-2.14.4.old/demos/Makefile.in 2008-10-17 01:07:13.000000000 -0300 -+++ gtk+2.0-2.14.4/demos/Makefile.in 2008-11-04 15:37:04.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@ +@@ -138,8 +179,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +189,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +218,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +237,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +248,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +260,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +301,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,17 +310,16 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- $(IMAGEFILES) \ +- demo.ui +- ++EXTRA_DIST = $(IMAGEFILES) demo.ui + TEST_PROGS = + + ### testing rules +@@ -409,9 +345,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + democodedir = $(datadir)/gtk-2.0/demo +- + demos = \ + appwindow.c \ + assistant.c \ +@@ -444,7 +378,6 @@ demos = \ + tree_store.c \ + ui_manager.c + +- + INCLUDES = \ + -DDEMOCODEDIR="\"$(democodedir)\"" \ + -I$(top_srcdir) \ +@@ -454,34 +387,26 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + DEPS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + LDADDS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- +-bin_PROGRAMS = gtk-demo +- + BUILT_SOURCES = demos.h +- + gtk_demo_SOURCES = \ + $(demos) \ + demo-common.h \ + main.c \ + demos.h + +- + gtk_demo_DEPENDENCIES = $(DEPS) + gtk_demo_LDADD = $(LDADDS) + gtk_demo_LDFLAGS = -export-dynamic +- + IMAGEFILES = alphatest.png \ + apple-red.png \ + background.jpg \ +@@ -497,93 +422,55 @@ IMAGEFILES = alphatest.png \ + gnu-keys.png \ + gtk-logo-rgb.gif + +- + democode_DATA = $(demos) $(IMAGEFILES) demo.ui +- + DISTCLEANFILES = demos.h +-subdir = demos/gtk-demo +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = geninclude.pl +-bin_PROGRAMS = gtk-demo$(EXEEXT) +-PROGRAMS = $(bin_PROGRAMS) +- +-am__objects_1 = appwindow.$(OBJEXT) assistant.$(OBJEXT) \ +- builder.$(OBJEXT) button_box.$(OBJEXT) changedisplay.$(OBJEXT) \ +- clipboard.$(OBJEXT) colorsel.$(OBJEXT) combobox.$(OBJEXT) \ +- dialog.$(OBJEXT) drawingarea.$(OBJEXT) editable_cells.$(OBJEXT) \ +- entry_completion.$(OBJEXT) expander.$(OBJEXT) \ +- hypertext.$(OBJEXT) iconview.$(OBJEXT) iconview_edit.$(OBJEXT) \ +- images.$(OBJEXT) list_store.$(OBJEXT) menus.$(OBJEXT) \ +- panes.$(OBJEXT) pickers.$(OBJEXT) pixbufs.$(OBJEXT) \ +- printing.$(OBJEXT) rotated_text.$(OBJEXT) sizegroup.$(OBJEXT) \ +- stock_browser.$(OBJEXT) textview.$(OBJEXT) textscroll.$(OBJEXT) \ +- tree_store.$(OBJEXT) ui_manager.$(OBJEXT) +-am_gtk_demo_OBJECTS = $(am__objects_1) main.$(OBJEXT) +-gtk_demo_OBJECTS = $(am_gtk_demo_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/appwindow.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/assistant.Po ./$(DEPDIR)/builder.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/button_box.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/changedisplay.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/clipboard.Po ./$(DEPDIR)/colorsel.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/combobox.Po ./$(DEPDIR)/dialog.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/drawingarea.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/editable_cells.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/entry_completion.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/expander.Po ./$(DEPDIR)/hypertext.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/iconview.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/iconview_edit.Po ./$(DEPDIR)/images.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/list_store.Po ./$(DEPDIR)/main.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/menus.Po ./$(DEPDIR)/panes.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pickers.Po ./$(DEPDIR)/pixbufs.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/printing.Po ./$(DEPDIR)/rotated_text.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/sizegroup.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/stock_browser.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/textscroll.Po ./$(DEPDIR)/textview.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/tree_store.Po ./$(DEPDIR)/ui_manager.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(gtk_demo_SOURCES) +-DATA = $(democode_DATA) +- +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am geninclude.pl.in +-SOURCES = $(gtk_demo_SOURCES) +- + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu demos/gtk-demo/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu demos/gtk-demo/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-geninclude.pl: $(top_builddir)/config.status geninclude.pl.in ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++geninclude.pl: $(top_builddir)/config.status $(srcdir)/geninclude.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(bindir) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -591,8 +478,8 @@ uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ +- rm -f $(DESTDIR)$(bindir)/$$f; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + + clean-binPROGRAMS: +@@ -603,10 +490,10 @@ clean-binPROGRAMS: + done + gtk-demo$(EXEEXT): $(gtk_demo_OBJECTS) $(gtk_demo_DEPENDENCIES) + @rm -f gtk-demo$(EXEEXT) +- $(LINK) $(gtk_demo_LDFLAGS) $(gtk_demo_OBJECTS) $(gtk_demo_LDADD) $(LIBS) ++ $(gtk_demo_LINK) $(gtk_demo_OBJECTS) $(gtk_demo_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -644,82 +531,58 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_manager.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-democodeDATA_INSTALL = $(INSTALL_DATA) + install-democodeDATA: $(democode_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(democodedir) ++ test -z "$(democodedir)" || $(MKDIR_P) "$(DESTDIR)$(democodedir)" + @list='$(democode_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(democodeDATA_INSTALL) $$d$$p $(DESTDIR)$(democodedir)/$$f"; \ +- $(democodeDATA_INSTALL) $$d$$p $(DESTDIR)$(democodedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(democodeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(democodedir)/$$f'"; \ ++ $(democodeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(democodedir)/$$f"; \ + done + + uninstall-democodeDATA: + @$(NORMAL_UNINSTALL) + @list='$(democode_DATA)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(democodedir)/$$f"; \ +- rm -f $(DESTDIR)$(democodedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(democodedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(democodedir)/$$f"; \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -729,23 +592,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -757,29 +620,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -795,9 +652,10 @@ check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(PROGRAMS) $(DATA) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(democodedir) ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(democodedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am + install-exec: install-exec-am +@@ -818,7 +676,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -833,24 +691,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-democodeDATA + ++install-dvi: install-dvi-am ++ + install-exec-am: install-binPROGRAMS + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -871,21 +739,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-democodeDATA \ +- uninstall-info-am ++uninstall-am: uninstall-binPROGRAMS uninstall-democodeDATA ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-binPROGRAMS clean-generic clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-binPROGRAMS install-data install-data-am \ +- install-democodeDATA install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-binPROGRAMS \ +- uninstall-democodeDATA uninstall-info-am ++ distclean-tags distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-binPROGRAMS install-data \ ++ install-data-am install-democodeDATA install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ ++ uninstall-binPROGRAMS uninstall-democodeDATA + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/demos/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/demos/Makefile.in 2008-10-17 06:07:13.000000000 +0200 ++++ gtk+-2.14.4/demos/Makefile.in 2008-11-11 18:56:00.044634863 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,11 +32,74 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++noinst_PROGRAMS = testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \ ++ testpixbuf-save$(EXEEXT) testpixbuf-scale$(EXEEXT) \ ++ pixbuf-demo$(EXEEXT) $(am__EXEEXT_1) ++ ++# Need to build test-inline-pixbufs.h for testpixbuf + @HAVE_PNG_TRUE@am__append_1 = testpixbuf ++subdir = demos ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++@HAVE_PNG_TRUE@am__EXEEXT_1 = testpixbuf$(EXEEXT) ++PROGRAMS = $(noinst_PROGRAMS) ++am_pixbuf_demo_OBJECTS = pixbuf-demo.$(OBJEXT) pixbuf-init.$(OBJEXT) ++pixbuf_demo_OBJECTS = $(am_pixbuf_demo_OBJECTS) ++am_testanimation_OBJECTS = testanimation.$(OBJEXT) \ ++ pixbuf-init.$(OBJEXT) ++testanimation_OBJECTS = $(am_testanimation_OBJECTS) ++am_testpixbuf_OBJECTS = testpixbuf.$(OBJEXT) pixbuf-init.$(OBJEXT) ++testpixbuf_OBJECTS = $(am_testpixbuf_OBJECTS) ++am_testpixbuf_drawable_OBJECTS = testpixbuf-drawable.$(OBJEXT) \ ++ pixbuf-init.$(OBJEXT) ++testpixbuf_drawable_OBJECTS = $(am_testpixbuf_drawable_OBJECTS) ++am_testpixbuf_save_OBJECTS = testpixbuf-save.$(OBJEXT) ++testpixbuf_save_OBJECTS = $(am_testpixbuf_save_OBJECTS) ++am_testpixbuf_scale_OBJECTS = testpixbuf-scale.$(OBJEXT) \ ++ pixbuf-init.$(OBJEXT) ++testpixbuf_scale_OBJECTS = $(am_testpixbuf_scale_OBJECTS) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(pixbuf_demo_SOURCES) $(testanimation_SOURCES) \ ++ $(testpixbuf_SOURCES) $(testpixbuf_drawable_SOURCES) \ ++ $(testpixbuf_save_SOURCES) $(testpixbuf_scale_SOURCES) ++DIST_SOURCES = $(pixbuf_demo_SOURCES) $(testanimation_SOURCES) \ ++ $(testpixbuf_SOURCES) $(testpixbuf_drawable_SOURCES) \ ++ $(testpixbuf_save_SOURCES) $(testpixbuf_scale_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -52,22 +110,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -82,8 +135,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -91,10 +142,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -121,6 +123,7 @@ +@@ -121,6 +168,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61445,19 +70756,902 @@ diff -urN gtk+2.0-2.14.4.old/demos/Makefile.in gtk+2.0-2.14.4/demos/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/docs/faq/Makefile.in gtk+2.0-2.14.4/docs/faq/Makefile.in ---- gtk+2.0-2.14.4.old/docs/faq/Makefile.in 2008-10-17 01:07:14.000000000 -0300 -+++ gtk+2.0-2.14.4/docs/faq/Makefile.in 2008-11-04 15:37:04.000000000 -0200 -@@ -94,6 +94,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@ +@@ -139,8 +187,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -151,91 +197,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -257,24 +226,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -285,8 +245,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -298,28 +256,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -328,22 +268,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -366,6 +309,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -374,24 +318,18 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- apple-red.png \ +- background.jpg \ +- gnome-applets.png \ +- gnome-calendar.png \ +- gnome-foot.png \ +- gnome-gimp.png \ +- gnome-gmush.png \ +- gnome-gsame.png \ +- gnu-keys.png +- ++EXTRA_DIST = apple-red.png background.jpg gnome-applets.png \ ++ gnome-calendar.png gnome-foot.png gnome-gimp.png \ ++ gnome-gmush.png gnome-gsame.png gnu-keys.png + TEST_PROGS = + + ### testing rules +@@ -417,9 +355,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = gtk-demo +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ +@@ -428,131 +364,74 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + DEPS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + LDADDS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- +-noinst_PROGRAMS = \ +- testpixbuf-drawable \ +- testanimation \ +- testpixbuf-save \ +- testpixbuf-scale \ +- pixbuf-demo\ +-$(am__append_1) + @HAVE_PNG_TRUE@BUILT_SOURCES = test-inline-pixbufs.h +- +-@CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE) + @CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource +-@CROSS_COMPILING_TRUE@pixbuf_csource_deps = ++@CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE) + @CROSS_COMPILING_FALSE@pixbuf_csource_deps = $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders +- ++@CROSS_COMPILING_TRUE@pixbuf_csource_deps = + testpixbuf_DEPENDENCIES = $(DEPS) + testpixbuf_drawable_DEPENDENCIES = $(DEPS) + testpixbuf_save_DEPENDENCIES = $(DEPS) + testpixbuf_scale_DEPENDENCIES = $(DEPS) + testanimation_DEPENDENCIES = $(DEPS) + pixbuf_demo_DEPENDENCIES = $(DEPS) +- + testpixbuf_LDADD = $(LDADDS) + testpixbuf_drawable_LDADD = $(LDADDS) + testpixbuf_save_LDADD = $(LDADDS) + testpixbuf_scale_LDADD = $(LDADDS) + testanimation_LDADD = $(LDADDS) + pixbuf_demo_LDADD = $(LDADDS) +- + testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c + testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c + testpixbuf_save_SOURCES = testpixbuf-save.c + testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c + testanimation_SOURCES = testanimation.c pixbuf-init.c + pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c +- + DISTCLEANFILES = test-inline-pixbufs.h +-subdir = demos +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-@HAVE_PNG_TRUE@noinst_PROGRAMS = testpixbuf-drawable$(EXEEXT) \ +-@HAVE_PNG_TRUE@ testanimation$(EXEEXT) testpixbuf-save$(EXEEXT) \ +-@HAVE_PNG_TRUE@ testpixbuf-scale$(EXEEXT) pixbuf-demo$(EXEEXT) \ +-@HAVE_PNG_TRUE@ testpixbuf$(EXEEXT) +-@HAVE_PNG_FALSE@noinst_PROGRAMS = testpixbuf-drawable$(EXEEXT) \ +-@HAVE_PNG_FALSE@ testanimation$(EXEEXT) testpixbuf-save$(EXEEXT) \ +-@HAVE_PNG_FALSE@ testpixbuf-scale$(EXEEXT) pixbuf-demo$(EXEEXT) +-PROGRAMS = $(noinst_PROGRAMS) +- +-am_pixbuf_demo_OBJECTS = pixbuf-demo.$(OBJEXT) pixbuf-init.$(OBJEXT) +-pixbuf_demo_OBJECTS = $(am_pixbuf_demo_OBJECTS) +-pixbuf_demo_LDFLAGS = +-am_testanimation_OBJECTS = testanimation.$(OBJEXT) pixbuf-init.$(OBJEXT) +-testanimation_OBJECTS = $(am_testanimation_OBJECTS) +-testanimation_LDFLAGS = +-am_testpixbuf_OBJECTS = testpixbuf.$(OBJEXT) pixbuf-init.$(OBJEXT) +-testpixbuf_OBJECTS = $(am_testpixbuf_OBJECTS) +-testpixbuf_LDFLAGS = +-am_testpixbuf_drawable_OBJECTS = testpixbuf-drawable.$(OBJEXT) \ +- pixbuf-init.$(OBJEXT) +-testpixbuf_drawable_OBJECTS = $(am_testpixbuf_drawable_OBJECTS) +-testpixbuf_drawable_LDFLAGS = +-am_testpixbuf_save_OBJECTS = testpixbuf-save.$(OBJEXT) +-testpixbuf_save_OBJECTS = $(am_testpixbuf_save_OBJECTS) +-testpixbuf_save_LDFLAGS = +-am_testpixbuf_scale_OBJECTS = testpixbuf-scale.$(OBJEXT) \ +- pixbuf-init.$(OBJEXT) +-testpixbuf_scale_OBJECTS = $(am_testpixbuf_scale_OBJECTS) +-testpixbuf_scale_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pixbuf-demo.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-init.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testanimation.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testpixbuf-drawable.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testpixbuf-save.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testpixbuf-scale.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testpixbuf.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(pixbuf_demo_SOURCES) $(testanimation_SOURCES) \ +- $(testpixbuf_SOURCES) $(testpixbuf_drawable_SOURCES) \ +- $(testpixbuf_save_SOURCES) $(testpixbuf_scale_SOURCES) +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(pixbuf_demo_SOURCES) $(testanimation_SOURCES) $(testpixbuf_SOURCES) $(testpixbuf_drawable_SOURCES) $(testpixbuf_save_SOURCES) $(testpixbuf_scale_SOURCES) +- + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu demos/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu demos/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -562,25 +441,25 @@ clean-noinstPROGRAMS: + done + pixbuf-demo$(EXEEXT): $(pixbuf_demo_OBJECTS) $(pixbuf_demo_DEPENDENCIES) + @rm -f pixbuf-demo$(EXEEXT) +- $(LINK) $(pixbuf_demo_LDFLAGS) $(pixbuf_demo_OBJECTS) $(pixbuf_demo_LDADD) $(LIBS) ++ $(LINK) $(pixbuf_demo_OBJECTS) $(pixbuf_demo_LDADD) $(LIBS) + testanimation$(EXEEXT): $(testanimation_OBJECTS) $(testanimation_DEPENDENCIES) + @rm -f testanimation$(EXEEXT) +- $(LINK) $(testanimation_LDFLAGS) $(testanimation_OBJECTS) $(testanimation_LDADD) $(LIBS) ++ $(LINK) $(testanimation_OBJECTS) $(testanimation_LDADD) $(LIBS) + testpixbuf$(EXEEXT): $(testpixbuf_OBJECTS) $(testpixbuf_DEPENDENCIES) + @rm -f testpixbuf$(EXEEXT) +- $(LINK) $(testpixbuf_LDFLAGS) $(testpixbuf_OBJECTS) $(testpixbuf_LDADD) $(LIBS) ++ $(LINK) $(testpixbuf_OBJECTS) $(testpixbuf_LDADD) $(LIBS) + testpixbuf-drawable$(EXEEXT): $(testpixbuf_drawable_OBJECTS) $(testpixbuf_drawable_DEPENDENCIES) + @rm -f testpixbuf-drawable$(EXEEXT) +- $(LINK) $(testpixbuf_drawable_LDFLAGS) $(testpixbuf_drawable_OBJECTS) $(testpixbuf_drawable_LDADD) $(LIBS) ++ $(LINK) $(testpixbuf_drawable_OBJECTS) $(testpixbuf_drawable_LDADD) $(LIBS) + testpixbuf-save$(EXEEXT): $(testpixbuf_save_OBJECTS) $(testpixbuf_save_DEPENDENCIES) + @rm -f testpixbuf-save$(EXEEXT) +- $(LINK) $(testpixbuf_save_LDFLAGS) $(testpixbuf_save_OBJECTS) $(testpixbuf_save_LDADD) $(LIBS) ++ $(LINK) $(testpixbuf_save_OBJECTS) $(testpixbuf_save_LDADD) $(LIBS) + testpixbuf-scale$(EXEEXT): $(testpixbuf_scale_OBJECTS) $(testpixbuf_scale_DEPENDENCIES) + @rm -f testpixbuf-scale$(EXEEXT) +- $(LINK) $(testpixbuf_scale_LDFLAGS) $(testpixbuf_scale_OBJECTS) $(testpixbuf_scale_LDADD) $(LIBS) ++ $(LINK) $(testpixbuf_scale_OBJECTS) $(testpixbuf_scale_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -594,37 +473,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpixbuf.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -632,10 +499,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -643,7 +506,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -655,15 +524,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -684,7 +558,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -695,35 +569,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -731,23 +600,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -759,29 +628,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -792,15 +655,19 @@ distdir: $(DISTFILES) + || 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 \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -812,7 +679,6 @@ check: $(BUILT_SOURCES) + all-am: Makefile $(PROGRAMS) + installdirs: installdirs-recursive + installdirs-am: +- + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive +@@ -833,7 +699,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -849,24 +715,34 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -887,27 +763,25 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool \ +- clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am \ +- dvi-recursive info info-am info-recursive install install-am \ +- install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ +- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ +- tags-recursive uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool clean-noinstPROGRAMS ctags ctags-recursive \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/docs/faq/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/docs/faq/Makefile.in 2008-10-17 06:07:14.000000000 +0200 ++++ gtk+-2.14.4/docs/faq/Makefile.in 2008-11-11 18:56:00.452635181 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,23 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = docs/faq ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +58,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +83,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +90,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61465,19 +71659,536 @@ diff -urN gtk+2.0-2.14.4.old/docs/faq/Makefile.in gtk+2.0-2.14.4/docs/faq/Makefi GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/docs/Makefile.in gtk+2.0-2.14.4/docs/Makefile.in ---- gtk+2.0-2.14.4.old/docs/Makefile.in 2008-10-17 01:07:13.000000000 -0300 -+++ gtk+2.0-2.14.4/docs/Makefile.in 2008-11-04 15:37:04.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +135,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +145,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +174,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +193,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +204,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +216,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +257,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,16 +266,16 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- gtk-faq.sgml +- ++EXTRA_DIST = gtk-faq.sgml + TEST_PROGS = + + ### testing rules +@@ -408,61 +301,67 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +-subdir = docs/faq +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/faq/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/faq/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + + ctags: CTAGS + CTAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -480,7 +379,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -501,7 +399,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -512,7 +410,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -524,12 +422,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -540,25 +446,27 @@ mostlyclean: mostlyclean-am + + mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +-pdf: pdf-am +- + pdf-am: + + ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am check-local clean clean-generic \ +- clean-libtool distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am ++ clean-libtool dist-hook distclean distclean-generic \ ++ distclean-libtool distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/docs/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/docs/Makefile.in 2008-10-17 06:07:13.000000000 +0200 ++++ gtk+-2.14.4/docs/Makefile.in 2008-11-11 18:56:00.332634944 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,35 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = docs ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61485,19 +72196,715 @@ diff -urN gtk+2.0-2.14.4.old/docs/Makefile.in gtk+2.0-2.14.4/docs/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.4/docs/reference/gdk/Makefile.in ---- gtk+2.0-2.14.4.old/docs/reference/gdk/Makefile.in 2008-10-17 01:07:14.000000000 -0300 -+++ gtk+2.0-2.14.4/docs/reference/gdk/Makefile.in 2008-11-04 15:37:05.000000000 -0200 -@@ -100,6 +100,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@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +216,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,30 +278,20 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- defsformat.txt \ +- developers.txt \ +- dnd_internals.txt \ +- make-todo \ +- refcounting.txt \ +- sizing-test.txt \ +- styles.txt \ +- text_widget.txt \ +- text_widget_internals.txt \ +- tree-column-sizing.txt \ +- widget_geometry.txt \ +- widget_system.txt \ +- generation.txt \ +- gtkdocs_fix \ +- RELEASE-HOWTO +- ++EXTRA_DIST = defsformat.txt developers.txt dnd_internals.txt make-todo \ ++ refcounting.txt sizing-test.txt styles.txt text_widget.txt \ ++ text_widget_internals.txt tree-column-sizing.txt \ ++ widget_geometry.txt widget_system.txt generation.txt \ ++ gtkdocs_fix RELEASE-HOWTO + TEST_PROGS = + + ### testing rules +@@ -422,31 +317,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = tutorial faq reference tools +-subdir = docs +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo +@@ -454,10 +357,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -465,7 +364,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -477,15 +382,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -506,7 +416,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -517,35 +427,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -553,23 +458,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -581,29 +486,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -614,15 +513,19 @@ distdir: $(DISTFILES) + || 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 \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -633,7 +536,6 @@ check: check-recursive + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +- + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -653,7 +555,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -664,25 +566,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -701,26 +612,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ +- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/docs/reference/gdk/Makefile.in 2008-10-17 06:07:14.000000000 +0200 ++++ gtk+-2.14.4/docs/reference/gdk/Makefile.in 2008-11-11 18:56:00.856634922 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -21,17 +21,11 @@ + #################################### + # Everything below here is generic # + #################################### +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -43,10 +37,24 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/version.xml.in $(top_srcdir)/Makefile.decl \ ++ $(top_srcdir)/gtk-doc.make ++subdir = docs/reference/gdk ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = version.xml ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -57,22 +65,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -87,8 +90,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -96,10 +97,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -126,6 +128,7 @@ +@@ -126,6 +123,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61505,19 +72912,588 @@ diff -urN gtk+2.0-2.14.4.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.4/docs/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14.4/docs/reference/gdk-pixbuf/Makefile.in ---- gtk+2.0-2.14.4.old/docs/reference/gdk-pixbuf/Makefile.in 2008-10-17 01:07:14.000000000 -0300 -+++ gtk+2.0-2.14.4/docs/reference/gdk-pixbuf/Makefile.in 2008-11-04 15:37:05.000000000 -0200 -@@ -100,6 +100,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@ +@@ -144,8 +142,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -156,91 +152,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -262,24 +181,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -290,8 +200,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -303,28 +211,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -333,22 +223,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -371,6 +264,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -379,22 +273,18 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +-# initialize variables for unconditional += appending +- + # Other files to distribute +-EXTRA_DIST = \ +- $(content_files) \ +- $(HTML_IMAGES) \ +- $(DOC_MAIN_SGML_FILE) \ +- $(DOC_MODULE)-sections.txt \ +- $(DOC_MODULE)-overrides.txt\ +-version.xml.in ++EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ ++ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ ++ version.xml.in + TEST_PROGS = + + ### testing rules +@@ -420,7 +310,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + AUTOMAKE_OPTIONS = 1.6 + + # The name of the module. +@@ -470,7 +359,6 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GDK_DEP_CFLAGS) + +- + GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib) + + # Extra options to supply to gtkdoc-mkdb +@@ -572,7 +460,6 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix + --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +- + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@@ -583,13 +470,10 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix + # searched for in VPATH/GPATH. + # + GPATH = $(srcdir) +- + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +- + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +- + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ +@@ -597,31 +481,45 @@ SCANOBJ_FILES = \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +- + REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +- + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-subdir = docs/reference/gdk +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = version.xml +-DIST_SOURCES = +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- $(top_srcdir)/gtk-doc.make Makefile.am version.xml.in + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/gdk/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/reference/gdk/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-version.xml: $(top_builddir)/config.status version.xml.in ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + + mostlyclean-libtool: +@@ -629,39 +527,29 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + + ctags: CTAGS + CTAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. $(distdir)/images +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -679,7 +567,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile all-local +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -701,7 +588,7 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -712,25 +599,34 @@ clean-am: clean-generic clean-libtool cl + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-local ++distclean-am: clean-am distclean-generic distclean-local + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-data-local + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -750,18 +646,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am all-local check check-am check-local clean \ +- clean-generic clean-libtool clean-local distclean \ +- distclean-generic distclean-libtool distclean-local distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic maintainer-clean-local mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-generic clean-libtool clean-local dist-hook distclean \ ++ distclean-generic distclean-libtool distclean-local distdir \ ++ dvi dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-local mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-local + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/docs/reference/gdk-pixbuf/Makefile.in 2008-10-17 06:07:14.000000000 +0200 ++++ gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in 2008-11-11 18:56:00.716634237 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -21,17 +21,11 @@ + #################################### + # Everything below here is generic # + #################################### +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -43,10 +37,28 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/version.xml.in $(top_srcdir)/Makefile.decl \ ++ $(top_srcdir)/gtk-doc.make ++subdir = docs/reference/gdk-pixbuf ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = version.xml ++SOURCES = ++DIST_SOURCES = ++man1dir = $(mandir)/man1 ++am__installdirs = "$(DESTDIR)$(man1dir)" ++NROFF = nroff ++MANS = $(man_MANS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -57,22 +69,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -87,8 +94,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -96,10 +101,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -126,6 +128,7 @@ +@@ -126,6 +127,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61525,19 +73501,651 @@ diff -urN gtk+2.0-2.14.4.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.4/docs/reference/gtk/Makefile.in ---- gtk+2.0-2.14.4.old/docs/reference/gtk/Makefile.in 2008-10-17 01:07:14.000000000 -0300 -+++ gtk+2.0-2.14.4/docs/reference/gtk/Makefile.in 2008-11-04 15:37:05.000000000 -0200 -@@ -103,6 +103,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@ +@@ -144,8 +146,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -156,91 +156,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -262,24 +185,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -290,8 +204,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -303,28 +215,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -333,22 +227,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -371,6 +268,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -379,28 +277,19 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +-# initialize variables for unconditional += appending +- + # Other files to distribute +-EXTRA_DIST = \ +- $(content_files) \ +- $(HTML_IMAGES) \ +- $(DOC_MAIN_SGML_FILE) \ +- $(DOC_MODULE)-sections.txt \ +- $(DOC_MODULE)-overrides.txt\ +-version.xml.in \ +- composite.png \ +- composite.dia \ +- apple-red-1a.png \ +- apple-red-2c.png \ +- gnome-gmush-1.png +- ++EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ ++ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ ++ version.xml.in composite.png composite.dia apple-red-1a.png \ ++ apple-red-2c.png gnome-gmush-1.png + TEST_PROGS = + + ### testing rules +@@ -426,7 +315,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + AUTOMAKE_OPTIONS = 1.6 + + # The name of the module. +@@ -458,7 +346,6 @@ IGNORE_HFILES = \ + xpm-color-table.h \ + test-images.h + +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +@@ -466,7 +353,6 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + GTKDOC_LIBS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ +@@ -496,7 +382,6 @@ FIXXREF_OPTIONS = --extra-dir=$(GLIB_PRE + --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +- + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@@ -507,13 +392,10 @@ FIXXREF_OPTIONS = --extra-dir=$(GLIB_PRE + # searched for in VPATH/GPATH. + # + GPATH = $(srcdir) +- + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +- + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +- + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ +@@ -521,40 +403,49 @@ SCANOBJ_FILES = \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +- + REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +- + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +- + ######################################################################## + man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 +- + BUILT_EXTRA_DIST = $(man_MANS) +-subdir = docs/reference/gdk-pixbuf +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = version.xml +-DIST_SOURCES = +- +-NROFF = nroff +-MANS = $(man_MANS) +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- $(top_srcdir)/gtk-doc.make Makefile.am version.xml.in + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/gdk-pixbuf/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/reference/gdk-pixbuf/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-version.xml: $(top_builddir)/config.status version.xml.in ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + + mostlyclean-libtool: +@@ -562,15 +453,9 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-man1dir = $(mandir)/man1 + install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(man1dir) ++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ +@@ -589,8 +474,8 @@ install-man1: $(man1_MANS) $(man_MANS) + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ +- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done + uninstall-man1: + @$(NORMAL_UNINSTALL) +@@ -610,8 +495,8 @@ uninstall-man1: + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ +- rm -f $(DESTDIR)$(man1dir)/$$inst; \ ++ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done + tags: TAGS + TAGS: +@@ -619,29 +504,23 @@ TAGS: + ctags: CTAGS + CTAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -659,9 +538,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(MANS) all-local +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(man1dir) ++ for dir in "$(DESTDIR)$(man1dir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -682,7 +562,7 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -693,25 +573,34 @@ clean-am: clean-generic clean-libtool cl + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-local ++distclean-am: clean-am distclean-generic distclean-local + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-data-local install-man + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: install-man1 + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -731,21 +620,25 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local uninstall-man ++uninstall-am: uninstall-local uninstall-man + + uninstall-man: uninstall-man1 + ++.MAKE: install-am install-strip ++ + .PHONY: all all-am all-local check check-am check-local clean \ +- clean-generic clean-libtool clean-local distclean \ +- distclean-generic distclean-libtool distclean-local distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec install-exec-am \ +- install-info install-info-am install-man install-man1 \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ ++ clean-generic clean-libtool clean-local dist-hook distclean \ ++ distclean-generic distclean-libtool distclean-local distdir \ ++ dvi dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-man1 install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am uninstall-local uninstall-man uninstall-man1 ++ uninstall-local uninstall-man uninstall-man1 + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/docs/reference/gtk/Makefile.in 2008-10-17 06:07:14.000000000 +0200 ++++ gtk+-2.14.4/docs/reference/gtk/Makefile.in 2008-11-11 18:56:01.024635254 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -21,17 +21,11 @@ + #################################### + # Everything below here is generic # + #################################### +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -43,10 +37,28 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/version.xml.in $(top_srcdir)/Makefile.decl \ ++ $(top_srcdir)/gtk-doc.make ++subdir = docs/reference/gtk ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = version.xml ++SOURCES = ++DIST_SOURCES = ++man1dir = $(mandir)/man1 ++am__installdirs = "$(DESTDIR)$(man1dir)" ++NROFF = nroff ++MANS = $(man_MANS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -57,25 +69,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ +- +-CPPFLAGS = @CPPFLAGS@ \ +- -UGTK_DISABLE_SINGLE_INCLUDES +- +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ ++CPPFLAGS = @CPPFLAGS@ -UGTK_DISABLE_SINGLE_INCLUDES + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -90,8 +94,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -99,10 +101,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -129,6 +131,7 @@ +@@ -129,6 +127,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61545,19 +74153,635 @@ diff -urN gtk+2.0-2.14.4.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.4/docs/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.14.4/docs/reference/libgail-util/Makefile.in ---- gtk+2.0-2.14.4.old/docs/reference/libgail-util/Makefile.in 2008-10-17 01:07:14.000000000 -0300 -+++ gtk+2.0-2.14.4/docs/reference/libgail-util/Makefile.in 2008-11-04 15:37:05.000000000 -0200 -@@ -100,6 +100,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@ +@@ -147,8 +146,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -159,91 +156,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -265,24 +185,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -293,8 +204,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -306,28 +215,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -336,22 +227,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -374,6 +268,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -382,22 +277,18 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +-# initialize variables for unconditional += appending +- + # Other files to distribute +-EXTRA_DIST = \ +- $(content_files) \ +- $(HTML_IMAGES) \ +- $(DOC_MAIN_SGML_FILE) \ +- $(DOC_MODULE)-sections.txt \ +- $(DOC_MODULE)-overrides.txt\ +-version.xml.in ++EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \ ++ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \ ++ version.xml.in + TEST_PROGS = + + ### testing rules +@@ -423,7 +314,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + AUTOMAKE_OPTIONS = 1.6 + + # The name of the module. +@@ -531,7 +421,6 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + GTKDOC_LIBS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ +@@ -576,7 +465,6 @@ content_files = \ + gtk-builder-convert.xml \ + visual_index.xml + +- + expand_content_files = \ + glossary.xml \ + migrating-checklist.sgml \ +@@ -766,7 +654,6 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix + --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo + + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +- + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@@ -777,13 +664,10 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix + # searched for in VPATH/GPATH. + # + GPATH = $(srcdir) +- + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +- + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +- + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ +@@ -791,40 +675,49 @@ SCANOBJ_FILES = \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +- + REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +- + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +- + ######################################################################## + man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 +- + BUILT_EXTRA_DIST = $(man_MANS) +-subdir = docs/reference/gtk +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = version.xml +-DIST_SOURCES = +- +-NROFF = nroff +-MANS = $(man_MANS) +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- $(top_srcdir)/gtk-doc.make Makefile.am version.xml.in + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/gtk/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/reference/gtk/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-version.xml: $(top_builddir)/config.status version.xml.in ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + + mostlyclean-libtool: +@@ -832,15 +725,9 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-man1dir = $(mandir)/man1 + install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(man1dir) ++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ +@@ -859,8 +746,8 @@ install-man1: $(man1_MANS) $(man_MANS) + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ +- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ + done + uninstall-man1: + @$(NORMAL_UNINSTALL) +@@ -880,8 +767,8 @@ uninstall-man1: + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ +- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ +- rm -f $(DESTDIR)$(man1dir)/$$inst; \ ++ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ + done + tags: TAGS + TAGS: +@@ -889,29 +776,23 @@ TAGS: + ctags: CTAGS + CTAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/$(srcdir)/images $(distdir)/$(top_srcdir)/gtk/stock-icons/20 $(distdir)/$(top_srcdir)/gtk/stock-icons/24 $(distdir)/$(top_srcdir)/gtk/stock-icons/32 $(distdir)/$(top_srcdir)/gtk/stock-icons/48 $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -929,9 +810,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(MANS) all-local +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(man1dir) ++ for dir in "$(DESTDIR)$(man1dir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -952,7 +834,7 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -963,25 +845,34 @@ clean-am: clean-generic clean-libtool cl + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-local ++distclean-am: clean-am distclean-generic distclean-local + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-data-local install-man + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: install-man1 + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -1001,21 +892,25 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local uninstall-man ++uninstall-am: uninstall-local uninstall-man + + uninstall-man: uninstall-man1 + ++.MAKE: install-am install-strip ++ + .PHONY: all all-am all-local check check-am check-local clean \ +- clean-generic clean-libtool clean-local distclean \ +- distclean-generic distclean-libtool distclean-local distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec install-exec-am \ +- install-info install-info-am install-man install-man1 \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic \ ++ clean-generic clean-libtool clean-local dist-hook distclean \ ++ distclean-generic distclean-libtool distclean-local distdir \ ++ dvi dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-man1 install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am uninstall-local uninstall-man uninstall-man1 ++ uninstall-local uninstall-man uninstall-man1 + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/docs/reference/libgail-util/Makefile.in 2008-10-17 06:07:14.000000000 +0200 ++++ gtk+-2.14.4/docs/reference/libgail-util/Makefile.in 2008-11-11 18:56:01.160634382 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -21,17 +21,11 @@ + #################################### + # Everything below here is generic # + #################################### +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -43,10 +37,23 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make ++subdir = docs/reference/libgail-util ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -57,22 +64,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -87,8 +89,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -96,10 +96,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -126,6 +128,7 @@ +@@ -126,6 +122,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61565,19 +74789,581 @@ diff -urN gtk+2.0-2.14.4.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/docs/reference/Makefile.in gtk+2.0-2.14.4/docs/reference/Makefile.in ---- gtk+2.0-2.14.4.old/docs/reference/Makefile.in 2008-10-17 01:07:14.000000000 -0300 -+++ gtk+2.0-2.14.4/docs/reference/Makefile.in 2008-11-04 15:37:05.000000000 -0200 -@@ -94,6 +94,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@ +@@ -144,8 +141,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -156,91 +151,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -262,24 +180,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -290,8 +199,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -303,28 +210,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -333,22 +222,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -371,6 +263,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -379,13 +272,13 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages +- +-# initialize variables for unconditional += appending + EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ +@@ -418,7 +311,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + AUTOMAKE_OPTIONS = 1.7 + + # The name of the module. +@@ -441,16 +333,13 @@ INCLUDES = \ + -I$(top_builddir) \ + $(DEP_CFLAGS) + +- + GTKDOC_LIBS = $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la + + # gtkdoc-mkdb related varaibles + MKDB_OPTIONS = + content_files = +- + HTML_IMAGES = + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +- + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@@ -461,13 +350,10 @@ HTML_IMAGES = + # searched for in VPATH/GPATH. + # + GPATH = $(srcdir) +- + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +- + DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +- + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ +@@ -475,69 +361,73 @@ SCANOBJ_FILES = \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +- + REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +- + CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-subdir = docs/reference/libgail-util +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- $(top_srcdir)/gtk-doc.make Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/libgail-util/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/reference/libgail-util/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + + ctags: CTAGS + CTAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -555,7 +445,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile all-local +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -577,7 +466,7 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -588,25 +477,34 @@ clean-am: clean-generic clean-libtool cl + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-local ++distclean-am: clean-am distclean-generic distclean-local + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-data-local + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -626,18 +524,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local ++uninstall-am: uninstall-local ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am all-local check check-am check-local clean \ +- clean-generic clean-libtool clean-local distclean \ +- distclean-generic distclean-libtool distclean-local distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-data-local install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic maintainer-clean-local mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am uninstall-local ++ clean-generic clean-libtool clean-local dist-hook distclean \ ++ distclean-generic distclean-libtool distclean-local distdir \ ++ dvi dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-local mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-local + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/docs/reference/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/docs/reference/Makefile.in 2008-10-17 06:07:14.000000000 +0200 ++++ gtk+-2.14.4/docs/reference/Makefile.in 2008-11-11 18:56:00.576634530 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,35 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog ++subdir = docs/reference ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61585,19 +75371,710 @@ diff -urN gtk+2.0-2.14.4.old/docs/reference/Makefile.in gtk+2.0-2.14.4/docs/refe GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/docs/tools/Makefile.in gtk+2.0-2.14.4/docs/tools/Makefile.in ---- gtk+2.0-2.14.4.old/docs/tools/Makefile.in 2008-10-17 01:07:14.000000000 -0300 -+++ gtk+2.0-2.14.4/docs/tools/Makefile.in 2008-11-04 15:37:05.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +216,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +278,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,31 +313,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = gdk-pixbuf gdk gtk libgail-util +-subdir = docs/reference +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- AUTHORS COPYING ChangeLog Makefile.am +-DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/reference/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo +@@ -438,10 +353,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -449,7 +360,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -490,7 +412,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -501,35 +423,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -565,29 +482,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -598,15 +509,19 @@ distdir: $(DISTFILES) + || 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 \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -617,7 +532,6 @@ check: check-recursive + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +- + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -637,7 +551,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -685,26 +608,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ +- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/docs/tools/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/docs/tools/Makefile.in 2008-10-17 06:07:14.000000000 +0200 ++++ gtk+-2.14.4/docs/tools/Makefile.in 2008-11-11 18:56:01.300634089 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,46 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++@USE_X11_TRUE@noinst_PROGRAMS = doc-shooter$(EXEEXT) ++subdir = docs/tools ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++PROGRAMS = $(noinst_PROGRAMS) ++am_doc_shooter_OBJECTS = shadow.$(OBJEXT) shooter.$(OBJEXT) \ ++ widgets.$(OBJEXT) ++doc_shooter_OBJECTS = $(am_doc_shooter_OBJECTS) ++am__DEPENDENCIES_1 = ++am__DEPENDENCIES_2 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) \ ++ $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(doc_shooter_SOURCES) ++DIST_SOURCES = $(doc_shooter_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +82,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +107,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +114,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +140,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61605,19 +76082,690 @@ diff -urN gtk+2.0-2.14.4.old/docs/tools/Makefile.in gtk+2.0-2.14.4/docs/tools/Ma GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/docs/tutorial/Makefile.in gtk+2.0-2.14.4/docs/tutorial/Makefile.in ---- gtk+2.0-2.14.4.old/docs/tutorial/Makefile.in 2008-10-17 01:07:14.000000000 -0300 -+++ gtk+2.0-2.14.4/docs/tutorial/Makefile.in 2008-11-04 15:37:05.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +159,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +169,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +198,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +217,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +228,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +240,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +281,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +290,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,7 +325,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ +@@ -415,24 +333,17 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + DEPS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + LDADDS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) \ + $(GTK_DEP_LIBS) + +- +-@USE_X11_TRUE@noinst_PROGRAMS = \ +-@USE_X11_TRUE@ doc-shooter +- +- + doc_shooter_DEPENDENCIES = $(DEPS) + doc_shooter_LDADD = $(LDADDS) + doc_shooter_SOURCES = \ +@@ -442,46 +353,39 @@ doc_shooter_SOURCES = \ + widgets.c \ + widgets.h + +-subdir = docs/tools +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-@USE_X11_TRUE@noinst_PROGRAMS = doc-shooter$(EXEEXT) +-@USE_X11_FALSE@noinst_PROGRAMS = +-PROGRAMS = $(noinst_PROGRAMS) +- +-am_doc_shooter_OBJECTS = shadow.$(OBJEXT) shooter.$(OBJEXT) \ +- widgets.$(OBJEXT) +-doc_shooter_OBJECTS = $(am_doc_shooter_OBJECTS) +-doc_shooter_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/shadow.Po ./$(DEPDIR)/shooter.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/widgets.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(doc_shooter_SOURCES) +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(doc_shooter_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/tools/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/tools/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -491,10 +395,10 @@ clean-noinstPROGRAMS: + done + doc-shooter$(EXEEXT): $(doc_shooter_OBJECTS) $(doc_shooter_DEPENDENCIES) + @rm -f doc-shooter$(EXEEXT) +- $(LINK) $(doc_shooter_LDFLAGS) $(doc_shooter_OBJECTS) $(doc_shooter_LDADD) $(LIBS) ++ $(LINK) $(doc_shooter_OBJECTS) $(doc_shooter_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -504,37 +408,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widgets.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -542,26 +434,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -571,23 +452,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -599,29 +480,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -636,7 +511,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(PROGRAMS) +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -657,7 +531,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -671,24 +545,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -709,19 +593,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ + ctags distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am info \ +- info-am install install-am install-data install-data-am \ +- install-exec install-exec-am install-info install-info-am \ +- install-man install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-info-am ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/docs/tutorial/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/docs/tutorial/Makefile.in 2008-10-17 06:07:14.000000000 +0200 ++++ gtk+-2.14.4/docs/tutorial/Makefile.in 2008-11-11 18:56:01.424636372 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,23 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = docs/tutorial ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +58,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +83,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +90,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61625,19 +76773,602 @@ diff -urN gtk+2.0-2.14.4.old/docs/tutorial/Makefile.in gtk+2.0-2.14.4/docs/tutor GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/gdk/directfb/Makefile.in gtk+2.0-2.14.4/gdk/directfb/Makefile.in ---- gtk+2.0-2.14.4.old/gdk/directfb/Makefile.in 2008-10-17 01:07:15.000000000 -0300 -+++ gtk+2.0-2.14.4/gdk/directfb/Makefile.in 2008-11-04 15:37:06.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +135,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +145,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +174,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +193,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +204,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +216,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +257,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,47 +266,27 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- gtk-tut.sgml \ +- images/arrow.png \ +- images/aspectframe.png \ +- images/base.png \ +- images/buttonbox.png \ +- images/buttons.png \ +- images/calendar.png \ +- images/colorsel.png \ +- images/entry.png \ +- images/eventbox.png \ +- images/filesel.png \ +- images/fixed.png \ +- images/frame.png \ +- images/gtkdial.png \ +- images/helloworld.png \ +- images/helloworld2.png \ +- images/label.png \ +- images/menu.png \ +- images/notebook.png \ +- images/packbox1.png \ +- images/packbox2.png \ +- images/paned.png \ +- images/progressbar.png \ +- images/radiobuttons.png \ +- images/rangewidgets.png \ +- images/rulers.png \ +- images/scribble.png \ +- images/scrolledwin.png \ +- images/spinbutton.png \ +- images/statusbar.png \ +- images/table.png \ ++EXTRA_DIST = gtk-tut.sgml images/arrow.png images/aspectframe.png \ ++ images/base.png images/buttonbox.png images/buttons.png \ ++ images/calendar.png images/colorsel.png images/entry.png \ ++ images/eventbox.png images/filesel.png images/fixed.png \ ++ images/frame.png images/gtkdial.png images/helloworld.png \ ++ images/helloworld2.png images/label.png images/menu.png \ ++ images/notebook.png images/packbox1.png images/packbox2.png \ ++ images/paned.png images/progressbar.png \ ++ images/radiobuttons.png images/rangewidgets.png \ ++ images/rulers.png images/scribble.png images/scrolledwin.png \ ++ images/spinbutton.png images/statusbar.png images/table.png \ + images/tictactoe.png +- + TEST_PROGS = + + ### testing rules +@@ -439,61 +312,67 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +-subdir = docs/tutorial +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/tutorial/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/tutorial/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + + ctags: CTAGS + CTAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. $(distdir)/images +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -511,7 +390,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -532,7 +410,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -543,7 +421,7 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + +@@ -555,12 +433,20 @@ info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -571,25 +457,27 @@ mostlyclean: mostlyclean-am + + mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +-pdf: pdf-am +- + pdf-am: + + ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am check-local clean clean-generic \ +- clean-libtool distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am ++ clean-libtool dist-hook distclean distclean-generic \ ++ distclean-libtool distdir dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/gdk/directfb/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gdk/directfb/Makefile.in 2008-10-17 06:07:15.000000000 +0200 ++++ gtk+-2.14.4/gdk/directfb/Makefile.in 2008-11-11 18:56:02.409135030 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,60 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO ++subdir = gdk/directfb ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++libgdk_directfb_la_LIBADD = ++am_libgdk_directfb_la_OBJECTS = gdkapplaunchcontext-directfb.lo \ ++ gdkcolor-directfb.lo gdkcursor-directfb.lo gdkdnd-directfb.lo \ ++ gdkdisplay-directfb.lo gdkdrawable-directfb.lo \ ++ gdkevents-directfb.lo gdkfont-directfb.lo gdkgc-directfb.lo \ ++ gdkgeometry-directfb.lo gdkglobals-directfb.lo \ ++ gdkim-directfb.lo gdkimage-directfb.lo gdkinput-directfb.lo \ ++ gdkkeys-directfb.lo gdkmain-directfb.lo gdkpixmap-directfb.lo \ ++ gdkproperty-directfb.lo gdkscreen-directfb.lo \ ++ gdkselection-directfb.lo gdkspawn-directfb.lo \ ++ gdktestutils-directfb.lo gdkvisual-directfb.lo \ ++ gdkwindow-directfb.lo gdkwindowid.lo ++libgdk_directfb_la_OBJECTS = $(am_libgdk_directfb_la_OBJECTS) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgdk_directfb_la_SOURCES) ++DIST_SOURCES = $(libgdk_directfb_la_SOURCES) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libgdkincludedir)" ++libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgdkinclude_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +97,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +122,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +129,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +155,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61645,19 +77376,881 @@ diff -urN gtk+2.0-2.14.4.old/gdk/directfb/Makefile.in gtk+2.0-2.14.4/gdk/directf GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/gdk/Makefile.in gtk+2.0-2.14.4/gdk/Makefile.in ---- gtk+2.0-2.14.4.old/gdk/Makefile.in 2008-10-17 01:07:15.000000000 -0300 -+++ gtk+2.0-2.14.4/gdk/Makefile.in 2008-11-04 15:37:06.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +174,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +184,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +213,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +232,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +243,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +255,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +296,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,14 +305,16 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = AUTHORS README TODO ++EXTRA_DIST = AUTHORS README TODO + TEST_PROGS = + + ### testing rules +@@ -406,9 +340,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + libgdkincludedir = $(includedir)/gtk-2.0/gdk +- + INCLUDES = \ + -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \ + -DGDK_COMPILATION \ +@@ -419,13 +351,10 @@ INCLUDES = \ + @GTK_DEBUG_FLAGS@ \ + @GDK_DEP_CFLAGS@ + +- + LDADDS = \ + @GDK_DEP_LIBS@ + +- + noinst_LTLIBRARIES = libgdk-directfb.la +- + libgdk_directfb_la_SOURCES = \ + gdkapplaunchcontext-directfb.c \ + gdkcolor-directfb.c \ +@@ -458,98 +387,57 @@ libgdk_directfb_la_SOURCES = \ + gdkwindowid.c \ + x-cursors.xbm + +- + libgdkinclude_HEADERS = \ + gdkdirectfb.h \ + gdkprivate-directfb.h + +-subdir = gdk/directfb +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +- +-libgdk_directfb_la_LDFLAGS = +-libgdk_directfb_la_LIBADD = +-am_libgdk_directfb_la_OBJECTS = gdkapplaunchcontext-directfb.lo \ +- gdkcolor-directfb.lo gdkcursor-directfb.lo gdkdnd-directfb.lo \ +- gdkdisplay-directfb.lo gdkdrawable-directfb.lo \ +- gdkevents-directfb.lo gdkfont-directfb.lo gdkgc-directfb.lo \ +- gdkgeometry-directfb.lo gdkglobals-directfb.lo \ +- gdkim-directfb.lo gdkimage-directfb.lo gdkinput-directfb.lo \ +- gdkkeys-directfb.lo gdkmain-directfb.lo gdkpixmap-directfb.lo \ +- gdkproperty-directfb.lo gdkscreen-directfb.lo \ +- gdkselection-directfb.lo gdkspawn-directfb.lo \ +- gdktestutils-directfb.lo gdkvisual-directfb.lo \ +- gdkwindow-directfb.lo gdkwindowid.lo +-libgdk_directfb_la_OBJECTS = $(am_libgdk_directfb_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkapplaunchcontext-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkim-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-directfb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindowid.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libgdk_directfb_la_SOURCES) +-HEADERS = $(libgdkinclude_HEADERS) +- +-DIST_COMMON = README $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl AUTHORS Makefile.am TODO +-SOURCES = $(libgdk_directfb_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/directfb/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/directfb/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgdk-directfb.la: $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_DEPENDENCIES) +- $(LINK) $(libgdk_directfb_la_LDFLAGS) $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_LIBADD) $(LIBS) ++ $(LINK) $(libgdk_directfb_la_OBJECTS) $(libgdk_directfb_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -581,82 +469,58 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowid.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) ++ test -z "$(libgdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdkincludedir)" + @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f"; \ +- $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ ++ $(libgdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdkincludedir)/$$f"; \ + done + + uninstall-libgdkincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgdkincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgdkincludedir)/$$f"; \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -666,23 +530,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -694,29 +558,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -731,9 +589,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) ++ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -753,7 +612,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -767,24 +626,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-libgdkincludeHEADERS + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -805,19 +674,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libgdkincludeHEADERS ++uninstall-am: uninstall-libgdkincludeHEADERS ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am \ +- install-libgdkincludeHEADERS install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-info-am \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libgdkincludeHEADERS install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-libgdkincludeHEADERS + + # call as: $(XVFB_START) && someprogram +Index: gtk+-2.14.4/gdk/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gdk/Makefile.in 2008-10-17 06:07:15.000000000 +0200 ++++ gtk+-2.14.4/gdk/Makefile.in 2008-11-11 18:56:02.252634832 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,13 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +34,143 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl COPYING ++subdir = gdk ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gdkincludedir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++libgdk_directfb_2_0_la_DEPENDENCIES = directfb/libgdk-directfb.la \ ++ $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la ++am__libgdk_directfb_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ ++ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ ++ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ ++ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ ++ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ ++ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ ++ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ ++ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ ++ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ ++ gdkenumtypes.c gdkmarshalers.h ++@USE_MEDIALIB_TRUE@am__objects_1 = gdkmedialib.lo ++am__objects_2 = $(am__objects_1) gdk.lo gdkapplaunchcontext.lo \ ++ gdkcairo.lo gdkcolor.lo gdkcursor.lo gdkdisplay.lo \ ++ gdkdisplaymanager.lo gdkdnd.lo gdkdraw.lo gdkevents.lo \ ++ gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo gdkkeys.lo \ ++ gdkkeyuni.lo gdkpango.lo gdkpixbuf-drawable.lo \ ++ gdkpixbuf-render.lo gdkpixmap.lo gdkpolyreg-generic.lo \ ++ gdkrectangle.lo gdkregion-generic.lo gdkrgb.lo gdkscreen.lo \ ++ gdkselection.lo gdkvisual.lo gdkwindow.lo gdkwindowimpl.lo ++am__objects_3 = $(am__objects_2) gdkenumtypes.lo ++am_libgdk_directfb_2_0_la_OBJECTS = $(am__objects_3) ++libgdk_directfb_2_0_la_OBJECTS = $(am_libgdk_directfb_2_0_la_OBJECTS) ++libgdk_directfb_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgdk_directfb_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++libgdk_quartz_2_0_la_DEPENDENCIES = quartz/libgdk-quartz.la \ ++ $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la ++am__libgdk_quartz_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ ++ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ ++ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ ++ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ ++ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ ++ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ ++ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ ++ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ ++ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ ++ gdkenumtypes.c gdkmarshalers.h gdkkeynames.c ++am_libgdk_quartz_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo ++libgdk_quartz_2_0_la_OBJECTS = $(am_libgdk_quartz_2_0_la_OBJECTS) ++libgdk_quartz_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgdk_quartz_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++am__libgdk_win32_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ ++ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ ++ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ ++ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ ++ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ ++ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ ++ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ ++ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ ++ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ ++ gdkenumtypes.c gdkmarshalers.h gdkkeynames.c ++am_libgdk_win32_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo ++libgdk_win32_2_0_la_OBJECTS = $(am_libgdk_win32_2_0_la_OBJECTS) ++libgdk_win32_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgdk_win32_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++libgdk_x11_2_0_la_DEPENDENCIES = x11/libgdk-x11.la \ ++ $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la ++am__libgdk_x11_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ ++ gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ ++ gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c \ ++ gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkimage.c \ ++ gdkinternals.h gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c \ ++ gdkpixbuf-drawable.c gdkpixbuf-render.c gdkpixmap.c \ ++ gdkpoly-generic.h gdkpolyreg-generic.c gdkrectangle.c \ ++ gdkregion-generic.c gdkregion-generic.h gdkrgb.c gdkscreen.c \ ++ gdkselection.c gdkvisual.c gdkwindow.c gdkwindowimpl.c \ ++ gdkenumtypes.c gdkmarshalers.h ++am_libgdk_x11_2_0_la_OBJECTS = $(am__objects_3) ++libgdk_x11_2_0_la_OBJECTS = $(am_libgdk_x11_2_0_la_OBJECTS) ++libgdk_x11_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgdk_x11_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgdk_directfb_2_0_la_SOURCES) \ ++ $(libgdk_quartz_2_0_la_SOURCES) $(libgdk_win32_2_0_la_SOURCES) \ ++ $(libgdk_x11_2_0_la_SOURCES) ++DIST_SOURCES = $(am__libgdk_directfb_2_0_la_SOURCES_DIST) \ ++ $(am__libgdk_quartz_2_0_la_SOURCES_DIST) \ ++ $(am__libgdk_win32_2_0_la_SOURCES_DIST) \ ++ $(am__libgdk_x11_2_0_la_SOURCES_DIST) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++DATA = $(noinst_DATA) ++gdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(gdkinclude_HEADERS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +181,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +206,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +213,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +239,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61665,156 +78258,8627 @@ diff -urN gtk+2.0-2.14.4.old/gdk/Makefile.in gtk+2.0-2.14.4/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/gdk/quartz/Makefile.in gtk+2.0-2.14.4/gdk/quartz/Makefile.in ---- gtk+2.0-2.14.4.old/gdk/quartz/Makefile.in 2008-10-17 01:07:16.000000000 -0300 -+++ gtk+2.0-2.14.4/gdk/quartz/Makefile.in 2008-11-04 15:37:07.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/gdk/tests/Makefile.in gtk+2.0-2.14.4/gdk/tests/Makefile.in ---- gtk+2.0-2.14.4.old/gdk/tests/Makefile.in 2008-10-17 01:07:16.000000000 -0300 -+++ gtk+2.0-2.14.4/gdk/tests/Makefile.in 2008-11-04 15:37:07.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/gdk/win32/Makefile.in gtk+2.0-2.14.4/gdk/win32/Makefile.in ---- gtk+2.0-2.14.4.old/gdk/win32/Makefile.in 2008-10-17 01:07:16.000000000 -0300 -+++ gtk+2.0-2.14.4/gdk/win32/Makefile.in 2008-11-04 15:37:07.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.4/gdk/win32/rc/Makefile.in ---- gtk+2.0-2.14.4.old/gdk/win32/rc/Makefile.in 2008-10-17 01:07:16.000000000 -0300 -+++ gtk+2.0-2.14.4/gdk/win32/rc/Makefile.in 2008-11-04 15:37:07.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/gdk/x11/Makefile.in gtk+2.0-2.14.4/gdk/x11/Makefile.in ---- gtk+2.0-2.14.4.old/gdk/x11/Makefile.in 2008-10-17 01:07:16.000000000 -0300 -+++ gtk+2.0-2.14.4/gdk/x11/Makefile.in 2008-11-04 15:37:07.000000000 -0200 -@@ -96,6 +96,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@ -@@ -122,6 +124,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.4/gdk-pixbuf/Makefile.in ---- gtk+2.0-2.14.4.old/gdk-pixbuf/Makefile.in 2008-10-17 01:07:15.000000000 -0300 -+++ gtk+2.0-2.14.4/gdk-pixbuf/Makefile.in 2008-11-04 15:37:06.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -442,6 +445,7 @@ +@@ -138,8 +258,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +268,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +297,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +316,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +327,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +339,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +380,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,31 +389,21 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- keynames.txt \ +- keyname-table.h \ +- gen-keyname-table.pl \ +- gdkconfig.h.win32 \ +- gdkkeysyms-update.pl \ +- gdk.def \ +- gdkmarshalers.list \ +- gdkmedialib.h \ +- makeenums.pl \ +- makefile.msc \ +- gdk.symbols \ +- makegdkalias.pl \ +- gdkenumtypes.c.template \ +- gdkenumtypes.h.template \ +- abicheck.sh \ +- pltcheck.sh\ +-$(gdk_built_sources) ++EXTRA_DIST = keynames.txt keyname-table.h gen-keyname-table.pl \ ++ gdkconfig.h.win32 gdkkeysyms-update.pl gdk.def \ ++ gdkmarshalers.list gdkmedialib.h makeenums.pl makefile.msc \ ++ gdk.symbols makegdkalias.pl gdkenumtypes.c.template \ ++ gdkenumtypes.h.template abicheck.sh pltcheck.sh \ ++ $(gdk_built_sources) + TEST_PROGS = + + ### testing rules +@@ -423,10 +429,8 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = $(gdktarget) . tests + DIST_SUBDIRS = win32 x11 quartz directfb tests +- + INCLUDES = \ + -DG_LOG_DOMAIN=\"Gdk\" \ + -DGDK_COMPILATION \ +@@ -436,9 +440,7 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GDK_DEP_CFLAGS) + +- + gtarget = $(gdktarget) +- + @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined + + # libtool stuff: set version and export symbols for resolving +@@ -452,7 +454,6 @@ LDADD = \ + $(LIBTOOL_EXPORT_OPTIONS) + + @USE_MEDIALIB_FALSE@medialib_sources = +- + @USE_MEDIALIB_TRUE@medialib_sources = \ + @USE_MEDIALIB_TRUE@ gdkmedialib.c + +@@ -496,17 +497,14 @@ gdk_public_h_sources = \ + gdkvisual.h \ + gdkwindow.h + +- + gdk_built_public_sources = \ + gdkenumtypes.h + +- + gdk_built_private_headers = \ + gdkprivate.h \ + gdkwindowimpl.h \ + gdkalias.h + +- + gdk_c_sources = \ + $(medialib_sources) \ + gdk.c \ +@@ -543,7 +541,6 @@ gdk_c_sources = \ + gdkwindow.c \ + gdkwindowimpl.c + +- + gdk_built_sources = \ + gdkaliasdef.c \ + gdkenumtypes.c \ +@@ -553,7 +550,6 @@ gdk_built_sources = \ + $(gdk_built_private_headers) - loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders +- + # + # setup GDK sources and their dependencies + # +@@ -566,40 +562,31 @@ common_sources = \ + gdkenumtypes.c \ + gdkmarshalers.h + +- + libgdk_directfb_2_0_la_SOURCES = $(common_sources) + libgdk_directfb_2_0_la_LIBADD = directfb/libgdk-directfb.la $(GDK_DEP_LIBS) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la + + libgdk_directfb_2_0_la_LDFLAGS = $(LDADD) +- + libgdk_x11_2_0_la_SOURCES = $(common_sources) + libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la + + libgdk_x11_2_0_la_LDFLAGS = $(LDADD) +- + libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c + libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la + + libgdk_quartz_2_0_la_LDFLAGS = $(LDADD) +- + libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c + libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la + + libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def + libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD) +- + @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib +- + @OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh +- + lib_LTLIBRARIES = $(gdktargetlib) +- + EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la +- + MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h + EXTRA_HEADERS = + +@@ -613,183 +600,79 @@ BUILT_SOURCES = \ + $(gdk_built_sources) \ + gdkconfig.h + +- + DISTCLEANFILES = gdkconfig.h stamp-gc-h +-subdir = gdk +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(lib_LTLIBRARIES) +- +-libgdk_directfb_2_0_la_DEPENDENCIES = directfb/libgdk-directfb.la \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +-am__libgdk_directfb_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ +- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ +- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ +- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ +- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ +- gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ +- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ +- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ +- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ +- gdkmarshalers.h +-@USE_MEDIALIB_TRUE@am__objects_1 = gdkmedialib.lo +-@USE_MEDIALIB_FALSE@am__objects_1 = +-am__objects_2 = $(am__objects_1) gdk.lo gdkapplaunchcontext.lo \ +- gdkcairo.lo gdkcolor.lo gdkcursor.lo gdkdisplay.lo \ +- gdkdisplaymanager.lo gdkdnd.lo gdkdraw.lo gdkevents.lo \ +- gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo gdkkeys.lo \ +- gdkkeyuni.lo gdkpango.lo gdkpixbuf-drawable.lo \ +- gdkpixbuf-render.lo gdkpixmap.lo gdkpolyreg-generic.lo \ +- gdkrectangle.lo gdkregion-generic.lo gdkrgb.lo gdkscreen.lo \ +- gdkselection.lo gdkvisual.lo gdkwindow.lo gdkwindowimpl.lo +-am__objects_3 = $(am__objects_2) gdkenumtypes.lo +-am_libgdk_directfb_2_0_la_OBJECTS = $(am__objects_3) +-libgdk_directfb_2_0_la_OBJECTS = $(am_libgdk_directfb_2_0_la_OBJECTS) +-libgdk_quartz_2_0_la_DEPENDENCIES = quartz/libgdk-quartz.la \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +-am__libgdk_quartz_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ +- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ +- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ +- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ +- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ +- gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ +- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ +- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ +- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ +- gdkmarshalers.h gdkkeynames.c +-am_libgdk_quartz_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo +-libgdk_quartz_2_0_la_OBJECTS = $(am_libgdk_quartz_2_0_la_OBJECTS) +-am__libgdk_win32_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ +- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ +- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ +- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ +- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ +- gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ +- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ +- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ +- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ +- gdkmarshalers.h gdkkeynames.c +-am_libgdk_win32_2_0_la_OBJECTS = $(am__objects_3) gdkkeynames.lo +-libgdk_win32_2_0_la_OBJECTS = $(am_libgdk_win32_2_0_la_OBJECTS) +-libgdk_x11_2_0_la_DEPENDENCIES = x11/libgdk-x11.la \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +-am__libgdk_x11_2_0_la_SOURCES_DIST = gdkmedialib.c gdk.c \ +- gdkapplaunchcontext.c gdkcairo.c gdkcolor.c gdkcursor.c \ +- gdkdisplay.c gdkdisplaymanager.c gdkdnd.c gdkdraw.c gdkevents.c \ +- gdkfont.c gdkgc.c gdkglobals.c gdkimage.c gdkinternals.h \ +- gdkintl.h gdkkeys.c gdkkeyuni.c gdkpango.c gdkpixbuf-drawable.c \ +- gdkpixbuf-render.c gdkpixmap.c gdkpoly-generic.h \ +- gdkpolyreg-generic.c gdkrectangle.c gdkregion-generic.c \ +- gdkregion-generic.h gdkrgb.c gdkscreen.c gdkselection.c \ +- gdkvisual.c gdkwindow.c gdkwindowimpl.c gdkenumtypes.c \ +- gdkmarshalers.h +-am_libgdk_x11_2_0_la_OBJECTS = $(am__objects_3) +-libgdk_x11_2_0_la_OBJECTS = $(am_libgdk_x11_2_0_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcairo.Plo ./$(DEPDIR)/gdkcolor.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplaymanager.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd.Plo ./$(DEPDIR)/gdkdraw.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkenumtypes.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkevents.Plo ./$(DEPDIR)/gdkfont.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkgc.Plo ./$(DEPDIR)/gdkglobals.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkimage.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeynames.Plo ./$(DEPDIR)/gdkkeys.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeyuni.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkmedialib.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkpango.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixbuf-drawable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixbuf-render.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkpolyreg-generic.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkrectangle.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkregion-generic.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkrgb.Plo ./$(DEPDIR)/gdkscreen.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual.Plo ./$(DEPDIR)/gdkwindow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindowimpl.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(am__libgdk_directfb_2_0_la_SOURCES_DIST) \ +- $(am__libgdk_quartz_2_0_la_SOURCES_DIST) \ +- $(am__libgdk_win32_2_0_la_SOURCES_DIST) \ +- $(am__libgdk_x11_2_0_la_SOURCES_DIST) +-DATA = $(noinst_DATA) +- +-HEADERS = $(gdkinclude_HEADERS) +- +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl COPYING Makefile.am +-SOURCES = $(libgdk_directfb_2_0_la_SOURCES) $(libgdk_quartz_2_0_la_SOURCES) $(libgdk_win32_2_0_la_SOURCES) $(libgdk_x11_2_0_la_SOURCES) +- + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-libLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libdir) ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgdk-directfb-2.0.la: $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_DEPENDENCIES) +- $(LINK) $(libgdk_directfb_2_0_la_LDFLAGS) $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_LIBADD) $(LIBS) ++ $(libgdk_directfb_2_0_la_LINK) $(libgdk_directfb_2_0_la_OBJECTS) $(libgdk_directfb_2_0_la_LIBADD) $(LIBS) + libgdk-quartz-2.0.la: $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_DEPENDENCIES) +- $(LINK) $(libgdk_quartz_2_0_la_LDFLAGS) $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_LIBADD) $(LIBS) ++ $(libgdk_quartz_2_0_la_LINK) $(libgdk_quartz_2_0_la_OBJECTS) $(libgdk_quartz_2_0_la_LIBADD) $(LIBS) + libgdk-win32-2.0.la: $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_DEPENDENCIES) +- $(LINK) $(libgdk_win32_2_0_la_LDFLAGS) $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_LIBADD) $(LIBS) ++ $(libgdk_win32_2_0_la_LINK) $(libgdk_win32_2_0_la_OBJECTS) $(libgdk_win32_2_0_la_LIBADD) $(LIBS) + libgdk-x11-2.0.la: $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_DEPENDENCIES) +- $(LINK) $(libgdk_x11_2_0_la_LDFLAGS) $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_LIBADD) $(LIBS) ++ $(libgdk_x11_2_0_la_LINK) $(libgdk_x11_2_0_la_OBJECTS) $(libgdk_x11_2_0_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -828,64 +711,47 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowimpl.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-gdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-gdkincludeHEADERS: $(gdkinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(gdkincludedir) ++ test -z "$(gdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gdkincludedir)" + @list='$(gdkinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(gdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gdkincludedir)/$$f"; \ +- $(gdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(gdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gdkincludedir)/$$f'"; \ ++ $(gdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gdkincludedir)/$$f"; \ + done + + uninstall-gdkincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(gdkinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(gdkincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(gdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(gdkincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(gdkincludedir)/$$f"; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -895,7 +761,13 @@ uninstall-gdkincludeHEADERS: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -907,15 +779,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -936,7 +813,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -947,35 +824,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -983,23 +855,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -1013,9 +885,9 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -1024,25 +896,25 @@ check-TESTS: $(TESTS) + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xpass=`expr $$xpass + 1`; \ +- failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xpass=`expr $$xpass + 1`; \ ++ failed=`expr $$failed + 1`; \ ++ echo "XPASS: $$tst"; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xfail=`expr $$xfail + 1`; \ ++ echo "XFAIL: $$tst"; \ + ;; \ + *) \ +- failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ failed=`expr $$failed + 1`; \ ++ echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ +@@ -1067,46 +939,40 @@ check-TESTS: $(TESTS) + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ +- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ +- test -n "$$skipped" && echo "$$skipped"; \ +- test -n "$$report" && echo "$$report"; \ ++ test -z "$$skipped" || echo "$$skipped"; \ ++ test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -1119,13 +985,17 @@ distdir: $(DISTFILES) + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -1137,8 +1007,9 @@ check: $(BUILT_SOURCES) + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(gdkincludedir) +- ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gdkincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive +@@ -1159,14 +1030,14 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ++ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + clean: clean-recursive + + clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +@@ -1176,26 +1047,36 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-local distclean-tags ++ distclean-local distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: install-data-local install-gdkincludeHEADERS + ++install-dvi: install-dvi-recursive ++ + install-exec-am: install-exec-local install-libLTLIBRARIES + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -1216,32 +1097,30 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-gdkincludeHEADERS uninstall-info-am \ +- uninstall-libLTLIBRARIES uninstall-local ++uninstall-am: uninstall-gdkincludeHEADERS uninstall-libLTLIBRARIES \ ++ uninstall-local + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-exec-am install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \ +- check-am check-local clean clean-generic clean-libLTLIBRARIES \ +- clean-libtool clean-recursive ctags ctags-recursive distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-local distclean-recursive distclean-tags distdir dvi \ +- dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-local \ +- install-data-recursive install-exec install-exec-am \ +- install-exec-local install-exec-recursive \ +- install-gdkincludeHEADERS install-info install-info-am \ +- install-info-recursive install-libLTLIBRARIES install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ +- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ +- tags-recursive uninstall uninstall-am \ +- uninstall-gdkincludeHEADERS uninstall-info-am \ +- uninstall-info-recursive uninstall-libLTLIBRARIES \ +- uninstall-local uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-TESTS check-am check-local clean \ ++ clean-generic clean-libLTLIBRARIES clean-libtool ctags \ ++ ctags-recursive distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-local distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exec install-exec-am install-exec-hook \ ++ install-exec-local install-gdkincludeHEADERS install-html \ ++ install-html-am install-info install-info-am \ ++ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am \ ++ uninstall-gdkincludeHEADERS uninstall-libLTLIBRARIES \ ++ uninstall-local + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/gdk/quartz/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gdk/quartz/Makefile.in 2008-10-17 06:07:16.000000000 +0200 ++++ gtk+-2.14.4/gdk/quartz/Makefile.in 2008-11-11 18:56:02.560633893 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,59 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = gdk/quartz ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++libgdk_quartz_la_LIBADD = ++am_libgdk_quartz_la_OBJECTS = GdkQuartzView.lo GdkQuartzWindow.lo \ ++ gdkapplaunchcontext-quartz.lo gdkcolor-quartz.lo \ ++ gdkcursor-quartz.lo gdkdisplay-quartz.lo gdkdnd-quartz.lo \ ++ gdkdrawable-quartz.lo gdkevents-quartz.lo \ ++ gdkeventloop-quartz.lo gdkfont-quartz.lo gdkgc-quartz.lo \ ++ gdkgeometry-quartz.lo gdkglobals-quartz.lo gdkim-quartz.lo \ ++ gdkimage-quartz.lo gdkinput.lo gdkkeys-quartz.lo \ ++ gdkmain-quartz.lo gdkpixmap-quartz.lo gdkproperty-quartz.lo \ ++ gdkscreen-quartz.lo gdkselection-quartz.lo gdkspawn-quartz.lo \ ++ gdktestutils-quartz.lo gdkvisual-quartz.lo gdkwindow-quartz.lo ++libgdk_quartz_la_OBJECTS = $(am_libgdk_quartz_la_OBJECTS) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgdk_quartz_la_SOURCES) ++DIST_SOURCES = $(libgdk_quartz_la_SOURCES) ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libgdkincludedir)" ++libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgdkinclude_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +242,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +304,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +339,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + libgdkincludedir = $(includedir)/gtk-2.0/gdk +- + INCLUDES = \ + -DG_LOG_DOMAIN=\"Gdk\" \ + -DGDK_COMPILATION \ +@@ -419,11 +350,8 @@ INCLUDES = \ + $(GDK_DEP_CFLAGS) \ + "-xobjective-c" + +- + LDADDS = $(GDK_DEP_LIBS) +- + noinst_LTLIBRARIES = libgdk-quartz.la +- + libgdk_quartz_la_SOURCES = \ + GdkQuartzView.c \ + GdkQuartzView.h \ +@@ -462,98 +390,56 @@ libgdk_quartz_la_SOURCES = \ + gdkwindow-quartz.h \ + xcursors.h + +- + libgdkinclude_HEADERS = \ + gdkquartz.h + +-subdir = gdk/quartz +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +- +-libgdk_quartz_la_LDFLAGS = +-libgdk_quartz_la_LIBADD = +-am_libgdk_quartz_la_OBJECTS = GdkQuartzView.lo GdkQuartzWindow.lo \ +- gdkapplaunchcontext-quartz.lo gdkcolor-quartz.lo \ +- gdkcursor-quartz.lo gdkdisplay-quartz.lo gdkdnd-quartz.lo \ +- gdkdrawable-quartz.lo gdkevents-quartz.lo \ +- gdkeventloop-quartz.lo gdkfont-quartz.lo gdkgc-quartz.lo \ +- gdkgeometry-quartz.lo gdkglobals-quartz.lo gdkim-quartz.lo \ +- gdkimage-quartz.lo gdkinput.lo gdkkeys-quartz.lo \ +- gdkmain-quartz.lo gdkpixmap-quartz.lo gdkproperty-quartz.lo \ +- gdkscreen-quartz.lo gdkselection-quartz.lo gdkspawn-quartz.lo \ +- gdktestutils-quartz.lo gdkvisual-quartz.lo gdkwindow-quartz.lo +-libgdk_quartz_la_OBJECTS = $(am_libgdk_quartz_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/GdkQuartzView.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/GdkQuartzWindow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkeventloop-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkim-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-quartz.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libgdk_quartz_la_SOURCES) +-HEADERS = $(libgdkinclude_HEADERS) +- +-DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-SOURCES = $(libgdk_quartz_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/quartz/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/quartz/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgdk-quartz.la: $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_DEPENDENCIES) +- $(LINK) $(libgdk_quartz_la_LDFLAGS) $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_LIBADD) $(LIBS) ++ $(LINK) $(libgdk_quartz_la_OBJECTS) $(libgdk_quartz_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -587,82 +473,58 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-quartz.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) ++ test -z "$(libgdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdkincludedir)" + @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f"; \ +- $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ ++ $(libgdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdkincludedir)/$$f"; \ + done + + uninstall-libgdkincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgdkincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgdkincludedir)/$$f"; \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -672,23 +534,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -700,29 +562,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -737,9 +593,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) ++ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -759,7 +616,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -773,24 +630,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-libgdkincludeHEADERS + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -811,19 +678,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libgdkincludeHEADERS ++uninstall-am: uninstall-libgdkincludeHEADERS ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am \ +- install-libgdkincludeHEADERS install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-info-am \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libgdkincludeHEADERS install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-libgdkincludeHEADERS + + # call as: $(XVFB_START) && someprogram +Index: gtk+-2.14.4/gdk/tests/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gdk/tests/Makefile.in 2008-10-17 06:07:16.000000000 +0200 ++++ gtk+-2.14.4/gdk/tests/Makefile.in 2008-11-11 18:56:02.700634089 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,47 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++check_PROGRAMS = check-gdk-cairo$(EXEEXT) ++subdir = gdk/tests ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__objects_1 = ++am_check_gdk_cairo_OBJECTS = check-gdk-cairo.$(OBJEXT) \ ++ $(am__objects_1) ++check_gdk_cairo_OBJECTS = $(am_check_gdk_cairo_OBJECTS) ++am__DEPENDENCIES_1 = ++check_gdk_cairo_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la \ ++ $(am__DEPENDENCIES_1) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(check_gdk_cairo_SOURCES) ++DIST_SOURCES = $(check_gdk_cairo_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +82,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +107,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +114,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +140,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +159,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +169,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +198,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +217,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +228,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +240,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +281,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +290,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,20 +325,15 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + NULL = +- +-check_PROGRAMS = check-gdk-cairo + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders +- + AM_CPPFLAGS = \ + $(GDK_DEP_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ + $(NULL) + +- + check_gdk_cairo_SOURCES = \ + check-gdk-cairo.c \ + $(NULL) +@@ -430,50 +344,43 @@ check_gdk_cairo_LDADD = \ + $(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la \ + $(NULL) + +- + CLEANFILES = \ + cairosurface.png \ + gdksurface.png + +-subdir = gdk/tests +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-check_PROGRAMS = check-gdk-cairo$(EXEEXT) +-am__objects_1 = +-am_check_gdk_cairo_OBJECTS = check-gdk-cairo.$(OBJEXT) $(am__objects_1) +-check_gdk_cairo_OBJECTS = $(am_check_gdk_cairo_OBJECTS) +-check_gdk_cairo_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la +-check_gdk_cairo_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/check-gdk-cairo.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(check_gdk_cairo_SOURCES) +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(check_gdk_cairo_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/tests/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/tests/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ +@@ -483,10 +390,10 @@ clean-checkPROGRAMS: + done + check-gdk-cairo$(EXEEXT): $(check_gdk_cairo_OBJECTS) $(check_gdk_cairo_DEPENDENCIES) + @rm -f check-gdk-cairo$(EXEEXT) +- $(LINK) $(check_gdk_cairo_LDFLAGS) $(check_gdk_cairo_OBJECTS) $(check_gdk_cairo_LDADD) $(LIBS) ++ $(LINK) $(check_gdk_cairo_OBJECTS) $(check_gdk_cairo_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -494,37 +401,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gdk-cairo.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -532,26 +427,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -561,23 +445,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -591,9 +475,9 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -602,25 +486,25 @@ check-TESTS: $(TESTS) + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xpass=`expr $$xpass + 1`; \ +- failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xpass=`expr $$xpass + 1`; \ ++ failed=`expr $$failed + 1`; \ ++ echo "XPASS: $$tst"; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xfail=`expr $$xfail + 1`; \ ++ echo "XFAIL: $$tst"; \ + ;; \ + *) \ +- failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ failed=`expr $$failed + 1`; \ ++ echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ +@@ -645,46 +529,40 @@ check-TESTS: $(TESTS) + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ +- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ +- test -n "$$skipped" && echo "$$skipped"; \ +- test -n "$$report" && echo "$$report"; \ ++ test -z "$$skipped" || echo "$$skipped"; \ ++ test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -700,7 +578,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local + check: check-am + all-am: Makefile +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -722,37 +599,48 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + clean: clean-am + +-clean-am: clean-checkPROGRAMS clean-generic clean-libtool mostlyclean-am ++clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ ++ mostlyclean-am + + distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -773,18 +661,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ + clean clean-checkPROGRAMS clean-generic clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/gdk/win32/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gdk/win32/Makefile.in 2008-10-17 06:07:16.000000000 +0200 ++++ gtk+-2.14.4/gdk/win32/Makefile.in 2008-11-11 18:56:02.860634243 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,69 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = gdk/win32 ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++libgdk_win32_la_LIBADD = ++am_libgdk_win32_la_OBJECTS = gdkapplaunchcontext-win32.lo \ ++ gdkcolor-win32.lo gdkcursor-win32.lo gdkdisplay-win32.lo \ ++ gdkdnd-win32.lo gdkdrawable-win32.lo gdkevents-win32.lo \ ++ gdkfont-win32.lo gdkgc-win32.lo gdkgeometry-win32.lo \ ++ gdkglobals-win32.lo gdkim-win32.lo gdkimage-win32.lo \ ++ gdkinput.lo gdkinput-win32.lo gdkkeys-win32.lo \ ++ gdkmain-win32.lo gdkpixmap-win32.lo gdkproperty-win32.lo \ ++ gdkscreen-win32.lo gdkselection-win32.lo gdkspawn-win32.lo \ ++ gdktestutils-win32.lo gdkvisual-win32.lo gdkwin32id.lo \ ++ gdkwindow-win32.lo ++libgdk_win32_la_OBJECTS = $(am_libgdk_win32_la_OBJECTS) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgdk_win32_la_SOURCES) ++DIST_SOURCES = $(libgdk_win32_la_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libgdkincludedir)" ++libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgdkinclude_HEADERS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +106,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +131,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +138,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +164,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +183,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +193,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +222,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +241,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +252,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +264,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +305,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,17 +314,16 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- bdfcursor.c \ +- makefile.msc +- ++EXTRA_DIST = bdfcursor.c makefile.msc + TEST_PROGS = + + ### testing rules +@@ -409,9 +349,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + libgdkincludedir = $(includedir)/gtk-2.0/gdk +- + INCLUDES = \ + -DG_LOG_DOMAIN=\"Gdk\" \ + -DINSIDE_GDK_WIN32 \ +@@ -423,13 +361,9 @@ INCLUDES = \ + $(GDK_WIN32_EXTRA_CFLAGS)\ + -DGDK_COMPILATION + +- + LDADDS = $(GDK_DEP_LIBS) +- + noinst_LTLIBRARIES = libgdk-win32.la +- + SUBDIRS = rc +- + libgdk_win32_la_SOURCES = \ + xcursors.h \ + gdkapplaunchcontext-win32.c \ +@@ -467,103 +401,56 @@ libgdk_win32_la_SOURCES = \ + wintab.h \ + pktdef.h + +- + libgdkinclude_HEADERS = \ + gdkwin32.h + +-subdir = gdk/win32 +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +- +-libgdk_win32_la_LDFLAGS = +-libgdk_win32_la_LIBADD = +-am_libgdk_win32_la_OBJECTS = gdkapplaunchcontext-win32.lo \ +- gdkcolor-win32.lo gdkcursor-win32.lo gdkdisplay-win32.lo \ +- gdkdnd-win32.lo gdkdrawable-win32.lo gdkevents-win32.lo \ +- gdkfont-win32.lo gdkgc-win32.lo gdkgeometry-win32.lo \ +- gdkglobals-win32.lo gdkim-win32.lo gdkimage-win32.lo \ +- gdkinput.lo gdkinput-win32.lo gdkkeys-win32.lo gdkmain-win32.lo \ +- gdkpixmap-win32.lo gdkproperty-win32.lo gdkscreen-win32.lo \ +- gdkselection-win32.lo gdkspawn-win32.lo gdktestutils-win32.lo \ +- gdkvisual-win32.lo gdkwin32id.lo gdkwindow-win32.lo +-libgdk_win32_la_OBJECTS = $(am_libgdk_win32_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkapplaunchcontext-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkim-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkwin32id.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-win32.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libgdk_win32_la_SOURCES) +-HEADERS = $(libgdkinclude_HEADERS) +- +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(libgdk_win32_la_SOURCES) +- + all: all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/win32/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/win32/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgdk-win32.la: $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_DEPENDENCIES) +- $(LINK) $(libgdk_win32_la_LDFLAGS) $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_LIBADD) $(LIBS) ++ $(LINK) $(libgdk_win32_la_OBJECTS) $(libgdk_win32_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -596,64 +483,47 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-win32.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) ++ test -z "$(libgdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdkincludedir)" + @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f"; \ +- $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ ++ $(libgdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdkincludedir)/$$f"; \ + done + + uninstall-libgdkincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgdkincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgdkincludedir)/$$f"; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -663,7 +533,13 @@ uninstall-libgdkincludeHEADERS: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -675,15 +551,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -704,7 +585,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -715,35 +596,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -751,23 +627,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -779,29 +655,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -812,15 +682,19 @@ distdir: $(DISTFILES) + || 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 \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -831,8 +705,9 @@ check: check-recursive + all-am: Makefile $(LTLIBRARIES) $(HEADERS) + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) +- ++ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -852,7 +727,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -866,24 +741,34 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: install-libgdkincludeHEADERS + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -904,28 +789,26 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libgdkincludeHEADERS ++uninstall-am: uninstall-libgdkincludeHEADERS + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool \ +- clean-noinstLTLIBRARIES clean-recursive ctags ctags-recursive \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am \ +- dvi-recursive info info-am info-recursive install install-am \ +- install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive \ +- install-libgdkincludeHEADERS install-man install-recursive \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES ctags ctags-recursive \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libgdkincludeHEADERS install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ +- installdirs-am installdirs-recursive maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ +- ps-recursive tags tags-recursive uninstall uninstall-am \ +- uninstall-info-am uninstall-info-recursive \ +- uninstall-libgdkincludeHEADERS uninstall-recursive ++ installdirs-am maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am uninstall-libgdkincludeHEADERS + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gdk/win32/rc/Makefile.in 2008-10-17 06:07:16.000000000 +0200 ++++ gtk+-2.14.4/gdk/win32/rc/Makefile.in 2008-11-11 18:56:02.980634481 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,24 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/gdk.rc.in $(top_srcdir)/Makefile.decl ++subdir = gdk/win32/rc ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = gdk.rc ++SOURCES = ++DIST_SOURCES = ++DATA = $(noinst_DATA) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +60,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +85,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +92,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +118,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +137,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +147,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +176,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +195,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +206,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +218,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +259,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,18 +268,16 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- gdk.rc \ +- gdk.rc.in \ +- gtk.ico +- ++EXTRA_DIST = gdk.rc gdk.rc.in gtk.ico + TEST_PROGS = + + ### testing rules +@@ -410,27 +303,40 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @USE_WIN32_TRUE@noinst_DATA = gdk-win32-res.o +-subdir = gdk/win32/rc +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = gdk.rc +-DIST_SOURCES = +-DATA = $(noinst_DATA) +- +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am gdk.rc.in + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/win32/rc/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/win32/rc/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-gdk.rc: $(top_builddir)/config.status gdk.rc.in ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++gdk.rc: $(top_builddir)/config.status $(srcdir)/gdk.rc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + + mostlyclean-libtool: +@@ -438,39 +344,29 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + tags: TAGS + TAGS: + + ctags: CTAGS + CTAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -485,7 +381,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(DATA) +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -506,7 +401,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -517,24 +412,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -553,17 +458,21 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am check-local clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/gdk/x11/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gdk/x11/Makefile.in 2008-10-17 06:07:16.000000000 +0200 ++++ gtk+-2.14.4/gdk/x11/Makefile.in 2008-11-11 18:56:03.152634902 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,13 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,12 +34,86 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl + @XINPUT_XFREE_TRUE@am__append_1 = gdkinput-x11.c gdkinput-xfree.c + @XINPUT_XFREE_FALSE@am__append_2 = gdkinput-none.c ++noinst_PROGRAMS = checksettings$(EXEEXT) ++TESTS = checksettings$(EXEEXT) ++subdir = gdk/x11 ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++libgdk_x11_la_LIBADD = ++am__libgdk_x11_la_SOURCES_DIST = MwmUtil.h gdkapplaunchcontext-x11.c \ ++ gdkasync.c gdkasync.h gdkcolor-x11.c gdkcursor-x11.c \ ++ gdkdisplay-x11.c gdkdisplay-x11.h gdkdnd-x11.c \ ++ gdkdrawable-x11.c gdkdrawable-x11.h gdkevents-x11.c \ ++ gdkfont-x11.c gdkgc-x11.c gdkgeometry-x11.c gdkglobals-x11.c \ ++ gdkim-x11.c gdkimage-x11.c gdkinput.c gdkkeys-x11.c \ ++ gdkmain-x11.c gdkpixmap-x11.c gdkpixmap-x11.h \ ++ gdkproperty-x11.c gdkscreen-x11.c gdkscreen-x11.h \ ++ gdkselection-x11.c gdkspawn-x11.c gdktestutils-x11.c \ ++ gdkvisual-x11.c gdkwindow-x11.c gdkwindow-x11.h \ ++ gdkxftdefaults.c gdkxid.c gdkx.h gdkprivate-x11.h \ ++ gdkinputprivate.h xsettings-client.h xsettings-client.c \ ++ xsettings-common.h xsettings-common.c gdkinput-x11.c \ ++ gdkinput-xfree.c gdkinput-none.c ++@XINPUT_XFREE_TRUE@am__objects_1 = gdkinput-x11.lo gdkinput-xfree.lo ++@XINPUT_XFREE_FALSE@am__objects_2 = gdkinput-none.lo ++am_libgdk_x11_la_OBJECTS = gdkapplaunchcontext-x11.lo gdkasync.lo \ ++ gdkcolor-x11.lo gdkcursor-x11.lo gdkdisplay-x11.lo \ ++ gdkdnd-x11.lo gdkdrawable-x11.lo gdkevents-x11.lo \ ++ gdkfont-x11.lo gdkgc-x11.lo gdkgeometry-x11.lo \ ++ gdkglobals-x11.lo gdkim-x11.lo gdkimage-x11.lo gdkinput.lo \ ++ gdkkeys-x11.lo gdkmain-x11.lo gdkpixmap-x11.lo \ ++ gdkproperty-x11.lo gdkscreen-x11.lo gdkselection-x11.lo \ ++ gdkspawn-x11.lo gdktestutils-x11.lo gdkvisual-x11.lo \ ++ gdkwindow-x11.lo gdkxftdefaults.lo gdkxid.lo \ ++ xsettings-client.lo xsettings-common.lo $(am__objects_1) \ ++ $(am__objects_2) ++libgdk_x11_la_OBJECTS = $(am_libgdk_x11_la_OBJECTS) ++PROGRAMS = $(noinst_PROGRAMS) ++checksettings_SOURCES = checksettings.c ++checksettings_OBJECTS = checksettings.$(OBJEXT) ++am__DEPENDENCIES_1 = ++checksettings_DEPENDENCIES = libgdk-x11.la $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgdk_x11_la_SOURCES) checksettings.c ++DIST_SOURCES = $(am__libgdk_x11_la_SOURCES_DIST) checksettings.c ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libgdkincludedir)" ++libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgdkinclude_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -53,22 +124,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -83,8 +149,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -92,10 +156,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -122,6 +182,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -140,8 +201,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -152,91 +211,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -258,24 +240,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -286,8 +259,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -299,28 +270,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -329,22 +282,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -367,6 +323,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -375,9 +332,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -385,12 +344,8 @@ GTESTER_REPORT = gtester-report # in $P + + # We need to include all these C files here since the conditionals + # don't seem to be correctly expanded for the dist files. +-EXTRA_DIST = \ +- gdkinput-x11.c \ +- gdkinput-xfree.c \ +- gdkinput-none.c \ ++EXTRA_DIST = gdkinput-x11.c gdkinput-xfree.c gdkinput-none.c \ + gdksettings.c +- + TEST_PROGS = + + ### testing rules +@@ -416,9 +371,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + libgdkincludedir = $(includedir)/gtk-2.0/gdk +- + INCLUDES = \ + -DG_LOG_DOMAIN=\"Gdk\" \ + -DGDK_COMPILATION \ +@@ -428,178 +381,69 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GDK_DEP_CFLAGS) + +- + LDADDS = $(GDK_DEP_LIBS) +- + noinst_LTLIBRARIES = libgdk-x11.la +- +-libgdk_x11_la_SOURCES = \ +- MwmUtil.h \ +- gdkapplaunchcontext-x11.c \ +- gdkasync.c \ +- gdkasync.h \ +- gdkcolor-x11.c \ +- gdkcursor-x11.c \ +- gdkdisplay-x11.c \ +- gdkdisplay-x11.h \ +- gdkdnd-x11.c \ +- gdkdrawable-x11.c \ +- gdkdrawable-x11.h \ +- gdkevents-x11.c \ +- gdkfont-x11.c \ +- gdkgc-x11.c \ +- gdkgeometry-x11.c \ +- gdkglobals-x11.c \ +- gdkim-x11.c \ +- gdkimage-x11.c \ +- gdkinput.c \ +- gdkkeys-x11.c \ +- gdkmain-x11.c \ +- gdkpixmap-x11.c \ +- gdkpixmap-x11.h \ +- gdkproperty-x11.c \ +- gdkscreen-x11.c \ +- gdkscreen-x11.h \ +- gdkselection-x11.c \ +- gdkspawn-x11.c \ +- gdktestutils-x11.c \ +- gdkvisual-x11.c \ +- gdkwindow-x11.c \ +- gdkwindow-x11.h \ +- gdkxftdefaults.c \ +- gdkxid.c \ +- gdkx.h \ +- gdkprivate-x11.h \ +- gdkinputprivate.h \ +- xsettings-client.h \ +- xsettings-client.c \ +- xsettings-common.h \ +- xsettings-common.c\ +-$(am__append_1) $(am__append_2) +- ++libgdk_x11_la_SOURCES = MwmUtil.h gdkapplaunchcontext-x11.c gdkasync.c \ ++ gdkasync.h gdkcolor-x11.c gdkcursor-x11.c gdkdisplay-x11.c \ ++ gdkdisplay-x11.h gdkdnd-x11.c gdkdrawable-x11.c \ ++ gdkdrawable-x11.h gdkevents-x11.c gdkfont-x11.c gdkgc-x11.c \ ++ gdkgeometry-x11.c gdkglobals-x11.c gdkim-x11.c gdkimage-x11.c \ ++ gdkinput.c gdkkeys-x11.c gdkmain-x11.c gdkpixmap-x11.c \ ++ gdkpixmap-x11.h gdkproperty-x11.c gdkscreen-x11.c \ ++ gdkscreen-x11.h gdkselection-x11.c gdkspawn-x11.c \ ++ gdktestutils-x11.c gdkvisual-x11.c gdkwindow-x11.c \ ++ gdkwindow-x11.h gdkxftdefaults.c gdkxid.c gdkx.h \ ++ gdkprivate-x11.h gdkinputprivate.h xsettings-client.h \ ++ xsettings-client.c xsettings-common.h xsettings-common.c \ ++ $(am__append_1) $(am__append_2) + libgdkinclude_HEADERS = \ + gdkx.h + +- +-noinst_PROGRAMS = checksettings + checksettings_LDADD = libgdk-x11.la $(GLIB_LIBS) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +- +-TESTS = checksettings +-subdir = gdk/x11 +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +- +-libgdk_x11_la_LDFLAGS = +-libgdk_x11_la_LIBADD = +-am__libgdk_x11_la_SOURCES_DIST = MwmUtil.h gdkapplaunchcontext-x11.c \ +- gdkasync.c gdkasync.h gdkcolor-x11.c gdkcursor-x11.c \ +- gdkdisplay-x11.c gdkdisplay-x11.h gdkdnd-x11.c \ +- gdkdrawable-x11.c gdkdrawable-x11.h gdkevents-x11.c \ +- gdkfont-x11.c gdkgc-x11.c gdkgeometry-x11.c gdkglobals-x11.c \ +- gdkim-x11.c gdkimage-x11.c gdkinput.c gdkkeys-x11.c \ +- gdkmain-x11.c gdkpixmap-x11.c gdkpixmap-x11.h gdkproperty-x11.c \ +- gdkscreen-x11.c gdkscreen-x11.h gdkselection-x11.c \ +- gdkspawn-x11.c gdktestutils-x11.c gdkvisual-x11.c \ +- gdkwindow-x11.c gdkwindow-x11.h gdkxftdefaults.c gdkxid.c \ +- gdkx.h gdkprivate-x11.h gdkinputprivate.h xsettings-client.h \ +- xsettings-client.c xsettings-common.h xsettings-common.c \ +- gdkinput-x11.c gdkinput-xfree.c gdkinput-none.c +-@XINPUT_XFREE_TRUE@am__objects_1 = gdkinput-x11.lo gdkinput-xfree.lo +-@XINPUT_XFREE_FALSE@am__objects_2 = gdkinput-none.lo +-am_libgdk_x11_la_OBJECTS = gdkapplaunchcontext-x11.lo gdkasync.lo \ +- gdkcolor-x11.lo gdkcursor-x11.lo gdkdisplay-x11.lo \ +- gdkdnd-x11.lo gdkdrawable-x11.lo gdkevents-x11.lo \ +- gdkfont-x11.lo gdkgc-x11.lo gdkgeometry-x11.lo \ +- gdkglobals-x11.lo gdkim-x11.lo gdkimage-x11.lo gdkinput.lo \ +- gdkkeys-x11.lo gdkmain-x11.lo gdkpixmap-x11.lo \ +- gdkproperty-x11.lo gdkscreen-x11.lo gdkselection-x11.lo \ +- gdkspawn-x11.lo gdktestutils-x11.lo gdkvisual-x11.lo \ +- gdkwindow-x11.lo gdkxftdefaults.lo gdkxid.lo \ +- xsettings-client.lo xsettings-common.lo $(am__objects_1) \ +- $(am__objects_2) +-libgdk_x11_la_OBJECTS = $(am_libgdk_x11_la_OBJECTS) +-noinst_PROGRAMS = checksettings$(EXEEXT) +-PROGRAMS = $(noinst_PROGRAMS) +- +-checksettings_SOURCES = checksettings.c +-checksettings_OBJECTS = checksettings.$(OBJEXT) +-checksettings_DEPENDENCIES = libgdk-x11.la \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +-checksettings_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/checksettings.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkapplaunchcontext-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkasync.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcolor-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkcursor-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdisplay-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdnd-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkdrawable-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkevents-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkfont-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkgc-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkgeometry-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkglobals-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkim-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkimage-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-none.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput-xfree.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkinput.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkkeys-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkmain-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkpixmap-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkproperty-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkscreen-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkselection-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkspawn-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdktestutils-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkvisual-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkwindow-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkxftdefaults.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdkxid.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/xsettings-client.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/xsettings-common.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(am__libgdk_x11_la_SOURCES_DIST) checksettings.c +-HEADERS = $(libgdkinclude_HEADERS) +- +-DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-SOURCES = $(libgdk_x11_la_SOURCES) checksettings.c +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/x11/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/x11/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgdk-x11.la: $(libgdk_x11_la_OBJECTS) $(libgdk_x11_la_DEPENDENCIES) +- $(LINK) $(libgdk_x11_la_LDFLAGS) $(libgdk_x11_la_OBJECTS) $(libgdk_x11_la_LIBADD) $(LIBS) ++ $(LINK) $(libgdk_x11_la_OBJECTS) $(libgdk_x11_la_LIBADD) $(LIBS) + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -609,10 +453,10 @@ clean-noinstPROGRAMS: + done + checksettings$(EXEEXT): $(checksettings_OBJECTS) $(checksettings_DEPENDENCIES) + @rm -f checksettings$(EXEEXT) +- $(LINK) $(checksettings_LDFLAGS) $(checksettings_OBJECTS) $(checksettings_LDADD) $(LIBS) ++ $(LINK) $(checksettings_OBJECTS) $(checksettings_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -652,82 +496,58 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsettings-common.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-libgdkincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgdkincludeHEADERS: $(libgdkinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) ++ test -z "$(libgdkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdkincludedir)" + @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f"; \ +- $(libgdkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgdkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ ++ $(libgdkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdkincludedir)/$$f"; \ + done + + uninstall-libgdkincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgdkinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgdkincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgdkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgdkincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgdkincludedir)/$$f"; \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -737,23 +557,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -767,9 +587,9 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -778,25 +598,25 @@ check-TESTS: $(TESTS) + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xpass=`expr $$xpass + 1`; \ +- failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xpass=`expr $$xpass + 1`; \ ++ failed=`expr $$failed + 1`; \ ++ echo "XPASS: $$tst"; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xfail=`expr $$xfail + 1`; \ ++ echo "XFAIL: $$tst"; \ + ;; \ + *) \ +- failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ failed=`expr $$failed + 1`; \ ++ echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ +@@ -821,46 +641,40 @@ check-TESTS: $(TESTS) + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ +- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ +- test -n "$$skipped" && echo "$$skipped"; \ +- test -n "$$report" && echo "$$report"; \ ++ test -z "$$skipped" || echo "$$skipped"; \ ++ test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -875,9 +689,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libgdkincludedir) ++ for dir in "$(DESTDIR)$(libgdkincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -897,7 +712,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -911,24 +726,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-libgdkincludeHEADERS + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -949,20 +774,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libgdkincludeHEADERS ++uninstall-am: uninstall-libgdkincludeHEADERS ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ + clean clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-libgdkincludeHEADERS install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ +- uninstall-libgdkincludeHEADERS ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-libgdkincludeHEADERS \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-libgdkincludeHEADERS + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gdk-pixbuf/Makefile.in 2008-10-17 06:07:15.000000000 +0200 ++++ gtk+-2.14.4/gdk-pixbuf/Makefile.in 2008-11-11 18:56:01.868634561 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,14 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ ++ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,1440 +35,1367 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ +-ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ +-AMTAR = @AMTAR@ +-AR = @AR@ +-AS = @AS@ +-ATK_PREFIX = @ATK_PREFIX@ +-AUTOCONF = @AUTOCONF@ +-AUTOHEADER = @AUTOHEADER@ +-AUTOMAKE = @AUTOMAKE@ +-AWK = @AWK@ +-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ +-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ +-CAIRO_PREFIX = @CAIRO_PREFIX@ +-CATALOGS = @CATALOGS@ +-CATOBJEXT = @CATOBJEXT@ +-CC = @CC@ +-CCAS = @CCAS@ +-CCASFLAGS = @CCASFLAGS@ +-CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ +-CUPS_API_MAJOR = @CUPS_API_MAJOR@ +-CUPS_API_MINOR = @CUPS_API_MINOR@ +-CUPS_CFLAGS = @CUPS_CFLAGS@ +-CUPS_CONFIG = @CUPS_CONFIG@ +-CUPS_LIBS = @CUPS_LIBS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ +-CYGPATH_W = @CYGPATH_W@ +-DATADIRNAME = @DATADIRNAME@ +-DB2HTML = @DB2HTML@ +-DEFS = @DEFS@ +-DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ +-DLLTOOL = @DLLTOOL@ +-DSYMUTIL = @DSYMUTIL@ +-ECHO = @ECHO@ +-ECHO_C = @ECHO_C@ +-ECHO_N = @ECHO_N@ +-ECHO_T = @ECHO_T@ +-EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +-EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ +-GAIL_INET_LIBS = @GAIL_INET_LIBS@ +-GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ +-GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +-GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ +-GDK_DEP_LIBS = @GDK_DEP_LIBS@ +-GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ +-GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@ +-GDK_PACKAGES = @GDK_PACKAGES@ +-GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +-GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@ +-GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@ +-GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@ +-GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@ +-GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@ +-GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@ +-GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@ +-GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@ +-GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@ +-GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@ +-GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@ +-GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ +-GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ +-GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +-GDK_WLIBS = @GDK_WLIBS@ +-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +-GLIB_CFLAGS = @GLIB_CFLAGS@ +-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +-GLIB_LIBS = @GLIB_LIBS@ +-GLIB_MKENUMS = @GLIB_MKENUMS@ +-GLIB_PREFIX = @GLIB_PREFIX@ +-GMOFILES = @GMOFILES@ +-GMSGFMT = @GMSGFMT@ +-GOBJECT_QUERY = @GOBJECT_QUERY@ +-GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTK_API_VERSION = @GTK_API_VERSION@ +-GTK_BINARY_AGE = @GTK_BINARY_AGE@ +-GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +-GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ +-GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ +-GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ +-GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ +-GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +-GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@ +-GTK_MICRO_VERSION = @GTK_MICRO_VERSION@ +-GTK_MINOR_VERSION = @GTK_MINOR_VERSION@ +-GTK_PACKAGES = @GTK_PACKAGES@ +-GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ +-GTK_VERSION = @GTK_VERSION@ +-GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ +-HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ +-HTML_DIR = @HTML_DIR@ +-INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ +-INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ +-INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ +-INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ +-INDENT = @INDENT@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-INSTOBJEXT = @INSTOBJEXT@ +-INTLLIBS = @INTLLIBS@ +-LDFLAGS = @LDFLAGS@ +-LIBJASPER = @LIBJASPER@ +-LIBJPEG = @LIBJPEG@ +-LIBOBJS = @LIBOBJS@ +-LIBPNG = @LIBPNG@ +-LIBS = @LIBS@ +-LIBTIFF = @LIBTIFF@ +-LIBTOOL = @LIBTOOL@ +-LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ +-LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LN_S = @LN_S@ +-LTLIBOBJS = @LTLIBOBJS@ +-LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ +-LT_VERSION_INFO = @LT_VERSION_INFO@ +-MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +-MAKEINFO = @MAKEINFO@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-MSGFMT = @MSGFMT@ +-MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +-NM = @NM@ +-NMEDIT = @NMEDIT@ +-OBJDUMP = @OBJDUMP@ +-OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-PACKAGE = @PACKAGE@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +-PACKAGE_NAME = @PACKAGE_NAME@ +-PACKAGE_STRING = @PACKAGE_STRING@ +-PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_VERSION = @PACKAGE_VERSION@ +-PANGO_PREFIX = @PANGO_PREFIX@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ +-PERL = @PERL@ +-PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ +-POFILES = @POFILES@ +-POSUB = @POSUB@ +-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +-RANLIB = @RANLIB@ +-REBUILD = @REBUILD@ +-REBUILD_PNGS = @REBUILD_PNGS@ +-SED = @SED@ +-SET_MAKE = @SET_MAKE@ +-SHELL = @SHELL@ +-STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ +-USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ +-VERSION = @VERSION@ +-WINDRES = @WINDRES@ +-XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ +-XMKMF = @XMKMF@ +-XMLCATALOG = @XMLCATALOG@ +-XML_CATALOG_FILE = @XML_CATALOG_FILE@ +-XSLTPROC = @XSLTPROC@ +-X_CFLAGS = @X_CFLAGS@ +-X_EXTRA_LIBS = @X_EXTRA_LIBS@ +-X_LIBS = @X_LIBS@ +-X_PRE_LIBS = @X_PRE_LIBS@ +-ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +-am__include = @am__include@ +-am__leading_dot = @am__leading_dot@ +-am__quote = @am__quote@ +-bindir = @bindir@ +-build = @build@ +-build_alias = @build_alias@ +-build_cpu = @build_cpu@ +-build_os = @build_os@ +-build_vendor = @build_vendor@ +-datadir = @datadir@ +-datarootdir = @datarootdir@ +-docdir = @docdir@ +-dvidir = @dvidir@ +-exec_prefix = @exec_prefix@ +-gdktarget = @gdktarget@ +-gdktargetlib = @gdktargetlib@ +-gtktargetlib = @gtktargetlib@ +-host = @host@ +-host_alias = @host_alias@ +-host_cpu = @host_cpu@ +-host_os = @host_os@ +-host_vendor = @host_vendor@ +-htmldir = @htmldir@ +-includedir = @includedir@ +-infodir = @infodir@ +-install_sh = @install_sh@ +-libdir = @libdir@ +-libexecdir = @libexecdir@ +-localedir = @localedir@ +-localstatedir = @localstatedir@ +-mandir = @mandir@ +-ms_librarian = @ms_librarian@ +-oldincludedir = @oldincludedir@ +-pdfdir = @pdfdir@ +-prefix = @prefix@ +-program_transform_name = @program_transform_name@ +-psdir = @psdir@ +-sbindir = @sbindir@ +-sharedstatedir = @sharedstatedir@ +-sysconfdir = @sysconfdir@ +-target_alias = @target_alias@ +- +-GTESTER = gtester # in $PATH for non-GLIB packages +-GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages +- +-# initialize variables for unconditional += appending +-EXTRA_DIST = \ +- gdk-pixbuf-csource.1 \ +- makefile.msc \ +- gdk-pixbuf.symbols \ +- makegdkpixbufalias.pl \ +- abicheck.sh \ +- pltcheck.sh \ +- gdk_pixbuf.def \ +- gdk_pixbuf.rc \ +- gdk-pixbuf-marshal.c \ +- gdk-pixbuf-marshal.list \ +- gdk-pixbuf-enum-types.c.template \ +- gdk-pixbuf-enum-types.h.template \ +- gen-color-table.pl +- +-TEST_PROGS = +- +-### testing rules +- +-# Xvfb based test rules +-XVFB = Xvfb -screen 0 800x600x16 +-XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ +- 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ +- 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ +- 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ +- 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ +- 9995 9996 9997 9998 9999 +- +-SKIP_GDKTARGET = \ +- test "$(gdktarget)" != "x11" \ +- && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." +- +-XVFB_START = \ +- ${XVFB} -help 2>/dev/null 1>&2 \ +- && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ +- && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ +- trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ +- && DISPLAY=:$$XID && export DISPLAY +- +- +-SUBDIRS = pixops +- +-@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined +- +-@OS_WIN32_TRUE@gdk_pixbuf_def = gdk_pixbuf.def +-@OS_WIN32_TRUE@gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def +- +-@OS_WIN32_TRUE@gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o +-@OS_WIN32_TRUE@gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o +- +-@OS_WIN32_TRUE@libole32 = -lole32 +- +-@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib +- +-@OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh +- +-lib_LTLIBRARIES = \ +- libgdk_pixbuf-2.0.la +- +- +-loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders +- +-module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) +- +-# +-# The PNG loader +-# +-libstatic_pixbufloader_png_la_SOURCES = io-png.c +-libpixbufloader_png_la_SOURCES = io-png.c +-libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs) +- +-# +-# The BMP loader +-# +-libstatic_pixbufloader_bmp_la_SOURCES = io-bmp.c +-libpixbufloader_bmp_la_SOURCES = io-bmp.c +-libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_bmp_la_LIBADD = $(module_libs) +- +-# +-# The WBMP loader +-# +-libstatic_pixbufloader_wbmp_la_SOURCES = io-wbmp.c +-libpixbufloader_wbmp_la_SOURCES = io-wbmp.c +-libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_wbmp_la_LIBADD = $(module_libs) +- +-# +-# The GIF loader +-# +-libstatic_pixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h +-libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h +-libpixbufloader_gif_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_gif_la_LIBADD = $(module_libs) +- +-# +-# The ICO loader +-# +-libstatic_pixbufloader_ico_la_SOURCES = io-ico.c +-libpixbufloader_ico_la_SOURCES = io-ico.c +-libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_ico_la_LIBADD = $(module_libs) +- +-# +-# The ANI loader +-# +-libstatic_pixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h +-libpixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h +-libpixbufloader_ani_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_ani_la_LIBADD = $(module_libs) +- +-# +-# The JPEG loader +-# +-libstatic_pixbufloader_jpeg_la_SOURCES = io-jpeg.c +-libpixbufloader_jpeg_la_SOURCES = io-jpeg.c +-libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs) +- +-# +-# The PNM loader +-# +-libstatic_pixbufloader_pnm_la_SOURCES = io-pnm.c +-libpixbufloader_pnm_la_SOURCES = io-pnm.c +-libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_pnm_la_LIBADD = $(module_libs) +- +-# +-# The RAS loader +-# +-libstatic_pixbufloader_ras_la_SOURCES = io-ras.c +-libpixbufloader_ras_la_SOURCES = io-ras.c +-libpixbufloader_ras_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_ras_la_LIBADD = $(module_libs) +- +-# +-# The TIFF loader +-# +-libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c +-libpixbufloader_tiff_la_SOURCES = io-tiff.c +-libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs) +- +-# +-# The XPM loader +-# +-libstatic_pixbufloader_xpm_la_SOURCES = io-xpm.c +-libpixbufloader_xpm_la_SOURCES = io-xpm.c +-libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_xpm_la_LIBADD = $(module_libs) +- +-# +-# The XBM loader +-# +-libstatic_pixbufloader_xbm_la_SOURCES = io-xbm.c +-libpixbufloader_xbm_la_SOURCES = io-xbm.c +-libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_xbm_la_LIBADD = $(module_libs) +- +-# +-# The TGA loader +-# +-libstatic_pixbufloader_tga_la_SOURCES = io-tga.c +-libpixbufloader_tga_la_SOURCES = io-tga.c +-libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_tga_la_LIBADD = $(module_libs) +- +-# +-# The .icns loader +-# +-libstatic_pixbufloader_icns_la_SOURCES = io-icns.c +-libpixbufloader_icns_la_SOURCES = io-icns.c +-libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_icns_la_LIBADD = $(module_libs) +- +-# +-# The PCX loader +-# +-libstatic_pixbufloader_pcx_la_SOURCES = io-pcx.c +-libpixbufloader_pcx_la_SOURCES = io-pcx.c +-libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_pcx_la_LIBADD = $(module_libs) +- +-# +-# The JPEG2000 loader +-# +-libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c +-libpixbufloader_jasper_la_SOURCES = io-jasper.c +-libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined) +-libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs) +- +- +-# When building the GDI+ loader statically, we put the "common" objects +-# only in one of the archives to avoid duplicate definitions +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@STATIC_GDIPLUS_LIBS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-ico.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-wmf.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-emf.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-bmp.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-gif.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-jpeg.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-tiff.la +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_ico_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_wmf_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_emf_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_bmp_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_gif_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_jpeg_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_png_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-png.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_tiff_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.c +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@GDIPLUS_LIBS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-ico.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-wmf.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-emf.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-bmp.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-gif.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-jpeg.la \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-tiff.la +- +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-png.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32) +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_SOURCES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.c +- +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32) +- +- +-# Loaders that aren't built if we build the GDI+ loader +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE@STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@BMP_LIB = libpixbufloader-bmp.la +- +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE@STATIC_GIF_LIB = libstatic-pixbufloader-gif.la +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@GIF_LIB = libpixbufloader-gif.la ++DIST_COMMON = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) \ ++ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/gdk-pixbuf-features.h.in $(srcdir)/gdk_pixbuf.rc.in \ ++ $(top_srcdir)/Makefile.decl ChangeLog ++noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) ++bin_PROGRAMS = gdk-pixbuf-csource$(EXEEXT) \ ++ gdk-pixbuf-query-loaders$(EXEEXT) ++subdir = gdk-pixbuf ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(loaderdir)" \ ++ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libgdk_pixbufincludedir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) ++loaderLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) $(loader_LTLIBRARIES) \ ++ $(noinst_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++am_libgdk_pixbuf_2_0_la_OBJECTS = gdk-pixbuf.lo \ ++ gdk-pixbuf-animation.lo gdk-pixbuf-data.lo gdk-pixbuf-io.lo \ ++ gdk-pixbuf-loader.lo gdk-pixbuf-scale.lo \ ++ gdk-pixbuf-simple-anim.lo gdk-pixbuf-scaled-anim.lo \ ++ gdk-pixbuf-util.lo gdk-pixdata.lo gdk-pixbuf-enum-types.lo ++libgdk_pixbuf_2_0_la_OBJECTS = $(am_libgdk_pixbuf_2_0_la_OBJECTS) ++libgdk_pixbuf_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgdk_pixbuf_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++am__DEPENDENCIES_2 = libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(am__DEPENDENCIES_1) ++libpixbufloader_ani_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo ++libpixbufloader_ani_la_OBJECTS = $(am_libpixbufloader_ani_la_OBJECTS) ++libpixbufloader_ani_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_ani_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@am_libpixbufloader_ani_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ANI_FALSE@ $(loaderdir) ++libpixbufloader_bmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_bmp_la_OBJECTS = io-bmp.lo ++libpixbufloader_bmp_la_OBJECTS = $(am_libpixbufloader_bmp_la_OBJECTS) ++libpixbufloader_bmp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_bmp_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@am_libpixbufloader_bmp_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-bmp.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_bmp_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.lo ++libpixbufloader_gdip_bmp_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_bmp_la_OBJECTS) ++libpixbufloader_gdip_bmp_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_bmp_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_bmp_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-emf.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_emf_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.lo ++libpixbufloader_gdip_emf_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_emf_la_OBJECTS) ++libpixbufloader_gdip_emf_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_emf_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_emf_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-gif.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_gif_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.lo ++libpixbufloader_gdip_gif_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_gif_la_OBJECTS) ++libpixbufloader_gdip_gif_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_gif_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_gif_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_ico_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-ico.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_ico_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.lo ++libpixbufloader_gdip_ico_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_ico_la_OBJECTS) ++libpixbufloader_gdip_ico_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_ico_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_ico_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-jpeg.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_jpeg_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.lo ++libpixbufloader_gdip_jpeg_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_jpeg_la_OBJECTS) ++libpixbufloader_gdip_jpeg_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_jpeg_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_jpeg_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-tiff.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_tiff_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.lo ++libpixbufloader_gdip_tiff_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_tiff_la_OBJECTS) ++libpixbufloader_gdip_tiff_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_tiff_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_tiff_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(am__DEPENDENCIES_1) ++am__libpixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-native.h \ ++ io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ ++ io-gdip-animation.c io-gdip-animation.h io-gdip-wmf.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_wmf_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.lo ++libpixbufloader_gdip_wmf_la_OBJECTS = \ ++ $(am_libpixbufloader_gdip_wmf_la_OBJECTS) ++libpixbufloader_gdip_wmf_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_gdip_wmf_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_wmf_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ $(loaderdir) ++libpixbufloader_gif_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo ++libpixbufloader_gif_la_OBJECTS = $(am_libpixbufloader_gif_la_OBJECTS) ++libpixbufloader_gif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_gif_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@am_libpixbufloader_gif_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@ $(loaderdir) ++libpixbufloader_icns_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_icns_la_OBJECTS = io-icns.lo ++libpixbufloader_icns_la_OBJECTS = \ ++ $(am_libpixbufloader_icns_la_OBJECTS) ++libpixbufloader_icns_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_icns_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICNS_FALSE@am_libpixbufloader_icns_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICNS_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_ICNS_FALSE@ $(loaderdir) ++libpixbufloader_ico_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_ico_la_OBJECTS = io-ico.lo ++libpixbufloader_ico_la_OBJECTS = $(am_libpixbufloader_ico_la_OBJECTS) ++libpixbufloader_ico_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_ico_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@am_libpixbufloader_ico_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ $(loaderdir) ++libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_2) ++am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo ++libpixbufloader_jasper_la_OBJECTS = \ ++ $(am_libpixbufloader_jasper_la_OBJECTS) ++libpixbufloader_jasper_la_LINK = $(LIBTOOL) --tag=CC \ ++ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(AM_CFLAGS) $(CFLAGS) $(libpixbufloader_jasper_la_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@am_libpixbufloader_jasper_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@ $(loaderdir) ++libpixbufloader_jpeg_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_2) ++am_libpixbufloader_jpeg_la_OBJECTS = io-jpeg.lo ++libpixbufloader_jpeg_la_OBJECTS = \ ++ $(am_libpixbufloader_jpeg_la_OBJECTS) ++libpixbufloader_jpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_jpeg_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@am_libpixbufloader_jpeg_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@ $(loaderdir) ++libpixbufloader_pcx_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_pcx_la_OBJECTS = io-pcx.lo ++libpixbufloader_pcx_la_OBJECTS = $(am_libpixbufloader_pcx_la_OBJECTS) ++libpixbufloader_pcx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_pcx_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@am_libpixbufloader_pcx_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PCX_FALSE@ $(loaderdir) ++libpixbufloader_png_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_2) ++am_libpixbufloader_png_la_OBJECTS = io-png.lo ++libpixbufloader_png_la_OBJECTS = $(am_libpixbufloader_png_la_OBJECTS) ++libpixbufloader_png_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_png_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@am_libpixbufloader_png_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@ $(loaderdir) ++libpixbufloader_pnm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_pnm_la_OBJECTS = io-pnm.lo ++libpixbufloader_pnm_la_OBJECTS = $(am_libpixbufloader_pnm_la_OBJECTS) ++libpixbufloader_pnm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_pnm_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@am_libpixbufloader_pnm_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_PNM_FALSE@ $(loaderdir) ++libpixbufloader_ras_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_ras_la_OBJECTS = io-ras.lo ++libpixbufloader_ras_la_OBJECTS = $(am_libpixbufloader_ras_la_OBJECTS) ++libpixbufloader_ras_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_ras_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@am_libpixbufloader_ras_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_RAS_FALSE@ $(loaderdir) ++libpixbufloader_tga_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_tga_la_OBJECTS = io-tga.lo ++libpixbufloader_tga_la_OBJECTS = $(am_libpixbufloader_tga_la_OBJECTS) ++libpixbufloader_tga_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_tga_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@am_libpixbufloader_tga_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_TGA_FALSE@ $(loaderdir) ++libpixbufloader_tiff_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_2) ++am_libpixbufloader_tiff_la_OBJECTS = io-tiff.lo ++libpixbufloader_tiff_la_OBJECTS = \ ++ $(am_libpixbufloader_tiff_la_OBJECTS) ++libpixbufloader_tiff_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_tiff_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@am_libpixbufloader_tiff_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@ $(loaderdir) ++libpixbufloader_wbmp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_wbmp_la_OBJECTS = io-wbmp.lo ++libpixbufloader_wbmp_la_OBJECTS = \ ++ $(am_libpixbufloader_wbmp_la_OBJECTS) ++libpixbufloader_wbmp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_wbmp_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@am_libpixbufloader_wbmp_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_WBMP_FALSE@ $(loaderdir) ++libpixbufloader_xbm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_xbm_la_OBJECTS = io-xbm.lo ++libpixbufloader_xbm_la_OBJECTS = $(am_libpixbufloader_xbm_la_OBJECTS) ++libpixbufloader_xbm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_xbm_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@am_libpixbufloader_xbm_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XBM_FALSE@ $(loaderdir) ++libpixbufloader_xpm_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixbufloader_xpm_la_OBJECTS = io-xpm.lo ++libpixbufloader_xpm_la_OBJECTS = $(am_libpixbufloader_xpm_la_OBJECTS) ++libpixbufloader_xpm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixbufloader_xpm_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@am_libpixbufloader_xpm_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_XPM_FALSE@ $(loaderdir) ++libstatic_pixbufloader_ani_la_LIBADD = ++am_libstatic_pixbufloader_ani_la_OBJECTS = io-ani.lo \ ++ io-ani-animation.lo ++libstatic_pixbufloader_ani_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_ani_la_OBJECTS) ++@INCLUDE_ANI_TRUE@am_libstatic_pixbufloader_ani_la_rpath = ++libstatic_pixbufloader_bmp_la_LIBADD = ++am_libstatic_pixbufloader_bmp_la_OBJECTS = io-bmp.lo ++libstatic_pixbufloader_bmp_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_bmp_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE@am_libstatic_pixbufloader_bmp_la_rpath = ++libstatic_pixbufloader_gdip_bmp_la_LIBADD = ++am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-bmp.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS = io-gdip-bmp.lo ++libstatic_pixbufloader_gdip_bmp_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_bmp_la_rpath = ++libstatic_pixbufloader_gdip_emf_la_LIBADD = ++am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-emf.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_emf_la_OBJECTS = io-gdip-emf.lo ++libstatic_pixbufloader_gdip_emf_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_emf_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_emf_la_rpath = ++libstatic_pixbufloader_gdip_gif_la_LIBADD = ++am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-gif.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_gif_la_OBJECTS = io-gdip-gif.lo ++libstatic_pixbufloader_gdip_gif_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_gif_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_gif_la_rpath = ++libstatic_pixbufloader_gdip_ico_la_LIBADD = ++am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST = \ ++ io-gdip-native.h io-gdip-propertytags.h io-gdip-utils.h \ ++ io-gdip-utils.c io-gdip-animation.c io-gdip-animation.h \ ++ io-gdip-ico.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_ico_la_OBJECTS = io-gdip-utils.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.lo \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.lo ++libstatic_pixbufloader_gdip_ico_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_ico_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_ico_la_rpath = ++libstatic_pixbufloader_gdip_jpeg_la_LIBADD = ++am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-jpeg.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = io-gdip-jpeg.lo ++libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_jpeg_la_rpath = ++libstatic_pixbufloader_gdip_tiff_la_LIBADD = ++am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-tiff.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS = io-gdip-tiff.lo ++libstatic_pixbufloader_gdip_tiff_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_tiff_la_rpath = ++libstatic_pixbufloader_gdip_wmf_la_LIBADD = ++am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-wmf.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS = io-gdip-wmf.lo ++libstatic_pixbufloader_gdip_wmf_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_wmf_la_rpath = ++libstatic_pixbufloader_gif_la_LIBADD = ++am_libstatic_pixbufloader_gif_la_OBJECTS = io-gif.lo \ ++ io-gif-animation.lo ++libstatic_pixbufloader_gif_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_gif_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE@am_libstatic_pixbufloader_gif_la_rpath = ++libstatic_pixbufloader_icns_la_LIBADD = ++am_libstatic_pixbufloader_icns_la_OBJECTS = io-icns.lo ++libstatic_pixbufloader_icns_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_icns_la_OBJECTS) ++@INCLUDE_ICNS_TRUE@am_libstatic_pixbufloader_icns_la_rpath = ++libstatic_pixbufloader_ico_la_LIBADD = ++am_libstatic_pixbufloader_ico_la_OBJECTS = io-ico.lo ++libstatic_pixbufloader_ico_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_ico_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE@am_libstatic_pixbufloader_ico_la_rpath = ++libstatic_pixbufloader_jasper_la_LIBADD = ++am_libstatic_pixbufloader_jasper_la_OBJECTS = io-jasper.lo ++libstatic_pixbufloader_jasper_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_jasper_la_OBJECTS) ++@HAVE_JASPER_TRUE@@INCLUDE_JASPER_TRUE@am_libstatic_pixbufloader_jasper_la_rpath = ++libstatic_pixbufloader_jpeg_la_LIBADD = ++am_libstatic_pixbufloader_jpeg_la_OBJECTS = io-jpeg.lo ++libstatic_pixbufloader_jpeg_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_jpeg_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@am_libstatic_pixbufloader_jpeg_la_rpath = ++libstatic_pixbufloader_pcx_la_LIBADD = ++am_libstatic_pixbufloader_pcx_la_OBJECTS = io-pcx.lo ++libstatic_pixbufloader_pcx_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_pcx_la_OBJECTS) ++@INCLUDE_PCX_TRUE@am_libstatic_pixbufloader_pcx_la_rpath = ++libstatic_pixbufloader_png_la_LIBADD = ++am_libstatic_pixbufloader_png_la_OBJECTS = io-png.lo ++libstatic_pixbufloader_png_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_png_la_OBJECTS) ++@HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@am_libstatic_pixbufloader_png_la_rpath = ++libstatic_pixbufloader_pnm_la_LIBADD = ++am_libstatic_pixbufloader_pnm_la_OBJECTS = io-pnm.lo ++libstatic_pixbufloader_pnm_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_pnm_la_OBJECTS) ++@INCLUDE_PNM_TRUE@am_libstatic_pixbufloader_pnm_la_rpath = ++libstatic_pixbufloader_ras_la_LIBADD = ++am_libstatic_pixbufloader_ras_la_OBJECTS = io-ras.lo ++libstatic_pixbufloader_ras_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_ras_la_OBJECTS) ++@INCLUDE_RAS_TRUE@am_libstatic_pixbufloader_ras_la_rpath = ++libstatic_pixbufloader_tga_la_LIBADD = ++am_libstatic_pixbufloader_tga_la_OBJECTS = io-tga.lo ++libstatic_pixbufloader_tga_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_tga_la_OBJECTS) ++@INCLUDE_TGA_TRUE@am_libstatic_pixbufloader_tga_la_rpath = ++libstatic_pixbufloader_tiff_la_LIBADD = ++am_libstatic_pixbufloader_tiff_la_OBJECTS = io-tiff.lo ++libstatic_pixbufloader_tiff_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_tiff_la_OBJECTS) ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@am_libstatic_pixbufloader_tiff_la_rpath = ++libstatic_pixbufloader_wbmp_la_LIBADD = ++am_libstatic_pixbufloader_wbmp_la_OBJECTS = io-wbmp.lo ++libstatic_pixbufloader_wbmp_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_wbmp_la_OBJECTS) ++@INCLUDE_WBMP_TRUE@am_libstatic_pixbufloader_wbmp_la_rpath = ++libstatic_pixbufloader_xbm_la_LIBADD = ++am_libstatic_pixbufloader_xbm_la_OBJECTS = io-xbm.lo ++libstatic_pixbufloader_xbm_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_xbm_la_OBJECTS) ++@INCLUDE_XBM_TRUE@am_libstatic_pixbufloader_xbm_la_rpath = ++libstatic_pixbufloader_xpm_la_LIBADD = ++am_libstatic_pixbufloader_xpm_la_OBJECTS = io-xpm.lo ++libstatic_pixbufloader_xpm_la_OBJECTS = \ ++ $(am_libstatic_pixbufloader_xpm_la_OBJECTS) ++@INCLUDE_XPM_TRUE@am_libstatic_pixbufloader_xpm_la_rpath = ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) ++am_gdk_pixbuf_csource_OBJECTS = gdk-pixbuf-csource.$(OBJEXT) ++gdk_pixbuf_csource_OBJECTS = $(am_gdk_pixbuf_csource_OBJECTS) ++gdk_pixbuf_csource_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT) ++gdk_pixbuf_query_loaders_OBJECTS = \ ++ $(am_gdk_pixbuf_query_loaders_OBJECTS) ++test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c ++test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT) ++test_gdk_pixbuf_DEPENDENCIES = $(am__DEPENDENCIES_2) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ ++ $(libpixbufloader_ani_la_SOURCES) \ ++ $(libpixbufloader_bmp_la_SOURCES) \ ++ $(libpixbufloader_gdip_bmp_la_SOURCES) \ ++ $(libpixbufloader_gdip_emf_la_SOURCES) \ ++ $(libpixbufloader_gdip_gif_la_SOURCES) \ ++ $(libpixbufloader_gdip_ico_la_SOURCES) \ ++ $(libpixbufloader_gdip_jpeg_la_SOURCES) \ ++ $(libpixbufloader_gdip_tiff_la_SOURCES) \ ++ $(libpixbufloader_gdip_wmf_la_SOURCES) \ ++ $(libpixbufloader_gif_la_SOURCES) \ ++ $(libpixbufloader_icns_la_SOURCES) \ ++ $(libpixbufloader_ico_la_SOURCES) \ ++ $(libpixbufloader_jasper_la_SOURCES) \ ++ $(libpixbufloader_jpeg_la_SOURCES) \ ++ $(libpixbufloader_pcx_la_SOURCES) \ ++ $(libpixbufloader_png_la_SOURCES) \ ++ $(libpixbufloader_pnm_la_SOURCES) \ ++ $(libpixbufloader_ras_la_SOURCES) \ ++ $(libpixbufloader_tga_la_SOURCES) \ ++ $(libpixbufloader_tiff_la_SOURCES) \ ++ $(libpixbufloader_wbmp_la_SOURCES) \ ++ $(libpixbufloader_xbm_la_SOURCES) \ ++ $(libpixbufloader_xpm_la_SOURCES) \ ++ $(libstatic_pixbufloader_ani_la_SOURCES) \ ++ $(libstatic_pixbufloader_bmp_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_bmp_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_emf_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_gif_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_ico_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_jpeg_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_tiff_la_SOURCES) \ ++ $(libstatic_pixbufloader_gdip_wmf_la_SOURCES) \ ++ $(libstatic_pixbufloader_gif_la_SOURCES) \ ++ $(libstatic_pixbufloader_icns_la_SOURCES) \ ++ $(libstatic_pixbufloader_ico_la_SOURCES) \ ++ $(libstatic_pixbufloader_jasper_la_SOURCES) \ ++ $(libstatic_pixbufloader_jpeg_la_SOURCES) \ ++ $(libstatic_pixbufloader_pcx_la_SOURCES) \ ++ $(libstatic_pixbufloader_png_la_SOURCES) \ ++ $(libstatic_pixbufloader_pnm_la_SOURCES) \ ++ $(libstatic_pixbufloader_ras_la_SOURCES) \ ++ $(libstatic_pixbufloader_tga_la_SOURCES) \ ++ $(libstatic_pixbufloader_tiff_la_SOURCES) \ ++ $(libstatic_pixbufloader_wbmp_la_SOURCES) \ ++ $(libstatic_pixbufloader_xbm_la_SOURCES) \ ++ $(libstatic_pixbufloader_xpm_la_SOURCES) \ ++ $(gdk_pixbuf_csource_SOURCES) \ ++ $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c ++DIST_SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ ++ $(libpixbufloader_ani_la_SOURCES) \ ++ $(libpixbufloader_bmp_la_SOURCES) \ ++ $(am__libpixbufloader_gdip_bmp_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_emf_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_gif_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_ico_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_tiff_la_SOURCES_DIST) \ ++ $(am__libpixbufloader_gdip_wmf_la_SOURCES_DIST) \ ++ $(libpixbufloader_gif_la_SOURCES) \ ++ $(libpixbufloader_icns_la_SOURCES) \ ++ $(libpixbufloader_ico_la_SOURCES) \ ++ $(libpixbufloader_jasper_la_SOURCES) \ ++ $(libpixbufloader_jpeg_la_SOURCES) \ ++ $(libpixbufloader_pcx_la_SOURCES) \ ++ $(libpixbufloader_png_la_SOURCES) \ ++ $(libpixbufloader_pnm_la_SOURCES) \ ++ $(libpixbufloader_ras_la_SOURCES) \ ++ $(libpixbufloader_tga_la_SOURCES) \ ++ $(libpixbufloader_tiff_la_SOURCES) \ ++ $(libpixbufloader_wbmp_la_SOURCES) \ ++ $(libpixbufloader_xbm_la_SOURCES) \ ++ $(libpixbufloader_xpm_la_SOURCES) \ ++ $(libstatic_pixbufloader_ani_la_SOURCES) \ ++ $(libstatic_pixbufloader_bmp_la_SOURCES) \ ++ $(am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST) \ ++ $(am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST) \ ++ $(libstatic_pixbufloader_gif_la_SOURCES) \ ++ $(libstatic_pixbufloader_icns_la_SOURCES) \ ++ $(libstatic_pixbufloader_ico_la_SOURCES) \ ++ $(libstatic_pixbufloader_jasper_la_SOURCES) \ ++ $(libstatic_pixbufloader_jpeg_la_SOURCES) \ ++ $(libstatic_pixbufloader_pcx_la_SOURCES) \ ++ $(libstatic_pixbufloader_png_la_SOURCES) \ ++ $(libstatic_pixbufloader_pnm_la_SOURCES) \ ++ $(libstatic_pixbufloader_ras_la_SOURCES) \ ++ $(libstatic_pixbufloader_tga_la_SOURCES) \ ++ $(libstatic_pixbufloader_tiff_la_SOURCES) \ ++ $(libstatic_pixbufloader_wbmp_la_SOURCES) \ ++ $(libstatic_pixbufloader_xbm_la_SOURCES) \ ++ $(libstatic_pixbufloader_xpm_la_SOURCES) \ ++ $(gdk_pixbuf_csource_SOURCES) \ ++ $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++DATA = $(noinst_DATA) ++libgdk_pixbufincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = @ACLOCAL@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++AS = @AS@ ++ATK_PREFIX = @ATK_PREFIX@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ ++BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ ++CAIRO_PREFIX = @CAIRO_PREFIX@ ++CATALOGS = @CATALOGS@ ++CATOBJEXT = @CATOBJEXT@ ++CC = @CC@ ++CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ ++CCASFLAGS = @CCASFLAGS@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CUPS_API_MAJOR = @CUPS_API_MAJOR@ ++CUPS_API_MINOR = @CUPS_API_MINOR@ ++CUPS_CFLAGS = @CUPS_CFLAGS@ ++CUPS_CONFIG = @CUPS_CONFIG@ ++CUPS_LIBS = @CUPS_LIBS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DATADIRNAME = @DATADIRNAME@ ++DB2HTML = @DB2HTML@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ ++ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++GAIL_INET_LIBS = @GAIL_INET_LIBS@ ++GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ ++GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ ++GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ ++GDK_DEP_LIBS = @GDK_DEP_LIBS@ ++GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ ++GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@ ++GDK_PACKAGES = @GDK_PACKAGES@ ++GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ ++GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@ ++GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@ ++GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@ ++GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@ ++GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@ ++GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@ ++GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@ ++GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@ ++GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@ ++GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@ ++GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@ ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ ++GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ ++GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ ++GDK_WLIBS = @GDK_WLIBS@ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ ++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ ++GLIB_MKENUMS = @GLIB_MKENUMS@ ++GLIB_PREFIX = @GLIB_PREFIX@ ++GMOFILES = @GMOFILES@ ++GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ ++GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTK_API_VERSION = @GTK_API_VERSION@ ++GTK_BINARY_AGE = @GTK_BINARY_AGE@ ++GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ ++GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ ++GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ ++GTK_DEP_LIBS = @GTK_DEP_LIBS@ ++GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ ++GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ ++GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ ++GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@ ++GTK_MICRO_VERSION = @GTK_MICRO_VERSION@ ++GTK_MINOR_VERSION = @GTK_MINOR_VERSION@ ++GTK_PACKAGES = @GTK_PACKAGES@ ++GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ ++GTK_VERSION = @GTK_VERSION@ ++GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ ++HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ ++HTML_DIR = @HTML_DIR@ ++INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ ++INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ ++INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ ++INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ ++INDENT = @INDENT@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++INSTOBJEXT = @INSTOBJEXT@ ++INTLLIBS = @INTLLIBS@ ++LDFLAGS = @LDFLAGS@ ++LIBJASPER = @LIBJASPER@ ++LIBJPEG = @LIBJPEG@ ++LIBOBJS = @LIBOBJS@ ++LIBPNG = @LIBPNG@ ++LIBS = @LIBS@ ++LIBTIFF = @LIBTIFF@ ++LIBTOOL = @LIBTOOL@ ++LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ ++LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ ++LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ ++MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ ++NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PANGO_PREFIX = @PANGO_PREFIX@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PERL = @PERL@ ++PKG_CONFIG = @PKG_CONFIG@ ++POFILES = @POFILES@ ++POSUB = @POSUB@ ++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ ++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ ++RANLIB = @RANLIB@ ++REBUILD = @REBUILD@ ++REBUILD_PNGS = @REBUILD_PNGS@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++STRIP = @STRIP@ ++USE_NLS = @USE_NLS@ ++VERSION = @VERSION@ ++WINDRES = @WINDRES@ ++XGETTEXT = @XGETTEXT@ ++XMKMF = @XMKMF@ ++XMLCATALOG = @XMLCATALOG@ ++XML_CATALOG_FILE = @XML_CATALOG_FILE@ ++XSLTPROC = @XSLTPROC@ ++X_CFLAGS = @X_CFLAGS@ ++X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++X_LIBS = @X_LIBS@ ++X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++gdktarget = @gdktarget@ ++gdktargetlib = @gdktargetlib@ ++gtktargetlib = @gtktargetlib@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++ms_librarian = @ms_librarian@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++GTESTER = gtester # in $PATH for non-GLIB packages ++GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE@STATIC_ICO_LIB = libstatic-pixbufloader-ico.la +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ICO_LIB = libpixbufloader-ico.la ++# initialize variables for unconditional += appending ++EXTRA_DIST = gdk-pixbuf-csource.1 makefile.msc gdk-pixbuf.symbols \ ++ makegdkpixbufalias.pl abicheck.sh pltcheck.sh gdk_pixbuf.def \ ++ gdk_pixbuf.rc gdk-pixbuf-marshal.c gdk-pixbuf-marshal.list \ ++ gdk-pixbuf-enum-types.c.template \ ++ gdk-pixbuf-enum-types.h.template gen-color-table.pl ++TEST_PROGS = + +-@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la +-@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@JPEG_LIB = libpixbufloader-jpeg.la ++### testing rules + +-@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la +-@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@TIFF_LIB = libpixbufloader-tiff.la ++# Xvfb based test rules ++XVFB = Xvfb -screen 0 800x600x16 ++XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ ++ 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ ++ 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ ++ 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ ++ 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ ++ 9995 9996 9997 9998 9999 + ++SKIP_GDKTARGET = \ ++ test "$(gdktarget)" != "x11" \ ++ && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." + +-# End of loaders not built if building GDI+ loader +-@HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@STATIC_PNG_LIB = libstatic-pixbufloader-png.la +-@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@PNG_LIB = libpixbufloader-png.la ++XVFB_START = \ ++ ${XVFB} -help 2>/dev/null 1>&2 \ ++ && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ ++ && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ ++ trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ ++ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ ++ && DISPLAY=:$$XID && export DISPLAY + +-@INCLUDE_WBMP_TRUE@STATIC_WBMP_LIB = libstatic-pixbufloader-wbmp.la +-@INCLUDE_WBMP_FALSE@WBMP_LIB = libpixbufloader-wbmp.la ++SUBDIRS = pixops ++@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined ++@OS_WIN32_TRUE@gdk_pixbuf_def = gdk_pixbuf.def ++@OS_WIN32_TRUE@gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def ++@OS_WIN32_TRUE@gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o ++@OS_WIN32_TRUE@gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o ++@OS_WIN32_TRUE@libole32 = -lole32 ++@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib ++@OS_LINUX_TRUE@TESTS = abicheck.sh pltcheck.sh ++lib_LTLIBRARIES = \ ++ libgdk_pixbuf-2.0.la + +-@INCLUDE_ANI_TRUE@STATIC_ANI_LIB = libstatic-pixbufloader-ani.la +-@INCLUDE_ANI_FALSE@ANI_LIB = libpixbufloader-ani.la ++loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders +loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d ++module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) - module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) +-@INCLUDE_PNM_TRUE@STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la +-@INCLUDE_PNM_FALSE@PNM_LIB = libpixbufloader-pnm.la ++# ++# The PNG loader ++# ++libstatic_pixbufloader_png_la_SOURCES = io-png.c ++libpixbufloader_png_la_SOURCES = io-png.c ++libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs) -@@ -841,7 +845,7 @@ - -DGDK_PIXBUF_ENABLE_BACKEND +-@INCLUDE_RAS_TRUE@STATIC_RAS_LIB = libstatic-pixbufloader-ras.la +-@INCLUDE_RAS_FALSE@RAS_LIB = libpixbufloader-ras.la ++# ++# The BMP loader ++# ++libstatic_pixbufloader_bmp_la_SOURCES = io-bmp.c ++libpixbufloader_bmp_la_SOURCES = io-bmp.c ++libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_bmp_la_LIBADD = $(module_libs) +-@INCLUDE_XPM_TRUE@STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la +-@INCLUDE_XPM_FALSE@XPM_LIB = libpixbufloader-xpm.la ++# ++# The WBMP loader ++# ++libstatic_pixbufloader_wbmp_la_SOURCES = io-wbmp.c ++libpixbufloader_wbmp_la_SOURCES = io-wbmp.c ++libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_wbmp_la_LIBADD = $(module_libs) + +-@INCLUDE_XBM_TRUE@STATIC_XBM_LIB = libstatic-pixbufloader-xbm.la +-@INCLUDE_XBM_FALSE@XBM_LIB = libpixbufloader-xbm.la ++# ++# The GIF loader ++# ++libstatic_pixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h ++libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h ++libpixbufloader_gif_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_gif_la_LIBADD = $(module_libs) + +-@INCLUDE_TGA_TRUE@STATIC_TGA_LIB = libstatic-pixbufloader-tga.la +-@INCLUDE_TGA_FALSE@TGA_LIB = libpixbufloader-tga.la ++# ++# The ICO loader ++# ++libstatic_pixbufloader_ico_la_SOURCES = io-ico.c ++libpixbufloader_ico_la_SOURCES = io-ico.c ++libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_ico_la_LIBADD = $(module_libs) + +-@INCLUDE_PCX_TRUE@STATIC_PCX_LIB = libstatic-pixbufloader-pcx.la +-@INCLUDE_PCX_FALSE@PCX_LIB = libpixbufloader-pcx.la ++# ++# The ANI loader ++# ++libstatic_pixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h ++libpixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h ++libpixbufloader_ani_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_ani_la_LIBADD = $(module_libs) + +-@INCLUDE_ICNS_TRUE@STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la +-@INCLUDE_ICNS_FALSE@ICNS_LIB = libpixbufloader-icns.la ++# ++# The JPEG loader ++# ++libstatic_pixbufloader_jpeg_la_SOURCES = io-jpeg.c ++libpixbufloader_jpeg_la_SOURCES = io-jpeg.c ++libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs) + +-@HAVE_JASPER_TRUE@@INCLUDE_JASPER_TRUE@STATIC_JASPER_LIB = libstatic-pixbufloader-jasper.la +-@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@JASPER_LIB = libpixbufloader-jasper.la ++# ++# The PNM loader ++# ++libstatic_pixbufloader_pnm_la_SOURCES = io-pnm.c ++libpixbufloader_pnm_la_SOURCES = io-pnm.c ++libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_pnm_la_LIBADD = $(module_libs) + +-@BUILD_DYNAMIC_MODULES_TRUE@loader_LTLIBRARIES = \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(PNG_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(BMP_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(WBMP_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(GIF_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(ICO_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(ANI_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(JPEG_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(PNM_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(RAS_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(TIFF_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(XPM_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(XBM_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(TGA_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(ICNS_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(PCX_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(JASPER_LIB) \ +-@BUILD_DYNAMIC_MODULES_TRUE@ $(GDIPLUS_LIBS) ++# ++# The RAS loader ++# ++libstatic_pixbufloader_ras_la_SOURCES = io-ras.c ++libpixbufloader_ras_la_SOURCES = io-ras.c ++libpixbufloader_ras_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_ras_la_LIBADD = $(module_libs) + ++# ++# The TIFF loader ++# ++libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c ++libpixbufloader_tiff_la_SOURCES = io-tiff.c ++libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs) + +-noinst_LTLIBRARIES = \ +- $(STATIC_PNG_LIB) \ +- $(STATIC_BMP_LIB) \ +- $(STATIC_WBMP_LIB) \ +- $(STATIC_GIF_LIB) \ +- $(STATIC_ICO_LIB) \ +- $(STATIC_ANI_LIB) \ +- $(STATIC_JPEG_LIB) \ +- $(STATIC_PNM_LIB) \ +- $(STATIC_RAS_LIB) \ +- $(STATIC_TIFF_LIB) \ +- $(STATIC_XPM_LIB) \ +- $(STATIC_XBM_LIB) \ +- $(STATIC_TGA_LIB) \ +- $(STATIC_ICNS_LIB) \ +- $(STATIC_PCX_LIB) \ +- $(STATIC_JASPER_LIB) \ +- $(STATIC_GDIPLUS_LIBS) ++# ++# The XPM loader ++# ++libstatic_pixbufloader_xpm_la_SOURCES = io-xpm.c ++libpixbufloader_xpm_la_SOURCES = io-xpm.c ++libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_xpm_la_LIBADD = $(module_libs) + ++# ++# The XBM loader ++# ++libstatic_pixbufloader_xbm_la_SOURCES = io-xbm.c ++libpixbufloader_xbm_la_SOURCES = io-xbm.c ++libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_xbm_la_LIBADD = $(module_libs) + +-builtin_objs = @INCLUDED_LOADER_OBJ@ ++# ++# The TGA loader ++# ++libstatic_pixbufloader_tga_la_SOURCES = io-tga.c ++libpixbufloader_tga_la_SOURCES = io-tga.c ++libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_tga_la_LIBADD = $(module_libs) + +-DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la +-INCLUDES = \ +- -DG_LOG_DOMAIN=\"GdkPixbuf\" \ +- -DGDK_PIXBUF_COMPILATION \ +- -I$(top_srcdir) -I$(top_builddir) \ +- -I$(top_srcdir)/gdk-pixbuf \ +- -I$(top_builddir)/gdk-pixbuf \ +- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ +- -DGTK_VERSION=\"$(GTK_VERSION)\" \ +- -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ +- -DGTK_PREFIX=\"$(prefix)\" \ +- $(INCLUDED_LOADER_DEFINE) \ +- $(GTK_DEBUG_FLAGS) \ +- $(GDK_PIXBUF_DEP_CFLAGS) \ +- -DGDK_PIXBUF_ENABLE_BACKEND ++# ++# The .icns loader ++# ++libstatic_pixbufloader_icns_la_SOURCES = io-icns.c ++libpixbufloader_icns_la_SOURCES = io-icns.c ++libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_icns_la_LIBADD = $(module_libs) + ++# ++# The PCX loader ++# ++libstatic_pixbufloader_pcx_la_SOURCES = io-pcx.c ++libpixbufloader_pcx_la_SOURCES = io-pcx.c ++libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_pcx_la_LIBADD = $(module_libs) -AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" -+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" - LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) +-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) ++# ++# The JPEG2000 loader ++# ++libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c ++libpixbufloader_jasper_la_SOURCES = io-jasper.c ++libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined) ++libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs) - noinst_PROGRAMS = test-gdk-pixbuf -diff -urN gtk+2.0-2.14.4.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.4/gdk-pixbuf/pixops/Makefile.in ---- gtk+2.0-2.14.4.old/gdk-pixbuf/pixops/Makefile.in 2008-10-17 01:07:15.000000000 -0300 -+++ gtk+2.0-2.14.4/gdk-pixbuf/pixops/Makefile.in 2008-11-04 15:37:06.000000000 -0200 -@@ -94,6 +94,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@ +-noinst_PROGRAMS = test-gdk-pixbuf +-test_gdk_pixbuf_LDADD = $(LDADDS) ++# When building the GDI+ loader statically, we put the "common" objects ++# only in one of the archives to avoid duplicate definitions ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@STATIC_GDIPLUS_LIBS = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-ico.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-wmf.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-emf.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-bmp.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-gif.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-jpeg.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ libstatic-pixbufloader-gdip-tiff.la + +-bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders +-gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c +-gdk_pixbuf_csource_LDADD = $(LDADDS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_ico_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.c + +-gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) +-gdk_pixbuf_query_loaders_LDADD = $(LDADDS) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_wmf_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.c + +-gdk_pixbuf_query_loaders_SOURCES = queryloaders.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_emf_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.c + +-# +-# The GdkPixBuf library +-# +-libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf +-libgdk_pixbuf_2_0_la_SOURCES = \ +- gdk-pixbuf-i18n.h \ +- gdk-pixbuf.c \ +- gdk-pixbuf-animation.c \ +- gdk-pixbuf-data.c \ +- gdk-pixbuf-io.c \ +- gdk-pixbuf-loader.c \ +- gdk-pixbuf-scale.c \ +- gdk-pixbuf-simple-anim.c \ +- gdk-pixbuf-scaled-anim.c \ +- gdk-pixbuf-util.c \ +- gdk-pixdata.c \ +- gdk-pixbuf-enum-types.c ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_bmp_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.c + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_gif_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.c + +-libgdk_pixbuf_2_0_la_LDFLAGS = \ +- $(gdk_pixbuf_win32_res_ldflag) \ +- -version-info $(LT_VERSION_INFO) \ +- $(LIBTOOL_EXPORT_OPTIONS) \ +- $(no_undefined) \ +- $(gdk_pixbuf_symbols) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_jpeg_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.c + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_png_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-png.c + +-libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32) +-libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@libstatic_pixbufloader_gdip_tiff_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.c + +-gdk_pixbuf_headers = \ +- gdk-pixbuf.h \ +- gdk-pixbuf-core.h \ +- gdk-pixbuf-transform.h \ +- gdk-pixbuf-io.h \ +- gdk-pixbuf-animation.h \ +- gdk-pixbuf-simple-anim.h \ +- gdk-pixbuf-loader.h ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@GDIPLUS_LIBS = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-ico.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-wmf.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-emf.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-bmp.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-gif.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-jpeg.la \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ libpixbufloader-gdip-tiff.la + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.c + +-libgdk_pixbufinclude_HEADERS = \ +- $(gdk_pixbuf_headers) \ +- gdk-pixbuf-enum-types.h \ +- gdk-pixbuf-marshal.h \ +- gdk-pixbuf-features.h \ +- gdk-pixdata.h ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.c + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.c + +-noinst_HEADERS = \ +- gdk-pixbuf-alias.h \ +- gdk-pixbuf-private.h \ +- gdk-pixbuf-scaled-anim.h \ +- xpm-color-table.h ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.c + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.c + +-BUILT_SOURCES = \ +- gdk-pixbuf-alias.h \ +- gdk-pixbuf-aliasdef.c \ +- gdk-pixbuf-enum-types.h \ +- gdk-pixbuf-enum-types.c \ +- gdk-pixbuf-marshal.h \ +- gdk-pixbuf-marshal.c \ +- gdk-pixbuf-features.h ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.c + ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-png.c + +-CLEANFILES = tmp-gdk-pixbuf-enum-types.h xgen-gmh xgen-gmc +-MAINTAINERCLEANFILES = \ +- gdk-pixbuf-aliasdef.c \ +- gdk-pixbuf-enum-types.h \ +- gdk-pixbuf-enum-types.c \ +- gdk-pixbuf-marshal.h \ +- gdk-pixbuf-marshal.c \ +- gdk-pixbuf.loaders\ +-s-enum-types-h stamp-gdk-pixbuf-marshal.h ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_SOURCES = \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-native.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-propertytags.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.c \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.h \ ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.c + +-@CROSS_COMPILING_TRUE@RUN_QUERY_LOADER_TEST = false +-@CROSS_COMPILING_FALSE@RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)" +-subdir = gdk-pixbuf +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h +-LTLIBRARIES = $(lib_LTLIBRARIES) $(loader_LTLIBRARIES) \ +- $(noinst_LTLIBRARIES) ++@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32) + +-am_libgdk_pixbuf_2_0_la_OBJECTS = gdk-pixbuf.lo gdk-pixbuf-animation.lo \ +- gdk-pixbuf-data.lo gdk-pixbuf-io.lo gdk-pixbuf-loader.lo \ +- gdk-pixbuf-scale.lo gdk-pixbuf-simple-anim.lo \ +- gdk-pixbuf-scaled-anim.lo gdk-pixbuf-util.lo gdk-pixdata.lo \ +- gdk-pixbuf-enum-types.lo +-libgdk_pixbuf_2_0_la_OBJECTS = $(am_libgdk_pixbuf_2_0_la_OBJECTS) +-libpixbufloader_ani_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo +-libpixbufloader_ani_la_OBJECTS = $(am_libpixbufloader_ani_la_OBJECTS) +-libpixbufloader_bmp_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_bmp_la_OBJECTS = io-bmp.lo +-libpixbufloader_bmp_la_OBJECTS = $(am_libpixbufloader_bmp_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_bmp_la_DEPENDENCIES = +-am__libpixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-bmp.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_bmp_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-bmp.lo +-libpixbufloader_gdip_bmp_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_bmp_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_emf_la_DEPENDENCIES = +-am__libpixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-emf.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_emf_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-emf.lo +-libpixbufloader_gdip_emf_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_emf_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_gif_la_DEPENDENCIES = +-am__libpixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-gif.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_gif_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-gif.lo +-libpixbufloader_gdip_gif_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_gif_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_ico_la_DEPENDENCIES = +-am__libpixbufloader_gdip_ico_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-ico.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_ico_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-ico.lo +-libpixbufloader_gdip_ico_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_ico_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_jpeg_la_DEPENDENCIES = +-am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-jpeg.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_jpeg_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-jpeg.lo +-libpixbufloader_gdip_jpeg_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_jpeg_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_tiff_la_DEPENDENCIES = +-am__libpixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-tiff.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_tiff_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-tiff.lo +-libpixbufloader_gdip_tiff_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_tiff_la_OBJECTS) +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_TRUE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@@OS_WIN32_FALSE@ libgdk_pixbuf-$(GTK_API_VERSION).la +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_TRUE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@@OS_WIN32_FALSE@libpixbufloader_gdip_wmf_la_DEPENDENCIES = +-am__libpixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-wmf.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@am_libpixbufloader_gdip_wmf_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_FALSE@ io-gdip-wmf.lo +-libpixbufloader_gdip_wmf_la_OBJECTS = \ +- $(am_libpixbufloader_gdip_wmf_la_OBJECTS) +-libpixbufloader_gif_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo +-libpixbufloader_gif_la_OBJECTS = $(am_libpixbufloader_gif_la_OBJECTS) +-libpixbufloader_icns_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_icns_la_OBJECTS = io-icns.lo +-libpixbufloader_icns_la_OBJECTS = $(am_libpixbufloader_icns_la_OBJECTS) +-libpixbufloader_ico_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_ico_la_OBJECTS = io-ico.lo +-libpixbufloader_ico_la_OBJECTS = $(am_libpixbufloader_ico_la_OBJECTS) +-libpixbufloader_jasper_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo +-libpixbufloader_jasper_la_OBJECTS = \ +- $(am_libpixbufloader_jasper_la_OBJECTS) +-libpixbufloader_jpeg_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_jpeg_la_OBJECTS = io-jpeg.lo +-libpixbufloader_jpeg_la_OBJECTS = $(am_libpixbufloader_jpeg_la_OBJECTS) +-libpixbufloader_pcx_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_pcx_la_OBJECTS = io-pcx.lo +-libpixbufloader_pcx_la_OBJECTS = $(am_libpixbufloader_pcx_la_OBJECTS) +-libpixbufloader_png_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_png_la_OBJECTS = io-png.lo +-libpixbufloader_png_la_OBJECTS = $(am_libpixbufloader_png_la_OBJECTS) +-libpixbufloader_pnm_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_pnm_la_OBJECTS = io-pnm.lo +-libpixbufloader_pnm_la_OBJECTS = $(am_libpixbufloader_pnm_la_OBJECTS) +-libpixbufloader_ras_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_ras_la_OBJECTS = io-ras.lo +-libpixbufloader_ras_la_OBJECTS = $(am_libpixbufloader_ras_la_OBJECTS) +-libpixbufloader_tga_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_tga_la_OBJECTS = io-tga.lo +-libpixbufloader_tga_la_OBJECTS = $(am_libpixbufloader_tga_la_OBJECTS) +-libpixbufloader_tiff_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_tiff_la_OBJECTS = io-tiff.lo +-libpixbufloader_tiff_la_OBJECTS = $(am_libpixbufloader_tiff_la_OBJECTS) +-libpixbufloader_wbmp_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_wbmp_la_OBJECTS = io-wbmp.lo +-libpixbufloader_wbmp_la_OBJECTS = $(am_libpixbufloader_wbmp_la_OBJECTS) +-libpixbufloader_xbm_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_xbm_la_OBJECTS = io-xbm.lo +-libpixbufloader_xbm_la_OBJECTS = $(am_libpixbufloader_xbm_la_OBJECTS) +-libpixbufloader_xpm_la_DEPENDENCIES = \ +- libgdk_pixbuf-$(GTK_API_VERSION).la +-am_libpixbufloader_xpm_la_OBJECTS = io-xpm.lo +-libpixbufloader_xpm_la_OBJECTS = $(am_libpixbufloader_xpm_la_OBJECTS) +-libstatic_pixbufloader_ani_la_LDFLAGS = +-libstatic_pixbufloader_ani_la_LIBADD = +-am_libstatic_pixbufloader_ani_la_OBJECTS = io-ani.lo io-ani-animation.lo +-libstatic_pixbufloader_ani_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_ani_la_OBJECTS) +-libstatic_pixbufloader_bmp_la_LDFLAGS = +-libstatic_pixbufloader_bmp_la_LIBADD = +-am_libstatic_pixbufloader_bmp_la_OBJECTS = io-bmp.lo +-libstatic_pixbufloader_bmp_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_bmp_la_OBJECTS) +-libstatic_pixbufloader_gdip_bmp_la_LDFLAGS = +-libstatic_pixbufloader_gdip_bmp_la_LIBADD = +-am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST = io-gdip-bmp.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-bmp.lo +-libstatic_pixbufloader_gdip_bmp_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_bmp_la_OBJECTS) +-libstatic_pixbufloader_gdip_emf_la_LDFLAGS = +-libstatic_pixbufloader_gdip_emf_la_LIBADD = +-am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST = io-gdip-emf.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_emf_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-emf.lo +-libstatic_pixbufloader_gdip_emf_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_emf_la_OBJECTS) +-libstatic_pixbufloader_gdip_gif_la_LDFLAGS = +-libstatic_pixbufloader_gdip_gif_la_LIBADD = +-am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST = io-gdip-gif.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_gif_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-gif.lo +-libstatic_pixbufloader_gdip_gif_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_gif_la_OBJECTS) +-libstatic_pixbufloader_gdip_ico_la_LDFLAGS = +-libstatic_pixbufloader_gdip_ico_la_LIBADD = +-am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST = io-gdip-native.h \ +- io-gdip-propertytags.h io-gdip-utils.h io-gdip-utils.c \ +- io-gdip-animation.c io-gdip-animation.h io-gdip-ico.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_ico_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-utils.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-animation.lo \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-ico.lo +-libstatic_pixbufloader_gdip_ico_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_ico_la_OBJECTS) +-libstatic_pixbufloader_gdip_jpeg_la_LDFLAGS = +-libstatic_pixbufloader_gdip_jpeg_la_LIBADD = +-am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST = io-gdip-jpeg.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-jpeg.lo +-libstatic_pixbufloader_gdip_jpeg_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) +-libstatic_pixbufloader_gdip_tiff_la_LDFLAGS = +-libstatic_pixbufloader_gdip_tiff_la_LIBADD = +-am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST = io-gdip-tiff.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-tiff.lo +-libstatic_pixbufloader_gdip_tiff_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_tiff_la_OBJECTS) +-libstatic_pixbufloader_gdip_wmf_la_LDFLAGS = +-libstatic_pixbufloader_gdip_wmf_la_LIBADD = +-am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST = io-gdip-wmf.c +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS = \ +-@BUILD_GDIPLUS_LOADERS_TRUE@@INCLUDE_GDIPLUS_TRUE@ io-gdip-wmf.lo +-libstatic_pixbufloader_gdip_wmf_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gdip_wmf_la_OBJECTS) +-libstatic_pixbufloader_gif_la_LDFLAGS = +-libstatic_pixbufloader_gif_la_LIBADD = +-am_libstatic_pixbufloader_gif_la_OBJECTS = io-gif.lo io-gif-animation.lo +-libstatic_pixbufloader_gif_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_gif_la_OBJECTS) +-libstatic_pixbufloader_icns_la_LDFLAGS = +-libstatic_pixbufloader_icns_la_LIBADD = +-am_libstatic_pixbufloader_icns_la_OBJECTS = io-icns.lo +-libstatic_pixbufloader_icns_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_icns_la_OBJECTS) +-libstatic_pixbufloader_ico_la_LDFLAGS = +-libstatic_pixbufloader_ico_la_LIBADD = +-am_libstatic_pixbufloader_ico_la_OBJECTS = io-ico.lo +-libstatic_pixbufloader_ico_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_ico_la_OBJECTS) +-libstatic_pixbufloader_jasper_la_LDFLAGS = +-libstatic_pixbufloader_jasper_la_LIBADD = +-am_libstatic_pixbufloader_jasper_la_OBJECTS = io-jasper.lo +-libstatic_pixbufloader_jasper_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_jasper_la_OBJECTS) +-libstatic_pixbufloader_jpeg_la_LDFLAGS = +-libstatic_pixbufloader_jpeg_la_LIBADD = +-am_libstatic_pixbufloader_jpeg_la_OBJECTS = io-jpeg.lo +-libstatic_pixbufloader_jpeg_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_jpeg_la_OBJECTS) +-libstatic_pixbufloader_pcx_la_LDFLAGS = +-libstatic_pixbufloader_pcx_la_LIBADD = +-am_libstatic_pixbufloader_pcx_la_OBJECTS = io-pcx.lo +-libstatic_pixbufloader_pcx_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_pcx_la_OBJECTS) +-libstatic_pixbufloader_png_la_LDFLAGS = +-libstatic_pixbufloader_png_la_LIBADD = +-am_libstatic_pixbufloader_png_la_OBJECTS = io-png.lo +-libstatic_pixbufloader_png_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_png_la_OBJECTS) +-libstatic_pixbufloader_pnm_la_LDFLAGS = +-libstatic_pixbufloader_pnm_la_LIBADD = +-am_libstatic_pixbufloader_pnm_la_OBJECTS = io-pnm.lo +-libstatic_pixbufloader_pnm_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_pnm_la_OBJECTS) +-libstatic_pixbufloader_ras_la_LDFLAGS = +-libstatic_pixbufloader_ras_la_LIBADD = +-am_libstatic_pixbufloader_ras_la_OBJECTS = io-ras.lo +-libstatic_pixbufloader_ras_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_ras_la_OBJECTS) +-libstatic_pixbufloader_tga_la_LDFLAGS = +-libstatic_pixbufloader_tga_la_LIBADD = +-am_libstatic_pixbufloader_tga_la_OBJECTS = io-tga.lo +-libstatic_pixbufloader_tga_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_tga_la_OBJECTS) +-libstatic_pixbufloader_tiff_la_LDFLAGS = +-libstatic_pixbufloader_tiff_la_LIBADD = +-am_libstatic_pixbufloader_tiff_la_OBJECTS = io-tiff.lo +-libstatic_pixbufloader_tiff_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_tiff_la_OBJECTS) +-libstatic_pixbufloader_wbmp_la_LDFLAGS = +-libstatic_pixbufloader_wbmp_la_LIBADD = +-am_libstatic_pixbufloader_wbmp_la_OBJECTS = io-wbmp.lo +-libstatic_pixbufloader_wbmp_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_wbmp_la_OBJECTS) +-libstatic_pixbufloader_xbm_la_LDFLAGS = +-libstatic_pixbufloader_xbm_la_LIBADD = +-am_libstatic_pixbufloader_xbm_la_OBJECTS = io-xbm.lo +-libstatic_pixbufloader_xbm_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_xbm_la_OBJECTS) +-libstatic_pixbufloader_xpm_la_LDFLAGS = +-libstatic_pixbufloader_xpm_la_LIBADD = +-am_libstatic_pixbufloader_xpm_la_OBJECTS = io-xpm.lo +-libstatic_pixbufloader_xpm_la_OBJECTS = \ +- $(am_libstatic_pixbufloader_xpm_la_OBJECTS) +-bin_PROGRAMS = gdk-pixbuf-csource$(EXEEXT) \ +- gdk-pixbuf-query-loaders$(EXEEXT) +-noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) +-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) ++# Loaders that aren't built if we build the GDI+ loader ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_TRUE@STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_BMP_FALSE@BMP_LIB = libpixbufloader-bmp.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_TRUE@STATIC_GIF_LIB = libstatic-pixbufloader-gif.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_GIF_FALSE@GIF_LIB = libpixbufloader-gif.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_TRUE@STATIC_ICO_LIB = libstatic-pixbufloader-ico.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@ICO_LIB = libpixbufloader-ico.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_TRUE@STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_JPEG_TRUE@@INCLUDE_JPEG_FALSE@JPEG_LIB = libpixbufloader-jpeg.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la ++@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@TIFF_LIB = libpixbufloader-tiff.la + +-am_gdk_pixbuf_csource_OBJECTS = gdk-pixbuf-csource.$(OBJEXT) +-gdk_pixbuf_csource_OBJECTS = $(am_gdk_pixbuf_csource_OBJECTS) +-gdk_pixbuf_csource_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la +-gdk_pixbuf_csource_LDFLAGS = +-am_gdk_pixbuf_query_loaders_OBJECTS = queryloaders.$(OBJEXT) +-gdk_pixbuf_query_loaders_OBJECTS = \ +- $(am_gdk_pixbuf_query_loaders_OBJECTS) +-gdk_pixbuf_query_loaders_LDFLAGS = +-test_gdk_pixbuf_SOURCES = test-gdk-pixbuf.c +-test_gdk_pixbuf_OBJECTS = test-gdk-pixbuf.$(OBJEXT) +-test_gdk_pixbuf_DEPENDENCIES = libgdk_pixbuf-$(GTK_API_VERSION).la +-test_gdk_pixbuf_LDFLAGS = ++# End of loaders not built if building GDI+ loader ++@HAVE_PNG_TRUE@@INCLUDE_PNG_TRUE@STATIC_PNG_LIB = libstatic-pixbufloader-png.la ++@HAVE_PNG_TRUE@@INCLUDE_PNG_FALSE@PNG_LIB = libpixbufloader-png.la ++@INCLUDE_WBMP_TRUE@STATIC_WBMP_LIB = libstatic-pixbufloader-wbmp.la ++@INCLUDE_WBMP_FALSE@WBMP_LIB = libpixbufloader-wbmp.la ++@INCLUDE_ANI_TRUE@STATIC_ANI_LIB = libstatic-pixbufloader-ani.la ++@INCLUDE_ANI_FALSE@ANI_LIB = libpixbufloader-ani.la ++@INCLUDE_PNM_TRUE@STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la ++@INCLUDE_PNM_FALSE@PNM_LIB = libpixbufloader-pnm.la ++@INCLUDE_RAS_TRUE@STATIC_RAS_LIB = libstatic-pixbufloader-ras.la ++@INCLUDE_RAS_FALSE@RAS_LIB = libpixbufloader-ras.la ++@INCLUDE_XPM_TRUE@STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la ++@INCLUDE_XPM_FALSE@XPM_LIB = libpixbufloader-xpm.la ++@INCLUDE_XBM_TRUE@STATIC_XBM_LIB = libstatic-pixbufloader-xbm.la ++@INCLUDE_XBM_FALSE@XBM_LIB = libpixbufloader-xbm.la ++@INCLUDE_TGA_TRUE@STATIC_TGA_LIB = libstatic-pixbufloader-tga.la ++@INCLUDE_TGA_FALSE@TGA_LIB = libpixbufloader-tga.la ++@INCLUDE_PCX_TRUE@STATIC_PCX_LIB = libstatic-pixbufloader-pcx.la ++@INCLUDE_PCX_FALSE@PCX_LIB = libpixbufloader-pcx.la ++@INCLUDE_ICNS_TRUE@STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la ++@INCLUDE_ICNS_FALSE@ICNS_LIB = libpixbufloader-icns.la ++@HAVE_JASPER_TRUE@@INCLUDE_JASPER_TRUE@STATIC_JASPER_LIB = libstatic-pixbufloader-jasper.la ++@HAVE_JASPER_TRUE@@INCLUDE_JASPER_FALSE@JASPER_LIB = libpixbufloader-jasper.la ++@BUILD_DYNAMIC_MODULES_TRUE@loader_LTLIBRARIES = \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(PNG_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(BMP_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(WBMP_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(GIF_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(ICO_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(ANI_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(JPEG_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(PNM_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(RAS_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(TIFF_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(XPM_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(XBM_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(TGA_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(ICNS_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(PCX_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(JASPER_LIB) \ ++@BUILD_DYNAMIC_MODULES_TRUE@ $(GDIPLUS_LIBS) + +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdk-pixbuf-animation.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-csource.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-data.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-enum-types.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-io.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-loader.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-scale.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-scaled-anim.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-simple-anim.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf-util.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixbuf.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gdk-pixdata.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-ani-animation.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-ani.Plo ./$(DEPDIR)/io-bmp.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-animation.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-bmp.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-emf.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-gif.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-ico.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-jpeg.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-tiff.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-utils.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gdip-wmf.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gif-animation.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-gif.Plo ./$(DEPDIR)/io-icns.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-ico.Plo ./$(DEPDIR)/io-jasper.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-jpeg.Plo ./$(DEPDIR)/io-pcx.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-png.Plo ./$(DEPDIR)/io-pnm.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-ras.Plo ./$(DEPDIR)/io-tga.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-tiff.Plo ./$(DEPDIR)/io-wbmp.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/io-xbm.Plo ./$(DEPDIR)/io-xpm.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/queryloaders.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/test-gdk-pixbuf.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) \ +- $(libpixbufloader_ani_la_SOURCES) \ +- $(libpixbufloader_bmp_la_SOURCES) \ +- $(am__libpixbufloader_gdip_bmp_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_emf_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_gif_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_ico_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_jpeg_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_tiff_la_SOURCES_DIST) \ +- $(am__libpixbufloader_gdip_wmf_la_SOURCES_DIST) \ +- $(libpixbufloader_gif_la_SOURCES) \ +- $(libpixbufloader_icns_la_SOURCES) \ +- $(libpixbufloader_ico_la_SOURCES) \ +- $(libpixbufloader_jasper_la_SOURCES) \ +- $(libpixbufloader_jpeg_la_SOURCES) \ +- $(libpixbufloader_pcx_la_SOURCES) \ +- $(libpixbufloader_png_la_SOURCES) \ +- $(libpixbufloader_pnm_la_SOURCES) \ +- $(libpixbufloader_ras_la_SOURCES) \ +- $(libpixbufloader_tga_la_SOURCES) \ +- $(libpixbufloader_tiff_la_SOURCES) \ +- $(libpixbufloader_wbmp_la_SOURCES) \ +- $(libpixbufloader_xbm_la_SOURCES) \ +- $(libpixbufloader_xpm_la_SOURCES) \ +- $(libstatic_pixbufloader_ani_la_SOURCES) \ +- $(libstatic_pixbufloader_bmp_la_SOURCES) \ +- $(am__libstatic_pixbufloader_gdip_bmp_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_emf_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_gif_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_ico_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_jpeg_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_tiff_la_SOURCES_DIST) \ +- $(am__libstatic_pixbufloader_gdip_wmf_la_SOURCES_DIST) \ +- $(libstatic_pixbufloader_gif_la_SOURCES) \ +- $(libstatic_pixbufloader_icns_la_SOURCES) \ +- $(libstatic_pixbufloader_ico_la_SOURCES) \ +- $(libstatic_pixbufloader_jasper_la_SOURCES) \ +- $(libstatic_pixbufloader_jpeg_la_SOURCES) \ +- $(libstatic_pixbufloader_pcx_la_SOURCES) \ +- $(libstatic_pixbufloader_png_la_SOURCES) \ +- $(libstatic_pixbufloader_pnm_la_SOURCES) \ +- $(libstatic_pixbufloader_ras_la_SOURCES) \ +- $(libstatic_pixbufloader_tga_la_SOURCES) \ +- $(libstatic_pixbufloader_tiff_la_SOURCES) \ +- $(libstatic_pixbufloader_wbmp_la_SOURCES) \ +- $(libstatic_pixbufloader_xbm_la_SOURCES) \ +- $(libstatic_pixbufloader_xpm_la_SOURCES) \ +- $(gdk_pixbuf_csource_SOURCES) \ +- $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c +-DATA = $(noinst_DATA) ++noinst_LTLIBRARIES = \ ++ $(STATIC_PNG_LIB) \ ++ $(STATIC_BMP_LIB) \ ++ $(STATIC_WBMP_LIB) \ ++ $(STATIC_GIF_LIB) \ ++ $(STATIC_ICO_LIB) \ ++ $(STATIC_ANI_LIB) \ ++ $(STATIC_JPEG_LIB) \ ++ $(STATIC_PNM_LIB) \ ++ $(STATIC_RAS_LIB) \ ++ $(STATIC_TIFF_LIB) \ ++ $(STATIC_XPM_LIB) \ ++ $(STATIC_XBM_LIB) \ ++ $(STATIC_TGA_LIB) \ ++ $(STATIC_ICNS_LIB) \ ++ $(STATIC_PCX_LIB) \ ++ $(STATIC_JASPER_LIB) \ ++ $(STATIC_GDIPLUS_LIBS) + +-HEADERS = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) ++builtin_objs = @INCLUDED_LOADER_OBJ@ ++DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la ++INCLUDES = \ ++ -DG_LOG_DOMAIN=\"GdkPixbuf\" \ ++ -DGDK_PIXBUF_COMPILATION \ ++ -I$(top_srcdir) -I$(top_builddir) \ ++ -I$(top_srcdir)/gdk-pixbuf \ ++ -I$(top_builddir)/gdk-pixbuf \ ++ -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ ++ -DGTK_VERSION=\"$(GTK_VERSION)\" \ ++ -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ ++ -DGTK_PREFIX=\"$(prefix)\" \ ++ $(INCLUDED_LOADER_DEFINE) \ ++ $(GTK_DEBUG_FLAGS) \ ++ $(GDK_PIXBUF_DEP_CFLAGS) \ ++ -DGDK_PIXBUF_ENABLE_BACKEND + ++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" ++LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS) ++test_gdk_pixbuf_LDADD = $(LDADDS) ++gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c ++gdk_pixbuf_csource_LDADD = $(LDADDS) ++gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) ++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) ++gdk_pixbuf_query_loaders_SOURCES = queryloaders.c + +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(libgdk_pixbufinclude_HEADERS) $(noinst_HEADERS) \ +- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog \ +- Makefile.am gdk-pixbuf-features.h.in gdk_pixbuf.rc.in +-DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(libgdk_pixbuf_2_0_la_SOURCES) $(libpixbufloader_ani_la_SOURCES) $(libpixbufloader_bmp_la_SOURCES) $(libpixbufloader_gdip_bmp_la_SOURCES) $(libpixbufloader_gdip_emf_la_SOURCES) $(libpixbufloader_gdip_gif_la_SOURCES) $(libpixbufloader_gdip_ico_la_SOURCES) $(libpixbufloader_gdip_jpeg_la_SOURCES) $(libpixbufloader_gdip_tiff_la_SOURCES) $(libpixbufloader_gdip_wmf_la_SOURCES) $(libpixbufloader_gif_la_SOURCES) $(libpixbufloader_icns_la_SOURCES) $(libpixbufloader_ico_la_SOURCES) $(libpixbufloader_jasper_la_SOURCES) $(libpixbufloader_jpeg_la_SOURCES) $(libpixbufloader_pcx_la_SOURCES) $(libpixbufloader_png_la_SOURCES) $(libpixbufloader_pnm_la_SOURCES) $(libpixbufloader_ras_la_SOURCES) $(libpixbufloader_tga_la_SOURCES) $(libpixbufloader_tiff_la_SOURCES) $(libpixbufloader_wbmp_la_SOURCES) $(libpixbufloader_xbm_la_SOURCES) $(libpixbufloader_xpm_la_SOURCES) $(libstatic_pixbufloader_ani_la_SOURCES) $(libstatic_pixbufloader_bmp_la_SOURCES) $(libstatic_pixbufloader_gdip_bmp_la_SOURCES) $(libstatic_pixbufloader_gdip_emf_la_SOURCES) $(libstatic_pixbufloader_gdip_gif_la_SOURCES) $(libstatic_pixbufloader_gdip_ico_la_SOURCES) $(libstatic_pixbufloader_gdip_jpeg_la_SOURCES) $(libstatic_pixbufloader_gdip_tiff_la_SOURCES) $(libstatic_pixbufloader_gdip_wmf_la_SOURCES) $(libstatic_pixbufloader_gif_la_SOURCES) $(libstatic_pixbufloader_icns_la_SOURCES) $(libstatic_pixbufloader_ico_la_SOURCES) $(libstatic_pixbufloader_jasper_la_SOURCES) $(libstatic_pixbufloader_jpeg_la_SOURCES) $(libstatic_pixbufloader_pcx_la_SOURCES) $(libstatic_pixbufloader_png_la_SOURCES) $(libstatic_pixbufloader_pnm_la_SOURCES) $(libstatic_pixbufloader_ras_la_SOURCES) $(libstatic_pixbufloader_tga_la_SOURCES) $(libstatic_pixbufloader_tiff_la_SOURCES) $(libstatic_pixbufloader_wbmp_la_SOURCES) $(libstatic_pixbufloader_xbm_la_SOURCES) $(libstatic_pixbufloader_xpm_la_SOURCES) $(gdk_pixbuf_csource_SOURCES) $(gdk_pixbuf_query_loaders_SOURCES) test-gdk-pixbuf.c ++# ++# The GdkPixBuf library ++# ++libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf ++libgdk_pixbuf_2_0_la_SOURCES = \ ++ gdk-pixbuf-i18n.h \ ++ gdk-pixbuf.c \ ++ gdk-pixbuf-animation.c \ ++ gdk-pixbuf-data.c \ ++ gdk-pixbuf-io.c \ ++ gdk-pixbuf-loader.c \ ++ gdk-pixbuf-scale.c \ ++ gdk-pixbuf-simple-anim.c \ ++ gdk-pixbuf-scaled-anim.c \ ++ gdk-pixbuf-util.c \ ++ gdk-pixdata.c \ ++ gdk-pixbuf-enum-types.c ++ ++libgdk_pixbuf_2_0_la_LDFLAGS = \ ++ $(gdk_pixbuf_win32_res_ldflag) \ ++ -version-info $(LT_VERSION_INFO) \ ++ $(LIBTOOL_EXPORT_OPTIONS) \ ++ $(no_undefined) \ ++ $(gdk_pixbuf_symbols) ++ ++libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32) ++libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) ++gdk_pixbuf_headers = \ ++ gdk-pixbuf.h \ ++ gdk-pixbuf-core.h \ ++ gdk-pixbuf-transform.h \ ++ gdk-pixbuf-io.h \ ++ gdk-pixbuf-animation.h \ ++ gdk-pixbuf-simple-anim.h \ ++ gdk-pixbuf-loader.h ++ ++libgdk_pixbufinclude_HEADERS = \ ++ $(gdk_pixbuf_headers) \ ++ gdk-pixbuf-enum-types.h \ ++ gdk-pixbuf-marshal.h \ ++ gdk-pixbuf-features.h \ ++ gdk-pixdata.h ++ ++noinst_HEADERS = \ ++ gdk-pixbuf-alias.h \ ++ gdk-pixbuf-private.h \ ++ gdk-pixbuf-scaled-anim.h \ ++ xpm-color-table.h ++ ++BUILT_SOURCES = \ ++ gdk-pixbuf-alias.h \ ++ gdk-pixbuf-aliasdef.c \ ++ gdk-pixbuf-enum-types.h \ ++ gdk-pixbuf-enum-types.c \ ++ gdk-pixbuf-marshal.h \ ++ gdk-pixbuf-marshal.c \ ++ gdk-pixbuf-features.h + ++CLEANFILES = tmp-gdk-pixbuf-enum-types.h xgen-gmh xgen-gmc ++MAINTAINERCLEANFILES = gdk-pixbuf-aliasdef.c gdk-pixbuf-enum-types.h \ ++ gdk-pixbuf-enum-types.c gdk-pixbuf-marshal.h \ ++ gdk-pixbuf-marshal.c gdk-pixbuf.loaders s-enum-types-h \ ++ stamp-gdk-pixbuf-marshal.h ++@CROSS_COMPILING_FALSE@RUN_QUERY_LOADER_TEST = test -z "$(DESTDIR)" ++@CROSS_COMPILING_TRUE@RUN_QUERY_LOADER_TEST = false + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk-pixbuf/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk-pixbuf/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-gdk_pixbuf.rc: $(top_builddir)/config.status gdk_pixbuf.rc.in ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++gdk_pixbuf.rc: $(top_builddir)/config.status $(srcdir)/gdk_pixbuf.rc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-gdk-pixbuf-features.h: $(top_builddir)/config.status gdk-pixbuf-features.h.in ++gdk-pixbuf-features.h: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-features.h.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-libLTLIBRARIES_INSTALL = $(INSTALL) + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libdir) ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +-loaderLTLIBRARIES_INSTALL = $(INSTALL) + install-loaderLTLIBRARIES: $(loader_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(loaderdir) ++ test -z "$(loaderdir)" || $(MKDIR_P) "$(DESTDIR)$(loaderdir)" + @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(loaderdir)/$$f"; \ +- $(LIBTOOL) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(loaderdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(loaderdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(loaderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(loaderdir)/$$f"; \ + else :; fi; \ + done + + uninstall-loaderLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(loaderdir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(loaderdir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(loaderdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(loaderdir)/$$p"; \ + done + + clean-loaderLTLIBRARIES: + -test -z "$(loader_LTLIBRARIES)" || rm -f $(loader_LTLIBRARIES) + @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +@@ -1479,116 +1404,115 @@ clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgdk_pixbuf-2.0.la: $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libgdk_pixbuf_2_0_la_LDFLAGS) $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_LIBADD) $(LIBS) ++ $(libgdk_pixbuf_2_0_la_LINK) -rpath $(libdir) $(libgdk_pixbuf_2_0_la_OBJECTS) $(libgdk_pixbuf_2_0_la_LIBADD) $(LIBS) + libpixbufloader-ani.la: $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ani_la_LDFLAGS) $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_LIBADD) $(LIBS) ++ $(libpixbufloader_ani_la_LINK) $(am_libpixbufloader_ani_la_rpath) $(libpixbufloader_ani_la_OBJECTS) $(libpixbufloader_ani_la_LIBADD) $(LIBS) + libpixbufloader-bmp.la: $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_bmp_la_LDFLAGS) $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_LIBADD) $(LIBS) ++ $(libpixbufloader_bmp_la_LINK) $(am_libpixbufloader_bmp_la_rpath) $(libpixbufloader_bmp_la_OBJECTS) $(libpixbufloader_bmp_la_LIBADD) $(LIBS) + libpixbufloader-gdip-bmp.la: $(libpixbufloader_gdip_bmp_la_OBJECTS) $(libpixbufloader_gdip_bmp_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_bmp_la_LDFLAGS) $(libpixbufloader_gdip_bmp_la_OBJECTS) $(libpixbufloader_gdip_bmp_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_bmp_la_LINK) $(am_libpixbufloader_gdip_bmp_la_rpath) $(libpixbufloader_gdip_bmp_la_OBJECTS) $(libpixbufloader_gdip_bmp_la_LIBADD) $(LIBS) + libpixbufloader-gdip-emf.la: $(libpixbufloader_gdip_emf_la_OBJECTS) $(libpixbufloader_gdip_emf_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_emf_la_LDFLAGS) $(libpixbufloader_gdip_emf_la_OBJECTS) $(libpixbufloader_gdip_emf_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_emf_la_LINK) $(am_libpixbufloader_gdip_emf_la_rpath) $(libpixbufloader_gdip_emf_la_OBJECTS) $(libpixbufloader_gdip_emf_la_LIBADD) $(LIBS) + libpixbufloader-gdip-gif.la: $(libpixbufloader_gdip_gif_la_OBJECTS) $(libpixbufloader_gdip_gif_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_gif_la_LDFLAGS) $(libpixbufloader_gdip_gif_la_OBJECTS) $(libpixbufloader_gdip_gif_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_gif_la_LINK) $(am_libpixbufloader_gdip_gif_la_rpath) $(libpixbufloader_gdip_gif_la_OBJECTS) $(libpixbufloader_gdip_gif_la_LIBADD) $(LIBS) + libpixbufloader-gdip-ico.la: $(libpixbufloader_gdip_ico_la_OBJECTS) $(libpixbufloader_gdip_ico_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_ico_la_LDFLAGS) $(libpixbufloader_gdip_ico_la_OBJECTS) $(libpixbufloader_gdip_ico_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_ico_la_LINK) $(am_libpixbufloader_gdip_ico_la_rpath) $(libpixbufloader_gdip_ico_la_OBJECTS) $(libpixbufloader_gdip_ico_la_LIBADD) $(LIBS) + libpixbufloader-gdip-jpeg.la: $(libpixbufloader_gdip_jpeg_la_OBJECTS) $(libpixbufloader_gdip_jpeg_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_jpeg_la_LDFLAGS) $(libpixbufloader_gdip_jpeg_la_OBJECTS) $(libpixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_jpeg_la_LINK) $(am_libpixbufloader_gdip_jpeg_la_rpath) $(libpixbufloader_gdip_jpeg_la_OBJECTS) $(libpixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) + libpixbufloader-gdip-tiff.la: $(libpixbufloader_gdip_tiff_la_OBJECTS) $(libpixbufloader_gdip_tiff_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_tiff_la_LDFLAGS) $(libpixbufloader_gdip_tiff_la_OBJECTS) $(libpixbufloader_gdip_tiff_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_tiff_la_LINK) $(am_libpixbufloader_gdip_tiff_la_rpath) $(libpixbufloader_gdip_tiff_la_OBJECTS) $(libpixbufloader_gdip_tiff_la_LIBADD) $(LIBS) + libpixbufloader-gdip-wmf.la: $(libpixbufloader_gdip_wmf_la_OBJECTS) $(libpixbufloader_gdip_wmf_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gdip_wmf_la_LDFLAGS) $(libpixbufloader_gdip_wmf_la_OBJECTS) $(libpixbufloader_gdip_wmf_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gdip_wmf_la_LINK) $(am_libpixbufloader_gdip_wmf_la_rpath) $(libpixbufloader_gdip_wmf_la_OBJECTS) $(libpixbufloader_gdip_wmf_la_LIBADD) $(LIBS) + libpixbufloader-gif.la: $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_gif_la_LDFLAGS) $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_LIBADD) $(LIBS) ++ $(libpixbufloader_gif_la_LINK) $(am_libpixbufloader_gif_la_rpath) $(libpixbufloader_gif_la_OBJECTS) $(libpixbufloader_gif_la_LIBADD) $(LIBS) + libpixbufloader-icns.la: $(libpixbufloader_icns_la_OBJECTS) $(libpixbufloader_icns_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_icns_la_LDFLAGS) $(libpixbufloader_icns_la_OBJECTS) $(libpixbufloader_icns_la_LIBADD) $(LIBS) ++ $(libpixbufloader_icns_la_LINK) $(am_libpixbufloader_icns_la_rpath) $(libpixbufloader_icns_la_OBJECTS) $(libpixbufloader_icns_la_LIBADD) $(LIBS) + libpixbufloader-ico.la: $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ico_la_LDFLAGS) $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_LIBADD) $(LIBS) ++ $(libpixbufloader_ico_la_LINK) $(am_libpixbufloader_ico_la_rpath) $(libpixbufloader_ico_la_OBJECTS) $(libpixbufloader_ico_la_LIBADD) $(LIBS) + libpixbufloader-jasper.la: $(libpixbufloader_jasper_la_OBJECTS) $(libpixbufloader_jasper_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_jasper_la_LDFLAGS) $(libpixbufloader_jasper_la_OBJECTS) $(libpixbufloader_jasper_la_LIBADD) $(LIBS) ++ $(libpixbufloader_jasper_la_LINK) $(am_libpixbufloader_jasper_la_rpath) $(libpixbufloader_jasper_la_OBJECTS) $(libpixbufloader_jasper_la_LIBADD) $(LIBS) + libpixbufloader-jpeg.la: $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_jpeg_la_LDFLAGS) $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_LIBADD) $(LIBS) ++ $(libpixbufloader_jpeg_la_LINK) $(am_libpixbufloader_jpeg_la_rpath) $(libpixbufloader_jpeg_la_OBJECTS) $(libpixbufloader_jpeg_la_LIBADD) $(LIBS) + libpixbufloader-pcx.la: $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_pcx_la_LDFLAGS) $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_LIBADD) $(LIBS) ++ $(libpixbufloader_pcx_la_LINK) $(am_libpixbufloader_pcx_la_rpath) $(libpixbufloader_pcx_la_OBJECTS) $(libpixbufloader_pcx_la_LIBADD) $(LIBS) + libpixbufloader-png.la: $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_png_la_LDFLAGS) $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_LIBADD) $(LIBS) ++ $(libpixbufloader_png_la_LINK) $(am_libpixbufloader_png_la_rpath) $(libpixbufloader_png_la_OBJECTS) $(libpixbufloader_png_la_LIBADD) $(LIBS) + libpixbufloader-pnm.la: $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_pnm_la_LDFLAGS) $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_LIBADD) $(LIBS) ++ $(libpixbufloader_pnm_la_LINK) $(am_libpixbufloader_pnm_la_rpath) $(libpixbufloader_pnm_la_OBJECTS) $(libpixbufloader_pnm_la_LIBADD) $(LIBS) + libpixbufloader-ras.la: $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_ras_la_LDFLAGS) $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_LIBADD) $(LIBS) ++ $(libpixbufloader_ras_la_LINK) $(am_libpixbufloader_ras_la_rpath) $(libpixbufloader_ras_la_OBJECTS) $(libpixbufloader_ras_la_LIBADD) $(LIBS) + libpixbufloader-tga.la: $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_tga_la_LDFLAGS) $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_LIBADD) $(LIBS) ++ $(libpixbufloader_tga_la_LINK) $(am_libpixbufloader_tga_la_rpath) $(libpixbufloader_tga_la_OBJECTS) $(libpixbufloader_tga_la_LIBADD) $(LIBS) + libpixbufloader-tiff.la: $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_tiff_la_LDFLAGS) $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_LIBADD) $(LIBS) ++ $(libpixbufloader_tiff_la_LINK) $(am_libpixbufloader_tiff_la_rpath) $(libpixbufloader_tiff_la_OBJECTS) $(libpixbufloader_tiff_la_LIBADD) $(LIBS) + libpixbufloader-wbmp.la: $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_wbmp_la_LDFLAGS) $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_LIBADD) $(LIBS) ++ $(libpixbufloader_wbmp_la_LINK) $(am_libpixbufloader_wbmp_la_rpath) $(libpixbufloader_wbmp_la_OBJECTS) $(libpixbufloader_wbmp_la_LIBADD) $(LIBS) + libpixbufloader-xbm.la: $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_xbm_la_LDFLAGS) $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_LIBADD) $(LIBS) ++ $(libpixbufloader_xbm_la_LINK) $(am_libpixbufloader_xbm_la_rpath) $(libpixbufloader_xbm_la_OBJECTS) $(libpixbufloader_xbm_la_LIBADD) $(LIBS) + libpixbufloader-xpm.la: $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_DEPENDENCIES) +- $(LINK) -rpath $(loaderdir) $(libpixbufloader_xpm_la_LDFLAGS) $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_LIBADD) $(LIBS) ++ $(libpixbufloader_xpm_la_LINK) $(am_libpixbufloader_xpm_la_rpath) $(libpixbufloader_xpm_la_OBJECTS) $(libpixbufloader_xpm_la_LIBADD) $(LIBS) + libstatic-pixbufloader-ani.la: $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_ani_la_LDFLAGS) $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_ani_la_rpath) $(libstatic_pixbufloader_ani_la_OBJECTS) $(libstatic_pixbufloader_ani_la_LIBADD) $(LIBS) + libstatic-pixbufloader-bmp.la: $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_bmp_la_LDFLAGS) $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_bmp_la_rpath) $(libstatic_pixbufloader_bmp_la_OBJECTS) $(libstatic_pixbufloader_bmp_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-bmp.la: $(libstatic_pixbufloader_gdip_bmp_la_OBJECTS) $(libstatic_pixbufloader_gdip_bmp_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_bmp_la_LDFLAGS) $(libstatic_pixbufloader_gdip_bmp_la_OBJECTS) $(libstatic_pixbufloader_gdip_bmp_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_bmp_la_rpath) $(libstatic_pixbufloader_gdip_bmp_la_OBJECTS) $(libstatic_pixbufloader_gdip_bmp_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-emf.la: $(libstatic_pixbufloader_gdip_emf_la_OBJECTS) $(libstatic_pixbufloader_gdip_emf_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_emf_la_LDFLAGS) $(libstatic_pixbufloader_gdip_emf_la_OBJECTS) $(libstatic_pixbufloader_gdip_emf_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_emf_la_rpath) $(libstatic_pixbufloader_gdip_emf_la_OBJECTS) $(libstatic_pixbufloader_gdip_emf_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-gif.la: $(libstatic_pixbufloader_gdip_gif_la_OBJECTS) $(libstatic_pixbufloader_gdip_gif_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_gif_la_LDFLAGS) $(libstatic_pixbufloader_gdip_gif_la_OBJECTS) $(libstatic_pixbufloader_gdip_gif_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_gif_la_rpath) $(libstatic_pixbufloader_gdip_gif_la_OBJECTS) $(libstatic_pixbufloader_gdip_gif_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-ico.la: $(libstatic_pixbufloader_gdip_ico_la_OBJECTS) $(libstatic_pixbufloader_gdip_ico_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_ico_la_LDFLAGS) $(libstatic_pixbufloader_gdip_ico_la_OBJECTS) $(libstatic_pixbufloader_gdip_ico_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_ico_la_rpath) $(libstatic_pixbufloader_gdip_ico_la_OBJECTS) $(libstatic_pixbufloader_gdip_ico_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-jpeg.la: $(libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) $(libstatic_pixbufloader_gdip_jpeg_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_jpeg_la_LDFLAGS) $(libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) $(libstatic_pixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_jpeg_la_rpath) $(libstatic_pixbufloader_gdip_jpeg_la_OBJECTS) $(libstatic_pixbufloader_gdip_jpeg_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-tiff.la: $(libstatic_pixbufloader_gdip_tiff_la_OBJECTS) $(libstatic_pixbufloader_gdip_tiff_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_tiff_la_LDFLAGS) $(libstatic_pixbufloader_gdip_tiff_la_OBJECTS) $(libstatic_pixbufloader_gdip_tiff_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_tiff_la_rpath) $(libstatic_pixbufloader_gdip_tiff_la_OBJECTS) $(libstatic_pixbufloader_gdip_tiff_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gdip-wmf.la: $(libstatic_pixbufloader_gdip_wmf_la_OBJECTS) $(libstatic_pixbufloader_gdip_wmf_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gdip_wmf_la_LDFLAGS) $(libstatic_pixbufloader_gdip_wmf_la_OBJECTS) $(libstatic_pixbufloader_gdip_wmf_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gdip_wmf_la_rpath) $(libstatic_pixbufloader_gdip_wmf_la_OBJECTS) $(libstatic_pixbufloader_gdip_wmf_la_LIBADD) $(LIBS) + libstatic-pixbufloader-gif.la: $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_gif_la_LDFLAGS) $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_gif_la_rpath) $(libstatic_pixbufloader_gif_la_OBJECTS) $(libstatic_pixbufloader_gif_la_LIBADD) $(LIBS) + libstatic-pixbufloader-icns.la: $(libstatic_pixbufloader_icns_la_OBJECTS) $(libstatic_pixbufloader_icns_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_icns_la_LDFLAGS) $(libstatic_pixbufloader_icns_la_OBJECTS) $(libstatic_pixbufloader_icns_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_icns_la_rpath) $(libstatic_pixbufloader_icns_la_OBJECTS) $(libstatic_pixbufloader_icns_la_LIBADD) $(LIBS) + libstatic-pixbufloader-ico.la: $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_ico_la_LDFLAGS) $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_ico_la_rpath) $(libstatic_pixbufloader_ico_la_OBJECTS) $(libstatic_pixbufloader_ico_la_LIBADD) $(LIBS) + libstatic-pixbufloader-jasper.la: $(libstatic_pixbufloader_jasper_la_OBJECTS) $(libstatic_pixbufloader_jasper_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_jasper_la_LDFLAGS) $(libstatic_pixbufloader_jasper_la_OBJECTS) $(libstatic_pixbufloader_jasper_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_jasper_la_rpath) $(libstatic_pixbufloader_jasper_la_OBJECTS) $(libstatic_pixbufloader_jasper_la_LIBADD) $(LIBS) + libstatic-pixbufloader-jpeg.la: $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_jpeg_la_LDFLAGS) $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_jpeg_la_rpath) $(libstatic_pixbufloader_jpeg_la_OBJECTS) $(libstatic_pixbufloader_jpeg_la_LIBADD) $(LIBS) + libstatic-pixbufloader-pcx.la: $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_pcx_la_LDFLAGS) $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_pcx_la_rpath) $(libstatic_pixbufloader_pcx_la_OBJECTS) $(libstatic_pixbufloader_pcx_la_LIBADD) $(LIBS) + libstatic-pixbufloader-png.la: $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_png_la_LDFLAGS) $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_png_la_rpath) $(libstatic_pixbufloader_png_la_OBJECTS) $(libstatic_pixbufloader_png_la_LIBADD) $(LIBS) + libstatic-pixbufloader-pnm.la: $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_pnm_la_LDFLAGS) $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_pnm_la_rpath) $(libstatic_pixbufloader_pnm_la_OBJECTS) $(libstatic_pixbufloader_pnm_la_LIBADD) $(LIBS) + libstatic-pixbufloader-ras.la: $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_ras_la_LDFLAGS) $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_ras_la_rpath) $(libstatic_pixbufloader_ras_la_OBJECTS) $(libstatic_pixbufloader_ras_la_LIBADD) $(LIBS) + libstatic-pixbufloader-tga.la: $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_tga_la_LDFLAGS) $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_tga_la_rpath) $(libstatic_pixbufloader_tga_la_OBJECTS) $(libstatic_pixbufloader_tga_la_LIBADD) $(LIBS) + libstatic-pixbufloader-tiff.la: $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_tiff_la_LDFLAGS) $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_tiff_la_rpath) $(libstatic_pixbufloader_tiff_la_OBJECTS) $(libstatic_pixbufloader_tiff_la_LIBADD) $(LIBS) + libstatic-pixbufloader-wbmp.la: $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_wbmp_la_LDFLAGS) $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_wbmp_la_rpath) $(libstatic_pixbufloader_wbmp_la_OBJECTS) $(libstatic_pixbufloader_wbmp_la_LIBADD) $(LIBS) + libstatic-pixbufloader-xbm.la: $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_xbm_la_LDFLAGS) $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_pixbufloader_xbm_la_rpath) $(libstatic_pixbufloader_xbm_la_OBJECTS) $(libstatic_pixbufloader_xbm_la_LIBADD) $(LIBS) + libstatic-pixbufloader-xpm.la: $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_DEPENDENCIES) +- $(LINK) $(libstatic_pixbufloader_xpm_la_LDFLAGS) $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_LIBADD) $(LIBS) +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++ $(LINK) $(am_libstatic_pixbufloader_xpm_la_rpath) $(libstatic_pixbufloader_xpm_la_OBJECTS) $(libstatic_pixbufloader_xpm_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(bindir) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -1596,8 +1520,8 @@ uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ +- rm -f $(DESTDIR)$(bindir)/$$f; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + + clean-binPROGRAMS: +@@ -1615,16 +1539,16 @@ clean-noinstPROGRAMS: + done + gdk-pixbuf-csource$(EXEEXT): $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_DEPENDENCIES) + @rm -f gdk-pixbuf-csource$(EXEEXT) +- $(LINK) $(gdk_pixbuf_csource_LDFLAGS) $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_LDADD) $(LIBS) ++ $(LINK) $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_LDADD) $(LIBS) + gdk-pixbuf-query-loaders$(EXEEXT): $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_DEPENDENCIES) + @rm -f gdk-pixbuf-query-loaders$(EXEEXT) +- $(LINK) $(gdk_pixbuf_query_loaders_LDFLAGS) $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_LDADD) $(LIBS) ++ $(LINK) $(gdk_pixbuf_query_loaders_OBJECTS) $(gdk_pixbuf_query_loaders_LDADD) $(LIBS) + test-gdk-pixbuf$(EXEEXT): $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_DEPENDENCIES) + @rm -f test-gdk-pixbuf$(EXEEXT) +- $(LINK) $(test_gdk_pixbuf_LDFLAGS) $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_LDADD) $(LIBS) ++ $(LINK) $(test_gdk_pixbuf_OBJECTS) $(test_gdk_pixbuf_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -1672,64 +1596,47 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gdk-pixbuf.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-libgdk_pixbufincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgdk_pixbufincludeHEADERS: $(libgdk_pixbufinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgdk_pixbufincludedir) ++ test -z "$(libgdk_pixbufincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdk_pixbufincludedir)" + @list='$(libgdk_pixbufinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgdk_pixbufincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ +- $(libgdk_pixbufincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgdk_pixbufincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgdk_pixbufincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgdk_pixbufincludedir)/$$f'"; \ ++ $(libgdk_pixbufincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ + done + + uninstall-libgdk_pixbufincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgdk_pixbufinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgdk_pixbufincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgdk_pixbufincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgdk_pixbufincludedir)/$$f"; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -1739,7 +1646,13 @@ uninstall-libgdk_pixbufincludeHEADERS: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -1751,15 +1664,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -1780,7 +1698,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -1791,35 +1709,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -1827,23 +1740,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -1857,9 +1770,9 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -1868,25 +1781,25 @@ check-TESTS: $(TESTS) + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xpass=`expr $$xpass + 1`; \ +- failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xpass=`expr $$xpass + 1`; \ ++ failed=`expr $$failed + 1`; \ ++ echo "XPASS: $$tst"; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xfail=`expr $$xfail + 1`; \ ++ echo "XFAIL: $$tst"; \ + ;; \ + *) \ +- failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ failed=`expr $$failed + 1`; \ ++ echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ +@@ -1911,46 +1824,40 @@ check-TESTS: $(TESTS) + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ +- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ +- test -n "$$skipped" && echo "$$skipped"; \ +- test -n "$$report" && echo "$$report"; \ ++ test -z "$$skipped" || echo "$$skipped"; \ ++ test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -1961,15 +1868,19 @@ distdir: $(DISTFILES) + || 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 \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -1978,13 +1889,16 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) all-local ++@CROSS_COMPILING_TRUE@all-local: ++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ ++ all-local + install-binPROGRAMS: install-libLTLIBRARIES + + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(loaderdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libgdk_pixbufincludedir) +- ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(loaderdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libgdk_pixbufincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive +@@ -2006,13 +1920,13 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ++ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + clean: clean-recursive + + clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ +@@ -2023,12 +1937,14 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-local distclean-tags ++ distclean-local distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: +@@ -2038,12 +1954,20 @@ install-data-am: install-libgdk_pixbufin + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-recursive ++ + install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -2064,35 +1988,34 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ +- uninstall-libLTLIBRARIES uninstall-libgdk_pixbufincludeHEADERS \ ++uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ ++ uninstall-libgdk_pixbufincludeHEADERS \ + uninstall-loaderLTLIBRARIES uninstall-local + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-data-am install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ +- check-TESTS check-am check-local clean clean-binPROGRAMS \ +- clean-generic clean-libLTLIBRARIES clean-libtool \ +- clean-loaderLTLIBRARIES clean-noinstLTLIBRARIES \ +- clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-local distclean-recursive distclean-tags distdir dvi \ +- dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-binPROGRAMS install-data install-data-am \ +- install-data-recursive install-exec install-exec-am \ +- install-exec-recursive install-info install-info-am \ +- install-info-recursive install-libLTLIBRARIES \ +- install-libgdk_pixbufincludeHEADERS install-loaderLTLIBRARIES \ +- install-man install-recursive install-strip installcheck \ +- installcheck-am installdirs installdirs-am \ +- installdirs-recursive maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ +- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ +- tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ +- uninstall-info-am uninstall-info-recursive \ +- uninstall-libLTLIBRARIES uninstall-libgdk_pixbufincludeHEADERS \ +- uninstall-loaderLTLIBRARIES uninstall-local uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am all-local check check-TESTS check-am check-local \ ++ clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ ++ clean-libtool clean-loaderLTLIBRARIES clean-noinstLTLIBRARIES \ ++ clean-noinstPROGRAMS ctags ctags-recursive distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-local distclean-tags distdir dvi dvi-am html html-am \ ++ info info-am install install-am install-binPROGRAMS \ ++ install-data install-data-am install-data-hook install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am \ ++ install-libLTLIBRARIES install-libgdk_pixbufincludeHEADERS \ ++ install-loaderLTLIBRARIES install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ++ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ++ uninstall-binPROGRAMS uninstall-libLTLIBRARIES \ ++ uninstall-libgdk_pixbufincludeHEADERS \ ++ uninstall-loaderLTLIBRARIES uninstall-local + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gdk-pixbuf/pixops/Makefile.in 2008-10-17 06:07:15.000000000 +0200 ++++ gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in 2008-11-11 18:56:02.024634625 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,59 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++noinst_PROGRAMS = timescale$(EXEEXT) ++subdir = gdk-pixbuf/pixops ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++libpixops_la_LIBADD = ++am__libpixops_la_SOURCES_DIST = pixops.c pixops.h pixops-internal.h \ ++ have_mmx.S scale_line_22_33_mmx.S composite_line_22_4a4_mmx.S \ ++ composite_line_color_22_4a4_mmx.S ++@USE_MMX_TRUE@am__objects_1 = have_mmx.lo scale_line_22_33_mmx.lo \ ++@USE_MMX_TRUE@ composite_line_22_4a4_mmx.lo \ ++@USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.lo ++am_libpixops_la_OBJECTS = pixops.lo $(am__objects_1) ++libpixops_la_OBJECTS = $(am_libpixops_la_OBJECTS) ++PROGRAMS = $(noinst_PROGRAMS) ++am_timescale_OBJECTS = timescale.$(OBJEXT) ++timescale_OBJECTS = $(am_timescale_OBJECTS) ++am__DEPENDENCIES_1 = ++timescale_DEPENDENCIES = libpixops.la $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) ++LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libpixops_la_SOURCES) $(timescale_SOURCES) ++DIST_SOURCES = $(am__libpixops_la_SOURCES_DIST) $(timescale_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61822,40 +86886,3351 @@ diff -urN gtk+2.0-2.14.4.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.4/gdk-pi GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/gtk/Makefile.in gtk+2.0-2.14.4/gtk/Makefile.in ---- gtk+2.0-2.14.4.old/gtk/Makefile.in 2008-10-17 01:07:17.000000000 -0300 -+++ gtk+2.0-2.14.4/gtk/Makefile.in 2008-11-04 15:37:08.000000000 -0200 -@@ -117,6 +117,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@ -@@ -143,6 +145,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +242,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,18 +304,16 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- DETAILS \ +- pixbuf-transform-math.ltx \ +- makefile.msc +- ++EXTRA_DIST = DETAILS pixbuf-transform-math.ltx makefile.msc + TEST_PROGS = + + ### testing rules +@@ -410,97 +339,70 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + noinst_LTLIBRARIES = libpixops.la +- + INCLUDES = \ + -I$(top_srcdir) -I$(top_builddir) \ + $(GTK_DEBUG_FLAGS) \ + $(GDK_PIXBUF_DEP_CFLAGS) + +- +-noinst_PROGRAMS = timescale +- + timescale_SOURCES = timescale.c + timescale_LDADD = libpixops.la $(GLIB_LIBS) $(GDK_PIXBUF_DEP_LIBS) +- + @USE_MMX_TRUE@mmx_sources = \ + @USE_MMX_TRUE@ have_mmx.S \ + @USE_MMX_TRUE@ scale_line_22_33_mmx.S \ + @USE_MMX_TRUE@ composite_line_22_4a4_mmx.S \ + @USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.S + +- + libpixops_la_SOURCES = \ + pixops.c \ + pixops.h \ + pixops-internal.h \ + $(mmx_sources) + +-subdir = gdk-pixbuf/pixops +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(noinst_LTLIBRARIES) +- +-libpixops_la_LDFLAGS = +-libpixops_la_LIBADD = +-am__libpixops_la_SOURCES_DIST = pixops.c pixops.h pixops-internal.h \ +- have_mmx.S scale_line_22_33_mmx.S composite_line_22_4a4_mmx.S \ +- composite_line_color_22_4a4_mmx.S +-@USE_MMX_TRUE@am__objects_1 = have_mmx.lo scale_line_22_33_mmx.lo \ +-@USE_MMX_TRUE@ composite_line_22_4a4_mmx.lo \ +-@USE_MMX_TRUE@ composite_line_color_22_4a4_mmx.lo +-am_libpixops_la_OBJECTS = pixops.lo $(am__objects_1) +-libpixops_la_OBJECTS = $(am_libpixops_la_OBJECTS) +-noinst_PROGRAMS = timescale$(EXEEXT) +-PROGRAMS = $(noinst_PROGRAMS) +- +-am_timescale_OBJECTS = timescale.$(OBJEXT) +-timescale_OBJECTS = $(am_timescale_OBJECTS) +-timescale_DEPENDENCIES = libpixops.la +-timescale_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pixops.Plo ./$(DEPDIR)/timescale.Po +-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) +-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ +- $(CCASFLAGS) +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(am__libpixops_la_SOURCES_DIST) $(timescale_SOURCES) +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(libpixops_la_SOURCES) $(timescale_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk-pixbuf/pixops/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk-pixbuf/pixops/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libpixops.la: $(libpixops_la_OBJECTS) $(libpixops_la_DEPENDENCIES) +- $(LINK) $(libpixops_la_LDFLAGS) $(libpixops_la_OBJECTS) $(libpixops_la_LIBADD) $(LIBS) ++ $(LINK) $(libpixops_la_OBJECTS) $(libpixops_la_LIBADD) $(LIBS) + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -510,58 +412,62 @@ clean-noinstPROGRAMS: + done + timescale$(EXEEXT): $(timescale_OBJECTS) $(timescale_DEPENDENCIES) + @rm -f timescale$(EXEEXT) +- $(LINK) $(timescale_LDFLAGS) $(timescale_OBJECTS) $(timescale_LDADD) $(LIBS) ++ $(LINK) $(timescale_OBJECTS) $(timescale_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c + ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite_line_22_4a4_mmx.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite_line_color_22_4a4_mmx.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/have_mmx.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixops.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale_line_22_33_mmx.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timescale.Po@am__quote@ + + .S.o: +- $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ $< + + .S.obj: +- $(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .S.lo: +- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@am__fastdepCCAS_TRUE@ $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCCAS_FALSE@ $(LTCPPASCOMPILE) -c -o $@ $< + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -569,26 +475,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -598,23 +493,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -626,29 +521,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -663,7 +552,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -684,7 +572,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -698,24 +586,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -736,19 +634,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-info-am ++ tags uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/gtk/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gtk/Makefile.in 2008-10-17 06:07:17.000000000 +0200 ++++ gtk+-2.14.4/gtk/Makefile.in 2008-11-11 18:56:03.684634570 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,15 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ ++ ++ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,7 +36,13 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(am__gtkunixprintinclude_HEADERS_DIST) \ ++ $(gtkinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/gtk-win32.rc.in \ ++ $(srcdir)/gtkversion.h.in $(srcdir)/makefile.msc.in \ ++ $(top_srcdir)/Makefile.decl + @OS_LINUX_TRUE@am__append_1 = abicheck.sh pltcheck.sh + @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_2 = $(INCLUDED_IMMODULE_OBJ) + @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_3 = $(INCLUDED_IMMODULE_OBJ) +@@ -61,1756 +66,945 @@ host_triplet = @host@ + @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_12 = gtksearchenginequartz.h + @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_quartz_c_sources) + @USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_14 = $(gtk_use_stub_c_sources) +-ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ +-AMTAR = @AMTAR@ +-AR = @AR@ +-AS = @AS@ +-ATK_PREFIX = @ATK_PREFIX@ +-AUTOCONF = @AUTOCONF@ +-AUTOHEADER = @AUTOHEADER@ +-AUTOMAKE = @AUTOMAKE@ +-AWK = @AWK@ +-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ +-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ +-CAIRO_PREFIX = @CAIRO_PREFIX@ +-CATALOGS = @CATALOGS@ +-CATOBJEXT = @CATOBJEXT@ +-CC = @CC@ +-CCAS = @CCAS@ +-CCASFLAGS = @CCASFLAGS@ +-CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ +-CUPS_API_MAJOR = @CUPS_API_MAJOR@ +-CUPS_API_MINOR = @CUPS_API_MINOR@ +-CUPS_CFLAGS = @CUPS_CFLAGS@ +-CUPS_CONFIG = @CUPS_CONFIG@ +-CUPS_LIBS = @CUPS_LIBS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ +-CYGPATH_W = @CYGPATH_W@ +-DATADIRNAME = @DATADIRNAME@ +-DB2HTML = @DB2HTML@ +-DEFS = @DEFS@ +-DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ +-DLLTOOL = @DLLTOOL@ +-DSYMUTIL = @DSYMUTIL@ +-ECHO = @ECHO@ +-ECHO_C = @ECHO_C@ +-ECHO_N = @ECHO_N@ +-ECHO_T = @ECHO_T@ +-EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ +-EXEEXT = @EXEEXT@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ +-GAIL_INET_LIBS = @GAIL_INET_LIBS@ +-GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ +-GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +-GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ +-GDK_DEP_LIBS = @GDK_DEP_LIBS@ +-GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ +-GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@ +-GDK_PACKAGES = @GDK_PACKAGES@ +-GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ +-GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@ +-GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@ +-GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@ +-GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@ +-GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@ +-GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@ +-GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@ +-GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@ +-GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@ +-GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@ +-GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@ +-GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ +-GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ +-GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +-GDK_WLIBS = @GDK_WLIBS@ +-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +-GLIB_CFLAGS = @GLIB_CFLAGS@ +-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +-GLIB_LIBS = @GLIB_LIBS@ +-GLIB_MKENUMS = @GLIB_MKENUMS@ +-GLIB_PREFIX = @GLIB_PREFIX@ +-GMOFILES = @GMOFILES@ +-GMSGFMT = @GMSGFMT@ +-GOBJECT_QUERY = @GOBJECT_QUERY@ +-GREP = @GREP@ +-GTKDOC_CHECK = @GTKDOC_CHECK@ +-GTK_API_VERSION = @GTK_API_VERSION@ +-GTK_BINARY_AGE = @GTK_BINARY_AGE@ +-GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ +-GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ +-GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ +-GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ +-GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ +-GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ +-GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +-GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@ +-GTK_MICRO_VERSION = @GTK_MICRO_VERSION@ +-GTK_MINOR_VERSION = @GTK_MINOR_VERSION@ +-GTK_PACKAGES = @GTK_PACKAGES@ +-GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ +-GTK_VERSION = @GTK_VERSION@ +-GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ +-HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ +-HTML_DIR = @HTML_DIR@ +-INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ +-INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ +-INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ +-INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ +-INDENT = @INDENT@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-INSTOBJEXT = @INSTOBJEXT@ +-INTLLIBS = @INTLLIBS@ +-LDFLAGS = @LDFLAGS@ +-LIBJASPER = @LIBJASPER@ +-LIBJPEG = @LIBJPEG@ +-LIBOBJS = @LIBOBJS@ +-LIBPNG = @LIBPNG@ +-LIBS = @LIBS@ +-LIBTIFF = @LIBTIFF@ +-LIBTOOL = @LIBTOOL@ +-LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ +-LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LN_S = @LN_S@ +-LTLIBOBJS = @LTLIBOBJS@ +-LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ +-LT_VERSION_INFO = @LT_VERSION_INFO@ +-MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +-MAKEINFO = @MAKEINFO@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-MSGFMT = @MSGFMT@ +-MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ +-NM = @NM@ +-NMEDIT = @NMEDIT@ +-OBJDUMP = @OBJDUMP@ +-OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-PACKAGE = @PACKAGE@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +-PACKAGE_NAME = @PACKAGE_NAME@ +-PACKAGE_STRING = @PACKAGE_STRING@ +-PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_VERSION = @PACKAGE_VERSION@ +-PANGO_PREFIX = @PANGO_PREFIX@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ +-PERL = @PERL@ +-PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ +-POFILES = @POFILES@ +-POSUB = @POSUB@ +-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +-RANLIB = @RANLIB@ +-REBUILD = @REBUILD@ +-REBUILD_PNGS = @REBUILD_PNGS@ +-SED = @SED@ +-SET_MAKE = @SET_MAKE@ +-SHELL = @SHELL@ +-STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ +-USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ +-VERSION = @VERSION@ +-WINDRES = @WINDRES@ +-XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ +-XMKMF = @XMKMF@ +-XMLCATALOG = @XMLCATALOG@ +-XML_CATALOG_FILE = @XML_CATALOG_FILE@ +-XSLTPROC = @XSLTPROC@ +-X_CFLAGS = @X_CFLAGS@ +-X_EXTRA_LIBS = @X_EXTRA_LIBS@ +-X_LIBS = @X_LIBS@ +-X_PRE_LIBS = @X_PRE_LIBS@ +-ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +-am__include = @am__include@ +-am__leading_dot = @am__leading_dot@ +-am__quote = @am__quote@ +-bindir = @bindir@ +-build = @build@ +-build_alias = @build_alias@ +-build_cpu = @build_cpu@ +-build_os = @build_os@ +-build_vendor = @build_vendor@ +-datadir = @datadir@ +-datarootdir = @datarootdir@ +-docdir = @docdir@ +-dvidir = @dvidir@ +-exec_prefix = @exec_prefix@ +-gdktarget = @gdktarget@ +-gdktargetlib = @gdktargetlib@ +-gtktargetlib = @gtktargetlib@ +-host = @host@ +-host_alias = @host_alias@ +-host_cpu = @host_cpu@ +-host_os = @host_os@ +-host_vendor = @host_vendor@ +-htmldir = @htmldir@ +-includedir = @includedir@ +-infodir = @infodir@ +-install_sh = @install_sh@ +-libdir = @libdir@ +-libexecdir = @libexecdir@ +-localedir = @localedir@ +-localstatedir = @localstatedir@ +-mandir = @mandir@ +-ms_librarian = @ms_librarian@ +-oldincludedir = @oldincludedir@ +-pdfdir = @pdfdir@ +-prefix = @prefix@ +-program_transform_name = @program_transform_name@ +-psdir = @psdir@ +-sbindir = @sbindir@ +-sharedstatedir = @sharedstatedir@ +-sysconfdir = @sysconfdir@ +-target_alias = @target_alias@ +- +-GTESTER = gtester # in $PATH for non-GLIB packages +-GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages +- +-# initialize variables for unconditional += appending +-EXTRA_DIST = gtkquartz.h $(gtk_private_h_sources) $(gtk_extra_sources) $(gtk_built_sources) $(STOCK_ICONS) \ +- $(STOCK_ICONS) \ +- $(GENERATED_ICONS) \ +- line-arrow.xbm \ +- line-wrap.xbm \ +- tree_plus.xbm \ +- tree_minus.xbm \ +- tree_minus.xpm \ +- tree_plus.xpm \ +- gtk.def \ +- gtk-builder-convert \ +- gtk-win32.rc \ +- gtk-win32.rc.in \ +- gtkwin32embed.h \ +- gtkwin32embedwidget.h \ +- gtkwin32embedwidget.c \ +- gtkprint-win32.h \ +- gtkprint-win32.c \ +- gtksearchenginequartz.h \ +- gtkrc.default \ +- gtkrc.key.default \ +- gtkrc.key.emacs \ +- makefile.msc \ +- makefile.msc.in \ +- makegtkalias.pl \ +- aliasfilescheck.sh \ +- abicheck.sh \ +- pltcheck.sh \ +- gtktypebuiltins.c.template \ +- gtktypebuiltins.h.template +- +-TEST_PROGS = +- +-### testing rules +- +-# Xvfb based test rules +-XVFB = Xvfb -screen 0 800x600x16 +-XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ +- 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ +- 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ +- 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ +- 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ +- 9995 9996 9997 9998 9999 +- +-SKIP_GDKTARGET = \ +- test "$(gdktarget)" != "x11" \ +- && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." +- +-XVFB_START = \ +- ${XVFB} -help 2>/dev/null 1>&2 \ +- && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ +- && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ +- trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ +- || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ +- && DISPLAY=:$$XID && export DISPLAY +- +- +- +-# Makefile.am for gtk+/gtk +-@USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f" +-@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f" +- +-SUBDIRS = theme-bits . tests +-DIST_SUBDIRS = theme-bits tests +-@HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr +- +-@HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups +- +-INCLUDES = \ +- -DG_LOG_DOMAIN=\"Gtk\" \ +- -DGTK_LIBDIR=\"$(libdir)\" \ +- -DGTK_DATADIR=\"$(datadir)\" \ +- -DGTK_DATA_PREFIX=\"$(prefix)\" \ +- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ +- -DGTK_VERSION=\"$(GTK_VERSION)\" \ +- -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ +- -DGTK_HOST=\"$(host)\" \ +- -DGTK_COMPILATION \ +- -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \ +- -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\" \ +- -I$(top_builddir) \ +- -I$(top_builddir)/gtk \ +- -I$(top_srcdir) -I../gdk \ +- -I$(top_srcdir)/gdk \ +- -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ +- -DGDK_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ +- -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ +- $(GTK_DEBUG_FLAGS) \ +- $(GTK_DEP_CFLAGS) \ +- $(gtk_clipboard_dnd_c_sources_CFLAGS) \ +- $(INCLUDED_IMMODULE_DEFINE) +- +- +-gtarget = $(gdktarget) +- +-@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined +- +-@OS_WIN32_TRUE@gtk_def = gtk.def +-@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def +- +-@OS_WIN32_TRUE@gtk_win32_res = gtk-win32-res.o +-@OS_WIN32_TRUE@gtk_win32_res_ldflag = -Wl,gtk-win32-res.o +- +-@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib +- +-TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)" +-TESTS = aliasfilescheck.sh $(am__append_1) +- +-libgtkincludedir = $(includedir)/gtk-2.0/gtk +-libadd = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(GTK_DEP_LIBS)\ +-$(am__append_2) +-deps = $(am__append_3) +- +-# libtool stuff: set version and export symbols for resolving +-# since automake doesn't support conditionalized libsomething_la_LDFLAGS +-# we use the general approach here +-libtool_opts = \ +- -version-info $(LT_VERSION_INFO) \ +- -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \ +- -rpath $(libdir) $(libgtk_target_ldflags) +- +- +-# +-# setup source file variables +-# +- +-# GTK+ header files for public installation (non-generated, or generated +-# by configure) +- +-# Broken +- +-# Deprecated +-gtk_public_h_sources = \ +- gtk.h \ +- gtkaboutdialog.h \ +- gtkaccelgroup.h \ +- gtkaccellabel.h \ +- gtkaccelmap.h \ +- gtkaccessible.h \ +- gtkaction.h \ +- gtkactiongroup.h \ +- gtkadjustment.h \ +- gtkalignment.h \ +- gtkarrow.h \ +- gtkaspectframe.h \ +- gtkassistant.h \ +- gtkbbox.h \ +- gtkbin.h \ +- gtkbindings.h \ +- gtkbox.h \ +- gtkbuilder.h \ +- gtkbuildable.h \ +- gtkbutton.h \ +- gtkcalendar.h \ +- gtkcelleditable.h \ +- gtkcelllayout.h \ +- gtkcellrenderer.h \ +- gtkcellrendereraccel.h \ +- gtkcellrenderercombo.h \ +- gtkcellrendererpixbuf.h \ +- gtkcellrendererprogress.h \ +- gtkcellrendererspin.h \ +- gtkcellrenderertext.h \ +- gtkcellrenderertoggle.h \ +- gtkcellview.h \ +- gtkcheckbutton.h \ +- gtkcheckmenuitem.h \ +- gtkclipboard.h \ +- gtkcolorbutton.h \ +- gtkcolorsel.h \ +- gtkcolorseldialog.h \ +- gtkcombobox.h \ +- gtkcomboboxentry.h \ +- gtkcontainer.h \ +- gtkcurve.h \ +- gtkdebug.h \ +- gtkdialog.h \ +- gtkdnd.h \ +- gtkdrawingarea.h \ +- gtkeditable.h \ +- gtkentry.h \ +- gtkentrycompletion.h \ +- gtkenums.h \ +- gtkeventbox.h \ +- gtkexpander.h \ +- gtkfilechooser.h \ +- gtkfilechooserbutton.h \ +- gtkfilechooserdialog.h \ +- gtkfilechooserwidget.h \ +- gtkfilefilter.h \ +- gtkfixed.h \ +- gtkfontbutton.h \ +- gtkfontsel.h \ +- gtkframe.h \ +- gtkgamma.h \ +- gtkgc.h \ +- gtkhandlebox.h \ +- gtkhbbox.h \ +- gtkhbox.h \ +- gtkhpaned.h \ +- gtkhruler.h \ +- gtkhscale.h \ +- gtkhscrollbar.h \ +- gtkhseparator.h \ +- gtkhsv.h \ +- gtkiconfactory.h \ +- gtkicontheme.h \ +- gtkiconview.h \ +- gtkimage.h \ +- gtkimagemenuitem.h \ +- gtkimcontext.h \ +- gtkimcontextsimple.h \ +- gtkimmodule.h \ +- gtkimmulticontext.h \ +- gtkinputdialog.h \ +- gtkinvisible.h \ +- gtkitem.h \ +- gtklabel.h \ +- gtklayout.h \ +- gtklinkbutton.h \ +- gtkliststore.h \ +- gtkmain.h \ +- gtkmenu.h \ +- gtkmenubar.h \ +- gtkmenuitem.h \ +- gtkmenushell.h \ +- gtkmenutoolbutton.h \ +- gtkmessagedialog.h \ +- gtkmisc.h \ +- gtkmodules.h \ +- gtkmountoperation.h \ +- gtknotebook.h \ +- gtkobject.h \ +- gtkpagesetup.h \ +- gtkpaned.h \ +- gtkpapersize.h \ +- gtkplug.h \ +- gtkprintcontext.h \ +- gtkprintoperation.h \ +- gtkprintoperationpreview.h \ +- gtkprintsettings.h \ +- gtkprivate.h \ +- gtkprogressbar.h \ +- gtkradioaction.h \ +- gtkradiobutton.h \ +- gtkradiomenuitem.h \ +- gtkradiotoolbutton.h \ +- gtkrange.h \ +- gtkrc.h \ +- gtkrecentaction.h \ +- gtkrecentchooser.h \ +- gtkrecentchooserdialog.h \ +- gtkrecentchoosermenu.h \ +- gtkrecentchooserwidget.h \ +- gtkrecentfilter.h \ +- gtkrecentmanager.h \ +- gtkruler.h \ +- gtkscale.h \ +- gtkscalebutton.h \ +- gtkscrollbar.h \ +- gtkscrolledwindow.h \ +- gtkselection.h \ +- gtkseparator.h \ +- gtkseparatormenuitem.h \ +- gtkseparatortoolitem.h \ +- gtkshow.h \ +- gtksettings.h \ +- gtksizegroup.h \ +- gtksocket.h \ +- gtkspinbutton.h \ +- gtkstatusbar.h \ +- gtkstatusicon.h \ +- gtkstock.h \ +- gtkstyle.h \ +- gtktable.h \ +- gtktearoffmenuitem.h \ +- gtktestutils.h \ +- gtktextbuffer.h \ +- gtktextbufferrichtext.h \ +- gtktextchild.h \ +- gtktextdisplay.h \ +- gtktextiter.h \ +- gtktextmark.h \ +- gtktexttag.h \ +- gtktexttagtable.h \ +- gtktextview.h \ +- gtktoggleaction.h \ +- gtktogglebutton.h \ +- gtktoggletoolbutton.h \ +- gtktoolbar.h \ +- gtktoolbutton.h \ +- gtktoolitem.h \ +- gtktoolshell.h \ +- gtktooltip.h \ +- gtktreednd.h \ +- gtktreemodel.h \ +- gtktreemodelfilter.h \ +- gtktreemodelsort.h \ +- gtktreeselection.h \ +- gtktreesortable.h \ +- gtktreestore.h \ +- gtktreeview.h \ +- gtktreeviewcolumn.h \ +- gtktypeutils.h \ +- gtkuimanager.h \ +- gtkvbbox.h \ +- gtkvbox.h \ +- gtkviewport.h \ +- gtkvolumebutton.h \ +- gtkvpaned.h \ +- gtkvruler.h \ +- gtkvscale.h \ +- gtkvscrollbar.h \ +- gtkvseparator.h \ +- gtkwidget.h \ +- gtkwindow.h\ +-\ +- gtktext.h \ +- gtktree.h \ +- gtktreeitem.h\ +-\ +- gtkclist.h \ +- gtkcombo.h \ +- gtkctree.h \ +- gtkfilesel.h \ +- gtkitemfactory.h \ +- gtklist.h \ +- gtklistitem.h \ +- gtkoldeditable.h \ +- gtkoptionmenu.h \ +- gtkpixmap.h \ +- gtkpreview.h \ +- gtkprogress.h \ +- gtksignal.h \ +- gtktipsquery.h \ +- gtktooltips.h +- +- +-@OS_UNIX_TRUE@gtk_unix_print_public_h_sources = \ +-@OS_UNIX_TRUE@ gtkpagesetupunixdialog.h \ +-@OS_UNIX_TRUE@ gtkprintunixdialog.h \ +-@OS_UNIX_TRUE@ gtkprinter.h \ +-@OS_UNIX_TRUE@ gtkprintjob.h \ +-@OS_UNIX_TRUE@ gtkunixprint.h +- +- +-# Installed header files without compatibility guarantees +-# that are not included in gtk/gtk.h +-gtk_semi_private_h_sources = \ +- gtktextlayout.h +- +- +-# GTK+ header files that don't get installed +-gtk_private_h_sources = \ +- gtkquery.h \ +- gtksearchengine.h \ +- gtksearchenginesimple.h \ +- gtkdndcursors.h \ +- gtkentryprivate.h \ +- gtkbuilderprivate.h \ +- gtkfilechooserdefault.h \ +- gtkfilechooserembed.h \ +- gtkfilechooserentry.h \ +- gtkfilechooserprivate.h \ +- gtkfilechoosersettings.h \ +- gtkfilechooserutils.h \ +- gtkfilesystem.h \ +- gtkfilesystemmodel.h \ +- gtkiconcache.h \ +- gtkintl.h \ +- gtkkeyhash.h \ +- gtkmnemonichash.h \ +- gtkpathbar.h \ +- gtkplugprivate.h \ +- gtkprintoperation-private.h\ +- gtkprintutils.h \ +- gtkrbtree.h \ +- gtkrecentchooserdefault.h \ +- gtkrecentchooserprivate.h \ +- gtkrecentchooserutils.h \ +- gtksocketprivate.h \ +- gtktextbtree.h \ +- gtktextbufferserialize.h\ +- gtktextchildprivate.h \ +- gtktextiterprivate.h \ +- gtktextmarkprivate.h \ +- gtktextsegment.h \ +- gtktexttagprivate.h \ +- gtktexttypes.h \ +- gtktextutil.h \ +- gtkthemes.h \ +- gtktoggleactionprivate.h\ +- gtktreedatalist.h \ +- gtktreeprivate.h \ +- gtkwindow-decorate.h \ +- $(gtk_clipboard_dnd_h_sources)\ +-$(am__append_4) $(am__append_6) $(am__append_8) $(am__append_10) $(am__append_12) +- +-# GTK+ C sources to build the library from +-gtk_base_c_sources = \ +- gtkquery.c \ +- gtksearchengine.c \ +- gtksearchenginesimple.c \ +- fnmatch.c \ +- gtkaboutdialog.c \ +- gtkaccelgroup.c \ +- gtkaccellabel.c \ +- gtkaccelmap.c \ +- gtkaccessible.c \ +- gtkaction.c \ +- gtkactiongroup.c \ +- gtkadjustment.c \ +- gtkalignment.c \ +- gtkarrow.c \ +- gtkaspectframe.c \ +- gtkassistant.c \ +- gtkbbox.c \ +- gtkbin.c \ +- gtkbindings.c \ +- gtkbox.c \ +- gtkbuildable.c \ +- gtkbuilder.c \ +- gtkbuilderparser.c \ +- gtkbutton.c \ +- gtkcalendar.c \ +- gtkcelleditable.c \ +- gtkcelllayout.c \ +- gtkcellrenderer.c \ +- gtkcellrendereraccel.c \ +- gtkcellrenderercombo.c \ +- gtkcellrendererpixbuf.c \ +- gtkcellrendererprogress.c \ +- gtkcellrendererspin.c \ +- gtkcellrenderertext.c \ +- gtkcellrenderertoggle.c \ +- gtkcellview.c \ +- gtkcheckbutton.c \ +- gtkcheckmenuitem.c \ +- gtkcolorbutton.c \ +- gtkcolorsel.c \ +- gtkcolorseldialog.c \ +- gtkcombobox.c \ +- gtkcomboboxentry.c \ +- gtkcontainer.c \ +- gtkcurve.c \ +- gtkdialog.c \ +- gtkdrawingarea.c \ +- gtkeditable.c \ +- gtkentry.c \ +- gtkentrycompletion.c \ +- gtkeventbox.c \ +- gtkexpander.c \ +- gtkfilechooser.c \ +- gtkfilechooserbutton.c \ +- gtkfilechooserdefault.c \ +- gtkfilechooserdialog.c \ +- gtkfilechooserembed.c \ +- gtkfilechooserentry.c \ +- gtkfilechoosersettings.c \ +- gtkfilechooserutils.c \ +- gtkfilechooserwidget.c \ +- gtkfilefilter.c \ +- gtkfilesystem.c \ +- gtkfilesystemmodel.c \ +- gtkfixed.c \ +- gtkfontbutton.c \ +- gtkfontsel.c \ +- gtkframe.c \ +- gtkgamma.c \ +- gtkgc.c \ +- gtkhandlebox.c \ +- gtkhbbox.c \ +- gtkhbox.c \ +- gtkhpaned.c \ +- gtkhruler.c \ +- gtkhscale.c \ +- gtkhscrollbar.c \ +- gtkhseparator.c \ +- gtkhsv.c \ +- gtkiconcache.c \ +- gtkiconcachevalidator.c \ +- gtkiconfactory.c \ +- gtkicontheme.c \ +- gtkiconview.c \ +- gtkimage.c \ +- gtkimagemenuitem.c \ +- gtkimcontext.c \ +- gtkimcontextsimple.c \ +- gtkimmodule.c \ +- gtkimmulticontext.c \ +- gtkinputdialog.c \ +- gtkinvisible.c \ +- gtkitem.c \ +- gtkkeyhash.c \ +- gtklabel.c \ +- gtklayout.c \ +- gtklinkbutton.c \ +- gtkliststore.c \ +- gtkmain.c \ +- gtkmarshal.c \ +- gtkmarshalers.c \ +- gtkmenu.c \ +- gtkmenubar.c \ +- gtkmenuitem.c \ +- gtkmenushell.c \ +- gtkmenutoolbutton.c \ +- gtkmessagedialog.c \ +- gtkmisc.c \ +- gtkmnemonichash.c \ +- gtkmodules.c \ +- gtkmountoperation.c \ +- gtknotebook.c \ +- gtkobject.c \ +- gtkpagesetup.c \ +- gtkpaned.c \ +- gtkpapersize.c \ +- gtkpathbar.c \ +- gtkplug.c \ +- gtkprintcontext.c \ +- gtkprintoperation.c \ +- gtkprintoperationpreview.c \ +- gtkprintsettings.c \ +- gtkprintutils.c \ +- gtkprogressbar.c \ +- gtkradioaction.c \ +- gtkradiobutton.c \ +- gtkradiomenuitem.c \ +- gtkradiotoolbutton.c \ +- gtkrange.c \ +- gtkrbtree.c \ +- gtkrc.c \ +- gtkrecentaction.c \ +- gtkrecentchooserdefault.c \ +- gtkrecentchooserdialog.c \ +- gtkrecentchoosermenu.c \ +- gtkrecentchooserwidget.c \ +- gtkrecentchooserutils.c \ +- gtkrecentchooser.c \ +- gtkrecentfilter.c \ +- gtkrecentmanager.c \ +- gtkruler.c \ +- gtkscale.c \ +- gtkscalebutton.c \ +- gtkscrollbar.c \ +- gtkscrolledwindow.c \ +- gtkselection.c \ +- gtkseparator.c \ +- gtkseparatormenuitem.c \ +- gtkseparatortoolitem.c \ +- gtksettings.c \ +- gtksizegroup.c \ +- gtkshow.c \ +- gtksocket.c \ +- gtkspinbutton.c \ +- gtkstatusbar.c \ +- gtkstatusicon.c \ +- gtkstock.c \ +- gtkstyle.c \ +- gtktable.c \ +- gtktearoffmenuitem.c \ +- gtktestutils.c \ +- gtktextbtree.c \ +- gtktextbuffer.c \ +- gtktextbufferrichtext.c \ +- gtktextbufferserialize.c\ +- gtktextchild.c \ +- gtktextdisplay.c \ +- gtktextiter.c \ +- gtktextlayout.c \ +- gtktextmark.c \ +- gtktextsegment.c \ +- gtktexttag.c \ +- gtktexttagtable.c \ +- gtktexttypes.c \ +- gtktextutil.c \ +- gtktextview.c \ +- gtkthemes.c \ +- gtktoggleaction.c \ +- gtktogglebutton.c \ +- gtktoggletoolbutton.c \ +- gtktoolbar.c \ +- gtktoolbutton.c \ +- gtktoolitem.c \ +- gtktoolshell.c \ +- gtktooltip.c \ +- gtktreedatalist.c \ +- gtktreednd.c \ +- gtktreemodel.c \ +- gtktreemodelfilter.c \ +- gtktreemodelsort.c \ +- gtktreeselection.c \ +- gtktreesortable.c \ +- gtktreestore.c \ +- gtktreeview.c \ +- gtktreeviewcolumn.c \ +- gtktypebuiltins.c \ +- gtktypeutils.c \ +- gtkuimanager.c \ +- gtkvbbox.c \ +- gtkvbox.c \ +- gtkvolumebutton.c \ +- gtkviewport.c \ +- gtkvpaned.c \ +- gtkvruler.c \ +- gtkvscale.c \ +- gtkvscrollbar.c \ +- gtkvseparator.c \ +- gtkwidget.c \ +- gtkwindow-decorate.c \ +- gtkwindow.c \ +- $(gtk_clipboard_dnd_c_sources)\ +-\ +- gtktext.c \ +- gtktree.c \ +- gtktreeitem.c\ +-\ +- gtkclist.c \ +- gtkcombo.c \ +- gtkctree.c \ +- gtkfilesel.c \ +- gtkitemfactory.c \ +- gtklist.c \ +- gtklistitem.c \ +- gtkoldeditable.c \ +- gtkoptionmenu.c \ +- gtkpixmap.c \ +- gtkpreview.c \ +- gtkprogress.c \ +- gtksignal.c \ +- gtktipsquery.c \ +- gtktooltips.c +- +- +-gtk_c_sources = $(gtk_base_c_sources) $(am__append_5) $(am__append_7) $(am__append_9) $(am__append_11) $(am__append_13) $(am__append_14) +-gtk_all_c_sources = $(gtk_base_c_sources) $(gtk_os_unix_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources) +- +-gtk_os_unix_c_sources = \ +- gtkpagesetupunixdialog.c \ +- gtkprinter.c \ +- gtkprinteroption.c \ +- gtkprinteroptionset.c \ +- gtkprinteroptionwidget.c \ +- gtkprintjob.c \ +- gtkprintoperation-unix.c \ +- gtkprintunixdialog.c \ +- gtkprintbackend.c \ +- gtksearchenginebeagle.c \ +- gtksearchenginetracker.c +- +- +-gtk_os_win32_c_sources = \ +- gtkprint-win32.c \ +- gtkprintoperation-win32.c +- +- +-gtk_use_x11_c_sources = \ +- gtkplug-x11.c \ +- gtksocket-x11.c \ +- gtkxembed.c \ +- gtktrayicon-x11.c +- +-gtk_use_win32_c_sources = \ +- gtkplug-win32.c \ +- gtksocket-win32.c \ +- gtkwin32embed.c \ +- gtkwin32embedwidget.c +- +-gtk_use_quartz_c_sources = \ +- gtksearchenginequartz.c \ +- gtkplug-stub.c \ +- gtksocket-stub.c +- +-gtk_use_stub_c_sources = \ +- gtkplug-stub.c \ +- gtksocket-stub.c +- +-@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c" +- +-@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c +-@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c +-@USE_QUARTZ_TRUE@gtk_clipboard_dnd_h_sources = gtkquartz.h +-@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c" +-@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources_CFLAGS = +- +-# we use our own built_sources variable rules to avoid automake's +-# BUILT_SOURCES oddities +-# we generate frequently rebuild files piggyback on a stamp file, so sources +-# depending on them only get rebuild when the built source actually changed +-# content +- +-# built sources that get installed with the header files +-gtk_built_public_sources = \ +- gtkmarshal.h \ +- gtktypebuiltins.h +- +- +-# built headers that don't get installed +-gtk_built_private_headers = \ +- gtkalias.h \ +- gtkmarshalers.h \ +- gtkbuiltincache.h \ +- gtkimcontextsimpleseqs.h +- +- +-gtk_built_sources = \ +- gtkaliasdef.c \ +- gtktypebuiltins.c \ +- gtktypefuncs.c \ +- gtkmarshalers.c \ +- gtkmarshal.c \ +- ${gtk_built_private_headers} \ +- ${gtk_built_public_sources} +- +- +-stamp_files = \ +- stamp-gtkmarshalers.h \ +- stamp-gtkmarshal.h \ +- stamp-gtktypebuiltins.h \ +- stamp-icons +- +- +-# non-header sources (headers should be specified in the above variables) +-# that don't serve as direct make target sources, i.e. they don't have +-# their own .lo rules and don't get publically installed +-gtk_extra_sources = \ +- paper_names.c \ +- paper_names_offsets.c \ +- gen-paper-names.c \ +- gtkstatusicon-quartz.c \ +- gtk.symbols \ +- gtkversion.h.in \ +- gtkmarshalers.list \ +- gtkmarshal.list +- +- +-# +-# setup GTK+ sources and their dependencies +-# +-MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) +-EXTRA_HEADERS = +- +-# +-# rules to generate built sources +-# +-# setup autogeneration dependencies +-gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf +-CLEANFILES = $(gen_sources) +- +-BUILT_SOURCES = $(gtk_built_sources) +- +-# target platform: +-lib_LTLIBRARIES = $(gtktargetlib) +- +-gtkincludedir = $(includedir)/gtk-2.0/gtk +-gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h +- +-gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk +-gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) +- +-libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) +-libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources) +-libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources) +-libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) +- +-libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) +-libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid +-libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) +-libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) +- +-libgtk_x11_2_0_la_LIBADD = $(libadd) +-libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 +-libgtk_quartz_2_0_la_LIBADD = $(libadd) +-libgtk_directfb_2_0_la_LIBADD = $(libadd) +- +-libgtk_x11_2_0_la_DEPENDENCIES = $(deps) +-libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps) +-libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) +-libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) +- +-@USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) +-EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la +- +-DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) +- +-TEST_DEPS = $(DEPS) gtk.immodules +- +-LDADDS = \ +- $(gtktargetlib) \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) +- +- +-# +-# Installed tools +-# +-bin_PROGRAMS = \ +- gtk-query-immodules-2.0 \ +- gtk-update-icon-cache +- +-bin_SCRIPTS = gtk-builder-convert +- +-gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) +-gtk_query_immodules_2_0_LDADD = $(LDADDS) +- +-gtk_query_immodules_2_0_SOURCES = queryimmodules.c +- +-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +- +-gtk_update_icon_cache_SOURCES = \ +- updateiconcache.c +- +- +-STOCK_ICONS = \ +- stock-icons/16/document-open-recent.png \ +- stock-icons/16/gtk-about.png \ +- stock-icons/16/gtk-add.png \ +- stock-icons/16/gtk-cdrom.png \ +- stock-icons/16/gtk-close.png \ +- stock-icons/16/gtk-connect.png \ +- stock-icons/16/gtk-convert.png \ +- stock-icons/16/gtk-copy.png \ +- stock-icons/16/gtk-cut.png \ +- stock-icons/16/gtk-delete.png \ +- stock-icons/16/gtk-directory.png \ +- stock-icons/16/gtk-disconnect.png \ +- stock-icons/16/gtk-edit.png \ +- stock-icons/16/gtk-execute.png \ +- stock-icons/16/gtk-file.png \ +- stock-icons/16/gtk-find-and-replace.png \ +- stock-icons/16/gtk-find.png \ +- stock-icons/16/gtk-floppy.png \ +- stock-icons/16/gtk-fullscreen.png \ +- stock-icons/16/gtk-go-back-ltr.png \ +- stock-icons/16/gtk-go-down.png \ +- stock-icons/16/gtk-go-forward-ltr.png \ +- stock-icons/16/gtk-goto-bottom.png \ +- stock-icons/16/gtk-goto-first-ltr.png \ +- stock-icons/16/gtk-goto-last-ltr.png \ +- stock-icons/16/gtk-goto-top.png \ +- stock-icons/16/gtk-go-up.png \ +- stock-icons/16/gtk-harddisk.png \ +- stock-icons/16/gtk-help.png \ +- stock-icons/16/gtk-home.png \ +- stock-icons/16/gtk-indent-ltr.png \ +- stock-icons/16/gtk-indent-rtl.png \ +- stock-icons/16/gtk-index.png \ +- stock-icons/16/gtk-info.png \ +- stock-icons/16/gtk-jump-to-ltr.png \ +- stock-icons/16/gtk-jump-to-rtl.png \ +- stock-icons/16/gtk-justify-center.png \ +- stock-icons/16/gtk-justify-fill.png \ +- stock-icons/16/gtk-justify-left.png \ +- stock-icons/16/gtk-justify-right.png \ +- stock-icons/16/gtk-leave-fullscreen.png \ +- stock-icons/16/gtk-media-forward-ltr.png \ +- stock-icons/16/gtk-media-next-ltr.png \ +- stock-icons/16/gtk-media-pause.png \ +- stock-icons/16/gtk-media-play-ltr.png \ +- stock-icons/16/gtk-media-play-rtl.png \ +- stock-icons/16/gtk-media-previous-ltr.png \ +- stock-icons/16/gtk-media-record.png \ +- stock-icons/16/gtk-media-rewind-ltr.png \ +- stock-icons/16/gtk-media-stop.png \ +- stock-icons/16/gtk-missing-image.png \ +- stock-icons/16/gtk-network.png \ +- stock-icons/16/gtk-new.png \ +- stock-icons/16/gtk-open.png \ +- stock-icons/16/gtk-page-setup.png \ +- stock-icons/16/gtk-paste.png \ +- stock-icons/16/gtk-preferences.png \ +- stock-icons/16/gtk-print.png \ +- stock-icons/16/gtk-print-error.png \ +- stock-icons/16/gtk-print-paused.png \ +- stock-icons/16/gtk-print-preview.png \ +- stock-icons/16/gtk-print-report.png \ +- stock-icons/16/gtk-print-warning.png \ +- stock-icons/16/gtk-properties.png \ +- stock-icons/16/gtk-quit.png \ +- stock-icons/16/gtk-redo-ltr.png \ +- stock-icons/16/gtk-redo-rtl.png \ +- stock-icons/16/gtk-refresh.png \ +- stock-icons/16/gtk-remove.png \ +- stock-icons/16/gtk-revert-to-saved-ltr.png \ +- stock-icons/16/gtk-revert-to-saved-rtl.png \ +- stock-icons/16/gtk-save-as.png \ +- stock-icons/16/gtk-select-all.png \ +- stock-icons/16/gtk-select-color.png \ +- stock-icons/16/gtk-select-font.png \ +- stock-icons/16/gtk-sort-ascending.png \ +- stock-icons/16/gtk-sort-descending.png \ +- stock-icons/16/gtk-spell-check.png \ +- stock-icons/16/gtk-stop.png \ +- stock-icons/16/gtk-strikethrough.png \ +- stock-icons/16/gtk-font.png \ +- stock-icons/16/gtk-undelete-ltr.png \ +- stock-icons/16/gtk-undelete-rtl.png \ +- stock-icons/16/gtk-underline.png \ +- stock-icons/16/gtk-undo-ltr.png \ +- stock-icons/16/gtk-undo-rtl.png \ +- stock-icons/16/gtk-unindent-ltr.png \ +- stock-icons/16/gtk-unindent-rtl.png \ +- stock-icons/16/gtk-zoom-100.png \ +- stock-icons/16/gtk-zoom-fit.png \ +- stock-icons/16/gtk-zoom-in.png \ +- stock-icons/16/gtk-zoom-out.png \ +- stock-icons/16/gtk-italic.png \ +- stock-icons/16/gtk-bold.png \ +- stock-icons/20/gtk-apply.png \ +- stock-icons/20/gtk-cancel.png \ +- stock-icons/20/gtk-close.png \ +- stock-icons/20/gtk-no.png \ +- stock-icons/20/gtk-ok.png \ +- stock-icons/20/gtk-yes.png \ +- stock-icons/24/audio-volume-high.png \ +- stock-icons/24/audio-volume-low.png \ +- stock-icons/24/audio-volume-medium.png \ +- stock-icons/24/audio-volume-muted.png \ +- stock-icons/24/document-open-recent.png \ +- stock-icons/24/gtk-about.png \ +- stock-icons/24/gtk-add.png \ +- stock-icons/24/gtk-bold.png \ +- stock-icons/24/gtk-cdrom.png \ +- stock-icons/24/gtk-clear.png \ +- stock-icons/24/gtk-close.png \ +- stock-icons/24/gtk-color-picker.png \ +- stock-icons/24/gtk-connect.png \ +- stock-icons/24/gtk-convert.png \ +- stock-icons/24/gtk-copy.png \ +- stock-icons/24/gtk-cut.png \ +- stock-icons/24/gtk-directory.png \ +- stock-icons/24/gtk-disconnect.png \ +- stock-icons/24/gtk-edit.png \ +- stock-icons/24/gtk-execute.png \ +- stock-icons/24/gtk-file.png \ +- stock-icons/24/gtk-find-and-replace.png \ +- stock-icons/24/gtk-find.png \ +- stock-icons/24/gtk-font.png \ +- stock-icons/24/gtk-fullscreen.png \ +- stock-icons/24/gtk-go-back-ltr.png \ +- stock-icons/24/gtk-goto-top.png \ +- stock-icons/24/gtk-go-down.png \ +- stock-icons/24/gtk-goto-bottom.png \ +- stock-icons/24/gtk-goto-first-ltr.png \ +- stock-icons/24/gtk-goto-last-ltr.png \ +- stock-icons/24/gtk-go-up.png \ +- stock-icons/24/gtk-harddisk.png \ +- stock-icons/24/gtk-help.png \ +- stock-icons/24/gtk-home.png \ +- stock-icons/24/gtk-indent-ltr.png \ +- stock-icons/24/gtk-indent-rtl.png \ +- stock-icons/24/gtk-index.png \ +- stock-icons/24/gtk-info.png \ +- stock-icons/24/gtk-italic.png \ +- stock-icons/24/gtk-jump-to-ltr.png \ +- stock-icons/24/gtk-jump-to-rtl.png \ +- stock-icons/24/gtk-justify-center.png \ +- stock-icons/24/gtk-justify-fill.png \ +- stock-icons/24/gtk-justify-left.png \ +- stock-icons/24/gtk-justify-right.png \ +- stock-icons/24/gtk-leave-fullscreen.png \ +- stock-icons/24/gtk-media-forward-ltr.png \ +- stock-icons/24/gtk-media-next-ltr.png \ +- stock-icons/24/gtk-media-pause.png \ +- stock-icons/24/gtk-media-play-ltr.png \ +- stock-icons/24/gtk-media-play-rtl.png \ +- stock-icons/24/gtk-media-previous-ltr.png \ +- stock-icons/24/gtk-media-record.png \ +- stock-icons/24/gtk-media-rewind-ltr.png \ +- stock-icons/24/gtk-media-stop.png \ +- stock-icons/24/gtk-missing-image.png \ +- stock-icons/24/gtk-network.png \ +- stock-icons/24/gtk-new.png \ +- stock-icons/24/gtk-open.png \ +- stock-icons/24/gtk-orientation-reverse-landscape.png \ +- stock-icons/24/gtk-orientation-landscape.png \ +- stock-icons/24/gtk-orientation-reverse-portrait.png \ +- stock-icons/24/gtk-orientation-portrait.png \ +- stock-icons/24/gtk-page-setup.png \ +- stock-icons/24/gtk-paste.png \ +- stock-icons/24/gtk-preferences.png \ +- stock-icons/24/gtk-print.png \ +- stock-icons/24/gtk-print-error.png \ +- stock-icons/24/gtk-print-paused.png \ +- stock-icons/24/gtk-print-preview.png \ +- stock-icons/24/gtk-print-report.png \ +- stock-icons/24/gtk-print-warning.png \ +- stock-icons/24/gtk-properties.png \ +- stock-icons/24/gtk-quit.png \ +- stock-icons/24/gtk-redo-ltr.png \ +- stock-icons/24/gtk-redo-rtl.png \ +- stock-icons/24/gtk-refresh.png \ +- stock-icons/24/gtk-remove.png \ +- stock-icons/24/gtk-revert-to-saved-ltr.png \ +- stock-icons/24/gtk-revert-to-saved-rtl.png \ +- stock-icons/24/gtk-select-font.png \ +- stock-icons/24/gtk-save-as.png \ +- stock-icons/24/gtk-floppy.png \ +- stock-icons/24/gtk-select-all.png \ +- stock-icons/24/gtk-select-color.png \ +- stock-icons/24/gtk-sort-ascending.png \ +- stock-icons/24/gtk-sort-descending.png \ +- stock-icons/24/gtk-spell-check.png \ +- stock-icons/24/gtk-stop.png \ +- stock-icons/24/gtk-strikethrough.png \ +- stock-icons/24/gtk-delete.png \ +- stock-icons/24/gtk-undelete-ltr.png \ +- stock-icons/24/gtk-undelete-rtl.png \ +- stock-icons/24/gtk-underline.png \ +- stock-icons/24/gtk-undo-ltr.png \ +- stock-icons/24/gtk-undo-rtl.png \ +- stock-icons/24/gtk-unindent-ltr.png \ +- stock-icons/24/gtk-unindent-rtl.png \ +- stock-icons/24/gtk-zoom-100.png \ +- stock-icons/24/gtk-zoom-fit.png \ +- stock-icons/24/gtk-zoom-in.png \ +- stock-icons/24/gtk-zoom-out.png \ +- stock-icons/24/gtk-go-forward-ltr.png \ +- stock-icons/32/gtk-dnd-multiple.png \ +- stock-icons/32/gtk-dnd.png \ +- stock-icons/48/gtk-dialog-authentication.png \ +- stock-icons/48/gtk-dialog-error.png \ +- stock-icons/48/gtk-dialog-info.png \ +- stock-icons/48/gtk-dialog-question.png \ +- stock-icons/48/gtk-dialog-warning.png ++bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \ ++ gtk-update-icon-cache$(EXEEXT) ++subdir = gtk ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ ++ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gtkincludedir)" \ ++ "$(DESTDIR)$(gtkunixprintincludedir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++@HAVE_INCLUDED_IMMMODULES_TRUE@am__DEPENDENCIES_2 = \ ++@HAVE_INCLUDED_IMMMODULES_TRUE@ $(am__DEPENDENCIES_1) ++am__DEPENDENCIES_3 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_2) ++am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ ++ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ ++ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ ++ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ ++ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ ++ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ ++ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ ++ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ ++ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ ++ gtkcellrendererprogress.c gtkcellrendererspin.c \ ++ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ ++ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ ++ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ ++ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ ++ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ ++ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ ++ gtkfilechooserbutton.c gtkfilechooserdefault.c \ ++ gtkfilechooserdialog.c gtkfilechooserembed.c \ ++ gtkfilechooserentry.c gtkfilechoosersettings.c \ ++ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ ++ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ ++ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ ++ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ ++ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ ++ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ ++ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ ++ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ ++ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ ++ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ ++ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ ++ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ ++ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ ++ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ ++ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ ++ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ ++ gtkprintoperation.c gtkprintoperationpreview.c \ ++ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ ++ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ ++ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ ++ gtkrecentaction.c gtkrecentchooserdefault.c \ ++ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ ++ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ ++ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ ++ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ ++ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ ++ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ ++ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ ++ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ ++ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ ++ gtktextbuffer.c gtktextbufferrichtext.c \ ++ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ ++ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ ++ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ ++ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ ++ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ ++ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ ++ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ ++ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ ++ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ ++ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ ++ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ ++ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ ++ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ ++ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ ++ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ ++ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ ++ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ ++ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ ++ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ ++ gtkprinteroption.c gtkprinteroptionset.c \ ++ gtkprinteroptionwidget.c gtkprintjob.c \ ++ gtkprintoperation-unix.c gtkprintunixdialog.c \ ++ gtkprintbackend.c gtksearchenginebeagle.c \ ++ gtksearchenginetracker.c gtkprint-win32.c \ ++ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ ++ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ ++ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ ++ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c ++@USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo ++@USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo \ ++@USE_QUARTZ_TRUE@ gtkdnd-quartz.lo gtkquartz.lo ++am__objects_2 = gtkquery.lo gtksearchengine.lo \ ++ gtksearchenginesimple.lo fnmatch.lo gtkaboutdialog.lo \ ++ gtkaccelgroup.lo gtkaccellabel.lo gtkaccelmap.lo \ ++ gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \ ++ gtkadjustment.lo gtkalignment.lo gtkarrow.lo gtkaspectframe.lo \ ++ gtkassistant.lo gtkbbox.lo gtkbin.lo gtkbindings.lo gtkbox.lo \ ++ gtkbuildable.lo gtkbuilder.lo gtkbuilderparser.lo gtkbutton.lo \ ++ gtkcalendar.lo gtkcelleditable.lo gtkcelllayout.lo \ ++ gtkcellrenderer.lo gtkcellrendereraccel.lo \ ++ gtkcellrenderercombo.lo gtkcellrendererpixbuf.lo \ ++ gtkcellrendererprogress.lo gtkcellrendererspin.lo \ ++ gtkcellrenderertext.lo gtkcellrenderertoggle.lo gtkcellview.lo \ ++ gtkcheckbutton.lo gtkcheckmenuitem.lo gtkcolorbutton.lo \ ++ gtkcolorsel.lo gtkcolorseldialog.lo gtkcombobox.lo \ ++ gtkcomboboxentry.lo gtkcontainer.lo gtkcurve.lo gtkdialog.lo \ ++ gtkdrawingarea.lo gtkeditable.lo gtkentry.lo \ ++ gtkentrycompletion.lo gtkeventbox.lo gtkexpander.lo \ ++ gtkfilechooser.lo gtkfilechooserbutton.lo \ ++ gtkfilechooserdefault.lo gtkfilechooserdialog.lo \ ++ gtkfilechooserembed.lo gtkfilechooserentry.lo \ ++ gtkfilechoosersettings.lo gtkfilechooserutils.lo \ ++ gtkfilechooserwidget.lo gtkfilefilter.lo gtkfilesystem.lo \ ++ gtkfilesystemmodel.lo gtkfixed.lo gtkfontbutton.lo \ ++ gtkfontsel.lo gtkframe.lo gtkgamma.lo gtkgc.lo gtkhandlebox.lo \ ++ gtkhbbox.lo gtkhbox.lo gtkhpaned.lo gtkhruler.lo gtkhscale.lo \ ++ gtkhscrollbar.lo gtkhseparator.lo gtkhsv.lo gtkiconcache.lo \ ++ gtkiconcachevalidator.lo gtkiconfactory.lo gtkicontheme.lo \ ++ gtkiconview.lo gtkimage.lo gtkimagemenuitem.lo gtkimcontext.lo \ ++ gtkimcontextsimple.lo gtkimmodule.lo gtkimmulticontext.lo \ ++ gtkinputdialog.lo gtkinvisible.lo gtkitem.lo gtkkeyhash.lo \ ++ gtklabel.lo gtklayout.lo gtklinkbutton.lo gtkliststore.lo \ ++ gtkmain.lo gtkmarshal.lo gtkmarshalers.lo gtkmenu.lo \ ++ gtkmenubar.lo gtkmenuitem.lo gtkmenushell.lo \ ++ gtkmenutoolbutton.lo gtkmessagedialog.lo gtkmisc.lo \ ++ gtkmnemonichash.lo gtkmodules.lo gtkmountoperation.lo \ ++ gtknotebook.lo gtkobject.lo gtkpagesetup.lo gtkpaned.lo \ ++ gtkpapersize.lo gtkpathbar.lo gtkplug.lo gtkprintcontext.lo \ ++ gtkprintoperation.lo gtkprintoperationpreview.lo \ ++ gtkprintsettings.lo gtkprintutils.lo gtkprogressbar.lo \ ++ gtkradioaction.lo gtkradiobutton.lo gtkradiomenuitem.lo \ ++ gtkradiotoolbutton.lo gtkrange.lo gtkrbtree.lo gtkrc.lo \ ++ gtkrecentaction.lo gtkrecentchooserdefault.lo \ ++ gtkrecentchooserdialog.lo gtkrecentchoosermenu.lo \ ++ gtkrecentchooserwidget.lo gtkrecentchooserutils.lo \ ++ gtkrecentchooser.lo gtkrecentfilter.lo gtkrecentmanager.lo \ ++ gtkruler.lo gtkscale.lo gtkscalebutton.lo gtkscrollbar.lo \ ++ gtkscrolledwindow.lo gtkselection.lo gtkseparator.lo \ ++ gtkseparatormenuitem.lo gtkseparatortoolitem.lo gtksettings.lo \ ++ gtksizegroup.lo gtkshow.lo gtksocket.lo gtkspinbutton.lo \ ++ gtkstatusbar.lo gtkstatusicon.lo gtkstock.lo gtkstyle.lo \ ++ gtktable.lo gtktearoffmenuitem.lo gtktestutils.lo \ ++ gtktextbtree.lo gtktextbuffer.lo gtktextbufferrichtext.lo \ ++ gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \ ++ gtktextiter.lo gtktextlayout.lo gtktextmark.lo \ ++ gtktextsegment.lo gtktexttag.lo gtktexttagtable.lo \ ++ gtktexttypes.lo gtktextutil.lo gtktextview.lo gtkthemes.lo \ ++ gtktoggleaction.lo gtktogglebutton.lo gtktoggletoolbutton.lo \ ++ gtktoolbar.lo gtktoolbutton.lo gtktoolitem.lo gtktoolshell.lo \ ++ gtktooltip.lo gtktreedatalist.lo gtktreednd.lo gtktreemodel.lo \ ++ gtktreemodelfilter.lo gtktreemodelsort.lo gtktreeselection.lo \ ++ gtktreesortable.lo gtktreestore.lo gtktreeview.lo \ ++ gtktreeviewcolumn.lo gtktypebuiltins.lo gtktypeutils.lo \ ++ gtkuimanager.lo gtkvbbox.lo gtkvbox.lo gtkvolumebutton.lo \ ++ gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \ ++ gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \ ++ gtkwindow-decorate.lo gtkwindow.lo $(am__objects_1) gtktext.lo \ ++ gtktree.lo gtktreeitem.lo gtkclist.lo gtkcombo.lo gtkctree.lo \ ++ gtkfilesel.lo gtkitemfactory.lo gtklist.lo gtklistitem.lo \ ++ gtkoldeditable.lo gtkoptionmenu.lo gtkpixmap.lo gtkpreview.lo \ ++ gtkprogress.lo gtksignal.lo gtktipsquery.lo gtktooltips.lo ++am__objects_3 = gtkpagesetupunixdialog.lo gtkprinter.lo \ ++ gtkprinteroption.lo gtkprinteroptionset.lo \ ++ gtkprinteroptionwidget.lo gtkprintjob.lo \ ++ gtkprintoperation-unix.lo gtkprintunixdialog.lo \ ++ gtkprintbackend.lo gtksearchenginebeagle.lo \ ++ gtksearchenginetracker.lo ++@OS_UNIX_TRUE@am__objects_4 = $(am__objects_3) ++am__objects_5 = gtkprint-win32.lo gtkprintoperation-win32.lo ++@OS_WIN32_TRUE@am__objects_6 = $(am__objects_5) ++am__objects_7 = gtkplug-x11.lo gtksocket-x11.lo gtkxembed.lo \ ++ gtktrayicon-x11.lo ++@USE_X11_TRUE@am__objects_8 = $(am__objects_7) ++am__objects_9 = gtkplug-win32.lo gtksocket-win32.lo gtkwin32embed.lo \ ++ gtkwin32embedwidget.lo ++@USE_WIN32_TRUE@@USE_X11_FALSE@am__objects_10 = $(am__objects_9) ++am__objects_11 = gtksearchenginequartz.lo gtkplug-stub.lo \ ++ gtksocket-stub.lo ++@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_12 = $(am__objects_11) ++am__objects_13 = gtkplug-stub.lo gtksocket-stub.lo ++@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_14 = $(am__objects_13) ++am__objects_15 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \ ++ $(am__objects_8) $(am__objects_10) $(am__objects_12) \ ++ $(am__objects_14) ++am_libgtk_directfb_2_0_la_OBJECTS = $(am__objects_15) ++libgtk_directfb_2_0_la_OBJECTS = $(am_libgtk_directfb_2_0_la_OBJECTS) ++libgtk_directfb_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgtk_directfb_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++am__libgtk_quartz_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ ++ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ ++ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ ++ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ ++ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ ++ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ ++ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ ++ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ ++ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ ++ gtkcellrendererprogress.c gtkcellrendererspin.c \ ++ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ ++ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ ++ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ ++ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ ++ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ ++ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ ++ gtkfilechooserbutton.c gtkfilechooserdefault.c \ ++ gtkfilechooserdialog.c gtkfilechooserembed.c \ ++ gtkfilechooserentry.c gtkfilechoosersettings.c \ ++ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ ++ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ ++ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ ++ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ ++ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ ++ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ ++ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ ++ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ ++ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ ++ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ ++ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ ++ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ ++ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ ++ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ ++ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ ++ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ ++ gtkprintoperation.c gtkprintoperationpreview.c \ ++ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ ++ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ ++ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ ++ gtkrecentaction.c gtkrecentchooserdefault.c \ ++ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ ++ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ ++ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ ++ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ ++ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ ++ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ ++ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ ++ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ ++ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ ++ gtktextbuffer.c gtktextbufferrichtext.c \ ++ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ ++ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ ++ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ ++ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ ++ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ ++ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ ++ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ ++ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ ++ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ ++ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ ++ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ ++ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ ++ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ ++ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ ++ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ ++ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ ++ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ ++ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ ++ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ ++ gtkprinteroption.c gtkprinteroptionset.c \ ++ gtkprinteroptionwidget.c gtkprintjob.c \ ++ gtkprintoperation-unix.c gtkprintunixdialog.c \ ++ gtkprintbackend.c gtksearchenginebeagle.c \ ++ gtksearchenginetracker.c gtkprint-win32.c \ ++ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ ++ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ ++ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ ++ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c ++am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_15) ++libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS) ++libgtk_quartz_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgtk_quartz_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++am__libgtk_win32_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ ++ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ ++ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ ++ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ ++ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ ++ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ ++ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ ++ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ ++ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ ++ gtkcellrendererprogress.c gtkcellrendererspin.c \ ++ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ ++ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ ++ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ ++ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ ++ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ ++ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ ++ gtkfilechooserbutton.c gtkfilechooserdefault.c \ ++ gtkfilechooserdialog.c gtkfilechooserembed.c \ ++ gtkfilechooserentry.c gtkfilechoosersettings.c \ ++ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ ++ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ ++ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ ++ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ ++ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ ++ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ ++ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ ++ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ ++ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ ++ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ ++ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ ++ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ ++ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ ++ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ ++ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ ++ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ ++ gtkprintoperation.c gtkprintoperationpreview.c \ ++ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ ++ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ ++ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ ++ gtkrecentaction.c gtkrecentchooserdefault.c \ ++ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ ++ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ ++ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ ++ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ ++ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ ++ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ ++ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ ++ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ ++ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ ++ gtktextbuffer.c gtktextbufferrichtext.c \ ++ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ ++ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ ++ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ ++ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ ++ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ ++ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ ++ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ ++ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ ++ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ ++ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ ++ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ ++ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ ++ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ ++ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ ++ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ ++ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ ++ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ ++ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ ++ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ ++ gtkprinteroption.c gtkprinteroptionset.c \ ++ gtkprinteroptionwidget.c gtkprintjob.c \ ++ gtkprintoperation-unix.c gtkprintunixdialog.c \ ++ gtkprintbackend.c gtksearchenginebeagle.c \ ++ gtksearchenginetracker.c gtkprint-win32.c \ ++ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ ++ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ ++ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ ++ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c ++am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15) ++libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS) ++libgtk_win32_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgtk_win32_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ ++ gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ ++ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ ++ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ ++ gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ ++ gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ ++ gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ ++ gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ ++ gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ ++ gtkcellrendererprogress.c gtkcellrendererspin.c \ ++ gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ ++ gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ ++ gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ ++ gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ ++ gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ ++ gtkeventbox.c gtkexpander.c gtkfilechooser.c \ ++ gtkfilechooserbutton.c gtkfilechooserdefault.c \ ++ gtkfilechooserdialog.c gtkfilechooserembed.c \ ++ gtkfilechooserentry.c gtkfilechoosersettings.c \ ++ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ ++ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ ++ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ ++ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ ++ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ ++ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ ++ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ ++ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ ++ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ ++ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ ++ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ ++ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ ++ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ ++ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ ++ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ ++ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ ++ gtkprintoperation.c gtkprintoperationpreview.c \ ++ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ ++ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ ++ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ ++ gtkrecentaction.c gtkrecentchooserdefault.c \ ++ gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ ++ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ ++ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ ++ gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ ++ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ ++ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ ++ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ ++ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ ++ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ ++ gtktextbuffer.c gtktextbufferrichtext.c \ ++ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ ++ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ ++ gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ ++ gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ ++ gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ ++ gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ ++ gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ ++ gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ ++ gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ ++ gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ ++ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ ++ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ ++ gtkwidget.c gtkwindow-decorate.c gtkwindow.c gtkclipboard.c \ ++ gtkdnd.c gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ ++ gtktext.c gtktree.c gtktreeitem.c gtkclist.c gtkcombo.c \ ++ gtkctree.c gtkfilesel.c gtkitemfactory.c gtklist.c \ ++ gtklistitem.c gtkoldeditable.c gtkoptionmenu.c gtkpixmap.c \ ++ gtkpreview.c gtkprogress.c gtksignal.c gtktipsquery.c \ ++ gtktooltips.c gtkpagesetupunixdialog.c gtkprinter.c \ ++ gtkprinteroption.c gtkprinteroptionset.c \ ++ gtkprinteroptionwidget.c gtkprintjob.c \ ++ gtkprintoperation-unix.c gtkprintunixdialog.c \ ++ gtkprintbackend.c gtksearchenginebeagle.c \ ++ gtksearchenginetracker.c gtkprint-win32.c \ ++ gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ ++ gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c \ ++ gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c \ ++ gtksearchenginequartz.c gtkplug-stub.c gtksocket-stub.c ++am_libgtk_x11_2_0_la_OBJECTS = $(am__objects_15) ++libgtk_x11_2_0_la_OBJECTS = $(am_libgtk_x11_2_0_la_OBJECTS) ++libgtk_x11_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libgtk_x11_2_0_la_LDFLAGS) $(LDFLAGS) -o $@ ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++PROGRAMS = $(bin_PROGRAMS) ++am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT) ++gtk_query_immodules_2_0_OBJECTS = \ ++ $(am_gtk_query_immodules_2_0_OBJECTS) ++am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) ++am_gtk_update_icon_cache_OBJECTS = updateiconcache.$(OBJEXT) ++gtk_update_icon_cache_OBJECTS = $(am_gtk_update_icon_cache_OBJECTS) ++gtk_update_icon_cache_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la ++binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++SCRIPTS = $(bin_SCRIPTS) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgtk_directfb_2_0_la_SOURCES) \ ++ $(libgtk_quartz_2_0_la_SOURCES) $(libgtk_win32_2_0_la_SOURCES) \ ++ $(libgtk_x11_2_0_la_SOURCES) \ ++ $(gtk_query_immodules_2_0_SOURCES) \ ++ $(gtk_update_icon_cache_SOURCES) ++DIST_SOURCES = $(am__libgtk_directfb_2_0_la_SOURCES_DIST) \ ++ $(am__libgtk_quartz_2_0_la_SOURCES_DIST) \ ++ $(am__libgtk_win32_2_0_la_SOURCES_DIST) \ ++ $(am__libgtk_x11_2_0_la_SOURCES_DIST) \ ++ $(gtk_query_immodules_2_0_SOURCES) \ ++ $(gtk_update_icon_cache_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++DATA = $(noinst_DATA) ++gtkincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++am__gtkunixprintinclude_HEADERS_DIST = gtkpagesetupunixdialog.h \ ++ gtkprintunixdialog.h gtkprinter.h gtkprintjob.h gtkunixprint.h ++gtkunixprintincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = @ACLOCAL@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++AS = @AS@ ++ATK_PREFIX = @ATK_PREFIX@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ ++BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ ++CAIRO_PREFIX = @CAIRO_PREFIX@ ++CATALOGS = @CATALOGS@ ++CATOBJEXT = @CATOBJEXT@ ++CC = @CC@ ++CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ ++CCASFLAGS = @CCASFLAGS@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CUPS_API_MAJOR = @CUPS_API_MAJOR@ ++CUPS_API_MINOR = @CUPS_API_MINOR@ ++CUPS_CFLAGS = @CUPS_CFLAGS@ ++CUPS_CONFIG = @CUPS_CONFIG@ ++CUPS_LIBS = @CUPS_LIBS@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++CXXDEPMODE = @CXXDEPMODE@ ++CXXFLAGS = @CXXFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DATADIRNAME = @DATADIRNAME@ ++DB2HTML = @DB2HTML@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ ++ECHO = @ECHO@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ ++GAIL_INET_LIBS = @GAIL_INET_LIBS@ ++GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ ++GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ ++GDK_DEP_CFLAGS = @GDK_DEP_CFLAGS@ ++GDK_DEP_LIBS = @GDK_DEP_LIBS@ ++GDK_EXTRA_CFLAGS = @GDK_EXTRA_CFLAGS@ ++GDK_EXTRA_LIBS = @GDK_EXTRA_LIBS@ ++GDK_PACKAGES = @GDK_PACKAGES@ ++GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@ ++GDK_PIXBUF_DEP_CFLAGS = @GDK_PIXBUF_DEP_CFLAGS@ ++GDK_PIXBUF_DEP_LIBS = @GDK_PIXBUF_DEP_LIBS@ ++GDK_PIXBUF_EXTRA_CFLAGS = @GDK_PIXBUF_EXTRA_CFLAGS@ ++GDK_PIXBUF_EXTRA_LIBS = @GDK_PIXBUF_EXTRA_LIBS@ ++GDK_PIXBUF_MAJOR = @GDK_PIXBUF_MAJOR@ ++GDK_PIXBUF_MICRO = @GDK_PIXBUF_MICRO@ ++GDK_PIXBUF_MINOR = @GDK_PIXBUF_MINOR@ ++GDK_PIXBUF_PACKAGES = @GDK_PIXBUF_PACKAGES@ ++GDK_PIXBUF_VERSION = @GDK_PIXBUF_VERSION@ ++GDK_PIXBUF_XLIB_DEP_CFLAGS = @GDK_PIXBUF_XLIB_DEP_CFLAGS@ ++GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_XLIB_DEP_LIBS@ ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ ++GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ ++GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ +GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -489,6 +492,8 @@ - -I$(top_srcdir)/gdk \ - -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ - -DGDK_DISABLE_DEPRECATED \ ++GDK_WLIBS = @GDK_WLIBS@ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ ++GLIB_CFLAGS = @GLIB_CFLAGS@ ++GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ ++GLIB_LIBS = @GLIB_LIBS@ ++GLIB_MKENUMS = @GLIB_MKENUMS@ ++GLIB_PREFIX = @GLIB_PREFIX@ ++GMOFILES = @GMOFILES@ ++GMSGFMT = @GMSGFMT@ ++GOBJECT_QUERY = @GOBJECT_QUERY@ ++GREP = @GREP@ ++GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTK_API_VERSION = @GTK_API_VERSION@ ++GTK_BINARY_AGE = @GTK_BINARY_AGE@ ++GTK_BINARY_VERSION = @GTK_BINARY_VERSION@ ++GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ ++GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ ++GTK_DEP_LIBS = @GTK_DEP_LIBS@ ++GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ ++GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ ++GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ ++GTK_MAJOR_VERSION = @GTK_MAJOR_VERSION@ ++GTK_MICRO_VERSION = @GTK_MICRO_VERSION@ ++GTK_MINOR_VERSION = @GTK_MINOR_VERSION@ ++GTK_PACKAGES = @GTK_PACKAGES@ ++GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ ++GTK_VERSION = @GTK_VERSION@ ++GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ ++HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ ++HTML_DIR = @HTML_DIR@ ++INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ ++INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ ++INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ ++INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ ++INDENT = @INDENT@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++INSTOBJEXT = @INSTOBJEXT@ ++INTLLIBS = @INTLLIBS@ ++LDFLAGS = @LDFLAGS@ ++LIBJASPER = @LIBJASPER@ ++LIBJPEG = @LIBJPEG@ ++LIBOBJS = @LIBOBJS@ ++LIBPNG = @LIBPNG@ ++LIBS = @LIBS@ ++LIBTIFF = @LIBTIFF@ ++LIBTOOL = @LIBTOOL@ ++LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ ++LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ ++LT_VERSION_INFO = @LT_VERSION_INFO@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ ++MKINSTALLDIRS = @MKINSTALLDIRS@ ++MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ ++NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ ++OBJEXT = @OBJEXT@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PANGO_PREFIX = @PANGO_PREFIX@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PERL = @PERL@ ++PKG_CONFIG = @PKG_CONFIG@ ++POFILES = @POFILES@ ++POSUB = @POSUB@ ++PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ ++PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ ++RANLIB = @RANLIB@ ++REBUILD = @REBUILD@ ++REBUILD_PNGS = @REBUILD_PNGS@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++STRIP = @STRIP@ ++USE_NLS = @USE_NLS@ ++VERSION = @VERSION@ ++WINDRES = @WINDRES@ ++XGETTEXT = @XGETTEXT@ ++XMKMF = @XMKMF@ ++XMLCATALOG = @XMLCATALOG@ ++XML_CATALOG_FILE = @XML_CATALOG_FILE@ ++XSLTPROC = @XSLTPROC@ ++X_CFLAGS = @X_CFLAGS@ ++X_EXTRA_LIBS = @X_EXTRA_LIBS@ ++X_LIBS = @X_LIBS@ ++X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_CXX = @ac_ct_CXX@ ++ac_ct_F77 = @ac_ct_F77@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++gdktarget = @gdktarget@ ++gdktargetlib = @gdktargetlib@ ++gtktargetlib = @gtktargetlib@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++ms_librarian = @ms_librarian@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++GTESTER = gtester # in $PATH for non-GLIB packages ++GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + ++# initialize variables for unconditional += appending ++EXTRA_DIST = gtkquartz.h $(gtk_private_h_sources) $(gtk_extra_sources) \ ++ $(gtk_built_sources) $(STOCK_ICONS) $(STOCK_ICONS) \ ++ $(GENERATED_ICONS) line-arrow.xbm line-wrap.xbm tree_plus.xbm \ ++ tree_minus.xbm tree_minus.xpm tree_plus.xpm gtk.def \ ++ gtk-builder-convert gtk-win32.rc gtk-win32.rc.in \ ++ gtkwin32embed.h gtkwin32embedwidget.h gtkwin32embedwidget.c \ ++ gtkprint-win32.h gtkprint-win32.c gtksearchenginequartz.h \ ++ gtkrc.default gtkrc.key.default gtkrc.key.emacs makefile.msc \ ++ makefile.msc.in makegtkalias.pl aliasfilescheck.sh abicheck.sh \ ++ pltcheck.sh gtktypebuiltins.c.template \ ++ gtktypebuiltins.h.template ++TEST_PROGS = + +-GENERATED_ICONS = \ +- stock-icons/16/gtk-go-back-rtl.png \ +- stock-icons/16/gtk-go-forward-rtl.png \ +- stock-icons/16/gtk-goto-first-rtl.png \ +- stock-icons/16/gtk-goto-last-rtl.png \ +- stock-icons/16/gtk-media-forward-rtl.png \ +- stock-icons/16/gtk-media-next-rtl.png \ +- stock-icons/16/gtk-media-previous-rtl.png \ +- stock-icons/16/gtk-media-rewind-rtl.png \ +- stock-icons/16/gtk-save.png \ +- stock-icons/16/drive-harddisk.png \ +- stock-icons/16/folder.png \ +- stock-icons/16/folder-remote.png \ +- stock-icons/16/user-home.png \ +- stock-icons/16/user-desktop.png \ +- stock-icons/16/text-x-generic.png \ +- stock-icons/24/gtk-go-back-rtl.png \ +- stock-icons/24/gtk-go-forward-rtl.png \ +- stock-icons/24/gtk-goto-first-rtl.png \ +- stock-icons/24/gtk-goto-last-rtl.png \ +- stock-icons/24/gtk-media-forward-rtl.png \ +- stock-icons/24/gtk-media-next-rtl.png \ +- stock-icons/24/gtk-media-previous-rtl.png \ +- stock-icons/24/gtk-media-rewind-rtl.png \ +- stock-icons/24/gtk-save.png \ +- stock-icons/24/drive-harddisk.png \ +- stock-icons/24/folder.png \ +- stock-icons/24/folder-remote.png \ +- stock-icons/24/user-home.png \ +- stock-icons/24/user-desktop.png \ +- stock-icons/24/text-x-generic.png ++### testing rules ++ ++# Xvfb based test rules ++XVFB = Xvfb -screen 0 800x600x16 ++XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ ++ 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ ++ 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ ++ 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ ++ 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ ++ 9995 9996 9997 9998 9999 + ++SKIP_GDKTARGET = \ ++ test "$(gdktarget)" != "x11" \ ++ && echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." + +-@CROSS_COMPILING_TRUE@gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) +-@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ +-@CROSS_COMPILING_FALSE@ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ +-@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache ++XVFB_START = \ ++ ${XVFB} -help 2>/dev/null 1>&2 \ ++ && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ ++ && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ ++ trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ ++ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ ++ && DISPLAY=:$$XID && export DISPLAY + +-subdir = gtk +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc +-LTLIBRARIES = $(lib_LTLIBRARIES) ++@USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f" + +-am__libgtk_directfb_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ +- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ +- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ +- gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ +- gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ +- gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ +- gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ +- gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ +- gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ +- gtkcellrendererprogress.c gtkcellrendererspin.c \ +- gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ +- gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ +- gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ +- gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ +- gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ +- gtkeventbox.c gtkexpander.c gtkfilechooser.c \ +- gtkfilechooserbutton.c gtkfilechooserdefault.c \ +- gtkfilechooserdialog.c gtkfilechooserembed.c \ +- gtkfilechooserentry.c gtkfilechoosersettings.c \ +- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ +- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ +- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ +- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ +- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ +- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ +- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ +- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ +- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ +- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ +- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ +- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ +- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ +- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ +- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ +- gtkprintcontext.c gtkprintoperation.c \ +- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ +- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ +- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ +- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ +- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ +- gtkrecentchooserwidget.c gtkrecentchooserutils.c \ +- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ +- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ +- gtkscrolledwindow.c gtkselection.c gtkseparator.c \ +- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ +- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ +- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ +- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ +- gtktextbuffer.c gtktextbufferrichtext.c \ +- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ +- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ +- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ +- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ +- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ +- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ +- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ +- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ +- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ +- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ +- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ +- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ +- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ +- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ +- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ +- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ +- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ +- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ +- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ +- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ +- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ +- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ +- gtksearchenginetracker.c gtkprint-win32.c \ +- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ +- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ +- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ +- gtkplug-stub.c gtksocket-stub.c +-@USE_QUARTZ_TRUE@am__objects_1 = gtkclipboard-quartz.lo gtkdnd-quartz.lo \ +-@USE_QUARTZ_TRUE@ gtkquartz.lo +-@USE_QUARTZ_FALSE@am__objects_1 = gtkclipboard.lo gtkdnd.lo +-am__objects_2 = gtkquery.lo gtksearchengine.lo gtksearchenginesimple.lo \ +- fnmatch.lo gtkaboutdialog.lo gtkaccelgroup.lo gtkaccellabel.lo \ +- gtkaccelmap.lo gtkaccessible.lo gtkaction.lo gtkactiongroup.lo \ +- gtkadjustment.lo gtkalignment.lo gtkarrow.lo gtkaspectframe.lo \ +- gtkassistant.lo gtkbbox.lo gtkbin.lo gtkbindings.lo gtkbox.lo \ +- gtkbuildable.lo gtkbuilder.lo gtkbuilderparser.lo gtkbutton.lo \ +- gtkcalendar.lo gtkcelleditable.lo gtkcelllayout.lo \ +- gtkcellrenderer.lo gtkcellrendereraccel.lo \ +- gtkcellrenderercombo.lo gtkcellrendererpixbuf.lo \ +- gtkcellrendererprogress.lo gtkcellrendererspin.lo \ +- gtkcellrenderertext.lo gtkcellrenderertoggle.lo gtkcellview.lo \ +- gtkcheckbutton.lo gtkcheckmenuitem.lo gtkcolorbutton.lo \ +- gtkcolorsel.lo gtkcolorseldialog.lo gtkcombobox.lo \ +- gtkcomboboxentry.lo gtkcontainer.lo gtkcurve.lo gtkdialog.lo \ +- gtkdrawingarea.lo gtkeditable.lo gtkentry.lo \ +- gtkentrycompletion.lo gtkeventbox.lo gtkexpander.lo \ +- gtkfilechooser.lo gtkfilechooserbutton.lo \ +- gtkfilechooserdefault.lo gtkfilechooserdialog.lo \ +- gtkfilechooserembed.lo gtkfilechooserentry.lo \ +- gtkfilechoosersettings.lo gtkfilechooserutils.lo \ +- gtkfilechooserwidget.lo gtkfilefilter.lo gtkfilesystem.lo \ +- gtkfilesystemmodel.lo gtkfixed.lo gtkfontbutton.lo \ +- gtkfontsel.lo gtkframe.lo gtkgamma.lo gtkgc.lo gtkhandlebox.lo \ +- gtkhbbox.lo gtkhbox.lo gtkhpaned.lo gtkhruler.lo gtkhscale.lo \ +- gtkhscrollbar.lo gtkhseparator.lo gtkhsv.lo gtkiconcache.lo \ +- gtkiconcachevalidator.lo gtkiconfactory.lo gtkicontheme.lo \ +- gtkiconview.lo gtkimage.lo gtkimagemenuitem.lo gtkimcontext.lo \ +- gtkimcontextsimple.lo gtkimmodule.lo gtkimmulticontext.lo \ +- gtkinputdialog.lo gtkinvisible.lo gtkitem.lo gtkkeyhash.lo \ +- gtklabel.lo gtklayout.lo gtklinkbutton.lo gtkliststore.lo \ +- gtkmain.lo gtkmarshal.lo gtkmarshalers.lo gtkmenu.lo \ +- gtkmenubar.lo gtkmenuitem.lo gtkmenushell.lo \ +- gtkmenutoolbutton.lo gtkmessagedialog.lo gtkmisc.lo \ +- gtkmnemonichash.lo gtkmodules.lo gtkmountoperation.lo \ +- gtknotebook.lo gtkobject.lo gtkpagesetup.lo gtkpaned.lo \ +- gtkpapersize.lo gtkpathbar.lo gtkplug.lo gtkprintcontext.lo \ +- gtkprintoperation.lo gtkprintoperationpreview.lo \ +- gtkprintsettings.lo gtkprintutils.lo gtkprogressbar.lo \ +- gtkradioaction.lo gtkradiobutton.lo gtkradiomenuitem.lo \ +- gtkradiotoolbutton.lo gtkrange.lo gtkrbtree.lo gtkrc.lo \ +- gtkrecentaction.lo gtkrecentchooserdefault.lo \ +- gtkrecentchooserdialog.lo gtkrecentchoosermenu.lo \ +- gtkrecentchooserwidget.lo gtkrecentchooserutils.lo \ +- gtkrecentchooser.lo gtkrecentfilter.lo gtkrecentmanager.lo \ +- gtkruler.lo gtkscale.lo gtkscalebutton.lo gtkscrollbar.lo \ +- gtkscrolledwindow.lo gtkselection.lo gtkseparator.lo \ +- gtkseparatormenuitem.lo gtkseparatortoolitem.lo gtksettings.lo \ +- gtksizegroup.lo gtkshow.lo gtksocket.lo gtkspinbutton.lo \ +- gtkstatusbar.lo gtkstatusicon.lo gtkstock.lo gtkstyle.lo \ +- gtktable.lo gtktearoffmenuitem.lo gtktestutils.lo \ +- gtktextbtree.lo gtktextbuffer.lo gtktextbufferrichtext.lo \ +- gtktextbufferserialize.lo gtktextchild.lo gtktextdisplay.lo \ +- gtktextiter.lo gtktextlayout.lo gtktextmark.lo \ +- gtktextsegment.lo gtktexttag.lo gtktexttagtable.lo \ +- gtktexttypes.lo gtktextutil.lo gtktextview.lo gtkthemes.lo \ +- gtktoggleaction.lo gtktogglebutton.lo gtktoggletoolbutton.lo \ +- gtktoolbar.lo gtktoolbutton.lo gtktoolitem.lo gtktoolshell.lo \ +- gtktooltip.lo gtktreedatalist.lo gtktreednd.lo gtktreemodel.lo \ +- gtktreemodelfilter.lo gtktreemodelsort.lo gtktreeselection.lo \ +- gtktreesortable.lo gtktreestore.lo gtktreeview.lo \ +- gtktreeviewcolumn.lo gtktypebuiltins.lo gtktypeutils.lo \ +- gtkuimanager.lo gtkvbbox.lo gtkvbox.lo gtkvolumebutton.lo \ +- gtkviewport.lo gtkvpaned.lo gtkvruler.lo gtkvscale.lo \ +- gtkvscrollbar.lo gtkvseparator.lo gtkwidget.lo \ +- gtkwindow-decorate.lo gtkwindow.lo $(am__objects_1) gtktext.lo \ +- gtktree.lo gtktreeitem.lo gtkclist.lo gtkcombo.lo gtkctree.lo \ +- gtkfilesel.lo gtkitemfactory.lo gtklist.lo gtklistitem.lo \ +- gtkoldeditable.lo gtkoptionmenu.lo gtkpixmap.lo gtkpreview.lo \ +- gtkprogress.lo gtksignal.lo gtktipsquery.lo gtktooltips.lo +-am__objects_3 = gtkpagesetupunixdialog.lo gtkprinter.lo \ +- gtkprinteroption.lo gtkprinteroptionset.lo \ +- gtkprinteroptionwidget.lo gtkprintjob.lo \ +- gtkprintoperation-unix.lo gtkprintunixdialog.lo \ +- gtkprintbackend.lo gtksearchenginebeagle.lo \ +- gtksearchenginetracker.lo +-@OS_UNIX_TRUE@am__objects_4 = $(am__objects_3) +-am__objects_5 = gtkprint-win32.lo gtkprintoperation-win32.lo +-@OS_WIN32_TRUE@am__objects_6 = $(am__objects_5) +-am__objects_7 = gtkplug-x11.lo gtksocket-x11.lo gtkxembed.lo \ +- gtktrayicon-x11.lo +-@USE_X11_TRUE@am__objects_8 = $(am__objects_7) +-am__objects_9 = gtkplug-win32.lo gtksocket-win32.lo gtkwin32embed.lo \ +- gtkwin32embedwidget.lo +-@USE_WIN32_TRUE@@USE_X11_FALSE@am__objects_10 = $(am__objects_9) +-am__objects_11 = gtksearchenginequartz.lo gtkplug-stub.lo \ +- gtksocket-stub.lo +-@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_12 = \ +-@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_11) +-am__objects_13 = gtkplug-stub.lo gtksocket-stub.lo +-@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__objects_14 = \ +-@USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@ $(am__objects_13) +-am__objects_15 = $(am__objects_2) $(am__objects_4) $(am__objects_6) \ +- $(am__objects_8) $(am__objects_10) $(am__objects_12) \ +- $(am__objects_14) +-am_libgtk_directfb_2_0_la_OBJECTS = $(am__objects_15) +-libgtk_directfb_2_0_la_OBJECTS = $(am_libgtk_directfb_2_0_la_OBJECTS) +-am__libgtk_quartz_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ +- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ +- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ +- gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ +- gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ +- gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ +- gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ +- gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ +- gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ +- gtkcellrendererprogress.c gtkcellrendererspin.c \ +- gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ +- gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ +- gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ +- gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ +- gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ +- gtkeventbox.c gtkexpander.c gtkfilechooser.c \ +- gtkfilechooserbutton.c gtkfilechooserdefault.c \ +- gtkfilechooserdialog.c gtkfilechooserembed.c \ +- gtkfilechooserentry.c gtkfilechoosersettings.c \ +- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ +- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ +- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ +- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ +- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ +- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ +- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ +- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ +- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ +- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ +- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ +- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ +- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ +- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ +- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ +- gtkprintcontext.c gtkprintoperation.c \ +- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ +- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ +- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ +- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ +- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ +- gtkrecentchooserwidget.c gtkrecentchooserutils.c \ +- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ +- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ +- gtkscrolledwindow.c gtkselection.c gtkseparator.c \ +- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ +- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ +- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ +- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ +- gtktextbuffer.c gtktextbufferrichtext.c \ +- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ +- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ +- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ +- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ +- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ +- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ +- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ +- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ +- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ +- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ +- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ +- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ +- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ +- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ +- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ +- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ +- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ +- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ +- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ +- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ +- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ +- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ +- gtksearchenginetracker.c gtkprint-win32.c \ +- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ +- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ +- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ +- gtkplug-stub.c gtksocket-stub.c +-am_libgtk_quartz_2_0_la_OBJECTS = $(am__objects_15) +-libgtk_quartz_2_0_la_OBJECTS = $(am_libgtk_quartz_2_0_la_OBJECTS) +-am__libgtk_win32_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ +- gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ +- gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ +- gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ +- gtkarrow.c gtkaspectframe.c gtkassistant.c gtkbbox.c gtkbin.c \ +- gtkbindings.c gtkbox.c gtkbuildable.c gtkbuilder.c \ +- gtkbuilderparser.c gtkbutton.c gtkcalendar.c gtkcelleditable.c \ +- gtkcelllayout.c gtkcellrenderer.c gtkcellrendereraccel.c \ +- gtkcellrenderercombo.c gtkcellrendererpixbuf.c \ +- gtkcellrendererprogress.c gtkcellrendererspin.c \ +- gtkcellrenderertext.c gtkcellrenderertoggle.c gtkcellview.c \ +- gtkcheckbutton.c gtkcheckmenuitem.c gtkcolorbutton.c \ +- gtkcolorsel.c gtkcolorseldialog.c gtkcombobox.c \ +- gtkcomboboxentry.c gtkcontainer.c gtkcurve.c gtkdialog.c \ +- gtkdrawingarea.c gtkeditable.c gtkentry.c gtkentrycompletion.c \ +- gtkeventbox.c gtkexpander.c gtkfilechooser.c \ +- gtkfilechooserbutton.c gtkfilechooserdefault.c \ +- gtkfilechooserdialog.c gtkfilechooserembed.c \ +- gtkfilechooserentry.c gtkfilechoosersettings.c \ +- gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ +- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ +- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ +- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ +- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ +- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ +- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ +- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ +- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ +- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ +- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ +- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ +- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ +- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ +- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ +- gtkprintcontext.c gtkprintoperation.c \ +- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ +- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ +- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ +- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ +- gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ +- gtkrecentchooserwidget.c gtkrecentchooserutils.c \ +- gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ +- gtkruler.c gtkscale.c gtkscalebutton.c gtkscrollbar.c \ +- gtkscrolledwindow.c gtkselection.c gtkseparator.c \ +- gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ +- gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ +- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ +- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ +- gtktextbuffer.c gtktextbufferrichtext.c \ +- gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ +- gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ +- gtktexttag.c gtktexttagtable.c gtktexttypes.c gtktextutil.c \ +- gtktextview.c gtkthemes.c gtktoggleaction.c gtktogglebutton.c \ +- gtktoggletoolbutton.c gtktoolbar.c gtktoolbutton.c \ +- gtktoolitem.c gtktoolshell.c gtktooltip.c gtktreedatalist.c \ +- gtktreednd.c gtktreemodel.c gtktreemodelfilter.c \ +- gtktreemodelsort.c gtktreeselection.c gtktreesortable.c \ +- gtktreestore.c gtktreeview.c gtktreeviewcolumn.c \ +- gtktypebuiltins.c gtktypeutils.c gtkuimanager.c gtkvbbox.c \ +- gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ +- gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ +- gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ +- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ +- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ +- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ +- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ +- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ +- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ +- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ +- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ +- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ +- gtksearchenginetracker.c gtkprint-win32.c \ +- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ +- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ +- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ +- gtkplug-stub.c gtksocket-stub.c +-am_libgtk_win32_2_0_la_OBJECTS = $(am__objects_15) +-libgtk_win32_2_0_la_OBJECTS = $(am_libgtk_win32_2_0_la_OBJECTS) +-am__libgtk_x11_2_0_la_SOURCES_DIST = gtkquery.c gtksearchengine.c \ ++# Makefile.am for gtk+/gtk ++@USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f" ++SUBDIRS = theme-bits . tests ++DIST_SUBDIRS = theme-bits tests ++@HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr ++@HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups ++INCLUDES = \ ++ -DG_LOG_DOMAIN=\"Gtk\" \ ++ -DGTK_LIBDIR=\"$(libdir)\" \ ++ -DGTK_DATADIR=\"$(datadir)\" \ ++ -DGTK_DATA_PREFIX=\"$(prefix)\" \ ++ -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ ++ -DGTK_VERSION=\"$(GTK_VERSION)\" \ ++ -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ ++ -DGTK_HOST=\"$(host)\" \ ++ -DGTK_COMPILATION \ ++ -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \ ++ -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\" \ ++ -I$(top_builddir) \ ++ -I$(top_builddir)/gtk \ ++ -I$(top_srcdir) -I../gdk \ ++ -I$(top_srcdir)/gdk \ ++ -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \ ++ -DGDK_DISABLE_DEPRECATED \ + -DMAEMO_CHANGES \ + -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \ - -DGTK_DISABLE_DEPRECATED \ - -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -@@ -757,13 +762,17 @@ - # Installed header files without compatibility guarantees - # that are not included in gtk/gtk.h - gtk_semi_private_h_sources = \ -- gtktextlayout.h ++ -DGTK_DISABLE_DEPRECATED \ ++ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ ++ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ ++ $(GTK_DEBUG_FLAGS) \ ++ $(GTK_DEP_CFLAGS) \ ++ $(gtk_clipboard_dnd_c_sources_CFLAGS) \ ++ $(INCLUDED_IMMODULE_DEFINE) ++ ++gtarget = $(gdktarget) ++@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined ++@OS_WIN32_TRUE@gtk_def = gtk.def ++@OS_WIN32_TRUE@gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def ++@OS_WIN32_TRUE@gtk_win32_res = gtk-win32-res.o ++@OS_WIN32_TRUE@gtk_win32_res_ldflag = -Wl,gtk-win32-res.o ++@MS_LIB_AVAILABLE_TRUE@noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib ++TESTS_ENVIRONMENT = srcdir="$(srcdir)" gtk_all_c_sources="$(gtk_all_c_sources)" ++TESTS = aliasfilescheck.sh $(am__append_1) ++libgtkincludedir = $(includedir)/gtk-2.0/gtk ++libadd = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) $(GTK_DEP_LIBS) \ ++ $(am__append_2) ++deps = $(am__append_3) ++ ++# libtool stuff: set version and export symbols for resolving ++# since automake doesn't support conditionalized libsomething_la_LDFLAGS ++# we use the general approach here ++libtool_opts = \ ++ -version-info $(LT_VERSION_INFO) \ ++ -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \ ++ -rpath $(libdir) $(libgtk_target_ldflags) ++ ++ ++# ++# setup source file variables ++# ++ ++# GTK+ header files for public installation (non-generated, or generated ++# by configure) ++ ++# Broken ++ ++# Deprecated ++gtk_public_h_sources = gtk.h gtkaboutdialog.h gtkaccelgroup.h \ ++ gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkaction.h \ ++ gtkactiongroup.h gtkadjustment.h gtkalignment.h gtkarrow.h \ ++ gtkaspectframe.h gtkassistant.h gtkbbox.h gtkbin.h \ ++ gtkbindings.h gtkbox.h gtkbuilder.h gtkbuildable.h gtkbutton.h \ ++ gtkcalendar.h gtkcelleditable.h gtkcelllayout.h \ ++ gtkcellrenderer.h gtkcellrendereraccel.h \ ++ gtkcellrenderercombo.h gtkcellrendererpixbuf.h \ ++ gtkcellrendererprogress.h gtkcellrendererspin.h \ ++ gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcellview.h \ ++ gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h \ ++ gtkcolorbutton.h gtkcolorsel.h gtkcolorseldialog.h \ ++ gtkcombobox.h gtkcomboboxentry.h gtkcontainer.h gtkcurve.h \ ++ gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h \ ++ gtkentry.h gtkentrycompletion.h gtkenums.h gtkeventbox.h \ ++ gtkexpander.h gtkfilechooser.h gtkfilechooserbutton.h \ ++ gtkfilechooserdialog.h gtkfilechooserwidget.h gtkfilefilter.h \ ++ gtkfixed.h gtkfontbutton.h gtkfontsel.h gtkframe.h gtkgamma.h \ ++ gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h \ ++ gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h \ ++ gtkhsv.h gtkiconfactory.h gtkicontheme.h gtkiconview.h \ ++ gtkimage.h gtkimagemenuitem.h gtkimcontext.h \ ++ gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h \ ++ gtkinputdialog.h gtkinvisible.h gtkitem.h gtklabel.h \ ++ gtklayout.h gtklinkbutton.h gtkliststore.h gtkmain.h gtkmenu.h \ ++ gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmenutoolbutton.h \ ++ gtkmessagedialog.h gtkmisc.h gtkmodules.h gtkmountoperation.h \ ++ gtknotebook.h gtkobject.h gtkpagesetup.h gtkpaned.h \ ++ gtkpapersize.h gtkplug.h gtkprintcontext.h gtkprintoperation.h \ ++ gtkprintoperationpreview.h gtkprintsettings.h gtkprivate.h \ ++ gtkprogressbar.h gtkradioaction.h gtkradiobutton.h \ ++ gtkradiomenuitem.h gtkradiotoolbutton.h gtkrange.h gtkrc.h \ ++ gtkrecentaction.h gtkrecentchooser.h gtkrecentchooserdialog.h \ ++ gtkrecentchoosermenu.h gtkrecentchooserwidget.h \ ++ gtkrecentfilter.h gtkrecentmanager.h gtkruler.h gtkscale.h \ ++ gtkscalebutton.h gtkscrollbar.h gtkscrolledwindow.h \ ++ gtkselection.h gtkseparator.h gtkseparatormenuitem.h \ ++ gtkseparatortoolitem.h gtkshow.h gtksettings.h gtksizegroup.h \ ++ gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstatusicon.h \ ++ gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h \ ++ gtktestutils.h gtktextbuffer.h gtktextbufferrichtext.h \ ++ gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextmark.h \ ++ gtktexttag.h gtktexttagtable.h gtktextview.h gtktoggleaction.h \ ++ gtktogglebutton.h gtktoggletoolbutton.h gtktoolbar.h \ ++ gtktoolbutton.h gtktoolitem.h gtktoolshell.h gtktooltip.h \ ++ gtktreednd.h gtktreemodel.h gtktreemodelfilter.h \ ++ gtktreemodelsort.h gtktreeselection.h gtktreesortable.h \ ++ gtktreestore.h gtktreeview.h gtktreeviewcolumn.h \ ++ gtktypeutils.h gtkuimanager.h gtkvbbox.h gtkvbox.h \ ++ gtkviewport.h gtkvolumebutton.h gtkvpaned.h gtkvruler.h \ ++ gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h \ ++ gtkwindow.h gtktext.h gtktree.h gtktreeitem.h gtkclist.h \ ++ gtkcombo.h gtkctree.h gtkfilesel.h gtkitemfactory.h gtklist.h \ ++ gtklistitem.h gtkoldeditable.h gtkoptionmenu.h gtkpixmap.h \ ++ gtkpreview.h gtkprogress.h gtksignal.h gtktipsquery.h \ ++ gtktooltips.h ++@OS_UNIX_TRUE@gtk_unix_print_public_h_sources = \ ++@OS_UNIX_TRUE@ gtkpagesetupunixdialog.h \ ++@OS_UNIX_TRUE@ gtkprintunixdialog.h \ ++@OS_UNIX_TRUE@ gtkprinter.h \ ++@OS_UNIX_TRUE@ gtkprintjob.h \ ++@OS_UNIX_TRUE@ gtkunixprint.h ++ ++ ++# Installed header files without compatibility guarantees ++# that are not included in gtk/gtk.h ++gtk_semi_private_h_sources = \ + gtktextlayout.h \ + gtkfilesystem.h \ + gtkfilesystemmodel.h \ @@ -61863,40 +90238,1620 @@ diff -urN gtk+2.0-2.14.4.old/gtk/Makefile.in gtk+2.0-2.14.4/gtk/Makefile.in + gtkfilechooserutils.h \ + gtkquery.h \ + gtksearchengine.h ++ ++ ++# GTK+ header files that don't get installed ++gtk_private_h_sources = gtksearchenginesimple.h gtkdndcursors.h \ ++ gtkentryprivate.h gtkbuilderprivate.h gtkfilechooserdefault.h \ ++ gtkfilechooserembed.h gtkfilechooserentry.h \ ++ gtkfilechoosersettings.h gtkiconcache.h gtkintl.h gtkkeyhash.h \ ++ gtkmnemonichash.h gtkpathbar.h gtkplugprivate.h \ ++ gtkprintoperation-private.h gtkprintutils.h gtkrbtree.h \ ++ gtkrecentchooserdefault.h gtkrecentchooserprivate.h \ ++ gtkrecentchooserutils.h gtksocketprivate.h gtktextbtree.h \ ++ gtktextbufferserialize.h gtktextchildprivate.h \ ++ gtktextiterprivate.h gtktextmarkprivate.h gtktextsegment.h \ ++ gtktexttagprivate.h gtktexttypes.h gtktextutil.h gtkthemes.h \ ++ gtktoggleactionprivate.h gtktreedatalist.h gtktreeprivate.h \ ++ gtkwindow-decorate.h $(gtk_clipboard_dnd_h_sources) \ ++ $(am__append_4) $(am__append_6) $(am__append_8) \ ++ $(am__append_10) $(am__append_12) ++ ++# GTK+ C sources to build the library from ++gtk_base_c_sources = gtkquery.c gtksearchengine.c \ + gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ + gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ + gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ +@@ -1830,25 +1024,26 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk + gtkfilechooserdialog.c gtkfilechooserembed.c \ + gtkfilechooserentry.c gtkfilechoosersettings.c \ + gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ +- gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c gtkfontbutton.c \ +- gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c \ +- gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c \ +- gtkhscrollbar.c gtkhseparator.c gtkhsv.c gtkiconcache.c \ +- gtkiconcachevalidator.c gtkiconfactory.c gtkicontheme.c \ +- gtkiconview.c gtkimage.c gtkimagemenuitem.c gtkimcontext.c \ +- gtkimcontextsimple.c gtkimmodule.c gtkimmulticontext.c \ +- gtkinputdialog.c gtkinvisible.c gtkitem.c gtkkeyhash.c \ +- gtklabel.c gtklayout.c gtklinkbutton.c gtkliststore.c gtkmain.c \ +- gtkmarshal.c gtkmarshalers.c gtkmenu.c gtkmenubar.c \ +- gtkmenuitem.c gtkmenushell.c gtkmenutoolbutton.c \ +- gtkmessagedialog.c gtkmisc.c gtkmnemonichash.c gtkmodules.c \ +- gtkmountoperation.c gtknotebook.c gtkobject.c gtkpagesetup.c \ +- gtkpaned.c gtkpapersize.c gtkpathbar.c gtkplug.c \ +- gtkprintcontext.c gtkprintoperation.c \ +- gtkprintoperationpreview.c gtkprintsettings.c gtkprintutils.c \ +- gtkprogressbar.c gtkradioaction.c gtkradiobutton.c \ +- gtkradiomenuitem.c gtkradiotoolbutton.c gtkrange.c gtkrbtree.c \ +- gtkrc.c gtkrecentaction.c gtkrecentchooserdefault.c \ ++ gtkfilesystem.c gtkfilesystemmodel.c gtkfixed.c \ ++ gtkfontbutton.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c \ ++ gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c \ ++ gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkhsv.c \ ++ gtkiconcache.c gtkiconcachevalidator.c gtkiconfactory.c \ ++ gtkicontheme.c gtkiconview.c gtkimage.c gtkimagemenuitem.c \ ++ gtkimcontext.c gtkimcontextsimple.c gtkimmodule.c \ ++ gtkimmulticontext.c gtkinputdialog.c gtkinvisible.c gtkitem.c \ ++ gtkkeyhash.c gtklabel.c gtklayout.c gtklinkbutton.c \ ++ gtkliststore.c gtkmain.c gtkmarshal.c gtkmarshalers.c \ ++ gtkmenu.c gtkmenubar.c gtkmenuitem.c gtkmenushell.c \ ++ gtkmenutoolbutton.c gtkmessagedialog.c gtkmisc.c \ ++ gtkmnemonichash.c gtkmodules.c gtkmountoperation.c \ ++ gtknotebook.c gtkobject.c gtkpagesetup.c gtkpaned.c \ ++ gtkpapersize.c gtkpathbar.c gtkplug.c gtkprintcontext.c \ ++ gtkprintoperation.c gtkprintoperationpreview.c \ ++ gtkprintsettings.c gtkprintutils.c gtkprogressbar.c \ ++ gtkradioaction.c gtkradiobutton.c gtkradiomenuitem.c \ ++ gtkradiotoolbutton.c gtkrange.c gtkrbtree.c gtkrc.c \ ++ gtkrecentaction.c gtkrecentchooserdefault.c \ + gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ + gtkrecentchooserwidget.c gtkrecentchooserutils.c \ + gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ +@@ -1856,8 +1051,8 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk + gtkscrolledwindow.c gtkselection.c gtkseparator.c \ + gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ + gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ +- gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c gtktable.c \ +- gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ ++ gtkstatusbar.c gtkstatusicon.c gtkstock.c gtkstyle.c \ ++ gtktable.c gtktearoffmenuitem.c gtktestutils.c gtktextbtree.c \ + gtktextbuffer.c gtktextbufferrichtext.c \ + gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ + gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ +@@ -1872,370 +1067,501 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk + gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ + gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ + gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ +- gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c \ +- gtkclipboard.c gtkdnd.c gtktext.c gtktree.c gtktreeitem.c \ +- gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c gtkitemfactory.c \ +- gtklist.c gtklistitem.c gtkoldeditable.c gtkoptionmenu.c \ +- gtkpixmap.c gtkpreview.c gtkprogress.c gtksignal.c \ +- gtktipsquery.c gtktooltips.c gtkpagesetupunixdialog.c \ +- gtkprinter.c gtkprinteroption.c gtkprinteroptionset.c \ +- gtkprinteroptionwidget.c gtkprintjob.c gtkprintoperation-unix.c \ +- gtkprintunixdialog.c gtkprintbackend.c gtksearchenginebeagle.c \ +- gtksearchenginetracker.c gtkprint-win32.c \ +- gtkprintoperation-win32.c gtkplug-x11.c gtksocket-x11.c \ +- gtkxembed.c gtktrayicon-x11.c gtkplug-win32.c gtksocket-win32.c \ +- gtkwin32embed.c gtkwin32embedwidget.c gtksearchenginequartz.c \ +- gtkplug-stub.c gtksocket-stub.c +-am_libgtk_x11_2_0_la_OBJECTS = $(am__objects_15) +-libgtk_x11_2_0_la_OBJECTS = $(am_libgtk_x11_2_0_la_OBJECTS) +-bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \ +- gtk-update-icon-cache$(EXEEXT) +-PROGRAMS = $(bin_PROGRAMS) ++ $(gtk_clipboard_dnd_c_sources) gtktext.c gtktree.c \ ++ gtktreeitem.c gtkclist.c gtkcombo.c gtkctree.c gtkfilesel.c \ ++ gtkitemfactory.c gtklist.c gtklistitem.c gtkoldeditable.c \ ++ gtkoptionmenu.c gtkpixmap.c gtkpreview.c gtkprogress.c \ ++ gtksignal.c gtktipsquery.c gtktooltips.c ++gtk_c_sources = $(gtk_base_c_sources) $(am__append_5) $(am__append_7) \ ++ $(am__append_9) $(am__append_11) $(am__append_13) \ ++ $(am__append_14) ++gtk_all_c_sources = $(gtk_base_c_sources) $(gtk_os_unix_c_sources) \ ++ $(gtk_os_win32_c_sources) $(gtk_use_x11_c_sources) \ ++ $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) \ ++ $(gtk_use_stub_c_sources) ++gtk_os_unix_c_sources = \ ++ gtkpagesetupunixdialog.c \ ++ gtkprinter.c \ ++ gtkprinteroption.c \ ++ gtkprinteroptionset.c \ ++ gtkprinteroptionwidget.c \ ++ gtkprintjob.c \ ++ gtkprintoperation-unix.c \ ++ gtkprintunixdialog.c \ ++ gtkprintbackend.c \ ++ gtksearchenginebeagle.c \ ++ gtksearchenginetracker.c +-am_gtk_query_immodules_2_0_OBJECTS = queryimmodules.$(OBJEXT) +-gtk_query_immodules_2_0_OBJECTS = $(am_gtk_query_immodules_2_0_OBJECTS) +-gtk_query_immodules_2_0_LDFLAGS = +-am_gtk_update_icon_cache_OBJECTS = updateiconcache.$(OBJEXT) +-gtk_update_icon_cache_OBJECTS = $(am_gtk_update_icon_cache_OBJECTS) +-gtk_update_icon_cache_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +-gtk_update_icon_cache_LDFLAGS = +-SCRIPTS = $(bin_SCRIPTS) ++gtk_os_win32_c_sources = \ ++ gtkprint-win32.c \ ++ gtkprintoperation-win32.c - # GTK+ header files that don't get installed - gtk_private_h_sources = \ -- gtkquery.h \ -- gtksearchengine.h \ - gtksearchenginesimple.h \ - gtkdndcursors.h \ - gtkentryprivate.h \ -@@ -771,11 +780,7 @@ - gtkfilechooserdefault.h \ - gtkfilechooserembed.h \ - gtkfilechooserentry.h \ -- gtkfilechooserprivate.h \ - gtkfilechoosersettings.h \ -- gtkfilechooserutils.h \ -- gtkfilesystem.h \ -- gtkfilesystemmodel.h \ - gtkiconcache.h \ - gtkintl.h \ - gtkkeyhash.h \ -diff -urN gtk+2.0-2.14.4.old/gtk/tests/Makefile.in gtk+2.0-2.14.4/gtk/tests/Makefile.in ---- gtk+2.0-2.14.4.old/gtk/tests/Makefile.in 2008-10-17 01:07:17.000000000 -0300 -+++ gtk+2.0-2.14.4/gtk/tests/Makefile.in 2008-11-04 15:37:08.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@ ++gtk_use_x11_c_sources = \ ++ gtkplug-x11.c \ ++ gtksocket-x11.c \ ++ gtkxembed.c \ ++ gtktrayicon-x11.c + +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fnmatch.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkaboutdialog.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkaccelgroup.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkaccellabel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkaccelmap.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkaccessible.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkaction.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkactiongroup.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkadjustment.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkalignment.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkarrow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkaspectframe.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkassistant.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkbbox.Plo ./$(DEPDIR)/gtkbin.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkbindings.Plo ./$(DEPDIR)/gtkbox.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkbuildable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkbuilder.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkbuilderparser.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcalendar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcelleditable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcelllayout.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrenderer.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrendereraccel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrenderercombo.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrendererpixbuf.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrendererprogress.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrendererspin.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrenderertext.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellrenderertoggle.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcellview.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcheckbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcheckmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkclipboard-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkclipboard.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkclist.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcolorbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcolorsel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcolorseldialog.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcombo.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcombobox.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcomboboxentry.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkcontainer.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkctree.Plo ./$(DEPDIR)/gtkcurve.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkdialog.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkdnd-quartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkdnd.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkdrawingarea.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkeditable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkentry.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkentrycompletion.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkeventbox.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkexpander.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooser.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserdefault.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserdialog.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserembed.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserentry.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechoosersettings.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserutils.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilechooserwidget.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilefilter.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesystem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfilesystemmodel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfixed.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfontbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkfontsel.Plo ./$(DEPDIR)/gtkframe.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkgamma.Plo ./$(DEPDIR)/gtkgc.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkhandlebox.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkhbbox.Plo ./$(DEPDIR)/gtkhbox.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkhpaned.Plo ./$(DEPDIR)/gtkhruler.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkhscale.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkhscrollbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkhseparator.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkhsv.Plo ./$(DEPDIR)/gtkiconcache.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkiconcachevalidator.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkiconfactory.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkicontheme.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkiconview.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkimage.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkimagemenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkimcontext.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkimcontextsimple.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkimmodule.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkimmulticontext.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkinputdialog.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkinvisible.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkitemfactory.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkkeyhash.Plo ./$(DEPDIR)/gtklabel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtklayout.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtklinkbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtklist.Plo ./$(DEPDIR)/gtklistitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkliststore.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmain.Plo ./$(DEPDIR)/gtkmarshal.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmarshalers.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmenu.Plo ./$(DEPDIR)/gtkmenubar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmenushell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmenutoolbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmessagedialog.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmisc.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmnemonichash.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmodules.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkmountoperation.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtknotebook.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkobject.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkoldeditable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkoptionmenu.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkpagesetup.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkpagesetupunixdialog.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkpaned.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkpapersize.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkpathbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkpixmap.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkplug-stub.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkplug-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkplug-x11.Plo ./$(DEPDIR)/gtkplug.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkpreview.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprint-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintbackend.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintcontext.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprinter.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprinteroption.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprinteroptionset.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprinteroptionwidget.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintjob.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintoperation-unix.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintoperation-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintoperation.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintoperationpreview.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintsettings.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintunixdialog.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintutils.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprogress.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprogressbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkquartz.Plo ./$(DEPDIR)/gtkquery.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkradioaction.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkradiobutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkradiomenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkradiotoolbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrange.Plo ./$(DEPDIR)/gtkrbtree.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrc.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentaction.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchooser.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchooserdefault.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchooserdialog.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchoosermenu.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchooserutils.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentchooserwidget.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentfilter.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkrecentmanager.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkruler.Plo ./$(DEPDIR)/gtkscale.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkscalebutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkscrollbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkscrolledwindow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksearchengine.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksearchenginebeagle.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksearchenginequartz.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksearchenginesimple.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksearchenginetracker.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkselection.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkseparator.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkseparatormenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkseparatortoolitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksettings.Plo ./$(DEPDIR)/gtkshow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksignal.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksizegroup.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket-stub.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket-win32.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtksocket.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkspinbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkstatusbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkstatusicon.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkstock.Plo ./$(DEPDIR)/gtkstyle.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktearoffmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktestutils.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktext.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextbtree.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextbuffer.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextbufferrichtext.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextbufferserialize.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextchild.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextdisplay.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextiter.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextlayout.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextmark.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextsegment.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktexttag.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktexttagtable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktexttypes.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextutil.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktextview.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkthemes.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktipsquery.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktoggleaction.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktogglebutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktoggletoolbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktoolshell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktooltip.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktooltips.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktrayicon-x11.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktree.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreedatalist.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreednd.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreeitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreemodel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreemodelfilter.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreemodelsort.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreeselection.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreesortable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreestore.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreeview.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktreeviewcolumn.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktypebuiltins.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtktypeutils.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkuimanager.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkvbbox.Plo ./$(DEPDIR)/gtkvbox.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkviewport.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkvolumebutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkvpaned.Plo ./$(DEPDIR)/gtkvruler.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkvscale.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkvscrollbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkvseparator.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkwidget.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkwin32embed.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkwin32embedwidget.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkwindow-decorate.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkwindow.Plo ./$(DEPDIR)/gtkxembed.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/queryimmodules.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/updateiconcache.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(am__libgtk_directfb_2_0_la_SOURCES_DIST) \ +- $(am__libgtk_quartz_2_0_la_SOURCES_DIST) \ +- $(am__libgtk_win32_2_0_la_SOURCES_DIST) \ +- $(am__libgtk_x11_2_0_la_SOURCES_DIST) \ +- $(gtk_query_immodules_2_0_SOURCES) \ +- $(gtk_update_icon_cache_SOURCES) +-DATA = $(noinst_DATA) ++gtk_use_win32_c_sources = \ ++ gtkplug-win32.c \ ++ gtksocket-win32.c \ ++ gtkwin32embed.c \ ++ gtkwin32embedwidget.c + +-HEADERS = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) ++gtk_use_quartz_c_sources = \ ++ gtksearchenginequartz.c \ ++ gtkplug-stub.c \ ++ gtksocket-stub.c ++ ++gtk_use_stub_c_sources = \ ++ gtkplug-stub.c \ ++ gtksocket-stub.c ++ ++@USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@gtk_use_quartz_c_sources_CFLAGS = "-xobjective-c" ++@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c ++@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources = gtkclipboard-quartz.c gtkdnd-quartz.c gtkquartz.c ++@USE_QUARTZ_TRUE@gtk_clipboard_dnd_h_sources = gtkquartz.h ++@USE_QUARTZ_FALSE@gtk_clipboard_dnd_c_sources_CFLAGS = ++@USE_QUARTZ_TRUE@gtk_clipboard_dnd_c_sources_CFLAGS = "-xobjective-c" ++ ++# we use our own built_sources variable rules to avoid automake's ++# BUILT_SOURCES oddities ++# we generate frequently rebuild files piggyback on a stamp file, so sources ++# depending on them only get rebuild when the built source actually changed ++# content ++ ++# built sources that get installed with the header files ++gtk_built_public_sources = \ ++ gtkmarshal.h \ ++ gtktypebuiltins.h ++ ++ ++# built headers that don't get installed ++gtk_built_private_headers = \ ++ gtkalias.h \ ++ gtkmarshalers.h \ ++ gtkbuiltincache.h \ ++ gtkimcontextsimpleseqs.h ++ ++gtk_built_sources = \ ++ gtkaliasdef.c \ ++ gtktypebuiltins.c \ ++ gtktypefuncs.c \ ++ gtkmarshalers.c \ ++ gtkmarshal.c \ ++ ${gtk_built_private_headers} \ ++ ${gtk_built_public_sources} ++ ++stamp_files = \ ++ stamp-gtkmarshalers.h \ ++ stamp-gtkmarshal.h \ ++ stamp-gtktypebuiltins.h \ ++ stamp-icons ++ ++ ++# non-header sources (headers should be specified in the above variables) ++# that don't serve as direct make target sources, i.e. they don't have ++# their own .lo rules and don't get publically installed ++gtk_extra_sources = \ ++ paper_names.c \ ++ paper_names_offsets.c \ ++ gen-paper-names.c \ ++ gtkstatusicon-quartz.c \ ++ gtk.symbols \ ++ gtkversion.h.in \ ++ gtkmarshalers.list \ ++ gtkmarshal.list ++ ++ ++# ++# setup GTK+ sources and their dependencies ++# ++MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS) ++EXTRA_HEADERS = ++ ++# ++# rules to generate built sources ++# ++# setup autogeneration dependencies ++gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf ++CLEANFILES = $(gen_sources) ++BUILT_SOURCES = $(gtk_built_sources) ++ ++# target platform: ++lib_LTLIBRARIES = $(gtktargetlib) ++gtkincludedir = $(includedir)/gtk-2.0/gtk ++gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h ++gtkunixprintincludedir = $(includedir)/gtk-unix-print-2.0/gtk ++gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources) ++libgtk_x11_2_0_la_SOURCES = $(gtk_c_sources) ++libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources) ++libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources) ++libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) ++libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) ++libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid ++libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) ++libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) ++libgtk_x11_2_0_la_LIBADD = $(libadd) ++libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 ++libgtk_quartz_2_0_la_LIBADD = $(libadd) ++libgtk_directfb_2_0_la_LIBADD = $(libadd) ++libgtk_x11_2_0_la_DEPENDENCIES = $(deps) ++libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps) ++libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) ++libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) ++@USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) ++EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la ++DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) ++TEST_DEPS = $(DEPS) gtk.immodules ++LDADDS = \ ++ $(gtktargetlib) \ ++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) ++ ++bin_SCRIPTS = gtk-builder-convert ++gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) ++gtk_query_immodules_2_0_LDADD = $(LDADDS) ++gtk_query_immodules_2_0_SOURCES = queryimmodules.c ++gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la ++gtk_update_icon_cache_SOURCES = \ ++ updateiconcache.c ++ ++STOCK_ICONS = \ ++ stock-icons/16/document-open-recent.png \ ++ stock-icons/16/gtk-about.png \ ++ stock-icons/16/gtk-add.png \ ++ stock-icons/16/gtk-cdrom.png \ ++ stock-icons/16/gtk-close.png \ ++ stock-icons/16/gtk-connect.png \ ++ stock-icons/16/gtk-convert.png \ ++ stock-icons/16/gtk-copy.png \ ++ stock-icons/16/gtk-cut.png \ ++ stock-icons/16/gtk-delete.png \ ++ stock-icons/16/gtk-directory.png \ ++ stock-icons/16/gtk-disconnect.png \ ++ stock-icons/16/gtk-edit.png \ ++ stock-icons/16/gtk-execute.png \ ++ stock-icons/16/gtk-file.png \ ++ stock-icons/16/gtk-find-and-replace.png \ ++ stock-icons/16/gtk-find.png \ ++ stock-icons/16/gtk-floppy.png \ ++ stock-icons/16/gtk-fullscreen.png \ ++ stock-icons/16/gtk-go-back-ltr.png \ ++ stock-icons/16/gtk-go-down.png \ ++ stock-icons/16/gtk-go-forward-ltr.png \ ++ stock-icons/16/gtk-goto-bottom.png \ ++ stock-icons/16/gtk-goto-first-ltr.png \ ++ stock-icons/16/gtk-goto-last-ltr.png \ ++ stock-icons/16/gtk-goto-top.png \ ++ stock-icons/16/gtk-go-up.png \ ++ stock-icons/16/gtk-harddisk.png \ ++ stock-icons/16/gtk-help.png \ ++ stock-icons/16/gtk-home.png \ ++ stock-icons/16/gtk-indent-ltr.png \ ++ stock-icons/16/gtk-indent-rtl.png \ ++ stock-icons/16/gtk-index.png \ ++ stock-icons/16/gtk-info.png \ ++ stock-icons/16/gtk-jump-to-ltr.png \ ++ stock-icons/16/gtk-jump-to-rtl.png \ ++ stock-icons/16/gtk-justify-center.png \ ++ stock-icons/16/gtk-justify-fill.png \ ++ stock-icons/16/gtk-justify-left.png \ ++ stock-icons/16/gtk-justify-right.png \ ++ stock-icons/16/gtk-leave-fullscreen.png \ ++ stock-icons/16/gtk-media-forward-ltr.png \ ++ stock-icons/16/gtk-media-next-ltr.png \ ++ stock-icons/16/gtk-media-pause.png \ ++ stock-icons/16/gtk-media-play-ltr.png \ ++ stock-icons/16/gtk-media-play-rtl.png \ ++ stock-icons/16/gtk-media-previous-ltr.png \ ++ stock-icons/16/gtk-media-record.png \ ++ stock-icons/16/gtk-media-rewind-ltr.png \ ++ stock-icons/16/gtk-media-stop.png \ ++ stock-icons/16/gtk-missing-image.png \ ++ stock-icons/16/gtk-network.png \ ++ stock-icons/16/gtk-new.png \ ++ stock-icons/16/gtk-open.png \ ++ stock-icons/16/gtk-page-setup.png \ ++ stock-icons/16/gtk-paste.png \ ++ stock-icons/16/gtk-preferences.png \ ++ stock-icons/16/gtk-print.png \ ++ stock-icons/16/gtk-print-error.png \ ++ stock-icons/16/gtk-print-paused.png \ ++ stock-icons/16/gtk-print-preview.png \ ++ stock-icons/16/gtk-print-report.png \ ++ stock-icons/16/gtk-print-warning.png \ ++ stock-icons/16/gtk-properties.png \ ++ stock-icons/16/gtk-quit.png \ ++ stock-icons/16/gtk-redo-ltr.png \ ++ stock-icons/16/gtk-redo-rtl.png \ ++ stock-icons/16/gtk-refresh.png \ ++ stock-icons/16/gtk-remove.png \ ++ stock-icons/16/gtk-revert-to-saved-ltr.png \ ++ stock-icons/16/gtk-revert-to-saved-rtl.png \ ++ stock-icons/16/gtk-save-as.png \ ++ stock-icons/16/gtk-select-all.png \ ++ stock-icons/16/gtk-select-color.png \ ++ stock-icons/16/gtk-select-font.png \ ++ stock-icons/16/gtk-sort-ascending.png \ ++ stock-icons/16/gtk-sort-descending.png \ ++ stock-icons/16/gtk-spell-check.png \ ++ stock-icons/16/gtk-stop.png \ ++ stock-icons/16/gtk-strikethrough.png \ ++ stock-icons/16/gtk-font.png \ ++ stock-icons/16/gtk-undelete-ltr.png \ ++ stock-icons/16/gtk-undelete-rtl.png \ ++ stock-icons/16/gtk-underline.png \ ++ stock-icons/16/gtk-undo-ltr.png \ ++ stock-icons/16/gtk-undo-rtl.png \ ++ stock-icons/16/gtk-unindent-ltr.png \ ++ stock-icons/16/gtk-unindent-rtl.png \ ++ stock-icons/16/gtk-zoom-100.png \ ++ stock-icons/16/gtk-zoom-fit.png \ ++ stock-icons/16/gtk-zoom-in.png \ ++ stock-icons/16/gtk-zoom-out.png \ ++ stock-icons/16/gtk-italic.png \ ++ stock-icons/16/gtk-bold.png \ ++ stock-icons/20/gtk-apply.png \ ++ stock-icons/20/gtk-cancel.png \ ++ stock-icons/20/gtk-close.png \ ++ stock-icons/20/gtk-no.png \ ++ stock-icons/20/gtk-ok.png \ ++ stock-icons/20/gtk-yes.png \ ++ stock-icons/24/audio-volume-high.png \ ++ stock-icons/24/audio-volume-low.png \ ++ stock-icons/24/audio-volume-medium.png \ ++ stock-icons/24/audio-volume-muted.png \ ++ stock-icons/24/document-open-recent.png \ ++ stock-icons/24/gtk-about.png \ ++ stock-icons/24/gtk-add.png \ ++ stock-icons/24/gtk-bold.png \ ++ stock-icons/24/gtk-cdrom.png \ ++ stock-icons/24/gtk-clear.png \ ++ stock-icons/24/gtk-close.png \ ++ stock-icons/24/gtk-color-picker.png \ ++ stock-icons/24/gtk-connect.png \ ++ stock-icons/24/gtk-convert.png \ ++ stock-icons/24/gtk-copy.png \ ++ stock-icons/24/gtk-cut.png \ ++ stock-icons/24/gtk-directory.png \ ++ stock-icons/24/gtk-disconnect.png \ ++ stock-icons/24/gtk-edit.png \ ++ stock-icons/24/gtk-execute.png \ ++ stock-icons/24/gtk-file.png \ ++ stock-icons/24/gtk-find-and-replace.png \ ++ stock-icons/24/gtk-find.png \ ++ stock-icons/24/gtk-font.png \ ++ stock-icons/24/gtk-fullscreen.png \ ++ stock-icons/24/gtk-go-back-ltr.png \ ++ stock-icons/24/gtk-goto-top.png \ ++ stock-icons/24/gtk-go-down.png \ ++ stock-icons/24/gtk-goto-bottom.png \ ++ stock-icons/24/gtk-goto-first-ltr.png \ ++ stock-icons/24/gtk-goto-last-ltr.png \ ++ stock-icons/24/gtk-go-up.png \ ++ stock-icons/24/gtk-harddisk.png \ ++ stock-icons/24/gtk-help.png \ ++ stock-icons/24/gtk-home.png \ ++ stock-icons/24/gtk-indent-ltr.png \ ++ stock-icons/24/gtk-indent-rtl.png \ ++ stock-icons/24/gtk-index.png \ ++ stock-icons/24/gtk-info.png \ ++ stock-icons/24/gtk-italic.png \ ++ stock-icons/24/gtk-jump-to-ltr.png \ ++ stock-icons/24/gtk-jump-to-rtl.png \ ++ stock-icons/24/gtk-justify-center.png \ ++ stock-icons/24/gtk-justify-fill.png \ ++ stock-icons/24/gtk-justify-left.png \ ++ stock-icons/24/gtk-justify-right.png \ ++ stock-icons/24/gtk-leave-fullscreen.png \ ++ stock-icons/24/gtk-media-forward-ltr.png \ ++ stock-icons/24/gtk-media-next-ltr.png \ ++ stock-icons/24/gtk-media-pause.png \ ++ stock-icons/24/gtk-media-play-ltr.png \ ++ stock-icons/24/gtk-media-play-rtl.png \ ++ stock-icons/24/gtk-media-previous-ltr.png \ ++ stock-icons/24/gtk-media-record.png \ ++ stock-icons/24/gtk-media-rewind-ltr.png \ ++ stock-icons/24/gtk-media-stop.png \ ++ stock-icons/24/gtk-missing-image.png \ ++ stock-icons/24/gtk-network.png \ ++ stock-icons/24/gtk-new.png \ ++ stock-icons/24/gtk-open.png \ ++ stock-icons/24/gtk-orientation-reverse-landscape.png \ ++ stock-icons/24/gtk-orientation-landscape.png \ ++ stock-icons/24/gtk-orientation-reverse-portrait.png \ ++ stock-icons/24/gtk-orientation-portrait.png \ ++ stock-icons/24/gtk-page-setup.png \ ++ stock-icons/24/gtk-paste.png \ ++ stock-icons/24/gtk-preferences.png \ ++ stock-icons/24/gtk-print.png \ ++ stock-icons/24/gtk-print-error.png \ ++ stock-icons/24/gtk-print-paused.png \ ++ stock-icons/24/gtk-print-preview.png \ ++ stock-icons/24/gtk-print-report.png \ ++ stock-icons/24/gtk-print-warning.png \ ++ stock-icons/24/gtk-properties.png \ ++ stock-icons/24/gtk-quit.png \ ++ stock-icons/24/gtk-redo-ltr.png \ ++ stock-icons/24/gtk-redo-rtl.png \ ++ stock-icons/24/gtk-refresh.png \ ++ stock-icons/24/gtk-remove.png \ ++ stock-icons/24/gtk-revert-to-saved-ltr.png \ ++ stock-icons/24/gtk-revert-to-saved-rtl.png \ ++ stock-icons/24/gtk-select-font.png \ ++ stock-icons/24/gtk-save-as.png \ ++ stock-icons/24/gtk-floppy.png \ ++ stock-icons/24/gtk-select-all.png \ ++ stock-icons/24/gtk-select-color.png \ ++ stock-icons/24/gtk-sort-ascending.png \ ++ stock-icons/24/gtk-sort-descending.png \ ++ stock-icons/24/gtk-spell-check.png \ ++ stock-icons/24/gtk-stop.png \ ++ stock-icons/24/gtk-strikethrough.png \ ++ stock-icons/24/gtk-delete.png \ ++ stock-icons/24/gtk-undelete-ltr.png \ ++ stock-icons/24/gtk-undelete-rtl.png \ ++ stock-icons/24/gtk-underline.png \ ++ stock-icons/24/gtk-undo-ltr.png \ ++ stock-icons/24/gtk-undo-rtl.png \ ++ stock-icons/24/gtk-unindent-ltr.png \ ++ stock-icons/24/gtk-unindent-rtl.png \ ++ stock-icons/24/gtk-zoom-100.png \ ++ stock-icons/24/gtk-zoom-fit.png \ ++ stock-icons/24/gtk-zoom-in.png \ ++ stock-icons/24/gtk-zoom-out.png \ ++ stock-icons/24/gtk-go-forward-ltr.png \ ++ stock-icons/32/gtk-dnd-multiple.png \ ++ stock-icons/32/gtk-dnd.png \ ++ stock-icons/48/gtk-dialog-authentication.png \ ++ stock-icons/48/gtk-dialog-error.png \ ++ stock-icons/48/gtk-dialog-info.png \ ++ stock-icons/48/gtk-dialog-question.png \ ++ stock-icons/48/gtk-dialog-warning.png + ++GENERATED_ICONS = \ ++ stock-icons/16/gtk-go-back-rtl.png \ ++ stock-icons/16/gtk-go-forward-rtl.png \ ++ stock-icons/16/gtk-goto-first-rtl.png \ ++ stock-icons/16/gtk-goto-last-rtl.png \ ++ stock-icons/16/gtk-media-forward-rtl.png \ ++ stock-icons/16/gtk-media-next-rtl.png \ ++ stock-icons/16/gtk-media-previous-rtl.png \ ++ stock-icons/16/gtk-media-rewind-rtl.png \ ++ stock-icons/16/gtk-save.png \ ++ stock-icons/16/drive-harddisk.png \ ++ stock-icons/16/folder.png \ ++ stock-icons/16/folder-remote.png \ ++ stock-icons/16/user-home.png \ ++ stock-icons/16/user-desktop.png \ ++ stock-icons/16/text-x-generic.png \ ++ stock-icons/24/gtk-go-back-rtl.png \ ++ stock-icons/24/gtk-go-forward-rtl.png \ ++ stock-icons/24/gtk-goto-first-rtl.png \ ++ stock-icons/24/gtk-goto-last-rtl.png \ ++ stock-icons/24/gtk-media-forward-rtl.png \ ++ stock-icons/24/gtk-media-next-rtl.png \ ++ stock-icons/24/gtk-media-previous-rtl.png \ ++ stock-icons/24/gtk-media-rewind-rtl.png \ ++ stock-icons/24/gtk-save.png \ ++ stock-icons/24/drive-harddisk.png \ ++ stock-icons/24/folder.png \ ++ stock-icons/24/folder-remote.png \ ++ stock-icons/24/user-home.png \ ++ stock-icons/24/user-desktop.png \ ++ stock-icons/24/text-x-generic.png + +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(gtkinclude_HEADERS) $(gtkunixprintinclude_HEADERS) \ +- $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl Makefile.am \ +- gtk-win32.rc.in gtkversion.h.in makefile.msc.in +-SOURCES = $(libgtk_directfb_2_0_la_SOURCES) $(libgtk_quartz_2_0_la_SOURCES) $(libgtk_win32_2_0_la_SOURCES) $(libgtk_x11_2_0_la_SOURCES) $(gtk_query_immodules_2_0_SOURCES) $(gtk_update_icon_cache_SOURCES) ++@CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ ++@CROSS_COMPILING_FALSE@ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ ++@CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache + ++@CROSS_COMPILING_TRUE@gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gtk/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-makefile.msc: $(top_builddir)/config.status makefile.msc.in ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++makefile.msc: $(top_builddir)/config.status $(srcdir)/makefile.msc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-gtkversion.h: $(top_builddir)/config.status gtkversion.h.in ++gtkversion.h: $(top_builddir)/config.status $(srcdir)/gtkversion.h.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-gtk-win32.rc: $(top_builddir)/config.status gtk-win32.rc.in ++gtk-win32.rc: $(top_builddir)/config.status $(srcdir)/gtk-win32.rc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-libLTLIBRARIES_INSTALL = $(INSTALL) + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libdir) ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgtk-directfb-2.0.la: $(libgtk_directfb_2_0_la_OBJECTS) $(libgtk_directfb_2_0_la_DEPENDENCIES) +- $(LINK) $(libgtk_directfb_2_0_la_LDFLAGS) $(libgtk_directfb_2_0_la_OBJECTS) $(libgtk_directfb_2_0_la_LIBADD) $(LIBS) ++ $(libgtk_directfb_2_0_la_LINK) $(libgtk_directfb_2_0_la_OBJECTS) $(libgtk_directfb_2_0_la_LIBADD) $(LIBS) + libgtk-quartz-2.0.la: $(libgtk_quartz_2_0_la_OBJECTS) $(libgtk_quartz_2_0_la_DEPENDENCIES) +- $(LINK) $(libgtk_quartz_2_0_la_LDFLAGS) $(libgtk_quartz_2_0_la_OBJECTS) $(libgtk_quartz_2_0_la_LIBADD) $(LIBS) ++ $(libgtk_quartz_2_0_la_LINK) $(libgtk_quartz_2_0_la_OBJECTS) $(libgtk_quartz_2_0_la_LIBADD) $(LIBS) + libgtk-win32-2.0.la: $(libgtk_win32_2_0_la_OBJECTS) $(libgtk_win32_2_0_la_DEPENDENCIES) +- $(LINK) $(libgtk_win32_2_0_la_LDFLAGS) $(libgtk_win32_2_0_la_OBJECTS) $(libgtk_win32_2_0_la_LIBADD) $(LIBS) ++ $(libgtk_win32_2_0_la_LINK) $(libgtk_win32_2_0_la_OBJECTS) $(libgtk_win32_2_0_la_LIBADD) $(LIBS) + libgtk-x11-2.0.la: $(libgtk_x11_2_0_la_OBJECTS) $(libgtk_x11_2_0_la_DEPENDENCIES) +- $(LINK) $(libgtk_x11_2_0_la_LDFLAGS) $(libgtk_x11_2_0_la_OBJECTS) $(libgtk_x11_2_0_la_LIBADD) $(LIBS) +-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++ $(libgtk_x11_2_0_la_LINK) $(libgtk_x11_2_0_la_OBJECTS) $(libgtk_x11_2_0_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(bindir) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + else :; fi; \ + done + +@@ -2243,8 +1569,8 @@ uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ +- rm -f $(DESTDIR)$(bindir)/$$f; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + + clean-binPROGRAMS: +@@ -2255,20 +1581,19 @@ clean-binPROGRAMS: + done + gtk-query-immodules-2.0$(EXEEXT): $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_DEPENDENCIES) + @rm -f gtk-query-immodules-2.0$(EXEEXT) +- $(LINK) $(gtk_query_immodules_2_0_LDFLAGS) $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_LDADD) $(LIBS) ++ $(LINK) $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_LDADD) $(LIBS) + gtk-update-icon-cache$(EXEEXT): $(gtk_update_icon_cache_OBJECTS) $(gtk_update_icon_cache_DEPENDENCIES) + @rm -f gtk-update-icon-cache$(EXEEXT) +- $(LINK) $(gtk_update_icon_cache_LDFLAGS) $(gtk_update_icon_cache_OBJECTS) $(gtk_update_icon_cache_LDADD) $(LIBS) +-binSCRIPT_INSTALL = $(INSTALL_SCRIPT) ++ $(LINK) $(gtk_update_icon_cache_OBJECTS) $(gtk_update_icon_cache_LDADD) $(LIBS) + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(bindir) ++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ +- $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ ++ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done + +@@ -2276,12 +1601,12 @@ uninstall-binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ +- rm -f $(DESTDIR)$(bindir)/$$f; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -2547,82 +1872,64 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updateiconcache.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-gtkincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-gtkincludeHEADERS: $(gtkinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(gtkincludedir) ++ test -z "$(gtkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gtkincludedir)" + @list='$(gtkinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(gtkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gtkincludedir)/$$f"; \ +- $(gtkincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gtkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(gtkincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gtkincludedir)/$$f'"; \ ++ $(gtkincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gtkincludedir)/$$f"; \ + done + + uninstall-gtkincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(gtkinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(gtkincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(gtkincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(gtkincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(gtkincludedir)/$$f"; \ + done +-gtkunixprintincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-gtkunixprintincludeHEADERS: $(gtkunixprintinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(gtkunixprintincludedir) ++ test -z "$(gtkunixprintincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gtkunixprintincludedir)" + @list='$(gtkunixprintinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(gtkunixprintincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gtkunixprintincludedir)/$$f"; \ +- $(gtkunixprintincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(gtkunixprintincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(gtkunixprintincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gtkunixprintincludedir)/$$f'"; \ ++ $(gtkunixprintincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gtkunixprintincludedir)/$$f"; \ + done + + uninstall-gtkunixprintincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(gtkunixprintinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(gtkunixprintincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(gtkunixprintincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(gtkunixprintincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(gtkunixprintincludedir)/$$f"; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -2632,7 +1939,13 @@ uninstall-gtkunixprintincludeHEADERS: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -2644,15 +1957,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -2673,7 +1991,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -2684,35 +2002,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -2720,23 +2033,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -2750,9 +2063,9 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -2761,25 +2074,25 @@ check-TESTS: $(TESTS) + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xpass=`expr $$xpass + 1`; \ +- failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xpass=`expr $$xpass + 1`; \ ++ failed=`expr $$failed + 1`; \ ++ echo "XPASS: $$tst"; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xfail=`expr $$xfail + 1`; \ ++ echo "XFAIL: $$tst"; \ + ;; \ + *) \ +- failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ failed=`expr $$failed + 1`; \ ++ echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ +@@ -2804,46 +2117,40 @@ check-TESTS: $(TESTS) + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ +- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ +- test -n "$$skipped" && echo "$$skipped"; \ +- test -n "$$report" && echo "$$report"; \ ++ test -z "$$skipped" || echo "$$skipped"; \ ++ test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. $(distdir)/stock-icons/16 $(distdir)/stock-icons/20 $(distdir)/stock-icons/24 $(distdir)/stock-icons/32 $(distdir)/stock-icons/48 +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -2856,13 +2163,17 @@ distdir: $(DISTFILES) + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -2877,8 +2188,9 @@ install-binPROGRAMS: install-libLTLIBRAR + + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) $(DESTDIR)$(gtkincludedir) $(DESTDIR)$(gtkunixprintincludedir) +- ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gtkincludedir)" "$(DESTDIR)$(gtkunixprintincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive + install-exec: install-exec-recursive +@@ -2900,13 +2212,13 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ++ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + clean: clean-recursive + + clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ +@@ -2916,12 +2228,14 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-local distclean-tags ++ distclean-local distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: +@@ -2929,15 +2243,23 @@ info-am: + install-data-am: install-data-local install-gtkincludeHEADERS \ + install-gtkunixprintincludeHEADERS + ++install-dvi: install-dvi-recursive ++ + install-exec-am: install-binPROGRAMS install-binSCRIPTS \ + install-libLTLIBRARIES + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -2960,35 +2282,34 @@ ps-am: + + uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-gtkincludeHEADERS \ +- uninstall-gtkunixprintincludeHEADERS uninstall-info-am \ +- uninstall-libLTLIBRARIES uninstall-local ++ uninstall-gtkunixprintincludeHEADERS uninstall-libLTLIBRARIES \ ++ uninstall-local + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-exec-am install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \ +- check-am check-local clean clean-binPROGRAMS clean-generic \ +- clean-libLTLIBRARIES clean-libtool clean-recursive ctags \ +- ctags-recursive distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-local distclean-recursive \ +- distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ +- info-recursive install install-am install-binPROGRAMS \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-TESTS check-am check-local clean \ ++ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-compile distclean-generic distclean-libtool \ ++ distclean-local distclean-tags distdir dvi dvi-am html html-am \ ++ info info-am install install-am install-binPROGRAMS \ + install-binSCRIPTS install-data install-data-am \ +- install-data-local install-data-recursive install-exec \ +- install-exec-am install-exec-recursive \ +- install-gtkincludeHEADERS install-gtkunixprintincludeHEADERS \ +- install-info install-info-am install-info-recursive \ +- install-libLTLIBRARIES install-man install-recursive \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am installdirs-recursive maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ +- ps-recursive tags tags-recursive uninstall uninstall-am \ ++ install-data-local install-dvi install-dvi-am install-exec \ ++ install-exec-am install-exec-hook install-gtkincludeHEADERS \ ++ install-gtkunixprintincludeHEADERS install-html \ ++ install-html-am install-info install-info-am \ ++ install-libLTLIBRARIES install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-binSCRIPTS \ + uninstall-gtkincludeHEADERS \ +- uninstall-gtkunixprintincludeHEADERS uninstall-info-am \ +- uninstall-info-recursive uninstall-libLTLIBRARIES \ +- uninstall-local uninstall-recursive ++ uninstall-gtkunixprintincludeHEADERS uninstall-libLTLIBRARIES \ ++ uninstall-local + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/gtk/tests/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gtk/tests/Makefile.in 2008-10-17 06:07:17.000000000 +0200 ++++ gtk+-2.14.4/gtk/tests/Makefile.in 2008-11-11 18:56:03.864635659 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,11 +32,86 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++noinst_PROGRAMS = $(am__EXEEXT_2) + @OS_UNIX_TRUE@am__append_1 = defaultvalue ++subdir = gtk/tests ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++@OS_UNIX_TRUE@am__EXEEXT_1 = defaultvalue$(EXEEXT) ++am__EXEEXT_2 = testing$(EXEEXT) liststore$(EXEEXT) treestore$(EXEEXT) \ ++ treeview-scrolling$(EXEEXT) recentmanager$(EXEEXT) \ ++ floating$(EXEEXT) object$(EXEEXT) builder$(EXEEXT) \ ++ $(am__EXEEXT_1) textbuffer$(EXEEXT) ++PROGRAMS = $(noinst_PROGRAMS) ++am_builder_OBJECTS = builder.$(OBJEXT) ++builder_OBJECTS = $(am_builder_OBJECTS) ++builder_DEPENDENCIES = $(progs_ldadd) ++builder_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(builder_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++am_defaultvalue_OBJECTS = defaultvalue.$(OBJEXT) pixbuf-init.$(OBJEXT) ++defaultvalue_OBJECTS = $(am_defaultvalue_OBJECTS) ++defaultvalue_DEPENDENCIES = $(progs_ldadd) ++am_floating_OBJECTS = floating.$(OBJEXT) ++floating_OBJECTS = $(am_floating_OBJECTS) ++floating_DEPENDENCIES = $(progs_ldadd) ++am_liststore_OBJECTS = liststore.$(OBJEXT) ++liststore_OBJECTS = $(am_liststore_OBJECTS) ++liststore_DEPENDENCIES = $(progs_ldadd) ++am_object_OBJECTS = object.$(OBJEXT) pixbuf-init.$(OBJEXT) ++object_OBJECTS = $(am_object_OBJECTS) ++object_DEPENDENCIES = $(progs_ldadd) ++am_recentmanager_OBJECTS = recentmanager.$(OBJEXT) ++recentmanager_OBJECTS = $(am_recentmanager_OBJECTS) ++recentmanager_DEPENDENCIES = $(progs_ldadd) ++am_testing_OBJECTS = testing.$(OBJEXT) ++testing_OBJECTS = $(am_testing_OBJECTS) ++testing_DEPENDENCIES = $(progs_ldadd) ++am_textbuffer_OBJECTS = textbuffer.$(OBJEXT) pixbuf-init.$(OBJEXT) ++textbuffer_OBJECTS = $(am_textbuffer_OBJECTS) ++textbuffer_DEPENDENCIES = $(progs_ldadd) ++am_treestore_OBJECTS = treestore.$(OBJEXT) ++treestore_OBJECTS = $(am_treestore_OBJECTS) ++treestore_DEPENDENCIES = $(progs_ldadd) ++am_treeview_scrolling_OBJECTS = treeview-scrolling.$(OBJEXT) ++treeview_scrolling_OBJECTS = $(am_treeview_scrolling_OBJECTS) ++treeview_scrolling_DEPENDENCIES = $(progs_ldadd) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(builder_SOURCES) $(defaultvalue_SOURCES) \ ++ $(floating_SOURCES) $(liststore_SOURCES) $(object_SOURCES) \ ++ $(recentmanager_SOURCES) $(testing_SOURCES) \ ++ $(textbuffer_SOURCES) $(treestore_SOURCES) \ ++ $(treeview_scrolling_SOURCES) ++DIST_SOURCES = $(builder_SOURCES) $(defaultvalue_SOURCES) \ ++ $(floating_SOURCES) $(liststore_SOURCES) $(object_SOURCES) \ ++ $(recentmanager_SOURCES) $(testing_SOURCES) \ ++ $(textbuffer_SOURCES) $(treestore_SOURCES) \ ++ $(treeview_scrolling_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -52,22 +122,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -82,8 +147,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -91,10 +154,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -121,6 +123,7 @@ +@@ -121,6 +180,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61904,19 +91859,832 @@ diff -urN gtk+2.0-2.14.4.old/gtk/tests/Makefile.in gtk+2.0-2.14.4/gtk/tests/Make GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.4/gtk/theme-bits/Makefile.in ---- gtk+2.0-2.14.4.old/gtk/theme-bits/Makefile.in 2008-10-17 01:07:17.000000000 -0300 -+++ gtk+2.0-2.14.4/gtk/theme-bits/Makefile.in 2008-11-04 15:37:08.000000000 -0200 -@@ -94,6 +94,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@ +@@ -139,8 +199,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -151,91 +209,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -257,24 +238,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -285,8 +257,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -298,28 +268,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -328,22 +280,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -366,6 +321,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -374,16 +330,19 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending + EXTRA_DIST = +- +-TEST_PROGS = testing liststore treestore treeview-scrolling recentmanager floating object builder $(am__append_1) textbuffer ++TEST_PROGS = testing liststore treestore treeview-scrolling \ ++ recentmanager floating object builder $(am__append_1) \ ++ textbuffer + + ### testing rules + +@@ -408,7 +367,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ +@@ -418,20 +376,16 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + DEPS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + progs_ldadd = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- +-noinst_PROGRAMS = $(TEST_PROGS) + testing_SOURCES = testing.c + testing_LDADD = $(progs_ldadd) + liststore_SOURCES = liststore.c +@@ -466,128 +420,39 @@ defaultvalue_SOURCES = defaultvalue.c pi + defaultvalue_LDADD = $(progs_ldadd) + textbuffer_SOURCES = textbuffer.c pixbuf-init.c + textbuffer_LDADD = $(progs_ldadd) +-subdir = gtk/tests +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-@OS_UNIX_TRUE@noinst_PROGRAMS = testing$(EXEEXT) liststore$(EXEEXT) \ +-@OS_UNIX_TRUE@ treestore$(EXEEXT) treeview-scrolling$(EXEEXT) \ +-@OS_UNIX_TRUE@ recentmanager$(EXEEXT) floating$(EXEEXT) \ +-@OS_UNIX_TRUE@ object$(EXEEXT) builder$(EXEEXT) \ +-@OS_UNIX_TRUE@ defaultvalue$(EXEEXT) textbuffer$(EXEEXT) +-@OS_UNIX_FALSE@noinst_PROGRAMS = testing$(EXEEXT) liststore$(EXEEXT) \ +-@OS_UNIX_FALSE@ treestore$(EXEEXT) treeview-scrolling$(EXEEXT) \ +-@OS_UNIX_FALSE@ recentmanager$(EXEEXT) floating$(EXEEXT) \ +-@OS_UNIX_FALSE@ object$(EXEEXT) builder$(EXEEXT) \ +-@OS_UNIX_FALSE@ textbuffer$(EXEEXT) +-PROGRAMS = $(noinst_PROGRAMS) +- +-am_builder_OBJECTS = builder.$(OBJEXT) +-builder_OBJECTS = $(am_builder_OBJECTS) +-builder_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_defaultvalue_OBJECTS = defaultvalue.$(OBJEXT) pixbuf-init.$(OBJEXT) +-defaultvalue_OBJECTS = $(am_defaultvalue_OBJECTS) +-defaultvalue_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-defaultvalue_LDFLAGS = +-am_floating_OBJECTS = floating.$(OBJEXT) +-floating_OBJECTS = $(am_floating_OBJECTS) +-floating_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-floating_LDFLAGS = +-am_liststore_OBJECTS = liststore.$(OBJEXT) +-liststore_OBJECTS = $(am_liststore_OBJECTS) +-liststore_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-liststore_LDFLAGS = +-am_object_OBJECTS = object.$(OBJEXT) pixbuf-init.$(OBJEXT) +-object_OBJECTS = $(am_object_OBJECTS) +-object_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-object_LDFLAGS = +-am_recentmanager_OBJECTS = recentmanager.$(OBJEXT) +-recentmanager_OBJECTS = $(am_recentmanager_OBJECTS) +-recentmanager_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-recentmanager_LDFLAGS = +-am_testing_OBJECTS = testing.$(OBJEXT) +-testing_OBJECTS = $(am_testing_OBJECTS) +-testing_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-testing_LDFLAGS = +-am_textbuffer_OBJECTS = textbuffer.$(OBJEXT) pixbuf-init.$(OBJEXT) +-textbuffer_OBJECTS = $(am_textbuffer_OBJECTS) +-textbuffer_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-textbuffer_LDFLAGS = +-am_treestore_OBJECTS = treestore.$(OBJEXT) +-treestore_OBJECTS = $(am_treestore_OBJECTS) +-treestore_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-treestore_LDFLAGS = +-am_treeview_scrolling_OBJECTS = treeview-scrolling.$(OBJEXT) +-treeview_scrolling_OBJECTS = $(am_treeview_scrolling_OBJECTS) +-treeview_scrolling_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-treeview_scrolling_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/builder.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/defaultvalue.Po ./$(DEPDIR)/floating.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/liststore.Po ./$(DEPDIR)/object.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-init.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/recentmanager.Po ./$(DEPDIR)/testing.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/textbuffer.Po ./$(DEPDIR)/treestore.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/treeview-scrolling.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(builder_SOURCES) $(defaultvalue_SOURCES) \ +- $(floating_SOURCES) $(liststore_SOURCES) $(object_SOURCES) \ +- $(recentmanager_SOURCES) $(testing_SOURCES) \ +- $(textbuffer_SOURCES) $(treestore_SOURCES) \ +- $(treeview_scrolling_SOURCES) +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(builder_SOURCES) $(defaultvalue_SOURCES) $(floating_SOURCES) $(liststore_SOURCES) $(object_SOURCES) $(recentmanager_SOURCES) $(testing_SOURCES) $(textbuffer_SOURCES) $(treestore_SOURCES) $(treeview_scrolling_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/tests/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gtk/tests/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -597,37 +462,37 @@ clean-noinstPROGRAMS: + done + builder$(EXEEXT): $(builder_OBJECTS) $(builder_DEPENDENCIES) + @rm -f builder$(EXEEXT) +- $(LINK) $(builder_LDFLAGS) $(builder_OBJECTS) $(builder_LDADD) $(LIBS) ++ $(builder_LINK) $(builder_OBJECTS) $(builder_LDADD) $(LIBS) + defaultvalue$(EXEEXT): $(defaultvalue_OBJECTS) $(defaultvalue_DEPENDENCIES) + @rm -f defaultvalue$(EXEEXT) +- $(LINK) $(defaultvalue_LDFLAGS) $(defaultvalue_OBJECTS) $(defaultvalue_LDADD) $(LIBS) ++ $(LINK) $(defaultvalue_OBJECTS) $(defaultvalue_LDADD) $(LIBS) + floating$(EXEEXT): $(floating_OBJECTS) $(floating_DEPENDENCIES) + @rm -f floating$(EXEEXT) +- $(LINK) $(floating_LDFLAGS) $(floating_OBJECTS) $(floating_LDADD) $(LIBS) ++ $(LINK) $(floating_OBJECTS) $(floating_LDADD) $(LIBS) + liststore$(EXEEXT): $(liststore_OBJECTS) $(liststore_DEPENDENCIES) + @rm -f liststore$(EXEEXT) +- $(LINK) $(liststore_LDFLAGS) $(liststore_OBJECTS) $(liststore_LDADD) $(LIBS) ++ $(LINK) $(liststore_OBJECTS) $(liststore_LDADD) $(LIBS) + object$(EXEEXT): $(object_OBJECTS) $(object_DEPENDENCIES) + @rm -f object$(EXEEXT) +- $(LINK) $(object_LDFLAGS) $(object_OBJECTS) $(object_LDADD) $(LIBS) ++ $(LINK) $(object_OBJECTS) $(object_LDADD) $(LIBS) + recentmanager$(EXEEXT): $(recentmanager_OBJECTS) $(recentmanager_DEPENDENCIES) + @rm -f recentmanager$(EXEEXT) +- $(LINK) $(recentmanager_LDFLAGS) $(recentmanager_OBJECTS) $(recentmanager_LDADD) $(LIBS) ++ $(LINK) $(recentmanager_OBJECTS) $(recentmanager_LDADD) $(LIBS) + testing$(EXEEXT): $(testing_OBJECTS) $(testing_DEPENDENCIES) + @rm -f testing$(EXEEXT) +- $(LINK) $(testing_LDFLAGS) $(testing_OBJECTS) $(testing_LDADD) $(LIBS) ++ $(LINK) $(testing_OBJECTS) $(testing_LDADD) $(LIBS) + textbuffer$(EXEEXT): $(textbuffer_OBJECTS) $(textbuffer_DEPENDENCIES) + @rm -f textbuffer$(EXEEXT) +- $(LINK) $(textbuffer_LDFLAGS) $(textbuffer_OBJECTS) $(textbuffer_LDADD) $(LIBS) ++ $(LINK) $(textbuffer_OBJECTS) $(textbuffer_LDADD) $(LIBS) + treestore$(EXEEXT): $(treestore_OBJECTS) $(treestore_DEPENDENCIES) + @rm -f treestore$(EXEEXT) +- $(LINK) $(treestore_LDFLAGS) $(treestore_OBJECTS) $(treestore_LDADD) $(LIBS) ++ $(LINK) $(treestore_OBJECTS) $(treestore_LDADD) $(LIBS) + treeview-scrolling$(EXEEXT): $(treeview_scrolling_OBJECTS) $(treeview_scrolling_DEPENDENCIES) + @rm -f treeview-scrolling$(EXEEXT) +- $(LINK) $(treeview_scrolling_LDFLAGS) $(treeview_scrolling_OBJECTS) $(treeview_scrolling_LDADD) $(LIBS) ++ $(LINK) $(treeview_scrolling_OBJECTS) $(treeview_scrolling_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -645,37 +510,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview-scrolling.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -683,26 +536,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -712,23 +554,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -740,29 +582,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -777,7 +613,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(PROGRAMS) +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -798,7 +633,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -812,24 +647,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -850,18 +695,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/gtk/theme-bits/Makefile.in 2008-10-17 06:07:17.000000000 +0200 ++++ gtk+-2.14.4/gtk/theme-bits/Makefile.in 2008-11-11 18:56:04.021135368 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,42 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++noinst_PROGRAMS = decompose-bits$(EXEEXT) ++subdir = gtk/theme-bits ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++PROGRAMS = $(noinst_PROGRAMS) ++am_decompose_bits_OBJECTS = decompose-bits.$(OBJEXT) ++decompose_bits_OBJECTS = $(am_decompose_bits_OBJECTS) ++decompose_bits_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(decompose_bits_SOURCES) ++DIST_SOURCES = $(decompose_bits_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +78,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +103,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +110,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +136,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61924,10 +92692,574 @@ diff -urN gtk+2.0-2.14.4.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.4/gtk/theme GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/ltmain.sh gtk+2.0-2.14.4/ltmain.sh ---- gtk+2.0-2.14.4.old/ltmain.sh 2008-08-29 19:27:25.000000000 -0300 -+++ gtk+2.0-2.14.4/ltmain.sh 2008-04-29 18:33:55.000000000 -0300 -@@ -43,7 +43,7 @@ +@@ -138,8 +155,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +165,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +194,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +213,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +224,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +236,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +277,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,14 +286,17 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = check-13.png check-13-inconsistent.png radio-13.png radio-13-inconsistent.png ++EXTRA_DIST = check-13.png check-13-inconsistent.png radio-13.png \ ++ radio-13-inconsistent.png + TEST_PROGS = + + ### testing rules +@@ -406,56 +322,46 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(GDK_PIXBUF_DEP_CFLAGS) + +- +-noinst_PROGRAMS = decompose-bits +- + decompose_bits_SOURCES = decompose-bits.c + decompose_bits_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +-subdir = gtk/theme-bits +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-noinst_PROGRAMS = decompose-bits$(EXEEXT) +-PROGRAMS = $(noinst_PROGRAMS) +- +-am_decompose_bits_OBJECTS = decompose-bits.$(OBJEXT) +-decompose_bits_OBJECTS = $(am_decompose_bits_OBJECTS) +-decompose_bits_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la +-decompose_bits_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/decompose-bits.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(decompose_bits_SOURCES) +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(decompose_bits_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/theme-bits/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gtk/theme-bits/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -465,10 +371,10 @@ clean-noinstPROGRAMS: + done + decompose-bits$(EXEEXT): $(decompose_bits_OBJECTS) $(decompose_bits_DEPENDENCIES) + @rm -f decompose-bits$(EXEEXT) +- $(LINK) $(decompose_bits_LDFLAGS) $(decompose_bits_OBJECTS) $(decompose_bits_LDADD) $(LIBS) ++ $(LINK) $(decompose_bits_OBJECTS) $(decompose_bits_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -476,37 +382,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decompose-bits.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -514,26 +408,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -543,23 +426,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -571,29 +454,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -608,7 +485,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(PROGRAMS) +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -629,7 +505,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -643,24 +519,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -681,18 +567,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/ltmain.sh +=================================================================== +--- gtk+-2.14.4.orig/ltmain.sh 2008-08-30 00:27:25.000000000 +0200 ++++ gtk+-2.14.4/ltmain.sh 2008-04-29 22:21:21.000000000 +0200 +@@ -43,7 +43,7 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool @@ -61936,7 +93268,7 @@ diff -urN gtk+2.0-2.14.4.old/ltmain.sh gtk+2.0-2.14.4/ltmain.sh TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -@@ -2135,7 +2135,10 @@ +@@ -2135,7 +2135,10 @@ EOF case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; @@ -61948,7 +93280,7 @@ diff -urN gtk+2.0-2.14.4.old/ltmain.sh gtk+2.0-2.14.4/ltmain.sh esac fi if test "$pass" = dlopen; then -@@ -3269,6 +3272,11 @@ +@@ -3269,6 +3272,11 @@ EOF revision="$number_minor" lt_irix_increment=no ;; @@ -61960,19 +93292,119 @@ diff -urN gtk+2.0-2.14.4.old/ltmain.sh gtk+2.0-2.14.4/ltmain.sh esac ;; no) -diff -urN gtk+2.0-2.14.4.old/m4macros/Makefile.in gtk+2.0-2.14.4/m4macros/Makefile.in ---- gtk+2.0-2.14.4.old/m4macros/Makefile.in 2008-10-17 01:07:17.000000000 -0300 -+++ gtk+2.0-2.14.4/m4macros/Makefile.in 2008-11-04 15:37:08.000000000 -0200 -@@ -94,6 +94,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@ +Index: gtk+-2.14.4/m4macros/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/m4macros/Makefile.in 2008-10-17 06:07:17.000000000 +0200 ++++ gtk+-2.14.4/m4macros/Makefile.in 2008-11-11 18:56:04.137134538 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,32 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = m4macros ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(m4datadir)" ++m4dataDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(m4data_DATA) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +68,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +100,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +126,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -61980,19 +93412,596 @@ diff -urN gtk+2.0-2.14.4.old/m4macros/Makefile.in gtk+2.0-2.14.4/m4macros/Makefi GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/Makefile.in gtk+2.0-2.14.4/Makefile.in ---- gtk+2.0-2.14.4.old/Makefile.in 2008-10-17 01:07:13.000000000 -0300 -+++ gtk+2.0-2.14.4/Makefile.in 2008-11-04 15:37:04.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@ +@@ -138,8 +145,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +155,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +184,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +203,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +214,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +226,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +267,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +276,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,56 +311,63 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + installed_m4 = gtk-2.0.m4 +- + m4datadir = $(datadir)/aclocal + m4data_DATA = $(installed_m4) +-subdir = m4macros +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +-DATA = $(m4data_DATA) +- +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4macros/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu m4macros/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-m4dataDATA_INSTALL = $(INSTALL_DATA) + install-m4dataDATA: $(m4data_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(m4datadir) ++ test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" + @list='$(m4data_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \ +- $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \ ++ $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \ + done + + uninstall-m4dataDATA: + @$(NORMAL_UNINSTALL) + @list='$(m4data_DATA)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(m4datadir)/$$f"; \ +- rm -f $(DESTDIR)$(m4datadir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(m4datadir)/$$f"; \ + done + tags: TAGS + TAGS: +@@ -463,29 +375,23 @@ TAGS: + ctags: CTAGS + CTAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -500,9 +406,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(DATA) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(m4datadir) ++ for dir in "$(DESTDIR)$(m4datadir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -522,7 +429,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -533,24 +440,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-m4dataDATA + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -569,17 +486,22 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-m4dataDATA ++uninstall-am: uninstall-m4dataDATA ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am check-local clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-m4dataDATA install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am \ ++ install-m4dataDATA install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am uninstall-m4dataDATA ++ uninstall-m4dataDATA + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/Makefile.in 2008-10-17 06:07:13.000000000 +0200 ++++ gtk+-2.14.4/Makefile.in 2008-11-11 18:56:07.673135343 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = . +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,11 +32,71 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ ++ $(srcdir)/config.h.win32.in $(srcdir)/gail-uninstalled.pc.in \ ++ $(srcdir)/gail.pc.in $(srcdir)/gdk-2.0-uninstalled.pc.in \ ++ $(srcdir)/gdk-2.0.pc.in \ ++ $(srcdir)/gdk-pixbuf-2.0-uninstalled.pc.in \ ++ $(srcdir)/gdk-pixbuf-2.0.pc.in \ ++ $(srcdir)/gtk+-2.0-uninstalled.pc.in $(srcdir)/gtk+-2.0.pc.in \ ++ $(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \ ++ $(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \ ++ COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \ ++ depcomp install-sh ltmain.sh missing mkinstalldirs + @OS_UNIX_TRUE@am__append_1 = gtk+-unix-print-2.0.pc ++subdir = . ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ++ configure.lineno config.status.lineno ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = config.h ++CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-pixbuf-2.0.pc \ ++ gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc \ ++ gdk-pixbuf-2.0-uninstalled.pc gdk-2.0-uninstalled.pc \ ++ gtk+-2.0-uninstalled.pc gail-uninstalled.pc ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(pkgconfigdir)" ++pkgconfigDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(pkgconfig_DATA) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \ ++ perf contrib docs m4macros ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++distdir = $(PACKAGE)-$(VERSION) ++top_distdir = $(distdir) ++am__remove_distdir = \ ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } ++DIST_ARCHIVES = $(distdir).tar.gz ++GZIP_ENV = --best ++distuninstallcheck_listfiles = find . -type f -print ++distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -52,22 +107,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -82,8 +132,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -91,10 +139,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -121,6 +123,7 @@ +@@ -121,6 +165,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62000,181 +94009,6083 @@ diff -urN gtk+2.0-2.14.4.old/Makefile.in gtk+2.0-2.14.4/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -516,7 +519,10 @@ +@@ -139,8 +184,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -151,91 +194,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -257,24 +223,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -285,8 +242,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -298,28 +253,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -328,22 +265,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -366,6 +306,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -374,122 +315,70 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- HACKING \ +- makecopyright \ +- NEWS.pre-1-0 \ +- ChangeLog.pre-1-0 \ +- ChangeLog.pre-1-2 \ +- ChangeLog.pre-2-0 \ +- ChangeLog.pre-2-2 \ +- ChangeLog.pre-2-4 \ +- ChangeLog.pre-2-6 \ +- ChangeLog.pre-2-8 \ +- ChangeLog.pre-2-10 \ +- ChangeLog.gtk-async-file-chooser \ +- ChangeLog.gtk-printing \ +- README.commits \ +- README.win32 \ +- config.h.win32 \ +- makefile.msc \ +- gtk-zip.sh.in \ +- sanitize-la.sh \ +- po/README.translators \ +- po/po2tbl.sed.in \ +- examples/aspectframe/Makefile \ +- examples/aspectframe/aspectframe.c \ +- examples/Makefile \ +- examples/README.1ST \ +- examples/extract.awk \ +- examples/extract.sh \ +- examples/arrow/Makefile \ +- examples/arrow/arrow.c \ +- examples/base/Makefile \ +- examples/base/base.c \ +- examples/buttonbox/Makefile \ +- examples/buttonbox/buttonbox.c \ +- examples/buttons/Makefile \ +- examples/buttons/buttons.c \ +- examples/buttons/info.xpm \ +- examples/calendar/Makefile \ +- examples/calendar/calendar.c \ +- examples/clist/Makefile \ +- examples/clist/clist.c \ +- examples/entry/Makefile \ +- examples/entry/entry.c \ +- examples/eventbox/Makefile \ +- examples/eventbox/eventbox.c \ +- examples/filesel/Makefile \ +- examples/filesel/filesel.c \ +- examples/gtkdial/Makefile \ +- examples/gtkdial/dial_test.c \ +- examples/gtkdial/gtkdial.c \ +- examples/gtkdial/gtkdial.h \ +- examples/helloworld/Makefile \ +- examples/helloworld/helloworld.c \ +- examples/helloworld2/Makefile \ +- examples/helloworld2/helloworld2.c \ +- examples/label/Makefile \ +- examples/label/label.c \ +- examples/list/Makefile \ +- examples/list/list.c \ +- examples/menu/Makefile \ +- examples/menu/menu.c \ +- examples/menu/itemfactory.c \ +- examples/notebook/Makefile \ +- examples/notebook/notebook.c \ +- examples/packbox/Makefile \ +- examples/packbox/packbox.c \ +- examples/paned/Makefile \ +- examples/paned/paned.c \ +- examples/pixmap/Makefile \ +- examples/pixmap/pixmap.c \ +- examples/progressbar/Makefile \ +- examples/progressbar/progressbar.c \ +- examples/radiobuttons/Makefile \ +- examples/radiobuttons/radiobuttons.c \ +- examples/rangewidgets/Makefile \ +- examples/rangewidgets/rangewidgets.c \ +- examples/rulers/Makefile \ +- examples/rulers/rulers.c \ +- examples/scribble-simple/Makefile \ +- examples/scribble-simple/scribble-simple.c \ +- examples/scribble-xinput/Makefile \ +- examples/scribble-xinput/scribble-xinput.c \ +- examples/scrolledwin/Makefile \ +- examples/scrolledwin/scrolledwin.c \ +- examples/selection/Makefile \ +- examples/selection/gettargets.c \ +- examples/selection/setselection.c \ +- examples/statusbar/Makefile \ +- examples/statusbar/statusbar.c \ +- examples/table/Makefile \ +- examples/table/table.c \ +- examples/text/Makefile \ +- examples/text/text.c \ +- examples/tictactoe/Makefile \ +- examples/tictactoe/tictactoe.c \ +- examples/tictactoe/tictactoe.h \ +- examples/tictactoe/ttt_test.c \ +- examples/tree/Makefile \ +- examples/tree/tree.c \ +- examples/wheelbarrow/Makefile \ +- examples/wheelbarrow/wheelbarrow.c \ +- examples/fixed/fixed.c \ +- examples/fixed/Makefile \ +- examples/frame/frame.c \ +- examples/frame/Makefile \ +- examples/spinbutton/spinbutton.c \ +- examples/spinbutton/Makefile \ +- examples/find-examples.sh +- ++EXTRA_DIST = HACKING makecopyright NEWS.pre-1-0 ChangeLog.pre-1-0 \ ++ ChangeLog.pre-1-2 ChangeLog.pre-2-0 ChangeLog.pre-2-2 \ ++ ChangeLog.pre-2-4 ChangeLog.pre-2-6 ChangeLog.pre-2-8 \ ++ ChangeLog.pre-2-10 ChangeLog.gtk-async-file-chooser \ ++ ChangeLog.gtk-printing README.commits README.win32 \ ++ config.h.win32 makefile.msc gtk-zip.sh.in sanitize-la.sh \ ++ po/README.translators po/po2tbl.sed.in \ ++ examples/aspectframe/Makefile \ ++ examples/aspectframe/aspectframe.c examples/Makefile \ ++ examples/README.1ST examples/extract.awk examples/extract.sh \ ++ examples/arrow/Makefile examples/arrow/arrow.c \ ++ examples/base/Makefile examples/base/base.c \ ++ examples/buttonbox/Makefile examples/buttonbox/buttonbox.c \ ++ examples/buttons/Makefile examples/buttons/buttons.c \ ++ examples/buttons/info.xpm examples/calendar/Makefile \ ++ examples/calendar/calendar.c examples/clist/Makefile \ ++ examples/clist/clist.c examples/entry/Makefile \ ++ examples/entry/entry.c examples/eventbox/Makefile \ ++ examples/eventbox/eventbox.c examples/filesel/Makefile \ ++ examples/filesel/filesel.c examples/gtkdial/Makefile \ ++ examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c \ ++ examples/gtkdial/gtkdial.h examples/helloworld/Makefile \ ++ examples/helloworld/helloworld.c examples/helloworld2/Makefile \ ++ examples/helloworld2/helloworld2.c examples/label/Makefile \ ++ examples/label/label.c examples/list/Makefile \ ++ examples/list/list.c examples/menu/Makefile \ ++ examples/menu/menu.c examples/menu/itemfactory.c \ ++ examples/notebook/Makefile examples/notebook/notebook.c \ ++ examples/packbox/Makefile examples/packbox/packbox.c \ ++ examples/paned/Makefile examples/paned/paned.c \ ++ examples/pixmap/Makefile examples/pixmap/pixmap.c \ ++ examples/progressbar/Makefile \ ++ examples/progressbar/progressbar.c \ ++ examples/radiobuttons/Makefile \ ++ examples/radiobuttons/radiobuttons.c \ ++ examples/rangewidgets/Makefile \ ++ examples/rangewidgets/rangewidgets.c examples/rulers/Makefile \ ++ examples/rulers/rulers.c examples/scribble-simple/Makefile \ ++ examples/scribble-simple/scribble-simple.c \ ++ examples/scribble-xinput/Makefile \ ++ examples/scribble-xinput/scribble-xinput.c \ ++ examples/scrolledwin/Makefile \ ++ examples/scrolledwin/scrolledwin.c examples/selection/Makefile \ ++ examples/selection/gettargets.c \ ++ examples/selection/setselection.c examples/statusbar/Makefile \ ++ examples/statusbar/statusbar.c examples/table/Makefile \ ++ examples/table/table.c examples/text/Makefile \ ++ examples/text/text.c examples/tictactoe/Makefile \ ++ examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h \ ++ examples/tictactoe/ttt_test.c examples/tree/Makefile \ ++ examples/tree/tree.c examples/wheelbarrow/Makefile \ ++ examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c \ ++ examples/fixed/Makefile examples/frame/frame.c \ ++ examples/frame/Makefile examples/spinbutton/spinbutton.c \ ++ examples/spinbutton/Makefile examples/find-examples.sh + TEST_PROGS = + + ### testing rules +@@ -516,17 +405,17 @@ XVFB_START = \ && DISPLAY=:$$XID && export DISPLAY -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 -@@ -560,13 +566,15 @@ - DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ - $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog INSTALL \ - Makefile.am NEWS acinclude.m4 aclocal.m4 compile config.guess \ + AUTOMAKE_OPTIONS = 1.7 +- + GDKTARGET = @gdktarget@ +- + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc $(am__append_1) +- ++pkgconfig_DATA = gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc \ ++ gtk+-$(GDKTARGET)-2.0.pc gail.pc $(am__append_1) + DISTCLEANFILES = \ + gtk+-unix-print-2.0.pc \ + gtk+-$(GDKTARGET)-2.0.pc \ +@@ -536,95 +425,83 @@ DISTCLEANFILES = \ + gdk-$(GDKTARGET)-2.0-uninstalled.pc \ + gail-uninstalled.pc + +- + DEFAULT_GDKTARGET = x11 +- + DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds +-subdir = . +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = config.h +-CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-pixbuf-2.0.pc \ +- gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc \ +- gdk-pixbuf-2.0-uninstalled.pc gdk-2.0-uninstalled.pc \ +- gtk+-2.0-uninstalled.pc gail-uninstalled.pc +-DIST_SOURCES = +-DATA = $(pkgconfig_DATA) +- +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ +- $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog INSTALL \ +- Makefile.am NEWS acinclude.m4 aclocal.m4 compile config.guess \ - config.h.in config.h.win32.in config.sub configure.in depcomp \ - gail-uninstalled.pc.in gail.pc.in 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 \ -+ config.h.in config.h.win32.in config.sub configure configure.in \ -+ depcomp gail-uninstalled.pc.in gail.pc.in \ -+ 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 +- 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 -@@ -822,7 +830,7 @@ + .SUFFIXES: +- +-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +- configure.lineno +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++am--refresh: ++ @: ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ ++ cd $(srcdir) && $(AUTOMAKE) --gnu \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ echo ' $(SHELL) ./config.status'; \ ++ $(SHELL) ./config.status;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ++ esac; + +-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck +-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +- cd $(srcdir) && $(AUTOCONF) + +-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(srcdir) && $(AUTOCONF) ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + + config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +- $(MAKE) stamp-h1; \ ++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi + + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +- +-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) +- touch $(srcdir)/config.h.in ++ rm -f stamp-h1 ++ touch $@ + + distclean-hdr: + -rm -f config.h stamp-h1 +-config.h.win32: $(top_builddir)/config.status config.h.win32.in ++config.h.win32: $(top_builddir)/config.status $(srcdir)/config.h.win32.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-gtk-zip.sh: $(top_builddir)/config.status gtk-zip.sh.in ++gtk-zip.sh: $(top_builddir)/config.status $(srcdir)/gtk-zip.sh.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-gdk-pixbuf-2.0.pc: $(top_builddir)/config.status gdk-pixbuf-2.0.pc.in ++gdk-pixbuf-2.0.pc: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-2.0.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-gdk-2.0.pc: $(top_builddir)/config.status gdk-2.0.pc.in ++gdk-2.0.pc: $(top_builddir)/config.status $(srcdir)/gdk-2.0.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-gtk+-2.0.pc: $(top_builddir)/config.status gtk+-2.0.pc.in ++gtk+-2.0.pc: $(top_builddir)/config.status $(srcdir)/gtk+-2.0.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-gtk+-unix-print-2.0.pc: $(top_builddir)/config.status gtk+-unix-print-2.0.pc.in ++gtk+-unix-print-2.0.pc: $(top_builddir)/config.status $(srcdir)/gtk+-unix-print-2.0.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-gail.pc: $(top_builddir)/config.status gail.pc.in ++gail.pc: $(top_builddir)/config.status $(srcdir)/gail.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-gdk-pixbuf-2.0-uninstalled.pc: $(top_builddir)/config.status gdk-pixbuf-2.0-uninstalled.pc.in ++gdk-pixbuf-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gdk-pixbuf-2.0-uninstalled.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-gdk-2.0-uninstalled.pc: $(top_builddir)/config.status gdk-2.0-uninstalled.pc.in ++gdk-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gdk-2.0-uninstalled.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-gtk+-2.0-uninstalled.pc: $(top_builddir)/config.status gtk+-2.0-uninstalled.pc.in ++gtk+-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gtk+-2.0-uninstalled.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +-gail-uninstalled.pc: $(top_builddir)/config.status gail-uninstalled.pc.in ++gail-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gail-uninstalled.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + + mostlyclean-libtool: +@@ -635,24 +512,22 @@ clean-libtool: + + distclean-libtool: + -rm -f libtool +-uninstall-info-am: +-pkgconfigDATA_INSTALL = $(INSTALL_DATA) + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ++ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ +- $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ ++ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + + uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ +- rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -662,7 +537,13 @@ uninstall-pkgconfigDATA: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -674,15 +555,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -703,7 +589,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -714,35 +600,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -750,23 +631,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -778,40 +659,25 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = . +-distdir = $(PACKAGE)-$(VERSION) +- +-am__remove_distdir = \ +- { test ! -d $(distdir) \ +- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr $(distdir); }; } +- +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + + distdir: $(DISTFILES) + $(am__remove_distdir) +- mkdir $(distdir) +- $(mkinstalldirs) $(distdir)/. $(distdir)/contrib/gdk-pixbuf-xlib $(distdir)/demos/gtk-demo $(distdir)/docs/reference/gdk $(distdir)/docs/reference/gdk-pixbuf $(distdir)/docs/reference/gtk $(distdir)/examples $(distdir)/examples/arrow $(distdir)/examples/aspectframe $(distdir)/examples/base $(distdir)/examples/buttonbox $(distdir)/examples/buttons $(distdir)/examples/calendar $(distdir)/examples/clist $(distdir)/examples/entry $(distdir)/examples/eventbox $(distdir)/examples/filesel $(distdir)/examples/fixed $(distdir)/examples/frame $(distdir)/examples/gtkdial $(distdir)/examples/helloworld $(distdir)/examples/helloworld2 $(distdir)/examples/label $(distdir)/examples/list $(distdir)/examples/menu $(distdir)/examples/notebook $(distdir)/examples/packbox $(distdir)/examples/paned $(distdir)/examples/pixmap $(distdir)/examples/progressbar $(distdir)/examples/radiobuttons $(distdir)/examples/rangewidgets $(distdir)/examples/rulers $(distdir)/examples/scribble-simple $(distdir)/examples/scribble-xinput $(distdir)/examples/scrolledwin $(distdir)/examples/selection $(distdir)/examples/spinbutton $(distdir)/examples/statusbar $(distdir)/examples/table $(distdir)/examples/text $(distdir)/examples/tictactoe $(distdir)/examples/tree $(distdir)/examples/wheelbarrow $(distdir)/gdk-pixbuf $(distdir)/gdk/win32/rc $(distdir)/gtk $(distdir)/po $(distdir)/po-properties +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ test -d $(distdir) || mkdir $(distdir) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -822,15 +688,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ -diff -urN gtk+2.0-2.14.4.old/modules/engines/Makefile.in gtk+2.0-2.14.4/modules/engines/Makefile.in ---- gtk+2.0-2.14.4.old/modules/engines/Makefile.in 2008-10-17 01:07:17.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/engines/Makefile.in 2008-11-04 15:37:09.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.14.4/modules/engines/ms-windows/Makefile.in ---- gtk+2.0-2.14.4.old/modules/engines/ms-windows/Makefile.in 2008-10-17 01:07:18.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/engines/ms-windows/Makefile.in 2008-11-04 15:37:09.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in ---- gtk+2.0-2.14.4.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-10-17 01:07:18.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-11-04 15:37:09.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.14.4/modules/engines/ms-windows/Theme/Makefile.in ---- gtk+2.0-2.14.4.old/modules/engines/ms-windows/Theme/Makefile.in 2008-10-17 01:07:18.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/engines/ms-windows/Theme/Makefile.in 2008-11-04 15:37:09.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.4/modules/engines/pixbuf/Makefile.in ---- gtk+2.0-2.14.4.old/modules/engines/pixbuf/Makefile.in 2008-10-17 01:07:18.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/engines/pixbuf/Makefile.in 2008-11-04 15:37:09.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/input/Makefile.in gtk+2.0-2.14.4/modules/input/Makefile.in ---- gtk+2.0-2.14.4.old/modules/input/Makefile.in 2008-10-17 01:07:18.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/input/Makefile.in 2008-11-04 15:37:09.000000000 -0200 -@@ -94,6 +94,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@ -@@ -120,6 +122,7 @@ - GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ - GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ - GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ -+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ - GDK_WLIBS = @GDK_WLIBS@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -545,9 +548,10 @@ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -841,22 +711,55 @@ distdir: $(DISTFILES) + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ +- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) + dist-gzip: distdir +- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ $(am__remove_distdir) ++ ++dist-bzip2: distdir ++ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ++ $(am__remove_distdir) ++ ++dist-lzma: distdir ++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma ++ $(am__remove_distdir) ++ ++dist-tarZ: distdir ++ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z ++ $(am__remove_distdir) ++ ++dist-shar: distdir ++ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ++ $(am__remove_distdir) ++ ++dist-zip: distdir ++ -rm -f $(distdir).zip ++ zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + dist dist-all: distdir +- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ++ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then + # it guarantees that the distribution is self-contained by making another + # tarfile. + distcheck: dist +- $(am__remove_distdir) +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ++ case '$(DIST_ARCHIVES)' in \ ++ *.tar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ *.tar.bz2*) \ ++ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.lzma*) \ ++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ *.tar.Z*) \ ++ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ ++ *.shar.gz*) \ ++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ *.zip*) \ ++ unzip $(distdir).zip ;;\ ++ esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst +@@ -876,19 +779,20 @@ distcheck: dist + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ +- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ ++ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ +- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ +- && rm -f $(distdir).tar.gz \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist \ ++ && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) +- @echo "$(distdir).tar.gz is ready for distribution" | \ +- sed 'h;s/./=/g;p;x;p;x' ++ @(echo "$(distdir) archives ready for distribution: "; \ ++ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ +@@ -913,8 +817,9 @@ check: check-recursive + all-am: Makefile $(DATA) config.h + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) +- ++ for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -934,7 +839,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -947,13 +852,15 @@ clean-am: clean-generic clean-libtool mo + distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-hdr \ ++ distclean-libtool distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: +@@ -962,12 +869,20 @@ install-data-am: install-pkgconfigDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -988,29 +903,28 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-local uninstall-pkgconfigDATA ++uninstall-am: uninstall-local uninstall-pkgconfigDATA + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-data-am install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive dist dist-all dist-gzip distcheck \ +- distclean distclean-generic distclean-hdr distclean-libtool \ +- distclean-recursive distclean-tags distcleancheck distdir \ +- distuninstallcheck dvi dvi-am dvi-recursive info info-am \ +- info-recursive install install-am install-data install-data-am \ +- install-data-recursive install-exec install-exec-am \ +- install-exec-recursive install-info install-info-am \ +- install-info-recursive install-man install-pkgconfigDATA \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ +- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-local \ +- uninstall-pkgconfigDATA uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am am--refresh check check-am check-local clean \ ++ clean-generic clean-libtool ctags ctags-recursive dist \ ++ dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ ++ dist-tarZ dist-zip distcheck distclean distclean-generic \ ++ distclean-hdr distclean-libtool distclean-tags distcleancheck \ ++ distdir distuninstallcheck dvi dvi-am html html-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-data-hook install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-pkgconfigDATA install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am uninstall-local \ ++ uninstall-pkgconfigDATA + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/engines/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/engines/Makefile.in 2008-10-17 06:07:17.000000000 +0200 ++++ gtk+-2.14.4/modules/engines/Makefile.in 2008-11-11 18:56:04.377134524 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,35 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = modules/engines ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = ms-windows pixbuf ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +216,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +278,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,33 +313,40 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @USE_WIN32_TRUE@wimp = ms-windows +- + SUBDIRS = $(wimp) pixbuf +-subdir = modules/engines +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-DIST_SUBDIRS = ms-windows pixbuf + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/engines/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo +@@ -440,10 +354,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -451,7 +361,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -463,15 +379,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -492,7 +413,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -503,35 +424,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -539,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -567,29 +483,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -602,13 +512,17 @@ distdir: $(DISTFILES) + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -619,7 +533,6 @@ check: check-recursive + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +- + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -639,7 +552,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -650,25 +563,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -687,26 +609,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ +- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/engines/ms-windows/Makefile.in 2008-10-17 06:07:18.000000000 +0200 ++++ gtk+-2.14.4/modules/engines/ms-windows/Makefile.in 2008-11-11 18:56:04.532634944 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,67 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = modules/engines/ms-windows ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(enginedir)" ++engineLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(engine_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++am__DEPENDENCIES_2 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ ++ $(top_builddir)/gdk/$(gdktargetlib) \ ++ $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1) ++libwimp_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libwimp_la_OBJECTS = msw_rc_style.lo msw_style.lo msw_theme_main.lo \ ++ xp_theme.lo ++libwimp_la_OBJECTS = $(am_libwimp_la_OBJECTS) ++libwimp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libwimp_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libwimp_la_SOURCES) ++DIST_SOURCES = $(libwimp_la_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +103,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +128,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +135,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +161,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +180,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +190,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +219,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +238,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +249,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +261,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +302,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +311,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +346,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = Theme +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ +@@ -416,18 +354,14 @@ INCLUDES = \ + -DGDK_DISABLE_DEPRECATED \ + $(GTK_DEP_CFLAGS) + +- + LDADDS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) \ + $(GTK_DEP_LIBS) + +- + enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines +- + engine_LTLIBRARIES = libwimp.la +- + libwimp_la_SOURCES = \ + msw_rc_style.c \ + msw_rc_style.h \ +@@ -438,95 +372,75 @@ libwimp_la_SOURCES = \ + xp_theme_defs.h \ + xp_theme.h + +- + libwimp_la_LDFLAGS = \ + -avoid-version -module -no-undefined -export-dynamic + +- + libwimp_la_LIBADD = $(LDADDS) -lgdi32 +-subdir = modules/engines/ms-windows +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(engine_LTLIBRARIES) +- +-libwimp_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_libwimp_la_OBJECTS = msw_rc_style.lo msw_style.lo msw_theme_main.lo \ +- xp_theme.lo +-libwimp_la_OBJECTS = $(am_libwimp_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/msw_rc_style.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/msw_style.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/msw_theme_main.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/xp_theme.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libwimp_la_SOURCES) +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(libwimp_la_SOURCES) +- + all: all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/ms-windows/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/engines/ms-windows/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-engineLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-engineLTLIBRARIES: $(engine_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(enginedir) ++ test -z "$(enginedir)" || $(MKDIR_P) "$(DESTDIR)$(enginedir)" + @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(enginedir)/$$f"; \ +- $(LIBTOOL) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(enginedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(enginedir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(enginedir)/$$f"; \ + else :; fi; \ + done + + uninstall-engineLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(enginedir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(enginedir)/$$p"; \ + done + + clean-engineLTLIBRARIES: + -test -z "$(engine_LTLIBRARIES)" || rm -f $(engine_LTLIBRARIES) + @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libwimp.la: $(libwimp_la_OBJECTS) $(libwimp_la_DEPENDENCIES) +- $(LINK) -rpath $(enginedir) $(libwimp_la_LDFLAGS) $(libwimp_la_OBJECTS) $(libwimp_la_LIBADD) $(LIBS) ++ $(libwimp_la_LINK) -rpath $(enginedir) $(libwimp_la_OBJECTS) $(libwimp_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -537,37 +451,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xp_theme.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -575,10 +477,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -586,7 +484,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -598,15 +502,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -627,7 +536,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -638,35 +547,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -674,23 +578,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -702,29 +606,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -735,15 +633,19 @@ distdir: $(DISTFILES) + || 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 \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -754,8 +656,9 @@ check: check-recursive + all-am: Makefile $(LTLIBRARIES) + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(enginedir) +- ++ for dir in "$(DESTDIR)$(enginedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -775,7 +678,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -789,24 +692,34 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: install-engineLTLIBRARIES + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -827,28 +740,27 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-engineLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-engineLTLIBRARIES + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-engineLTLIBRARIES clean-generic \ +- clean-libtool clean-recursive ctags ctags-recursive distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am \ +- dvi-recursive info info-am info-recursive install install-am \ +- install-data install-data-am install-data-recursive \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean \ ++ clean-engineLTLIBRARIES clean-generic clean-libtool ctags \ ++ ctags-recursive distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am \ + install-engineLTLIBRARIES install-exec install-exec-am \ +- install-exec-recursive install-info install-info-am \ +- install-info-recursive install-man install-recursive \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am installdirs-recursive maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ +- ps-recursive tags tags-recursive uninstall uninstall-am \ +- uninstall-engineLTLIBRARIES uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am \ ++ uninstall-engineLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-10-17 06:07:18.000000000 +0200 ++++ gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-11-11 18:56:04.768634352 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,32 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = modules/engines/ms-windows/Theme/gtk-2.0 ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(themedir)" ++themeDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(theme_DATA) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +68,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +100,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +126,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +145,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +155,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +184,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +203,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +214,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +226,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +267,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +276,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,54 +311,62 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + themedir = $(datadir)/themes/MS-Windows/gtk-2.0 + theme_DATA = gtkrc +-subdir = modules/engines/ms-windows/Theme/gtk-2.0 +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +-DATA = $(theme_DATA) +- +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am + all: all-am + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/ms-windows/Theme/gtk-2.0/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/engines/ms-windows/Theme/gtk-2.0/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-themeDATA_INSTALL = $(INSTALL_DATA) + install-themeDATA: $(theme_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(themedir) ++ test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" + @list='$(theme_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \ +- $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \ ++ $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \ + done + + uninstall-themeDATA: + @$(NORMAL_UNINSTALL) + @list='$(theme_DATA)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(themedir)/$$f"; \ +- rm -f $(DESTDIR)$(themedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(themedir)/$$f"; \ + done + tags: TAGS + TAGS: +@@ -461,29 +374,23 @@ TAGS: + ctags: CTAGS + CTAGS: + +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -498,9 +405,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(DATA) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(themedir) ++ for dir in "$(DESTDIR)$(themedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -520,7 +428,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -531,24 +439,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-am + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool ++distclean-am: clean-am distclean-generic + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-themeDATA + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -567,17 +485,21 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-themeDATA ++uninstall-am: uninstall-themeDATA ++ ++.MAKE: install-am install-strip + + .PHONY: all all-am check check-am check-local clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip install-themeDATA \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-info-am uninstall-themeDATA ++ distdir dvi dvi-am html html-am info info-am install \ ++ install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip install-themeDATA installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am uninstall uninstall-am uninstall-themeDATA + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/engines/ms-windows/Theme/Makefile.in 2008-10-17 06:07:18.000000000 +0200 ++++ gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in 2008-11-11 18:56:04.652634693 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,35 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = modules/engines/ms-windows/Theme ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +216,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +278,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,31 +313,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = gtk-2.0 +-subdir = modules/engines/ms-windows/Theme +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/ms-windows/Theme/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/engines/ms-windows/Theme/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo +@@ -438,10 +353,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -449,7 +360,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -490,7 +412,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -501,35 +423,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -565,29 +482,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -598,15 +509,19 @@ distdir: $(DISTFILES) + || 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 \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -617,7 +532,6 @@ check: check-recursive + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +- + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -637,7 +551,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -685,26 +608,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ +- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/engines/pixbuf/Makefile.in 2008-10-17 06:07:18.000000000 +0200 ++++ gtk+-2.14.4/modules/engines/pixbuf/Makefile.in 2008-11-11 18:56:04.912634147 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,58 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ChangeLog ++subdir = modules/engines/pixbuf ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(enginedir)" ++engineLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(engine_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ ++ $(top_builddir)/gdk/$(gdktargetlib) \ ++ $(top_builddir)/gtk/$(gtktargetlib) ++libpixmap_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libpixmap_la_OBJECTS = pixbuf-draw.lo pixbuf-main.lo \ ++ pixbuf-render.lo pixbuf-rc-style.lo ++libpixmap_la_OBJECTS = $(am_libpixmap_la_OBJECTS) ++libpixmap_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libpixmap_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libpixmap_la_SOURCES) ++DIST_SOURCES = $(libpixmap_la_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +94,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +119,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +126,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +152,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +171,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +181,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +210,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +229,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +240,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +252,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +293,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +302,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +337,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ +@@ -416,18 +345,14 @@ INCLUDES = \ + -DGDK_DISABLE_DEPRECATED \ + $(GTK_DEP_CFLAGS) + +- + LDADDS = \ + $(GTK_DEP_LIBS) \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines +- + engine_LTLIBRARIES = libpixmap.la +- + libpixmap_la_SOURCES = \ + pixbuf-draw.c \ + pixbuf-main.c \ +@@ -437,85 +362,73 @@ libpixmap_la_SOURCES = \ + pixbuf-style.h \ + pixbuf.h + +- + libpixmap_la_LDFLAGS = -avoid-version -module $(no_undefined) + libpixmap_la_LIBADD = $(LDADDS) +-subdir = modules/engines/pixbuf +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(engine_LTLIBRARIES) +- +-libpixmap_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_libpixmap_la_OBJECTS = pixbuf-draw.lo pixbuf-main.lo pixbuf-render.lo \ +- pixbuf-rc-style.lo +-libpixmap_la_OBJECTS = $(am_libpixmap_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pixbuf-draw.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-main.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-rc-style.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-render.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libpixmap_la_SOURCES) +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- ChangeLog Makefile.am +-SOURCES = $(libpixmap_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/engines/pixbuf/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/engines/pixbuf/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-engineLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-engineLTLIBRARIES: $(engine_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(enginedir) ++ test -z "$(enginedir)" || $(MKDIR_P) "$(DESTDIR)$(enginedir)" + @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(enginedir)/$$f"; \ +- $(LIBTOOL) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(enginedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(enginedir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(engineLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(enginedir)/$$f"; \ + else :; fi; \ + done + + uninstall-engineLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(enginedir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(enginedir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(enginedir)/$$p"; \ + done + + clean-engineLTLIBRARIES: + -test -z "$(engine_LTLIBRARIES)" || rm -f $(engine_LTLIBRARIES) + @list='$(engine_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libpixmap.la: $(libpixmap_la_OBJECTS) $(libpixmap_la_DEPENDENCIES) +- $(LINK) -rpath $(enginedir) $(libpixmap_la_LDFLAGS) $(libpixmap_la_OBJECTS) $(libpixmap_la_LIBADD) $(LIBS) ++ $(libpixmap_la_LINK) -rpath $(enginedir) $(libpixmap_la_OBJECTS) $(libpixmap_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -526,37 +439,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf-render.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -564,26 +465,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -593,23 +483,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -621,29 +511,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -658,9 +542,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(enginedir) ++ for dir in "$(DESTDIR)$(enginedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -680,7 +565,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -694,24 +579,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-engineLTLIBRARIES + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -732,20 +627,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-engineLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-engineLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-engineLTLIBRARIES clean-generic clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am \ + install-engineLTLIBRARIES install-exec install-exec-am \ +- install-info install-info-am install-man install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-engineLTLIBRARIES \ +- uninstall-info-am ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-engineLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/input/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/input/Makefile.in 2008-10-17 06:07:18.000000000 +0200 ++++ gtk+-2.14.4/modules/input/Makefile.in 2008-11-11 18:56:05.216634586 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,256 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(dist_imconffile_DATA) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/input ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(moduledir)" \ ++ "$(DESTDIR)$(imconffiledir)" ++moduleLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++am__DEPENDENCIES_2 = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) \ ++ $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1) ++im_am_et_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_am_et_la_OBJECTS = imam-et.lo ++im_am_et_la_OBJECTS = $(am_im_am_et_la_OBJECTS) ++im_am_et_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_am_et_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_AM_ET_FALSE@am_im_am_et_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_AM_ET_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_AM_ET_FALSE@ $(moduledir) ++im_cedilla_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_cedilla_la_OBJECTS = imcedilla.lo ++im_cedilla_la_OBJECTS = $(am_im_cedilla_la_OBJECTS) ++im_cedilla_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_cedilla_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CEDILLA_FALSE@am_im_cedilla_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CEDILLA_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CEDILLA_FALSE@ $(moduledir) ++im_cyrillic_translit_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_cyrillic_translit_la_OBJECTS = imcyrillic-translit.lo ++im_cyrillic_translit_la_OBJECTS = \ ++ $(am_im_cyrillic_translit_la_OBJECTS) ++im_cyrillic_translit_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_cyrillic_translit_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@am_im_cyrillic_translit_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ $(moduledir) ++im_ime_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_ime_la_OBJECTS = gtkimcontextime.lo imime.lo ++im_ime_la_OBJECTS = $(am_im_ime_la_OBJECTS) ++im_ime_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_ime_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@am_im_ime_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@ $(moduledir) ++im_inuktitut_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_inuktitut_la_OBJECTS = iminuktitut.lo ++im_inuktitut_la_OBJECTS = $(am_im_inuktitut_la_OBJECTS) ++im_inuktitut_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_inuktitut_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_INUKTITUT_FALSE@am_im_inuktitut_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_INUKTITUT_FALSE@ $(moduledir) ++im_ipa_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_ipa_la_OBJECTS = imipa.lo ++im_ipa_la_OBJECTS = $(am_im_ipa_la_OBJECTS) ++im_ipa_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_ipa_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IPA_FALSE@am_im_ipa_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IPA_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_IPA_FALSE@ $(moduledir) ++im_multipress_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_multipress_la_OBJECTS = \ ++ im_multipress_la-gtkimcontextmultipress.lo \ ++ im_multipress_la-immultipress.lo ++im_multipress_la_OBJECTS = $(am_im_multipress_la_OBJECTS) ++im_multipress_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_multipress_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_MULTIPRESS_FALSE@am_im_multipress_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_MULTIPRESS_FALSE@ $(moduledir) ++im_thai_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_thai_la_OBJECTS = thai-charprop.lo gtkimcontextthai.lo imthai.lo ++im_thai_la_OBJECTS = $(am_im_thai_la_OBJECTS) ++im_thai_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_thai_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_THAI_FALSE@am_im_thai_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_THAI_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_THAI_FALSE@ $(moduledir) ++im_ti_er_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_ti_er_la_OBJECTS = imti-er.lo ++im_ti_er_la_OBJECTS = $(am_im_ti_er_la_OBJECTS) ++im_ti_er_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_ti_er_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ER_FALSE@am_im_ti_er_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ER_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ER_FALSE@ $(moduledir) ++im_ti_et_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_ti_et_la_OBJECTS = imti-et.lo ++im_ti_et_la_OBJECTS = $(am_im_ti_et_la_OBJECTS) ++im_ti_et_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_ti_et_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ET_FALSE@am_im_ti_et_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ET_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_TI_ET_FALSE@ $(moduledir) ++im_viqr_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_viqr_la_OBJECTS = imviqr.lo ++im_viqr_la_OBJECTS = $(am_im_viqr_la_OBJECTS) ++im_viqr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_viqr_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_VIQR_FALSE@am_im_viqr_la_rpath = \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_VIQR_FALSE@ -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@INCLUDE_IM_VIQR_FALSE@ $(moduledir) ++im_xim_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_im_xim_la_OBJECTS = gtkimcontextxim.lo imxim.lo ++im_xim_la_OBJECTS = $(am_im_xim_la_OBJECTS) ++im_xim_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(im_xim_la_LDFLAGS) $(LDFLAGS) -o $@ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@am_im_xim_la_rpath = -rpath \ ++@BUILD_DYNAMIC_MODULES_TRUE@@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@ $(moduledir) ++libstatic_im_am_et_la_LIBADD = ++am__objects_1 = imam-et.lo ++am_libstatic_im_am_et_la_OBJECTS = $(am__objects_1) ++libstatic_im_am_et_la_OBJECTS = $(am_libstatic_im_am_et_la_OBJECTS) ++@INCLUDE_IM_AM_ET_TRUE@am_libstatic_im_am_et_la_rpath = ++libstatic_im_cedilla_la_LIBADD = ++am__objects_2 = imcedilla.lo ++am_libstatic_im_cedilla_la_OBJECTS = $(am__objects_2) ++libstatic_im_cedilla_la_OBJECTS = \ ++ $(am_libstatic_im_cedilla_la_OBJECTS) ++@INCLUDE_IM_CEDILLA_TRUE@am_libstatic_im_cedilla_la_rpath = ++libstatic_im_cyrillic_translit_la_LIBADD = ++am__objects_3 = imcyrillic-translit.lo ++am_libstatic_im_cyrillic_translit_la_OBJECTS = $(am__objects_3) ++libstatic_im_cyrillic_translit_la_OBJECTS = \ ++ $(am_libstatic_im_cyrillic_translit_la_OBJECTS) ++@INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@am_libstatic_im_cyrillic_translit_la_rpath = ++libstatic_im_ime_la_DEPENDENCIES = ++am__objects_4 = gtkimcontextime.lo imime.lo ++am_libstatic_im_ime_la_OBJECTS = $(am__objects_4) ++libstatic_im_ime_la_OBJECTS = $(am_libstatic_im_ime_la_OBJECTS) ++@INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE@am_libstatic_im_ime_la_rpath = ++libstatic_im_inuktitut_la_LIBADD = ++am__objects_5 = iminuktitut.lo ++am_libstatic_im_inuktitut_la_OBJECTS = $(am__objects_5) ++libstatic_im_inuktitut_la_OBJECTS = \ ++ $(am_libstatic_im_inuktitut_la_OBJECTS) ++@INCLUDE_IM_INUKTITUT_TRUE@am_libstatic_im_inuktitut_la_rpath = ++libstatic_im_ipa_la_LIBADD = ++am__objects_6 = imipa.lo ++am_libstatic_im_ipa_la_OBJECTS = $(am__objects_6) ++libstatic_im_ipa_la_OBJECTS = $(am_libstatic_im_ipa_la_OBJECTS) ++@INCLUDE_IM_IPA_TRUE@am_libstatic_im_ipa_la_rpath = ++libstatic_im_multipress_la_LIBADD = ++am__objects_7 = libstatic_im_multipress_la-gtkimcontextmultipress.lo \ ++ libstatic_im_multipress_la-immultipress.lo ++am_libstatic_im_multipress_la_OBJECTS = $(am__objects_7) ++libstatic_im_multipress_la_OBJECTS = \ ++ $(am_libstatic_im_multipress_la_OBJECTS) ++@INCLUDE_IM_MULTIPRESS_TRUE@am_libstatic_im_multipress_la_rpath = ++libstatic_im_thai_la_LIBADD = ++am__objects_8 = thai-charprop.lo gtkimcontextthai.lo imthai.lo ++am_libstatic_im_thai_la_OBJECTS = $(am__objects_8) ++libstatic_im_thai_la_OBJECTS = $(am_libstatic_im_thai_la_OBJECTS) ++@INCLUDE_IM_THAI_TRUE@am_libstatic_im_thai_la_rpath = ++libstatic_im_ti_er_la_LIBADD = ++am__objects_9 = imti-er.lo ++am_libstatic_im_ti_er_la_OBJECTS = $(am__objects_9) ++libstatic_im_ti_er_la_OBJECTS = $(am_libstatic_im_ti_er_la_OBJECTS) ++@INCLUDE_IM_TI_ER_TRUE@am_libstatic_im_ti_er_la_rpath = ++libstatic_im_ti_et_la_LIBADD = ++am__objects_10 = imti-et.lo ++am_libstatic_im_ti_et_la_OBJECTS = $(am__objects_10) ++libstatic_im_ti_et_la_OBJECTS = $(am_libstatic_im_ti_et_la_OBJECTS) ++@INCLUDE_IM_TI_ET_TRUE@am_libstatic_im_ti_et_la_rpath = ++libstatic_im_viqr_la_LIBADD = ++am__objects_11 = imviqr.lo ++am_libstatic_im_viqr_la_OBJECTS = $(am__objects_11) ++libstatic_im_viqr_la_OBJECTS = $(am_libstatic_im_viqr_la_OBJECTS) ++@INCLUDE_IM_VIQR_TRUE@am_libstatic_im_viqr_la_rpath = ++libstatic_im_xim_la_LIBADD = ++am__objects_12 = gtkimcontextxim.lo imxim.lo ++am_libstatic_im_xim_la_OBJECTS = $(am__objects_12) ++libstatic_im_xim_la_OBJECTS = $(am_libstatic_im_xim_la_OBJECTS) ++@HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE@am_libstatic_im_xim_la_rpath = ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) \ ++ $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) \ ++ $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) \ ++ $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) \ ++ $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) \ ++ $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) \ ++ $(libstatic_im_am_et_la_SOURCES) \ ++ $(libstatic_im_cedilla_la_SOURCES) \ ++ $(libstatic_im_cyrillic_translit_la_SOURCES) \ ++ $(libstatic_im_ime_la_SOURCES) \ ++ $(libstatic_im_inuktitut_la_SOURCES) \ ++ $(libstatic_im_ipa_la_SOURCES) \ ++ $(libstatic_im_multipress_la_SOURCES) \ ++ $(libstatic_im_thai_la_SOURCES) \ ++ $(libstatic_im_ti_er_la_SOURCES) \ ++ $(libstatic_im_ti_et_la_SOURCES) \ ++ $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) ++DIST_SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) \ ++ $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) \ ++ $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) \ ++ $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) \ ++ $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) \ ++ $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) \ ++ $(libstatic_im_am_et_la_SOURCES) \ ++ $(libstatic_im_cedilla_la_SOURCES) \ ++ $(libstatic_im_cyrillic_translit_la_SOURCES) \ ++ $(libstatic_im_ime_la_SOURCES) \ ++ $(libstatic_im_inuktitut_la_SOURCES) \ ++ $(libstatic_im_ipa_la_SOURCES) \ ++ $(libstatic_im_multipress_la_SOURCES) \ ++ $(libstatic_im_thai_la_SOURCES) \ ++ $(libstatic_im_ti_er_la_SOURCES) \ ++ $(libstatic_im_ti_et_la_SOURCES) \ ++ $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) ++dist_imconffileDATA_INSTALL = $(INSTALL_DATA) ++DATA = $(dist_imconffile_DATA) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +293,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +318,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +325,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ + EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +351,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X + GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ + GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ + GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ ++GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@ + GDK_WLIBS = @GDK_WLIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -138,8 +370,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +380,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +409,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +428,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +439,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +451,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +492,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +501,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +536,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ +@@ -420,22 +548,18 @@ INCLUDES = \ + $(GTK_DEP_CFLAGS) \ + $(INCLUDED_IMMODULE_DEFINE) + +- + DEPS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + LDADDS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) \ + $(GTK_DEP_LIBS) + +- + moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules +- + im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_xim_la_SOURCES = \ + gtkimcontextxim.c \ +@@ -446,42 +570,36 @@ libstatic_im_xim_la_SOURCES = $(im_xim_l + im_xim_la_LIBADD = $(LDADDS) + @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE@STATIC_XIM_MODULE = libstatic-im-xim.la + @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@XIM_MODULE = im-xim.la +- + im_am_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_am_et_la_SOURCES = imam-et.c + libstatic_im_am_et_la_SOURCES = $(im_am_et_la_SOURCES) + im_am_et_la_LIBADD = $(LDADDS) + @INCLUDE_IM_AM_ET_TRUE@STATIC_AM_ET_MODULE = libstatic-im-am-et.la + @INCLUDE_IM_AM_ET_FALSE@AM_ET_MODULE = im-am-et.la +- + im_cedilla_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_cedilla_la_SOURCES = imcedilla.c + libstatic_im_cedilla_la_SOURCES = $(im_cedilla_la_SOURCES) + im_cedilla_la_LIBADD = $(LDADDS) + @INCLUDE_IM_CEDILLA_TRUE@STATIC_CEDILLA_MODULE = libstatic-im-cedilla.la + @INCLUDE_IM_CEDILLA_FALSE@CEDILLA_MODULE = im-cedilla.la +- + im_cyrillic_translit_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_cyrillic_translit_la_SOURCES = imcyrillic-translit.c + libstatic_im_cyrillic_translit_la_SOURCES = $(im_cyrillic_translit_la_SOURCES) + im_cyrillic_translit_la_LIBADD = $(LDADDS) + @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@STATIC_CYRILLIC_TRANSLIT_MODULE = libstatic-im-cyrillic-translit.la + @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@CYRILLIC_TRANSLIT_MODULE = im-cyrillic-translit.la +- + im_ti_er_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_ti_er_la_SOURCES = imti-er.c + libstatic_im_ti_er_la_SOURCES = $(im_ti_er_la_SOURCES) + im_ti_er_la_LIBADD = $(LDADDS) + @INCLUDE_IM_TI_ER_TRUE@STATIC_TI_ER_MODULE = libstatic-im-ti-er.la + @INCLUDE_IM_TI_ER_FALSE@TI_ER_MODULE = im-ti-er.la +- + im_ti_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_ti_et_la_SOURCES = imti-et.c + libstatic_im_ti_et_la_SOURCES = $(im_ti_et_la_SOURCES) + im_ti_et_la_LIBADD = $(LDADDS) + @INCLUDE_IM_TI_ET_TRUE@STATIC_TI_ET_MODULE = libstatic-im-ti-et.la + @INCLUDE_IM_TI_ET_FALSE@TI_ET_MODULE = im-ti-et.la +- + im_thai_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_thai_la_SOURCES = \ + thai-charprop.c \ +@@ -494,28 +612,24 @@ libstatic_im_thai_la_SOURCES = $(im_thai + im_thai_la_LIBADD = $(LDADDS) + @INCLUDE_IM_THAI_TRUE@STATIC_THAI_MODULE = libstatic-im-thai.la + @INCLUDE_IM_THAI_FALSE@THAI_MODULE = im-thai.la +- + im_viqr_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_viqr_la_SOURCES = imviqr.c + libstatic_im_viqr_la_SOURCES = $(im_viqr_la_SOURCES) + im_viqr_la_LIBADD = $(LDADDS) + @INCLUDE_IM_VIQR_TRUE@STATIC_VIQR_MODULE = libstatic-im-viqr.la + @INCLUDE_IM_VIQR_FALSE@VIQR_MODULE = im-viqr.la +- + im_inuktitut_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_inuktitut_la_SOURCES = iminuktitut.c + libstatic_im_inuktitut_la_SOURCES = $(im_inuktitut_la_SOURCES) + im_inuktitut_la_LIBADD = $(LDADDS) + @INCLUDE_IM_INUKTITUT_TRUE@STATIC_INUKTITUT_MODULE = libstatic-im-inuktitut.la + @INCLUDE_IM_INUKTITUT_FALSE@INUKTITUT_MODULE = im-inuktitut.la +- + im_ipa_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_ipa_la_SOURCES = imipa.c + libstatic_im_ipa_la_SOURCES = $(im_ipa_la_SOURCES) + im_ipa_la_LIBADD = $(LDADDS) + @INCLUDE_IM_IPA_TRUE@STATIC_IPA_MODULE = libstatic-im-ipa.la + @INCLUDE_IM_IPA_FALSE@IPA_MODULE = im-ipa.la +- + im_ime_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) + im_ime_la_SOURCES = \ + gtkimcontextime.c \ +@@ -528,7 +642,6 @@ im_ime_la_LIBADD = -limm32 $(LDADDS) + libstatic_im_ime_la_LIBADD = -limm32 + @INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE@STATIC_IME_MODULE = libstatic-im-ime.la + @INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@IME_MODULE = im-ime.la +- + multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\" + im_multipress_la_CPPFLAGS = $(multipress_defs) + libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS) +@@ -542,13 +655,11 @@ libstatic_im_multipress_la_SOURCES = $(i + im_multipress_la_LIBADD = $(LDADDS) + @INCLUDE_IM_MULTIPRESS_TRUE@STATIC_MULTIPRESS_MODULE = libstatic-im-multipress.la + @INCLUDE_IM_MULTIPRESS_FALSE@MULTIPRESS_MODULE = im-multipress.la +- 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_FALSE@@ENABLE_STATIC_TRUE@RUN_QUERY_IMMODULES_TEST = false @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 - +- @BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \ @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \ -@@ -1351,7 +1355,18 @@ + @BUILD_DYNAMIC_MODULES_TRUE@ $(CEDILLA_MODULE) \ +@@ -563,7 +674,6 @@ dist_imconffile_DATA = im-multipress.con + @BUILD_DYNAMIC_MODULES_TRUE@ $(VIQR_MODULE) \ + @BUILD_DYNAMIC_MODULES_TRUE@ $(XIM_MODULE) + +- + noinst_LTLIBRARIES = \ + $(STATIC_AM_ET_MODULE) \ + $(STATIC_CEDILLA_MODULE) \ +@@ -578,234 +688,64 @@ noinst_LTLIBRARIES = \ + $(STATIC_VIQR_MODULE) \ + $(STATIC_XIM_MODULE) + +- + CLEANFILES = gtk.immodules +-subdir = modules/input +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) +- +-im_am_et_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_am_et_la_OBJECTS = imam-et.lo +-im_am_et_la_OBJECTS = $(am_im_am_et_la_OBJECTS) +-im_cedilla_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_cedilla_la_OBJECTS = imcedilla.lo +-im_cedilla_la_OBJECTS = $(am_im_cedilla_la_OBJECTS) +-im_cyrillic_translit_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_cyrillic_translit_la_OBJECTS = imcyrillic-translit.lo +-im_cyrillic_translit_la_OBJECTS = $(am_im_cyrillic_translit_la_OBJECTS) +-im_ime_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_ime_la_OBJECTS = gtkimcontextime.lo imime.lo +-im_ime_la_OBJECTS = $(am_im_ime_la_OBJECTS) +-im_inuktitut_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_inuktitut_la_OBJECTS = iminuktitut.lo +-im_inuktitut_la_OBJECTS = $(am_im_inuktitut_la_OBJECTS) +-im_ipa_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_ipa_la_OBJECTS = imipa.lo +-im_ipa_la_OBJECTS = $(am_im_ipa_la_OBJECTS) +-im_multipress_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_multipress_la_OBJECTS = im_multipress_la-gtkimcontextmultipress.lo \ +- im_multipress_la-immultipress.lo +-im_multipress_la_OBJECTS = $(am_im_multipress_la_OBJECTS) +-im_thai_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_thai_la_OBJECTS = thai-charprop.lo gtkimcontextthai.lo imthai.lo +-im_thai_la_OBJECTS = $(am_im_thai_la_OBJECTS) +-im_ti_er_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_ti_er_la_OBJECTS = imti-er.lo +-im_ti_er_la_OBJECTS = $(am_im_ti_er_la_OBJECTS) +-im_ti_et_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_ti_et_la_OBJECTS = imti-et.lo +-im_ti_et_la_OBJECTS = $(am_im_ti_et_la_OBJECTS) +-im_viqr_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_viqr_la_OBJECTS = imviqr.lo +-im_viqr_la_OBJECTS = $(am_im_viqr_la_OBJECTS) +-im_xim_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_im_xim_la_OBJECTS = gtkimcontextxim.lo imxim.lo +-im_xim_la_OBJECTS = $(am_im_xim_la_OBJECTS) +-libstatic_im_am_et_la_LDFLAGS = +-libstatic_im_am_et_la_LIBADD = +-am__objects_1 = imam-et.lo +-am_libstatic_im_am_et_la_OBJECTS = $(am__objects_1) +-libstatic_im_am_et_la_OBJECTS = $(am_libstatic_im_am_et_la_OBJECTS) +-libstatic_im_cedilla_la_LDFLAGS = +-libstatic_im_cedilla_la_LIBADD = +-am__objects_2 = imcedilla.lo +-am_libstatic_im_cedilla_la_OBJECTS = $(am__objects_2) +-libstatic_im_cedilla_la_OBJECTS = $(am_libstatic_im_cedilla_la_OBJECTS) +-libstatic_im_cyrillic_translit_la_LDFLAGS = +-libstatic_im_cyrillic_translit_la_LIBADD = +-am__objects_3 = imcyrillic-translit.lo +-am_libstatic_im_cyrillic_translit_la_OBJECTS = $(am__objects_3) +-libstatic_im_cyrillic_translit_la_OBJECTS = \ +- $(am_libstatic_im_cyrillic_translit_la_OBJECTS) +-libstatic_im_ime_la_LDFLAGS = +-libstatic_im_ime_la_DEPENDENCIES = +-am__objects_4 = gtkimcontextime.lo imime.lo +-am_libstatic_im_ime_la_OBJECTS = $(am__objects_4) +-libstatic_im_ime_la_OBJECTS = $(am_libstatic_im_ime_la_OBJECTS) +-libstatic_im_inuktitut_la_LDFLAGS = +-libstatic_im_inuktitut_la_LIBADD = +-am__objects_5 = iminuktitut.lo +-am_libstatic_im_inuktitut_la_OBJECTS = $(am__objects_5) +-libstatic_im_inuktitut_la_OBJECTS = \ +- $(am_libstatic_im_inuktitut_la_OBJECTS) +-libstatic_im_ipa_la_LDFLAGS = +-libstatic_im_ipa_la_LIBADD = +-am__objects_6 = imipa.lo +-am_libstatic_im_ipa_la_OBJECTS = $(am__objects_6) +-libstatic_im_ipa_la_OBJECTS = $(am_libstatic_im_ipa_la_OBJECTS) +-libstatic_im_multipress_la_LDFLAGS = +-libstatic_im_multipress_la_LIBADD = +-am__objects_7 = libstatic_im_multipress_la-gtkimcontextmultipress.lo \ +- libstatic_im_multipress_la-immultipress.lo +-am_libstatic_im_multipress_la_OBJECTS = $(am__objects_7) +-libstatic_im_multipress_la_OBJECTS = \ +- $(am_libstatic_im_multipress_la_OBJECTS) +-libstatic_im_thai_la_LDFLAGS = +-libstatic_im_thai_la_LIBADD = +-am__objects_8 = thai-charprop.lo gtkimcontextthai.lo imthai.lo +-am_libstatic_im_thai_la_OBJECTS = $(am__objects_8) +-libstatic_im_thai_la_OBJECTS = $(am_libstatic_im_thai_la_OBJECTS) +-libstatic_im_ti_er_la_LDFLAGS = +-libstatic_im_ti_er_la_LIBADD = +-am__objects_9 = imti-er.lo +-am_libstatic_im_ti_er_la_OBJECTS = $(am__objects_9) +-libstatic_im_ti_er_la_OBJECTS = $(am_libstatic_im_ti_er_la_OBJECTS) +-libstatic_im_ti_et_la_LDFLAGS = +-libstatic_im_ti_et_la_LIBADD = +-am__objects_10 = imti-et.lo +-am_libstatic_im_ti_et_la_OBJECTS = $(am__objects_10) +-libstatic_im_ti_et_la_OBJECTS = $(am_libstatic_im_ti_et_la_OBJECTS) +-libstatic_im_viqr_la_LDFLAGS = +-libstatic_im_viqr_la_LIBADD = +-am__objects_11 = imviqr.lo +-am_libstatic_im_viqr_la_OBJECTS = $(am__objects_11) +-libstatic_im_viqr_la_OBJECTS = $(am_libstatic_im_viqr_la_OBJECTS) +-libstatic_im_xim_la_LDFLAGS = +-libstatic_im_xim_la_LIBADD = +-am__objects_12 = gtkimcontextxim.lo imxim.lo +-am_libstatic_im_xim_la_OBJECTS = $(am__objects_12) +-libstatic_im_xim_la_OBJECTS = $(am_libstatic_im_xim_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkimcontextime.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkimcontextthai.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkimcontextxim.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/im_multipress_la-immultipress.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/imam-et.Plo ./$(DEPDIR)/imcedilla.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/imcyrillic-translit.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/imime.Plo ./$(DEPDIR)/iminuktitut.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/imipa.Plo ./$(DEPDIR)/imthai.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/imti-er.Plo ./$(DEPDIR)/imti-et.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/imviqr.Plo ./$(DEPDIR)/imxim.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/thai-charprop.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) \ +- $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) \ +- $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) \ +- $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) \ +- $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) \ +- $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) \ +- $(libstatic_im_am_et_la_SOURCES) \ +- $(libstatic_im_cedilla_la_SOURCES) \ +- $(libstatic_im_cyrillic_translit_la_SOURCES) \ +- $(libstatic_im_ime_la_SOURCES) \ +- $(libstatic_im_inuktitut_la_SOURCES) \ +- $(libstatic_im_ipa_la_SOURCES) \ +- $(libstatic_im_multipress_la_SOURCES) \ +- $(libstatic_im_thai_la_SOURCES) \ +- $(libstatic_im_ti_er_la_SOURCES) \ +- $(libstatic_im_ti_et_la_SOURCES) \ +- $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) +-DATA = $(dist_imconffile_DATA) +- +-DIST_COMMON = $(dist_imconffile_DATA) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-SOURCES = $(im_am_et_la_SOURCES) $(im_cedilla_la_SOURCES) $(im_cyrillic_translit_la_SOURCES) $(im_ime_la_SOURCES) $(im_inuktitut_la_SOURCES) $(im_ipa_la_SOURCES) $(im_multipress_la_SOURCES) $(im_thai_la_SOURCES) $(im_ti_er_la_SOURCES) $(im_ti_et_la_SOURCES) $(im_viqr_la_SOURCES) $(im_xim_la_SOURCES) $(libstatic_im_am_et_la_SOURCES) $(libstatic_im_cedilla_la_SOURCES) $(libstatic_im_cyrillic_translit_la_SOURCES) $(libstatic_im_ime_la_SOURCES) $(libstatic_im_inuktitut_la_SOURCES) $(libstatic_im_ipa_la_SOURCES) $(libstatic_im_multipress_la_SOURCES) $(libstatic_im_thai_la_SOURCES) $(libstatic_im_ti_er_la_SOURCES) $(libstatic_im_ti_et_la_SOURCES) $(libstatic_im_viqr_la_SOURCES) $(libstatic_im_xim_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/input/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/input/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-moduleLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-moduleLTLIBRARIES: $(module_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(moduledir) ++ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f"; \ +- $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + else :; fi; \ + done + + uninstall-moduleLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + done + + clean-moduleLTLIBRARIES: + -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES) + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +@@ -814,61 +754,61 @@ clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + im-am-et.la: $(im_am_et_la_OBJECTS) $(im_am_et_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_am_et_la_LDFLAGS) $(im_am_et_la_OBJECTS) $(im_am_et_la_LIBADD) $(LIBS) ++ $(im_am_et_la_LINK) $(am_im_am_et_la_rpath) $(im_am_et_la_OBJECTS) $(im_am_et_la_LIBADD) $(LIBS) + im-cedilla.la: $(im_cedilla_la_OBJECTS) $(im_cedilla_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_cedilla_la_LDFLAGS) $(im_cedilla_la_OBJECTS) $(im_cedilla_la_LIBADD) $(LIBS) ++ $(im_cedilla_la_LINK) $(am_im_cedilla_la_rpath) $(im_cedilla_la_OBJECTS) $(im_cedilla_la_LIBADD) $(LIBS) + im-cyrillic-translit.la: $(im_cyrillic_translit_la_OBJECTS) $(im_cyrillic_translit_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_cyrillic_translit_la_LDFLAGS) $(im_cyrillic_translit_la_OBJECTS) $(im_cyrillic_translit_la_LIBADD) $(LIBS) ++ $(im_cyrillic_translit_la_LINK) $(am_im_cyrillic_translit_la_rpath) $(im_cyrillic_translit_la_OBJECTS) $(im_cyrillic_translit_la_LIBADD) $(LIBS) + im-ime.la: $(im_ime_la_OBJECTS) $(im_ime_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_ime_la_LDFLAGS) $(im_ime_la_OBJECTS) $(im_ime_la_LIBADD) $(LIBS) ++ $(im_ime_la_LINK) $(am_im_ime_la_rpath) $(im_ime_la_OBJECTS) $(im_ime_la_LIBADD) $(LIBS) + im-inuktitut.la: $(im_inuktitut_la_OBJECTS) $(im_inuktitut_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_inuktitut_la_LDFLAGS) $(im_inuktitut_la_OBJECTS) $(im_inuktitut_la_LIBADD) $(LIBS) ++ $(im_inuktitut_la_LINK) $(am_im_inuktitut_la_rpath) $(im_inuktitut_la_OBJECTS) $(im_inuktitut_la_LIBADD) $(LIBS) + im-ipa.la: $(im_ipa_la_OBJECTS) $(im_ipa_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_ipa_la_LDFLAGS) $(im_ipa_la_OBJECTS) $(im_ipa_la_LIBADD) $(LIBS) ++ $(im_ipa_la_LINK) $(am_im_ipa_la_rpath) $(im_ipa_la_OBJECTS) $(im_ipa_la_LIBADD) $(LIBS) + im-multipress.la: $(im_multipress_la_OBJECTS) $(im_multipress_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_multipress_la_LDFLAGS) $(im_multipress_la_OBJECTS) $(im_multipress_la_LIBADD) $(LIBS) ++ $(im_multipress_la_LINK) $(am_im_multipress_la_rpath) $(im_multipress_la_OBJECTS) $(im_multipress_la_LIBADD) $(LIBS) + im-thai.la: $(im_thai_la_OBJECTS) $(im_thai_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_thai_la_LDFLAGS) $(im_thai_la_OBJECTS) $(im_thai_la_LIBADD) $(LIBS) ++ $(im_thai_la_LINK) $(am_im_thai_la_rpath) $(im_thai_la_OBJECTS) $(im_thai_la_LIBADD) $(LIBS) + im-ti-er.la: $(im_ti_er_la_OBJECTS) $(im_ti_er_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_ti_er_la_LDFLAGS) $(im_ti_er_la_OBJECTS) $(im_ti_er_la_LIBADD) $(LIBS) ++ $(im_ti_er_la_LINK) $(am_im_ti_er_la_rpath) $(im_ti_er_la_OBJECTS) $(im_ti_er_la_LIBADD) $(LIBS) + im-ti-et.la: $(im_ti_et_la_OBJECTS) $(im_ti_et_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_ti_et_la_LDFLAGS) $(im_ti_et_la_OBJECTS) $(im_ti_et_la_LIBADD) $(LIBS) ++ $(im_ti_et_la_LINK) $(am_im_ti_et_la_rpath) $(im_ti_et_la_OBJECTS) $(im_ti_et_la_LIBADD) $(LIBS) + im-viqr.la: $(im_viqr_la_OBJECTS) $(im_viqr_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_viqr_la_LDFLAGS) $(im_viqr_la_OBJECTS) $(im_viqr_la_LIBADD) $(LIBS) ++ $(im_viqr_la_LINK) $(am_im_viqr_la_rpath) $(im_viqr_la_OBJECTS) $(im_viqr_la_LIBADD) $(LIBS) + im-xim.la: $(im_xim_la_OBJECTS) $(im_xim_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(im_xim_la_LDFLAGS) $(im_xim_la_OBJECTS) $(im_xim_la_LIBADD) $(LIBS) ++ $(im_xim_la_LINK) $(am_im_xim_la_rpath) $(im_xim_la_OBJECTS) $(im_xim_la_LIBADD) $(LIBS) + libstatic-im-am-et.la: $(libstatic_im_am_et_la_OBJECTS) $(libstatic_im_am_et_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_am_et_la_LDFLAGS) $(libstatic_im_am_et_la_OBJECTS) $(libstatic_im_am_et_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_am_et_la_rpath) $(libstatic_im_am_et_la_OBJECTS) $(libstatic_im_am_et_la_LIBADD) $(LIBS) + libstatic-im-cedilla.la: $(libstatic_im_cedilla_la_OBJECTS) $(libstatic_im_cedilla_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_cedilla_la_LDFLAGS) $(libstatic_im_cedilla_la_OBJECTS) $(libstatic_im_cedilla_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_cedilla_la_rpath) $(libstatic_im_cedilla_la_OBJECTS) $(libstatic_im_cedilla_la_LIBADD) $(LIBS) + libstatic-im-cyrillic-translit.la: $(libstatic_im_cyrillic_translit_la_OBJECTS) $(libstatic_im_cyrillic_translit_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_cyrillic_translit_la_LDFLAGS) $(libstatic_im_cyrillic_translit_la_OBJECTS) $(libstatic_im_cyrillic_translit_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_cyrillic_translit_la_rpath) $(libstatic_im_cyrillic_translit_la_OBJECTS) $(libstatic_im_cyrillic_translit_la_LIBADD) $(LIBS) + libstatic-im-ime.la: $(libstatic_im_ime_la_OBJECTS) $(libstatic_im_ime_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_ime_la_LDFLAGS) $(libstatic_im_ime_la_OBJECTS) $(libstatic_im_ime_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_ime_la_rpath) $(libstatic_im_ime_la_OBJECTS) $(libstatic_im_ime_la_LIBADD) $(LIBS) + libstatic-im-inuktitut.la: $(libstatic_im_inuktitut_la_OBJECTS) $(libstatic_im_inuktitut_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_inuktitut_la_LDFLAGS) $(libstatic_im_inuktitut_la_OBJECTS) $(libstatic_im_inuktitut_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_inuktitut_la_rpath) $(libstatic_im_inuktitut_la_OBJECTS) $(libstatic_im_inuktitut_la_LIBADD) $(LIBS) + libstatic-im-ipa.la: $(libstatic_im_ipa_la_OBJECTS) $(libstatic_im_ipa_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_ipa_la_LDFLAGS) $(libstatic_im_ipa_la_OBJECTS) $(libstatic_im_ipa_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_ipa_la_rpath) $(libstatic_im_ipa_la_OBJECTS) $(libstatic_im_ipa_la_LIBADD) $(LIBS) + libstatic-im-multipress.la: $(libstatic_im_multipress_la_OBJECTS) $(libstatic_im_multipress_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_multipress_la_LDFLAGS) $(libstatic_im_multipress_la_OBJECTS) $(libstatic_im_multipress_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_multipress_la_rpath) $(libstatic_im_multipress_la_OBJECTS) $(libstatic_im_multipress_la_LIBADD) $(LIBS) + libstatic-im-thai.la: $(libstatic_im_thai_la_OBJECTS) $(libstatic_im_thai_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_thai_la_LDFLAGS) $(libstatic_im_thai_la_OBJECTS) $(libstatic_im_thai_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_thai_la_rpath) $(libstatic_im_thai_la_OBJECTS) $(libstatic_im_thai_la_LIBADD) $(LIBS) + libstatic-im-ti-er.la: $(libstatic_im_ti_er_la_OBJECTS) $(libstatic_im_ti_er_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_ti_er_la_LDFLAGS) $(libstatic_im_ti_er_la_OBJECTS) $(libstatic_im_ti_er_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_ti_er_la_rpath) $(libstatic_im_ti_er_la_OBJECTS) $(libstatic_im_ti_er_la_LIBADD) $(LIBS) + libstatic-im-ti-et.la: $(libstatic_im_ti_et_la_OBJECTS) $(libstatic_im_ti_et_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_ti_et_la_LDFLAGS) $(libstatic_im_ti_et_la_OBJECTS) $(libstatic_im_ti_et_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_ti_et_la_rpath) $(libstatic_im_ti_et_la_OBJECTS) $(libstatic_im_ti_et_la_LIBADD) $(LIBS) + libstatic-im-viqr.la: $(libstatic_im_viqr_la_OBJECTS) $(libstatic_im_viqr_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_viqr_la_LDFLAGS) $(libstatic_im_viqr_la_OBJECTS) $(libstatic_im_viqr_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_viqr_la_rpath) $(libstatic_im_viqr_la_OBJECTS) $(libstatic_im_viqr_la_LIBADD) $(LIBS) + libstatic-im-xim.la: $(libstatic_im_xim_la_OBJECTS) $(libstatic_im_xim_la_DEPENDENCIES) +- $(LINK) $(libstatic_im_xim_la_LDFLAGS) $(libstatic_im_xim_la_OBJECTS) $(libstatic_im_xim_la_LIBADD) $(LIBS) ++ $(LINK) $(am_libstatic_im_xim_la_rpath) $(libstatic_im_xim_la_OBJECTS) $(libstatic_im_xim_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -894,214 +834,86 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thai-charprop.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +- +-im_multipress_la-gtkimcontextmultipress.o: gtkimcontextmultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-gtkimcontextmultipress.o -MD -MP -MF "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o im_multipress_la-gtkimcontextmultipress.o `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='im_multipress_la-gtkimcontextmultipress.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Po' tmpdepfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-gtkimcontextmultipress.o `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c +- +-im_multipress_la-gtkimcontextmultipress.obj: gtkimcontextmultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-gtkimcontextmultipress.obj -MD -MP -MF "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o im_multipress_la-gtkimcontextmultipress.obj `if test -f 'gtkimcontextmultipress.c'; then $(CYGPATH_W) 'gtkimcontextmultipress.c'; else $(CYGPATH_W) '$(srcdir)/gtkimcontextmultipress.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='im_multipress_la-gtkimcontextmultipress.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Po' tmpdepfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-gtkimcontextmultipress.obj `if test -f 'gtkimcontextmultipress.c'; then $(CYGPATH_W) 'gtkimcontextmultipress.c'; else $(CYGPATH_W) '$(srcdir)/gtkimcontextmultipress.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + im_multipress_la-gtkimcontextmultipress.lo: gtkimcontextmultipress.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-gtkimcontextmultipress.lo -MD -MP -MF "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-gtkimcontextmultipress.lo -MD -MP -MF $(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo -c -o im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Tpo $(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='im_multipress_la-gtkimcontextmultipress.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.Plo' tmpdepfile='$(DEPDIR)/im_multipress_la-gtkimcontextmultipress.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c +- +-im_multipress_la-immultipress.o: immultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-immultipress.o -MD -MP -MF "$(DEPDIR)/im_multipress_la-immultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o im_multipress_la-immultipress.o `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo" "$(DEPDIR)/im_multipress_la-immultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='im_multipress_la-immultipress.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-immultipress.Po' tmpdepfile='$(DEPDIR)/im_multipress_la-immultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-immultipress.o `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c +- +-im_multipress_la-immultipress.obj: immultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-immultipress.obj -MD -MP -MF "$(DEPDIR)/im_multipress_la-immultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o im_multipress_la-immultipress.obj `if test -f 'immultipress.c'; then $(CYGPATH_W) 'immultipress.c'; else $(CYGPATH_W) '$(srcdir)/immultipress.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo" "$(DEPDIR)/im_multipress_la-immultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='im_multipress_la-immultipress.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-immultipress.Po' tmpdepfile='$(DEPDIR)/im_multipress_la-immultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-immultipress.obj `if test -f 'immultipress.c'; then $(CYGPATH_W) 'immultipress.c'; else $(CYGPATH_W) '$(srcdir)/immultipress.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c + + im_multipress_la-immultipress.lo: immultipress.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-immultipress.lo -MD -MP -MF "$(DEPDIR)/im_multipress_la-immultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo" "$(DEPDIR)/im_multipress_la-immultipress.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/im_multipress_la-immultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT im_multipress_la-immultipress.lo -MD -MP -MF $(DEPDIR)/im_multipress_la-immultipress.Tpo -c -o im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/im_multipress_la-immultipress.Tpo $(DEPDIR)/im_multipress_la-immultipress.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='im_multipress_la-immultipress.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/im_multipress_la-immultipress.Plo' tmpdepfile='$(DEPDIR)/im_multipress_la-immultipress.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c +- +-libstatic_im_multipress_la-gtkimcontextmultipress.o: gtkimcontextmultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.o -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-gtkimcontextmultipress.o `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='libstatic_im_multipress_la-gtkimcontextmultipress.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.o `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c +- +-libstatic_im_multipress_la-gtkimcontextmultipress.obj: gtkimcontextmultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.obj -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-gtkimcontextmultipress.obj `if test -f 'gtkimcontextmultipress.c'; then $(CYGPATH_W) 'gtkimcontextmultipress.c'; else $(CYGPATH_W) '$(srcdir)/gtkimcontextmultipress.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='libstatic_im_multipress_la-gtkimcontextmultipress.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.obj `if test -f 'gtkimcontextmultipress.c'; then $(CYGPATH_W) 'gtkimcontextmultipress.c'; else $(CYGPATH_W) '$(srcdir)/gtkimcontextmultipress.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c + + libstatic_im_multipress_la-gtkimcontextmultipress.lo: gtkimcontextmultipress.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.lo -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-gtkimcontextmultipress.lo -MD -MP -MF $(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Tpo $(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkimcontextmultipress.c' object='libstatic_im_multipress_la-gtkimcontextmultipress.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.Plo' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-gtkimcontextmultipress.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c +- +-libstatic_im_multipress_la-immultipress.o: immultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.o -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-immultipress.o `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='libstatic_im_multipress_la-immultipress.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.o `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c +- +-libstatic_im_multipress_la-immultipress.obj: immultipress.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.obj -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-immultipress.obj `if test -f 'immultipress.c'; then $(CYGPATH_W) 'immultipress.c'; else $(CYGPATH_W) '$(srcdir)/immultipress.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='libstatic_im_multipress_la-immultipress.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.Po' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.obj `if test -f 'immultipress.c'; then $(CYGPATH_W) 'immultipress.c'; else $(CYGPATH_W) '$(srcdir)/immultipress.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-gtkimcontextmultipress.lo `test -f 'gtkimcontextmultipress.c' || echo '$(srcdir)/'`gtkimcontextmultipress.c + + libstatic_im_multipress_la-immultipress.lo: immultipress.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.lo -MD -MP -MF "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo" "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatic_im_multipress_la-immultipress.lo -MD -MP -MF $(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libstatic_im_multipress_la-immultipress.Tpo $(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='immultipress.c' object='libstatic_im_multipress_la-immultipress.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.Plo' tmpdepfile='$(DEPDIR)/libstatic_im_multipress_la-immultipress.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libstatic_im_multipress_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatic_im_multipress_la-immultipress.lo `test -f 'immultipress.c' || echo '$(srcdir)/'`immultipress.c + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-dist_imconffileDATA_INSTALL = $(INSTALL_DATA) + install-dist_imconffileDATA: $(dist_imconffile_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(imconffiledir) ++ test -z "$(imconffiledir)" || $(MKDIR_P) "$(DESTDIR)$(imconffiledir)" + @list='$(dist_imconffile_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(dist_imconffileDATA_INSTALL) $$d$$p $(DESTDIR)$(imconffiledir)/$$f"; \ +- $(dist_imconffileDATA_INSTALL) $$d$$p $(DESTDIR)$(imconffiledir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(dist_imconffileDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imconffiledir)/$$f'"; \ ++ $(dist_imconffileDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imconffiledir)/$$f"; \ + done + + uninstall-dist_imconffileDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_imconffile_DATA)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(imconffiledir)/$$f"; \ +- rm -f $(DESTDIR)$(imconffiledir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(imconffiledir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(imconffiledir)/$$f"; \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -1111,23 +923,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -1139,29 +951,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -1175,10 +981,12 @@ distdir: $(DISTFILES) + check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am ++@CROSS_COMPILING_TRUE@all-local: + all-am: Makefile $(LTLIBRARIES) $(DATA) all-local +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(moduledir) $(DESTDIR)$(imconffiledir) ++ for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(imconffiledir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -1199,7 +1007,7 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -1213,12 +1021,14 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: +@@ -1227,12 +1037,20 @@ install-data-am: install-dist_imconffile + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -1253,22 +1071,27 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-dist_imconffileDATA uninstall-info-am \ +- uninstall-local uninstall-moduleLTLIBRARIES ++uninstall-am: uninstall-dist_imconffileDATA uninstall-local \ ++ uninstall-moduleLTLIBRARIES ++ ++.MAKE: install-am install-data-am install-strip + + .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \ + clean clean-generic clean-libtool clean-moduleLTLIBRARIES \ + clean-noinstLTLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-dist_imconffileDATA install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-moduleLTLIBRARIES install-strip installcheck \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-hook \ ++ install-dist_imconffileDATA install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man \ ++ install-moduleLTLIBRARIES install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-dist_imconffileDATA \ +- uninstall-info-am uninstall-local uninstall-moduleLTLIBRARIES ++ uninstall-local uninstall-moduleLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +@@ -1351,7 +1174,18 @@ uninstall-local: included-modules: $(noinst_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES) @@ -62194,19 +100105,124 @@ diff -urN gtk+2.0-2.14.4.old/modules/input/Makefile.in gtk+2.0-2.14.4/modules/in @CROSS_COMPILING_FALSE@all-local: gtk.immodules # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN gtk+2.0-2.14.4.old/modules/Makefile.in gtk+2.0-2.14.4/modules/Makefile.in ---- gtk+2.0-2.14.4.old/modules/Makefile.in 2008-10-17 01:07:17.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/Makefile.in 2008-11-04 15:37:08.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@ +Index: gtk+-2.14.4/modules/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/Makefile.in 2008-10-17 06:07:17.000000000 +0200 ++++ gtk+-2.14.4/modules/Makefile.in 2008-11-11 18:56:04.257134776 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,11 +31,36 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl + @OS_UNIX_TRUE@am__append_1 = printbackends ++subdir = modules ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = input engines other printbackends ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -52,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -82,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -91,10 +103,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -121,6 +123,7 @@ +@@ -121,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62214,19 +100230,723 @@ diff -urN gtk+2.0-2.14.4.old/modules/Makefile.in gtk+2.0-2.14.4/modules/Makefile GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.14.4/modules/other/gail/libgail-util/Makefile.in ---- gtk+2.0-2.14.4.old/modules/other/gail/libgail-util/Makefile.in 2008-10-17 01:07:19.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/other/gail/libgail-util/Makefile.in 2008-11-04 15:37:10.000000000 -0200 -@@ -94,6 +94,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@ +@@ -139,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -151,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -257,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -285,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -298,28 +217,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -328,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -366,6 +270,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -374,9 +279,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -407,31 +314,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = input engines other $(am__append_1) +-subdir = modules +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-DIST_SUBDIRS = input engines other printbackends + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo +@@ -439,10 +354,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -450,7 +361,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -462,15 +379,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -491,7 +413,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -502,35 +424,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -538,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -566,29 +483,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -601,13 +512,17 @@ distdir: $(DISTFILES) + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -618,7 +533,6 @@ check: check-recursive + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +- + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -638,7 +552,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -649,25 +563,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -686,26 +609,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ +- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/other/gail/libgail-util/Makefile.in 2008-10-17 06:07:19.000000000 +0200 ++++ gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in 2008-11-11 18:56:05.936635035 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,13 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +34,60 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(libgailutilinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/other/gail/libgail-util ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(libdir)" \ ++ "$(DESTDIR)$(libgailutilincludedir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(lib_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++libgailutil_la_DEPENDENCIES = $(top_builddir)/gtk/$(gtktargetlib) \ ++ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) ++am__objects_1 = libgailutil_la-gailmisc.lo \ ++ libgailutil_la-gailtextutil.lo ++am_libgailutil_la_OBJECTS = $(am__objects_1) ++libgailutil_la_OBJECTS = $(am_libgailutil_la_OBJECTS) ++libgailutil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgailutil_la_CFLAGS) \ ++ $(CFLAGS) $(libgailutil_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgailutil_la_SOURCES) ++DIST_SOURCES = $(libgailutil_la_SOURCES) ++DATA = $(noinst_DATA) ++libgailutilincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgailutilinclude_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +98,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +123,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +130,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +156,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62234,19 +100954,928 @@ diff -urN gtk+2.0-2.14.4.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/other/gail/Makefile.in gtk+2.0-2.14.4/modules/other/gail/Makefile.in ---- gtk+2.0-2.14.4.old/modules/other/gail/Makefile.in 2008-10-17 01:07:19.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/other/gail/Makefile.in 2008-11-04 15:37:10.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +175,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +185,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +214,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +233,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +244,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +256,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +297,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +306,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -408,32 +343,24 @@ XVFB_START = \ + + @OS_WIN32_TRUE@export_symbols = -export-symbols gailutil.def + @OS_WIN32_TRUE@no_undefined = -no-undefined +- + @MS_LIB_AVAILABLE_TRUE@noinst_DATA = gailutil.lib +- + lib_LTLIBRARIES = libgailutil.la +- + util_c_sources = \ + gailmisc.c \ + gailtextutil.c + +- + libgailutilincludedir = $(includedir)/gail-1.0/libgail-util +- + util_public_h_sources = \ + gailmisc.h \ + gailtextutil.h \ + gail-util.h + +- + libgailutil_la_SOURCES = \ + $(util_c_sources) + +- + libgailutilinclude_HEADERS = \ + $(util_public_h_sources) + +- + libgailutil_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ +@@ -444,102 +371,87 @@ libgailutil_la_CPPFLAGS = \ + -DGDK_DISABLE_DEPRECATED\ + -DGTK_DISABLE_DEPRECATED + +- + libgailutil_la_CFLAGS = \ + $(GTK_DEP_CFLAGS) \ + $(GTK_DEBUG_FLAGS) \ + $(AM_CFLAGS) + +- + libgailutil_la_LIBADD = \ + $(top_builddir)/gtk/$(gtktargetlib) \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(GTK_DEP_LIBS) + +- + libgailutil_la_LDFLAGS = \ + -version-info $(GAIL_LT_VERSION_INFO) \ + $(no_undefined) \ + $(export_symbols) \ + $(LDFLAGS) + +-subdir = modules/other/gail/libgail-util +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(lib_LTLIBRARIES) +- +-libgailutil_la_DEPENDENCIES = $(top_builddir)/gtk/$(gtktargetlib) \ +- $(top_builddir)/gdk/$(gdktargetlib) +-am__objects_1 = libgailutil_la-gailmisc.lo \ +- libgailutil_la-gailtextutil.lo +-am_libgailutil_la_OBJECTS = $(am__objects_1) +-libgailutil_la_OBJECTS = $(am_libgailutil_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libgailutil_la-gailmisc.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgailutil_la-gailtextutil.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libgailutil_la_SOURCES) +-DATA = $(noinst_DATA) +- +-HEADERS = $(libgailutilinclude_HEADERS) +- +-DIST_COMMON = $(libgailutilinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-SOURCES = $(libgailutil_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/other/gail/libgail-util/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/other/gail/libgail-util/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-libLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libdir) ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgailutil.la: $(libgailutil_la_OBJECTS) $(libgailutil_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libgailutil_la_LDFLAGS) $(libgailutil_la_OBJECTS) $(libgailutil_la_LIBADD) $(LIBS) ++ $(libgailutil_la_LINK) -rpath $(libdir) $(libgailutil_la_OBJECTS) $(libgailutil_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -548,148 +460,72 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgailutil_la-gailtextutil.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +- +-libgailutil_la-gailmisc.o: gailmisc.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailmisc.o -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailmisc.o `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" "$(DEPDIR)/libgailutil_la-gailmisc.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmisc.c' object='libgailutil_la-gailmisc.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailmisc.Po' tmpdepfile='$(DEPDIR)/libgailutil_la-gailmisc.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailmisc.o `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c +- +-libgailutil_la-gailmisc.obj: gailmisc.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailmisc.obj -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailmisc.obj `if test -f 'gailmisc.c'; then $(CYGPATH_W) 'gailmisc.c'; else $(CYGPATH_W) '$(srcdir)/gailmisc.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" "$(DEPDIR)/libgailutil_la-gailmisc.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmisc.c' object='libgailutil_la-gailmisc.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailmisc.Po' tmpdepfile='$(DEPDIR)/libgailutil_la-gailmisc.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailmisc.obj `if test -f 'gailmisc.c'; then $(CYGPATH_W) 'gailmisc.c'; else $(CYGPATH_W) '$(srcdir)/gailmisc.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libgailutil_la-gailmisc.lo: gailmisc.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailmisc.lo -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailmisc.lo `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo" "$(DEPDIR)/libgailutil_la-gailmisc.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailmisc.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailmisc.lo -MD -MP -MF $(DEPDIR)/libgailutil_la-gailmisc.Tpo -c -o libgailutil_la-gailmisc.lo `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgailutil_la-gailmisc.Tpo $(DEPDIR)/libgailutil_la-gailmisc.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmisc.c' object='libgailutil_la-gailmisc.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailmisc.Plo' tmpdepfile='$(DEPDIR)/libgailutil_la-gailmisc.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailmisc.lo `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c +- +-libgailutil_la-gailtextutil.o: gailtextutil.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailtextutil.o -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailtextutil.o `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" "$(DEPDIR)/libgailutil_la-gailtextutil.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextutil.c' object='libgailutil_la-gailtextutil.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailtextutil.Po' tmpdepfile='$(DEPDIR)/libgailutil_la-gailtextutil.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailtextutil.o `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c +- +-libgailutil_la-gailtextutil.obj: gailtextutil.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailtextutil.obj -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailtextutil.obj `if test -f 'gailtextutil.c'; then $(CYGPATH_W) 'gailtextutil.c'; else $(CYGPATH_W) '$(srcdir)/gailtextutil.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" "$(DEPDIR)/libgailutil_la-gailtextutil.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextutil.c' object='libgailutil_la-gailtextutil.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailtextutil.Po' tmpdepfile='$(DEPDIR)/libgailutil_la-gailtextutil.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailtextutil.obj `if test -f 'gailtextutil.c'; then $(CYGPATH_W) 'gailtextutil.c'; else $(CYGPATH_W) '$(srcdir)/gailtextutil.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailmisc.lo `test -f 'gailmisc.c' || echo '$(srcdir)/'`gailmisc.c + + libgailutil_la-gailtextutil.lo: gailtextutil.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailtextutil.lo -MD -MP -MF "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgailutil_la-gailtextutil.lo `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo" "$(DEPDIR)/libgailutil_la-gailtextutil.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgailutil_la-gailtextutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -MT libgailutil_la-gailtextutil.lo -MD -MP -MF $(DEPDIR)/libgailutil_la-gailtextutil.Tpo -c -o libgailutil_la-gailtextutil.lo `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgailutil_la-gailtextutil.Tpo $(DEPDIR)/libgailutil_la-gailtextutil.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextutil.c' object='libgailutil_la-gailtextutil.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgailutil_la-gailtextutil.Plo' tmpdepfile='$(DEPDIR)/libgailutil_la-gailtextutil.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailtextutil.lo `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgailutil_la_CPPFLAGS) $(CPPFLAGS) $(libgailutil_la_CFLAGS) $(CFLAGS) -c -o libgailutil_la-gailtextutil.lo `test -f 'gailtextutil.c' || echo '$(srcdir)/'`gailtextutil.c + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-libgailutilincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgailutilincludeHEADERS: $(libgailutilinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgailutilincludedir) ++ test -z "$(libgailutilincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgailutilincludedir)" + @list='$(libgailutilinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgailutilincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgailutilincludedir)/$$f"; \ +- $(libgailutilincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgailutilincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgailutilincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgailutilincludedir)/$$f'"; \ ++ $(libgailutilincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgailutilincludedir)/$$f"; \ + done + + uninstall-libgailutilincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgailutilinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgailutilincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgailutilincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgailutilincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgailutilincludedir)/$$f"; \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -699,23 +535,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -727,29 +563,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -764,9 +594,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(libgailutilincludedir) ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libgailutilincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -786,7 +617,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -800,24 +631,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-data-local install-libgailutilincludeHEADERS + ++install-dvi: install-dvi-am ++ + install-exec-am: install-libLTLIBRARIES + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -838,21 +679,25 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ ++uninstall-am: uninstall-libLTLIBRARIES \ + uninstall-libgailutilincludeHEADERS uninstall-local + ++.MAKE: install-am install-strip ++ + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libLTLIBRARIES clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-data-local \ +- install-exec install-exec-am install-info install-info-am \ +- install-libLTLIBRARIES install-libgailutilincludeHEADERS \ +- install-man install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-data-local install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-libLTLIBRARIES \ ++ install-libgailutilincludeHEADERS install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-libgailutilincludeHEADERS uninstall-local + + # call as: $(XVFB_START) && someprogram +Index: gtk+-2.14.4/modules/other/gail/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/other/gail/Makefile.in 2008-10-17 06:07:19.000000000 +0200 ++++ gtk+-2.14.4/modules/other/gail/Makefile.in 2008-11-11 18:56:05.764634613 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,100 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(libgailinclude_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog ++subdir = modules/other/gail ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(moduledir)" \ ++ "$(DESTDIR)$(libgailincludedir)" ++moduleLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(module_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++libgail_la_DEPENDENCIES = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ ++ $(top_builddir)/gdk/$(gdktargetlib) \ ++ $(top_builddir)/gtk/$(gtktargetlib) \ ++ $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++am__objects_1 = libgail_la-gail.lo libgail_la-gailadjustment.lo \ ++ libgail_la-gailarrow.lo libgail_la-gailbooleancell.lo \ ++ libgail_la-gailbox.lo libgail_la-gailbutton.lo \ ++ libgail_la-gailcalendar.lo libgail_la-gailcell.lo \ ++ libgail_la-gailcellparent.lo libgail_la-gailcheckmenuitem.lo \ ++ libgail_la-gailchecksubmenuitem.lo libgail_la-gailclist.lo \ ++ libgail_la-gailclistcell.lo libgail_la-gailcombo.lo \ ++ libgail_la-gailcombobox.lo libgail_la-gailcontainer.lo \ ++ libgail_la-gailcontainercell.lo libgail_la-gailentry.lo \ ++ libgail_la-gailexpander.lo libgail_la-gailframe.lo \ ++ libgail_la-gailimage.lo libgail_la-gailimagecell.lo \ ++ libgail_la-gailitem.lo libgail_la-gaillabel.lo \ ++ libgail_la-gaillist.lo libgail_la-gailmenu.lo \ ++ libgail_la-gailmenushell.lo libgail_la-gailmenuitem.lo \ ++ libgail_la-gailnotebook.lo libgail_la-gailnotebookpage.lo \ ++ libgail_la-gailobject.lo libgail_la-gailoptionmenu.lo \ ++ libgail_la-gailpaned.lo libgail_la-gailpixmap.lo \ ++ libgail_la-gailprogressbar.lo libgail_la-gailradiobutton.lo \ ++ libgail_la-gailradiomenuitem.lo \ ++ libgail_la-gailradiosubmenuitem.lo libgail_la-gailrange.lo \ ++ libgail_la-gailrenderercell.lo libgail_la-gailscale.lo \ ++ libgail_la-gailscrollbar.lo libgail_la-gailscrolledwindow.lo \ ++ libgail_la-gailseparator.lo libgail_la-gailspinbutton.lo \ ++ libgail_la-gailsubmenuitem.lo libgail_la-gailstatusbar.lo \ ++ libgail_la-gailtextcell.lo libgail_la-gailtextview.lo \ ++ libgail_la-gailtogglebutton.lo libgail_la-gailtoplevel.lo \ ++ libgail_la-gailtreeview.lo libgail_la-gailutil.lo \ ++ libgail_la-gailwidget.lo libgail_la-gailwindow.lo ++am__objects_2 = ++am_libgail_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ ++ $(am__objects_2) ++libgail_la_OBJECTS = $(am_libgail_la_OBJECTS) ++libgail_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgail_la_CFLAGS) \ ++ $(CFLAGS) $(libgail_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libgail_la_SOURCES) ++DIST_SOURCES = $(libgail_la_SOURCES) ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++libgailincludeHEADERS_INSTALL = $(INSTALL_HEADER) ++HEADERS = $(libgailinclude_HEADERS) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +137,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +162,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +169,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +195,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62254,19 +101883,3185 @@ diff -urN gtk+2.0-2.14.4.old/modules/other/gail/Makefile.in gtk+2.0-2.14.4/modul GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14.4/modules/other/gail/tests/Makefile.in ---- gtk+2.0-2.14.4.old/modules/other/gail/tests/Makefile.in 2008-10-17 01:07:19.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/other/gail/tests/Makefile.in 2008-11-04 15:37:11.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +214,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +224,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +253,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +272,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +283,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +295,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +336,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +345,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,14 +380,10 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = libgail-util tests +- + @OS_WIN32_TRUE@no_undefined = -no-undefined +- + moduledir = $(libdir)/gtk-2.0/modules + module_LTLIBRARIES = libgail.la +- + gail_c_sources = \ + gail-private-macros.h \ + gail.c \ +@@ -472,9 +442,7 @@ gail_c_sources = \ + gailwidget.c \ + gailwindow.c + +- + libgailincludedir = $(includedir)/gail-1.0/gail +- + gail_private_h_sources = \ + gail.h \ + gailadjustment.h \ +@@ -532,21 +500,17 @@ gail_private_h_sources = \ + gailutil.h \ + gailwindow.h + +- + gail_public_h_sources = \ + gailwidget.h + +- + libgail_la_SOURCES = \ + $(gail_c_sources) \ + $(gail_public_h_sources) \ + $(gail_private_h_sources) + +- + libgailinclude_HEADERS = \ + $(gail_public_h_sources) + +- + libgail_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/modules/other \ +@@ -558,13 +522,11 @@ libgail_la_CPPFLAGS = \ + -DGDK_DISABLE_DEPRECATED \ + $(AM_CPPFLAGS) + +- + libgail_la_CFLAGS = \ + $(GTK_DEP_CFLAGS) \ + $(GTK_DEBUG_FLAGS) \ + $(AM_CFLAGS) + +- + libgail_la_LIBADD = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ +@@ -573,178 +535,76 @@ libgail_la_LIBADD = \ + $(GTK_DEP_LIBS) \ + $(INTLLIBS) + +- + libgail_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version \ + $(no_undefined) \ + $(LDFLAGS) + +-subdir = modules/other/gail +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(module_LTLIBRARIES) +- +-libgail_la_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) \ +- $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la +-am__objects_1 = libgail_la-gail.lo libgail_la-gailadjustment.lo \ +- libgail_la-gailarrow.lo libgail_la-gailbooleancell.lo \ +- libgail_la-gailbox.lo libgail_la-gailbutton.lo \ +- libgail_la-gailcalendar.lo libgail_la-gailcell.lo \ +- libgail_la-gailcellparent.lo libgail_la-gailcheckmenuitem.lo \ +- libgail_la-gailchecksubmenuitem.lo libgail_la-gailclist.lo \ +- libgail_la-gailclistcell.lo libgail_la-gailcombo.lo \ +- libgail_la-gailcombobox.lo libgail_la-gailcontainer.lo \ +- libgail_la-gailcontainercell.lo libgail_la-gailentry.lo \ +- libgail_la-gailexpander.lo libgail_la-gailframe.lo \ +- libgail_la-gailimage.lo libgail_la-gailimagecell.lo \ +- libgail_la-gailitem.lo libgail_la-gaillabel.lo \ +- libgail_la-gaillist.lo libgail_la-gailmenu.lo \ +- libgail_la-gailmenushell.lo libgail_la-gailmenuitem.lo \ +- libgail_la-gailnotebook.lo libgail_la-gailnotebookpage.lo \ +- libgail_la-gailobject.lo libgail_la-gailoptionmenu.lo \ +- libgail_la-gailpaned.lo libgail_la-gailpixmap.lo \ +- libgail_la-gailprogressbar.lo libgail_la-gailradiobutton.lo \ +- libgail_la-gailradiomenuitem.lo \ +- libgail_la-gailradiosubmenuitem.lo libgail_la-gailrange.lo \ +- libgail_la-gailrenderercell.lo libgail_la-gailscale.lo \ +- libgail_la-gailscrollbar.lo libgail_la-gailscrolledwindow.lo \ +- libgail_la-gailseparator.lo libgail_la-gailspinbutton.lo \ +- libgail_la-gailsubmenuitem.lo libgail_la-gailstatusbar.lo \ +- libgail_la-gailtextcell.lo libgail_la-gailtextview.lo \ +- libgail_la-gailtogglebutton.lo libgail_la-gailtoplevel.lo \ +- libgail_la-gailtreeview.lo libgail_la-gailutil.lo \ +- libgail_la-gailwidget.lo libgail_la-gailwindow.lo +-am__objects_2 = +-am_libgail_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ +- $(am__objects_2) +-libgail_la_OBJECTS = $(am_libgail_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libgail_la-gail.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailadjustment.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailarrow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailbooleancell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailbox.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcalendar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcellparent.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcheckmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailchecksubmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailclist.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailclistcell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcombo.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcombobox.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcontainer.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailcontainercell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailentry.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailexpander.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailframe.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailimage.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailimagecell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gaillabel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gaillist.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailmenu.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailmenushell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailnotebook.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailnotebookpage.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailobject.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailoptionmenu.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailpaned.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailpixmap.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailprogressbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailradiobutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailradiomenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailradiosubmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailrange.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailrenderercell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailscale.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailscrollbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailscrolledwindow.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailseparator.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailspinbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailstatusbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailsubmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailtextcell.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailtextview.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailtogglebutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailtoplevel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailtreeview.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailutil.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailwidget.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libgail_la-gailwindow.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libgail_la_SOURCES) +-HEADERS = $(libgailinclude_HEADERS) +- +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(libgailinclude_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl ChangeLog Makefile.am +-DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(libgail_la_SOURCES) +- + all: all-recursive + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/other/gail/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/other/gail/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-moduleLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-moduleLTLIBRARIES: $(module_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(moduledir) ++ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f"; \ +- $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + else :; fi; \ + done + + uninstall-moduleLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + done + + clean-moduleLTLIBRARIES: + -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES) + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libgail.la: $(libgail_la_OBJECTS) $(libgail_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(libgail_la_LDFLAGS) $(libgail_la_OBJECTS) $(libgail_la_LIBADD) $(LIBS) ++ $(libgail_la_LINK) -rpath $(moduledir) $(libgail_la_OBJECTS) $(libgail_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -806,1879 +666,432 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgail_la-gailwindow.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +- +-libgail_la-gail.o: gail.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gail.o -MD -MP -MF "$(DEPDIR)/libgail_la-gail.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gail.o `test -f 'gail.c' || echo '$(srcdir)/'`gail.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gail.Tpo" "$(DEPDIR)/libgail_la-gail.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gail.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gail.c' object='libgail_la-gail.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gail.Po' tmpdepfile='$(DEPDIR)/libgail_la-gail.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gail.o `test -f 'gail.c' || echo '$(srcdir)/'`gail.c +- +-libgail_la-gail.obj: gail.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gail.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gail.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gail.obj `if test -f 'gail.c'; then $(CYGPATH_W) 'gail.c'; else $(CYGPATH_W) '$(srcdir)/gail.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gail.Tpo" "$(DEPDIR)/libgail_la-gail.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gail.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gail.c' object='libgail_la-gail.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gail.Po' tmpdepfile='$(DEPDIR)/libgail_la-gail.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gail.obj `if test -f 'gail.c'; then $(CYGPATH_W) 'gail.c'; else $(CYGPATH_W) '$(srcdir)/gail.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libgail_la-gail.lo: gail.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gail.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gail.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gail.lo `test -f 'gail.c' || echo '$(srcdir)/'`gail.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gail.Tpo" "$(DEPDIR)/libgail_la-gail.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gail.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gail.lo -MD -MP -MF $(DEPDIR)/libgail_la-gail.Tpo -c -o libgail_la-gail.lo `test -f 'gail.c' || echo '$(srcdir)/'`gail.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gail.Tpo $(DEPDIR)/libgail_la-gail.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gail.c' object='libgail_la-gail.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gail.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gail.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gail.lo `test -f 'gail.c' || echo '$(srcdir)/'`gail.c +- +-libgail_la-gailadjustment.o: gailadjustment.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailadjustment.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailadjustment.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailadjustment.o `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo" "$(DEPDIR)/libgail_la-gailadjustment.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailadjustment.c' object='libgail_la-gailadjustment.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailadjustment.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailadjustment.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailadjustment.o `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c +- +-libgail_la-gailadjustment.obj: gailadjustment.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailadjustment.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailadjustment.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailadjustment.obj `if test -f 'gailadjustment.c'; then $(CYGPATH_W) 'gailadjustment.c'; else $(CYGPATH_W) '$(srcdir)/gailadjustment.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo" "$(DEPDIR)/libgail_la-gailadjustment.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailadjustment.c' object='libgail_la-gailadjustment.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailadjustment.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailadjustment.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailadjustment.obj `if test -f 'gailadjustment.c'; then $(CYGPATH_W) 'gailadjustment.c'; else $(CYGPATH_W) '$(srcdir)/gailadjustment.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gail.lo `test -f 'gail.c' || echo '$(srcdir)/'`gail.c + + libgail_la-gailadjustment.lo: gailadjustment.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailadjustment.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailadjustment.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailadjustment.lo `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo" "$(DEPDIR)/libgail_la-gailadjustment.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailadjustment.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailadjustment.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailadjustment.Tpo -c -o libgail_la-gailadjustment.lo `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailadjustment.Tpo $(DEPDIR)/libgail_la-gailadjustment.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailadjustment.c' object='libgail_la-gailadjustment.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailadjustment.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailadjustment.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailadjustment.lo `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c +- +-libgail_la-gailarrow.o: gailarrow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailarrow.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailarrow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailarrow.o `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailarrow.Tpo" "$(DEPDIR)/libgail_la-gailarrow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailarrow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailarrow.c' object='libgail_la-gailarrow.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailarrow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailarrow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailarrow.o `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c +- +-libgail_la-gailarrow.obj: gailarrow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailarrow.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailarrow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailarrow.obj `if test -f 'gailarrow.c'; then $(CYGPATH_W) 'gailarrow.c'; else $(CYGPATH_W) '$(srcdir)/gailarrow.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailarrow.Tpo" "$(DEPDIR)/libgail_la-gailarrow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailarrow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailarrow.c' object='libgail_la-gailarrow.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailarrow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailarrow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailarrow.obj `if test -f 'gailarrow.c'; then $(CYGPATH_W) 'gailarrow.c'; else $(CYGPATH_W) '$(srcdir)/gailarrow.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailadjustment.lo `test -f 'gailadjustment.c' || echo '$(srcdir)/'`gailadjustment.c + + libgail_la-gailarrow.lo: gailarrow.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailarrow.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailarrow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailarrow.lo `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailarrow.Tpo" "$(DEPDIR)/libgail_la-gailarrow.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailarrow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailarrow.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailarrow.Tpo -c -o libgail_la-gailarrow.lo `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailarrow.Tpo $(DEPDIR)/libgail_la-gailarrow.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailarrow.c' object='libgail_la-gailarrow.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailarrow.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailarrow.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailarrow.lo `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c +- +-libgail_la-gailbooleancell.o: gailbooleancell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbooleancell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbooleancell.o `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" "$(DEPDIR)/libgail_la-gailbooleancell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbooleancell.c' object='libgail_la-gailbooleancell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbooleancell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbooleancell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbooleancell.o `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c +- +-libgail_la-gailbooleancell.obj: gailbooleancell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbooleancell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbooleancell.obj `if test -f 'gailbooleancell.c'; then $(CYGPATH_W) 'gailbooleancell.c'; else $(CYGPATH_W) '$(srcdir)/gailbooleancell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" "$(DEPDIR)/libgail_la-gailbooleancell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbooleancell.c' object='libgail_la-gailbooleancell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbooleancell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbooleancell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbooleancell.obj `if test -f 'gailbooleancell.c'; then $(CYGPATH_W) 'gailbooleancell.c'; else $(CYGPATH_W) '$(srcdir)/gailbooleancell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailarrow.lo `test -f 'gailarrow.c' || echo '$(srcdir)/'`gailarrow.c + + libgail_la-gailbooleancell.lo: gailbooleancell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbooleancell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbooleancell.lo `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo" "$(DEPDIR)/libgail_la-gailbooleancell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbooleancell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbooleancell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailbooleancell.Tpo -c -o libgail_la-gailbooleancell.lo `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailbooleancell.Tpo $(DEPDIR)/libgail_la-gailbooleancell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbooleancell.c' object='libgail_la-gailbooleancell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbooleancell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailbooleancell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbooleancell.lo `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c +- +-libgail_la-gailbox.o: gailbox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbox.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailbox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbox.o `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbox.Tpo" "$(DEPDIR)/libgail_la-gailbox.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbox.c' object='libgail_la-gailbox.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbox.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbox.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbox.o `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c +- +-libgail_la-gailbox.obj: gailbox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbox.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailbox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbox.obj `if test -f 'gailbox.c'; then $(CYGPATH_W) 'gailbox.c'; else $(CYGPATH_W) '$(srcdir)/gailbox.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbox.Tpo" "$(DEPDIR)/libgail_la-gailbox.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbox.c' object='libgail_la-gailbox.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbox.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbox.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbox.obj `if test -f 'gailbox.c'; then $(CYGPATH_W) 'gailbox.c'; else $(CYGPATH_W) '$(srcdir)/gailbox.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbooleancell.lo `test -f 'gailbooleancell.c' || echo '$(srcdir)/'`gailbooleancell.c + + libgail_la-gailbox.lo: gailbox.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbox.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailbox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbox.lo `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbox.Tpo" "$(DEPDIR)/libgail_la-gailbox.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbox.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailbox.Tpo -c -o libgail_la-gailbox.lo `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailbox.Tpo $(DEPDIR)/libgail_la-gailbox.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbox.c' object='libgail_la-gailbox.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbox.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailbox.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbox.lo `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c +- +-libgail_la-gailbutton.o: gailbutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbutton.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbutton.o `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbutton.Tpo" "$(DEPDIR)/libgail_la-gailbutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbutton.c' object='libgail_la-gailbutton.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbutton.o `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c +- +-libgail_la-gailbutton.obj: gailbutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbutton.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbutton.obj `if test -f 'gailbutton.c'; then $(CYGPATH_W) 'gailbutton.c'; else $(CYGPATH_W) '$(srcdir)/gailbutton.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbutton.Tpo" "$(DEPDIR)/libgail_la-gailbutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbutton.c' object='libgail_la-gailbutton.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailbutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbutton.obj `if test -f 'gailbutton.c'; then $(CYGPATH_W) 'gailbutton.c'; else $(CYGPATH_W) '$(srcdir)/gailbutton.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbox.lo `test -f 'gailbox.c' || echo '$(srcdir)/'`gailbox.c + + libgail_la-gailbutton.lo: gailbutton.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbutton.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailbutton.lo `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailbutton.Tpo" "$(DEPDIR)/libgail_la-gailbutton.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailbutton.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailbutton.Tpo -c -o libgail_la-gailbutton.lo `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailbutton.Tpo $(DEPDIR)/libgail_la-gailbutton.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailbutton.c' object='libgail_la-gailbutton.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailbutton.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailbutton.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbutton.lo `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c +- +-libgail_la-gailcalendar.o: gailcalendar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcalendar.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcalendar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcalendar.o `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo" "$(DEPDIR)/libgail_la-gailcalendar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcalendar.c' object='libgail_la-gailcalendar.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcalendar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcalendar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcalendar.o `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c +- +-libgail_la-gailcalendar.obj: gailcalendar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcalendar.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcalendar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcalendar.obj `if test -f 'gailcalendar.c'; then $(CYGPATH_W) 'gailcalendar.c'; else $(CYGPATH_W) '$(srcdir)/gailcalendar.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo" "$(DEPDIR)/libgail_la-gailcalendar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcalendar.c' object='libgail_la-gailcalendar.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcalendar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcalendar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcalendar.obj `if test -f 'gailcalendar.c'; then $(CYGPATH_W) 'gailcalendar.c'; else $(CYGPATH_W) '$(srcdir)/gailcalendar.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailbutton.lo `test -f 'gailbutton.c' || echo '$(srcdir)/'`gailbutton.c + + libgail_la-gailcalendar.lo: gailcalendar.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcalendar.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcalendar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcalendar.lo `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo" "$(DEPDIR)/libgail_la-gailcalendar.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcalendar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcalendar.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcalendar.Tpo -c -o libgail_la-gailcalendar.lo `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcalendar.Tpo $(DEPDIR)/libgail_la-gailcalendar.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcalendar.c' object='libgail_la-gailcalendar.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcalendar.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcalendar.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcalendar.lo `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c +- +-libgail_la-gailcell.o: gailcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcell.o `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcell.Tpo" "$(DEPDIR)/libgail_la-gailcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcell.c' object='libgail_la-gailcell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcell.o `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c +- +-libgail_la-gailcell.obj: gailcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcell.obj `if test -f 'gailcell.c'; then $(CYGPATH_W) 'gailcell.c'; else $(CYGPATH_W) '$(srcdir)/gailcell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcell.Tpo" "$(DEPDIR)/libgail_la-gailcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcell.c' object='libgail_la-gailcell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcell.obj `if test -f 'gailcell.c'; then $(CYGPATH_W) 'gailcell.c'; else $(CYGPATH_W) '$(srcdir)/gailcell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcalendar.lo `test -f 'gailcalendar.c' || echo '$(srcdir)/'`gailcalendar.c + + libgail_la-gailcell.lo: gailcell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcell.lo `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcell.Tpo" "$(DEPDIR)/libgail_la-gailcell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcell.Tpo -c -o libgail_la-gailcell.lo `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcell.Tpo $(DEPDIR)/libgail_la-gailcell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcell.c' object='libgail_la-gailcell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcell.lo `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c +- +-libgail_la-gailcellparent.o: gailcellparent.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcellparent.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcellparent.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcellparent.o `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo" "$(DEPDIR)/libgail_la-gailcellparent.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcellparent.c' object='libgail_la-gailcellparent.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcellparent.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcellparent.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcellparent.o `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c +- +-libgail_la-gailcellparent.obj: gailcellparent.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcellparent.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcellparent.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcellparent.obj `if test -f 'gailcellparent.c'; then $(CYGPATH_W) 'gailcellparent.c'; else $(CYGPATH_W) '$(srcdir)/gailcellparent.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo" "$(DEPDIR)/libgail_la-gailcellparent.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcellparent.c' object='libgail_la-gailcellparent.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcellparent.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcellparent.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcellparent.obj `if test -f 'gailcellparent.c'; then $(CYGPATH_W) 'gailcellparent.c'; else $(CYGPATH_W) '$(srcdir)/gailcellparent.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcell.lo `test -f 'gailcell.c' || echo '$(srcdir)/'`gailcell.c + + libgail_la-gailcellparent.lo: gailcellparent.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcellparent.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcellparent.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcellparent.lo `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo" "$(DEPDIR)/libgail_la-gailcellparent.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcellparent.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcellparent.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcellparent.Tpo -c -o libgail_la-gailcellparent.lo `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcellparent.Tpo $(DEPDIR)/libgail_la-gailcellparent.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcellparent.c' object='libgail_la-gailcellparent.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcellparent.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcellparent.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcellparent.lo `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c +- +-libgail_la-gailcheckmenuitem.o: gailcheckmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcheckmenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcheckmenuitem.o `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailcheckmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcheckmenuitem.c' object='libgail_la-gailcheckmenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcheckmenuitem.o `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c +- +-libgail_la-gailcheckmenuitem.obj: gailcheckmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcheckmenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcheckmenuitem.obj `if test -f 'gailcheckmenuitem.c'; then $(CYGPATH_W) 'gailcheckmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailcheckmenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailcheckmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcheckmenuitem.c' object='libgail_la-gailcheckmenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcheckmenuitem.obj `if test -f 'gailcheckmenuitem.c'; then $(CYGPATH_W) 'gailcheckmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailcheckmenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcellparent.lo `test -f 'gailcellparent.c' || echo '$(srcdir)/'`gailcellparent.c + + libgail_la-gailcheckmenuitem.lo: gailcheckmenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcheckmenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcheckmenuitem.lo `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailcheckmenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcheckmenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo -c -o libgail_la-gailcheckmenuitem.lo `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcheckmenuitem.Tpo $(DEPDIR)/libgail_la-gailcheckmenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcheckmenuitem.c' object='libgail_la-gailcheckmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcheckmenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcheckmenuitem.lo `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c +- +-libgail_la-gailchecksubmenuitem.o: gailchecksubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailchecksubmenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailchecksubmenuitem.o `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailchecksubmenuitem.c' object='libgail_la-gailchecksubmenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailchecksubmenuitem.o `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c +- +-libgail_la-gailchecksubmenuitem.obj: gailchecksubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailchecksubmenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailchecksubmenuitem.obj `if test -f 'gailchecksubmenuitem.c'; then $(CYGPATH_W) 'gailchecksubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailchecksubmenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailchecksubmenuitem.c' object='libgail_la-gailchecksubmenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailchecksubmenuitem.obj `if test -f 'gailchecksubmenuitem.c'; then $(CYGPATH_W) 'gailchecksubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailchecksubmenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcheckmenuitem.lo `test -f 'gailcheckmenuitem.c' || echo '$(srcdir)/'`gailcheckmenuitem.c + + libgail_la-gailchecksubmenuitem.lo: gailchecksubmenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailchecksubmenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailchecksubmenuitem.lo `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailchecksubmenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo -c -o libgail_la-gailchecksubmenuitem.lo `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailchecksubmenuitem.Tpo $(DEPDIR)/libgail_la-gailchecksubmenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailchecksubmenuitem.c' object='libgail_la-gailchecksubmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailchecksubmenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailchecksubmenuitem.lo `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c +- +-libgail_la-gailclist.o: gailclist.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclist.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailclist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclist.o `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclist.Tpo" "$(DEPDIR)/libgail_la-gailclist.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclist.c' object='libgail_la-gailclist.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclist.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailclist.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclist.o `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c +- +-libgail_la-gailclist.obj: gailclist.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclist.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailclist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclist.obj `if test -f 'gailclist.c'; then $(CYGPATH_W) 'gailclist.c'; else $(CYGPATH_W) '$(srcdir)/gailclist.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclist.Tpo" "$(DEPDIR)/libgail_la-gailclist.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclist.c' object='libgail_la-gailclist.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclist.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailclist.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclist.obj `if test -f 'gailclist.c'; then $(CYGPATH_W) 'gailclist.c'; else $(CYGPATH_W) '$(srcdir)/gailclist.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailchecksubmenuitem.lo `test -f 'gailchecksubmenuitem.c' || echo '$(srcdir)/'`gailchecksubmenuitem.c + + libgail_la-gailclist.lo: gailclist.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclist.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailclist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclist.lo `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclist.Tpo" "$(DEPDIR)/libgail_la-gailclist.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclist.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailclist.Tpo -c -o libgail_la-gailclist.lo `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailclist.Tpo $(DEPDIR)/libgail_la-gailclist.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclist.c' object='libgail_la-gailclist.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclist.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailclist.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclist.lo `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c +- +-libgail_la-gailclistcell.o: gailclistcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclistcell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailclistcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclistcell.o `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo" "$(DEPDIR)/libgail_la-gailclistcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclistcell.c' object='libgail_la-gailclistcell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclistcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailclistcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclistcell.o `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c +- +-libgail_la-gailclistcell.obj: gailclistcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclistcell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailclistcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclistcell.obj `if test -f 'gailclistcell.c'; then $(CYGPATH_W) 'gailclistcell.c'; else $(CYGPATH_W) '$(srcdir)/gailclistcell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo" "$(DEPDIR)/libgail_la-gailclistcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclistcell.c' object='libgail_la-gailclistcell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclistcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailclistcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclistcell.obj `if test -f 'gailclistcell.c'; then $(CYGPATH_W) 'gailclistcell.c'; else $(CYGPATH_W) '$(srcdir)/gailclistcell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclist.lo `test -f 'gailclist.c' || echo '$(srcdir)/'`gailclist.c + + libgail_la-gailclistcell.lo: gailclistcell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclistcell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailclistcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailclistcell.lo `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo" "$(DEPDIR)/libgail_la-gailclistcell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailclistcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailclistcell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailclistcell.Tpo -c -o libgail_la-gailclistcell.lo `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailclistcell.Tpo $(DEPDIR)/libgail_la-gailclistcell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailclistcell.c' object='libgail_la-gailclistcell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailclistcell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailclistcell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclistcell.lo `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c +- +-libgail_la-gailcombo.o: gailcombo.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombo.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombo.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombo.o `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombo.Tpo" "$(DEPDIR)/libgail_la-gailcombo.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombo.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombo.c' object='libgail_la-gailcombo.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombo.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcombo.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombo.o `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c +- +-libgail_la-gailcombo.obj: gailcombo.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombo.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombo.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombo.obj `if test -f 'gailcombo.c'; then $(CYGPATH_W) 'gailcombo.c'; else $(CYGPATH_W) '$(srcdir)/gailcombo.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombo.Tpo" "$(DEPDIR)/libgail_la-gailcombo.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombo.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombo.c' object='libgail_la-gailcombo.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombo.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcombo.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombo.obj `if test -f 'gailcombo.c'; then $(CYGPATH_W) 'gailcombo.c'; else $(CYGPATH_W) '$(srcdir)/gailcombo.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailclistcell.lo `test -f 'gailclistcell.c' || echo '$(srcdir)/'`gailclistcell.c + + libgail_la-gailcombo.lo: gailcombo.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombo.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombo.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombo.lo `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombo.Tpo" "$(DEPDIR)/libgail_la-gailcombo.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombo.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombo.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcombo.Tpo -c -o libgail_la-gailcombo.lo `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcombo.Tpo $(DEPDIR)/libgail_la-gailcombo.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombo.c' object='libgail_la-gailcombo.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombo.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcombo.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombo.lo `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c +- +-libgail_la-gailcombobox.o: gailcombobox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombobox.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombobox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombobox.o `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo" "$(DEPDIR)/libgail_la-gailcombobox.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombobox.c' object='libgail_la-gailcombobox.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombobox.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcombobox.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombobox.o `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c +- +-libgail_la-gailcombobox.obj: gailcombobox.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombobox.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombobox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombobox.obj `if test -f 'gailcombobox.c'; then $(CYGPATH_W) 'gailcombobox.c'; else $(CYGPATH_W) '$(srcdir)/gailcombobox.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo" "$(DEPDIR)/libgail_la-gailcombobox.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombobox.c' object='libgail_la-gailcombobox.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombobox.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcombobox.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombobox.obj `if test -f 'gailcombobox.c'; then $(CYGPATH_W) 'gailcombobox.c'; else $(CYGPATH_W) '$(srcdir)/gailcombobox.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombo.lo `test -f 'gailcombo.c' || echo '$(srcdir)/'`gailcombo.c + + libgail_la-gailcombobox.lo: gailcombobox.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombobox.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcombobox.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcombobox.lo `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo" "$(DEPDIR)/libgail_la-gailcombobox.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcombobox.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcombobox.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcombobox.Tpo -c -o libgail_la-gailcombobox.lo `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcombobox.Tpo $(DEPDIR)/libgail_la-gailcombobox.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcombobox.c' object='libgail_la-gailcombobox.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcombobox.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcombobox.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombobox.lo `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c +- +-libgail_la-gailcontainer.o: gailcontainer.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainer.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainer.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainer.o `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo" "$(DEPDIR)/libgail_la-gailcontainer.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainer.c' object='libgail_la-gailcontainer.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainer.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainer.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainer.o `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c +- +-libgail_la-gailcontainer.obj: gailcontainer.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainer.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainer.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainer.obj `if test -f 'gailcontainer.c'; then $(CYGPATH_W) 'gailcontainer.c'; else $(CYGPATH_W) '$(srcdir)/gailcontainer.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo" "$(DEPDIR)/libgail_la-gailcontainer.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainer.c' object='libgail_la-gailcontainer.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainer.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainer.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainer.obj `if test -f 'gailcontainer.c'; then $(CYGPATH_W) 'gailcontainer.c'; else $(CYGPATH_W) '$(srcdir)/gailcontainer.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcombobox.lo `test -f 'gailcombobox.c' || echo '$(srcdir)/'`gailcombobox.c + + libgail_la-gailcontainer.lo: gailcontainer.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainer.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainer.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainer.lo `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo" "$(DEPDIR)/libgail_la-gailcontainer.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainer.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainer.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcontainer.Tpo -c -o libgail_la-gailcontainer.lo `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcontainer.Tpo $(DEPDIR)/libgail_la-gailcontainer.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainer.c' object='libgail_la-gailcontainer.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainer.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainer.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainer.lo `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c +- +-libgail_la-gailcontainercell.o: gailcontainercell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainercell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainercell.o `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" "$(DEPDIR)/libgail_la-gailcontainercell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainercell.c' object='libgail_la-gailcontainercell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainercell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainercell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainercell.o `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c +- +-libgail_la-gailcontainercell.obj: gailcontainercell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainercell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainercell.obj `if test -f 'gailcontainercell.c'; then $(CYGPATH_W) 'gailcontainercell.c'; else $(CYGPATH_W) '$(srcdir)/gailcontainercell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" "$(DEPDIR)/libgail_la-gailcontainercell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainercell.c' object='libgail_la-gailcontainercell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainercell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainercell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainercell.obj `if test -f 'gailcontainercell.c'; then $(CYGPATH_W) 'gailcontainercell.c'; else $(CYGPATH_W) '$(srcdir)/gailcontainercell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainer.lo `test -f 'gailcontainer.c' || echo '$(srcdir)/'`gailcontainer.c + + libgail_la-gailcontainercell.lo: gailcontainercell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainercell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailcontainercell.lo `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo" "$(DEPDIR)/libgail_la-gailcontainercell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailcontainercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailcontainercell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailcontainercell.Tpo -c -o libgail_la-gailcontainercell.lo `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailcontainercell.Tpo $(DEPDIR)/libgail_la-gailcontainercell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailcontainercell.c' object='libgail_la-gailcontainercell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailcontainercell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailcontainercell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainercell.lo `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c +- +-libgail_la-gailentry.o: gailentry.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailentry.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailentry.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailentry.o `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailentry.Tpo" "$(DEPDIR)/libgail_la-gailentry.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailentry.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailentry.c' object='libgail_la-gailentry.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailentry.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailentry.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailentry.o `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c +- +-libgail_la-gailentry.obj: gailentry.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailentry.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailentry.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailentry.obj `if test -f 'gailentry.c'; then $(CYGPATH_W) 'gailentry.c'; else $(CYGPATH_W) '$(srcdir)/gailentry.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailentry.Tpo" "$(DEPDIR)/libgail_la-gailentry.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailentry.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailentry.c' object='libgail_la-gailentry.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailentry.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailentry.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailentry.obj `if test -f 'gailentry.c'; then $(CYGPATH_W) 'gailentry.c'; else $(CYGPATH_W) '$(srcdir)/gailentry.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailcontainercell.lo `test -f 'gailcontainercell.c' || echo '$(srcdir)/'`gailcontainercell.c + + libgail_la-gailentry.lo: gailentry.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailentry.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailentry.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailentry.lo `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailentry.Tpo" "$(DEPDIR)/libgail_la-gailentry.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailentry.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailentry.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailentry.Tpo -c -o libgail_la-gailentry.lo `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailentry.Tpo $(DEPDIR)/libgail_la-gailentry.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailentry.c' object='libgail_la-gailentry.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailentry.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailentry.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailentry.lo `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c +- +-libgail_la-gailexpander.o: gailexpander.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailexpander.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailexpander.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailexpander.o `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailexpander.Tpo" "$(DEPDIR)/libgail_la-gailexpander.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailexpander.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailexpander.c' object='libgail_la-gailexpander.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailexpander.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailexpander.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailexpander.o `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c +- +-libgail_la-gailexpander.obj: gailexpander.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailexpander.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailexpander.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailexpander.obj `if test -f 'gailexpander.c'; then $(CYGPATH_W) 'gailexpander.c'; else $(CYGPATH_W) '$(srcdir)/gailexpander.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailexpander.Tpo" "$(DEPDIR)/libgail_la-gailexpander.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailexpander.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailexpander.c' object='libgail_la-gailexpander.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailexpander.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailexpander.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailexpander.obj `if test -f 'gailexpander.c'; then $(CYGPATH_W) 'gailexpander.c'; else $(CYGPATH_W) '$(srcdir)/gailexpander.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailentry.lo `test -f 'gailentry.c' || echo '$(srcdir)/'`gailentry.c + + libgail_la-gailexpander.lo: gailexpander.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailexpander.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailexpander.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailexpander.lo `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailexpander.Tpo" "$(DEPDIR)/libgail_la-gailexpander.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailexpander.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailexpander.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailexpander.Tpo -c -o libgail_la-gailexpander.lo `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailexpander.Tpo $(DEPDIR)/libgail_la-gailexpander.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailexpander.c' object='libgail_la-gailexpander.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailexpander.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailexpander.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailexpander.lo `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c +- +-libgail_la-gailframe.o: gailframe.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailframe.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailframe.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailframe.o `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailframe.Tpo" "$(DEPDIR)/libgail_la-gailframe.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailframe.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailframe.c' object='libgail_la-gailframe.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailframe.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailframe.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailframe.o `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c +- +-libgail_la-gailframe.obj: gailframe.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailframe.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailframe.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailframe.obj `if test -f 'gailframe.c'; then $(CYGPATH_W) 'gailframe.c'; else $(CYGPATH_W) '$(srcdir)/gailframe.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailframe.Tpo" "$(DEPDIR)/libgail_la-gailframe.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailframe.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailframe.c' object='libgail_la-gailframe.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailframe.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailframe.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailframe.obj `if test -f 'gailframe.c'; then $(CYGPATH_W) 'gailframe.c'; else $(CYGPATH_W) '$(srcdir)/gailframe.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailexpander.lo `test -f 'gailexpander.c' || echo '$(srcdir)/'`gailexpander.c + + libgail_la-gailframe.lo: gailframe.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailframe.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailframe.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailframe.lo `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailframe.Tpo" "$(DEPDIR)/libgail_la-gailframe.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailframe.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailframe.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailframe.Tpo -c -o libgail_la-gailframe.lo `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailframe.Tpo $(DEPDIR)/libgail_la-gailframe.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailframe.c' object='libgail_la-gailframe.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailframe.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailframe.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailframe.lo `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c +- +-libgail_la-gailimage.o: gailimage.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimage.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailimage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimage.o `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimage.Tpo" "$(DEPDIR)/libgail_la-gailimage.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimage.c' object='libgail_la-gailimage.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimage.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailimage.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimage.o `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c +- +-libgail_la-gailimage.obj: gailimage.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimage.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailimage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimage.obj `if test -f 'gailimage.c'; then $(CYGPATH_W) 'gailimage.c'; else $(CYGPATH_W) '$(srcdir)/gailimage.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimage.Tpo" "$(DEPDIR)/libgail_la-gailimage.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimage.c' object='libgail_la-gailimage.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimage.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailimage.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimage.obj `if test -f 'gailimage.c'; then $(CYGPATH_W) 'gailimage.c'; else $(CYGPATH_W) '$(srcdir)/gailimage.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailframe.lo `test -f 'gailframe.c' || echo '$(srcdir)/'`gailframe.c + + libgail_la-gailimage.lo: gailimage.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimage.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailimage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimage.lo `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimage.Tpo" "$(DEPDIR)/libgail_la-gailimage.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimage.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailimage.Tpo -c -o libgail_la-gailimage.lo `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailimage.Tpo $(DEPDIR)/libgail_la-gailimage.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimage.c' object='libgail_la-gailimage.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimage.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailimage.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimage.lo `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c +- +-libgail_la-gailimagecell.o: gailimagecell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimagecell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailimagecell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimagecell.o `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo" "$(DEPDIR)/libgail_la-gailimagecell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimagecell.c' object='libgail_la-gailimagecell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimagecell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailimagecell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimagecell.o `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c +- +-libgail_la-gailimagecell.obj: gailimagecell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimagecell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailimagecell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimagecell.obj `if test -f 'gailimagecell.c'; then $(CYGPATH_W) 'gailimagecell.c'; else $(CYGPATH_W) '$(srcdir)/gailimagecell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo" "$(DEPDIR)/libgail_la-gailimagecell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimagecell.c' object='libgail_la-gailimagecell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimagecell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailimagecell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimagecell.obj `if test -f 'gailimagecell.c'; then $(CYGPATH_W) 'gailimagecell.c'; else $(CYGPATH_W) '$(srcdir)/gailimagecell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimage.lo `test -f 'gailimage.c' || echo '$(srcdir)/'`gailimage.c + + libgail_la-gailimagecell.lo: gailimagecell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimagecell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailimagecell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailimagecell.lo `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo" "$(DEPDIR)/libgail_la-gailimagecell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailimagecell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailimagecell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailimagecell.Tpo -c -o libgail_la-gailimagecell.lo `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailimagecell.Tpo $(DEPDIR)/libgail_la-gailimagecell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailimagecell.c' object='libgail_la-gailimagecell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailimagecell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailimagecell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimagecell.lo `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c +- +-libgail_la-gailitem.o: gailitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailitem.o `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailitem.Tpo" "$(DEPDIR)/libgail_la-gailitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailitem.c' object='libgail_la-gailitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailitem.o `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c +- +-libgail_la-gailitem.obj: gailitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailitem.obj `if test -f 'gailitem.c'; then $(CYGPATH_W) 'gailitem.c'; else $(CYGPATH_W) '$(srcdir)/gailitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailitem.Tpo" "$(DEPDIR)/libgail_la-gailitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailitem.c' object='libgail_la-gailitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailitem.obj `if test -f 'gailitem.c'; then $(CYGPATH_W) 'gailitem.c'; else $(CYGPATH_W) '$(srcdir)/gailitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailimagecell.lo `test -f 'gailimagecell.c' || echo '$(srcdir)/'`gailimagecell.c + + libgail_la-gailitem.lo: gailitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailitem.lo `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailitem.Tpo" "$(DEPDIR)/libgail_la-gailitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailitem.Tpo -c -o libgail_la-gailitem.lo `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailitem.Tpo $(DEPDIR)/libgail_la-gailitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailitem.c' object='libgail_la-gailitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailitem.lo `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c +- +-libgail_la-gaillabel.o: gaillabel.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillabel.o -MD -MP -MF "$(DEPDIR)/libgail_la-gaillabel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillabel.o `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillabel.Tpo" "$(DEPDIR)/libgail_la-gaillabel.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillabel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillabel.c' object='libgail_la-gaillabel.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillabel.Po' tmpdepfile='$(DEPDIR)/libgail_la-gaillabel.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillabel.o `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c +- +-libgail_la-gaillabel.obj: gaillabel.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillabel.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gaillabel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillabel.obj `if test -f 'gaillabel.c'; then $(CYGPATH_W) 'gaillabel.c'; else $(CYGPATH_W) '$(srcdir)/gaillabel.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillabel.Tpo" "$(DEPDIR)/libgail_la-gaillabel.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillabel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillabel.c' object='libgail_la-gaillabel.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillabel.Po' tmpdepfile='$(DEPDIR)/libgail_la-gaillabel.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillabel.obj `if test -f 'gaillabel.c'; then $(CYGPATH_W) 'gaillabel.c'; else $(CYGPATH_W) '$(srcdir)/gaillabel.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailitem.lo `test -f 'gailitem.c' || echo '$(srcdir)/'`gailitem.c + + libgail_la-gaillabel.lo: gaillabel.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillabel.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gaillabel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillabel.lo `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillabel.Tpo" "$(DEPDIR)/libgail_la-gaillabel.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillabel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillabel.lo -MD -MP -MF $(DEPDIR)/libgail_la-gaillabel.Tpo -c -o libgail_la-gaillabel.lo `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gaillabel.Tpo $(DEPDIR)/libgail_la-gaillabel.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillabel.c' object='libgail_la-gaillabel.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillabel.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gaillabel.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillabel.lo `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c +- +-libgail_la-gaillist.o: gaillist.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillist.o -MD -MP -MF "$(DEPDIR)/libgail_la-gaillist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillist.o `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillist.Tpo" "$(DEPDIR)/libgail_la-gaillist.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillist.c' object='libgail_la-gaillist.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillist.Po' tmpdepfile='$(DEPDIR)/libgail_la-gaillist.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillist.o `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c +- +-libgail_la-gaillist.obj: gaillist.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillist.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gaillist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillist.obj `if test -f 'gaillist.c'; then $(CYGPATH_W) 'gaillist.c'; else $(CYGPATH_W) '$(srcdir)/gaillist.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillist.Tpo" "$(DEPDIR)/libgail_la-gaillist.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillist.c' object='libgail_la-gaillist.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillist.Po' tmpdepfile='$(DEPDIR)/libgail_la-gaillist.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillist.obj `if test -f 'gaillist.c'; then $(CYGPATH_W) 'gaillist.c'; else $(CYGPATH_W) '$(srcdir)/gaillist.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillabel.lo `test -f 'gaillabel.c' || echo '$(srcdir)/'`gaillabel.c + + libgail_la-gaillist.lo: gaillist.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillist.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gaillist.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gaillist.lo `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gaillist.Tpo" "$(DEPDIR)/libgail_la-gaillist.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gaillist.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gaillist.lo -MD -MP -MF $(DEPDIR)/libgail_la-gaillist.Tpo -c -o libgail_la-gaillist.lo `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gaillist.Tpo $(DEPDIR)/libgail_la-gaillist.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gaillist.c' object='libgail_la-gaillist.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gaillist.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gaillist.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillist.lo `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c +- +-libgail_la-gailmenu.o: gailmenu.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenu.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenu.o `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenu.Tpo" "$(DEPDIR)/libgail_la-gailmenu.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenu.c' object='libgail_la-gailmenu.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenu.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenu.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenu.o `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c +- +-libgail_la-gailmenu.obj: gailmenu.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenu.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenu.obj `if test -f 'gailmenu.c'; then $(CYGPATH_W) 'gailmenu.c'; else $(CYGPATH_W) '$(srcdir)/gailmenu.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenu.Tpo" "$(DEPDIR)/libgail_la-gailmenu.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenu.c' object='libgail_la-gailmenu.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenu.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenu.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenu.obj `if test -f 'gailmenu.c'; then $(CYGPATH_W) 'gailmenu.c'; else $(CYGPATH_W) '$(srcdir)/gailmenu.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gaillist.lo `test -f 'gaillist.c' || echo '$(srcdir)/'`gaillist.c + + libgail_la-gailmenu.lo: gailmenu.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenu.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenu.lo `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenu.Tpo" "$(DEPDIR)/libgail_la-gailmenu.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenu.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailmenu.Tpo -c -o libgail_la-gailmenu.lo `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailmenu.Tpo $(DEPDIR)/libgail_la-gailmenu.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenu.c' object='libgail_la-gailmenu.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenu.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailmenu.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenu.lo `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c +- +-libgail_la-gailmenushell.o: gailmenushell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenushell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenushell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenushell.o `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo" "$(DEPDIR)/libgail_la-gailmenushell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenushell.c' object='libgail_la-gailmenushell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenushell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenushell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenushell.o `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c +- +-libgail_la-gailmenushell.obj: gailmenushell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenushell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenushell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenushell.obj `if test -f 'gailmenushell.c'; then $(CYGPATH_W) 'gailmenushell.c'; else $(CYGPATH_W) '$(srcdir)/gailmenushell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo" "$(DEPDIR)/libgail_la-gailmenushell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenushell.c' object='libgail_la-gailmenushell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenushell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenushell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenushell.obj `if test -f 'gailmenushell.c'; then $(CYGPATH_W) 'gailmenushell.c'; else $(CYGPATH_W) '$(srcdir)/gailmenushell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenu.lo `test -f 'gailmenu.c' || echo '$(srcdir)/'`gailmenu.c + + libgail_la-gailmenushell.lo: gailmenushell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenushell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenushell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenushell.lo `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo" "$(DEPDIR)/libgail_la-gailmenushell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenushell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenushell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailmenushell.Tpo -c -o libgail_la-gailmenushell.lo `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailmenushell.Tpo $(DEPDIR)/libgail_la-gailmenushell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenushell.c' object='libgail_la-gailmenushell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenushell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailmenushell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenushell.lo `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c +- +-libgail_la-gailmenuitem.o: gailmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenuitem.o `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenuitem.c' object='libgail_la-gailmenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenuitem.o `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c +- +-libgail_la-gailmenuitem.obj: gailmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenuitem.obj `if test -f 'gailmenuitem.c'; then $(CYGPATH_W) 'gailmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailmenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenuitem.c' object='libgail_la-gailmenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenuitem.obj `if test -f 'gailmenuitem.c'; then $(CYGPATH_W) 'gailmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailmenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenushell.lo `test -f 'gailmenushell.c' || echo '$(srcdir)/'`gailmenushell.c + + libgail_la-gailmenuitem.lo: gailmenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailmenuitem.lo `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailmenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailmenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailmenuitem.Tpo -c -o libgail_la-gailmenuitem.lo `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailmenuitem.Tpo $(DEPDIR)/libgail_la-gailmenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailmenuitem.c' object='libgail_la-gailmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailmenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailmenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenuitem.lo `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c +- +-libgail_la-gailnotebook.o: gailnotebook.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebook.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebook.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebook.o `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo" "$(DEPDIR)/libgail_la-gailnotebook.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebook.c' object='libgail_la-gailnotebook.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebook.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebook.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebook.o `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c +- +-libgail_la-gailnotebook.obj: gailnotebook.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebook.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebook.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebook.obj `if test -f 'gailnotebook.c'; then $(CYGPATH_W) 'gailnotebook.c'; else $(CYGPATH_W) '$(srcdir)/gailnotebook.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo" "$(DEPDIR)/libgail_la-gailnotebook.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebook.c' object='libgail_la-gailnotebook.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebook.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebook.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebook.obj `if test -f 'gailnotebook.c'; then $(CYGPATH_W) 'gailnotebook.c'; else $(CYGPATH_W) '$(srcdir)/gailnotebook.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailmenuitem.lo `test -f 'gailmenuitem.c' || echo '$(srcdir)/'`gailmenuitem.c + + libgail_la-gailnotebook.lo: gailnotebook.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebook.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebook.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebook.lo `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo" "$(DEPDIR)/libgail_la-gailnotebook.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebook.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebook.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailnotebook.Tpo -c -o libgail_la-gailnotebook.lo `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailnotebook.Tpo $(DEPDIR)/libgail_la-gailnotebook.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebook.c' object='libgail_la-gailnotebook.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebook.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebook.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebook.lo `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c +- +-libgail_la-gailnotebookpage.o: gailnotebookpage.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebookpage.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebookpage.o `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" "$(DEPDIR)/libgail_la-gailnotebookpage.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebookpage.c' object='libgail_la-gailnotebookpage.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebookpage.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebookpage.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebookpage.o `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c +- +-libgail_la-gailnotebookpage.obj: gailnotebookpage.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebookpage.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebookpage.obj `if test -f 'gailnotebookpage.c'; then $(CYGPATH_W) 'gailnotebookpage.c'; else $(CYGPATH_W) '$(srcdir)/gailnotebookpage.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" "$(DEPDIR)/libgail_la-gailnotebookpage.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebookpage.c' object='libgail_la-gailnotebookpage.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebookpage.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebookpage.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebookpage.obj `if test -f 'gailnotebookpage.c'; then $(CYGPATH_W) 'gailnotebookpage.c'; else $(CYGPATH_W) '$(srcdir)/gailnotebookpage.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebook.lo `test -f 'gailnotebook.c' || echo '$(srcdir)/'`gailnotebook.c + + libgail_la-gailnotebookpage.lo: gailnotebookpage.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebookpage.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailnotebookpage.lo `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo" "$(DEPDIR)/libgail_la-gailnotebookpage.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailnotebookpage.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailnotebookpage.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailnotebookpage.Tpo -c -o libgail_la-gailnotebookpage.lo `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailnotebookpage.Tpo $(DEPDIR)/libgail_la-gailnotebookpage.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailnotebookpage.c' object='libgail_la-gailnotebookpage.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailnotebookpage.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailnotebookpage.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebookpage.lo `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c +- +-libgail_la-gailobject.o: gailobject.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailobject.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailobject.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailobject.o `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailobject.Tpo" "$(DEPDIR)/libgail_la-gailobject.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailobject.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailobject.c' object='libgail_la-gailobject.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailobject.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailobject.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailobject.o `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c +- +-libgail_la-gailobject.obj: gailobject.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailobject.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailobject.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailobject.obj `if test -f 'gailobject.c'; then $(CYGPATH_W) 'gailobject.c'; else $(CYGPATH_W) '$(srcdir)/gailobject.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailobject.Tpo" "$(DEPDIR)/libgail_la-gailobject.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailobject.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailobject.c' object='libgail_la-gailobject.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailobject.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailobject.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailobject.obj `if test -f 'gailobject.c'; then $(CYGPATH_W) 'gailobject.c'; else $(CYGPATH_W) '$(srcdir)/gailobject.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailnotebookpage.lo `test -f 'gailnotebookpage.c' || echo '$(srcdir)/'`gailnotebookpage.c + + libgail_la-gailobject.lo: gailobject.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailobject.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailobject.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailobject.lo `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailobject.Tpo" "$(DEPDIR)/libgail_la-gailobject.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailobject.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailobject.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailobject.Tpo -c -o libgail_la-gailobject.lo `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailobject.Tpo $(DEPDIR)/libgail_la-gailobject.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailobject.c' object='libgail_la-gailobject.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailobject.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailobject.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailobject.lo `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c +- +-libgail_la-gailoptionmenu.o: gailoptionmenu.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailoptionmenu.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailoptionmenu.o `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" "$(DEPDIR)/libgail_la-gailoptionmenu.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailoptionmenu.c' object='libgail_la-gailoptionmenu.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailoptionmenu.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailoptionmenu.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailoptionmenu.o `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c +- +-libgail_la-gailoptionmenu.obj: gailoptionmenu.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailoptionmenu.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailoptionmenu.obj `if test -f 'gailoptionmenu.c'; then $(CYGPATH_W) 'gailoptionmenu.c'; else $(CYGPATH_W) '$(srcdir)/gailoptionmenu.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" "$(DEPDIR)/libgail_la-gailoptionmenu.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailoptionmenu.c' object='libgail_la-gailoptionmenu.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailoptionmenu.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailoptionmenu.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailoptionmenu.obj `if test -f 'gailoptionmenu.c'; then $(CYGPATH_W) 'gailoptionmenu.c'; else $(CYGPATH_W) '$(srcdir)/gailoptionmenu.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailobject.lo `test -f 'gailobject.c' || echo '$(srcdir)/'`gailobject.c + + libgail_la-gailoptionmenu.lo: gailoptionmenu.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailoptionmenu.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailoptionmenu.lo `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo" "$(DEPDIR)/libgail_la-gailoptionmenu.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailoptionmenu.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailoptionmenu.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailoptionmenu.Tpo -c -o libgail_la-gailoptionmenu.lo `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailoptionmenu.Tpo $(DEPDIR)/libgail_la-gailoptionmenu.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailoptionmenu.c' object='libgail_la-gailoptionmenu.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailoptionmenu.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailoptionmenu.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailoptionmenu.lo `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c +- +-libgail_la-gailpaned.o: gailpaned.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpaned.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailpaned.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpaned.o `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpaned.Tpo" "$(DEPDIR)/libgail_la-gailpaned.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpaned.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpaned.c' object='libgail_la-gailpaned.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpaned.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailpaned.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpaned.o `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c +- +-libgail_la-gailpaned.obj: gailpaned.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpaned.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailpaned.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpaned.obj `if test -f 'gailpaned.c'; then $(CYGPATH_W) 'gailpaned.c'; else $(CYGPATH_W) '$(srcdir)/gailpaned.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpaned.Tpo" "$(DEPDIR)/libgail_la-gailpaned.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpaned.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpaned.c' object='libgail_la-gailpaned.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpaned.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailpaned.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpaned.obj `if test -f 'gailpaned.c'; then $(CYGPATH_W) 'gailpaned.c'; else $(CYGPATH_W) '$(srcdir)/gailpaned.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailoptionmenu.lo `test -f 'gailoptionmenu.c' || echo '$(srcdir)/'`gailoptionmenu.c + + libgail_la-gailpaned.lo: gailpaned.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpaned.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailpaned.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpaned.lo `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpaned.Tpo" "$(DEPDIR)/libgail_la-gailpaned.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpaned.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpaned.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailpaned.Tpo -c -o libgail_la-gailpaned.lo `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailpaned.Tpo $(DEPDIR)/libgail_la-gailpaned.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpaned.c' object='libgail_la-gailpaned.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpaned.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailpaned.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpaned.lo `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c +- +-libgail_la-gailpixmap.o: gailpixmap.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpixmap.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailpixmap.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpixmap.o `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo" "$(DEPDIR)/libgail_la-gailpixmap.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpixmap.c' object='libgail_la-gailpixmap.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpixmap.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailpixmap.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpixmap.o `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c +- +-libgail_la-gailpixmap.obj: gailpixmap.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpixmap.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailpixmap.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpixmap.obj `if test -f 'gailpixmap.c'; then $(CYGPATH_W) 'gailpixmap.c'; else $(CYGPATH_W) '$(srcdir)/gailpixmap.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo" "$(DEPDIR)/libgail_la-gailpixmap.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpixmap.c' object='libgail_la-gailpixmap.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpixmap.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailpixmap.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpixmap.obj `if test -f 'gailpixmap.c'; then $(CYGPATH_W) 'gailpixmap.c'; else $(CYGPATH_W) '$(srcdir)/gailpixmap.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpaned.lo `test -f 'gailpaned.c' || echo '$(srcdir)/'`gailpaned.c + + libgail_la-gailpixmap.lo: gailpixmap.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpixmap.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailpixmap.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailpixmap.lo `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo" "$(DEPDIR)/libgail_la-gailpixmap.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailpixmap.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailpixmap.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailpixmap.Tpo -c -o libgail_la-gailpixmap.lo `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailpixmap.Tpo $(DEPDIR)/libgail_la-gailpixmap.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailpixmap.c' object='libgail_la-gailpixmap.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailpixmap.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailpixmap.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpixmap.lo `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c +- +-libgail_la-gailprogressbar.o: gailprogressbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailprogressbar.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailprogressbar.o `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" "$(DEPDIR)/libgail_la-gailprogressbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailprogressbar.c' object='libgail_la-gailprogressbar.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailprogressbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailprogressbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailprogressbar.o `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c +- +-libgail_la-gailprogressbar.obj: gailprogressbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailprogressbar.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailprogressbar.obj `if test -f 'gailprogressbar.c'; then $(CYGPATH_W) 'gailprogressbar.c'; else $(CYGPATH_W) '$(srcdir)/gailprogressbar.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" "$(DEPDIR)/libgail_la-gailprogressbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailprogressbar.c' object='libgail_la-gailprogressbar.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailprogressbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailprogressbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailprogressbar.obj `if test -f 'gailprogressbar.c'; then $(CYGPATH_W) 'gailprogressbar.c'; else $(CYGPATH_W) '$(srcdir)/gailprogressbar.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailpixmap.lo `test -f 'gailpixmap.c' || echo '$(srcdir)/'`gailpixmap.c + + libgail_la-gailprogressbar.lo: gailprogressbar.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailprogressbar.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailprogressbar.lo `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo" "$(DEPDIR)/libgail_la-gailprogressbar.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailprogressbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailprogressbar.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailprogressbar.Tpo -c -o libgail_la-gailprogressbar.lo `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailprogressbar.Tpo $(DEPDIR)/libgail_la-gailprogressbar.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailprogressbar.c' object='libgail_la-gailprogressbar.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailprogressbar.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailprogressbar.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailprogressbar.lo `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c +- +-libgail_la-gailradiobutton.o: gailradiobutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiobutton.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiobutton.o `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" "$(DEPDIR)/libgail_la-gailradiobutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiobutton.c' object='libgail_la-gailradiobutton.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiobutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiobutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiobutton.o `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c +- +-libgail_la-gailradiobutton.obj: gailradiobutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiobutton.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiobutton.obj `if test -f 'gailradiobutton.c'; then $(CYGPATH_W) 'gailradiobutton.c'; else $(CYGPATH_W) '$(srcdir)/gailradiobutton.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" "$(DEPDIR)/libgail_la-gailradiobutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiobutton.c' object='libgail_la-gailradiobutton.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiobutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiobutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiobutton.obj `if test -f 'gailradiobutton.c'; then $(CYGPATH_W) 'gailradiobutton.c'; else $(CYGPATH_W) '$(srcdir)/gailradiobutton.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailprogressbar.lo `test -f 'gailprogressbar.c' || echo '$(srcdir)/'`gailprogressbar.c + + libgail_la-gailradiobutton.lo: gailradiobutton.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiobutton.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiobutton.lo `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo" "$(DEPDIR)/libgail_la-gailradiobutton.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiobutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiobutton.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailradiobutton.Tpo -c -o libgail_la-gailradiobutton.lo `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailradiobutton.Tpo $(DEPDIR)/libgail_la-gailradiobutton.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiobutton.c' object='libgail_la-gailradiobutton.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiobutton.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailradiobutton.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiobutton.lo `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c +- +-libgail_la-gailradiomenuitem.o: gailradiomenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiomenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiomenuitem.o `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiomenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiomenuitem.c' object='libgail_la-gailradiomenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiomenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiomenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiomenuitem.o `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c +- +-libgail_la-gailradiomenuitem.obj: gailradiomenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiomenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiomenuitem.obj `if test -f 'gailradiomenuitem.c'; then $(CYGPATH_W) 'gailradiomenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailradiomenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiomenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiomenuitem.c' object='libgail_la-gailradiomenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiomenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiomenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiomenuitem.obj `if test -f 'gailradiomenuitem.c'; then $(CYGPATH_W) 'gailradiomenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailradiomenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiobutton.lo `test -f 'gailradiobutton.c' || echo '$(srcdir)/'`gailradiobutton.c + + libgail_la-gailradiomenuitem.lo: gailradiomenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiomenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiomenuitem.lo `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiomenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiomenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiomenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailradiomenuitem.Tpo -c -o libgail_la-gailradiomenuitem.lo `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailradiomenuitem.Tpo $(DEPDIR)/libgail_la-gailradiomenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiomenuitem.c' object='libgail_la-gailradiomenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiomenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailradiomenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiomenuitem.lo `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c +- +-libgail_la-gailradiosubmenuitem.o: gailradiosubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiosubmenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiosubmenuitem.o `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiosubmenuitem.c' object='libgail_la-gailradiosubmenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiosubmenuitem.o `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c +- +-libgail_la-gailradiosubmenuitem.obj: gailradiosubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiosubmenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiosubmenuitem.obj `if test -f 'gailradiosubmenuitem.c'; then $(CYGPATH_W) 'gailradiosubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailradiosubmenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiosubmenuitem.c' object='libgail_la-gailradiosubmenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiosubmenuitem.obj `if test -f 'gailradiosubmenuitem.c'; then $(CYGPATH_W) 'gailradiosubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailradiosubmenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiomenuitem.lo `test -f 'gailradiomenuitem.c' || echo '$(srcdir)/'`gailradiomenuitem.c + + libgail_la-gailradiosubmenuitem.lo: gailradiosubmenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiosubmenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailradiosubmenuitem.lo `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailradiosubmenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo -c -o libgail_la-gailradiosubmenuitem.lo `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailradiosubmenuitem.Tpo $(DEPDIR)/libgail_la-gailradiosubmenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailradiosubmenuitem.c' object='libgail_la-gailradiosubmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailradiosubmenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiosubmenuitem.lo `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c +- +-libgail_la-gailrange.o: gailrange.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrange.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailrange.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrange.o `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrange.Tpo" "$(DEPDIR)/libgail_la-gailrange.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrange.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrange.c' object='libgail_la-gailrange.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrange.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailrange.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrange.o `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c +- +-libgail_la-gailrange.obj: gailrange.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrange.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailrange.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrange.obj `if test -f 'gailrange.c'; then $(CYGPATH_W) 'gailrange.c'; else $(CYGPATH_W) '$(srcdir)/gailrange.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrange.Tpo" "$(DEPDIR)/libgail_la-gailrange.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrange.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrange.c' object='libgail_la-gailrange.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrange.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailrange.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrange.obj `if test -f 'gailrange.c'; then $(CYGPATH_W) 'gailrange.c'; else $(CYGPATH_W) '$(srcdir)/gailrange.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailradiosubmenuitem.lo `test -f 'gailradiosubmenuitem.c' || echo '$(srcdir)/'`gailradiosubmenuitem.c + + libgail_la-gailrange.lo: gailrange.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrange.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailrange.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrange.lo `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrange.Tpo" "$(DEPDIR)/libgail_la-gailrange.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrange.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrange.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailrange.Tpo -c -o libgail_la-gailrange.lo `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailrange.Tpo $(DEPDIR)/libgail_la-gailrange.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrange.c' object='libgail_la-gailrange.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrange.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailrange.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrange.lo `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c +- +-libgail_la-gailrenderercell.o: gailrenderercell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrenderercell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrenderercell.o `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" "$(DEPDIR)/libgail_la-gailrenderercell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrenderercell.c' object='libgail_la-gailrenderercell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrenderercell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailrenderercell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrenderercell.o `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c +- +-libgail_la-gailrenderercell.obj: gailrenderercell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrenderercell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrenderercell.obj `if test -f 'gailrenderercell.c'; then $(CYGPATH_W) 'gailrenderercell.c'; else $(CYGPATH_W) '$(srcdir)/gailrenderercell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" "$(DEPDIR)/libgail_la-gailrenderercell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrenderercell.c' object='libgail_la-gailrenderercell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrenderercell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailrenderercell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrenderercell.obj `if test -f 'gailrenderercell.c'; then $(CYGPATH_W) 'gailrenderercell.c'; else $(CYGPATH_W) '$(srcdir)/gailrenderercell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrange.lo `test -f 'gailrange.c' || echo '$(srcdir)/'`gailrange.c + + libgail_la-gailrenderercell.lo: gailrenderercell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrenderercell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailrenderercell.lo `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo" "$(DEPDIR)/libgail_la-gailrenderercell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailrenderercell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailrenderercell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailrenderercell.Tpo -c -o libgail_la-gailrenderercell.lo `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailrenderercell.Tpo $(DEPDIR)/libgail_la-gailrenderercell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailrenderercell.c' object='libgail_la-gailrenderercell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailrenderercell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailrenderercell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrenderercell.lo `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c +- +-libgail_la-gailscale.o: gailscale.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscale.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailscale.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscale.o `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscale.Tpo" "$(DEPDIR)/libgail_la-gailscale.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscale.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscale.c' object='libgail_la-gailscale.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscale.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscale.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscale.o `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c +- +-libgail_la-gailscale.obj: gailscale.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscale.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailscale.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscale.obj `if test -f 'gailscale.c'; then $(CYGPATH_W) 'gailscale.c'; else $(CYGPATH_W) '$(srcdir)/gailscale.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscale.Tpo" "$(DEPDIR)/libgail_la-gailscale.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscale.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscale.c' object='libgail_la-gailscale.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscale.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscale.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscale.obj `if test -f 'gailscale.c'; then $(CYGPATH_W) 'gailscale.c'; else $(CYGPATH_W) '$(srcdir)/gailscale.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailrenderercell.lo `test -f 'gailrenderercell.c' || echo '$(srcdir)/'`gailrenderercell.c + + libgail_la-gailscale.lo: gailscale.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscale.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailscale.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscale.lo `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscale.Tpo" "$(DEPDIR)/libgail_la-gailscale.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscale.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscale.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailscale.Tpo -c -o libgail_la-gailscale.lo `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailscale.Tpo $(DEPDIR)/libgail_la-gailscale.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscale.c' object='libgail_la-gailscale.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscale.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailscale.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscale.lo `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c +- +-libgail_la-gailscrollbar.o: gailscrollbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrollbar.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrollbar.o `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" "$(DEPDIR)/libgail_la-gailscrollbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrollbar.c' object='libgail_la-gailscrollbar.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrollbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscrollbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrollbar.o `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c +- +-libgail_la-gailscrollbar.obj: gailscrollbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrollbar.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrollbar.obj `if test -f 'gailscrollbar.c'; then $(CYGPATH_W) 'gailscrollbar.c'; else $(CYGPATH_W) '$(srcdir)/gailscrollbar.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" "$(DEPDIR)/libgail_la-gailscrollbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrollbar.c' object='libgail_la-gailscrollbar.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrollbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscrollbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrollbar.obj `if test -f 'gailscrollbar.c'; then $(CYGPATH_W) 'gailscrollbar.c'; else $(CYGPATH_W) '$(srcdir)/gailscrollbar.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscale.lo `test -f 'gailscale.c' || echo '$(srcdir)/'`gailscale.c + + libgail_la-gailscrollbar.lo: gailscrollbar.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrollbar.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrollbar.lo `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo" "$(DEPDIR)/libgail_la-gailscrollbar.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrollbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrollbar.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailscrollbar.Tpo -c -o libgail_la-gailscrollbar.lo `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailscrollbar.Tpo $(DEPDIR)/libgail_la-gailscrollbar.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrollbar.c' object='libgail_la-gailscrollbar.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrollbar.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailscrollbar.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrollbar.lo `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c +- +-libgail_la-gailscrolledwindow.o: gailscrolledwindow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrolledwindow.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrolledwindow.o `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" "$(DEPDIR)/libgail_la-gailscrolledwindow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrolledwindow.c' object='libgail_la-gailscrolledwindow.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrolledwindow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscrolledwindow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrolledwindow.o `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c +- +-libgail_la-gailscrolledwindow.obj: gailscrolledwindow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrolledwindow.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrolledwindow.obj `if test -f 'gailscrolledwindow.c'; then $(CYGPATH_W) 'gailscrolledwindow.c'; else $(CYGPATH_W) '$(srcdir)/gailscrolledwindow.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" "$(DEPDIR)/libgail_la-gailscrolledwindow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrolledwindow.c' object='libgail_la-gailscrolledwindow.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrolledwindow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailscrolledwindow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrolledwindow.obj `if test -f 'gailscrolledwindow.c'; then $(CYGPATH_W) 'gailscrolledwindow.c'; else $(CYGPATH_W) '$(srcdir)/gailscrolledwindow.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrollbar.lo `test -f 'gailscrollbar.c' || echo '$(srcdir)/'`gailscrollbar.c + + libgail_la-gailscrolledwindow.lo: gailscrolledwindow.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrolledwindow.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailscrolledwindow.lo `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo" "$(DEPDIR)/libgail_la-gailscrolledwindow.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailscrolledwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailscrolledwindow.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailscrolledwindow.Tpo -c -o libgail_la-gailscrolledwindow.lo `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailscrolledwindow.Tpo $(DEPDIR)/libgail_la-gailscrolledwindow.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailscrolledwindow.c' object='libgail_la-gailscrolledwindow.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailscrolledwindow.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailscrolledwindow.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrolledwindow.lo `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c +- +-libgail_la-gailseparator.o: gailseparator.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailseparator.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailseparator.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailseparator.o `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailseparator.Tpo" "$(DEPDIR)/libgail_la-gailseparator.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailseparator.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailseparator.c' object='libgail_la-gailseparator.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailseparator.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailseparator.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailseparator.o `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c +- +-libgail_la-gailseparator.obj: gailseparator.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailseparator.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailseparator.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailseparator.obj `if test -f 'gailseparator.c'; then $(CYGPATH_W) 'gailseparator.c'; else $(CYGPATH_W) '$(srcdir)/gailseparator.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailseparator.Tpo" "$(DEPDIR)/libgail_la-gailseparator.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailseparator.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailseparator.c' object='libgail_la-gailseparator.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailseparator.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailseparator.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailseparator.obj `if test -f 'gailseparator.c'; then $(CYGPATH_W) 'gailseparator.c'; else $(CYGPATH_W) '$(srcdir)/gailseparator.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailscrolledwindow.lo `test -f 'gailscrolledwindow.c' || echo '$(srcdir)/'`gailscrolledwindow.c + + libgail_la-gailseparator.lo: gailseparator.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailseparator.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailseparator.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailseparator.lo `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailseparator.Tpo" "$(DEPDIR)/libgail_la-gailseparator.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailseparator.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailseparator.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailseparator.Tpo -c -o libgail_la-gailseparator.lo `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailseparator.Tpo $(DEPDIR)/libgail_la-gailseparator.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailseparator.c' object='libgail_la-gailseparator.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailseparator.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailseparator.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailseparator.lo `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c +- +-libgail_la-gailspinbutton.o: gailspinbutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailspinbutton.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailspinbutton.o `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" "$(DEPDIR)/libgail_la-gailspinbutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailspinbutton.c' object='libgail_la-gailspinbutton.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailspinbutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailspinbutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailspinbutton.o `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c +- +-libgail_la-gailspinbutton.obj: gailspinbutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailspinbutton.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailspinbutton.obj `if test -f 'gailspinbutton.c'; then $(CYGPATH_W) 'gailspinbutton.c'; else $(CYGPATH_W) '$(srcdir)/gailspinbutton.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" "$(DEPDIR)/libgail_la-gailspinbutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailspinbutton.c' object='libgail_la-gailspinbutton.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailspinbutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailspinbutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailspinbutton.obj `if test -f 'gailspinbutton.c'; then $(CYGPATH_W) 'gailspinbutton.c'; else $(CYGPATH_W) '$(srcdir)/gailspinbutton.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailseparator.lo `test -f 'gailseparator.c' || echo '$(srcdir)/'`gailseparator.c + + libgail_la-gailspinbutton.lo: gailspinbutton.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailspinbutton.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailspinbutton.lo `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo" "$(DEPDIR)/libgail_la-gailspinbutton.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailspinbutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailspinbutton.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailspinbutton.Tpo -c -o libgail_la-gailspinbutton.lo `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailspinbutton.Tpo $(DEPDIR)/libgail_la-gailspinbutton.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailspinbutton.c' object='libgail_la-gailspinbutton.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailspinbutton.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailspinbutton.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailspinbutton.lo `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c +- +-libgail_la-gailsubmenuitem.o: gailsubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailsubmenuitem.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailsubmenuitem.o `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailsubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailsubmenuitem.c' object='libgail_la-gailsubmenuitem.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailsubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailsubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailsubmenuitem.o `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c +- +-libgail_la-gailsubmenuitem.obj: gailsubmenuitem.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailsubmenuitem.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailsubmenuitem.obj `if test -f 'gailsubmenuitem.c'; then $(CYGPATH_W) 'gailsubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailsubmenuitem.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailsubmenuitem.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailsubmenuitem.c' object='libgail_la-gailsubmenuitem.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailsubmenuitem.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailsubmenuitem.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailsubmenuitem.obj `if test -f 'gailsubmenuitem.c'; then $(CYGPATH_W) 'gailsubmenuitem.c'; else $(CYGPATH_W) '$(srcdir)/gailsubmenuitem.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailspinbutton.lo `test -f 'gailspinbutton.c' || echo '$(srcdir)/'`gailspinbutton.c + + libgail_la-gailsubmenuitem.lo: gailsubmenuitem.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailsubmenuitem.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailsubmenuitem.lo `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo" "$(DEPDIR)/libgail_la-gailsubmenuitem.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailsubmenuitem.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailsubmenuitem.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailsubmenuitem.Tpo -c -o libgail_la-gailsubmenuitem.lo `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailsubmenuitem.Tpo $(DEPDIR)/libgail_la-gailsubmenuitem.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailsubmenuitem.c' object='libgail_la-gailsubmenuitem.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailsubmenuitem.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailsubmenuitem.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailsubmenuitem.lo `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c +- +-libgail_la-gailstatusbar.o: gailstatusbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailstatusbar.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailstatusbar.o `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" "$(DEPDIR)/libgail_la-gailstatusbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailstatusbar.c' object='libgail_la-gailstatusbar.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailstatusbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailstatusbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailstatusbar.o `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c +- +-libgail_la-gailstatusbar.obj: gailstatusbar.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailstatusbar.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailstatusbar.obj `if test -f 'gailstatusbar.c'; then $(CYGPATH_W) 'gailstatusbar.c'; else $(CYGPATH_W) '$(srcdir)/gailstatusbar.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" "$(DEPDIR)/libgail_la-gailstatusbar.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailstatusbar.c' object='libgail_la-gailstatusbar.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailstatusbar.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailstatusbar.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailstatusbar.obj `if test -f 'gailstatusbar.c'; then $(CYGPATH_W) 'gailstatusbar.c'; else $(CYGPATH_W) '$(srcdir)/gailstatusbar.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailsubmenuitem.lo `test -f 'gailsubmenuitem.c' || echo '$(srcdir)/'`gailsubmenuitem.c + + libgail_la-gailstatusbar.lo: gailstatusbar.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailstatusbar.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailstatusbar.lo `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo" "$(DEPDIR)/libgail_la-gailstatusbar.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailstatusbar.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailstatusbar.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailstatusbar.Tpo -c -o libgail_la-gailstatusbar.lo `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailstatusbar.Tpo $(DEPDIR)/libgail_la-gailstatusbar.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailstatusbar.c' object='libgail_la-gailstatusbar.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailstatusbar.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailstatusbar.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailstatusbar.lo `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c +- +-libgail_la-gailtextcell.o: gailtextcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextcell.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextcell.o `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo" "$(DEPDIR)/libgail_la-gailtextcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextcell.c' object='libgail_la-gailtextcell.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtextcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextcell.o `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c +- +-libgail_la-gailtextcell.obj: gailtextcell.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextcell.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextcell.obj `if test -f 'gailtextcell.c'; then $(CYGPATH_W) 'gailtextcell.c'; else $(CYGPATH_W) '$(srcdir)/gailtextcell.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo" "$(DEPDIR)/libgail_la-gailtextcell.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextcell.c' object='libgail_la-gailtextcell.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextcell.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtextcell.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextcell.obj `if test -f 'gailtextcell.c'; then $(CYGPATH_W) 'gailtextcell.c'; else $(CYGPATH_W) '$(srcdir)/gailtextcell.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailstatusbar.lo `test -f 'gailstatusbar.c' || echo '$(srcdir)/'`gailstatusbar.c + + libgail_la-gailtextcell.lo: gailtextcell.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextcell.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextcell.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextcell.lo `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo" "$(DEPDIR)/libgail_la-gailtextcell.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextcell.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextcell.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailtextcell.Tpo -c -o libgail_la-gailtextcell.lo `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailtextcell.Tpo $(DEPDIR)/libgail_la-gailtextcell.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextcell.c' object='libgail_la-gailtextcell.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextcell.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailtextcell.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextcell.lo `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c +- +-libgail_la-gailtextview.o: gailtextview.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextview.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextview.o `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextview.Tpo" "$(DEPDIR)/libgail_la-gailtextview.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextview.c' object='libgail_la-gailtextview.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextview.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtextview.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextview.o `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c +- +-libgail_la-gailtextview.obj: gailtextview.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextview.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextview.obj `if test -f 'gailtextview.c'; then $(CYGPATH_W) 'gailtextview.c'; else $(CYGPATH_W) '$(srcdir)/gailtextview.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextview.Tpo" "$(DEPDIR)/libgail_la-gailtextview.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextview.c' object='libgail_la-gailtextview.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextview.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtextview.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextview.obj `if test -f 'gailtextview.c'; then $(CYGPATH_W) 'gailtextview.c'; else $(CYGPATH_W) '$(srcdir)/gailtextview.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextcell.lo `test -f 'gailtextcell.c' || echo '$(srcdir)/'`gailtextcell.c + + libgail_la-gailtextview.lo: gailtextview.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextview.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailtextview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtextview.lo `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtextview.Tpo" "$(DEPDIR)/libgail_la-gailtextview.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtextview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtextview.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailtextview.Tpo -c -o libgail_la-gailtextview.lo `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailtextview.Tpo $(DEPDIR)/libgail_la-gailtextview.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtextview.c' object='libgail_la-gailtextview.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtextview.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailtextview.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextview.lo `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c +- +-libgail_la-gailtogglebutton.o: gailtogglebutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtogglebutton.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtogglebutton.o `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" "$(DEPDIR)/libgail_la-gailtogglebutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtogglebutton.c' object='libgail_la-gailtogglebutton.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtogglebutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtogglebutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtogglebutton.o `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c +- +-libgail_la-gailtogglebutton.obj: gailtogglebutton.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtogglebutton.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtogglebutton.obj `if test -f 'gailtogglebutton.c'; then $(CYGPATH_W) 'gailtogglebutton.c'; else $(CYGPATH_W) '$(srcdir)/gailtogglebutton.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" "$(DEPDIR)/libgail_la-gailtogglebutton.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtogglebutton.c' object='libgail_la-gailtogglebutton.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtogglebutton.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtogglebutton.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtogglebutton.obj `if test -f 'gailtogglebutton.c'; then $(CYGPATH_W) 'gailtogglebutton.c'; else $(CYGPATH_W) '$(srcdir)/gailtogglebutton.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtextview.lo `test -f 'gailtextview.c' || echo '$(srcdir)/'`gailtextview.c + + libgail_la-gailtogglebutton.lo: gailtogglebutton.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtogglebutton.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtogglebutton.lo `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo" "$(DEPDIR)/libgail_la-gailtogglebutton.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtogglebutton.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtogglebutton.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailtogglebutton.Tpo -c -o libgail_la-gailtogglebutton.lo `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailtogglebutton.Tpo $(DEPDIR)/libgail_la-gailtogglebutton.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtogglebutton.c' object='libgail_la-gailtogglebutton.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtogglebutton.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailtogglebutton.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtogglebutton.lo `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c +- +-libgail_la-gailtoplevel.o: gailtoplevel.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtoplevel.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtoplevel.o `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" "$(DEPDIR)/libgail_la-gailtoplevel.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtoplevel.c' object='libgail_la-gailtoplevel.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtoplevel.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtoplevel.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtoplevel.o `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c +- +-libgail_la-gailtoplevel.obj: gailtoplevel.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtoplevel.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtoplevel.obj `if test -f 'gailtoplevel.c'; then $(CYGPATH_W) 'gailtoplevel.c'; else $(CYGPATH_W) '$(srcdir)/gailtoplevel.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" "$(DEPDIR)/libgail_la-gailtoplevel.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtoplevel.c' object='libgail_la-gailtoplevel.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtoplevel.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtoplevel.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtoplevel.obj `if test -f 'gailtoplevel.c'; then $(CYGPATH_W) 'gailtoplevel.c'; else $(CYGPATH_W) '$(srcdir)/gailtoplevel.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtogglebutton.lo `test -f 'gailtogglebutton.c' || echo '$(srcdir)/'`gailtogglebutton.c + + libgail_la-gailtoplevel.lo: gailtoplevel.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtoplevel.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtoplevel.lo `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo" "$(DEPDIR)/libgail_la-gailtoplevel.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtoplevel.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtoplevel.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailtoplevel.Tpo -c -o libgail_la-gailtoplevel.lo `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailtoplevel.Tpo $(DEPDIR)/libgail_la-gailtoplevel.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtoplevel.c' object='libgail_la-gailtoplevel.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtoplevel.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailtoplevel.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtoplevel.lo `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c +- +-libgail_la-gailtreeview.o: gailtreeview.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtreeview.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailtreeview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtreeview.o `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo" "$(DEPDIR)/libgail_la-gailtreeview.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtreeview.c' object='libgail_la-gailtreeview.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtreeview.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtreeview.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtreeview.o `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c +- +-libgail_la-gailtreeview.obj: gailtreeview.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtreeview.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailtreeview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtreeview.obj `if test -f 'gailtreeview.c'; then $(CYGPATH_W) 'gailtreeview.c'; else $(CYGPATH_W) '$(srcdir)/gailtreeview.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo" "$(DEPDIR)/libgail_la-gailtreeview.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtreeview.c' object='libgail_la-gailtreeview.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtreeview.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailtreeview.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtreeview.obj `if test -f 'gailtreeview.c'; then $(CYGPATH_W) 'gailtreeview.c'; else $(CYGPATH_W) '$(srcdir)/gailtreeview.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtoplevel.lo `test -f 'gailtoplevel.c' || echo '$(srcdir)/'`gailtoplevel.c + + libgail_la-gailtreeview.lo: gailtreeview.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtreeview.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailtreeview.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailtreeview.lo `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo" "$(DEPDIR)/libgail_la-gailtreeview.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailtreeview.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailtreeview.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailtreeview.Tpo -c -o libgail_la-gailtreeview.lo `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailtreeview.Tpo $(DEPDIR)/libgail_la-gailtreeview.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailtreeview.c' object='libgail_la-gailtreeview.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailtreeview.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailtreeview.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtreeview.lo `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c +- +-libgail_la-gailutil.o: gailutil.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailutil.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailutil.o `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailutil.Tpo" "$(DEPDIR)/libgail_la-gailutil.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailutil.c' object='libgail_la-gailutil.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailutil.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailutil.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailutil.o `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c +- +-libgail_la-gailutil.obj: gailutil.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailutil.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailutil.obj `if test -f 'gailutil.c'; then $(CYGPATH_W) 'gailutil.c'; else $(CYGPATH_W) '$(srcdir)/gailutil.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailutil.Tpo" "$(DEPDIR)/libgail_la-gailutil.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailutil.c' object='libgail_la-gailutil.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailutil.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailutil.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailutil.obj `if test -f 'gailutil.c'; then $(CYGPATH_W) 'gailutil.c'; else $(CYGPATH_W) '$(srcdir)/gailutil.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailtreeview.lo `test -f 'gailtreeview.c' || echo '$(srcdir)/'`gailtreeview.c + + libgail_la-gailutil.lo: gailutil.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailutil.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailutil.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailutil.lo `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailutil.Tpo" "$(DEPDIR)/libgail_la-gailutil.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailutil.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailutil.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailutil.Tpo -c -o libgail_la-gailutil.lo `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailutil.Tpo $(DEPDIR)/libgail_la-gailutil.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailutil.c' object='libgail_la-gailutil.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailutil.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailutil.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailutil.lo `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c +- +-libgail_la-gailwidget.o: gailwidget.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwidget.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailwidget.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwidget.o `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwidget.Tpo" "$(DEPDIR)/libgail_la-gailwidget.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwidget.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwidget.c' object='libgail_la-gailwidget.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwidget.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailwidget.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwidget.o `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c +- +-libgail_la-gailwidget.obj: gailwidget.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwidget.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailwidget.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwidget.obj `if test -f 'gailwidget.c'; then $(CYGPATH_W) 'gailwidget.c'; else $(CYGPATH_W) '$(srcdir)/gailwidget.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwidget.Tpo" "$(DEPDIR)/libgail_la-gailwidget.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwidget.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwidget.c' object='libgail_la-gailwidget.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwidget.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailwidget.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwidget.obj `if test -f 'gailwidget.c'; then $(CYGPATH_W) 'gailwidget.c'; else $(CYGPATH_W) '$(srcdir)/gailwidget.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailutil.lo `test -f 'gailutil.c' || echo '$(srcdir)/'`gailutil.c + + libgail_la-gailwidget.lo: gailwidget.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwidget.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailwidget.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwidget.lo `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwidget.Tpo" "$(DEPDIR)/libgail_la-gailwidget.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwidget.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwidget.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailwidget.Tpo -c -o libgail_la-gailwidget.lo `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailwidget.Tpo $(DEPDIR)/libgail_la-gailwidget.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwidget.c' object='libgail_la-gailwidget.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwidget.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailwidget.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwidget.lo `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c +- +-libgail_la-gailwindow.o: gailwindow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwindow.o -MD -MP -MF "$(DEPDIR)/libgail_la-gailwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwindow.o `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwindow.Tpo" "$(DEPDIR)/libgail_la-gailwindow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwindow.c' object='libgail_la-gailwindow.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwindow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailwindow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwindow.o `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c +- +-libgail_la-gailwindow.obj: gailwindow.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwindow.obj -MD -MP -MF "$(DEPDIR)/libgail_la-gailwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwindow.obj `if test -f 'gailwindow.c'; then $(CYGPATH_W) 'gailwindow.c'; else $(CYGPATH_W) '$(srcdir)/gailwindow.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwindow.Tpo" "$(DEPDIR)/libgail_la-gailwindow.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwindow.c' object='libgail_la-gailwindow.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwindow.Po' tmpdepfile='$(DEPDIR)/libgail_la-gailwindow.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwindow.obj `if test -f 'gailwindow.c'; then $(CYGPATH_W) 'gailwindow.c'; else $(CYGPATH_W) '$(srcdir)/gailwindow.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwidget.lo `test -f 'gailwidget.c' || echo '$(srcdir)/'`gailwidget.c + + libgail_la-gailwindow.lo: gailwindow.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwindow.lo -MD -MP -MF "$(DEPDIR)/libgail_la-gailwindow.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libgail_la-gailwindow.lo `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libgail_la-gailwindow.Tpo" "$(DEPDIR)/libgail_la-gailwindow.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libgail_la-gailwindow.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -MT libgail_la-gailwindow.lo -MD -MP -MF $(DEPDIR)/libgail_la-gailwindow.Tpo -c -o libgail_la-gailwindow.lo `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgail_la-gailwindow.Tpo $(DEPDIR)/libgail_la-gailwindow.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gailwindow.c' object='libgail_la-gailwindow.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libgail_la-gailwindow.Plo' tmpdepfile='$(DEPDIR)/libgail_la-gailwindow.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwindow.lo `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgail_la_CPPFLAGS) $(CPPFLAGS) $(libgail_la_CFLAGS) $(CFLAGS) -c -o libgail_la-gailwindow.lo `test -f 'gailwindow.c' || echo '$(srcdir)/'`gailwindow.c + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-libgailincludeHEADERS_INSTALL = $(INSTALL_HEADER) + install-libgailincludeHEADERS: $(libgailinclude_HEADERS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(libgailincludedir) ++ test -z "$(libgailincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgailincludedir)" + @list='$(libgailinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(libgailincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgailincludedir)/$$f"; \ +- $(libgailincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgailincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(libgailincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgailincludedir)/$$f'"; \ ++ $(libgailincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgailincludedir)/$$f"; \ + done + + uninstall-libgailincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(libgailinclude_HEADERS)'; for p in $$list; do \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(libgailincludedir)/$$f"; \ +- rm -f $(DESTDIR)$(libgailincludedir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libgailincludedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libgailincludedir)/$$f"; \ + done + + # This directory's subdirectories are mostly independent; you can cd +@@ -2688,7 +1101,13 @@ uninstall-libgailincludeHEADERS: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -2700,15 +1119,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -2729,7 +1153,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -2740,35 +1164,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -2776,23 +1195,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -2804,29 +1223,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -2837,15 +1250,19 @@ distdir: $(DISTFILES) + || 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 \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -2856,8 +1273,9 @@ check: check-recursive + all-am: Makefile $(LTLIBRARIES) $(HEADERS) + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(moduledir) $(DESTDIR)$(libgailincludedir) +- ++ for dir in "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(libgailincludedir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -2877,7 +1295,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -2891,24 +1309,35 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + +-install-data-am: install-libgailincludeHEADERS install-moduleLTLIBRARIES ++install-data-am: install-libgailincludeHEADERS \ ++ install-moduleLTLIBRARIES ++ ++install-dvi: install-dvi-recursive + + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -2929,30 +1358,28 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libgailincludeHEADERS \ ++uninstall-am: uninstall-libgailincludeHEADERS \ + uninstall-moduleLTLIBRARIES + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool \ +- clean-moduleLTLIBRARIES clean-recursive ctags ctags-recursive \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-recursive distclean-tags distdir dvi dvi-am \ +- dvi-recursive info info-am info-recursive install install-am \ +- install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive \ +- install-libgailincludeHEADERS install-man \ +- install-moduleLTLIBRARIES install-recursive install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- installdirs-recursive maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ +- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ +- tags-recursive uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-libgailincludeHEADERS \ +- uninstall-moduleLTLIBRARIES uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool clean-moduleLTLIBRARIES ctags ctags-recursive \ ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libgailincludeHEADERS install-man \ ++ install-moduleLTLIBRARIES install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am \ ++ uninstall-libgailincludeHEADERS uninstall-moduleLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/other/gail/tests/Makefile.in 2008-10-17 06:07:19.000000000 +0200 ++++ gtk+-2.14.4/modules/other/gail/tests/Makefile.in 2008-11-11 18:56:06.192634399 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,183 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = modules/other/gail/tests ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(moduledir)" ++moduleLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++@OS_WIN32_FALSE@libferret_la_DEPENDENCIES = \ ++@OS_WIN32_FALSE@ $(top_builddir)/gtk/$(gtktargetlib) \ ++@OS_WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ++am__libferret_la_SOURCES_DIST = testlib.c testlib.h ferret.c ++@OS_WIN32_FALSE@am_libferret_la_OBJECTS = testlib.lo ferret.lo ++libferret_la_OBJECTS = $(am_libferret_la_OBJECTS) ++libferret_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libferret_la_LDFLAGS) $(LDFLAGS) -o $@ ++@OS_WIN32_FALSE@am_libferret_la_rpath = -rpath $(moduledir) ++libtestaction_la_LIBADD = ++am_libtestaction_la_OBJECTS = testaction.lo ++libtestaction_la_OBJECTS = $(am_libtestaction_la_OBJECTS) ++libtestaction_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestaction_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestbutton_la_LIBADD = ++am_libtestbutton_la_OBJECTS = testlib.lo testbutton.lo ++libtestbutton_la_OBJECTS = $(am_libtestbutton_la_OBJECTS) ++libtestbutton_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestbutton_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestcombo_la_LIBADD = ++am_libtestcombo_la_OBJECTS = testlib.lo testcombo.lo ++libtestcombo_la_OBJECTS = $(am_libtestcombo_la_OBJECTS) ++libtestcombo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestcombo_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestcomponent_la_LIBADD = ++am_libtestcomponent_la_OBJECTS = testcomponent.lo ++libtestcomponent_la_OBJECTS = $(am_libtestcomponent_la_OBJECTS) ++libtestcomponent_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestcomponent_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestimage_la_LIBADD = ++am_libtestimage_la_OBJECTS = testimage.lo ++libtestimage_la_OBJECTS = $(am_libtestimage_la_OBJECTS) ++libtestimage_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestimage_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestmenuitem_la_LIBADD = ++am_libtestmenuitem_la_OBJECTS = testlib.lo testmenuitem.lo ++libtestmenuitem_la_OBJECTS = $(am_libtestmenuitem_la_OBJECTS) ++libtestmenuitem_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestmenuitem_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestnotebook_la_LIBADD = ++am_libtestnotebook_la_OBJECTS = testlib.lo testnotebook.lo ++libtestnotebook_la_OBJECTS = $(am_libtestnotebook_la_OBJECTS) ++libtestnotebook_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestnotebook_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestobject_la_LIBADD = ++am_libtestobject_la_OBJECTS = testlib.lo testobject.lo ++libtestobject_la_OBJECTS = $(am_libtestobject_la_OBJECTS) ++libtestobject_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestobject_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestoptionmenu_la_LIBADD = ++am_libtestoptionmenu_la_OBJECTS = testlib.lo testoptionmenu.lo ++libtestoptionmenu_la_OBJECTS = $(am_libtestoptionmenu_la_OBJECTS) ++libtestoptionmenu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestoptionmenu_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestpaned_la_LIBADD = ++am_libtestpaned_la_OBJECTS = testlib.lo testpaned.lo ++libtestpaned_la_OBJECTS = $(am_libtestpaned_la_OBJECTS) ++libtestpaned_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestpaned_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestprops_la_LIBADD = ++am_libtestprops_la_OBJECTS = testlib.lo testprops.lo ++libtestprops_la_OBJECTS = $(am_libtestprops_la_OBJECTS) ++libtestprops_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestprops_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestselection_la_LIBADD = ++am_libtestselection_la_OBJECTS = testselection.lo ++libtestselection_la_OBJECTS = $(am_libtestselection_la_OBJECTS) ++libtestselection_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestselection_la_LDFLAGS) $(LDFLAGS) -o $@ ++libteststatusbar_la_LIBADD = ++am_libteststatusbar_la_OBJECTS = teststatusbar.lo ++libteststatusbar_la_OBJECTS = $(am_libteststatusbar_la_OBJECTS) ++libteststatusbar_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libteststatusbar_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtesttable_la_LIBADD = ++am_libtesttable_la_OBJECTS = testlib.lo testtextlib.lo testtable.lo ++libtesttable_la_OBJECTS = $(am_libtesttable_la_OBJECTS) ++libtesttable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtesttable_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtesttext_la_LIBADD = ++am_libtesttext_la_OBJECTS = testlib.lo testtextlib.lo testtext.lo ++libtesttext_la_OBJECTS = $(am_libtesttext_la_OBJECTS) ++libtesttext_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtesttext_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtesttoplevel_la_LIBADD = ++am_libtesttoplevel_la_OBJECTS = testlib.lo testtoplevel.lo ++libtesttoplevel_la_OBJECTS = $(am_libtesttoplevel_la_OBJECTS) ++libtesttoplevel_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtesttoplevel_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtesttreetable_la_LIBADD = ++am_libtesttreetable_la_OBJECTS = testlib.lo testtreetable.lo ++libtesttreetable_la_OBJECTS = $(am_libtesttreetable_la_OBJECTS) ++libtesttreetable_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtesttreetable_la_LDFLAGS) $(LDFLAGS) -o $@ ++libtestvalues_la_LIBADD = ++am_libtestvalues_la_OBJECTS = testvalues.lo ++libtestvalues_la_OBJECTS = $(am_libtestvalues_la_OBJECTS) ++libtestvalues_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libtestvalues_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libferret_la_SOURCES) $(libtestaction_la_SOURCES) \ ++ $(libtestbutton_la_SOURCES) $(libtestcombo_la_SOURCES) \ ++ $(libtestcomponent_la_SOURCES) $(libtestimage_la_SOURCES) \ ++ $(libtestmenuitem_la_SOURCES) $(libtestnotebook_la_SOURCES) \ ++ $(libtestobject_la_SOURCES) $(libtestoptionmenu_la_SOURCES) \ ++ $(libtestpaned_la_SOURCES) $(libtestprops_la_SOURCES) \ ++ $(libtestselection_la_SOURCES) $(libteststatusbar_la_SOURCES) \ ++ $(libtesttable_la_SOURCES) $(libtesttext_la_SOURCES) \ ++ $(libtesttoplevel_la_SOURCES) $(libtesttreetable_la_SOURCES) \ ++ $(libtestvalues_la_SOURCES) ++DIST_SOURCES = $(am__libferret_la_SOURCES_DIST) \ ++ $(libtestaction_la_SOURCES) $(libtestbutton_la_SOURCES) \ ++ $(libtestcombo_la_SOURCES) $(libtestcomponent_la_SOURCES) \ ++ $(libtestimage_la_SOURCES) $(libtestmenuitem_la_SOURCES) \ ++ $(libtestnotebook_la_SOURCES) $(libtestobject_la_SOURCES) \ ++ $(libtestoptionmenu_la_SOURCES) $(libtestpaned_la_SOURCES) \ ++ $(libtestprops_la_SOURCES) $(libtestselection_la_SOURCES) \ ++ $(libteststatusbar_la_SOURCES) $(libtesttable_la_SOURCES) \ ++ $(libtesttext_la_SOURCES) $(libtesttoplevel_la_SOURCES) \ ++ $(libtesttreetable_la_SOURCES) $(libtestvalues_la_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +219,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +244,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +251,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +277,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62274,19 +105069,1138 @@ diff -urN gtk+2.0-2.14.4.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14.4 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/other/Makefile.in gtk+2.0-2.14.4/modules/other/Makefile.in ---- gtk+2.0-2.14.4.old/modules/other/Makefile.in 2008-10-17 01:07:18.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/other/Makefile.in 2008-11-04 15:37:10.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +296,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +306,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +335,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +354,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +365,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +377,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +418,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +427,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,15 +462,11 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @OS_WIN32_TRUE@no_undefined = -no-undefined +- + moduledir = $(libdir)/gtk-2.0/modules +- + @OS_WIN32_FALSE@module_LTLIBRARIES = \ + @OS_WIN32_FALSE@ libferret.la + +- + noinst_LTLIBRARIES = \ + libtestaction.la \ + libtestbutton.la \ +@@ -435,7 +487,6 @@ noinst_LTLIBRARIES = \ + libtesttreetable.la \ + libtestvalues.la + +- + AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ +@@ -444,34 +495,28 @@ AM_CPPFLAGS = \ + -I$(top_builddir)/gtk \ + -DGDK_DISABLE_DEPRECATED + +- + AM_CFLAGS = \ + $(GTK_DEP_CFLAGS) \ + $(GTK_DEBUG_FLAGS) + +- + @OS_WIN32_FALSE@libferret_la_SOURCES = \ + @OS_WIN32_FALSE@ testlib.c \ + @OS_WIN32_FALSE@ testlib.h \ + @OS_WIN32_FALSE@ ferret.c + +- + @OS_WIN32_FALSE@libferret_la_LDFLAGS = \ + @OS_WIN32_FALSE@ -rpath $(moduledir) -module -avoid-version \ + @OS_WIN32_FALSE@ $(no_undefined) \ + @OS_WIN32_FALSE@ $(LDFLAGS) + +- + @OS_WIN32_FALSE@libferret_la_LIBADD = \ + @OS_WIN32_FALSE@ $(top_builddir)/gtk/$(gtktargetlib) \ + @OS_WIN32_FALSE@ $(GTK_DEP_LIBS) \ + @OS_WIN32_FALSE@ $(GAIL_INET_LIBS) + +- + libtestaction_la_SOURCES = \ + testaction.c + +- + libtestaction_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -479,13 +524,11 @@ libtestaction_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestbutton_la_SOURCES = \ + testlib.c \ + testlib.h \ + testbutton.c + +- + libtestbutton_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -493,13 +536,11 @@ libtestbutton_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestcombo_la_SOURCES = \ + testlib.c \ + testlib.h \ + testcombo.c + +- + libtestcombo_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -507,11 +548,9 @@ libtestcombo_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestcomponent_la_SOURCES = \ + testcomponent.c + +- + libtestcomponent_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -519,11 +558,9 @@ libtestcomponent_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestimage_la_SOURCES = \ + testimage.c + +- + libtestimage_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -531,13 +568,11 @@ libtestimage_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestmenuitem_la_SOURCES = \ + testlib.c \ + testlib.h \ + testmenuitem.c + +- + libtestmenuitem_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -545,13 +580,11 @@ libtestmenuitem_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestnotebook_la_SOURCES = \ + testlib.c \ + testlib.h \ + testnotebook.c + +- + libtestnotebook_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -559,13 +592,11 @@ libtestnotebook_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestobject_la_SOURCES = \ + testlib.c \ + testlib.h \ + testobject.c + +- + libtestobject_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -573,13 +604,11 @@ libtestobject_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestoptionmenu_la_SOURCES = \ + testlib.c \ + testlib.h \ + testoptionmenu.c + +- + libtestoptionmenu_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -587,13 +616,11 @@ libtestoptionmenu_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestpaned_la_SOURCES = \ + testlib.c \ + testlib.h \ + testpaned.c + +- + libtestpaned_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -601,13 +628,11 @@ libtestpaned_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestprops_la_SOURCES = \ + testlib.c \ + testlib.h \ + testprops.c + +- + libtestprops_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -615,11 +640,9 @@ libtestprops_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestselection_la_SOURCES = \ + testselection.c + +- + libtestselection_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -627,11 +650,9 @@ libtestselection_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libteststatusbar_la_SOURCES = \ + teststatusbar.c + +- + libteststatusbar_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -639,7 +660,6 @@ libteststatusbar_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtesttable_la_SOURCES = \ + testlib.c \ + testlib.h \ +@@ -647,7 +667,6 @@ libtesttable_la_SOURCES = \ + testtextlib.h \ + testtable.c + +- + libtesttable_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -655,7 +674,6 @@ libtesttable_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtesttext_la_SOURCES = \ + testlib.c \ + testlib.h \ +@@ -663,7 +681,6 @@ libtesttext_la_SOURCES = \ + testtextlib.h \ + testtext.c + +- + libtesttext_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -671,13 +688,11 @@ libtesttext_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtesttoplevel_la_SOURCES = \ + testlib.c \ + testlib.h \ + testtoplevel.c + +- + libtesttoplevel_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -685,13 +700,11 @@ libtesttoplevel_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtesttreetable_la_SOURCES = \ + testlib.c \ + testlib.h \ + testtreetable.c + +- + libtesttreetable_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -699,11 +712,9 @@ libtesttreetable_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +- + libtestvalues_la_SOURCES = \ + testvalues.c + +- + libtestvalues_la_LDFLAGS = \ + -rpath $(moduledir) -module -avoid-version $(no_undefined) \ + $(top_builddir)/gtk/$(gtktargetlib) \ +@@ -711,150 +722,63 @@ libtestvalues_la_LDFLAGS = \ + $(GTK_DEP_LIBS) \ + $(LDFLAGS) + +-subdir = modules/other/gail/tests +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(module_LTLIBRARIES) $(noinst_LTLIBRARIES) +- +-@OS_WIN32_TRUE@libferret_la_DEPENDENCIES = +-@OS_WIN32_FALSE@libferret_la_DEPENDENCIES = \ +-@OS_WIN32_FALSE@ $(top_builddir)/gtk/$(gtktargetlib) +-am__libferret_la_SOURCES_DIST = testlib.c testlib.h ferret.c +-@OS_WIN32_FALSE@am_libferret_la_OBJECTS = testlib.lo ferret.lo +-libferret_la_OBJECTS = $(am_libferret_la_OBJECTS) +-libtestaction_la_LIBADD = +-am_libtestaction_la_OBJECTS = testaction.lo +-libtestaction_la_OBJECTS = $(am_libtestaction_la_OBJECTS) +-libtestbutton_la_LIBADD = +-am_libtestbutton_la_OBJECTS = testlib.lo testbutton.lo +-libtestbutton_la_OBJECTS = $(am_libtestbutton_la_OBJECTS) +-libtestcombo_la_LIBADD = +-am_libtestcombo_la_OBJECTS = testlib.lo testcombo.lo +-libtestcombo_la_OBJECTS = $(am_libtestcombo_la_OBJECTS) +-libtestcomponent_la_LIBADD = +-am_libtestcomponent_la_OBJECTS = testcomponent.lo +-libtestcomponent_la_OBJECTS = $(am_libtestcomponent_la_OBJECTS) +-libtestimage_la_LIBADD = +-am_libtestimage_la_OBJECTS = testimage.lo +-libtestimage_la_OBJECTS = $(am_libtestimage_la_OBJECTS) +-libtestmenuitem_la_LIBADD = +-am_libtestmenuitem_la_OBJECTS = testlib.lo testmenuitem.lo +-libtestmenuitem_la_OBJECTS = $(am_libtestmenuitem_la_OBJECTS) +-libtestnotebook_la_LIBADD = +-am_libtestnotebook_la_OBJECTS = testlib.lo testnotebook.lo +-libtestnotebook_la_OBJECTS = $(am_libtestnotebook_la_OBJECTS) +-libtestobject_la_LIBADD = +-am_libtestobject_la_OBJECTS = testlib.lo testobject.lo +-libtestobject_la_OBJECTS = $(am_libtestobject_la_OBJECTS) +-libtestoptionmenu_la_LIBADD = +-am_libtestoptionmenu_la_OBJECTS = testlib.lo testoptionmenu.lo +-libtestoptionmenu_la_OBJECTS = $(am_libtestoptionmenu_la_OBJECTS) +-libtestpaned_la_LIBADD = +-am_libtestpaned_la_OBJECTS = testlib.lo testpaned.lo +-libtestpaned_la_OBJECTS = $(am_libtestpaned_la_OBJECTS) +-libtestprops_la_LIBADD = +-am_libtestprops_la_OBJECTS = testlib.lo testprops.lo +-libtestprops_la_OBJECTS = $(am_libtestprops_la_OBJECTS) +-libtestselection_la_LIBADD = +-am_libtestselection_la_OBJECTS = testselection.lo +-libtestselection_la_OBJECTS = $(am_libtestselection_la_OBJECTS) +-libteststatusbar_la_LIBADD = +-am_libteststatusbar_la_OBJECTS = teststatusbar.lo +-libteststatusbar_la_OBJECTS = $(am_libteststatusbar_la_OBJECTS) +-libtesttable_la_LIBADD = +-am_libtesttable_la_OBJECTS = testlib.lo testtextlib.lo testtable.lo +-libtesttable_la_OBJECTS = $(am_libtesttable_la_OBJECTS) +-libtesttext_la_LIBADD = +-am_libtesttext_la_OBJECTS = testlib.lo testtextlib.lo testtext.lo +-libtesttext_la_OBJECTS = $(am_libtesttext_la_OBJECTS) +-libtesttoplevel_la_LIBADD = +-am_libtesttoplevel_la_OBJECTS = testlib.lo testtoplevel.lo +-libtesttoplevel_la_OBJECTS = $(am_libtesttoplevel_la_OBJECTS) +-libtesttreetable_la_LIBADD = +-am_libtesttreetable_la_OBJECTS = testlib.lo testtreetable.lo +-libtesttreetable_la_OBJECTS = $(am_libtesttreetable_la_OBJECTS) +-libtestvalues_la_LIBADD = +-am_libtestvalues_la_OBJECTS = testvalues.lo +-libtestvalues_la_OBJECTS = $(am_libtestvalues_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ferret.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testaction.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testbutton.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testcombo.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testcomponent.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testimage.Plo ./$(DEPDIR)/testlib.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testmenuitem.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testnotebook.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testobject.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testoptionmenu.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testpaned.Plo ./$(DEPDIR)/testprops.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testselection.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/teststatusbar.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtable.Plo ./$(DEPDIR)/testtext.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtextlib.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtoplevel.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreetable.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testvalues.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(am__libferret_la_SOURCES_DIST) \ +- $(libtestaction_la_SOURCES) $(libtestbutton_la_SOURCES) \ +- $(libtestcombo_la_SOURCES) $(libtestcomponent_la_SOURCES) \ +- $(libtestimage_la_SOURCES) $(libtestmenuitem_la_SOURCES) \ +- $(libtestnotebook_la_SOURCES) $(libtestobject_la_SOURCES) \ +- $(libtestoptionmenu_la_SOURCES) $(libtestpaned_la_SOURCES) \ +- $(libtestprops_la_SOURCES) $(libtestselection_la_SOURCES) \ +- $(libteststatusbar_la_SOURCES) $(libtesttable_la_SOURCES) \ +- $(libtesttext_la_SOURCES) $(libtesttoplevel_la_SOURCES) \ +- $(libtesttreetable_la_SOURCES) $(libtestvalues_la_SOURCES) +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(libferret_la_SOURCES) $(libtestaction_la_SOURCES) $(libtestbutton_la_SOURCES) $(libtestcombo_la_SOURCES) $(libtestcomponent_la_SOURCES) $(libtestimage_la_SOURCES) $(libtestmenuitem_la_SOURCES) $(libtestnotebook_la_SOURCES) $(libtestobject_la_SOURCES) $(libtestoptionmenu_la_SOURCES) $(libtestpaned_la_SOURCES) $(libtestprops_la_SOURCES) $(libtestselection_la_SOURCES) $(libteststatusbar_la_SOURCES) $(libtesttable_la_SOURCES) $(libtesttext_la_SOURCES) $(libtesttoplevel_la_SOURCES) $(libtesttreetable_la_SOURCES) $(libtestvalues_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/other/gail/tests/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/other/gail/tests/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-moduleLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-moduleLTLIBRARIES: $(module_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(moduledir) ++ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f"; \ +- $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \ + else :; fi; \ + done + + uninstall-moduleLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(moduledir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$p"; \ + done + + clean-moduleLTLIBRARIES: + -test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES) + @list='$(module_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +@@ -863,51 +787,51 @@ clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libferret.la: $(libferret_la_OBJECTS) $(libferret_la_DEPENDENCIES) +- $(LINK) -rpath $(moduledir) $(libferret_la_LDFLAGS) $(libferret_la_OBJECTS) $(libferret_la_LIBADD) $(LIBS) ++ $(libferret_la_LINK) $(am_libferret_la_rpath) $(libferret_la_OBJECTS) $(libferret_la_LIBADD) $(LIBS) + libtestaction.la: $(libtestaction_la_OBJECTS) $(libtestaction_la_DEPENDENCIES) +- $(LINK) $(libtestaction_la_LDFLAGS) $(libtestaction_la_OBJECTS) $(libtestaction_la_LIBADD) $(LIBS) ++ $(libtestaction_la_LINK) $(libtestaction_la_OBJECTS) $(libtestaction_la_LIBADD) $(LIBS) + libtestbutton.la: $(libtestbutton_la_OBJECTS) $(libtestbutton_la_DEPENDENCIES) +- $(LINK) $(libtestbutton_la_LDFLAGS) $(libtestbutton_la_OBJECTS) $(libtestbutton_la_LIBADD) $(LIBS) ++ $(libtestbutton_la_LINK) $(libtestbutton_la_OBJECTS) $(libtestbutton_la_LIBADD) $(LIBS) + libtestcombo.la: $(libtestcombo_la_OBJECTS) $(libtestcombo_la_DEPENDENCIES) +- $(LINK) $(libtestcombo_la_LDFLAGS) $(libtestcombo_la_OBJECTS) $(libtestcombo_la_LIBADD) $(LIBS) ++ $(libtestcombo_la_LINK) $(libtestcombo_la_OBJECTS) $(libtestcombo_la_LIBADD) $(LIBS) + libtestcomponent.la: $(libtestcomponent_la_OBJECTS) $(libtestcomponent_la_DEPENDENCIES) +- $(LINK) $(libtestcomponent_la_LDFLAGS) $(libtestcomponent_la_OBJECTS) $(libtestcomponent_la_LIBADD) $(LIBS) ++ $(libtestcomponent_la_LINK) $(libtestcomponent_la_OBJECTS) $(libtestcomponent_la_LIBADD) $(LIBS) + libtestimage.la: $(libtestimage_la_OBJECTS) $(libtestimage_la_DEPENDENCIES) +- $(LINK) $(libtestimage_la_LDFLAGS) $(libtestimage_la_OBJECTS) $(libtestimage_la_LIBADD) $(LIBS) ++ $(libtestimage_la_LINK) $(libtestimage_la_OBJECTS) $(libtestimage_la_LIBADD) $(LIBS) + libtestmenuitem.la: $(libtestmenuitem_la_OBJECTS) $(libtestmenuitem_la_DEPENDENCIES) +- $(LINK) $(libtestmenuitem_la_LDFLAGS) $(libtestmenuitem_la_OBJECTS) $(libtestmenuitem_la_LIBADD) $(LIBS) ++ $(libtestmenuitem_la_LINK) $(libtestmenuitem_la_OBJECTS) $(libtestmenuitem_la_LIBADD) $(LIBS) + libtestnotebook.la: $(libtestnotebook_la_OBJECTS) $(libtestnotebook_la_DEPENDENCIES) +- $(LINK) $(libtestnotebook_la_LDFLAGS) $(libtestnotebook_la_OBJECTS) $(libtestnotebook_la_LIBADD) $(LIBS) ++ $(libtestnotebook_la_LINK) $(libtestnotebook_la_OBJECTS) $(libtestnotebook_la_LIBADD) $(LIBS) + libtestobject.la: $(libtestobject_la_OBJECTS) $(libtestobject_la_DEPENDENCIES) +- $(LINK) $(libtestobject_la_LDFLAGS) $(libtestobject_la_OBJECTS) $(libtestobject_la_LIBADD) $(LIBS) ++ $(libtestobject_la_LINK) $(libtestobject_la_OBJECTS) $(libtestobject_la_LIBADD) $(LIBS) + libtestoptionmenu.la: $(libtestoptionmenu_la_OBJECTS) $(libtestoptionmenu_la_DEPENDENCIES) +- $(LINK) $(libtestoptionmenu_la_LDFLAGS) $(libtestoptionmenu_la_OBJECTS) $(libtestoptionmenu_la_LIBADD) $(LIBS) ++ $(libtestoptionmenu_la_LINK) $(libtestoptionmenu_la_OBJECTS) $(libtestoptionmenu_la_LIBADD) $(LIBS) + libtestpaned.la: $(libtestpaned_la_OBJECTS) $(libtestpaned_la_DEPENDENCIES) +- $(LINK) $(libtestpaned_la_LDFLAGS) $(libtestpaned_la_OBJECTS) $(libtestpaned_la_LIBADD) $(LIBS) ++ $(libtestpaned_la_LINK) $(libtestpaned_la_OBJECTS) $(libtestpaned_la_LIBADD) $(LIBS) + libtestprops.la: $(libtestprops_la_OBJECTS) $(libtestprops_la_DEPENDENCIES) +- $(LINK) $(libtestprops_la_LDFLAGS) $(libtestprops_la_OBJECTS) $(libtestprops_la_LIBADD) $(LIBS) ++ $(libtestprops_la_LINK) $(libtestprops_la_OBJECTS) $(libtestprops_la_LIBADD) $(LIBS) + libtestselection.la: $(libtestselection_la_OBJECTS) $(libtestselection_la_DEPENDENCIES) +- $(LINK) $(libtestselection_la_LDFLAGS) $(libtestselection_la_OBJECTS) $(libtestselection_la_LIBADD) $(LIBS) ++ $(libtestselection_la_LINK) $(libtestselection_la_OBJECTS) $(libtestselection_la_LIBADD) $(LIBS) + libteststatusbar.la: $(libteststatusbar_la_OBJECTS) $(libteststatusbar_la_DEPENDENCIES) +- $(LINK) $(libteststatusbar_la_LDFLAGS) $(libteststatusbar_la_OBJECTS) $(libteststatusbar_la_LIBADD) $(LIBS) ++ $(libteststatusbar_la_LINK) $(libteststatusbar_la_OBJECTS) $(libteststatusbar_la_LIBADD) $(LIBS) + libtesttable.la: $(libtesttable_la_OBJECTS) $(libtesttable_la_DEPENDENCIES) +- $(LINK) $(libtesttable_la_LDFLAGS) $(libtesttable_la_OBJECTS) $(libtesttable_la_LIBADD) $(LIBS) ++ $(libtesttable_la_LINK) $(libtesttable_la_OBJECTS) $(libtesttable_la_LIBADD) $(LIBS) + libtesttext.la: $(libtesttext_la_OBJECTS) $(libtesttext_la_DEPENDENCIES) +- $(LINK) $(libtesttext_la_LDFLAGS) $(libtesttext_la_OBJECTS) $(libtesttext_la_LIBADD) $(LIBS) ++ $(libtesttext_la_LINK) $(libtesttext_la_OBJECTS) $(libtesttext_la_LIBADD) $(LIBS) + libtesttoplevel.la: $(libtesttoplevel_la_OBJECTS) $(libtesttoplevel_la_DEPENDENCIES) +- $(LINK) $(libtesttoplevel_la_LDFLAGS) $(libtesttoplevel_la_OBJECTS) $(libtesttoplevel_la_LIBADD) $(LIBS) ++ $(libtesttoplevel_la_LINK) $(libtesttoplevel_la_OBJECTS) $(libtesttoplevel_la_LIBADD) $(LIBS) + libtesttreetable.la: $(libtesttreetable_la_OBJECTS) $(libtesttreetable_la_DEPENDENCIES) +- $(LINK) $(libtesttreetable_la_LDFLAGS) $(libtesttreetable_la_OBJECTS) $(libtesttreetable_la_LIBADD) $(LIBS) ++ $(libtesttreetable_la_LINK) $(libtesttreetable_la_OBJECTS) $(libtesttreetable_la_LIBADD) $(LIBS) + libtestvalues.la: $(libtestvalues_la_OBJECTS) $(libtestvalues_la_DEPENDENCIES) +- $(LINK) $(libtestvalues_la_LDFLAGS) $(libtestvalues_la_OBJECTS) $(libtestvalues_la_LIBADD) $(LIBS) ++ $(libtestvalues_la_LINK) $(libtestvalues_la_OBJECTS) $(libtestvalues_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -935,37 +859,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testvalues.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -973,26 +885,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -1002,23 +903,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -1030,29 +931,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -1067,9 +962,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(moduledir) ++ for dir in "$(DESTDIR)$(moduledir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -1089,7 +985,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -1103,24 +999,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-moduleLTLIBRARIES + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -1141,20 +1047,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-moduleLTLIBRARIES ++uninstall-am: uninstall-moduleLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-moduleLTLIBRARIES \ + clean-noinstLTLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am info info-am install install-am install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-moduleLTLIBRARIES \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ +- uninstall-moduleLTLIBRARIES ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man \ ++ install-moduleLTLIBRARIES install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am uninstall-moduleLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/other/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/other/Makefile.in 2008-10-17 06:07:18.000000000 +0200 ++++ gtk+-2.14.4/modules/other/Makefile.in 2008-11-11 18:56:05.336634824 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +31,35 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++subdir = modules/other ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DIST_SUBDIRS = $(SUBDIRS) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62294,19 +106208,724 @@ diff -urN gtk+2.0-2.14.4.old/modules/other/Makefile.in gtk+2.0-2.14.4/modules/ot GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.14.4/modules/printbackends/cups/Makefile.in ---- gtk+2.0-2.14.4.old/modules/printbackends/cups/Makefile.in 2008-10-17 01:07:20.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/printbackends/cups/Makefile.in 2008-11-04 15:37:11.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +216,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +278,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,31 +313,39 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = gail +-subdir = modules/other +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-DIST_SUBDIRS = $(SUBDIRS) + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/other/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/other/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo +@@ -438,10 +353,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -449,7 +360,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -490,7 +412,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -501,35 +423,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -565,29 +482,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -598,15 +509,19 @@ distdir: $(DISTFILES) + || 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 \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -617,7 +532,6 @@ check: check-recursive + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +- + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -637,7 +551,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -685,26 +608,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ +- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/printbackends/cups/Makefile.in 2008-10-17 06:07:20.000000000 +0200 ++++ gtk+-2.14.4/modules/printbackends/cups/Makefile.in 2008-11-11 18:56:06.468634212 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,59 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/printbackends/cups ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(backenddir)" ++backendLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(backend_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++am__DEPENDENCIES_2 = $(top_builddir)/gtk/$(gtktargetlib) \ ++ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) ++libprintbackend_cups_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ ++ $(am__DEPENDENCIES_1) ++am_libprintbackend_cups_la_OBJECTS = gtkprintbackendcups.lo \ ++ gtkprintercups.lo gtkcupsutils.lo ++libprintbackend_cups_la_OBJECTS = \ ++ $(am_libprintbackend_cups_la_OBJECTS) ++libprintbackend_cups_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libprintbackend_cups_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libprintbackend_cups_la_SOURCES) ++DIST_SOURCES = $(libprintbackend_cups_la_SOURCES) ++HEADERS = $(noinst_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62314,19 +106933,769 @@ diff -urN gtk+2.0-2.14.4.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.14 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/printbackends/file/Makefile.in gtk+2.0-2.14.4/modules/printbackends/file/Makefile.in ---- gtk+2.0-2.14.4.old/modules/printbackends/file/Makefile.in 2008-10-17 01:07:20.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/printbackends/file/Makefile.in 2008-11-04 15:37:11.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +242,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +304,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +339,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gtk \ +@@ -420,107 +351,90 @@ INCLUDES = \ + $(GTK_DEP_CFLAGS) \ + $(GTK_DEBUG_FLAGS) + +- + LDADDS = \ + $(top_builddir)/gtk/$(gtktargetlib) \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(GTK_DEP_LIBS) + +- + backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends +- + backend_LTLIBRARIES = libprintbackend-cups.la +- + libprintbackend_cups_la_SOURCES = \ + gtkprintbackendcups.c \ + gtkprintercups.c \ + gtkcupsutils.c + +- + noinst_HEADERS = \ + gtkprintbackendcups.h \ + gtkprintercups.h \ + gtkcupsutils.h + +- + libprintbackend_cups_la_LDFLAGS = -avoid-version -module $(no_undefined) + libprintbackend_cups_la_LIBADD = $(LDADDS) $(CUPS_LIBS) +-subdir = modules/printbackends/cups +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(backend_LTLIBRARIES) +- +-libprintbackend_cups_la_DEPENDENCIES = \ +- $(top_builddir)/gtk/$(gtktargetlib) \ +- $(top_builddir)/gdk/$(gdktargetlib) +-am_libprintbackend_cups_la_OBJECTS = gtkprintbackendcups.lo \ +- gtkprintercups.lo gtkcupsutils.lo +-libprintbackend_cups_la_OBJECTS = $(am_libprintbackend_cups_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkcupsutils.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintbackendcups.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkprintercups.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libprintbackend_cups_la_SOURCES) +-HEADERS = $(noinst_HEADERS) +- +-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-SOURCES = $(libprintbackend_cups_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/cups/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/printbackends/cups/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-backendLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(backenddir) ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: + -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES) + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libprintbackend-cups.la: $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libprintbackend_cups_la_LDFLAGS) $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_LIBADD) $(LIBS) ++ $(libprintbackend_cups_la_LINK) -rpath $(backenddir) $(libprintbackend_cups_la_OBJECTS) $(libprintbackend_cups_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -530,37 +444,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintercups.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -568,26 +470,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -597,23 +488,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -625,29 +516,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -662,9 +547,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(backenddir) ++ for dir in "$(DESTDIR)$(backenddir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -684,7 +570,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -698,24 +584,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -736,20 +632,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-backendLTLIBRARIES install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-backendLTLIBRARIES \ +- uninstall-info-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am \ ++ install-backendLTLIBRARIES install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-backendLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/printbackends/file/Makefile.in 2008-10-17 06:07:20.000000000 +0200 ++++ gtk+-2.14.4/modules/printbackends/file/Makefile.in 2008-11-11 18:56:06.628633877 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,59 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/printbackends/file ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(backenddir)" ++backendLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(backend_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++libprintbackend_file_la_DEPENDENCIES = \ ++ $(top_builddir)/gtk/$(gtktargetlib) \ ++ $(top_builddir)/gdk/$(gdktargetlib) $(am__DEPENDENCIES_1) ++am_libprintbackend_file_la_OBJECTS = \ ++ libprintbackend_file_la-gtkprintbackendfile.lo ++libprintbackend_file_la_OBJECTS = \ ++ $(am_libprintbackend_file_la_OBJECTS) ++libprintbackend_file_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libprintbackend_file_la_CFLAGS) $(CFLAGS) \ ++ $(libprintbackend_file_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libprintbackend_file_la_SOURCES) ++DIST_SOURCES = $(libprintbackend_file_la_SOURCES) ++HEADERS = $(noinst_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62334,19 +107703,804 @@ diff -urN gtk+2.0-2.14.4.old/modules/printbackends/file/Makefile.in gtk+2.0-2.14 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14.4/modules/printbackends/lpr/Makefile.in ---- gtk+2.0-2.14.4.old/modules/printbackends/lpr/Makefile.in 2008-10-17 01:07:20.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/printbackends/lpr/Makefile.in 2008-11-04 15:37:11.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +242,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +304,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,17 +339,12 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined +- + backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends +- + backend_LTLIBRARIES = libprintbackend-file.la +- + libprintbackend_file_la_SOURCES = \ + gtkprintbackendfile.c + +- + libprintbackend_file_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gtk \ +@@ -426,100 +354,86 @@ libprintbackend_file_la_CPPFLAGS = \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ + $(AM_CPPFLAGS) + +- + libprintbackend_file_la_CFLAGS = \ + $(GTK_DEP_CFLAGS) \ + $(AM_CFLAGS) + +- + libprintbackend_file_la_LDFLAGS = \ + -avoid-version -module $(no_undefined) + +- + libprintbackend_file_la_LIBADD = \ + $(top_builddir)/gtk/$(gtktargetlib) \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(GTK_DEP_LIBS) + +- + noinst_HEADERS = \ + gtkprintbackendfile.h + +-subdir = modules/printbackends/file +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(backend_LTLIBRARIES) +- +-libprintbackend_file_la_DEPENDENCIES = \ +- $(top_builddir)/gtk/$(gtktargetlib) \ +- $(top_builddir)/gdk/$(gdktargetlib) +-am_libprintbackend_file_la_OBJECTS = \ +- libprintbackend_file_la-gtkprintbackendfile.lo +-libprintbackend_file_la_OBJECTS = $(am_libprintbackend_file_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libprintbackend_file_la_SOURCES) +-HEADERS = $(noinst_HEADERS) +- +-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-SOURCES = $(libprintbackend_file_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/file/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/printbackends/file/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-backendLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(backenddir) ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: + -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES) + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libprintbackend-file.la: $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libprintbackend_file_la_LDFLAGS) $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_LIBADD) $(LIBS) ++ $(libprintbackend_file_la_LINK) -rpath $(backenddir) $(libprintbackend_file_la_OBJECTS) $(libprintbackend_file_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -527,70 +441,32 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +- +-libprintbackend_file_la-gtkprintbackendfile.o: gtkprintbackendfile.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.o -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.o `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.o `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c +- +-libprintbackend_file_la-gtkprintbackendfile.obj: gtkprintbackendfile.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.obj -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.obj `if test -f 'gtkprintbackendfile.c'; then $(CYGPATH_W) 'gtkprintbackendfile.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendfile.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Po' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.obj `if test -f 'gtkprintbackendfile.c'; then $(CYGPATH_W) 'gtkprintbackendfile.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendfile.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libprintbackend_file_la-gtkprintbackendfile.lo: gtkprintbackendfile.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.lo -MD -MP -MF "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo" "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -MT libprintbackend_file_la-gtkprintbackendfile.lo -MD -MP -MF $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Tpo $(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendfile.c' object='libprintbackend_file_la-gtkprintbackendfile.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo' tmpdepfile='$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_file_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_file_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_file_la-gtkprintbackendfile.lo `test -f 'gtkprintbackendfile.c' || echo '$(srcdir)/'`gtkprintbackendfile.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -598,26 +474,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -627,23 +492,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -655,29 +520,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -692,9 +551,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(backenddir) ++ for dir in "$(DESTDIR)$(backenddir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -714,7 +574,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -728,24 +588,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -766,20 +636,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-backendLTLIBRARIES install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-backendLTLIBRARIES \ +- uninstall-info-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am \ ++ install-backendLTLIBRARIES install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-backendLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/printbackends/lpr/Makefile.in 2008-10-17 06:07:20.000000000 +0200 ++++ gtk+-2.14.4/modules/printbackends/lpr/Makefile.in 2008-11-11 18:56:06.788634031 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,56 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/printbackends/lpr ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(backenddir)" ++backendLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(backend_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ ++ $(top_builddir)/gtk/$(gtktargetlib) ++libprintbackend_lpr_la_DEPENDENCIES = $(am__DEPENDENCIES_2) ++am_libprintbackend_lpr_la_OBJECTS = gtkprintbackendlpr.lo ++libprintbackend_lpr_la_OBJECTS = $(am_libprintbackend_lpr_la_OBJECTS) ++libprintbackend_lpr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libprintbackend_lpr_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libprintbackend_lpr_la_SOURCES) ++DIST_SOURCES = $(libprintbackend_lpr_la_SOURCES) ++HEADERS = $(noinst_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +93,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +118,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +125,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +151,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62354,19 +108508,737 @@ diff -urN gtk+2.0-2.14.4.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/printbackends/Makefile.in gtk+2.0-2.14.4/modules/printbackends/Makefile.in ---- gtk+2.0-2.14.4.old/modules/printbackends/Makefile.in 2008-10-17 01:07:19.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/printbackends/Makefile.in 2008-11-04 15:37:11.000000000 -0200 -@@ -96,6 +96,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@ +@@ -138,8 +170,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +180,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +209,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +228,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +239,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +251,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +292,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +301,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,9 +336,7 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gtk \ +@@ -419,98 +347,85 @@ INCLUDES = \ + $(GTK_DEP_CFLAGS) \ + $(GTK_DEBUG_FLAGS) + +- + LDADDS = \ + $(GTK_DEP_LIBS) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends +- + backend_LTLIBRARIES = libprintbackend-lpr.la +- + libprintbackend_lpr_la_SOURCES = \ + gtkprintbackendlpr.c + +- + noinst_HEADERS = \ + gtkprintbackendlpr.h + +- + libprintbackend_lpr_la_LDFLAGS = -avoid-version -module $(no_undefined) + libprintbackend_lpr_la_LIBADD = $(LDADDS) +-subdir = modules/printbackends/lpr +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(backend_LTLIBRARIES) +- +-libprintbackend_lpr_la_DEPENDENCIES = \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_libprintbackend_lpr_la_OBJECTS = gtkprintbackendlpr.lo +-libprintbackend_lpr_la_OBJECTS = $(am_libprintbackend_lpr_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gtkprintbackendlpr.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libprintbackend_lpr_la_SOURCES) +-HEADERS = $(noinst_HEADERS) +- +-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-SOURCES = $(libprintbackend_lpr_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/lpr/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/printbackends/lpr/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-backendLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(backenddir) ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: + -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES) + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libprintbackend-lpr.la: $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libprintbackend_lpr_la_LDFLAGS) $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_LIBADD) $(LIBS) ++ $(libprintbackend_lpr_la_LINK) -rpath $(backenddir) $(libprintbackend_lpr_la_OBJECTS) $(libprintbackend_lpr_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -518,37 +433,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintbackendlpr.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -556,26 +459,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -585,23 +477,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -613,29 +505,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -650,9 +536,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(backenddir) ++ for dir in "$(DESTDIR)$(backenddir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -672,7 +559,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -686,24 +573,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -724,20 +621,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-backendLTLIBRARIES install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-backendLTLIBRARIES \ +- uninstall-info-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am \ ++ install-backendLTLIBRARIES install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-backendLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/printbackends/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/printbackends/Makefile.in 2008-10-17 06:07:19.000000000 +0200 ++++ gtk+-2.14.4/modules/printbackends/Makefile.in 2008-11-11 18:56:06.312635125 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,17 +15,11 @@ + @SET_MAKE@ + + # GTK+ - The GIMP Toolkit +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,12 +31,36 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl + @HAVE_CUPS_TRUE@am__append_1 = cups + @TEST_PRINT_BACKEND_TRUE@am__append_2 = test ++subdir = modules/printbackends ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++SOURCES = ++DIST_SOURCES = ++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ++ html-recursive info-recursive install-data-recursive \ ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -53,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -83,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -92,10 +103,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -122,6 +124,7 @@ +@@ -122,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62374,19 +109246,721 @@ diff -urN gtk+2.0-2.14.4.old/modules/printbackends/Makefile.in gtk+2.0-2.14.4/mo GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/modules/printbackends/test/Makefile.in gtk+2.0-2.14.4/modules/printbackends/test/Makefile.in ---- gtk+2.0-2.14.4.old/modules/printbackends/test/Makefile.in 2008-10-17 01:07:20.000000000 -0300 -+++ gtk+2.0-2.14.4/modules/printbackends/test/Makefile.in 2008-11-04 15:37:11.000000000 -0200 -@@ -94,6 +94,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@ +@@ -140,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -152,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -258,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -286,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -299,28 +217,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -329,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -367,6 +270,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -375,9 +279,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -408,32 +314,40 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + SUBDIRS = file lpr $(am__append_1) $(am__append_2) +- + DIST_SUBDIRS = cups file lpr test +-subdir = modules/printbackends +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-DIST_SOURCES = +- +-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ +- ps-recursive install-info-recursive uninstall-info-recursive \ +- all-recursive install-data-recursive install-exec-recursive \ +- installdirs-recursive install-recursive uninstall-recursive \ +- check-recursive installcheck-recursive +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am + all: all-recursive + + .SUFFIXES: +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/printbackends/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + mostlyclean-libtool: + -rm -f *.lo +@@ -441,10 +355,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, +@@ -452,7 +362,13 @@ uninstall-info-am: + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -464,15 +380,20 @@ $(RECURSIVE_TARGETS): + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: +- @set fnord $$MAKEFLAGS; amf=$$2; \ ++$(RECURSIVE_CLEAN_TARGETS): ++ @failcom='exit 1'; \ ++ for f in x $$MAKEFLAGS; do \ ++ case $$f in \ ++ *=* | --[!k]*);; \ ++ *k*) failcom='fail=yes';; \ ++ esac; \ ++ done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ +@@ -493,7 +414,7 @@ maintainer-clean-recursive: + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ +- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ ++ || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +@@ -504,35 +425,30 @@ ctags-recursive: + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ +- if (etags --etags-include --version) >/dev/null 2>&1; then \ ++ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ ++ empty_fix=.; \ + else \ + include_option=--include; \ ++ empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -f $$subdir/TAGS && \ ++ test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ +@@ -540,23 +456,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -568,29 +484,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -603,13 +513,17 @@ distdir: $(DISTFILES) + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ +- test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ test -d "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" \ +- distdir=../$(distdir)/$$subdir \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -620,7 +534,6 @@ check: check-recursive + all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: +- + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -640,7 +553,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -651,25 +564,34 @@ clean-am: clean-generic clean-libtool mo + + distclean: distclean-recursive + -rm -f Makefile +-distclean-am: clean-am distclean-generic distclean-libtool \ +- distclean-tags ++distclean-am: clean-am distclean-generic distclean-tags + + dvi: dvi-recursive + + dvi-am: + ++html: html-recursive ++ + info: info-recursive + + info-am: + + install-data-am: + ++install-dvi: install-dvi-recursive ++ + install-exec-am: + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -688,26 +610,24 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- check-local clean clean-generic clean-libtool clean-recursive \ +- ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am dvi-recursive info info-am info-recursive install \ +- install-am install-data install-data-am install-data-recursive \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-recursive install-strip installcheck installcheck-am \ +- installdirs installdirs-am installdirs-recursive \ +- maintainer-clean maintainer-clean-generic \ +- maintainer-clean-recursive mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ +- pdf-recursive ps ps-am ps-recursive tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am \ +- uninstall-info-recursive uninstall-recursive ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am check-local clean clean-generic \ ++ clean-libtool ctags ctags-recursive distclean \ ++ distclean-generic distclean-libtool distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/modules/printbackends/test/Makefile.in 2008-10-17 06:07:20.000000000 +0200 ++++ gtk+-2.14.4/modules/printbackends/test/Makefile.in 2008-11-11 18:56:06.940634494 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,12 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ ++ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +33,58 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ++subdir = modules/printbackends/test ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++am__installdirs = "$(DESTDIR)$(backenddir)" ++backendLTLIBRARIES_INSTALL = $(INSTALL) ++LTLIBRARIES = $(backend_LTLIBRARIES) ++am__DEPENDENCIES_1 = ++libprintbackend_test_la_DEPENDENCIES = \ ++ $(top_builddir)/gtk/$(gtktargetlib) $(am__DEPENDENCIES_1) ++am_libprintbackend_test_la_OBJECTS = \ ++ libprintbackend_test_la-gtkprintbackendtest.lo ++libprintbackend_test_la_OBJECTS = \ ++ $(am_libprintbackend_test_la_OBJECTS) ++libprintbackend_test_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++ $(libprintbackend_test_la_CFLAGS) $(CFLAGS) \ ++ $(libprintbackend_test_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(libprintbackend_test_la_SOURCES) ++DIST_SOURCES = $(libprintbackend_test_la_SOURCES) ++HEADERS = $(noinst_HEADERS) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +95,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +120,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +127,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +153,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62394,19 +109968,788 @@ diff -urN gtk+2.0-2.14.4.old/modules/printbackends/test/Makefile.in gtk+2.0-2.14 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/perf/Makefile.in gtk+2.0-2.14.4/perf/Makefile.in ---- gtk+2.0-2.14.4.old/perf/Makefile.in 2008-10-17 01:07:20.000000000 -0300 -+++ gtk+2.0-2.14.4/perf/Makefile.in 2008-11-04 15:37:12.000000000 -0200 -@@ -94,6 +94,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@ +@@ -138,8 +172,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +182,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +211,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +230,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +241,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +253,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +294,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,9 +303,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +@@ -406,17 +338,12 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined +- + backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends +- + backend_LTLIBRARIES = libprintbackend-test.la +- + libprintbackend_test_la_SOURCES = \ + gtkprintbackendtest.c + +- + libprintbackend_test_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gtk \ +@@ -426,98 +353,85 @@ libprintbackend_test_la_CPPFLAGS = \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ + $(AM_CPPFLAGS) + +- + libprintbackend_test_la_CFLAGS = \ + $(GTK_DEP_CFLAGS) \ + $(AM_CFLAGS) + +- + libprintbackend_test_la_LDFLAGS = \ + -avoid-version -module $(no_undefined) + +- + libprintbackend_test_la_LIBADD = \ + $(top_builddir)/gtk/$(gtktargetlib) \ + $(GTK_DEP_LIBS) + +- + noinst_HEADERS = \ + gtkprintbackendtest.h + +-subdir = modules/printbackends/test +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-LTLIBRARIES = $(backend_LTLIBRARIES) +- +-libprintbackend_test_la_DEPENDENCIES = \ +- $(top_builddir)/gtk/$(gtktargetlib) +-am_libprintbackend_test_la_OBJECTS = \ +- libprintbackend_test_la-gtkprintbackendtest.lo +-libprintbackend_test_la_OBJECTS = $(am_libprintbackend_test_la_OBJECTS) +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = \ +-@AMDEP_TRUE@ ./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(libprintbackend_test_la_SOURCES) +-HEADERS = $(noinst_HEADERS) +- +-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in \ +- $(top_srcdir)/Makefile.decl Makefile.am +-SOURCES = $(libprintbackend_test_la_SOURCES) +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/printbackends/test/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu modules/printbackends/test/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +-backendLTLIBRARIES_INSTALL = $(INSTALL) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-backendLTLIBRARIES: $(backend_LTLIBRARIES) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(backenddir) ++ test -z "$(backenddir)" || $(MKDIR_P) "$(DESTDIR)$(backenddir)" + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f"; \ +- $(LIBTOOL) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$f; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(backenddir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(backendLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(backenddir)/$$f"; \ + else :; fi; \ + done + + uninstall-backendLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ +- p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \ +- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(backenddir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(backenddir)/$$p"; \ + done + + clean-backendLTLIBRARIES: + -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES) + @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" = "$$p" && dir=.; \ ++ test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done + libprintbackend-test.la: $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_DEPENDENCIES) +- $(LINK) -rpath $(backenddir) $(libprintbackend_test_la_LDFLAGS) $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_LIBADD) $(LIBS) ++ $(libprintbackend_test_la_LINK) -rpath $(backenddir) $(libprintbackend_test_la_OBJECTS) $(libprintbackend_test_la_LIBADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -525,70 +439,32 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< +- +-libprintbackend_test_la-gtkprintbackendtest.o: gtkprintbackendtest.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.o -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.o `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.o `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c +- +-libprintbackend_test_la-gtkprintbackendtest.obj: gtkprintbackendtest.c +-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.obj -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.obj `if test -f 'gtkprintbackendtest.c'; then $(CYGPATH_W) 'gtkprintbackendtest.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendtest.c'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Po' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.obj `if test -f 'gtkprintbackendtest.c'; then $(CYGPATH_W) 'gtkprintbackendtest.c'; else $(CYGPATH_W) '$(srcdir)/gtkprintbackendtest.c'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libprintbackend_test_la-gtkprintbackendtest.lo: gtkprintbackendtest.c +-@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.lo -MD -MP -MF "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo" "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -MT libprintbackend_test_la-gtkprintbackendtest.lo -MD -MP -MF $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Tpo $(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gtkprintbackendtest.c' object='libprintbackend_test_la-gtkprintbackendtest.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo' tmpdepfile='$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprintbackend_test_la_CPPFLAGS) $(CPPFLAGS) $(libprintbackend_test_la_CFLAGS) $(CFLAGS) -c -o libprintbackend_test_la-gtkprintbackendtest.lo `test -f 'gtkprintbackendtest.c' || echo '$(srcdir)/'`gtkprintbackendtest.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -596,26 +472,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -625,23 +490,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -653,29 +518,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = ../../.. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/../../.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -690,9 +549,10 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local + check: check-am + all-am: Makefile $(LTLIBRARIES) $(HEADERS) +- + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(backenddir) ++ for dir in "$(DESTDIR)$(backenddir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-am + install-exec: install-exec-am + install-data: install-data-am +@@ -712,7 +572,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -726,24 +586,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: install-backendLTLIBRARIES + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -764,20 +634,24 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am ++uninstall-am: uninstall-backendLTLIBRARIES ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-backendLTLIBRARIES clean-generic clean-libtool ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-backendLTLIBRARIES install-data \ +- install-data-am install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-compile \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags uninstall uninstall-am uninstall-backendLTLIBRARIES \ +- uninstall-info-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am \ ++ install-backendLTLIBRARIES install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-backendLTLIBRARIES + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/perf/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/perf/Makefile.in 2008-10-17 06:07:20.000000000 +0200 ++++ gtk+-2.14.4/perf/Makefile.in 2008-11-11 18:56:07.092634470 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,10 +32,43 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++noinst_PROGRAMS = testperf$(EXEEXT) ++subdir = perf ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++PROGRAMS = $(noinst_PROGRAMS) ++am_testperf_OBJECTS = appwindow.$(OBJEXT) gtkwidgetprofiler.$(OBJEXT) \ ++ main.$(OBJEXT) marshalers.$(OBJEXT) textview.$(OBJEXT) \ ++ treeview.$(OBJEXT) typebuiltins.$(OBJEXT) ++testperf_OBJECTS = $(am_testperf_OBJECTS) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(testperf_SOURCES) ++DIST_SOURCES = $(testperf_SOURCES) ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -51,22 +79,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -81,8 +104,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -90,10 +111,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -120,6 +122,7 @@ +@@ -120,6 +137,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62414,19 +110757,985 @@ diff -urN gtk+2.0-2.14.4.old/perf/Makefile.in gtk+2.0-2.14.4/perf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -diff -urN gtk+2.0-2.14.4.old/tests/Makefile.in gtk+2.0-2.14.4/tests/Makefile.in ---- gtk+2.0-2.14.4.old/tests/Makefile.in 2008-10-17 01:07:21.000000000 -0300 -+++ gtk+2.0-2.14.4/tests/Makefile.in 2008-11-04 15:37:12.000000000 -0200 -@@ -96,6 +96,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@ +@@ -138,8 +156,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -150,91 +166,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -256,24 +195,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -284,8 +214,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -297,28 +225,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -327,22 +237,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -365,6 +278,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -373,20 +287,17 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- README \ +- marshalers.list \ +- typebuiltins.c.template \ +- typebuiltins.h.template \ +- $(BUILT_SOURCES) +- ++EXTRA_DIST = README marshalers.list typebuiltins.c.template \ ++ typebuiltins.h.template $(BUILT_SOURCES) + TEST_PROGS = + + ### testing rules +@@ -412,7 +323,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ +@@ -422,27 +332,18 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + DEPS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + LDADDS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- +-noinst_PROGRAMS = \ +- testperf +- +- + testperf_DEPENDENCIES = $(TEST_DEPS) +- + testperf_LDADD = $(LDADDS) +- + testperf_SOURCES = \ + appwindow.c \ + gtkwidgetprofiler.c \ +@@ -456,68 +357,54 @@ testperf_SOURCES = \ + typebuiltins.h \ + widgets.h + +- + BUILT_SOURCES = \ + marshalers.c \ + marshalers.h \ + typebuiltins.c \ + typebuiltins.h + +- + stamp_files = \ + stamp-marshalers.h \ + stamp-typebuiltins.h + +- + headers_with_enums = \ + gtkwidgetprofiler.h + +- + MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(stamp_files) +-subdir = perf +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-noinst_PROGRAMS = testperf$(EXEEXT) +-PROGRAMS = $(noinst_PROGRAMS) +- +-am_testperf_OBJECTS = appwindow.$(OBJEXT) gtkwidgetprofiler.$(OBJEXT) \ +- main.$(OBJEXT) marshalers.$(OBJEXT) textview.$(OBJEXT) \ +- treeview.$(OBJEXT) typebuiltins.$(OBJEXT) +-testperf_OBJECTS = $(am_testperf_OBJECTS) +-testperf_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/appwindow.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/gtkwidgetprofiler.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/marshalers.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/textview.Po ./$(DEPDIR)/treeview.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/typebuiltins.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(testperf_SOURCES) +-DIST_COMMON = README $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(testperf_SOURCES) +- + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu perf/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu perf/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -527,10 +414,10 @@ clean-noinstPROGRAMS: + done + testperf$(EXEEXT): $(testperf_OBJECTS) $(testperf_DEPENDENCIES) + @rm -f testperf$(EXEEXT) +- $(LINK) $(testperf_LDFLAGS) $(testperf_OBJECTS) $(testperf_LDADD) $(LIBS) ++ $(LINK) $(testperf_OBJECTS) $(testperf_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -544,37 +431,25 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/typebuiltins.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + mostlyclean-libtool: + -rm -f *.lo +@@ -582,26 +457,15 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -611,23 +475,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -639,29 +503,23 @@ GTAGS: + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -677,7 +535,6 @@ check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(PROGRAMS) +- + installdirs: + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +@@ -699,13 +556,13 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ++ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + clean: clean-am + + clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ +@@ -715,24 +572,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-local distclean-tags ++ distclean-local distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -753,18 +620,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-local distclean-tags distdir dvi dvi-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-local distclean-tags distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + +Index: gtk+-2.14.4/tests/Makefile.in +=================================================================== +--- gtk+-2.14.4.orig/tests/Makefile.in 2008-10-17 06:07:21.000000000 +0200 ++++ gtk+-2.14.4/tests/Makefile.in 2008-11-11 18:56:07.473134785 +0100 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.7.9 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + +-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +-# Free Software Foundation, Inc. ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,16 +16,11 @@ + + # GTK+ - The GIMP Toolkit + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. +- + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -37,12 +32,274 @@ POST_INSTALL = : + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : ++build_triplet = @build@ + host_triplet = @host@ ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(top_srcdir)/Makefile.decl ++noinst_PROGRAMS = $(am__EXEEXT_1) simple$(EXEEXT) \ ++ print-editor$(EXEEXT) testaccel$(EXEEXT) \ ++ testassistant$(EXEEXT) testbbox$(EXEEXT) testcairo$(EXEEXT) \ ++ testcalendar$(EXEEXT) testcombo$(EXEEXT) \ ++ testcombochange$(EXEEXT) testcellrenderertext$(EXEEXT) \ ++ testdnd$(EXEEXT) testellipsise$(EXEEXT) \ ++ testentrycompletion$(EXEEXT) testfilechooser$(EXEEXT) \ ++ testfilechooserbutton$(EXEEXT) testframe$(EXEEXT) \ ++ testgtk$(EXEEXT) testiconview$(EXEEXT) testicontheme$(EXEEXT) \ ++ testimage$(EXEEXT) testinput$(EXEEXT) testmenus$(EXEEXT) \ ++ testmenubars$(EXEEXT) testmountoperation$(EXEEXT) \ ++ testmultidisplay$(EXEEXT) testmultiscreen$(EXEEXT) \ ++ testnotebookdnd$(EXEEXT) testnouiprint$(EXEEXT) \ ++ testprint$(EXEEXT) testrgb$(EXEEXT) testrecentchooser$(EXEEXT) \ ++ testrecentchoosermenu$(EXEEXT) testrichtext$(EXEEXT) \ ++ testselection$(EXEEXT) $(am__EXEEXT_2) testspinbutton$(EXEEXT) \ ++ teststatusicon$(EXEEXT) testtext$(EXEEXT) testtoolbar$(EXEEXT) \ ++ stresstest-toolbar$(EXEEXT) testtreeedit$(EXEEXT) \ ++ testtreemodel$(EXEEXT) testtreeview$(EXEEXT) \ ++ testtreefocus$(EXEEXT) testtreeflow$(EXEEXT) \ ++ testtreecolumns$(EXEEXT) testtreecolumnsizing$(EXEEXT) \ ++ testtreesort$(EXEEXT) treestoretest$(EXEEXT) \ ++ testxinerama$(EXEEXT) pixbuf-read$(EXEEXT) \ ++ pixbuf-lowmem$(EXEEXT) pixbuf-randomly-modified$(EXEEXT) \ ++ pixbuf-random$(EXEEXT) pixbuf-threads$(EXEEXT) \ ++ testmerge$(EXEEXT) testactions$(EXEEXT) testgrouping$(EXEEXT) \ ++ testtooltips$(EXEEXT) testvolumebutton$(EXEEXT) \ ++ $(am__EXEEXT_3) + @HAVE_CXX_TRUE@am__append_1 = autotestkeywords ++@HAVE_CXX_TRUE@TESTS = autotestkeywords$(EXEEXT) + @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@am__append_2 = -DHAVE_OBJC=1 ++subdir = tests ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.in ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++am__EXEEXT_1 = ++@USE_X11_TRUE@am__EXEEXT_2 = testsocket$(EXEEXT) \ ++@USE_X11_TRUE@ testsocket_child$(EXEEXT) ++@HAVE_CXX_TRUE@am__EXEEXT_3 = autotestkeywords$(EXEEXT) ++PROGRAMS = $(noinst_PROGRAMS) ++am__autotestkeywords_SOURCES_DIST = autotestkeywords.cc ++@HAVE_CXX_TRUE@am_autotestkeywords_OBJECTS = \ ++@HAVE_CXX_TRUE@ autotestkeywords-autotestkeywords.$(OBJEXT) ++autotestkeywords_OBJECTS = $(am_autotestkeywords_OBJECTS) ++autotestkeywords_LDADD = $(LDADD) ++autotestkeywords_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ ++ $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++pixbuf_lowmem_SOURCES = pixbuf-lowmem.c ++pixbuf_lowmem_OBJECTS = pixbuf-lowmem.$(OBJEXT) ++pixbuf_lowmem_DEPENDENCIES = $(LDADDS) ++pixbuf_random_SOURCES = pixbuf-random.c ++pixbuf_random_OBJECTS = pixbuf-random.$(OBJEXT) ++pixbuf_random_DEPENDENCIES = $(LDADDS) ++pixbuf_randomly_modified_SOURCES = pixbuf-randomly-modified.c ++pixbuf_randomly_modified_OBJECTS = pixbuf-randomly-modified.$(OBJEXT) ++pixbuf_randomly_modified_DEPENDENCIES = $(LDADDS) ++pixbuf_read_SOURCES = pixbuf-read.c ++pixbuf_read_OBJECTS = pixbuf-read.$(OBJEXT) ++pixbuf_read_DEPENDENCIES = $(LDADDS) ++pixbuf_threads_SOURCES = pixbuf-threads.c ++pixbuf_threads_OBJECTS = pixbuf-threads.$(OBJEXT) ++am__DEPENDENCIES_1 = ++pixbuf_threads_DEPENDENCIES = $(LDADDS) $(am__DEPENDENCIES_1) ++print_editor_SOURCES = print-editor.c ++print_editor_OBJECTS = print-editor.$(OBJEXT) ++simple_SOURCES = simple.c ++simple_OBJECTS = simple.$(OBJEXT) ++stresstest_toolbar_SOURCES = stresstest-toolbar.c ++stresstest_toolbar_OBJECTS = stresstest-toolbar.$(OBJEXT) ++stresstest_toolbar_DEPENDENCIES = $(LDADDS) ++testaccel_SOURCES = testaccel.c ++testaccel_OBJECTS = testaccel.$(OBJEXT) ++am_testactions_OBJECTS = testactions.$(OBJEXT) ++testactions_OBJECTS = $(am_testactions_OBJECTS) ++testassistant_SOURCES = testassistant.c ++testassistant_OBJECTS = testassistant.$(OBJEXT) ++am_testbbox_OBJECTS = testbbox.$(OBJEXT) ++testbbox_OBJECTS = $(am_testbbox_OBJECTS) ++testcairo_SOURCES = testcairo.c ++testcairo_OBJECTS = testcairo.$(OBJEXT) ++testcalendar_SOURCES = testcalendar.c ++testcalendar_OBJECTS = testcalendar.$(OBJEXT) ++testcellrenderertext_SOURCES = testcellrenderertext.c ++testcellrenderertext_OBJECTS = testcellrenderertext.$(OBJEXT) ++testcombo_SOURCES = testcombo.c ++testcombo_OBJECTS = testcombo.$(OBJEXT) ++testcombochange_SOURCES = testcombochange.c ++testcombochange_OBJECTS = testcombochange.$(OBJEXT) ++testdnd_SOURCES = testdnd.c ++testdnd_OBJECTS = testdnd.$(OBJEXT) ++testellipsise_SOURCES = testellipsise.c ++testellipsise_OBJECTS = testellipsise.$(OBJEXT) ++am_testentrycompletion_OBJECTS = prop-editor.$(OBJEXT) \ ++ testentrycompletion.$(OBJEXT) ++testentrycompletion_OBJECTS = $(am_testentrycompletion_OBJECTS) ++am_testfilechooser_OBJECTS = prop-editor.$(OBJEXT) \ ++ testfilechooser.$(OBJEXT) ++testfilechooser_OBJECTS = $(am_testfilechooser_OBJECTS) ++am_testfilechooserbutton_OBJECTS = prop-editor.$(OBJEXT) \ ++ testfilechooserbutton.$(OBJEXT) ++testfilechooserbutton_OBJECTS = $(am_testfilechooserbutton_OBJECTS) ++am_testframe_OBJECTS = testframe.$(OBJEXT) ++testframe_OBJECTS = $(am_testframe_OBJECTS) ++am_testgrouping_OBJECTS = testgrouping.$(OBJEXT) ++testgrouping_OBJECTS = $(am_testgrouping_OBJECTS) ++am_testgtk_OBJECTS = prop-editor.$(OBJEXT) testgtk.$(OBJEXT) ++testgtk_OBJECTS = $(am_testgtk_OBJECTS) ++testicontheme_SOURCES = testicontheme.c ++testicontheme_OBJECTS = testicontheme.$(OBJEXT) ++am_testiconview_OBJECTS = testiconview.$(OBJEXT) prop-editor.$(OBJEXT) ++testiconview_OBJECTS = $(am_testiconview_OBJECTS) ++testimage_SOURCES = testimage.c ++testimage_OBJECTS = testimage.$(OBJEXT) ++testinput_SOURCES = testinput.c ++testinput_OBJECTS = testinput.$(OBJEXT) ++testmenubars_SOURCES = testmenubars.c ++testmenubars_OBJECTS = testmenubars.$(OBJEXT) ++testmenus_SOURCES = testmenus.c ++testmenus_OBJECTS = testmenus.$(OBJEXT) ++am_testmerge_OBJECTS = testmerge.$(OBJEXT) ++testmerge_OBJECTS = $(am_testmerge_OBJECTS) ++testmountoperation_SOURCES = testmountoperation.c ++testmountoperation_OBJECTS = testmountoperation.$(OBJEXT) ++testmultidisplay_SOURCES = testmultidisplay.c ++testmultidisplay_OBJECTS = testmultidisplay.$(OBJEXT) ++testmultiscreen_SOURCES = testmultiscreen.c ++testmultiscreen_OBJECTS = testmultiscreen.$(OBJEXT) ++testnotebookdnd_SOURCES = testnotebookdnd.c ++testnotebookdnd_OBJECTS = testnotebookdnd.$(OBJEXT) ++testnouiprint_SOURCES = testnouiprint.c ++testnouiprint_OBJECTS = testnouiprint.$(OBJEXT) ++am_testprint_OBJECTS = testprint.$(OBJEXT) \ ++ testprintfileoperation.$(OBJEXT) ++testprint_OBJECTS = $(am_testprint_OBJECTS) ++am_testrecentchooser_OBJECTS = prop-editor.$(OBJEXT) \ ++ testrecentchooser.$(OBJEXT) ++testrecentchooser_OBJECTS = $(am_testrecentchooser_OBJECTS) ++am_testrecentchoosermenu_OBJECTS = testrecentchoosermenu.$(OBJEXT) ++testrecentchoosermenu_OBJECTS = $(am_testrecentchoosermenu_OBJECTS) ++testrgb_SOURCES = testrgb.c ++testrgb_OBJECTS = testrgb.$(OBJEXT) ++testrichtext_SOURCES = testrichtext.c ++testrichtext_OBJECTS = testrichtext.$(OBJEXT) ++testselection_SOURCES = testselection.c ++testselection_OBJECTS = testselection.$(OBJEXT) ++am_testsocket_OBJECTS = testsocket.$(OBJEXT) \ ++ testsocket_common.$(OBJEXT) ++testsocket_OBJECTS = $(am_testsocket_OBJECTS) ++am_testsocket_child_OBJECTS = testsocket_child.$(OBJEXT) \ ++ testsocket_common.$(OBJEXT) ++testsocket_child_OBJECTS = $(am_testsocket_child_OBJECTS) ++am_testspinbutton_OBJECTS = testspinbutton.$(OBJEXT) ++testspinbutton_OBJECTS = $(am_testspinbutton_OBJECTS) ++am_teststatusicon_OBJECTS = prop-editor.$(OBJEXT) \ ++ teststatusicon.$(OBJEXT) ++teststatusicon_OBJECTS = $(am_teststatusicon_OBJECTS) ++am_testtext_OBJECTS = prop-editor.$(OBJEXT) testtext.$(OBJEXT) ++testtext_OBJECTS = $(am_testtext_OBJECTS) ++am_testtoolbar_OBJECTS = testtoolbar.$(OBJEXT) prop-editor.$(OBJEXT) ++testtoolbar_OBJECTS = $(am_testtoolbar_OBJECTS) ++testtoolbar_DEPENDENCIES = $(LDADDS) ++am_testtooltips_OBJECTS = testtooltips.$(OBJEXT) ++testtooltips_OBJECTS = $(am_testtooltips_OBJECTS) ++testtreecolumns_SOURCES = testtreecolumns.c ++testtreecolumns_OBJECTS = testtreecolumns.$(OBJEXT) ++testtreecolumnsizing_SOURCES = testtreecolumnsizing.c ++testtreecolumnsizing_OBJECTS = testtreecolumnsizing.$(OBJEXT) ++am_testtreeedit_OBJECTS = testtreeedit.$(OBJEXT) ++testtreeedit_OBJECTS = $(am_testtreeedit_OBJECTS) ++testtreeflow_SOURCES = testtreeflow.c ++testtreeflow_OBJECTS = testtreeflow.$(OBJEXT) ++testtreefocus_SOURCES = testtreefocus.c ++testtreefocus_OBJECTS = testtreefocus.$(OBJEXT) ++am_testtreemodel_OBJECTS = testtreemodel.$(OBJEXT) ++testtreemodel_OBJECTS = $(am_testtreemodel_OBJECTS) ++testtreesort_SOURCES = testtreesort.c ++testtreesort_OBJECTS = testtreesort.$(OBJEXT) ++am_testtreeview_OBJECTS = prop-editor.$(OBJEXT) testtreeview.$(OBJEXT) ++testtreeview_OBJECTS = $(am_testtreeview_OBJECTS) ++am_testvolumebutton_OBJECTS = testvolumebutton.$(OBJEXT) ++testvolumebutton_OBJECTS = $(am_testvolumebutton_OBJECTS) ++testxinerama_SOURCES = testxinerama.c ++testxinerama_OBJECTS = testxinerama.$(OBJEXT) ++treestoretest_SOURCES = treestoretest.c ++treestoretest_OBJECTS = treestoretest.$(OBJEXT) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++depcomp = $(SHELL) $(top_srcdir)/depcomp ++am__depfiles_maybe = depfiles ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ ++SOURCES = $(autotestkeywords_SOURCES) pixbuf-lowmem.c pixbuf-random.c \ ++ pixbuf-randomly-modified.c pixbuf-read.c pixbuf-threads.c \ ++ print-editor.c simple.c stresstest-toolbar.c testaccel.c \ ++ $(testactions_SOURCES) testassistant.c $(testbbox_SOURCES) \ ++ testcairo.c testcalendar.c testcellrenderertext.c testcombo.c \ ++ testcombochange.c testdnd.c testellipsise.c \ ++ $(testentrycompletion_SOURCES) $(testfilechooser_SOURCES) \ ++ $(testfilechooserbutton_SOURCES) $(testframe_SOURCES) \ ++ $(testgrouping_SOURCES) $(testgtk_SOURCES) testicontheme.c \ ++ $(testiconview_SOURCES) testimage.c testinput.c testmenubars.c \ ++ testmenus.c $(testmerge_SOURCES) testmountoperation.c \ ++ testmultidisplay.c testmultiscreen.c testnotebookdnd.c \ ++ testnouiprint.c $(testprint_SOURCES) \ ++ $(testrecentchooser_SOURCES) $(testrecentchoosermenu_SOURCES) \ ++ testrgb.c testrichtext.c testselection.c $(testsocket_SOURCES) \ ++ $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) \ ++ $(teststatusicon_SOURCES) $(testtext_SOURCES) \ ++ $(testtoolbar_SOURCES) $(testtooltips_SOURCES) \ ++ testtreecolumns.c testtreecolumnsizing.c \ ++ $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c \ ++ $(testtreemodel_SOURCES) testtreesort.c \ ++ $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) \ ++ testxinerama.c treestoretest.c ++DIST_SOURCES = $(am__autotestkeywords_SOURCES_DIST) pixbuf-lowmem.c \ ++ pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c \ ++ pixbuf-threads.c print-editor.c simple.c stresstest-toolbar.c \ ++ testaccel.c $(testactions_SOURCES) testassistant.c \ ++ $(testbbox_SOURCES) testcairo.c testcalendar.c \ ++ testcellrenderertext.c testcombo.c testcombochange.c testdnd.c \ ++ testellipsise.c $(testentrycompletion_SOURCES) \ ++ $(testfilechooser_SOURCES) $(testfilechooserbutton_SOURCES) \ ++ $(testframe_SOURCES) $(testgrouping_SOURCES) \ ++ $(testgtk_SOURCES) testicontheme.c $(testiconview_SOURCES) \ ++ testimage.c testinput.c testmenubars.c testmenus.c \ ++ $(testmerge_SOURCES) testmountoperation.c testmultidisplay.c \ ++ testmultiscreen.c testnotebookdnd.c testnouiprint.c \ ++ $(testprint_SOURCES) $(testrecentchooser_SOURCES) \ ++ $(testrecentchoosermenu_SOURCES) testrgb.c testrichtext.c \ ++ testselection.c $(testsocket_SOURCES) \ ++ $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) \ ++ $(teststatusicon_SOURCES) $(testtext_SOURCES) \ ++ $(testtoolbar_SOURCES) $(testtooltips_SOURCES) \ ++ testtreecolumns.c testtreecolumnsizing.c \ ++ $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c \ ++ $(testtreemodel_SOURCES) testtreesort.c \ ++ $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) \ ++ testxinerama.c treestoretest.c ++ETAGS = etags ++CTAGS = ctags ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -53,22 +310,17 @@ AUTOMAKE = @AUTOMAKE@ + AWK = @AWK@ + BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ + BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ +-BUILD_DYNAMIC_MODULES_FALSE = @BUILD_DYNAMIC_MODULES_FALSE@ +-BUILD_DYNAMIC_MODULES_TRUE = @BUILD_DYNAMIC_MODULES_TRUE@ +-BUILD_GDIPLUS_LOADERS_FALSE = @BUILD_GDIPLUS_LOADERS_FALSE@ +-BUILD_GDIPLUS_LOADERS_TRUE = @BUILD_GDIPLUS_LOADERS_TRUE@ + CAIRO_PREFIX = @CAIRO_PREFIX@ + CATALOGS = @CATALOGS@ + CATOBJEXT = @CATOBJEXT@ + CC = @CC@ + CCAS = @CCAS@ ++CCASDEPMODE = @CCASDEPMODE@ + CCASFLAGS = @CCASFLAGS@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ +-CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ +-CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ + CUPS_API_MAJOR = @CUPS_API_MAJOR@ + CUPS_API_MINOR = @CUPS_API_MINOR@ + CUPS_CFLAGS = @CUPS_CFLAGS@ +@@ -83,8 +335,6 @@ DATADIRNAME = @DATADIRNAME@ + DB2HTML = @DB2HTML@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_EXPLICIT_DEPS_FALSE = @DISABLE_EXPLICIT_DEPS_FALSE@ +-DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ + DLLTOOL = @DLLTOOL@ + DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ +@@ -92,10 +342,6 @@ ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ +-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ +-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ +-ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ +-ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -@@ -122,6 +124,7 @@ +@@ -122,6 +368,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -62434,3 +111743,1741 @@ diff -urN gtk+2.0-2.14.4.old/tests/Makefile.in gtk+2.0-2.14.4/tests/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ +@@ -140,8 +387,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION + GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ + GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ + GTK_DEP_LIBS = @GTK_DEP_LIBS@ +-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ + GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ + GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ + GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ +@@ -152,91 +397,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ + GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ + GTK_VERSION = @GTK_VERSION@ + GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ +-HAVE_CUPS_FALSE = @HAVE_CUPS_FALSE@ +-HAVE_CUPS_TRUE = @HAVE_CUPS_TRUE@ +-HAVE_CXX_FALSE = @HAVE_CXX_FALSE@ +-HAVE_CXX_TRUE = @HAVE_CXX_TRUE@ +-HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ +-HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ + HAVE_HTTP_AUTHSTRING = @HAVE_HTTP_AUTHSTRING@ +-HAVE_INCLUDED_IMMMODULES_FALSE = @HAVE_INCLUDED_IMMMODULES_FALSE@ +-HAVE_INCLUDED_IMMMODULES_TRUE = @HAVE_INCLUDED_IMMMODULES_TRUE@ +-HAVE_JASPER_FALSE = @HAVE_JASPER_FALSE@ +-HAVE_JASPER_TRUE = @HAVE_JASPER_TRUE@ +-HAVE_JPEG_FALSE = @HAVE_JPEG_FALSE@ +-HAVE_JPEG_TRUE = @HAVE_JPEG_TRUE@ +-HAVE_OBJC_FALSE = @HAVE_OBJC_FALSE@ +-HAVE_OBJC_TRUE = @HAVE_OBJC_TRUE@ +-HAVE_PNG_FALSE = @HAVE_PNG_FALSE@ +-HAVE_PNG_TRUE = @HAVE_PNG_TRUE@ +-HAVE_TIFF_FALSE = @HAVE_TIFF_FALSE@ +-HAVE_TIFF_TRUE = @HAVE_TIFF_TRUE@ +-HAVE_X11R6_FALSE = @HAVE_X11R6_FALSE@ +-HAVE_X11R6_TRUE = @HAVE_X11R6_TRUE@ + HTML_DIR = @HTML_DIR@ + INCLUDED_IMMODULE_DEFINE = @INCLUDED_IMMODULE_DEFINE@ + INCLUDED_IMMODULE_OBJ = @INCLUDED_IMMODULE_OBJ@ + INCLUDED_LOADER_DEFINE = @INCLUDED_LOADER_DEFINE@ + INCLUDED_LOADER_OBJ = @INCLUDED_LOADER_OBJ@ +-INCLUDE_ANI_FALSE = @INCLUDE_ANI_FALSE@ +-INCLUDE_ANI_TRUE = @INCLUDE_ANI_TRUE@ +-INCLUDE_BMP_FALSE = @INCLUDE_BMP_FALSE@ +-INCLUDE_BMP_TRUE = @INCLUDE_BMP_TRUE@ +-INCLUDE_GDIPLUS_FALSE = @INCLUDE_GDIPLUS_FALSE@ +-INCLUDE_GDIPLUS_TRUE = @INCLUDE_GDIPLUS_TRUE@ +-INCLUDE_GIF_FALSE = @INCLUDE_GIF_FALSE@ +-INCLUDE_GIF_TRUE = @INCLUDE_GIF_TRUE@ +-INCLUDE_ICNS_FALSE = @INCLUDE_ICNS_FALSE@ +-INCLUDE_ICNS_TRUE = @INCLUDE_ICNS_TRUE@ +-INCLUDE_ICO_FALSE = @INCLUDE_ICO_FALSE@ +-INCLUDE_ICO_TRUE = @INCLUDE_ICO_TRUE@ +-INCLUDE_IM_AM_ET_FALSE = @INCLUDE_IM_AM_ET_FALSE@ +-INCLUDE_IM_AM_ET_TRUE = @INCLUDE_IM_AM_ET_TRUE@ +-INCLUDE_IM_CEDILLA_FALSE = @INCLUDE_IM_CEDILLA_FALSE@ +-INCLUDE_IM_CEDILLA_TRUE = @INCLUDE_IM_CEDILLA_TRUE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE = @INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE@ +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE = @INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE@ +-INCLUDE_IM_IME_FALSE = @INCLUDE_IM_IME_FALSE@ +-INCLUDE_IM_IME_TRUE = @INCLUDE_IM_IME_TRUE@ +-INCLUDE_IM_INUKTITUT_FALSE = @INCLUDE_IM_INUKTITUT_FALSE@ +-INCLUDE_IM_INUKTITUT_TRUE = @INCLUDE_IM_INUKTITUT_TRUE@ +-INCLUDE_IM_IPA_FALSE = @INCLUDE_IM_IPA_FALSE@ +-INCLUDE_IM_IPA_TRUE = @INCLUDE_IM_IPA_TRUE@ +-INCLUDE_IM_MULTIPRESS_FALSE = @INCLUDE_IM_MULTIPRESS_FALSE@ +-INCLUDE_IM_MULTIPRESS_TRUE = @INCLUDE_IM_MULTIPRESS_TRUE@ +-INCLUDE_IM_THAI_FALSE = @INCLUDE_IM_THAI_FALSE@ +-INCLUDE_IM_THAI_TRUE = @INCLUDE_IM_THAI_TRUE@ +-INCLUDE_IM_TI_ER_FALSE = @INCLUDE_IM_TI_ER_FALSE@ +-INCLUDE_IM_TI_ER_TRUE = @INCLUDE_IM_TI_ER_TRUE@ +-INCLUDE_IM_TI_ET_FALSE = @INCLUDE_IM_TI_ET_FALSE@ +-INCLUDE_IM_TI_ET_TRUE = @INCLUDE_IM_TI_ET_TRUE@ +-INCLUDE_IM_VIQR_FALSE = @INCLUDE_IM_VIQR_FALSE@ +-INCLUDE_IM_VIQR_TRUE = @INCLUDE_IM_VIQR_TRUE@ +-INCLUDE_IM_XIM_FALSE = @INCLUDE_IM_XIM_FALSE@ +-INCLUDE_IM_XIM_TRUE = @INCLUDE_IM_XIM_TRUE@ +-INCLUDE_JASPER_FALSE = @INCLUDE_JASPER_FALSE@ +-INCLUDE_JASPER_TRUE = @INCLUDE_JASPER_TRUE@ +-INCLUDE_JPEG_FALSE = @INCLUDE_JPEG_FALSE@ +-INCLUDE_JPEG_TRUE = @INCLUDE_JPEG_TRUE@ +-INCLUDE_PCX_FALSE = @INCLUDE_PCX_FALSE@ +-INCLUDE_PCX_TRUE = @INCLUDE_PCX_TRUE@ +-INCLUDE_PNG_FALSE = @INCLUDE_PNG_FALSE@ +-INCLUDE_PNG_TRUE = @INCLUDE_PNG_TRUE@ +-INCLUDE_PNM_FALSE = @INCLUDE_PNM_FALSE@ +-INCLUDE_PNM_TRUE = @INCLUDE_PNM_TRUE@ +-INCLUDE_RAS_FALSE = @INCLUDE_RAS_FALSE@ +-INCLUDE_RAS_TRUE = @INCLUDE_RAS_TRUE@ +-INCLUDE_TGA_FALSE = @INCLUDE_TGA_FALSE@ +-INCLUDE_TGA_TRUE = @INCLUDE_TGA_TRUE@ +-INCLUDE_TIFF_FALSE = @INCLUDE_TIFF_FALSE@ +-INCLUDE_TIFF_TRUE = @INCLUDE_TIFF_TRUE@ +-INCLUDE_WBMP_FALSE = @INCLUDE_WBMP_FALSE@ +-INCLUDE_WBMP_TRUE = @INCLUDE_WBMP_TRUE@ +-INCLUDE_XBM_FALSE = @INCLUDE_XBM_FALSE@ +-INCLUDE_XBM_TRUE = @INCLUDE_XBM_TRUE@ +-INCLUDE_XPM_FALSE = @INCLUDE_XPM_FALSE@ +-INCLUDE_XPM_TRUE = @INCLUDE_XPM_TRUE@ + INDENT = @INDENT@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -258,24 +426,15 @@ LTLIBOBJS = @LTLIBOBJS@ + LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ + LT_VERSION_INFO = @LT_VERSION_INFO@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +-MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@ +-MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@ + NM = @NM@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OS_LINUX_FALSE = @OS_LINUX_FALSE@ +-OS_LINUX_TRUE = @OS_LINUX_TRUE@ +-OS_UNIX_FALSE = @OS_UNIX_FALSE@ +-OS_UNIX_TRUE = @OS_UNIX_TRUE@ +-OS_WIN32_FALSE = @OS_WIN32_FALSE@ +-OS_WIN32_TRUE = @OS_WIN32_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -286,8 +445,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PERL = @PERL@ + PKG_CONFIG = @PKG_CONFIG@ +-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -299,28 +456,10 @@ SED = @SED@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TEST_PRINT_BACKEND_FALSE = @TEST_PRINT_BACKEND_FALSE@ +-TEST_PRINT_BACKEND_TRUE = @TEST_PRINT_BACKEND_TRUE@ +-USE_DIRECTFB_FALSE = @USE_DIRECTFB_FALSE@ +-USE_DIRECTFB_TRUE = @USE_DIRECTFB_TRUE@ +-USE_MEDIALIB25_FALSE = @USE_MEDIALIB25_FALSE@ +-USE_MEDIALIB25_TRUE = @USE_MEDIALIB25_TRUE@ +-USE_MEDIALIB_FALSE = @USE_MEDIALIB_FALSE@ +-USE_MEDIALIB_TRUE = @USE_MEDIALIB_TRUE@ +-USE_MMX_FALSE = @USE_MMX_FALSE@ +-USE_MMX_TRUE = @USE_MMX_TRUE@ + USE_NLS = @USE_NLS@ +-USE_QUARTZ_FALSE = @USE_QUARTZ_FALSE@ +-USE_QUARTZ_TRUE = @USE_QUARTZ_TRUE@ +-USE_WIN32_FALSE = @USE_WIN32_FALSE@ +-USE_WIN32_TRUE = @USE_WIN32_TRUE@ +-USE_X11_FALSE = @USE_X11_FALSE@ +-USE_X11_TRUE = @USE_X11_TRUE@ + VERSION = @VERSION@ + WINDRES = @WINDRES@ + XGETTEXT = @XGETTEXT@ +-XINPUT_XFREE_FALSE = @XINPUT_XFREE_FALSE@ +-XINPUT_XFREE_TRUE = @XINPUT_XFREE_TRUE@ + XMKMF = @XMKMF@ + XMLCATALOG = @XMLCATALOG@ + XML_CATALOG_FILE = @XML_CATALOG_FILE@ +@@ -329,22 +468,25 @@ X_CFLAGS = @X_CFLAGS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_LIBS = @X_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ + bindir = @bindir@ + build = @build@ + build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -367,6 +509,7 @@ libexecdir = @libexecdir@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ ++mkdir_p = @mkdir_p@ + ms_librarian = @ms_librarian@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ +@@ -375,37 +518,21 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +- ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + GTESTER = gtester # in $PATH for non-GLIB packages + GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + + # initialize variables for unconditional += appending +-EXTRA_DIST = \ +- prop-editor.h \ +- testgtk.1 \ +- testgtkrc \ +- testgtkrc2 \ +- circles.xbm \ +- 3DRings.xpm \ +- FilesQueue.xpm \ +- Modeller.xpm \ +- check-y.xpm \ +- check-n.xpm \ +- marble.xpm \ +- test.xpm \ +- check-y.xpm \ +- check-n.xpm \ +- test.xpm \ +- merge-1.ui \ +- merge-2.ui \ +- merge-3.ui \ +- gnome-textfile.png \ +- makefile.msc \ +- file-chooser-test-dir/empty \ ++EXTRA_DIST = prop-editor.h testgtk.1 testgtkrc testgtkrc2 circles.xbm \ ++ 3DRings.xpm FilesQueue.xpm Modeller.xpm check-y.xpm \ ++ check-n.xpm marble.xpm test.xpm check-y.xpm check-n.xpm \ ++ test.xpm merge-1.ui merge-2.ui merge-3.ui gnome-textfile.png \ ++ makefile.msc file-chooser-test-dir/empty \ + file-chooser-test-dir/text.txt +- + TEST_PROGS = + + ### testing rules +@@ -431,7 +558,6 @@ XVFB_START = \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY + +- + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir)/gdk \ +@@ -441,89 +567,21 @@ INCLUDES = \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +- + DEPS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + LDADDS = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(top_builddir)/gtk/$(gtktargetlib) + +- + @USE_X11_TRUE@testsocket_programs = testsocket testsocket_child +- +-noinst_PROGRAMS = $(TEST_PROGS) \ +- simple \ +- print-editor \ +- testaccel \ +- testassistant \ +- testbbox \ +- testcairo \ +- testcalendar \ +- testcombo \ +- testcombochange \ +- testcellrenderertext \ +- testdnd \ +- testellipsise \ +- testentrycompletion \ +- testfilechooser \ +- testfilechooserbutton \ +- testframe \ +- testgtk \ +- testiconview \ +- testicontheme \ +- testimage \ +- testinput \ +- testmenus \ +- testmenubars \ +- testmountoperation \ +- testmultidisplay \ +- testmultiscreen \ +- testnotebookdnd \ +- testnouiprint \ +- testprint \ +- testrgb \ +- testrecentchooser \ +- testrecentchoosermenu \ +- testrichtext \ +- testselection \ +- $(testsocket_programs) \ +- testspinbutton \ +- teststatusicon \ +- testtext \ +- testtoolbar \ +- stresstest-toolbar \ +- testtreeedit \ +- testtreemodel \ +- testtreeview \ +- testtreefocus \ +- testtreeflow \ +- testtreecolumns \ +- testtreecolumnsizing \ +- testtreesort \ +- treestoretest \ +- testxinerama \ +- pixbuf-read \ +- pixbuf-lowmem \ +- pixbuf-randomly-modified \ +- pixbuf-random \ +- pixbuf-threads \ +- testmerge \ +- testactions \ +- testgrouping \ +- testtooltips \ +- testvolumebutton\ +-$(am__append_1) +-@HAVE_CXX_TRUE@TESTS = autotestkeywords +- + @HAVE_CXX_TRUE@autotestkeywords_SOURCES = autotestkeywords.cc +-@HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers $(am__append_2) ++@HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers \ ++@HAVE_CXX_TRUE@ $(am__append_2) + @HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@autotestkeywords_CXXFLAGS = -x objective-c++ +- + simple_DEPENDENCIES = $(TEST_DEPS) + print_editor_DEPENDENCIES = $(TEST_DEPS) + testicontheme_DEPENDENCIES = $(TEST_DEPS) +@@ -578,7 +636,6 @@ testactions_DEPENDENCIES = $(TEST_DEPS) + testgrouping_DEPENDENCIES = $(TEST_DEPS) + testtooltips_DEPENDENCIES = $(TEST_DEPS) + testvolumebutton_DEPENDENCIES = $(TEST_DEPS) +- + simple_LDADD = $(LDADDS) + print_editor_LDADD = $(LDADDS) + testaccel_LDADD = $(LDADDS) +@@ -640,700 +697,125 @@ testactions_LDADD = $(LDADDS) + testgrouping_LDADD = $(LDADDS) + testtooltips_LDADD = $(LDADDS) + testvolumebutton_LDADD = $(LDADDS) +- + testentrycompletion_SOURCES = \ + prop-editor.c \ + testentrycompletion.c + +- + testfilechooser_SOURCES = \ + prop-editor.c \ + testfilechooser.c + +- + testfilechooserbutton_SOURCES = \ + prop-editor.c \ + testfilechooserbutton.c + +- + testgtk_SOURCES = \ + prop-editor.c \ + testgtk.c + +- + testtreeedit_SOURCES = \ + testtreeedit.c + +- + testtreemodel_SOURCES = \ + testtreemodel.c + +- + testtreeview_SOURCES = \ + prop-editor.c \ + testtreeview.c + +- + testtext_SOURCES = \ + prop-editor.c \ + testtext.c + +- + testtoolbar_SOURCES = \ + testtoolbar.c \ + prop-editor.c + +- + testprint_SOURCES = \ + testprint.c \ + testprintfileoperation.h \ + testprintfileoperation.c + +- + testsocket_SOURCES = \ + testsocket.c \ + testsocket_common.c + +- + testsocket_child_SOURCES = \ + testsocket_child.c \ + testsocket_common.c + +- + testspinbutton_SOURCES = \ + testspinbutton.c + +- + teststatusicon_SOURCES = \ + prop-editor.c \ + teststatusicon.c + +- + testmerge_SOURCES = \ + testmerge.c + +- + testactions_SOURCES = \ + testactions.c + +- + testbbox_SOURCES = \ + testbbox.c + +- + testframe_SOURCES = \ + testframe.c + +- + testiconview_SOURCES = \ + testiconview.c \ + prop-editor.c + +- + testrecentchooser_SOURCES = \ + prop-editor.c \ + testrecentchooser.c + +- + testgrouping_SOURCES = \ + testgrouping.c + +- + testtooltips_SOURCES = \ + testtooltips.c + +- + testrecentchoosermenu_SOURCES = \ + testrecentchoosermenu.c + +- + testvolumebutton_SOURCES = \ + testvolumebutton.c + +-subdir = tests +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-@HAVE_CXX_FALSE@@USE_X11_TRUE@noinst_PROGRAMS = simple$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ print-editor$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testaccel$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testassistant$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testbbox$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testcairo$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testcalendar$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testcombo$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testcombochange$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testcellrenderertext$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testdnd$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testellipsise$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testentrycompletion$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testfilechooser$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testfilechooserbutton$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testframe$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testgtk$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testiconview$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testicontheme$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testimage$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testinput$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmenus$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmenubars$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmountoperation$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmultidisplay$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmultiscreen$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testnotebookdnd$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testnouiprint$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testprint$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testrgb$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testrecentchooser$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testrecentchoosermenu$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testrichtext$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testselection$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testsocket$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testsocket_child$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testspinbutton$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ teststatusicon$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtext$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtoolbar$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ stresstest-toolbar$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreeedit$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreemodel$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreeview$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreefocus$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreeflow$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreecolumns$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreecolumnsizing$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtreesort$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ treestoretest$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testxinerama$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ pixbuf-read$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ pixbuf-lowmem$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ pixbuf-randomly-modified$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ pixbuf-random$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ pixbuf-threads$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testmerge$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testactions$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testgrouping$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testtooltips$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_TRUE@ testvolumebutton$(EXEEXT) +-@HAVE_CXX_FALSE@@USE_X11_FALSE@noinst_PROGRAMS = simple$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ print-editor$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testaccel$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testassistant$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testbbox$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testcairo$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testcalendar$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testcombo$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testcombochange$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testcellrenderertext$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testdnd$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testellipsise$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testentrycompletion$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testfilechooser$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testfilechooserbutton$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testframe$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testgtk$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testiconview$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testicontheme$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testimage$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testinput$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmenus$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmenubars$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmountoperation$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmultidisplay$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmultiscreen$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testnotebookdnd$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testnouiprint$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testprint$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testrgb$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testrecentchooser$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testrecentchoosermenu$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testrichtext$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testselection$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testspinbutton$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ teststatusicon$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtext$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtoolbar$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ stresstest-toolbar$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreeedit$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreemodel$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreeview$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreefocus$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreeflow$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreecolumns$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreecolumnsizing$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtreesort$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ treestoretest$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testxinerama$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ pixbuf-read$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ pixbuf-lowmem$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ pixbuf-randomly-modified$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ pixbuf-random$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ pixbuf-threads$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testmerge$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testactions$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testgrouping$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testtooltips$(EXEEXT) \ +-@HAVE_CXX_FALSE@@USE_X11_FALSE@ testvolumebutton$(EXEEXT) +-@HAVE_CXX_TRUE@@USE_X11_TRUE@noinst_PROGRAMS = simple$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ print-editor$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testaccel$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testassistant$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testbbox$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testcairo$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testcalendar$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testcombo$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testcombochange$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testcellrenderertext$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testdnd$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testellipsise$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testentrycompletion$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testfilechooser$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testfilechooserbutton$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testframe$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testgtk$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testiconview$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testicontheme$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testimage$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testinput$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmenus$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmenubars$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmountoperation$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmultidisplay$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmultiscreen$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testnotebookdnd$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testnouiprint$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testprint$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testrgb$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testrecentchooser$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testrecentchoosermenu$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testrichtext$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testselection$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testsocket$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testsocket_child$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testspinbutton$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ teststatusicon$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtext$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtoolbar$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ stresstest-toolbar$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreeedit$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreemodel$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreeview$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreefocus$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreeflow$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreecolumns$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreecolumnsizing$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtreesort$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ treestoretest$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testxinerama$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ pixbuf-read$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ pixbuf-lowmem$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ pixbuf-randomly-modified$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ pixbuf-random$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ pixbuf-threads$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testmerge$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testactions$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testgrouping$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testtooltips$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ testvolumebutton$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_TRUE@ autotestkeywords$(EXEEXT) +-@HAVE_CXX_TRUE@@USE_X11_FALSE@noinst_PROGRAMS = simple$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ print-editor$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testaccel$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testassistant$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testbbox$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testcairo$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testcalendar$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testcombo$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testcombochange$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testcellrenderertext$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testdnd$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testellipsise$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testentrycompletion$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testfilechooser$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testfilechooserbutton$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testframe$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testgtk$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testiconview$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testicontheme$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testimage$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testinput$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmenus$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmenubars$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmountoperation$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmultidisplay$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmultiscreen$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testnotebookdnd$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testnouiprint$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testprint$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testrgb$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testrecentchooser$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testrecentchoosermenu$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testrichtext$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testselection$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testspinbutton$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ teststatusicon$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtext$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtoolbar$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ stresstest-toolbar$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreeedit$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreemodel$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreeview$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreefocus$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreeflow$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreecolumns$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreecolumnsizing$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtreesort$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ treestoretest$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testxinerama$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ pixbuf-read$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ pixbuf-lowmem$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ pixbuf-randomly-modified$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ pixbuf-random$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ pixbuf-threads$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testmerge$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testactions$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testgrouping$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testtooltips$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ testvolumebutton$(EXEEXT) \ +-@HAVE_CXX_TRUE@@USE_X11_FALSE@ autotestkeywords$(EXEEXT) +-PROGRAMS = $(noinst_PROGRAMS) +- +-am__autotestkeywords_SOURCES_DIST = autotestkeywords.cc +-@HAVE_CXX_TRUE@am_autotestkeywords_OBJECTS = \ +-@HAVE_CXX_TRUE@ autotestkeywords-autotestkeywords.$(OBJEXT) +-autotestkeywords_OBJECTS = $(am_autotestkeywords_OBJECTS) +-autotestkeywords_LDADD = $(LDADD) +-autotestkeywords_DEPENDENCIES = +-autotestkeywords_LDFLAGS = +-pixbuf_lowmem_SOURCES = pixbuf-lowmem.c +-pixbuf_lowmem_OBJECTS = pixbuf-lowmem.$(OBJEXT) +-pixbuf_lowmem_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-pixbuf_lowmem_LDFLAGS = +-pixbuf_random_SOURCES = pixbuf-random.c +-pixbuf_random_OBJECTS = pixbuf-random.$(OBJEXT) +-pixbuf_random_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-pixbuf_random_LDFLAGS = +-pixbuf_randomly_modified_SOURCES = pixbuf-randomly-modified.c +-pixbuf_randomly_modified_OBJECTS = pixbuf-randomly-modified.$(OBJEXT) +-pixbuf_randomly_modified_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-pixbuf_randomly_modified_LDFLAGS = +-pixbuf_read_SOURCES = pixbuf-read.c +-pixbuf_read_OBJECTS = pixbuf-read.$(OBJEXT) +-pixbuf_read_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-pixbuf_read_LDFLAGS = +-pixbuf_threads_SOURCES = pixbuf-threads.c +-pixbuf_threads_OBJECTS = pixbuf-threads.$(OBJEXT) +-pixbuf_threads_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-pixbuf_threads_LDFLAGS = +-print_editor_SOURCES = print-editor.c +-print_editor_OBJECTS = print-editor.$(OBJEXT) +-print_editor_LDFLAGS = +-simple_SOURCES = simple.c +-simple_OBJECTS = simple.$(OBJEXT) +-simple_LDFLAGS = +-stresstest_toolbar_SOURCES = stresstest-toolbar.c +-stresstest_toolbar_OBJECTS = stresstest-toolbar.$(OBJEXT) +-stresstest_toolbar_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-stresstest_toolbar_LDFLAGS = +-testaccel_SOURCES = testaccel.c +-testaccel_OBJECTS = testaccel.$(OBJEXT) +-testaccel_LDFLAGS = +-am_testactions_OBJECTS = testactions.$(OBJEXT) +-testactions_OBJECTS = $(am_testactions_OBJECTS) +-testactions_LDFLAGS = +-testassistant_SOURCES = testassistant.c +-testassistant_OBJECTS = testassistant.$(OBJEXT) +-testassistant_LDFLAGS = +-am_testbbox_OBJECTS = testbbox.$(OBJEXT) +-testbbox_OBJECTS = $(am_testbbox_OBJECTS) +-testbbox_LDFLAGS = +-testcairo_SOURCES = testcairo.c +-testcairo_OBJECTS = testcairo.$(OBJEXT) +-testcairo_LDFLAGS = +-testcalendar_SOURCES = testcalendar.c +-testcalendar_OBJECTS = testcalendar.$(OBJEXT) +-testcalendar_LDFLAGS = +-testcellrenderertext_SOURCES = testcellrenderertext.c +-testcellrenderertext_OBJECTS = testcellrenderertext.$(OBJEXT) +-testcellrenderertext_LDFLAGS = +-testcombo_SOURCES = testcombo.c +-testcombo_OBJECTS = testcombo.$(OBJEXT) +-testcombo_LDFLAGS = +-testcombochange_SOURCES = testcombochange.c +-testcombochange_OBJECTS = testcombochange.$(OBJEXT) +-testcombochange_LDFLAGS = +-testdnd_SOURCES = testdnd.c +-testdnd_OBJECTS = testdnd.$(OBJEXT) +-testdnd_LDFLAGS = +-testellipsise_SOURCES = testellipsise.c +-testellipsise_OBJECTS = testellipsise.$(OBJEXT) +-testellipsise_LDFLAGS = +-am_testentrycompletion_OBJECTS = prop-editor.$(OBJEXT) \ +- testentrycompletion.$(OBJEXT) +-testentrycompletion_OBJECTS = $(am_testentrycompletion_OBJECTS) +-testentrycompletion_LDFLAGS = +-am_testfilechooser_OBJECTS = prop-editor.$(OBJEXT) \ +- testfilechooser.$(OBJEXT) +-testfilechooser_OBJECTS = $(am_testfilechooser_OBJECTS) +-testfilechooser_LDFLAGS = +-am_testfilechooserbutton_OBJECTS = prop-editor.$(OBJEXT) \ +- testfilechooserbutton.$(OBJEXT) +-testfilechooserbutton_OBJECTS = $(am_testfilechooserbutton_OBJECTS) +-testfilechooserbutton_LDFLAGS = +-am_testframe_OBJECTS = testframe.$(OBJEXT) +-testframe_OBJECTS = $(am_testframe_OBJECTS) +-testframe_LDFLAGS = +-am_testgrouping_OBJECTS = testgrouping.$(OBJEXT) +-testgrouping_OBJECTS = $(am_testgrouping_OBJECTS) +-testgrouping_LDFLAGS = +-am_testgtk_OBJECTS = prop-editor.$(OBJEXT) testgtk.$(OBJEXT) +-testgtk_OBJECTS = $(am_testgtk_OBJECTS) +-testgtk_LDFLAGS = +-testicontheme_SOURCES = testicontheme.c +-testicontheme_OBJECTS = testicontheme.$(OBJEXT) +-testicontheme_LDFLAGS = +-am_testiconview_OBJECTS = testiconview.$(OBJEXT) prop-editor.$(OBJEXT) +-testiconview_OBJECTS = $(am_testiconview_OBJECTS) +-testiconview_LDFLAGS = +-testimage_SOURCES = testimage.c +-testimage_OBJECTS = testimage.$(OBJEXT) +-testimage_LDFLAGS = +-testinput_SOURCES = testinput.c +-testinput_OBJECTS = testinput.$(OBJEXT) +-testinput_LDFLAGS = +-testmenubars_SOURCES = testmenubars.c +-testmenubars_OBJECTS = testmenubars.$(OBJEXT) +-testmenubars_LDFLAGS = +-testmenus_SOURCES = testmenus.c +-testmenus_OBJECTS = testmenus.$(OBJEXT) +-testmenus_LDFLAGS = +-am_testmerge_OBJECTS = testmerge.$(OBJEXT) +-testmerge_OBJECTS = $(am_testmerge_OBJECTS) +-testmerge_LDFLAGS = +-testmountoperation_SOURCES = testmountoperation.c +-testmountoperation_OBJECTS = testmountoperation.$(OBJEXT) +-testmountoperation_LDFLAGS = +-testmultidisplay_SOURCES = testmultidisplay.c +-testmultidisplay_OBJECTS = testmultidisplay.$(OBJEXT) +-testmultidisplay_LDFLAGS = +-testmultiscreen_SOURCES = testmultiscreen.c +-testmultiscreen_OBJECTS = testmultiscreen.$(OBJEXT) +-testmultiscreen_LDFLAGS = +-testnotebookdnd_SOURCES = testnotebookdnd.c +-testnotebookdnd_OBJECTS = testnotebookdnd.$(OBJEXT) +-testnotebookdnd_LDFLAGS = +-testnouiprint_SOURCES = testnouiprint.c +-testnouiprint_OBJECTS = testnouiprint.$(OBJEXT) +-testnouiprint_LDFLAGS = +-am_testprint_OBJECTS = testprint.$(OBJEXT) \ +- testprintfileoperation.$(OBJEXT) +-testprint_OBJECTS = $(am_testprint_OBJECTS) +-testprint_LDFLAGS = +-am_testrecentchooser_OBJECTS = prop-editor.$(OBJEXT) \ +- testrecentchooser.$(OBJEXT) +-testrecentchooser_OBJECTS = $(am_testrecentchooser_OBJECTS) +-testrecentchooser_LDFLAGS = +-am_testrecentchoosermenu_OBJECTS = testrecentchoosermenu.$(OBJEXT) +-testrecentchoosermenu_OBJECTS = $(am_testrecentchoosermenu_OBJECTS) +-testrecentchoosermenu_LDFLAGS = +-testrgb_SOURCES = testrgb.c +-testrgb_OBJECTS = testrgb.$(OBJEXT) +-testrgb_LDFLAGS = +-testrichtext_SOURCES = testrichtext.c +-testrichtext_OBJECTS = testrichtext.$(OBJEXT) +-testrichtext_LDFLAGS = +-testselection_SOURCES = testselection.c +-testselection_OBJECTS = testselection.$(OBJEXT) +-testselection_LDFLAGS = +-am_testsocket_OBJECTS = testsocket.$(OBJEXT) testsocket_common.$(OBJEXT) +-testsocket_OBJECTS = $(am_testsocket_OBJECTS) +-testsocket_LDFLAGS = +-am_testsocket_child_OBJECTS = testsocket_child.$(OBJEXT) \ +- testsocket_common.$(OBJEXT) +-testsocket_child_OBJECTS = $(am_testsocket_child_OBJECTS) +-testsocket_child_LDFLAGS = +-am_testspinbutton_OBJECTS = testspinbutton.$(OBJEXT) +-testspinbutton_OBJECTS = $(am_testspinbutton_OBJECTS) +-testspinbutton_LDFLAGS = +-am_teststatusicon_OBJECTS = prop-editor.$(OBJEXT) \ +- teststatusicon.$(OBJEXT) +-teststatusicon_OBJECTS = $(am_teststatusicon_OBJECTS) +-teststatusicon_LDFLAGS = +-am_testtext_OBJECTS = prop-editor.$(OBJEXT) testtext.$(OBJEXT) +-testtext_OBJECTS = $(am_testtext_OBJECTS) +-testtext_LDFLAGS = +-am_testtoolbar_OBJECTS = testtoolbar.$(OBJEXT) prop-editor.$(OBJEXT) +-testtoolbar_OBJECTS = $(am_testtoolbar_OBJECTS) +-testtoolbar_DEPENDENCIES = \ +- $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(top_builddir)/gdk/$(gdktargetlib) \ +- $(top_builddir)/gtk/$(gtktargetlib) +-testtoolbar_LDFLAGS = +-am_testtooltips_OBJECTS = testtooltips.$(OBJEXT) +-testtooltips_OBJECTS = $(am_testtooltips_OBJECTS) +-testtooltips_LDFLAGS = +-testtreecolumns_SOURCES = testtreecolumns.c +-testtreecolumns_OBJECTS = testtreecolumns.$(OBJEXT) +-testtreecolumns_LDFLAGS = +-testtreecolumnsizing_SOURCES = testtreecolumnsizing.c +-testtreecolumnsizing_OBJECTS = testtreecolumnsizing.$(OBJEXT) +-testtreecolumnsizing_LDFLAGS = +-am_testtreeedit_OBJECTS = testtreeedit.$(OBJEXT) +-testtreeedit_OBJECTS = $(am_testtreeedit_OBJECTS) +-testtreeedit_LDFLAGS = +-testtreeflow_SOURCES = testtreeflow.c +-testtreeflow_OBJECTS = testtreeflow.$(OBJEXT) +-testtreeflow_LDFLAGS = +-testtreefocus_SOURCES = testtreefocus.c +-testtreefocus_OBJECTS = testtreefocus.$(OBJEXT) +-testtreefocus_LDFLAGS = +-am_testtreemodel_OBJECTS = testtreemodel.$(OBJEXT) +-testtreemodel_OBJECTS = $(am_testtreemodel_OBJECTS) +-testtreemodel_LDFLAGS = +-testtreesort_SOURCES = testtreesort.c +-testtreesort_OBJECTS = testtreesort.$(OBJEXT) +-testtreesort_LDFLAGS = +-am_testtreeview_OBJECTS = prop-editor.$(OBJEXT) testtreeview.$(OBJEXT) +-testtreeview_OBJECTS = $(am_testtreeview_OBJECTS) +-testtreeview_LDFLAGS = +-am_testvolumebutton_OBJECTS = testvolumebutton.$(OBJEXT) +-testvolumebutton_OBJECTS = $(am_testvolumebutton_OBJECTS) +-testvolumebutton_LDFLAGS = +-testxinerama_SOURCES = testxinerama.c +-testxinerama_OBJECTS = testxinerama.$(OBJEXT) +-testxinerama_LDFLAGS = +-treestoretest_SOURCES = treestoretest.c +-treestoretest_OBJECTS = treestoretest.$(OBJEXT) +-treestoretest_LDFLAGS = +- +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/depcomp +-am__depfiles_maybe = depfiles +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autotestkeywords-autotestkeywords.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-lowmem.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-random.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-randomly-modified.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-read.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/pixbuf-threads.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/print-editor.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/prop-editor.Po ./$(DEPDIR)/simple.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/stresstest-toolbar.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testaccel.Po ./$(DEPDIR)/testactions.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testassistant.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testbbox.Po ./$(DEPDIR)/testcairo.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testcalendar.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testcellrenderertext.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testcombo.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testcombochange.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testdnd.Po ./$(DEPDIR)/testellipsise.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testentrycompletion.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testfilechooser.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testfilechooserbutton.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testframe.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testgrouping.Po ./$(DEPDIR)/testgtk.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testicontheme.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testiconview.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testimage.Po ./$(DEPDIR)/testinput.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testmenubars.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testmenus.Po ./$(DEPDIR)/testmerge.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testmountoperation.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testmultidisplay.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testmultiscreen.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testnotebookdnd.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testnouiprint.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testprint.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testprintfileoperation.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testrecentchooser.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testrecentchoosermenu.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testrgb.Po ./$(DEPDIR)/testrichtext.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testselection.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testsocket.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testsocket_child.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testsocket_common.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testspinbutton.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/teststatusicon.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtext.Po ./$(DEPDIR)/testtoolbar.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtooltips.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreecolumns.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreecolumnsizing.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreeedit.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreeflow.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreefocus.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreemodel.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreesort.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testtreeview.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testvolumebutton.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/testxinerama.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/treestoretest.Po +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CXXFLAGS) $(CXXFLAGS) +-CXXLD = $(CXX) +-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(am__autotestkeywords_SOURCES_DIST) pixbuf-lowmem.c \ +- pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c \ +- pixbuf-threads.c print-editor.c simple.c stresstest-toolbar.c \ +- testaccel.c $(testactions_SOURCES) testassistant.c \ +- $(testbbox_SOURCES) testcairo.c testcalendar.c \ +- testcellrenderertext.c testcombo.c testcombochange.c testdnd.c \ +- testellipsise.c $(testentrycompletion_SOURCES) \ +- $(testfilechooser_SOURCES) $(testfilechooserbutton_SOURCES) \ +- $(testframe_SOURCES) $(testgrouping_SOURCES) $(testgtk_SOURCES) \ +- testicontheme.c $(testiconview_SOURCES) testimage.c testinput.c \ +- testmenubars.c testmenus.c $(testmerge_SOURCES) \ +- testmountoperation.c testmultidisplay.c testmultiscreen.c \ +- testnotebookdnd.c testnouiprint.c $(testprint_SOURCES) \ +- $(testrecentchooser_SOURCES) $(testrecentchoosermenu_SOURCES) \ +- testrgb.c testrichtext.c testselection.c $(testsocket_SOURCES) \ +- $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) \ +- $(teststatusicon_SOURCES) $(testtext_SOURCES) \ +- $(testtoolbar_SOURCES) $(testtooltips_SOURCES) \ +- testtreecolumns.c testtreecolumnsizing.c \ +- $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c \ +- $(testtreemodel_SOURCES) testtreesort.c $(testtreeview_SOURCES) \ +- $(testvolumebutton_SOURCES) testxinerama.c treestoretest.c +-DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl \ +- Makefile.am +-SOURCES = $(autotestkeywords_SOURCES) pixbuf-lowmem.c pixbuf-random.c pixbuf-randomly-modified.c pixbuf-read.c pixbuf-threads.c print-editor.c simple.c stresstest-toolbar.c testaccel.c $(testactions_SOURCES) testassistant.c $(testbbox_SOURCES) testcairo.c testcalendar.c testcellrenderertext.c testcombo.c testcombochange.c testdnd.c testellipsise.c $(testentrycompletion_SOURCES) $(testfilechooser_SOURCES) $(testfilechooserbutton_SOURCES) $(testframe_SOURCES) $(testgrouping_SOURCES) $(testgtk_SOURCES) testicontheme.c $(testiconview_SOURCES) testimage.c testinput.c testmenubars.c testmenus.c $(testmerge_SOURCES) testmountoperation.c testmultidisplay.c testmultiscreen.c testnotebookdnd.c testnouiprint.c $(testprint_SOURCES) $(testrecentchooser_SOURCES) $(testrecentchoosermenu_SOURCES) testrgb.c testrichtext.c testselection.c $(testsocket_SOURCES) $(testsocket_child_SOURCES) $(testspinbutton_SOURCES) $(teststatusicon_SOURCES) $(testtext_SOURCES) $(testtoolbar_SOURCES) $(testtooltips_SOURCES) testtreecolumns.c testtreecolumnsizing.c $(testtreeedit_SOURCES) testtreeflow.c testtreefocus.c $(testtreemodel_SOURCES) testtreesort.c $(testtreeview_SOURCES) $(testvolumebutton_SOURCES) testxinerama.c treestoretest.c +- + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .cc .lo .o .obj +-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.decl $(top_srcdir)/configure.in $(ACLOCAL_M4) ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu tests/Makefile +-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + + clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ +@@ -1343,193 +825,193 @@ clean-noinstPROGRAMS: + done + autotestkeywords$(EXEEXT): $(autotestkeywords_OBJECTS) $(autotestkeywords_DEPENDENCIES) + @rm -f autotestkeywords$(EXEEXT) +- $(CXXLINK) $(autotestkeywords_LDFLAGS) $(autotestkeywords_OBJECTS) $(autotestkeywords_LDADD) $(LIBS) ++ $(autotestkeywords_LINK) $(autotestkeywords_OBJECTS) $(autotestkeywords_LDADD) $(LIBS) + pixbuf-lowmem$(EXEEXT): $(pixbuf_lowmem_OBJECTS) $(pixbuf_lowmem_DEPENDENCIES) + @rm -f pixbuf-lowmem$(EXEEXT) +- $(LINK) $(pixbuf_lowmem_LDFLAGS) $(pixbuf_lowmem_OBJECTS) $(pixbuf_lowmem_LDADD) $(LIBS) ++ $(LINK) $(pixbuf_lowmem_OBJECTS) $(pixbuf_lowmem_LDADD) $(LIBS) + pixbuf-random$(EXEEXT): $(pixbuf_random_OBJECTS) $(pixbuf_random_DEPENDENCIES) + @rm -f pixbuf-random$(EXEEXT) +- $(LINK) $(pixbuf_random_LDFLAGS) $(pixbuf_random_OBJECTS) $(pixbuf_random_LDADD) $(LIBS) ++ $(LINK) $(pixbuf_random_OBJECTS) $(pixbuf_random_LDADD) $(LIBS) + pixbuf-randomly-modified$(EXEEXT): $(pixbuf_randomly_modified_OBJECTS) $(pixbuf_randomly_modified_DEPENDENCIES) + @rm -f pixbuf-randomly-modified$(EXEEXT) +- $(LINK) $(pixbuf_randomly_modified_LDFLAGS) $(pixbuf_randomly_modified_OBJECTS) $(pixbuf_randomly_modified_LDADD) $(LIBS) ++ $(LINK) $(pixbuf_randomly_modified_OBJECTS) $(pixbuf_randomly_modified_LDADD) $(LIBS) + pixbuf-read$(EXEEXT): $(pixbuf_read_OBJECTS) $(pixbuf_read_DEPENDENCIES) + @rm -f pixbuf-read$(EXEEXT) +- $(LINK) $(pixbuf_read_LDFLAGS) $(pixbuf_read_OBJECTS) $(pixbuf_read_LDADD) $(LIBS) ++ $(LINK) $(pixbuf_read_OBJECTS) $(pixbuf_read_LDADD) $(LIBS) + pixbuf-threads$(EXEEXT): $(pixbuf_threads_OBJECTS) $(pixbuf_threads_DEPENDENCIES) + @rm -f pixbuf-threads$(EXEEXT) +- $(LINK) $(pixbuf_threads_LDFLAGS) $(pixbuf_threads_OBJECTS) $(pixbuf_threads_LDADD) $(LIBS) ++ $(LINK) $(pixbuf_threads_OBJECTS) $(pixbuf_threads_LDADD) $(LIBS) + print-editor$(EXEEXT): $(print_editor_OBJECTS) $(print_editor_DEPENDENCIES) + @rm -f print-editor$(EXEEXT) +- $(LINK) $(print_editor_LDFLAGS) $(print_editor_OBJECTS) $(print_editor_LDADD) $(LIBS) ++ $(LINK) $(print_editor_OBJECTS) $(print_editor_LDADD) $(LIBS) + simple$(EXEEXT): $(simple_OBJECTS) $(simple_DEPENDENCIES) + @rm -f simple$(EXEEXT) +- $(LINK) $(simple_LDFLAGS) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) ++ $(LINK) $(simple_OBJECTS) $(simple_LDADD) $(LIBS) + stresstest-toolbar$(EXEEXT): $(stresstest_toolbar_OBJECTS) $(stresstest_toolbar_DEPENDENCIES) + @rm -f stresstest-toolbar$(EXEEXT) +- $(LINK) $(stresstest_toolbar_LDFLAGS) $(stresstest_toolbar_OBJECTS) $(stresstest_toolbar_LDADD) $(LIBS) ++ $(LINK) $(stresstest_toolbar_OBJECTS) $(stresstest_toolbar_LDADD) $(LIBS) + testaccel$(EXEEXT): $(testaccel_OBJECTS) $(testaccel_DEPENDENCIES) + @rm -f testaccel$(EXEEXT) +- $(LINK) $(testaccel_LDFLAGS) $(testaccel_OBJECTS) $(testaccel_LDADD) $(LIBS) ++ $(LINK) $(testaccel_OBJECTS) $(testaccel_LDADD) $(LIBS) + testactions$(EXEEXT): $(testactions_OBJECTS) $(testactions_DEPENDENCIES) + @rm -f testactions$(EXEEXT) +- $(LINK) $(testactions_LDFLAGS) $(testactions_OBJECTS) $(testactions_LDADD) $(LIBS) ++ $(LINK) $(testactions_OBJECTS) $(testactions_LDADD) $(LIBS) + testassistant$(EXEEXT): $(testassistant_OBJECTS) $(testassistant_DEPENDENCIES) + @rm -f testassistant$(EXEEXT) +- $(LINK) $(testassistant_LDFLAGS) $(testassistant_OBJECTS) $(testassistant_LDADD) $(LIBS) ++ $(LINK) $(testassistant_OBJECTS) $(testassistant_LDADD) $(LIBS) + testbbox$(EXEEXT): $(testbbox_OBJECTS) $(testbbox_DEPENDENCIES) + @rm -f testbbox$(EXEEXT) +- $(LINK) $(testbbox_LDFLAGS) $(testbbox_OBJECTS) $(testbbox_LDADD) $(LIBS) ++ $(LINK) $(testbbox_OBJECTS) $(testbbox_LDADD) $(LIBS) + testcairo$(EXEEXT): $(testcairo_OBJECTS) $(testcairo_DEPENDENCIES) + @rm -f testcairo$(EXEEXT) +- $(LINK) $(testcairo_LDFLAGS) $(testcairo_OBJECTS) $(testcairo_LDADD) $(LIBS) ++ $(LINK) $(testcairo_OBJECTS) $(testcairo_LDADD) $(LIBS) + testcalendar$(EXEEXT): $(testcalendar_OBJECTS) $(testcalendar_DEPENDENCIES) + @rm -f testcalendar$(EXEEXT) +- $(LINK) $(testcalendar_LDFLAGS) $(testcalendar_OBJECTS) $(testcalendar_LDADD) $(LIBS) ++ $(LINK) $(testcalendar_OBJECTS) $(testcalendar_LDADD) $(LIBS) + testcellrenderertext$(EXEEXT): $(testcellrenderertext_OBJECTS) $(testcellrenderertext_DEPENDENCIES) + @rm -f testcellrenderertext$(EXEEXT) +- $(LINK) $(testcellrenderertext_LDFLAGS) $(testcellrenderertext_OBJECTS) $(testcellrenderertext_LDADD) $(LIBS) ++ $(LINK) $(testcellrenderertext_OBJECTS) $(testcellrenderertext_LDADD) $(LIBS) + testcombo$(EXEEXT): $(testcombo_OBJECTS) $(testcombo_DEPENDENCIES) + @rm -f testcombo$(EXEEXT) +- $(LINK) $(testcombo_LDFLAGS) $(testcombo_OBJECTS) $(testcombo_LDADD) $(LIBS) ++ $(LINK) $(testcombo_OBJECTS) $(testcombo_LDADD) $(LIBS) + testcombochange$(EXEEXT): $(testcombochange_OBJECTS) $(testcombochange_DEPENDENCIES) + @rm -f testcombochange$(EXEEXT) +- $(LINK) $(testcombochange_LDFLAGS) $(testcombochange_OBJECTS) $(testcombochange_LDADD) $(LIBS) ++ $(LINK) $(testcombochange_OBJECTS) $(testcombochange_LDADD) $(LIBS) + testdnd$(EXEEXT): $(testdnd_OBJECTS) $(testdnd_DEPENDENCIES) + @rm -f testdnd$(EXEEXT) +- $(LINK) $(testdnd_LDFLAGS) $(testdnd_OBJECTS) $(testdnd_LDADD) $(LIBS) ++ $(LINK) $(testdnd_OBJECTS) $(testdnd_LDADD) $(LIBS) + testellipsise$(EXEEXT): $(testellipsise_OBJECTS) $(testellipsise_DEPENDENCIES) + @rm -f testellipsise$(EXEEXT) +- $(LINK) $(testellipsise_LDFLAGS) $(testellipsise_OBJECTS) $(testellipsise_LDADD) $(LIBS) ++ $(LINK) $(testellipsise_OBJECTS) $(testellipsise_LDADD) $(LIBS) + testentrycompletion$(EXEEXT): $(testentrycompletion_OBJECTS) $(testentrycompletion_DEPENDENCIES) + @rm -f testentrycompletion$(EXEEXT) +- $(LINK) $(testentrycompletion_LDFLAGS) $(testentrycompletion_OBJECTS) $(testentrycompletion_LDADD) $(LIBS) ++ $(LINK) $(testentrycompletion_OBJECTS) $(testentrycompletion_LDADD) $(LIBS) + testfilechooser$(EXEEXT): $(testfilechooser_OBJECTS) $(testfilechooser_DEPENDENCIES) + @rm -f testfilechooser$(EXEEXT) +- $(LINK) $(testfilechooser_LDFLAGS) $(testfilechooser_OBJECTS) $(testfilechooser_LDADD) $(LIBS) ++ $(LINK) $(testfilechooser_OBJECTS) $(testfilechooser_LDADD) $(LIBS) + testfilechooserbutton$(EXEEXT): $(testfilechooserbutton_OBJECTS) $(testfilechooserbutton_DEPENDENCIES) + @rm -f testfilechooserbutton$(EXEEXT) +- $(LINK) $(testfilechooserbutton_LDFLAGS) $(testfilechooserbutton_OBJECTS) $(testfilechooserbutton_LDADD) $(LIBS) ++ $(LINK) $(testfilechooserbutton_OBJECTS) $(testfilechooserbutton_LDADD) $(LIBS) + testframe$(EXEEXT): $(testframe_OBJECTS) $(testframe_DEPENDENCIES) + @rm -f testframe$(EXEEXT) +- $(LINK) $(testframe_LDFLAGS) $(testframe_OBJECTS) $(testframe_LDADD) $(LIBS) ++ $(LINK) $(testframe_OBJECTS) $(testframe_LDADD) $(LIBS) + testgrouping$(EXEEXT): $(testgrouping_OBJECTS) $(testgrouping_DEPENDENCIES) + @rm -f testgrouping$(EXEEXT) +- $(LINK) $(testgrouping_LDFLAGS) $(testgrouping_OBJECTS) $(testgrouping_LDADD) $(LIBS) ++ $(LINK) $(testgrouping_OBJECTS) $(testgrouping_LDADD) $(LIBS) + testgtk$(EXEEXT): $(testgtk_OBJECTS) $(testgtk_DEPENDENCIES) + @rm -f testgtk$(EXEEXT) +- $(LINK) $(testgtk_LDFLAGS) $(testgtk_OBJECTS) $(testgtk_LDADD) $(LIBS) ++ $(LINK) $(testgtk_OBJECTS) $(testgtk_LDADD) $(LIBS) + testicontheme$(EXEEXT): $(testicontheme_OBJECTS) $(testicontheme_DEPENDENCIES) + @rm -f testicontheme$(EXEEXT) +- $(LINK) $(testicontheme_LDFLAGS) $(testicontheme_OBJECTS) $(testicontheme_LDADD) $(LIBS) ++ $(LINK) $(testicontheme_OBJECTS) $(testicontheme_LDADD) $(LIBS) + testiconview$(EXEEXT): $(testiconview_OBJECTS) $(testiconview_DEPENDENCIES) + @rm -f testiconview$(EXEEXT) +- $(LINK) $(testiconview_LDFLAGS) $(testiconview_OBJECTS) $(testiconview_LDADD) $(LIBS) ++ $(LINK) $(testiconview_OBJECTS) $(testiconview_LDADD) $(LIBS) + testimage$(EXEEXT): $(testimage_OBJECTS) $(testimage_DEPENDENCIES) + @rm -f testimage$(EXEEXT) +- $(LINK) $(testimage_LDFLAGS) $(testimage_OBJECTS) $(testimage_LDADD) $(LIBS) ++ $(LINK) $(testimage_OBJECTS) $(testimage_LDADD) $(LIBS) + testinput$(EXEEXT): $(testinput_OBJECTS) $(testinput_DEPENDENCIES) + @rm -f testinput$(EXEEXT) +- $(LINK) $(testinput_LDFLAGS) $(testinput_OBJECTS) $(testinput_LDADD) $(LIBS) ++ $(LINK) $(testinput_OBJECTS) $(testinput_LDADD) $(LIBS) + testmenubars$(EXEEXT): $(testmenubars_OBJECTS) $(testmenubars_DEPENDENCIES) + @rm -f testmenubars$(EXEEXT) +- $(LINK) $(testmenubars_LDFLAGS) $(testmenubars_OBJECTS) $(testmenubars_LDADD) $(LIBS) ++ $(LINK) $(testmenubars_OBJECTS) $(testmenubars_LDADD) $(LIBS) + testmenus$(EXEEXT): $(testmenus_OBJECTS) $(testmenus_DEPENDENCIES) + @rm -f testmenus$(EXEEXT) +- $(LINK) $(testmenus_LDFLAGS) $(testmenus_OBJECTS) $(testmenus_LDADD) $(LIBS) ++ $(LINK) $(testmenus_OBJECTS) $(testmenus_LDADD) $(LIBS) + testmerge$(EXEEXT): $(testmerge_OBJECTS) $(testmerge_DEPENDENCIES) + @rm -f testmerge$(EXEEXT) +- $(LINK) $(testmerge_LDFLAGS) $(testmerge_OBJECTS) $(testmerge_LDADD) $(LIBS) ++ $(LINK) $(testmerge_OBJECTS) $(testmerge_LDADD) $(LIBS) + testmountoperation$(EXEEXT): $(testmountoperation_OBJECTS) $(testmountoperation_DEPENDENCIES) + @rm -f testmountoperation$(EXEEXT) +- $(LINK) $(testmountoperation_LDFLAGS) $(testmountoperation_OBJECTS) $(testmountoperation_LDADD) $(LIBS) ++ $(LINK) $(testmountoperation_OBJECTS) $(testmountoperation_LDADD) $(LIBS) + testmultidisplay$(EXEEXT): $(testmultidisplay_OBJECTS) $(testmultidisplay_DEPENDENCIES) + @rm -f testmultidisplay$(EXEEXT) +- $(LINK) $(testmultidisplay_LDFLAGS) $(testmultidisplay_OBJECTS) $(testmultidisplay_LDADD) $(LIBS) ++ $(LINK) $(testmultidisplay_OBJECTS) $(testmultidisplay_LDADD) $(LIBS) + testmultiscreen$(EXEEXT): $(testmultiscreen_OBJECTS) $(testmultiscreen_DEPENDENCIES) + @rm -f testmultiscreen$(EXEEXT) +- $(LINK) $(testmultiscreen_LDFLAGS) $(testmultiscreen_OBJECTS) $(testmultiscreen_LDADD) $(LIBS) ++ $(LINK) $(testmultiscreen_OBJECTS) $(testmultiscreen_LDADD) $(LIBS) + testnotebookdnd$(EXEEXT): $(testnotebookdnd_OBJECTS) $(testnotebookdnd_DEPENDENCIES) + @rm -f testnotebookdnd$(EXEEXT) +- $(LINK) $(testnotebookdnd_LDFLAGS) $(testnotebookdnd_OBJECTS) $(testnotebookdnd_LDADD) $(LIBS) ++ $(LINK) $(testnotebookdnd_OBJECTS) $(testnotebookdnd_LDADD) $(LIBS) + testnouiprint$(EXEEXT): $(testnouiprint_OBJECTS) $(testnouiprint_DEPENDENCIES) + @rm -f testnouiprint$(EXEEXT) +- $(LINK) $(testnouiprint_LDFLAGS) $(testnouiprint_OBJECTS) $(testnouiprint_LDADD) $(LIBS) ++ $(LINK) $(testnouiprint_OBJECTS) $(testnouiprint_LDADD) $(LIBS) + testprint$(EXEEXT): $(testprint_OBJECTS) $(testprint_DEPENDENCIES) + @rm -f testprint$(EXEEXT) +- $(LINK) $(testprint_LDFLAGS) $(testprint_OBJECTS) $(testprint_LDADD) $(LIBS) ++ $(LINK) $(testprint_OBJECTS) $(testprint_LDADD) $(LIBS) + testrecentchooser$(EXEEXT): $(testrecentchooser_OBJECTS) $(testrecentchooser_DEPENDENCIES) + @rm -f testrecentchooser$(EXEEXT) +- $(LINK) $(testrecentchooser_LDFLAGS) $(testrecentchooser_OBJECTS) $(testrecentchooser_LDADD) $(LIBS) ++ $(LINK) $(testrecentchooser_OBJECTS) $(testrecentchooser_LDADD) $(LIBS) + testrecentchoosermenu$(EXEEXT): $(testrecentchoosermenu_OBJECTS) $(testrecentchoosermenu_DEPENDENCIES) + @rm -f testrecentchoosermenu$(EXEEXT) +- $(LINK) $(testrecentchoosermenu_LDFLAGS) $(testrecentchoosermenu_OBJECTS) $(testrecentchoosermenu_LDADD) $(LIBS) ++ $(LINK) $(testrecentchoosermenu_OBJECTS) $(testrecentchoosermenu_LDADD) $(LIBS) + testrgb$(EXEEXT): $(testrgb_OBJECTS) $(testrgb_DEPENDENCIES) + @rm -f testrgb$(EXEEXT) +- $(LINK) $(testrgb_LDFLAGS) $(testrgb_OBJECTS) $(testrgb_LDADD) $(LIBS) ++ $(LINK) $(testrgb_OBJECTS) $(testrgb_LDADD) $(LIBS) + testrichtext$(EXEEXT): $(testrichtext_OBJECTS) $(testrichtext_DEPENDENCIES) + @rm -f testrichtext$(EXEEXT) +- $(LINK) $(testrichtext_LDFLAGS) $(testrichtext_OBJECTS) $(testrichtext_LDADD) $(LIBS) ++ $(LINK) $(testrichtext_OBJECTS) $(testrichtext_LDADD) $(LIBS) + testselection$(EXEEXT): $(testselection_OBJECTS) $(testselection_DEPENDENCIES) + @rm -f testselection$(EXEEXT) +- $(LINK) $(testselection_LDFLAGS) $(testselection_OBJECTS) $(testselection_LDADD) $(LIBS) ++ $(LINK) $(testselection_OBJECTS) $(testselection_LDADD) $(LIBS) + testsocket$(EXEEXT): $(testsocket_OBJECTS) $(testsocket_DEPENDENCIES) + @rm -f testsocket$(EXEEXT) +- $(LINK) $(testsocket_LDFLAGS) $(testsocket_OBJECTS) $(testsocket_LDADD) $(LIBS) ++ $(LINK) $(testsocket_OBJECTS) $(testsocket_LDADD) $(LIBS) + testsocket_child$(EXEEXT): $(testsocket_child_OBJECTS) $(testsocket_child_DEPENDENCIES) + @rm -f testsocket_child$(EXEEXT) +- $(LINK) $(testsocket_child_LDFLAGS) $(testsocket_child_OBJECTS) $(testsocket_child_LDADD) $(LIBS) ++ $(LINK) $(testsocket_child_OBJECTS) $(testsocket_child_LDADD) $(LIBS) + testspinbutton$(EXEEXT): $(testspinbutton_OBJECTS) $(testspinbutton_DEPENDENCIES) + @rm -f testspinbutton$(EXEEXT) +- $(LINK) $(testspinbutton_LDFLAGS) $(testspinbutton_OBJECTS) $(testspinbutton_LDADD) $(LIBS) ++ $(LINK) $(testspinbutton_OBJECTS) $(testspinbutton_LDADD) $(LIBS) + teststatusicon$(EXEEXT): $(teststatusicon_OBJECTS) $(teststatusicon_DEPENDENCIES) + @rm -f teststatusicon$(EXEEXT) +- $(LINK) $(teststatusicon_LDFLAGS) $(teststatusicon_OBJECTS) $(teststatusicon_LDADD) $(LIBS) ++ $(LINK) $(teststatusicon_OBJECTS) $(teststatusicon_LDADD) $(LIBS) + testtext$(EXEEXT): $(testtext_OBJECTS) $(testtext_DEPENDENCIES) + @rm -f testtext$(EXEEXT) +- $(LINK) $(testtext_LDFLAGS) $(testtext_OBJECTS) $(testtext_LDADD) $(LIBS) ++ $(LINK) $(testtext_OBJECTS) $(testtext_LDADD) $(LIBS) + testtoolbar$(EXEEXT): $(testtoolbar_OBJECTS) $(testtoolbar_DEPENDENCIES) + @rm -f testtoolbar$(EXEEXT) +- $(LINK) $(testtoolbar_LDFLAGS) $(testtoolbar_OBJECTS) $(testtoolbar_LDADD) $(LIBS) ++ $(LINK) $(testtoolbar_OBJECTS) $(testtoolbar_LDADD) $(LIBS) + testtooltips$(EXEEXT): $(testtooltips_OBJECTS) $(testtooltips_DEPENDENCIES) + @rm -f testtooltips$(EXEEXT) +- $(LINK) $(testtooltips_LDFLAGS) $(testtooltips_OBJECTS) $(testtooltips_LDADD) $(LIBS) ++ $(LINK) $(testtooltips_OBJECTS) $(testtooltips_LDADD) $(LIBS) + testtreecolumns$(EXEEXT): $(testtreecolumns_OBJECTS) $(testtreecolumns_DEPENDENCIES) + @rm -f testtreecolumns$(EXEEXT) +- $(LINK) $(testtreecolumns_LDFLAGS) $(testtreecolumns_OBJECTS) $(testtreecolumns_LDADD) $(LIBS) ++ $(LINK) $(testtreecolumns_OBJECTS) $(testtreecolumns_LDADD) $(LIBS) + testtreecolumnsizing$(EXEEXT): $(testtreecolumnsizing_OBJECTS) $(testtreecolumnsizing_DEPENDENCIES) + @rm -f testtreecolumnsizing$(EXEEXT) +- $(LINK) $(testtreecolumnsizing_LDFLAGS) $(testtreecolumnsizing_OBJECTS) $(testtreecolumnsizing_LDADD) $(LIBS) ++ $(LINK) $(testtreecolumnsizing_OBJECTS) $(testtreecolumnsizing_LDADD) $(LIBS) + testtreeedit$(EXEEXT): $(testtreeedit_OBJECTS) $(testtreeedit_DEPENDENCIES) + @rm -f testtreeedit$(EXEEXT) +- $(LINK) $(testtreeedit_LDFLAGS) $(testtreeedit_OBJECTS) $(testtreeedit_LDADD) $(LIBS) ++ $(LINK) $(testtreeedit_OBJECTS) $(testtreeedit_LDADD) $(LIBS) + testtreeflow$(EXEEXT): $(testtreeflow_OBJECTS) $(testtreeflow_DEPENDENCIES) + @rm -f testtreeflow$(EXEEXT) +- $(LINK) $(testtreeflow_LDFLAGS) $(testtreeflow_OBJECTS) $(testtreeflow_LDADD) $(LIBS) ++ $(LINK) $(testtreeflow_OBJECTS) $(testtreeflow_LDADD) $(LIBS) + testtreefocus$(EXEEXT): $(testtreefocus_OBJECTS) $(testtreefocus_DEPENDENCIES) + @rm -f testtreefocus$(EXEEXT) +- $(LINK) $(testtreefocus_LDFLAGS) $(testtreefocus_OBJECTS) $(testtreefocus_LDADD) $(LIBS) ++ $(LINK) $(testtreefocus_OBJECTS) $(testtreefocus_LDADD) $(LIBS) + testtreemodel$(EXEEXT): $(testtreemodel_OBJECTS) $(testtreemodel_DEPENDENCIES) + @rm -f testtreemodel$(EXEEXT) +- $(LINK) $(testtreemodel_LDFLAGS) $(testtreemodel_OBJECTS) $(testtreemodel_LDADD) $(LIBS) ++ $(LINK) $(testtreemodel_OBJECTS) $(testtreemodel_LDADD) $(LIBS) + testtreesort$(EXEEXT): $(testtreesort_OBJECTS) $(testtreesort_DEPENDENCIES) + @rm -f testtreesort$(EXEEXT) +- $(LINK) $(testtreesort_LDFLAGS) $(testtreesort_OBJECTS) $(testtreesort_LDADD) $(LIBS) ++ $(LINK) $(testtreesort_OBJECTS) $(testtreesort_LDADD) $(LIBS) + testtreeview$(EXEEXT): $(testtreeview_OBJECTS) $(testtreeview_DEPENDENCIES) + @rm -f testtreeview$(EXEEXT) +- $(LINK) $(testtreeview_LDFLAGS) $(testtreeview_OBJECTS) $(testtreeview_LDADD) $(LIBS) ++ $(LINK) $(testtreeview_OBJECTS) $(testtreeview_LDADD) $(LIBS) + testvolumebutton$(EXEEXT): $(testvolumebutton_OBJECTS) $(testvolumebutton_DEPENDENCIES) + @rm -f testvolumebutton$(EXEEXT) +- $(LINK) $(testvolumebutton_LDFLAGS) $(testvolumebutton_OBJECTS) $(testvolumebutton_LDADD) $(LIBS) ++ $(LINK) $(testvolumebutton_OBJECTS) $(testvolumebutton_LDADD) $(LIBS) + testxinerama$(EXEEXT): $(testxinerama_OBJECTS) $(testxinerama_DEPENDENCIES) + @rm -f testxinerama$(EXEEXT) +- $(LINK) $(testxinerama_LDFLAGS) $(testxinerama_OBJECTS) $(testxinerama_LDADD) $(LIBS) ++ $(LINK) $(testxinerama_OBJECTS) $(testxinerama_LDADD) $(LIBS) + treestoretest$(EXEEXT): $(treestoretest_OBJECTS) $(treestoretest_DEPENDENCIES) + @rm -f treestoretest$(EXEEXT) +- $(LINK) $(treestoretest_LDFLAGS) $(treestoretest_OBJECTS) $(treestoretest_LDADD) $(LIBS) ++ $(LINK) $(treestoretest_OBJECTS) $(treestoretest_LDADD) $(LIBS) + + mostlyclean-compile: +- -rm -f *.$(OBJEXT) core *.core ++ -rm -f *.$(OBJEXT) + + distclean-compile: + -rm -f *.tab.c +@@ -1601,130 +1083,76 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treestoretest.Po@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCC_TRUE@ fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + .cc.o: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCXX_TRUE@ fi ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + + .cc.obj: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ +-@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCXX_TRUE@ fi ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + .cc.lo: +-@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ +-@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ +-@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ +-@am__fastdepCXX_TRUE@ fi ++@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + + autotestkeywords-autotestkeywords.o: autotestkeywords.cc +-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -MT autotestkeywords-autotestkeywords.o -MD -MP -MF "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" \ +-@am__fastdepCXX_TRUE@ -c -o autotestkeywords-autotestkeywords.o `test -f 'autotestkeywords.cc' || echo '$(srcdir)/'`autotestkeywords.cc; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" "$(DEPDIR)/autotestkeywords-autotestkeywords.Po"; \ +-@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo"; exit 1; \ +-@am__fastdepCXX_TRUE@ fi ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -MT autotestkeywords-autotestkeywords.o -MD -MP -MF $(DEPDIR)/autotestkeywords-autotestkeywords.Tpo -c -o autotestkeywords-autotestkeywords.o `test -f 'autotestkeywords.cc' || echo '$(srcdir)/'`autotestkeywords.cc ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/autotestkeywords-autotestkeywords.Tpo $(DEPDIR)/autotestkeywords-autotestkeywords.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='autotestkeywords.cc' object='autotestkeywords-autotestkeywords.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/autotestkeywords-autotestkeywords.Po' tmpdepfile='$(DEPDIR)/autotestkeywords-autotestkeywords.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -c -o autotestkeywords-autotestkeywords.o `test -f 'autotestkeywords.cc' || echo '$(srcdir)/'`autotestkeywords.cc + + autotestkeywords-autotestkeywords.obj: autotestkeywords.cc +-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -MT autotestkeywords-autotestkeywords.obj -MD -MP -MF "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" \ +-@am__fastdepCXX_TRUE@ -c -o autotestkeywords-autotestkeywords.obj `if test -f 'autotestkeywords.cc'; then $(CYGPATH_W) 'autotestkeywords.cc'; else $(CYGPATH_W) '$(srcdir)/autotestkeywords.cc'; fi`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" "$(DEPDIR)/autotestkeywords-autotestkeywords.Po"; \ +-@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo"; exit 1; \ +-@am__fastdepCXX_TRUE@ fi ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -MT autotestkeywords-autotestkeywords.obj -MD -MP -MF $(DEPDIR)/autotestkeywords-autotestkeywords.Tpo -c -o autotestkeywords-autotestkeywords.obj `if test -f 'autotestkeywords.cc'; then $(CYGPATH_W) 'autotestkeywords.cc'; else $(CYGPATH_W) '$(srcdir)/autotestkeywords.cc'; fi` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/autotestkeywords-autotestkeywords.Tpo $(DEPDIR)/autotestkeywords-autotestkeywords.Po + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='autotestkeywords.cc' object='autotestkeywords-autotestkeywords.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/autotestkeywords-autotestkeywords.Po' tmpdepfile='$(DEPDIR)/autotestkeywords-autotestkeywords.TPo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -c -o autotestkeywords-autotestkeywords.obj `if test -f 'autotestkeywords.cc'; then $(CYGPATH_W) 'autotestkeywords.cc'; else $(CYGPATH_W) '$(srcdir)/autotestkeywords.cc'; fi` + +-autotestkeywords-autotestkeywords.lo: autotestkeywords.cc +-@am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -MT autotestkeywords-autotestkeywords.lo -MD -MP -MF "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" \ +-@am__fastdepCXX_TRUE@ -c -o autotestkeywords-autotestkeywords.lo `test -f 'autotestkeywords.cc' || echo '$(srcdir)/'`autotestkeywords.cc; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo" "$(DEPDIR)/autotestkeywords-autotestkeywords.Plo"; \ +-@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/autotestkeywords-autotestkeywords.Tpo"; exit 1; \ +-@am__fastdepCXX_TRUE@ fi +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='autotestkeywords.cc' object='autotestkeywords-autotestkeywords.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/autotestkeywords-autotestkeywords.Plo' tmpdepfile='$(DEPDIR)/autotestkeywords-autotestkeywords.TPlo' @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(autotestkeywords_CPPFLAGS) $(CPPFLAGS) $(autotestkeywords_CXXFLAGS) $(CXXFLAGS) -c -o autotestkeywords-autotestkeywords.lo `test -f 'autotestkeywords.cc' || echo '$(srcdir)/'`autotestkeywords.cc +- + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs + +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +- +-ETAGS = etags +-ETAGSFLAGS = +- +-CTAGS = ctags +-CTAGSFLAGS = +- +-tags: TAGS +- + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique ++tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +@@ -1734,23 +1162,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(ETAGS_ARGS)$$tags$$unique" \ +- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique +- ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -1764,9 +1192,9 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ +- list='$(TESTS)'; \ ++ list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -1775,25 +1203,25 @@ check-TESTS: $(TESTS) + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xpass=`expr $$xpass + 1`; \ +- failed=`expr $$failed + 1`; \ +- echo "XPASS: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xpass=`expr $$xpass + 1`; \ ++ failed=`expr $$failed + 1`; \ ++ echo "XPASS: $$tst"; \ + ;; \ + *) \ +- echo "PASS: $$tst"; \ ++ echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *" $$tst "*) \ +- xfail=`expr $$xfail + 1`; \ +- echo "XFAIL: $$tst"; \ ++ *$$ws$$tst$$ws*) \ ++ xfail=`expr $$xfail + 1`; \ ++ echo "XFAIL: $$tst"; \ + ;; \ + *) \ +- failed=`expr $$failed + 1`; \ +- echo "FAIL: $$tst"; \ ++ failed=`expr $$failed + 1`; \ ++ echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ +@@ -1818,46 +1246,40 @@ check-TESTS: $(TESTS) + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ +- test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ +- test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ +- test -n "$$skipped" && echo "$$skipped"; \ +- test -n "$$report" && echo "$$report"; \ ++ test -z "$$skipped" || echo "$$skipped"; \ ++ test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +- +-top_distdir = .. +-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + + distdir: $(DISTFILES) +- $(mkinstalldirs) $(distdir)/.. $(distdir)/file-chooser-test-dir +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkinstalldirs) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -1872,7 +1294,6 @@ check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local + check: check-am + all-am: Makefile $(PROGRAMS) +- + installdirs: + install: install-am + install-exec: install-exec-am +@@ -1893,7 +1314,7 @@ mostlyclean-generic: + clean-generic: + + distclean-generic: +- -rm -f $(CONFIG_CLEAN_FILES) ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -1907,24 +1328,34 @@ distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags ++ distclean-tags + + dvi: dvi-am + + dvi-am: + ++html: html-am ++ + info: info-am + + info-am: + + install-data-am: + ++install-dvi: install-dvi-am ++ + install-exec-am: + ++install-html: install-html-am ++ + install-info: install-info-am + + install-man: + ++install-pdf: install-pdf-am ++ ++install-ps: install-ps-am ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -1945,18 +1376,23 @@ ps: ps-am + + ps-am: + +-uninstall-am: uninstall-info-am ++uninstall-am: ++ ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \ + clean clean-generic clean-libtool clean-noinstPROGRAMS ctags \ +- distclean distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am info info-am install \ +- install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am ++ distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags uninstall uninstall-am + + # call as: $(XVFB_START) && someprogram + diff --git a/debian/patches/series b/debian/patches/series index c2360fb6fa..15be1681eb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,7 @@ 003_gdk.pc_privates.patch 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch 005_xpmico.patch -006_proper-directfb-modules.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 diff --git a/debian/rules b/debian/rules index 91486fe924..bbd7e7f3ac 100644 --- a/debian/rules +++ b/debian/rules @@ -319,8 +319,8 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK -p$(UDEB_PKG) dh_installexamples -s dh_link -s - dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG) -Nlibgail18 - dh_strip -plibgail18 --dbg-package=libgail-dbg + dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG) -Nlibgail18 -Nlibgail-common + dh_strip -plibgail18 -plibgail-common --dbg-package=libgail-dbg dh_strip -p$(UDEB_PKG) dh_compress -s -X.sgml -X.devhelp dh_fixperms -s -X$(LIBDIR)/$(SHARED_PKG) From afd67ba1ec44ad1db605ac0dce05e5324fc871f8 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Wed, 12 Nov 2008 00:39:27 +0000 Subject: [PATCH 20/29] Really install the faq and tutorial files correctly so that the devhelp file is read. (The devhelp files need updating but I have no idea how to do.) --- debian/changelog | 8 ++++++++ debian/libgtk2.0-doc.install.in | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb12f5d01a..b1bbca9e56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gtk+2.0 (2.14.4-4) UNRELEASED; urgency=low + + * Really install the faq and tutorial files correctly so that the + devhelp file is read. (The devhelp files need updating but I have no + idea how to do.) + + -- Josselin Mouette Wed, 12 Nov 2008 01:01:29 +0100 + gtk+2.0 (2.14.4-3) experimental; urgency=low * libgail*.install: fix installation paths. Closes: #505105. diff --git a/debian/libgtk2.0-doc.install.in b/debian/libgtk2.0-doc.install.in index cd0fd9b4d0..ddf8e3029d 100644 --- a/debian/libgtk2.0-doc.install.in +++ b/debian/libgtk2.0-doc.install.in @@ -1,10 +1,10 @@ # from Debian -debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/faq/html -debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/tutorial/html +debian/gtk-faq.devhelp usr/share/doc/@DOC_PKG@/faq +debian/gtk-tutorial.devhelp usr/share/doc/@DOC_PKG@/tutorial # from the shared flavor debian/install/shared/usr/share/gtk-doc/html/gtk* usr/share/doc/@DOC_PKG@ debian/install/shared/usr/share/gtk-doc/html/gdk* usr/share/doc/@DOC_PKG@ # from the source -docs/faq/html usr/share/doc/@DOC_PKG@/faq -docs/tutorial/html usr/share/doc/@DOC_PKG@/tutorial +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@ From 5c133e3bea1b24472cd4db77d8c06124f1e637c1 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Wed, 12 Nov 2008 12:16:17 +0000 Subject: [PATCH 21/29] devhelp file is read. * Update doc-base files accordingly. * gruik2devhelp.awk: new script to generate the devhelp files automatically for the FAQ and tutorial, based on the HTML doc. * Build-depend on gawk, run the script appropriately. --- debian/changelog | 7 +- debian/control | 3 +- debian/control.in | 3 +- debian/gruik2devhelp.awk | 29 ++ debian/gtk-faq.devhelp | 215 --------------- debian/gtk-tutorial.devhelp | 284 -------------------- debian/libgtk2.0-doc.doc-base.gtk-faq | 4 +- debian/libgtk2.0-doc.doc-base.gtk2-tutorial | 4 +- debian/rules | 10 +- 9 files changed, 50 insertions(+), 509 deletions(-) create mode 100644 debian/gruik2devhelp.awk delete mode 100644 debian/gtk-faq.devhelp delete mode 100644 debian/gtk-tutorial.devhelp diff --git a/debian/changelog b/debian/changelog index b1bbca9e56..5436d72f6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ gtk+2.0 (2.14.4-4) UNRELEASED; urgency=low * Really install the faq and tutorial files correctly so that the - devhelp file is read. (The devhelp files need updating but I have no - idea how to do.) + devhelp file is read. + * Update doc-base files accordingly. + * gruik2devhelp.awk: new script to generate the devhelp files + automatically for the FAQ and tutorial, based on the HTML doc. + * Build-depend on gawk, run the script appropriately. -- Josselin Mouette Wed, 12 Nov 2008 01:01:29 +0100 diff --git a/debian/control b/debian/control index ed68e0156d..d2f3c08a8b 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,8 @@ Build-Depends: debhelper (>= 5.0.22), x11proto-xext-dev, libdirectfb-dev (>= 0.9.26), libcups2-dev (>= 1.2), - quilt + quilt, + gawk Build-Depends-Indep: gtk-doc-tools (>= 1.8), docbook-xml Standards-Version: 3.8.0 diff --git a/debian/control.in b/debian/control.in index 5a9ad05c4d..cf6fbe4adf 100644 --- a/debian/control.in +++ b/debian/control.in @@ -33,7 +33,8 @@ Build-Depends: debhelper (>= 5.0.22), x11proto-xext-dev, libdirectfb-dev (>= 0.9.26), libcups2-dev (>= 1.2), - quilt + quilt, + gawk Build-Depends-Indep: gtk-doc-tools (>= 1.8), docbook-xml Standards-Version: 3.8.0 diff --git a/debian/gruik2devhelp.awk b/debian/gruik2devhelp.awk new file mode 100644 index 0000000000..15f870d260 --- /dev/null +++ b/debian/gruik2devhelp.awk @@ -0,0 +1,29 @@ +#! /usr/bin/awk -f + +BEGIN { print ""; + level=1 } + +title == 1 { print "(.*)"; + print ""; + title=0 } +/^><DD$/ { level++ } +/^><\/DD$/ { level-- } + +intext == 0 && href != "" && /^>([^<>]*)<.*$/ { n=n gensub("^>(.*)<.*$", "\\1",1); } +intext == 1 && href != "" && /^([^<>]*)$/ { n=n $0 " "; } +intext == 0 && href != "" && /^>([^<>]*)$/ { n=n gensub("^>(.*)$", "\\1",1) " "; intext=1 } +intext == 1 && href != "" && /^([^<>]*)<.*$/ { n=n gensub("^([^<>]*)<.*$", "\\1",1); intext=0 } +href != "" && /<\/A$/ { for (i=level; i<lastlevel+1; i++) print "</sub>"; + print "<sub name=\"" n "\" link=\"" href "\">"; + href = ""; + lastlevel = level } +ending != 1 && /^HREF=".*"$/ { href=gensub("^HREF=\"(.*)\"$","\\1",1); + n = ""; + intext = 0 } +/^CLASS="NAVFOOTER"$/ { ending = 1 } + +END { for (i=0; i<lastlevel; i++) print "</sub>"; + print "</chapters>"; + print "</book>" } diff --git a/debian/gtk-faq.devhelp b/debian/gtk-faq.devhelp deleted file mode 100644 index 1d62947488..0000000000 --- a/debian/gtk-faq.devhelp +++ /dev/null @@ -1,215 +0,0 @@ -<?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> diff --git a/debian/gtk-tutorial.devhelp b/debian/gtk-tutorial.devhelp deleted file mode 100644 index 519f28a865..0000000000 --- a/debian/gtk-tutorial.devhelp +++ /dev/null @@ -1,284 +0,0 @@ -<?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> diff --git a/debian/libgtk2.0-doc.doc-base.gtk-faq b/debian/libgtk2.0-doc.doc-base.gtk-faq index 57a7004fe8..1cba83eeac 100644 --- a/debian/libgtk2.0-doc.doc-base.gtk-faq +++ b/debian/libgtk2.0-doc.doc-base.gtk-faq @@ -8,5 +8,5 @@ Abstract: This document is intended to answer questions that are Section: Programming/C Format: HTML -Index: /usr/share/doc/libgtk2.0-doc/faq/html/book1.html -Files: /usr/share/doc/libgtk2.0-doc/faq/html/*.html +Index: /usr/share/doc/libgtk2.0-doc/faq/book1.html +Files: /usr/share/doc/libgtk2.0-doc/faq/*.html diff --git a/debian/libgtk2.0-doc.doc-base.gtk2-tutorial b/debian/libgtk2.0-doc.doc-base.gtk2-tutorial index ec6982c333..e6db01f1ba 100644 --- a/debian/libgtk2.0-doc.doc-base.gtk2-tutorial +++ b/debian/libgtk2.0-doc.doc-base.gtk2-tutorial @@ -14,5 +14,5 @@ Abstract: GTK+ (GIMP Toolkit) is a library for creating graphical user Section: Programming/C Format: HTML -Index: /usr/share/doc/libgtk2.0-doc/tutorial/html/book1.html -Files: /usr/share/doc/libgtk2.0-doc/tutorial/html/*.html +Index: /usr/share/doc/libgtk2.0-doc/tutorial/book1.html +Files: /usr/share/doc/libgtk2.0-doc/tutorial/*.html diff --git a/debian/rules b/debian/rules index bbd7e7f3ac..36efda899f 100644 --- a/debian/rules +++ b/debian/rules @@ -147,6 +147,11 @@ DH_INSTALLDOCS_FILES := NEWS README ChangeLog # ".in" file; pass the list of packages in $(1) dh_subst_files = $(patsubst %.in,%,$(wildcard $(addprefix debian/, $(addsuffix *.in, $(1))))) +# Gruik gruik generation of .devhelp files for the FAQ and tutorial +debian/gtk-%.devhelp: docs/%/html/book1.html + gawk -f debian/gruik2devhelp.awk -v name=gtk-$* $< > $@ +devhelpfiles: debian/gtk-faq.devhelp debian/gtk-tutorial.devhelp + debian/dh_gtkmodules.1: debian/dh_gtkmodules cd debian && pod2man -c "Gtk" -r "$(DEBVERSION)" dh_gtkmodules dh_gtkmodules.1 @@ -248,6 +253,7 @@ clean:: debian/control # unapply patches, if any QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2 -rm -rf .pc + rm -f debian/*.devhelp -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 @@ -255,7 +261,7 @@ clean:: debian/control maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check) -binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS)) +binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS)) devhelpfiles dh_testdir dh_testroot dh_install -i @@ -354,4 +360,4 @@ list-missing: egrep -v '(\.la|$(LIBDIR)/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 +.PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary devhelpfiles From 01bf4c050b8795bbeb7e17d5e289962e138e22a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@debian.org> Date: Tue, 25 Nov 2008 10:59:39 +0000 Subject: [PATCH 22/29] * New upstream bugfix release: + debian/patches/070_mandatory-relibtoolize.patch: - Regenerated for the new version. --- debian/changelog | 10 +- .../patches/070_mandatory-relibtoolize.patch | 107947 +++++++++------ 2 files changed, 67988 insertions(+), 39969 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5436d72f6d..649bc23332 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -gtk+2.0 (2.14.4-4) UNRELEASED; urgency=low +gtk+2.0 (2.14.5-1) experimental; urgency=low + [ Josselin Mouette ] * Really install the faq and tutorial files correctly so that the devhelp file is read. * Update doc-base files accordingly. @@ -7,7 +8,12 @@ gtk+2.0 (2.14.4-4) UNRELEASED; urgency=low automatically for the FAQ and tutorial, based on the HTML doc. * Build-depend on gawk, run the script appropriately. - -- Josselin Mouette <joss@debian.org> Wed, 12 Nov 2008 01:01:29 +0100 + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/070_mandatory-relibtoolize.patch: + - Regenerated for the new version. + + -- Sebastian Dröge <slomo@debian.org> Tue, 25 Nov 2008 11:00:35 +0100 gtk+2.0 (2.14.4-3) experimental; urgency=low diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index 28726d0084..85233747f1 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -1,7 +1,6 @@ -Index: gtk+-2.14.4/aclocal.m4 -=================================================================== ---- gtk+-2.14.4.orig/aclocal.m4 2008-10-17 06:07:01.000000000 +0200 -+++ gtk+-2.14.4/aclocal.m4 2008-11-11 18:55:51.176636138 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2.0-2.14.5/aclocal.m4 +--- gtk+2.0-2.14.5.old/aclocal.m4 2008-11-24 07:41:24.000000000 +0100 ++++ gtk+2.0-2.14.5/aclocal.m4 2008-11-25 11:09:38.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- @@ -13,7 +12,7 @@ Index: gtk+-2.14.4/aclocal.m4 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -11,937 +11,702 @@ +@@ -11,10782 +11,8440 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @@ -322,7 +321,57 @@ Index: gtk+-2.14.4/aclocal.m4 -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -- ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include <glib.h> ++#include <stdio.h> ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ 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" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ GOBJECT_QUERY="" ++ GLIB_MKENUMS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ AC_SUBST(GLIB_GENMARSHAL) ++ AC_SUBST(GOBJECT_QUERY) ++ AC_SUBST(GLIB_MKENUMS) ++ rm -f conf.glibtest ++]) + -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl @@ -379,490 +428,43 @@ Index: gtk+-2.14.4/aclocal.m4 -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -- --# AM_AUTOMAKE_VERSION(VERSION) --# ---------------------------- --# Automake X.Y traces this macro to ensure aclocal.m4 has been --# generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) -- --# AM_SET_CURRENT_AUTOMAKE_VERSION --# ------------------------------- --# Call AM_AUTOMAKE_VERSION so it can be traced. --# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. --AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.7.9])]) -- --# Helper functions for option handling. -*- Autoconf -*- -- --# Copyright 2001, 2002 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 2 -- --# _AM_MANGLE_OPTION(NAME) --# ----------------------- --AC_DEFUN([_AM_MANGLE_OPTION], --[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -- --# _AM_SET_OPTION(NAME) --# ------------------------------ --# Set option NAME. Presently that only means defining a flag for this option. --AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -- --# _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- --# OPTIONS is a space-separated list of Automake options. --AC_DEFUN([_AM_SET_OPTIONS], --[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -- --# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) --# ------------------------------------------- --# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. --AC_DEFUN([_AM_IF_OPTION], --[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -+ if test "x$no_glib" = x ; then -+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig/" -+ else -+ if test -f conf.glibtest ; then -+ : -+ else -+ echo "*** Could not run GLIB test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$LIBS $GLIB_LIBS" -+ AC_TRY_LINK([ -+#include <glib.h> -+#include <stdio.h> -+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -+ [ 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" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GLIB_CFLAGS="" -+ GLIB_LIBS="" -+ GLIB_GENMARSHAL="" -+ GOBJECT_QUERY="" -+ GLIB_MKENUMS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ AC_SUBST(GLIB_GENMARSHAL) -+ AC_SUBST(GOBJECT_QUERY) -+ AC_SUBST(GLIB_MKENUMS) -+ rm -f conf.glibtest -+]) - +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. - # --# Check to make sure that the build environment is sane. ++# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. - # -- --# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 3 -- --# AM_SANITY_CHECK --# --------------- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -- fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then -- -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -- fi -- -- test "$[2]" = conftest.file -- ) --then -- # Ok. -- : --else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) --fi --AC_MSG_RESULT(yes)]) -- --# -*- Autoconf -*- -- -- --# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 3 -- --# AM_MISSING_PROG(NAME, PROGRAM) --# ------------------------------ --AC_DEFUN([AM_MISSING_PROG], --[AC_REQUIRE([AM_MISSING_HAS_RUN]) --$1=${$1-"${am_missing_run}$2"} --AC_SUBST($1)]) -- -- --# AM_MISSING_HAS_RUN --# ------------------ --# Define MISSING if not defined so far and test if it supports --run. --# If it does, set am_missing_run to use it, otherwise, to nothing. --AC_DEFUN([AM_MISSING_HAS_RUN], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" --# Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " --else -- am_missing_run= -- AC_MSG_WARN([`missing' script is too old or missing]) --fi --]) -- --# AM_AUX_DIR_EXPAND -- --# Copyright 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets --# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to --# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. - # --# Of course, Automake must honor this variable whenever it calls a --# tool from the auxiliary directory. The problem is that $srcdir (and --# therefore $ac_aux_dir as well) can be either absolute or relative, --# depending on how configure is run. This is pretty annoying, since --# it makes $ac_aux_dir quite unusable in subdirectories: in the top --# source directory, any form will work fine, but in subdirectories a --# relative path needs to be adjusted first. ++# +# Macro to add for using GNU gettext. +# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 - # --# $ac_aux_dir/missing --# fails when called from a subdirectory if $ac_aux_dir is relative --# $top_srcdir/$ac_aux_dir/missing --# fails if $ac_aux_dir is absolute, --# fails when called from a subdirectory in a VPATH build with --# a relative $ac_aux_dir ++# +# Modified to never use included libintl. +# Owen Taylor <otaylor@redhat.com>, 12/15/1998 - # --# The reason of the latter failure is that $top_srcdir and $ac_aux_dir --# are both prefixed by $srcdir. In an in-source build this is usually --# harmless because $srcdir is `.', but things will broke when you --# start a VPATH build or use an absolute $srcdir. ++# +# Major rework to remove unused code +# Owen Taylor <otaylor@redhat.com>, 12/11/2002 - # --# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, --# iff we strip the leading $srcdir from $ac_aux_dir. That would be: --# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` --# and then we would define $MISSING as --# MISSING="\${SHELL} $am_aux_dir/missing" --# This will work as long as MISSING is not called from configure, because --# unfortunately $(top_srcdir) has no meaning in configure. --# However there are other variables, like CC, which are often used in --# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 - # --# Another solution, used here, is to always expand $ac_aux_dir to an --# absolute PATH. The drawback is that using absolute paths prevent a --# configured tree to be moved without reconfiguration. -- --# Rely on autoconf to set up CDPATH properly. --AC_PREREQ([2.50]) -- --AC_DEFUN([AM_AUX_DIR_EXPAND], [ --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` --]) -- --# AM_PROG_INSTALL_SH --# ------------------ --# Define $install_sh. -- --# Copyright 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --AC_DEFUN([AM_PROG_INSTALL_SH], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"$am_aux_dir/install-sh"} --AC_SUBST(install_sh)]) -- --# AM_PROG_INSTALL_STRIP -- --# Copyright 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# One issue with vendor `install' (even GNU) is that you can't --# specify the program used to strip binaries. This is especially --# annoying in cross-compiling environments, where the build's strip --# is unlikely to handle the host's binaries. --# Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in `make install-strip', and initialize --# STRIPPROG with the value of the STRIP variable (set by the user). --AC_DEFUN([AM_PROG_INSTALL_STRIP], --[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --# Installed binaries are usually stripped using `strip' when the user --# run `make install-strip'. However `strip' might not be the right --# tool to use in cross-compilation environments, therefore Automake --# will honor the `STRIP' environment variable to overrule this program. --dnl Don't test for $cross_compiling = yes, because it might be `maybe'. --if test "$cross_compiling" != no; then -- AC_CHECK_TOOL([STRIP], [strip], :) --fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" --AC_SUBST([INSTALL_STRIP_PROGRAM])]) -- --# -*- Autoconf -*- --# Copyright (C) 2003 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 1 -- --# Check whether the underlying file-system supports filenames --# with a leading dot. For instance MS-DOS doesn't. --AC_DEFUN([AM_SET_LEADING_DOT], --[rm -rf .tst 2>/dev/null --mkdir .tst 2>/dev/null --if test -d .tst; then -- am__leading_dot=. --else -- am__leading_dot=_ --fi --rmdir .tst 2>/dev/null --AC_SUBST([am__leading_dot])]) -- --# serial 5 -*- Autoconf -*- -- --# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- -- --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -- -- -- --# _AM_DEPENDENCIES(NAME) --# ---------------------- --# See how the compiler implements dependency checking. --# NAME is "CC", "CXX", "GCJ", or "OBJC". --# We try a few techniques and use that to set a single cache variable. ++# +# Modified to require ngettext +# Matthias Clasen <mclasen@redhat.com> 08/06/2004 - # --# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was --# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular --# dependency, and given that the user is not expected to run this macro, --# just rely on AC_PROG_CC. --AC_DEFUN([_AM_DEPENDENCIES], --[AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl --AC_REQUIRE([AM_MAKE_INCLUDE])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl -- --ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -- [$1], CXX, [depcc="$CXX" am_compiler_list=], -- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) ++# +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) --AC_CACHE_CHECK([dependency style of $depcc], -- [am_cv_$1_dependencies_compiler_type], --[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub +-# This program 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 General Public License for more details. +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros @@ -875,24 +477,9 @@ Index: gtk+-2.14.4/aclocal.m4 +dnl definitions in terms of our private definitions. +dnl -- am_cv_$1_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -- fi -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- : > sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], @@ -907,13 +494,11 @@ Index: gtk+-2.14.4/aclocal.m4 + fi + fi]) -- case $depmode in -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, @@ -934,34 +519,10 @@ Index: gtk+-2.14.4/aclocal.m4 + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" - break - fi -- ;; -- none) break ;; -- esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. -- if depmode=$depmode \ -- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -- am_cv_$1_dependencies_compiler_type=$depmode -- break -- fi - fi - done -- -- cd .. -- rm -rf conftest.dir ++ break ++ fi ++ fi ++ done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. @@ -972,27 +533,18 @@ Index: gtk+-2.14.4/aclocal.m4 +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) - else -- am_cv_$1_dependencies_compiler_type=none ++else + AC_MSG_RESULT(no) - fi ++fi +AC_SUBST($1)dnl - ]) --AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) --AM_CONDITIONAL([am__fastdep$1], [ -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) --]) -- ++]) --# AM_SET_DEPDIR --# ------------- --# Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES --AC_DEFUN([AM_SET_DEPDIR], --[AC_REQUIRE([AM_SET_LEADING_DOT])dnl --AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl --]) +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.7.9])]) +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], @@ -1000,31 +552,26 @@ Index: gtk+-2.14.4/aclocal.m4 + [USE_NLS=yes + AC_SUBST(USE_NLS) +-# Helper functions for option handling. -*- Autoconf -*- + gt_cv_have_gettext=no --# AM_DEP_TRACK --# ------------ --AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking Speeds up one-time builds -- --enable-dependency-tracking Do not reject slow dependency extractors]) --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' --fi --AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --AC_SUBST([AMDEPBACKSLASH]) --]) +-# Copyright 2001, 2002 Free Software Foundation, Inc. + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= --# Generate code to set up dependency tracking. -*- Autoconf -*- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" --# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +-# This program 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 General Public License for more details. + # + # First check in libc + # @@ -1052,10 +599,10 @@ Index: gtk+-2.14.4/aclocal.m4 + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. + # + # If we don't have everything we want, check in libintl + # @@ -1068,10 +615,7 @@ Index: gtk+-2.14.4/aclocal.m4 + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) --# This program 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 General Public License for more details. +-# serial 2 + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) @@ -1083,10 +627,10 @@ Index: gtk+-2.14.4/aclocal.m4 + :,-liconv) + fi --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), @@ -1099,7 +643,11 @@ Index: gtk+-2.14.4/aclocal.m4 + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" --#serial 2 +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else @@ -1111,54 +659,11 @@ Index: gtk+-2.14.4/aclocal.m4 + fi + fi --# _AM_OUTPUT_DEPENDENCY_COMMANDS --# ------------------------------ --AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], --[for mf in $CONFIG_FILES; do -- # Strip MF so we end up with the name of the file. -- mf=`echo "$mf" | sed -e 's/:.*$//'` -- # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named `Makefile.in', but -- # some people rename them; so instead we look at the file content. -- # Grep'ing the first line is not enough: some people post-process -- # each Makefile.in and add a new line on top of each file to say so. -- # So let's grep whole file. -- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -- dirpart=`AS_DIRNAME("$mf")` -- else -- continue -- fi -- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -- test -z "$DEPDIR" && continue -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n -e '/^U = / s///p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n -e ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`AS_DIRNAME(["$file"])` -- AS_MKDIR_P([$dirpart/$fdir]) -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -- done --done --])# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes @@ -1224,23 +729,19 @@ Index: gtk+-2.14.4/aclocal.m4 + fi + ]) +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi --# AM_OUTPUT_DEPENDENCY_COMMANDS --# ----------------------------- --# This macro should only be invoked once -- use via AC_REQUIRE. -# --# This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each `.P' file that we will --# need in order to bootstrap the dependency handling code. --AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], --[AC_CONFIG_COMMANDS([depfiles], -- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) --]) +-# Check to make sure that the build environment is sane. +-# + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the @@ -1254,20 +755,23 @@ Index: gtk+-2.14.4/aclocal.m4 + fi + fi --# Check to see how 'make' treats includes. -*- Autoconf -*- +-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + # We need to process the po/ directory. + POSUB=po --# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -+ AC_OUTPUT_COMMANDS( -+ [case "$CONFIG_FILES" in *po/Makefile.in*) -+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -+ esac]) - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) + +-# This program 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 General Public License for more details. + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. @@ -1276,10 +780,10 @@ Index: gtk+-2.14.4/aclocal.m4 + POFILES="$POFILES $lang.po" + done --# This program 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 General Public License for more details. +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) @@ -1293,10 +797,7 @@ Index: gtk+-2.14.4/aclocal.m4 + AC_SUBST(POSUB) + ]) --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. +-# serial 3 +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation @@ -1314,7 +815,23 @@ Index: gtk+-2.14.4/aclocal.m4 + GLIB_LC_MESSAGES + GLIB_WITH_NLS --# serial 2 +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= @@ -1345,6 +862,844 @@ Index: gtk+-2.14.4/aclocal.m4 + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi ++ ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi + fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then + +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi ++ AC_SUBST(MKINSTALLDIRS) + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) ++ ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` + else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) ++ localedir=`eval echo "${datadir}/locale"` + fi +-AC_MSG_RESULT(yes)]) +- +-# -*- Autoconf -*- +- +- +-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) ++]) + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# serial 3 +- +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl + ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) + +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " +-else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) +-fi +-]) + +-# AM_AUX_DIR_EXPAND ++dnl -*- mode: autoconf -*- + +-# Copyright 2001 Free Software Foundation, Inc. ++# serial 1 + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++dnl Usage: ++dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ++AC_DEFUN([GTK_DOC_CHECK], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ dnl for overriding the documentation installation directory ++ 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]) + +-# This program 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 General Public License for more details. ++ dnl enable/disable documentation building ++ AC_ARG_ENABLE([gtk-doc], ++ AS_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [[default=no]]]),, ++ [enable_gtk_doc=no]) + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++ if test x$enable_gtk_doc = xyes; then ++ ifelse([$1],[], ++ [PKG_CHECK_EXISTS([gtk-doc],, ++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], ++ [PKG_CHECK_EXISTS([gtk-doc >= $1],, ++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) ++ fi + +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +-# +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. +-# +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir +-# +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. +-# +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. +-# +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. ++ AC_MSG_CHECKING([whether to build gtk-doc documentation]) ++ AC_MSG_RESULT($enable_gtk_doc) + +-# Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50]) ++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + +-AC_DEFUN([AM_AUX_DIR_EXPAND], [ +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` ++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + ]) + +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# Copyright 2001 Free Software Foundation, Inc. ++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. + +-# This program 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 General Public License for more details. ++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) ++# ----------------------------------------------------------- ++# If this macro is not defined by Autoconf, define it here. ++m4_ifdef([AC_PROVIDE_IFELSE], ++ [], ++ [m4_define([AC_PROVIDE_IFELSE], ++ [m4_ifdef([AC_PROVIDE_$1], ++ [$2], [$3])])]) + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. + +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} +-AC_SUBST(install_sh)]) ++# AC_PROG_LIBTOOL ++# --------------- ++AC_DEFUN([AC_PROG_LIBTOOL], ++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl ++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX ++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. ++ AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [AC_LIBTOOL_CXX], ++ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX ++ ])]) ++dnl And a similar setup for Fortran 77 support ++ AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [AC_LIBTOOL_F77], ++ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 ++])]) ++ ++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. ++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run ++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. ++ AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], ++ [AC_LIBTOOL_GCJ], ++ [ifdef([AC_PROG_GCJ], ++ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([A][M_PROG_GCJ], ++ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) ++ ifdef([LT_AC_PROG_GCJ], ++ [define([LT_AC_PROG_GCJ], ++ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) ++])])# AC_PROG_LIBTOOL + +-# AM_PROG_INSTALL_STRIP + +-# Copyright 2001 Free Software Foundation, Inc. ++# _AC_PROG_LIBTOOL ++# ---------------- ++AC_DEFUN([_AC_PROG_LIBTOOL], ++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl ++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +-# This program 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 General Public License for more details. ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Prevent multiple expansion ++define([AC_PROG_LIBTOOL], []) ++])# _AC_PROG_LIBTOOL + +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# -*- Autoconf -*- +-# Copyright (C) 2003 Free Software Foundation, Inc. ++# AC_LIBTOOL_SETUP ++# ---------------- ++AC_DEFUN([AC_LIBTOOL_SETUP], ++[AC_PREREQ(2.50)dnl ++AC_REQUIRE([AC_ENABLE_SHARED])dnl ++AC_REQUIRE([AC_ENABLE_STATIC])dnl ++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_PROG_LD])dnl ++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl ++AC_REQUIRE([AC_PROG_NM])dnl + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++AC_REQUIRE([AC_PROG_LN_S])dnl ++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl ++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! ++AC_REQUIRE([AC_OBJEXT])dnl ++AC_REQUIRE([AC_EXEEXT])dnl ++dnl ++AC_LIBTOOL_SYS_MAX_CMD_LEN ++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++AC_LIBTOOL_OBJDIR + +-# This program 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 General Public License for more details. ++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++_LT_AC_PROG_ECHO_BACKSLASH + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi ++ ;; ++esac + +-# serial 1 ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='sed -e 1s/^X//' ++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) ++# Same as above, but do not quote variable references. ++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +-# serial 5 -*- Autoconf -*- ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++# Constants: ++rm="rm -f" + +-# This program 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 General Public License for more details. ++# Global variables: ++default_ofile=libtool ++can_build_shared=yes + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ltmain="$ac_aux_dir/ltmain.sh" ++ofile="$default_ofile" ++with_gnu_ld="$lt_cv_prog_gnu_ld" + ++AC_CHECK_TOOL(AR, ar, false) ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++AC_CHECK_TOOL(STRIP, strip, :) + +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" + ++# Set sane defaults for various variables ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++test -z "$AS" && AS=as ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++test -z "$LD" && LD=ld ++test -z "$LN_S" && LN_S="ln -s" ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++test -z "$NM" && NM=nm ++test -z "$SED" && SED=sed ++test -z "$OBJDUMP" && OBJDUMP=objdump ++test -z "$RANLIB" && RANLIB=: ++test -z "$STRIP" && STRIP=: ++test -z "$ac_objext" && ac_objext=o + ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= + +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi + +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub ++_LT_CC_BASENAME([$compiler]) + +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++# Only perform the check for file, if the check method requires it ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ AC_PATH_MAGIC + fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- : > sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +- +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) ++ ;; ++esac + ++_LT_REQUIRED_DARWIN_CHECKS + +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) ++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++enable_win32_dll=yes, enable_win32_dll=no) ++ ++AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + ++AC_ARG_WITH([pic], ++ [AC_HELP_STRING([--with-pic], ++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++ [pic_mode="$withval"], ++ [pic_mode=default]) ++test -z "$pic_mode" && pic_mode=default + +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking Speeds up one-time builds +- --enable-dependency-tracking Do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) +-]) ++# Use C for the default configuration in the libtool script ++tagname= ++AC_LIBTOOL_LANG_C_CONFIG ++_LT_AC_TAGCONFIG ++])# AC_LIBTOOL_SETUP + +-# Generate code to set up dependency tracking. -*- Autoconf -*- + +-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. ++# _LT_AC_SYS_COMPILER ++# ------------------- ++AC_DEFUN([_LT_AC_SYS_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} + +-# This program 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 General Public License for more details. ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Allow CC to be a program name with arguments. ++compiler=$CC ++])# _LT_AC_SYS_COMPILER + +-#serial 2 + +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue +- # Extract the definition of DEP_FILES from the Makefile without +- # running `make'. +- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` +- test -z "$DEPDIR" && continue +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n -e '/^U = / s///p' < "$mf"` +- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" +- # We invoke sed twice because it is the simplest approach to +- # changing $(DEPDIR) to its actual value in the expansion. +- for file in `sed -n -e ' +- /^DEP_FILES = .*\\\\$/ { +- s/^DEP_FILES = // +- :loop +- s/\\\\$// +- p +- n +- /\\\\$/ b loop +- p +- } +- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++AC_DEFUN([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac + done +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS +- +- +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + ]) + +-# Check to see how 'make' treats includes. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++AC_DEFUN([_LT_COMPILER_BOILERPLATE], ++[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* ++])# _LT_COMPILER_BOILERPLATE + +-# This program 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 General Public License for more details. + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++AC_DEFUN([_LT_LINKER_BOILERPLATE], ++[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 -r conftest* ++])# _LT_LINKER_BOILERPLATE + +-# serial 2 ++# _LT_REQUIRED_DARWIN_CHECKS ++# -------------------------- ++# Check for some things on darwin ++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ ++ case $host_os in ++ rhapsody* | darwin*) ++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -# AM_MAKE_INCLUDE() -# ----------------- @@ -1380,67 +1735,144 @@ Index: gtk+-2.14.4/aclocal.m4 - am__include=.include - am__quote="\"" - _am_result=BSD -+ dnl Construct list of names of catalog files to be constructed. -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi ++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++ [lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ echo "int foo(void){return 1;}" > conftest.c ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib ${wl}-single_module conftest.c ++ if test -f libconftest.dylib; then ++ lt_cv_apple_cc_single_mod=yes ++ rm -rf libconftest.dylib* fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf --]) -- ++ rm conftest.c ++ fi]) ++ AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++ [lt_cv_ld_exported_symbols_list], ++ [lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" ++ ]) ++ case $host_os in ++ rhapsody* | darwin1.[[0123]]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac + ]) + -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. -- ++# _LT_AC_SYS_LIBPATH_AIX ++# ---------------------- ++# Links a minimal program and checks the executable ++# for the system default hardcoded library path. In most cases, ++# this is /usr/lib:/lib, but when the MPI compilers are used ++# the location of the communication and MPI libs are included too. ++# 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_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 "$lt_aix_libpath_sed"` ++fi],[]) ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++])# _LT_AC_SYS_LIBPATH_AIX + -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -- + -# This program 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 General Public License for more details. ++# _LT_AC_SHELL_INIT(ARG) ++# ---------------------- ++AC_DEFUN([_LT_AC_SHELL_INIT], ++[ifdef([AC_DIVERSION_NOTICE], ++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++ [AC_DIVERT_PUSH(NOTICE)]) ++$1 ++AC_DIVERT_POP ++])# _LT_AC_SHELL_INIT -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -- + -# serial 5 -+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). -+ dnl Try to locate is. -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+ fi -+ AC_SUBST(MKINSTALLDIRS) ++# _LT_AC_PROG_ECHO_BACKSLASH ++# -------------------------- ++# Add some code to the start of the generated configure script which ++# will find an echo command which doesn't interpret backslashes. ++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], ++[_LT_AC_SHELL_INIT([ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} -AC_PREREQ(2.52) -+ dnl Generate list of files to be processed by xgettext which will -+ dnl be included in po/Makefile. -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES -+ ]) ++case X$ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ;; ++esac -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- @@ -1453,154 +1885,2457 @@ Index: gtk+-2.14.4/aclocal.m4 -if $2; then - $1_TRUE= - $1_FALSE='#' -+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -+# ------------------------------- -+# Define VARIABLE to the location where catalog files will -+# be installed by po/Makefile. -+glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -+glib_save_prefix="$prefix" -+glib_save_exec_prefix="$exec_prefix" -+glib_save_datarootdir="$datarootdir" -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+test "x$exec_prefix" = xNONE && exec_prefix=$prefix -+datarootdir=`eval echo "${datarootdir}"` -+if test "x$CATOBJEXT" = "x.mo" ; then -+ localedir=`eval echo "${libdir}/locale"` ++echo=${ECHO-echo} ++if test "X[$]1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X[$]1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $echo works! ++ : else - $1_TRUE='#' - $1_FALSE= -+ localedir=`eval echo "${datadir}/locale"` ++ # Restart under the correct shell. ++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) -+prefix="$glib_save_prefix" -+exec_prefix="$glib_save_exec_prefix" -+datarootdir="$glib_save_datarootdir" -+AC_DEFINE_UNQUOTED($1, "$localedir", -+ [Define the location where the catalogs will be installed]) -+]) -+ -+dnl -+dnl Now the definitions that aclocal will find -+dnl -+ifdef(glib_configure_in,[],[ -+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -+])dnl -+ -+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -+# -+# Create a temporary file with TEST-FILE as its contents and pass the -+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -+# 0 and perform ACTION-IF-FAIL for any other exit status. -+AC_DEFUN([GLIB_RUN_PROG], -+[cat >conftest.foo <<_ACEOF -+$2 -+_ACEOF -+if AC_RUN_LOG([$1 conftest.foo]); then -+ m4_ifval([$3], [$3], [:]) -+m4_ifvaln([$4], [else $4])dnl -+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -+fi]) - +- -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- - +- -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. -+dnl -*- mode: autoconf -*- - +- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -+# serial 1 - +- -# This program 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 General Public License for more details. -+dnl Usage: -+dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -+AC_DEFUN([GTK_DOC_CHECK], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ dnl for overriding the documentation installation directory -+ 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]) - +- -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -+ dnl enable/disable documentation building -+ AC_ARG_ENABLE([gtk-doc], -+ AS_HELP_STRING([--enable-gtk-doc], -+ [use gtk-doc to build documentation [[default=no]]]),, -+ [enable_gtk_doc=no]) - +- -AC_PREREQ([2.52]) -+ if test x$enable_gtk_doc = xyes; then -+ ifelse([$1],[], -+ [PKG_CHECK_EXISTS([gtk-doc],, -+ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], -+ [PKG_CHECK_EXISTS([gtk-doc >= $1],, -+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) -+ fi - +- -# serial 6 -+ AC_MSG_CHECKING([whether to build gtk-doc documentation]) -+ AC_MSG_RESULT($enable_gtk_doc) - +- -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) -+ -+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) -+]) +- +-# Helper functions for option handling. -*- Autoconf -*- +-# +-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +-# Written by Gary V. Vaughan, 2004 +-# +-# This file is free software; the Free Software Foundation gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +- +-# serial 6 ltoptions.m4 +- +-# This is to help aclocal find these macros, as it can't see m4_define. +-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) +- +- +-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +-# ------------------------------------------ +-m4_define([_LT_MANGLE_OPTION], +-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) +- +- +-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +-# --------------------------------------- +-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +-# matching handler defined, dispatch to it. Other OPTION-NAMEs are +-# saved as a flag. +-m4_define([_LT_SET_OPTION], +-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), +- _LT_MANGLE_DEFUN([$1], [$2]), +- [m4_warning([Unknown $1 option `$2'])])[]dnl +-]) +- +- +-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------------------------ +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-m4_define([_LT_IF_OPTION], +-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) +- +- +-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +-# ------------------------------------------------------- +-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +-# are set. +-m4_define([_LT_UNLESS_OPTIONS], +-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), +- [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), +- [m4_define([$0_found])])])[]dnl +-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +-])[]dnl +-]) - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat <<EOF ++[$]* ++EOF ++ exit 0 ++fi --# serial 52 AC_PROG_LIBTOOL -+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL +-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +-# ---------------------------------------- +-# OPTION-LIST is a space-separated list of Libtool options associated +-# with MACRO-NAME. If any OPTION has a matching handler declared with +-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +-# the unknown option and exit. +-m4_defun([_LT_SET_OPTIONS], +-[# Set options +-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), +- [_LT_SET_OPTION([$1], _LT_Option)]) +- +-m4_if([$1],[LT_INIT],[ +- dnl +- dnl Simply set some default values (i.e off) if boolean options were not +- dnl specified: +- _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no +- ]) +- _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no +- ]) +- dnl +- dnl If no reference was made to various pairs of opposing options, then +- dnl we run the default mode handler for the pair. For example, if neither +- dnl `shared' nor `disable-shared' was passed, we enable building of shared +- dnl archives by default: +- _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) +- _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) +- _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) +- _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], +- [_LT_ENABLE_FAST_INSTALL]) +- ]) +-])# _LT_SET_OPTIONS +- ++# 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 + ++if test -z "$ECHO"; then ++if test "X${echo_test_string+set}" != Xset; then ++# find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if (echo_test_string=`eval $cmd`) 2>/dev/null && ++ echo_test_string=`eval $cmd` && ++ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ++ then ++ break ++ fi ++ done ++fi + +-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +-# ----------------------------------------- +-m4_define([_LT_MANGLE_DEFUN], +-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) ++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. + ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" + +-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +-# ----------------------------------------------- +-m4_define([LT_OPTION_DEFINE], +-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +-])# LT_OPTION_DEFINE ++ if test "X$echo" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ echo='print -r' ++ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ echo='printf %s\n' ++ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: + ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done + +-# dlopen +-# ------ +-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +-]) ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ echo=echo ++ fi ++ fi ++ fi ++ fi ++fi ++fi + +-AU_DEFUN([AC_LIBTOOL_DLOPEN], +-[_LT_SET_OPTION([LT_INIT], [dlopen]) +-AC_DIAGNOSE([obsolete], +-[$0: Remove this warning and the call to _LT_SET_OPTION when you +-put the `dlopen' option into LT_INIT's first parameter.]) +-]) ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++ECHO=$echo ++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++fi + +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) ++AC_SUBST(ECHO) ++])])# _LT_AC_PROG_ECHO_BACKSLASH - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -1565,7 +1330,6 @@ s390*-*linux*|sparc*-*linux*) - esac - ;; - *64-bit*) -- libsuff=64 - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -2628,13 +2392,11 @@ linux* | k*bsd*-gnu) - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +-# win32-dll +-# --------- +-# Declare package support for building win32 dll's. +-LT_OPTION_DEFINE([LT_INIT], [win32-dll], +-[enable_win32_dll=yes ++# _LT_AC_LOCK ++# ----------- ++AC_DEFUN([_LT_AC_LOCK], ++[AC_ARG_ENABLE([libtool-lock], ++ [AC_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ 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 -@@ -2646,6 +2408,18 @@ linux* | k*bsd*-gnu) - dynamic_linker='GNU/Linux ld.so' ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. + case $host in +-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) ++ia64-*-hpux*) ++ # 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.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ;; +-esac +- +-test -z "$AS" && AS=as +-_LT_DECL([], [AS], [0], [Assembler program])dnl +- +-test -z "$DLLTOOL" && DLLTOOL=dlltool +-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl +-test -z "$OBJDUMP" && OBJDUMP=objdump +-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +-])# win32-dll ++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" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *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" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; + +-AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-_LT_SET_OPTION([LT_INIT], [win32-dll]) +-AC_DIAGNOSE([obsolete], +-[$0: Remove this warning and the call to _LT_SET_OPTION when you +-put the `win32-dll' option into LT_INIT's first parameter.]) +-]) +- +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) +- +- +-# _LT_ENABLE_SHARED([DEFAULT]) +-# ---------------------------- +-# implement the --enable-shared flag, and supports the `shared' and +-# `disable-shared' LT_INIT options. +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-m4_define([_LT_ENABLE_SHARED], +-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +-AC_ARG_ENABLE([shared], +- [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], +- [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++ [AC_LANG_PUSH(C) ++ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LANG_POP]) ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # 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 ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" + fi +- done +- IFS="$lt_save_ifs" ++ ;; ++ esac + ;; +- esac], +- [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], ++[*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++ AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++ AC_CHECK_TOOL(AS, as, false) ++ AC_CHECK_TOOL(OBJDUMP, objdump, false) ++ ;; ++ ]) ++esac + +- _LT_DECL([build_libtool_libs], [enable_shared], [0], +- [Whether or not to build shared libraries]) +-])# _LT_ENABLE_SHARED ++need_locks="$enable_libtool_lock" + +-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) ++])# _LT_AC_LOCK + +-# Old names: +-AC_DEFUN([AC_ENABLE_SHARED], +-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ++ ++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------------------- ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], ++[AC_REQUIRE([LT_AC_PROG_SED]) ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ 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. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ 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. ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ fi ++ $rm conftest* + ]) + +-AC_DEFUN([AC_DISABLE_SHARED], +-[_LT_SET_OPTION([LT_INIT], [disable-shared]) ++if test x"[$]$2" = xyes; then ++ ifelse([$5], , :, [$5]) ++else ++ ifelse([$6], , :, [$6]) ++fi ++])# AC_LIBTOOL_COMPILER_OPTION ++ ++ ++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ------------------------------------------------------------ ++# Check whether the given compiler option works ++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $3" ++ 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 ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ else ++ $2=yes ++ fi ++ fi ++ $rm -r conftest* ++ LDFLAGS="$save_LDFLAGS" + ]) + +-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++if test x"[$]$2" = xyes; then ++ ifelse([$4], , :, [$4]) ++else ++ ifelse([$5], , :, [$5]) ++fi ++])# AC_LIBTOOL_LINKER_OPTION ++ + +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AM_ENABLE_SHARED], []) +-dnl AC_DEFUN([AM_DISABLE_SHARED], []) ++# AC_LIBTOOL_SYS_MAX_CMD_LEN ++# -------------------------- ++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], ++[# find the maximum length of command line arguments ++AC_MSG_CHECKING([the maximum length of command line arguments]) ++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++ i=0 ++ teststring="ABCD" + ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; + ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; + +-# _LT_ENABLE_STATIC([DEFAULT]) +-# ---------------------------- +-# implement the --enable-static flag, and support the `static' and +-# `disable-static' LT_INIT options. +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-m4_define([_LT_ENABLE_STATIC], +-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +-AC_ARG_ENABLE([static], +- [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], +- [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_static=yes ;; +- no) enable_static=no ;; +- *) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_static=]_LT_ENABLE_STATIC_DEFAULT) ++ cygwin* | mingw*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + +- _LT_DECL([build_old_libs], [enable_static], [0], +- [Whether or not to build static libraries]) +-])# _LT_ENABLE_STATIC ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + +-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ 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` ++ ;; + +-# Old names: +-AC_DEFUN([AC_ENABLE_STATIC], +-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +-]) ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; + +-AC_DEFUN([AC_DISABLE_STATIC], +-[_LT_SET_OPTION([LT_INIT], [disable-static]) ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ 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` ++ fi ++ ;; ++ esac + ]) ++if test -n $lt_cv_sys_max_cmd_len ; then ++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++else ++ AC_MSG_RESULT(none) ++fi ++])# AC_LIBTOOL_SYS_MAX_CMD_LEN + +-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AM_ENABLE_STATIC], []) +-dnl AC_DEFUN([AM_DISABLE_STATIC], []) ++# _LT_AC_CHECK_DLFCN ++# ------------------ ++AC_DEFUN([_LT_AC_CHECK_DLFCN], ++[AC_CHECK_HEADERS(dlfcn.h)dnl ++])# _LT_AC_CHECK_DLFCN + + ++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# --------------------------------------------------------------------- ++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "$cross_compiling" = yes; then : ++ [$4] ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <<EOF ++[#line __oline__ "configure" ++#include "confdefs.h" + +-# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +-# ---------------------------------- +-# implement the --enable-fast-install flag, and support the `fast-install' +-# and `disable-fast-install' LT_INIT options. +-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +-m4_define([_LT_ENABLE_FAST_INSTALL], +-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +-AC_ARG_ENABLE([fast-install], +- [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], +- [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], +- [p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac], +- [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) +- +-_LT_DECL([fast_install], [enable_fast_install], [0], +- [Whether or not to optimize for fast installation])dnl +-])# _LT_ENABLE_FAST_INSTALL +- +-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) +- +-# Old names: +-AU_DEFUN([AC_ENABLE_FAST_INSTALL], +-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +-AC_DIAGNOSE([obsolete], +-[$0: Remove this warning and the call to _LT_SET_OPTION when you put +-the `fast-install' option into LT_INIT's first parameter.]) +-]) +- +-AU_DEFUN([AC_DISABLE_FAST_INSTALL], +-[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +-AC_DIAGNOSE([obsolete], +-[$0: Remove this warning and the call to _LT_SET_OPTION when you put +-the `disable-fast-install' option into LT_INIT's first parameter.]) +-]) +- +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +- +- +-# _LT_WITH_PIC([MODE]) +-# -------------------- +-# implement the --with-pic flag, and support the `pic-only' and `no-pic' +-# LT_INIT options. +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +-m4_define([_LT_WITH_PIC], +-[AC_ARG_WITH([pic], +- [AS_HELP_STRING([--with-pic], +- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], +- [pic_mode=default]) ++#if HAVE_DLFCN_H ++#include <dlfcn.h> ++#endif + +-test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) ++#include <stdio.h> + +-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +-])# _LT_WITH_PIC ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif + +-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif + +-# Old name: +-AU_DEFUN([AC_LIBTOOL_PICMODE], +-[_LT_SET_OPTION([LT_INIT], [pic-only]) +-AC_DIAGNOSE([obsolete], +-[$0: Remove this warning and the call to _LT_SET_OPTION when you +-put the `pic-only' option into LT_INIT's first parameter.]) +-]) ++#ifdef __cplusplus ++extern "C" void exit (int); ++#endif + +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; + ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); + +-m4_define([_LTDL_MODE], []) +-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], +- [m4_define([_LTDL_MODE], [nonrecursive])]) +-LT_OPTION_DEFINE([LTDL_INIT], [recursive], +- [m4_define([_LTDL_MODE], [recursive])]) +-LT_OPTION_DEFINE([LTDL_INIT], [subproject], +- [m4_define([_LTDL_MODE], [subproject])]) +- +-m4_define([_LTDL_TYPE], []) +-LT_OPTION_DEFINE([LTDL_INIT], [installable], +- [m4_define([_LTDL_TYPE], [installable])]) +-LT_OPTION_DEFINE([LTDL_INIT], [convenience], +- [m4_define([_LTDL_TYPE], [convenience])]) ++ exit (status); ++}] ++EOF ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) $1 ;; ++ x$lt_dlneed_uscore) $2 ;; ++ x$lt_dlunknown|x*) $3 ;; ++ esac ++ else : ++ # compilation failed ++ $3 ++ fi ++fi ++rm -fr conftest* ++])# _LT_AC_TRY_DLOPEN_SELF + +-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008 Free Software Foundation, Inc. +-# Written by Gordon Matzigkeit, 1996 +-# +-# This file is free software; the Free Software Foundation gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +- +-m4_define([_LT_COPYING], [dnl +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008 Free Software Foundation, Inc. +-# Written by Gordon Matzigkeit, 1996 +-# +-# This file is part of GNU Libtool. +-# +-# GNU Libtool is free software; you can redistribute it and/or +-# modify it under the terms of the GNU General Public License as +-# published by the Free Software Foundation; either version 2 of +-# the License, or (at your option) any later version. +-# +-# As a special exception to the GNU General Public License, +-# if you distribute this file as part of a program or library that +-# is built using GNU Libtool, you may include this file under the +-# same distribution terms that you use for the rest of that program. +-# +-# GNU Libtool 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 General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with GNU Libtool; see the file COPYING. If not, a copy +-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +-# obtained by writing to the Free Software Foundation, Inc., +-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-]) + +-# serial 56 LT_INIT ++# AC_LIBTOOL_DLOPEN_SELF ++# ---------------------- ++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], ++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= + ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; + +-# LT_PREREQ(VERSION) +-# ------------------ +-# Complain and exit if this libtool version is less that VERSION. +-m4_defun([LT_PREREQ], +-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, +- [m4_default([$3], +- [m4_fatal([Libtool version $1 or higher is required], +- 63)])], +- [$2])]) ++ mingw* | pw32*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; + ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; + +-# _LT_CHECK_BUILDDIR +-# ------------------ +-# Complain if the absolute build directory name contains unusual characters +-m4_defun([_LT_CHECK_BUILDDIR], +-[case `pwd` in +- *\ * | *\ *) +- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +-esac +-]) ++ darwin*) ++ # if libdl is installed we need to link against it ++ AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ]) ++ ;; + ++ *) ++ AC_CHECK_FUNC([shl_load], ++ [lt_cv_dlopen="shl_load"], ++ [AC_CHECK_LIB([dld], [shl_load], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], ++ [AC_CHECK_FUNC([dlopen], ++ [lt_cv_dlopen="dlopen"], ++ [AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [AC_CHECK_LIB([svld], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++ [AC_CHECK_LIB([dld], [dld_link], ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac + +-# LT_INIT([OPTIONS]) +-# ------------------ +-AC_DEFUN([LT_INIT], +-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +-AC_BEFORE([$0], [LT_LANG])dnl +-AC_BEFORE([$0], [LT_OUTPUT])dnl +-AC_BEFORE([$0], [LTDL_INIT])dnl +-m4_require([_LT_CHECK_BUILDDIR])dnl +- +-dnl Autoconf doesn't catch unexpanded LT_ macros by default: +-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +-dnl unless we require an AC_DEFUNed macro: +-AC_REQUIRE([LTOPTIONS_VERSION])dnl +-AC_REQUIRE([LTSUGAR_VERSION])dnl +-AC_REQUIRE([LTVERSION_VERSION])dnl +-AC_REQUIRE([LTOBSOLETE_VERSION])dnl +-m4_require([_LT_PROG_LTMAIN])dnl ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi + +-dnl Parse OPTIONS +-_LT_SET_OPTIONS([$0], [$1]) ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ltmain" ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" + +-_LT_SETUP ++ AC_CACHE_CHECK([whether a program can dlopen itself], ++ lt_cv_dlopen_self, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++ ]) + +-# Only expand once: +-m4_define([LT_INIT]) +-])# LT_INIT +- +-# Old names: +-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +-dnl AC_DEFUN([AM_PROG_LIBTOOL], []) ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++ lt_cv_dlopen_self_static, [dnl ++ _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++ ]) ++ fi + ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac + +-# _LT_CC_BASENAME(CC) +-# ------------------- +-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +-m4_defun([_LT_CC_BASENAME], +-[for cc_temp in $1""; do +- case $cc_temp in +- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; +- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; +- \-*) ;; +- *) break;; ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; + esac +-done +-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-]) + ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++])# AC_LIBTOOL_DLOPEN_SELF + +-# _LT_FILEUTILS_DEFAULTS +-# ---------------------- +-# It is okay to use these file commands and assume they have been set +-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +-m4_defun([_LT_FILEUTILS_DEFAULTS], +-[: ${CP="cp -f"} +-: ${MV="mv -f"} +-: ${RM="rm -f"} +-])# _LT_FILEUTILS_DEFAULTS + ++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) ++# --------------------------------- ++# 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_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 ++ $rm -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +-# _LT_SETUP +-# --------- +-m4_defun([_LT_SETUP], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-_LT_DECL([], [host_alias], [0], [The host system])dnl +-_LT_DECL([], [host], [0])dnl +-_LT_DECL([], [host_os], [0])dnl +-dnl +-_LT_DECL([], [build_alias], [0], [The build system])dnl +-_LT_DECL([], [build], [0])dnl +-_LT_DECL([], [build_os], [0])dnl +-dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([LT_PATH_LD])dnl +-AC_REQUIRE([LT_PATH_NM])dnl +-dnl +-AC_REQUIRE([AC_PROG_LN_S])dnl +-test -z "$LN_S" && LN_S="ln -s" +-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +-dnl +-AC_REQUIRE([LT_CMD_MAX_LEN])dnl +-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +-dnl +-m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-m4_require([_LT_CHECK_SHELL_FEATURES])dnl +-m4_require([_LT_CMD_RELOAD])dnl +-m4_require([_LT_CHECK_MAGIC_METHOD])dnl +-m4_require([_LT_CMD_OLD_ARCHIVE])dnl +-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +- +-_LT_CONFIG_LIBTOOL_INIT([ +-# See if we are running on zsh, and set the options which allow our +-# commands through without removal of \ escapes INIT. +-if test -n "\${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +-fi ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ fi ++ fi ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $rm conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files ++ $rm out/* && rmdir out ++ cd .. ++ rmdir conftest ++ $rm conftest* + ]) +-if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +-fi ++])# AC_LIBTOOL_PROG_CC_C_O + +-_LT_CHECK_OBJDIR + +-m4_require([_LT_TAG_COMPILER])dnl +-_LT_PROG_ECHO_BACKSLASH ++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) ++# ----------------------------------------- ++# Check to see if we can do hard links to lock some files if needed ++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], ++[AC_REQUIRE([_LT_AC_LOCK])dnl + +-case $host_os in +-aix3*) +- # AIX sometimes has problems with the GCC collect2 program. For some +- # reason, if we set the COLLECT_NAMES environment variable, the problems +- # vanish in a puff of smoke. +- if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +- fi +- ;; +-esac +- +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' +- +-# Same as above, but do not quote variable references. +-double_quote_subst='s/\([["`\\]]\)/\\\1/g' +- +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +- +-# Sed substitution to delay expansion of an escaped single quote. +-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' +- +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' +- +-# Global variables: +-ofile=libtool +-can_build_shared=yes +- +-# All known linkers require a `.a' archive for static linking (except MSVC, +-# which needs '.lib'). +-libext=a +- +-with_gnu_ld="$lt_cv_prog_gnu_ld" +- +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" +- +-# Set sane defaults for various variables +-test -z "$CC" && CC=cc +-test -z "$LTCC" && LTCC=$CC +-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +-test -z "$LD" && LD=ld +-test -z "$ac_objext" && ac_objext=o +- +-_LT_CC_BASENAME([$compiler]) +- +-# Only perform the check for file, if the check method requires it +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-case $deplibs_check_method in +-file_magic*) +- if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- _LT_PATH_MAGIC ++hard_links="nottested" ++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ AC_MSG_CHECKING([if we can lock with hard links]) ++ hard_links=yes ++ $rm conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ AC_MSG_RESULT([$hard_links]) ++ if test "$hard_links" = no; then ++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++ need_locks=warn + fi +- ;; +-esac +- +-# Use C for the default configuration in the libtool script +-LT_SUPPORTED_TAG([CC]) +-_LT_LANG_C_CONFIG +-_LT_LANG_DEFAULT_CONFIG +-_LT_CONFIG_COMMANDS +-])# _LT_SETUP +- +- +-# _LT_PROG_LTMAIN +-# --------------- +-# Note that this code is called both from `configure', and `config.status' +-# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +-# `config.status' has no value for ac_aux_dir unless we are using Automake, +-# so we pass a copy along to make sure it has a sensible value anyway. +-m4_defun([_LT_PROG_LTMAIN], +-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +-ltmain="$ac_aux_dir/ltmain.sh" +-])# _LT_PROG_LTMAIN ++else ++ need_locks=no ++fi ++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS + + ++# AC_LIBTOOL_OBJDIR ++# ----------------- ++AC_DEFUN([AC_LIBTOOL_OBJDIR], ++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++[rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null]) ++objdir=$lt_cv_objdir ++])# AC_LIBTOOL_OBJDIR + +-# So that we can recreate a full libtool script including additional +-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +-# in macros and then make a single call at the end using the `libtool' +-# label. + ++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) ++# ---------------------------------------------- ++# Check hardcoding attributes. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++_LT_AC_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ ++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ ++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + +-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +-# ---------------------------------------- +-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +-m4_define([_LT_CONFIG_LIBTOOL_INIT], +-[m4_ifval([$1], +- [m4_append([_LT_OUTPUT_LIBTOOL_INIT], +- [$1 +-])])]) ++ # We can hardcode non-existant directories. ++ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++ # Linking always hardcodes the temporary library directory. ++ _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported ++fi ++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) + +-# Initialize. +-m4_define([_LT_OUTPUT_LIBTOOL_INIT]) ++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH + + +-# _LT_CONFIG_LIBTOOL([COMMANDS]) +-# ------------------------------ +-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +-m4_define([_LT_CONFIG_LIBTOOL], +-[m4_ifval([$1], +- [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], +- [$1 +-])])]) +- +-# Initialize. +-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) +- +- +-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +-# ----------------------------------------------------- +-m4_defun([_LT_CONFIG_SAVE_COMMANDS], +-[_LT_CONFIG_LIBTOOL([$1]) +-_LT_CONFIG_LIBTOOL_INIT([$2]) +-]) ++# AC_LIBTOOL_SYS_LIB_STRIP ++# ------------------------ ++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], ++[striplib= ++old_striplib= ++AC_MSG_CHECKING([whether stripping libraries is possible]) ++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ AC_MSG_RESULT([yes]) ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) ++ ;; ++ esac ++fi ++])# AC_LIBTOOL_SYS_LIB_STRIP + + +-# _LT_FORMAT_COMMENT([COMMENT]) ++# AC_LIBTOOL_SYS_DYNAMIC_LINKER + # ----------------------------- +-# Add leading comment marks to the start of each line, and a trailing +-# full-stop to the whole comment if one is not present already. +-m4_define([_LT_FORMAT_COMMENT], +-[m4_ifval([$1], [ +-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], +- [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +-)]) ++# PORTME Fill in your ld.so characteristics ++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_MSG_CHECKING([dynamic linker characteristics]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++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 ++ 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. ++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ 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]) ++need_lib_prefix=unknown ++hardcode_into_libs=no + ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown + ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH + ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; + ++aix[[4-9]]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[[01]] | aix4.[[01]].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib<name>.so ++ # instead of lib<name>.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; + +-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +-# ------------------------------------------------------------------- +-# CONFIGNAME is the name given to the value in the libtool script. +-# VARNAME is the (base) name used in the configure script. +-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +-# VARNAME. Any other value will be used directly. +-m4_define([_LT_DECL], +-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], +- [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], +- [m4_ifval([$1], [$1], [$2])]) +- lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) +- m4_ifval([$4], +- [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) +- lt_dict_add_subkey([lt_decl_dict], [$2], +- [tagged?], [m4_ifval([$5], [yes], [no])])]) +-]) ++amigaos*) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; + ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; + +-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +-# -------------------------------------------------------- +-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) +- +- +-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +-# ------------------------------------------------ +-m4_define([lt_decl_tag_varnames], +-[_lt_decl_filter([tagged?], [yes], $@)]) +- +- +-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +-# --------------------------------------------------------- +-m4_define([_lt_decl_filter], +-[m4_case([$#], +- [0], [m4_fatal([$0: too few arguments: $#])], +- [1], [m4_fatal([$0: too few arguments: $#: $1])], +- [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], +- [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], +- [lt_dict_filter([lt_decl_dict], $@)])[]dnl +-]) ++bsdi[[45]]*) ++ version_type=linux ++ 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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; + ++cygwin* | mingw* | pw32*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no + +-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +-# -------------------------------------------------- +-m4_define([lt_decl_quote_varnames], +-[_lt_decl_filter([value], [1], $@)]) +- +- +-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +-# --------------------------------------------------- +-m4_define([lt_decl_dquote_varnames], +-[_lt_decl_filter([value], [2], $@)]) +- +- +-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +-# --------------------------------------------------- +-m4_define([lt_decl_varnames_tagged], +-[m4_assert([$# <= 2])dnl +-_$0(m4_quote(m4_default([$1], [[, ]])), +- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), +- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +-m4_define([_lt_decl_varnames_tagged], +-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) +- +- +-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +-# ------------------------------------------------ +-m4_define([lt_decl_all_varnames], +-[_$0(m4_quote(m4_default([$1], [[, ]])), +- m4_if([$2], [], +- m4_quote(lt_decl_varnames), +- m4_quote(m4_shift($@))))[]dnl +-]) +-m4_define([_lt_decl_all_varnames], +-[lt_join($@, lt_decl_varnames_tagged([$1], +- lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +-]) +- +- +-# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +-# ------------------------------------ +-# Quote a variable value, and forward it to `config.status' so that its +-# declaration there will have the same value as in `configure'. VARNAME +-# must have a single quote delimited value for this to work. +-m4_define([_LT_CONFIG_STATUS_DECLARE], +-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) +- +- +-# _LT_CONFIG_STATUS_DECLARATIONS +-# ------------------------------ +-# We delimit libtool config variables with single quotes, so when +-# we write them to config.status, we have to be sure to quote all +-# embedded single quotes properly. In configure, this macro expands +-# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +-# +-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' +-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), +- [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) +- +- +-# _LT_LIBTOOL_TAGS +-# ---------------- +-# Output comment and list of tags supported by the script +-m4_defun([_LT_LIBTOOL_TAGS], +-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +-available_tags="_LT_TAGS"dnl +-]) +- +- +-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +-# ----------------------------------- +-# Extract the dictionary values for VARNAME (optionally with TAG) and +-# expand to a commented shell variable setting: +-# +-# # Some comment about what VAR is for. +-# visible_name=$lt_internal_name +-m4_define([_LT_LIBTOOL_DECLARE], +-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], +- [description])))[]dnl +-m4_pushdef([_libtool_name], +- m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), +- [0], [_libtool_name=[$]$1], +- [1], [_libtool_name=$lt_[]$1], +- [2], [_libtool_name=$lt_[]$1], +- [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +-]) +- +- +-# _LT_LIBTOOL_CONFIG_VARS +-# ----------------------- +-# Produce commented declarations of non-tagged libtool config variables +-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +-# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +-# section) are produced by _LT_LIBTOOL_TAG_VARS. +-m4_defun([_LT_LIBTOOL_CONFIG_VARS], +-[m4_foreach([_lt_var], +- m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), +- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) +- +- +-# _LT_LIBTOOL_TAG_VARS(TAG) +-# ------------------------- +-m4_define([_LT_LIBTOOL_TAG_VARS], +-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), +- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) +- +- +-# _LT_TAGVAR(VARNAME, [TAGNAME]) +-# ------------------------------ +-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) +- +- +-# _LT_CONFIG_COMMANDS +-# ------------------- +-# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +-# variables for single and double quote escaping we saved from calls +-# to _LT_DECL, we can put quote escaped variables declarations +-# into `config.status', and then the shell code to quote escape them in +-# for loops in `config.status'. Finally, any additional code accumulated +-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +-m4_defun([_LT_CONFIG_COMMANDS], +-[AC_PROVIDE_IFELSE([LT_OUTPUT], +- dnl If the libtool generation code has been placed in $CONFIG_LT, +- dnl instead of duplicating it all over again into config.status, +- dnl then we will have config.status run $CONFIG_LT later, so it +- dnl needs to know what name is stored there: +- [AC_CONFIG_COMMANDS([libtool], +- [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], +- dnl If the libtool generation code is destined for config.status, +- dnl expand the accumulated commands and init code now: +- [AC_CONFIG_COMMANDS([libtool], +- [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +-])#_LT_CONFIG_COMMANDS +- +- +-# Initialize. +-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +-[ +- +-# 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 ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $rm \$dlpath' ++ shlibpath_overrides_runpath=yes + +-sed_quote_subst='$sed_quote_subst' +-double_quote_subst='$double_quote_subst' +-delay_variable_subst='$delay_variable_subst' +-_LT_CONFIG_STATUS_DECLARATIONS +-LTCC='$LTCC' +-LTCFLAGS='$LTCFLAGS' +-compiler='$compiler_DEFAULT' +- +-# Quote evaled strings. +-for var in lt_decl_all_varnames([[ \ +-]], lt_decl_quote_varnames); do +- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in +- *[[\\\\\\\`\\"\\\$]]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" +- ;; +- *) +- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- esac +-done +- +-# Double-quote double-evaled strings. +-for var in lt_decl_all_varnames([[ \ +-]], lt_decl_dquote_varnames); do +- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in +- *[[\\\\\\\`\\"\\\$]]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ mingw*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ 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 ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ 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 + ;; +- *) +- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac +-done ++ ;; + +-# Fix-up fallback echo if it was mangled by the above quoting rules. +-case \$lt_ECHO in +-*'\\\[$]0 --fallback-echo"')dnl " +- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH + ;; +-esac +- +-_LT_OUTPUT_LIBTOOL_INIT +-]) +- + +-# LT_OUTPUT +-# --------- +-# This macro allows early generation of the libtool script (before +-# AC_OUTPUT is called), incase it is used in configure for compilation +-# tests. +-AC_DEFUN([LT_OUTPUT], +-[: ${CONFIG_LT=./config.lt} +-AC_MSG_NOTICE([creating $CONFIG_LT]) +-cat >"$CONFIG_LT" <<_LTEOF +-#! $SHELL +-# Generated by $as_me. +-# Run this file to recreate a libtool stub with the current configuration. +- +-lt_cl_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_LTEOF +- +-cat >>"$CONFIG_LT" <<\_LTEOF +-AS_SHELL_SANITIZE +-_AS_PREPARE +- +-exec AS_MESSAGE_FD>&1 +-exec AS_MESSAGE_LOG_FD>>config.log +-{ +- echo +- AS_BOX([Running $as_me.]) +-} >&AS_MESSAGE_LOG_FD +- +-lt_cl_help="\ +-\`$as_me' creates a local libtool stub from the current configuration, +-for use in further configure time tests before the real libtool is +-generated. +- +-Usage: $[0] [[OPTIONS]] +- +- -h, --help print this help, then exit +- -V, --version print version number, then exit +- -q, --quiet do not print progress messages +- -d, --debug don't remove temporary files +- +-Report bugs to <bug-libtool@gnu.org>." +- +-lt_cl_version="\ +-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +-configured by $[0], generated by m4_PACKAGE_STRING. +- +-Copyright (C) 2008 Free Software Foundation, Inc. +-This config.lt script is free software; the Free Software Foundation +-gives unlimited permision to copy, distribute and modify it." ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ 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' ++ ;; + +-while test $[#] != 0 +-do +- case $[1] in +- --version | --v* | -V ) +- echo "$lt_cl_version"; exit 0 ;; +- --help | --h* | -h ) +- echo "$lt_cl_help"; exit 0 ;; +- --debug | --d* | -d ) +- debug=: ;; +- --quiet | --q* | --silent | --s* | -q ) +- lt_cl_silent=: ;; ++dgux*) ++ 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 ++ ;; + +- -*) AC_MSG_ERROR([unrecognized option: $[1] +-Try \`$[0] --help' for more information.]) ;; ++freebsd1*) ++ dynamic_linker=no ++ ;; + +- *) AC_MSG_ERROR([unrecognized argument: $[1] +-Try \`$[0] --help' for more information.]) ;; ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; + esac +- shift +-done +- +-if $lt_cl_silent; then +- exec AS_MESSAGE_FD>/dev/null +-fi +-_LTEOF +- +-cat >>"$CONFIG_LT" <<_LTEOF +-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +-_LTEOF +- +-cat >>"$CONFIG_LT" <<\_LTEOF +-AC_MSG_NOTICE([creating $ofile]) +-_LT_OUTPUT_LIBTOOL_COMMANDS +-AS_EXIT(0) +-_LTEOF +-chmod +x "$CONFIG_LT" +- +-# configure is writing to config.log, but config.lt does its own redirection, +-# appending to config.log, which fails on DOS, as config.log is still kept +-# open by configure. Here we exec the FD to /dev/null, effectively closing +-# config.log, so it can be properly (re)opened and appended to by config.lt. +-if test "$no_create" != yes; then +- lt_cl_success=: +- test "$silent" = yes && +- lt_config_lt_args="$lt_config_lt_args --quiet" +- exec AS_MESSAGE_LOG_FD>/dev/null +- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +- exec AS_MESSAGE_LOG_FD>>config.log +- $lt_cl_success || AS_EXIT(1) +-fi +-])# LT_OUTPUT +- +- +-# _LT_CONFIG(TAG) +-# --------------- +-# If TAG is the built-in tag, create an initial libtool script with a +-# default configuration from the untagged config vars. Otherwise add code +-# to config.status for appending the configuration named by TAG from the +-# matching tagged config vars. +-m4_defun([_LT_CONFIG], +-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-_LT_CONFIG_SAVE_COMMANDS([ +- m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl +- m4_if(_LT_TAG, [C], [ +- # 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 +- setopt NO_GLOB_SUBST +- fi +- +- cfgfile="${ofile}T" +- trap "$RM \"$cfgfile\"; exit 1" 1 2 15 +- $RM "$cfgfile" +- +- cat <<_LT_EOF >> "$cfgfile" +-#! $SHELL +- +-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +-# NOTE: Changes made to this file will be lost: look at ltmain.sh. +-# +-_LT_COPYING +-_LT_LIBTOOL_TAGS +- +-# ### BEGIN LIBTOOL CONFIG +-_LT_LIBTOOL_CONFIG_VARS +-_LT_LIBTOOL_TAG_VARS +-# ### END LIBTOOL CONFIG +- +-_LT_EOF +- ++ shlibpath_var=LD_LIBRARY_PATH + case $host_os in +- aix3*) +- cat <<\_LT_EOF >> "$cfgfile" +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-_LT_EOF ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes + ;; + esac ++ ;; + +- _LT_PROG_LTMAIN +- +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- _LT_PROG_XSI_SHELLFNS +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +-], +-[cat <<_LT_EOF >> "$ofile" +- +-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +-dnl in a comment (ie after a #). +-# ### BEGIN LIBTOOL TAG CONFIG: $1 +-_LT_LIBTOOL_TAG_VARS(_LT_TAG) +-# ### END LIBTOOL TAG CONFIG: $1 +-_LT_EOF +-])dnl /m4_if +-], +-[m4_if([$1], [], [ +- PACKAGE='$PACKAGE' +- VERSION='$VERSION' +- TIMESTAMP='$TIMESTAMP' +- RM='$RM' +- ofile='$ofile'], []) +-])dnl /_LT_CONFIG_SAVE_COMMANDS +-])# _LT_CONFIG +- +- +-# LT_SUPPORTED_TAG(TAG) +-# --------------------- +-# Trace this macro to discover what tags are supported by the libtool +-# --tag option, using: +-# autoconf --trace 'LT_SUPPORTED_TAG:$1' +-AC_DEFUN([LT_SUPPORTED_TAG], []) +- +- +-# C support is built-in for now +-m4_define([_LT_LANG_C_enabled], []) +-m4_define([_LT_TAGS], []) +- +- +-# LT_LANG(LANG) +-# ------------- +-# Enable libtool support for the given language if not already enabled. +-AC_DEFUN([LT_LANG], +-[AC_BEFORE([$0], [LT_OUTPUT])dnl +-m4_case([$1], +- [C], [_LT_LANG(C)], +- [C++], [_LT_LANG(CXX)], +- [Java], [_LT_LANG(GCJ)], +- [Fortran 77], [_LT_LANG(F77)], +- [Fortran], [_LT_LANG(FC)], +- [Windows Resource], [_LT_LANG(RC)], +- [m4_ifdef([_LT_LANG_]$1[_CONFIG], +- [_LT_LANG($1)], +- [m4_fatal([$0: unsupported language: "$1"])])])dnl +-])# LT_LANG +- +- +-# _LT_LANG(LANGNAME) +-# ------------------ +-m4_defun([_LT_LANG], +-[m4_ifdef([_LT_LANG_]$1[_enabled], [], +- [LT_SUPPORTED_TAG([$1])dnl +- m4_append([_LT_TAGS], [$1 ])dnl +- m4_define([_LT_LANG_]$1[_enabled], [])dnl +- _LT_LANG_$1_CONFIG($1)])dnl +-])# _LT_LANG +- +- +-# _LT_LANG_DEFAULT_CONFIG +-# ----------------------- +-m4_defun([_LT_LANG_DEFAULT_CONFIG], +-[AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [LT_LANG(CXX)], +- [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) +- +-AC_PROVIDE_IFELSE([AC_PROG_F77], +- [LT_LANG(F77)], +- [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) +- +-AC_PROVIDE_IFELSE([AC_PROG_FC], +- [LT_LANG(FC)], +- [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) +- +-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +-dnl pulling things in needlessly. +-AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [LT_LANG(GCJ)], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [LT_LANG(GCJ)], +- [AC_PROVIDE_IFELSE([LT_PROG_GCJ], +- [LT_LANG(GCJ)], +- [m4_ifdef([AC_PROG_GCJ], +- [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) +- m4_ifdef([A][M_PROG_GCJ], +- [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) +- m4_ifdef([LT_PROG_GCJ], +- [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +- +-AC_PROVIDE_IFELSE([LT_PROG_RC], +- [LT_LANG(RC)], +- [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +-])# _LT_LANG_DEFAULT_CONFIG +- +-# Obsolete macros: +-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +-dnl AC_DEFUN([AC_LIBTOOL_F77], []) +-dnl AC_DEFUN([AC_LIBTOOL_FC], []) +-dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) ++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 ++ hardcode_into_libs=yes ++ ;; + ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; + +-# _LT_TAG_COMPILER +-# ---------------- +-m4_defun([_LT_TAG_COMPILER], +-[AC_REQUIRE([AC_PROG_CC])dnl ++interix[[3-9]]*) ++ 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' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; + +-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; + +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; + +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++# This must be Linux ELF. ++linux* | k*bsd*-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' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes + +-# Allow CC to be a program name with arguments. +-compiler=$CC +-])# _LT_TAG_COMPILER ++ # 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>/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 ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; + +-# _LT_COMPILER_BOILERPLATE +-# ------------------------ +-# Check for compiler boilerplate output or warnings with +-# the simple compiler test code. +-m4_defun([_LT_COMPILER_BOILERPLATE], +-[m4_require([_LT_DECL_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* +-])# _LT_COMPILER_BOILERPLATE +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no @@ -1612,195 +4347,5412 @@ Index: gtk+-2.14.4/aclocal.m4 + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -3427,7 +3201,7 @@ 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)$' ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; + +-# _LT_LINKER_BOILERPLATE +-# ---------------------- +-# Check for linker boilerplate output or warnings with +-# the simple link test code. +-m4_defun([_LT_LINKER_BOILERPLATE], +-[m4_require([_LT_DECL_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 -r conftest* +-])# _LT_LINKER_BOILERPLATE ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; + +-# _LT_REQUIRED_DARWIN_CHECKS +-# ------------------------- +-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ +- case $host_os in +- rhapsody* | darwin*) +- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) +- AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) +- AC_CHECK_TOOL([LIPO], [lipo], [:]) +- AC_CHECK_TOOL([OTOOL], [otool], [:]) +- AC_CHECK_TOOL([OTOOL64], [otool64], [:]) +- _LT_DECL([], [DSYMUTIL], [1], +- [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) +- _LT_DECL([], [NMEDIT], [1], +- [Tool to change global to local symbols on Mac OS X]) +- _LT_DECL([], [LIPO], [1], +- [Tool to manipulate fat objects and archives on Mac OS X]) +- _LT_DECL([], [OTOOL], [1], +- [ldd/readelf like tool for Mach-O binaries on Mac OS X]) +- _LT_DECL([], [OTOOL64], [1], +- [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) ++nto-qnx*) ++ 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=yes ++ ;; + +- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], +- [lt_cv_apple_cc_single_mod=no +- if test -z "${LT_MULTI_MODULE}"; then +- # By default we will add the -single_module flag. You can override +- # by either setting the environment variable LT_MULTI_MODULE +- # non-empty at configure time, or by adding -multi_module to the +- # link flags. +- rm -rf libconftest.dylib* +- echo "int foo(void){return 1;}" > conftest.c +- echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD +- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +- -dynamiclib -Wl,-single_module conftest.c 2>conftest.err +- _lt_result=$? +- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then +- lt_cv_apple_cc_single_mod=yes +- else +- cat conftest.err >&AS_MESSAGE_LOG_FD +- fi +- rm -rf libconftest.dylib* +- rm -f conftest.* +- fi]) +- AC_CACHE_CHECK([for -exported_symbols_list linker flag], +- [lt_cv_ld_exported_symbols_list], +- [lt_cv_ld_exported_symbols_list=no +- save_LDFLAGS=$LDFLAGS +- echo "_main" > conftest.sym +- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], +- [lt_cv_ld_exported_symbols_list=yes], +- [lt_cv_ld_exported_symbols_list=no]) +- LDFLAGS="$save_LDFLAGS" +- ]) ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in +- rhapsody* | darwin1.[[012]]) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +- darwin1.*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- darwin*) # darwin 5.x on +- # if running on 10.5 or later, the deployment target defaults +- # to the OS version, if on x86, and 10.4, the deployment +- # target defaults to 10.4. Don't you love it? +- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- 10.[[012]]*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- 10.*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ openbsd2.[[89]] | openbsd2.[[89]].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; + esac +- ;; +- esac +- if test "$lt_cv_apple_cc_single_mod" = "yes"; then +- _lt_dar_single_mod='$single_module' +- fi +- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then +- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' +- else +- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- if test "$DSYMUTIL" != ":"; then +- _lt_dsymutil='~$DSYMUTIL $lib || :' +- else +- _lt_dsymutil= +- fi +- ;; +- esac +-]) +- +- +-# _LT_DARWIN_LINKER_FEATURES +-# -------------------------- +-# Checks for linker and compiler features on darwin +-m4_defun([_LT_DARWIN_LINKER_FEATURES], +-[ +- m4_require([_LT_REQUIRED_DARWIN_CHECKS]) +- _LT_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_TAGVAR(hardcode_direct, $1)=no +- _LT_TAGVAR(hardcode_automatic, $1)=yes +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_TAGVAR(link_all_deplibs, $1)=yes +- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" +- case $cc_basename in +- ifort*) _lt_dar_can_shared=yes ;; +- *) _lt_dar_can_shared=$GCC ;; +- esac +- if test "$_lt_dar_can_shared" = "yes"; then +- output_verbose_link_cmd=echo +- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- m4_if([$1], [CXX], +-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then +- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" +- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +- fi +-],[]) else -@@ -4434,7 +4208,7 @@ case $host_os in +- _LT_TAGVAR(ld_shlibs, $1)=no ++ shlibpath_overrides_runpath=yes + fi +-]) +- +-# _LT_SYS_MODULE_PATH_AIX +-# ----------------------- +-# Links a minimal program and checks the executable +-# for the system default hardcoded library path. In most cases, +-# this is /usr/lib:/lib, but when the MPI compilers are used +-# the location of the communication and MPI libs are included too. +-# If we don't find anything, use the default library path according +-# to the aix ld manual. +-m4_defun([_LT_SYS_MODULE_PATH_AIX], +-[m4_require([_LT_DECL_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 "$lt_aix_libpath_sed"` +-fi],[]) +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +-])# _LT_SYS_MODULE_PATH_AIX +- +- +-# _LT_SHELL_INIT(ARG) +-# ------------------- +-m4_define([_LT_SHELL_INIT], +-[ifdef([AC_DIVERSION_NOTICE], +- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], +- [AC_DIVERT_PUSH(NOTICE)]) +-$1 +-AC_DIVERT_POP +-])# _LT_SHELL_INIT ++ ;; + ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; + +-# _LT_PROG_ECHO_BACKSLASH +-# ----------------------- +-# Add some code to the start of the generated configure script which +-# will find an echo command which doesn't interpret backslashes. +-m4_defun([_LT_PROG_ECHO_BACKSLASH], +-[_LT_SHELL_INIT([ +-# Check that we are running under the correct shell. +-SHELL=${CONFIG_SHELL-/bin/sh} ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; + +-case X$lt_ECHO in +-X*--fallback-echo) +- # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++rdos*) ++ dynamic_linker=no + ;; +-esac + +-ECHO=${lt_ECHO-echo} +-if test "X[$]1" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +-elif test "X[$]1" = X--fallback-echo; then +- # Avoid inline document here, it may be left over +- : +-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then +- # Yippee, $ECHO works! +- : +-else +- # Restart under the correct shell. +- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +-fi ++solaris*) ++ 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=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; + +-if test "X[$]1" = X--fallback-echo; then +- # used as fallback echo +- shift +- cat <<_LT_EOF +-[$]* +-_LT_EOF +- exit 0 +-fi ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; + +-# 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 ++sysv4 | sysv4.3*) ++ version_type=linux ++ 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 ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; + +-if test -z "$lt_ECHO"; then +- if test "X${echo_test_string+set}" != Xset; then +- # find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if { echo_test_string=`eval $cmd`; } 2>/dev/null && +- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null +- then +- break +- fi +- done ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH + fi ++ ;; + +- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && +- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ shlibpath_overrides_runpath=no + else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. +- +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do +- IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- ECHO="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ shlibpath_overrides_runpath=yes ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; + +- if test "X$ECHO" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && +- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- ECHO='print -r' +- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- ECHO='printf %s\n' +- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && +- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: ++uts4*) ++ version_type=linux ++ 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 ++ ;; + +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done ++*) ++ dynamic_linker=no ++ ;; ++esac ++AC_MSG_RESULT([$dynamic_linker]) ++test "$dynamic_linker" = no && can_build_shared=no + +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} +- else +- # Oops. We lost completely, so just stick with echo. +- ECHO=echo +- fi +- fi +- fi +- fi +- fi +-fi ++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], ++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) ++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], ++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) ++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +-# Copy echo and quote the copy suitably for passing to libtool from +-# the Makefile, instead of quoting the original, which is used later. +-lt_ECHO=$ECHO +-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi ++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + +-AC_SUBST(lt_ECHO) +-]) +-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +-_LT_DECL([], [ECHO], [1], +- [An echo program that does not interpret backslashes]) +-])# _LT_PROG_ECHO_BACKSLASH + ++# _LT_AC_TAGCONFIG ++# ---------------- ++AC_DEFUN([_LT_AC_TAGCONFIG], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_ARG_WITH([tags], ++ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], ++ [include additional configurations @<:@automatic@:>@])], ++ [tagnames="$withval"]) ++ ++if test -f "$ltmain" && test -n "$tagnames"; then ++ if test ! -f "${ofile}"; then ++ AC_MSG_WARN([output file `$ofile' does not exist]) ++ fi ++ ++ if test -z "$LTCC"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" ++ if test -z "$LTCC"; then ++ AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) ++ else ++ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) ++ fi ++ fi ++ if test -z "$LTCFLAGS"; then ++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" ++ fi + +-# _LT_ENABLE_LOCK +-# --------------- +-m4_defun([_LT_ENABLE_LOCK], +-[AC_ARG_ENABLE([libtool-lock], +- [AS_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ # Extract list of available tagged configurations in $ofile. ++ # Note that this assumes the entire list is on one line. ++ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case $host in +-ia64-*-hpux*) +- # 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.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for tagname in $tagnames; do ++ IFS="$lt_save_ifs" ++ # Check whether tagname contains only valid characters ++ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in ++ "") ;; ++ *) AC_MSG_ERROR([invalid tag name: $tagname]) ;; 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= -@@ -6126,7 +5900,7 @@ AC_MSG_CHECKING([for $compiler option to - ;; - esac +- fi +- rm -rf conftest* +- ;; +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac ++ ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null ++ then ++ AC_MSG_ERROR([tag name \"$tagname\" already exists]) + fi +- fi +- rm -rf conftest* +- ;; + +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +-s390*-*linux*|s390*-*tpf*|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" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac ++ # Update the list of available tags. ++ if test -n "$tagname"; then ++ echo appending configuration tag \"$tagname\" to $ofile ++ ++ case $tagname in ++ CXX) ++ if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_LIBTOOL_LANG_CXX_CONFIG ++ else ++ tagname="" ++ fi ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) +- *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" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*|s390*-*tpf*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac ++ ++ F77) ++ if test -n "$F77" && test "X$F77" != "Xno"; then ++ AC_LIBTOOL_LANG_F77_CONFIG ++ else ++ tagname="" ++ fi ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -6503,6 +6277,9 @@ ifelse([$1],[CXX],[ - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - ;; -+ 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' - ;; -@@ -6711,12 +6488,13 @@ EOF - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- esac +- fi +- rm -rf conftest* +- ;; + +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_LANG_PUSH(C) +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) +- AC_LANG_POP]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +-sparc*-*solaris*) +- # 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 +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then +- LD="${LD-ld} -64" ++ GCJ) ++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then ++ AC_LIBTOOL_LANG_GCJ_CONFIG ++ else ++ tagname="" fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; + ;; ++ ++ RC) ++ AC_LIBTOOL_LANG_RC_CONFIG ++ ;; ++ ++ *) ++ AC_MSG_ERROR([Unsupported tag name: $tagname]) ++ ;; + esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +-esac -- 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= -@@ -7147,7 +6925,7 @@ _LT_EOF - _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 -@@ -7464,1137 +7242,1209 @@ AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ - ])# _LT_AC_FILE_LTDLL_C - - --# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) --# --------------------------------- --AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -+# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -+# --------------------------------- -+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) -+ -+ -+# old names -+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -+ -+# This is just to silence aclocal about the macro not being used -+ifelse([AC_DISABLE_FAST_INSTALL]) -+ -+AC_DEFUN([LT_AC_PROG_GCJ], -+[AC_CHECK_TOOL(GCJ, gcj, no) -+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ AC_SUBST(GCJFLAGS) -+]) -+ -+AC_DEFUN([LT_AC_PROG_RC], -+[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 # -+# macro and use it instead. # -+# LT_AC_PROG_SED -+# -------------- -+# Check for a fully-functional sed program, that truncates -+# as few characters as possible. Prefer GNU sed if found. -+AC_DEFUN([LT_AC_PROG_SED], -+[AC_MSG_CHECKING([for a sed that does not truncate output]) -+AC_CACHE_VAL(lt_cv_path_SED, -+[# Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ 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 -+ 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 -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break -+ fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed +-need_locks="$enable_libtool_lock" +-])# _LT_ENABLE_LOCK ++ # Append the new tag name to the list of available tags. ++ if test -n "$tagname" ; then ++ available_tags="$available_tags $tagname" ++ fi + fi + done -+done -+]) -+SED=$lt_cv_path_SED -+AC_SUBST([SED]) -+AC_MSG_RESULT([$SED]) -+]) ++ IFS="$lt_save_ifs" + ++ # Now substitute the updated list of available tags. ++ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then ++ mv "${ofile}T" "$ofile" ++ chmod +x "$ofile" ++ else ++ rm -f "${ofile}T" ++ AC_MSG_ERROR([unable to update list of available tagged configurations.]) ++ fi ++fi ++])# _LT_AC_TAGCONFIG + +-# _LT_CMD_OLD_ARCHIVE +-# ------------------- +-m4_defun([_LT_CMD_OLD_ARCHIVE], +-[AC_CHECK_TOOL(AR, ar, false) +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-_LT_DECL([], [AR], [1], [The archiver]) +-_LT_DECL([], [AR_FLAGS], [1]) + +-AC_CHECK_TOOL(STRIP, strip, :) +-test -z "$STRIP" && STRIP=: +-_LT_DECL([], [STRIP], [1], [A symbol stripping program]) ++# AC_LIBTOOL_DLOPEN ++# ----------------- ++# enable checks for dlopen support ++AC_DEFUN([AC_LIBTOOL_DLOPEN], ++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_DLOPEN + +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-test -z "$RANLIB" && RANLIB=: +-_LT_DECL([], [RANLIB], [1], +- [Commands used to install an old-style archive]) + +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= ++# AC_LIBTOOL_WIN32_DLL ++# -------------------- ++# declare package support for building win32 DLLs ++AC_DEFUN([AC_LIBTOOL_WIN32_DLL], ++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) ++])# AC_LIBTOOL_WIN32_DLL + +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" +- ;; +- *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi +-_LT_DECL([], [old_postinstall_cmds], [2]) +-_LT_DECL([], [old_postuninstall_cmds], [2]) +-_LT_TAGDECL([], [old_archive_cmds], [2], +- [Commands used to build an old-style archive]) +-])# _LT_CMD_OLD_ARCHIVE +- +- +-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ---------------------------------------------------------------- +-# Check whether the given compiler option works +-AC_DEFUN([_LT_COMPILER_OPTION], +-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-m4_require([_LT_DECL_SED])dnl +-AC_CACHE_CHECK([$1], [$2], +- [$2=no +- m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) +- 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. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- 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. +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- fi +- $RM conftest* +-]) +- +-if test x"[$]$2" = xyes; then +- m4_if([$5], , :, [$5]) +-else +- m4_if([$6], , :, [$6]) +-fi +-])# _LT_COMPILER_OPTION +- +-# Old name: +-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) +- +- +-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ---------------------------------------------------- +-# Check whether the given linker option works +-AC_DEFUN([_LT_LINKER_OPTION], +-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-m4_require([_LT_DECL_SED])dnl +-AC_CACHE_CHECK([$1], [$2], +- [$2=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $3" +- 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 +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&AS_MESSAGE_LOG_FD +- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- $2=yes +- fi +- else +- $2=yes +- fi +- fi +- $RM -r conftest* +- LDFLAGS="$save_LDFLAGS" +-]) +- +-if test x"[$]$2" = xyes; then +- m4_if([$4], , :, [$4]) +-else +- m4_if([$5], , :, [$5]) +-fi +-])# _LT_LINKER_OPTION +- +-# Old name: +-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + ++# AC_ENABLE_SHARED([DEFAULT]) ++# --------------------------- ++# implement the --enable-shared flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_SHARED], ++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([shared], ++ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_shared=]AC_ENABLE_SHARED_DEFAULT) ++])# AC_ENABLE_SHARED + +-# LT_CMD_MAX_LEN +-#--------------- +-AC_DEFUN([LT_CMD_MAX_LEN], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-# find the maximum length of command line arguments +-AC_MSG_CHECKING([the maximum length of command line arguments]) +-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl +- i=0 +- teststring="ABCD" + +- case $build_os in +- msdosdjgpp*) +- # On DJGPP, this test can blow up pretty badly due to problems in libc +- # (any single argument exceeding 2000 bytes causes a buffer overrun +- # during glob expansion). Even if it were fixed, the result of this +- # check would be larger than it should be. +- lt_cv_sys_max_cmd_len=12288; # 12K is about right +- ;; ++# AC_DISABLE_SHARED ++# ----------------- ++# set the default shared flag to --disable-shared ++AC_DEFUN([AC_DISABLE_SHARED], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_SHARED(no) ++])# AC_DISABLE_SHARED + +- gnu*) +- # Under GNU Hurd, this test is not required because there is +- # no limit to the length of command line arguments. +- # Libtool will interpret -1 as no limit whatsoever +- lt_cv_sys_max_cmd_len=-1; +- ;; + +- cygwin* | mingw* | cegcc*) +- # On Win9x/ME, this test blows up -- it succeeds, but takes +- # about 5 minutes as the teststring grows exponentially. +- # Worse, since 9x/ME are not pre-emptively multitasking, +- # you end up with a "frozen" computer, even though with patience +- # the test eventually succeeds (with a max line length of 256k). +- # Instead, let's just punt: use the minimum linelength reported by +- # all of the supported platforms: 8192 (on NT/2K/XP). +- lt_cv_sys_max_cmd_len=8192; +- ;; ++# AC_ENABLE_STATIC([DEFAULT]) ++# --------------------------- ++# implement the --enable-static flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_STATIC], ++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([static], ++ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_static=]AC_ENABLE_STATIC_DEFAULT) ++])# AC_ENABLE_STATIC + +- amigaos*) +- # On AmigaOS with pdksh, this test takes hours, literally. +- # So we just punt and use a minimum line length of 8192. +- lt_cv_sys_max_cmd_len=8192; +- ;; + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) +- # This has been around since 386BSD, at least. Likely further. +- if test -x /sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +- elif test -x /usr/sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` +- else +- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs +- fi +- # And add a safety zone +- 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` +- ;; ++# AC_DISABLE_STATIC ++# ----------------- ++# set the default static flag to --disable-static ++AC_DEFUN([AC_DISABLE_STATIC], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_STATIC(no) ++])# AC_DISABLE_STATIC + +- interix*) +- # We know the value 262144 and hardcode it with a safety zone (like BSD) +- lt_cv_sys_max_cmd_len=196608 +- ;; + +- osf*) +- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure +- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +- # nice to cause kernel panics so lets avoid the loop below. +- # First set a reasonable default. +- lt_cv_sys_max_cmd_len=16384 +- # +- if test -x /sbin/sysconfig; then +- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in +- *1*) lt_cv_sys_max_cmd_len=-1 ;; +- esac +- fi +- ;; +- sco3.2v5*) +- lt_cv_sys_max_cmd_len=102400 +- ;; +- sysv5* | sco5v6* | sysv4.2uw2*) +- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` +- if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` +- else +- lt_cv_sys_max_cmd_len=32768 +- fi +- ;; +- *) +- 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 +- # Make teststring a little bigger before we do anything with it. +- # a 1K string should be a reasonable start. +- for i in 1 2 3 4 5 6 7 8 ; do +- teststring=$teststring$teststring +- done +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- # 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. +- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ +- = "XX$teststring$teststring"; } >/dev/null 2>&1 && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring ++# AC_ENABLE_FAST_INSTALL([DEFAULT]) ++# --------------------------------- ++# implement the --enable-fast-install flag ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++AC_DEFUN([AC_ENABLE_FAST_INSTALL], ++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl ++AC_ARG_ENABLE([fast-install], ++ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi + done +- # Only check the string length outside the loop. +- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` +- 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 +-]) +-if test -n $lt_cv_sys_max_cmd_len ; then +- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +-else +- AC_MSG_RESULT(none) +-fi +-max_cmd_len=$lt_cv_sys_max_cmd_len +-_LT_DECL([], [max_cmd_len], [0], +- [What is the maximum length of a command?]) +-])# LT_CMD_MAX_LEN ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) ++])# AC_ENABLE_FAST_INSTALL + +-# Old name: +-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + ++# AC_DISABLE_FAST_INSTALL ++# ----------------------- ++# set the default to --disable-fast-install ++AC_DEFUN([AC_DISABLE_FAST_INSTALL], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_ENABLE_FAST_INSTALL(no) ++])# AC_DISABLE_FAST_INSTALL + +-# _LT_HEADER_DLFCN +-# ---------------- +-m4_defun([_LT_HEADER_DLFCN], +-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +-])# _LT_HEADER_DLFCN + ++# AC_LIBTOOL_PICMODE([MODE]) ++# -------------------------- ++# implement the --with-pic flag ++# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++AC_DEFUN([AC_LIBTOOL_PICMODE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++pic_mode=ifelse($#,1,$1,default) ++])# AC_LIBTOOL_PICMODE + +-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# ---------------------------------------------------------------- +-m4_defun([_LT_TRY_DLOPEN_SELF], +-[m4_require([_LT_HEADER_DLFCN])dnl +-if test "$cross_compiling" = yes; then : +- [$4] +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext <<_LT_EOF +-[#line __oline__ "configure" +-#include "confdefs.h" + +-#if HAVE_DLFCN_H +-#include <dlfcn.h> +-#endif ++# AC_PROG_EGREP ++# ------------- ++# This is predefined starting with Autoconf 2.54, so this conditional ++# definition can be removed once we require Autoconf 2.54 or later. ++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], ++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], ++ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 ++ then ac_cv_prog_egrep='grep -E' ++ else ac_cv_prog_egrep='egrep' ++ fi]) ++ EGREP=$ac_cv_prog_egrep ++ AC_SUBST([EGREP]) ++])]) + +-#include <stdio.h> + +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif ++# AC_PATH_TOOL_PREFIX ++# ------------------- ++# 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]) ++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++[case $MAGIC_CMD in ++[[\\/*] | ?:[\\/]*]) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++dnl $ac_dummy forces splitting on constant user-supplied paths. ++dnl POSIX.2 word splitting is done only on the output of word expansions, ++dnl not every word. This closes a longstanding sh security hole. ++ ac_dummy="ifelse([$2], , $PATH, [$2])" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$1; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<EOF 1>&2 + +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org + +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; ++EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac]) ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ AC_MSG_RESULT($MAGIC_CMD) ++else ++ AC_MSG_RESULT(no) ++fi ++])# AC_PATH_TOOL_PREFIX + +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- else +- puts (dlerror ()); + +- return status; +-}] +-_LT_EOF +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) $1 ;; +- x$lt_dlneed_uscore) $2 ;; +- x$lt_dlunknown|x*) $3 ;; +- esac +- else : +- # compilation failed +- $3 ++# AC_PATH_MAGIC ++# ------------- ++# 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 ++ if test -n "$ac_tool_prefix"; then ++ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++ else ++ MAGIC_CMD=: + fi + fi +-rm -fr conftest* +-])# _LT_TRY_DLOPEN_SELF +- +- +-# LT_SYS_DLOPEN_SELF +-# ------------------ +-AC_DEFUN([LT_SYS_DLOPEN_SELF], +-[m4_require([_LT_HEADER_DLFCN])dnl +-if test "x$enable_dlopen" != xyes; then +- enable_dlopen=unknown +- enable_dlopen_self=unknown +- enable_dlopen_self_static=unknown +-else +- lt_cv_dlopen=no +- lt_cv_dlopen_libs= +- +- case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ;; +- +- mingw* | pw32* | cegcc*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= +- ;; ++])# AC_PATH_MAGIC + +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= +- ;; + +- darwin*) +- # if libdl is installed we need to link against it +- AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +- ]) ++# AC_PROG_LD ++# ---------- ++# find the pathname to the GNU or non-GNU linker ++AC_DEFUN([AC_PROG_LD], ++[AC_ARG_WITH([gnu-ld], ++ [AC_HELP_STRING([--with-gnu-ld], ++ [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++ [test "$withval" = no || with_gnu_ld=yes], ++ [with_gnu_ld=no]) ++AC_REQUIRE([LT_AC_PROG_SED])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ AC_MSG_CHECKING([for ld used by $CC]) ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [[\\/]]* | ?:[[\\/]]*) ++ re_direlt='/[[^/]][[^/]]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` ++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld + ;; +- + *) +- AC_CHECK_FUNC([shl_load], +- [lt_cv_dlopen="shl_load"], +- [AC_CHECK_LIB([dld], [shl_load], +- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], +- [AC_CHECK_FUNC([dlopen], +- [lt_cv_dlopen="dlopen"], +- [AC_CHECK_LIB([dl], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], +- [AC_CHECK_LIB([svld], [dlopen], +- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], +- [AC_CHECK_LIB([dld], [dld_link], +- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) +- ]) +- ]) +- ]) +- ]) +- ]) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown + ;; + esac ++elif test "$with_gnu_ld" = yes; then ++ AC_MSG_CHECKING([for GNU ld]) ++else ++ AC_MSG_CHECKING([for non-GNU ld]) ++fi ++AC_CACHE_VAL(lt_cv_path_LD, ++[if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in ++ *GNU* | *'with BFD'*) ++ test "$with_gnu_ld" != no && break ++ ;; ++ *) ++ test "$with_gnu_ld" != yes && break ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++else ++ lt_cv_path_LD="$LD" # Let the user override the test with a path. ++fi]) ++LD="$lt_cv_path_LD" ++if test -n "$LD"; then ++ AC_MSG_RESULT($LD) ++else ++ AC_MSG_RESULT(no) ++fi ++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) ++AC_PROG_LD_GNU ++])# AC_PROG_LD + +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes +- else +- enable_dlopen=no +- fi + +- case $lt_cv_dlopen in +- dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++# AC_PROG_LD_GNU ++# -------------- ++AC_DEFUN([AC_PROG_LD_GNU], ++[AC_REQUIRE([AC_PROG_EGREP])dnl ++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, ++[# I'd rather use --version here, but apparently some GNU lds only accept -v. ++case `$LD -v 2>&1 </dev/null` in ++*GNU* | *'with BFD'*) ++ lt_cv_prog_gnu_ld=yes ++ ;; ++*) ++ lt_cv_prog_gnu_ld=no ++ ;; ++esac]) ++with_gnu_ld=$lt_cv_prog_gnu_ld ++])# AC_PROG_LD_GNU + +- save_LDFLAGS="$LDFLAGS" +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" +- +- AC_CACHE_CHECK([whether a program can dlopen itself], +- lt_cv_dlopen_self, [dnl +- _LT_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, +- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) +- ]) +- +- if test "x$lt_cv_dlopen_self" = xyes; then +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], +- lt_cv_dlopen_self_static, [dnl +- _LT_TRY_DLOPEN_SELF( +- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, +- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) +- ]) ++# AC_PROG_LD_RELOAD_FLAG ++# ---------------------- ++# find reload flag for linker ++# -- PORTME Some linkers may need a different reload flag. ++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], ++[AC_CACHE_CHECK([for $LD option to reload object files], ++ lt_cv_ld_reload_flag, ++ [lt_cv_ld_reload_flag='-r']) ++reload_flag=$lt_cv_ld_reload_flag ++case $reload_flag in ++"" | " "*) ;; ++*) reload_flag=" $reload_flag" ;; ++esac ++reload_cmds='$LD$reload_flag -o $output$reload_objs' ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ else ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi +- +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" + ;; +- esac +- +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac ++esac ++])# AC_PROG_LD_RELOAD_FLAG + +- case $lt_cv_dlopen_self_static in +- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; +- *) enable_dlopen_self_static=unknown ;; +- esac +-fi +-_LT_DECL([dlopen_support], [enable_dlopen], [0], +- [Whether dlopen is supported]) +-_LT_DECL([dlopen_self], [enable_dlopen_self], [0], +- [Whether dlopen of programs is supported]) +-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], +- [Whether dlopen of statically linked programs is supported]) +-])# LT_SYS_DLOPEN_SELF +- +-# Old name: +-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + ++# AC_DEPLIBS_CHECK_METHOD ++# ----------------------- ++# 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 recognize dependent libraries], ++lt_cv_deplibs_check_method, ++[lt_cv_file_magic_cmd='$MAGIC_CMD' ++lt_cv_file_magic_test_file= ++lt_cv_deplibs_check_method='unknown' ++# Need to set the preceding variable on all platforms that support ++# interlibrary dependencies. ++# 'none' -- dependencies not supported. ++# `unknown' -- same as none, but documents that we really don't know. ++# 'pass_all' -- all dependencies passed with no checks. ++# 'test_compile' -- check by making test program. ++# 'file_magic [[regex]]' -- check by looking for files in library path ++# which responds to the $file_magic_cmd with a given extended regex. ++# If you have `file' or equivalent on your system and you're not sure ++# whether `pass_all' will *always* work, you probably want this one. + +-# _LT_COMPILER_C_O([TAGNAME]) +-# --------------------------- +-# Check to see if options -c and -o are simultaneously supported by compiler. +-# This macro does not hard code the compiler like AC_PROG_CC_C_O. +-m4_defun([_LT_COMPILER_C_O], +-[m4_require([_LT_DECL_SED])dnl +-m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-m4_require([_LT_TAG_COMPILER])dnl +-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], +- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], +- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no +- $RM -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++case $host_os in ++aix[[4-9]]*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&AS_MESSAGE_LOG_FD +- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- if (exit $ac_status) && test -s out/conftest2.$ac_objext +- then +- # The compiler can only warn and ignore the option if not recognized +- # So say no if there are warnings +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes +- fi +- fi +- chmod u+w . 2>&AS_MESSAGE_LOG_FD +- $RM conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files +- $RM out/* && rmdir out +- cd .. +- $RM -r conftest +- $RM conftest* +-]) +-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], +- [Does compiler simultaneously support -c and -o options?]) +-])# _LT_COMPILER_C_O ++beos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + ++bsdi[[45]]*) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' ++ lt_cv_file_magic_cmd='/usr/bin/file -L' ++ lt_cv_file_magic_test_file=/shlib/libc.so ++ ;; + +-# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +-# ---------------------------------- +-# Check to see if we can do hard links to lock some files if needed +-m4_defun([_LT_COMPILER_FILE_LOCKS], +-[m4_require([_LT_ENABLE_LOCK])dnl +-m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-_LT_COMPILER_C_O([$1]) ++cygwin*) ++ # func_win32_libid is a shell function defined in ltmain.sh ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ ;; + +-hard_links="nottested" +-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- AC_MSG_CHECKING([if we can lock with hard links]) +- hard_links=yes +- $RM conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- AC_MSG_RESULT([$hard_links]) +- if test "$hard_links" = no; then +- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) +- need_locks=warn ++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', ++ # 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 +-else +- need_locks=no +-fi +-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +-])# _LT_COMPILER_FILE_LOCKS +- +- +-# _LT_CHECK_OBJDIR +-# ---------------- +-m4_defun([_LT_CHECK_OBJDIR], +-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +-[rm -f .libs 2>/dev/null +-mkdir .libs 2>/dev/null +-if test -d .libs; then +- lt_cv_objdir=.libs +-else +- # MS-DOS does not allow filenames that begin with a dot. +- lt_cv_objdir=_libs +-fi +-rmdir .libs 2>/dev/null]) +-objdir=$lt_cv_objdir +-_LT_DECL([], [objdir], [0], +- [The name of the directory that contains temporary libtool files])dnl +-m4_pattern_allow([LT_OBJDIR])dnl +-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", +- [Define to the sub-directory in which libtool stores uninstalled libraries.]) +-])# _LT_CHECK_OBJDIR +- ++ ;; + +-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +-# -------------------------------------- +-# Check hardcoding attributes. +-m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +-[AC_MSG_CHECKING([how to hardcode library paths into programs]) +-_LT_TAGVAR(hardcode_action, $1)= +-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || +- test -n "$_LT_TAGVAR(runpath_var, $1)" || +- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++darwin* | rhapsody*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +- # We can hardcode non-existent directories. +- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then +- # Linking always hardcodes the temporary library directory. +- _LT_TAGVAR(hardcode_action, $1)=relink ++freebsd* | dragonfly*) ++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ case $host_cpu in ++ i*86 ) ++ # Not sure whether the presence of OpenBSD here was a mistake. ++ # Let's accept both of them until this is cleared up. ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ ;; ++ esac + else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_TAGVAR(hardcode_action, $1)=immediate ++ lt_cv_deplibs_check_method=pass_all + fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- _LT_TAGVAR(hardcode_action, $1)=unsupported +-fi +-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) +- +-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || +- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi +-_LT_TAGDECL([], [hardcode_action], [0], +- [How to hardcode a shared library path into an executable]) +-])# _LT_LINKER_HARDCODE_LIBPATH ++ ;; + ++gnu*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + +-# _LT_CMD_STRIPLIB +-# ---------------- +-m4_defun([_LT_CMD_STRIPLIB], +-[m4_require([_LT_DECL_EGREP]) +-striplib= +-old_striplib= +-AC_MSG_CHECKING([whether stripping libraries is possible]) +-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- AC_MSG_RESULT([yes]) +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- old_striplib="$STRIP -S" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- fi ++hpux10.20* | hpux11*) ++ lt_cv_file_magic_cmd=/usr/bin/file ++ case $host_cpu in ++ ia64*) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' ++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ ;; ++ hppa*64*) ++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) +- AC_MSG_RESULT([no]) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++ lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac +-fi +-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +-_LT_DECL([], [striplib], [1]) +-])# _LT_CMD_STRIPLIB ++ ;; + ++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)$' ++ ;; + +-# _LT_SYS_DYNAMIC_LINKER([TAG]) +-# ----------------------------- +-# PORTME Fill in your ld.so characteristics +-m4_defun([_LT_SYS_DYNAMIC_LINKER], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-m4_require([_LT_DECL_EGREP])dnl +-m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-m4_require([_LT_DECL_OBJDUMP])dnl +-m4_require([_LT_DECL_SED])dnl +-AC_MSG_CHECKING([dynamic linker characteristics]) +-m4_if([$1], +- [], [ +-if test "$GCC" = yes; then +- case $host_os in +- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; +- *) lt_awk_arg="/^libraries:/" ;; ++irix5* | irix6* | nonstopux*) ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; + 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. +- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ lt_cv_deplibs_check_method=pass_all ++ ;; + -+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -+# -+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++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 +- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + 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]) +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-need_lib_prefix=unknown +-hardcode_into_libs=no +- +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown ++ ;; + +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH ++newos6*) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=/usr/lib/libnls.so ++ ;; + +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' ++nto-qnx*) ++ lt_cv_deplibs_check_method=unknown + ;; + +-aix[[4-9]]*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then +- # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH ++openbsd*) ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else +- # With GCC up to 2.95.x, collect2 would create an import file +- # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in +- # development snapshots of GCC prior to 3.0. +- case $host_os in +- aix4 | aix4.[[01]] | aix4.[[01]].*) +- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; +- esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib<name>.so +- # instead of lib<name>.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' +- fi +- shlibpath_var=LIBPATH ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +-amigaos*) +- case $host_cpu in +- powerpc) +- # Since July 2007 AmigaOS4 officially supports .so libraries. +- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- ;; +- m68k) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' +- ;; +- esac ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH ++rdos*) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-bsdi[[45]]*) +- version_type=linux +- 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' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs ++solaris*) ++ lt_cv_deplibs_check_method=pass_all + ;; + +-cygwin* | mingw* | pw32* | cegcc*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no +- +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname~ +- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; +- fi' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $RM \$dlpath' +- shlibpath_overrides_runpath=yes +- +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw* | cegcc*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- 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 ';[c-zC-Z]:/' >/dev/null]; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- 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 +- ;; +- pw32*) +- # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- ;; +- esac ++sysv4 | sysv4.3*) ++ case $host_vendor in ++ motorola) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; +- +- *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ncr) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ sequent) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++ ;; ++ sni) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" ++ lt_cv_file_magic_test_file=/lib/libc.so ++ ;; ++ siemens) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all + ;; + esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH +- ;; +- +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +-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' + ;; + +-dgux*) +- 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 ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all + ;; ++esac ++]) ++file_magic_cmd=$lt_cv_file_magic_cmd ++deplibs_check_method=$lt_cv_deplibs_check_method ++test -z "$deplibs_check_method" && deplibs_check_method=unknown ++])# AC_DEPLIBS_CHECK_METHOD + +-freebsd1*) +- dynamic_linker=no +- ;; + +-freebsd* | dragonfly*) +- # DragonFly does not have aout. When/if they implement a new +- # versioning mechanism, adjust this. +- if test -x /usr/bin/objformat; then +- objformat=`/usr/bin/objformat` +- else +- case $host_os in +- freebsd[[123]]*) objformat=aout ;; +- *) objformat=elf ;; +- esac ++# AC_PROG_NM ++# ---------- ++# find the pathname to a BSD-compatible name lister ++AC_DEFUN([AC_PROG_NM], ++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, ++[if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" + fi +- version_type=freebsd-$objformat +- case $version_type in +- freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes +- ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.[[01]]* | freebsdelf3.[[01]]*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ +- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- *) # from 4.6 on, and DragonFly +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- esac +- ;; ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++fi]) ++NM="$lt_cv_path_NM" ++])# AC_PROG_NM + +-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 +- hardcode_into_libs=yes +- ;; + +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case $host_cpu in +- ia64*) +- shrext_cmds='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +- fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext_cmds='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' ++# AC_CHECK_LIBM ++# ------------- ++# check for math library ++AC_DEFUN([AC_CHECK_LIBM], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++LIBM= ++case $host in ++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++ # These system don't have libm, or don't need it + ;; +- +-interix[[3-9]]*) +- 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' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes ++*-ncr-sysv4.3*) ++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +- +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +- esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes ++*) ++ AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; ++esac ++])# AC_CHECK_LIBM + +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; + +-# This must be Linux ELF. +-linux* | k*bsd*-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' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- # Some binutils ld are patched to set DT_RUNPATH +- save_LDFLAGS=$LDFLAGS +- save_libdir=$libdir +- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ +- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], +- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], +- [shlibpath_overrides_runpath=yes])]) +- LDFLAGS=$save_LDFLAGS +- libdir=$save_libdir ++# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) ++# ----------------------------------- ++# sets LIBLTDL to the link flags for the libltdl convenience library and ++# LTDLINCL to the include flags for the libltdl header and adds ++# --enable-ltdl-convenience to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with ++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' ++# (note the single quotes!). If your package is not flat and you're not ++# using automake, define top_builddir and top_srcdir appropriately in ++# the Makefiles. ++AC_DEFUN([AC_LIBLTDL_CONVENIENCE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++ case $enable_ltdl_convenience in ++ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; ++ "") enable_ltdl_convenience=yes ++ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; ++ esac ++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_CONVENIENCE + +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. +- hardcode_into_libs=yes + +- # 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>/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" ++# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) ++# ----------------------------------- ++# sets LIBLTDL to the link flags for the libltdl installable library and ++# LTDLINCL to the include flags for the libltdl header and adds ++# --enable-ltdl-install to the configure arguments. Note that ++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, ++# and an installed libltdl is not found, it is assumed to be `libltdl'. ++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with ++# '${top_srcdir}/' (note the single quotes!). If your package is not ++# flat and you're not using automake, define top_builddir and top_srcdir ++# appropriately in the Makefiles. ++# In the future, this macro may have to be called after AC_PROG_LIBTOOL. ++AC_DEFUN([AC_LIBLTDL_INSTALLABLE], ++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++ AC_CHECK_LIB(ltdl, lt_dlinit, ++ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], ++ [if test x"$enable_ltdl_install" = xno; then ++ AC_MSG_WARN([libltdl not installed, but installation disabled]) ++ else ++ enable_ltdl_install=yes ++ fi ++ ]) ++ if test x"$enable_ltdl_install" = x"yes"; then ++ ac_configure_args="$ac_configure_args --enable-ltdl-install" ++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ++ else ++ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" ++ LIBLTDL="-lltdl" ++ LTDLINCL= + fi ++ # For backwards non-gettext consistent compatibility... ++ INCLTDL="$LTDLINCL" ++])# AC_LIBLTDL_INSTALLABLE + +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; + +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +- fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; ++# AC_LIBTOOL_CXX ++# -------------- ++# enable support for C++ libraries ++AC_DEFUN([AC_LIBTOOL_CXX], ++[AC_REQUIRE([_LT_AC_LANG_CXX]) ++])# AC_LIBTOOL_CXX + +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; + +-*nto* | *qnx*) +- version_type=qnx +- 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='ldqnx.so' +- ;; ++# _LT_AC_LANG_CXX ++# --------------- ++AC_DEFUN([_LT_AC_LANG_CXX], ++[AC_REQUIRE([AC_PROG_CXX]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) ++])# _LT_AC_LANG_CXX + +-openbsd*) +- version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" +- need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[[89]] | openbsd2.[[89]].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi +- ;; ++# _LT_AC_PROG_CXXCPP ++# ------------------ ++AC_DEFUN([_LT_AC_PROG_CXXCPP], ++[ ++AC_REQUIRE([AC_PROG_CXX]) ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_PROG_CXXCPP ++fi ++])# _LT_AC_PROG_CXXCPP + +-os2*) +- libname_spec='$name' +- shrext_cmds=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; ++# AC_LIBTOOL_F77 ++# -------------- ++# enable support for Fortran 77 libraries ++AC_DEFUN([AC_LIBTOOL_F77], ++[AC_REQUIRE([_LT_AC_LANG_F77]) ++])# AC_LIBTOOL_F77 + +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; + +-rdos*) +- dynamic_linker=no +- ;; ++# _LT_AC_LANG_F77 ++# --------------- ++AC_DEFUN([_LT_AC_LANG_F77], ++[AC_REQUIRE([AC_PROG_F77]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) ++])# _LT_AC_LANG_F77 + +-solaris*) +- 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=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; + +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; ++# AC_LIBTOOL_GCJ ++# -------------- ++# enable support for GCJ libraries ++AC_DEFUN([AC_LIBTOOL_GCJ], ++[AC_REQUIRE([_LT_AC_LANG_GCJ]) ++])# AC_LIBTOOL_GCJ + +-sysv4 | sysv4.3*) +- version_type=linux +- 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 +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; +- esac +- ;; + +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi +- ;; ++# _LT_AC_LANG_GCJ ++# --------------- ++AC_DEFUN([_LT_AC_LANG_GCJ], ++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], ++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], ++ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], ++ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], ++ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) ++])# _LT_AC_LANG_GCJ + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- version_type=freebsd-elf +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then +- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- else +- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- case $host_os in +- sco3.2v5*) +- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +- ;; +- esac +- fi +- sys_lib_dlsearch_path_spec='/usr/lib' +- ;; + +-tpf*) +- # TPF is a cross-target only. Preferred cross-host = GNU/Linux. +- 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}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; ++# AC_LIBTOOL_RC ++# ------------- ++# enable support for Windows resource files ++AC_DEFUN([AC_LIBTOOL_RC], ++[AC_REQUIRE([LT_AC_PROG_RC]) ++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) ++])# AC_LIBTOOL_RC + +-uts4*) +- version_type=linux +- 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 +- ;; + +-*) +- dynamic_linker=no ++# AC_LIBTOOL_LANG_C_CONFIG ++# ------------------------ ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) ++AC_DEFUN([_LT_AC_LANG_C_CONFIG], ++[lt_save_CC="$CC" ++AC_LANG_PUSH(C) ++ ++# Source file extension for C test sources. ++ac_ext=c ++ ++# Object file extension for compiled C test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++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);}' ++ ++_LT_AC_SYS_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++AC_LIBTOOL_SYS_LIB_STRIP ++AC_LIBTOOL_DLOPEN_SELF ++ ++# Report which library types will actually be built ++AC_MSG_CHECKING([if libtool supports shared libraries]) ++AC_MSG_RESULT([$can_build_shared]) ++ ++AC_MSG_CHECKING([whether to build shared libraries]) ++test "$can_build_shared" = "no" && enable_shared=no ++ ++# On AIX, shared libraries and static libraries use the same namespace, and ++# are all built from PIC. ++case $host_os in ++aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi + ;; ++ ++aix[[4-9]]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; + esac +-AC_MSG_RESULT([$dynamic_linker]) +-test "$dynamic_linker" = no && can_build_shared=no ++AC_MSG_RESULT([$enable_shared]) + +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi ++AC_MSG_CHECKING([whether to build static libraries]) ++# Make sure either enable_shared or enable_static is yes. ++test "$enable_shared" = yes || enable_static=yes ++AC_MSG_RESULT([$enable_static]) + +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-fi +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +-fi ++AC_LIBTOOL_CONFIG($1) + +-_LT_DECL([], [variables_saved_for_relink], [1], +- [Variables whose values should be saved in libtool wrapper scripts and +- restored at link time]) +-_LT_DECL([], [need_lib_prefix], [0], +- [Do we need the "lib" prefix for modules?]) +-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +-_LT_DECL([], [version_type], [0], [Library versioning type]) +-_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +-_LT_DECL([], [shlibpath_overrides_runpath], [0], +- [Is shlibpath searched before the hard-coded library search path?]) +-_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +-_LT_DECL([], [library_names_spec], [1], +- [[List of archive names. First name is the real one, the rest are links. +- The last name is the one that the linker finds with -lNAME]]) +-_LT_DECL([], [soname_spec], [1], +- [[The coded name of the library, if different from the real name]]) +-_LT_DECL([], [postinstall_cmds], [2], +- [Command to use after installation of a shared archive]) +-_LT_DECL([], [postuninstall_cmds], [2], +- [Command to use after uninstallation of a shared archive]) +-_LT_DECL([], [finish_cmds], [2], +- [Commands used to finish a libtool library installation in a directory]) +-_LT_DECL([], [finish_eval], [1], +- [[As "finish_cmds", except a single script fragment to be evaled but +- not shown]]) +-_LT_DECL([], [hardcode_into_libs], [0], +- [Whether we should hardcode library paths into libraries]) +-_LT_DECL([], [sys_lib_search_path_spec], [2], +- [Compile-time system search path for libraries]) +-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], +- [Run-time system search path for libraries]) +-])# _LT_SYS_DYNAMIC_LINKER ++AC_LANG_POP ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_C_CONFIG + + +-# _LT_PATH_TOOL_PREFIX(TOOL) ++# AC_LIBTOOL_LANG_CXX_CONFIG + # -------------------------- +-# find a file program which can recognize shared library +-AC_DEFUN([_LT_PATH_TOOL_PREFIX], +-[m4_require([_LT_DECL_EGREP])dnl +-AC_MSG_CHECKING([for $1]) +-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +-[case $MAGIC_CMD in +-[[\\/*] | ?:[\\/]*]) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. +- ;; +-*) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +-dnl $ac_dummy forces splitting on constant user-supplied paths. +-dnl POSIX.2 word splitting is done only on the output of word expansions, +-dnl not every word. This closes a longstanding sh security hole. +- ac_dummy="m4_if([$2], , $PATH, [$2])" +- for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$1; then +- lt_cv_path_MAGIC_CMD="$ac_dir/$1" +- if test -n "$file_magic_test_file"; then +- case $deplibs_check_method in +- "file_magic "*) +- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | +- $EGREP "$file_magic_regex" > /dev/null; then +- : +- else +- cat <<_LT_EOF 1>&2 +- +-*** Warning: the command libtool uses to detect shared libraries, +-*** $file_magic_cmd, produces output that libtool cannot recognize. +-*** The result is that libtool may fail to recognize shared libraries +-*** as such. This will affect the creation of libtool libraries that +-*** depend on shared libraries, but programs linked with such libtool +-*** libraries will work regardless of this problem. Nevertheless, you +-*** may want to report the problem to your system manager and/or to +-*** bug-libtool@gnu.org ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) ++AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], ++[AC_LANG_PUSH(C++) ++AC_REQUIRE([AC_PROG_CXX]) ++AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++ ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_AC_TAGVAR(allow_undefined_flag, $1)= ++_LT_AC_TAGVAR(always_export_symbols, $1)=no ++_LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_direct, $1)=no ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++_LT_AC_TAGVAR(hardcode_automatic, $1)=no ++_LT_AC_TAGVAR(module_cmds, $1)= ++_LT_AC_TAGVAR(module_expsym_cmds, $1)= ++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_AC_TAGVAR(no_undefined_flag, $1)= ++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +-_LT_EOF +- fi ;; +- esac +- fi +- break +- fi +- done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac]) +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +-if test -n "$MAGIC_CMD"; then +- AC_MSG_RESULT($MAGIC_CMD) +-else +- AC_MSG_RESULT(no) +-fi +-_LT_DECL([], [MAGIC_CMD], [0], +- [Used to examine libraries when file_magic_cmd begins with "file"])dnl +-])# _LT_PATH_TOOL_PREFIX ++# Dependencies to place before and after the object being linked: ++_LT_AC_TAGVAR(predep_objects, $1)= ++_LT_AC_TAGVAR(postdep_objects, $1)= ++_LT_AC_TAGVAR(predeps, $1)= ++_LT_AC_TAGVAR(postdeps, $1)= ++_LT_AC_TAGVAR(compiler_lib_search_path, $1)= ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= + +-# Old name: +-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) ++# Source file extension for C++ test sources. ++ac_ext=cpp + ++# Object file extension for compiled C++ test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +-# _LT_PATH_MAGIC +-# -------------- +-# find a file program which can recognize a shared library +-m4_defun([_LT_PATH_MAGIC], +-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +-if test -z "$lt_cv_path_MAGIC_CMD"; then +- if test -n "$ac_tool_prefix"; then +- _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) +- else +- MAGIC_CMD=: +- fi +-fi +-])# _LT_PATH_MAGIC ++# Code to be used in simple compile tests ++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); }' + +-# LT_PATH_LD +-# ---------- +-# find the pathname to the GNU or non-GNU linker +-AC_DEFUN([LT_PATH_LD], +-[AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-m4_require([_LT_DECL_SED])dnl +-m4_require([_LT_DECL_EGREP])dnl ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +-AC_ARG_WITH([gnu-ld], +- [AS_HELP_STRING([--with-gnu-ld], +- [assume the C compiler uses GNU ld @<:@default=no@:>@])], +- [test "$withval" = no || with_gnu_ld=yes], +- [with_gnu_ld=no])dnl ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- AC_MSG_CHECKING([for ld used by $CC]) +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [[\\/]]* | ?:[[\\/]]*) +- re_direlt='/[[^/]][[^/]]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` +- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- AC_MSG_CHECKING([for GNU ld]) ++# Allow CC to be a program name with arguments. ++lt_save_CC=$CC ++lt_save_LD=$LD ++lt_save_GCC=$GCC ++GCC=$GXX ++lt_save_with_gnu_ld=$with_gnu_ld ++lt_save_path_LD=$lt_cv_path_LD ++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else +- AC_MSG_CHECKING([for non-GNU ld]) ++ $as_unset lt_cv_prog_gnu_ld + fi +-AC_CACHE_VAL(lt_cv_path_LD, +-[if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- lt_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in +- *GNU* | *'with BFD'*) +- test "$with_gnu_ld" != no && break +- ;; +- *) +- test "$with_gnu_ld" != yes && break +- ;; +- esac +- fi +- done +- IFS="$lt_save_ifs" ++if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX + else +- lt_cv_path_LD="$LD" # Let the user override the test with a path. +-fi]) +-LD="$lt_cv_path_LD" +-if test -n "$LD"; then +- AC_MSG_RESULT($LD) ++ $as_unset lt_cv_path_LD ++fi ++test -z "${LDCXX+set}" || LD=$LDCXX ++CC=${CXX-"c++"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) ++ ++# We don't want -fno-exception wen compiling C++ code, so set the ++# no_builtin_flag separately ++if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else +- AC_MSG_RESULT(no) ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi +-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +-_LT_PATH_LD_GNU +-AC_SUBST([LD]) + +-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) +-])# LT_PATH_LD ++if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration + +-# Old names: +-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) +-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AM_PROG_LD], []) +-dnl AC_DEFUN([AC_PROG_LD], []) +- +- +-# _LT_PATH_LD_GNU +-#- -------------- +-m4_defun([_LT_PATH_LD_GNU], +-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, +-[# I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 </dev/null` in +-*GNU* | *'with BFD'*) +- lt_cv_prog_gnu_ld=yes +- ;; +-*) +- lt_cv_prog_gnu_ld=no +- ;; +-esac]) +-with_gnu_ld=$lt_cv_prog_gnu_ld +-])# _LT_PATH_LD_GNU ++ AC_PROG_LD + ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test "$with_gnu_ld" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + +-# _LT_CMD_RELOAD +-# -------------- +-# find reload flag for linker +-# -- PORTME Some linkers may need a different reload flag. +-m4_defun([_LT_CMD_RELOAD], +-[AC_CACHE_CHECK([for $LD option to reload object files], +- lt_cv_ld_reload_flag, +- [lt_cv_ld_reload_flag='-r']) +-reload_flag=$lt_cv_ld_reload_flag +-case $reload_flag in +-"" | " "*) ;; +-*) reload_flag=" $reload_flag" ;; +-esac +-reload_cmds='$LD$reload_flag -o $output$reload_objs' +-case $host_os in +- darwin*) +- if test "$GCC" = yes; then +- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' ++ ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ ++ grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else +- reload_cmds='$LD$reload_flag -o $output$reload_objs' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi +- ;; +-esac +-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl +-_LT_DECL([], [reload_cmds], [2])dnl +-])# _LT_CMD_RELOAD ++ else ++ with_gnu_ld=no ++ wlarc= + ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ fi + +-# _LT_CHECK_MAGIC_METHOD +-# ---------------------- +-# how to check for library dependencies +-# -- PORTME fill in with the dynamic library characteristics +-m4_defun([_LT_CHECK_MAGIC_METHOD], +-[m4_require([_LT_DECL_EGREP]) +-m4_require([_LT_DECL_OBJDUMP]) +-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= +-lt_cv_deplibs_check_method='unknown' +-# Need to set the preceding variable on all platforms that support +-# interlibrary dependencies. +-# 'none' -- dependencies not supported. +-# `unknown' -- same as none, but documents that we really don't know. +-# 'pass_all' -- all dependencies passed with no checks. +-# 'test_compile' -- check by making test program. +-# 'file_magic [[regex]]' -- check by looking for files in library path +-# which responds to the $file_magic_cmd with a given extended regex. +-# If you have `file' or equivalent on your system and you're not sure +-# whether `pass_all' will *always* work, you probably want this one. ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' ++ ++else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++fi + ++# PORTME: fill in a description of your system's C++ link characteristics ++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++_LT_AC_TAGVAR(ld_shlibs, $1)=yes + case $host_os in +-aix[[4-9]]*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ aix3*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aix[[4-9]]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ aix_use_runtimelinking=no + +-beos*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac + +-bsdi[[45]]*) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' +- lt_cv_file_magic_cmd='/usr/bin/file -L' +- lt_cv_file_magic_test_file=/shlib/libc.so +- ;; ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi + +-cygwin*) +- # func_win32_libid is a shell function defined in ltmain.sh +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='func_win32_libid' +- ;; ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +-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', +- # 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 +- ;; ++ if test "$GXX" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi + +-cegcc) +- # use the weaker test based on 'objdump'. See mingw*. +- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' +- lt_cv_file_magic_cmd='$OBJDUMP -f' +- ;; ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + +-darwin* | rhapsody*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; + +-freebsd* | dragonfly*) +- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then +- case $host_cpu in +- i*86 ) +- # Not sure whether the presence of OpenBSD here was a mistake. +- # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` +- ;; ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; + esac +- else +- lt_cv_deplibs_check_method=pass_all +- fi +- ;; ++ ;; + +-gnu*) +- lt_cv_deplibs_check_method=pass_all ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _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 ++ ++ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi + ;; ++ darwin* | rhapsody*) ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ if test "$GXX" = yes ; then ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi ++ else ++ 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` $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 $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}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++ ;; + +-hpux10.20* | hpux11*) +- lt_cv_file_magic_cmd=/usr/bin/file +- case $host_cpu in +- ia64*) +- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' +- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac + ;; +- hppa*64*) +- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] +- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ freebsd[[12]]*) ++ # C++ shared libraries reported to be fairly broken before switch to ELF ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- *) +- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' +- lt_cv_file_magic_test_file=/usr/lib/libc.sl ++ freebsd-elf*) ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; +- esac +- ;; +- +-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)$' +- ;; +- +-irix5* | irix6* | nonstopux*) +- case $LD in +- *-32|*"-32 ") libmagic=32-bit;; +- *-n32|*"-n32 ") libmagic=N32;; +- *-64|*"-64 ") libmagic=64-bit;; +- *) libmagic=never-match;; +- esac +- lt_cv_deplibs_check_method=pass_all +- ;; ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ ;; ++ gnu*) ++ ;; ++ hpux9*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# This must be Linux ELF. +-linux* | k*bsd*-gnu) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ case $host_cpu in ++ hppa*64*|ia64*) ;; ++ *) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac + +-netbsd*) +- 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 +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' +- fi +- ;; ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ 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' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _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' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++ fi ++ fi ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ esac ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc*) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + +-newos6*) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=/usr/lib/libnls.so +- ;; ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-*nto* | *qnx*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # 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*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ m88k*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ 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= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ openbsd*) ++ 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 ++ ;; ++ osf3*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +-openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' +- else +- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' +- fi +- ;; ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $rm $lib.exp' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +-osf3* | osf4* | osf5*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ else ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ psos*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes ++ _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)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # 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)='-z allextract$convenience -z defaultextract' ++ ;; ++ esac ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +-rdos*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ output_verbose_link_cmd='echo' + +-solaris*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ # 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' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- lt_cv_deplibs_check_method=pass_all +- ;; ++ # The C++ compiler must be used to create the archive. ++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++ if $CC --version | grep -v '^2\.7' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + +-sysv4 | sysv4.3*) +- case $host_vendor in +- motorola) +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" ++ 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 + ;; +- ncr) +- lt_cv_deplibs_check_method=pass_all ++ 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 ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac + ;; +- sequent) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ # So that behaviour is only enabled if SCOABSPATH is set to a ++ # non-empty value in the environment. Most likely only useful for ++ # creating official distributions of packages. ++ # This is a hack until libtool officially supports absolute path ++ # names for shared libraries. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac + ;; +- sni) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" +- lt_cv_file_magic_test_file=/lib/libc.so ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac + ;; +- siemens) +- lt_cv_deplibs_check_method=pass_all ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- pc) +- lt_cv_deplibs_check_method=pass_all ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +- esac +- ;; +- +-tpf*) +- lt_cv_deplibs_check_method=pass_all +- ;; + esac +-]) +-file_magic_cmd=$lt_cv_file_magic_cmd +-deplibs_check_method=$lt_cv_deplibs_check_method +-test -z "$deplibs_check_method" && deplibs_check_method=unknown ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +-_LT_DECL([], [deplibs_check_method], [1], +- [Method to check whether dependent libraries are shared objects]) +-_LT_DECL([], [file_magic_cmd], [1], +- [Command to use when deplibs_check_method == "file_magic"]) +-])# _LT_CHECK_MAGIC_METHOD ++_LT_AC_TAGVAR(GCC, $1)="$GXX" ++_LT_AC_TAGVAR(LD, $1)="$LD" + ++AC_LIBTOOL_POSTDEP_PREDEP($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +-# LT_PATH_NM +-# ---------- +-# find the pathname to a BSD- or MS-compatible name lister +-AC_DEFUN([LT_PATH_NM], +-[AC_REQUIRE([AC_PROG_CC])dnl +-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +-[if test -n "$NM"; then +- # Let the user override the test. +- lt_cv_path_NM="$NM" +-else +- lt_nm_to_check="${ac_tool_prefix}nm" +- 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 +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- tmp_nm="$ac_dir/$lt_tmp_nm" +- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- # Tru64's nm complains that /dev/null is an invalid object file +- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in +- */dev/null* | *'Invalid file or object type'*) +- lt_cv_path_NM="$tmp_nm -B" +- break +- ;; +- *) +- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in +- */dev/null*) +- lt_cv_path_NM="$tmp_nm -p" +- break +- ;; +- *) +- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags +- ;; +- esac +- ;; +- esac +- fi +- done +- IFS="$lt_save_ifs" +- done +- : ${lt_cv_path_NM=no} +-fi]) +-if test "$lt_cv_path_NM" != "no"; then +- NM="$lt_cv_path_NM" ++AC_LIBTOOL_CONFIG($1) ++ ++AC_LANG_POP ++CC=$lt_save_CC ++LDCXX=$LD ++LD=$lt_save_LD ++GCC=$lt_save_GCC ++with_gnu_ldcxx=$with_gnu_ld ++with_gnu_ld=$lt_save_with_gnu_ld ++lt_cv_path_LDCXX=$lt_cv_path_LD ++lt_cv_path_LD=$lt_save_path_LD ++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++])# AC_LIBTOOL_LANG_CXX_CONFIG ++ ++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) ++# ------------------------------------ ++# Figure out "hidden" library dependencies from verbose ++# compiler output when linking a shared library. ++# Parse the compiler output and extract the necessary ++# objects, libraries and library flags. ++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], ++[AC_REQUIRE([LT_AC_PROG_SED])dnl ++dnl we can't use the lt_simple_compile_test_code here, ++dnl because it contains code intended for an executable, ++dnl not a library. It's possible we should let each ++dnl tag define a new lt_????_link_test_code variable, ++dnl but it's only used here... ++ifelse([$1],[],[cat > conftest.$ac_ext <<EOF ++int a; ++void foo (void) { a = 0; } ++EOF ++],[$1],[CXX],[cat > conftest.$ac_ext <<EOF ++class Foo ++{ ++public: ++ Foo (void) { a = 0; } ++private: ++ int a; ++}; ++EOF ++],[$1],[F77],[cat > conftest.$ac_ext <<EOF ++ subroutine foo ++ implicit none ++ integer*4 a ++ a=0 ++ return ++ end ++EOF ++],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF ++public class foo { ++ private int a; ++ public void bar (void) { ++ a = 0; ++ } ++}; ++EOF ++]) ++dnl Parse the compiler output and extract the necessary ++dnl objects, libraries and library flags. ++if AC_TRY_EVAL(ac_compile); then ++ # Parse the compiler output and extract the necessary ++ # objects, libraries and library flags. ++ ++ # Sentinel used to keep track of whether or not we are before ++ # the conftest object file. ++ pre_test_object_deps_done=no ++ ++ # The `*' in the case matches for architectures that use `case' in ++ # $output_verbose_cmd can trigger glob expansion during the loop ++ # eval without this substitution. ++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` ++ ++ for p in `eval $output_verbose_link_cmd`; do ++ case $p in ++ ++ -L* | -R* | -l*) ++ # Some compilers place space between "-{L,R}" and the path. ++ # Remove the space. ++ if test $p = "-L" \ ++ || test $p = "-R"; then ++ prev=$p ++ continue ++ else ++ prev= ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ case $p in ++ -L* | -R*) ++ # Internal compiler library paths should come after those ++ # provided the user. The postdeps already come after the ++ # user supplied libs so there is no need to process them. ++ if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" ++ else ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" ++ fi ++ ;; ++ # The "-l" case would never come before the object being ++ # linked, so don't bother handling this case. ++ esac ++ else ++ if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then ++ _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" ++ else ++ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" ++ fi ++ fi ++ ;; ++ ++ *.$objext) ++ # This assumes that the test object file only shows up ++ # once in the compiler output. ++ if test "$p" = "conftest.$objext"; then ++ pre_test_object_deps_done=yes ++ continue ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then ++ _LT_AC_TAGVAR(predep_objects, $1)="$p" ++ else ++ _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" ++ fi ++ else ++ if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then ++ _LT_AC_TAGVAR(postdep_objects, $1)="$p" ++ else ++ _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" ++ fi ++ fi ++ ;; ++ ++ *) ;; # Ignore the rest. ++ ++ esac ++ done ++ ++ # Clean up. ++ rm -f a.out a.exe + else +- # Didn't find any BSD compatible name lister, look for dumpbin. +- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) +- AC_SUBST([DUMPBIN]) +- if test "$DUMPBIN" != ":"; then +- NM="$DUMPBIN" +- fi ++ echo "libtool.m4: error: problem compiling $1 test program" + fi +-test -z "$NM" && NM=nm +-AC_SUBST([NM]) +-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + +-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], +- [lt_cv_nm_interface="BSD nm" +- echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) +- (eval "$ac_compile" 2>conftest.err) +- cat conftest.err >&AS_MESSAGE_LOG_FD +- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) +- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) +- cat conftest.err >&AS_MESSAGE_LOG_FD +- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) +- cat conftest.out >&AS_MESSAGE_LOG_FD +- if $GREP 'External.*some_variable' conftest.out > /dev/null; then +- lt_cv_nm_interface="MS dumpbin" +- fi +- rm -f conftest*]) +-])# LT_PATH_NM +- +-# Old names: +-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AM_PROG_NM], []) +-dnl AC_DEFUN([AC_PROG_NM], []) ++$rm -f confest.$objext + ++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= ++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi + +-# LT_LIB_M +-# -------- +-# check for math library +-AC_DEFUN([LT_LIB_M], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-LIBM= +-case $host in +-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +- # These system don't have libm, or don't need it ++# PORTME: override above test on systems where it is broken ++ifelse([$1],[CXX], ++[case $host_os in ++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)= ++ _LT_AC_TAGVAR(postdep_objects,$1)= ++ _LT_AC_TAGVAR(postdeps,$1)= + ;; +-*-ncr-sysv4.3*) +- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") +- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ++ ++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 + ;; +-*) +- AC_CHECK_LIB(m, cos, LIBM="-lm") ++ ++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. ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac + ;; + esac +-AC_SUBST([LIBM]) +-])# LT_LIB_M ++]) ++case " $_LT_AC_TAGVAR(postdeps, $1) " in ++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; ++esac ++])# AC_LIBTOOL_POSTDEP_PREDEP + +-# Old name: +-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_CHECK_LIBM], []) ++# AC_LIBTOOL_LANG_F77_CONFIG ++# -------------------------- ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) ++AC_DEFUN([_LT_AC_LANG_F77_CONFIG], ++[AC_REQUIRE([AC_PROG_F77]) ++AC_LANG_PUSH(Fortran 77) + ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_AC_TAGVAR(allow_undefined_flag, $1)= ++_LT_AC_TAGVAR(always_export_symbols, $1)=no ++_LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_direct, $1)=no ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++_LT_AC_TAGVAR(hardcode_automatic, $1)=no ++_LT_AC_TAGVAR(module_cmds, $1)= ++_LT_AC_TAGVAR(module_expsym_cmds, $1)= ++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_AC_TAGVAR(no_undefined_flag, $1)= ++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +-# _LT_COMPILER_NO_RTTI([TAGNAME]) +-# ------------------------------- +-m4_defun([_LT_COMPILER_NO_RTTI], +-[m4_require([_LT_TAG_COMPILER])dnl ++# Source file extension for f77 test sources. ++ac_ext=f + +-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++# Object file extension for compiled f77 test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +-if test "$GCC" = yes; then +- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" + +- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], +- lt_cv_prog_compiler_rtti_exceptions, +- [-fno-rtti -fno-exceptions], [], +- [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +-fi +-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], +- [Compiler flag to turn off builtin functions]) +-])# _LT_COMPILER_NO_RTTI ++# Code to be used in simple link tests ++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 + +-# _LT_CMD_GLOBAL_SYMBOLS +-# ---------------------- +-m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([LT_PATH_NM])dnl +-AC_REQUIRE([LT_PATH_LD])dnl +-m4_require([_LT_DECL_SED])dnl +-m4_require([_LT_DECL_EGREP])dnl +-m4_require([_LT_TAG_COMPILER])dnl ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +-# Check for command to grab the raw symbol name followed by C symbol from nm. +-AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +-[ +-# These are sane defaults that work on at least a few old systems. +-# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${F77-"f77"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + +-# Character class describing NM global symbol codes. +-symcode='[[BCDEGRST]]' ++AC_MSG_CHECKING([if libtool supports shared libraries]) ++AC_MSG_RESULT([$can_build_shared]) + +-# Regexp to match symbols that can be accessed directly from C. +-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' ++AC_MSG_CHECKING([whether to build shared libraries]) ++test "$can_build_shared" = "no" && enable_shared=no + +-# Define system-specific variables. ++# On AIX, shared libraries and static libraries use the same namespace, and ++# are all built from PIC. + case $host_os in +-aix*) +- symcode='[[BCDT]]' +- ;; +-cygwin* | mingw* | pw32* | cegcc*) +- symcode='[[ABCDGISTW]]' +- ;; +-hpux*) +- if test "$host_cpu" = ia64; then +- symcode='[[ABCDEGRST]]' ++aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' + fi + ;; +-irix* | nonstopux*) +- symcode='[[BCDEGRST]]' +- ;; +-osf*) +- symcode='[[BCDEGQRST]]' +- ;; +-solaris*) +- symcode='[[BDRT]]' +- ;; +-sco3.2v5*) +- symcode='[[DT]]' +- ;; +-sysv4.2uw2*) +- symcode='[[DT]]' +- ;; +-sysv5* | sco5v6* | unixware* | OpenUNIX*) +- symcode='[[ABDT]]' +- ;; +-sysv4) +- symcode='[[DFNSTU]]' ++aix[[4-9]]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi + ;; + esac ++AC_MSG_RESULT([$enable_shared]) + +-# If we're using GNU nm, then use its standard symbol codes. +-case `$NM -V 2>&1` in +-*GNU* | *'with BFD'*) +- symcode='[[ABCDGIRSTW]]' ;; +-esac ++AC_MSG_CHECKING([whether to build static libraries]) ++# Make sure either enable_shared or enable_static is yes. ++test "$enable_shared" = yes || enable_static=yes ++AC_MSG_RESULT([$enable_static]) ++ ++_LT_AC_TAGVAR(GCC, $1)="$G77" ++_LT_AC_TAGVAR(LD, $1)="$LD" ++ ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +-# Transform an extracted symbol line into a proper C declaration. +-# Some systems (esp. on ia64) link data and code symbols differently, +-# so use this general approach. +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++AC_LIBTOOL_CONFIG($1) + +-# Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++AC_LANG_POP ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_F77_CONFIG + +-# Handle CRLF in mingw tool chain +-opt_cr= +-case $build_os in +-mingw*) +- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp +- ;; +-esac + +-# Try without a prefix underscore, then with it. +-for ac_symprfx in "" "_"; do ++# AC_LIBTOOL_LANG_GCJ_CONFIG ++# -------------------------- ++# Ensure that the configuration vars for the C compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) ++AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], ++[AC_LANG_SAVE + +- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. +- symxfrm="\\1 $ac_symprfx\\2 \\2" ++# Source file extension for Java test sources. ++ac_ext=java + +- # Write the raw and C identifiers. +- if test "$lt_cv_nm_interface" = "MS dumpbin"; then +- # Fake it for dumpbin and say T for any non-static function +- # and D for any global variable. +- # Also find C++ and __fastcall symbols from MSVC++, +- # which start with @ or ?. +- lt_cv_sys_global_symbol_pipe="$AWK ['"\ +-" {last_section=section; section=\$ 3};"\ +-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +-" \$ 0!~/External *\|/{next};"\ +-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +-" {if(hide[section]) next};"\ +-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +-" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +-" ' prfx=^$ac_symprfx]" +- else +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" +- fi ++# Object file extension for compiled Java test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +- # Check to see that the pipe works correctly. +- pipe_works=no ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="class foo {}" + +- rm -f conftest* +- cat > conftest.$ac_ext <<_LT_EOF +-#ifdef __cplusplus +-extern "C" { +-#endif +-char nm_test_var; +-void nm_test_func(void); +-void nm_test_func(void){} +-#ifdef __cplusplus +-} +-#endif +-int main(){nm_test_var='a';nm_test_func();return(0);} +-_LT_EOF ++# Code to be used in simple link tests ++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +- if AC_TRY_EVAL(ac_compile); then +- # Now try to grab the symbols. +- nlist=conftest.nm +- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then +- # Try sorting and uniquifying the output. +- if sort "$nlist" | uniq > "$nlist"T; then +- mv -f "$nlist"T "$nlist" +- else +- rm -f "$nlist"T +- fi ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER + +- # Make sure that we snagged all the symbols we need. +- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then +- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then +- cat <<_LT_EOF > conftest.$ac_ext +-#ifdef __cplusplus +-extern "C" { +-#endif ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +-_LT_EOF +- # Now generate the symbol file. +- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${GCJ-"gcj"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) + +- cat <<_LT_EOF >> conftest.$ac_ext ++# GCJ did not exist at the time GCC didn't implicitly link libc in. ++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + +-/* The mapping between symbol names and symbols. */ +-const struct { +- const char *name; +- void *address; +-} +-lt__PROGRAM__LTX_preloaded_symbols[[]] = +-{ +- { "@PROGRAM@", (void *) 0 }, +-_LT_EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext +- cat <<\_LT_EOF >> conftest.$ac_ext +- {0, (void *) 0} +-}; ++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds + +-/* This works around a problem in FreeBSD linker */ +-#ifdef FREEBSD_WORKAROUND +-static const void *lt_preloaded_setup() { +- return lt__PROGRAM__LTX_preloaded_symbols; +-} +-#endif ++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) ++AC_LIBTOOL_PROG_COMPILER_PIC($1) ++AC_LIBTOOL_PROG_CC_C_O($1) ++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) ++AC_LIBTOOL_PROG_LD_SHLIBS($1) ++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) ++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +-#ifdef __cplusplus +-} +-#endif +-_LT_EOF +- # Now try linking the two files. +- mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" +- LIBS="conftstm.$ac_objext" +- CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then +- pipe_works=yes +- fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" +- else +- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD +- cat conftest.$ac_ext >&5 +- fi +- rm -rf conftest* conftst* ++AC_LIBTOOL_CONFIG($1) + +- # Do not use the global_symbol_pipe unless it works. +- if test "$pipe_works" = yes; then +- break +- else +- lt_cv_sys_global_symbol_pipe= +- fi +-done +-]) +-if test -z "$lt_cv_sys_global_symbol_pipe"; then +- lt_cv_sys_global_symbol_to_cdecl= +-fi +-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- AC_MSG_RESULT(failed) +-else +- AC_MSG_RESULT(ok) +-fi ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_GCJ_CONFIG + +-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], +- [Take the output of nm and produce a listing of raw symbols and C names]) +-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], +- [Transform the output of nm in a proper C declaration]) +-_LT_DECL([global_symbol_to_c_name_address], +- [lt_cv_sys_global_symbol_to_c_name_address], [1], +- [Transform the output of nm in a C name address pair]) +-_LT_DECL([global_symbol_to_c_name_address_lib_prefix], +- [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], +- [Transform the output of nm in a C name address pair when lib prefix is needed]) +-]) # _LT_CMD_GLOBAL_SYMBOLS + ++# AC_LIBTOOL_LANG_RC_CONFIG ++# ------------------------- ++# Ensure that the configuration vars for the Windows resource compiler are ++# suitably defined. Those variables are subsequently used by ++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. ++AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) ++AC_DEFUN([_LT_AC_LANG_RC_CONFIG], ++[AC_LANG_SAVE + +-# _LT_COMPILER_PIC([TAGNAME]) +-# --------------------------- +-m4_defun([_LT_COMPILER_PIC], +-[m4_require([_LT_TAG_COMPILER])dnl +-_LT_TAGVAR(lt_prog_compiler_wl, $1)= +-_LT_TAGVAR(lt_prog_compiler_pic, $1)= +-_LT_TAGVAR(lt_prog_compiler_static, $1)= ++# Source file extension for RC test sources. ++ac_ext=rc + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) +-m4_if([$1], [CXX], [ +- # C++ specific cases for pic, static, wl, etc. +- if test "$GXX" = yes; then +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++# Object file extension for compiled RC test sources. ++objext=o ++_LT_AC_TAGVAR(objext, $1)=$objext + +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- fi +- ;; ++# Code to be used in simple compile tests ++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +- amigaos*) +- case $host_cpu in +- powerpc) +- # see comment about AmigaOS4 .so support +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- m68k) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' +- ;; +- esac +- ;; ++# Code to be used in simple link tests ++lt_simple_link_test_code="$lt_simple_compile_test_code" + +- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; +- mingw* | cygwin* | os2* | pw32* | cegcc*) +- # 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 +- m4_if([$1], [GCJ], [], +- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) +- ;; +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' +- ;; +- *djgpp*) +- # DJGPP does not support shared libraries at all +- _LT_TAGVAR(lt_prog_compiler_pic, $1)= +- ;; +- interix[[3-9]]*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. +- ;; +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +- fi +- ;; +- hpux*) +- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit +- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag +- # sets the default TLS model and affects inlining. +- case $host_cpu in +- hppa*64*) +- ;; +- *) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- ;; +- *qnx* | *nto*) +- # QNX uses GNU C++, but need to define -shared option too, otherwise +- # it will coredump. +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_AC_SYS_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++CC=${RC-"windres"} ++compiler=$CC ++_LT_AC_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) ++_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ ++AC_LIBTOOL_CONFIG($1) ++ ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# AC_LIBTOOL_LANG_RC_CONFIG ++ ++ ++# AC_LIBTOOL_CONFIG([TAGNAME]) ++# ---------------------------- ++# If TAGNAME is not passed, then create an initial libtool script ++# with a default configuration from the untagged config vars. Otherwise ++# add code to config.status for appending the configuration named by ++# TAGNAME from the matching tagged config vars. ++AC_DEFUN([AC_LIBTOOL_CONFIG], ++[# The else clause should only fire when bootstrapping the ++# libtool distribution, otherwise you forgot to ship ltmain.sh ++# with your package, and you will get complaints that there are ++# no rules to generate ltmain.sh. ++if test -f "$ltmain"; then ++ # 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 ++ setopt NO_GLOB_SUBST ++ fi ++ # Now quote all the things that may contain metacharacters while being ++ # careful not to overquote the AC_SUBSTed values. We take copies of the ++ # variables and quote the copies for generation of the libtool script. ++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ ++ SED SHELL STRIP \ ++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ ++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ ++ deplibs_check_method reload_flag reload_cmds need_locks \ ++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ ++ lt_cv_sys_global_symbol_to_c_name_address \ ++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ ++ old_postinstall_cmds old_postuninstall_cmds \ ++ _LT_AC_TAGVAR(compiler, $1) \ ++ _LT_AC_TAGVAR(CC, $1) \ ++ _LT_AC_TAGVAR(LD, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ ++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ ++ _LT_AC_TAGVAR(old_archive_cmds, $1) \ ++ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ ++ _LT_AC_TAGVAR(predep_objects, $1) \ ++ _LT_AC_TAGVAR(postdep_objects, $1) \ ++ _LT_AC_TAGVAR(predeps, $1) \ ++ _LT_AC_TAGVAR(postdeps, $1) \ ++ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ ++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ ++ _LT_AC_TAGVAR(archive_cmds, $1) \ ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ ++ _LT_AC_TAGVAR(postinstall_cmds, $1) \ ++ _LT_AC_TAGVAR(postuninstall_cmds, $1) \ ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ ++ _LT_AC_TAGVAR(allow_undefined_flag, $1) \ ++ _LT_AC_TAGVAR(no_undefined_flag, $1) \ ++ _LT_AC_TAGVAR(export_symbols_cmds, $1) \ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ ++ _LT_AC_TAGVAR(hardcode_automatic, $1) \ ++ _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 ++ ++ case $var in ++ _LT_AC_TAGVAR(old_archive_cmds, $1) | \ ++ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ ++ _LT_AC_TAGVAR(archive_cmds, $1) | \ ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ ++ _LT_AC_TAGVAR(module_cmds, $1) | \ ++ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ ++ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ ++ extract_expsyms_cmds | reload_cmds | finish_cmds | \ ++ postinstall_cmds | postuninstall_cmds | \ ++ old_postinstall_cmds | old_postuninstall_cmds | \ ++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) ++ # Double-quote double-evaled strings. ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac +- else +- case $host_os in +- aix[[4-9]]*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- else +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- chorus*) +- case $cc_basename in +- cxch68*) +- # Green Hills C++ Compiler +- # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" +- ;; +- esac +- ;; +- dgux*) +- case $cc_basename in +- ec++*) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- *) +- ;; +- esac +- ;; +- freebsd* | dragonfly*) +- # FreeBSD uses GNU C++ +- ;; +- hpux9* | hpux10* | hpux11*) +- case $cc_basename in +- CC*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +- if test "$host_cpu" != ia64; then +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- fi +- ;; +- aCC*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- ;; +- esac +- ;; +- *) +- ;; +- esac +- ;; +- interix*) +- # This is c89, which is MS Visual C++ (no shared libs) +- # Anyone wants to do a port? +- ;; +- irix5* | irix6* | nonstopux*) +- case $cc_basename in +- CC*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- # CC pic flag -KPIC is the default. +- ;; +- *) +- ;; +- esac +- ;; +- linux* | k*bsd*-gnu) +- case $cc_basename in +- KCC*) +- # KAI C++ Compiler +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- ecpc* ) +- # old Intel C++ for x86_64 which still supported -KPIC. +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' +- ;; +- icpc* ) +- # Intel C++, used to be incompatible with GCC. +- # ICC 10 doesn't accept -KPIC any more. +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' +- ;; +- pgCC* | pgcpp*) +- # Portland Group C++ compiler +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- cxx*) +- # Compaq C++ +- # Make sure the PIC flag is empty. It appears that all Alpha +- # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- xlc* | xlC*) +- # IBM XL 8.0 on PPC +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' +- ;; +- *) +- case `$CC -V 2>&1 | sed 5q` in +- *Sun\ C*) +- # Sun C++ 5.9 +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- ;; +- esac +- ;; +- esac +- ;; +- lynxos*) +- ;; +- m88k*) +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' +- ;; +- *) +- ;; +- esac +- ;; +- netbsd*) +- ;; +- *qnx* | *nto*) +- # QNX uses GNU C++, but need to define -shared option too, otherwise +- # it will coredump. +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' +- ;; +- osf3* | osf4* | osf5*) +- case $cc_basename in +- KCC*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- cxx*) +- # Digital/Compaq C++ +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # Make sure the PIC flag is empty. It appears that all Alpha +- # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- *) +- ;; +- esac +- ;; +- psos*) +- ;; +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- ;; +- *) +- ;; +- esac +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- lcc*) +- # Lucid +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- *) +- ;; +- esac +- ;; +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- case $cc_basename in +- CC*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- ;; +- *) +- ;; +- esac +- ;; +- vxworks*) +- ;; +- *) +- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; +- esac +- fi +-], +-[ +- if test "$GCC" = yes; then +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ done + +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- fi +- ;; ++ case $lt_echo in ++ *'\[$]0 --fallback-echo"') ++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` ++ ;; ++ esac + +- amigaos*) +- case $host_cpu in +- powerpc) +- # see comment about AmigaOS4 .so support +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- m68k) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' +- ;; +- esac +- ;; ++ifelse([$1], [], ++ [cfgfile="${ofile}T" ++ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 ++ $rm -f "$cfgfile" ++ AC_MSG_NOTICE([creating $ofile])], ++ [cfgfile="$ofile"]) + +- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; ++ cat <<__EOF__ >> "$cfgfile" ++ifelse([$1], [], ++[#! $SHELL + +- mingw* | cygwin* | pw32* | os2* | cegcc*) +- # 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 +- m4_if([$1], [GCJ], [], +- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) +- ;; ++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is part of GNU Libtool: ++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by @@ -1814,200 +9766,4293 @@ Index: gtk+-2.14.4/aclocal.m4 +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -+ -+# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -+# ---------------------------------- -+AC_DEFUN([PKG_PROG_PKG_CONFIG], -+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=m4_default([$1], [0.9.0]) -+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ PKG_CONFIG="" -+ fi -+ -+fi[]dnl -+])# PKG_PROG_PKG_CONFIG -+ -+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# -+# Check to see whether a particular set of modules exists. Similar -+# to PKG_CHECK_MODULES(), but does not set variables or print errors. -+# -+# -+# Similar to PKG_CHECK_MODULES, make sure that the first instance of -+# this or PKG_CHECK_MODULES is called, or make sure to call -+# PKG_CHECK_EXISTS manually -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_EXISTS], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+if test -n "$PKG_CONFIG" && \ -+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -+ m4_ifval([$2], [$2], [:]) -+m4_ifvaln([$3], [else -+ $3])dnl -+fi]) -+ -+ -+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -+# --------------------------------------------- -+m4_define([_PKG_CONFIG], -+[if test -n "$PKG_CONFIG"; then -+ if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" -+ else -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -+ [pkg_failed=yes]) -+ fi -+else -+ pkg_failed=untried -+fi[]dnl -+])# _PKG_CONFIG -+ -+# _PKG_SHORT_ERRORS_SUPPORTED -+# ----------------------------- -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])# _PKG_SHORT_ERRORS_SUPPORTED -+ -+ -+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+# [ACTION-IF-NOT-FOUND]) -+# -+# -+# Note that if there is a possibility the first call to -+# PKG_CHECK_MODULES might not happen, you should be sure to include an -+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -+# -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_MODULES], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -+ -+pkg_failed=no -+AC_MSG_CHECKING([for $1]) -+ -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' +- ;; ++# A sed program that does not truncate output. ++SED=$lt_SED --# old names --AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) --AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) --AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) --AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) --AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) --AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) --AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -+if test $pkg_failed = yes; then -+ _PKG_SHORT_ERRORS_SUPPORTED -+ if test $_pkg_short_errors_supported = yes; then -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` -+ else -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +- hpux*) +- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit +- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag +- # sets the default TLS model and affects inlining. +- case $host_cpu in +- hppa*64*) +- # +Z the default +- ;; +- *) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- ;; ++# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++Xsed="$SED -e 1s/^X//" --# This is just to silence aclocal about the macro not being used --ifelse([AC_DISABLE_FAST_INSTALL]) -+ ifelse([$4], , [AC_MSG_ERROR(dnl -+[Package requirements ($2) were not met: +- interix[[3-9]]*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. +- ;; ++# 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 --AC_DEFUN([LT_AC_PROG_GCJ], --[AC_CHECK_TOOL(GCJ, gcj, no) -- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -- AC_SUBST(GCJFLAGS) +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- enable_shared=no +- ;; ++# The names of the tagged configurations supported by this script. ++available_tags= + +- *nto* | *qnx*) +- # QNX uses GNU C++, but need to define -shared option too, otherwise +- # it will coredump. +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' +- ;; ++# ### BEGIN LIBTOOL CONFIG], ++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +- fi +- ;; ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +- *) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- else +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL + +- mingw* | cygwin* | pw32* | os2* | cegcc*) +- # 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). +- m4_if([$1], [GCJ], [], +- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) +- ;; ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared + +- hpux9* | hpux10* | hpux11*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +- ;; ++# Whether or not to build static libraries. ++build_old_libs=$enable_static + +- irix5* | irix6* | nonstopux*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC (with -KPIC) is the default. +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + +- linux* | k*bsd*-gnu) +- case $cc_basename in +- # old Intel for x86_64 which still supported -KPIC. +- ecc*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' +- ;; +- # icc used to be incompatible with GCC. +- # ICC 10 doesn't accept -KPIC any more. +- icc* | ifort*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' +- ;; +- # Lahey Fortran 8.1. +- lf95*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' +- ;; +- pgcc* | pgf77* | pgf90* | pgf95*) +- # Portland Group compilers (*not* the Pentium gcc compiler, +- # which looks to be a dead project) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- ccc*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # All Alpha code is PIC. +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- xl*) +- # IBM XL C 8.0/Fortran 10.1 on PPC +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' +- ;; +- *) +- case `$CC -V 2>&1 | sed 5q` in +- *Sun\ C*) +- # Sun C 5.9 +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- ;; +- *Sun\ F*) +- # Sun Fortran 8.3 passes all unrecognized flags to the linker +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='' +- ;; +- esac +- ;; +- esac +- ;; ++# Whether or not to disallow shared libs when runtime libs are static ++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) + +- newsos6) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install + +- *nto* | *qnx*) +- # QNX uses GNU C++, but need to define -shared option too, otherwise +- # it will coredump. +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' +- ;; ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os + +- osf3* | osf4* | osf5*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # All OSF/1 code is PIC. +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os + +- rdos*) +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; ++# An echo program that does not interpret backslashes. ++echo=$lt_echo + +- solaris*) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- case $cc_basename in +- f77* | f90* | f95*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; +- *) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +- esac +- ;; ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS + +- sunos4*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# A C compiler. ++LTCC=$lt_LTCC + +- sysv4 | sysv4.2uw2* | sysv4.3*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# LTCC compiler flags. ++LTCFLAGS=$lt_LTCFLAGS + +- sysv4*MP*) +- if test -d /usr/nec ;then +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- fi +- ;; ++# A language-specific compiler. ++CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# Is the compiler the GNU C compiler? ++with_gcc=$_LT_AC_TAGVAR(GCC, $1) + +- unicos*) +- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; ++# An ERE matcher. ++EGREP=$lt_EGREP + +- uts4*) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# The linker used to build libraries. ++LD=$lt_[]_LT_AC_TAGVAR(LD, $1) + +- *) +- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; +- esac +- fi -]) -+$$1_PKG_ERRORS +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)= +- ;; +- *) +- _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" +- ;; +-esac +-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], +- [How to pass a linker flag through the compiler]) ++# Whether we need hard or soft links. ++LN_S=$lt_LN_S --AC_DEFUN([LT_AC_PROG_RC], --[AC_CHECK_TOOL(RC, windres, no) --]) -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -+_PKG_TEXT -+])], -+ [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 -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - --# Cheap backport of AS_EXECUTABLE_P and required macros --# from Autoconf 2.59; we should not use $as_executable_p directly. -+_PKG_TEXT - --# _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' -+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], -+ [$4]) - else -- as_executable_p='test -f' +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then +- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], +- [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], +- [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], +- [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in +- "" | " "*) ;; +- *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; +- esac], +- [_LT_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi --])])# _AS_TEST_PREPARE -+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -+ AC_MSG_RESULT([yes]) -+ ifelse([$3], , :, [$3]) -+fi[]dnl -+])# PKG_CHECK_MODULES +-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], +- [Additional compiler flags for building library objects]) ++# A BSD-compatible nm program. ++NM=$lt_NM --# 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 -+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +-# +-# Check to make sure the static flag actually works. +-# +-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +- _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), +- $lt_tmp_static_flag, +- [], +- [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], +- [Compiler flag to prevent dynamic linking]) +-])# _LT_COMPILER_PIC ++# A symbol stripping program ++STRIP=$lt_STRIP + ++# Used to examine libraries when file_magic_cmd begins "file" ++MAGIC_CMD=$MAGIC_CMD + +-# _LT_LINKER_SHLIBS([TAGNAME]) +-# ---------------------------- +-# See if the linker supports building shared libraries. +-m4_defun([_LT_LINKER_SHLIBS], +-[AC_REQUIRE([LT_PATH_LD])dnl +-AC_REQUIRE([LT_PATH_NM])dnl +-m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-m4_require([_LT_DECL_EGREP])dnl +-m4_require([_LT_DECL_SED])dnl +-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +-m4_require([_LT_TAG_COMPILER])dnl +-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-m4_if([$1], [CXX], [ +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- case $host_os in +- aix[[4-9]]*) +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- else +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- fi +- ;; +- pw32*) +- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" +- ;; +- cygwin* | mingw* | cegcc*) +- _LT_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_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; +- esac +- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +-], [ +- runpath_var= +- _LT_TAGVAR(allow_undefined_flag, $1)= +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(archive_cmds, $1)= +- _LT_TAGVAR(archive_expsym_cmds, $1)= +- _LT_TAGVAR(compiler_needs_object, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- _LT_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- _LT_TAGVAR(hardcode_automatic, $1)=no +- _LT_TAGVAR(hardcode_direct, $1)=no +- _LT_TAGVAR(hardcode_direct_absolute, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +- _LT_TAGVAR(hardcode_libdir_separator, $1)= +- _LT_TAGVAR(hardcode_minus_L, $1)=no +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_TAGVAR(inherit_rpath, $1)=no +- _LT_TAGVAR(link_all_deplibs, $1)=unknown +- _LT_TAGVAR(module_cmds, $1)= +- _LT_TAGVAR(module_expsym_cmds, $1)= +- _LT_TAGVAR(old_archive_from_new_cmds, $1)= +- _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= +- _LT_TAGVAR(thread_safe_flag_spec, $1)= +- _LT_TAGVAR(whole_archive_flag_spec, $1)= +- # include_expsyms should be a list of space-separated symbols to be *always* +- # included in the symbol list +- _LT_TAGVAR(include_expsyms, $1)= +- # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. +- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out +- # platforms (ab)use it in PIC code, but their linkers get confused if +- # the symbol is explicitly referenced. Since portable code cannot +- # rely on this symbol name, it's probably fine to never include it in +- # preloaded symbol tables. +- # Exclude shared library initialization/finalization symbols. +-dnl Note also adjust exclude_expsyms for C++ above. +- extract_expsyms_cmds= ++# Used on cygwin: DLL creation program. ++DLLTOOL="$DLLTOOL" + +- case $host_os in +- cygwin* | mingw* | pw32* | cegcc*) +- # FIXME: the MSVC++ port hasn't been tested in a loooong time +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- with_gnu_ld=no +- fi +- ;; +- interix*) +- # we just hope/assume this is gcc and not c89 (= MSVC++) +- with_gnu_ld=yes +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +- esac ++# Used on cygwin: object dumper. ++OBJDUMP="$OBJDUMP" + +- _LT_TAGVAR(ld_shlibs, $1)=yes +- if test "$with_gnu_ld" = yes; then +- # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' ++# Used on cygwin: assembler. ++AS="$AS" + +- # Set some defaults for GNU ld with shared library support. These +- # are reset later if shared libraries are not supported. Putting them +- # here allows them to be overridden if necessary. +- runpath_var=LD_RUN_PATH +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then +- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- supports_anon_versioning=no +- case `$LD -v 2>&1` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir + +- # See if GNU ld supports shared libraries. +- case $host_os in +- aix[[3-9]]*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- _LT_TAGVAR(ld_shlibs, $1)=no +- cat <<_LT_EOF 1>&2 ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds + +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported +-*** to be unable to reliably create shared libraries on AIX. +-*** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. ++# How to pass a linker flag through the compiler. ++wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + +-_LT_EOF +- fi +- ;; ++# Object file suffix (normally "o"). ++objext="$ac_objext" + +- amigaos*) +- case $host_cpu in +- powerpc) +- # see comment about AmigaOS4 .so support +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='' +- ;; +- m68k) +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- ;; +- esac +- ;; ++# Old archive suffix (normally "a"). ++libext="$libext" + +- beos*) +- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# Shared library suffix (normally ".so"). ++shrext_cmds='$shrext_cmds' + +- cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- _LT_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' ++# Executable file suffix (normally ""). ++exeext="$exeext" + +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# Additional compiler flags for building library objects. ++pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++pic_mode=$pic_mode + +- interix[[3-9]]*) +- _LT_TAGVAR(hardcode_direct, $1)=no +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_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' +- ;; ++# What is the maximum length of a command? ++max_cmd_len=$lt_cv_sys_max_cmd_len + +- gnu* | linux* | tpf* | k*bsd*-gnu) +- tmp_diet=no +- if test "$host_os" = linux-dietlibc; then +- case $cc_basename in +- diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) +- esac +- fi +- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ +- && test "$tmp_diet" = no +- then +- tmp_addflag= +- tmp_sharedflag='-shared' +- case $cc_basename,$host_cpu in +- pgcc*) # Portland Group C compiler +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag' +- ;; +- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 +- tmp_addflag=' -i_dynamic' ;; +- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 +- tmp_addflag=' -i_dynamic -nofor_main' ;; +- ifc* | ifort*) # Intel Fortran compiler +- tmp_addflag=' -nofor_main' ;; +- lf95*) # Lahey Fortran 8.1 +- _LT_TAGVAR(whole_archive_flag_spec, $1)= +- tmp_sharedflag='--shared' ;; +- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) +- tmp_sharedflag='-qmkshrobj' +- tmp_addflag= ;; +- esac +- case `$CC -V 2>&1 | sed 5q` in +- *Sun\ C*) # Sun C 5.9 +- _LT_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' +- _LT_TAGVAR(compiler_needs_object, $1)=yes +- tmp_sharedflag='-G' ;; +- *Sun\ F*) # Sun Fortran 8.3 +- tmp_sharedflag='-G' ;; +- esac +- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) + +- if test "x$supports_anon_versioning" = xyes; then +- _LT_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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks + +- case $cc_basename in +- xlf*) +- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself +- _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' +- if test "x$supports_anon_versioning" = xyes; then +- _LT_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~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' +- fi +- ;; +- esac +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# Do we need the lib prefix for modules? ++need_lib_prefix=$need_lib_prefix + +- netbsd*) +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' +- wlarc= +- else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- fi +- ;; ++# Do we need a version for libraries? ++need_version=$need_version + +- solaris*) +- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then +- _LT_TAGVAR(ld_shlibs, $1)=no +- cat <<_LT_EOF 1>&2 ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen + +-*** Warning: The releases 2.8.* of the GNU linker cannot reliably +-*** create shared libraries on Solaris systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.9.1 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self + +-_LT_EOF +- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static + +- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) +- case `$LD -v 2>&1` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) +- _LT_TAGVAR(ld_shlibs, $1)=no +- cat <<_LT_EOF 1>&2 ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) + +-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +-*** reliably create shared libraries on SCO systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) + +-_LT_EOF +- ;; +- *) +- # For security reasons, it is highly recommended that you always +- # use absolute paths for naming shared libraries, and exclude the +- # DT_RUNPATH tag from executables and libraries. But doing so +- # requires that you compile everything twice, which is a pain. +- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) + +- sunos4*) +- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- wlarc= +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) + +- *) +- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac ++# Compiler flag to generate thread-safe objects. ++thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) + +- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then +- runpath_var= +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- else +- # PORTME fill in a description of your system's linker (not GNU ld) +- case $host_os in +- aix3*) +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=yes +- _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- _LT_TAGVAR(hardcode_direct, $1)=unsupported +- fi +- ;; ++# Library versioning type. ++version_type=$version_type + +- aix[[4-9]]*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- else +- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- fi +- aix_use_runtimelinking=no ++# Format of library name prefix. ++libname_spec=$lt_libname_spec + +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- ;; +- esac ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME. ++library_names_spec=$lt_library_names_spec + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++# Commands used to build and install an old-style archive. ++RANLIB=$lt_RANLIB ++old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds + +- _LT_TAGVAR(archive_cmds, $1)='' +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_TAGVAR(link_all_deplibs, $1)=yes +- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) + +- if test "$GCC" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && +- strings "$collect2name" | $GREP resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- : +- else +- # We have old collect2 +- _LT_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) + +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an +- # empty executable. +- _LT_SYS_MODULE_PATH_AIX +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an +- # empty executable. +- _LT_SYS_MODULE_PATH_AIX +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; ++# Commands used to build and install a shared archive. ++archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) ++archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) ++postinstall_cmds=$lt_postinstall_cmds ++postuninstall_cmds=$lt_postuninstall_cmds + +- amigaos*) +- case $host_cpu in +- powerpc) +- # see comment about AmigaOS4 .so support +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='' +- ;; +- m68k) +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- ;; +- esac +- ;; ++# Commands used to build a loadable module (assumed same as above if empty) ++module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) ++module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) + +- bsdi[[45]]*) +- _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic +- ;; ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib + +- cygwin* | mingw* | pw32* | cegcc*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # The linker will automatically build a .lib file if we build a DLL. +- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' +- # FIXME: Should let the user specify the lib program. +- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' +- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- ;; ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) + +- darwin* | rhapsody*) +- _LT_DARWIN_LINKER_FEATURES($1) +- ;; ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) + +- dgux*) +- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Dependencies to place before the objects being linked to create a ++# shared library. ++predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) + +- freebsd1*) +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; ++# Dependencies to place after the objects being linked to create a ++# shared library. ++postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) + +- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +- # support. Future versions do this automatically, but an explicit c++rt0.o +- # does not break anything, and helps significantly (at the cost of a little +- # extra space). +- freebsd2.2*) +- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# The directories searched by this compiler when creating a shared ++# library ++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) + +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) + +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | dragonfly*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method + +- hpux9*) +- if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- fi +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_TAGVAR(hardcode_direct, $1)=yes ++# Command to use when deplibs_check_method == file_magic. ++file_magic_cmd=$lt_file_magic_cmd + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) + +- hpux10*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +- fi +- if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- fi +- ;; ++# Flag that forces no undefined symbols. ++no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) + +- hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case $host_cpu in +- hppa*64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- case $host_cpu in +- hppa*64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds + +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_TAGVAR(hardcode_direct, $1)=no +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++# Same as above, but a single script fragment to be evaled but not shown. ++finish_eval=$lt_finish_eval + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- ;; +- esac +- fi +- ;; ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- # Try to use the -exported_symbol ld option, if it does not +- # work, assume that -exports_file does not work either and +- # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- AC_LINK_IFELSE(int foo(void) {}, +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +- ) +- LDFLAGS="$save_LDFLAGS" +- else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +- fi +- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_TAGVAR(inherit_rpath, $1)=yes +- _LT_TAGVAR(link_all_deplibs, $1)=yes +- ;; ++# Transform the output of nm in a proper C declaration ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +- netbsd*) +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out +- else +- _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Transform the output of nm in a C name address pair ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +- newsos6) +- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# This is the shared library runtime path variable. ++runpath_var=$runpath_var + +- *nto* | *qnx*) +- ;; ++# This is the shared library path variable. ++shlibpath_var=$shlibpath_var + +- openbsd*) +- if test -f /usr/libexec/ld.so; then +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- else +- case $host_os in +- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) +- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- ;; +- *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- ;; +- esac +- fi +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +- os2*) +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +- ;; ++# How to hardcode a shared library path into an executable. ++hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) + +- osf3*) +- if test "$GCC" = yes; then +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- fi +- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs + +- osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- else +- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ +- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) + +- # Both c and cxx compiler support -rpath directly +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- fi +- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; ++# If ld is used when linking, flag to hardcode \$libdir into ++# a binary during linking. This must work even if \$libdir does ++# not exist. ++hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) + +- solaris*) +- _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' +- if test "$GCC" = yes; then +- wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' +- else +- case `$CC -V 2>&1` in +- *"Compilers 5.0"*) +- wlarc='' +- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' +- ;; +- *) +- wlarc='${wl}' +- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' +- ;; +- esac +- fi +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- # 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?) +- if test "$GCC" = yes; then +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' +- else +- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' +- fi +- ;; +- esac +- _LT_TAGVAR(link_all_deplibs, $1)=yes +- ;; ++# Whether we need a single -rpath flag with a separated argument. ++hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) + +- sunos4*) +- if test "x$host_vendor" = xsequent; then +- # Use $CC to link under sequent, because it throws in some extra .o +- # files that make .init and .fini sections work. +- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++# resulting binary. ++hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) + +- sysv4) +- case $host_vendor in +- sni) +- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? +- ;; +- siemens) +- ## LD is ld it makes a PLAMLIB +- ## CC just makes a GrossModule. +- _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' +- _LT_TAGVAR(hardcode_direct, $1)=no +- ;; +- motorola) +- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie +- ;; +- esac +- runpath_var='LD_RUN_PATH' +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the ++# resulting binary. ++hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) + +- sysv4.3*) +- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' +- ;; ++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into ++# the resulting binary. ++hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- _LT_TAGVAR(ld_shlibs, $1)=yes +- fi +- ;; ++# Set to yes if building a shared library automatically hardcodes DIR into the library ++# and all subsequent libraries and executables linked against it. ++hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) +- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at relink time. ++variables_saved_for_relink="$variables_saved_for_relink" + +- if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) + +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_TAGVAR(link_all_deplibs, $1)=yes +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' ++# Compile-time system search path for libraries ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +- if test "$GCC" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; ++# Run-time system search path for libraries ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +- uts4*) +- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path + +- *) +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac ++# Set to yes if exported symbols are required. ++always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) + +- if test x$host_vendor = xsni; then +- case $host in +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' +- ;; +- esac +- fi +- fi +-]) +-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) + +-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds + +-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +-_LT_DECL([], [extract_expsyms_cmds], [2], +- [The commands to extract the exported symbol list from a shared archive]) ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) + +-# +-# Do we need to explicitly link libc? +-# +-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +-x|xyes) +- # Assume -lc should be added +- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++# Symbols that must always be exported. ++include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) + +- if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $_LT_TAGVAR(archive_cmds, $1) in +- *'~'*) +- # FIXME: we may have to deal with multi-command sequences. +- ;; +- '$CC '*) +- # Test whether the compiler implicitly links with -lc since on some +- # systems, -lgcc has to come before -lc. If gcc already passes -lc +- # to ld, don't add -lc before -lgcc. +- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) +- $RM conftest* +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ifelse([$1],[], ++[# ### END LIBTOOL CONFIG], ++[# ### END LIBTOOL TAG CONFIG: $tagname]) + +- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) +- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) +- _LT_TAGVAR(allow_undefined_flag, $1)= +- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) +- then +- _LT_TAGVAR(archive_cmds_need_lc, $1)=no +- else +- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes +- fi +- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $RM conftest* +- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) +- ;; +- esac +- fi +- ;; +-esac +- +-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], +- [Whether or not to add -lc for building shared libraries]) +-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], +- [enable_shared_with_static_runtimes], [0], +- [Whether or not to disallow shared libs when runtime libs are static]) +-_LT_TAGDECL([], [export_dynamic_flag_spec], [1], +- [Compiler flag to allow reflexive dlopens]) +-_LT_TAGDECL([], [whole_archive_flag_spec], [1], +- [Compiler flag to generate shared objects directly from archives]) +-_LT_TAGDECL([], [compiler_needs_object], [1], +- [Whether the compiler copes with passing no objects directly]) +-_LT_TAGDECL([], [old_archive_from_new_cmds], [2], +- [Create an old-style archive from a shared archive]) +-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], +- [Create a temporary old-style archive to link instead of a shared archive]) +-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +-_LT_TAGDECL([], [archive_expsym_cmds], [2]) +-_LT_TAGDECL([], [module_cmds], [2], +- [Commands used to build a loadable module if different from building +- a shared archive.]) +-_LT_TAGDECL([], [module_expsym_cmds], [2]) +-_LT_TAGDECL([], [with_gnu_ld], [1], +- [Whether we are building with GNU ld or not]) +-_LT_TAGDECL([], [allow_undefined_flag], [1], +- [Flag that allows shared libraries with undefined symbols to be built]) +-_LT_TAGDECL([], [no_undefined_flag], [1], +- [Flag that enforces no undefined symbols]) +-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], +- [Flag to hardcode $libdir into a binary during linking. +- This must work even if $libdir does not exist]) +-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], +- [[If ld is used when linking, flag to hardcode $libdir into a binary +- during linking. This must work even if $libdir does not exist]]) +-_LT_TAGDECL([], [hardcode_libdir_separator], [1], +- [Whether we need a single "-rpath" flag with a separated argument]) +-_LT_TAGDECL([], [hardcode_direct], [0], +- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes +- DIR into the resulting binary]) +-_LT_TAGDECL([], [hardcode_direct_absolute], [0], +- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes +- DIR into the resulting binary and the resulting library dependency is +- "absolute", i.e impossible to change by setting ${shlibpath_var} if the +- library is relocated]) +-_LT_TAGDECL([], [hardcode_minus_L], [0], +- [Set to "yes" if using the -LDIR flag during linking hardcodes DIR +- into the resulting binary]) +-_LT_TAGDECL([], [hardcode_shlibpath_var], [0], +- [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +- into the resulting binary]) +-_LT_TAGDECL([], [hardcode_automatic], [0], +- [Set to "yes" if building a shared library automatically hardcodes DIR +- into the library and all subsequent libraries and executables linked +- against it]) +-_LT_TAGDECL([], [inherit_rpath], [0], +- [Set to yes if linker adds runtime paths of dependent libraries +- to runtime path list]) +-_LT_TAGDECL([], [link_all_deplibs], [0], +- [Whether libtool must link a program against all its dependency libraries]) +-_LT_TAGDECL([], [fix_srcfile_path], [1], +- [Fix the shell variable $srcfile for the compiler]) +-_LT_TAGDECL([], [always_export_symbols], [0], +- [Set to "yes" if exported symbols are required]) +-_LT_TAGDECL([], [export_symbols_cmds], [2], +- [The commands to list exported symbols]) +-_LT_TAGDECL([], [exclude_expsyms], [1], +- [Symbols that should not be listed in the preloaded symbols]) +-_LT_TAGDECL([], [include_expsyms], [1], +- [Symbols that must always be exported]) +-_LT_TAGDECL([], [prelink_cmds], [2], +- [Commands necessary for linking programs (against libraries) with templates]) +-_LT_TAGDECL([], [file_list_spec], [1], +- [Specify filename containing input files]) +-dnl FIXME: Not yet implemented +-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +-dnl [Compiler flag to generate thread safe objects]) +-])# _LT_LINKER_SHLIBS +- +- +-# _LT_LANG_C_CONFIG([TAG]) +-# ------------------------ +-# Ensure that the configuration variables for a C compiler are suitably +-# defined. These variables are subsequently used by _LT_CONFIG to write +-# the compiler configuration to `libtool'. +-m4_defun([_LT_LANG_C_CONFIG], +-[m4_require([_LT_DECL_EGREP])dnl +-lt_save_CC="$CC" +-AC_LANG_PUSH(C) +- +-# Source file extension for C test sources. +-ac_ext=c +- +-# Object file extension for compiled C test sources. +-objext=o +-_LT_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-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);}' +- +-_LT_TAG_COMPILER +-# Save the default compiler, since it gets overwritten when the other +-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +-compiler_DEFAULT=$CC +- +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE +- +-if test -n "$compiler"; then +- _LT_COMPILER_NO_RTTI($1) +- _LT_COMPILER_PIC($1) +- _LT_COMPILER_C_O($1) +- _LT_COMPILER_FILE_LOCKS($1) +- _LT_LINKER_SHLIBS($1) +- _LT_SYS_DYNAMIC_LINKER($1) +- _LT_LINKER_HARDCODE_LIBPATH($1) +- LT_SYS_DLOPEN_SELF +- _LT_CMD_STRIPLIB +- +- # Report which library types will actually be built +- AC_MSG_CHECKING([if libtool supports shared libraries]) +- AC_MSG_RESULT([$can_build_shared]) ++__EOF__ + +- AC_MSG_CHECKING([whether to build shared libraries]) +- test "$can_build_shared" = "no" && enable_shared=no +- +- # On AIX, shared libraries and static libraries use the same namespace, and +- # are all built from PIC. ++ifelse([$1],[], [ + case $host_os in + aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; ++ cat <<\EOF >> "$cfgfile" + +- aix[[4-9]]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++EOF + ;; + esac +- AC_MSG_RESULT([$enable_shared]) + +- AC_MSG_CHECKING([whether to build static libraries]) +- # Make sure either enable_shared or enable_static is yes. +- test "$enable_shared" = yes || enable_static=yes +- AC_MSG_RESULT([$enable_static]) ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + +- _LT_CONFIG($1) ++ mv -f "$cfgfile" "$ofile" || \ ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++]) ++else ++ # If there is no Makefile yet, we rely on a make rule to execute ++ # `config.status --recheck' to rerun these tests and create the ++ # libtool script then. ++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` ++ if test -f "$ltmain_in"; then ++ test -f Makefile && make "$ltmain" ++ fi + fi +-AC_LANG_POP +-CC="$lt_save_CC" +-])# _LT_LANG_C_CONFIG ++])# AC_LIBTOOL_CONFIG + + +-# _LT_PROG_CXX +-# ------------ +-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ +-# compiler, we have our own version here. +-m4_defun([_LT_PROG_CXX], +-[ +-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) +-AC_PROG_CXX +-if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_PROG_CXXCPP +-else +- _lt_caught_CXX_error=yes ++# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) ++# ------------------------------------------- ++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], ++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++ ++_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++ ++if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ ++ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++ lt_cv_prog_compiler_rtti_exceptions, ++ [-fno-rtti -fno-exceptions], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) + fi +-popdef([AC_MSG_ERROR]) +-])# _LT_PROG_CXX ++])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI + +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([_LT_PROG_CXX], []) + ++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++# --------------------------------- ++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. ++AC_MSG_CHECKING([command to parse $NM output from $compiler object]) ++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], ++[ ++# These are sane defaults that work on at least a few old systems. ++# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +-# _LT_LANG_CXX_CONFIG([TAG]) +-# -------------------------- +-# Ensure that the configuration variables for a C++ compiler are suitably +-# defined. These variables are subsequently used by _LT_CONFIG to write +-# the compiler configuration to `libtool'. +-m4_defun([_LT_LANG_CXX_CONFIG], +-[AC_REQUIRE([_LT_PROG_CXX])dnl +-m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-m4_require([_LT_DECL_EGREP])dnl +- +-AC_LANG_PUSH(C++) +-_LT_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_TAGVAR(allow_undefined_flag, $1)= +-_LT_TAGVAR(always_export_symbols, $1)=no +-_LT_TAGVAR(archive_expsym_cmds, $1)= +-_LT_TAGVAR(compiler_needs_object, $1)=no +-_LT_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_TAGVAR(hardcode_direct, $1)=no +-_LT_TAGVAR(hardcode_direct_absolute, $1)=no +-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_TAGVAR(hardcode_minus_L, $1)=no +-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +-_LT_TAGVAR(hardcode_automatic, $1)=no +-_LT_TAGVAR(inherit_rpath, $1)=no +-_LT_TAGVAR(module_cmds, $1)= +-_LT_TAGVAR(module_expsym_cmds, $1)= +-_LT_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_TAGVAR(no_undefined_flag, $1)= +-_LT_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++# Character class describing NM global symbol codes. ++symcode='[[BCDEGRST]]' + +-# Source file extension for C++ test sources. +-ac_ext=cpp ++# Regexp to match symbols that can be accessed directly from C. ++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +-# Object file extension for compiled C++ test sources. +-objext=o +-_LT_TAGVAR(objext, $1)=$objext ++# Transform an extracted symbol line into a proper C declaration ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + +-# No sense in running all these tests if we already determined that +-# the CXX compiler isn't working. Some variables (like enable_shared) +-# are currently assumed to apply to all compilers on this platform, +-# and will be corrupted by setting them based on a non-working compiler. +-if test "$_lt_caught_CXX_error" != yes; then +- # Code to be used in simple compile tests +- 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); }' +- +- # ltmain only uses $CC for tagged configurations so make sure $CC is set. +- _LT_TAG_COMPILER +- +- # save warnings/boilerplate of simple test code +- _LT_COMPILER_BOILERPLATE +- _LT_LINKER_BOILERPLATE +- +- # Allow CC to be a program name with arguments. +- lt_save_CC=$CC +- lt_save_LD=$LD +- lt_save_GCC=$GCC +- GCC=$GXX +- lt_save_with_gnu_ld=$with_gnu_ld +- lt_save_path_LD=$lt_cv_path_LD +- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +- else +- $as_unset lt_cv_prog_gnu_ld ++# Transform an extracted symbol line into symbol name and symbol address ++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'" ++ ++# Define system-specific variables. ++case $host_os in ++aix*) ++ symcode='[[BCDT]]' ++ ;; ++cygwin* | mingw* | pw32*) ++ symcode='[[ABCDGISTW]]' ++ ;; ++hpux*) # Its linker distinguishes data from code symbols ++ if test "$host_cpu" = ia64; then ++ symcode='[[ABCDEGRST]]' + fi +- if test -n "${lt_cv_path_LDCXX+set}"; then +- lt_cv_path_LD=$lt_cv_path_LDCXX +- else +- $as_unset lt_cv_path_LD ++ 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* | 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'" ++ 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'" + fi +- test -z "${LDCXX+set}" || LD=$LDCXX +- CC=${CXX-"c++"} +- compiler=$CC +- _LT_TAGVAR(compiler, $1)=$CC +- _LT_CC_BASENAME([$compiler]) +- +- if test -n "$compiler"; then +- # We don't want -fno-exception when compiling C++ code, so set the +- # no_builtin_flag separately +- if test "$GXX" = yes; then +- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +- else +- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +- fi ++ ;; ++irix* | nonstopux*) ++ symcode='[[BCDEGRST]]' ++ ;; ++osf*) ++ symcode='[[BCDEGQRST]]' ++ ;; ++solaris*) ++ symcode='[[BDRT]]' ++ ;; ++sco3.2v5*) ++ symcode='[[DT]]' ++ ;; ++sysv4.2uw2*) ++ symcode='[[DT]]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[[ABDT]]' ++ ;; ++sysv4) ++ symcode='[[DFNSTU]]' ++ ;; ++esac + +- if test "$GXX" = yes; then +- # Set up default GNU C++ configuration ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac + +- LT_PATH_LD ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[[ABCDGIRSTW]]' ;; ++esac + +- # Check if GNU C++ uses GNU ld as the underlying linker, since the +- # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- +- # If archive_cmds runs LD, not CC, wlarc should be empty +- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to +- # investigate it a little bit more. (MM) +- wlarc='${wl}' +- +- # ancient GNU ld didn't support --whole-archive et. al. +- if eval "`$CC -print-prog-name=ld` --help 2>&1" | +- $GREP 'no-whole-archive' > /dev/null; then +- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- else +- with_gnu_ld=no +- wlarc= ++# Try without a prefix undercore, then with it. ++for ac_symprfx in "" "_"; do + +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- fi ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ # Write the raw and C identifiers. ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + +- else +- GXX=no +- with_gnu_ld=no +- wlarc= +- fi ++ # Check to see that the pipe works correctly. ++ pipe_works=no + +- # PORTME: fill in a description of your system's C++ link characteristics +- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +- _LT_TAGVAR(ld_shlibs, $1)=yes +- case $host_os in +- aix3*) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- aix[[4-9]]*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no ++ rm -f conftest* ++ cat > conftest.$ac_ext <<EOF ++#ifdef __cplusplus ++extern "C" { ++#endif ++char nm_test_var; ++void nm_test_func(){} ++#ifdef __cplusplus ++} ++#endif ++int main(){nm_test_var='a';nm_test_func();return(0);} ++EOF + +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done +- ;; +- esac ++ if AC_TRY_EVAL(ac_compile); then ++ # Now try to grab the symbols. ++ nlist=conftest.nm ++ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then ++ # Try sorting and uniquifying the output. ++ if sort "$nlist" | uniq > "$nlist"T; then ++ mv -f "$nlist"T "$nlist" ++ else ++ rm -f "$nlist"T ++ fi + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++ # Make sure that we snagged all the symbols we need. ++ if grep ' nm_test_var$' "$nlist" >/dev/null; then ++ if grep ' nm_test_func$' "$nlist" >/dev/null; then ++ cat <<EOF > conftest.$ac_ext ++#ifdef __cplusplus ++extern "C" { ++#endif + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- _LT_TAGVAR(archive_cmds, $1)='' +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_TAGVAR(link_all_deplibs, $1)=yes +- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' +- +- if test "$GXX" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && +- strings "$collect2name" | $GREP resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- : +- else +- # We have old collect2 +- _LT_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi ++EOF ++ # Now generate the symbol file. ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to +- # export. +- _LT_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty +- # executable. +- _LT_SYS_MODULE_PATH_AIX +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ cat <<EOF >> conftest.$ac_ext ++#if defined (__STDC__) && __STDC__ ++# define lt_ptr_t void * ++#else ++# define lt_ptr_t char * ++# define const ++#endif + +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an +- # empty executable. +- _LT_SYS_MODULE_PATH_AIX +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared +- # libraries. +- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; ++/* The mapping between symbol names and symbols. */ ++const struct { ++ const char *name; ++ lt_ptr_t address; ++} ++lt_preloaded_symbols[[]] = ++{ ++EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext ++ cat <<\EOF >> conftest.$ac_ext ++ {0, (lt_ptr_t) 0} ++}; + +- beos*) +- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++#ifdef __cplusplus ++} ++#endif ++EOF ++ # Now try linking the two files. ++ mv conftest.$ac_objext conftstm.$ac_objext ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" ++ LIBS="conftstm.$ac_objext" ++ CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then ++ pipe_works=yes ++ fi ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" + else +- _LT_TAGVAR(ld_shlibs, $1)=no ++ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi +- ;; +- +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; ++ else ++ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD ++ cat conftest.$ac_ext >&5 ++ fi ++ rm -rf conftest* conftst* + +- cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_TAGVAR(always_export_symbols, $1)=no +- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- darwin* | rhapsody*) +- _LT_DARWIN_LINKER_FEATURES($1) +- ;; ++ # Do not use the global_symbol_pipe unless it works. ++ if test "$pipe_works" = yes; then ++ break ++ else ++ lt_cv_sys_global_symbol_pipe= ++ fi ++done ++]) ++if test -z "$lt_cv_sys_global_symbol_pipe"; then ++ lt_cv_sys_global_symbol_to_cdecl= ++fi ++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++ AC_MSG_RESULT(failed) ++else ++ AC_MSG_RESULT(ok) ++fi ++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE ++ ++ ++# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) ++# --------------------------------------- ++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], ++[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= ++_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= + ++AC_MSG_CHECKING([for $compiler option to produce PIC]) ++ ifelse([$1],[CXX],[ ++ # C++ specific cases for pic, static, wl, etc. ++ if test "$GXX" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ 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 ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ *djgpp*) ++ # DJGPP does not support shared libraries at all ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ interix[[3-9]]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ case $host_os in ++ aix[[4-9]]*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ chorus*) ++ case $cc_basename in ++ cxch68*) ++ # Green Hills C++ Compiler ++ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ ;; ++ esac ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; + dgux*) +- case $cc_basename in +- ec++*) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no ++ case $cc_basename in ++ ec++*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; +- ghcx*) ++ ghcx*) + # Green Hills C++ Compiler +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no ++ *) + ;; +- esac +- ;; +- +- freebsd[[12]]*) +- # C++ shared libraries reported to be fairly broken before +- # switch to ELF +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- +- freebsd-elf*) +- _LT_TAGVAR(archive_cmds_need_lc, $1)=no +- ;; +- ++ esac ++ ;; + freebsd* | dragonfly*) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- _LT_TAGVAR(ld_shlibs, $1)=yes +- ;; +- +- gnu*) +- ;; +- +- hpux9*) +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' +- ;; +- *) +- if test "$GXX" = yes; then +- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; +- +- hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- +- case $host_cpu in +- hppa*64*|ia64*) +- ;; +- *) +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; +- esac +- fi +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_TAGVAR(hardcode_direct, $1)=no +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- esac +- +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no ++ # FreeBSD uses GNU C++ ++ ;; ++ hpux9* | hpux10* | hpux11*) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ if test "$host_cpu" != ia64; then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ fi + ;; +- aCC*) ++ aCC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in +- hppa*64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; + esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' + ;; +- *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then +- case $host_cpu in +- hppa*64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- fi +- else +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi ++ *) + ;; +- esac +- ;; +- +- interix[[3-9]]*) +- _LT_TAGVAR(hardcode_direct, $1)=no +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _LT_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' +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC*) +- # SGI C++ +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- +- # Archives containing C++ object files must be created using +- # "CC -ar", where "CC" is the IRIX C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ esac ++ ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; ++ irix5* | irix6* | nonstopux*) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ # CC pic flag -KPIC is the default. + ;; +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' +- fi +- fi +- _LT_TAGVAR(link_all_deplibs, $1)=yes ++ *) + ;; +- esac +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_TAGVAR(inherit_rpath, $1)=yes +- ;; +- ++ esac ++ ;; + linux* | k*bsd*-gnu) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' +- +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ case $cc_basename in ++ KCC*) ++ # KAI C++ Compiler ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; +- icpc* | ecpc* ) ++ icpc* | ecpc*) + # Intel C++ +- with_gnu_ld=yes +- # version 8.0 and above of icpc choke on multiply defined symbols +- # if we add $predep_objects and $postdep_objects, however 7.1 and +- # earlier do not add the objects themselves. +- case `$CC -V 2>&1` in +- *"Version 7."*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- *) # Version 8.0 or newer +- tmp_idyn= +- case $host_cpu in +- ia64*) tmp_idyn=' -i_dynamic';; +- esac +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- esac +- _LT_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler. ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; +- pgCC* | pgcpp*) +- # Portland Group C++ compiler +- case `$CC -V` in +- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) +- _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ +- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' +- _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ +- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ +- $RANLIB $oldlib' +- _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +- ;; +- *) # Version 6 will use weak symbols +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +- ;; +- esac +- +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' +- ;; + cxx*) + # Compaq C++ +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' +- +- runpath_var=LD_RUN_PATH +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' +- ;; +- xl*) +- # IBM XL 8.0 on PPC, with GNU ld +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- if test "x$supports_anon_versioning" = xyes; then +- _LT_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 -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _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_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_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' +- _LT_TAGVAR(compiler_needs_object, $1)=yes +- +- # 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ _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 + ;; +- + lynxos*) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no + ;; +- + m88k*) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no + ;; +- + mvs*) +- case $cc_basename in +- cxx*) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no ++ case $cc_basename in ++ cxx*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; +- +- netbsd*) +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' +- wlarc= +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; +- +- *nto* | *qnx*) +- _LT_TAGVAR(ld_shlibs, $1)=yes +- ;; +- +- openbsd2*) +- # C++ shared libraries are fairly broken +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- +- openbsd*) +- if test -f /usr/libexec/ld.so; then +- _LT_TAGVAR(hardcode_direct, $1)=yes +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- _LT_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_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_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- fi +- output_verbose_link_cmd=echo +- else +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi ++ netbsd* | netbsdelf*-gnu) + ;; +- + osf3* | osf4* | osf5*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- case $host in +- osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; +- *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; +- esac ++ case $cc_basename in ++ KCC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; +- RCC*) ++ RCC*) + # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; +- cxx*) +- case $host in +- osf3*) +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- ;; +- *) +- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ +- $RM $lib.exp' +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- ;; +- esac +- +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' ++ cxx*) ++ # Digital/Compaq C++ ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- case $host in +- osf3*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- ;; +- *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- ;; +- esac +- +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- fi + ;; +- esac +- ;; +- ++ esac ++ ;; + psos*) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- lcc*) +- # Lucid +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- ++ ;; + solaris*) +- case $cc_basename in +- CC*) ++ case $cc_basename in ++ CC*) + # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes +- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' +- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' +- +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- # The compiler driver will combine and reorder linker options, +- # but understands `-z linker_flag'. +- # Supported since Solaris 2.6 (maybe 2.5.1?) +- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' +- ;; +- esac +- _LT_TAGVAR(link_all_deplibs, $1)=yes +- +- 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ _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 ' + ;; +- gcx*) ++ gcx*) + # Green Hills C++ Compiler +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- +- # The C++ compiler must be used to create the archive. +- _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; +- *) +- # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' +- if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' +- fi +- +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' +- ;; +- esac +- fi ++ *) + ;; +- esac +- ;; +- +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) +- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var='LD_RUN_PATH' +- +- case $cc_basename in +- CC*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- ;; +- +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' +- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_TAGVAR(link_all_deplibs, $1)=yes +- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' +- ++ esac ++ ;; ++ sunos4*) + case $cc_basename in +- CC*) +- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ CC*) ++ # Sun C++ 4.x ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ lcc*) ++ # Lucid ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) +- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac +- ;; +- ++ ;; + tandem*) +- case $cc_basename in +- NCC*) ++ case $cc_basename in ++ NCC*) + # NonStop-UX NCC 3.20 +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- +- vxworks*) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- +- *) +- # FIXME: insert proper C++ library support +- _LT_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- +- AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +- +- _LT_TAGVAR(GCC, $1)="$GXX" +- _LT_TAGVAR(LD, $1)="$LD" +- +- ## CAVEAT EMPTOR: +- ## There is no encapsulation within the following macros, do not change +- ## the running order or otherwise move them around unless you know exactly +- ## what you are doing... +- _LT_SYS_HIDDEN_LIBDEPS($1) +- _LT_COMPILER_PIC($1) +- _LT_COMPILER_C_O($1) +- _LT_COMPILER_FILE_LOCKS($1) +- _LT_LINKER_SHLIBS($1) +- _LT_SYS_DYNAMIC_LINKER($1) +- _LT_LINKER_HARDCODE_LIBPATH($1) +- +- _LT_CONFIG($1) +- fi # test -n "$compiler" +- +- CC=$lt_save_CC +- LDCXX=$LD +- LD=$lt_save_LD +- GCC=$lt_save_GCC +- with_gnu_ld=$lt_save_with_gnu_ld +- lt_cv_path_LDCXX=$lt_cv_path_LD +- lt_cv_path_LD=$lt_save_path_LD +- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +-fi # test "$_lt_caught_CXX_error" != yes +- +-AC_LANG_POP +-])# _LT_LANG_CXX_CONFIG +- +- +-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +-# --------------------------------- +-# Figure out "hidden" library dependencies from verbose +-# compiler output when linking a shared library. +-# Parse the compiler output and extract the necessary +-# objects, libraries and library flags. +-m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +-# Dependencies to place before and after the object being linked: +-_LT_TAGVAR(predep_objects, $1)= +-_LT_TAGVAR(postdep_objects, $1)= +-_LT_TAGVAR(predeps, $1)= +-_LT_TAGVAR(postdeps, $1)= +-_LT_TAGVAR(compiler_lib_search_path, $1)= +- +-dnl we can't use the lt_simple_compile_test_code here, +-dnl because it contains code intended for an executable, +-dnl not a library. It's possible we should let each +-dnl tag define a new lt_????_link_test_code variable, +-dnl but it's only used here... +-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +-int a; +-void foo (void) { a = 0; } +-_LT_EOF +-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +-class Foo +-{ +-public: +- Foo (void) { a = 0; } +-private: +- int a; +-}; +-_LT_EOF +-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF +- subroutine foo +- implicit none +- integer*4 a +- a=0 +- return +- end +-_LT_EOF +-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF +- subroutine foo +- implicit none +- integer a +- a=0 +- return +- end +-_LT_EOF +-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +-public class foo { +- private int a; +- public void bar (void) { +- a = 0; +- } +-}; +-_LT_EOF +-]) +-dnl Parse the compiler output and extract the necessary +-dnl objects, libraries and library flags. +-if AC_TRY_EVAL(ac_compile); then +- # Parse the compiler output and extract the necessary +- # objects, libraries and library flags. +- +- # Sentinel used to keep track of whether or not we are before +- # the conftest object file. +- pre_test_object_deps_done=no +- +- for p in `eval "$output_verbose_link_cmd"`; do +- case $p in +- +- -L* | -R* | -l*) +- # Some compilers place space between "-{L,R}" and the path. +- # Remove the space. +- if test $p = "-L" || +- test $p = "-R"; then +- prev=$p +- continue +- else +- prev= +- fi +- +- if test "$pre_test_object_deps_done" = no; then +- case $p in +- -L* | -R*) +- # Internal compiler library paths should come after those +- # provided the user. The postdeps already come after the +- # user supplied libs so there is no need to process them. +- if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then +- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" +- else +- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" +- fi +- ;; +- # The "-l" case would never come before the object being +- # linked, so don't bother handling this case. +- esac +- else +- if test -z "$_LT_TAGVAR(postdeps, $1)"; then +- _LT_TAGVAR(postdeps, $1)="${prev}${p}" +- else +- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" +- fi +- fi +- ;; +- +- *.$objext) +- # This assumes that the test object file only shows up +- # once in the compiler output. +- if test "$p" = "conftest.$objext"; then +- pre_test_object_deps_done=yes +- continue +- fi +- +- if test "$pre_test_object_deps_done" = no; then +- if test -z "$_LT_TAGVAR(predep_objects, $1)"; then +- _LT_TAGVAR(predep_objects, $1)="$p" +- else +- _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" +- fi +- else +- if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then +- _LT_TAGVAR(postdep_objects, $1)="$p" +- else +- _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" +- fi +- fi +- ;; +- +- *) ;; # Ignore the rest. +- +- esac +- done +- +- # Clean up. +- rm -f a.out a.exe +-else +- echo "libtool.m4: error: problem compiling $1 test program" +-fi +- +-$RM -f confest.$objext +- +-# PORTME: override above test on systems where it is broken +-m4_if([$1], [CXX], +-[case $host_os in +-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_TAGVAR(predep_objects,$1)= +- _LT_TAGVAR(postdep_objects,$1)= +- _LT_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_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. +- if test "$solaris_use_stlport4" != yes; then +- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' +- fi +- ;; +- esac +- ;; +-esac +-]) +- +-case " $_LT_TAGVAR(postdeps, $1) " in +-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +-esac +- _LT_TAGVAR(compiler_lib_search_dirs, $1)= +-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then +- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +-fi +-_LT_TAGDECL([], [compiler_lib_search_dirs], [1], +- [The directories searched by this compiler when creating a shared library]) +-_LT_TAGDECL([], [predep_objects], [1], +- [Dependencies to place before and after the objects being linked to +- create a shared library]) +-_LT_TAGDECL([], [postdep_objects], [1]) +-_LT_TAGDECL([], [predeps], [1]) +-_LT_TAGDECL([], [postdeps], [1]) +-_LT_TAGDECL([], [compiler_lib_search_path], [1], +- [The library search path used internally by the compiler when linking +- a shared library]) +-])# _LT_SYS_HIDDEN_LIBDEPS +- +- +-# _LT_PROG_F77 +-# ------------ +-# Since AC_PROG_F77 is broken, in that it returns the empty string +-# if there is no fortran compiler, we have our own version here. +-m4_defun([_LT_PROG_F77], +-[ +-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) +-AC_PROG_F77 +-if test -z "$F77" || test "X$F77" = "Xno"; then +- _lt_disable_F77=yes +-fi +-popdef([AC_MSG_ERROR]) +-])# _LT_PROG_F77 +- +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([_LT_PROG_F77], []) +- +- +-# _LT_LANG_F77_CONFIG([TAG]) +-# -------------------------- +-# Ensure that the configuration variables for a Fortran 77 compiler are +-# suitably defined. These variables are subsequently used by _LT_CONFIG +-# to write the compiler configuration to `libtool'. +-m4_defun([_LT_LANG_F77_CONFIG], +-[AC_REQUIRE([_LT_PROG_F77])dnl +-AC_LANG_PUSH(Fortran 77) +- +-_LT_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_TAGVAR(allow_undefined_flag, $1)= +-_LT_TAGVAR(always_export_symbols, $1)=no +-_LT_TAGVAR(archive_expsym_cmds, $1)= +-_LT_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_TAGVAR(hardcode_direct, $1)=no +-_LT_TAGVAR(hardcode_direct_absolute, $1)=no +-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_TAGVAR(hardcode_minus_L, $1)=no +-_LT_TAGVAR(hardcode_automatic, $1)=no +-_LT_TAGVAR(inherit_rpath, $1)=no +-_LT_TAGVAR(module_cmds, $1)= +-_LT_TAGVAR(module_expsym_cmds, $1)= +-_LT_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_TAGVAR(no_undefined_flag, $1)= +-_LT_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- +-# Source file extension for f77 test sources. +-ac_ext=f +- +-# Object file extension for compiled f77 test sources. +-objext=o +-_LT_TAGVAR(objext, $1)=$objext +- +-# No sense in running all these tests if we already determined that +-# the F77 compiler isn't working. Some variables (like enable_shared) +-# are currently assumed to apply to all compilers on this platform, +-# and will be corrupted by setting them based on a non-working compiler. +-if test "$_lt_disable_F77" != yes; then +- # Code to be used in simple compile tests +- lt_simple_compile_test_code="\ +- subroutine t +- return +- end +-" +- +- # Code to be used in simple link tests +- lt_simple_link_test_code="\ +- program t +- end +-" +- +- # ltmain only uses $CC for tagged configurations so make sure $CC is set. +- _LT_TAG_COMPILER +- +- # save warnings/boilerplate of simple test code +- _LT_COMPILER_BOILERPLATE +- _LT_LINKER_BOILERPLATE +- +- # Allow CC to be a program name with arguments. +- lt_save_CC="$CC" +- lt_save_GCC=$GCC +- CC=${F77-"f77"} +- compiler=$CC +- _LT_TAGVAR(compiler, $1)=$CC +- _LT_CC_BASENAME([$compiler]) +- GCC=$G77 +- if test -n "$compiler"; then +- AC_MSG_CHECKING([if libtool supports shared libraries]) +- AC_MSG_RESULT([$can_build_shared]) +- +- AC_MSG_CHECKING([whether to build shared libraries]) +- test "$can_build_shared" = "no" && enable_shared=no +- +- # On AIX, shared libraries and static libraries use the same namespace, and +- # are all built from PIC. +- case $host_os in +- aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +- aix[[4-9]]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; +- esac +- AC_MSG_RESULT([$enable_shared]) +- +- AC_MSG_CHECKING([whether to build static libraries]) +- # Make sure either enable_shared or enable_static is yes. +- test "$enable_shared" = yes || enable_static=yes +- AC_MSG_RESULT([$enable_static]) +- +- _LT_TAGVAR(GCC, $1)="$G77" +- _LT_TAGVAR(LD, $1)="$LD" +- +- ## CAVEAT EMPTOR: +- ## There is no encapsulation within the following macros, do not change +- ## the running order or otherwise move them around unless you know exactly +- ## what you are doing... +- _LT_COMPILER_PIC($1) +- _LT_COMPILER_C_O($1) +- _LT_COMPILER_FILE_LOCKS($1) +- _LT_LINKER_SHLIBS($1) +- _LT_SYS_DYNAMIC_LINKER($1) +- _LT_LINKER_HARDCODE_LIBPATH($1) +- +- _LT_CONFIG($1) +- fi # test -n "$compiler" +- +- GCC=$lt_save_GCC +- CC="$lt_save_CC" +-fi # test "$_lt_disable_F77" != yes +- +-AC_LANG_POP +-])# _LT_LANG_F77_CONFIG +- +- +-# _LT_PROG_FC +-# ----------- +-# Since AC_PROG_FC is broken, in that it returns the empty string +-# if there is no fortran compiler, we have our own version here. +-m4_defun([_LT_PROG_FC], +-[ +-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) +-AC_PROG_FC +-if test -z "$FC" || test "X$FC" = "Xno"; then +- _lt_disable_FC=yes +-fi +-popdef([AC_MSG_ERROR]) +-])# _LT_PROG_FC +- +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([_LT_PROG_FC], []) +- +- +-# _LT_LANG_FC_CONFIG([TAG]) +-# ------------------------- +-# Ensure that the configuration variables for a Fortran compiler are +-# suitably defined. These variables are subsequently used by _LT_CONFIG +-# to write the compiler configuration to `libtool'. +-m4_defun([_LT_LANG_FC_CONFIG], +-[AC_REQUIRE([_LT_PROG_FC])dnl +-AC_LANG_PUSH(Fortran) +- +-_LT_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_TAGVAR(allow_undefined_flag, $1)= +-_LT_TAGVAR(always_export_symbols, $1)=no +-_LT_TAGVAR(archive_expsym_cmds, $1)= +-_LT_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_TAGVAR(hardcode_direct, $1)=no +-_LT_TAGVAR(hardcode_direct_absolute, $1)=no +-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_TAGVAR(hardcode_minus_L, $1)=no +-_LT_TAGVAR(hardcode_automatic, $1)=no +-_LT_TAGVAR(inherit_rpath, $1)=no +-_LT_TAGVAR(module_cmds, $1)= +-_LT_TAGVAR(module_expsym_cmds, $1)= +-_LT_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_TAGVAR(no_undefined_flag, $1)= +-_LT_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- +-# Source file extension for fc test sources. +-ac_ext=${ac_fc_srcext-f} +- +-# Object file extension for compiled fc test sources. +-objext=o +-_LT_TAGVAR(objext, $1)=$objext +- +-# No sense in running all these tests if we already determined that +-# the FC compiler isn't working. Some variables (like enable_shared) +-# are currently assumed to apply to all compilers on this platform, +-# and will be corrupted by setting them based on a non-working compiler. +-if test "$_lt_disable_FC" != yes; then +- # Code to be used in simple compile tests +- lt_simple_compile_test_code="\ +- subroutine t +- return +- end +-" +- +- # Code to be used in simple link tests +- lt_simple_link_test_code="\ +- program t +- end +-" +- +- # ltmain only uses $CC for tagged configurations so make sure $CC is set. +- _LT_TAG_COMPILER +- +- # save warnings/boilerplate of simple test code +- _LT_COMPILER_BOILERPLATE +- _LT_LINKER_BOILERPLATE +- +- # Allow CC to be a program name with arguments. +- lt_save_CC="$CC" +- lt_save_GCC=$GCC +- CC=${FC-"f95"} +- compiler=$CC +- GCC=$ac_cv_fc_compiler_gnu +- +- _LT_TAGVAR(compiler, $1)=$CC +- _LT_CC_BASENAME([$compiler]) +- +- if test -n "$compiler"; then +- AC_MSG_CHECKING([if libtool supports shared libraries]) +- AC_MSG_RESULT([$can_build_shared]) +- +- AC_MSG_CHECKING([whether to build shared libraries]) +- test "$can_build_shared" = "no" && enable_shared=no +- +- # On AIX, shared libraries and static libraries use the same namespace, and +- # are all built from PIC. +- case $host_os in +- aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +- aix[[4-9]]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ esac ++ ;; ++ vxworks*) ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; + esac +- AC_MSG_RESULT([$enable_shared]) +- +- AC_MSG_CHECKING([whether to build static libraries]) +- # Make sure either enable_shared or enable_static is yes. +- test "$enable_shared" = yes || enable_static=yes +- AC_MSG_RESULT([$enable_static]) +- +- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" +- _LT_TAGVAR(LD, $1)="$LD" +- +- ## CAVEAT EMPTOR: +- ## There is no encapsulation within the following macros, do not change +- ## the running order or otherwise move them around unless you know exactly +- ## what you are doing... +- _LT_SYS_HIDDEN_LIBDEPS($1) +- _LT_COMPILER_PIC($1) +- _LT_COMPILER_C_O($1) +- _LT_COMPILER_FILE_LOCKS($1) +- _LT_LINKER_SHLIBS($1) +- _LT_SYS_DYNAMIC_LINKER($1) +- _LT_LINKER_HARDCODE_LIBPATH($1) +- +- _LT_CONFIG($1) +- fi # test -n "$compiler" +- +- GCC=$lt_save_GCC +- CC="$lt_save_CC" +-fi # test "$_lt_disable_FC" != yes ++ fi ++], ++[ ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + +-AC_LANG_POP +-])# _LT_LANG_FC_CONFIG ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; + ++ amigaos*) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; + +-# _LT_LANG_GCJ_CONFIG([TAG]) +-# -------------------------- +-# Ensure that the configuration variables for the GNU Java Compiler compiler +-# are suitably defined. These variables are subsequently used by _LT_CONFIG +-# to write the compiler configuration to `libtool'. +-m4_defun([_LT_LANG_GCJ_CONFIG], +-[AC_REQUIRE([LT_PROG_GCJ])dnl +-AC_LANG_SAVE ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; + +-# Source file extension for Java test sources. +-ac_ext=java ++ 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 ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + +-# Object file extension for compiled Java test sources. +-objext=o +-_LT_TAGVAR(objext, $1)=$objext ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}" ++ interix[[3-9]]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; + +-# Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ enable_shared=no ++ ;; + +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_TAG_COMPILER ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; + +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE ++ hpux*) ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; + +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-lt_save_GCC=$GCC +-GCC=yes +-CC=${GCJ-"gcj"} +-compiler=$CC +-_LT_TAGVAR(compiler, $1)=$CC +-_LT_TAGVAR(LD, $1)="$LD" +-_LT_CC_BASENAME([$compiler]) ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ darwin*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ case $cc_basename in ++ xlc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ esac ++ ;; + +-# GCJ did not exist at the time GCC didn't implicitly link libc in. +-_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ 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). ++ m4_if([$1], [GCJ], [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + +-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++ hpux9* | hpux10* | hpux11*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ ;; + +-if test -n "$compiler"; then +- _LT_COMPILER_NO_RTTI($1) +- _LT_COMPILER_PIC($1) +- _LT_COMPILER_C_O($1) +- _LT_COMPILER_FILE_LOCKS($1) +- _LT_LINKER_SHLIBS($1) +- _LT_LINKER_HARDCODE_LIBPATH($1) ++ irix5* | irix6* | nonstopux*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC (with -KPIC) is the default. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; + +- _LT_CONFIG($1) +-fi ++ newsos6) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + +-AC_LANG_RESTORE ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ icc* | ecc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ccc*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # 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 ++ ;; + +-GCC=$lt_save_GCC +-CC="$lt_save_CC" +-])# _LT_LANG_GCJ_CONFIG ++ osf3* | osf4* | osf5*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All OSF/1 code is PIC. ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; + ++ rdos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; + +-# _LT_LANG_RC_CONFIG([TAG]) +-# ------------------------- +-# Ensure that the configuration variables for the Windows resource compiler +-# are suitably defined. These variables are subsequently used by _LT_CONFIG +-# to write the compiler configuration to `libtool'. +-m4_defun([_LT_LANG_RC_CONFIG], +-[AC_REQUIRE([LT_PROG_RC])dnl +-AC_LANG_SAVE ++ solaris*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ esac ++ ;; + +-# Source file extension for RC test sources. +-ac_ext=rc ++ sunos4*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + +-# Object file extension for compiled RC test sources. +-objext=o +-_LT_TAGVAR(objext, $1)=$objext ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; + +-# Code to be used in simple link tests +-lt_simple_link_test_code="$lt_simple_compile_test_code" ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_TAG_COMPILER ++ unicos*) ++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; + +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE ++ uts4*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-lt_save_GCC=$GCC +-GCC= +-CC=${RC-"windres"} +-compiler=$CC +-_LT_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) +-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ esac ++ fi ++]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) + +-if test -n "$compiler"; then +- : +- _LT_CONFIG($1) +# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then ++ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), ++ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], ++ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in ++ "" | " "*) ;; ++ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++ esac], ++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) + fi ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ *) ++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++ ;; ++esac +-GCC=$lt_save_GCC +-AC_LANG_RESTORE +-CC="$lt_save_CC" +-])# _LT_LANG_RC_CONFIG ++# ++# Check to make sure the static flag actually works. ++# ++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" ++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), ++ $lt_tmp_static_flag, ++ [], ++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++]) + + +-# LT_PROG_GCJ +-# ----------- +-AC_DEFUN([LT_PROG_GCJ], +-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], +- [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], +- [AC_CHECK_TOOL(GCJ, gcj,) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +- AC_SUBST(GCJFLAGS)])])[]dnl +-]) ++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) ++# ------------------------------------ ++# See if the linker supports building shared libraries. ++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], ++[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 ++ aix[[4-9]]*) ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ fi ++ ;; ++ pw32*) ++ _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' ++ ;; ++ 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' ++ ;; ++ esac ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++],[ ++ runpath_var= ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ _LT_AC_TAGVAR(archive_cmds, $1)= ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= ++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=no ++ _LT_AC_TAGVAR(module_cmds, $1)= ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)= ++ _LT_AC_TAGVAR(always_export_symbols, $1)=no ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ _LT_AC_TAGVAR(include_expsyms, $1)= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # it will be wrapped by ` (' and `)$', so one must not match beginning or ++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++ # as well as any symbol that contains `d'. ++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++ # platforms (ab)use it in PIC code, but their linkers get confused if ++ # the symbol is explicitly referenced. Since portable code cannot ++ # rely on this symbol name, it's probably fine to never include it in ++ # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++dnl Note also adjust exclude_expsyms for C++ above. ++ extract_expsyms_cmds= ++ # Just being paranoid about ensuring that cc_basename is set. ++ _LT_CC_BASENAME([$compiler]) ++ case $host_os in ++ cygwin* | mingw* | pw32*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac + +-# Old name: +-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([LT_AC_PROG_GCJ], []) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ if test "$with_gnu_ld" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' + ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>/dev/null` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac + +-# LT_PROG_RC +-# ---------- +-AC_DEFUN([LT_PROG_RC], +-[AC_CHECK_TOOL(RC, windres,) +-]) ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix[[3-9]]*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <<EOF 1>&2 + +-# Old name: +-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([LT_AC_PROG_RC], []) ++*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. + ++EOF ++ fi ++ ;; + +-# _LT_DECL_EGREP +-# -------------- +-# If we don't have a new enough Autoconf to choose the best grep +-# available, choose the one first in the user's PATH. +-m4_defun([_LT_DECL_EGREP], +-[AC_REQUIRE([AC_PROG_EGREP])dnl +-AC_REQUIRE([AC_PROG_FGREP])dnl +-test -z "$GREP" && GREP=grep +-_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +-_LT_DECL([], [EGREP], [1], [An ERE matcher]) +-_LT_DECL([], [FGREP], [1], [A literal string matcher]) +-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +-AC_SUBST([GREP]) +-]) ++ amigaos*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ++ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports ++ # that the semantics of dynamic libraries on AmigaOS, at least up ++ # to version 4, is to share data among multiple programs linked ++ # with the same dynamic library. Since this doesn't match the ++ # behavior of shared libraries on other platforms, we can't use ++ # them. ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; + ++ beos*) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + +-# _LT_DECL_OBJDUMP +-# -------------- +-# If we don't have a new enough Autoconf to choose the best objdump +-# available, choose the one first in the user's PATH. +-m4_defun([_LT_DECL_OBJDUMP], +-[AC_CHECK_TOOL(OBJDUMP, objdump, false) +-test -z "$OBJDUMP" && OBJDUMP=objdump +-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +-AC_SUBST([OBJDUMP]) +-]) ++ cygwin* | mingw* | pw32*) ++ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _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/'\'' -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' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + +-# _LT_DECL_SED +-# ------------ +-# Check for a fully-functional sed program, that truncates +-# as few characters as possible. Prefer GNU sed if found. +-m4_defun([_LT_DECL_SED], +-[AC_PROG_SED +-test -z "$SED" && SED=sed +-Xsed="$SED -e 1s/^X//" +-_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], +- [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +-])# _LT_DECL_SED ++ 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' ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _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' ++ ;; + +-m4_ifndef([AC_PROG_SED], [ -# 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 # -# macro and use it instead. # --# LT_AC_PROG_SED --# -------------- --# Check for a fully-functional sed program, that truncates --# as few characters as possible. Prefer GNU sed if found. --AC_DEFUN([LT_AC_PROG_SED], ++ 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 ++ pgcc*) # Portland Group C compiler ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ esac ++ 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' + +-m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. @@ -2019,9 +14064,18 @@ Index: gtk+-2.14.4/aclocal.m4 - 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 ++ 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 '"$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 - done - done -done @@ -2060,6 +14114,2186 @@ Index: gtk+-2.14.4/aclocal.m4 -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) +-])#AC_PROG_SED +-])#m4_ifndef +- +-# Old name: +-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([LT_AC_PROG_SED], []) +- ++ ;; + +-# _LT_CHECK_SHELL_FEATURES +-# ------------------------ +-# Find out whether the shell is Bourne or XSI compatible, +-# or has some other useful features. +-m4_defun([_LT_CHECK_SHELL_FEATURES], +-[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +-# Try some XSI features +-xsi_shell=no +-( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ +- && eval 'test $(( 1 + 1 )) -eq 2 \ +- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ +- && xsi_shell=yes +-AC_MSG_RESULT([$xsi_shell]) +-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) +- +-AC_MSG_CHECKING([whether the shell understands "+="]) +-lt_shell_append=no +-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ +- >/dev/null 2>&1 \ +- && lt_shell_append=yes +-AC_MSG_RESULT([$lt_shell_append]) +-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) ++ 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= ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; + +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- lt_unset=unset +-else +- lt_unset=false +-fi +-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl ++ solaris*) ++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <<EOF 1>&2 + +-# test EBCDIC or ASCII +-case `echo X|tr X '\101'` in +- A) # ASCII based system +- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr +- lt_SP2NL='tr \040 \012' +- lt_NL2SP='tr \015\012 \040\040' +- ;; +- *) # EBCDIC based system +- lt_SP2NL='tr \100 \n' +- lt_NL2SP='tr \r\n \100\100' +- ;; +-esac +-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +-])# _LT_CHECK_SHELL_FEATURES ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. + ++EOF ++ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + +-# _LT_PROG_XSI_SHELLFNS +-# --------------------- +-# Bourne and XSI compatible variants of some useful shell functions. +-m4_defun([_LT_PROG_XSI_SHELLFNS], +-[case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 + +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. + +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} ++_LT_EOF ++ ;; ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} ++ sunos4*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} ++ *) ++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac + +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} ++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then ++ runpath_var= ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ fi ++ ;; + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} ++ aix[[4-9]]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $[*] )) +-} ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi + +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} ++ _LT_AC_TAGVAR(archive_cmds, $1)='' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +-} ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && \ ++ strings "$collect2name" | grep resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi + +-dnl func_dirname_and_basename +-dnl A portable version of this function is already defined in general.m4sh +-dnl so there is no need for it here. +- +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "X${3}" \ +- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "X${3}" \ +- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; +- esac +-} ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an empty executable. ++ _LT_AC_SYS_LIBPATH_AIX ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[[^=]]*=//' ++ amigaos*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ # see comment about different semantics on the GNU ld section ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +-} ++ bsdi[[45]]*) ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++ ;; + +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +-} ++ cygwin* | mingw* | pw32*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # 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(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` +-} ++ darwin* | rhapsody*) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' ++ ;; ++ *) # Darwin 1.3 on ++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ else ++ case ${MACOSX_DEPLOYMENT_TARGET} in ++ 10.[[012]]) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ++ ;; ++ 10.*) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ if test "$GCC" = yes ; then ++ output_verbose_link_cmd='echo' ++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ else ++ 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` $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 $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}' ++ ;; ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ fi ++ ;; + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$[@]"` +-} ++ dgux*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +-} ++ freebsd1*) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; + +-_LT_EOF +-esac ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]+=\$[2]" +-} +-_LT_EOF +- ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$[1]=\$$[1]\$[2]" +-} ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ 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 ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-_LT_EOF +- ;; +- esac +-]) ++ hpux9*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes + +-# ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*- +-# +-# Copyright (C) 1999-2006, 2007, 2008 Free Software Foundation, Inc. +-# Written by Thomas Tanner, 1999 +-# +-# This file is free software; the Free Software Foundation gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +- +-# serial 17 LTDL_INIT +- +-# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE]) +-# ------------------------------------------ +-# DIRECTORY contains the libltdl sources. It is okay to call this +-# function multiple times, as long as the same DIRECTORY is always given. +-AC_DEFUN([LT_CONFIG_LTDL_DIR], +-[AC_BEFORE([$0], [LTDL_INIT]) +-_$0($*) +-])# LT_CONFIG_LTDL_DIR +- +-# We break this out into a separate macro, so that we can call it safely +-# internally without being caught accidentally by the sed scan in libtoolize. +-m4_defun([_LT_CONFIG_LTDL_DIR], +-[dnl remove trailing slashes +-m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$])) +-m4_case(_LTDL_DIR, +- [], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply `.' +- m4_if(_ARG_DIR, [.], +- [], +- [m4_define([_LTDL_DIR], _ARG_DIR) +- _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])])], +- [m4_if(_ARG_DIR, _LTDL_DIR, +- [], +- [m4_fatal([multiple libltdl directories: `]_LTDL_DIR[', `]_ARG_DIR['])])]) +-m4_popdef([_ARG_DIR]) +-])# _LT_CONFIG_LTDL_DIR ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; + +-# Initialise: +-m4_define([_LTDL_DIR], []) ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + +-# _LT_BUILD_PREFIX +-# ---------------- +-# If Autoconf is new enough, expand to `${top_build_prefix}', otherwise +-# to `${top_builddir}/'. +-m4_define([_LT_BUILD_PREFIX], +-[m4_ifdef([AC_AUTOCONF_VERSION], +- [m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.62]), +- [-1], [m4_ifdef([_AC_HAVE_TOP_BUILD_PREFIX], +- [${top_build_prefix}], +- [${top_builddir}/])], +- [${top_build_prefix}])], +- [${top_builddir}/])[]dnl +-]) ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ fi ++ ;; + ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + +-# LTDL_CONVENIENCE +-# ---------------- +-# sets LIBLTDL to the link flags for the libltdl convenience library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-convenience to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. LIBLTDL will be prefixed with +-# '${top_build_prefix}' if available, otherwise with '${top_builddir}/', +-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single +-# quotes!). If your package is not flat and you're not using automake, +-# define top_build_prefix, top_builddir, and top_srcdir appropriately +-# in your Makefiles. +-AC_DEFUN([LTDL_CONVENIENCE], +-[AC_BEFORE([$0], [LTDL_INIT])dnl +-dnl Although the argument is deprecated and no longer documented, +-dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one +-dnl here make sure it is the same as any other declaration of libltdl's +-dnl location! This also ensures lt_ltdl_dir is set when configure.ac is +-dnl not yet using an explicit LT_CONFIG_LTDL_DIR. +-m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl +-_$0() +-])# LTDL_CONVENIENCE +- +-# AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools, +-# now we have LT_CONFIG_LTDL_DIR: +-AU_DEFUN([AC_LIBLTDL_CONVENIENCE], +-[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) +-_LTDL_CONVENIENCE]) ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIBLTDL_CONVENIENCE], []) ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac ++ fi ++ ;; + ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ ;; + +-# _LTDL_CONVENIENCE +-# ----------------- +-# Code shared by LTDL_CONVENIENCE and LTDL_INIT([convenience]). +-m4_defun([_LTDL_CONVENIENCE], +-[case $enable_ltdl_convenience in +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +-esac +-LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la" +-LTDLDEPS=$LIBLTDL +-LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}" ++ 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 ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-AC_SUBST([LIBLTDL]) +-AC_SUBST([LTDLDEPS]) +-AC_SUBST([LTDLINCL]) ++ newsos6) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# For backwards non-gettext consistent compatibility... +-INCLTDL="$LTDLINCL" +-AC_SUBST([INCLTDL]) +-])# _LTDL_CONVENIENCE ++ openbsd*) ++ 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 ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + ++ os2*) ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ ;; + +-# LTDL_INSTALLABLE +-# ---------------- +-# sets LIBLTDL to the link flags for the libltdl installable library +-# and LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-install to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called from here. If an installed libltdl +-# is not found, LIBLTDL will be prefixed with '${top_build_prefix}' if +-# available, otherwise with '${top_builddir}/', and LTDLINCL will be +-# prefixed with '${top_srcdir}/' (note the single quotes!). If your +-# package is not flat and you're not using automake, define top_build_prefix, +-# top_builddir, and top_srcdir appropriately in your Makefiles. +-# In the future, this macro may have to be called after LT_INIT. +-AC_DEFUN([LTDL_INSTALLABLE], +-[AC_BEFORE([$0], [LTDL_INIT])dnl +-dnl Although the argument is deprecated and no longer documented, +-dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one +-dnl here make sure it is the same as any other declaration of libltdl's +-dnl location! This also ensures lt_ltdl_dir is set when configure.ac is +-dnl not yet using an explicit LT_CONFIG_LTDL_DIR. +-m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl +-_$0() +-])# LTDL_INSTALLABLE +- +-# AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools, +-# now we have LT_CONFIG_LTDL_DIR: +-AU_DEFUN([AC_LIBLTDL_INSTALLABLE], +-[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) +-_LTDL_INSTALLABLE]) ++ osf3*) ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; + +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], []) ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ else ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ ++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + ++ # Both c and cxx compiler support -rpath directly ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; + +-# _LTDL_INSTALLABLE +-# ----------------- +-# Code shared by LTDL_INSTALLABLE and LTDL_INIT([installable]). +-m4_defun([_LTDL_INSTALLABLE], +-[if test -f $prefix/lib/libltdl.la; then +- lt_save_LDFLAGS="$LDFLAGS" +- LDFLAGS="-L$prefix/lib $LDFLAGS" +- AC_CHECK_LIB([ltdl], [lt_dlinit], [lt_lib_ltdl=yes]) +- LDFLAGS="$lt_save_LDFLAGS" +- if test x"${lt_lib_ltdl-no}" = xyes; then +- if test x"$enable_ltdl_install" != xyes; then +- # Don't overwrite $prefix/lib/libltdl.la without --enable-ltdl-install +- AC_MSG_WARN([not overwriting libltdl at $prefix, force with `--enable-ltdl-install']) +- enable_ltdl_install=no +- fi +- elif test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- fi +-fi ++ solaris*) ++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ else ++ wlarc='' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # 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?) ++ 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 ++ ;; + +-# If configure.ac declared an installable ltdl, and the user didn't override +-# with --disable-ltdl-install, we will install the shipped libltdl. +-case $enable_ltdl_install in +- no) ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- LTDLDEPS= +- LTDLINCL= +- ;; +- *) enable_ltdl_install=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdl.la" +- LTDLDEPS=$LIBLTDL +- LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}" ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; +-esac + +-AC_SUBST([LIBLTDL]) +-AC_SUBST([LTDLDEPS]) +-AC_SUBST([LTDLINCL]) ++ sysv4) ++ case $host_vendor in ++ sni) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no ++ ;; ++ motorola) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# For backwards non-gettext consistent compatibility... +-INCLTDL="$LTDLINCL" +-AC_SUBST([INCLTDL]) +-])# LTDL_INSTALLABLE ++ sysv4.3*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++ ;; + ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes ++ fi ++ ;; + +-# _LTDL_MODE_DISPATCH +-# ------------------- +-m4_define([_LTDL_MODE_DISPATCH], +-[dnl If _LTDL_DIR is `.', then we are configuring libltdl itself: +-m4_if(_LTDL_DIR, [], +- [], +- dnl if _LTDL_MODE was not set already, the default value is `subproject': +- [m4_case(m4_default(_LTDL_MODE, [subproject]), +- [subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR) +- _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])], +- [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"; lt_libobj_prefix="$lt_ltdl_dir/"])], +- [recursive], [], +- [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])dnl +-dnl Be careful not to expand twice: +-m4_define([$0], []) +-])# _LTDL_MODE_DISPATCH ++ 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 ++ runpath_var='LD_RUN_PATH' + ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; + +-# _LT_LIBOBJ(MODULE_NAME) +-# ----------------------- +-# Like AC_LIBOBJ, except that MODULE_NAME goes into _LT_LIBOBJS instead +-# of into LIBOBJS. +-AC_DEFUN([_LT_LIBOBJ], [ +- m4_pattern_allow([^_LT_LIBOBJS$]) +- _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext" +-])# _LT_LIBOBJS ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' ++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' + ++ if test "$GCC" = yes; then ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; + +-# LTDL_INIT([OPTIONS]) +-# -------------------- +-# Clients of libltdl can use this macro to allow the installer to +-# choose between a shipped copy of the ltdl sources or a preinstalled +-# version of the library. If the shipped ltdl sources are not in a +-# subdirectory named libltdl, the directory name must be given by +-# LT_CONFIG_LTDL_DIR. +-AC_DEFUN([LTDL_INIT], +-[dnl Parse OPTIONS +-_LT_SET_OPTIONS([$0], [$1]) +- +-dnl We need to keep our own list of libobjs separate from our parent project, +-dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while +-dnl we look for our own LIBOBJs. +-m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ])) +-m4_pushdef([AC_LIBSOURCES]) +- +-dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: +-m4_if(_LTDL_MODE, [], +- [m4_define([_LTDL_MODE], m4_default([$2], [subproject])) +- m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])], +- [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])]) +- +-AC_ARG_WITH([included_ltdl], +- [AS_HELP_STRING([--with-included-ltdl], +- [use the GNU ltdl sources included here])]) +- +-if test "x$with_included_ltdl" != xyes; then +- # We are not being forced to use the included libltdl sources, so +- # decide whether there is a useful installed version we can use. +- AC_CHECK_HEADER([ltdl.h], +- [AC_CHECK_DECL([lt_dlinterface_register], +- [AC_CHECK_LIB([ltdl], [lt_dladvise_preload], +- [with_included_ltdl=no], +- [with_included_ltdl=yes])], +- [with_included_ltdl=yes], +- [AC_INCLUDES_DEFAULT +- #include <ltdl.h>])], +- [with_included_ltdl=yes], +- [AC_INCLUDES_DEFAULT] +- ) +-fi +- +-dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE +-dnl was called yet, then for old times' sake, we assume libltdl is in an +-dnl eponymous directory: +-AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])]) +- +-AC_ARG_WITH([ltdl_include], +- [AS_HELP_STRING([--with-ltdl-include=DIR], +- [use the ltdl headers installed in DIR])]) ++ uts4*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-if test -n "$with_ltdl_include"; then +- if test -f "$with_ltdl_include/ltdl.h"; then : +- else +- AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include']) ++ *) ++ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac + fi +-else +- with_ltdl_include=no +-fi ++]) ++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +-AC_ARG_WITH([ltdl_lib], +- [AS_HELP_STRING([--with-ltdl-lib=DIR], +- [use the libltdl.la installed in DIR])]) ++# ++# Do we need to explicitly link libc? ++# ++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in ++x|xyes) ++ # Assume -lc should be added ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + +-if test -n "$with_ltdl_lib"; then +- if test -f "$with_ltdl_lib/libltdl.la"; then : +- else +- AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib']) +- fi +-else +- with_ltdl_lib=no +-fi ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $_LT_AC_TAGVAR(archive_cmds, $1) in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++ $rm conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +-case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in +- ,yes,no,no,) +- m4_case(m4_default(_LTDL_TYPE, [convenience]), +- [convenience], [_LTDL_CONVENIENCE], +- [installable], [_LTDL_INSTALLABLE], +- [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)]) +- ;; +- ,no,no,no,) +- # If the included ltdl is not to be used, then use the +- # preinstalled libltdl we found. +- AC_DEFINE([HAVE_LTDL], [1], +- [Define this if a modern libltdl is already installed]) +- LIBLTDL=-lltdl +- LTDLDEPS= +- LTDLINCL= +- ;; +- ,no*,no,*) +- AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together]) +- ;; +- *) with_included_ltdl=no +- LIBLTDL="-L$with_ltdl_lib -lltdl" +- LTDLDEPS= +- LTDLINCL="-I$with_ltdl_include" +- ;; ++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)= ++ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) ++ then ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ else ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++ fi ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $rm conftest* ++ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) ++ ;; ++ esac ++ fi ++ ;; + esac +-INCLTDL="$LTDLINCL" ++])# AC_LIBTOOL_PROG_LD_SHLIBS + +-# Report our decision... +-AC_MSG_CHECKING([where to find libltdl headers]) +-AC_MSG_RESULT([$LTDLINCL]) +-AC_MSG_CHECKING([where to find libltdl library]) +-AC_MSG_RESULT([$LIBLTDL]) +- +-_LTDL_SETUP +- +-dnl restore autoconf definition. +-m4_popdef([AC_LIBOBJ]) +-m4_popdef([AC_LIBSOURCES]) +- +-AC_CONFIG_COMMANDS_PRE([ +- _ltdl_libobjs= +- _ltdl_ltlibobjs= +- if test -n "$_LT_LIBOBJS"; then +- # Remove the extension. +- _lt_sed_drop_objext='s/\.o$//;s/\.obj$//' +- for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do +- _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext" +- _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo" +- done +- fi +- AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs]) +- AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs]) +-]) + +-# Only expand once: +-m4_define([LTDL_INIT]) +-])# LTDL_INIT +- +-# Old names: +-AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)]) +-AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)]) +-AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LIB_LTDL], []) +-dnl AC_DEFUN([AC_WITH_LTDL], []) +-dnl AC_DEFUN([LT_WITH_LTDL], []) ++# _LT_AC_FILE_LTDLL_C ++# ------------------- ++# Be careful that the start marker always follows a newline. ++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ ++# /* ltdll.c starts here */ ++# #define WIN32_LEAN_AND_MEAN ++# #include <windows.h> ++# #undef WIN32_LEAN_AND_MEAN ++# #include <stdio.h> ++# ++# #ifndef __CYGWIN__ ++# # ifdef __CYGWIN32__ ++# # define __CYGWIN__ __CYGWIN32__ ++# # endif ++# #endif ++# ++# #ifdef __cplusplus ++# extern "C" { ++# #endif ++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); ++# #ifdef __cplusplus ++# } ++# #endif ++# ++# #ifdef __CYGWIN__ ++# #include <cygwin/cygwin_dll.h> ++# DECLARE_CYGWIN_DLL( DllMain ); ++# #endif ++# HINSTANCE __hDllInstance_base; ++# ++# BOOL APIENTRY ++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) ++# { ++# __hDllInstance_base = hInst; ++# return TRUE; ++# } ++# /* ltdll.c ends here */ ++])# _LT_AC_FILE_LTDLL_C + + +-# _LTDL_SETUP +-# ----------- +-# Perform all the checks necessary for compilation of the ltdl objects +-# -- including compiler checks and header checks. This is a public +-# interface mainly for the benefit of libltdl's own configure.ac, most +-# other users should call LTDL_INIT instead. +-AC_DEFUN([_LTDL_SETUP], +-[AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([LT_SYS_MODULE_EXT])dnl +-AC_REQUIRE([LT_SYS_MODULE_PATH])dnl +-AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl +-AC_REQUIRE([LT_LIB_DLLOAD])dnl +-AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl +-AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl +-AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl +-AC_REQUIRE([gl_FUNC_ARGZ])dnl +- +-m4_require([_LT_CHECK_OBJDIR])dnl +-m4_require([_LT_HEADER_DLFCN])dnl +-m4_require([_LT_CHECK_DLPREOPEN])dnl +-m4_require([_LT_DECL_SED])dnl +- +-dnl Don't require this, or it will be expanded earlier than the code +-dnl that sets the variables it relies on: +-_LT_ENABLE_INSTALL +- +-dnl _LTDL_MODE specific code must be called at least once: +-_LTDL_MODE_DISPATCH +- +-# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS +-# the user used. This is so that ltdl.h can pick up the parent projects +-# config.h file, The first file in AC_CONFIG_HEADERS must contain the +-# definitions required by ltdl.c. +-# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility). +-AC_CONFIG_COMMANDS_PRE([dnl +-m4_pattern_allow([^LT_CONFIG_H$])dnl +-m4_ifset([AH_HEADER], +- [LT_CONFIG_H=AH_HEADER], +- [m4_ifset([AC_LIST_HEADERS], +- [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[ ]]*,,;s,[[ :]].*$,,'`], +- [])])]) +-AC_SUBST([LT_CONFIG_H]) +- +-AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h], +- [], [], [AC_INCLUDES_DEFAULT]) +- +-AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) +-AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) +- +-AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension]) +- +-name=ltdl +-LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` +-AC_SUBST([LTDLOPEN]) +-])# _LTDL_SETUP ++# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++# --------------------------------- ++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) + + +-# _LT_ENABLE_INSTALL +-# ------------------ +-m4_define([_LT_ENABLE_INSTALL], +-[AC_ARG_ENABLE([ltdl-install], +- [AS_HELP_STRING([--enable-ltdl-install], [install libltdl])]) +- +-case ,${enable_ltdl_install},${enable_ltdl_convenience} in +- *yes*) ;; +- *) enable_ltdl_convenience=yes ;; +-esac ++# old names ++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) ++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) ++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) + +-m4_ifdef([AM_CONDITIONAL], +-[AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno) +- AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)]) +-])# _LT_ENABLE_INSTALL ++# This is just to silence aclocal about the macro not being used ++ifelse([AC_DISABLE_FAST_INSTALL]) + ++AC_DEFUN([LT_AC_PROG_GCJ], ++[AC_CHECK_TOOL(GCJ, gcj, no) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS) ++]) + +-# LT_SYS_DLOPEN_DEPLIBS +-# --------------------- +-AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_CACHE_CHECK([whether deplibs are loaded by dlopen], +- [lt_cv_sys_dlopen_deplibs], +- [# PORTME does your system automatically load deplibs for dlopen? +- # or its logical equivalent (e.g. shl_load for HP-UX < 11) +- # For now, we just catch OSes we know something about -- in the +- # future, we'll try test this programmatically. +- lt_cv_sys_dlopen_deplibs=unknown +- case $host_os in +- aix3*|aix4.1.*|aix4.2.*) +- # Unknown whether this is true for these versions of AIX, but +- # we want this `case' here to explicitly catch those versions. +- lt_cv_sys_dlopen_deplibs=unknown +- ;; +- aix[[4-9]]*) +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- amigaos*) +- case $host_cpu in +- powerpc) +- lt_cv_sys_dlopen_deplibs=no +- ;; +- esac +- ;; +- darwin*) +- # Assuming the user has installed a libdl from somewhere, this is true +- # If you are looking for one http://www.opendarwin.org/projects/dlcompat +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- freebsd* | dragonfly*) +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- gnu* | linux* | k*bsd*-gnu) +- # GNU and its variants, using gnu ld.so (Glibc) +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- hpux10*|hpux11*) +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- interix*) +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- irix[[12345]]*|irix6.[[01]]*) +- # Catch all versions of IRIX before 6.2, and indicate that we don't +- # know how it worked for any of those versions. +- lt_cv_sys_dlopen_deplibs=unknown +- ;; +- irix*) +- # The case above catches anything before 6.2, and it's known that +- # at 6.2 and later dlopen does load deplibs. +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- netbsd*) +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- openbsd*) +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- osf[[1234]]*) +- # dlopen did load deplibs (at least at 4.x), but until the 5.x series, +- # it did *not* use an RPATH in a shared library to find objects the +- # library depends on, so we explicitly say `no'. +- lt_cv_sys_dlopen_deplibs=no +- ;; +- osf5.0|osf5.0a|osf5.1) +- # dlopen *does* load deplibs and with the right loader patch applied +- # it even uses RPATH in a shared library to search for shared objects +- # that the library depends on, but there's no easy way to know if that +- # patch is installed. Since this is the case, all we can really +- # say is unknown -- it depends on the patch being installed. If +- # it is, this changes to `yes'. Without it, it would be `no'. +- lt_cv_sys_dlopen_deplibs=unknown +- ;; +- osf*) +- # the two cases above should catch all versions of osf <= 5.1. Read +- # the comments above for what we know about them. +- # At > 5.1, deplibs are loaded *and* any RPATH in a shared library +- # is used to find them so we can finally say `yes'. +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- qnx*) +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- solaris*) +- lt_cv_sys_dlopen_deplibs=yes +- ;; +- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- libltdl_cv_sys_dlopen_deplibs=yes +- ;; +- esac +- ]) +-if test "$lt_cv_sys_dlopen_deplibs" != yes; then +- AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1], +- [Define if the OS needs help to load dependent libraries for dlopen().]) +-fi +-])# LT_SYS_DLOPEN_DEPLIBS ++AC_DEFUN([LT_AC_PROG_RC], ++[AC_CHECK_TOOL(RC, windres, no) ++]) + +-# Old name: +-AU_ALIAS([AC_LTDL_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], []) + ++# Cheap backport of AS_EXECUTABLE_P and required macros ++# from Autoconf 2.59; we should not use $as_executable_p directly. + +-# LT_SYS_MODULE_EXT +-# ----------------- +-AC_DEFUN([LT_SYS_MODULE_EXT], +-[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl +-AC_CACHE_CHECK([which extension is used for runtime loadable modules], +- [libltdl_cv_shlibext], +-[ +-module=yes +-eval libltdl_cv_shlibext=$shrext_cmds +- ]) +-if test -n "$libltdl_cv_shlibext"; then +- m4_pattern_allow([LT_MODULE_EXT])dnl +- AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"], +- [Define to the extension used for runtime loadable modules, say, ".so".]) ++# _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 +-])# LT_SYS_MODULE_EXT +- +-# Old name: +-AU_ALIAS([AC_LTDL_SHLIBEXT], [LT_SYS_MODULE_EXT]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LTDL_SHLIBEXT], []) +- +- +-# LT_SYS_MODULE_PATH +-# ------------------ +-AC_DEFUN([LT_SYS_MODULE_PATH], +-[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl +-AC_CACHE_CHECK([which variable specifies run-time module search path], +- [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"]) +-if test -n "$lt_cv_module_path_var"; then +- m4_pattern_allow([LT_MODULE_PATH_VAR])dnl +- AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"], +- [Define to the name of the environment variable that determines the run-time module search path.]) +-fi +-])# LT_SYS_MODULE_PATH +- +-# Old name: +-AU_ALIAS([AC_LTDL_SHLIBPATH], [LT_SYS_MODULE_PATH]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LTDL_SHLIBPATH], []) ++])])# _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 + +-# LT_SYS_DLSEARCH_PATH +-# -------------------- +-AC_DEFUN([LT_SYS_DLSEARCH_PATH], +-[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl +-AC_CACHE_CHECK([for the default library search path], +- [lt_cv_sys_dlsearch_path], +- [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"]) +-if test -n "$lt_cv_sys_dlsearch_path"; then +- sys_dlsearch_path= +- for dir in $lt_cv_sys_dlsearch_path; do +- if test -z "$sys_dlsearch_path"; then +- sys_dlsearch_path="$dir" +- else +- sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir" +- fi ++# 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 # ++# macro and use it instead. # ++# LT_AC_PROG_SED ++# -------------- ++# Check for a fully-functional sed program, that truncates ++# as few characters as possible. Prefer GNU sed if found. ++AC_DEFUN([LT_AC_PROG_SED], ++[AC_MSG_CHECKING([for a sed that does not truncate output]) ++AC_CACHE_VAL(lt_cv_path_SED, ++[# Loop through the user's path and test for sed and gsed. ++# Then use that list of sed's as ones to test for truncation. ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ 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 ++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++ fi ++ done + done +- m4_pattern_allow([LT_DLSEARCH_PATH])dnl +- AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"], +- [Define to the system default library search path.]) +-fi +-])# LT_SYS_DLSEARCH_PATH +- +-# Old name: +-AU_ALIAS([AC_LTDL_SYSSEARCHPATH], [LT_SYS_DLSEARCH_PATH]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LTDL_SYSSEARCHPATH], []) +- +- +-# _LT_CHECK_DLPREOPEN +-# ------------------- +-m4_defun([_LT_CHECK_DLPREOPEN], +-[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +-AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen], +- [libltdl_cv_preloaded_symbols], +- [if test -n "$lt_cv_sys_global_symbol_pipe"; then +- libltdl_cv_preloaded_symbols=yes +- else +- libltdl_cv_preloaded_symbols=no ++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 ++# along with /bin/sed that truncates output. ++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++ test ! -f $lt_ac_sed && continue ++ cat /dev/null > conftest.in ++ lt_ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++ # Check for GNU sed and select it if it is found. ++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++ lt_cv_path_SED=$lt_ac_sed ++ break + fi +- ]) +-if test x"$libltdl_cv_preloaded_symbols" = xyes; then +- AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1], +- [Define if libtool can extract symbol lists from object files.]) +-fi +-])# _LT_CHECK_DLPREOPEN +- +- +-# LT_LIB_DLLOAD +-# ------------- +-AC_DEFUN([LT_LIB_DLLOAD], +-[m4_pattern_allow([^LT_DLLOADERS$]) +-LT_DLLOADERS= +-AC_SUBST([LT_DLLOADERS]) +- +-AC_LANG_PUSH([C]) +- +-LIBADD_DLOPEN= +-AC_SEARCH_LIBS([dlopen], [dl], +- [AC_DEFINE([HAVE_LIBDL], [1], +- [Define if you have the libdl library or equivalent.]) +- if test "$ac_cv_search_dlopen" != "none required" ; then +- LIBADD_DLOPEN="-ldl" +- fi +- libltdl_cv_lib_dl_dlopen="yes" +- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], +- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H +-# include <dlfcn.h> +-#endif +- ]], [[dlopen(0, 0);]])], +- [AC_DEFINE([HAVE_LIBDL], [1], +- [Define if you have the libdl library or equivalent.]) +- libltdl_cv_func_dlopen="yes" +- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], +- [AC_CHECK_LIB([svld], [dlopen], +- [AC_DEFINE([HAVE_LIBDL], [1], +- [Define if you have the libdl library or equivalent.]) +- LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes" +- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])]) +-if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes +-then +- lt_save_LIBS="$LIBS" +- LIBS="$LIBS $LIBADD_DLOPEN" +- AC_CHECK_FUNCS([dlerror]) +- LIBS="$lt_save_LIBS" +-fi +-AC_SUBST([LIBADD_DLOPEN]) +- +-LIBADD_SHL_LOAD= +-AC_CHECK_FUNC([shl_load], +- [AC_DEFINE([HAVE_SHL_LOAD], [1], +- [Define if you have the shl_load function.]) +- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"], +- [AC_CHECK_LIB([dld], [shl_load], +- [AC_DEFINE([HAVE_SHL_LOAD], [1], +- [Define if you have the shl_load function.]) +- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la" +- LIBADD_SHL_LOAD="-ldld"])]) +-AC_SUBST([LIBADD_SHL_LOAD]) ++ while true; do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >>conftest.nl ++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++ cmp -s conftest.out conftest.nl || break ++ # 10000 chars as input seems more than enough ++ test $lt_ac_count -gt 10 && break ++ lt_ac_count=`expr $lt_ac_count + 1` ++ if test $lt_ac_count -gt $lt_ac_max; then ++ lt_ac_max=$lt_ac_count ++ lt_cv_path_SED=$lt_ac_sed ++ fi ++ done ++done ++]) ++SED=$lt_cv_path_SED ++AC_SUBST([SED]) ++AC_MSG_RESULT([$SED]) ++]) + +-case $host_os in +-darwin[[1567]].*) +-# We only want this for pre-Mac OS X 10.4. +- AC_CHECK_FUNC([_dyld_func_lookup], +- [AC_DEFINE([HAVE_DYLD], [1], +- [Define if you have the _dyld_func_lookup function.]) +- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"]) +- ;; +-beos*) +- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" +- ;; +-cygwin* | mingw* | os2* | pw32*) +- AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]]) +- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la" +- ;; +-esac ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program 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 ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. + +-AC_CHECK_LIB([dld], [dld_link], +- [AC_DEFINE([HAVE_DLD], [1], +- [Define if you have the GNU dld library.]) +- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"]) +-AC_SUBST([LIBADD_DLD_LINK]) +- +-m4_pattern_allow([^LT_DLPREOPEN$]) +-LT_DLPREOPEN= +-if test -n "$LT_DLLOADERS" +-then +- for lt_loader in $LT_DLLOADERS; do +- LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader " +- done +- AC_DEFINE([HAVE_LIBDLLOADER], [1], +- [Define if libdlloader will be built on this platform]) ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + fi +-AC_SUBST([LT_DLPREOPEN]) +- +-dnl This isn't used anymore, but set it for backwards compatibility +-LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD" +-AC_SUBST([LIBADD_DL]) +- +-AC_LANG_POP +-])# LT_LIB_DLLOAD ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG + +-# Old name: +-AU_ALIAS([AC_LTDL_DLLIB], [LT_LIB_DLLOAD]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LTDL_DLLIB], []) ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) + + +-# LT_SYS_SYMBOL_USCORE +-# -------------------- +-# does the compiler prefix global symbols with an underscore? +-AC_DEFUN([LT_SYS_SYMBOL_USCORE], +-[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +-AC_CACHE_CHECK([for _ prefix in compiled symbols], +- [lt_cv_sys_symbol_underscore], +- [lt_cv_sys_symbol_underscore=no +- cat > conftest.$ac_ext <<_LT_EOF +-void nm_test_func(){} +-int main(){nm_test_func;return 0;} +-_LT_EOF +- if AC_TRY_EVAL(ac_compile); then +- # Now try to grab the symbols. +- ac_nlist=conftest.nm +- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then +- # See whether the symbols have a leading underscore. +- if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then +- lt_cv_sys_symbol_underscore=yes +- else +- if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then +- : +- else +- echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD +- fi +- fi ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" + else +- echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) + fi +- else +- echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD +- cat conftest.c >&AS_MESSAGE_LOG_FD +- fi +- rm -rf conftest* +- ]) +- sys_symbol_underscore=$lt_cv_sys_symbol_underscore +- AC_SUBST([sys_symbol_underscore]) +-])# LT_SYS_SYMBOL_USCORE +- +-# Old name: +-AU_ALIAS([AC_LTDL_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], []) +- +- +-# LT_FUNC_DLSYM_USCORE +-# -------------------- +-AC_DEFUN([LT_FUNC_DLSYM_USCORE], +-[AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl +-if test x"$lt_cv_sys_symbol_underscore" = xyes; then +- if test x"$libltdl_cv_func_dlopen" = xyes || +- test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then +- AC_CACHE_CHECK([whether we have to add an underscore for dlsym], +- [libltdl_cv_need_uscore], +- [libltdl_cv_need_uscore=unknown +- save_LIBS="$LIBS" +- LIBS="$LIBS $LIBADD_DLOPEN" +- _LT_TRY_DLOPEN_SELF( +- [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes], +- [], [libltdl_cv_need_uscore=cross]) +- LIBS="$save_LIBS" +- ]) +- fi +-fi ++else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG + +-if test x"$libltdl_cv_need_uscore" = xyes; then +- AC_DEFINE([NEED_USCORE], [1], +- [Define if dlsym() requires a leading underscore in symbol names.]) +-fi +-])# LT_FUNC_DLSYM_USCORE ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED + +-# Old name: +-AU_ALIAS([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE]) +-dnl aclocal-1.4 backwards compatibility: +-dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], []) + +-# Portability macros for glibc argz. -*- Autoconf -*- ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) + # +-# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +-# Written by Gary V. Vaughan <gary@gnu.org> + # +-# This file is free software; the Free Software Foundation gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +- +-# serial 5 argz.m4 +- +-AC_DEFUN([gl_FUNC_ARGZ], +-[gl_PREREQ_ARGZ +- +-AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT]) +- +-AC_CHECK_TYPES([error_t], +- [], +- [AC_DEFINE([error_t], [int], +- [Define to a type to use for `error_t' if it is not otherwise available.]) +- AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h +- does not typedef error_t.])], +- [#if defined(HAVE_ARGZ_H) +-# include <argz.h> +-#endif]) +- +-ARGZ_H= +-AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \ +- argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])]) +- +-dnl if have system argz functions, allow forced use of +-dnl libltdl-supplied implementation (and default to do so +-dnl on "known bad" systems). Could use a runtime check, but +-dnl (a) detecting malloc issues is notoriously unreliable +-dnl (b) only known system that declares argz functions, +-dnl provides them, yet they are broken, is cygwin +-dnl releases prior to 16-Mar-2007 (1.5.24 and earlier) +-dnl So, it's more straightforward simply to special case +-dnl this for known bad systems. +-AS_IF([test -z "$ARGZ_H"], +- [AC_CACHE_CHECK( +- [if argz actually works], +- [lt_cv_sys_argz_works], +- [[case $host_os in #( +- *cygwin*) +- lt_cv_sys_argz_works=no +- if test "$cross_compiling" != no; then +- lt_cv_sys_argz_works="guessing no" +- else +- lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' +- save_IFS=$IFS +- IFS=-. +- set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` +- IFS=$save_IFS +- lt_os_major=${2-0} +- lt_os_minor=${3-0} +- lt_os_micro=${4-0} +- if test "$lt_os_major" -gt 1 \ +- || { test "$lt_os_major" -eq 1 \ +- && { test "$lt_os_minor" -gt 5 \ +- || { test "$lt_os_minor" -eq 5 \ +- && test "$lt_os_micro" -gt 24; }; }; }; then +- lt_cv_sys_argz_works=yes +- fi +- fi +- ;; #( +- *) lt_cv_sys_argz_works=yes ;; +- esac]]) +- AS_IF([test $lt_cv_sys_argz_works = yes], +- [AC_DEFINE([HAVE_WORKING_ARGZ], 1, +- [This value is set to 1 to indicate that the system argz facility works])], +- [ARGZ_H=argz.h +- AC_LIBOBJ([argz])])]) +- +-AC_SUBST([ARGZ_H]) +-]) +- +-# Prerequisites of lib/argz.c. +-AC_DEFUN([gl_PREREQ_ARGZ], [:]) +- +-# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac + # +-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +-# Written by Gary V. Vaughan, 2004 + # +-# This file is free software; the Free Software Foundation gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +- +-# serial 6 ltsugar.m4 +- +-# This is to help aclocal find these macros, as it can't see m4_define. +-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) +- +- +-# lt_join(SEP, ARG1, [ARG2...]) +-# ----------------------------- +-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +-# associated separator. +-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +-# versions in m4sugar had bugs. +-m4_define([lt_join], +-[m4_if([$#], [1], [], +- [$#], [2], [[$2]], +- [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +-m4_define([_lt_join], +-[m4_if([$#$2], [2], [], +- [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) + +-# lt_car(LIST) +-# lt_cdr(LIST) +-# ------------ +-# Manipulate m4 lists. +-# These macros are necessary as long as will still need to support +-# Autoconf-2.59 which quotes differently. +-m4_define([lt_car], [[$1]]) +-m4_define([lt_cdr], +-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], +- [$#], 1, [], +- [m4_dquote(m4_shift($@))])]) +-m4_define([lt_unquote], $1) +- +- +-# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +-# ------------------------------------------ +-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +-# Note that neither SEPARATOR nor STRING are expanded; they are appended +-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +-# No SEPARATOR is output if MACRO-NAME was previously undefined (different +-# than defined and empty). +-# +-# This macro is needed until we can rely on Autoconf 2.62, since earlier +-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +-m4_define([lt_append], +-[m4_define([$1], +- m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) + ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + +-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +-# ---------------------------------------------------------- +-# Produce a SEP delimited list of all paired combinations of elements of +-# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +-# has the form PREFIXmINFIXSUFFIXn. +-# Needed until we can rely on m4_combine added in Autoconf 2.62. +-m4_define([lt_combine], +-[m4_if(m4_eval([$# > 3]), [1], +- [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +-[[m4_foreach([_Lt_prefix], [$2], +- [m4_foreach([_Lt_suffix], +- ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, +- [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) +- +- +-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +-# ----------------------------------------------------------------------- +-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +-m4_define([lt_if_append_uniq], +-[m4_ifdef([$1], +- [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], +- [lt_append([$1], [$2], [$3])$4], +- [$5])], +- [lt_append([$1], [$2], [$3])$4])]) ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: + ++$$1_PKG_ERRORS + +-# lt_dict_add(DICT, KEY, VALUE) +-# ----------------------------- +-m4_define([lt_dict_add], +-[m4_define([$1($2)], [$3])]) ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + ++_PKG_TEXT ++])], ++ [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 ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. + +-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +-# -------------------------------------------- +-m4_define([lt_dict_add_subkey], +-[m4_define([$1($2:$3)], [$4])]) ++_PKG_TEXT + ++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES + +-# lt_dict_fetch(DICT, KEY, [SUBKEY]) +-# ---------------------------------- +-m4_define([lt_dict_fetch], +-[m4_ifval([$3], +- m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), +- m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) ++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -2071,11 +16305,14 @@ Index: gtk+-2.14.4/aclocal.m4 +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.10.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) ++]) --# Figure out how to run the assembler. -*- Autoconf -*- -- --# serial 2 +-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +-# ----------------------------------------------------------------- +-m4_define([lt_if_dict_fetch], +-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], +- [$5], +- [$6])]) +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. @@ -2083,7 +16320,6 @@ Index: gtk+-2.14.4/aclocal.m4 +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) --# Copyright 2001 Free Software Foundation, Inc. +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. @@ -2094,38 +16330,39 @@ Index: gtk+-2.14.4/aclocal.m4 + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +-# -------------------------------------------------------------- +-m4_define([lt_dict_filter], +-[m4_if([$5], [], [], +- [lt_join(m4_quote(m4_default([$4], [[, ]])), +- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), +- [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +-]) +# Figure out how to run the assembler. -*- Autoconf -*- --# This program 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 General Public License for more details. +-# ltversion.m4 -- version numbers -*- Autoconf -*- +-# +-# Copyright (C) 2004 Free Software Foundation, Inc. +-# Written by Scott James Remnant, 2004 +# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# + # +-# This file is free software; the Free Software Foundation gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. +-# Generated from ltversion.in. +# serial 5 - # AM_PROG_AS - # ---------- - AC_DEFUN([AM_PROG_AS], - [# By default we simply use the C compiler to build assembly code. - AC_REQUIRE([AC_PROG_CC]) --: ${CCAS='$(CC)'} --# Set ASFLAGS if not already set. --: ${CCASFLAGS='$(CFLAGS)'} --AC_SUBST(CCAS) --AC_SUBST(CCASFLAGS)]) +-# serial 3012 ltversion.m4 +-# This file is part of GNU Libtool ++# AM_PROG_AS ++# ---------- ++AC_DEFUN([AM_PROG_AS], ++[# By default we simply use the C compiler to build assembly code. ++AC_REQUIRE([AC_PROG_CC]) +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS +AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) @@ -2133,25 +16370,29 @@ Index: gtk+-2.14.4/aclocal.m4 +_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl +]) --# Add --enable-maintainer-mode option to configure. --# From Jim Meyering +-m4_define([LT_PACKAGE_VERSION], [2.2.6]) +-m4_define([LT_PACKAGE_REVISION], [1.3012]) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- --# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +-AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.6' +-macro_revision='1.3012' +-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +-_LT_DECL(, macro_revision, 0) +-]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -+# + # +-# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +-# Written by Scott James Remnant, 2004. +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, @@ -2159,7 +16400,98 @@ Index: gtk+-2.14.4/aclocal.m4 +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. -+# + # +-# This file is free software; the Free Software Foundation gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +- +-# serial 4 lt~obsolete.m4 +- +-# These exist entirely to fool aclocal when bootstrapping libtool. +-# +-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +-# which have later been changed to m4_define as they aren't part of the +-# exported API, or moved to Autoconf or Automake where they belong. +-# +-# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +-# using a macro with the same name in our local m4/libtool.m4 it'll +-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +-# and doesn't know about Autoconf macros at all.) +-# +-# So we provide this file, which has a silly filename so it's always +-# included after everything else. This provides aclocal with the +-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +-# because those macros already exist, or will be overwritten later. +-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +-# +-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +-# Yes, that means every name once taken will need to remain here until +-# we give up compatibility with versions before 1.7, at which point +-# we need to keep only those names which we still refer to. +- +-# This is to help aclocal find these macros, as it can't see m4_define. +-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) +- +-m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +-m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +-m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +-m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +-m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +-m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +-m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +-m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +-m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +-m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +-m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +-m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +-m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +-m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +-m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +-m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +-m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +-m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +-m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +-m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +-m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +-m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +-m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +-m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +-m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +-m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +-m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) +-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +-m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +-m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +-m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +-m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +-m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +-m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +- +-# Figure out how to run the assembler. -*- Autoconf -*- +- +-# serial 2 +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing @@ -2186,10 +16518,7 @@ Index: gtk+-2.14.4/aclocal.m4 +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. --# This program 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 General Public License for more details. +-# Copyright 2001 Free Software Foundation, Inc. +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl @@ -2197,23 +16526,42 @@ Index: gtk+-2.14.4/aclocal.m4 +am_aux_dir=`cd $ac_aux_dir && pwd` +]) --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. --# serial 2 +-# This program 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 General Public License for more details. +# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -+ + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +# serial 4 -+ + +-# AM_PROG_AS +-# ---------- +-AC_DEFUN([AM_PROG_AS], +-[# By default we simply use the C compiler to build assembly code. +-AC_REQUIRE([AC_PROG_CC]) +-: ${CCAS='$(CC)'} +-# Set ASFLAGS if not already set. +-: ${CCASFLAGS='$(CFLAGS)'} +-AC_SUBST(CCAS) +-AC_SUBST(CCASFLAGS)]) +# This was merged into AC_PROG_CC in Autoconf. -+ + +-# Add --enable-maintainer-mode option to configure. +-# From Jim Meyering +AU_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +AC_DIAGNOSE([obsolete], [$0: @@ -2224,18 +16572,31 @@ Index: gtk+-2.14.4/aclocal.m4 +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +]) +AU_DEFUN([fp_PROG_CC_STDC]) -+ + +-# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +# AM_CONDITIONAL -*- Autoconf -*- -+ + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -+ + +-# This program 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 General Public License for more details. +# serial 8 -+ + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. @@ -2259,7 +16620,8 @@ Index: gtk+-2.14.4/aclocal.m4 + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -+ + +-# serial 2 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# @@ -3905,54 +18267,89 @@ Index: gtk+-2.14.4/aclocal.m4 +]) # _AM_PROG_TAR +m4_include([acinclude.m4]) -Index: gtk+-2.14.4/autom4te.cache/output.0 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+-2.14.4/autom4te.cache/output.0 2008-11-11 18:55:59.204634667 +0100 -@@ -0,0 +1,38228 @@ -+@%:@! /bin/sh -+@%:@ Guess values for system-dependent variables and create Makefiles. -+@%:@ Generated by GNU Autoconf 2.61 for gtk+ 2.14.4. -+@%:@ -+@%:@ Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>. -+@%:@ -+@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+@%:@ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+@%:@ This configure script is free software; the Free Software Foundation -+@%:@ gives unlimited permission to copy, distribute and modify it. -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## -+ -+# 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=: +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/config.h.in gtk+2.0-2.14.5/config.h.in +--- gtk+2.0-2.14.5.old/config.h.in 2008-11-24 07:41:28.000000000 +0100 ++++ gtk+2.0-2.14.5/config.h.in 2008-11-25 11:09:44.000000000 +0100 +@@ -210,10 +210,6 @@ + /* Define to 1 if you have the `_NSGetEnviron' function. */ + #undef HAVE__NSGETENVIRON + +-/* Define to the sub-directory in which libtool stores uninstalled libraries. +- */ +-#undef LT_OBJDIR +- + /* Define if <X11/extensions/XIproto.h> needed for xReply */ + #undef NEED_XIPROTO_H_FOR_XREPLY + +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2.0-2.14.5/configure +--- gtk+2.0-2.14.5.old/configure 2008-11-24 07:41:48.000000000 +0100 ++++ gtk+2.0-2.14.5/configure 2008-11-25 11:09:43.000000000 +0100 +@@ -1,11 +1,11 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.63 for gtk+ 2.14.5. ++# Generated by GNU Autoconf 2.61 for gtk+ 2.14.5. + # + # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>. + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## --------------------- ## +@@ -17,7 +17,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # 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 -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +@@ -39,45 +39,17 @@ + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='printf %s\n' +- as_echo_n='printf %s' +-else +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' +-fi +- + # The user is always right. + if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh @@ -3962,58 +18359,35 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + PATH_SEPARATOR=: + fi + rm -f conf$$.sh -+fi -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) + fi + + # Support unset when possible. +@@ -93,6 +65,8 @@ + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) +as_nl=' +' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +@@ -115,7 +89,7 @@ + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. + { (exit 1); exit 1; } + fi + +@@ -128,10 +102,17 @@ + PS4='+ ' + + # NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ @@ -4025,389 +18399,110 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && +@@ -153,7 +134,7 @@ + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+if test "x$CONFIG_SHELL" = x; then -+ if (eval ":") 2>/dev/null; then -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -179,7 +160,7 @@ + as_have_required=no + fi + +- if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": -+(as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=\$LINENO -+ as_lineno_2=\$LINENO -+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -+") 2> /dev/null; then -+ : -+else -+ as_candidate_shells= -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ case $as_dir in -+ /*) -+ for as_base in sh bash ksh sh5; do -+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -+ done;; -+ esac -+done -+IFS=$as_save_IFS -+ -+ -+ for as_shell in $as_candidate_shells $SHELL; do -+ # 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 -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: + (as_func_return () { + (exit \$1) + } +@@ -261,7 +242,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # 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 -+ -+ -+: -+_ASEOF -+}; then -+ CONFIG_SHELL=$as_shell -+ as_have_required=yes -+ if { "$as_shell" 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +@@ -282,7 +263,7 @@ + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # 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 -+ -+ -+: -+(as_func_return () { -+ (exit $1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = "$1" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test $exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -+ -+_ASEOF -+}; then -+ break -+fi -+ -+fi -+ -+ done -+ -+ if test "x$CONFIG_SHELL" != x; then -+ for as_var in BASH_ENV ENV + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +@@ -362,10 +343,10 @@ + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ -+ if test $as_have_required = no; then -+ echo This script requires a shell more modern than all the -+ echo shells that I found on your system. Please install a -+ echo modern shell, or manually run the script under such a -+ echo shell if you do have one. -+ { (exit 1); exit 1; } -+fi -+ -+ -+fi -+ -+fi -+ -+ -+ -+(eval "as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0") || { -+ echo No shell found that supports shell functions. + fi + + +@@ -434,10 +415,9 @@ + + test \$exitcode = 0") || { + echo No shell found that supports shell functions. +- echo Please tell bug-autoconf@gnu.org about your system, +- echo including any error possibly output before this message. +- echo This can help us improve future autoconf versions. +- echo Configuration will now proceed without shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message -+} -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || + } + + +@@ -473,7 +453,7 @@ + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems +@@ -501,6 +481,7 @@ + *) + ECHO_N='-n';; + esac + -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -513,22 +494,19 @@ + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null + mkdir conf$$.dir -+fi + fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' @@ -4416,92 +18511,82 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' + as_ln_s='cp -p' +- fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln -+else -+ as_ln_s='cp -p' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ 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 + else + as_ln_s='cp -p' + fi +@@ -553,10 +531,10 @@ + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then +- test -d "$1/."; + test -d "$1/."; -+ else -+ case $1 in + else + case $1 in +- -*)set "./$1";; + -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+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'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+ -+ -+# Check that we are running under the correct shell. -+SHELL=${CONFIG_SHELL-/bin/sh} -+ + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi +@@ -577,22 +555,22 @@ + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +-case X$lt_ECHO in +case X$ECHO in -+X*--fallback-echo) -+ # Remove one level of quotation (which was required for Make). + X*--fallback-echo) + # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` + ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` -+ ;; -+esac -+ + ;; + esac + +-ECHO=${lt_ECHO-echo} +echo=${ECHO-echo} -+if test "X$1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X$1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then +- # Yippee, $ECHO works! +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! -+ : -+else -+ # Restart under the correct shell. -+ exec $SHELL "$0" --no-reexec ${1+"$@"} -+fi -+ -+if test "X$1" = X--fallback-echo; then -+ # used as fallback echo -+ shift + : + else + # Restart under the correct shell. +@@ -602,9 +580,9 @@ + if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift +- cat <<_LT_EOF + cat <<EOF -+$* + $* +-_LT_EOF +EOF -+ exit 0 -+fi -+ -+# 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 -+ + exit 0 + fi + +@@ -612,116 +590,121 @@ + # if CDPATH is set. + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +-if test -z "$lt_ECHO"; then +- if test "X${echo_test_string+set}" != Xset; then +- # find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if { echo_test_string=`eval $cmd`; } 2>/dev/null && +- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null +- then +- break +- fi +- done +- fi +if test -z "$ECHO"; then +if test "X${echo_test_string+set}" != Xset; then +# find a string as large as possible, as long as the shell can cope with it @@ -4515,7 +18600,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + done +fi -+ + +- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && +- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +- else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then @@ -4526,10 +18621,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. -+ + +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do +- IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- ECHO="$dir/echo" +- break +- fi +- done + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && @@ -4539,7 +18645,27 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + done + IFS="$lt_save_ifs" -+ + +- if test "X$ECHO" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && +- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- ECHO='print -r' +- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} +- else +- # Try using printf. +- ECHO='printf %s\n' +- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && +- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && @@ -4566,7 +18692,34 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then + test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- ECHO="$CONFIG_SHELL $0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- ECHO="$CONFIG_SHELL $0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: +- +- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do +- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" @@ -4580,12 +18733,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + else + # maybe with a smaller string... + prev=: -+ + +- if test "$prev" != 'sed 50q "$0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} +- else +- # Oops. We lost completely, so just stick with echo. +- ECHO=echo + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break -+ fi + fi +- fi + prev="$cmd" + done + @@ -4597,92 +18758,418 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Oops. We lost completely, so just stick with echo. + echo=echo + fi -+ fi -+ fi -+ fi + fi + fi + fi + fi +fi -+fi -+ -+# Copy echo and quote the copy suitably for passing to libtool from -+# the Makefile, instead of quoting the original, which is used later. + + # Copy echo and quote the copy suitably for passing to libtool from + # the Makefile, instead of quoting the original, which is used later. +-lt_ECHO=$ECHO +-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then +- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -+fi -+ -+ -+ -+ + fi + + + + +tagnames=${tagnames+${tagnames},}CXX + +tagnames=${tagnames+${tagnames},}F77 + -+exec 7<&0 </dev/null 6>&1 -+ -+# Name of the host. -+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# so uname gets run too. -+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -+ -+# -+# Initializations. -+# -+ac_default_prefix=/usr/local -+ac_clean_files= -+ac_config_libobj_dir=. -+LIB@&t@OBJS= -+cross_compiling=no -+subdirs= -+MFLAGS= -+MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+ -+# Identity of this package. -+PACKAGE_NAME='gtk+' -+PACKAGE_TARNAME='gtk+' -+PACKAGE_VERSION='2.14.4' -+PACKAGE_STRING='gtk+ 2.14.4' -+PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B' -+ -+ac_unique_file="gdk/gdktypes.h" -+# Factoring default headers for most tests. -+ac_includes_default="\ -+#include <stdio.h> -+#ifdef HAVE_SYS_TYPES_H -+# include <sys/types.h> -+#endif -+#ifdef HAVE_SYS_STAT_H -+# include <sys/stat.h> -+#endif -+#ifdef STDC_HEADERS -+# include <stdlib.h> -+# include <stddef.h> -+#else -+# ifdef HAVE_STDLIB_H -+# include <stdlib.h> -+# endif -+#endif -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -+# include <memory.h> -+# endif -+# include <string.h> -+#endif -+#ifdef HAVE_STRINGS_H -+# include <strings.h> -+#endif -+#ifdef HAVE_INTTYPES_H -+# include <inttypes.h> -+#endif -+#ifdef HAVE_STDINT_H -+# include <stdint.h> -+#endif -+#ifdef HAVE_UNISTD_H -+# include <unistd.h> -+#endif" -+ + exec 7<&0 </dev/null 6>&1 + + # Name of the host. +@@ -786,399 +769,372 @@ + # include <unistd.h> + #endif" + +-ac_subst_vars='LTLIBOBJS +-LIBOBJS +-ENABLE_MAN_FALSE +-ENABLE_MAN_TRUE +-XMLCATALOG +-XML_CATALOG_FILE +-XSLTPROC +-HAVE_DOCBOOK_FALSE +-HAVE_DOCBOOK_TRUE +-DB2HTML +-GTK_DOC_USE_LIBTOOL_FALSE +-GTK_DOC_USE_LIBTOOL_TRUE +-ENABLE_GTK_DOC_FALSE +-ENABLE_GTK_DOC_TRUE +-GTKDOC_CHECK +-HTML_DIR +-TEST_PRINT_BACKEND_FALSE +-TEST_PRINT_BACKEND_TRUE +-HAVE_HTTP_AUTHSTRING +-HAVE_CUPS_FALSE +-HAVE_CUPS_TRUE +-CUPS_LIBS +-CUPS_CFLAGS +-CUPS_API_MINOR +-CUPS_API_MAJOR +-CUPS_CONFIG +-GAIL_INET_LIBS +-GTK_XIM_FLAGS +-GTK_DEBUG_FLAGS +-CAIRO_PREFIX +-PANGO_PREFIX +-ATK_PREFIX +-GLIB_PREFIX +-GTK_DEP_CFLAGS +-GTK_DEP_LIBS +-GTK_EXTRA_CFLAGS +-GTK_EXTRA_LIBS +-GTK_PACKAGES +-GDK_PIXBUF_DEP_CFLAGS +-GDK_PIXBUF_DEP_LIBS +-GDK_PIXBUF_EXTRA_CFLAGS +-GDK_PIXBUF_EXTRA_LIBS +-GDK_PIXBUF_PACKAGES +-GDK_DEP_CFLAGS +-GDK_DEP_LIBS +-GDK_EXTRA_CFLAGS +-GDK_EXTRA_LIBS +-GDK_PACKAGES +-USE_DIRECTFB_FALSE +-USE_DIRECTFB_TRUE +-GDK_PIXBUF_XLIB_DEP_CFLAGS +-GDK_PIXBUF_XLIB_DEP_LIBS +-GDK_PIXBUF_XLIB_EXTRA_CFLAGS +-GDK_PIXBUF_XLIB_EXTRA_LIBS +-GDK_PIXBUF_XLIB_PACKAGES +-USE_QUARTZ_FALSE +-USE_QUARTZ_TRUE +-USE_WIN32_FALSE +-USE_WIN32_TRUE +-USE_X11_FALSE +-USE_X11_TRUE +-XINPUT_XFREE_FALSE +-XINPUT_XFREE_TRUE +-HAVE_X11R6_FALSE +-HAVE_X11R6_TRUE +-X_EXTRA_LIBS +-X_LIBS +-X_PRE_LIBS +-X_CFLAGS +-XMKMF +-REBUILD_PNGS +-GTK_UPDATE_ICON_CACHE +-GDK_PIXBUF_CSOURCE +-CROSS_COMPILING_FALSE +-CROSS_COMPILING_TRUE +-USE_MMX_FALSE +-USE_MMX_TRUE +-USE_MEDIALIB25_FALSE +-USE_MEDIALIB25_TRUE +-USE_MEDIALIB_FALSE +-USE_MEDIALIB_TRUE +-HAVE_JASPER_FALSE +-HAVE_JASPER_TRUE +-HAVE_JPEG_FALSE +-HAVE_JPEG_TRUE +-HAVE_PNG_FALSE +-HAVE_PNG_TRUE +-HAVE_TIFF_FALSE +-HAVE_TIFF_TRUE +-INCLUDE_IM_XIM_FALSE +-INCLUDE_IM_XIM_TRUE +-INCLUDE_IM_VIQR_FALSE +-INCLUDE_IM_VIQR_TRUE +-INCLUDE_IM_TI_ET_FALSE +-INCLUDE_IM_TI_ET_TRUE +-INCLUDE_IM_TI_ER_FALSE +-INCLUDE_IM_TI_ER_TRUE +-INCLUDE_IM_THAI_FALSE +-INCLUDE_IM_THAI_TRUE +-INCLUDE_IM_MULTIPRESS_FALSE +-INCLUDE_IM_MULTIPRESS_TRUE +-INCLUDE_IM_IPA_FALSE +-INCLUDE_IM_IPA_TRUE +-INCLUDE_IM_INUKTITUT_FALSE +-INCLUDE_IM_INUKTITUT_TRUE +-INCLUDE_IM_IME_FALSE +-INCLUDE_IM_IME_TRUE +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE +-INCLUDE_IM_CEDILLA_FALSE +-INCLUDE_IM_CEDILLA_TRUE +-INCLUDE_IM_AM_ET_FALSE +-INCLUDE_IM_AM_ET_TRUE +-INCLUDED_IMMODULE_DEFINE +-INCLUDED_IMMODULE_OBJ +-HAVE_INCLUDED_IMMMODULES_FALSE +-HAVE_INCLUDED_IMMMODULES_TRUE +-INCLUDE_GDIPLUS_FALSE +-INCLUDE_GDIPLUS_TRUE +-INCLUDE_JASPER_FALSE +-INCLUDE_JASPER_TRUE +-INCLUDE_ICNS_FALSE +-INCLUDE_ICNS_TRUE +-INCLUDE_PCX_FALSE +-INCLUDE_PCX_TRUE +-INCLUDE_TGA_FALSE +-INCLUDE_TGA_TRUE +-INCLUDE_XBM_FALSE +-INCLUDE_XBM_TRUE +-INCLUDE_XPM_FALSE +-INCLUDE_XPM_TRUE +-INCLUDE_TIFF_FALSE +-INCLUDE_TIFF_TRUE +-INCLUDE_RAS_FALSE +-INCLUDE_RAS_TRUE +-INCLUDE_PNM_FALSE +-INCLUDE_PNM_TRUE +-INCLUDE_JPEG_FALSE +-INCLUDE_JPEG_TRUE +-INCLUDE_ANI_FALSE +-INCLUDE_ANI_TRUE +-INCLUDE_ICO_FALSE +-INCLUDE_ICO_TRUE +-INCLUDE_GIF_FALSE +-INCLUDE_GIF_TRUE +-INCLUDE_WBMP_FALSE +-INCLUDE_WBMP_TRUE +-INCLUDE_BMP_FALSE +-INCLUDE_BMP_TRUE +-INCLUDE_PNG_FALSE +-INCLUDE_PNG_TRUE +-INCLUDED_LOADER_DEFINE +-INCLUDED_LOADER_OBJ +-BUILD_DYNAMIC_MODULES_FALSE +-BUILD_DYNAMIC_MODULES_TRUE +-LIBJASPER +-LIBPNG +-LIBJPEG +-LIBTIFF +-BUILD_GDIPLUS_LOADERS_FALSE +-BUILD_GDIPLUS_LOADERS_TRUE +-GDK_WLIBS +-GLIB_MKENUMS +-GOBJECT_QUERY +-GLIB_GENMARSHAL +-GLIB_LIBS +-GLIB_CFLAGS +-MKINSTALLDIRS +-POSUB +-POFILES +-PO_IN_DATADIR_FALSE +-PO_IN_DATADIR_TRUE +-INTLLIBS +-INSTOBJEXT +-GMOFILES +-DATADIRNAME +-CATOBJEXT +-CATALOGS +-XGETTEXT +-GMSGFMT +-MSGFMT_OPTS +-MSGFMT +-USE_NLS +-REBUILD +-INDENT +-PERL +-DISABLE_EXPLICIT_DEPS_FALSE +-DISABLE_EXPLICIT_DEPS_TRUE +-LIBTOOL_EXPORT_OPTIONS +-BASE_DEPENDENCIES_LIBS +-BASE_DEPENDENCIES_CFLAGS +-PKG_CONFIG +-gtktargetlib +-gdktargetlib +-gdktarget +-MS_LIB_AVAILABLE_FALSE +-MS_LIB_AVAILABLE_TRUE +-ms_librarian +-WINDRES +-OS_LINUX_FALSE +-OS_LINUX_TRUE +-OS_UNIX_FALSE +-OS_UNIX_TRUE +-OS_WIN32_FALSE +-OS_WIN32_TRUE +-PLATFORM_WIN32_FALSE +-PLATFORM_WIN32_TRUE +-MAINT +-MAINTAINER_MODE_FALSE +-MAINTAINER_MODE_TRUE +-CCASFLAGS +-CCAS +-CXXCPP +-CPP +-OTOOL64 +-OTOOL +-LIPO +-NMEDIT +-DSYMUTIL +-lt_ECHO +-RANLIB +-AR +-LN_S +-NM +-ac_ct_DUMPBIN +-DUMPBIN +-LD +-FGREP +-EGREP +-GREP +-SED +-LIBTOOL +-OBJDUMP +-DLLTOOL +-AS +-HAVE_OBJC_FALSE +-HAVE_OBJC_TRUE +-HAVE_CXX_FALSE +-HAVE_CXX_TRUE +-am__fastdepCXX_FALSE +-am__fastdepCXX_TRUE +-CXXDEPMODE +-CXXFLAGS +-ac_ct_CXX +-CXX +-am__fastdepCC_FALSE +-am__fastdepCC_TRUE +-CCDEPMODE +-AMDEPBACKSLASH +-AMDEP_FALSE +-AMDEP_TRUE +-am__quote +-am__include +-DEPDIR +-OBJEXT +-EXEEXT +-ac_ct_CC +-CPPFLAGS +-LDFLAGS +-CFLAGS +-CC +-LIB_EXE_MACHINE_FLAG +-host_os +-host_vendor +-host_cpu +-host +-build_os +-build_vendor +-build_cpu +-build +-GETTEXT_PACKAGE +-GDK_PIXBUF_VERSION +-GDK_PIXBUF_MICRO +-GDK_PIXBUF_MINOR +-GDK_PIXBUF_MAJOR +-GAIL_LT_CURRENT_MINUS_AGE +-GAIL_LT_VERSION_INFO +-LT_CURRENT_MINUS_AGE +-LT_VERSION_INFO +-GTK_BINARY_VERSION +-GTK_VERSION +-GTK_API_VERSION +-GTK_BINARY_AGE +-GTK_INTERFACE_AGE +-GTK_MICRO_VERSION +-GTK_MINOR_VERSION +-GTK_MAJOR_VERSION +-am__leading_dot +-SET_MAKE +-AWK +-INSTALL_STRIP_PROGRAM +-STRIP +-install_sh +-AMTAR +-MAKEINFO +-AUTOHEADER +-AUTOMAKE +-AUTOCONF +-ACLOCAL +-VERSION +-PACKAGE +-CYGPATH_W +-INSTALL_DATA +-INSTALL_SCRIPT +-INSTALL_PROGRAM +-target_alias +-host_alias +-build_alias +-LIBS +-ECHO_T +-ECHO_N +-ECHO_C +-DEFS +-mandir +-localedir +-libdir +-psdir +-pdfdir +-dvidir +-htmldir +-infodir +-docdir +-oldincludedir +-includedir +-localstatedir +-sharedstatedir +-sysconfdir +-datadir +-datarootdir +-libexecdir +-sbindir +-bindir +-program_transform_name +-prefix +-exec_prefix +-PACKAGE_BUGREPORT +-PACKAGE_STRING +-PACKAGE_VERSION +-PACKAGE_TARNAME +-PACKAGE_NAME +ac_subst_vars='SHELL -+PATH_SEPARATOR + PATH_SEPARATOR +-SHELL' +-ac_subst_files='' +-ac_user_opts=' +-enable_option_checking +-enable_dependency_tracking +-enable_static +-enable_shared +-with_pic +-enable_fast_install +-with_gnu_ld +-enable_libtool_lock +-enable_largefile +-enable_maintainer_mode +-enable_debug +-enable_shm +-enable_xkb +-enable_xinerama +-enable_rebuilds +-enable_visibility +-with_xinput +-with_gdktarget +-enable_explicit_deps +-enable_glibtest +-enable_modules +-with_libpng +-with_libjpeg +-with_libtiff +-with_libjasper +-enable_gdiplus +-with_included_loaders +-with_included_immodules +-with_x +-enable_cups +-enable_test_print_backend +-with_html_dir +-enable_gtk_doc +-enable_man +-with_xml_catalog +-' +- ac_precious_vars='build_alias +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION @@ -4716,8 +19203,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ECHO_T +LIBS +build_alias -+host_alias -+target_alias + host_alias + target_alias +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA @@ -4766,10 +19253,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +host_vendor +host_os +LIB_EXE_MACHINE_FLAG -+CC -+CFLAGS -+LDFLAGS -+CPPFLAGS + CC + CFLAGS + LDFLAGS +-LIBS + CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT @@ -4784,9 +19272,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +am__fastdepCC_FALSE +ENABLE_STATIC_TRUE +ENABLE_STATIC_FALSE -+CXX + CXX +ac_ct_CXX -+CXXFLAGS + CXXFLAGS +-CCC +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE @@ -4806,8 +19295,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +DLLTOOL +AS +OBJDUMP -+CPP -+CXXCPP + CPP + CXXCPP +F77 +FFLAGS +ac_ct_F77 @@ -5027,7 +19516,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +XMLCATALOG +ENABLE_MAN_TRUE +ENABLE_MAN_FALSE -+LIB@&t@OBJS ++LIBOBJS +LTLIBOBJS' +ac_subst_files='' + ac_precious_vars='build_alias @@ -5047,546 +19536,283 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +FFLAGS +CCAS +CCASFLAGS -+PKG_CONFIG -+BASE_DEPENDENCIES_CFLAGS -+BASE_DEPENDENCIES_LIBS -+XMKMF' -+ -+ -+# Initialize some variables set by options. -+ac_init_help= -+ac_init_version=false -+# The variables have the same names as the options, with -+# dashes changed to underlines. -+cache_file=/dev/null -+exec_prefix=NONE -+no_create= -+no_recursion= -+prefix=NONE -+program_prefix=NONE -+program_suffix=NONE -+program_transform_name=s,x,x, -+silent= -+site= -+srcdir= -+verbose= -+x_includes=NONE -+x_libraries=NONE -+ -+# Installation directory options. -+# These are left unexpanded so users can "make install exec_prefix=/foo" -+# and all the variables that are supposed to be based on exec_prefix -+# by default will actually change. -+# Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) -+bindir='${exec_prefix}/bin' -+sbindir='${exec_prefix}/sbin' -+libexecdir='${exec_prefix}/libexec' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' -+sysconfdir='${prefix}/etc' -+sharedstatedir='${prefix}/com' -+localstatedir='${prefix}/var' -+includedir='${prefix}/include' -+oldincludedir='/usr/include' -+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' -+ -+ac_prev= -+ac_dashdash= -+for ac_option -+do -+ # If the previous option needs an argument, assign it. -+ if test -n "$ac_prev"; then -+ eval $ac_prev=\$ac_option -+ ac_prev= -+ continue -+ fi -+ -+ case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; -+ esac -+ -+ # Accept the important Cygnus configure options, so we can diagnose typos. -+ -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; -+ -+ -bindir | --bindir | --bindi | --bind | --bin | --bi) -+ ac_prev=bindir ;; -+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -+ bindir=$ac_optarg ;; -+ -+ -build | --build | --buil | --bui | --bu) -+ ac_prev=build_alias ;; -+ -build=* | --build=* | --buil=* | --bui=* | --bu=*) -+ build_alias=$ac_optarg ;; -+ -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -+ cache_file=$ac_optarg ;; -+ -+ --config-cache | -C) -+ cache_file=config.cache ;; -+ -+ -datadir | --datadir | --datadi | --datad) -+ ac_prev=datadir ;; -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) -+ datadir=$ac_optarg ;; -+ -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ -+ -disable-* | --disable-*) + PKG_CONFIG + BASE_DEPENDENCIES_CFLAGS + BASE_DEPENDENCIES_LIBS +@@ -1188,8 +1144,6 @@ + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false +-ac_unrecognized_opts= +-ac_unrecognized_sep= + # The variables have the same names as the options, with + # dashes changed to underlines. + cache_file=/dev/null +@@ -1288,21 +1242,13 @@ + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ # Reject names that are not valid shell variable names. + # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"enable_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval enable_$ac_useropt=no ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; -+ -+ -enable-* | --enable-*) + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; +@@ -1315,21 +1261,13 @@ + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ # Reject names that are not valid shell variable names. + # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"enable_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval enable_$ac_useropt=\$ac_optarg ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -+ -+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -+ | --exec | --exe | --ex) -+ ac_prev=exec_prefix ;; -+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ -+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ -+ | --exec=* | --exe=* | --ex=*) -+ exec_prefix=$ac_optarg ;; -+ -+ -gas | --gas | --ga | --g) -+ # Obsolete; use --with-gas. -+ with_gas=yes ;; -+ -+ -help | --help | --hel | --he | -h) -+ ac_init_help=long ;; -+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) -+ ac_init_help=recursive ;; -+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) -+ ac_init_help=short ;; -+ -+ -host | --host | --hos | --ho) -+ ac_prev=host_alias ;; -+ -host=* | --host=* | --hos=* | --ho=*) -+ host_alias=$ac_optarg ;; -+ -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ -+ -includedir | --includedir | --includedi | --included | --include \ -+ | --includ | --inclu | --incl | --inc) -+ ac_prev=includedir ;; -+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ -+ | --includ=* | --inclu=* | --incl=* | --inc=*) -+ includedir=$ac_optarg ;; -+ -+ -infodir | --infodir | --infodi | --infod | --info | --inf) -+ ac_prev=infodir ;; -+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -+ infodir=$ac_optarg ;; -+ -+ -libdir | --libdir | --libdi | --libd) -+ ac_prev=libdir ;; -+ -libdir=* | --libdir=* | --libdi=* | --libd=*) -+ libdir=$ac_optarg ;; -+ -+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ -+ | --libexe | --libex | --libe) -+ ac_prev=libexecdir ;; -+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ -+ | --libexe=* | --libex=* | --libe=*) -+ libexecdir=$ac_optarg ;; -+ -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ -+ -localstatedir | --localstatedir | --localstatedi | --localstated \ -+ | --localstate | --localstat | --localsta | --localst | --locals) -+ ac_prev=localstatedir ;; -+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) -+ localstatedir=$ac_optarg ;; -+ -+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -+ ac_prev=mandir ;; -+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -+ mandir=$ac_optarg ;; -+ -+ -nfp | --nfp | --nf) -+ # Obsolete; use --without-fp. -+ with_fp=no ;; -+ -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c | -n) -+ no_create=yes ;; -+ -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) -+ no_recursion=yes ;; -+ -+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ -+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ -+ | --oldin | --oldi | --old | --ol | --o) -+ ac_prev=oldincludedir ;; -+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ -+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ -+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -+ oldincludedir=$ac_optarg ;; -+ -+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -+ ac_prev=prefix ;; -+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -+ prefix=$ac_optarg ;; -+ -+ -program-prefix | --program-prefix | --program-prefi | --program-pref \ -+ | --program-pre | --program-pr | --program-p) -+ ac_prev=program_prefix ;; -+ -program-prefix=* | --program-prefix=* | --program-prefi=* \ -+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -+ program_prefix=$ac_optarg ;; -+ -+ -program-suffix | --program-suffix | --program-suffi | --program-suff \ -+ | --program-suf | --program-su | --program-s) -+ ac_prev=program_suffix ;; -+ -program-suffix=* | --program-suffix=* | --program-suffi=* \ -+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -+ program_suffix=$ac_optarg ;; -+ -+ -program-transform-name | --program-transform-name \ -+ | --program-transform-nam | --program-transform-na \ -+ | --program-transform-n | --program-transform- \ -+ | --program-transform | --program-transfor \ -+ | --program-transfo | --program-transf \ -+ | --program-trans | --program-tran \ -+ | --progr-tra | --program-tr | --program-t) -+ ac_prev=program_transform_name ;; -+ -program-transform-name=* | --program-transform-name=* \ -+ | --program-transform-nam=* | --program-transform-na=* \ -+ | --program-transform-n=* | --program-transform-=* \ -+ | --program-transform=* | --program-transfor=* \ -+ | --program-transfo=* | --program-transf=* \ -+ | --program-trans=* | --program-tran=* \ -+ | --progr-tra=* | --program-tr=* | --program-t=*) -+ program_transform_name=$ac_optarg ;; -+ -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ silent=yes ;; -+ -+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -+ ac_prev=sbindir ;; -+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -+ | --sbi=* | --sb=*) -+ sbindir=$ac_optarg ;; -+ -+ -sharedstatedir | --sharedstatedir | --sharedstatedi \ -+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -+ | --sharedst | --shareds | --shared | --share | --shar \ -+ | --sha | --sh) -+ ac_prev=sharedstatedir ;; -+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ -+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ -+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ -+ | --sha=* | --sh=*) -+ sharedstatedir=$ac_optarg ;; -+ -+ -site | --site | --sit) -+ ac_prev=site ;; -+ -site=* | --site=* | --sit=*) -+ site=$ac_optarg ;; -+ -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ srcdir=$ac_optarg ;; -+ -+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ -+ | --syscon | --sysco | --sysc | --sys | --sy) -+ ac_prev=sysconfdir ;; -+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ -+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -+ sysconfdir=$ac_optarg ;; -+ -+ -target | --target | --targe | --targ | --tar | --ta | --t) -+ ac_prev=target_alias ;; -+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -+ target_alias=$ac_optarg ;; -+ -+ -v | -verbose | --verbose | --verbos | --verbo | --verb) -+ verbose=yes ;; -+ -+ -version | --version | --versio | --versi | --vers | -V) -+ ac_init_version=: ;; -+ -+ -with-* | --with-*) + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -1520,38 +1458,22 @@ + ac_init_version=: ;; + + -with-* | --with-*) +- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ # Reject names that are not valid shell variable names. + # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"with_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval with_$ac_useropt=\$ac_optarg ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -+ -+ -without-* | --without-*) + + -without-* | --without-*) +- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ # Reject names that are not valid shell variable names. + # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"with_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval with_$ac_useropt=no ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; -+ -+ --x) -+ # Obsolete; use --with-x. -+ with_x=yes ;; -+ -+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ -+ | --x-incl | --x-inc | --x-in | --x-i) -+ ac_prev=x_includes ;; -+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ -+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -+ x_includes=$ac_optarg ;; -+ -+ -x-libraries | --x-libraries | --x-librarie | --x-librari \ -+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) -+ ac_prev=x_libraries ;; -+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ -+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -+ x_libraries=$ac_optarg ;; -+ + + --x) + # Obsolete; use --with-x. +@@ -1571,7 +1493,7 @@ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option + -*) { echo "$as_me: error: unrecognized option: $ac_option -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; } -+ ;; -+ -+ *=*) -+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; +@@ -1580,16 +1502,16 @@ + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { (exit 1); exit 1; }; } -+ eval $ac_envvar=\$ac_optarg -+ export $ac_envvar ;; -+ -+ *) -+ # FIXME: should be removed in autoconf 3.0. + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ ;; -+ -+ esac -+done -+ -+if test -n "$ac_prev"; then -+ ac_option=--`echo $ac_prev | sed 's/_/-/g'` + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + +@@ -1598,38 +1520,22 @@ + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 + { echo "$as_me: error: missing argument to $ac_option" >&2 -+ { (exit 1); exit 1; }; } -+fi -+ + { (exit 1); exit 1; }; } + fi + +-if test -n "$ac_unrecognized_opts"; then +- case $enable_option_checking in +- no) ;; +- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 +- { (exit 1); exit 1; }; } ;; +- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; +- esac +-fi +- +-# Check all directory arguments for consistency. +# Be sure to have absolute directory names. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir -+do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; -+ esac + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir + do + eval ac_val=\$$ac_var +- # Remove trailing slashes. +- case $ac_val in +- */ ) +- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` +- eval $ac_var=\$ac_val;; +- esac +- # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; } -+done -+ -+# There might be people who depend on the old broken behavior: `$host' -+# used to hold the argument of --host etc. -+# FIXME: To remove some day. -+build=$build_alias -+host=$host_alias -+target=$target_alias -+ -+# FIXME: To remove some day. -+if test "x$host_alias" != x; then -+ if test "x$build_alias" = x; then -+ cross_compiling=maybe + { (exit 1); exit 1; }; } + done + +@@ -1644,7 +1550,7 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ If a cross compiler is detected then cross compile mode will be used." >&2 -+ elif test "x$build_alias" != "x$host_alias"; then -+ cross_compiling=yes -+ fi -+fi -+ -+ac_tool_prefix= -+test -n "$host_alias" && ac_tool_prefix=$host_alias- -+ -+test "$silent" = yes && exec 6>/dev/null -+ -+ -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes +@@ -1660,10 +1566,10 @@ + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { $as_echo "$as_me: error: working directory cannot be determined" >&2 + { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { (exit 1); exit 1; }; } -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { (exit 1); exit 1; }; } + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 + { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { (exit 1); exit 1; }; } -+ -+ -+# Find the source files, if location was not specified. -+if test -z "$srcdir"; then -+ ac_srcdir_defaulted=yes -+ # Try the directory containing this script, then the parent directory. + { (exit 1); exit 1; }; } + + +@@ -1671,12 +1577,12 @@ + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. +- ac_confdir=`$as_dirname -- "$as_myself" || +-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_myself" : 'X\(//\)[^/]' \| \ +- X"$as_myself" : 'X\(//\)$' \| \ +- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_myself" | + ac_confdir=`$as_dirname -- "$0" || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X"$0" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ srcdir=$ac_confdir -+ if test ! -r "$srcdir/$ac_unique_file"; then -+ srcdir=.. -+ fi -+else -+ ac_srcdir_defaulted=no -+fi -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -1703,12 +1609,12 @@ + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { (exit 1); exit 1; }; } -+fi -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( + { (exit 1); exit 1; }; } + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 -+ { (exit 1); exit 1; }; } -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done -+ -+# -+# Report the --help message. -+# -+if test "$ac_init_help" = "long"; then -+ # Omit some internal or obsolete options to make the list less imposing. -+ # This message is too long to be a string in the A/UX 3.1 sh. -+ cat <<_ACEOF -+\`configure' configures gtk+ 2.14.4 to adapt to many kinds of systems. -+ -+Usage: $0 [OPTION]... [VAR=VALUE]... -+ -+To assign environment variables (e.g., CC, CFLAGS...), specify them as -+VAR=VALUE. See below for descriptions of some of the useful variables. -+ -+Defaults for the options are specified in brackets. -+ -+Configuration: -+ -h, --help display this help and exit -+ --help=short display options specific to this package -+ --help=recursive display the short help of all the included packages -+ -V, --version display version information and exit -+ -q, --quiet, --silent do not print \`checking...' messages -+ --cache-file=FILE cache test results in FILE [disabled] -+ -C, --config-cache alias for \`--cache-file=config.cache' -+ -n, --no-create do not create output files -+ --srcdir=DIR find the sources in DIR [configure dir or \`..'] -+ -+Installation directories: -+ --prefix=PREFIX install architecture-independent files in PREFIX + { (exit 1); exit 1; }; } + pwd)` + # When building in place, set srcdir=. +@@ -1757,9 +1663,9 @@ + + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] + [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] + [PREFIX] -+ -+By default, \`make install' will install all the files in -+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -+an installation prefix other than \`$ac_default_prefix' using \`--prefix', -+for instance \`--prefix=\$HOME'. -+ -+For better control, use the options below. -+ -+Fine tuning of the installation directories: + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +@@ -1769,25 +1675,25 @@ + For better control, use the options below. + + Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] +- --infodir=DIR info documentation [DATAROOTDIR/info] +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] +- --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/gtk+] +- --htmldir=DIR html documentation [DOCDIR] +- --dvidir=DIR dvi documentation [DOCDIR] +- --pdfdir=DIR pdf documentation [DOCDIR] +- --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] @@ -5601,487 +19827,270 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root @<:@DATAROOTDIR/doc/gtk+@:>@ ++ --docdir=DIR documentation root [DATAROOTDIR/doc/gtk+] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] -+_ACEOF -+ -+ cat <<\_ACEOF -+ -+Program names: -+ --program-prefix=PREFIX prepend PREFIX to installed program names -+ --program-suffix=SUFFIX append SUFFIX to installed program names -+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names -+ -+X features: -+ --x-includes=DIR X include files are in DIR -+ --x-libraries=DIR X library files are in DIR -+ -+System types: -+ --build=BUILD configure for building on BUILD [guessed] -+ --host=HOST cross-compile to build programs to run on HOST [BUILD] -+_ACEOF -+fi -+ -+if test -n "$ac_init_help"; then -+ case $ac_init_help in -+ short | recursive ) echo "Configuration of gtk+ 2.14.4:";; -+ esac -+ cat <<\_ACEOF -+ -+Optional Features: -+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + _ACEOF + + cat <<\_ACEOF +@@ -1814,19 +1720,18 @@ + cat <<\_ACEOF + + Optional Features: +- --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --disable-dependency-tracking Speeds up one-time builds +- --enable-dependency-tracking Do not reject slow dependency extractors + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors -+ --enable-static@<:@=PKGS@:>@ build static libraries @<:@default=no@:>@ -+ --enable-shared@<:@=PKGS@:>@ build shared libraries @<:@default=yes@:>@ -+ --enable-fast-install@<:@=PKGS@:>@ -+ optimize for fast installation @<:@default=yes@:>@ -+ --disable-libtool-lock avoid locking (might break parallel builds) -+ --disable-largefile omit support for large files + --enable-static[=PKGS] build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --disable-largefile omit support for large files +- --enable-maintainer-mode enable make rules and dependencies not useful +- (and sometimes confusing) to the casual installer + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer -+ --enable-debug=@<:@no/minimum/yes@:>@ -+ turn on debugging @<:@default=minimum@:>@ -+ --enable-shm support shared memory if available [default=yes] -+ --enable-xkb support XKB [default=maybe] -+ --enable-xinerama support xinerama extension if available -+ [default=yes] -+ --disable-rebuilds disable all source autogeneration rules -+ --disable-visibility don't use ELF visibility attributes -+ --enable-explicit-deps=@<:@yes/no/auto@:>@ -+ use explicit dependencies in .pc files -+ [default=auto] -+ --disable-glibtest do not try to compile and run a test GLIB program -+ --disable-modules disable dynamic module loading -+ --disable-gdiplus disable GDI+ loaders for gdk-pixbuf -+ --disable-cups -+ disable cups print backend -+ -+ --enable-test-print-backend -+ build test print backend -+ --enable-gtk-doc use gtk-doc to build documentation [default=no] -+ --enable-man regenerate man pages from Docbook [default=no] -+ -+Optional Packages: -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-gnu-ld assume the C compiler uses GNU ld @<:@default=no@:>@ -+ --with-pic try to use only PIC/non-PIC objects @<:@default=use -+ both@:>@ -+ --with-tags@<:@=TAGS@:>@ include additional configurations @<:@automatic@:>@ -+ --with-xinput=@<:@no/yes@:>@ support XInput -+ --with-gdktarget=[x11/win32/quartz/directfb] select non-default GDK target -+ --without-libpng disable PNG loader for gdk-pixbuf -+ --without-libjpeg disable JPEG loader for gdk-pixbuf -+ --without-libtiff disable TIFF loader for gdk-pixbuf -+ --without-libjasper disable JPEG2000 loader for gdk-pixbuf -+ --with-included-loaders=LOADER1,LOADER2,... -+ build the specified loaders into gdk-pixbuf -+ --with-included-immodules=MODULE1,MODULE2,... -+ build the specified input methods into gtk -+ --with-x use the X Window System -+ --with-html-dir=PATH path to installed docs -+ --with-xml-catalog=CATALOG -+ path to xml catalog to use -+ -+Some influential environment variables: -+ CC C compiler command -+ 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 -+ CXXFLAGS C++ compiler flags -+ CPP C preprocessor -+ CXXCPP C++ preprocessor + --enable-debug=[no/minimum/yes] + turn on debugging [default=minimum] + --enable-shm support shared memory if available [default=yes] +@@ -1852,9 +1757,10 @@ + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-pic try to use only PIC/non-PIC objects [default=use + both] +- --with-gnu-ld assume the C compiler uses GNU ld [default=no] ++ --with-tags[=TAGS] include additional configurations [automatic] + --with-xinput=[no/yes] support XInput + --with-gdktarget=[x11/win32/quartz/directfb] select non-default GDK target + --without-libpng disable PNG loader for gdk-pixbuf +@@ -1882,6 +1788,10 @@ + CXXFLAGS C++ compiler flags + CPP C preprocessor + CXXCPP C++ preprocessor + F77 Fortran 77 compiler command + FFLAGS Fortran 77 compiler flags + CCAS assembler compiler command (defaults to CC) + CCASFLAGS assembler compiler flags (defaults to CFLAGS) -+ PKG_CONFIG path to pkg-config utility -+ BASE_DEPENDENCIES_CFLAGS -+ C compiler flags for BASE_DEPENDENCIES, overriding pkg-config -+ BASE_DEPENDENCIES_LIBS -+ linker flags for BASE_DEPENDENCIES, overriding pkg-config -+ XMKMF Path to xmkmf, Makefile generator for X Window System -+ -+Use these variables to override the choices made by `configure' or to help -+it to find libraries and programs with nonstandard names/locations. -+ -+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>. -+_ACEOF -+ac_status=$? -+fi -+ -+if test "$ac_init_help" = "recursive"; then -+ # If there are subdirs, report their specific --help. -+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + PKG_CONFIG path to pkg-config utility + BASE_DEPENDENCIES_CFLAGS + C compiler flags for BASE_DEPENDENCIES, overriding pkg-config +@@ -1900,17 +1810,15 @@ + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || +- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || +- continue + test -d "$ac_dir" || continue -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ # A ".." for each directory in $ac_dir_suffix. + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix -+ -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive -+ else + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -1946,7 +1854,7 @@ + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else +- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } -+ done -+fi -+ -+test -n "$ac_init_help" && exit $ac_status -+if $ac_init_version; then -+ cat <<\_ACEOF -+gtk+ configure 2.14.4 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +@@ -1956,10 +1864,10 @@ + if $ac_init_version; then + cat <<\_ACEOF + gtk+ configure 2.14.5 +-generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.61 -+ -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+This configure script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it. -+_ACEOF -+ exit -+fi -+cat >config.log <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by gtk+ $as_me 2.14.4, which was + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1970,7 +1878,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by gtk+ $as_me 2.14.5, which was +-generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+@%:@@%:@ --------- @%:@@%:@ -+@%:@@%:@ Platform. @%:@@%:@ -+@%:@@%:@ --------- @%:@@%:@ -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. + + $ $0 $@ + +@@ -2006,7 +1914,7 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" + echo "PATH: $as_dir" -+done -+IFS=$as_save_IFS -+ -+} >&5 -+ -+cat >&5 <<_ACEOF -+ -+ -+@%:@@%:@ ----------- @%:@@%:@ -+@%:@@%:@ Core tests. @%:@@%:@ -+@%:@@%:@ ----------- @%:@@%:@ -+ -+_ACEOF -+ -+ -+# Keep a trace of the command line. -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. -+# Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. -+ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= -+ac_must_keep_next=false -+for ac_pass in 1 2 -+do -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ continue ;; -+ *\'*) + done + IFS=$as_save_IFS + +@@ -2041,7 +1949,7 @@ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) +- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case $ac_pass in -+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 2) -+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac -+ fi -+ ac_configure_args="$ac_configure_args '$ac_arg'" -+ ;; -+ esac -+ done -+done -+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+ -+# When interrupted or exit'd, cleanup temporary files, and complete -+# config.log. We remove comments because anyway the quotes in there -+# would cause problems or look ugly. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -+trap 'exit_status=$? -+ # Save into config.log some information that might help in debugging. -+ { -+ echo -+ -+ cat <<\_ASBOX -+@%:@@%:@ ---------------- @%:@@%:@ -+@%:@@%:@ Cache variables. @%:@@%:@ -+@%:@@%:@ ---------------- @%:@@%:@ -+_ASBOX -+ echo -+ # The following way of writing the cache mishandles newlines in values, -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +@@ -2093,12 +2001,11 @@ + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ (set) 2>&1 | -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ sed -n \ -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( -+ *) -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) -+ echo -+ -+ cat <<\_ASBOX -+@%:@@%:@ ----------------- @%:@@%:@ -+@%:@@%:@ Output variables. @%:@@%:@ -+@%:@@%:@ ----------------- @%:@@%:@ -+_ASBOX -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( +- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac +@@ -2128,9 +2035,9 @@ + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac + esac +- $as_echo "$ac_var='\''$ac_val'\''" + echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ cat <<\_ASBOX -+@%:@@%:@ ------------------- @%:@@%:@ -+@%:@@%:@ File substitutions. @%:@@%:@ -+@%:@@%:@ ------------------- @%:@@%:@ -+_ASBOX -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in + done | sort + echo + +@@ -2145,9 +2052,9 @@ + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac + esac +- $as_echo "$ac_var='\''$ac_val'\''" + echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ fi -+ -+ if test -s confdefs.h; then -+ cat <<\_ASBOX -+@%:@@%:@ ----------- @%:@@%:@ -+@%:@@%:@ confdefs.h. @%:@@%:@ -+@%:@@%:@ ----------- @%:@@%:@ -+_ASBOX -+ echo -+ cat confdefs.h -+ echo -+ fi -+ test "$ac_signal" != 0 && + done | sort + echo + fi +@@ -2163,8 +2070,8 @@ + echo + fi + test "$ac_signal" != 0 && +- $as_echo "$as_me: caught signal $ac_signal" +- $as_echo "$as_me: exit $exit_status" + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" -+ } >&5 -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -+ exit $exit_status -+' 0 -+for ac_signal in 1 2 13 15; do -+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+done -+ac_signal=0 -+ -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -f -r conftest* confdefs.h -+ -+# Predefined preprocessor variables. -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_NAME "$PACKAGE_NAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_VERSION "$PACKAGE_VERSION" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_STRING "$PACKAGE_STRING" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -+_ACEOF -+ -+ -+# Let the site file select an alternate cache file if it wants to. + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +@@ -2206,24 +2113,21 @@ + + + # Let the site file select an alternate cache file if it wants to. +-# Prefer an explicitly selected file to automatically selected ones. +-ac_site_file1=NONE +-ac_site_file2=NONE +# Prefer explicitly selected file to automatically selected ones. -+if test -n "$CONFIG_SITE"; then + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE + set x "$CONFIG_SITE" -+elif test "x$prefix" != xNONE; then + elif test "x$prefix" != xNONE; then +- ac_site_file1=$prefix/share/config.site +- ac_site_file2=$prefix/etc/config.site + set x "$prefix/share/config.site" "$prefix/etc/config.site" -+else + else +- ac_site_file1=$ac_default_prefix/share/config.site +- ac_site_file2=$ac_default_prefix/etc/config.site + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" -+fi + fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" +shift +for ac_site_file -+do -+ if test -r "$ac_site_file"; then + do +- test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then +- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-$as_echo "$as_me: loading site script $ac_site_file" >&6;} + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} -+ sed 's/^/| /' "$ac_site_file" >&5 -+ . "$ac_site_file" -+ fi -+done -+ -+if test -r "$cache_file"; then -+ # Some versions of bash will fail to source /dev/null (special -+ # files actually), so we avoid doing that. -+ if test -f "$cache_file"; then + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +@@ -2233,16 +2137,16 @@ + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-$as_echo "$as_me: loading cache $cache_file" >&6;} + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} -+ case $cache_file in -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; -+ esac -+ fi -+else + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-$as_echo "$as_me: creating cache $cache_file" >&6;} + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} -+ >$cache_file -+fi -+ -+# Check that the precious variables saved in the cache have kept the same -+# value. -+ac_cache_corrupted=false -+for ac_var in $ac_precious_vars; do -+ eval ac_old_set=\$ac_cv_env_${ac_var}_set -+ eval ac_new_set=\$ac_env_${ac_var}_set -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value -+ case $ac_old_set,$ac_new_set in -+ set,) + >$cache_file + fi + +@@ -2256,38 +2160,29 @@ + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,set) + ac_cache_corrupted=: ;; + ,set) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,);; -+ *) -+ if test "x$ac_old_val" != "x$ac_new_val"; then + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- # differences in whitespace do not lead to failure. +- ac_old_val_w=`echo x $ac_old_val` +- ac_new_val_w=`echo x $ac_new_val` +- if test "$ac_old_val_w" != "$ac_new_val_w"; then +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- ac_cache_corrupted=: +- else +- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} +- eval $ac_var=\$ac_old_val +- fi +- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 @@ -6089,249 +20098,189 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: -+ fi;; -+ esac -+ # Pass precious variables to config.status. -+ if test "$ac_new_set" = set; then -+ case $ac_new_val in + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *) ac_arg=$ac_var=$ac_new_val ;; -+ esac -+ case " $ac_configure_args " in -+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ esac -+ fi -+done -+if $ac_cache_corrupted; then + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in +@@ -2297,12 +2192,10 @@ + fi + done + if $ac_cache_corrupted; then +- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ -+ -+ -+# Save this value here, since automake will set cflags later -+cflags_set=${CFLAGS+set} -+ + { (exit 1); exit 1; }; } + fi + +@@ -2343,7 +2236,8 @@ + # Save this value here, since automake will set cflags later + cflags_set=${CFLAGS+set} + +-am__api_version="1.7" +am__api_version='1.10' + -+ac_aux_dir= -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ if test -f "$ac_dir/install-sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install-sh -c" -+ break -+ elif test -f "$ac_dir/install.sh"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install.sh -c" -+ break -+ elif test -f "$ac_dir/shtool"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/shtool install -c" -+ break -+ fi -+done -+if test -z "$ac_aux_dir"; then + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then +@@ -2361,8 +2255,8 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ -+ -+# Find a good install program. We prefer a C program (faster), -+# so one script is as good as another. But avoid the broken or -+# incompatible versions: -+# SysV /etc/install, /usr/sbin/install -+# SunOS /usr/etc/install -+# IRIX /sbin/install -+# AIX /bin/install -+# AmigaOS /C/install, which installs bootblocks on floppy discs -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -+# AFS /usr/afsws/bin/install, which mishandles nonexistent args -+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic -+# ./install, which can be erroneously created by make from ./install.sh. + { (exit 1); exit 1; }; } + fi + +@@ -2388,12 +2282,11 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-# Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -+if test -z "$INSTALL"; then -+if test "${ac_cv_path_install+set}" = set; then + if test -z "$INSTALL"; then + if test "${ac_cv_path_install+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in -+ ./ | .// | /cC/* | \ -+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ /usr/ucb/* ) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # 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_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. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -2422,29 +2315,17 @@ + # program-specific install script used by HP pwplus--don't use. + : + else +- rm -rf conftest.one conftest.two conftest.dir +- echo one > conftest.one +- echo two > conftest.two +- mkdir conftest.dir +- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +- test -s conftest.one && test -s conftest.two && +- test -s conftest.dir/conftest.one && +- test -s conftest.dir/conftest.two +- then +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 -+ fi -+ fi -+ done -+ done -+ ;; -+esac -+done -+IFS=$as_save_IFS -+ -+ -+fi -+ if test "${ac_cv_path_install+set}" = set; then -+ INSTALL=$ac_cv_path_install -+ else -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ INSTALL=$ac_install_sh -+ fi -+fi + fi + fi + done + done + ;; + esac +- + done + IFS=$as_save_IFS + +-rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -2457,8 +2338,8 @@ + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +-$as_echo "$INSTALL" >&6; } +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } -+ -+# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -+# It thinks the first close brace ends the variable substitution. -+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -+ -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ -+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -+ + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -2468,8 +2349,8 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-$as_echo_n "checking whether build environment is sane... " >&6; } +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } -+# Just in case -+sleep 1 -+echo timestamp > conftest.file -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ if test "$*" = "X"; then -+ # -L didn't work. -+ set X `ls -t $srcdir/configure conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$*" != "X $srcdir/configure conftest.file" \ -+ && test "$*" != "X conftest.file $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". + # Just in case + sleep 1 + echo timestamp > conftest.file +@@ -2492,9 +2373,9 @@ + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -+alias in your environment" >&5 + alias in your environment" >&5 +-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -+alias in your environment" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ -+ test "$2" = conftest.file -+ ) -+then -+ # Ok. -+ : -+else + alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2505,24 +2386,26 @@ + # Ok. + : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -+Check your system clock" >&5 + Check your system clock" >&5 +-$as_echo "$as_me: error: newly created file is older than distributed files! +echo "$as_me: error: newly created file is older than distributed files! -+Check your system clock" >&2;} -+ { (exit 1); exit 1; }; } -+fi + Check your system clock" >&2;} + { (exit 1); exit 1; }; } + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -+test "$program_prefix" != NONE && -+ program_transform_name="s&^&$program_prefix&;$program_transform_name" -+# Use a double $ so make ignores it. -+test "$program_suffix" != NONE && -+ program_transform_name="s&\$&$program_suffix&;$program_transform_name" + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. + test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +-# Double any \ or $. +# Double any \ or $. echo might interpret backslashes. -+# By default was `s,x,x', remove it if useless. + # By default was `s,x,x', remove it if useless. +-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +- +cat <<\_ACEOF >conftest.sed +s/[\\$]/&&/g;s/;s,x,x,$// +_ACEOF +program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +rm -f conftest.sed -+ -+# expand $ac_aux_dir to an absolute path -+am_aux_dir=`cd $ac_aux_dir && pwd` -+ -+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run true"; then -+ am_missing_run="$MISSING --run " -+else -+ am_missing_run= + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` +@@ -2533,18 +2416,66 @@ + am_missing_run="$MISSING --run " + else + am_missing_run= +- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+fi -+ + fi + +-for ac_prog in gawk mawk nawk awk +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AWK+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then @@ -6388,79 +20337,76 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$AWK"; then -+ ac_cv_prog_AWK="$AWK" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AWK="$ac_prog" + else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +@@ -2557,7 +2488,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+AWK=$ac_cv_prog_AWK -+if test -n "$AWK"; then + break 2 + fi + done +@@ -2568,23 +2499,22 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +-$as_echo "$AWK" >&6; } + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$AWK" && break -+done -+ + fi + + + test -n "$AWK" && break + done + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +-set x ${MAKE-make} +-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then + if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh -+all: -+ @echo '@@@%%%=$(MAKE)=@@@%%%' -+_ACEOF -+# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac -+rm -f conftest.make -+fi -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + else + cat >conftest.make <<\_ACEOF + SHELL = /bin/sh +@@ -2601,12 +2531,12 @@ + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -+ SET_MAKE= -+else + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+ SET_MAKE="MAKE=${MAKE-make}" -+fi -+ -+rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. -+else -+ am__leading_dot=_ -+fi -+rmdir .tst 2>/dev/null -+ + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -2619,12 +2549,16 @@ + fi + rmdir .tst 2>/dev/null + +- # test to see if srcdir already configured +-if test "`cd $srcdir && pwd`" != "`pwd`" && +- test -f $srcdir/config.status; then +- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." @@ -6469,149 +20415,125 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -+ { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; } + fi -+fi -+ -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi -+fi -+ -+ -+# Define the identity of the package. -+ PACKAGE='gtk+' -+ VERSION='2.14.4' -+ -+ -+# Some tools Automake needs. -+ -+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} -+ -+ -+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} -+ -+ -+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} -+ -+ -+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} -+ -+ -+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -+ + fi + + # test whether we have cygpath +@@ -2658,10 +2592,7 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +- +-AMTAR=${AMTAR-"${am_missing_run}tar"} +- +-install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -+ -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+if test "$cross_compiling" != no; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -+set dummy ${ac_tool_prefix}strip; ac_word=$2 + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -2671,10 +2602,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_STRIP+set}" = set; then + if test "${ac_cv_prog_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -2687,7 +2618,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+STRIP=$ac_cv_prog_STRIP -+if test -n "$STRIP"; then + break 2 + fi + done +@@ -2698,11 +2629,11 @@ + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_STRIP"; then -+ ac_ct_STRIP=$STRIP -+ # Extract the first word of "strip", so it can be a program name with args. -+set dummy strip; ac_word=$2 + fi + + +@@ -2711,10 +2642,10 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_STRIP"; then -+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_STRIP="strip" + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -2727,7 +2658,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -+if test -n "$ac_ct_STRIP"; then + break 2 + fi + done +@@ -2738,11 +2669,11 @@ + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-$as_echo "$ac_ct_STRIP" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) + fi + + if test "x$ac_ct_STRIP" = x; then +@@ -2750,8 +2681,12 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi -+else -+ STRIP="$ac_cv_prog_STRIP" -+fi -+ -+fi + ac_tool_warned=yes ;; + esac + STRIP=$ac_ct_STRIP +@@ -2761,10 +2696,17 @@ + fi + + fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -+ -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} @@ -6619,567 +20541,458 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + -+ -+ -+ -+ac_config_headers="$ac_config_headers config.h" -+ -+ -+# -+# For each of the libraries we build, we define the following -+ -+# substituted variables: -+# -+# foo_PACKAGES: pkg-config packages this library requires -+# foo_EXTRA_LIBS: Libraries this module requires not pulled in by pkg-config -+# foo_EXTRA_CFLAGS: cflags this module requires not pulled in by pkg-config -+# foo_DEP_LIBS: All libraries this module requires -+# foo_DEP_CFLAGS: All cflags this module requires -+ -+ -+GTK_MAJOR_VERSION=2 -+GTK_MINOR_VERSION=14 -+GTK_MICRO_VERSION=4 -+GTK_INTERFACE_AGE=4 -+GTK_BINARY_AGE=1404 -+GTK_VERSION=2.14.4 -+GTK_API_VERSION=2.0 -+GTK_BINARY_VERSION=2.10.0 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+# libtool versioning -+#LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION -+#LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE` -+#LT_REVISION=$GTK_INTERFACE_AGE -+#LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE` -+#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` -+ -+ -+ -+ -+LT_VERSION_INFO="1400:4:1400" -+LT_CURRENT_MINUS_AGE=0 -+ -+ -+ -+ -+ -+ -+ -+ -+GAIL_LT_VERSION_INFO=18:1:0 -+ -+GAIL_LT_CURRENT_MINUS_AGE=18 -+ -+ -+# -+# gdk-pixbuf gets versioned separately, and for now, using standard -+# libtool versioning, not GTK+-style versioning -+# -+GDK_PIXBUF_MAJOR=2 -+GDK_PIXBUF_MINOR=14 -+GDK_PIXBUF_MICRO=4 -+GDK_PIXBUF_VERSION="${GDK_PIXBUF_MAJOR}.${GDK_PIXBUF_MINOR}.${GDK_PIXBUF_MICRO}" -+ -+ -+ -+ -+ -+GETTEXT_PACKAGE=gtk20 -+ -+ -+cat >>confdefs.h <<_ACEOF -+@%:@define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -+_ACEOF -+ -+ -+# Make sure we can run config.sub. -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + + + +@@ -2848,34 +2790,34 @@ + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} -+ { (exit 1); exit 1; }; } -+ + { (exit 1); exit 1; }; } + +-{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +-$as_echo_n "checking build system type... " >&6; } +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -+if test "${ac_cv_build+set}" = set; then + if test "${ac_cv_build+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -+ { (exit 1); exit 1; }; } -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { (exit 1); exit 1; }; } + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} -+ { (exit 1); exit 1; }; } -+ -+fi + { (exit 1); exit 1; }; } + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-$as_echo "$ac_cv_build" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; + case $ac_cv_build in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-$as_echo "$as_me: error: invalid value of canonical build" >&2;} +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} -+ { (exit 1); exit 1; }; };; -+esac -+build=$ac_cv_build -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -+ -+ + { (exit 1); exit 1; }; };; + esac + build=$ac_cv_build +@@ -2892,27 +2834,27 @@ + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +-$as_echo_n "checking host system type... " >&6; } +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -+if test "${ac_cv_host+set}" = set; then + if test "${ac_cv_host+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+fi + { (exit 1); exit 1; }; } + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-$as_echo "$ac_cv_host" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; + case $ac_cv_host in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-$as_echo "$as_me: error: invalid value of canonical host" >&2;} +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} -+ { (exit 1); exit 1; }; };; -+esac -+host=$ac_cv_host -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -+ -+ -+ -+MATH_LIB=-lm + { (exit 1); exit 1; }; };; + esac + host=$ac_cv_host +@@ -2931,8 +2873,8 @@ + + + MATH_LIB=-lm +-{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5 +-$as_echo_n "checking for native Win32... " >&6; } +{ echo "$as_me:$LINENO: checking for native Win32" >&5 +echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } -+LIB_EXE_MACHINE_FLAG=X86 -+case "$host" in -+ *-*-mingw*) -+ os_win32=yes -+ gio_can_sniff=no -+ MATH_LIB= -+ case "$host" in -+ x86_64-*-*) -+ LIB_EXE_MACHINE_FLAG=X64 -+ ;; -+ esac -+ ;; -+ *) -+ os_win32=no -+ ;; -+esac + LIB_EXE_MACHINE_FLAG=X86 + case "$host" in + *-*-mingw*) +@@ -2949,8 +2891,8 @@ + os_win32=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $os_win32" >&5 +-$as_echo "$os_win32" >&6; } +{ echo "$as_me:$LINENO: result: $os_win32" >&5 +echo "${ECHO_T}$os_win32" >&6; } -+ -+ -+ -+case $host in -+ *-*-linux*) -+ os_linux=yes -+ ;; -+esac -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}gcc; ac_word=$2 + + + +@@ -2968,10 +2910,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_CC="${ac_tool_prefix}gcc" + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2984,7 +2926,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then + break 2 + fi + done +@@ -2995,11 +2937,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_CC"; then -+ ac_ct_CC=$CC -+ # Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 + fi + + +@@ -3008,10 +2950,10 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_CC="gcc" + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -3024,7 +2966,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then + break 2 + fi + done +@@ -3035,11 +2977,11 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) + fi + + if test "x$ac_ct_CC" = x; then +@@ -3047,8 +2989,12 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi -+else -+ CC="$ac_cv_prog_CC" -+fi -+ -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}cc; ac_word=$2 + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +@@ -3061,10 +3007,10 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_CC="${ac_tool_prefix}cc" + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3077,7 +3023,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then + break 2 + fi + done +@@ -3088,11 +3034,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ fi -+fi -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 + fi + + +@@ -3101,10 +3047,10 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ ac_prog_rejected=no -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+ ac_cv_prog_CC="cc" + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3122,7 +3068,7 @@ + continue + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $@%:@ != 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -+ fi -+fi -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then + break 2 + fi + done +@@ -3145,11 +3091,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in cl.exe -+ 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 + fi + + +@@ -3160,10 +3106,10 @@ + 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3176,7 +3122,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then + break 2 + fi + done +@@ -3187,11 +3133,11 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$CC" && break -+ done -+fi -+if test -z "$CC"; then -+ ac_ct_CC=$CC -+ for ac_prog in cl.exe -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 + fi + + +@@ -3204,10 +3150,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_CC="$ac_prog" + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -3220,7 +3166,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then + break 2 + fi + done +@@ -3231,11 +3177,11 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_CC" && break -+done -+ -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) + fi + + +@@ -3247,8 +3193,12 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi -+fi -+ -+fi -+ -+ + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +@@ -3258,50 +3208,44 @@ + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&5 + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +echo "$as_me: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&2;} + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } -+ -+# Provide some information about the compiler. + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 +echo "$as_me:$LINENO: checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + { (ac_try="$ac_compiler --version >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 -+ ac_status=$? + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + (exit $ac_status); } + { (ac_try="$ac_compiler -v >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 -+ ac_status=$? + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + (exit $ac_status); } + { (ac_try="$ac_compiler -V >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 -+ ac_status=$? + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+ac_clean_files_save=$ac_clean_files + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +@@ -3320,22 +3264,27 @@ + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.exe b.out" -+# Try to create an executable without -o first, disregard a.out. -+# It will help us diagnose broken compilers, and finding out an intuition -+# of exeext. + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } +-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +- +-# The possible output files: +-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" +- +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` @@ -7192,681 +21005,514 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in + ac_rmfiles= + for ac_file in $ac_files + do + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { (ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac + done +@@ -3346,11 +3295,10 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# 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 '' -+do -+ test -f "$ac_file" || continue -+ case $ac_file in + (exit $ac_status); }; then + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +@@ -3361,7 +3309,7 @@ + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) -+ ;; -+ [ab].out ) -+ # We found the default executable, but exeext='' is most -+ # certainly right. -+ break;; -+ *.* ) -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. -+ break;; -+ * ) -+ break;; -+ esac -+done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ -+else -+ ac_file='' -+fi -+ + ;; + [ab].out ) + # We found the default executable, but exeext='' is most +@@ -3388,27 +3336,25 @@ + ac_file='' + fi + +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } -+if test -z "$ac_file"; then + if test -z "$ac_file"; then +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -+See \`config.log' for more details." >&5 + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C compiler cannot create executables +echo "$as_me: error: C compiler cannot create executables -+See \`config.log' for more details." >&2;} + See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } + { (exit 77); exit 77; }; } -+fi -+ -+ac_exeext=$ac_cv_exeext -+ -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. + fi + + ac_exeext=$ac_cv_exeext + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -+# If not cross compiling, check that we can run a simple program. -+if test "$cross_compiling" != yes; then -+ if { ac_try='./$ac_file' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then +@@ -3417,53 +3363,49 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." >&5 + If you meant to cross compile, use \`--host'. + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run C compiled programs. +echo "$as_me: error: cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." >&2;} + If you meant to cross compile, use \`--host'. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } -+ fi -+ fi -+fi + fi + fi + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -+ + +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +rm -f a.out a.exe conftest$ac_cv_exeext b.out -+ac_clean_files=$ac_clean_files_save -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. + ac_clean_files=$ac_clean_files_save + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } -+ + +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-$as_echo_n "checking for suffix of executables... " >&6; } +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ # If both `conftest.exe' and `conftest' are `present' (well, observable) -+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -+# work properly (i.e., refer to `conftest.exe'), while it won't with -+# `rm'. -+for ac_file in conftest.exe conftest conftest.*; do -+ test -f "$ac_file" || continue -+ case $ac_file in + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -3472,33 +3414,31 @@ + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ break;; -+ * ) break;; -+ esac -+done -+else + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac + done + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." >&5 + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." >&2;} + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } -+fi -+ -+rm -f conftest$ac_cv_exeext + fi + + rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-$as_echo "$ac_cv_exeext" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } -+ -+rm -f conftest.$ac_ext -+EXEEXT=$ac_cv_exeext -+ac_exeext=$EXEEXT + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-$as_echo_n "checking for suffix of object files... " >&6; } +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -+if test "${ac_cv_objext+set}" = set; then + if test "${ac_cv_objext+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.o conftest.obj -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3521,43 +3461,40 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>&5 -+ ac_status=$? + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; -+ case $ac_file in + (exit $ac_status); }; then + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; -+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` -+ break;; -+ esac -+done -+else + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." >&5 + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile +echo "$as_me: error: cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." >&2;} + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } + { (exit 1); exit 1; }; } -+fi -+ -+rm -f conftest.$ac_cv_objext conftest.$ac_ext -+fi + fi + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-$as_echo "$ac_cv_objext" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } -+OBJEXT=$ac_cv_objext -+ac_objext=$OBJEXT + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -+if test "${ac_cv_c_compiler_gnu+set}" = set; then + if test "${ac_cv_c_compiler_gnu+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+#ifndef __GNUC__ -+ choke me -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3583,21 +3520,20 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_compiler_gnu=yes -+else + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_compiler_gnu=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_c_compiler_gnu=$ac_compiler_gnu -+ -+fi + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -3607,19 +3543,15 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-$as_echo "$ac_cv_c_compiler_gnu" >&6; } +-if test $ac_compiler_gnu = yes; then +- GCC=yes +-else +- GCC= +-fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +GCC=`test $ac_compiler_gnu = yes && echo yes` -+ac_test_CFLAGS=${CFLAGS+set} -+ac_save_CFLAGS=$CFLAGS + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-$as_echo_n "checking whether $CC accepts -g... " >&6; } +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_g+set}" = set; then + if test "${ac_cv_prog_cc_g+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes +@@ -3646,21 +3578,20 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 + (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 +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" +@@ -3685,21 +3616,20 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag +@@ -3725,21 +3655,20 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 + (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 +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -3754,8 +3683,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-$as_echo "$ac_cv_prog_cc_g" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS=$ac_save_CFLAGS -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" -+ fi -+else -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi -+fi + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then +@@ -3771,10 +3700,10 @@ + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then + if test "${ac_cv_prog_cc_c89+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_prog_cc_c89=no -+ac_save_CC=$CC -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdarg.h> -+#include <stdio.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -+struct buf { int x; }; -+FILE * (*rcsopen) (struct buf *, struct stat *, int); -+static char *e (p, i) -+ char **p; -+ int i; -+{ -+ return p[i]; -+} -+static char *f (char * (*g) (char **, int), char **p, ...) -+{ -+ char *s; -+ va_list v; -+ va_start (v,p); -+ s = g (p, va_arg (v,int)); -+ va_end (v); -+ return s; -+} -+ -+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has -+ function prototypes and stuff, but not '\xHH' hex character constants. -+ These don't provoke an error unfortunately, instead are silently treated -+ as 'x'. The following induces an error, until -std is added to get -+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an -+ array size at least. It's necessary to write '\x00'==0 to get something -+ that's true only with -std. */ -+int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -+ -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ -+int test (int i, double x); -+struct s1 {int (*f) (int a);}; -+struct s2 {int (*f) (double a);}; -+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -+int argc; -+char **argv; -+int -+main () -+{ -+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -+ ; -+ return 0; -+} -+_ACEOF -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+do -+ CC="$ac_save_CC $ac_arg" -+ rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +@@ -3845,21 +3774,20 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 + (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 +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break -+done -+rm -f conftest.$ac_ext -+CC=$ac_save_CC -+ -+fi -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -3875,15 +3803,15 @@ + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ;; + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; -+ xno) + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +-$as_echo "unsupported" >&6; } ;; + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; -+ *) -+ CC="$CC $ac_cv_prog_cc_c89" + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -+esac -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+DEPDIR="${am__leading_dot}deps" -+ -+ac_config_commands="$ac_config_commands depfiles" -+ -+ -+am_make=${MAKE-make} -+cat > confinc << 'END' -+am__doit: -+ @echo done -+.PHONY: am__doit -+END -+# If we don't find an include directive, just comment out the code. + esac + + +@@ -3904,8 +3832,8 @@ + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +-$as_echo_n "checking for style of include used by $am_make... " >&6; } +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } -+am__include="#" -+am__quote= -+_am_result=none -+# First try GNU make style include. -+echo "include confinc" > confmf -+# We grep out `Entering directory' and `Leaving directory' -+# messages which can occur if `w' ends up in MAKEFLAGS. -+# In particular we don't look at `^make:' because GNU make might -+# be invoked under some other name (usually "gmake"), in which -+# case it prints its new name instead of `make'. -+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then -+ am__include=include -+ am__quote= -+ _am_result=GNU -+fi -+# Now try BSD make style include. -+if test "$am__include" = "#"; then -+ echo '.include "confinc"' > confmf -+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then -+ am__include=.include -+ am__quote="\"" -+ _am_result=BSD -+ fi -+fi -+ -+ + am__include="#" + am__quote= + _am_result=none +@@ -3932,8 +3860,8 @@ + fi + + +-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +-$as_echo "$_am_result" >&6; } +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } -+rm -f confinc confmf -+ -+# Check whether --enable-dependency-tracking was given. -+if test "${enable_dependency_tracking+set}" = set; then -+ enableval=$enable_dependency_tracking; -+fi -+ -+if test "x$enable_dependency_tracking" != xno; then -+ am_depcomp="$ac_aux_dir/depcomp" -+ AMDEPBACKSLASH='\' -+fi + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +@@ -3945,9 +3873,7 @@ + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi +- +- +-if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then -+ AMDEP_TRUE= -+ AMDEP_FALSE='#' -+else -+ AMDEP_TRUE='#' -+ AMDEP_FALSE= -+fi -+ -+ -+ -+depcc="$CC" am_compiler_list= -+ + AMDEP_TRUE= + AMDEP_FALSE='#' + else +@@ -3957,13 +3883,12 @@ + + + +- + depcc="$CC" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-$as_echo_n "checking dependency style of $depcc... " >&6; } +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_CC_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -3999,7 +3924,9 @@ + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +@@ -4023,13 +3950,19 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: @@ -7875,59 +21521,35 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CC_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_CC_dependencies_compiler_type=none -+fi -+ -+fi + am_cv_CC_dependencies_compiler_type=$depmode + break + fi +@@ -4043,13 +3976,11 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -+ -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then -+ am__fastdepCC_TRUE= -+ am__fastdepCC_FALSE='#' -+else -+ am__fastdepCC_TRUE='#' -+ am__fastdepCC_FALSE= -+fi -+ -+ -+# Check whether --enable-static was given. -+if test "${enable_static+set}" = set; then -+ enableval=$enable_static; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac -+else -+ enable_static=no -+fi -+ -+ -+ + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= +@@ -4085,11 +4016,13 @@ + + + +- +- +- +- +- + if test "$enable_static" = yes; then + ENABLE_STATIC_TRUE= + ENABLE_STATIC_FALSE='#' @@ -7935,556 +21557,428 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ENABLE_STATIC_TRUE='#' + ENABLE_STATIC_FALSE= +fi -+ -+ -+if test -n "$ac_tool_prefix"; then -+ for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl -+ 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 + + + if test -n "$ac_tool_prefix"; then +@@ -4097,10 +4030,10 @@ + 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CXX+set}" = set; then + if test "${ac_cv_prog_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CXX"; then -+ ac_cv_prog_CXX="$CXX" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +@@ -4113,7 +4046,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CXX=$ac_cv_prog_CXX -+if test -n "$CXX"; then + break 2 + fi + done +@@ -4124,11 +4057,11 @@ + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +-$as_echo "$CXX" >&6; } + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$CXX" && break -+ done -+fi -+if test -z "$CXX"; then -+ ac_ct_CXX=$CXX -+ 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. -+set dummy $ac_prog; ac_word=$2 + fi + + +@@ -4141,10 +4074,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CXX"; then -+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_CXX="$ac_prog" + else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +@@ -4157,7 +4090,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -+if test -n "$ac_ct_CXX"; then + break 2 + fi + done +@@ -4168,11 +4101,11 @@ + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-$as_echo "$ac_ct_CXX" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_CXX" && break -+done -+ -+ if test "x$ac_ct_CXX" = x; then -+ CXX="gcc" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) + fi + + +@@ -4184,8 +4117,12 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CXX=$ac_ct_CXX -+ fi -+fi -+ -+ -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+ -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+if test -z "$CXX"; then -+ if test -n "$CCC"; then -+ CXX=$CCC -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -+ 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 + ac_tool_warned=yes ;; + esac + CXX=$ac_ct_CXX +@@ -4214,10 +4151,10 @@ + 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CXX+set}" = set; then + if test "${ac_cv_prog_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CXX"; then -+ ac_cv_prog_CXX="$CXX" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +@@ -4230,7 +4167,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CXX=$ac_cv_prog_CXX -+if test -n "$CXX"; then + break 2 + fi + done +@@ -4241,11 +4178,11 @@ + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +-$as_echo "$CXX" >&6; } + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$CXX" && break -+ done -+fi -+if test -z "$CXX"; then -+ ac_ct_CXX=$CXX -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 + fi + + +@@ -4258,10 +4195,10 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CXX"; then -+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_CXX="$ac_prog" + else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +@@ -4274,7 +4211,7 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -+if test -n "$ac_ct_CXX"; then + break 2 + fi + done +@@ -4285,11 +4222,11 @@ + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-$as_echo "$ac_ct_CXX" >&6; } + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_CXX" && break -+done -+ -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) + fi + + +@@ -4301,8 +4238,12 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CXX=$ac_ct_CXX -+ fi -+fi -+ -+ fi -+fi -+# Provide some information about the compiler. + ac_tool_warned=yes ;; + esac + CXX=$ac_ct_CXX +@@ -4312,47 +4253,43 @@ + fi + fi + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + { (ac_try="$ac_compiler --version >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 -+ ac_status=$? + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + (exit $ac_status); } + { (ac_try="$ac_compiler -v >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 -+ ac_status=$? + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + (exit $ac_status); } + { (ac_try="$ac_compiler -V >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 -+ ac_status=$? + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ + (exit $ac_status); } + +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } -+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+#ifndef __GNUC__ -+ choke me -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -4378,21 +4315,20 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_compiler_gnu=yes -+else + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_compiler_gnu=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -+ -+fi + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -4402,19 +4338,15 @@ + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +-if test $ac_compiler_gnu = yes; then +- GXX=yes +-else +- GXX= +-fi +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +GXX=`test $ac_compiler_gnu = yes && echo yes` -+ac_test_CXXFLAGS=${CXXFLAGS+set} -+ac_save_CXXFLAGS=$CXXFLAGS + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +-$as_echo_n "checking whether $CXX accepts -g... " >&6; } +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cxx_g+set}" = set; then + if test "${ac_cv_prog_cxx_g+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes +@@ -4441,21 +4373,20 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 + (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 +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CXXFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + sed 's/^/| /' conftest.$ac_ext >&5 + + CXXFLAGS="" +@@ -4480,21 +4411,20 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +@@ -4520,21 +4450,20 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 + (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 +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+fi + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -4549,8 +4478,8 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +-$as_echo "$ac_cv_prog_cxx_g" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS=$ac_save_CXXFLAGS -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi -+fi -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+depcc="$CXX" am_compiler_list= -+ + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS + elif test $ac_cv_prog_cxx_g = yes; then +@@ -4574,10 +4503,10 @@ + + depcc="$CXX" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-$as_echo_n "checking dependency style of $depcc... " >&6; } +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_CXX_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -4613,7 +4542,9 @@ + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c +- : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +@@ -4637,13 +4568,19 @@ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: @@ -8493,159 +21987,151 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CXX_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_CXX_dependencies_compiler_type=none -+fi -+ -+fi + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi +@@ -4657,13 +4594,11 @@ + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } -+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type -+ -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then -+ am__fastdepCXX_TRUE= -+ am__fastdepCXX_FALSE='#' -+else -+ am__fastdepCXX_TRUE='#' -+ am__fastdepCXX_FALSE= -+fi -+ -+ -+ -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+class a { int b; } c; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + +- +- +-if ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= +@@ -4696,30 +4631,27 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CXX= -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + CXX= + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +- +-if test "$CXX" != ""; then + if test "$CXX" != ""; then -+ HAVE_CXX_TRUE= -+ HAVE_CXX_FALSE='#' -+else -+ HAVE_CXX_TRUE='#' -+ HAVE_CXX_FALSE= -+fi -+ -+ -+gtk_save_cxxflags="$CXXFLAGS" -+CXXFLAGS="$CXXFLAGS -x objective-c++" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@interface Foo @end -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + HAVE_CXX_TRUE= + HAVE_CXX_FALSE='#' + else +@@ -4751,30 +4683,27 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ OBJC=yes -+else + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + OBJC=yes + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ OBJC=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + OBJC=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +- +-if test "$OBJC" = "yes"; then + if test "$OBJC" = "yes"; then -+ HAVE_OBJC_TRUE= -+ HAVE_OBJC_FALSE='#' -+else -+ HAVE_OBJC_TRUE='#' -+ HAVE_OBJC_FALSE= -+fi -+ -+CXXFLAGS="$gtk_save_cxxflags" -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+if test "$os_win32" = "yes"; then -+ if test x$enable_static = xyes -o x$enable_static = x; then + HAVE_OBJC_TRUE= + HAVE_OBJC_FALSE='#' + else +@@ -4792,389 +4721,251 @@ + + if test "$os_win32" = "yes"; then + if test x$enable_static = xyes -o x$enable_static = x; then +- { $as_echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 +-$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} + { echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 +echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} -+ enable_static=no -+ fi -+ if test x$enable_shared = xno; then + enable_static=no + fi + if test x$enable_shared = xno; then +- { $as_echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 +-$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} + { echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 +echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} -+ fi -+ enable_shared=yes -+fi -+ -+ -+ + fi + enable_shared=yes + fi + +-enable_win32_dll=yes + +-case $host in +-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +-set dummy ${ac_tool_prefix}as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AS+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$AS"; then +- ac_cv_prog_AS="$AS" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_AS="${ac_tool_prefix}as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + +-fi +-fi +-AS=$ac_cv_prog_AS +-if test -n "$AS"; then +- { $as_echo "$as_me:$LINENO: result: $AS" >&5 +-$as_echo "$AS" >&6; } +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then + enableval=$enable_shared; p=${PACKAGE-default} @@ -8665,11 +22151,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + IFS="$lt_save_ifs" + ;; + esac -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + enable_shared=yes -+fi -+ -+ + fi + + +-fi +-if test -z "$ac_cv_prog_AS"; then +- ac_ct_AS=$AS +- # Extract the first word of "as", so it can be a program name with args. +-set dummy as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then +- $as_echo_n "(cached) " >&6 +# Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then + enableval=$enable_fast_install; p=${PACKAGE-default} @@ -8689,7 +22186,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + IFS="$lt_save_ifs" + ;; + esac -+else + else +- if test -n "$ac_ct_AS"; then +- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. + enable_fast_install=yes +fi + @@ -8698,14 +22197,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } +if test "${lt_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else + # Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_AS="as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then @@ -8713,8 +22219,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + done + done -+done -+IFS=$as_save_IFS + 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 @@ -8745,11 +22251,41 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + done +done -+ -+fi -+ + + fi +-fi +-ac_ct_AS=$ac_cv_prog_ac_ct_AS +-if test -n "$ac_ct_AS"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +-$as_echo "$ac_ct_AS" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi + +- if test "x$ac_ct_AS" = x; then +- AS="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- AS=$ac_ct_AS +- fi +-else +- AS="$ac_cv_prog_AS" +-fi +SED=$lt_cv_path_SED -+ + +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +-set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DLLTOOL+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } + @@ -8757,22 +22293,30 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- if test -n "$DLLTOOL"; then +- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do +- 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { 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. @@ -8806,37 +22350,53 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + + $ac_path_GREP_found && break 3 + done -+done + done + -+done -+IFS=$as_save_IFS + done + IFS=$as_save_IFS + + -+ -+fi + fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } -+fi + fi +-DLLTOOL=$ac_cv_prog_DLLTOOL +-if test -n "$DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +-$as_echo "$DLLTOOL" >&6; } + -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + ac_cv_path_GREP=$GREP -+fi -+ -+ -+fi + fi + + + fi +-if test -z "$ac_cv_prog_DLLTOOL"; then +- ac_ct_DLLTOOL=$DLLTOOL +- # Extract the first word of "dlltool", so it can be a program name with args. +-set dummy dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" -+ ++ + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- if test -n "$ac_ct_DLLTOOL"; then +- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else @@ -8845,84 +22405,370 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do +- 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +-if test -n "$ac_ct_DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +-$as_echo "$ac_ct_DLLTOOL" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_DLLTOOL" = x; then +- DLLTOOL="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- DLLTOOL=$ac_ct_DLLTOOL +- fi +-else +- DLLTOOL="$ac_cv_prog_DLLTOOL" +-fi +- +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +-set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$OBJDUMP"; then +- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-OBJDUMP=$ac_cv_prog_OBJDUMP +-if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +-$as_echo "$OBJDUMP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_OBJDUMP"; then +- ac_ct_OBJDUMP=$OBJDUMP +- # Extract the first word of "objdump", so it can be a program name with args. +-set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_OBJDUMP"; then +- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +-if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +-$as_echo "$ac_ct_OBJDUMP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_OBJDUMP" = x; then +- OBJDUMP="false" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- OBJDUMP=$ac_ct_OBJDUMP +- fi +-else +- OBJDUMP="$ac_cv_prog_OBJDUMP" +-fi +- +- ;; +-esac +- +-test -z "$AS" && AS=as +- +- +- +- +- +-test -z "$DLLTOOL" && DLLTOOL=dlltool +- +- +- +- +- +-test -z "$OBJDUMP" && OBJDUMP=objdump +- +- +- +- +- +- +- +-case `pwd` in +- *\ * | *\ *) +- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +-esac +- +- +- +-macro_version='2.2.6' +-macro_revision='1.3012' +- +- +- +- +- +- +- +- +- +- +- +- +- +-ltmain="$ac_aux_dir/ltmain.sh" +- +-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +-$as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if test "${ac_cv_path_SED+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ +- for ac_i in 1 2 3 4 5 6 7; do +- ac_script="$ac_script$as_nl$ac_script" +- done +- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed +- $as_unset ac_script || ac_script= +- if test -z "$SED"; then +- ac_path_SED_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in sed gsed; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +-# Check for GNU ac_path_SED and select it if it is found. +- # Check for GNU $ac_path_SED +-case `"$ac_path_SED" --version 2>&1` in + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { 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 -+*GNU*) + *GNU*) +- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 + *) + ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +- $as_echo '' >> "conftest.nl" +- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` +- if test $ac_count -gt ${ac_path_SED_max-0}; then + if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one + # Best one so far, save it but keep looking for a better one +- ac_cv_path_SED="$ac_path_SED" +- ac_path_SED_max=$ac_count + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break +@@ -5182,310 +4973,85 @@ + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- $ac_path_SED_found && break 3 +- done + + $ac_path_EGREP_found && break 3 -+ done -+done -+ + done + done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_SED"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +- fi +-else +- ac_cv_path_SED=$SED +-fi +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 +-$as_echo "$ac_cv_path_SED" >&6; } +- SED="$ac_cv_path_SED" +- rm -f conftest.sed +- +-test -z "$SED" && SED=sed +-Xsed="$SED -e 1s/^X//" +- +- + +done +IFS=$as_save_IFS -+ -+ + + +fi -+ + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi -+ + +else + ac_cv_path_EGREP=$EGREP +fi -+ -+ + + + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -+ -+ -+ + + +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +-$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +-if test "${ac_cv_path_GREP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -z "$GREP"; then +- ac_path_GREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- 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_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 +-*GNU*) +- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $as_echo 'GREP' >> "conftest.nl" +- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` +- if test $ac_count -gt ${ac_path_GREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_GREP="$ac_path_GREP" +- ac_path_GREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac + +- $ac_path_GREP_found && break 3 +- done +- done +-done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_GREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } +- fi +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -+else + else +- ac_cv_path_GREP=$GREP + with_gnu_ld=no -+fi -+ + fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. @@ -8961,67 +22807,263 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +-$as_echo "$ac_cv_path_GREP" >&6; } +- GREP="$ac_cv_path_GREP" +- +- +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +-$as_echo_n "checking for egrep... " >&6; } +-if test "${ac_cv_path_EGREP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 +- then ac_cv_path_EGREP="$GREP -E" +- else +- if test -z "$EGREP"; then +- ac_path_EGREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- 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_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 +-*GNU*) +- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $as_echo 'EGREP' >> "conftest.nl" +- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` +- if test $ac_count -gt ${ac_path_EGREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_EGREP="$ac_path_EGREP" +- ac_path_EGREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac +- +- $ac_path_EGREP_found && break 3 +- done +- done +-done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_EGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } +- fi +-else +- ac_cv_path_EGREP=$EGREP +-fi +- +- fi +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +-$as_echo "$ac_cv_path_EGREP" >&6; } +- EGREP="$ac_cv_path_EGREP" +- +- +-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 +-$as_echo_n "checking for fgrep... " >&6; } +-if test "${ac_cv_path_FGREP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 +- then ac_cv_path_FGREP="$GREP -F" +- else +- if test -z "$FGREP"; then +- ac_path_FGREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_prog in fgrep; do +- for ac_exec_ext in '' $ac_executable_extensions; do +- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" +- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +-# Check for GNU ac_path_FGREP and select it if it is found. +- # Check for GNU $ac_path_FGREP +-case `"$ac_path_FGREP" --version 2>&1` in +-*GNU*) +- ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +-*) +- ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" +- while : +- do +- cat "conftest.in" "conftest.in" >"conftest.tmp" +- mv "conftest.tmp" "conftest.in" +- cp "conftest.in" "conftest.nl" +- $as_echo 'FGREP' >> "conftest.nl" +- "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break +- ac_count=`expr $ac_count + 1` +- if test $ac_count -gt ${ac_path_FGREP_max-0}; then +- # Best one so far, save it but keep looking for a better one +- ac_cv_path_FGREP="$ac_path_FGREP" +- ac_path_FGREP_max=$ac_count +- fi +- # 10*(2^10) chars as input seems more than enough +- test $ac_count -gt 10 && break +- done +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +-esac +- +- $ac_path_FGREP_found && break 3 +- done +- done +-done +-IFS=$as_save_IFS +- if test -z "$ac_cv_path_FGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} +- { (exit 1); exit 1; }; } +- fi +-else +- ac_cv_path_FGREP=$FGREP +-fi +- +- fi +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 +-$as_echo "$ac_cv_path_FGREP" >&6; } +- FGREP="$ac_cv_path_FGREP" +- +- +-test -z "$GREP" && GREP=grep +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-# Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then +- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +-else +- with_gnu_ld=no +-fi +- +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-$as_echo_n "checking for ld used by $CC... " >&6; } +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [\\/]* | ?:[\\/]*) +- re_direlt='/[^/][^/]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` +- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 +-$as_echo_n "checking for GNU ld... " >&6; } +-else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-$as_echo_n "checking for non-GNU ld... " >&6; } +-fi +-if test "${lt_cv_path_LD+set}" = set; then +- $as_echo_n "(cached) " >&6 +if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in -+ *GNU* | *'with BFD'*) -+ test "$with_gnu_ld" != no && break -+ ;; -+ *) -+ test "$with_gnu_ld" != yes && break -+ ;; -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+else -+ lt_cv_path_LD="$LD" # Let the user override the test with a path. -+fi -+fi -+ -+LD="$lt_cv_path_LD" -+if test -n "$LD"; then + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -5515,19 +5081,19 @@ + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 +-$as_echo "$LD" >&6; } + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi + fi +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+ { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -+if test "${lt_cv_prog_gnu_ld+set}" = set; then + if test "${lt_cv_prog_gnu_ld+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # I'd rather use --version here, but apparently some GNU lds only accept -v. -+case `$LD -v 2>&1 </dev/null` in -+*GNU* | *'with BFD'*) -+ lt_cv_prog_gnu_ld=yes -+ ;; -+*) -+ lt_cv_prog_gnu_ld=no -+ ;; -+esac -+fi + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 </dev/null` in +@@ -5539,22 +5105,40 @@ + ;; + esac + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +-$as_echo "$lt_cv_prog_gnu_ld" >&6; } +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -+with_gnu_ld=$lt_cv_prog_gnu_ld -+ -+ + with_gnu_ld=$lt_cv_prog_gnu_ld + + +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } +if test "${lt_cv_ld_reload_flag+set}" = set; then @@ -9046,76 +23088,134 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + ;; +esac -+ + +- +- +- +- +- +- +-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 +-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } -+if test "${lt_cv_path_NM+set}" = set; then + if test "${lt_cv_path_NM+set}" = set; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$NM"; then -+ # Let the user override the test. -+ lt_cv_path_NM="$NM" -+else -+ lt_nm_to_check="${ac_tool_prefix}nm" -+ 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 -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+ done + else + if test -n "$NM"; then + # Let the user override the test. +@@ -5597,397 +5181,455 @@ + done + IFS="$lt_save_ifs" + done +- : ${lt_cv_path_NM=no} + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -+fi -+fi + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +-$as_echo "$lt_cv_path_NM" >&6; } +-if test "$lt_cv_path_NM" != "no"; then +- NM="$lt_cv_path_NM" +-else +- # Didn't find any BSD compatible name lister, look for dumpbin. +- if test -n "$ac_tool_prefix"; then +- for ac_prog in "dumpbin -symbols" "link -dump -symbols" +- 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DUMPBIN+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$DUMPBIN"; then +- ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } +NM="$lt_cv_path_NM" -+ + +-fi +-fi +-DUMPBIN=$ac_cv_prog_DUMPBIN +-if test -n "$DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 +-$as_echo "$DUMPBIN" >&6; } +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- test -n "$DUMPBIN" && break +- done + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } -+fi -+ + fi +-if test -z "$DUMPBIN"; then +- ac_ct_DUMPBIN=$DUMPBIN +- for ac_prog in "dumpbin -symbols" "link -dump -symbols" +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_DUMPBIN"; then +- ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + +-fi +-fi +-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +-if test -n "$ac_ct_DUMPBIN"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 +-$as_echo "$ac_ct_DUMPBIN" >&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 + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' @@ -9129,28 +23229,44 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. -+ + +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; -+ + +- test -n "$ac_ct_DUMPBIN" && break +-done +beos*) + lt_cv_deplibs_check_method=pass_all + ;; -+ + +- if test "x$ac_ct_DUMPBIN" = x; then +- DUMPBIN=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- DUMPBIN=$ac_ct_DUMPBIN +- fi +-fi +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; -+ + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; -+ + +- if test "$DUMPBIN" != ":"; then +- NM="$DUMPBIN" +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', @@ -9161,7 +23277,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi + fi +-fi +-test -z "$NM" && NM=nm + ;; + +darwin* | rhapsody*) @@ -9183,11 +23301,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_cv_deplibs_check_method=pass_all + fi + ;; -+ + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; -+ + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in @@ -9205,12 +23323,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +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)$' + ;; -+ + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; @@ -9220,30 +23338,77 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + lt_cv_deplibs_check_method=pass_all + ;; -+ + +# This must be Linux ELF. +linux* | k*bsd*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; -+ + +-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 +-$as_echo_n "checking the name lister ($NM) interface... " >&6; } +-if test "${lt_cv_nm_interface+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_nm_interface="BSD nm" +- echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:5728: $ac_compile\"" >&5) +- (eval "$ac_compile" 2>conftest.err) +- cat conftest.err >&5 +- (eval echo "\"\$as_me:5731: $NM \\\"conftest.$ac_objext\\\"\"" >&5) +- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) +- cat conftest.err >&5 +- (eval echo "\"\$as_me:5734: output\"" >&5) +- cat conftest.out >&5 +- if $GREP 'External.*some_variable' conftest.out > /dev/null; then +- lt_cv_nm_interface="MS dumpbin" +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 + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' -+ fi + fi +- rm -f conftest* +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 +-$as_echo "$lt_cv_nm_interface" >&6; } + ;; -+ + +-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +-$as_echo_n "checking whether ln -s works... " >&6; } +-LN_S=$as_ln_s +-if test "$LN_S" = "ln -s"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +-$as_echo "no, using $LN_S" >&6; } +-fi +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; -+ + +-# find the maximum length of command line arguments +-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +-$as_echo_n "checking the maximum length of command line arguments... " >&6; } +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- i=0 +- teststring="ABCD" +nto-qnx*) + lt_cv_deplibs_check_method=unknown + ;; -+ + +- case $build_os in +- msdosdjgpp*) +- # On DJGPP, this test can blow up pretty badly due to problems in libc +- # (any single argument exceeding 2000 bytes causes a buffer overrun +- # during glob expansion). Even if it were fixed, the result of this +- # check would be larger than it should be. +- lt_cv_sys_max_cmd_len=12288; # 12K is about right +- ;; +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' @@ -9251,78 +23416,218 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; -+ + +- gnu*) +- # Under GNU Hurd, this test is not required because there is +- # no limit to the length of command line arguments. +- # Libtool will interpret -1 as no limit whatsoever +- lt_cv_sys_max_cmd_len=-1; +- ;; +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; -+ + +- cygwin* | mingw* | cegcc*) +- # On Win9x/ME, this test blows up -- it succeeds, but takes +- # about 5 minutes as the teststring grows exponentially. +- # Worse, since 9x/ME are not pre-emptively multitasking, +- # you end up with a "frozen" computer, even though with patience +- # the test eventually succeeds (with a max line length of 256k). +- # Instead, let's just punt: use the minimum linelength reported by +- # all of the supported platforms: 8192 (on NT/2K/XP). +- lt_cv_sys_max_cmd_len=8192; +- ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; -+ + +- amigaos*) +- # On AmigaOS with pdksh, this test takes hours, literally. +- # So we just punt and use a minimum line length of 8192. +- lt_cv_sys_max_cmd_len=8192; +- ;; +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; -+ + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) +- # This has been around since 386BSD, at least. Likely further. +- if test -x /sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +- elif test -x /usr/sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` +- else +- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs +- fi +- # And add a safety zone +- 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` +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -+ ;; + ;; +- +- interix*) +- # We know the value 262144 and hardcode it with a safety zone (like BSD) +- lt_cv_sys_max_cmd_len=196608 + ncr) + lt_cv_deplibs_check_method=pass_all -+ ;; + ;; +- +- osf*) +- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure +- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +- # nice to cause kernel panics so lets avoid the loop below. +- # First set a reasonable default. +- lt_cv_sys_max_cmd_len=16384 +- # +- if test -x /sbin/sysconfig; then +- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in +- *1*) lt_cv_sys_max_cmd_len=-1 ;; +- esac +- fi + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' -+ ;; + ;; +- sco3.2v5*) +- lt_cv_sys_max_cmd_len=102400 + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so -+ ;; + ;; +- sysv5* | sco5v6* | sysv4.2uw2*) +- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` +- if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` +- else +- lt_cv_sys_max_cmd_len=32768 +- fi + siemens) + lt_cv_deplibs_check_method=pass_all -+ ;; + ;; +- *) +- 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 +- # Make teststring a little bigger before we do anything with it. +- # a 1K string should be a reasonable start. +- for i in 1 2 3 4 5 6 7 8 ; do +- teststring=$teststring$teststring +- done +- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} +- # 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. +- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ +- = "XX$teststring$teststring"; } >/dev/null 2>&1 && +- test $i != 17 # 1/2 MB should be enough +- do +- i=`expr $i + 1` +- teststring=$teststring$teststring +- done +- # Only check the string length outside the loop. +- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` +- 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 + pc) + lt_cv_deplibs_check_method=pass_all -+ ;; -+ esac + ;; + esac + ;; -+ + +-fi +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac -+ -+fi + +-if test -n $lt_cv_sys_max_cmd_len ; then +- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +-$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: none" >&5 +-$as_echo "none" >&6; } + fi +-max_cmd_len=$lt_cv_sys_max_cmd_len +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown -+ -+ -+ -+ + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -+ + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ + +-: ${CP="cp -f"} +-: ${MV="mv -f"} +-: ${RM="rm -f"} +- +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 +-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +-# Try some XSI features +-xsi_shell=no +-( _lt_dummy="a/b/c" +- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ +- = c,a/b,, \ +- && eval 'test $(( 1 + 1 )) -eq 2 \ +- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ +- && xsi_shell=yes +-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 +-$as_echo "$xsi_shell" >&6; } +- +- +-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 +-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +-lt_shell_append=no +-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ +- >/dev/null 2>&1 \ +- && lt_shell_append=yes +-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 +-$as_echo "$lt_shell_append" >&6; } +# Allow CC to be a program name with arguments. +compiler=$CC -+ -+ + + +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- lt_unset=unset +-else +- lt_unset=false +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; -+fi -+ ++ enableval=$enable_libtool_lock; + fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ + +- +- +- +-# test EBCDIC or ASCII +-case `echo X|tr X '\101'` in +- A) # ASCII based system +- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr +- lt_SP2NL='tr \040 \012' +- lt_NL2SP='tr \015\012 \040\040' +- ;; +- *) # EBCDIC based system +- lt_SP2NL='tr \100 \n' +- lt_NL2SP='tr \r\n \100\100' +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in @@ -9347,7 +23652,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; +*-*-irix6*) + # Find out which ABI we are using. -+ echo '#line __oline__ "configure"' > conftest.$ac_ext ++ echo '#line 5438 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? @@ -9380,8 +23685,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + rm -rf conftest* -+ ;; -+ + ;; +-esac +- +- +- +- +- +- +- + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. @@ -9434,7 +23747,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + rm -rf conftest* + ;; -+ + +-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +-$as_echo_n "checking for $LD option to reload object files... " >&6; } +-if test "${lt_cv_ld_reload_flag+set}" = set; then +- $as_echo_n "(cached) " >&6 +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" @@ -9443,24 +23760,45 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } +if test "${lt_cv_cc_needs_belf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- lt_cv_ld_reload_flag='-r' +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +-$as_echo "$lt_cv_ld_reload_flag" >&6; } +-reload_flag=$lt_cv_ld_reload_flag +-case $reload_flag in +-"" | " "*) ;; +-*) reload_flag=" $reload_flag" ;; +-esac +-reload_cmds='$LD$reload_flag -o $output$reload_objs' +-case $host_os in +- darwin*) +- if test "$GCC" = yes; then +- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' +- else +- reload_cmds='$LD$reload_flag -o $output$reload_objs' +- fi +- ;; +-esac +- +- + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +int +main () +{ -+ + + ; + return 0; +} @@ -9487,10 +23825,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + lt_cv_cc_needs_belf=no +fi -+ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c @@ -9498,7 +23836,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } @@ -9530,7 +23868,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + rm -rf conftest* + ;; -+ + +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +-set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then +- $as_echo_n "(cached) " >&6 +*-*-cygwin* | *-*-mingw* | *-*-pw32*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. @@ -9539,38 +23884,54 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DLLTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- if test -n "$OBJDUMP"; then +- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -5996,8 +5638,8 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi + break 2 + fi + done +@@ -6006,28 +5648,28 @@ + + fi + fi +-OBJDUMP=$ac_cv_prog_OBJDUMP +-if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +-$as_echo "$OBJDUMP" >&6; } +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +echo "${ECHO_T}$DLLTOOL" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi + fi + + + fi +-if test -z "$ac_cv_prog_OBJDUMP"; then +- ac_ct_OBJDUMP=$OBJDUMP +- # Extract the first word of "objdump", so it can be a program name with args. +-set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +- $as_echo_n "(cached) " >&6 +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. @@ -9579,55 +23940,72 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- if test -n "$ac_ct_OBJDUMP"; then +- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -6036,8 +5678,8 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi + break 2 + fi + done +@@ -6046,260 +5688,140 @@ + + fi + fi +-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +-if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +-$as_echo "$ac_ct_OBJDUMP" >&6; } +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ + fi + +- if test "x$ac_ct_OBJDUMP" = x; then +- OBJDUMP="false" + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac + ac_tool_warned=yes ;; + esac +- OBJDUMP=$ac_ct_OBJDUMP + DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else + fi + else +- OBJDUMP="$ac_cv_prog_OBJDUMP" + DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ + fi + +-test -z "$OBJDUMP" && OBJDUMP=objdump +- +- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +set dummy ${ac_tool_prefix}as; ac_word=$2 @@ -9653,7 +24031,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +fi +fi +AS=$ac_cv_prog_AS @@ -9664,8 +24042,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ -+ + + +fi +if test -z "$ac_cv_prog_AS"; then + ac_ct_AS=$AS @@ -9693,21 +24071,211 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +-$as_echo_n "checking how to recognize dependent libraries... " >&6; } +-if test "${lt_cv_deplibs_check_method+set}" = set; then +- $as_echo_n "(cached) " >&6 +fi +fi +ac_ct_AS=$ac_cv_prog_ac_ct_AS +if test -n "$ac_ct_AS"; then + { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +echo "${ECHO_T}$ac_ct_AS" >&6; } -+else + else +- lt_cv_file_magic_cmd='$MAGIC_CMD' +-lt_cv_file_magic_test_file= +-lt_cv_deplibs_check_method='unknown' +-# Need to set the preceding variable on all platforms that support +-# interlibrary dependencies. +-# 'none' -- dependencies not supported. +-# `unknown' -- same as none, but documents that we really don't know. +-# 'pass_all' -- all dependencies passed with no checks. +-# 'test_compile' -- check by making test program. +-# 'file_magic [[regex]]' -- check by looking for files in library path +-# which responds to the $file_magic_cmd with a given extended regex. +-# If you have `file' or equivalent on your system and you're not sure +-# whether `pass_all' will *always* work, you probably want this one. +- +-case $host_os in +-aix[4-9]*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-beos*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-bsdi[45]*) +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' +- lt_cv_file_magic_cmd='/usr/bin/file -L' +- lt_cv_file_magic_test_file=/shlib/libc.so +- ;; +- +-cygwin*) +- # func_win32_libid is a shell function defined in ltmain.sh +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='func_win32_libid' +- ;; +- +-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', +- # 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 +- ;; +- +-cegcc) +- # use the weaker test based on 'objdump'. See mingw*. +- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' +- lt_cv_file_magic_cmd='$OBJDUMP -f' +- ;; +- +-darwin* | rhapsody*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-freebsd* | dragonfly*) +- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then +- case $host_cpu in +- i*86 ) +- # Not sure whether the presence of OpenBSD here was a mistake. +- # Let's accept both of them until this is cleared up. +- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` +- ;; +- esac +- else +- lt_cv_deplibs_check_method=pass_all +- fi +- ;; +- +-gnu*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-hpux10.20* | hpux11*) +- lt_cv_file_magic_cmd=/usr/bin/file +- case $host_cpu in +- ia64*) +- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' +- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so +- ;; +- hppa*64*) +- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' +- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl +- ;; +- *) +- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' +- lt_cv_file_magic_test_file=/usr/lib/libc.sl +- ;; +- esac +- ;; +- +-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)$' +- ;; +- +-irix5* | irix6* | nonstopux*) +- case $LD in +- *-32|*"-32 ") libmagic=32-bit;; +- *-n32|*"-n32 ") libmagic=N32;; +- *-64|*"-64 ") libmagic=64-bit;; +- *) libmagic=never-match;; +- esac +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-# This must be Linux ELF. +-linux* | k*bsd*-gnu) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-netbsd*) +- 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 +- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' +- fi +- ;; +- +-newos6*) +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' +- lt_cv_file_magic_cmd=/usr/bin/file +- lt_cv_file_magic_test_file=/usr/lib/libnls.so +- ;; +- +-*nto* | *qnx*) +- lt_cv_deplibs_check_method=pass_all +- ;; + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ + +-openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + if test "x$ac_ct_AS" = x; then + AS="false" -+ else + else +- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' +- fi +- ;; +- +-osf3* | osf4* | osf5*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-rdos*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-solaris*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- lt_cv_deplibs_check_method=pass_all +- ;; +- +-sysv4 | sysv4.3*) +- case $host_vendor in +- motorola) +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' +- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` +- ;; +- ncr) +- lt_cv_deplibs_check_method=pass_all +- ;; +- sequent) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' +- ;; +- sni) +- lt_cv_file_magic_cmd='/bin/file' +- lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" +- lt_cv_file_magic_test_file=/lib/libc.so +- ;; +- siemens) +- lt_cv_deplibs_check_method=pass_all +- ;; +- pc) +- lt_cv_deplibs_check_method=pass_all +- ;; +- esac +- ;; +- +-tpf*) +- lt_cv_deplibs_check_method=pass_all +- ;; + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools @@ -9717,13 +24285,37 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; -+esac + esac +- + AS=$ac_ct_AS + fi +else + AS="$ac_cv_prog_AS" -+fi -+ + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +-$as_echo "$lt_cv_deplibs_check_method" >&6; } +-file_magic_cmd=$lt_cv_file_magic_cmd +-deplibs_check_method=$lt_cv_deplibs_check_method +-test -z "$deplibs_check_method" && deplibs_check_method=unknown +- +- +- +- + +- +- +- +- +- +- +- +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AR+set}" = set; then +- $as_echo_n "(cached) " >&6 + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -9731,38 +24323,54 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_OBJDUMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- if test -n "$AR"; then +- ac_cv_prog_AR="$AR" # Let the user override the test. + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -6308,8 +5830,8 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_AR="${ac_tool_prefix}ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi + break 2 + fi + done +@@ -6318,28 +5840,28 @@ + + fi + fi +-AR=$ac_cv_prog_AR +-if test -n "$AR"; then +- { $as_echo "$as_me:$LINENO: result: $AR" >&5 +-$as_echo "$AR" >&6; } +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +echo "${ECHO_T}$OBJDUMP" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi + fi + + + fi +-if test -z "$ac_cv_prog_AR"; then +- ac_ct_AR=$AR +- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +- $as_echo_n "(cached) " >&6 +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. @@ -9771,62 +24379,95 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- if test -n "$ac_ct_AR"; then +- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -6348,8 +5870,8 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_AR="ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_OBJDUMP="objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi + break 2 + fi + done +@@ -6358,266 +5880,447 @@ + + fi + fi +-ac_ct_AR=$ac_cv_prog_ac_ct_AR +-if test -n "$ac_ct_AR"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +-$as_echo "$ac_ct_AR" >&6; } +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ + fi + +- if test "x$ac_ct_AR" = x; then +- AR="false" + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac + ac_tool_warned=yes ;; + esac +- AR=$ac_ct_AR + OBJDUMP=$ac_ct_OBJDUMP -+ fi -+else + fi + else +- AR="$ac_cv_prog_AR" + OBJDUMP="$ac_cv_prog_OBJDUMP" -+fi -+ + fi + +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +- +- +- +- +- +- + ;; -+ + +esac -+ + +need_locks="$enable_libtool_lock" -+ -+ + + +- +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +-set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$STRIP"; then +- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9841,13 +24482,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes -+do + do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since @@ -9860,11 +24514,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@ifdef __STDC__ -+@%:@ include <limits.h> -+@%:@else -+@%:@ include <assert.h> -+@%:@endif ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" @@ -9887,10 +24541,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + # Broken: fails on valid input. +continue -+fi + fi +-fi +-STRIP=$ac_cv_prog_STRIP +-if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } + +rm -f conftest.err conftest.$ac_ext + @@ -9902,7 +24561,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <ac_nonexistent.h> ++#include <ac_nonexistent.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -9922,32 +24581,76 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + }; then + # Broken: success on invalid input. +continue -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break -+fi -+ + fi + +rm -f conftest.err conftest.$ac_ext -+ -+done + +-fi +-if test -z "$ac_cv_prog_STRIP"; then +- ac_ct_STRIP=$STRIP +- # Extract the first word of "strip", so it can be a program name with args. +-set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_STRIP"; then +- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi + done +-done +-IFS=$as_save_IFS +- +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break -+fi + fi + + done + ac_cv_prog_CPP=$CPP -+ -+fi ++ + fi +-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +-if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-$as_echo "$ac_ct_STRIP" >&6; } + CPP=$ac_cv_prog_CPP -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + ac_cv_prog_CPP=$CPP -+fi + fi +- +- if test "x$ac_ct_STRIP" = x; then +- STRIP=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } +ac_preproc_ok=false @@ -9965,18 +24668,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@ifdef __STDC__ -+@%:@ include <limits.h> -+@%:@else -+@%:@ include <assert.h> -+@%:@endif ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; -+esac + esac +- STRIP=$ac_ct_STRIP +- fi +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? @@ -9989,14 +24694,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + }; then + : -+else + else +- STRIP="$ac_cv_prog_STRIP" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue -+fi -+ + fi + +-test -z "$STRIP" && STRIP=: +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers @@ -10007,7 +24714,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <ac_nonexistent.h> ++#include <ac_nonexistent.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -10030,14 +24737,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + # Passes both tests. +ac_preproc_ok=: +break +fi -+ + +rm -f conftest.err conftest.$ac_ext -+ + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext @@ -10050,19 +24757,43 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi -+ + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ + + +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_RANLIB+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$RANLIB"; then +- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF @@ -10073,7 +24804,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#include <stdarg.h> +#include <string.h> +#include <float.h> -+ + +-fi +-fi +-RANLIB=$ac_cv_prog_RANLIB +-if test -n "$RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +-$as_echo "$RANLIB" >&6; } +int +main () +{ @@ -10100,15 +24837,44 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no -+fi -+ + fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +-fi +-if test -z "$ac_cv_prog_RANLIB"; then +- ac_ct_RANLIB=$RANLIB +- # Extract the first word of "ranlib", so it can be a program name with args. +-set dummy ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_RANLIB"; then +- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_RANLIB="ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF @@ -10118,18 +24884,50 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <string.h> -+ + +-fi +-fi +-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +-if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +-$as_echo "$ac_ct_RANLIB" >&6; } +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + ac_cv_header_stdc=no -+fi + fi +rm -f conftest* -+ -+fi -+ + +- if test "x$ac_ct_RANLIB" = x; then +- RANLIB=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- RANLIB=$ac_ct_RANLIB +- fi +-else +- RANLIB="$ac_cv_prog_RANLIB" + fi + +-test -z "$RANLIB" && RANLIB=: +- +- +- +- +- +- +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF @@ -10139,18 +24937,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdlib.h> -+ + +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" +- ;; +- *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no -+fi + fi +rm -f conftest* -+ + +fi -+ + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then @@ -10174,7 +24982,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif -+ + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () @@ -10212,36 +25020,34 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi -+ -+ + + +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define STDC_HEADERS 1 ++#define STDC_HEADERS 1 +_ACEOF -+ + +fi -+ + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. -+ -+ -+ -+ -+ -+ -+ -+ -+ + + + +@@ -6627,1691 +6330,1689 @@ + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do @@ -10258,8 +25064,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -+ -+@%:@include <$ac_header> + ++#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" @@ -10282,10 +25088,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + eval "$as_ac_Header=no" +fi -+ + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` @@ -10293,15 +25099,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -+ + +fi -+ + +done -+ -+ -+ + + + +for ac_header in dlfcn.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -10325,7 +25131,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -+@%:@include <$ac_header> ++#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" @@ -10348,14 +25154,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_header_compiler=no +fi -+ + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } @@ -10365,7 +25171,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <$ac_header> ++#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -10387,14 +25193,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_header_preproc=no +fi -+ + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +- +- +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC +- +- +-# Check for command to grab the raw symbol name followed by C symbol from nm. +-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +- $as_echo_n "(cached) " >&6 +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -10418,9 +25241,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -10429,24 +25252,69 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+ + +-# These are sane defaults that work on at least a few old systems. +-# [They come from Ultrix. What could be older than Ultrix?!! ;)] +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -+ + +-# Character class describing NM global symbol codes. +-symcode='[BCDEGRST]' +fi -+ + +-# Regexp to match symbols that can be accessed directly from C. +-sympat='\([_A-Za-z][_A-Za-z0-9]*\)' +done -+ -+ + +-# Define system-specific variables. +-case $host_os in +-aix*) +- symcode='[BCDT]' +- ;; +-cygwin* | mingw* | pw32* | cegcc*) +- symcode='[ABCDGISTW]' +- ;; +-hpux*) +- if test "$host_cpu" = ia64; then +- symcode='[ABCDEGRST]' +- fi +- ;; +-irix* | nonstopux*) +- symcode='[BCDEGRST]' +- ;; +-osf*) +- symcode='[BCDEGQRST]' +- ;; +-solaris*) +- symcode='[BDRT]' +- ;; +-sco3.2v5*) +- symcode='[DT]' +- ;; +-sysv4.2uw2*) +- symcode='[DT]' +- ;; +-sysv5* | sco5v6* | unixware* | OpenUNIX*) +- symcode='[ABDT]' +- ;; +-sysv4) +- symcode='[DFNSTU]' +- ;; +-esac + +-# If we're using GNU nm, then use its standard symbol codes. +-case `$NM -V 2>&1` in +-*GNU* | *'with BFD'*) +- symcode='[ABCDGIRSTW]' ;; + +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || @@ -10480,18 +25348,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@ifdef __STDC__ -+@%:@ include <limits.h> -+@%:@else -+@%:@ include <assert.h> -+@%:@endif ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; -+esac + esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? @@ -10507,13 +25375,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-# Transform an extracted symbol line into a proper C declaration. +-# Some systems (esp. on ia64) link data and code symbols differently, +-# so use this general approach. +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + # Broken: fails on valid input. +continue +fi -+ + +-# Transform an extracted symbol line into symbol name and symbol address +-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +rm -f conftest.err conftest.$ac_ext -+ + +-# Handle CRLF in mingw tool chain +-opt_cr= +-case $build_os in +-mingw*) +- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp +- ;; + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF @@ -10522,13 +25403,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <ac_nonexistent.h> ++#include <ac_nonexistent.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; -+esac + esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? @@ -10545,24 +25426,60 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-# Try without a prefix underscore, then with it. +-for ac_symprfx in "" "_"; do + # Passes both tests. +ac_preproc_ok=: +break +fi -+ + +- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. +- symxfrm="\\1 $ac_symprfx\\2 \\2" +rm -f conftest.err conftest.$ac_ext -+ + +- # Write the raw and C identifiers. +- if test "$lt_cv_nm_interface" = "MS dumpbin"; then +- # Fake it for dumpbin and say T for any non-static function +- # and D for any global variable. +- # Also find C++ and __fastcall symbols from MSVC++, +- # which start with @ or ?. +- lt_cv_sys_global_symbol_pipe="$AWK '"\ +-" {last_section=section; section=\$ 3};"\ +-" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +-" \$ 0!~/External *\|/{next};"\ +-" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +-" {if(hide[section]) next};"\ +-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +-" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +-" ' prfx=^$ac_symprfx" +- else +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" +- fi +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi -+ + +- # Check to see that the pipe works correctly. +- pipe_works=no + done + ac_cv_prog_CXXCPP=$CXXCPP -+ + +- rm -f conftest* +- cat > conftest.$ac_ext <<_LT_EOF +-#ifdef __cplusplus +-extern "C" { +-#endif +-char nm_test_var; +-void nm_test_func(void); +-void nm_test_func(void){} +-#ifdef __cplusplus +-} +fi + CXXCPP=$ac_cv_prog_CXXCPP +else @@ -10585,11 +25502,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@ifdef __STDC__ -+@%:@ include <limits.h> -+@%:@else -+@%:@ include <assert.h> -+@%:@endif ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> + #endif +-int main(){nm_test_var='a';nm_test_func();return(0);} +-_LT_EOF +- +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- # Now try to grab the symbols. +- nlist=conftest.nm +- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 +- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" @@ -10599,7 +25528,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s "$nlist"; then +- # Try sorting and uniquifying the output. +- if sort "$nlist" | uniq > "$nlist"T; then +- mv -f "$nlist"T "$nlist" +- else +- rm -f "$nlist"T +- fi + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 @@ -10612,13 +25549,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +- # Make sure that we snagged all the symbols we need. +- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then +- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then +- cat <<_LT_EOF > conftest.$ac_ext +-#ifdef __cplusplus +-extern "C" { +-#endif + # Broken: fails on valid input. +continue +fi -+ + +-_LT_EOF +- # Now generate the symbol file. +- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' +rm -f conftest.err conftest.$ac_ext -+ + +- cat <<_LT_EOF >> conftest.$ac_ext + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF @@ -10627,7 +25575,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <ac_nonexistent.h> ++#include <ac_nonexistent.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -10650,14 +25598,66 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-/* The mapping between symbol names and symbols. */ +-const struct { +- const char *name; +- void *address; +-} +-lt__PROGRAM__LTX_preloaded_symbols[] = +-{ +- { "@PROGRAM@", (void *) 0 }, +-_LT_EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext +- cat <<\_LT_EOF >> conftest.$ac_ext +- {0, (void *) 0} +-}; + # Passes both tests. +ac_preproc_ok=: +break +fi -+ + +-/* This works around a problem in FreeBSD linker */ +-#ifdef FREEBSD_WORKAROUND +-static const void *lt_preloaded_setup() { +- return lt__PROGRAM__LTX_preloaded_symbols; +-} +-#endif +rm -f conftest.err conftest.$ac_ext -+ + +-#ifdef __cplusplus +-} +-#endif +-_LT_EOF +- # Now try linking the two files. +- mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" +- LIBS="conftstm.$ac_objext" +- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext}; then +- pipe_works=yes +- fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" +- else +- echo "cannot find nm_test_func in $nlist" >&5 +- fi +- else +- echo "cannot find nm_test_var in $nlist" >&5 +- fi +- else +- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 +- fi +- else +- echo "$progname: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- fi +- rm -rf conftest* conftst* +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext @@ -10670,7 +25670,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi -+ + +- # Do not use the global_symbol_pipe unless it works. +- if test "$pipe_works" = yes; then +- break +- else +- lt_cv_sys_global_symbol_pipe= +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -10706,23 +25711,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 -+ fi -+done + fi + done +done +IFS=$as_save_IFS -+ -+fi -+fi + + fi +- +-if test -z "$lt_cv_sys_global_symbol_pipe"; then +- lt_cv_sys_global_symbol_to_cdecl= + fi +-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- { $as_echo "$as_me:$LINENO: result: failed" >&5 +-$as_echo "failed" >&6; } +F77=$ac_cv_prog_F77 +if test -n "$F77"; then + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: ok" >&5 +-$as_echo "ok" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ + fi + + + test -n "$F77" && break + done +fi @@ -10754,7 +25767,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +fi +fi +ac_ct_F77=$ac_cv_prog_ac_ct_F77 @@ -10765,11 +25778,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ -+ + + + test -n "$ac_ct_F77" && break +done -+ + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-# Check whether --enable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then +- enableval=$enable_libtool_lock; + if test "x$ac_ct_F77" = x; then + F77="" + else @@ -10785,9 +25818,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +esac + F77=$ac_ct_F77 + fi -+fi -+ -+ + fi + +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case $host in +-ia64-*-hpux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +# Provide some information about the compiler. +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` @@ -10798,7 +25840,25 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '#line 6937 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" @@ -10808,7 +25868,44 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- fi +- rm -rf conftest* +- ;; +- +-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +-s390*-*linux*|s390*-*tpf*|sparc*-*linux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" @@ -10818,11 +25915,64 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; 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" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *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" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*|s390*-*tpf*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +rm -f a.out -+ + +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +-$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +-if test "${lt_cv_cc_needs_belf+set}" = set; then +- $as_echo_n "(cached) " >&6 +# If we don't use `.F' as extension, the preprocessor is not run on the +# input file. (Note that this only needs to work for GNU compilers.) +ac_save_ext=$ac_ext @@ -10831,44 +25981,129 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } +if test "${ac_cv_f77_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ + cat >conftest.$ac_ext <<_ACEOF + program main +#ifndef __GNUC__ + choke me +#endif -+ + +- ; +- return 0; +-} + end -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { + (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || + test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- lt_cv_cc_needs_belf=yes + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- lt_cv_cc_needs_belf=no + ac_compiler_gnu=no -+fi -+ + fi + +-rm -rf conftest.dSYM +-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' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_f77_compiler_gnu=$ac_compiler_gnu -+ -+fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +-$as_echo "$lt_cv_cc_needs_belf" >&6; } +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +-sparc*-*solaris*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.o` in +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then +- LD="${LD-ld} -64" +- fi +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +-esac +- +-need_locks="$enable_libtool_lock" +- +- +- case $host_os in +- rhapsody* | darwin*) +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } +ac_ext=$ac_save_ext @@ -10879,11 +26114,34 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_f77_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- if test -n "$DSYMUTIL"; then +- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + FFLAGS=-g +cat >conftest.$ac_ext <<_ACEOF + program main -+ + +-fi +-fi +-DSYMUTIL=$ac_cv_prog_DSYMUTIL +-if test -n "$DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +-$as_echo "$DSYMUTIL" >&6; } + end +_ACEOF +rm -f conftest.$ac_objext @@ -10904,16 +26162,40 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_prog_f77_g=no -+fi -+ + fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi + + fi +-if test -z "$ac_cv_prog_DSYMUTIL"; then +- ac_ct_DSYMUTIL=$DSYMUTIL +- # Extract the first word of "dsymutil", so it can be a program name with args. +-set dummy dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_DSYMUTIL"; then +- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } +if test "$ac_test_FFLAGS" = set; then @@ -10923,15 +26205,50 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + FFLAGS="-g -O2" + else + FFLAGS="-g" -+ fi -+else + fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +-if test -n "$ac_ct_DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +-$as_echo "$ac_ct_DSYMUTIL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_DSYMUTIL" = x; then +- DSYMUTIL=":" + if test "x$ac_cv_f77_compiler_gnu" = xyes; then + FFLAGS="-O2" -+ else + else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- DSYMUTIL=$ac_ct_DSYMUTIL + FFLAGS= -+ fi -+fi -+ + fi +-else +- DSYMUTIL="$ac_cv_prog_DSYMUTIL" + fi + +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +-set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_NMEDIT+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$NMEDIT"; then +- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +G77=`test $ac_compiler_gnu = yes && echo yes` +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' @@ -10947,10 +26264,35 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } +if test "${lt_cv_sys_max_cmd_len+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-NMEDIT=$ac_cv_prog_NMEDIT +-if test -n "$NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 +-$as_echo "$NMEDIT" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi + i=0 + teststring="ABCD" -+ + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc @@ -10959,14 +26301,51 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; -+ + +-fi +-if test -z "$ac_cv_prog_NMEDIT"; then +- ac_ct_NMEDIT=$NMEDIT +- # Extract the first word of "nmedit", so it can be a program name with args. +-set dummy nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_NMEDIT"; then +- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_NMEDIT="nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; -+ + +-fi +-fi +-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +-if test -n "$ac_ct_NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +-$as_echo "$ac_ct_NMEDIT" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi + cygwin* | mingw*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. @@ -10977,13 +26356,52 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; -+ + +- if test "x$ac_ct_NMEDIT" = x; then +- NMEDIT=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- NMEDIT=$ac_ct_NMEDIT +- fi +-else +- NMEDIT="$ac_cv_prog_NMEDIT" +-fi + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; -+ + +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +-set dummy ${ac_tool_prefix}lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_LIPO+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$LIPO"; then +- ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_LIPO="${ac_tool_prefix}lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then @@ -10997,12 +26415,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + 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` + ;; -+ + +-fi +-fi +-LIPO=$ac_cv_prog_LIPO +-if test -n "$LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 +-$as_echo "$LIPO" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; -+ + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -11051,43 +26479,234 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + ;; + esac -+ -+fi -+ + + fi +-if test -z "$ac_cv_prog_LIPO"; then +- ac_ct_LIPO=$LIPO +- # Extract the first word of "lipo", so it can be a program name with args. +-set dummy lipo; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_LIPO"; then +- ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_LIPO="lipo" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + +-fi +-fi +-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +-if test -n "$ac_ct_LIPO"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 +-$as_echo "$ac_ct_LIPO" >&6; } +if test -n $lt_cv_sys_max_cmd_len ; then + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } -+fi -+ -+ -+ -+ -+ + fi + +- if test "x$ac_ct_LIPO" = x; then +- LIPO=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- LIPO=$ac_ct_LIPO +- fi +-else +- LIPO="$ac_cv_prog_LIPO" +-fi + +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +-set dummy ${ac_tool_prefix}otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$OTOOL"; then +- ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_OTOOL="${ac_tool_prefix}otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + +-fi +-fi +-OTOOL=$ac_cv_prog_OTOOL +-if test -n "$OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 +-$as_echo "$OTOOL" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi + + +-fi +-if test -z "$ac_cv_prog_OTOOL"; then +- ac_ct_OTOOL=$OTOOL +- # Extract the first word of "otool", so it can be a program name with args. +-set dummy otool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_OTOOL"; then +- ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. +# 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; } +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ + else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_OTOOL="otool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + +-fi +-fi +-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +-if test -n "$ac_ct_OTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 +-$as_echo "$ac_ct_OTOOL" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+ + +- if test "x$ac_ct_OTOOL" = x; then +- OTOOL=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- OTOOL=$ac_ct_OTOOL +- fi +-else +- OTOOL="$ac_cv_prog_OTOOL" +-fi +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' -+ + +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +-set dummy ${ac_tool_prefix}otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OTOOL64+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$OTOOL64"; then +- ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -+ + +-fi +-fi +-OTOOL64=$ac_cv_prog_OTOOL64 +-if test -n "$OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 +-$as_echo "$OTOOL64" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +# Transform an extracted symbol line into a proper C declaration +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" -+ + +# Transform an extracted symbol line into symbol name and symbol address +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'" -+ + +-fi +-if test -z "$ac_cv_prog_OTOOL64"; then +- ac_ct_OTOOL64=$OTOOL64 +- # Extract the first word of "otool64", so it can be a program name with args. +-set dummy otool64; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_OTOOL64"; then +- ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_OTOOL64="otool64" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +# Define system-specific variables. +case $host_os in +aix*) @@ -11099,7 +26718,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +hpux*) # Its linker distinguishes data from code symbols + if test "$host_cpu" = ia64; then + symcode='[ABCDEGRST]' -+ fi + fi +-done +-done +-IFS=$as_save_IFS + 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'" + ;; @@ -11132,7 +26754,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + symcode='[DFNSTU]' + ;; +esac -+ + +-fi +-fi +-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +-if test -n "$ac_ct_OTOOL64"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 +-$as_echo "$ac_ct_OTOOL64" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in @@ -11140,25 +26772,38 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac -+ + +- if test "x$ac_ct_OTOOL64" = x; then +- OTOOL64=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; -+esac -+ + esac +- OTOOL64=$ac_ct_OTOOL64 +- fi +-else +- OTOOL64="$ac_cv_prog_OTOOL64" +-fi + +# Try without a prefix undercore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" -+ + + # Write the raw and C identifiers. + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -+ + + # Check to see that the pipe works correctly. + pipe_works=no -+ + + rm -f conftest* + cat > conftest.$ac_ext <<EOF +#ifdef __cplusplus @@ -11171,7 +26816,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +EOF -+ + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? @@ -11190,7 +26835,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + else + rm -f "$nlist"T + fi -+ + + # Make sure that we snagged all the symbols we need. + if grep ' nm_test_var$' "$nlist" >/dev/null; then + if grep ' nm_test_func$' "$nlist" >/dev/null; then @@ -11198,11 +26843,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#ifdef __cplusplus +extern "C" { +#endif -+ + +EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' -+ + + cat <<EOF >> conftest.$ac_ext +#if defined (__STDC__) && __STDC__ +# define lt_ptr_t void * @@ -11210,7 +26855,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# define lt_ptr_t char * +# define const +#endif -+ + +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; @@ -11223,7 +26868,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + cat <<\EOF >> conftest.$ac_ext + {0, (lt_ptr_t) 0} +}; -+ + +#ifdef __cplusplus +} +#endif @@ -11257,7 +26902,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* -+ + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break @@ -11265,9 +26910,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_cv_sys_global_symbol_pipe= + fi +done -+ + +fi -+ + +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi @@ -11278,7 +26923,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } +fi -+ + +{ echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } +if test "${lt_cv_objdir+set}" = set; then @@ -11297,11 +26942,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir -+ -+ -+ -+ -+ + + + + + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some @@ -11313,36 +26958,40 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + ;; +esac -+ + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' -+ + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -+ + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' -+ + +# Constants: +rm="rm -f" -+ + +# Global variables: +default_ofile=libtool +can_build_shared=yes -+ + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" -+ + +- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +-$as_echo_n "checking for -single_module linker flag... " >&6; } +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then +- $as_echo_n "(cached) " >&6 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -11350,7 +26999,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- lt_cv_apple_cc_single_mod=no +- if test -z "${LT_MULTI_MODULE}"; then +- # By default we will add the -single_module flag. You can override +- # by either setting the environment variable LT_MULTI_MODULE +- # non-empty at configure time, or by adding -multi_module to the +- # link flags. +- rm -rf libconftest.dylib* +- echo "int foo(void){return 1;}" > conftest.c +- echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +--dynamiclib -Wl,-single_module conftest.c" >&5 +- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +- -dynamiclib -Wl,-single_module conftest.c 2>conftest.err +- _lt_result=$? +- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then +- lt_cv_apple_cc_single_mod=yes +- else +- cat conftest.err >&5 +- fi +- rm -rf libconftest.dylib* +- rm -f conftest.* +- fi + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else @@ -11369,19 +27039,74 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +IFS=$as_save_IFS + -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +-$as_echo "$lt_cv_apple_cc_single_mod" >&6; } +- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +- $as_echo_n "(cached) " >&6 +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } -+else + else +- lt_cv_ld_exported_symbols_list=no +- save_LDFLAGS=$LDFLAGS +- echo "_main" > conftest.sym +- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ -+ -+fi + +-int +-main () +-{ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- lt_cv_ld_exported_symbols_list=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- lt_cv_ld_exported_symbols_list=no + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="$save_LDFLAGS" +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. @@ -11408,14 +27133,93 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ -+fi -+fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } +- case $host_os in +- rhapsody* | darwin1.[012]) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +- darwin1.*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- darwin*) # darwin 5.x on +- # if running on 10.5 or later, the deployment target defaults +- # to the OS version, if on x86, and 10.4, the deployment +- # target defaults to 10.4. Don't you love it? +- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +- 10.0,*86*-darwin8*|10.0,*-darwin[91]*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- 10.[012]*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- 10.*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- esac +- ;; +- esac +- if test "$lt_cv_apple_cc_single_mod" = "yes"; then +- _lt_dar_single_mod='$single_module' +- fi +- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then +- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' +- else +- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' +- fi +- if test "$DSYMUTIL" != ":"; then +- _lt_dsymutil='~$DSYMUTIL $lib || :' +- else +- _lt_dsymutil= +- fi +- ;; +- esac +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +-$as_echo_n "checking how to run the C preprocessor... " >&6; } +-# On Suns, sometimes $CPP names a directory. +-if test -n "$CPP" && test -d "$CPP"; then +- CPP= + fi +-if test -z "$CPP"; then +- if test "${ac_cv_prog_CPP+set}" = set; then +- $as_echo_n "(cached) " >&6 +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } -+else + else +- # Double quotes because CPP needs to be expanded +- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +- do +- ac_preproc_ok=false +-for ac_c_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- # <limits.h> exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi @@ -11432,13 +27236,62 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : + AR=$ac_ct_AR + fi -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # Broken: fails on valid input. +-continue + AR="$ac_cv_prog_AR" -+fi -+ + fi + +-rm -f conftest.err conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <ac_nonexistent.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -11446,7 +27299,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else @@ -11464,7 +27319,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +- # Passes both tests. +-ac_preproc_ok=: +-break +fi +fi +RANLIB=$ac_cv_prog_RANLIB @@ -11474,10 +27332,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi + fi + +-rm -f conftest.err conftest.$ac_ext + +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- break + fi +- +- done +- ac_cv_prog_CPP=$CPP +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. @@ -11504,17 +27371,47 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ -+fi + + fi +- CPP=$ac_cv_prog_CPP +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } -+else + else +- ac_cv_prog_CPP=$CPP + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +-$as_echo "$CPP" >&6; } +-ac_preproc_ok=false +-for ac_c_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- # <limits.h> exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" @@ -11528,13 +27425,62 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- : + RANLIB=$ac_ct_RANLIB + fi -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # Broken: fails on valid input. +-continue + RANLIB="$ac_cv_prog_RANLIB" -+fi -+ + fi + +-rm -f conftest.err conftest.$ac_ext +- +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <ac_nonexistent.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -11542,7 +27488,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else @@ -11560,19 +27508,47 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ -+fi + +- # Passes both tests. +-ac_preproc_ok=: +-break + fi +- +-rm -f conftest.err conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } -+else + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ + fi + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- + +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-$as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then +- $as_echo_n "(cached) " >&6 +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP @@ -11582,7 +27558,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdlib.h> +-#include <stdarg.h> +-#include <string.h> +-#include <float.h> + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else @@ -11600,7 +27586,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +-int +-main () +-{ +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP @@ -11611,7 +27600,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else @@ -11624,17 +27622,54 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_header_stdc=yes + STRIP=$ac_ct_STRIP + fi -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_stdc=no + STRIP="$ac_cv_prog_STRIP" -+fi -+ -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-if test $ac_cv_header_stdc = yes; then +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <string.h> + +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +old_CC="$CC" +old_CFLAGS="$CFLAGS" -+ + +-fi +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru @@ -11652,12 +27687,27 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o -+ + +-if test $ac_cv_header_stdc = yes; then +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdlib.h> +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= -+ + +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : +-else +- ac_cv_header_stdc=no +if test -n "$RANLIB"; then + case $host_os in + openbsd*) @@ -11668,8 +27718,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi -+ + fi +-rm -f conftest* + +-fi +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; @@ -11679,7 +27731,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ + +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then +- : + +# Only perform the check for file, if the check method requires it +case $deplibs_check_method in @@ -11689,7 +27745,25 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <ctype.h> +-#include <stdlib.h> +-#if ((' ' & 0x0FF) == 0x020) +-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#else +-# define ISLOWER(c) \ +- (('a' <= (c) && (c) <= 'i') \ +- || ('j' <= (c) && (c) <= 'r') \ +- || ('s' <= (c) && (c) <= 'z')) +-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +-#endif + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -11713,7 +27787,46 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + : + else + cat <<EOF 1>&2 -+ + +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +-int +-main () +-{ +- int i; +- for (i = 0; i < 256; i++) +- if (XOR (islower (i), ISLOWER (i)) +- || toupper (i) != TOUPPER (i)) +- return 2; +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries @@ -11722,7 +27835,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org -+ + +-( exit $ac_status ) +-ac_cv_header_stdc=no +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +EOF + fi ;; + esac @@ -11734,8 +27852,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac -+fi -+ + fi + +- +-fi +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 @@ -11743,8 +27863,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-$as_echo "$ac_cv_header_stdc" >&6; } +-if test $ac_cv_header_stdc = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF + +-fi +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { echo "$as_me:$LINENO: checking for file" >&5 @@ -11775,7 +27903,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + : + else + cat <<EOF 1>&2 -+ + +-# On IRIX 5.3, sys/types and inttypes.h are conflicting. +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries @@ -11784,7 +27913,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org -+ + +EOF + fi ;; + esac @@ -11797,7 +27926,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; +esac +fi -+ + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 @@ -11806,17 +27935,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ + + else + MAGIC_CMD=: + fi +fi -+ + + fi + ;; +esac -+ -+ + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then @@ -11844,7 +27973,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL @@ -11855,8 +27984,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ -+ + + +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL @@ -11866,10 +28003,41 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -11884,9 +28052,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ -+fi -+fi + +- eval "$as_ac_Header=no" + fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 @@ -11895,7 +28076,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else @@ -11913,47 +28094,151 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" -+fi -+ -+ if test -n "$ac_tool_prefix"; then + fi + +-done +- +- +- +-for ac_header in dlfcn.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +- +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_Header=no" +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +- +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-if test -z "$CXX"; then +- if test -n "$CCC"; then +- CXX=$CCC +- else + if test -n "$ac_tool_prefix"; then +- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +- 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- if test -n "$CXX"; then +- ac_cv_prog_CXX="$CXX" # Let the user override the test. + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -8320,8 +8021,8 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi + break 2 + fi + done +@@ -8330,32 +8031,28 @@ + + fi + fi +-CXX=$ac_cv_prog_CXX +-if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +-$as_echo "$CXX" >&6; } +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { echo "$as_me:$LINENO: result: $NMEDIT" >&5 +echo "${ECHO_T}$NMEDIT" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi + fi + + +- test -n "$CXX" && break +- done + fi +-if test -z "$CXX"; then +- ac_ct_CXX=$CXX +- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. @@ -11962,61 +28247,122 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- if test -n "$ac_ct_CXX"; then +- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -8364,8 +8061,8 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_CXX="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_NMEDIT="nmedit" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi + break 2 + fi + done +@@ -8374,78 +8071,68 @@ + + fi + fi +-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +-if test -n "$ac_ct_CXX"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-$as_echo "$ac_ct_CXX" >&6; } +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ + fi + +- +- test -n "$ac_ct_CXX" && break +-done +- +- if test "x$ac_ct_CXX" = x; then +- CXX="g++" + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac + ac_tool_warned=yes ;; + esac +- CXX=$ac_ct_CXX + NMEDIT=$ac_ct_NMEDIT -+ fi + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" -+fi -+ -+ + fi + +- fi +-fi +-# Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } + +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +- $as_echo_n "(cached) " >&6 + { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override @@ -12045,51 +28391,71 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -8455,4674 +8142,6806 @@ + int + main () + { +-#ifndef __GNUC__ +- choke me +-#endif + + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { + (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_compiler_gnu=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + lt_cv_ld_exported_symbols_list=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_compiler_gnu=no + lt_cv_ld_exported_symbols_list=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" -+ -+fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +-if test $ac_compiler_gnu = yes; then +- GXX=yes +-else +- GXX= +{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in @@ -12133,21 +28499,76 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; -+fi -+ ++ enableval=$enable_libtool_lock; + fi +-ac_test_CXXFLAGS=${CXXFLAGS+set} +-ac_save_CXXFLAGS=$CXXFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +-$as_echo_n "checking whether $CXX accepts -g... " >&6; } +-if test "${ac_cv_prog_cxx_g+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_save_cxx_werror_flag=$ac_cxx_werror_flag +- ac_cxx_werror_flag=yes +- ac_cv_prog_cxx_g=no +- CXXFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-int +-main () +-{ +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then + withval=$with_pic; pic_mode="$withval" -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + pic_mode=default +fi -+ + +- CXXFLAGS="" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +test -z "$pic_mode" && pic_mode=default -+ + +-int +-main () +-{ +# Use C for the default configuration in the libtool script +tagname= +lt_save_CC="$CC" @@ -12156,58 +28577,228 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cxx_werror_flag=$ac_save_cxx_werror_flag +- CXXFLAGS="-g" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +# Source file extension for C test sources. +ac_ext=c -+ + +-int +-main () +-{ +# Object file extension for compiled C test sources. +objext=o +objext=$objext -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +# Code to be used in simple compile tests +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);}' -+ -+ + +-fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -+ + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_cxx_werror_flag=$ac_save_cxx_werror_flag +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +-$as_echo "$ac_cv_prog_cxx_g" >&6; } +-if test "$ac_test_CXXFLAGS" = set; then +- CXXFLAGS=$ac_save_CXXFLAGS +-elif test $ac_cv_prog_cxx_g = yes; then +- if test "$GXX" = yes; then +- CXXFLAGS="-g -O2" +- else +- CXXFLAGS="-g" +- fi +-else +- if test "$GXX" = yes; then +- CXXFLAGS="-O2" +- else +- CXXFLAGS= +- fi +-fi +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Allow CC to be a program name with arguments. +compiler=$CC -+ -+ + +-depcc="$CXX" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-$as_echo_n "checking dependency style of $depcc... " >&6; } +-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +# save warnings/boilerplate of simple test code +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* -+ + +- am_cv_CXX_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- : > sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +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 -r conftest* -+ -+ + +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break +- fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else +- am_cv_CXX_dependencies_compiler_type=$depmode +- break +- fi +- fi +- done + +- cd .. +- rm -rf conftest.dir + +lt_prog_compiler_no_builtin_flag= + +if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + -+ ++ +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- am_cv_CXX_dependencies_compiler_type=none + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -12221,11 +28812,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -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:__oline__: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8312: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 -+ echo "$as_me:__oline__: \$? = $ac_status" >&5 ++ echo "$as_me:8316: \$? = $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. @@ -12237,29 +28828,105 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + $rm conftest* + -+fi + fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } -+ + +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + +fi -+ -+fi -+ + +lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= -+ + +-if +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then +- am__fastdepCXX_TRUE= +- am__fastdepCXX_FALSE='#' +-else +- am__fastdepCXX_TRUE='#' +- am__fastdepCXX_FALSE= +-fi +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+ + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' -+ + +-if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +-$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +-if test -z "$CXXCPP"; then +- if test "${ac_cv_prog_CXXCPP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- # Double quotes because CXXCPP needs to be expanded +- for CXXCPP in "$CXX -E" "/lib/cpp" +- do +- ac_preproc_ok=false +-for ac_cxx_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- # <limits.h> exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- # Broken: fails on valid input. +-continue +-fi + case $host_os in + aix*) + # All AIX code is PIC. @@ -12268,18 +28935,55 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_static='-Bstatic' + fi + ;; -+ + +-rm -f conftest.err conftest.$ac_ext + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; -+ + +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <ac_nonexistent.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; -+ + +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi + 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). @@ -12287,31 +28991,93 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; -+ + +-rm -f conftest.err conftest.$ac_ext + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; -+ + +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- break +-fi + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; -+ + +- done +- ac_cv_prog_CXXCPP=$CXXCPP + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; -+ + +-fi +- CXXCPP=$ac_cv_prog_CXXCPP +-else +- ac_cv_prog_CXXCPP=$CXXCPP +-fi +-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 +-$as_echo "$CXXCPP" >&6; } +-ac_preproc_ok=false +-for ac_cxx_preproc_warn_flag in '' yes +-do +- # Use a header file that comes with gcc, so configuring glibc +- # with a fresh cross-compiler works. +- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- # <limits.h> exists even on freestanding compilers. +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. "Syntax error" is here to catch this case. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- Syntax error +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- test ! -s conftest.err +- }; then +- : +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; -+ + +- # Broken: fails on valid input. +-continue +-fi + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. @@ -12324,7 +29090,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +-rm -f conftest.err conftest.$ac_ext + *) + lt_prog_compiler_pic='-fPIC' + ;; @@ -12351,13 +29118,49 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +- # OK, works on sane cases. Now check whether nonexistent headers +- # can be detected and how. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <ac_nonexistent.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + 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' + ;; -+ + +- # Passes both tests. +-ac_preproc_ok=: +-break +-fi + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but @@ -12373,18 +29176,38 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; -+ + +-rm -f conftest.err conftest.$ac_ext +- +-done +-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext +-if $ac_preproc_ok; then +- : +-else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-_lt_caught_CXX_error=yes; } +-fi + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; -+ + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; -+ + +-else +- _lt_caught_CXX_error=yes +-fi + linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) @@ -12422,17 +29245,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; -+ + + rdos*) + lt_prog_compiler_static='-non_shared' + ;; -+ + + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' @@ -12443,56 +29266,79 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_wl='-Wl,';; + esac + ;; -+ + +-# Set options + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; -+ + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; -+ + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; -+ + +- enable_dlopen=no + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; -+ + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; -+ + + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; -+ -+ *) + +- # Check whether --enable-shared was given. +-if test "${enable_shared+set}" = set; then +- enableval=$enable_shared; p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; + *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" + lt_prog_compiler_can_build_shared=no -+ ;; -+ esac + ;; + esac +-else +- enable_shared=yes +-fi +- +- + fi -+ + +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } -+ + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then -+ + +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then @@ -12511,11 +29357,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -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:__oline__: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8602: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 -+ echo "$as_me:__oline__: \$? = $ac_status" >&5 ++ echo "$as_me:8606: \$? = $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. @@ -12526,11 +29372,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + $rm conftest* -+ + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } -+ + +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; @@ -12540,7 +29386,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no +fi -+ + +fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: @@ -12551,7 +29397,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac -+ + +# +# Check to make sure the static flag actually works. +# @@ -12582,18 +29428,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + $rm -r conftest* + LDFLAGS="$save_LDFLAGS" -+ + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } -+ + +-# Check whether --with-pic was given. +-if test "${with_pic+set}" = set; then +- withval=$with_pic; pic_mode="$withval" +if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : -+else + else +- pic_mode=default + lt_prog_compiler_static= -+fi -+ -+ + fi + + +-test -z "$pic_mode" && pic_mode=default +- +- +- +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then @@ -12605,7 +29459,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + cd conftest + mkdir out + 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 + # (2) before a word containing "conftest.", or (3) at the end. @@ -12615,11 +29469,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -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:__oline__: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8706: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 -+ echo "$as_me:__oline__: \$? = $ac_status" >&5 ++ echo "$as_me:8710: \$? = $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 @@ -12639,12 +29493,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + cd .. + rmdir conftest + $rm conftest* -+ + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } -+ -+ + + +- # Check whether --enable-fast-install was given. +-if test "${enable_fast_install+set}" = set; then +- enableval=$enable_fast_install; p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user @@ -12663,13 +29536,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi -+else + else +- enable_fast_install=yes + need_locks=no -+fi -+ + fi + +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+ + + runpath_var= + allow_undefined_flag= + enable_shared_with_static_runtimes=no @@ -12717,7 +29591,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ + + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time @@ -12735,12 +29609,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + with_gnu_ld=no + ;; + esac -+ + + ld_shlibs=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' -+ + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. @@ -12761,7 +29635,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac -+ + + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) @@ -12769,22 +29643,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<EOF 1>&2 -+ + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. -+ + +EOF + fi + ;; -+ + + amigaos*) + archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes -+ + + # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked @@ -12793,7 +29667,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # them. + ld_shlibs=no + ;; -+ + +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ltmain" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +- +- +- +- +- +- +- +- +- + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported @@ -12804,7 +29692,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs=no + fi + ;; -+ + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. @@ -12813,7 +29701,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + 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/'\'' -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' + # If the export-symbols file already is a .def file (1st line @@ -12829,7 +29717,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs=no + fi + ;; -+ + + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no @@ -12844,7 +29732,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + 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' + ;; -+ + + gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= @@ -12873,7 +29761,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + 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~ @@ -12885,7 +29773,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs=no + fi + ;; -+ + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -12895,19 +29783,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; -+ + + solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<EOF 1>&2 -+ + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -+ + +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -12916,20 +29804,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs=no + fi + ;; -+ + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 -+ + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -+ + +_LT_EOF + ;; + *) @@ -12943,14 +29831,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -+ + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -12960,7 +29848,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + ;; + esac -+ + + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= @@ -12983,7 +29871,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct=unsupported + fi + ;; -+ + +-test -z "$LN_S" && LN_S="ln -s" +- +- +- +- +- + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't @@ -13000,7 +29894,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no -+ + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. @@ -13013,22 +29907,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + done + ;; + esac -+ + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -+ + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ + + archive_cmds='' + hardcode_direct=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes -+ + + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check @@ -13069,7 +29963,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + fi -+ + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes @@ -13084,11 +29978,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +int +main () +{ -+ + + ; + return 0; +} @@ -13111,7 +30005,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ + +-if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { @@ -13123,18 +30019,39 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# 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 "$lt_aix_libpath_sed"` -+fi -+else + fi +- +-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 +-$as_echo_n "checking for objdir... " >&6; } +-if test "${lt_cv_objdir+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- rm -f .libs 2>/dev/null +-mkdir .libs 2>/dev/null +-if test -d .libs; then +- lt_cv_objdir=.libs + else +- # MS-DOS does not allow filenames that begin with a dot. +- lt_cv_objdir=_libs +-fi +-rmdir .libs 2>/dev/null +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +-$as_echo "$lt_cv_objdir" >&6; } +-objdir=$lt_cv_objdir +- + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + + +fi -+ + +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 -+ + +-cat >>confdefs.h <<_ACEOF +-#define LT_OBJDIR "$lt_cv_objdir/" + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else @@ -13146,15 +30063,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF + _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +int +main () +{ -+ + + ; + return 0; +} @@ -13177,7 +30094,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { @@ -13193,14 +30110,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + + +fi -+ + +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 -+ + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. @@ -13214,7 +30131,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + ;; -+ + + amigaos*) + archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' @@ -13222,11 +30139,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # see comment about different semantics on the GNU ld section + ld_shlibs=no + ;; -+ + + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; -+ + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. @@ -13247,7 +30164,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; -+ + + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[012]) @@ -13296,17 +30213,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + fi + ;; -+ + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; -+ + + freebsd1*) + ld_shlibs=no + ;; -+ + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little @@ -13317,7 +30234,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -+ + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' @@ -13325,7 +30242,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; -+ + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' @@ -13333,7 +30250,45 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -+ + +-case $host_os in +-aix3*) +- # AIX sometimes has problems with the GCC collect2 program. For some +- # reason, if we set the COLLECT_NAMES environment variable, the problems +- # vanish in a puff of smoke. +- if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +- fi +- ;; +-esac +- +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-sed_quote_subst='s/\(["`$\\]\)/\\\1/g' +- +-# Same as above, but do not quote variable references. +-double_quote_subst='s/\(["`\\]\)/\\\1/g' +- +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +- +-# Sed substitution to delay expansion of an escaped single quote. +-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' +- +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' +- +-# Global variables: +-ofile=libtool +-can_build_shared=yes +- +-# All known linkers require a `.a' archive for static linking (except MSVC, +-# which needs '.lib'). +-libext=a +- +-with_gnu_ld="$lt_cv_prog_gnu_ld" + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' @@ -13343,13 +30298,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes -+ + +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; -+ + +-# Set sane defaults for various variables +-test -z "$CC" && CC=cc +-test -z "$LTCC" && LTCC=$CC +-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +-test -z "$LD" && LD=ld +-test -z "$ac_objext" && ac_objext=o + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -13359,16 +30322,58 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: -+ + +-for cc_temp in $compiler""; do +- case $cc_temp in +- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; +- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + hardcode_direct=yes + export_dynamic_flag_spec='${wl}-E' -+ + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; -+ + +-# Only perform the check for file, if the check method requires it +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-case $deplibs_check_method in +-file_magic*) +- if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $MAGIC_CMD in +-[\\/*] | ?:[\\/]*) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. +- ;; +-*) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" +- for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/${ac_tool_prefix}file; then +- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" +- if test -n "$file_magic_test_file"; then +- case $deplibs_check_method in +- "file_magic "*) +- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | +- $EGREP "$file_magic_regex" > /dev/null; then +- : +- else +- cat <<_LT_EOF 1>&2 + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in @@ -13398,7 +30403,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: -+ + +-*** Warning: the command libtool uses to detect shared libraries, +-*** $file_magic_cmd, produces output that libtool cannot recognize. +-*** The result is that libtool may fail to recognize shared libraries +-*** as such. This will affect the creation of libtool libraries that +-*** depend on shared libraries, but programs linked with such libtool +-*** libraries will work regardless of this problem. Nevertheless, you +-*** may want to report the problem to your system manager and/or to +-*** bug-libtool@gnu.org + case $host_cpu in + hppa*64*|ia64*) + hardcode_libdir_flag_spec_ld='+b $libdir' @@ -13408,15 +30421,33 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *) + hardcode_direct=yes + export_dynamic_flag_spec='${wl}-E' -+ + +-_LT_EOF +- fi ;; + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; -+ esac -+ fi + esac + fi +- break +- fi +- done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac +-fi + ;; -+ + +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +-if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-$as_echo "$MAGIC_CMD" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' @@ -13428,7 +30459,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_separator=: + link_all_deplibs=yes + ;; -+ + + 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 @@ -13439,7 +30470,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -+ + + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes @@ -13447,7 +30478,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; -+ + + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes @@ -13473,7 +30504,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs=no + fi + ;; -+ + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes @@ -13481,7 +30512,50 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; -+ + +-if test -z "$lt_cv_path_MAGIC_CMD"; then +- if test -n "$ac_tool_prefix"; then +- { $as_echo "$as_me:$LINENO: checking for file" >&5 +-$as_echo_n "checking for file... " >&6; } +-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $MAGIC_CMD in +-[\\/*] | ?:[\\/]*) +- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. +- ;; +-*) +- lt_save_MAGIC_CMD="$MAGIC_CMD" +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" +- for ac_dir in $ac_dummy; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/file; then +- lt_cv_path_MAGIC_CMD="$ac_dir/file" +- if test -n "$file_magic_test_file"; then +- case $deplibs_check_method in +- "file_magic "*) +- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` +- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | +- $EGREP "$file_magic_regex" > /dev/null; then +- : +- else +- cat <<_LT_EOF 1>&2 +- +-*** Warning: the command libtool uses to detect shared libraries, +-*** $file_magic_cmd, produces output that libtool cannot recognize. +-*** The result is that libtool may fail to recognize shared libraries +-*** as such. This will affect the creation of libtool libraries that +-*** depend on shared libraries, but programs linked with such libtool +-*** libraries will work regardless of this problem. Nevertheless, you +-*** may want to report the problem to your system manager and/or to +-*** bug-libtool@gnu.org +- +-_LT_EOF +- fi ;; +- esac + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -13489,11 +30563,27 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi + fi +- break +- fi +- done +- IFS="$lt_save_ifs" +- MAGIC_CMD="$lt_save_MAGIC_CMD" +- ;; +-esac +-fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; -+ + +-MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +-if test -n "$MAGIC_CMD"; then +- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +-$as_echo "$MAGIC_CMD" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' @@ -13504,13 +30594,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+ + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + hardcode_libdir_separator=: + ;; -+ + +- else +- MAGIC_CMD=: +- fi +-fi + solaris*) + no_undefined_flag=' -z text' + if test "$GCC" = yes; then @@ -13542,7 +30636,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + link_all_deplibs=yes + ;; -+ + +- fi +- ;; +-esac + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o @@ -13556,7 +30653,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; -+ + +-# Use C for the default configuration in the libtool script + sysv4) + case $host_vendor in + sni) @@ -13578,13 +30676,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; -+ + +-lt_save_CC="$CC" +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; -+ + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -13594,13 +30698,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs=yes + fi + ;; -+ + +-# Source file extension for C test sources. +-ac_ext=c + 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 + runpath_var='LD_RUN_PATH' -+ + +-# Object file extension for compiled C test sources. +-objext=o +-objext=$objext + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -13609,7 +30718,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -+ + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="int some_variable = 0;" + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to @@ -13626,7 +30737,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' -+ + +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(){return(0);}' + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -13635,23 +30748,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -+ + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; -+ + + *) + ld_shlibs=no + ;; + esac + fi -+ + +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no -+ + +# +# Do we need to explicitly link libc? +# @@ -13659,7 +30772,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes -+ + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) @@ -13673,7 +30786,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? @@ -13714,7 +30827,37 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + ;; +esac -+ + +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC +- +-# Save the default compiler, since it gets overwritten when the other +-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +-compiler_DEFAULT=$CC +- +-# save warnings/boilerplate of simple test code +-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* +- +-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 -r conftest* +- +- +-if test -n "$compiler"; then +- +-lt_prog_compiler_no_builtin_flag= +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +library_names_spec= @@ -13730,8 +30873,50 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" -+ -+if test "$GCC" = yes; then + + if test "$GCC" = yes; then +- lt_prog_compiler_no_builtin_flag=' -fno-builtin' +- +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_rtti_exceptions=no +- ac_outfile=conftest.$ac_objext +- 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. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:9470: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:9474: \$? = $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. +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_rtti_exceptions=yes +- fi +- fi +- $RM conftest* +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +- +-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +- lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; @@ -13779,26 +30964,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` -+else + else +- : + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi + fi +need_lib_prefix=unknown +hardcode_into_libs=no -+ + +-fi +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown -+ + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH -+ + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; -+ + +aix[4-9]*) + version_type=linux + need_lib_prefix=no @@ -13842,19 +31029,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LIBPATH + fi + ;; -+ + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; -+ + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; -+ + +- lt_prog_compiler_wl= +-lt_prog_compiler_pic= +-lt_prog_compiler_static= +bsdi[45]*) + version_type=linux + need_version=no @@ -13868,13 +31058,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; -+ + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no -+ + +- if test "$GCC" = yes; then +- lt_prog_compiler_wl='-Wl,' +- lt_prog_compiler_static='-static' + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' @@ -13889,13 +31084,33 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes -+ -+ case $host_os in + + case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static='-Bstatic' +- fi + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; + ;; +- +- amigaos*) +- case $host_cpu in +- powerpc) +- # see comment about AmigaOS4 .so support +- lt_prog_compiler_pic='-fPIC' +- ;; +- m68k) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' +- ;; +- esac + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' @@ -13911,14 +31126,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi -+ ;; + ;; +- +- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; + ;; + esac + ;; -+ + +- mingw* | cygwin* | pw32* | os2* | cegcc*) +- # 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' +- ;; + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; @@ -13927,7 +31152,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; -+ + +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- lt_prog_compiler_pic='-fno-common' +- ;; +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin @@ -13938,11 +31168,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + +- hpux*) +- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit +- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag +- # sets the default TLS model and affects inlining. +- case $host_cpu in +- hppa*64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic='-fPIC' +- ;; +- esac +- ;; ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; -+ + +- interix[3-9]*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. +- ;; +dgux*) + version_type=linux + need_lib_prefix=no @@ -13951,11 +31198,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; -+ + +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- lt_prog_compiler_can_build_shared=no +- enable_shared=no +- ;; +freebsd1*) + dynamic_linker=no + ;; -+ + +- *nto* | *qnx*) +- # QNX uses GNU C++, but need to define -shared option too, otherwise +- # it will coredump. +- lt_prog_compiler_pic='-fPIC -shared' +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. @@ -13973,11 +31230,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no -+ ;; + ;; +- +- sysv4*MP*) +- if test -d /usr/nec; then +- lt_prog_compiler_pic=-Kconform_pic +- fi + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes -+ ;; + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in @@ -14067,11 +31329,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -+ + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; -+ *) + *) +- lt_prog_compiler_pic='-fPIC' +- ;; + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else @@ -14095,7 +31359,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; -+ esac + esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- lt_prog_compiler_wl='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static='-Bstatic' +- else +- lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH @@ -14104,12 +31380,32 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; -+ + +- mingw* | cygwin* | pw32* | os2* | cegcc*) +- # 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' +- ;; +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -+ + +- hpux9* | hpux10* | hpux11*) +- lt_prog_compiler_wl='-Wl,' +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- lt_prog_compiler_static='${wl}-a ${wl}archive' +- ;; +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux @@ -14124,13 +31420,75 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes -+ + +- irix5* | irix6* | nonstopux*) +- lt_prog_compiler_wl='-Wl,' +- # PIC (with -KPIC) is the default. +- lt_prog_compiler_static='-non_shared' +- ;; + # 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>/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 -+ + +- linux* | k*bsd*-gnu) +- case $cc_basename in +- # old Intel for x86_64 which still supported -KPIC. +- ecc*) +- lt_prog_compiler_wl='-Wl,' +- lt_prog_compiler_pic='-KPIC' +- lt_prog_compiler_static='-static' +- ;; +- # icc used to be incompatible with GCC. +- # ICC 10 doesn't accept -KPIC any more. +- icc* | ifort*) +- lt_prog_compiler_wl='-Wl,' +- lt_prog_compiler_pic='-fPIC' +- lt_prog_compiler_static='-static' +- ;; +- # Lahey Fortran 8.1. +- lf95*) +- lt_prog_compiler_wl='-Wl,' +- lt_prog_compiler_pic='--shared' +- lt_prog_compiler_static='--static' +- ;; +- pgcc* | pgf77* | pgf90* | pgf95*) +- # Portland Group compilers (*not* the Pentium gcc compiler, +- # which looks to be a dead project) +- lt_prog_compiler_wl='-Wl,' +- lt_prog_compiler_pic='-fpic' +- lt_prog_compiler_static='-Bstatic' +- ;; +- ccc*) +- lt_prog_compiler_wl='-Wl,' +- # All Alpha code is PIC. +- lt_prog_compiler_static='-non_shared' +- ;; +- xl*) +- # IBM XL C 8.0/Fortran 10.1 on PPC +- lt_prog_compiler_wl='-Wl,' +- lt_prog_compiler_pic='-qpic' +- lt_prog_compiler_static='-qstaticlink' +- ;; +- *) +- 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 +- ;; + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, @@ -14139,7 +31497,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; -+ + +- newsos6) +- lt_prog_compiler_pic='-KPIC' +- lt_prog_compiler_static='-Bstatic' +- ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no @@ -14151,7 +31513,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; -+ + +- *nto* | *qnx*) +- # QNX uses GNU C++, but need to define -shared option too, otherwise +- # it will coredump. +- lt_prog_compiler_pic='-fPIC -shared' +- ;; +netbsd*) + version_type=sunos + need_lib_prefix=no @@ -14169,14 +31536,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; -+ + +- osf3* | osf4* | osf5*) +- lt_prog_compiler_wl='-Wl,' +- # All OSF/1 code is PIC. +- lt_prog_compiler_static='-non_shared' +- ;; +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -+ + +- rdos*) +- lt_prog_compiler_static='-non_shared' +- ;; +nto-qnx*) + version_type=linux + need_lib_prefix=no @@ -14186,7 +31561,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -+ + +- solaris*) +- lt_prog_compiler_pic='-KPIC' +- lt_prog_compiler_static='-Bstatic' +- case $cc_basename in +- f77* | f90* | f95*) +- lt_prog_compiler_wl='-Qoption ld ';; +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" @@ -14204,15 +31585,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; -+ *) + *) +- lt_prog_compiler_wl='-Wl,';; + shlibpath_overrides_runpath=yes + ;; -+ esac + esac +- ;; + else + shlibpath_overrides_runpath=yes + fi + ;; -+ + +- sunos4*) +- lt_prog_compiler_wl='-Qoption ld ' +- lt_prog_compiler_pic='-PIC' +- lt_prog_compiler_static='-Bstatic' +- ;; +os2*) + libname_spec='$name' + shrext_cmds=".dll" @@ -14221,7 +31609,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; -+ + +- sysv4 | sysv4.2uw2* | sysv4.3*) +- lt_prog_compiler_wl='-Wl,' +- lt_prog_compiler_pic='-KPIC' +- lt_prog_compiler_static='-Bstatic' +- ;; +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no @@ -14232,11 +31625,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; -+ + +- sysv4*MP*) +- if test -d /usr/nec ;then +- lt_prog_compiler_pic='-Kconform_pic' +- lt_prog_compiler_static='-Bstatic' +- fi +- ;; +rdos*) + dynamic_linker=no + ;; -+ + +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- lt_prog_compiler_wl='-Wl,' +- lt_prog_compiler_pic='-KPIC' +- lt_prog_compiler_static='-Bstatic' +- ;; +solaris*) + version_type=linux + need_lib_prefix=no @@ -14249,7 +31653,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; -+ + +- unicos*) +- lt_prog_compiler_wl='-Wl,' +- lt_prog_compiler_can_build_shared=no +- ;; +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -14261,7 +31669,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + need_version=yes + ;; -+ + +- uts4*) +- lt_prog_compiler_pic='-pic' +- lt_prog_compiler_static='-Bstatic' +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -14273,10 +31684,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH -+ ;; + ;; +- +- *) +- lt_prog_compiler_can_build_shared=no + siemens) + need_lib_prefix=no -+ ;; + ;; +- esac +- fi +- +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic= +- ;; +- *) +- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +-$as_echo "$lt_prog_compiler_pic" >&6; } +- + motorola) + need_lib_prefix=no + need_version=no @@ -14285,7 +31714,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux @@ -14294,7 +31723,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LD_LIBRARY_PATH + fi + ;; -+ + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no @@ -14317,14 +31746,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; -+ + +uts4*) + version_type=linux + 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 + ;; -+ + +*) + dynamic_linker=no + ;; @@ -14332,34 +31761,92 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no -+ + +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$lt_prog_compiler_pic"; then +- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then +- $as_echo_n "(cached) " >&6 +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- lt_cv_prog_compiler_pic_works=no +- ac_outfile=conftest.$ac_objext +- 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. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:9809: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:9813: \$? = $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. +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_pic_works=yes +- fi +- fi +- $RM conftest* +- + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi -+ + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + +-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +- case $lt_prog_compiler_pic in +- "" | " "*) ;; +- *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; +- esac +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- lt_prog_compiler_pic= +- lt_prog_compiler_can_build_shared=no +-fi +- + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi -+ + fi + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi -+ + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var" || \ + test "X$hardcode_automatic" = "Xyes" ; then -+ + +- +- +-# +-# Check to make sure the static flag actually works. +-# +-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works+set}" = set; then +- $as_echo_n "(cached) " >&6 + # We can hardcode non-existant directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we @@ -14373,14 +31860,35 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi -+else + else +- lt_cv_prog_compiler_static_works=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- 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 +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&5 +- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_static_works=yes +- fi +- else +- lt_cv_prog_compiler_static_works=yes +- fi +- fi +- $RM -r conftest* +- LDFLAGS="$save_LDFLAGS" + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6; } -+ + +if test "$hardcode_action" = relink; then + # Fast installation is not supported + enable_fast_install=no @@ -14388,8 +31896,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless -+fi -+ + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works" >&6; } + +-if test x"$lt_cv_prog_compiler_static_works" = xyes; then +- : +striplib= +old_striplib= +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 @@ -14399,7 +31911,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -+else + else +- lt_prog_compiler_static= +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) @@ -14418,8 +31931,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}no" >&6; } + ;; + esac -+fi -+ + fi + +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown @@ -14427,24 +31940,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= -+ + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; -+ + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; -+ + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; -+ + + darwin*) + # if libdl is installed we need to link against it + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 @@ -14460,7 +31973,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +- +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then +- $as_echo_n "(cached) " >&6 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -14495,31 +32013,72 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes -+else + else +- lt_cv_prog_compiler_c_o=no +- $RM -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:9914: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&5 +- echo "$as_me:9918: \$? = $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 +- # So say no if there are warnings +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_c_o=yes +- fi +- fi +- chmod u+w . 2>&5 +- $RM conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files +- $RM out/* && rmdir out +- cd .. +- $RM -r conftest +- $RM conftest* + ac_cv_lib_dl_dlopen=no +fi -+ + +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 + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else -+ + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes -+ + +fi -+ + + ;; -+ + + *) + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } @@ -14535,20 +32094,68 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load -+ + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ -+ + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_c_o=no +- $RM -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif -+ + +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:9969: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&5 +- echo "$as_me:9973: \$? = $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 +- # So say no if there are warnings +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_c_o=yes +- fi +- fi +- chmod u+w . 2>&5 +- $RM conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files +- $RM out/* && rmdir out +- cd .. +- $RM -r conftest +- $RM conftest* +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +#undef shl_load -+ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -14562,7 +32169,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#if defined __stub_shl_load || defined __stub___shl_load +choke me +#endif -+ + +int +main () +{ @@ -14593,13 +32200,33 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_cv_func_shl_load=no +fi -+ + +-hard_links="nottested" +-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-$as_echo_n "checking if we can lock with hard links... " >&6; } +- hard_links=yes +- $RM conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +-$as_echo "$hard_links" >&6; } +- if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} +- need_locks=warn +- fi +-else +- need_locks=no +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } +if test $ac_cv_func_shl_load = yes; then @@ -14618,7 +32245,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -14656,10 +32283,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_cv_lib_dld_shl_load=no +fi -+ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -14683,20 +32310,62 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen -+ + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ -+ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif -+ + +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } +#undef dlopen -+ + +- runpath_var= +- allow_undefined_flag= +- always_export_symbols=no +- archive_cmds= +- archive_expsym_cmds= +- compiler_needs_object=no +- enable_shared_with_static_runtimes=no +- export_dynamic_flag_spec= +- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- hardcode_automatic=no +- hardcode_direct=no +- hardcode_direct_absolute=no +- hardcode_libdir_flag_spec= +- hardcode_libdir_flag_spec_ld= +- hardcode_libdir_separator= +- hardcode_minus_L=no +- hardcode_shlibpath_var=unsupported +- inherit_rpath=no +- link_all_deplibs=unknown +- module_cmds= +- module_expsym_cmds= +- old_archive_from_new_cmds= +- old_archive_from_expsyms_cmds= +- thread_safe_flag_spec= +- whole_archive_flag_spec= +- # include_expsyms should be a list of space-separated symbols to be *always* +- # included in the symbol list +- include_expsyms= +- # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. +- exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' +- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out +- # platforms (ab)use it in PIC code, but their linkers get confused if +- # the symbol is explicitly referenced. Since portable code cannot +- # rely on this symbol name, it's probably fine to never include it in +- # preloaded symbol tables. +- # Exclude shared library initialization/finalization symbols. +- extract_expsyms_cmds= +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -14710,7 +32379,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#if defined __stub_dlopen || defined __stub___dlopen +choke me +#endif -+ + +- case $host_os in +- cygwin* | mingw* | pw32* | cegcc*) +- # FIXME: the MSVC++ port hasn't been tested in a loooong time +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- with_gnu_ld=no +- fi +- ;; +- interix*) +- # we just hope/assume this is gcc and not c89 (= MSVC++) +- with_gnu_ld=yes +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +- esac +int +main () +{ @@ -14741,10 +32427,34 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +- ld_shlibs=yes +- if test "$with_gnu_ld" = yes; then +- # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' + ac_cv_func_dlopen=no +fi -+ + +- # Set some defaults for GNU ld with shared library support. These +- # are reset later if shared libraries are not supported. Putting them +- # here allows them to be overridden if necessary. +- runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- export_dynamic_flag_spec='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec= +- fi +- supports_anon_versioning=no +- case `$LD -v 2>&1` in +- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi @@ -14766,7 +32476,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +- # See if GNU ld supports shared libraries. +- case $host_os in +- aix[3-9]*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- ld_shlibs=no +- cat <<_LT_EOF 1>&2 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -14804,10 +32521,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported +-*** to be unable to reliably create shared libraries on AIX. +-*** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. + ac_cv_lib_dl_dlopen=no +fi -+ + +-_LT_EOF +- fi +- ;; +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -14830,7 +32555,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +- amigaos*) +- case $host_cpu in +- powerpc) +- # see comment about AmigaOS4 .so support +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='' +- ;; +- m68k) +- archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_minus_L=yes +- ;; +- esac +- ;; +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -14868,10 +32607,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +- beos*) +- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- allow_undefined_flag=unsupported +- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- ld_shlibs=no +- fi +- ;; + ac_cv_lib_svld_dlopen=no +fi -+ + +- cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, +- # as there is no search path for DLLs. +- hardcode_libdir_flag_spec='-L$libdir' +- 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' +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -14894,7 +32651,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +- 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' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- ld_shlibs=no +- fi +- ;; +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -14932,10 +32704,66 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +- interix[3-9]*) +- hardcode_direct=no +- hardcode_shlibpath_var=no +- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' +- export_dynamic_flag_spec='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- 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' +- ;; + ac_cv_lib_dld_dld_link=no +fi -+ + +- gnu* | linux* | tpf* | k*bsd*-gnu) +- tmp_diet=no +- if test "$host_os" = linux-dietlibc; then +- case $cc_basename in +- diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) +- esac +- fi +- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ +- && test "$tmp_diet" = no +- then +- tmp_addflag= +- tmp_sharedflag='-shared' +- case $cc_basename,$host_cpu in +- pgcc*) # Portland Group C compiler +- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag' +- ;; +- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 +- tmp_addflag=' -i_dynamic' ;; +- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 +- tmp_addflag=' -i_dynamic -nofor_main' ;; +- ifc* | ifort*) # Intel Fortran compiler +- tmp_addflag=' -nofor_main' ;; +- lf95*) # Lahey Fortran 8.1 +- whole_archive_flag_spec= +- tmp_sharedflag='--shared' ;; +- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) +- tmp_sharedflag='-qmkshrobj' +- tmp_addflag= ;; +- esac +- 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' +- compiler_needs_object=yes +- tmp_sharedflag='-G' ;; +- *Sun\ F*) # Sun Fortran 8.3 +- tmp_sharedflag='-G' ;; +- esac +- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -14945,42 +32773,194 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +fi -+ -+ + +- if test "x$supports_anon_versioning" = xyes; 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi + +- case $cc_basename in +- xlf*) +- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself +- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' +- hardcode_libdir_flag_spec= +- hardcode_libdir_flag_spec_ld='-rpath $libdir' +- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' +- if test "x$supports_anon_versioning" = xyes; 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~ +- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' +- fi +- ;; +- esac +- else +- ld_shlibs=no +- fi +- ;; +fi -+ -+ + +- netbsd*) +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' +- wlarc= +- else +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- fi +- ;; + +- solaris*) +- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then +- ld_shlibs=no +- cat <<_LT_EOF 1>&2 +fi -+ -+ + +-*** Warning: The releases 2.8.* of the GNU linker cannot reliably +-*** create shared libraries on Solaris systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.9.1 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. + +-_LT_EOF +- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- ld_shlibs=no +- fi +- ;; +fi -+ -+ + +- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) +- case `$LD -v 2>&1` in +- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) +- ld_shlibs=no +- cat <<_LT_EOF 1>&2 + +-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +-*** reliably create shared libraries on SCO systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. +fi -+ -+ + +-_LT_EOF +- ;; +- *) +- # For security reasons, it is highly recommended that you always +- # use absolute paths for naming shared libraries, and exclude the +- # DT_RUNPATH tag from executables and libraries. But doing so +- # requires that you compile everything twice, which is a pain. +- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- ld_shlibs=no +- fi +- ;; +- esac +- ;; + +- sunos4*) +- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- wlarc= +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- ;; +fi -+ + +- *) +- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- ld_shlibs=no +- fi +- ;; +- esac + ;; + esac -+ + +- if test "$ld_shlibs" = no; then +- runpath_var= +- hardcode_libdir_flag_spec= +- export_dynamic_flag_spec= +- whole_archive_flag_spec= +- fi + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes -+ else + else +- # PORTME fill in a description of your system's linker (not GNU ld) +- case $host_os in +- aix3*) +- allow_undefined_flag=unsupported +- always_export_symbols=yes +- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- hardcode_minus_L=yes +- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- hardcode_direct=unsupported +- fi +- ;; + enable_dlopen=no + fi -+ + +- aix[4-9]*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then +- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- else +- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- fi +- aix_use_runtimelinking=no + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ + +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- ;; +- esac + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" -+ + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } +if test "${lt_cv_dlopen_self+set}" = set; then @@ -14992,15 +32972,77 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF -+#line __oline__ "configure" ++#line 11083 "configure" +#include "confdefs.h" -+ + +- archive_cmds='' +- hardcode_direct=yes +- hardcode_direct_absolute=yes +- hardcode_libdir_separator=':' +- link_all_deplibs=yes +- file_list_spec='${wl}-f,' +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif -+ + +- if test "$GCC" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && +- strings "$collect2name" | $GREP resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- : +- else +- # We have old collect2 +- hardcode_direct=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- hardcode_minus_L=yes +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_libdir_separator= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi +#include <stdio.h> -+ + +- export_dynamic_flag_spec='${wl}-bexpall' +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- always_export_symbols=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- allow_undefined_flag='-berok' +- # Determine the default libpath from the value encoded in an +- # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else @@ -15010,7 +33052,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# define LT_DLGLOBAL 0 +# endif +#endif -+ + +-int +-main () +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW @@ -15039,10 +33083,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +void fnord() { int i=42;} +int main () -+{ + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; -+ + +- ; +- return 0; + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; @@ -15053,11 +33099,32 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + puts (dlerror ()); + + exit (status); -+} + } +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 -+ ac_status=$? + ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null @@ -15074,8 +33141,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +fi +rm -fr conftest* + -+ -+fi + +-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 "$lt_aix_libpath_sed"` + fi +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } + @@ -15085,22 +33163,29 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } +if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF -+#line __oline__ "configure" ++#line 11183 "configure" +#include "confdefs.h" -+ + +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif -+ + +-fi +#include <stdio.h> -+ + +-rm -rf conftest.dSYM +-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 +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else @@ -15110,7 +33195,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# define LT_DLGLOBAL 0 +# endif +#endif -+ + +- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' +- allow_undefined_flag="-z nodefs" +- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an +- # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW @@ -15132,17 +33233,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# endif +# endif +#endif -+ + +-int +-main () +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () -+{ + { + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; -+ + +- ; +- return 0; + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; @@ -15153,11 +33258,44 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + puts (dlerror ()); + + exit (status); -+} + } +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 -+ ac_status=$? + ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $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 "$lt_aix_libpath_sed"` + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null @@ -15171,33 +33309,93 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # compilation failed + lt_cv_dlopen_self_static=no + fi -+fi + fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +rm -fr conftest* -+ -+ -+fi + + + fi +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } + fi -+ + +-rm -rf conftest.dSYM +-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 +- +- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- no_undefined_flag=' ${wl}-bernotok' +- allow_undefined_flag=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec='$convenience' +- archive_cmds_need_lc=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +- +- amigaos*) +- case $host_cpu in +- powerpc) +- # see comment about AmigaOS4 .so support +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds='' +- ;; +- m68k) +- archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_minus_L=yes +- ;; +- esac +- ;; + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac -+ + +- bsdi[45]*) +- export_dynamic_flag_spec=-rdynamic +- ;; + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac -+ + +- cygwin* | mingw* | pw32* | cegcc*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # 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' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes +- ;; + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi -+ -+ + +- darwin* | rhapsody*) + +# Report which library types will actually be built +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } @@ -15207,7 +33405,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } +test "$can_build_shared" = "no" && enable_shared=no -+ + +- archive_cmds_need_lc=no +- hardcode_direct=no +- hardcode_automatic=yes +- hardcode_shlibpath_var=unsupported +- whole_archive_flag_spec='' +- link_all_deplibs=yes +- allow_undefined_flag="$_lt_dar_allow_undefined" +- case $cc_basename in +- ifort*) _lt_dar_can_shared=yes ;; +- *) _lt_dar_can_shared=$GCC ;; +- esac +- if test "$_lt_dar_can_shared" = "yes"; then +- output_verbose_link_cmd=echo +- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case $host_os in @@ -15218,16 +33433,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + postinstall_cmds='$RANLIB $lib' + fi + ;; -+ + +- else +- ld_shlibs=no +aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no -+ fi + fi + ;; +esac +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -+ + +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } +# Make sure either enable_shared or enable_static is yes. @@ -15310,28 +33527,60 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; + ;; +- +- dgux*) +- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_shlibpath_var=no + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; + ;; + esac + done -+ + +- freebsd1*) +- ld_shlibs=no +- ;; + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac -+ + +- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +- # support. Future versions do this automatically, but an explicit c++rt0.o +- # does not break anything, and helps significantly (at the cost of a little +- # extra space). +- freebsd2.2*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- hardcode_libdir_flag_spec='-R$libdir' +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- ;; +cfgfile="${ofile}T" + trap "$rm \"$cfgfile\"; exit 1" 1 2 15 + $rm -f "$cfgfile" + { echo "$as_me:$LINENO: creating $ofile" >&5 +echo "$as_me: creating $ofile" >&6;} -+ + +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct=yes +- hardcode_minus_L=yes +- hardcode_shlibpath_var=no +- ;; + cat <<__EOF__ >> "$cfgfile" +#! $SHELL -+ + +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | dragonfly*) +- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec='-R$libdir' +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- ;; +# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +# NOTE: Changes made to this file will be lost: look at ltmain.sh. @@ -15360,336 +33609,764 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -+ + +- hpux9*) +- if test "$GCC" = yes; then +- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- fi +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator=: +- hardcode_direct=yes +# A sed program that does not truncate output. +SED=$lt_SED -+ + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes +- export_dynamic_flag_spec='${wl}-E' +- ;; +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="$SED -e 1s/^X//" -+ + +- hpux10*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +- fi +- if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_flag_spec_ld='+b $libdir' +- hardcode_libdir_separator=: +- hardcode_direct=yes +- hardcode_direct_absolute=yes +- export_dynamic_flag_spec='${wl}-E' +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes +- fi +- ;; +# 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 -+ + +- hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case $host_cpu in +- hppa*64*) +- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- case $host_cpu in +- hppa*64*) +- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator=: +# The names of the tagged configurations supported by this script. +available_tags= -+ + +- case $host_cpu in +- hppa*64*|ia64*) +- hardcode_direct=no +- hardcode_shlibpath_var=no +- ;; +- *) +- hardcode_direct=yes +- hardcode_direct_absolute=yes +- export_dynamic_flag_spec='${wl}-E' +# ### BEGIN LIBTOOL CONFIG -+ + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes +- ;; +- esac +- fi +- ;; +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ + +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- # Try to use the -exported_symbol ld option, if it does not +- # work, assume that -exports_file does not work either and +- # implicitly export all symbols. +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" +- cat >conftest.$ac_ext <<_ACEOF +-int foo(void) {} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL -+ + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared -+ + +# Whether or not to build static libraries. +build_old_libs=$enable_static -+ + +-fi +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc -+ + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="$save_LDFLAGS" +- else +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +- fi +- archive_cmds_need_lc='no' +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator=: +- inherit_rpath=yes +- link_all_deplibs=yes +- ;; +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -+ + +- netbsd*) +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out +- else +- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- hardcode_libdir_flag_spec='-R$libdir' +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- ;; +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install -+ + +- newsos6) +- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct=yes +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator=: +- hardcode_shlibpath_var=no +- ;; +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os -+ + +- *nto* | *qnx*) +- ;; +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os -+ + +- openbsd*) +- if test -f /usr/libexec/ld.so; then +- hardcode_direct=yes +- hardcode_shlibpath_var=no +- hardcode_direct_absolute=yes +- 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 +- ld_shlibs=no +- fi +- ;; +# An echo program that does not interpret backslashes. +echo=$lt_echo -+ + +- os2*) +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_minus_L=yes +- allow_undefined_flag=unsupported +- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +- ;; +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS -+ + +- osf3*) +- if test "$GCC" = yes; then +- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- allow_undefined_flag=' -expect_unresolved \*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- fi +- archive_cmds_need_lc='no' +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator=: +- ;; +# A C compiler. +LTCC=$lt_LTCC -+ + +- osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- else +- allow_undefined_flag=' -expect_unresolved \*' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ +- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS -+ + +- # Both c and cxx compiler support -rpath directly +- hardcode_libdir_flag_spec='-rpath $libdir' +- fi +- archive_cmds_need_lc='no' +- hardcode_libdir_separator=: +- ;; +# A language-specific compiler. +CC=$lt_compiler -+ + +- solaris*) +- no_undefined_flag=' -z defs' +- if test "$GCC" = yes; then +- wlarc='${wl}' +- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' +- else +- case `$CC -V 2>&1` in +- *"Compilers 5.0"*) +- wlarc='' +- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' +- ;; +- *) +- wlarc='${wl}' +- archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' +- ;; +- esac +- fi +- hardcode_libdir_flag_spec='-R$libdir' +- hardcode_shlibpath_var=no +- case $host_os in +- solaris2.[0-5] | solaris2.[0-5].*) ;; +- *) +- # 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?) +- 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 +- ;; +# Is the compiler the GNU C compiler? +with_gcc=$GCC -+ + +- sunos4*) +- if test "x$host_vendor" = xsequent; then +- # Use $CC to link under sequent, because it throws in some extra .o +- # files that make .init and .fini sections work. +- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_direct=yes +- hardcode_minus_L=yes +- hardcode_shlibpath_var=no +- ;; +- +- sysv4) +- case $host_vendor in +- sni) +- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct=yes # is this really true??? +- ;; +- siemens) +- ## LD is ld it makes a PLAMLIB +- ## CC just makes a GrossModule. +- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- reload_cmds='$CC -r -o $output$reload_objs' +- hardcode_direct=no +- ;; +- motorola) +- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct=no #Motorola manual says yes, but my tests say they lie +- ;; +- esac +- runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var=no +- ;; +# An ERE matcher. +EGREP=$lt_EGREP -+ + +- sysv4.3*) +- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var=no +- export_dynamic_flag_spec='-Bexport' +- ;; +# The linker used to build libraries. +LD=$lt_LD -+ + +- sysv4*MP*) +- if test -d /usr/nec; then +- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var=no +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ld_shlibs=yes +- fi +- ;; +# Whether we need hard or soft links. +LN_S=$lt_LN_S -+ + +- 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 +- runpath_var='LD_RUN_PATH' +# A BSD-compatible nm program. +NM=$lt_NM -+ + +- if test "$GCC" = yes; then +- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; +# A symbol stripping program +STRIP=$lt_STRIP -+ + +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- no_undefined_flag='${wl}-z,text' +- allow_undefined_flag='${wl}-z,nodefs' +- archive_cmds_need_lc=no +- hardcode_shlibpath_var=no +- hardcode_libdir_flag_spec='${wl}-R,$libdir' +- hardcode_libdir_separator=':' +- link_all_deplibs=yes +- export_dynamic_flag_spec='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD -+ + +- if test "$GCC" = yes; then +- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" -+ + +- uts4*) +- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_shlibpath_var=no +- ;; +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" -+ + +- *) +- ld_shlibs=no +- ;; +- esac +# Used on cygwin: assembler. +AS="$AS" -+ + +- if test x$host_vendor = xsni; then +- case $host in +- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) +- export_dynamic_flag_spec='${wl}-Blargedynsym' +- ;; +- esac +- fi +- fi +# The name of the directory that contains temporary libtool files. +objdir=$objdir -+ + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +-$as_echo "$ld_shlibs" >&6; } +-test "$ld_shlibs" = no && can_build_shared=no +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -+ + +-with_gnu_ld=$with_gnu_ld +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl -+ + +# Object file suffix (normally "o"). +objext="$ac_objext" -+ + +# Old archive suffix (normally "a"). +libext="$libext" -+ + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' -+ + +# Executable file suffix (normally ""). +exeext="$exeext" -+ + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic +pic_mode=$pic_mode -+ + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len -+ + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o -+ + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks -+ + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix -+ + +# Do we need a version for libraries? +need_version=$need_version -+ + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen -+ + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self -+ + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static -+ + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static -+ + +-# +-# Do we need to explicitly link libc? +-# +-case "x$archive_cmds_need_lc" in +-x|xyes) +- # Assume -lc should be added +- archive_cmds_need_lc=yes +- +- if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $archive_cmds in +- *'~'*) +- # FIXME: we may have to deal with multi-command sequences. +- ;; +- '$CC '*) +- # Test whether the compiler implicitly links with -lc since on some +- # systems, -lgcc has to come before -lc. If gcc already passes -lc +- # to ld, don't add -lc before -lgcc. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +- $RM conftest* +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$lt_prog_compiler_wl +- pic_flag=$lt_prog_compiler_pic +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$allow_undefined_flag +- allow_undefined_flag= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 +- (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- then +- archive_cmds_need_lc=no +- else +- archive_cmds_need_lc=yes +- fi +- allow_undefined_flag=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $RM conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +-$as_echo "$archive_cmds_need_lc" >&6; } +- ;; +- esac +- fi +- ;; +-esac +- +- +- +- +- +- +- +- +- +- +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -+ + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -+ + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec -+ + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec -+ + +# Library versioning type. +version_type=$version_type -+ + +# Format of library name prefix. +libname_spec=$lt_libname_spec -+ + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec -+ + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec -+ + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -+ + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -+ + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds -+ + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds -+ + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib -+ + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects -+ + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects -+ + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps -+ + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps -+ + +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs -+ + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path -+ + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method -+ + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd -+ + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag -+ + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag -+ + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds -+ + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval -+ + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ + +# This is the shared library runtime path variable. +runpath_var=$runpath_var -+ + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var -+ + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action -+ + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs -+ + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -+ + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -+ + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator -+ + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct -+ + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L -+ + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var -+ + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic -+ + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" -+ + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs -+ + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path -+ + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols -+ + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds -+ + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms -+ + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms -+ + +# ### END LIBTOOL CONFIG -+ + +__EOF__ -+ -+ + + + case $host_os in + aix3*) + cat <<\EOF >> "$cfgfile" -+ + +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. @@ -15700,17 +34377,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +EOF + ;; + esac -+ + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) -+ + + mv -f "$cfgfile" "$ofile" || \ + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" -+ + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the @@ -15720,29 +34397,29 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test -f Makefile && make "$ltmain" + fi +fi -+ -+ + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ + +CC="$lt_save_CC" -+ -+ + + +# Check whether --with-tags was given. +if test "${with_tags+set}" = set; then + withval=$with_tags; tagnames="$withval" +fi -+ -+ + + +if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then + { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 +echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} + fi -+ + + if test -z "$LTCC"; then + eval "`$SHELL ${ofile} --config | grep '^LTCC='`" + if test -z "$LTCC"; then @@ -15756,11 +34433,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi -+ + + # Extract list of available tagged configurations in $ofile. + # Note that this assumes the entire list is on one line. + available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` -+ + + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for tagname in $tagnames; do + IFS="$lt_save_ifs" @@ -15772,14 +34449,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { (exit 1); exit 1; }; } + ;; + esac -+ + + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null + then + { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 +echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} + { (exit 1); exit 1; }; } + fi -+ + + # Update the list of available tags. + if test -n "$tagname"; then + echo appending configuration tag \"$tagname\" to $ofile @@ -15794,10 +34471,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+ -+ -+ + + + + +archive_cmds_need_lc_CXX=no +allow_undefined_flag_CXX= +always_export_symbols_CXX=no @@ -15817,7 +34494,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +no_undefined_flag_CXX= +whole_archive_flag_spec_CXX= +enable_shared_with_static_runtimes_CXX=no -+ + +# Dependencies to place before and after the object being linked: +predep_objects_CXX= +postdep_objects_CXX= @@ -15825,46 +34502,46 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +postdeps_CXX= +compiler_lib_search_path_CXX= +compiler_lib_search_dirs_CXX= -+ + +# Source file extension for C++ test sources. +ac_ext=cpp -+ + +# Object file extension for compiled C++ test sources. +objext=o +objext_CXX=$objext -+ + +# Code to be used in simple compile tests +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); }' -+ + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -+ + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ + +# Allow CC to be a program name with arguments. +compiler=$CC -+ -+ + + +# save warnings/boilerplate of simple test code +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* -+ + +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 -r conftest* -+ -+ + + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_LD=$LD @@ -15895,8 +34572,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ + + +# We don't want -fno-exception wen compiling C++ code, so set the +# no_builtin_flag separately +if test "$GXX" = yes; then @@ -15904,18 +34581,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + lt_prog_compiler_no_builtin_flag_CXX= +fi -+ + +if test "$GXX" = yes; then + # Set up default GNU C++ configuration -+ -+ + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi -+ + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. @@ -15983,7 +34660,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_cv_path_LD="$LD" # Let the user override the test with a path. +fi +fi -+ + +LD="$lt_cv_path_LD" +if test -n "$LD"; then + { echo "$as_me:$LINENO: result: $LD" >&5 @@ -16013,23 +34690,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld -+ -+ -+ + + + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' -+ + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ + grep 'no-whole-archive' > /dev/null; then @@ -16040,7 +34717,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + else + with_gnu_ld=no + wlarc= -+ + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should @@ -16048,18 +34725,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # the platform it is being used on. + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi -+ + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ + +else + GXX=no + with_gnu_ld=no + wlarc= +fi -+ + +# PORTME: fill in a description of your system's C++ link characteristics +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } @@ -16078,7 +34755,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + no_entry_flag="" + else + aix_use_runtimelinking=no -+ + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. @@ -16093,11 +34770,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + done + ;; + esac -+ + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -+ + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to @@ -16108,7 +34785,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct_CXX=yes + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes -+ + + if test "$GXX" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check @@ -16149,7 +34826,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + fi -+ + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_CXX=yes @@ -16164,11 +34841,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +int +main () +{ -+ + + ; + return 0; +} @@ -16191,7 +34868,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { @@ -16207,16 +34884,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + + +fi -+ + +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 -+ + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -+ + + archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then @@ -16231,11 +34908,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +int +main () +{ -+ + + ; + return 0; +} @@ -16258,7 +34935,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { @@ -16274,14 +34951,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + + +fi -+ + +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 -+ + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. @@ -16295,7 +34972,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + ;; -+ + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported @@ -16306,7 +34983,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_CXX=no + fi + ;; -+ + + chorus*) + case $cc_basename in + *) @@ -16315,7 +34992,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. @@ -16373,7 +35050,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + fi + ;; -+ + + dgux*) + case $cc_basename in + ec++*) @@ -16445,7 +35122,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test $with_gnu_ld = no; then + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: -+ + + case $host_cpu in + hppa*64*|ia64*) ;; + *) @@ -16465,7 +35142,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # location of the library. + ;; + esac -+ + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support @@ -16620,11 +35297,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Compaq C++ + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ + + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + hardcode_libdir_separator_CXX=: -+ + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. @@ -16644,7 +35321,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + 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. @@ -16720,14 +35397,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: -+ + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' -+ + + ;; + RCC*) + # Rational C++ 2.4.1 @@ -16755,15 +35432,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: -+ + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no @@ -16780,10 +35457,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: -+ + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' @@ -16818,15 +35495,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: -+ + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no @@ -16865,7 +35542,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ + + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_shlibpath_var_CXX=no + case $host_os in @@ -16878,9 +35555,77 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + link_all_deplibs_CXX=yes -+ + +- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-$as_echo_n "checking dynamic linker characteristics... " >&6; } + output_verbose_link_cmd='echo' -+ + +-if test "$GCC" = yes; 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. +- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` +- else +- 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 +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-need_lib_prefix=unknown +-hardcode_into_libs=no + # 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 @@ -16890,7 +35635,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + gcx*) + # Green Hills C++ Compiler + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ + +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown + # The C++ compiler must be used to create the archive. + old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; @@ -16902,7 +35650,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ + +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. @@ -16913,13 +35666,41 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ + +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + fi -+ + +-aix[4-9]*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then +- # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- else +- # With GCC up to 2.95.x, collect2 would create an import file +- # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in +- # development snapshots of GCC prior to 3.0. +- case $host_os in +- aix4 | aix4.[01] | aix4.[01].*) +- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; @@ -16929,8 +35710,36 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + fi + ;; -+ esac -+ ;; + esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib<name>.so +- # instead of lib<name>.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' +- fi +- shlibpath_var=LIBPATH +- fi +- ;; +- +-amigaos*) +- case $host_cpu in +- powerpc) +- # Since July 2007 AmigaOS4 officially supports .so libraries. +- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; +- m68k) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' + archive_cmds_need_lc_CXX=no @@ -16947,7 +35756,80 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac -+ ;; + ;; +- esac +- ;; +- +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH +- ;; +- +-bsdi[45]*) +- version_type=linux +- 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' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs +- ;; +- +-cygwin* | mingw* | pw32* | cegcc*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no +- +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname~ +- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; +- fi' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $RM \$dlpath' +- shlibpath_overrides_runpath=yes +- +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw* | cegcc*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- 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 ';[c-zC-Z]:/' >/dev/null; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- 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 +- ;; +- pw32*) +- # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to @@ -16983,8 +35865,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; -+ esac -+ ;; + esac + ;; +- + tandem*) + case $cc_basename in + NCC*) @@ -17002,18 +35885,46 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; -+ *) + *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no -+ ;; + ;; +- esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH +- ;; +- +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +esac +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } +test "$ld_shlibs_CXX" = no && can_build_shared=no -+ + +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" +- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +- ;; +GCC_CXX="$GXX" +LD_CXX="$LD" -+ + +-dgux*) +- 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 +- ;; +cat > conftest.$ac_ext <<EOF +class Foo +{ @@ -17023,7 +35934,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + int a; +}; +EOF -+ + +-freebsd1*) +- dynamic_linker=no +- ;; +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? @@ -17103,8 +36017,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + + *) ;; # Ignore the rest. -+ -+ esac + +-freebsd* | dragonfly*) +- # DragonFly does not have aout. When/if they implement a new +- # versioning mechanism, adjust this. +- if test -x /usr/bin/objformat; then +- objformat=`/usr/bin/objformat` +- else +- case $host_os in +- freebsd[123]*) objformat=aout ;; +- *) objformat=elf ;; + esac +- fi +- version_type=freebsd-$objformat +- case $version_type in +- freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes + done + + # Clean up. @@ -17142,15 +36076,42 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes -+ ;; + ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.[01]* | freebsdelf3.[01]*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ +- freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- *) # from 4.6 on, and DragonFly +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes + esac + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi -+ ;; -+ esac -+ ;; -+ + ;; + esac + ;; + +-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 +- hardcode_into_libs=yes +- ;; +solaris*) + case $cc_basename in + CC*) @@ -17163,35 +36124,266 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + solaris_use_stlport4=yes + ;; + esac -+ + +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case $host_cpu in +- ia64*) +- shrext_cmds='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + # 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. + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; + fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext_cmds='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' + ;; +esac -+ + +-interix[3-9]*) +- 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' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +case " $postdeps_CXX " in +*" -lc "*) archive_cmds_need_lc_CXX=no ;; +esac -+ + +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +- esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes +- ;; +- +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; +- +-# This must be Linux ELF. +-linux* | k*bsd*-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' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- # Some binutils ld are patched to set DT_RUNPATH +- save_LDFLAGS=$LDFLAGS +- save_libdir=$libdir +- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ +- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then +- shlibpath_overrides_runpath=yes +-fi +- +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- LDFLAGS=$save_LDFLAGS +- libdir=$save_libdir +- +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. +- hardcode_into_libs=yes +- +- # 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>/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 +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; +- +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +- fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +lt_prog_compiler_wl_CXX= +lt_prog_compiler_pic_CXX= +lt_prog_compiler_static_CXX= -+ + +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+ + +-*nto* | *qnx*) +- version_type=qnx +- 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='ldqnx.so' +- ;; + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-static' -+ -+ case $host_os in + +-openbsd*) +- version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" +- need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in +- openbsd2.[89] | openbsd2.[89].*) +- shlibpath_overrides_runpath=no + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then @@ -17238,18 +36430,117 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) -+ ;; -+ *) + ;; + *) +- shlibpath_overrides_runpath=yes + lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ esac -+ ;; + ;; + esac +- else +- shlibpath_overrides_runpath=yes +- fi +- ;; +- +-os2*) +- libname_spec='$name' +- shrext_cmds=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; +- +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; +- +-rdos*) +- dynamic_linker=no +- ;; +- +-solaris*) +- 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=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; +- +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; +- +-sysv4 | sysv4.3*) +- version_type=linux +- 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 +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no + ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + *) + lt_prog_compiler_pic_CXX='-fPIC' -+ ;; + ;; +- esac +- ;; +- +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi +- ;; +- +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- version_type=freebsd-elf +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then +- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + esac -+ else -+ case $host_os in + else +- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in +- sco3.2v5*) +- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + aix[4-9]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then @@ -17463,18 +36754,43 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + *) + lt_prog_compiler_can_build_shared_CXX=no -+ ;; -+ esac -+ fi -+ + ;; + esac + fi +- sys_lib_dlsearch_path_spec='/usr/lib' +- ;; + +-tpf*) +- # TPF is a cross-target only. Preferred cross-host = GNU/Linux. +- 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}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } -+ + +-uts4*) +- version_type=linux +- 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 +- ;; +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_CXX"; then -+ + +-*) +- dynamic_linker=no +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-$as_echo "$dynamic_linker" >&6; } +-test "$dynamic_linker" = no && can_build_shared=no +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then @@ -17493,11 +36809,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -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:__oline__: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13584: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 -+ echo "$as_me:__oline__: \$? = $ac_status" >&5 ++ echo "$as_me:13588: \$? = $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. @@ -17508,11 +36824,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + $rm conftest* -+ -+fi + +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } -+ + +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-fi +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; @@ -17521,8 +36845,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + lt_prog_compiler_pic_CXX= + lt_prog_compiler_can_build_shared_CXX=no -+fi -+ + fi + +fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: @@ -17533,7 +36857,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" + ;; +esac -+ + +# +# Check to make sure the static flag actually works. +# @@ -17564,18 +36888,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + $rm -r conftest* + LDFLAGS="$save_LDFLAGS" -+ + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } -+ + +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +fi -+ -+ + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then @@ -17587,7 +36911,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + cd conftest + mkdir out + 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 + # (2) before a word containing "conftest.", or (3) at the end. @@ -17597,11 +36921,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -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:__oline__: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13688: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 -+ echo "$as_me:__oline__: \$? = $ac_status" >&5 ++ echo "$as_me:13692: \$? = $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 @@ -17621,12 +36945,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + cd .. + rmdir conftest + $rm conftest* -+ + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } -+ -+ + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user @@ -17648,10 +36972,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + need_locks=no +fi -+ + +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+ + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix[4-9]*) @@ -17677,11 +37001,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -+ + +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } +test "$ld_shlibs_CXX" = no && can_build_shared=no -+ + +# +# Do we need to explicitly link libc? +# @@ -17689,7 +37013,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_CXX=yes -+ + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_CXX in + *'~'*) @@ -17703,7 +37027,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? @@ -17744,7 +37068,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + ;; +esac -+ + +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +library_names_spec= @@ -17760,24 +37084,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" -+ + +need_lib_prefix=unknown +hardcode_into_libs=no -+ + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown -+ + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH -+ + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; -+ + +aix[4-9]*) + version_type=linux + need_lib_prefix=no @@ -17821,19 +37145,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LIBPATH + fi + ;; -+ + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; -+ + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; -+ + +bsdi[45]*) + version_type=linux + need_version=no @@ -17847,13 +37171,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; -+ + +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no -+ + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' @@ -17868,7 +37192,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes -+ + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' @@ -17897,7 +37221,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; @@ -17906,7 +37230,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; -+ + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin @@ -17917,10 +37241,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ + + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; -+ + +dgux*) + version_type=linux + need_lib_prefix=no @@ -17929,22 +37253,124 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; -+ + +freebsd1*) + dynamic_linker=no + ;; -+ + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +-hardcode_action= +-if test -n "$hardcode_libdir_flag_spec" || +- test -n "$runpath_var" || +- test "X$hardcode_automatic" = "Xyes" ; then +- +- # We can hardcode non-existent directories. +- if test "$hardcode_direct" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && +- test "$hardcode_minus_L" != no; then +- # Linking always hardcodes the temporary library directory. +- hardcode_action=relink +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` -+ else + else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- hardcode_action=immediate + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac -+ fi + fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- hardcode_action=unsupported +-fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +-$as_echo "$hardcode_action" >&6; } +- +-if test "$hardcode_action" = relink || +- test "$inherit_rpath" = yes; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi +- +- +- +- +- +- +- if test "x$enable_dlopen" != xyes; then +- enable_dlopen=unknown +- enable_dlopen_self=unknown +- enable_dlopen_self_static=unknown +-else +- lt_cv_dlopen=no +- lt_cv_dlopen_libs= +- + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) @@ -17958,26 +37384,108 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in + case $host_os in +- beos*) +- lt_cv_dlopen="load_add_on" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes + freebsd2*) + shlibpath_overrides_runpath=yes -+ ;; + ;; +- +- mingw* | pw32* | cegcc*) +- lt_cv_dlopen="LoadLibrary" +- lt_cv_dlopen_libs= + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes -+ ;; + ;; +- +- cygwin*) +- lt_cv_dlopen="dlopen" +- lt_cv_dlopen_libs= + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes -+ ;; + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; -+ + +- darwin*) +- # if libdl is installed we need to link against it +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dl_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_dl_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +gnu*) + version_type=linux + need_lib_prefix=no @@ -17987,7 +37495,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; -+ + +- lt_cv_dlopen="dyld" +- lt_cv_dlopen_libs= +- lt_cv_dlopen_self=yes +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. @@ -18033,7 +37544,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; -+ + +-fi +interix[3-9]*) + version_type=linux + need_lib_prefix=no @@ -18045,7 +37557,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -+ + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; @@ -18063,8 +37575,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= -+ ;; -+ *) + ;; +- + *) +- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +-$as_echo_n "checking for shl_load... " >&6; } +-if test "${ac_cv_func_shl_load+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define shl_load innocuous_shl_load + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; @@ -18082,12 +37609,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; -+ + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shl_load (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -+ + +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux @@ -18102,13 +37638,27 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes -+ + +-#undef shl_load + # 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>/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 -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char shl_load (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_shl_load || defined __stub___shl_load +-choke me +-#endif + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, @@ -18117,7 +37667,40 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; -+ + +-int +-main () +-{ +-return shl_load (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_shl_load=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no @@ -18129,7 +37712,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; -+ + +- ac_cv_func_shl_load=no +-fi +netbsd*) + version_type=sunos + need_lib_prefix=no @@ -18147,14 +37732,76 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; -+ + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-$as_echo "$ac_cv_func_shl_load" >&6; } +-if test "x$ac_cv_func_shl_load" = x""yes; then +- lt_cv_dlopen="shl_load" +-else +- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-$as_echo_n "checking for shl_load in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_shl_load+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char shl_load (); +-int +-main () +-{ +-return shl_load (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dld_shl_load=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +nto-qnx*) + version_type=linux + need_lib_prefix=no @@ -18164,7 +37811,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -+ + +- ac_cv_lib_dld_shl_load=no +-fi +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" @@ -18190,7 +37839,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=yes + fi + ;; -+ + +-rm -rf conftest.dSYM +-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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 +-$as_echo_n "checking for dlopen... " >&6; } +-if test "${ac_cv_func_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define dlopen innocuous_dlopen +os2*) + libname_spec='$name' + shrext_cmds=".dll" @@ -18199,7 +37872,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; -+ + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dlopen (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no @@ -18210,11 +37887,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; -+ + +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +rdos*) + dynamic_linker=no + ;; -+ + +-#undef dlopen +solaris*) + version_type=linux + need_lib_prefix=no @@ -18227,7 +37910,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_dlopen || defined __stub___dlopen +-choke me +-#endif +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -18239,7 +37935,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + need_version=yes + ;; -+ + +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -18306,38 +38015,181 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +*) + dynamic_linker=no + ;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_dlopen=yes +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi -+ + +- ac_cv_func_dlopen=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-$as_echo "$ac_cv_func_dlopen" >&6; } +-if test "x$ac_cv_func_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } +-if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dl_dlopen=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ + +- ac_cv_lib_dl_dlopen=no +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ + fi + +-rm -rf conftest.dSYM +-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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-$as_echo_n "checking for dlopen in -lsvld... " >&6; } +-if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsvld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var_CXX" || \ + test "X$hardcode_automatic_CXX" = "Xyes" ; then -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_svld_dlopen=yes + # We can hardcode non-existant directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we @@ -18351,14 +38203,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_svld_dlopen=no + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported -+fi + fi +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6; } -+ + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported + enable_fast_install=no @@ -18366,9 +38226,69 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless -+fi -+ -+ + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +-else +- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +-$as_echo_n "checking for dld_link in -ldld... " >&6; } +-if test "${ac_cv_lib_dld_dld_link+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dld_link (); +-int +-main () +-{ +-return dld_link (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dld_dld_link=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_dld_dld_link=no +-fi +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are @@ -18450,240 +38370,510 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + done -+ + +-rm -rf conftest.dSYM +-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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then +- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" +-fi + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac -+ + +cfgfile="$ofile" -+ + +-fi + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ + +-fi +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL -+ + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared -+ + +-fi +# Whether or not to build static libraries. +build_old_libs=$enable_static -+ + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX -+ + +-fi +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX -+ + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install -+ + +-fi +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os -+ + +- ;; +- esac +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os -+ + +- if test "x$lt_cv_dlopen" != xno; then +- enable_dlopen=yes +- else +- enable_dlopen=no +- fi +# An echo program that does not interpret backslashes. +echo=$lt_echo -+ + +- case $lt_cv_dlopen in +- dlopen) +- save_CPPFLAGS="$CPPFLAGS" +- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS -+ + +- save_LDFLAGS="$LDFLAGS" +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" +# A C compiler. +LTCC=$lt_LTCC -+ + +- save_LIBS="$LIBS" +- LIBS="$lt_cv_dlopen_libs $LIBS" +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS -+ + +- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-$as_echo_n "checking whether a program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then : +- lt_cv_dlopen_self=cross +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext <<_LT_EOF +-#line 12769 "configure" +-#include "confdefs.h" +# A language-specific compiler. +CC=$lt_compiler_CXX -+ + +-#if HAVE_DLFCN_H +-#include <dlfcn.h> +-#endif +# Is the compiler the GNU C compiler? +with_gcc=$GCC_CXX -+ + +-#include <stdio.h> +# An ERE matcher. +EGREP=$lt_EGREP -+ + +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif +# The linker used to build libraries. +LD=$lt_LD_CXX -+ + +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif +# Whether we need hard or soft links. +LN_S=$lt_LN_S -+ + +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; +# A BSD-compatible nm program. +NM=$lt_NM -+ + +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- else +- puts (dlerror ()); +# A symbol stripping program +STRIP=$lt_STRIP -+ + +- return status; +-} +-_LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) >&5 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; +- x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; +- esac +- else : +- # compilation failed +- lt_cv_dlopen_self=no +- fi +-fi +-rm -fr conftest* +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD -+ + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" -+ + +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-$as_echo "$lt_cv_dlopen_self" >&6; } +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" -+ + +- if test "x$lt_cv_dlopen_self" = xyes; then +- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +-if test "${lt_cv_dlopen_self_static+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then : +- lt_cv_dlopen_self_static=cross +-else +- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 +- lt_status=$lt_dlunknown +- cat > conftest.$ac_ext <<_LT_EOF +-#line 12865 "configure" +-#include "confdefs.h" +# Used on cygwin: assembler. +AS="$AS" -+ + +-#if HAVE_DLFCN_H +-#include <dlfcn.h> +-#endif +# The name of the directory that contains temporary libtool files. +objdir=$objdir -+ + +-#include <stdio.h> +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -+ + +-#ifdef RTLD_GLOBAL +-# define LT_DLGLOBAL RTLD_GLOBAL +-#else +-# ifdef DL_GLOBAL +-# define LT_DLGLOBAL DL_GLOBAL +-# else +-# define LT_DLGLOBAL 0 +-# endif +-#endif +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX -+ + +-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we +- find out it does not work in some platform. */ +-#ifndef LT_DLLAZY_OR_NOW +-# ifdef RTLD_LAZY +-# define LT_DLLAZY_OR_NOW RTLD_LAZY +-# else +-# ifdef DL_LAZY +-# define LT_DLLAZY_OR_NOW DL_LAZY +-# else +-# ifdef RTLD_NOW +-# define LT_DLLAZY_OR_NOW RTLD_NOW +-# else +-# ifdef DL_NOW +-# define LT_DLLAZY_OR_NOW DL_NOW +-# else +-# define LT_DLLAZY_OR_NOW 0 +-# endif +-# endif +-# endif +-# endif +-#endif +# Object file suffix (normally "o"). +objext="$ac_objext" -+ + +-void fnord() { int i=42;} +-int main () +-{ +- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); +- int status = $lt_dlunknown; +# Old archive suffix (normally "a"). +libext="$libext" -+ + +- if (self) +- { +- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; +- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; +- /* dlclose (self); */ +- } +- else +- puts (dlerror ()); +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' -+ + +- return status; +-} +-_LT_EOF +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then +- (./conftest; exit; ) >&5 2>/dev/null +- lt_status=$? +- case x$lt_status in +- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; +- x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; +- esac +- else : +- # compilation failed +- lt_cv_dlopen_self_static=no +- fi +-fi +-rm -fr conftest* +# Executable file suffix (normally ""). +exeext="$exeext" -+ + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX +pic_mode=$pic_mode -+ + +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-$as_echo "$lt_cv_dlopen_self_static" >&6; } +- fi +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len -+ + +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +- ;; +- esac +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -+ + +- case $lt_cv_dlopen_self in +- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; +- *) enable_dlopen_self=unknown ;; +- esac +# Must we lock files when doing compilation? +need_locks=$lt_need_locks -+ + +- case $lt_cv_dlopen_self_static in +- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; +- *) enable_dlopen_self_static=unknown ;; +- esac +-fi +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix -+ + +# Do we need a version for libraries? +need_version=$need_version -+ + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen -+ + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self -+ + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static -+ + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX -+ + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -+ + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -+ + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX -+ + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX -+ + +# Library versioning type. +version_type=$version_type -+ + +# Format of library name prefix. +libname_spec=$lt_libname_spec -+ + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec -+ + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec -+ + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_CXX +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -+ + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX -+ + +-striplib= +-old_striplib= +-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-$as_echo_n "checking whether stripping libraries is possible... " >&6; } +-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- old_striplib="$STRIP -S" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- fi +- ;; +- *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- ;; +- esac +-fi +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds -+ + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX -+ + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib -+ + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_CXX -+ + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_CXX -+ + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_CXX -+ + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_CXX -+ + +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX -+ + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -+ + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method -+ + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd -+ + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX -+ + +- # Report which library types will actually be built +- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-$as_echo_n "checking if libtool supports shared libraries... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-$as_echo "$can_build_shared" >&6; } +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX -+ + +- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-$as_echo_n "checking whether to build shared libraries... " >&6; } +- test "$can_build_shared" = "no" && enable_shared=no +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds -+ + +- # On AIX, shared libraries and static libraries use the same namespace, and +- # are all built from PIC. +- case $host_os in +- aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval -+ + +- aix[4-9]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; +- esac +- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 +-$as_echo "$enable_shared" >&6; } +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + @@ -18748,7 +38938,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ + +- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-$as_echo_n "checking whether to build static libraries... " >&6; } +- # Make sure either enable_shared or enable_static is yes. +- test "$enable_shared" = yes || enable_static=yes +- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 +-$as_echo "$enable_static" >&6; } +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path + @@ -18766,12 +38962,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_CXX -+ + +# ### END LIBTOOL TAG CONFIG: $tagname -+ + +__EOF__ -+ -+ + + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the @@ -18780,15 +38976,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi -+fi + fi + + -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + +-CC="$lt_save_CC" +CC=$lt_save_CC +LDCXX=$LD +LD=$lt_save_LD @@ -18799,15 +38996,42 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +lt_cv_path_LD=$lt_save_path_LD +lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+ + + else + tagname="" + fi + ;; -+ + +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + F77) + if test -n "$F77" && test "X$F77" != "Xno"; then -+ + +-archive_cmds_need_lc_CXX=no +-allow_undefined_flag_CXX= +-always_export_symbols_CXX=no +-archive_expsym_cmds_CXX= +-compiler_needs_object_CXX=no +-export_dynamic_flag_spec_CXX= +-hardcode_direct_CXX=no +-hardcode_direct_absolute_CXX=no +-hardcode_libdir_flag_spec_CXX= +-hardcode_libdir_flag_spec_ld_CXX= +-hardcode_libdir_separator_CXX= +-hardcode_minus_L_CXX=no +-hardcode_shlibpath_var_CXX=unsupported +-hardcode_automatic_CXX=no +-inherit_rpath_CXX=no +-module_cmds_CXX= +-module_expsym_cmds_CXX= +-link_all_deplibs_CXX=unknown +-old_archive_cmds_CXX=$old_archive_cmds +-no_undefined_flag_CXX= +-whole_archive_flag_spec_CXX= +-enable_shared_with_static_runtimes_CXX=no +ac_ext=f +ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -18832,78 +39056,228 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +no_undefined_flag_F77= +whole_archive_flag_spec_F77= +enable_shared_with_static_runtimes_F77=no -+ + +-# Source file extension for C++ test sources. +-ac_ext=cpp +# Source file extension for f77 test sources. +ac_ext=f -+ + +-# Object file extension for compiled C++ test sources. +# Object file extension for compiled f77 test sources. -+objext=o + objext=o +-objext_CXX=$objext +- +-# No sense in running all these tests if we already determined that +-# the CXX compiler isn't working. Some variables (like enable_shared) +-# are currently assumed to apply to all compilers on this platform, +-# and will be corrupted by setting them based on a non-working compiler. +-if test "$_lt_caught_CXX_error" != yes; then +- # Code to be used in simple compile tests +- 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); }' +- +- # ltmain only uses $CC for tagged configurations so make sure $CC is set. +- +- +objext_F77=$objext -+ + +# Code to be used in simple compile tests +lt_simple_compile_test_code="\ + subroutine t + return + end +" -+ + +# Code to be used in simple link tests +lt_simple_link_test_code="\ + program t + end +" -+ + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ + + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} +@@ -13134,42 +14953,26 @@ + compiler=$CC + + +- # save warnings/boilerplate of simple test code +- ac_outfile=conftest.$ac_objext +# save warnings/boilerplate of simple test code +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` + 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* +$rm conftest* -+ + +- ac_outfile=conftest.$ac_objext +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` + 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 -r conftest* +$rm -r conftest* -+ -+ + + +- # Allow CC to be a program name with arguments. +- lt_save_CC=$CC +- lt_save_LD=$LD +- lt_save_GCC=$GCC +- GCC=$GXX +- lt_save_with_gnu_ld=$with_gnu_ld +- lt_save_path_LD=$lt_cv_path_LD +- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +- else +- $as_unset lt_cv_prog_gnu_ld +- fi +- if test -n "${lt_cv_path_LDCXX+set}"; then +- lt_cv_path_LD=$lt_cv_path_LDCXX +- else +- $as_unset lt_cv_path_LD +- fi +- test -z "${LDCXX+set}" || LD=$LDCXX +- CC=${CXX-"c++"} +- compiler=$CC +- compiler_CXX=$CC +- for cc_temp in $compiler""; do +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +CC=${F77-"f77"} +compiler=$CC +compiler_F77=$CC +for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +@@ -13177,5338 +14980,5852 @@ + *) break;; + esac + done +-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +- +- +- if test -n "$compiler"; then +- # We don't want -fno-exception when compiling C++ code, so set the +- # no_builtin_flag separately +- if test "$GXX" = yes; then +- lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' +- else +- lt_prog_compiler_no_builtin_flag_CXX= +- fi +- +- if test "$GXX" = yes; then +- # Set up default GNU C++ configuration +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ + + +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -+ + +-# Check whether --with-gnu-ld was given. +-if test "${with_gnu_ld+set}" = set; then +- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +-else +- with_gnu_ld=no +-fi +- +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-$as_echo_n "checking for ld used by $CC... " >&6; } +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [\\/]* | ?:[\\/]*) +- re_direlt='/[^/][^/]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` +- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 +-$as_echo_n "checking for GNU ld... " >&6; } +-else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-$as_echo_n "checking for non-GNU ld... " >&6; } +-fi +-if test "${lt_cv_path_LD+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -z "$LD"; then +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$lt_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- lt_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in +- *GNU* | *'with BFD'*) +- test "$with_gnu_ld" != no && break +- ;; +- *) +- test "$with_gnu_ld" != yes && break +- ;; +- esac +- fi +- done +- IFS="$lt_save_ifs" +-else +- lt_cv_path_LD="$LD" # Let the user override the test with a path. +-fi +-fi +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } +test "$can_build_shared" = "no" && enable_shared=no -+ + +-LD="$lt_cv_path_LD" +-if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 +-$as_echo "$LD" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +- { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-if test "${lt_cv_prog_gnu_ld+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- # I'd rather use --version here, but apparently some GNU lds only accept -v. +-case `$LD -v 2>&1 </dev/null` in +-*GNU* | *'with BFD'*) +- lt_cv_prog_gnu_ld=yes +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case $host_os in @@ -18913,16 +39287,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi -+ ;; + ;; +-*) +- lt_cv_prog_gnu_ld=no +aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi -+ ;; -+esac + ;; + esac +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +-$as_echo "$lt_cv_prog_gnu_ld" >&6; } +-with_gnu_ld=$lt_cv_prog_gnu_ld +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -+ + +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } +# Make sure either enable_shared or enable_static is yes. @@ -18936,14 +39316,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +lt_prog_compiler_wl_F77= +lt_prog_compiler_pic_F77= +lt_prog_compiler_static_F77= -+ + +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+ + + if test "$GCC" = yes; then + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_static_F77='-static' -+ + + case $host_os in + aix*) + # All AIX code is PIC. @@ -18952,18 +39332,42 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_static_F77='-Bstatic' + fi + ;; -+ + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; -+ + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; -+ + +- # Check if GNU C++ uses GNU ld as the underlying linker, since the +- # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- +- # If archive_cmds runs LD, not CC, wlarc should be empty +- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to +- # investigate it a little bit more. (MM) +- wlarc='${wl}' +- +- # ancient GNU ld didn't support --whole-archive et. al. +- if eval "`$CC -print-prog-name=ld` --help 2>&1" | +- $GREP 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec_CXX= +- fi +- else +- with_gnu_ld=no +- wlarc= + 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). @@ -18971,31 +39375,79 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # (--disable-auto-import) libraries + lt_prog_compiler_pic_F77='-DDLL_EXPORT' + ;; -+ + +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- fi + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_F77='-fno-common' + ;; -+ + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; -+ + +- else +- GXX=no +- with_gnu_ld=no +- wlarc= +- fi + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared_F77=no + enable_shared=no + ;; -+ + +- # PORTME: fill in a description of your system's C++ link characteristics +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } +- ld_shlibs_CXX=yes +- case $host_os in +- aix3*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- aix[4-9]*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_F77=-Kconform_pic + fi + ;; -+ + +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done +- ;; +- esac + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. @@ -19008,7 +39460,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi + *) + lt_prog_compiler_pic_F77='-fPIC' + ;; @@ -19035,13 +39490,82 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- archive_cmds_CXX='' +- hardcode_direct_CXX=yes +- hardcode_direct_absolute_CXX=yes +- hardcode_libdir_separator_CXX=':' +- link_all_deplibs_CXX=yes +- file_list_spec_CXX='${wl}-f,' +- +- if test "$GXX" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && +- strings "$collect2name" | $GREP resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- : +- else +- # We have old collect2 +- hardcode_direct_CXX=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- hardcode_minus_L_CXX=yes +- hardcode_libdir_flag_spec_CXX='-L$libdir' +- hardcode_libdir_separator_CXX= +- fi +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi + 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' + ;; -+ + +- export_dynamic_flag_spec_CXX='${wl}-bexpall' +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to +- # export. +- always_export_symbols_CXX=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- allow_undefined_flag_CXX='-berok' +- # Determine the default libpath from the value encoded in an empty +- # executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl_F77='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but @@ -19057,18 +39581,61 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static_F77='${wl}-a ${wl}archive' + ;; -+ + +-int +-main () +-{ + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl_F77='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static_F77='-non_shared' + ;; -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then + newsos6) + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; -+ + +-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 "$lt_aix_libpath_sed"` +-fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) @@ -19106,17 +39673,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl_F77='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static_F77='-non_shared' + ;; -+ + +-fi + rdos*) + lt_prog_compiler_static_F77='-non_shared' + ;; -+ + +-rm -rf conftest.dSYM +-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 + solaris*) + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' @@ -19127,56 +39699,144 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_wl_F77='-Wl,';; + esac + ;; -+ + +- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + sunos4*) + lt_prog_compiler_wl_F77='-Qoption ld ' + lt_prog_compiler_pic_F77='-PIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; -+ + +- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' +- allow_undefined_flag_CXX="-z nodefs" +- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an +- # empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; -+ + +-int +-main () +-{ + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic_F77='-Kconform_pic' + lt_prog_compiler_static_F77='-Bstatic' + fi + ;; -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; -+ + +-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 "$lt_aix_libpath_sed"` +-fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + unicos*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_can_build_shared_F77=no + ;; -+ + + uts4*) + lt_prog_compiler_pic_F77='-pic' + lt_prog_compiler_static_F77='-Bstatic' + ;; -+ + +-fi + *) + lt_prog_compiler_can_build_shared_F77=no + ;; + esac + fi -+ + +-rm -rf conftest.dSYM +-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 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } -+ + +- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- no_undefined_flag_CXX=' ${wl}-bernotok' +- allow_undefined_flag_CXX=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_CXX='$convenience' +- archive_cmds_need_lc_CXX=yes +- # This is similar to how AIX traditionally builds its shared +- # libraries. +- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_F77"; then -+ + +- beos*) +- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- allow_undefined_flag_CXX=unsupported +- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- ld_shlibs_CXX=no +- fi +- ;; +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then @@ -19195,11 +39855,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -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:__oline__: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15286: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 -+ echo "$as_me:__oline__: \$? = $ac_status" >&5 ++ echo "$as_me:15290: \$? = $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. @@ -19210,11 +39870,66 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + $rm conftest* -+ + +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } -+ + +- cygwin* | mingw* | pw32* | cegcc*) +- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, +- # as there is no search path for DLLs. +- hardcode_libdir_flag_spec_CXX='-L$libdir' +- allow_undefined_flag_CXX=unsupported +- always_export_symbols_CXX=no +- enable_shared_with_static_runtimes_CXX=yes +- +- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- ld_shlibs_CXX=no +- fi +- ;; +- darwin* | rhapsody*) +- +- +- archive_cmds_need_lc_CXX=no +- hardcode_direct_CXX=no +- hardcode_automatic_CXX=yes +- hardcode_shlibpath_var_CXX=unsupported +- whole_archive_flag_spec_CXX='' +- link_all_deplibs_CXX=yes +- allow_undefined_flag_CXX="$_lt_dar_allow_undefined" +- case $cc_basename in +- ifort*) _lt_dar_can_shared=yes ;; +- *) _lt_dar_can_shared=$GCC ;; +- esac +- if test "$_lt_dar_can_shared" = "yes"; then +- output_verbose_link_cmd=echo +- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- if test "$lt_cv_apple_cc_single_mod" != "yes"; then +- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +- fi +if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in + "" | " "*) ;; @@ -19224,7 +39939,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_pic_F77= + lt_prog_compiler_can_build_shared_F77=no +fi -+ + +- else +- ld_shlibs_CXX=no +- fi +fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: @@ -19235,7 +39953,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" + ;; +esac -+ + +- ;; +# +# Check to make sure the static flag actually works. +# @@ -19266,18 +39985,48 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + $rm -r conftest* + LDFLAGS="$save_LDFLAGS" -+ + +- dgux*) +- case $cc_basename in +- ec++*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } -+ + +- freebsd[12]*) +- # C++ shared libraries reported to be fairly broken before +- # switch to ELF +- ld_shlibs_CXX=no +- ;; +if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then + : +else + lt_prog_compiler_static_F77= +fi -+ -+ + +- freebsd-elf*) +- archive_cmds_need_lc_CXX=no +- ;; + +- freebsd* | dragonfly*) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- ld_shlibs_CXX=yes +- ;; +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then @@ -19289,7 +40038,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ + +- gnu*) +- ;; + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. @@ -19299,11 +40050,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -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:__oline__: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15390: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 -+ echo "$as_me:__oline__: \$? = $ac_status" >&5 ++ echo "$as_me:15394: \$? = $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 @@ -19323,12 +40074,123 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + cd .. + rmdir conftest + $rm conftest* -+ + +- hpux9*) +- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- export_dynamic_flag_spec_CXX='${wl}-E' +- hardcode_direct_CXX=yes +- hardcode_minus_L_CXX=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- aCC*) +- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' +- ;; +- *) +- if test "$GXX" = yes; then +- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- fi +- ;; +- esac +- ;; +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } -+ -+ + +- hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_CXX=: + +- case $host_cpu in +- hppa*64*|ia64*) +- ;; +- *) +- export_dynamic_flag_spec_CXX='${wl}-E' +- ;; +- esac +- fi +- case $host_cpu in +- hppa*64*|ia64*) +- hardcode_direct_CXX=no +- hardcode_shlibpath_var_CXX=no +- ;; +- *) +- hardcode_direct_CXX=yes +- hardcode_direct_absolute_CXX=yes +- hardcode_minus_L_CXX=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- esac +- +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- aCC*) +- case $host_cpu in +- hppa*64*) +- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' +- ;; +- *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then +- case $host_cpu in +- hppa*64*) +- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- fi +- else +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- fi +- ;; +- esac +- ;; +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user @@ -19350,10 +40212,130 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + need_locks=no +fi -+ + +- interix[3-9]*) +- hardcode_direct_CXX=no +- hardcode_shlibpath_var_CXX=no +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_CXX='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- archive_expsym_cmds_CXX='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' +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC*) +- # SGI C++ +- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- +- # Archives containing C++ object files must be created using +- # "CC -ar", where "CC" is the IRIX C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' +- ;; +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' +- fi +- fi +- link_all_deplibs_CXX=yes +- ;; +- esac +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- inherit_rpath_CXX=yes +- ;; +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+ + +- linux* | k*bsd*-gnu) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' +- ;; +- icpc* | ecpc* ) +- # Intel C++ +- with_gnu_ld=yes +- # version 8.0 and above of icpc choke on multiply defined symbols +- # if we add $predep_objects and $postdep_objects, however 7.1 and +- # earlier do not add the objects themselves. +- case `$CC -V 2>&1` in +- *"Version 7."*) +- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- *) # Version 8.0 or newer +- tmp_idyn= +- case $host_cpu in +- ia64*) tmp_idyn=' -i_dynamic';; +- esac +- archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- esac +- archive_cmds_need_lc_CXX=no +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +- ;; +- pgCC* | pgcpp*) +- # Portland Group C++ compiler +- case `$CC -V` in +- *pgCC\ [1-5]* | *pgcpp\ [1-5]*) +- prelink_cmds_CXX='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ +- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' +- old_archive_cmds_CXX='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ +- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ +- $RANLIB $oldlib' +- archive_cmds_CXX='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- archive_expsym_cmds_CXX='tpldir=Template.dir~ +- rm -rf $tpldir~ +- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ +- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +- ;; +- *) # Version 6 will use weak symbols +- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +- ;; +- esac + runpath_var= + allow_undefined_flag_F77= + enable_shared_with_static_runtimes_F77=no @@ -19401,7 +40383,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ + +- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' +- ;; +- cxx*) +- # Compaq C++ +- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time @@ -19419,12 +40409,63 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + with_gnu_ld=no + ;; + esac -+ + +- runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec_CXX='-rpath $libdir' +- hardcode_libdir_separator_CXX=: + ld_shlibs_F77=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' -+ + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' +- ;; +- xl*) +- # IBM XL 8.0 on PPC, with GNU ld +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- if test "x$supports_anon_versioning" = xyes; then +- archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ +- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ +- echo "local: *; };" >> $output_objdir/$libname.ver~ +- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi +- ;; +- *) +- 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' +- compiler_needs_object_CXX=yes +- +- # 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 +- ;; + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. @@ -19445,7 +40486,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac -+ + +- lynxos*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) @@ -19453,17 +40498,44 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$host_cpu" != ia64; then + ld_shlibs_F77=no + cat <<EOF 1>&2 -+ + +- m88k*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. -+ + +- mvs*) +- case $cc_basename in +- cxx*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +EOF + fi + ;; -+ + +- netbsd*) +- 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= +- hardcode_libdir_flag_spec_CXX='-R$libdir' +- hardcode_direct_CXX=yes +- hardcode_shlibpath_var_CXX=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; + amigaos*) + archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_F77='-L$libdir' @@ -19477,7 +40549,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # them. + ld_shlibs_F77=no + ;; -+ + +- *nto* | *qnx*) +- ld_shlibs_CXX=yes +- ;; + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_F77=unsupported @@ -19488,7 +40563,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_F77=no + fi + ;; -+ + +- openbsd2*) +- # C++ shared libraries are fairly broken +- ld_shlibs_CXX=no +- ;; + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, + # as there is no search path for DLLs. @@ -19497,14 +40576,73 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + 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/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ + +- openbsd*) +- if test -f /usr/libexec/ld.so; then +- hardcode_direct_CXX=yes +- hardcode_shlibpath_var_CXX=no +- hardcode_direct_absolute_CXX=yes +- 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 + 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' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; -+ else + else +- ld_shlibs_CXX=no +- fi +- ;; +- +- osf3* | osf4* | osf5*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- hardcode_libdir_separator_CXX=: +- +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- case $host in +- osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; +- *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; +- esac +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- cxx*) +- case $host in +- osf3*) +- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- ;; +- *) +- allow_undefined_flag_CXX=' -expect_unresolved \*' +- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ +- $RM $lib.exp' +- hardcode_libdir_flag_spec_CXX='-rpath $libdir' +- ;; +- esac + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ @@ -19513,7 +40651,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_F77=no + fi + ;; -+ + +- hardcode_libdir_separator_CXX=: + interix[3-9]*) + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no @@ -19528,7 +40667,44 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + 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' + ;; -+ + +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' +- case $host in +- osf3*) +- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- ;; +- *) +- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- ;; +- esac +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- fi +- ;; +- esac +- ;; + gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= @@ -19557,7 +40733,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + tmp_sharedflag='-shared' ;; + esac + archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ + +- psos*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; + 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~ @@ -19569,7 +40749,25 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_F77=no + fi + ;; -+ + +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- lcc*) +- # Lucid +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -19579,19 +40777,51 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; -+ + +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- archive_cmds_need_lc_CXX=yes +- 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='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' +- +- hardcode_libdir_flag_spec_CXX='-R$libdir' +- hardcode_shlibpath_var_CXX=no +- case $host_os in +- solaris2.[0-5] | solaris2.[0-5].*) ;; +- *) +- # 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='-z allextract$convenience -z defaultextract' +- ;; +- esac +- link_all_deplibs_CXX=yes + solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs_F77=no + cat <<EOF 1>&2 -+ + +- output_verbose_link_cmd='echo' +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -+ + +- # 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' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -19600,23 +40830,76 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_F77=no + fi + ;; -+ + +- # The C++ compiler must be used to create the archive. +- old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +- ;; +- *) +- # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- no_undefined_flag_CXX=' ${wl}-z ${wl}defs' +- if $CC --version | $GREP -v '^2\.7' > /dev/null; then +- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' +- 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 +- ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_F77=no + cat <<_LT_EOF 1>&2 -+ + +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) +- no_undefined_flag_CXX='${wl}-z,text' +- archive_cmds_need_lc_CXX=no +- hardcode_shlibpath_var_CXX=no +- runpath_var='LD_RUN_PATH' +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -+ + +- case $cc_basename in +- CC*) +- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +_LT_EOF + ;; -+ *) + *) +- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' @@ -19625,16 +40908,42 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_F77=no + fi + ;; -+ esac -+ ;; -+ + esac + ;; + +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- no_undefined_flag_CXX='${wl}-z,text' +- allow_undefined_flag_CXX='${wl}-z,nodefs' +- archive_cmds_need_lc_CXX=no +- hardcode_shlibpath_var_CXX=no +- hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' +- hardcode_libdir_separator_CXX=':' +- link_all_deplibs_CXX=yes +- export_dynamic_flag_spec_CXX='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' + sunos4*) + archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; -+ + +- case $cc_basename in +- CC*) +- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -19642,9 +40951,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + else + ld_shlibs_F77=no + fi -+ ;; + ;; + esac -+ + +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; + if test "$ld_shlibs_F77" = no; then + runpath_var= + hardcode_libdir_flag_spec_F77= @@ -19667,7 +40989,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct_F77=unsupported + fi + ;; -+ + +- vxworks*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't @@ -19684,7 +41010,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no -+ + +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. @@ -19697,22 +41028,58 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + done + ;; + esac -+ + +- { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-$as_echo "$ld_shlibs_CXX" >&6; } +- test "$ld_shlibs_CXX" = no && can_build_shared=no +- +- GCC_CXX="$GXX" +- LD_CXX="$LD" +- +- ## CAVEAT EMPTOR: +- ## There is no encapsulation within the following macros, do not change +- ## the running order or otherwise move them around unless you know exactly +- ## what you are doing... +- # Dependencies to place before and after the object being linked: +-predep_objects_CXX= +-postdep_objects_CXX= +-predeps_CXX= +-postdeps_CXX= +-compiler_lib_search_path_CXX= + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -+ + +-cat > conftest.$ac_ext <<_LT_EOF +-class Foo +-{ +-public: +- Foo (void) { a = 0; } +-private: +- int a; +-}; +-_LT_EOF + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ + +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- # Parse the compiler output and extract the necessary +- # objects, libraries and library flags. + archive_cmds_F77='' + hardcode_direct_F77=yes + hardcode_libdir_separator_F77=':' + link_all_deplibs_F77=yes -+ + +- # Sentinel used to keep track of whether or not we are before +- # the conftest object file. +- pre_test_object_deps_done=no + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check @@ -19753,7 +41120,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + fi -+ + +- for p in `eval "$output_verbose_link_cmd"`; do +- case $p in + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_F77=yes @@ -19764,7 +41133,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF + program main -+ + +- -L* | -R* | -l*) +- # Some compilers place space between "-{L,R}" and the path. +- # Remove the space. +- if test $p = "-L" || +- test $p = "-R"; then +- prev=$p +- continue +- else +- prev= +- fi + end +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext @@ -19785,7 +41164,30 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ + +- if test "$pre_test_object_deps_done" = no; then +- case $p in +- -L* | -R*) +- # Internal compiler library paths should come after those +- # provided the user. The postdeps already come after the +- # user supplied libs so there is no need to process them. +- if test -z "$compiler_lib_search_path_CXX"; then +- compiler_lib_search_path_CXX="${prev}${p}" +- else +- compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" +- fi +- ;; +- # The "-l" case would never come before the object being +- # linked, so don't bother handling this case. +- esac +- else +- if test -z "$postdeps_CXX"; then +- postdeps_CXX="${prev}${p}" +- else +- postdeps_CXX="${postdeps_CXX} ${prev}${p}" +- fi +- fi +- ;; +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { @@ -19801,14 +41203,38 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + +- *.$objext) +- # This assumes that the test object file only shows up +- # once in the compiler output. +- if test "$p" = "conftest.$objext"; then +- pre_test_object_deps_done=yes +- continue +- fi + +- if test "$pre_test_object_deps_done" = no; then +- if test -z "$predep_objects_CXX"; then +- predep_objects_CXX="$p" +- else +- predep_objects_CXX="$predep_objects_CXX $p" +- fi +- else +- if test -z "$postdep_objects_CXX"; then +- postdep_objects_CXX="$p" +- else +- postdep_objects_CXX="$postdep_objects_CXX $p" +- fi +- fi +- ;; +fi -+ + +- *) ;; # Ignore the rest. +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 -+ + +- esac +- done + hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else @@ -19820,7 +41246,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF + program main -+ + +- # Clean up. +- rm -f a.out a.exe +-else +- echo "libtool.m4: error: problem compiling CXX test program" + end +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext @@ -19841,7 +41271,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ ++ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { @@ -19853,18 +41283,39 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# 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 "$lt_aix_libpath_sed"` -+fi + fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + +-$RM -f confest.$objext + +-# PORTME: override above test on systems where it is broken +-case $host_os in +-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= +- postdep_objects_CXX= +- postdeps_CXX= +- ;; +fi -+ + +-linux*) +- case `$CC -V 2>&1 | sed 5q` in +- *Sun\ C*) +- # Sun C++ 5.9 +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 -+ + +- # 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 + hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. @@ -19877,8 +41328,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi -+ ;; -+ + ;; +- esac + +- if test "$solaris_use_stlport4" != yes; then +- postdeps_CXX='-library=Cstd -library=Crun' +- fi +- ;; +- esac +- ;; + amigaos*) + archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_F77='-L$libdir' @@ -19886,11 +41344,51 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # see comment about different semantics on the GNU ld section + ld_shlibs_F77=no + ;; -+ + +-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 + bsdi[45]*) + export_dynamic_flag_spec_F77=-rdynamic -+ ;; -+ + ;; +- 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. +- if test "$solaris_use_stlport4" != yes; then +- postdeps_CXX='-library=Cstd -library=Crun' +- fi +- ;; +- esac +- ;; +-esac +- +- +-case " $postdeps_CXX " in +-*" -lc "*) archive_cmds_need_lc_CXX=no ;; +-esac +- compiler_lib_search_dirs_CXX= +-if test -n "${compiler_lib_search_path_CXX}"; then +- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +-fi +- +- +- +- +- +- +- +- +- + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. @@ -19911,7 +41409,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fix_srcfile_path_F77='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_F77=yes + ;; -+ + + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[012]) @@ -19960,17 +41458,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + fi + ;; -+ + + dgux*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_shlibpath_var_F77=no + ;; -+ + + freebsd1*) + ld_shlibs_F77=no + ;; -+ + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little @@ -19981,7 +41479,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; -+ + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' @@ -19989,7 +41487,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_minus_L_F77=yes + hardcode_shlibpath_var_F77=no + ;; -+ + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' @@ -19997,7 +41495,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; -+ + + hpux9*) + if test "$GCC" = yes; then + archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' @@ -20007,13 +41505,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + hardcode_direct_F77=yes -+ + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' + ;; -+ + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -20023,16 +41521,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: -+ + + hardcode_direct_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' -+ + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + fi + ;; -+ + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in @@ -20062,7 +41560,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: -+ + + case $host_cpu in + hppa*64*|ia64*) + hardcode_libdir_flag_spec_ld_F77='+b $libdir' @@ -20072,7 +41570,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *) + hardcode_direct_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' -+ + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes @@ -20080,7 +41578,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + fi + ;; -+ + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' @@ -20092,7 +41590,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_separator_F77=: + link_all_deplibs_F77=yes + ;; -+ + + 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 @@ -20103,7 +41601,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; -+ + + newsos6) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes @@ -20111,7 +41609,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_separator_F77=: + hardcode_shlibpath_var_F77=no + ;; -+ + + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct_F77=yes @@ -20137,7 +41635,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_F77=no + fi + ;; -+ + + os2*) + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes @@ -20145,7 +41643,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; -+ + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' @@ -20157,7 +41655,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_F77=: + ;; -+ + +- lt_prog_compiler_wl_CXX= +-lt_prog_compiler_pic_CXX= +-lt_prog_compiler_static_CXX= + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' @@ -20168,13 +41669,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+ + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec_F77='-rpath $libdir' + fi + hardcode_libdir_separator_F77=: + ;; -+ + +- # C++ specific cases for pic, static, wl, etc. +- if test "$GXX" = yes; then +- lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_static_CXX='-static' + solaris*) + no_undefined_flag_F77=' -z text' + if test "$GCC" = yes; then @@ -20206,7 +41713,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + link_all_deplibs_F77=yes + ;; -+ + +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_CXX='-Bstatic' + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o @@ -20214,13 +41727,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi + fi + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_direct_F77=yes + hardcode_minus_L_F77=yes + hardcode_shlibpath_var_F77=no -+ ;; -+ + ;; + +- amigaos*) +- case $host_cpu in +- powerpc) +- # see comment about AmigaOS4 .so support +- lt_prog_compiler_pic_CXX='-fPIC' +- ;; +- m68k) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + sysv4) + case $host_vendor in + sni) @@ -20233,31 +41757,65 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds_F77='$CC -r -o $output$reload_objs' + hardcode_direct_F77=no -+ ;; + ;; + motorola) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie + ;; -+ esac + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_F77=no -+ ;; -+ + ;; + +- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; +- mingw* | cygwin* | os2* | pw32* | cegcc*) +- # 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*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- lt_prog_compiler_pic_CXX='-fno-common' +- ;; +- *djgpp*) +- # DJGPP does not support shared libraries at all +- lt_prog_compiler_pic_CXX= +- ;; +- interix[3-9]*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. + sysv4.3*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_F77=no + export_dynamic_flag_spec_F77='-Bexport' -+ ;; + ;; + -+ sysv4*MP*) -+ if test -d /usr/nec; then + sysv4*MP*) + if test -d /usr/nec; then +- lt_prog_compiler_pic_CXX=-Kconform_pic + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_F77=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs_F77=yes -+ fi -+ ;; + fi + ;; +- hpux*) +- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit +- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag +- # sets the default TLS model and affects inlining. +- case $host_cpu in +- hppa*64*) +- ;; +- *) +- lt_prog_compiler_pic_CXX='-fPIC' +- ;; +- esac + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_F77='${wl}-z,text' @@ -20298,15 +41856,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi -+ ;; + ;; +- *qnx* | *nto*) +- # QNX uses GNU C++, but need to define -shared option too, otherwise +- # it will coredump. +- lt_prog_compiler_pic_CXX='-fPIC -shared' + + uts4*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_shlibpath_var_F77=no -+ ;; + ;; + -+ *) + *) +- lt_prog_compiler_pic_CXX='-fPIC' + ld_shlibs_F77=no + ;; + esac @@ -20373,8 +41936,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + $rm conftest* + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } -+ ;; -+ esac + ;; + esac + fi + ;; +esac @@ -20421,13 +41984,235 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH -+ else + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. -+ case $host_os in + case $host_os in +- aix[4-9]*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_CXX='-Bstatic' +- else +- lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- chorus*) +- case $cc_basename in +- cxch68*) +- # Green Hills C++ Compiler +- # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" +- ;; +- esac +- ;; +- dgux*) +- case $cc_basename in +- ec++*) +- lt_prog_compiler_pic_CXX='-KPIC' +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- lt_prog_compiler_pic_CXX='-pic' +- ;; +- *) +- ;; +- esac +- ;; +- freebsd* | dragonfly*) +- # FreeBSD uses GNU C++ +- ;; +- hpux9* | hpux10* | hpux11*) +- case $cc_basename in +- CC*) +- lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' +- if test "$host_cpu" != ia64; then +- lt_prog_compiler_pic_CXX='+Z' +- fi +- ;; +- aCC*) +- lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic_CXX='+Z' +- ;; +- esac +- ;; +- *) +- ;; +- esac +- ;; +- interix*) +- # This is c89, which is MS Visual C++ (no shared libs) +- # Anyone wants to do a port? +- ;; +- irix5* | irix6* | nonstopux*) +- case $cc_basename in +- CC*) +- lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_static_CXX='-non_shared' +- # CC pic flag -KPIC is the default. +- ;; +- *) +- ;; +- esac +- ;; +- linux* | k*bsd*-gnu) +- case $cc_basename in +- KCC*) +- # KAI C++ Compiler +- lt_prog_compiler_wl_CXX='--backend -Wl,' +- lt_prog_compiler_pic_CXX='-fPIC' +- ;; +- ecpc* ) +- # old Intel C++ for x86_64 which still supported -KPIC. +- lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_pic_CXX='-KPIC' +- lt_prog_compiler_static_CXX='-static' +- ;; +- icpc* ) +- # Intel C++, used to be incompatible with GCC. +- # ICC 10 doesn't accept -KPIC any more. +- lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_pic_CXX='-fPIC' +- lt_prog_compiler_static_CXX='-static' +- ;; +- pgCC* | pgcpp*) +- # Portland Group C++ compiler +- lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_pic_CXX='-fpic' +- lt_prog_compiler_static_CXX='-Bstatic' +- ;; +- cxx*) +- # Compaq C++ +- # Make sure the PIC flag is empty. It appears that all Alpha +- # Linux and Compaq Tru64 Unix objects are PIC. +- lt_prog_compiler_pic_CXX= +- lt_prog_compiler_static_CXX='-non_shared' +- ;; +- xlc* | xlC*) +- # IBM XL 8.0 on PPC +- lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_pic_CXX='-qpic' +- lt_prog_compiler_static_CXX='-qstaticlink' +- ;; +- *) +- 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 +- ;; +- lynxos*) +- ;; +- m88k*) +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- lt_prog_compiler_pic_CXX='-W c,exportall' +- ;; +- *) +- ;; +- esac +- ;; +- netbsd*) +- ;; +- *qnx* | *nto*) +- # QNX uses GNU C++, but need to define -shared option too, otherwise +- # it will coredump. +- lt_prog_compiler_pic_CXX='-fPIC -shared' +- ;; +- osf3* | osf4* | osf5*) +- case $cc_basename in +- KCC*) +- lt_prog_compiler_wl_CXX='--backend -Wl,' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- lt_prog_compiler_pic_CXX='-pic' +- ;; +- cxx*) +- # Digital/Compaq C++ +- lt_prog_compiler_wl_CXX='-Wl,' +- # Make sure the PIC flag is empty. It appears that all Alpha +- # Linux and Compaq Tru64 Unix objects are PIC. +- lt_prog_compiler_pic_CXX= +- lt_prog_compiler_static_CXX='-non_shared' +- ;; +- *) +- ;; +- esac +- ;; +- psos*) +- ;; +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- lt_prog_compiler_pic_CXX='-KPIC' +- lt_prog_compiler_static_CXX='-Bstatic' +- lt_prog_compiler_wl_CXX='-Qoption ld ' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- lt_prog_compiler_pic_CXX='-PIC' +- ;; +- *) +- ;; +- esac +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- lt_prog_compiler_pic_CXX='-pic' +- lt_prog_compiler_static_CXX='-Bstatic' +- ;; +- lcc*) +- # Lucid +- lt_prog_compiler_pic_CXX='-pic' +- ;; +- *) +- ;; +- esac +- ;; +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- case $cc_basename in +- CC*) +- lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_pic_CXX='-KPIC' +- lt_prog_compiler_static_CXX='-Bstatic' +- ;; +- esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- lt_prog_compiler_pic_CXX='-KPIC' +- ;; +- *) +- ;; +- esac +- ;; +- vxworks*) +- ;; +- *) +- lt_prog_compiler_can_build_shared_CXX=no +- ;; + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' @@ -20437,7 +42222,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + can_build_shared=no + fi + ;; -+ esac + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. @@ -20453,21 +42238,32 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH -+ fi + fi + ;; -+ + +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic_CXX= +- ;; +- *) +- lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +-$as_echo "$lt_prog_compiler_pic_CXX" >&6; } +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; -+ + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; -+ + +bsdi[45]*) + version_type=linux + need_version=no @@ -20481,13 +42277,63 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; -+ + +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$lt_prog_compiler_pic_CXX"; then +- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_pic_works_CXX=no +- ac_outfile=conftest.$ac_objext +- 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. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:14885: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:14889: \$? = $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. +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_pic_works_CXX=yes +- fi +- fi +- $RM conftest* +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no -+ + +-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then +- case $lt_prog_compiler_pic_CXX in +- "" | " "*) ;; +- *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; +- esac +-else +- lt_prog_compiler_pic_CXX= +- lt_prog_compiler_can_build_shared_CXX=no +-fi + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' @@ -20502,7 +42348,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes -+ + +-fi + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' @@ -20531,7 +42378,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; @@ -20540,7 +42387,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; -+ + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin @@ -20551,10 +42398,43 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ + +-# +-# Check to make sure the static flag actually works. +-# +-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_static_works_CXX=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- 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 +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&5 +- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_static_works_CXX=yes +- fi +- else +- lt_cv_prog_compiler_static_works_CXX=yes +- fi +- fi +- $RM -r conftest* +- LDFLAGS="$save_LDFLAGS" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; -+ + +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } +dgux*) + version_type=linux + need_lib_prefix=no @@ -20563,11 +42443,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; -+ + +-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then +- : +-else +- lt_prog_compiler_static_CXX= +-fi +freebsd1*) + dynamic_linker=no + ;; -+ + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. @@ -20611,7 +42496,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +gnu*) + version_type=linux + need_lib_prefix=no @@ -20621,7 +42506,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; -+ + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. @@ -20667,7 +42552,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; -+ + +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_c_o_CXX=no +- $RM -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext +interix[3-9]*) + version_type=linux + need_lib_prefix=no @@ -20679,7 +42575,58 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -+ + +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:14984: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&5 +- echo "$as_me:14988: \$? = $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 +- # So say no if there are warnings +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_c_o_CXX=yes +- fi +- fi +- chmod u+w . 2>&5 +- $RM conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files +- $RM out/* && rmdir out +- cd .. +- $RM -r conftest +- $RM conftest* +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } +- +- +- +- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_c_o_CXX=no +- $RM -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; @@ -20716,12 +42663,48 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; -+ + +- lt_compiler_flag="-o out/conftest2.$ac_objext" +- # Insert the option either (1) after the last *FLAGS variable, or +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:15036: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&5 +- echo "$as_me:15040: \$? = $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 +- # So say no if there are warnings +- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_c_o_CXX=yes +- fi +- fi +- chmod u+w . 2>&5 +- $RM conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files +- $RM out/* && rmdir out +- cd .. +- $RM -r conftest +- $RM conftest* +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -+ + +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux @@ -20736,13 +42719,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes -+ + + # 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>/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 + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, @@ -20751,7 +42734,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; -+ + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no @@ -20763,7 +42746,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; -+ + +-hard_links="nottested" +-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-$as_echo_n "checking if we can lock with hard links... " >&6; } +- hard_links=yes +- $RM conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +-$as_echo "$hard_links" >&6; } +- if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} +- need_locks=warn +netbsd*) + version_type=sunos + need_lib_prefix=no @@ -20776,19 +42776,25 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' -+ fi + fi +-else +- need_locks=no +-fi +- + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; -+ + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -+ + +- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } +nto-qnx*) + version_type=linux + need_lib_prefix=no @@ -20798,16 +42804,43 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -+ + +- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in + case $host_os in +- aix[4-9]*) +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then +- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- else +- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- fi +- ;; +- pw32*) +- export_symbols_cmds_CXX="$ltdll_cmds" +- ;; +- cygwin* | mingw* | cegcc*) +- 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 '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; -+ esac + esac +- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' +- +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-$as_echo "$ld_shlibs_CXX" >&6; } +-test "$ld_shlibs_CXX" = no && can_build_shared=no +- +-with_gnu_ld_CXX=$with_gnu_ld +- + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH @@ -20824,7 +42857,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=yes + fi + ;; -+ + +os2*) + libname_spec='$name' + shrext_cmds=".dll" @@ -20833,7 +42866,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; -+ + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no @@ -20844,11 +42877,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; -+ + +rdos*) + dynamic_linker=no + ;; -+ + +solaris*) + version_type=linux + need_lib_prefix=no @@ -20861,7 +42894,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; -+ + +-# +-# Do we need to explicitly link libc? +-# +-case "x$archive_cmds_need_lc_CXX" in +-x|xyes) +- # Assume -lc should be added +- archive_cmds_need_lc_CXX=yes +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -20873,7 +42913,56 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + need_version=yes + ;; -+ + +- if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $archive_cmds_CXX in +- *'~'*) +- # FIXME: we may have to deal with multi-command sequences. +- ;; +- '$CC '*) +- # Test whether the compiler implicitly links with -lc since on some +- # systems, -lgcc has to come before -lc. If gcc already passes -lc +- # to ld, don't add -lc before -lgcc. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +- $RM conftest* +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext +- +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$lt_prog_compiler_wl_CXX +- pic_flag=$lt_prog_compiler_pic_CXX +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX +- allow_undefined_flag_CXX= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 +- (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +- then +- archive_cmds_need_lc_CXX=no +- else +- archive_cmds_need_lc_CXX=yes +- fi +- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $RM conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +-$as_echo "$archive_cmds_need_lc_CXX" >&6; } +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -20894,7 +42983,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; + ;; + esac + ;; + @@ -20925,8 +43014,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; -+ esac -+ fi + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + @@ -20939,39 +43028,39 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +*) + dynamic_linker=no -+ ;; -+esac + ;; + esac +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no -+ + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi -+ + +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi -+ + +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi -+ + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +hardcode_action_F77= +if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var_F77" || \ + test "X$hardcode_automatic_F77" = "Xyes" ; then -+ + + # We can hardcode non-existant directories. + if test "$hardcode_direct_F77" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we @@ -20992,7 +43081,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +fi +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6; } -+ + +if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported + enable_fast_install=no @@ -21001,8 +43090,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Fast installation is not necessary + enable_fast_install=needless +fi -+ -+ + + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are @@ -21084,198 +43173,226 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + done -+ + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac -+ + +cfgfile="$ofile" -+ + + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL -+ + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared -+ + +# Whether or not to build static libraries. +build_old_libs=$enable_static -+ + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_F77 -+ + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 -+ + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install -+ + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os -+ + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os -+ + +# An echo program that does not interpret backslashes. +echo=$lt_echo -+ + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS -+ + +# A C compiler. +LTCC=$lt_LTCC -+ + +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS -+ + +# A language-specific compiler. +CC=$lt_compiler_F77 -+ + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_F77 -+ + +# An ERE matcher. +EGREP=$lt_EGREP -+ + +# The linker used to build libraries. +LD=$lt_LD_F77 -+ + +# Whether we need hard or soft links. +LN_S=$lt_LN_S -+ + +# A BSD-compatible nm program. +NM=$lt_NM -+ + +# A symbol stripping program +STRIP=$lt_STRIP -+ + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD -+ + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" -+ + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" -+ + +# Used on cygwin: assembler. +AS="$AS" -+ + +# The name of the directory that contains temporary libtool files. +objdir=$objdir -+ + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -+ + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_F77 -+ + +# Object file suffix (normally "o"). +objext="$ac_objext" -+ + +# Old archive suffix (normally "a"). +libext="$libext" -+ + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' -+ + +# Executable file suffix (normally ""). +exeext="$exeext" -+ + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_F77 +pic_mode=$pic_mode -+ + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len -+ + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 -+ + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks -+ + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix -+ + +# Do we need a version for libraries? +need_version=$need_version -+ + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen -+ + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self -+ + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static -+ + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_F77 -+ + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 -+ + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 -+ + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 -+ + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 -+ + +# Library versioning type. +version_type=$version_type -+ + +# Format of library name prefix. +libname_spec=$lt_libname_spec -+ + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec -+ + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec -+ + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_F77 +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 -+ + +- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-$as_echo_n "checking dynamic linker characteristics... " >&6; } +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 -+ + +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-need_lib_prefix=unknown +-hardcode_into_libs=no +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_F77 +archive_expsym_cmds=$lt_archive_expsym_cmds_F77 +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds -+ + +-# when you set need_version to no, make sure it does not cause -set_version +-# flags to be left without arguments +-need_version=unknown +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_F77 +module_expsym_cmds=$lt_module_expsym_cmds_F77 -+ + +-case $host_os in +-aix3*) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' +- shlibpath_var=LIBPATH +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib -+ + +- # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_F77 @@ -21295,57 +43412,357 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 -+ + +-aix[4-9]*) +- version_type=linux +- need_lib_prefix=no +- need_version=no +- hardcode_into_libs=yes +- if test "$host_cpu" = ia64; then +- # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- else +- # With GCC up to 2.95.x, collect2 would create an import file +- # for dependence libraries. The import file would start with +- # the line `#! .'. This would cause the generated library to +- # depend on `.', always an invalid library. This was fixed in +- # development snapshots of GCC prior to 3.0. +- case $host_os in +- aix4 | aix4.[01] | aix4.[01].*) +- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' +- echo ' yes ' +- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then +- : +- else +- can_build_shared=no +- fi +- ;; +- esac +- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct +- # soname into executable. Probably we can add versioning support to +- # collect2, so additional links can be useful in future. +- if test "$aix_use_runtimelinking" = yes; then +- # If using run time linking (on AIX 4.2 or later) use lib<name>.so +- # instead of lib<name>.a to let people know that these are not +- # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- else +- # We preserve .a as extension for shared libraries through AIX4.2 +- # and later when we are not doing run time linking. +- library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' +- fi +- shlibpath_var=LIBPATH +- fi +- ;; +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_F77 -+ + +-amigaos*) +- case $host_cpu in +- powerpc) +- # Since July 2007 AmigaOS4 officially supports .so libraries. +- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- ;; +- m68k) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' +- ;; +- esac +- ;; +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method -+ + +-beos*) +- library_names_spec='${libname}${shared_ext}' +- dynamic_linker="$host_os ld.so" +- shlibpath_var=LIBRARY_PATH +- ;; +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd -+ + +-bsdi[45]*) +- version_type=linux +- 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' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" +- # the default ld.so.conf also contains /usr/contrib/lib and +- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow +- # libtool to hard-code these into programs +- ;; +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_F77 -+ + +-cygwin* | mingw* | pw32* | cegcc*) +- version_type=windows +- shrext_cmds=".dll" +- need_version=no +- need_lib_prefix=no +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_F77 -+ + +- case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) +- library_names_spec='$libname.dll.a' +- # DLL is installed to $(libdir)/../bin by postinstall_cmds +- postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ +- dldir=$destdir/`dirname \$dlpath`~ +- test -d \$dldir || mkdir -p \$dldir~ +- $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname~ +- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then +- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; +- fi' +- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ +- dlpath=$dir/\$dldll~ +- $RM \$dlpath' +- shlibpath_overrides_runpath=yes +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds -+ + +- case $host_os in +- cygwin*) +- # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" +- ;; +- mingw* | cegcc*) +- # MinGW DLLs use traditional 'lib' prefix +- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- 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 ';[c-zC-Z]:/' >/dev/null; then +- # It is most probably a Windows format PATH printed by +- # mingw gcc, but we are running on Cygwin. Gcc prints its search +- # path with ; separators, and with drive letters. We can handle the +- # drive letters (cygwin fileutils understands them), so leave them, +- # especially as we might pass files found there to a mingw objdump, +- # which wouldn't understand a cygwinified path. Ahh. +- 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 +- ;; +- pw32*) +- # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- ;; +- esac +- ;; +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval -+ + +- *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' +- ;; +- esac +- dynamic_linker='Win32 ld.exe' +- # FIXME: first we should search . and the directory the executable is in +- shlibpath_var=PATH +- ;; +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ + +-darwin* | rhapsody*) +- dynamic_linker="$host_os dyld" +- version_type=darwin +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' +- shlibpath_overrides_runpath=yes +- shlibpath_var=DYLD_LIBRARY_PATH +- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ + +- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +- ;; +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ + +-dgux*) +- 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 +- ;; +# This is the shared library runtime path variable. +runpath_var=$runpath_var -+ + +-freebsd1*) +- dynamic_linker=no +- ;; +# This is the shared library path variable. +shlibpath_var=$shlibpath_var -+ + +-freebsd* | dragonfly*) +- # DragonFly does not have aout. When/if they implement a new +- # versioning mechanism, adjust this. +- if test -x /usr/bin/objformat; then +- objformat=`/usr/bin/objformat` +- else +- case $host_os in +- freebsd[123]*) objformat=aout ;; +- *) objformat=elf ;; +- esac +- fi +- version_type=freebsd-$objformat +- case $version_type in +- freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- need_version=no +- need_lib_prefix=no +- ;; +- freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' +- need_version=yes +- ;; +- esac +- shlibpath_var=LD_LIBRARY_PATH +- case $host_os in +- freebsd2*) +- shlibpath_overrides_runpath=yes +- ;; +- freebsd3.[01]* | freebsdelf3.[01]*) +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ +- freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- *) # from 4.6 on, and DragonFly +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- esac +- ;; +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ + +-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 +- hardcode_into_libs=yes +- ;; +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_F77 -+ + +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case $host_cpu in +- ia64*) +- shrext_cmds='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +- fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext_cmds='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' +- ;; +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs -+ + +-interix[3-9]*) +- 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' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 -+ + +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +- esac +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- hardcode_into_libs=yes +- ;; +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. @@ -21369,40 +43786,134 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_F77 -+ + +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" -+ + +-# This must be Linux ELF. +-linux* | k*bsd*-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' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- # Some binutils ld are patched to set DT_RUNPATH +- save_LDFLAGS=$LDFLAGS +- save_libdir=$libdir +- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ +- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_F77 -+ + +-int +-main () +-{ +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then +- shlibpath_overrides_runpath=yes +-fi +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path -+ + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_F77 -+ + +-fi +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_F77 -+ + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- LDFLAGS=$save_LDFLAGS +- libdir=$save_libdir +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ + +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. +- hardcode_into_libs=yes +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_F77 -+ + +- # 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>/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 +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_F77 -+ + +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; +# ### END LIBTOOL TAG CONFIG: $tagname -+ + +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' +- else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' +__EOF__ + + @@ -21413,66 +43924,249 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" -+ fi + fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +fi -+ -+ + +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; + +-*nto* | *qnx*) +- version_type=qnx +- 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='ldqnx.so' +- ;; +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ + +-openbsd*) +- version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" +- need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[89] | openbsd2.[89].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +CC="$lt_save_CC" + + else + tagname="" + fi -+ ;; -+ + ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi +- ;; + +-os2*) +- libname_spec='$name' +- shrext_cmds=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; + GCJ) + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -+ -+ + +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; + +-rdos*) +- dynamic_linker=no +- ;; +- +-solaris*) +- 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=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; +- +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; +- +-sysv4 | sysv4.3*) +- version_type=linux +- 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 +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; +- esac +- ;; +- +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi +- ;; +- +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- version_type=freebsd-elf +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then +- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- else +- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- case $host_os in +- sco3.2v5*) +- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +- ;; +- esac +- fi +- sys_lib_dlsearch_path_spec='/usr/lib' +- ;; +- +-tpf*) +- # TPF is a cross-target only. Preferred cross-host = GNU/Linux. +- 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}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no +- hardcode_into_libs=yes +- ;; +- +-uts4*) +- version_type=linux +- 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 +- ;; +- +-*) +- dynamic_linker=no +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-$as_echo "$dynamic_linker" >&6; } +-test "$dynamic_linker" = no && can_build_shared=no +- +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi +- +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-fi +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +-fi +# Source file extension for Java test sources. +ac_ext=java -+ + +# Object file extension for compiled Java test sources. +objext=o +objext_GCJ=$objext -+ + +# Code to be used in simple compile tests +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) {}; }' -+ + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -+ + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ + +# Allow CC to be a program name with arguments. +compiler=$CC -+ -+ + + +# save warnings/boilerplate of simple test code +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* -+ + +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 -r conftest* -+ -+ + + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +CC=${GCJ-"gcj"} @@ -21487,20 +44181,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ + + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +archive_cmds_need_lc_GCJ=no -+ + +old_archive_cmds_GCJ=$old_archive_cmds -+ -+ + + +lt_prog_compiler_no_builtin_flag_GCJ= -+ + +if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -+ -+ + + +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then @@ -21519,11 +44213,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -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:__oline__: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17610: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 -+ echo "$as_me:__oline__: \$? = $ac_status" >&5 ++ echo "$as_me:17614: \$? = $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. @@ -21534,30 +44228,30 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + $rm conftest* -+ + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } -+ + +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +else + : +fi -+ + +fi -+ + +lt_prog_compiler_wl_GCJ= +lt_prog_compiler_pic_GCJ= +lt_prog_compiler_static_GCJ= -+ + +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -+ + + if test "$GCC" = yes; then + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_static_GCJ='-static' -+ + + case $host_os in + aix*) + # All AIX code is PIC. @@ -21566,50 +44260,56 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_static_GCJ='-Bstatic' + fi + ;; -+ + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; -+ + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; -+ + + 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 -+ + + ;; -+ + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_GCJ='-fno-common' + ;; -+ + + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; -+ + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared_GCJ=no + enable_shared=no + ;; -+ + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_GCJ=-Kconform_pic + fi + ;; -+ + +- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +-hardcode_action_CXX= +-if test -n "$hardcode_libdir_flag_spec_CXX" || +- test -n "$runpath_var_CXX" || +- test "X$hardcode_automatic_CXX" = "Xyes" ; then + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. @@ -21622,12 +44322,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +- # We can hardcode non-existent directories. +- if test "$hardcode_direct_CXX" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && +- test "$hardcode_minus_L_CXX" != no; then +- # Linking always hardcodes the temporary library directory. +- hardcode_action_CXX=relink + *) + lt_prog_compiler_pic_GCJ='-fPIC' + ;; + esac -+ else + else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- hardcode_action_CXX=immediate +- fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- hardcode_action_CXX=unsupported +-fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +-$as_echo "$hardcode_action_CXX" >&6; } + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) @@ -21649,13 +44368,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +-if test "$hardcode_action_CXX" = relink || +- test "$inherit_rpath_CXX" = yes; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi + 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). -+ + + ;; -+ + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl_GCJ='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but @@ -21671,18 +44399,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' + ;; -+ + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl_GCJ='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static_GCJ='-non_shared' + ;; -+ + + newsos6) + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; -+ + + linux* | k*bsd*-gnu) + case $cc_basename in + icc* | ecc*) @@ -21720,17 +44448,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl_GCJ='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static_GCJ='-non_shared' + ;; -+ + +- fi # test -n "$compiler" + rdos*) + lt_prog_compiler_static_GCJ='-non_shared' + ;; -+ + +- CC=$lt_save_CC +- LDCXX=$LD +- LD=$lt_save_LD +- GCC=$lt_save_GCC +- with_gnu_ld=$lt_save_with_gnu_ld +- lt_cv_path_LDCXX=$lt_cv_path_LD +- lt_cv_path_LD=$lt_save_path_LD +- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +-fi # test "$_lt_caught_CXX_error" != yes + solaris*) + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' @@ -21741,56 +44480,61 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_wl_GCJ='-Wl,';; + esac + ;; -+ + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu + sunos4*) + lt_prog_compiler_wl_GCJ='-Qoption ld ' + lt_prog_compiler_pic_GCJ='-PIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; -+ + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; -+ + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic_GCJ='-Kconform_pic' + lt_prog_compiler_static_GCJ='-Bstatic' + fi + ;; -+ + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; -+ + + unicos*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_can_build_shared_GCJ=no + ;; -+ + + uts4*) + lt_prog_compiler_pic_GCJ='-pic' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; -+ + + *) + lt_prog_compiler_can_build_shared_GCJ=no + ;; + esac + fi -+ + +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } -+ + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_GCJ"; then -+ + +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then @@ -21809,11 +44553,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -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:__oline__: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17900: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 -+ echo "$as_me:__oline__: \$? = $ac_status" >&5 ++ echo "$as_me:17904: \$? = $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. @@ -21824,11 +44568,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + $rm conftest* -+ + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } -+ + +if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in + "" | " "*) ;; @@ -21838,7 +44582,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_pic_GCJ= + lt_prog_compiler_can_build_shared_GCJ=no +fi -+ + +fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: @@ -21849,7 +44593,41 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" + ;; +esac -+ + +- ac_config_commands="$ac_config_commands libtool" +- +- +- +- +-# Only expand once: +- +- +-: ${CONFIG_LT=./config.lt} +-{ $as_echo "$as_me:$LINENO: creating $CONFIG_LT" >&5 +-$as_echo "$as_me: creating $CONFIG_LT" >&6;} +-cat >"$CONFIG_LT" <<_LTEOF +-#! $SHELL +-# Generated by $as_me. +-# Run this file to recreate a libtool stub with the current configuration. +- +-lt_cl_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +-_LTEOF +- +-cat >>"$CONFIG_LT" <<\_LTEOF +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## +- +-# 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=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which +- # is contrary to our usage. Disable this feature. +- alias -g '${1+"$@"}'='"$@"' +- setopt NO_GLOB_SUBST +# +# Check to make sure the static flag actually works. +# @@ -21858,7 +44636,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- case `(set -o) 2>/dev/null` in +- *posix*) set -o posix ;; +-esac + lt_cv_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -21880,18 +44661,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + $rm -r conftest* + LDFLAGS="$save_LDFLAGS" -+ -+fi + + fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } -+ + +if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then + : +else + lt_prog_compiler_static_GCJ= +fi -+ -+ + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then @@ -21903,7 +44684,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ + +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. @@ -21913,11 +44701,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -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:__oline__: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18004: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 -+ echo "$as_me:__oline__: \$? = $ac_status" >&5 ++ echo "$as_me:18008: \$? = $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 @@ -21937,12 +44725,53 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + cd .. + rmdir conftest + $rm conftest* -+ -+fi + +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='printf %s\n' +- as_echo_n='printf %s' +-else +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' + fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } -+ -+ + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } +-fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user @@ -21961,13 +44790,30 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi -+else + else +- as_unset=false + need_locks=no -+fi -+ + fi + +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+ + +-# IFS +-# We need space, tab and new line, in precisely that order. Quoting is +-# there to prevent editors from complaining about space-tab. +-# (If _AS_PATH_WALK were called with IFS unset, it would disable word +-# splitting by setting IFS to empty value.) +-IFS=" "" $as_nl" +- +-# Find who we are. Look in the path if we contain no directory separator. +-case $0 in +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + runpath_var= + allow_undefined_flag_GCJ= + enable_shared_with_static_runtimes_GCJ=no @@ -22013,9 +44859,29 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + \-*) ;; + *) break;; + esac -+done + done +-IFS=$as_save_IFS +- +- ;; +-esac +-# We did not find ourselves, most probably we were run as `sh COMMAND' +-# in which case we are not to be found in the path. +-if test "x$as_myself" = x; then +- as_myself=$0 +-fi +-if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } +-fi +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +-done +-PS1='$ ' +-PS2='> ' +-PS4='+ ' + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time @@ -22033,12 +44899,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + with_gnu_ld=no + ;; + esac -+ + +-# NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE + ld_shlibs_GCJ=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' -+ + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. @@ -22059,7 +44937,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac -+ + +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) @@ -22067,17 +44950,141 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$host_cpu" != ia64; then + ld_shlibs_GCJ=no + cat <<EOF 1>&2 -+ + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. -+ + +-# Name of the executable. +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- +-# CDPATH. +-$as_unset CDPATH +- +- +- +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { +- +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +-$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} +- { (exit 1); exit 1; }; } +- +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} +- +- +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +-else +- as_dirname=false +-fi +- +-ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in +--n*) +- case `echo 'x\c'` in +- *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; +- esac;; +-*) +- ECHO_N='-n';; +-esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi +- +-rm -f conf$$ conf$$.exe conf$$.file +-if test -d conf$$.dir; then +- rm -f conf$$.dir/conf$$.file +-else +- rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null +-fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else +- as_ln_s='cp -p' +- fi +-else +- as_ln_s='cp -p' +-fi +-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +-rmdir conf$$.dir 2>/dev/null +EOF + fi + ;; -+ + +-if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: +-else +- test -d ./-p && rmdir ./-p +- as_mkdir_p=false +-fi + amigaos*) + archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_GCJ='-L$libdir' @@ -22091,18 +45098,44 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # them. + ld_shlibs_GCJ=no + ;; -+ + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- 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/."; + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_GCJ=unsupported + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else + 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 +-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'" + ld_shlibs_GCJ=no + fi + ;; -+ + +-# Sed expression to map a string onto a valid variable name. +-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, + # as there is no search path for DLLs. @@ -22111,7 +45144,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + 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/'\'' -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' + # If the export-symbols file already is a .def file (1st line @@ -22127,7 +45160,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_GCJ=no + fi + ;; -+ + + interix[3-9]*) + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no @@ -22142,7 +45175,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + 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' + ;; -+ + +-exec 6>&1 +-exec 5>>config.log +-{ +- echo +- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +-## Running $as_me. ## +-_ASBOX +-} >&5 + gnu* | linux* | k*bsd*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= @@ -22171,7 +45212,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + tmp_sharedflag='-shared' ;; + esac + archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ + +-lt_cl_help="\ +-\`$as_me' creates a local libtool stub from the current configuration, +-for use in further configure time tests before the real libtool is +-generated. +- +-Usage: $0 [OPTIONS] +- +- -h, --help print this help, then exit +- -V, --version print version number, then exit +- -q, --quiet do not print progress messages +- -d, --debug don't remove temporary files +- +-Report bugs to <bug-libtool@gnu.org>." +- +-lt_cl_version="\ +-gtk+ config.lt 2.14.5 +-configured by $0, generated by GNU Autoconf 2.63. +- +-Copyright (C) 2008 Free Software Foundation, Inc. +-This config.lt script is free software; the Free Software Foundation +-gives unlimited permision to copy, distribute and modify it." + 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~ @@ -22183,7 +45245,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_GCJ=no + fi + ;; -+ + +-while test $# != 0 +-do +- case $1 in +- --version | --v* | -V ) +- echo "$lt_cl_version"; exit 0 ;; +- --help | --h* | -h ) +- echo "$lt_cl_help"; exit 0 ;; +- --debug | --d* | -d ) +- debug=: ;; +- --quiet | --q* | --silent | --s* | -q ) +- lt_cl_silent=: ;; +- +- -*) { { $as_echo "$as_me:$LINENO: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&5 +-$as_echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2;} +- { (exit 1); exit 1; }; } ;; + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' @@ -22193,19 +45272,32 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; -+ + +- *) { { $as_echo "$as_me:$LINENO: error: unrecognized argument: $1 +-Try \`$0 --help' for more information." >&5 +-$as_echo "$as_me: error: unrecognized argument: $1 +-Try \`$0 --help' for more information." >&2;} +- { (exit 1); exit 1; }; } ;; +- esac +- shift +-done + solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs_GCJ=no + cat <<EOF 1>&2 -+ + +-if $lt_cl_silent; then +- exec 6>/dev/null +-fi +-_LTEOF +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -+ + +-cat >>"$CONFIG_LT" <<_LTEOF +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -22214,20 +45306,300 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_GCJ=no + fi + ;; -+ + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_GCJ=no + cat <<_LT_EOF 1>&2 -+ + +-# 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 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. -+ + +-sed_quote_subst='$sed_quote_subst' +-double_quote_subst='$double_quote_subst' +-delay_variable_subst='$delay_variable_subst' +-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' +-AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' +-DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' +-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' +-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' +-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' +-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' +-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' +-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' +-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' +-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' +-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' +-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' +-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' +-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' +-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' +-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' +-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' +-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' +-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' +-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' +-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' +-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' +-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' +-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' +-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' +-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' +-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' +-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' +-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' +-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' +-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' +-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' +-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' +-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' +-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' +-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' +-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' +-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' +-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' +-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' +-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' +-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' +-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' +-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' +-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' +-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' +-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' +-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' +-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' +-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' +-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' +-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' +-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' +-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' +-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' +-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' +-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' +-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' +-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' +-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' +-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' +-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' +-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' +-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' +-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' +-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' +-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' +-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' +-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' +-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' +-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' +-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' +-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' +-predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' +-postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' +-predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' +-postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' +-LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +- +-LTCC='$LTCC' +-LTCFLAGS='$LTCFLAGS' +-compiler='$compiler_DEFAULT' +- +-# Quote evaled strings. +-for var in SED \ +-GREP \ +-EGREP \ +-FGREP \ +-LD \ +-NM \ +-LN_S \ +-lt_SP2NL \ +-lt_NL2SP \ +-reload_flag \ +-deplibs_check_method \ +-file_magic_cmd \ +-AR \ +-AR_FLAGS \ +-STRIP \ +-RANLIB \ +-CC \ +-CFLAGS \ +-compiler \ +-lt_cv_sys_global_symbol_pipe \ +-lt_cv_sys_global_symbol_to_cdecl \ +-lt_cv_sys_global_symbol_to_c_name_address \ +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +-SHELL \ +-ECHO \ +-lt_prog_compiler_no_builtin_flag \ +-lt_prog_compiler_wl \ +-lt_prog_compiler_pic \ +-lt_prog_compiler_static \ +-lt_cv_prog_compiler_c_o \ +-need_locks \ +-DSYMUTIL \ +-NMEDIT \ +-LIPO \ +-OTOOL \ +-OTOOL64 \ +-shrext_cmds \ +-export_dynamic_flag_spec \ +-whole_archive_flag_spec \ +-compiler_needs_object \ +-with_gnu_ld \ +-allow_undefined_flag \ +-no_undefined_flag \ +-hardcode_libdir_flag_spec \ +-hardcode_libdir_flag_spec_ld \ +-hardcode_libdir_separator \ +-fix_srcfile_path \ +-exclude_expsyms \ +-include_expsyms \ +-file_list_spec \ +-variables_saved_for_relink \ +-libname_spec \ +-library_names_spec \ +-soname_spec \ +-finish_eval \ +-old_striplib \ +-striplib \ +-compiler_lib_search_dirs \ +-predep_objects \ +-postdep_objects \ +-predeps \ +-postdeps \ +-compiler_lib_search_path \ +-LD_CXX \ +-compiler_CXX \ +-lt_prog_compiler_no_builtin_flag_CXX \ +-lt_prog_compiler_wl_CXX \ +-lt_prog_compiler_pic_CXX \ +-lt_prog_compiler_static_CXX \ +-lt_cv_prog_compiler_c_o_CXX \ +-export_dynamic_flag_spec_CXX \ +-whole_archive_flag_spec_CXX \ +-compiler_needs_object_CXX \ +-with_gnu_ld_CXX \ +-allow_undefined_flag_CXX \ +-no_undefined_flag_CXX \ +-hardcode_libdir_flag_spec_CXX \ +-hardcode_libdir_flag_spec_ld_CXX \ +-hardcode_libdir_separator_CXX \ +-fix_srcfile_path_CXX \ +-exclude_expsyms_CXX \ +-include_expsyms_CXX \ +-file_list_spec_CXX \ +-compiler_lib_search_dirs_CXX \ +-predep_objects_CXX \ +-postdep_objects_CXX \ +-predeps_CXX \ +-postdeps_CXX \ +-compiler_lib_search_path_CXX; do +- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in +- *[\\\\\\\`\\"\\\$]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" +- ;; +- *) +- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +_LT_EOF + ;; + *) @@ -22240,25 +45612,84 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + ;; + esac -+ ;; -+ + ;; +- esac +-done + +-# Double-quote double-evaled strings. +-for var in reload_cmds \ +-old_postinstall_cmds \ +-old_postuninstall_cmds \ +-old_archive_cmds \ +-extract_expsyms_cmds \ +-old_archive_from_new_cmds \ +-old_archive_from_expsyms_cmds \ +-archive_cmds \ +-archive_expsym_cmds \ +-module_cmds \ +-module_expsym_cmds \ +-export_symbols_cmds \ +-prelink_cmds \ +-postinstall_cmds \ +-postuninstall_cmds \ +-finish_cmds \ +-sys_lib_search_path_spec \ +-sys_lib_dlsearch_path_spec \ +-old_archive_cmds_CXX \ +-old_archive_from_new_cmds_CXX \ +-old_archive_from_expsyms_cmds_CXX \ +-archive_cmds_CXX \ +-archive_expsym_cmds_CXX \ +-module_cmds_CXX \ +-module_expsym_cmds_CXX \ +-export_symbols_cmds_CXX \ +-prelink_cmds_CXX; do +- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in +- *[\\\\\\\`\\"\\\$]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + sunos4*) + archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no -+ ;; + ;; + -+ *) + *) +- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs_GCJ=no + fi -+ ;; -+ esac -+ + ;; + esac +-done +- +-# Fix-up fallback echo if it was mangled by the above quoting rules. +-case \$lt_ECHO in +-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` +- ;; +-esac +- +-ac_aux_dir='$ac_aux_dir' +-xsi_shell='$xsi_shell' +-lt_shell_append='$lt_shell_append' +- +-# See if we are running on zsh, and set the options which allow our +-# commands through without removal of \ escapes INIT. +-if test -n "\${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +-fi +- +- +- PACKAGE='$PACKAGE' +- VERSION='$VERSION' +- TIMESTAMP='$TIMESTAMP' +- RM='$RM' +- ofile='$ofile' +- + + if test "$ld_shlibs_GCJ" = no; then + runpath_var= + hardcode_libdir_flag_spec_GCJ= @@ -22281,7 +45712,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct_GCJ=unsupported + fi + ;; -+ + + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't @@ -22298,7 +45729,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no -+ + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. @@ -22311,22 +45742,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + done + ;; + esac -+ + +-_LTEOF + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi -+ + +-cat >>"$CONFIG_LT" <<\_LTEOF +-{ $as_echo "$as_me:$LINENO: creating $ofile" >&5 +-$as_echo "$as_me: creating $ofile" >&6;} + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ + + archive_cmds_GCJ='' + hardcode_direct_GCJ=yes + hardcode_libdir_separator_GCJ=':' + link_all_deplibs_GCJ=yes -+ + +- # 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 +- setopt NO_GLOB_SUBST +- fi + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check @@ -22367,7 +45807,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + fi -+ + +- cfgfile="${ofile}T" +- trap "$RM \"$cfgfile\"; exit 1" 1 2 15 +- $RM "$cfgfile" + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_GCJ=yes @@ -22382,11 +45825,44 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +- cat <<_LT_EOF >> "$cfgfile" +-#! $SHELL +int +main () +{ -+ + +-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +-# NOTE: Changes made to this file will be lost: look at ltmain.sh. +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008 Free Software Foundation, Inc. +-# Written by Gordon Matzigkeit, 1996 +-# +-# This file is part of GNU Libtool. +-# +-# GNU Libtool is free software; you can redistribute it and/or +-# modify it under the terms of the GNU General Public License as +-# published by the Free Software Foundation; either version 2 of +-# the License, or (at your option) any later version. +-# +-# As a special exception to the GNU General Public License, +-# if you distribute this file as part of a program or library that +-# is built using GNU Libtool, you may include this file under the +-# same distribution terms that you use for the rest of that program. +-# +-# GNU Libtool 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 General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with GNU Libtool; see the file COPYING. If not, a copy +-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +-# obtained by writing to the Free Software Foundation, Inc., +-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ; + return 0; +} @@ -22409,7 +45885,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ + +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { @@ -22425,14 +45901,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + +-# The names of the tagged configurations supported by this script. +-available_tags="CXX " + +-# ### BEGIN LIBTOOL CONFIG +fi -+ + +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +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 -+ + +-# Assembler program. +-AS=$AS + hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else @@ -22448,11 +45931,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +-# DLL creation program. +-DLLTOOL=$DLLTOOL +int +main () +{ -+ + +-# Object dumper program. +-OBJDUMP=$OBJDUMP + ; + return 0; +} @@ -22475,7 +45962,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ + +-# Which release of libtool.m4 was used? +-macro_version=$macro_version +-macro_revision=$macro_revision +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { @@ -22491,14 +45981,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared + +-# What type of objects to build. +-pic_mode=$pic_mode +fi -+ + +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +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 -+ + +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os + hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. @@ -22512,7 +46012,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + ;; -+ + +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os + amigaos*) + archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_GCJ='-L$libdir' @@ -22520,11 +46024,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # see comment about different semantics on the GNU ld section + ld_shlibs_GCJ=no + ;; -+ + +-# A sed program that does not truncate output. +-SED=$lt_SED + bsdi[45]*) + export_dynamic_flag_spec_GCJ=-rdynamic + ;; -+ + +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="\$SED -e 1s/^X//" + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. @@ -22545,7 +46053,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_GCJ=yes + ;; -+ + +-# A grep program that handles long lines. +-GREP=$lt_GREP + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[012]) @@ -22594,17 +46104,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + fi + ;; -+ + +-# An ERE matcher. +-EGREP=$lt_EGREP + dgux*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_shlibpath_var_GCJ=no + ;; -+ + +-# A literal string matcher. +-FGREP=$lt_FGREP + freebsd1*) + ld_shlibs_GCJ=no + ;; -+ + +-# A BSD- or MS-compatible name lister. +-NM=$lt_NM + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little @@ -22615,7 +46131,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; -+ + +-# Whether we need soft or hard links. +-LN_S=$lt_LN_S + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' @@ -22623,7 +46141,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_minus_L_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; -+ + +-# What is the maximum length of a command? +-max_cmd_len=$max_cmd_len + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' @@ -22631,7 +46151,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; -+ + +-# Object file suffix (normally "o"). +-objext=$ac_objext + hpux9*) + if test "$GCC" = yes; then + archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' @@ -22641,13 +46163,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + hardcode_direct_GCJ=yes -+ + +-# Executable file suffix (normally ""). +-exeext=$exeext + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + ;; -+ + +-# whether the shell understands "unset". +-lt_unset=$lt_unset + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -22657,16 +46183,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: -+ + +-# turn spaces into newlines. +-SP2NL=$lt_lt_SP2NL + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' -+ + +-# turn newlines into spaces. +-NL2SP=$lt_lt_NL2SP + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + fi + ;; -+ + +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in @@ -22696,7 +46229,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: -+ + +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method + case $host_cpu in + hppa*64*|ia64*) + hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' @@ -22706,7 +46241,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *) + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' -+ + +-# Command to use when deplibs_check_method == "file_magic". +-file_magic_cmd=$lt_file_magic_cmd + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes @@ -22714,7 +46251,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + fi + ;; -+ + +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' @@ -22726,7 +46266,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_separator_GCJ=: + link_all_deplibs_GCJ=yes + ;; -+ + +-# A symbol stripping program. +-STRIP=$lt_STRIP + 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 @@ -22737,7 +46279,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; -+ + +-# Commands used to install an old-style archive. +-RANLIB=$lt_RANLIB +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds + newsos6) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=yes @@ -22745,7 +46291,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_separator_GCJ=: + hardcode_shlibpath_var_GCJ=no + ;; -+ + +-# A C compiler. +-LTCC=$lt_CC + openbsd*) + if test -f /usr/libexec/ld.so; then + hardcode_direct_GCJ=yes @@ -22771,7 +46319,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_GCJ=no + fi + ;; -+ + +-# LTCC compiler flags. +-LTCFLAGS=$lt_CFLAGS + os2*) + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_minus_L_GCJ=yes @@ -22779,7 +46329,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; -+ + +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' @@ -22791,7 +46343,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + ;; -+ + +-# Transform the output of nm in a proper C declaration. +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' @@ -22802,13 +46356,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+ + +-# Transform the output of nm in a C name address pair. +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec_GCJ='-rpath $libdir' + fi + hardcode_libdir_separator_GCJ=: + ;; -+ + +-# Transform the output of nm in a C name address pair when lib prefix is needed. +-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + solaris*) + no_undefined_flag_GCJ=' -z text' + if test "$GCC" = yes; then @@ -22840,7 +46398,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + link_all_deplibs_GCJ=yes + ;; -+ + +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o @@ -22854,7 +46414,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_minus_L_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; -+ + +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL + sysv4) + case $host_vendor in + sni) @@ -22876,13 +46438,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_GCJ=no + ;; -+ + +-# An echo program that does not interpret backslashes. +-ECHO=$lt_ECHO + sysv4.3*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_GCJ=no + export_dynamic_flag_spec_GCJ='-Bexport' + ;; -+ + +-# Used to examine libraries when file_magic_cmd begins with "file". +-MAGIC_CMD=$MAGIC_CMD + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' @@ -22892,13 +46458,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ld_shlibs_GCJ=yes + fi + ;; -+ + +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks + 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 + runpath_var='LD_RUN_PATH' -+ + +-# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +-DSYMUTIL=$lt_DSYMUTIL + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -22907,7 +46477,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -+ + +-# Tool to change global to local symbols on Mac OS X. +-NMEDIT=$lt_NMEDIT + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to @@ -22924,7 +46496,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + link_all_deplibs_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-Bexport' + runpath_var='LD_RUN_PATH' -+ + +-# Tool to manipulate fat objects and archives on Mac OS X. +-LIPO=$lt_LIPO + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -22933,23 +46507,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; -+ + +-# ldd/readelf like tool for Mach-O binaries on Mac OS X. +-OTOOL=$lt_OTOOL + uts4*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_shlibpath_var_GCJ=no + ;; -+ + +-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +-OTOOL64=$lt_OTOOL64 + *) + ld_shlibs_GCJ=no + ;; + esac + fi -+ + +-# Old archive suffix (normally "a"). +-libext=$libext +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } +test "$ld_shlibs_GCJ" = no && can_build_shared=no -+ + +-# Shared library suffix (normally ".so"). +-shrext_cmds=$lt_shrext_cmds +# +# Do we need to explicitly link libc? +# @@ -22957,7 +46539,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_GCJ=yes -+ + +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_GCJ in + *'~'*) @@ -22971,7 +46555,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ + +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at link time. +-variables_saved_for_relink=$lt_variables_saved_for_relink + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? @@ -23012,7 +46599,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + ;; +esac -+ + +-# Do we need the "lib" prefix for modules? +-need_lib_prefix=$need_lib_prefix +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +library_names_spec= @@ -23028,24 +46617,34 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" -+ + +-# Do we need a version for libraries? +-need_version=$need_version +need_lib_prefix=unknown +hardcode_into_libs=no -+ + +-# Library versioning type. +-version_type=$version_type +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown -+ + +-# Shared library runtime path variable. +-runpath_var=$runpath_var +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH -+ + +-# Shared library path variable. +-shlibpath_var=$shlibpath_var + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; -+ + +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +aix[4-9]*) + version_type=linux + need_lib_prefix=no @@ -23089,19 +46688,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LIBPATH + fi + ;; -+ + +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; -+ + +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME +-library_names_spec=$lt_library_names_spec +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; -+ + +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +bsdi[45]*) + version_type=linux + need_version=no @@ -23115,13 +46721,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; -+ + +-# Command to use after installation of a shared archive. +-postinstall_cmds=$lt_postinstall_cmds +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no -+ + +-# Command to use after uninstallation of a shared archive. +-postuninstall_cmds=$lt_postuninstall_cmds + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' @@ -23136,7 +46746,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes -+ + +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' @@ -23165,7 +46777,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +-# As "finish_cmds", except a single script fragment to be evaled but +-# not shown. +-finish_eval=$lt_finish_eval + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; @@ -23174,7 +46789,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; -+ + +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin @@ -23185,10 +46802,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ + +-# Compile-time system search path for libraries. +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; -+ + +-# Run-time system search path for libraries. +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +dgux*) + version_type=linux + need_lib_prefix=no @@ -23197,11 +46818,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; -+ + +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +freebsd1*) + dynamic_linker=no + ;; -+ + +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. @@ -23245,7 +46870,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +gnu*) + version_type=linux + need_lib_prefix=no @@ -23255,7 +46882,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; -+ + +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. @@ -23301,7 +46931,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; -+ + +interix[3-9]*) + version_type=linux + need_lib_prefix=no @@ -23313,7 +46943,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; -+ + +-# The linker used to build libraries. +-LD=$lt_LD +- +-# Commands used to build an old-style archive. +-old_archive_cmds=$lt_old_archive_cmds +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; @@ -23350,12 +46985,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; -+ + +-# A language specific compiler. +-CC=$lt_compiler +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; -+ + +-# Is the compiler the GNU compiler? +-with_gcc=$GCC +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux @@ -23370,13 +47009,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes -+ + +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + # 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>/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 -+ + +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, @@ -23385,7 +47028,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; -+ + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no @@ -23397,7 +47042,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; -+ + +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static +netbsd*) + version_type=sunos + need_lib_prefix=no @@ -23415,14 +47062,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; -+ + +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -+ + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc +nto-qnx*) + version_type=linux + need_lib_prefix=no @@ -23432,7 +47083,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; -+ + +-# Whether or not to disallow shared libs when runtime libs are static. +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" @@ -23458,7 +47111,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_overrides_runpath=yes + fi + ;; -+ + +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec +os2*) + libname_spec='$name' + shrext_cmds=".dll" @@ -23467,7 +47122,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; -+ + +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no @@ -23478,11 +47135,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; -+ + +-# Whether the compiler copes with passing no objects directly. +-compiler_needs_object=$lt_compiler_needs_object +rdos*) + dynamic_linker=no + ;; -+ + +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds +solaris*) + version_type=linux + need_lib_prefix=no @@ -23495,7 +47156,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; -+ + +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -23507,7 +47170,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + need_version=yes + ;; -+ + +-# Commands used to build a shared archive. +-archive_cmds=$lt_archive_cmds +-archive_expsym_cmds=$lt_archive_expsym_cmds +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -23531,7 +47197,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + ;; -+ + +-# Commands used to build a loadable module if different from building +-# a shared archive. +-module_cmds=$lt_module_cmds +-module_expsym_cmds=$lt_module_expsym_cmds +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux @@ -23540,7 +47210,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shlibpath_var=LD_LIBRARY_PATH + fi + ;; -+ + +-# Whether we are building with GNU ld or not. +-with_gnu_ld=$lt_with_gnu_ld +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no @@ -23563,14 +47235,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; -+ + +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag +uts4*) + version_type=linux + 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 + ;; -+ + +-# Flag that enforces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag +*) + dynamic_linker=no + ;; @@ -23578,34 +47254,53 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no -+ + +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +fi -+ + +-# If ld is used when linking, flag to hardcode \$libdir into a binary +-# during linking. This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +fi -+ + +-# Whether we need a single "-rpath" flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ + +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary. +-hardcode_direct=$hardcode_direct +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi -+ + +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary and the resulting library dependency is +-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +-# library is relocated. +-hardcode_direct_absolute=$hardcode_direct_absolute +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ + test "X$hardcode_automatic_GCJ" = "Xyes" ; then -+ + +-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +-# into the resulting binary. +-hardcode_minus_L=$hardcode_minus_L + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we @@ -23626,7 +47321,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +fi +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } -+ + +-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +-# into the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no @@ -23635,8 +47333,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Fast installation is not necessary + enable_fast_install=needless +fi -+ -+ + +-# Set to "yes" if building a shared library automatically hardcodes DIR +-# into the library and all subsequent libraries and executables linked +-# against it. +-hardcode_automatic=$hardcode_automatic + +-# Set to yes if linker adds runtime paths of dependent libraries +-# to runtime path list. +-inherit_rpath=$inherit_rpath +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are @@ -23718,198 +47423,447 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + done -+ + +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac -+ + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +cfgfile="$ofile" -+ + +-# Set to "yes" if exported symbols are required. +-always_export_symbols=$always_export_symbols + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ + +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ + +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL -+ + +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared -+ + +-# Commands necessary for linking programs (against libraries) with templates. +-prelink_cmds=$lt_prelink_cmds +# Whether or not to build static libraries. +build_old_libs=$enable_static -+ + +-# Specify filename containing input files. +-file_list_spec=$lt_file_list_spec +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_GCJ -+ + +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ -+ + +-# The directories searched by this compiler when creating a shared library. +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install -+ + +-# Dependencies to place before and after the objects being linked to +-# create a shared library. +-predep_objects=$lt_predep_objects +-postdep_objects=$lt_postdep_objects +-predeps=$lt_predeps +-postdeps=$lt_postdeps +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os -+ + +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os -+ + +-# ### END LIBTOOL CONFIG +# An echo program that does not interpret backslashes. +echo=$lt_echo -+ + +-_LT_EOF +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS -+ + +- case $host_os in +- aix3*) +- cat <<\_LT_EOF >> "$cfgfile" +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-_LT_EOF +- ;; +- esac +# A C compiler. +LTCC=$lt_LTCC -+ + +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS -+ + +-ltmain="$ac_aux_dir/ltmain.sh" +# A language-specific compiler. +CC=$lt_compiler_GCJ -+ + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_GCJ -+ + +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +# An ERE matcher. +EGREP=$lt_EGREP -+ + +- case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +# The linker used to build libraries. +LD=$lt_LD_GCJ -+ + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +# Whether we need hard or soft links. +LN_S=$lt_LN_S -+ + +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +# A BSD-compatible nm program. +NM=$lt_NM -+ + +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} +# A symbol stripping program +STRIP=$lt_STRIP -+ + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD -+ + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" -+ + +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" -+ + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +# Used on cygwin: assembler. +AS="$AS" -+ + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +# The name of the directory that contains temporary libtool files. +objdir=$objdir -+ + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -+ + +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_GCJ -+ + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} +# Object file suffix (normally "o"). +objext="$ac_objext" -+ + +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +-} +# Old archive suffix (normally "a"). +libext="$libext" -+ + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' -+ + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "X${3}" \ +- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "X${3}" \ +- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; +- esac +-} +# Executable file suffix (normally ""). +exeext="$exeext" -+ + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_GCJ +pic_mode=$pic_mode -+ + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +-} +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len -+ + +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +-} +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -+ + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` +-} +# Must we lock files when doing compilation? +need_locks=$lt_need_locks -+ + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=`expr "$@"` +-} +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix -+ + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +# Do we need a version for libraries? +need_version=$need_version -+ + +-_LT_EOF +-esac +# Whether dlopen is supported. +dlopen_support=$enable_dlopen -+ + +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1+=\$2" +-} +-_LT_EOF +- ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self -+ + +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () +-{ +- eval "$1=\$$1\$2" +-} +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static -+ + +-_LT_EOF +- ;; +- esac +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_GCJ -+ + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ -+ + +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ -+ + +- mv -f "$cfgfile" "$ofile" || +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ -+ + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ -+ + +- cat <<_LT_EOF >> "$ofile" +# Library versioning type. +version_type=$version_type -+ + +-# ### BEGIN LIBTOOL TAG CONFIG: CXX +# Format of library name prefix. +libname_spec=$lt_libname_spec -+ + +-# The linker used to build libraries. +-LD=$lt_LD_CXX +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec -+ + +-# Commands used to build an old-style archive. +-old_archive_cmds=$lt_old_archive_cmds_CXX +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec -+ + +-# A language specific compiler. +-CC=$lt_compiler_CXX +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_GCJ +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ + +-# Is the compiler the GNU compiler? +-with_gcc=$GCC_CXX +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ -+ + +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ -+ + +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_CXX +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_GCJ +archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds -+ + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_CXX +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_GCJ +module_expsym_cmds=$lt_module_expsym_cmds_GCJ -+ + +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_CXX +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib -+ + +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_GCJ @@ -23929,57 +47883,104 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ -+ + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_CXX +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -+ + +-# Whether or not to disallow shared libs when runtime libs are static. +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method -+ + +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd -+ + +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX +- +-# Whether the compiler copes with passing no objects directly. +-compiler_needs_object=$lt_compiler_needs_object_CXX +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_GCJ -+ + +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_GCJ -+ + +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds -+ + +-# Commands used to build a shared archive. +-archive_cmds=$lt_archive_cmds_CXX +-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval -+ + +-# Commands used to build a loadable module if different from building +-# a shared archive. +-module_cmds=$lt_module_cmds_CXX +-module_expsym_cmds=$lt_module_expsym_cmds_CXX +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ + +-# Whether we are building with GNU ld or not. +-with_gnu_ld=$lt_with_gnu_ld_CXX +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ + +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_CXX +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ + +-# Flag that enforces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_CXX +# This is the shared library runtime path variable. +runpath_var=$runpath_var -+ + +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX +# This is the shared library path variable. +shlibpath_var=$shlibpath_var -+ + +-# If ld is used when linking, flag to hardcode \$libdir into a binary +-# during linking. This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ + +-# Whether we need a single "-rpath" flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_GCJ -+ + +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary. +-hardcode_direct=$hardcode_direct_CXX +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs -+ + +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary and the resulting library dependency is +-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +-# library is relocated. +-hardcode_direct_absolute=$hardcode_direct_absolute_CXX +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ -+ + +-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +-# into the resulting binary. +-hardcode_minus_L=$hardcode_minus_L_CXX +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. @@ -24003,43 +48004,69 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_GCJ -+ + +-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +-# into the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" -+ + +-# Set to "yes" if building a shared library automatically hardcodes DIR +-# into the library and all subsequent libraries and executables linked +-# against it. +-hardcode_automatic=$hardcode_automatic_CXX +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_GCJ -+ + +-# Set to yes if linker adds runtime paths of dependent libraries +-# to runtime path list. +-inherit_rpath=$inherit_rpath_CXX +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ + +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_CXX +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ -+# Fix the shell variable \$srcfile for the compiler. + + # Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_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 +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_GCJ -+ -+# The commands to list exported symbols. + + # The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_CXX +export_symbols_cmds=$lt_export_symbols_cmds_GCJ + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. + + # Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_CXX +exclude_expsyms=$lt_exclude_expsyms_GCJ -+ -+# Symbols that must always be exported. + + # Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_CXX +include_expsyms=$lt_include_expsyms_GCJ -+ + +-# Commands necessary for linking programs (against libraries) with templates. +-prelink_cmds=$lt_prelink_cmds_CXX +# ### END LIBTOOL TAG CONFIG: $tagname -+ + +-# Specify filename containing input files. +-file_list_spec=$lt_file_list_spec_CXX +__EOF__ -+ -+ + +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_CXX + +-# The directories searched by this compiler when creating a shared library. +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the @@ -24049,63 +48076,213 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test -f Makefile && make "$ltmain" + fi +fi -+ -+ + +-# Dependencies to place before and after the objects being linked to +-# create a shared library. +-predep_objects=$lt_predep_objects_CXX +-postdep_objects=$lt_postdep_objects_CXX +-predeps=$lt_predeps_CXX +-postdeps=$lt_postdeps_CXX + +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ + +-# ### END LIBTOOL TAG CONFIG: CXX +-_LT_EOF +CC="$lt_save_CC" -+ + + else + tagname="" + fi + ;; -+ + +-{ (exit 0); exit 0; } +-_LTEOF +-chmod +x "$CONFIG_LT" + RC) -+ -+ + +-# configure is writing to config.log, but config.lt does its own redirection, +-# appending to config.log, which fails on DOS, as config.log is still kept +-# open by configure. Here we exec the FD to /dev/null, effectively closing +-# config.log, so it can be properly (re)opened and appended to by config.lt. +-if test "$no_create" != yes; then +- lt_cl_success=: +- test "$silent" = yes && +- lt_config_lt_args="$lt_config_lt_args --quiet" +- exec 5>/dev/null +- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +- exec 5>>config.log +- $lt_cl_success || { (exit 1); exit 1; } +-fi + +# Source file extension for RC test sources. +ac_ext=rc -+ + +# Object file extension for compiled RC test sources. +objext=o +objext_RC=$objext -+ + +-# Make sure we use 64-bit versions of various file stuff. +-# Check whether --enable-largefile was given. +-if test "${enable_largefile+set}" = set; then +- enableval=$enable_largefile; +-fi +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' -+ + +-if test "$enable_largefile" != no; then +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" -+ + +- { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +-$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +-if test "${ac_cv_sys_largefile_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_sys_largefile_CC=no +- if test "$GCC" != yes; then +- ac_save_CC=$CC +- while :; do +- # IRIX 6.2 and later do not support large files by default, +- # so use the C compiler's -n32 option if that helps. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +- /* Check that off_t can represent 2**63 - 1 correctly. +- We can't simply define LARGE_OFF_T to be 9223372036854775807, +- since some C++ compilers masquerading as C compilers +- incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 +- && LARGE_OFF_T % 2147483647 == 1) +- ? 1 : -1]; +-int +-main () +-{ +# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ + +- ; +- return 0; +-} +-_ACEOF +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- break +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} -+ + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ + +-fi +# Allow CC to be a program name with arguments. +compiler=$CC -+ -+ + +-rm -f core conftest.err conftest.$ac_objext +- CC="$CC -n32" +- rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +# save warnings/boilerplate of simple test code +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* -+ + +-fi +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 -r conftest* -+ -+ + +-rm -f core conftest.err conftest.$ac_objext +- break +- done +- CC=$ac_save_CC +- rm -f conftest.$ac_ext +- fi +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +-$as_echo "$ac_cv_sys_largefile_CC" >&6; } +- if test "$ac_cv_sys_largefile_CC" != no; then +- CC=$CC$ac_cv_sys_largefile_CC +- fi + +- { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +-if test "${ac_cv_sys_file_offset_bits+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +- /* Check that off_t can represent 2**63 - 1 correctly. +- We can't simply define LARGE_OFF_T to be 9223372036854775807, +- since some C++ compilers masquerading as C compilers +- incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 +- && LARGE_OFF_T % 2147483647 == 1) +- ? 1 : -1]; +-int +-main () +-{ +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +CC=${RC-"windres"} @@ -24120,9 +48297,35 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +lt_cv_prog_compiler_c_o_RC=yes -+ + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are @@ -24204,198 +48407,627 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + done -+ + +-fi + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac -+ + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#define _FILE_OFFSET_BITS 64 +-#include <sys/types.h> +- /* Check that off_t can represent 2**63 - 1 correctly. +- We can't simply define LARGE_OFF_T to be 9223372036854775807, +- since some C++ compilers masquerading as C compilers +- incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 +- && LARGE_OFF_T % 2147483647 == 1) +- ? 1 : -1]; +-int +-main () +-{ +cfgfile="$ofile" -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ + +-fi +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL -+ + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_cv_sys_file_offset_bits=unknown +- break +-done +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +-$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +-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 +-;; +-esac +-rm -rf conftest* +- if test $ac_cv_sys_file_offset_bits = unknown; then +- { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +-if test "${ac_cv_sys_large_files+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- while :; do +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +- /* Check that off_t can represent 2**63 - 1 correctly. +- We can't simply define LARGE_OFF_T to be 9223372036854775807, +- since some C++ compilers masquerading as C compilers +- incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 +- && LARGE_OFF_T % 2147483647 == 1) +- ? 1 : -1]; +-int +-main () +-{ +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +# Whether or not to build static libraries. +build_old_libs=$enable_static -+ + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_RC -+ + +-fi +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC -+ + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#define _LARGE_FILES 1 +-#include <sys/types.h> +- /* Check that off_t can represent 2**63 - 1 correctly. +- We can't simply define LARGE_OFF_T to be 9223372036854775807, +- since some C++ compilers masquerading as C compilers +- incorrectly reject 9223372036854775807. */ +-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 +- && LARGE_OFF_T % 2147483647 == 1) +- ? 1 : -1]; +-int +-main () +-{ +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os -+ + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os -+ + +-fi +# An echo program that does not interpret backslashes. +echo=$lt_echo -+ + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_cv_sys_large_files=unknown +- break +-done +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +-$as_echo "$ac_cv_sys_large_files" >&6; } +-case $ac_cv_sys_large_files in #( +- no | unknown) ;; +- *) +-cat >>confdefs.h <<_ACEOF +-#define _LARGE_FILES $ac_cv_sys_large_files +-_ACEOF +-;; +-esac +-rm -rf conftest* +- fi +-fi +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS -+ + +# A C compiler. +LTCC=$lt_LTCC -+ + +-# By default we simply use the C compiler to build assembly code. +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS -+ + +-: ${CCAS='$(CC)'} +-# Set ASFLAGS if not already set. +-: ${CCASFLAGS='$(CFLAGS)'} +# A language-specific compiler. +CC=$lt_compiler_RC -+ + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_RC -+ + +-# Extract the first word of "nm", so it can be a program name with args. +-set dummy nm; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_NM+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $NM in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_NM="$NM" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +# An ERE matcher. +EGREP=$lt_EGREP -+ + +- test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" +- ;; +-esac +-fi +-NM=$ac_cv_path_NM +-if test -n "$NM"; then +- { $as_echo "$as_me:$LINENO: result: $NM" >&5 +-$as_echo "$NM" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +# The linker used to build libraries. +LD=$lt_LD_RC -+ + +# Whether we need hard or soft links. +LN_S=$lt_LN_S -+ + +# A BSD-compatible nm program. +NM=$lt_NM -+ + +-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +- # Check whether --enable-maintainer-mode was given. +-if test "${enable_maintainer_mode+set}" = set; then +- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +-else +- USE_MAINTAINER_MODE=no +-fi +# A symbol stripping program +STRIP=$lt_STRIP -+ + +- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +-$as_echo "$USE_MAINTAINER_MODE" >&6; } +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD -+ + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" -+ + +-if test $USE_MAINTAINER_MODE = yes; then +- MAINTAINER_MODE_TRUE= +- MAINTAINER_MODE_FALSE='#' +-else +- MAINTAINER_MODE_TRUE='#' +- MAINTAINER_MODE_FALSE= +-fi +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" -+ + +- MAINT=$MAINTAINER_MODE_TRUE +# Used on cygwin: assembler. +AS="$AS" -+ + +# The name of the directory that contains temporary libtool files. +objdir=$objdir -+ + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -+ + +-{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +-$as_echo_n "checking for some Win32 platform... " >&6; } +-case "$host" in +- *-*-mingw*|*-*-cygwin*) +- platform_win32=yes +- ;; +- *) +- platform_win32=no +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 +-$as_echo "$platform_win32" >&6; } +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_RC -+ + +# Object file suffix (normally "o"). +objext="$ac_objext" -+ + +-if test "$platform_win32" = "yes"; then +- PLATFORM_WIN32_TRUE= +- PLATFORM_WIN32_FALSE='#' +-else +- PLATFORM_WIN32_TRUE='#' +- PLATFORM_WIN32_FALSE= +-fi +# Old archive suffix (normally "a"). +libext="$libext" -+ + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' -+ + +# Executable file suffix (normally ""). +exeext="$exeext" -+ + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_RC +pic_mode=$pic_mode -+ + +-if test "$os_win32" = "yes"; then +- OS_WIN32_TRUE= +- OS_WIN32_FALSE='#' +-else +- OS_WIN32_TRUE='#' +- OS_WIN32_FALSE= +-fi +- +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len -+ + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -+ + +-if test "$os_win32" != "yes"; then +- OS_UNIX_TRUE= +- OS_UNIX_FALSE='#' +-else +- OS_UNIX_TRUE='#' +- OS_UNIX_FALSE= +-fi +# Must we lock files when doing compilation? +need_locks=$lt_need_locks -+ + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix -+ + +# Do we need a version for libraries? +need_version=$need_version -+ + +-if test "$os_linux" = "yes"; then +- OS_LINUX_TRUE= +- OS_LINUX_FALSE='#' +-else +- OS_LINUX_TRUE='#' +- OS_LINUX_FALSE= +-fi +# Whether dlopen is supported. +dlopen_support=$enable_dlopen -+ + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self -+ + +-if test "$os_win32" = "yes"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. +-set dummy ${ac_tool_prefix}windres; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_WINDRES+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$WINDRES"; then +- ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_WINDRES="${ac_tool_prefix}windres" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static -+ + +-fi +-fi +-WINDRES=$ac_cv_prog_WINDRES +-if test -n "$WINDRES"; then +- { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 +-$as_echo "$WINDRES" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_RC -+ + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC -+ + +-fi +-if test -z "$ac_cv_prog_WINDRES"; then +- ac_ct_WINDRES=$WINDRES +- # Extract the first word of "windres", so it can be a program name with args. +-set dummy windres; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_WINDRES"; then +- ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_WINDRES="windres" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC -+ + +-fi +-fi +-ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES +-if test -n "$ac_ct_WINDRES"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 +-$as_echo "$ac_ct_WINDRES" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC -+ + +- if test "x$ac_ct_WINDRES" = x; then +- WINDRES="no" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- WINDRES=$ac_ct_WINDRES +- fi +-else +- WINDRES="$ac_cv_prog_WINDRES" +-fi +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC -+ + +- if test "$WINDRES" = no; then +- { { $as_echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 +-$as_echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} +- { (exit 1); exit 1; }; } +- fi +- # Extract the first word of "lib.exe", so it can be a program name with args. +-set dummy lib.exe; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ms_librarian+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ms_librarian"; then +- ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ms_librarian="yes" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +# Library versioning type. +version_type=$version_type -+ + +- test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" +-fi +-fi +-ms_librarian=$ac_cv_prog_ms_librarian +-if test -n "$ms_librarian"; then +- { $as_echo "$as_me:$LINENO: result: $ms_librarian" >&5 +-$as_echo "$ms_librarian" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +# Format of library name prefix. +libname_spec=$lt_libname_spec -+ + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec -+ + +-fi +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec -+ + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_RC +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ + +-if test x$ms_librarian = xyes; then +- MS_LIB_AVAILABLE_TRUE= +- MS_LIB_AVAILABLE_FALSE='#' +-else +- MS_LIB_AVAILABLE_TRUE='#' +- MS_LIB_AVAILABLE_FALSE= +-fi +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC -+ + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC -+ + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_RC +archive_expsym_cmds=$lt_archive_expsym_cmds_RC +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds -+ + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_RC +module_expsym_cmds=$lt_module_expsym_cmds_RC -+ + +-# Check whether --enable-debug was given. +-if test "${enable_debug+set}" = set; then +- enableval=$enable_debug; +-else +- enable_debug=minimum +-fi +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib -+ + +-# Check whether --enable-shm was given. +-if test "${enable_shm+set}" = set; then +- enableval=$enable_shm; +-else +- enable_shm="yes" +-fi +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_RC @@ -24415,57 +49047,102 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# The directories searched by this compiler when creating a shared +# library +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC -+ + +-# Check whether --enable-xkb was given. +-if test "${enable_xkb+set}" = set; then +- enableval=$enable_xkb; +-else +- enable_xkb="maybe" +-fi +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_RC -+ + +-# Check whether --enable-xinerama was given. +-if test "${enable_xinerama+set}" = set; then +- enableval=$enable_xinerama; +-else +- enable_xinerama="yes" +-fi +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method -+ + +-# Check whether --enable-rebuilds was given. +-if test "${enable_rebuilds+set}" = set; then +- enableval=$enable_rebuilds; +-else +- enable_rebuilds=yes +-fi +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd -+ + +-# Check whether --enable-visibility was given. +-if test "${enable_visibility+set}" = set; then +- enableval=$enable_visibility; +-else +- enable_visibility=yes +-fi +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_RC -+ + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_RC -+ + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds -+ + +-# Check whether --with-xinput was given. +-if test "${with_xinput+set}" = set; then +- withval=$with_xinput; +-fi +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval -+ + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ + +-if test "$platform_win32" = yes; then +- gdktarget=win32 +-else +- gdktarget=x11 +-fi +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ + +-# Check whether --with-gdktarget was given. +-if test "${with_gdktarget+set}" = set; then +- withval=$with_gdktarget; gdktarget=$with_gdktarget +-fi +# This is the shared library runtime path variable. +runpath_var=$runpath_var -+ + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var -+ + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ + +-case $gdktarget in +- x11|win32|quartz|directfb) ;; +- *) { { $as_echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 +-$as_echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} +- { (exit 1); exit 1; }; };; +-esac +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_RC -+ + +-gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la +-gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs -+ + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC -+ + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. @@ -24489,44 +49166,99 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_RC -+ + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" -+ + +-if test "x$enable_debug" = "xyes"; then +- test "$cflags_set" = set || CFLAGS="$CFLAGS -g" +- GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" +-else +- if test "x$enable_debug" = "xno"; then +- GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" +- else +- GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS" +- fi +-fi +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_RC -+ + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ + +-if test "x$enable_visibility" = "xno"; then +- GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY" +-fi +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path -+ + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_RC -+ + +-cat >>confdefs.h <<_ACEOF +-#define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}" +-_ACEOF +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_RC -+ + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_RC -+ + +-# Build time sanity check... +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-$as_echo_n "checking whether build environment is sane... " >&6; } +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$*" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` +- fi +- rm -f conftest.file +- if test "$*" != "X $srcdir/configure conftest.file" \ +- && test "$*" != "X conftest.file $srcdir/configure"; then +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_RC + +# ### END LIBTOOL TAG CONFIG: $tagname + +__EOF__ -+ -+ -+else + +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&5 +-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +-alias in your environment" >&2;} +- { (exit 1); exit 1; }; } +- fi + +- test "$2" = conftest.file +- ) +-then +- # Ok. +- : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! +-Check your system clock" >&5 +-$as_echo "$as_me: error: newly created file is older than distributed files! +-Check your system clock" >&2;} + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. @@ -24570,10 +49302,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + rm -f "${ofile}T" + { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 +echo "$as_me: error: unable to update list of available tagged configurations." >&2;} -+ { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; } + fi -+fi -+ + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } + +-# Checks for programs. +-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 +-$as_echo_n "checking for library containing strerror... " >&6; } +-if test "${ac_cv_search_strerror+set}" = set; then +- $as_echo_n "(cached) " >&6 + + +# This can be used to rebuild libtool when needed @@ -24594,14 +49333,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + + + -+ -+ -+ + + -+ -+ -+ ++ ++ ++ ++ ++ ++ + + + @@ -24609,7 +49348,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# Make sure we use 64-bit versions of various file stuff. +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then -+ enableval=$enable_largefile; ++ enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then @@ -24618,7 +49357,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } +if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC @@ -24626,54 +49367,91 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <sys/types.h> + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char strerror (); ++#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ -+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; -+int -+main () -+{ + int + main () + { +-return strerror (); + -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-for ac_lib in '' cposix; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_search_strerror=$ac_res + } && test -s conftest.$ac_objext; then + break -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM +-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 +-fi +-done +-if test "${ac_cv_search_strerror+set}" = set; then +- : ++rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" @@ -24693,14 +49471,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_largefile_CC=' -n32'; break -+else + else +- ac_cv_search_strerror=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +-$as_echo "$ac_cv_search_strerror" >&6; } +-ac_res=$ac_cv_search_strerror +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- +-fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + + +fi -+ -+rm -f core conftest.err conftest.$ac_objext + ++rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC @@ -24712,75 +49502,160 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi -+ + +-{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 +-$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; } +-if test "${am_cv_prog_cc_stdc+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- am_cv_prog_cc_stdc=no +-ac_save_CC="$CC" +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" + { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } +if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <sys/types.h> + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <stdarg.h> +-#include <stdio.h> + #include <sys/types.h> +-#include <sys/stat.h> +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv; +- + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ -+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + int + main () + { + +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +- + ; + return 0; + } +@@ -18519,252 +20836,341 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 + ac_cv_sys_file_offset_bits=no; break -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-done +-CC="$ac_save_CC" +- +-fi +- +-if test -z "$am_cv_prog_cc_stdc"; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 +-$as_echo "$am_cv_prog_cc_stdc" >&6; } +-fi +-case "x$am_cv_prog_cc_stdc" in +- x|xno) ;; +- *) CC="$CC $am_cv_prog_cc_stdc" ;; +-esac +- +-# Find a good install program. We prefer a C program (faster), +-# so one script is as good as another. But avoid the broken or +-# incompatible versions: +-# SysV /etc/install, /usr/sbin/install +-# SunOS /usr/etc/install +-# IRIX /sbin/install +-# AIX /bin/install +-# AmigaOS /C/install, which installs bootblocks on floppy discs +-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +-# AFS /usr/afsws/bin/install, which mishandles nonexistent args +-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +-# OS/2's system install, which has a completely different semantic +-# ./install, which can be erroneously created by make from ./install.sh. +-# Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-$as_echo_n "checking for a BSD-compatible install... " >&6; } +-if test -z "$INSTALL"; then +-if test "${ac_cv_path_install+set}" = set; then +- $as_echo_n "(cached) " >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@define _FILE_OFFSET_BITS 64 -+@%:@include <sys/types.h> ++#define _FILE_OFFSET_BITS 64 ++#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ -+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; @@ -24810,11 +49685,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_file_offset_bits=64; break -+else + else +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- # Account for people who put trailing slashes in PATH elements. +-case $as_dir/ in +- ./ | .// | /cC/* | \ +- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ +- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ +- /usr/ucb/* ) ;; + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + -+ ++ +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -24826,12 +49712,44 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; -+ *) + *) +- # OSF1 and SCO ODT 3.0 have their own names for install. +- # Don't use installbsd from OSF since it installs stuff as root +- # 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_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. +- : +- elif test $ac_prog = install && +- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then +- # program-specific install script used by HP pwplus--don't use. +- : +- else +- rm -rf conftest.one conftest.two conftest.dir +- echo one > conftest.one +- echo two > conftest.two +- mkdir conftest.dir +- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +- test -s conftest.one && test -s conftest.two && +- test -s conftest.dir/conftest.one && +- test -s conftest.dir/conftest.two +- then +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi +- fi +- fi +- done +- done +- ;; +cat >>confdefs.h <<_ACEOF -+@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits ++#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; -+esac + esac +rm -f conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 @@ -24846,19 +49764,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <sys/types.h> ++#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ -+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ -+ + +-done +-IFS=$as_save_IFS + ; + return 0; +} @@ -24884,10 +49804,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ + +-rm -rf conftest.one conftest.two conftest.dir + + fi +- if test "${ac_cv_path_install+set}" = set; then +- INSTALL=$ac_cv_path_install +- else +- # As a last resort, use the slow shell script. Don't cache a +- # value for INSTALL within a source directory, because that will +- # break other packages using the cache if that directory is +- # removed, or if the value is a relative name. +- INSTALL=$ac_install_sh +- fi +-fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +-$as_echo "$INSTALL" >&6; } + +-# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +-# It thinks the first close brace ends the variable substitution. +-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ @@ -24895,20 +49831,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@define _LARGE_FILES 1 -+@%:@include <sys/types.h> ++#define _LARGE_FILES 1 ++#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ -+@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ -+ + +-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + ; + return 0; +} @@ -24934,8 +49871,25 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + +-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +-set x ${MAKE-make} +-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.make <<\_ACEOF +-SHELL = /bin/sh +-all: +- @echo '@@@%%%=$(MAKE)=@@@%%%' +-_ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-case `${MAKE-make} -f conftest.make 2>/dev/null` in +- *@@@%%%=?*=@@@%%%*) +- eval ac_cv_prog_make_${ac_make}_set=yes;; +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -24947,24 +49901,77 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; -+ *) + *) +- eval ac_cv_prog_make_${ac_make}_set=no;; +cat >>confdefs.h <<_ACEOF -+@%:@define _LARGE_FILES $ac_cv_sys_large_files ++#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; -+esac + esac +-rm -f conftest.make +-fi +-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- SET_MAKE= +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- SET_MAKE="MAKE=${MAKE-make}" +rm -f conftest* + fi -+fi -+ -+ + fi + + +-if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) CFLAGS="$CFLAGS -Wall" ;; +- esac +# By default we simply use the C compiler to build assembly code. -+ + +- if test "x$enable_ansi" = "xyes"; then +- case " $CFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) CFLAGS="$CFLAGS -ansi" ;; +- esac +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS -+ -+ -+ + +- case " $CFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) CFLAGS="$CFLAGS -pedantic" ;; +- esac +- fi +-fi + +-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" + +-# Ensure MSVC-compatible struct packing convention is used when +-# compiling for Win32 with gcc. +-# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while +-# gcc2 uses "-fnative-struct". +-if test x"$os_win32" = xyes; then +- if test x"$GCC" = xyes; then +- msnative_struct='' +- { $as_echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 +-$as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; } +- if test -z "$ac_cv_prog_CC"; then +- our_gcc="$CC" +- else +- our_gcc="$ac_cv_prog_CC" +- fi +- case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in +- 2.) +- if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then +- msnative_struct='-fnative-struct' +- fi +- ;; +- *) +- if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then +- msnative_struct='-mms-bitfields' +- fi +- ;; +depcc="$CCAS" am_compiler_list= + +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 @@ -25023,7 +50030,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + ;; + none) break ;; -+ esac + esac +- if test x"$msnative_struct" = x ; then +- { $as_echo "$as_me:$LINENO: result: no way" >&5 +-$as_echo "no way" >&6; } +- { $as_echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 +-$as_echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} +- else +- CFLAGS="$CFLAGS $msnative_struct" +- { $as_echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 +-$as_echo "${msnative_struct}" >&6; } + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. @@ -25048,21 +50064,30 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + am_cv_CCAS_dependencies_compiler_type=$depmode + break + fi -+ fi + fi +- fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CCAS_dependencies_compiler_type=none -+fi -+ + fi + +-# Honor aclocal flags +-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" +fi +{ echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CCAS_dependencies_compiler_type" >&6; } +CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type -+ -+ if + +-## Initial sanity check, done here so that users get told they +-## have the wrong dependencies as early in the process as possible. +-## Later on we actually use the cflags/libs from separate pkg-config +-## calls. Oh, also the later pkg-config calls don't include +-## the version requirements since those make the module lists +-## annoying to construct ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then + am__fastdepCCAS_TRUE= @@ -25071,49 +50096,65 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + am__fastdepCCAS_TRUE='#' + am__fastdepCCAS_FALSE= +fi -+ -+ + + +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 +# Extract the first word of "nm", so it can be a program name with args. +set dummy nm; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- case $PKG_CONFIG in + case $NM in -+ [\\/]* | ?:[\\/]*) + [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ac_cv_path_NM="$NM" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -18774,492 +21180,411 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + 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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ + break 2 + fi + done + done + IFS=$as_save_IFS + + test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" -+ ;; -+esac -+fi + ;; + esac + fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } +NM=$ac_cv_path_NM +if test -n "$NM"; then + { echo "$as_me:$LINENO: result: $NM" >&5 +echo "${ECHO_T}$NM" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ + fi + + + +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } @@ -25122,20 +50163,32 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no -+fi + fi +-if test -z "$ac_cv_path_PKG_CONFIG"; then +- ac_pt_PKG_CONFIG=$PKG_CONFIG +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' -+else + else +- case $ac_pt_PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. +- ;; + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE -+ ++ + + +{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 @@ -25144,7 +50197,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *-*-mingw*|*-*-cygwin*) + platform_win32=yes + ;; -+ *) + *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + platform_win32=no + ;; +esac @@ -25197,31 +50251,43 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_WINDRES="${ac_tool_prefix}windres" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi + break 2 + fi + done + done + IFS=$as_save_IFS + +- ;; +-esac + fi +-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +-if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-$as_echo "$ac_pt_PKG_CONFIG" >&6; } +fi +WINDRES=$ac_cv_prog_WINDRES +if test -n "$WINDRES"; then + { echo "$as_me:$LINENO: result: $WINDRES" >&5 +echo "${ECHO_T}$WINDRES" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ + fi + +- if test "x$ac_pt_PKG_CONFIG" = x; then +- PKG_CONFIG="" + +fi +if test -z "$ac_cv_prog_WINDRES"; then @@ -25264,23 +50330,57 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + + if test "x$ac_ct_WINDRES" = x; then + WINDRES="no" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac + ac_tool_warned=yes ;; + esac +- PKG_CONFIG=$ac_pt_PKG_CONFIG + WINDRES=$ac_ct_WINDRES -+ fi -+else + fi + else +- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +-fi +- +-fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=0.9.0 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- PKG_CONFIG="" +- fi +- + WINDRES="$ac_cv_prog_WINDRES" -+fi -+ + fi + +-pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 +-$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; } +- +-if test -n "$BASE_DEPENDENCIES_CFLAGS"; then +- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` + if test "$WINDRES" = no; then + { { echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 +echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} @@ -25292,7 +50392,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ms_librarian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- pkg_failed=yes + if test -n "$ms_librarian"; then + ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. +else @@ -25312,131 +50413,355 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +IFS=$as_save_IFS + + test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" -+fi -+fi + fi +- else +- pkg_failed=untried + fi +-if test -n "$BASE_DEPENDENCIES_LIBS"; then +- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` +ms_librarian=$ac_cv_prog_ms_librarian +if test -n "$ms_librarian"; then + { echo "$as_me:$LINENO: result: $ms_librarian" >&5 +echo "${ECHO_T}$ms_librarian" >&6; } -+else + else +- pkg_failed=yes + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ + fi +- else +- pkg_failed=untried +-fi +- +- + +-if test $pkg_failed = yes; then + +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +fi + if test x$ms_librarian = xyes; then + MS_LIB_AVAILABLE_TRUE= + MS_LIB_AVAILABLE_FALSE='#' -+else + else +- _pkg_short_errors_supported=no + MS_LIB_AVAILABLE_TRUE='#' + MS_LIB_AVAILABLE_FALSE= -+fi -+ -+ -+ -+ + fi +- if test $_pkg_short_errors_supported = yes; then +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` +- else +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 +- +- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: +- +-$BASE_DEPENDENCIES_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. + +-Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS +-and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&5 +-$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: +- +-$BASE_DEPENDENCIES_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS +-and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } +-elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: 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 +-path to pkg-config. + +-Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS +-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://pkg-config.freedesktop.org/>. +-See \`config.log' for more details." >&5 +-$as_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 +-path to pkg-config. + +-Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS +-and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then -+ enableval=$enable_debug; ++ enableval=$enable_debug; +else + enable_debug=minimum +fi -+ + +-To get pkg-config, see <http://pkg-config.freedesktop.org/>. +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } +# Check whether --enable-shm was given. +if test "${enable_shm+set}" = set; then -+ enableval=$enable_shm; -+else ++ enableval=$enable_shm; + else +- BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS +- BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- : + enable_shm="yes" -+fi -+ + fi + +-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 "^[^_].*"' +# Check whether --enable-xkb was given. +if test "${enable_xkb+set}" = set; then -+ enableval=$enable_xkb; -+else ++ enableval=$enable_xkb; + else +- # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk) +- LIBTOOL_EXPORT_OPTIONS= + enable_xkb="maybe" -+fi -+ + fi + +# Check whether --enable-xinerama was given. +if test "${enable_xinerama+set}" = set; then -+ enableval=$enable_xinerama; ++ enableval=$enable_xinerama; +else + enable_xinerama="yes" +fi -+ + +# Check whether --enable-rebuilds was given. +if test "${enable_rebuilds+set}" = set; then -+ enableval=$enable_rebuilds; ++ enableval=$enable_rebuilds; +else + enable_rebuilds=yes +fi -+ + +-# Check whether --enable-explicit-deps was given. +-if test "${enable_explicit_deps+set}" = set; then +- enableval=$enable_explicit_deps; +# Check whether --enable-visibility was given. +if test "${enable_visibility+set}" = set; then -+ enableval=$enable_visibility; -+else ++ enableval=$enable_visibility; + else +- enable_explicit_deps=auto + enable_visibility=yes -+fi -+ -+ -+ + fi + + +-{ $as_echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 +-$as_echo_n "checking Whether to write dependencies into .pc files... " >&6; } +-case $enable_explicit_deps in +- auto) +- export SED +- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` +- if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then +- enable_explicit_deps=yes +- else +- enable_explicit_deps=no +- fi +- ;; +- yes|no) +- ;; +- *) { { $as_echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 +-$as_echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} +- { (exit 1); exit 1; }; } +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 +-$as_echo "$enable_explicit_deps" >&6; } + +# Check whether --with-xinput was given. +if test "${with_xinput+set}" = set; then -+ withval=$with_xinput; ++ withval=$with_xinput; +fi -+ -+ + + +-if test $enable_explicit_deps = no; then +- DISABLE_EXPLICIT_DEPS_TRUE= +- DISABLE_EXPLICIT_DEPS_FALSE='#' +if test "$platform_win32" = yes; then + gdktarget=win32 -+else + else +- DISABLE_EXPLICIT_DEPS_TRUE='#' +- DISABLE_EXPLICIT_DEPS_FALSE= + gdktarget=x11 -+fi -+ -+ + fi + + +-# define a MAINT-like variable REBUILD which is set if Perl +-# and awk are found, so autogenerated sources can be rebuilt +# Check whether --with-gdktarget was given. +if test "${with_gdktarget+set}" = set; then + withval=$with_gdktarget; gdktarget=$with_gdktarget +fi -+ -+ + +-for ac_prog in perl5 perl +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PERL+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $PERL in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PERL="$PERL" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + +- ;; + +case $gdktarget in + x11|win32|quartz|directfb) ;; + *) { { echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 +echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} + { (exit 1); exit 1; }; };; -+esac -+ + esac +-fi +-PERL=$ac_cv_path_PERL +-if test -n "$PERL"; then +- { $as_echo "$as_me:$LINENO: result: $PERL" >&5 +-$as_echo "$PERL" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi + +gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la +gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la -+ -+ -+ -+ + +- test -n "$PERL" && break +-done + + +-# We would like indent, but don't require it. +-# Extract the first word of "indent", so it can be a program name with args. +-set dummy indent; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_INDENT+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$INDENT"; then +- ac_cv_prog_INDENT="$INDENT" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_INDENT="indent" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + +-fi +-fi +-INDENT=$ac_cv_prog_INDENT +-if test -n "$INDENT"; then +- { $as_echo "$as_me:$LINENO: result: $INDENT" >&5 +-$as_echo "$INDENT" >&6; } +if test "x$enable_debug" = "xyes"; then + test "$cflags_set" = set || CFLAGS="$CFLAGS -g" -+ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" -+else ++ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + if test "x$enable_debug" = "xno"; then + GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" + else + GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS" + fi -+fi -+ -+ + fi + + +- +-REBUILD=\# +-if test "x$enable_rebuilds" = "xyes" && \ +- test -n "$PERL" && \ +- $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then +- REBUILD= +if test "x$enable_visibility" = "xno"; then + GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY" -+fi -+ -+ -+ + fi + + + +cat >>confdefs.h <<_ACEOF -+@%:@define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}" ++#define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}" +_ACEOF -+ -+ -+ + + + +-for ac_func in lstat mkstemp flockfile getc_unlocked +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef $ac_func +# Build time sanity check... +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } @@ -25457,7 +50782,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually @@ -25468,51 +50806,138 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi -+ + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" + test "$2" = conftest.file + ) +then + # Ok. + : -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! +Check your system clock" >&5 +echo "$as_me: error: newly created file is older than distributed files! +Check your system clock" >&2;} + { (exit 1); exit 1; }; } -+fi + fi +-done +- +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -+ + +-for ac_func in localtime_r +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +# Checks for programs. +{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 +echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } +if test "${ac_cv_search_strerror+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef $ac_func + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -19267,414 +21592,496 @@ + #ifdef __cplusplus + extern "C" + #endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +char strerror (); -+int -+main () -+{ + int + main () + { +-return $ac_func (); +return strerror (); -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' cposix; do + if test -z "$ac_lib"; then + ac_res="none required" @@ -25521,37 +50946,61 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_strerror=$ac_res -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" +-fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext ++ conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then + break -+fi -+done + fi + done +if test "${ac_cv_search_strerror+set}" = set; then + : +else @@ -25565,9 +51014,52 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ac_res=$ac_cv_search_strerror +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ + +fi -+ + +-# _NL_TIME_FIRST_WEEKDAY is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 +-$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <langinfo.h> +-int +-main () +-{ +- +-char c; +-c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY)); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- gtk_ok=yes +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -25580,7 +51072,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else @@ -25598,7 +51092,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +- gtk_ok=no +fi +fi +CC=$ac_cv_prog_CC @@ -25608,10 +51103,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } +-if test "$gtk_ok" = "yes"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE__NL_TIME_FIRST_WEEKDAY 1 +-_ACEOF + + fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. @@ -25638,7 +51143,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +-# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 +-$as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <langinfo.h> +-int +-main () +-{ +- +-char c; +-c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT)); +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC @@ -25649,7 +51170,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; + if test "x$ac_ct_CC" = x; then + CC="" + else @@ -25662,13 +51192,43 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- gtk_ok=yes + CC=$ac_ct_CC + fi -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gtk_ok=no + CC="$ac_cv_prog_CC" -+fi -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } +-if test "$gtk_ok" = "yes"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE__NL_MEASUREMENT_MEASUREMENT 1 +-_ACEOF +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. @@ -25695,21 +51255,79 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ -+fi + + fi +- +-# _NL_PAPER_HEIGHT is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 +-$as_echo_n "checking for _NL_PAPER_HEIGHT... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <langinfo.h> +-int +-main () +-{ +- +-char c; +-c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT)); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- gtk_ok=yes +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gtk_ok=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } +-if test "$gtk_ok" = "yes"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE__NL_PAPER_HEIGHT 1 +-_ACEOF + + fi -+fi + fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 @@ -25740,12 +51358,25 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +-# _NL_PAPER_WIDTH is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 +-$as_echo_n "checking for _NL_PAPER_WIDTH... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <langinfo.h> +-int +-main () +-{ +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift -+ if test $@%:@ != 0; then ++ if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. @@ -25763,8 +51394,36 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ -+ + +-char c; +-c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH)); + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- gtk_ok=yes +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then @@ -25776,7 +51435,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else @@ -25794,7 +51455,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +- gtk_ok=no +fi +fi +CC=$ac_cv_prog_CC @@ -25804,9 +51466,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } +-if test "$gtk_ok" = "yes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE__NL_PAPER_WIDTH 1 +-_ACEOF + test -n "$CC" && break + done +fi @@ -25870,9 +51541,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + CC=$ac_ct_CC + fi +fi -+ -+fi -+ + + fi + +-# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable +-{ $as_echo "$as_me:$LINENO: checking for sigsetjmp" >&5 +-$as_echo_n "checking for sigsetjmp... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 @@ -25920,52 +51595,97 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <setjmp.h> + -+int -+main () -+{ + int + main () + { +- +-sigjmp_buf env; +-sigsetjmp(env, 0); +#ifndef __GNUC__ + choke me +#endif -+ -+ ; -+ return 0; -+} -+_ACEOF + + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- gtk_ok=yes + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- gtk_ok=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } +-if test "$gtk_ok" = "yes"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SIGSETJMP 1 +-_ACEOF +- + ac_compiler_gnu=no -+fi -+ + fi + +-# i18n stuff +-ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" +- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu -+ -+fi + +-for ac_header in locale.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +GCC=`test $ac_compiler_gnu = yes && echo yes` @@ -25975,17 +51695,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> + +int +main () @@ -25994,36 +51720,53 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -19682,1106 +22089,929 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + ac_cv_prog_cc_g=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <$ac_header> + +int +main () @@ -26032,77 +51775,180 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + test ! -s conftest.err +- }; then +- ac_header_preproc=yes + } && test -s conftest.$ac_objext; then + : -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- if test $ac_cv_header_locale_h = yes; then +- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +-$as_echo_n "checking for LC_MESSAGES... " >&6; } +-if test "${am_cv_val_LC_MESSAGES+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <locale.h> + -+int -+main () -+{ + int + main () + { +-return LC_MESSAGES + -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- am_cv_val_LC_MESSAGES=yes + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi + sed 's/^/| /' conftest.$ac_ext >&5 + +- am_cv_val_LC_MESSAGES=no + + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +-$as_echo "$am_cv_val_LC_MESSAGES" >&6; } +- if test $am_cv_val_LC_MESSAGES = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LC_MESSAGES 1 +-_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ + +- fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi @@ -26115,27 +51961,183 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + CFLAGS="-g -O2" + else + CFLAGS="-g" -+ fi -+else + fi +- USE_NLS=yes +- +- +- gt_cv_have_gettext=no +- +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= +- +- if test "${ac_cv_header_libintl_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } +-if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 +-$as_echo_n "checking libintl.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <libintl.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 +-$as_echo_n "checking libintl.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <libintl.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } +-if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 + else +- ac_cv_header_libintl_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } +- + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi -+fi + fi +-if test "x$ac_cv_header_libintl_h" = x""yes; then +- gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" +- +- # +- # First check in libc +- # +- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 +-$as_echo_n "checking for ngettext in libc... " >&6; } +-if test "${gt_cv_func_ngettext_libc+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-#include <libintl.h> +- +-int +-main () +#include <stdarg.h> +#include <stdio.h> +#include <sys/types.h> @@ -26146,7 +52148,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +static char *e (p, i) + char **p; + int i; -+{ + { +-return !ngettext ("","", 1) +- ; +- return 0; + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) @@ -26157,8 +52162,57 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + s = g (p, va_arg (v,int)); + va_end (v); + return s; -+} -+ + } +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- gt_cv_func_ngettext_libc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gt_cv_func_ngettext_libc=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +-$as_echo "$gt_cv_func_ngettext_libc" >&6; } + +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 +-$as_echo_n "checking for dgettext in libc... " >&6; } +-if test "${gt_cv_func_dgettext_libc+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated @@ -26167,62 +52221,83 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -+ + +-#include <libintl.h> +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; -+int -+main () -+{ + int + main () + { +-return !dgettext ("","") +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- gt_cv_func_dgettext_libc=yes + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- gt_cv_func_dgettext_libc=no + -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC -+ -+fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 +-$as_echo "$gt_cv_func_dgettext_libc" >&6; } +- fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) @@ -26236,16 +52311,43 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; +esac -+ -+ + +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then + +-for ac_func in bind_textdomain_codeset +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +depcc="$CC" am_compiler_list= -+ + +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then @@ -26269,7 +52371,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -+ + +-#undef $ac_func + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` @@ -26290,7 +52393,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll @@ -26329,19 +52445,66 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + done -+ + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" + cd .. + rm -rf conftest.dir -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" + am_cv_CC_dependencies_compiler_type=none -+fi -+ -+fi + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -+ -+ if + ++ if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= @@ -26349,12 +52512,70 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= -+fi -+ -+ -+ + fi +-done + +- fi + +- # +- # If we don't have everything we want, check in libintl +- # +- if test "$gt_cv_func_dgettext_libc" != "yes" \ +- || test "$gt_cv_func_ngettext_libc" != "yes" \ +- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + +- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 +-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bindtextdomain (); +-int +-main () +-{ +-return bindtextdomain (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_intl_bindtextdomain=yes +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: @@ -26373,7 +52594,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -26411,9 +52634,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +esac +done +IFS=$as_save_IFS -+ -+ -+fi + +- ac_cv_lib_intl_bindtextdomain=no +-fi + +-rm -rf conftest.dSYM +-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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 +-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +-$as_echo_n "checking for ngettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_ngettext+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else @@ -26426,7 +52671,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +fi +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char ngettext (); +-int +-main () +-{ +-return ngettext (); +- ; +- return 0; +-} +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' @@ -26445,26 +52704,50 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_intl_ngettext=yes +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + SET_MAKE= -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi -+ + +- ac_cv_lib_intl_ngettext=no + +if test "x$GCC" = "xyes"; then + case " $CFLAGS " in @@ -26483,8 +52766,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *) CFLAGS="$CFLAGS -pedantic" ;; + esac + fi -+fi -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" + +# Ensure MSVC-compatible struct packing convention is used when @@ -26524,16 +52811,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}${msnative_struct}" >&6; } + fi + fi -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +-$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +-$as_echo_n "checking for dgettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_dgettext+set}" = set; then +- $as_echo_n "(cached) " >&6 + +# Honor aclocal flags +ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + -+## Initial sanity check, done here so that users get told they ++## Initial sanity check, done here so that users get told they +## have the wrong dependencies as early in the process as possible. +## Later on we actually use the cflags/libs from separate pkg-config -+## calls. Oh, also the later pkg-config calls don't include -+## the version requirements since those make the module lists ++## calls. Oh, also the later pkg-config calls don't include ++## the version requirements since those make the module lists +## annoying to construct + + @@ -26545,7 +52839,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -26565,21 +52867,60 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dgettext (); +-int +-main () +-{ +-return dgettext (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; + ;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_intl_dgettext=yes +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + -+ -+fi + +- ac_cv_lib_intl_dgettext=no + fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. @@ -26608,10 +52949,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS + ;; +esac -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +-$as_echo "$ac_cv_lib_intl_dgettext" >&6; } +-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then +- gt_cv_func_dgettext_libintl=yes +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 @@ -26619,8 +52968,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ + fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else @@ -26638,9 +52987,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi + fi + + fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 @@ -26653,13 +53002,55 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi -+ + +fi -+ + +- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 +-$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } +- { $as_echo "$as_me:$LINENO: result: " >&5 +-$as_echo "" >&6; } +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +-$as_echo_n "checking for ngettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_ngettext+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl -liconv $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +pkg_failed=no +{ echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 +echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; } -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char ngettext (); +-int +-main () +-{ +-return ngettext (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +if test -n "$PKG_CONFIG"; then + if test -n "$BASE_DEPENDENCIES_CFLAGS"; then + pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" @@ -26667,15 +53058,77 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 -+ ac_status=$? + ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_intl_ngettext=yes + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_ngettext=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS + pkg_failed=yes -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +-$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +-$as_echo_n "checking for dcgettext in -lintl... " >&6; } +-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then +- $as_echo_n "(cached) " >&6 + fi -+else + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl -liconv $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dcgettext (); +-int +-main () +-{ +-return dcgettext (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then @@ -26685,53 +53138,165 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 -+ ac_status=$? + ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_intl_dcgettext=yes + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_intl_dcgettext=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS + pkg_failed=yes -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then +- gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv + fi -+else + else +- : + pkg_failed=untried -+fi -+ + fi + + + +if test $pkg_failed = yes; then -+ ++ +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes -+else + else +- : + _pkg_short_errors_supported=no -+fi + fi +- + if test $_pkg_short_errors_supported = yes; then + BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` -+ else ++ else + BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` -+ fi + fi + # Put the nasty error message in config.log where it belongs + echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 -+ + +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset + { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: -+ + +-for ac_func in bind_textdomain_codeset +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +$BASE_DEPENDENCIES_PKG_ERRORS -+ + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -+ + +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS +and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: -+ + +-#undef $ac_func +$BASE_DEPENDENCIES_PKG_ERRORS -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -+ + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS +and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. @@ -26741,11 +53306,27 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { { echo "$as_me:$LINENO: 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 +path to pkg-config. -+ + +- eval "$as_ac_var=no" +-fi +Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS +and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -+ + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +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 @@ -26755,7 +53336,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS +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://pkg-config.freedesktop.org/>. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } @@ -26765,8 +53346,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : -+fi -+ + fi +-done + +- LIBS="$glib_save_LIBS" +if test "$os_win32" != yes; then + # libtool option to control which symbols are exported + # right now, symbols starting with _ are not exported @@ -26775,17 +53358,38 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk) + LIBTOOL_EXPORT_OPTIONS= +fi -+ -+ -+ + +- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then +- gt_cv_func_dgettext_libc=no +- else +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- && test "$gt_cv_func_ngettext_libc" = "yes"; then +- gt_cv_func_dgettext_libintl=no +- fi +- fi +- fi +- fi + +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- || test "$gt_cv_func_dgettext_libintl" = "yes"; then +- gt_cv_have_gettext=yes +- fi + +- if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" +- fi +# Check whether --enable-explicit-deps was given. +if test "${enable_explicit_deps+set}" = set; then -+ enableval=$enable_explicit_deps; ++ enableval=$enable_explicit_deps; +else + enable_explicit_deps=auto +fi -+ -+ + +- if test "$gt_cv_have_gettext" = "yes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_GETTEXT 1 +-_ACEOF +{ echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 +echo $ECHO_N "checking Whether to write dependencies into .pc files... $ECHO_C" >&6; } +case $enable_explicit_deps in @@ -26793,12 +53397,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + export SED + deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` + if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then -+ enable_explicit_deps=yes ++ enable_explicit_deps=yes + else -+ enable_explicit_deps=no ++ enable_explicit_deps=no + fi + ;; -+ yes|no) ++ yes|no) + ;; + *) { { echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 +echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} @@ -26807,11 +53411,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +esac +{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 +echo "${ECHO_T}$enable_explicit_deps" >&6; } -+ + +- # Extract the first word of "msgfmt", so it can be a program name with args. +-set dummy msgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_MSGFMT+set}" = set; then +- $as_echo_n "(cached) " >&6 + if test $enable_explicit_deps = no; then + DISABLE_EXPLICIT_DEPS_TRUE= + DISABLE_EXPLICIT_DEPS_FALSE='#' -+else + else +- case "$MSGFMT" in +- /*) +- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + DISABLE_EXPLICIT_DEPS_TRUE='#' + DISABLE_EXPLICIT_DEPS_FALSE= +fi @@ -26832,8 +53445,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + case $PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. -+ ;; -+ *) + ;; + *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then +- ac_cv_path_MSGFMT="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -26849,18 +53474,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +IFS=$as_save_IFS + -+ ;; -+esac -+fi + ;; + esac + fi +-MSGFMT="$ac_cv_path_MSGFMT" +-if test "$MSGFMT" != "no"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 +-$as_echo "$MSGFMT" >&6; } +PERL=$ac_cv_path_PERL +if test -n "$PERL"; then + { echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6; } -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ + fi +- if test "$MSGFMT" != "no"; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS $INTLLIBS" + +-for ac_func in dcgettext + + test -n "$PERL" && break +done @@ -26918,113 +53553,193 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + + +for ac_func in lstat mkstemp flockfile getc_unlocked -+do + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -20834,165 +23064,90 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" -+else + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+ + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + +- MSGFMT_OPTS= +- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 +-$as_echo_n "checking if msgfmt accepts -c... " >&6; } +- cat >conftest.foo <<_ACEOF +- +-msgid "" +-msgstr "" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Project-Id-Version: test 1.0\n" +-"PO-Revision-Date: 2007-02-15 12:01+0100\n" +-"Last-Translator: test <foo@bar.xx>\n" +-"Language-Team: C <LL@li.org>\n" +-"MIME-Version: 1.0\n" +-"Content-Transfer-Encoding: 8bit\n" +- +-_ACEOF +-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 +- ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +-else { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-echo "$as_me: failed input was:" >&5 +-sed 's/^/| /' conftest.foo >&5 +-fi + +- # Extract the first word of "gmsgfmt", so it can be a program name with args. +-set dummy gmsgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GMSGFMT+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $GMSGFMT in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +for ac_func in localtime_r -+do + do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" +- ;; +-esac +-fi +-GMSGFMT=$ac_cv_path_GMSGFMT +-if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +-$as_echo "$GMSGFMT" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- # Extract the first word of "xgettext", so it can be a program name with args. +-set dummy xgettext; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XGETTEXT+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case "$XGETTEXT" in +- /*) +- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then +- ac_cv_path_XGETTEXT="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" +- ;; +-esac +-fi +-XGETTEXT="$ac_cv_path_XGETTEXT" +-if test "$XGETTEXT" != ":"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +-$as_echo "$XGETTEXT" >&6; } +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func @@ -27055,41 +53770,76 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif -+ -+int -+main () -+{ + + int + main () + { +-extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr +return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -21003,75 +23158,58 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- CATOBJEXT=.gmo +- DATADIRNAME=share + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- case $host in +- *-*-solaris*) +- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-$as_echo_n "checking for bind_textdomain_codeset... " >&6; } +-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char bind_textdomain_codeset (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ + eval "$as_ac_var=no" +fi -+ + +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi @@ -27098,13 +53848,27 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -+ + +-#undef bind_textdomain_codeset +fi +done -+ -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char bind_textdomain_codeset (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +-choke me +-#endif + +# _NL_TIME_FIRST_WEEKDAY is an enum and not a define +{ echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 +echo $ECHO_N "checking for _NL_TIME_FIRST_WEEKDAY... $ECHO_C" >&6; } @@ -27115,55 +53879,89 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <langinfo.h> -+int -+main () -+{ + int + main () + { +-return bind_textdomain_codeset (); + +char c; +c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY)); + -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -21082,393 +23220,511 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_bind_textdomain_codeset=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + gtk_ok=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_bind_textdomain_codeset=no + gtk_ok=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then +- CATOBJEXT=.gmo +- DATADIRNAME=share +-else +- CATOBJEXT=.mo +- DATADIRNAME=lib +-fi +{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 +echo "${ECHO_T}$gtk_ok" >&6; } +if test "$gtk_ok" = "yes"; then -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE__NL_TIME_FIRST_WEEKDAY 1 ++#define HAVE__NL_TIME_FIRST_WEEKDAY 1 +_ACEOF -+ -+fi -+ + +- ;; +- *) +- CATOBJEXT=.mo +- DATADIRNAME=lib +- ;; +- esac + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- LIBS="$glib_save_LIBS" +- INSTOBJEXT=.mo +- else +- gt_cv_have_gettext=no +- fi +- fi +# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define +{ echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 +echo $ECHO_N "checking for _NL_MEASUREMENT_MEASUREMENT... $ECHO_C" >&6; } @@ -27177,10 +53975,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +int +main () +{ -+ + +-fi +char c; +c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT)); -+ + + ; + return 0; +} @@ -27207,22 +54006,37 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + gtk_ok=no +fi -+ + +- if test "$gt_cv_have_gettext" = "yes" ; then +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; } +if test "$gtk_ok" = "yes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE__NL_MEASUREMENT_MEASUREMENT 1 -+_ACEOF -+ + + cat >>confdefs.h <<\_ACEOF +-#define ENABLE_NLS 1 ++#define HAVE__NL_MEASUREMENT_MEASUREMENT 1 + _ACEOF + +- fi +- +- if test "$XGETTEXT" != ":"; then +- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then +- : ; +- else +- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } +- XGETTEXT=":" +- fi +- fi +fi -+ + +- # We need to process the po/ directory. +- POSUB=po +# _NL_PAPER_HEIGHT is an enum and not a define +{ echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 +echo $ECHO_N "checking for _NL_PAPER_HEIGHT... $ECHO_C" >&6; } @@ -27236,10 +54050,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +int +main () +{ -+ + +- ac_config_commands="$ac_config_commands default-1" +char c; +c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT)); -+ + + ; + return 0; +} @@ -27266,22 +54081,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +- for lang in $ALL_LINGUAS; do +- GMOFILES="$GMOFILES $lang.gmo" +- POFILES="$POFILES $lang.po" +- done + gtk_ok=no +fi -+ + +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; } +if test "$gtk_ok" = "yes"; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE__NL_PAPER_HEIGHT 1 ++#define HAVE__NL_PAPER_HEIGHT 1 +_ACEOF -+ + +fi -+ + +# _NL_PAPER_WIDTH is an enum and not a define +{ echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 +echo $ECHO_N "checking for _NL_PAPER_WIDTH... $ECHO_C" >&6; } @@ -27295,10 +54114,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +int +main () +{ -+ + +char c; +c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH)); -+ + + ; + return 0; +} @@ -27325,22 +54144,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + gtk_ok=no +fi -+ + +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; } +if test "$gtk_ok" = "yes"; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE__NL_PAPER_WIDTH 1 ++#define HAVE__NL_PAPER_WIDTH 1 +_ACEOF -+ + +fi -+ + +# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable +{ echo "$as_me:$LINENO: checking for sigsetjmp" >&5 +echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6; } @@ -27354,10 +54173,83 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +int +main () +{ -+ + +sigjmp_buf env; +sigsetjmp(env, 0); -+ + +- if test "$gt_cv_have_gettext" = "yes"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 +-$as_echo_n "checking for catalogs to be installed... " >&6; } +- NEW_LINGUAS= +- for presentlang in $ALL_LINGUAS; do +- useit=no +- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then +- desiredlanguages="$LINGUAS" +- else +- desiredlanguages="$ALL_LINGUAS" +- fi +- for desiredlang in $desiredlanguages; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- NEW_LINGUAS="$NEW_LINGUAS $presentlang" +- fi +- done +- LINGUAS=$NEW_LINGUAS +- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 +-$as_echo "$LINGUAS" >&6; } +- fi +- +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +- fi +- fi +- +- MKINSTALLDIRS= +- if test -n "$ac_aux_dir"; then +- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" +- fi +- if test -z "$MKINSTALLDIRS"; then +- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" +- fi +- +- +- test -d po || mkdir po +- if test "x$srcdir" != "x."; then +- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then +- posrcprefix="$srcdir/" +- else +- posrcprefix="../$srcdir/" +- fi +- else +- posrcprefix="../" +- fi +- rm -f po/POTFILES +- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ +- < $srcdir/po/POTFILES.in > po/POTFILES +- +-LIBS="$LIBS $INTLLIBS" +-ac_config_commands="$ac_config_commands default-2" +- +- +-glib_save_prefix="$prefix" +-glib_save_exec_prefix="$exec_prefix" +-glib_save_datarootdir="$datarootdir" +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` + ; + return 0; +} @@ -27381,29 +54273,43 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + gtk_ok=yes -+else + else +- localedir=`eval echo "${datadir}/locale"` + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no -+fi -+ + fi +-prefix="$glib_save_prefix" +-exec_prefix="$glib_save_exec_prefix" +-datarootdir="$glib_save_datarootdir" + +-cat >>confdefs.h <<_ACEOF +-#define GTK_LOCALEDIR "$localedir" +-_ACEOF +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; } +if test "$gtk_ok" = "yes"; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_SIGSETJMP 1 ++#define HAVE_SIGSETJMP 1 +_ACEOF -+ + +fi -+ + +-{ $as_echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 +-$as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; } +# i18n stuff +ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" -+ -+ + +-gtk_save_LIBS=$LIBS +-LIBS="$LIBS -lm" +-if test "$cross_compiling" = yes; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } + +for ac_header in locale.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -27416,28 +54322,50 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+else + else +- cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <math.h> +- int main (void) { return (log(1) != log(1.)); } +$ac_includes_default -+@%:@include <$ac_header> -+_ACEOF ++#include <$ac_header> + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 @@ -27447,13 +54375,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes -+else + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +-( exit $ac_status ) +-gtk_save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -std1" +- if test "$cross_compiling" = yes; then +- true + ac_header_compiler=no +fi -+ + +-else +- cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } @@ -27462,21 +54399,42 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <$ac_header> -+_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <math.h> +- int main (void) { return (log(1) != log(1.)); } ++#include <$ac_header> + _ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- { $as_echo "$as_me:$LINENO: result: -std1" >&5 +-$as_echo "-std1" >&6; } + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 @@ -27486,17 +54444,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + }; then + ac_header_preproc=yes -+else + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +-( exit $ac_status ) +-{ $as_echo "$as_me:$LINENO: result: " >&5 +-$as_echo "" >&6; } +- CFLAGS="$gtk_save_CFLAGS" +- { $as_echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 +-$as_echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + ac_header_preproc=no -+fi -+ + fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -27520,9 +54489,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -27533,21 +54502,58 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" -+fi + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+ + +-LIBS=$gtk_save_LIBS +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -+ + +-{ $as_echo "$as_me:$LINENO: checking for the BeOS" >&5 +-$as_echo_n "checking for the BeOS... " >&6; } +-case $host in +- *-*-beos*) +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- MATH_LIB= +- ;; +- *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- ;; +-esac +fi -+ + +-# +-# see bug 162979 +-# +-{ $as_echo "$as_me:$LINENO: checking for HP-UX" >&5 +-$as_echo_n "checking for HP-UX... " >&6; } +-case $host_os in +- hpux9* | hpux10* | hpux11*) +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- CFLAGS="$CFLAGS -DHPPEX -DSHMLINK" +- ;; +- *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- ;; +-esac +done -+ + +-{ $as_echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 +-$as_echo_n "checking for extra flags for POSIX compliance... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_locale_h = yes; then + { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } @@ -27555,43 +54561,59 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <dirent.h> +#include <locale.h> -+int -+main () -+{ + int + main () + { +-DIR *dir; +return LC_MESSAGES -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + am_cv_val_LC_MESSAGES=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- gtk_save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -posix" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ + am_cv_val_LC_MESSAGES=no +fi + @@ -27601,15 +54623,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_LC_MESSAGES 1 -+_ACEOF ++#define HAVE_LC_MESSAGES 1 + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <dirent.h> +-int +-main () +-{ +-DIR *dir; +- ; +- return 0; +-} + + fi + fi + USE_NLS=yes -+ ++ + + gt_cv_have_gettext=no + @@ -27636,37 +54669,119 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -+@%:@include <libintl.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac ++#include <libintl.h> + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -21476,235 +23732,120 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- { $as_echo "$as_me:$LINENO: result: -posix" >&5 +-$as_echo "-posix" >&6; } + ac_header_compiler=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: result: " >&5 +-$as_echo "" >&6; } +- CFLAGS="$gtk_save_CFLAGS" +- { $as_echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 +-$as_echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ + +-# +-# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working +-# +- +-GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0" +- +-# Check whether --enable-glibtest was given. +-if test "${enable_glibtest+set}" = set; then +- enableval=$enable_glibtest; +-else +- enable_glibtest=yes +-fi +- +- +- pkg_config_args=glib-2.0 +- for module in . gobject gmodule-no-export gthread +- do +- case "$module" in +- gmodule) +- pkg_config_args="$pkg_config_args gmodule-2.0" +- ;; +- gmodule-no-export) +- pkg_config_args="$pkg_config_args gmodule-no-export-2.0" +- ;; +- gobject) +- pkg_config_args="$pkg_config_args gobject-2.0" +- ;; +- gthread) +- pkg_config_args="$pkg_config_args gthread-2.0" +- ;; +- gio*) +- pkg_config_args="$pkg_config_args $module-2.0" +- ;; +- esac +- done +- +- +- +-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- ;; +# Is the header present? +{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 +echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } @@ -27676,13 +54791,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <libintl.h> ++#include <libintl.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; -+esac + esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? @@ -27695,17 +54815,68 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + }; then + ac_header_preproc=yes -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_header_preproc=no -+fi -+ + fi +-if test -z "$ac_cv_path_PKG_CONFIG"; then +- ac_pt_PKG_CONFIG=$PKG_CONFIG +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $ac_pt_PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + +- ;; +-esac +-fi +-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +-if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-$as_echo "$ac_pt_PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +- if test "x$ac_pt_PKG_CONFIG" = x; then +- PKG_CONFIG="" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -27729,28 +54900,91 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; -+esac + esac +- PKG_CONFIG=$ac_pt_PKG_CONFIG +- fi +{ echo "$as_me:$LINENO: checking for libintl.h" >&5 +echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libintl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +-fi +- + ac_cv_header_libintl_h=$ac_header_preproc -+fi + fi +-if test -n "$PKG_CONFIG"; then +- _pkg_min_version=0.16 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } +- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- PKG_CONFIG="" +- fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } -+ -+fi + + fi +if test $ac_cv_header_libintl_h = yes; then + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" -+ + +- no_glib="" +- +- if test "x$PKG_CONFIG" = x ; then +- no_glib=yes +- PKG_CONFIG=no +- fi +- +- min_glib_version=2.17.6 +- { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 +-$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } +- +- if test x$PKG_CONFIG != xno ; then +- ## don't try to run the test against uninstalled libtool libs +- if $PKG_CONFIG --uninstalled $pkg_config_args; then +- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" +- enable_glibtest=no +- fi +- +- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then +- : +- else +- no_glib=yes +- fi +- fi +- +- if test x"$no_glib" = x ; then +- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` +- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` +- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +- +- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` +- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` +- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` +- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` +- if test "x$enable_glibtest" = "xyes" ; then +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$GLIB_LIBS $LIBS" +- rm -f conf.glibtest +- if test "$cross_compiling" = yes; then +- echo $ac_n "cross compiling; assumed OK... $ac_c" + # + # First check in libc + # @@ -27758,33 +54992,115 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } +if test "${gt_cv_func_ngettext_libc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -21713,151 +23854,68 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-#include <glib.h> +-#include <stdio.h> +-#include <stdlib.h> +#include <libintl.h> -+ -+int -+main () -+{ + + int + main () + { +- int major, minor, micro; +- char *tmp_version; +- +- system ("touch conf.glibtest"); +- +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = g_strdup("$min_glib_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_glib_version"); +- exit(1); +- } +- +- if ((glib_major_version != $glib_config_major_version) || +- (glib_minor_version != $glib_config_minor_version) || +- (glib_micro_version != $glib_config_micro_version)) +- { +- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", +- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, +- glib_major_version, glib_minor_version, glib_micro_version); +- printf ("*** was found! If pkg-config was correct, then it is best\n"); +- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); +- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); +- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); +- printf("*** required on your system.\n"); +- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); +- printf("*** to point to the correct configuration files\n"); +- } +- else if ((glib_major_version != GLIB_MAJOR_VERSION) || +- (glib_minor_version != GLIB_MINOR_VERSION) || +- (glib_micro_version != GLIB_MICRO_VERSION)) +- { +- printf("*** GLIB header files (version %d.%d.%d) do not match\n", +- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); +- printf("*** library (version %d.%d.%d)\n", +- glib_major_version, glib_minor_version, glib_micro_version); +- } +- else +- { +- if ((glib_major_version > major) || +- ((glib_major_version == major) && (glib_minor_version > minor)) || +- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", +- glib_major_version, glib_minor_version, glib_micro_version); +- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", +- major, minor, micro); +- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); +- printf("***\n"); +- printf("*** If you have already installed a sufficiently new version, this error\n"); +- printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); +- printf("*** being found. The easiest way to fix this is to remove the old version\n"); +- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); +- printf("*** correct copy of pkg-config. (In this case, you will have to\n"); +- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); +- printf("*** so that the correct libraries are found at run-time))\n"); +- } +- } +- return 1; +return !ngettext ("","", 1) + ; + return 0; -+} -+_ACEOF + } +- + _ACEOF +-rm -f conftest$ac_exeext +rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 @@ -27795,20 +55111,51 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + gt_cv_func_ngettext_libc=yes -+else + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +-( exit $ac_status ) +-no_glib=yes +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + gt_cv_func_ngettext_libc=no -+fi -+ + fi + +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" +- fi +- fi +- if test "x$no_glib" = x ; then +- { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 +-$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } +- : +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** A new enough version of pkg-config was not found." +- echo "*** See http://www.freedesktop.org/software/pkgconfig/" +- else +- if test -f conf.glibtest ; then +- : +- else +- echo "*** Could not run GLIB test program, checking why..." +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$LIBS $GLIB_LIBS" +- cat >conftest.$ac_ext <<_ACEOF +fi +{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } -+ ++ + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 +echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } @@ -27816,173 +55163,222 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-#include <glib.h> +-#include <stdio.h> +#include <libintl.h> -+ -+int -+main () -+{ + + int + main () + { +- return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); +return !dgettext ("","") -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -21868,86 +23926,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $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" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- echo "*** If you have an old version installed, it is best to remove it, although" +- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + gt_cv_func_dgettext_libc=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means GLIB is incorrectly installed." + gt_cv_func_dgettext_libc=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ -+fi + fi + +-rm -rf conftest.dSYM + 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" +- fi +- fi +- GLIB_CFLAGS="" +- GLIB_LIBS="" +- GLIB_GENMARSHAL="" +- GOBJECT_QUERY="" +- GLIB_MKENUMS="" +- { { $as_echo "$as_me:$LINENO: error: +-*** GLIB 2.17.6 or better is required. The latest version of +-*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5 +-$as_echo "$as_me: error: +-*** GLIB 2.17.6 or better is required. The latest version of +-*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- + +- +- rm -f conf.glibtest +- +- +-# See if it's safe to turn G_DISABLE_DEPRECATED on. +-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` +-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.17.6 | sed "s/\.[^.]*\$//"` +-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then +- CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" + fi +{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 +echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } + fi -+ + +-CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS" +- +- +-gtk_save_LIBS=$LIBS +-LIBS="$LIBS $GLIB_LIBS" + if test "$gt_cv_func_ngettext_libc" = "yes" ; then -+ -+for ac_func in bind_textdomain_codeset -+do + + for ac_func in bind_textdomain_codeset + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -22000,1027 +24015,1041 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" -+else + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + +-LIBS=$gtk_save_LIBS + fi -+ + + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then -+ + +-for ac_header in pwd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 +echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } +if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -27998,33 +55394,50 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_bindtextdomain=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + ac_cv_lib_intl_bindtextdomain=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -28039,12 +55452,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <$ac_header> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -28060,37 +55474,123 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + test ! -s conftest.err +- }; then +- ac_header_preproc=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_ngettext=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no + ac_cv_lib_intl_ngettext=no -+fi -+ + fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_PWD_H 1 +-_ACEOF +- +-fi +- +-done +- +- +-for ac_header in sys/time.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +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 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } +if test $ac_cv_lib_intl_ngettext = yes; then @@ -28098,15 +55598,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } +if test "${ac_cv_lib_intl_dgettext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -28122,48 +55627,166 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_dgettext=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + ac_cv_lib_intl_dgettext=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +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 + fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } +if test $ac_cv_lib_intl_dgettext = yes; then + gt_cv_func_dgettext_libintl=yes -+fi -+ -+fi -+ -+fi -+ -+ + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SYS_TIME_H 1 +-_ACEOF + + fi + +-done +- + +-for ac_header in unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 +echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } @@ -28173,15 +55796,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } +if test "${ac_cv_lib_intl_ngettext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl -liconv $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -28197,33 +55825,50 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_ngettext=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + ac_cv_lib_intl_ngettext=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -28238,12 +55883,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl -liconv $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <$ac_header> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -28259,37 +55905,93 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + test ! -s conftest.err +- }; then +- ac_header_preproc=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_dcgettext=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no + ac_cv_lib_intl_dcgettext=no -+fi -+ + fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +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 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } +if test $ac_cv_lib_intl_dcgettext = yes; then @@ -28297,14 +55999,25 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + libintl_extra_libs=-liconv +else + : -+fi -+ + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_UNISTD_H 1 +-_ACEOF + +else + : -+fi -+ + fi + +-done + fi -+ + + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), @@ -28314,21 +56027,39 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset -+ + +-for ac_header in ftw.h +for ac_func in bind_textdomain_codeset -+do + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func @@ -28367,33 +56098,57 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + eval "$as_ac_var=no" -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi @@ -28402,14 +56157,80 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no + fi +done -+ + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } + LIBS="$glib_save_LIBS" -+ + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else @@ -28420,22 +56241,30 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + fi + fi -+ + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi -+ ++ + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_GETTEXT 1 -+_ACEOF + ++ if test "$gt_cv_have_gettext" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_FTW_H 1 ++#define HAVE_GETTEXT 1 + _ACEOF + + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -28462,7 +56291,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" + ;; +esac -+fi + fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != "no"; then + { echo "$as_me:$LINENO: result: $MSGFMT" >&5 @@ -28474,7 +56303,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" -+ + +-done +- +- +-{ $as_echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 +-$as_echo_n "checking for GNU ftw extensions... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +for ac_func in dcgettext +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -28484,11 +56319,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#define _XOPEN_SOURCE 500 +-#define _GNU_SOURCE +-#include <ftw.h> +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func @@ -28520,40 +56358,58 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +choke me +#endif + -+int -+main () -+{ + int + main () + { +-int flags = FTW_ACTIONRETVAL; +return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- gtk_ok=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- gtk_ok=no + eval "$as_ac_var=no" -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-if test $gtk_ok = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_GNU_FTW 1 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi @@ -28562,17 +56418,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + fi +done -+ + +-saved_cflags="$CFLAGS" +-saved_ldflags="$LDFLAGS" + MSGFMT_OPTS= + { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 +echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } + cat >conftest.foo <<_ACEOF -+ + +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" @@ -28582,8 +56443,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +"Language-Team: C <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" -+ -+_ACEOF + +-# Checks for header files. +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-$as_echo_n "checking for ANSI C header files... " >&6; } +-if test "${ac_cv_header_stdc+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdlib.h> +-#include <stdarg.h> +-#include <string.h> +-#include <float.h> +- +if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 + ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 + ac_status=$? @@ -28596,7 +56473,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: failed input was:" >&5 +sed 's/^/| /' conftest.foo >&5 +fi -+ ++ + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -28681,64 +56558,133 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + -+int -+main () -+{ + int + main () + { +- +extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_header_stdc=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ CATOBJEXT=.gmo ++ CATOBJEXT=.gmo + DATADIRNAME=share -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_header_stdc=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-if test $ac_cv_header_stdc = yes; then +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <string.h> +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "memchr" >/dev/null 2>&1; then +- : + case $host in + *-*-solaris*) + { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } +if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +- +-fi +- +-if test $ac_cv_header_stdc = yes; then +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <stdlib.h> +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "free" >/dev/null 2>&1; then +- : +-else +- ac_cv_header_stdc=no +-fi +-rm -f conftest* +/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define bind_textdomain_codeset innocuous_bind_textdomain_codeset -+ + +-fi +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char bind_textdomain_codeset (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ -+ + +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +- if test "$cross_compiling" = yes; then +- : +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <ctype.h> +-#include <stdlib.h> +-#if ((' ' & 0x0FF) == 0x020) +-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#ifdef __STDC__ +# include <limits.h> -+#else + #else +-# define ISLOWER(c) \ +- (('a' <= (c) && (c) <= 'i') \ +- || ('j' <= (c) && (c) <= 'r') \ +- || ('s' <= (c) && (c) <= 'z')) +-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +# include <assert.h> +#endif + @@ -28756,25 +56702,48 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + something starting with __ and the normal name is an alias. */ +#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset +choke me -+#endif -+ -+int -+main () -+{ + #endif + +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + int + main () + { +- int i; +- for (i = 0; i < 256; i++) +- if (XOR (islower (i), ISLOWER (i)) +- || toupper (i) != TOUPPER (i)) +- return 2; +return bind_textdomain_codeset (); + ; -+ return 0; -+} -+_ACEOF + return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 @@ -28785,26 +56754,40 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_bind_textdomain_codeset=yes -+else + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +-( exit $ac_status ) +-ac_cv_header_stdc=no +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + ac_cv_func_bind_textdomain_codeset=no -+fi -+ + fi + +- +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } +if test $ac_cv_func_bind_textdomain_codeset = yes; then -+ CATOBJEXT=.gmo ++ CATOBJEXT=.gmo + DATADIRNAME=share +else + CATOBJEXT=.mo + DATADIRNAME=lib -+fi -+ + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-$as_echo "$ac_cv_header_stdc" >&6; } +-if test $ac_cv_header_stdc = yes; then + +-cat >>confdefs.h <<\_ACEOF +-#define STDC_HEADERS 1 +-_ACEOF + ;; + *) + CATOBJEXT=.mo @@ -28821,19 +56804,81 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + gt_cv_have_gettext=no + fi + fi -+ -+fi -+ -+ + + fi + + +-# Checks for typedefs, structures, and compiler characteristics. +-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +-$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +-if test "${ac_cv_c_const+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ + + if test "$gt_cv_have_gettext" = "yes" ; then -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define ENABLE_NLS 1 -+_ACEOF -+ ++#define ENABLE_NLS 1 + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-int +-main () +-{ +-/* FIXME: Include the comments suggested by Paul. */ +-#ifndef __cplusplus +- /* Ultrix mips cc rejects this. */ +- typedef int charset[2]; +- const charset cs; +- /* SunOS 4.1.1 cc rejects this. */ +- 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}; +- /* AIX XL C 1.02.0.0 rejects this. +- It does not let you subtract one const X* pointer from another in +- an arm of an if-expression whose if-part is not a constant +- expression */ +- const char *g = "string"; +- pcpcc = &g + (g ? g-g : 0); +- /* HPUX 7.0 cc rejects these. */ +- ++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; + fi -+ + +- *t++ = 0; +- if (s) return 0; +- } +- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ +- int x[] = {25, 17}; +- const int *foo = &x[0]; +- ++foo; +- } +- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ +- typedef const int *iptr; +- iptr p = 0; +- ++p; +- } +- { /* AIX XL C 1.02.0.0 rejects this saying +- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ +- struct s { int j; const int *ap[3]; }; +- struct s *b; b->j = 5; +- } +- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ +- const int foo = 10; +- if (!foo) return 0; +- } +- return !cs[0] && !zero.x; +-#endif + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; @@ -28843,29 +56888,58 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + XGETTEXT=":" + fi + fi -+ + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + # We need to process the po/ directory. + POSUB=po -+ + +- ac_cv_c_const=no +-fi + ac_config_commands="$ac_config_commands default-1" -+ + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then @@ -28912,7 +56986,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi -+ ++ + + test -d po || mkdir po + if test "x$srcdir" != "x."; then @@ -28927,7 +57001,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES -+ ++ +LIBS="$LIBS $INTLLIBS" +ac_config_commands="$ac_config_commands default-2" + @@ -28942,17 +57016,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + localedir=`eval echo "${libdir}/locale"` +else + localedir=`eval echo "${datadir}/locale"` -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +-$as_echo "$ac_cv_c_const" >&6; } +-if test $ac_cv_c_const = no; then +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" -+ + +-cat >>confdefs.h <<\_ACEOF +-#define const /**/ +cat >>confdefs.h <<_ACEOF -+@%:@define GTK_LOCALEDIR "$localedir" -+_ACEOF -+ -+ -+ ++#define GTK_LOCALEDIR "$localedir" + _ACEOF + +-fi + + +-# Checks for library functions. +-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +-$as_echo_n "checking return type of signal handlers... " >&6; } +-if test "${ac_cv_type_signal+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 +echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6; } + @@ -28962,25 +57047,49 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } + -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23028,504 +25057,423 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <sys/types.h> +-#include <signal.h> +- +-int +-main () +-{ +-return *(signal (0, 0)) (0) == 1; +- ; +- return 0; +-} +#include <math.h> + int main (void) { return (log(1) != log(1.)); } -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 -+ ac_status=$? + ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_type_signal=int + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in @@ -28994,36 +57103,84 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + (exit $ac_status); }; }; then + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_type_signal=void +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +-$as_echo "$ac_cv_type_signal" >&6; } +- +-cat >>confdefs.h <<_ACEOF +-#define RETSIGTYPE $ac_cv_type_signal +-_ACEOF +- +- +- +( exit $ac_status ) +gtk_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -std1" + if test "$cross_compiling" = yes; then + true -+ -+else + +-for ac_header in stdlib.h unistd.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> +#include <math.h> + int main (void) { return (log(1) != log(1.)); } -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 -+ ac_status=$? + ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in @@ -29037,11 +57194,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + (exit $ac_status); }; }; then + { echo "$as_me:$LINENO: result: -std1" >&5 +echo "${ECHO_T}-std1" >&6; } -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no +( exit $ac_status ) +{ echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } @@ -29050,9 +57209,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi @@ -29093,12 +57258,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +{ echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 +echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <$ac_header> +#include <dirent.h> +int +main () @@ -29107,120 +57273,343 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + test ! -s conftest.err +- }; then +- ac_header_preproc=yes + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +- +-for ac_func in getpagesize +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else + gtk_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -posix" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +#include <dirent.h> -+int -+main () -+{ + int + main () + { +-return $ac_func (); +DIR *dir; -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: -posix" >&5 +echo "${ECHO_T}-posix" >&6; } -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } + CFLAGS="$gtk_save_CFLAGS" + { echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 +echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} -+fi -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF + +-fi +-done +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +-{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 +-$as_echo_n "checking for working mmap... " >&6; } +-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then +- ac_cv_func_mmap_fixed_mapped=no +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-/* malloc might have been renamed as rpl_malloc. */ +-#undef malloc +# +# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working -+# -+ ++# + +-/* Thanks to Mike Haertel and Jim Avera for this test. +- Here is a matrix of mmap possibilities: +- mmap private not fixed +- mmap private fixed at somewhere currently unmapped +- mmap private fixed at somewhere already mapped +- mmap shared not fixed +- mmap shared fixed at somewhere currently unmapped +- mmap shared fixed at somewhere already mapped +- For private mappings, we should verify that changes cannot be read() +- back from the file, nor mmap's back from the file at a different +- address. (There have been systems where private was not correctly +- implemented like the infamous i386 svr4.0, and systems where the +- VM page cache was not coherent with the file system buffer cache +- like early versions of FreeBSD and possibly contemporary NetBSD.) +- For shared mappings, we should conversely verify that changes get +- propagated back to all the places they're supposed to be. +GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0" -+ + +- Grep wants private fixed already mapped. +- The main things grep needs to know about mmap are: +- * does it exist and is it safe to write into the mmap'd area +- * how to use it (BSD variants) */ +# Check whether --enable-glibtest was given. +if test "${enable_glibtest+set}" = set; then -+ enableval=$enable_glibtest; ++ enableval=$enable_glibtest; +else + enable_glibtest=yes +fi -+ -+ + +-#include <fcntl.h> +-#include <sys/mman.h> + +-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H +-char *malloc (); +-#endif + pkg_config_args=glib-2.0 + for module in . gobject gmodule-no-export gthread + do + case "$module" in -+ gmodule) ++ gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; -+ gmodule-no-export) ++ gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; -+ gobject) ++ gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; -+ gthread) ++ gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; -+ gio*) ++ gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done -+ -+ -+ + +-/* This mess was copied from the GNU getpagesize.h. */ +-#ifndef HAVE_GETPAGESIZE +-/* Assume that all systems that can run configure 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 */ +-# ifdef HAVE_SYS_PARAM_H +-# include <sys/param.h> +-# ifdef EXEC_PAGESIZE +-# define getpagesize() EXEC_PAGESIZE +-# else /* no EXEC_PAGESIZE */ +-# ifdef NBPG +-# define getpagesize() NBPG * CLSIZE +-# ifndef CLSIZE +-# define CLSIZE 1 +-# endif /* no CLSIZE */ +-# else /* no NBPG */ +-# ifdef NBPC +-# define getpagesize() NBPC +-# else /* no NBPC */ +-# ifdef PAGESIZE +-# define getpagesize() PAGESIZE +-# endif /* PAGESIZE */ +-# endif /* no NBPC */ +-# endif /* no NBPG */ +-# endif /* no EXEC_PAGESIZE */ +-# else /* no HAVE_SYS_PARAM_H */ +-# define getpagesize() 8192 /* punt totally */ +-# endif /* no HAVE_SYS_PARAM_H */ +-# endif /* no _SC_PAGESIZE */ + +-#endif /* no HAVE_GETPAGESIZE */ +- +-int +-main () +-{ +- char *data, *data2, *data3; +- int i, pagesize; +- int fd; +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -29249,7 +57638,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +- pagesize = getpagesize (); + ;; +esac +fi @@ -29261,8 +57651,37 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ -+ + +- /* First, make a file with some known garbage in it. */ +- data = (char *) malloc (pagesize); +- if (!data) +- return 1; +- for (i = 0; i < pagesize; ++i) +- *(data + i) = rand (); +- umask (0); +- fd = creat ("conftest.mmap", 0600); +- if (fd < 0) +- return 1; +- if (write (fd, data, pagesize) != pagesize) +- return 1; +- close (fd); + +- /* Next, try to mmap the file at a fixed address which already has +- something else allocated at it. If we can, also make sure that +- we see the same garbage. */ +- fd = open ("conftest.mmap", O_RDWR); +- if (fd < 0) +- return 1; +- data2 = (char *) malloc (2 * pagesize); +- if (!data2) +- return 1; +- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); +- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, +- MAP_PRIVATE | MAP_FIXED, fd, 0L)) +- return 1; +- for (i = 0; i < pagesize; ++i) +- if (*(data + i) != *(data2 + i)) +- return 1; +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG @@ -29292,9 +57711,40 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +- /* Finally, make sure that changes to the mapped area do not +- percolate back to the file as seen by read(). (This is a bug on +- some variants of i386 svr4.0.) */ +- for (i = 0; i < pagesize; ++i) +- *(data2 + i) = *(data2 + i) + 1; +- data3 = (char *) malloc (pagesize); +- if (!data3) +- return 1; +- if (read (fd, data3, pagesize) != pagesize) +- return 1; +- for (i = 0; i < pagesize; ++i) +- if (*(data + i) != *(data3 + i)) +- return 1; +- close (fd); +- return 0; +-} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; + ;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then @@ -29317,14 +57767,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_mmap_fixed_mapped=yes + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi -+else + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi -+ -+fi + +-( exit $ac_status ) +-ac_cv_func_mmap_fixed_mapped=no + fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.16 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 @@ -29337,39 +57801,55 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi -+ -+fi + + fi + + no_glib="" -+ + +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } +-if test $ac_cv_func_mmap_fixed_mapped = yes; then + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no + fi -+ + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_MMAP 1 +-_ACEOF + min_glib_version=2.17.6 + { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 +echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; } -+ + +-fi +-rm -f conftest.mmap + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi -+ + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi -+ + + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -+ + +-for ac_func in mallinfo +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ @@ -29386,21 +57866,66 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + rm -f conf.glibtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23533,100 +25481,235 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif + +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +#include <glib.h> +#include <stdio.h> +#include <stdlib.h> -+ -+int -+main () -+{ + + int + main () + { +-return $ac_func (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err + int major, minor, micro; + char *tmp_version; + @@ -29417,7 +57942,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { -+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); @@ -29427,7 +57952,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); -+ } ++ } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) @@ -29506,7 +58031,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test "x$no_glib" = x ; then + { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 +echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } -+ : ++ : + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } @@ -29535,7 +58060,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +int +main () +{ -+ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ++ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; + return 0; +} @@ -29550,12 +58075,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + echo "*** The test program compiled, but did not run. This usually means" @@ -29566,17 +58097,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+else ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed." -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi @@ -29586,131 +58131,143 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" -+ { { echo "$as_me:$LINENO: error: -+*** GLIB 2.17.6 or better is required. The latest version of ++ { { echo "$as_me:$LINENO: error: ++*** GLIB 2.17.6 or better is required. The latest version of +*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5 -+echo "$as_me: error: -+*** GLIB 2.17.6 or better is required. The latest version of ++echo "$as_me: error: ++*** GLIB 2.17.6 or better is required. The latest version of +*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} + { (exit 1); exit 1; }; } + fi -+ -+ -+ -+ -+ -+ rm -f conf.glibtest + ++ ++ ++ ++ ++ rm -f conf.glibtest + + +# See if it's safe to turn G_DISABLE_DEPRECATED on. -+GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"` -+GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.17.6 | sed "s/\.@<:@^.@:>@*\$//"` ++GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` ++GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.17.6 | sed "s/\.[^.]*\$//"` +if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then + CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" -+fi + fi +-done + +CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS" -+ -+ + + +-for ac_func in getresuid +gtk_save_LIBS=$LIBS +LIBS="$LIBS $GLIB_LIBS" + +for ac_func in bind_textdomain_codeset -+do + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23679,103 +25762,67 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" -+else + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + +-{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 +-$as_echo_n "checking for uid_t in sys/types.h... " >&6; } +-if test "${ac_cv_type_uid_t+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "uid_t" >/dev/null 2>&1; then +- ac_cv_type_uid_t=yes +-else +- ac_cv_type_uid_t=no +-fi +-rm -f conftest* +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 +-$as_echo "$ac_cv_type_uid_t" >&6; } +-if test $ac_cv_type_uid_t = no; then +- +-cat >>confdefs.h <<\_ACEOF +-#define uid_t int +-_ACEOF +- +LIBS=$gtk_save_LIBS -+ -+ + +-cat >>confdefs.h <<\_ACEOF +-#define gid_t int +-_ACEOF + +for ac_header in pwd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -29719,7 +58276,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi + fi +- +- +-# Check if <sys/select.h> needs to be included for fd_set +-{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5 +-$as_echo_n "checking for fd_set... " >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } @@ -29727,41 +58289,60 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <sys/types.h> +-int +-main () +-{ +-fd_set readMask, writeMask; +- ; +- return 0; +-} +$ac_includes_default -+@%:@include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac ++#include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -23783,466 +25830,438 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- gtk_ok=yes + ac_header_compiler=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- gtk_ok=no + ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-if test $gtk_ok = yes; then +- { $as_echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 +-$as_echo "yes, found in sys/types.h" >&6; } +-else +- cat >conftest.$ac_ext <<_ACEOF +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + @@ -29769,13 +58350,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <$ac_header> -+_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <sys/select.h> +- ++#include <$ac_header> + _ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "fd_mask" >/dev/null 2>&1; then +- gtk_ok=yes +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -29798,12 +58384,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no -+fi -+ + fi +-rm -f conftest* + +- if test $gtk_ok = yes; then +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SYS_SELECT_H 1 +-_ACEOF +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -29827,9 +58418,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -29844,19 +58435,29 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+ + +- { $as_echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 +-$as_echo "yes, found in sys/select.h" >&6; } +- else +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_PWD_H 1 -+_ACEOF -+ -+fi -+ + + cat >>confdefs.h <<\_ACEOF +-#define NO_FD_SET 1 ++#define HAVE_PWD_H 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- fi + fi + +-# `widechar' tests for gdki18n.h +-{ $as_echo "$as_me:$LINENO: checking for wchar.h" >&5 +-$as_echo_n "checking for wchar.h... " >&6; } +done + + @@ -29876,80 +58477,113 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <wchar.h> +$ac_includes_default -+@%:@include <$ac_header> -+_ACEOF ++#include <$ac_header> + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + test ! -s conftest.err +- }; then +- gdk_wchar_h=yes + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- gdk_wchar_h=no + ac_header_compiler=no -+fi -+ + fi + +-rm -f conftest.err conftest.$ac_ext +-if test $gdk_wchar_h = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_WCHAR_H 1 +-_ACEOF +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 +-$as_echo "$gdk_wchar_h" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ + +-# Check for wctype.h (for iswalnum) +-{ $as_echo "$as_me:$LINENO: checking for wctype.h" >&5 +-$as_echo_n "checking for wctype.h... " >&6; } +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <wctype.h> ++#include <$ac_header> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.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 + ac_header_preproc=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- gdk_wctype_h=no + ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext + fi + + rm -f conftest.err conftest.$ac_ext +-if test $gdk_wctype_h = yes; then +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + @@ -29976,9 +58610,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -29997,15 +58631,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_SYS_TIME_H 1 -+_ACEOF -+ -+fi -+ + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_WCTYPE_H 1 ++#define HAVE_SYS_TIME_H 1 + _ACEOF + + fi +-{ $as_echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 +-$as_echo "$gdk_wctype_h" >&6; } + +-# in Solaris 2.5, `iswalnum' is in -lw +-GDK_WLIBS= +-{ $as_echo "$as_me:$LINENO: checking for iswalnum" >&5 +-$as_echo_n "checking for iswalnum... " >&6; } +-if test "${ac_cv_func_iswalnum+set}" = set; then +- $as_echo_n "(cached) " >&6 +done + + @@ -30021,44 +58664,112 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+else + else +- cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define iswalnum to an innocuous variant, in case <limits.h> declares iswalnum. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define iswalnum innocuous_iswalnum +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char iswalnum (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef iswalnum +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char iswalnum (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_iswalnum || defined __stub___iswalnum +-choke me +-#endif +- +-int +-main () +-{ +-return iswalnum (); +- ; +- return 0; +-} +$ac_includes_default -+@%:@include <$ac_header> -+_ACEOF ++#include <$ac_header> + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_iswalnum=yes + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_iswalnum=no + ac_header_compiler=no -+fi -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 +-$as_echo "$ac_cv_func_iswalnum" >&6; } +-if test "x$ac_cv_func_iswalnum" = x""yes; then +- : +-else +- { $as_echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 +-$as_echo_n "checking for iswalnum in -lw... " >&6; } +-if test "${ac_cv_lib_w_iswalnum+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lw $LIBS" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } @@ -30066,42 +58777,81 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <$ac_header> -+_ACEOF + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char iswalnum (); +-int +-main () +-{ +-return iswalnum (); +- ; +- return 0; +-} ++#include <$ac_header> + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext + }; then +- ac_cv_lib_w_iswalnum=yes + ac_header_preproc=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_w_iswalnum=no + ac_header_preproc=no -+fi -+ + fi + +-rm -rf conftest.dSYM +-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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 +-$as_echo "$ac_cv_lib_w_iswalnum" >&6; } +-if test "x$ac_cv_lib_w_iswalnum" = x""yes; then +- GDK_WLIBS=-lw +-fi +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -30125,9 +58875,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -30138,129 +58888,277 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" -+fi + fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+ + +- +-oLIBS="$LIBS" +-LIBS="$LIBS $GDK_WLIBS" +-# The following is necessary for Linux libc-5.4.38 +-{ $as_echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5 +-$as_echo_n "checking if iswalnum() and friends are properly defined... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdlib.h> +-int +-main () +-{ +- +-#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) +-# ifdef HAVE_WCTYPE_H +-# include <wctype.h> +-# else +-# ifdef HAVE_WCHAR_H +-# include <wchar.h> +-# endif +-# endif +-#else +-# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) +-#endif +-iswalnum((wchar_t) 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- gdk_working_wctype=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- gdk_working_wctype=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS="$oLIBS" +- +-if test $gdk_working_wctype = no; then +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_UNISTD_H 1 -+_ACEOF -+ -+fi -+ + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_BROKEN_WCTYPE 1 +-_ACEOF +- +- GDK_WLIBS= +-fi +-{ $as_echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 +-$as_echo "$gdk_working_wctype" >&6; } +- +- +-# Check for uxtheme.h (for MS-Windows Engine) +-{ $as_echo "$as_me:$LINENO: checking for uxtheme.h" >&5 +-$as_echo_n "checking for uxtheme.h... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <uxtheme.h> ++#define HAVE_UNISTD_H 1 + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- gtk_uxtheme_h=no + fi + +-rm -f conftest.err conftest.$ac_ext +-if test $gtk_uxtheme_h = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_UXTHEME_H 1 +-_ACEOF +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 +-$as_echo "$gtk_uxtheme_h" >&6; } +done -+ -+ + +-# Checks for gdkspawn + +-for ac_header in crt_externs.h +for ac_header in ftw.h -+do + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+else -+ # Is the header compilable? + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+@%:@include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -24258,33 +26277,32 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -24298,52 +26316,51 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 + (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 +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 @@ -30273,102 +59171,183 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -24352,24 +26369,25 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+ -+fi + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_FTW_H 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ ++#define HAVE_FTW_H 1 + _ACEOF + + fi +@@ -24377,309 +26395,374 @@ + done + + +-for ac_func in _NSGetEnviron +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +{ echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 +echo $ECHO_N "checking for GNU ftw extensions... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +#define _XOPEN_SOURCE 500 +#define _GNU_SOURCE +#include <ftw.h> -+int -+main () -+{ + int + main () + { +-return $ac_func (); +int flags = FTW_ACTIONRETVAL; -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" + } && test -s conftest.$ac_objext; then + gtk_ok=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" + gtk_ok=no -+fi -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test $gtk_ok = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_GNU_FTW 1 -+_ACEOF + ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_GNU_FTW 1 + _ACEOF + +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ + fi +-done + +saved_cflags="$CFLAGS" +saved_ldflags="$LDFLAGS" -+ -+ + + +-################################################## +-# Checks for gdk-pixbuf +-################################################## +# Checks for header files. +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } @@ -30385,11 +59364,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#include <stdarg.h> +#include <string.h> +#include <float.h> -+ + +int +main () +{ -+ + +-use_la_modules=false +-case $host in +- *-aix*) use_la_modules=true + ; + return 0; +} @@ -30399,7 +59381,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; -+esac + esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? @@ -30415,33 +59397,43 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-if $use_la_modules ; then + ac_cv_header_stdc=no +fi -+ + +-cat >>confdefs.h <<\_ACEOF +-#define USE_LA_MODULES 1 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF + _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <string.h> -+ + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no -+fi + fi +rm -f conftest* -+ -+fi -+ + +- +-{ $as_echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 +-$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; } +- +-# Check whether --enable-modules was given. +-if test "${enable_modules+set}" = set; then +- enableval=$enable_modules; + fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF @@ -30451,18 +59443,62 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdlib.h> -+ -+_ACEOF + +-dynworks=false +-deps= +-if test x$enable_modules = xno; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- { $as_echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 +-$as_echo_n "checking whether dynamic modules work... " >&6; } +- ## for loop is to strip newline +- tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` +- for I in $tmp; do +- dynworks=$I +- done +- +- if $dynworks; then +- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" +- pixbuf_deplibs_check=`$pixbuf_libtool_config | \ +- grep '^[a-z_]*check[a-z_]*_method=['\''"]' | \ +- sed 's/.*['\''"]\(.*\)['\''"]$/\1/'` +- if test "x$pixbuf_deplibs_check" = "xnone" || \ +- test "x$pixbuf_deplibs_check" = "xunknown" || \ +- test "x$pixbuf_deplibs_check" = "x"; then +- dynworks=false +- fi +- fi +- +- if $dynworks; then +- +-cat >>confdefs.h <<\_ACEOF +-#define USE_GMODULE 1 + _ACEOF +- +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- fi +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no -+fi + fi +rm -f conftest* -+ -+fi -+ + +- +- +-# Check whether --with-libpng was given. +-if test "${with_libpng+set}" = set; then +- withval=$with_libpng; + fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then @@ -30486,7 +59522,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif -+ + +-# Check whether --with-libjpeg was given. +-if test "${with_libjpeg+set}" = set; then +- withval=$with_libjpeg; +-fi +- +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () @@ -30524,43 +59565,79 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-# Check whether --with-libtiff was given. +-if test "${with_libtiff+set}" = set; then +- withval=$with_libtiff; +( exit $ac_status ) +ac_cv_header_stdc=no -+fi + fi +- +- +-# Check whether --with-libjasper was given. +-if test "${with_libjasper+set}" = set; then +- withval=$with_libjasper; +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ -+fi + fi + + +-# Check whether --enable-gdiplus was given. +-if test "${enable_gdiplus+set}" = set; then +- enableval=$enable_gdiplus; + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define STDC_HEADERS 1 ++#define STDC_HEADERS 1 +_ACEOF -+ -+fi -+ -+ + +- +- +-if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then +- BUILD_GDIPLUS_LOADERS_TRUE= +- BUILD_GDIPLUS_LOADERS_FALSE='#' +-else +- BUILD_GDIPLUS_LOADERS_TRUE='#' +- BUILD_GDIPLUS_LOADERS_FALSE= + fi + + +-if test x$os_win32 = xno || test x$enable_gdiplus = xno; then +- if test x$with_libtiff != xno && test -z "$LIBTIFF"; then +- { $as_echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 +-$as_echo_n "checking for TIFFReadRGBAImageOriented in -ltiff... " >&6; } +-if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then +- $as_echo_n "(cached) " >&6 +# Checks for typedefs, structures, and compiler characteristics. +{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } +if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ltiff -lm $LIBS" +-cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char TIFFReadRGBAImageOriented (); + int + main () + { +-return TIFFReadRGBAImageOriented (); +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ @@ -30611,46 +59688,73 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + return !cs[0] && !zero.x; +#endif + -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes + } && test -s conftest.$ac_objext; then + ac_cv_c_const=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no + ac_cv_c_const=no -+fi -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 +-$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } +-if test "x$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" = x""yes; then +- if test "${ac_cv_header_tiffio_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } +-if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define const ++#define const +_ACEOF + -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } + + +# Checks for library functions. @@ -30658,13 +59762,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } +if test "${ac_cv_type_signal+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +-$as_echo_n "checking tiffio.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <tiffio.h> +#include <sys/types.h> +#include <signal.h> + @@ -30675,39 +59785,50 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -24687,206 +26770,61 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + ac_cv_type_signal=int -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + ac_cv_type_signal=void -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6; } -+ + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +-$as_echo_n "checking tiffio.h presence... " >&6; } +cat >>confdefs.h <<_ACEOF -+@%:@define RETSIGTYPE $ac_cv_type_signal ++#define RETSIGTYPE $ac_cv_type_signal +_ACEOF + + @@ -30729,93 +59850,291 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <tiffio.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } +-if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_tiffio_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } +- +-fi +-if test "x$ac_cv_header_tiffio_h" = x""yes; then +- TIFF='tiff'; LIBTIFF='-ltiff' +-else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} +-fi +- +- +-else +- { $as_echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 +-$as_echo_n "checking for TIFFWriteScanline in -ltiff... " >&6; } +-if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ltiff -ljpeg -lz -lm $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char TIFFWriteScanline (); +-int +-main () +-{ +-return TIFFWriteScanline (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_tiff_TIFFWriteScanline=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_tiff_TIFFWriteScanline=no +-fi +- +-rm -rf conftest.dSYM +-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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 +-$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } +-if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then +- if test "${ac_cv_header_tiffio_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } +-if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +-$as_echo_n "checking tiffio.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <tiffio.h> +$ac_includes_default -+@%:@include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac ++#include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -24894,92 +26832,90 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +-$as_echo_n "checking tiffio.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <tiffio.h> ++#include <$ac_header> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 + (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 +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 @@ -30828,35 +60147,46 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -24988,39 +26924,58 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } +-if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_cv_header_tiffio_h=$ac_header_preproc + eval "$as_ac_Header=\$ac_header_preproc" -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+ -+fi + + fi +-if test "x$ac_cv_header_tiffio_h" = x""yes; then +- TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' +-else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -+ -+fi + + fi + +done -+ + + +for ac_func in getpagesize +do @@ -30865,13 +60195,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- { $as_echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 +-$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; } +-if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" +-cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func @@ -30888,13 +60226,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#endif + +#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -25028,11 +26983,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char TIFFFlushData (); +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named @@ -30903,54 +60242,118 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +choke me +#endif + -+int -+main () -+{ + int + main () + { +-return TIFFFlushData (); +return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -25043,216 +27005,258 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_tiff34_TIFFFlushData=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_tiff34_TIFFFlushData=no + eval "$as_ac_var=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 +-$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; } +-if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then +- if test "${ac_cv_header_tiffio_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } +-if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +-$as_echo_n "checking tiffio.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <tiffio.h> +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + fi +done -+ + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +-$as_echo_n "checking tiffio.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +{ echo "$as_me:$LINENO: checking for working mmap" >&5 +echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } +if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then @@ -30960,15 +60363,44 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_cv_func_mmap_fixed_mapped=no +else + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <tiffio.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +-fi +$ac_includes_default +/* malloc might have been renamed as rpl_malloc. */ +#undef malloc -+ + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +/* Thanks to Mike Haertel and Jim Avera for this test. + Here is a matrix of mmap possibilities: + mmap private not fixed @@ -30985,7 +60417,36 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + like early versions of FreeBSD and possibly contemporary NetBSD.) + For shared mappings, we should conversely verify that changes get + propagated back to all the places they're supposed to be. -+ + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; + Grep wants private fixed already mapped. + The main things grep needs to know about mmap are: + * does it exist and is it safe to write into the mmap'd area @@ -31097,7 +60558,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; -+esac + esac +-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } +-if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? @@ -31113,32 +60578,64 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_mmap_fixed_mapped=yes -+else + else +- ac_cv_header_tiffio_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +( exit $ac_status ) +ac_cv_func_mmap_fixed_mapped=no -+fi + fi +-if test "x$ac_cv_header_tiffio_h" = x""yes; then +- TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' +-else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ -+fi + fi + + +-else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} + fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } +if test $ac_cv_func_mmap_fixed_mapped = yes; then -+ + +-fi +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_MMAP 1 ++#define HAVE_MMAP 1 +_ACEOF -+ -+fi + + fi +rm -f conftest.mmap -+ -+ -+ + +- fi + +- if test x$with_libtiff != xno && test -z "$LIBTIFF"; then +- { { $as_echo "$as_me:$LINENO: error: +-*** Checks for TIFF loader failed. You can build without it by passing +-*** --without-libtiff to configure but some programs using GTK+ may +-*** not work properly" >&5 +-$as_echo "$as_me: error: +-*** Checks for TIFF loader failed. You can build without it by passing +-*** --without-libtiff to configure but some programs using GTK+ may +-*** not work properly" >&2;} +- { (exit 1); exit 1; }; } +- fi +-fi + +-if test x$os_win32 = xno || test x$enable_gdiplus = xno; then +- if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then +- { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 +-$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; } +-if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then +- $as_echo_n "(cached) " >&6 +for ac_func in mallinfo +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -31146,13 +60643,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ljpeg $LIBS" +-cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func @@ -31169,13 +60669,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#endif + +#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -25260,11 +27264,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char jpeg_destroy_decompress (); +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named @@ -31184,54 +60685,119 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +choke me +#endif + -+int -+main () -+{ + int + main () + { +-return jpeg_destroy_decompress (); +return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -25275,114 +27286,90 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_jpeg_jpeg_destroy_decompress=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_jpeg_jpeg_destroy_decompress=no + eval "$as_ac_var=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 +-$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } +-if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then +- jpeg_ok=yes +-else +- jpeg_ok=no +- { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} + fi +- +- if test "$jpeg_ok" = yes; then +- { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +-$as_echo_n "checking for jpeglib.h... " >&6; } +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <stdio.h> +-#undef PACKAGE +-#undef VERSION +-#undef HAVE_STDLIB_H +-#include <jpeglib.h> +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- jpeg_ok=no + fi +done -+ + +-rm -f conftest.err conftest.$ac_ext +- { $as_echo "$as_me:$LINENO: result: $jpeg_ok" >&5 +-$as_echo "$jpeg_ok" >&6; } +- if test "$jpeg_ok" = yes; then +- LIBJPEG='-ljpeg' +- { $as_echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 +-$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; } +-if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then +- $as_echo_n "(cached) " >&6 + +for ac_func in getresuid +do @@ -31240,13 +60806,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ljpeg $LIBS" +-cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func @@ -31265,11 +60836,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ + #ifdef __cplusplus + extern "C" + #endif +-char jpeg_simple_progression (); +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named @@ -31278,51 +60850,66 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +choke me +#endif + -+int -+main () -+{ + int + main () + { +-return jpeg_simple_progression (); +return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -25393,371 +27380,346 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_jpeg_jpeg_simple_progression=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_jpeg_jpeg_simple_progression=no + eval "$as_ac_var=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 +-$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } +-if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -+ + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_PROGRESSIVE_JPEG 1 +fi +done + @@ -31333,81 +60920,145 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF + _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <sys/types.h> -+ + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "uid_t" >/dev/null 2>&1; then + ac_cv_type_uid_t=yes -+else + else +- { $as_echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 +-$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} + ac_cv_type_uid_t=no -+fi + fi +rm -f conftest* -+ + +- else +- { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} +- fi +- fi +- fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } +if test $ac_cv_type_uid_t = no; then -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define uid_t int ++#define uid_t int +_ACEOF + -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define gid_t int ++#define gid_t int +_ACEOF -+ -+fi -+ + +- if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then +- { { $as_echo "$as_me:$LINENO: error: +-*** Checks for JPEG loader failed. You can build without it by passing +-*** --without-libjpeg to configure but some programs using GTK+ may +-*** not work properly" >&5 +-$as_echo "$as_me: error: +-*** Checks for JPEG loader failed. You can build without it by passing +-*** --without-libjpeg to configure but some programs using GTK+ may +-*** not work properly" >&2;} +- { (exit 1); exit 1; }; } +- fi + fi + +- if test x$with_libpng != xno && test -z "$LIBPNG"; then +- { $as_echo "$as_me:$LINENO: checking for libpng12" >&5 +-$as_echo_n "checking for libpng12... " >&6; } +- if $PKG_CONFIG --exists libpng12 ; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- PNG='png' +- PNG_DEP_CFLAGS_PACKAGES=libpng12 +- LIBPNG=`$PKG_CONFIG --libs libpng12` +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 +-$as_echo_n "checking for png_read_info in -lpng... " >&6; } +-if test "${ac_cv_lib_png_png_read_info+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpng -lz -lm $LIBS" + +# Check if <sys/select.h> needs to be included for fd_set +{ echo "$as_me:$LINENO: checking for fd_set" >&5 +echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char png_read_info (); +#include <sys/types.h> -+int -+main () -+{ + int + main () + { +-return png_read_info (); +fd_set readMask, writeMask; -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_png_png_read_info=yes + } && test -s conftest.$ac_objext; then + gtk_ok=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_png_png_read_info=no + gtk_ok=no -+fi -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test $gtk_ok = yes; then + { echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 @@ -31425,68 +61076,102 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "fd_mask" >/dev/null 2>&1; then + gtk_ok=yes -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 +-$as_echo "$ac_cv_lib_png_png_read_info" >&6; } +-if test "x$ac_cv_lib_png_png_read_info" = x""yes; then +- if test "${ac_cv_header_png_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for png.h" >&5 +-$as_echo_n "checking for png.h... " >&6; } +-if test "${ac_cv_header_png_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +rm -f conftest* + + if test $gtk_ok = yes; then -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_SYS_SELECT_H 1 ++#define HAVE_SYS_SELECT_H 1 +_ACEOF + + { echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 +echo "${ECHO_T}yes, found in sys/select.h" >&6; } + else -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define NO_FD_SET 1 ++#define NO_FD_SET 1 +_ACEOF + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +-$as_echo "$ac_cv_header_png_h" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5 +-$as_echo_n "checking png.h usability... " >&6; } + +# `widechar' tests for gdki18n.h +{ echo "$as_me:$LINENO: checking for wchar.h" >&5 +echo $ECHO_N "checking for wchar.h... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <png.h> +#include <wchar.h> -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + }; then + gdk_wchar_h=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + gdk_wchar_h=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +rm -f conftest.err conftest.$ac_ext +if test $gdk_wchar_h = yes; then -+ + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5 +-$as_echo_n "checking png.h presence... " >&6; } +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_WCHAR_H 1 ++#define HAVE_WCHAR_H 1 +_ACEOF + +fi @@ -31496,62 +61181,125 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# Check for wctype.h (for iswalnum) +{ echo "$as_me:$LINENO: checking for wctype.h" >&5 +echo $ECHO_N "checking for wctype.h... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <png.h> +#include <wctype.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.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 + gdk_wctype_h=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no + gdk_wctype_h=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +if test $gdk_wctype_h = yes; then -+ + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for png.h" >&5 +-$as_echo_n "checking for png.h... " >&6; } +-if test "${ac_cv_header_png_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_png_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +-$as_echo "$ac_cv_header_png_h" >&6; } +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_WCTYPE_H 1 ++#define HAVE_WCTYPE_H 1 +_ACEOF -+ -+fi + + fi +-if test "x$ac_cv_header_png_h" = x""yes; then +- png_ok=yes +-else +- png_ok=no +-fi +- +{ echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 +echo "${ECHO_T}$gdk_wctype_h" >&6; } -+ + +# in Solaris 2.5, `iswalnum' is in -lw +GDK_WLIBS= +{ echo "$as_me:$LINENO: checking for iswalnum" >&5 +echo $ECHO_N "checking for iswalnum... $ECHO_C" >&6; } +if test "${ac_cv_func_iswalnum+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} +-fi +- +- if test "$png_ok" = yes; then +- { $as_echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 +-$as_echo_n "checking for png_structp in png.h... " >&6; } +- cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <png.h> +/* Define iswalnum to an innocuous variant, in case <limits.h> declares iswalnum. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define iswalnum innocuous_iswalnum @@ -31583,40 +61331,86 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +choke me +#endif + -+int -+main () -+{ + int + main () + { +-png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct; +return iswalnum (); -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- png_ok=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_iswalnum=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- png_ok=no + ac_cv_func_iswalnum=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { $as_echo "$as_me:$LINENO: result: $png_ok" >&5 +-$as_echo "$png_ok" >&6; } +- if test "$png_ok" = yes; then +- PNG='png'; LIBPNG='-lpng -lz' +- else +- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 +-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} +- fi +- else +- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} +- fi +- fi +- fi +- +- if test x$with_libpng != xno && test -z "$LIBPNG"; then +- { { $as_echo "$as_me:$LINENO: error: +-*** Checks for PNG loader failed. You can build without it by passing +-*** --without-libpng to configure but many programs using GTK+ will +-*** not work properly. The PNG loader is also needed if you are compiling +-*** from CVS." >&5 +-$as_echo "$as_me: error: +-*** Checks for PNG loader failed. You can build without it by passing +-*** --without-libpng to configure but many programs using GTK+ will +-*** not work properly. The PNG loader is also needed if you are compiling +-*** from CVS." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- if test x$with_libjasper != xno && test -z "$LIBJASPER"; then +- { $as_echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 +-$as_echo_n "checking for jas_init in -ljasper... " >&6; } +-if test "${ac_cv_lib_jasper_jas_init+set}" = set; then +- $as_echo_n "(cached) " >&6 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi @@ -31629,70 +61423,89 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for iswalnum in -lw... $ECHO_C" >&6; } +if test "${ac_cv_lib_w_iswalnum+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ljasper -ljpeg $LIBS" +LIBS="-lw $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25771,11 +27733,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char jas_init (); +char iswalnum (); -+int -+main () -+{ + int + main () + { +-return jas_init (); +return iswalnum (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -25786,709 +27748,798 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_jasper_jas_init=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_w_iswalnum=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_jasper_jas_init=no + ac_cv_lib_w_iswalnum=no -+fi -+ -+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 + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 +-$as_echo "$ac_cv_lib_jasper_jas_init" >&6; } +-if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then +- LIBJASPER=-ljasper +{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 +echo "${ECHO_T}$ac_cv_lib_w_iswalnum" >&6; } +if test $ac_cv_lib_w_iswalnum = yes; then + GDK_WLIBS=-lw + fi + +- fi +fi -+ -+fi -+ -+ + +- if test x$with_libjasper != xno && test -z "$LIBJASPER"; then +- { { $as_echo "$as_me:$LINENO: error: +-*** Checks for JPEG2000 loader failed. You can build without it by passing +-*** --without-libjasper to configure" >&5 +-$as_echo "$as_me: error: +-*** Checks for JPEG2000 loader failed. You can build without it by passing +-*** --without-libjasper to configure" >&2;} +- { (exit 1); exit 1; }; } +- fi + +oLIBS="$LIBS" +LIBS="$LIBS $GDK_WLIBS" +# The following is necessary for Linux libc-5.4.38 @@ -31708,7 +61521,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +int +main () +{ -+ + +#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) +# ifdef HAVE_WCTYPE_H +# include <wctype.h> @@ -31721,7 +61534,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) +#endif +iswalnum((wchar_t) 0); -+ + + ; + return 0; +} @@ -31748,26 +61561,38 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + gdk_working_wctype=no +fi -+ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$oLIBS" -+ + +if test $gdk_working_wctype = no; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_BROKEN_WCTYPE 1 ++#define HAVE_BROKEN_WCTYPE 1 +_ACEOF -+ + +-if $dynworks; then +- BUILD_DYNAMIC_MODULES_TRUE= +- BUILD_DYNAMIC_MODULES_FALSE='#' +-else +- BUILD_DYNAMIC_MODULES_TRUE='#' +- BUILD_DYNAMIC_MODULES_FALSE= + GDK_WLIBS= -+fi + fi +{ echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 +echo "${ECHO_T}$gdk_working_wctype" >&6; } -+ -+ + + +-# +-# Allow building some or all gdk-pixbuf loaders included +-# +-{ $as_echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 +-$as_echo_n "checking pixbuf loaders to build... " >&6; } +- +# Check for uxtheme.h (for MS-Windows Engine) +{ echo "$as_me:$LINENO: checking for uxtheme.h" >&5 +echo $ECHO_N "checking for uxtheme.h... $ECHO_C" >&6; } @@ -31799,23 +61624,39 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-# Check whether --with-included_loaders was given. +-if test "${with_included_loaders+set}" = set; then +- withval=$with_included_loaders; + gtk_uxtheme_h=no -+fi -+ + fi + +rm -f conftest.err conftest.$ac_ext +if test $gtk_uxtheme_h = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_UXTHEME_H 1 -+_ACEOF + -+fi ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_UXTHEME_H 1 ++_ACEOF + +-if $dynworks; then +- : +-else +- ## if the option was specified, leave it; otherwise disable included loaders +- if test x$with_included_loaders = xno; then +- with_included_loaders=yes +- fi + fi +{ echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 +echo "${ECHO_T}$gtk_uxtheme_h" >&6; } -+ + +-# Use the traditional png loader instead of the GDI+ one on Windows, +-# because some important apps like GIMP need to read and write +-# arbitrary tEXt chunks which doesn't seem to be possible through GDI+ +# Checks for gdkspawn -+ + +-all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm" +-if test x$with_libjasper != xno; then +- all_loaders="$all_loaders,jasper" +for ac_header in crt_externs.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -31824,11 +61665,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi + fi +-if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then +- # Skip PNG, see comment above +- gdip_formats="bmp emf gif ico jpeg tiff wmf" +- for f in $gdip_formats; do +- all_loaders="$all_loaders,gdip-$f" +- done +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+else + else +- all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff" +-fi +-included_loaders="" +-# If no loaders specified, include all +-if test "x$with_included_loaders" = xyes ; then +- included_loaders="$all_loaders" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } @@ -31839,7 +61692,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -+@%:@include <$ac_header> ++#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" @@ -31859,17 +61712,52 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes -+else + else +- included_loaders="$with_included_loaders" +-fi +- +-{ $as_echo "$as_me:$LINENO: result: $included_loaders" >&5 +-$as_echo "$included_loaders" >&6; } +- +-INCLUDED_LOADER_OBJ= +-INCLUDED_LOADER_DEFINE= +- +-IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," +-for loader in $included_loaders; do +- if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then +- : +- else +- { { $as_echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 +-$as_echo "$as_me: error: the specified loader $loader does not exist" >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- loader_underscores=`echo $loader | sed -e 's/-/_/g'` +- INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la" +- +- # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader +- case $loader in +- gdip-*) ;; +- *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";; +- esac +- eval INCLUDE_$loader_underscores=yes +-done + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders +-# (except gdip-png, which isn't built at all) +-if test x"$INCLUDE_gdip_ico" = xyes; then +- INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus" + ac_header_compiler=no -+fi -+ + fi + +-IFS="$gtk_save_ifs" +- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } @@ -31879,7 +61767,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <$ac_header> ++#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -31901,14 +61789,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_header_preproc=no +fi -+ + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +-if test x"$INCLUDE_png" = xyes; then +- INCLUDE_PNG_TRUE= +- INCLUDE_PNG_FALSE='#' +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -31932,9 +61823,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -31943,24 +61834,36 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- INCLUDE_PNG_TRUE='#' +- INCLUDE_PNG_FALSE= + eval "$as_ac_Header=\$ac_header_preproc" -+fi + fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } -+ + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -+ -+fi -+ + +- +-if test x"$INCLUDE_bmp" = xyes; then +- INCLUDE_BMP_TRUE= +- INCLUDE_BMP_FALSE='#' +-else +- INCLUDE_BMP_TRUE='#' +- INCLUDE_BMP_FALSE= + fi + +done -+ -+ + + +-if test x"$INCLUDE_wbmp" = xyes; then +- INCLUDE_WBMP_TRUE= +- INCLUDE_WBMP_FALSE='#' +for ac_func in _NSGetEnviron +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -31968,7 +61871,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- INCLUDE_WBMP_TRUE='#' +- INCLUDE_WBMP_FALSE= +-fi + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF @@ -31983,15 +61889,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ -+ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif -+ + +#undef $ac_func -+ + +-if test x"$INCLUDE_gif" = xyes; then +- INCLUDE_GIF_TRUE= +- INCLUDE_GIF_FALSE='#' +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -32033,13 +61942,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" -+else + else +- INCLUDE_GIF_TRUE='#' +- INCLUDE_GIF_FALSE= +-fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + eval "$as_ac_var=no" +fi -+ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi @@ -32048,53 +61960,85 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -+ -+fi + +-if test x"$INCLUDE_ico" = xyes; then +- INCLUDE_ICO_TRUE= +- INCLUDE_ICO_FALSE='#' +-else +- INCLUDE_ICO_TRUE='#' +- INCLUDE_ICO_FALSE= + fi +done -+ -+ -+ + + + +-if test x"$INCLUDE_ani" = xyes; then +- INCLUDE_ANI_TRUE= +- INCLUDE_ANI_FALSE='#' +-else +- INCLUDE_ANI_TRUE='#' +- INCLUDE_ANI_FALSE= +-fi +################################################## +# Checks for gdk-pixbuf +################################################## -+ -+ + + +use_la_modules=false +case $host in + *-aix*) use_la_modules=true +esac + +if $use_la_modules ; then -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define USE_LA_MODULES 1 ++#define USE_LA_MODULES 1 +_ACEOF -+ -+fi -+ -+ + +-if test x"$INCLUDE_jpeg" = xyes; then +- INCLUDE_JPEG_TRUE= +- INCLUDE_JPEG_FALSE='#' +-else +- INCLUDE_JPEG_TRUE='#' +- INCLUDE_JPEG_FALSE= + fi + + +{ echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 +echo $ECHO_N "checking whether to build gmodulized gdk-pixbuf... $ECHO_C" >&6; } -+ + +-if test x"$INCLUDE_pnm" = xyes; then +- INCLUDE_PNM_TRUE= +- INCLUDE_PNM_FALSE='#' +-else +- INCLUDE_PNM_TRUE='#' +- INCLUDE_PNM_FALSE= +# Check whether --enable-modules was given. +if test "${enable_modules+set}" = set; then -+ enableval=$enable_modules; -+fi -+ -+ ++ enableval=$enable_modules; + fi + + +- +-if test x"$INCLUDE_ras" = xyes; then +- INCLUDE_RAS_TRUE= +- INCLUDE_RAS_FALSE='#' +dynworks=false +deps= +if test x$enable_modules = xno; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+else + else +- INCLUDE_RAS_TRUE='#' +- INCLUDE_RAS_FALSE= +-fi + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + { echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 +echo $ECHO_N "checking whether dynamic modules work... $ECHO_C" >&6; } -+ ## for loop is to strip newline ++ ## for loop is to strip newline + tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` + for I in $tmp; do + dynworks=$I @@ -32111,78 +62055,184 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + dynworks=false + fi + fi -+ + + if $dynworks; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define USE_GMODULE 1 ++#define USE_GMODULE 1 +_ACEOF -+ + +-if test x"$INCLUDE_tiff" = xyes; then +- INCLUDE_TIFF_TRUE= +- INCLUDE_TIFF_FALSE='#' +-else +- INCLUDE_TIFF_TRUE='#' +- INCLUDE_TIFF_FALSE= + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi -+fi -+ -+ -+ + fi + + + +-if test x"$INCLUDE_xpm" = xyes; then +- INCLUDE_XPM_TRUE= +- INCLUDE_XPM_FALSE='#' +-else +- INCLUDE_XPM_TRUE='#' +- INCLUDE_XPM_FALSE= +# Check whether --with-libpng was given. +if test "${with_libpng+set}" = set; then -+ withval=$with_libpng; -+fi -+ -+ ++ withval=$with_libpng; + fi + + +- +-if test x"$INCLUDE_xbm" = xyes; then +- INCLUDE_XBM_TRUE= +- INCLUDE_XBM_FALSE='#' +-else +- INCLUDE_XBM_TRUE='#' +- INCLUDE_XBM_FALSE= +# Check whether --with-libjpeg was given. +if test "${with_libjpeg+set}" = set; then -+ withval=$with_libjpeg; -+fi -+ -+ ++ withval=$with_libjpeg; + fi + + +# Check whether --with-libtiff was given. +if test "${with_libtiff+set}" = set; then -+ withval=$with_libtiff; ++ withval=$with_libtiff; +fi + -+ + +-if test x"$INCLUDE_tga" = xyes; then +- INCLUDE_TGA_TRUE= +- INCLUDE_TGA_FALSE='#' +-else +- INCLUDE_TGA_TRUE='#' +- INCLUDE_TGA_FALSE= +# Check whether --with-libjasper was given. +if test "${with_libjasper+set}" = set; then -+ withval=$with_libjasper; -+fi -+ -+ ++ withval=$with_libjasper; + fi + + +# Check whether --enable-gdiplus was given. +if test "${enable_gdiplus+set}" = set; then -+ enableval=$enable_gdiplus; ++ enableval=$enable_gdiplus; +fi -+ + +-if test x"$INCLUDE_pcx" = xyes; then +- INCLUDE_PCX_TRUE= +- INCLUDE_PCX_FALSE='#' + + if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then + BUILD_GDIPLUS_LOADERS_TRUE= + BUILD_GDIPLUS_LOADERS_FALSE='#' -+else + else +- INCLUDE_PCX_TRUE='#' +- INCLUDE_PCX_FALSE= + BUILD_GDIPLUS_LOADERS_TRUE='#' + BUILD_GDIPLUS_LOADERS_FALSE= -+fi -+ -+ + fi + + +- +-if test x"$INCLUDE_icns" = xyes; then +- INCLUDE_ICNS_TRUE= +- INCLUDE_ICNS_FALSE='#' +-else +- INCLUDE_ICNS_TRUE='#' +- INCLUDE_ICNS_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_jasper" = xyes; then +- INCLUDE_JASPER_TRUE= +- INCLUDE_JASPER_FALSE='#' +-else +- INCLUDE_JASPER_TRUE='#' +- INCLUDE_JASPER_FALSE= +-fi +- +-# As all GDI+ loaders are either built-in or not, arbitrarily just +-# check one of the variables here +- +- +-if test x"$INCLUDE_gdip_ico" = xyes; then +- INCLUDE_GDIPLUS_TRUE= +- INCLUDE_GDIPLUS_FALSE='#' +-else +- INCLUDE_GDIPLUS_TRUE='#' +- INCLUDE_GDIPLUS_FALSE= +-fi +- +- +-if test x$gio_can_sniff = x; then +- { $as_echo "$as_me:$LINENO: checking if gio can sniff png" >&5 +-$as_echo_n "checking if gio can sniff png... " >&6; } +- gtk_save_LIBS="$LIBS" +- gtk_save_CFLAGS="$CFLAGS" +- LIBS="`$PKG_CONFIG --libs gio-2.0`" +- CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" +- if test "$cross_compiling" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } +if test x$os_win32 = xno || test x$enable_gdiplus = xno; then + if test x$with_libtiff != xno && test -z "$LIBTIFF"; then + { echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 +echo $ECHO_N "checking for TIFFReadRGBAImageOriented in -ltiff... $ECHO_C" >&6; } +if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltiff -lm $LIBS" +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +- #include <gio/gio.h> +- static const gsize data_size = 159; +- static const guint8 data[] = +- { +- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, +- 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, +- 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, +- 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, +- 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, +- 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, +- 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, +- 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, +- 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, +- 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, +- 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, +- 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, +- 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, +- 0x42, 0x60, 0x82 +- }; +- int +- main (int argc, char **argv) +- { +- char *content_type; +- char *image_png; +- content_type = g_content_type_guess (NULL, data, data_size, NULL); +- image_png = g_content_type_from_mime_type ("image/png"); +- return !!strcmp (content_type, image_png); +- } +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -32197,16 +62247,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-rm -f conftest$ac_exeext +rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 @@ -32250,17 +62307,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -+@%:@include <tiffio.h> ++#include <tiffio.h> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- gio_can_sniff=yes +- +-cat >>confdefs.h <<\_ACEOF +-#define GDK_PIXBUF_USE_GIO_MIME 1 +-_ACEOF +- + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 @@ -32270,17 +62338,36 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes -+else + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +-( exit $ac_status ) +-gio_can_sniff=no +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +- +- { $as_echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 +-$as_echo "$gio_can_sniff" >&6; } +- LIBS="$gtk_save_LIBS" +- CFLAGS="$gtk_save_CFLAGS" + ac_header_compiler=no -+fi -+ + fi + +-# +-# Allow building some or all immodules included +-# +-{ $as_echo "$as_me:$LINENO: checking immodules to build" >&5 +-$as_echo_n "checking immodules to build... " >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ + +# Is the header present? +{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } @@ -32290,7 +62377,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <tiffio.h> ++#include <tiffio.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -32312,14 +62399,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-# Check whether --with-included_immodules was given. +-if test "${with_included_immodules+set}" = set; then +- withval=$with_included_immodules; + ac_header_preproc=no -+fi -+ + fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +-if $dynworks; then +- : +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -32343,9 +62435,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -32354,22 +62446,63 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } +if test "${ac_cv_header_tiffio_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ## if the option was specified, leave it; otherwise disable included immodules +- if test x$with_included_immodules = xno; then +- with_included_immodules=yes +- fi + ac_cv_header_tiffio_h=$ac_header_preproc -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } -+ -+fi + +-all_immodules="am-et,cedilla,cyrillic-translit" +-if test "$gdktarget" = "win32"; then +- all_immodules="${all_immodules},ime" +-fi +-all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr" +-if test "$gdktarget" = "x11"; then +- all_immodules="${all_immodules},xim" + fi +- +-included_immodules="" +-# If the switch specified without listing any specific ones, include all +-if test "x$with_included_immodules" = xyes ; then +- included_immodules="$all_immodules" +if test $ac_cv_header_tiffio_h = yes; then + TIFF='tiff'; LIBTIFF='-ltiff' -+else + else +- included_immodules="$with_included_immodules" + { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} -+fi -+ -+ -+else + fi + +-{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 +-$as_echo "$included_immodules" >&6; } + +- +-if test "x$included_immodules" != x; then +- HAVE_INCLUDED_IMMMODULES_TRUE= +- HAVE_INCLUDED_IMMMODULES_FALSE='#' + else +- HAVE_INCLUDED_IMMMODULES_TRUE='#' +- HAVE_INCLUDED_IMMMODULES_FALSE= +-fi +- +- +-INCLUDED_IMMODULE_OBJ= +-INCLUDED_IMMODULE_DEFINE= +- +-IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," +-for immodule in $included_immodules; do +- immodule_underscores=`echo $immodule | sed -e 's/-/_/g'` +- if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then +- : +- else +- { { $as_echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 +-$as_echo "$as_me: error: the specified input method $immodule does not exist" >&2;} +- { (exit 1); exit 1; }; } +- fi + { echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 +echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6; } +if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then @@ -32383,52 +62516,222 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +- INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la" +- INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores" +- eval INCLUDE_$immodule_underscores=yes +-done +-IFS="$gtk_save_ifs" +- +- +- +- +- +-if test x"$INCLUDE_am_et" = xyes; then +- INCLUDE_IM_AM_ET_TRUE= +- INCLUDE_IM_AM_ET_FALSE='#' +-else +- INCLUDE_IM_AM_ET_TRUE='#' +- INCLUDE_IM_AM_ET_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_cedilla" = xyes; then +- INCLUDE_IM_CEDILLA_TRUE= +- INCLUDE_IM_CEDILLA_FALSE='#' +-else +- INCLUDE_IM_CEDILLA_TRUE='#' +- INCLUDE_IM_CEDILLA_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_cyrillic_translit" = xyes; then +- INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= +- INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' +-else +- INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#' +- INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_ime" = xyes; then +- INCLUDE_IM_IME_TRUE= +- INCLUDE_IM_IME_FALSE='#' +-else +- INCLUDE_IM_IME_TRUE='#' +- INCLUDE_IM_IME_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_inuktitut" = xyes; then +- INCLUDE_IM_INUKTITUT_TRUE= +- INCLUDE_IM_INUKTITUT_FALSE='#' +-else +- INCLUDE_IM_INUKTITUT_TRUE='#' +- INCLUDE_IM_INUKTITUT_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_ipa" = xyes; then +- INCLUDE_IM_IPA_TRUE= +- INCLUDE_IM_IPA_FALSE='#' +-else +- INCLUDE_IM_IPA_TRUE='#' +- INCLUDE_IM_IPA_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_multipress" = xyes; then +- INCLUDE_IM_MULTIPRESS_TRUE= +- INCLUDE_IM_MULTIPRESS_FALSE='#' +-else +- INCLUDE_IM_MULTIPRESS_TRUE='#' +- INCLUDE_IM_MULTIPRESS_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_thai" = xyes; then +- INCLUDE_IM_THAI_TRUE= +- INCLUDE_IM_THAI_FALSE='#' +-else +- INCLUDE_IM_THAI_TRUE='#' +- INCLUDE_IM_THAI_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_ti_er" = xyes; then +- INCLUDE_IM_TI_ER_TRUE= +- INCLUDE_IM_TI_ER_FALSE='#' +-else +- INCLUDE_IM_TI_ER_TRUE='#' +- INCLUDE_IM_TI_ER_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_ti_et" = xyes; then +- INCLUDE_IM_TI_ET_TRUE= +- INCLUDE_IM_TI_ET_FALSE='#' +-else +- INCLUDE_IM_TI_ET_TRUE='#' +- INCLUDE_IM_TI_ET_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_viqr" = xyes; then +- INCLUDE_IM_VIQR_TRUE= +- INCLUDE_IM_VIQR_FALSE='#' +-else +- INCLUDE_IM_VIQR_TRUE='#' +- INCLUDE_IM_VIQR_FALSE= +-fi +- +- +- +-if test x"$INCLUDE_xim" = xyes; then +- INCLUDE_IM_XIM_TRUE= +- INCLUDE_IM_XIM_FALSE='#' +-else +- INCLUDE_IM_XIM_TRUE='#' +- INCLUDE_IM_XIM_FALSE= +-fi +- +- +-{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +-$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +-if test "${ac_cv_header_sys_wait_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +-#include <sys/wait.h> +-#ifndef WEXITSTATUS +-# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) +-#endif +-#ifndef WIFEXITED +-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" -+#endif + #endif +- +char TIFFWriteScanline (); -+int -+main () -+{ + int + main () + { +- int s; +- wait (&s); +- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; +return TIFFWriteScanline (); -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (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 + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_tiff_TIFFWriteScanline=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_header_sys_wait_h=no + ac_cv_lib_tiff_TIFFWriteScanline=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +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 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +-$as_echo "$ac_cv_header_sys_wait_h" >&6; } +-if test $ac_cv_header_sys_wait_h = yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SYS_WAIT_H 1 +-_ACEOF +- +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 +echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } +if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then @@ -32437,61 +62740,97 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } +if test "${ac_cv_header_tiffio_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi + fi +- +- +-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +-$as_echo_n "checking return type of signal handlers... " >&6; } +-if test "${ac_cv_type_signal+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } -+else + else +- cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <sys/types.h> +-#include <signal.h> +- +-int +-main () +-{ +-return *(signal (0, 0)) (0) == 1; +- ; +- return 0; +-} +$ac_includes_default -+@%:@include <tiffio.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac ++#include <tiffio.h> + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -26496,108 +28547,192 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 + ac_header_compiler=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_type_signal=void + ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +-$as_echo "$ac_cv_type_signal" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ + +-cat >>confdefs.h <<_ACEOF +-#define RETSIGTYPE $ac_cv_type_signal +# Is the header present? +{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF + _ACEOF +- +- +- +- +- +-if test "x$LIBTIFF" != x; then +- HAVE_TIFF_TRUE= +- HAVE_TIFF_FALSE='#' +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <tiffio.h> ++#include <tiffio.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -32510,17 +62849,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + }; then + ac_header_preproc=yes -+else + else +- HAVE_TIFF_TRUE='#' +- HAVE_TIFF_FALSE= +-fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_header_preproc=no +fi -+ + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +-if test "x$LIBPNG" != x; then +- HAVE_PNG_TRUE= +- HAVE_PNG_FALSE='#' +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -32544,9 +62889,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -32555,22 +62900,39 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } +if test "${ac_cv_header_tiffio_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- HAVE_PNG_TRUE='#' +- HAVE_PNG_FALSE= + ac_cv_header_tiffio_h=$ac_header_preproc -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } -+ + +- +- +-if test "x$LIBJPEG" != x; then +- HAVE_JPEG_TRUE= +- HAVE_JPEG_FALSE='#' +fi +if test $ac_cv_header_tiffio_h = yes; then + TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' -+else + else +- HAVE_JPEG_TRUE='#' +- HAVE_JPEG_FALSE= + { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} -+fi -+ -+ -+else + fi + + +- +-if test "x$LIBJASPER" != x; then +- HAVE_JASPER_TRUE= +- HAVE_JASPER_FALSE='#' + else +- HAVE_JASPER_TRUE='#' +- HAVE_JASPER_FALSE= +-fi +- + { echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 +echo $ECHO_N "checking for TIFFFlushData in -ltiff34... $ECHO_C" >&6; } +if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then @@ -32584,7 +62946,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +-if $dynworks ; then +- STATIC_LIB_DEPS= +- if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then +- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF" +- fi +- if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then +- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG" +- fi +- if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then +- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" +- fi +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -32619,13 +62992,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_tiff34_TIFFFlushData=yes -+else + else +- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tiff34_TIFFFlushData=no -+fi -+ + fi + +-# Checks to see whether we should include mediaLib +-# support. +-# +-if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 +-$as_echo_n "checking for sys/systeminfo.h... " >&6; } +-if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -32638,100 +63020,136 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } +if test "${ac_cv_header_tiffio_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 +-$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } -+else -+ # Is the header compilable? + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 +-$as_echo_n "checking sys/systeminfo.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+@%:@include <tiffio.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -26605,7 +28740,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <sys/systeminfo.h> ++#include <tiffio.h> + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -26613,92 +28748,90 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h presence" >&5 +-$as_echo_n "checking sys/systeminfo.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <tiffio.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <sys/systeminfo.h> ++#include <tiffio.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 + (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 +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 @@ -32744,56 +63162,73 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -26707,180 +28840,171 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 +-$as_echo_n "checking for sys/systeminfo.h... " >&6; } +-if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } +if test "${ac_cv_header_tiffio_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_cv_header_sys_systeminfo_h=$ac_header_preproc + ac_cv_header_tiffio_h=$ac_header_preproc -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 +-$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } -+ -+fi + + fi +-if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then +if test $ac_cv_header_tiffio_h = yes; then + TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' +else + { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} +fi -+ + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SYS_SYSTEMINFO_H 1 +-_ACEOF + +else + { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 +echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} +fi -+ + + fi + +fi -+ -+fi -+ + +-if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 +-$as_echo_n "checking for sys/sysinfo.h... " >&6; } +-if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 + fi + + if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -+ { { echo "$as_me:$LINENO: error: -+*** Checks for TIFF loader failed. You can build without it by passing ++ { { echo "$as_me:$LINENO: error: ++*** Checks for TIFF loader failed. You can build without it by passing +*** --without-libtiff to configure but some programs using GTK+ may +*** not work properly" >&5 -+echo "$as_me: error: -+*** Checks for TIFF loader failed. You can build without it by passing ++echo "$as_me: error: ++*** Checks for TIFF loader failed. You can build without it by passing +*** --without-libtiff to configure but some programs using GTK+ may +*** not work properly" >&2;} + { (exit 1); exit 1; }; } + fi -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 +-$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } + +if test x$os_win32 = xno || test x$enable_gdiplus = xno; then + if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then @@ -32801,15 +63236,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; } +if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 +-$as_echo_n "checking sys/sysinfo.h usability... " >&6; } + ac_check_lib_save_LIBS=$LIBS +LIBS="-ljpeg $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <sys/sysinfo.h> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -32825,33 +63265,46 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_jpeg_jpeg_destroy_decompress=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + ac_cv_lib_jpeg_jpeg_destroy_decompress=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -32865,47 +63318,121 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 +echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} +fi -+ + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 +-$as_echo_n "checking sys/sysinfo.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + if test "$jpeg_ok" = yes; then + { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <sys/sysinfo.h> +#include <stdio.h> +#undef PACKAGE +#undef VERSION +#undef HAVE_STDLIB_H +#include <jpeglib.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.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 + jpeg_ok=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no + jpeg_ok=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 +-$as_echo_n "checking for sys/sysinfo.h... " >&6; } +-if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_sys_sysinfo_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 +-$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } +- +-fi +-if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SYS_SYSINFO_H 1 +-_ACEOF +- +-fi +- +- +- +-{ $as_echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 +-$as_echo_n "checking for mediaLib 2.3... " >&6; } +-use_mlib25=no +-# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib +-# patch requires. +-{ $as_echo "$as_me:$LINENO: checking for mlib_ImageSetStruct in -lmlib" >&5 +-$as_echo_n "checking for mlib_ImageSetStruct in -lmlib... " >&6; } +-if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then +- $as_echo_n "(cached) " >&6 + { echo "$as_me:$LINENO: result: $jpeg_ok" >&5 +echo "${ECHO_T}$jpeg_ok" >&6; } + if test "$jpeg_ok" = yes; then @@ -32914,74 +63441,98 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6; } +if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmlib $LIBS" +LIBS="-ljpeg $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -26894,11 +29018,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char mlib_ImageSetStruct (); +char jpeg_simple_progression (); -+int -+main () -+{ + int + main () + { +-return mlib_ImageSetStruct (); +return jpeg_simple_progression (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -26909,61 +29033,82 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_mlib_mlib_ImageSetStruct=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_jpeg_jpeg_simple_progression=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_mlib_mlib_ImageSetStruct=no + ac_cv_lib_jpeg_jpeg_simple_progression=no -+fi -+ -+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 + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 +-$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } +-if test "x$ac_cv_lib_mlib_mlib_ImageSetStruct" = x""yes; then +- use_mlib=yes +-else +- use_mlib=no +-fi +- +-if test $use_mlib = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } +if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_PROGRESSIVE_JPEG 1 -+_ACEOF -+ + + cat >>confdefs.h <<\_ACEOF +-#define USE_MEDIALIB 1 ++#define HAVE_PROGRESSIVE_JPEG 1 + _ACEOF + +- MEDIA_LIB=-lmlib +else + { echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 +echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} +fi -+ + +- { $as_echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 +-$as_echo_n "checking for mediaLib 2.5... " >&6; } +- # Check for a mediaLib 2.5 function since that is what is needed for +- # gdk_rgb_convert integration. +- { $as_echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 +-$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; } +-if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then +- $as_echo_n "(cached) " >&6 + else + { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 +echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} @@ -32990,12 +63541,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + + if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then -+ { { echo "$as_me:$LINENO: error: -+*** Checks for JPEG loader failed. You can build without it by passing ++ { { echo "$as_me:$LINENO: error: ++*** Checks for JPEG loader failed. You can build without it by passing +*** --without-libjpeg to configure but some programs using GTK+ may +*** not work properly" >&5 -+echo "$as_me: error: -+*** Checks for JPEG loader failed. You can build without it by passing ++echo "$as_me: error: ++*** Checks for JPEG loader failed. You can build without it by passing +*** --without-libjpeg to configure but some programs using GTK+ may +*** not work properly" >&2;} + { (exit 1); exit 1; }; } @@ -33018,61 +63569,70 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; } +if test "${ac_cv_lib_png_png_read_info+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmlib $LIBS" +LIBS="-lpng -lz -lm $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -26977,11 +29122,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char mlib_VideoColorRGBint_to_BGRAint (); +char png_read_info (); -+int -+main () -+{ + int + main () + { +-return mlib_VideoColorRGBint_to_BGRAint (); +return png_read_info (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -26992,817 +29137,1294 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_png_png_read_info=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no + ac_cv_lib_png_png_read_info=no -+fi -+ -+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 + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 +-$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } +-if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then +- use_mlib25=yes +{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 +echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; } +if test $ac_cv_lib_png_png_read_info = yes; then @@ -33084,7 +63644,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +echo "${ECHO_T}$ac_cv_header_png_h" >&6; } -+else + else +- use_mlib25=no + # Is the header compilable? +{ echo "$as_me:$LINENO: checking png.h usability" >&5 +echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } @@ -33095,7 +63656,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -+@%:@include <png.h> ++#include <png.h> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" @@ -33120,12 +63681,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no -+fi -+ + fi + +- if test $use_mlib25 = yes; then +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ + +-cat >>confdefs.h <<\_ACEOF +-#define USE_MEDIALIB25 1 +# Is the header present? +{ echo "$as_me:$LINENO: checking png.h presence" >&5 +echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } @@ -33135,8 +63699,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <png.h> -+_ACEOF ++#include <png.h> + _ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -33157,14 +63721,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +- fi + ac_header_preproc=no -+fi -+ + fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +-if test $use_mlib = yes; then +- USE_MEDIALIB_TRUE= +- USE_MEDIALIB_FALSE='#' +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -33188,9 +63756,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -33199,25 +63767,47 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } +if test "${ac_cv_header_png_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- USE_MEDIALIB_TRUE='#' +- USE_MEDIALIB_FALSE= + ac_cv_header_png_h=$ac_header_preproc -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +echo "${ECHO_T}$ac_cv_header_png_h" >&6; } -+ + +fi +if test $ac_cv_header_png_h = yes; then + png_ok=yes +else + png_ok=no +fi -+ -+ -+else + + +-if test $use_mlib25 = yes; then +- USE_MEDIALIB25_TRUE= +- USE_MEDIALIB25_FALSE='#' + else +- USE_MEDIALIB25_TRUE='#' +- USE_MEDIALIB25_FALSE= + { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 +echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} -+fi -+ + fi + +- +-# Checks to see if we should compile in MMX support (there will be +-# a runtime test when the code is actually run to see if it should +-# be used - this just checks if we can compile it.) +-# +-# This code is partially taken from Mesa +-# +-{ $as_echo "$as_me:$LINENO: checking for x86 platform" >&5 +-$as_echo_n "checking for x86 platform... " >&6; } +-case $host_cpu in +- i386|i486|i586|i686|i786|k6|k7) +- use_x86_asm=yes +- ;; +- *) +- use_x86_asm=no + if test "$png_ok" = yes; then + { echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 +echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6; } @@ -33241,7 +63831,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; -+esac + esac +-{ $as_echo "$as_me:$LINENO: result: $use_x86_asm" >&5 +-$as_echo "$use_x86_asm" >&6; } +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? @@ -33257,10 +63849,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-use_mmx_asm=no +-if test $use_x86_asm = yes; then +- save_ac_ext=$ac_ext +- ac_ext=S + png_ok=no +fi -+ + +- { $as_echo "$as_me:$LINENO: checking compiler support for MMX" >&5 +-$as_echo_n "checking compiler support for MMX... " >&6; } +- cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- use_mmx_asm=yes +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { echo "$as_me:$LINENO: result: $png_ok" >&5 +echo "${ECHO_T}$png_ok" >&6; } @@ -33274,23 +63879,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 +echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} + fi -+ fi + fi + fi -+ + +- rm -rf conftest* + if test x$with_libpng != xno && test -z "$LIBPNG"; then -+ { { echo "$as_me:$LINENO: error: -+*** Checks for PNG loader failed. You can build without it by passing ++ { { echo "$as_me:$LINENO: error: ++*** Checks for PNG loader failed. You can build without it by passing +*** --without-libpng to configure but many programs using GTK+ will +*** not work properly. The PNG loader is also needed if you are compiling +*** from CVS." >&5 -+echo "$as_me: error: -+*** Checks for PNG loader failed. You can build without it by passing ++echo "$as_me: error: ++*** Checks for PNG loader failed. You can build without it by passing +*** --without-libpng to configure but many programs using GTK+ will +*** not work properly. The PNG loader is also needed if you are compiling +*** from CVS." >&2;} + { (exit 1); exit 1; }; } + fi -+ + +- ac_ext=$save_ac_ext +- if test $use_mmx_asm = yes; then + if test x$with_libjasper != xno && test -z "$LIBJASPER"; then + { echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 +echo $ECHO_N "checking for jas_init in -ljasper... $ECHO_C" >&6; } @@ -33305,7 +63913,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +-cat >>confdefs.h <<\_ACEOF +-#define USE_MMX 1 +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -33320,7 +63930,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in @@ -33343,10 +63953,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- fi + ac_cv_lib_jasper_jas_init=no -+fi -+ + fi + +- +- +-if test x$use_mmx_asm = xyes; then +- USE_MMX_TRUE= +- USE_MMX_FALSE='#' +-else +- USE_MMX_TRUE='#' +- USE_MMX_FALSE= +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -33355,33 +63979,73 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}$ac_cv_lib_jasper_jas_init" >&6; } +if test $ac_cv_lib_jasper_jas_init = yes; then + LIBJASPER=-ljasper -+fi -+ + fi + + fi -+ + +-REBUILD_PNGS= +-if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then +- REBUILD_PNGS=# +-fi + if test x$with_libjasper != xno && test -z "$LIBJASPER"; then -+ { { echo "$as_me:$LINENO: error: -+*** Checks for JPEG2000 loader failed. You can build without it by passing ++ { { echo "$as_me:$LINENO: error: ++*** Checks for JPEG2000 loader failed. You can build without it by passing +*** --without-libjasper to configure" >&5 -+echo "$as_me: error: -+*** Checks for JPEG2000 loader failed. You can build without it by passing ++echo "$as_me: error: ++*** Checks for JPEG2000 loader failed. You can build without it by passing +*** --without-libjasper to configure" >&2;} + { (exit 1); exit 1; }; } + fi -+ -+ -+ -+ -+ -+ + + + + +-if test $cross_compiling = yes; then +- CROSS_COMPILING_TRUE= +- CROSS_COMPILING_FALSE='#' +-else +- CROSS_COMPILING_TRUE='#' +- CROSS_COMPILING_FALSE= +-fi + + +-if test $cross_compiling = yes; then +- # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. +-set dummy gdk-pixbuf-csource; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then +- $as_echo_n "(cached) " >&6 + if $dynworks; then + BUILD_DYNAMIC_MODULES_TRUE= + BUILD_DYNAMIC_MODULES_FALSE='#' -+else + else +- case $GDK_PIXBUF_CSOURCE in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + BUILD_DYNAMIC_MODULES_TRUE='#' + BUILD_DYNAMIC_MODULES_FALSE= +fi -+ + +- test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" +- ;; +-esac + +# +# Allow building some or all gdk-pixbuf loaders included @@ -33392,23 +64056,35 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +# Check whether --with-included_loaders was given. +if test "${with_included_loaders+set}" = set; then -+ withval=$with_included_loaders; -+fi ++ withval=$with_included_loaders; + fi +-GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE +-if test -n "$GDK_PIXBUF_CSOURCE"; then +- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 +-$as_echo "$GDK_PIXBUF_CSOURCE" >&6; } + + -+if $dynworks; then ++if $dynworks; then + : -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + ## if the option was specified, leave it; otherwise disable included loaders + if test x$with_included_loaders = xno; then + with_included_loaders=yes + fi -+fi -+ + fi + +# Use the traditional png loader instead of the GDI+ one on Windows, +# because some important apps like GIMP need to read and write +# arbitrary tEXt chunks which doesn't seem to be possible through GDI+ -+ + +- # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. +-set dummy gtk-update-icon-cache; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE+set}" = set; then +- $as_echo_n "(cached) " >&6 +all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm" +if test x$with_libjasper != xno; then + all_loaders="$all_loaders,jasper" @@ -33419,23 +64095,66 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + for f in $gdip_formats; do + all_loaders="$all_loaders,gdip-$f" + done -+else + else +- case $GTK_UPDATE_ICON_CACHE in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GTK_UPDATE_ICON_CACHE="$GTK_UPDATE_ICON_CACHE" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no" +- ;; +-esac + all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff" -+fi + fi +-GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE +-if test -n "$GTK_UPDATE_ICON_CACHE"; then +- { $as_echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 +-$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; } +included_loaders="" +# If no loaders specified, include all +if test "x$with_included_loaders" = xyes ; then + included_loaders="$all_loaders" -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + included_loaders="$with_included_loaders" -+fi -+ + fi + +{ echo "$as_me:$LINENO: result: $included_loaders" >&5 +echo "${ECHO_T}$included_loaders" >&6; } -+ + +- if test x$GTK_UPDATE_ICON_CACHE = xno; then +- REBUILD_PNGS=# +- fi +-fi +INCLUDED_LOADER_OBJ= +INCLUDED_LOADER_DEFINE= -+ + +-if test ! -f $srcdir/gtk/gtkbuiltincache.h && +- test "x$REBUILD_PNGS" = "x#" ; then +- { { $as_echo "$as_me:$LINENO: error: +-*** gtkbuiltincache.h is not in the tree, and cannot be built +-*** because you don't have libpng, or (when cross-compiling) you +-*** don't have a prebuilt gtk-update-icon-cache on the build system." >&5 +-$as_echo "$as_me: error: +-*** gtkbuiltincache.h is not in the tree, and cannot be built +-*** because you don't have libpng, or (when cross-compiling) you +-*** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} +IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," +for loader in $included_loaders; do + if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then @@ -33443,12 +64162,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + else + { { echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 +echo "$as_me: error: the specified loader $loader does not exist" >&2;} -+ { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; } +-fi + fi -+ + + loader_underscores=`echo $loader | sed -e 's/-/_/g'` + INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la" -+ + + # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader + case $loader in + gdip-*) ;; @@ -33456,17 +64176,34 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + eval INCLUDE_$loader_underscores=yes +done -+ + +-GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" +-GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" +-GDK_PIXBUF_EXTRA_CFLAGS= +-GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" +-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" +# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders +# (except gdip-png, which isn't built at all) +if test x"$INCLUDE_gdip_ico" = xyes; then + INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus" +fi -+ + +-######################################## +-# Windowing system checks +-######################################## +IFS="$gtk_save_ifs" -+ -+ -+ + +-GDK_PIXBUF_XLIB_PACKAGES= +-GDK_PIXBUF_XLIB_EXTRA_CFLAGS= +-GDK_PIXBUF_XLIB_EXTRA_LIBS= + +-X_PACKAGES=fontconfig +-GDK_EXTRA_LIBS="$GDK_WLIBS" +-GDK_EXTRA_CFLAGS= + +-# GTK+ uses some X calls, so needs to link against X directly +-GTK_DEP_PACKAGES_FOR_X= +-GTK_DEP_LIBS_FOR_X= + if test x"$INCLUDE_png" = xyes; then + INCLUDE_PNG_TRUE= + INCLUDE_PNG_FALSE='#' @@ -33474,7 +64211,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_PNG_TRUE='#' + INCLUDE_PNG_FALSE= +fi -+ + +-if test "x$gdktarget" = "xx11"; then +- # +- # We use fontconfig very peripherally when decoding the default +- # settings. +- # +- if $PKG_CONFIG --exists fontconfig; then : ; else +- { { $as_echo "$as_me:$LINENO: error: +-*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&5 +-$as_echo "$as_me: error: +-*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} +- { (exit 1); exit 1; }; } +- fi + if test x"$INCLUDE_bmp" = xyes; then + INCLUDE_BMP_TRUE= + INCLUDE_BMP_FALSE='#' @@ -33482,7 +64231,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_BMP_TRUE='#' + INCLUDE_BMP_FALSE= +fi -+ + +- # +- # Check for basic X packages; we use pkg-config if available +- # +- if $PKG_CONFIG --exists x11 xext xrender; then +- have_base_x_pc=true +- X_PACKAGES="$X_PACKAGES x11 xext xrender" +- x_libs="`$PKG_CONFIG --libs x11 xext xrender`" +- X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" + if test x"$INCLUDE_wbmp" = xyes; then + INCLUDE_WBMP_TRUE= + INCLUDE_WBMP_FALSE='#' @@ -33490,7 +64247,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_WBMP_TRUE='#' + INCLUDE_WBMP_FALSE= +fi -+ + +- # Strip out any .la files that pkg-config might give us (this happens +- # with -uninstalled.pc files) +- x_libs_for_checks= +- for I in $x_libs ; do +- case $I in +- *.la) ;; +- *) x_libs_for_checks="$x_libs_for_checks $I" ;; +- esac +- done + if test x"$INCLUDE_gif" = xyes; then + INCLUDE_GIF_TRUE= + INCLUDE_GIF_FALSE='#' @@ -33498,7 +64264,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_GIF_TRUE='#' + INCLUDE_GIF_FALSE= +fi -+ + +- GDK_PIXBUF_XLIB_PACKAGES="x11" +- GTK_PACKAGES_FOR_X="x11" +- else +- have_base_x_pc=false +- { $as_echo "$as_me:$LINENO: checking for X" >&5 +-$as_echo_n "checking for X... " >&6; } + if test x"$INCLUDE_ico" = xyes; then + INCLUDE_ICO_TRUE= + INCLUDE_ICO_FALSE='#' @@ -33506,7 +64278,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_ICO_TRUE='#' + INCLUDE_ICO_FALSE= +fi -+ + + if test x"$INCLUDE_ani" = xyes; then + INCLUDE_ANI_TRUE= + INCLUDE_ANI_FALSE='#' @@ -33514,19 +64286,32 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_ANI_TRUE='#' + INCLUDE_ANI_FALSE= +fi -+ + +-# Check whether --with-x was given. +-if test "${with_x+set}" = set; then +- withval=$with_x; + if test x"$INCLUDE_jpeg" = xyes; then + INCLUDE_JPEG_TRUE= + INCLUDE_JPEG_FALSE='#' +else + INCLUDE_JPEG_TRUE='#' + INCLUDE_JPEG_FALSE= -+fi -+ + fi + +-# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +-if test "x$with_x" = xno; then +- # The user explicitly disabled X. +- have_x=disabled + if test x"$INCLUDE_pnm" = xyes; then + INCLUDE_PNM_TRUE= + INCLUDE_PNM_FALSE='#' -+else + else +- case $x_includes,$x_libraries in #( +- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 +-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} +- { (exit 1); exit 1; }; };; #( +- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then +- $as_echo_n "(cached) " >&6 + INCLUDE_PNM_TRUE='#' + INCLUDE_PNM_FALSE= +fi @@ -33534,11 +64319,62 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + if test x"$INCLUDE_ras" = xyes; then + INCLUDE_RAS_TRUE= + INCLUDE_RAS_FALSE='#' -+else + else +- # One or both of the vars are not set, and there is no cached value. +-ac_x_includes=no ac_x_libraries=no +-rm -f -r conftest.dir +-if mkdir conftest.dir; then +- cd conftest.dir +- cat >Imakefile <<'_ACEOF' +-incroot: +- @echo incroot='${INCROOT}' +-usrlibdir: +- @echo usrlibdir='${USRLIBDIR}' +-libdir: +- @echo libdir='${LIBDIR}' +-_ACEOF +- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then +- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +- for ac_var in incroot usrlibdir libdir; do +- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" +- done +- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. +- for ac_extension in a so sl dylib la dll; do +- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && +- test -f "$ac_im_libdir/libX11.$ac_extension"; then +- ac_im_usrlibdir=$ac_im_libdir; break +- fi +- done +- # Screen out bogus values from the imake configuration. They are +- # bogus both because they are the default anyway, and because +- # using them would break gcc on systems where it needs fixed includes. +- case $ac_im_incroot in +- /usr/include) ac_x_includes= ;; +- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; +- esac +- case $ac_im_usrlibdir in +- /usr/lib | /usr/lib64 | /lib | /lib64) ;; +- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; +- esac +- fi +- cd .. +- rm -f -r conftest.dir + INCLUDE_RAS_TRUE='#' + INCLUDE_RAS_FALSE= -+fi -+ + fi + +-# Standard set of common directories for X headers. +-# Check X11 before X11Rn because it is often a symlink to the current release. +-ac_x_header_dirs=' +-/usr/X11/include +-/usr/X11R6/include +-/usr/X11R5/include +-/usr/X11R4/include +- +-/usr/include/X11 +-/usr/include/X11R6 +-/usr/include/X11R5 +-/usr/include/X11R4 + if test x"$INCLUDE_tiff" = xyes; then + INCLUDE_TIFF_TRUE= + INCLUDE_TIFF_FALSE='#' @@ -33546,7 +64382,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_TIFF_TRUE='#' + INCLUDE_TIFF_FALSE= +fi -+ + +-/usr/local/X11/include +-/usr/local/X11R6/include +-/usr/local/X11R5/include +-/usr/local/X11R4/include + if test x"$INCLUDE_xpm" = xyes; then + INCLUDE_XPM_TRUE= + INCLUDE_XPM_FALSE='#' @@ -33554,7 +64394,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_XPM_TRUE='#' + INCLUDE_XPM_FALSE= +fi -+ + +-/usr/local/include/X11 +-/usr/local/include/X11R6 +-/usr/local/include/X11R5 +-/usr/local/include/X11R4 + if test x"$INCLUDE_xbm" = xyes; then + INCLUDE_XBM_TRUE= + INCLUDE_XBM_FALSE='#' @@ -33562,7 +64406,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_XBM_TRUE='#' + INCLUDE_XBM_FALSE= +fi -+ + +-/usr/X386/include +-/usr/x386/include +-/usr/XFree86/include/X11 + if test x"$INCLUDE_tga" = xyes; then + INCLUDE_TGA_TRUE= + INCLUDE_TGA_FALSE='#' @@ -33570,7 +64417,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_TGA_TRUE='#' + INCLUDE_TGA_FALSE= +fi -+ + +-/usr/include +-/usr/local/include +-/usr/unsupported/include +-/usr/athena/include +-/usr/local/x11r5/include +-/usr/lpp/Xamples/include + if test x"$INCLUDE_pcx" = xyes; then + INCLUDE_PCX_TRUE= + INCLUDE_PCX_FALSE='#' @@ -33578,7 +64431,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_PCX_TRUE='#' + INCLUDE_PCX_FALSE= +fi -+ + +-/usr/openwin/include +-/usr/openwin/share/include' + if test x"$INCLUDE_icns" = xyes; then + INCLUDE_ICNS_TRUE= + INCLUDE_ICNS_FALSE='#' @@ -33586,15 +64441,53 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + INCLUDE_ICNS_TRUE='#' + INCLUDE_ICNS_FALSE= +fi -+ + +-if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Xlib.h. +- # First, try using that file with no special directory specified. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <X11/Xlib.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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= + if test x"$INCLUDE_jasper" = xyes; then + INCLUDE_JASPER_TRUE= + INCLUDE_JASPER_FALSE='#' -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + INCLUDE_JASPER_TRUE='#' + INCLUDE_JASPER_FALSE= +fi -+ + +- for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Xlib.h"; then +- ac_x_includes=$ac_dir +- break +- fi +-done +# As all GDI+ loaders are either built-in or not, arbitrarily just +# check one of the variables here + if test x"$INCLUDE_gdip_ico" = xyes; then @@ -33603,9 +64496,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + INCLUDE_GDIPLUS_TRUE='#' + INCLUDE_GDIPLUS_FALSE= -+fi -+ -+ + fi + +-rm -f conftest.err conftest.$ac_ext +-fi # $ac_x_includes = no + +-if test "$ac_x_libraries" = no; then +- # Check for the libraries. +- # See if we find them without any special options. +- # Don't add to $LIBS permanently. +- ac_save_LIBS=$LIBS +- LIBS="-lX11 $LIBS" +if test x$gio_can_sniff = x; then + { echo "$as_me:$LINENO: checking if gio can sniff png" >&5 +echo $ECHO_N "checking if gio can sniff png... $ECHO_C" >&6; } @@ -33620,30 +64521,38 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <X11/Xlib.h> +-int +-main () +-{ +-XrmInitialize () +- ; +- return 0; +-} + + #include <gio/gio.h> + static const gsize data_size = 159; -+ static const guint8 data[] = ++ static const guint8 data[] = + { -+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -+ 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, -+ 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, -+ 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, -+ 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, -+ 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, -+ 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, -+ 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, -+ 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, -+ 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, -+ 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, -+ 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, -+ 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, ++ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, ++ 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, ++ 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, ++ 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, ++ 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, ++ 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, ++ 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, ++ 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, ++ 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, ++ 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, ++ 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, ++ 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, ++ 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, + 0x42, 0x60, 0x82 + }; + int @@ -33651,20 +64560,38 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { + char *content_type; + char *image_png; -+ content_type = g_content_type_guess (NULL, data, data_size, NULL); ++ content_type = g_content_type_guess (NULL, data, data_size, NULL); + image_png = g_content_type_from_mime_type ("image/png"); + return !!strcmp (content_type, image_png); + } -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 -+ ac_status=$? + ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- LIBS=$ac_save_LIBS +-# We can link X programs with no special library path. +-ac_x_libraries= + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in @@ -33677,29 +64604,74 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gio_can_sniff=yes -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define GDK_PIXBUF_USE_GIO_MIME 1 ++#define GDK_PIXBUF_USE_GIO_MIME 1 +_ACEOF + -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- LIBS=$ac_save_LIBS +-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +-do +- # Don't even attempt the hair of trying to link an X program! +- for ac_extension in a so sl dylib la dll; do +- if test -r "$ac_dir/libX11.$ac_extension"; then +- ac_x_libraries=$ac_dir +- break 2 +- fi +- done +-done +( exit $ac_status ) +gio_can_sniff=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi # $ac_x_libraries = no + +-case $ac_x_includes,$ac_x_libraries in #( +- no,* | *,no | *\'*) +- # Didn't find X, or a directory has "'" in its name. +- ac_cv_have_x="have_x=no";; #( +- *) +- # Record where we found X for the cache. +- ac_cv_have_x="have_x=yes\ +- ac_x_includes='$ac_x_includes'\ +- ac_x_libraries='$ac_x_libraries'" +-esac + { echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 +echo "${ECHO_T}$gio_can_sniff" >&6; } + LIBS="$gtk_save_LIBS" + CFLAGS="$gtk_save_CFLAGS" -+fi -+ + fi +-;; #( +- *) have_x=yes;; +- esac +- eval "$ac_cv_have_x" +-fi # $with_x != no + +-if test "$have_x" != yes; then +- { $as_echo "$as_me:$LINENO: result: $have_x" >&5 +-$as_echo "$have_x" >&6; } +- no_x=yes +-else +- # If each of the values was on the command line, it overrides each guess. +- test "x$x_includes" = xNONE && x_includes=$ac_x_includes +- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries +- # Update the cache value to reflect the command line values. +- ac_cv_have_x="have_x=yes\ +- ac_x_includes='$x_includes'\ +- ac_x_libraries='$x_libraries'" +- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +-$as_echo "libraries $x_libraries, headers $x_includes" >&6; } +# +# Allow building some or all immodules included +# @@ -33709,11 +64681,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +# Check whether --with-included_immodules was given. +if test "${with_included_immodules+set}" = set; then -+ withval=$with_included_immodules; -+fi -+ -+ -+if $dynworks; then ++ withval=$with_included_immodules; + fi + +-if test "$no_x" = yes; then +- # Not all programs may use this symbol, but it does not hurt to define it. + +-cat >>confdefs.h <<\_ACEOF +-#define X_DISPLAY_MISSING 1 +-_ACEOF ++if $dynworks; then + : +else + ## if the option was specified, leave it; otherwise disable included immodules @@ -33721,7 +64698,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + with_included_immodules=yes + fi +fi -+ + +- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= +all_immodules="am-et,cedilla,cyrillic-translit" +if test "$gdktarget" = "win32"; then + all_immodules="${all_immodules},ime" @@ -33735,10 +64713,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# If the switch specified without listing any specific ones, include all +if test "x$with_included_immodules" = xyes ; then + included_immodules="$all_immodules" -+else + else +- if test -n "$x_includes"; then +- X_CFLAGS="$X_CFLAGS -I$x_includes" +- fi + included_immodules="$with_included_immodules" +fi -+ + +- # It would also be nice to do this for all -L options, not just this one. +- if test -n "$x_libraries"; then +- 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 . . . . +- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +-$as_echo_n "checking whether -R must be followed by a space... " >&6; } +- 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 +{ echo "$as_me:$LINENO: result: $included_immodules" >&5 +echo "${ECHO_T}$included_immodules" >&6; } + if test "x$included_immodules" != x; then @@ -33875,11 +64867,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +#include <sys/types.h> +#include <sys/wait.h> +#ifndef WEXITSTATUS @@ -33888,39 +64880,56 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#ifndef WIFEXITED +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif -+ -+int -+main () -+{ + + int + main () + { +- + int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- X_LIBS="$X_LIBS -R$x_libraries" + } && test -s conftest.$ac_objext; then + ac_cv_header_sys_wait_h=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- LIBS="$ac_xsave_LIBS -R $x_libraries" +- cat >conftest.$ac_ext <<_ACEOF + ac_cv_header_sys_wait_h=no +fi + @@ -33929,9 +64938,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } +if test $ac_cv_header_sys_wait_h = yes; then -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_SYS_WAIT_H 1 ++#define HAVE_SYS_WAIT_H 1 +_ACEOF + +fi @@ -33943,58 +64952,114 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +#include <sys/types.h> +#include <signal.h> -+ -+int -+main () -+{ + + int + main () + { +- +return *(signal (0, 0)) (0) == 1; -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- X_LIBS="$X_LIBS -R $x_libraries" + } && test -s conftest.$ac_objext; then + ac_cv_type_signal=int -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: result: neither works" >&5 +-$as_echo "neither works" >&6; } + ac_cv_type_signal=void -+fi -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6; } -+ + +-rm -rf conftest.dSYM +-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 +cat >>confdefs.h <<_ACEOF -+@%:@define RETSIGTYPE $ac_cv_type_signal ++#define RETSIGTYPE $ac_cv_type_signal +_ACEOF -+ -+ -+ + +- # Check for system-dependent libraries X programs must link with. +- # Do this before checking for the system-independent R6 libraries +- # (-lICE), since we may need -lsocket or whatever for X linking. + +- if test "$ISC" = yes; then +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" +- else +- # Martyn Johnson says this is needed for Ultrix, if the X +- # libraries were built with DECnet support. And Karl Berry says +- # the Alpha needs dnet_stub (dnet does not exist). +- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char XOpenDisplay (); +-int +-main () +-{ +-return XOpenDisplay (); +- ; +- return 0; +-} + if test "x$LIBTIFF" != x; then + HAVE_TIFF_TRUE= + HAVE_TIFF_FALSE='#' @@ -34060,29 +65125,38 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking sys/systeminfo.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -+@%:@include <sys/systeminfo.h> ++#include <sys/systeminfo.h> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else @@ -34105,7 +65179,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <sys/systeminfo.h> ++#include <sys/systeminfo.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -34122,12 +65196,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err -+ }; then + }; then +- : + ac_header_preproc=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } +-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then +- $as_echo_n "(cached) " >&6 + ac_header_preproc=no +fi + @@ -34158,9 +65238,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -34169,7 +65249,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldnet $LIBS" + ac_cv_header_sys_systeminfo_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 @@ -34177,9 +65259,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +fi +if test $ac_cv_header_sys_systeminfo_h = yes; then -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_SYS_SYSTEMINFO_H 1 ++#define HAVE_SYS_SYSTEMINFO_H 1 +_ACEOF + +fi @@ -34197,31 +65279,55 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Is the header compilable? +{ echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 +echo $ECHO_N "checking sys/sysinfo.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dnet_ntoa (); +-int +-main () +-{ +-return dnet_ntoa (); +- ; +- return 0; +-} +$ac_includes_default -+@%:@include <sys/sysinfo.h> -+_ACEOF ++#include <sys/sysinfo.h> + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else @@ -34244,7 +65350,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <sys/sysinfo.h> ++#include <sys/sysinfo.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -34261,15 +65367,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err -+ }; then + }; then +- ac_cv_lib_dnet_dnet_ntoa=yes + ac_header_preproc=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_dnet_dnet_ntoa=no + ac_header_preproc=no -+fi -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } @@ -34297,9 +65410,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -34310,15 +65423,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_sys_sysinfo_h=$ac_header_preproc -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then +- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } + -+fi + fi +if test $ac_cv_header_sys_sysinfo_h = yes; then -+ + +- if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } +-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then +- $as_echo_n "(cached) " >&6 +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_SYS_SYSINFO_H 1 ++#define HAVE_SYS_SYSINFO_H 1 +_ACEOF + +fi @@ -34334,77 +65456,189 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for mlib_ImageSetStruct in -lmlib... $ECHO_C" >&6; } +if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldnet_stub $LIBS" +LIBS="-lmlib $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27816,11 +30438,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char dnet_ntoa (); +char mlib_ImageSetStruct (); -+int -+main () -+{ + int + main () + { +-return dnet_ntoa (); +return mlib_ImageSetStruct (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -27831,150 +30453,57 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_dnet_stub_dnet_ntoa=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_mlib_mlib_ImageSetStruct=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_dnet_stub_dnet_ntoa=no + ac_cv_lib_mlib_mlib_ImageSetStruct=no -+fi -+ -+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 + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then +- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +-fi +- +- fi +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- LIBS="$ac_xsave_LIBS" +- +- # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, +- # to get the SysV transport functions. +- # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) +- # needs -lnsl. +- # The nsl library prevents programs from opening the X display +- # on Irix 5.2, according to T.E. Dickey. +- # The functions gethostbyname, getservbyname, and inet_addr are +- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. +- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 +-$as_echo_n "checking for gethostbyname... " >&6; } +-if test "${ac_cv_func_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 +echo "${ECHO_T}$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } +if test $ac_cv_lib_mlib_mlib_ImageSetStruct = yes; then + use_mlib=yes -+else + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define gethostbyname innocuous_gethostbyname +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char gethostbyname (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef gethostbyname + use_mlib=no +fi -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char gethostbyname (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_gethostbyname || defined __stub___gethostbyname +-choke me +-#endif +if test $use_mlib = yes; then -+ + +-int +-main () +-{ +-return gethostbyname (); +- ; +- return 0; +-} +cat >>confdefs.h <<\_ACEOF -+@%:@define USE_MEDIALIB 1 -+_ACEOF -+ ++#define USE_MEDIALIB 1 + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_gethostbyname=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_gethostbyname=no +-fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +-$as_echo "$ac_cv_func_gethostbyname" >&6; } + MEDIA_LIB=-lmlib -+ + +- if test $ac_cv_func_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&6 + { echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 +echo $ECHO_N "checking for mediaLib 2.5... $ECHO_C" >&6; } + # Check for a mediaLib 2.5 function since that is what is needed for @@ -34413,84 +65647,156 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... $ECHO_C" >&6; } +if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnsl $LIBS" +LIBS="-lmlib $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27988,11 +30517,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char gethostbyname (); +char mlib_VideoColorRGBint_to_BGRAint (); -+int -+main () -+{ + int + main () + { +-return gethostbyname (); +return mlib_VideoColorRGBint_to_BGRAint (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -28003,550 +30532,459 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_nsl_gethostbyname=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_nsl_gethostbyname=no + ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no -+fi -+ -+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 + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 +echo "${ECHO_T}$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } +if test $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint = yes; then + use_mlib25=yes +else + use_mlib25=no -+fi -+ + fi + +- if test $ac_cv_lib_nsl_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } +-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lbsd $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + if test $use_mlib25 = yes; then -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char gethostbyname (); +-int +-main () +-{ +-return gethostbyname (); +- ; +- return 0; +-} +cat >>confdefs.h <<\_ACEOF -+@%:@define USE_MEDIALIB25 1 -+_ACEOF -+ ++#define USE_MEDIALIB25 1 + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_bsd_gethostbyname=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_bsd_gethostbyname=no + fi -+fi + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS + if test $use_mlib = yes; then + USE_MEDIALIB_TRUE= + USE_MEDIALIB_FALSE='#' +else + USE_MEDIALIB_TRUE='#' + USE_MEDIALIB_FALSE= -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + + if test $use_mlib25 = yes; then + USE_MEDIALIB25_TRUE= @@ -34498,8 +65804,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + USE_MEDIALIB25_TRUE='#' + USE_MEDIALIB25_FALSE= -+fi -+ + fi + +- fi + +# Checks to see if we should compile in MMX support (there will be +# a runtime test when the code is actually run to see if it should @@ -34523,7 +65830,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +if test $use_x86_asm = yes; then + save_ac_ext=$ac_ext + ac_ext=S -+ ++ + { echo "$as_me:$LINENO: checking compiler support for MMX" >&5 +echo $ECHO_N "checking compiler support for MMX... $ECHO_C" >&6; } + cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S @@ -34533,17 +65840,41 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + use_mmx_asm=yes -+ fi -+ + fi + +- # lieder@skyler.mavd.honeywell.com says without -lsocket, +- # socket/setsockopt and other routines are undefined under SCO ODT +- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary +- # on later versions), says Simon Leinen: it contains gethostby* +- # variants that don't use the name server (or something). -lsocket +- # must be given before -lnsl if both are needed. We assume that +- # if connect needs -lnsl, so does gethostbyname. +- { $as_echo "$as_me:$LINENO: checking for connect" >&5 +-$as_echo_n "checking for connect... " >&6; } +-if test "${ac_cv_func_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ + rm -rf conftest* + + ac_ext=$save_ac_ext + if test $use_mmx_asm = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define USE_MMX 1 -+_ACEOF + ++cat >>confdefs.h <<\_ACEOF ++#define USE_MMX 1 + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define connect to an innocuous variant, in case <limits.h> declares connect. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define connect innocuous_connect + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char connect (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else @@ -34551,7 +65882,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}no" >&6; } + fi +fi -+ + +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif + if test x$use_mmx_asm = xyes; then + USE_MMX_TRUE= + USE_MMX_FALSE='#' @@ -34559,23 +65895,82 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + USE_MMX_TRUE='#' + USE_MMX_FALSE= +fi -+ -+ + +-#undef connect + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char connect (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_connect || defined __stub___connect +-choke me +-#endif +REBUILD_PNGS= +if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then + REBUILD_PNGS=# +fi -+ -+ + +-int +-main () +-{ +-return connect (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_connect=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_connect=no + if test $cross_compiling = yes; then + CROSS_COMPILING_TRUE= + CROSS_COMPILING_FALSE='#' +else + CROSS_COMPILING_TRUE='#' + CROSS_COMPILING_FALSE= -+fi -+ -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +-$as_echo "$ac_cv_func_connect" >&6; } + +- if test $ac_cv_func_connect = no; then +- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +-$as_echo_n "checking for connect in -lsocket... " >&6; } +-if test "${ac_cv_lib_socket_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 +if test $cross_compiling = yes; then + # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. +set dummy gdk-pixbuf-csource; ac_word=$2 @@ -34583,7 +65978,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ + case $GDK_PIXBUF_CSOURCE in + [\\/]* | ?:[\\/]*) + ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path. @@ -34603,21 +66006,72 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char connect (); +-int +-main () +-{ +-return connect (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; + test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" + ;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_socket_connect=yes +fi +GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE +if test -n "$GDK_PIXBUF_CSOURCE"; then + { echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 +echo "${ECHO_T}$GDK_PIXBUF_CSOURCE" >&6; } -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_socket_connect=no + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ + fi + +-rm -rf conftest.dSYM +-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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +-$as_echo "$ac_cv_lib_socket_connect" >&6; } +-if test "x$ac_cv_lib_socket_connect" = x""yes; then +- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +-fi + +- fi + # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. +set dummy gtk-update-icon-cache; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -34644,7 +66098,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +done +done +IFS=$as_save_IFS -+ + +- # Guillermo Gomez says -lposix is necessary on A/UX. +- { $as_echo "$as_me:$LINENO: checking for remove" >&5 +-$as_echo_n "checking for remove... " >&6; } +-if test "${ac_cv_func_remove+set}" = set; then +- $as_echo_n "(cached) " >&6 + test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no" + ;; +esac @@ -34653,63 +66112,196 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +if test -n "$GTK_UPDATE_ICON_CACHE"; then + { echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 +echo "${ECHO_T}$GTK_UPDATE_ICON_CACHE" >&6; } -+else + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define remove to an innocuous variant, in case <limits.h> declares remove. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define remove innocuous_remove + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ -+ + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char remove (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ + +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif + if test x$GTK_UPDATE_ICON_CACHE = xno; then + REBUILD_PNGS=# + fi +fi -+ -+if test ! -f $srcdir/gtk/gtkbuiltincache.h && + +-#undef remove ++if test ! -f $srcdir/gtk/gtkbuiltincache.h && + test "x$REBUILD_PNGS" = "x#" ; then -+ { { echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: +*** gtkbuiltincache.h is not in the tree, and cannot be built -+*** because you don't have libpng, or (when cross-compiling) you ++*** because you don't have libpng, or (when cross-compiling) you +*** don't have a prebuilt gtk-update-icon-cache on the build system." >&5 -+echo "$as_me: error: ++echo "$as_me: error: +*** gtkbuiltincache.h is not in the tree, and cannot be built -+*** because you don't have libpng, or (when cross-compiling) you ++*** because you don't have libpng, or (when cross-compiling) you +*** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} + { (exit 1); exit 1; }; } +fi -+ -+ -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char remove (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_remove || defined __stub___remove +-choke me +-#endif + +-int +-main () +-{ +-return remove (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_remove=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_remove=no +-fi +GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" +GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" -+GDK_PIXBUF_EXTRA_CFLAGS= ++GDK_PIXBUF_EXTRA_CFLAGS= +GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" +GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" -+ + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +-$as_echo "$ac_cv_func_remove" >&6; } +######################################## +# Windowing system checks +######################################## -+ + +- if test $ac_cv_func_remove = no; then +- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +-$as_echo_n "checking for remove in -lposix... " >&6; } +-if test "${ac_cv_lib_posix_remove+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lposix $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +GDK_PIXBUF_XLIB_PACKAGES= +GDK_PIXBUF_XLIB_EXTRA_CFLAGS= +GDK_PIXBUF_XLIB_EXTRA_LIBS= -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char remove (); +-int +-main () +-{ +-return remove (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_posix_remove=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +X_PACKAGES=fontconfig +GDK_EXTRA_LIBS="$GDK_WLIBS" +GDK_EXTRA_CFLAGS= -+ + +- ac_cv_lib_posix_remove=no +-fi +# GTK+ uses some X calls, so needs to link against X directly +GTK_DEP_PACKAGES_FOR_X= +GTK_DEP_LIBS_FOR_X= -+ + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +if test "x$gdktarget" = "xx11"; then + # + # We use fontconfig very peripherally when decoding the default + # settings. + # + if $PKG_CONFIG --exists fontconfig; then : ; else -+ { { echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: +*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&5 -+echo "$as_me: error: ++echo "$as_me: error: +*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} + { (exit 1); exit 1; }; } + fi @@ -34722,17 +66314,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + X_PACKAGES="$X_PACKAGES x11 xext xrender" + x_libs="`$PKG_CONFIG --libs x11 xext xrender`" + X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" -+ ++ + # Strip out any .la files that pkg-config might give us (this happens + # with -uninstalled.pc files) + x_libs_for_checks= + for I in $x_libs ; do -+ case $I in ++ case $I in + *.la) ;; + *) x_libs_for_checks="$x_libs_for_checks $I" ;; + esac + done -+ ++ + GDK_PIXBUF_XLIB_PACKAGES="x11" + GTK_PACKAGES_FOR_X="x11" + else @@ -34743,8 +66335,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +# Check whether --with-x was given. +if test "${with_x+set}" = set; then -+ withval=$with_x; -+fi ++ withval=$with_x; + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +-$as_echo "$ac_cv_lib_posix_remove" >&6; } +-if test "x$ac_cv_lib_posix_remove" = x""yes; then +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then @@ -34797,8 +66393,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + cd .. + rm -f -r conftest.dir -+fi -+ + fi + +- fi +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' @@ -34806,7 +66403,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include -+ + +- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- { $as_echo "$as_me:$LINENO: checking for shmat" >&5 +-$as_echo_n "checking for shmat... " >&6; } +-if test "${ac_cv_func_shmat+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +/usr/include/X11 +/usr/include/X11R6 +/usr/include/X11R5 @@ -34839,47 +66442,114 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <X11/Xlib.h> -+_ACEOF + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define shmat innocuous_shmat +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char shmat (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef shmat +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char shmat (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_shmat || defined __stub___shmat +-choke me +-#endif +- +-int +-main () +-{ +-return shmat (); +- ; +- return 0; +-} ++#include <X11/Xlib.h> + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext + }; then +- ac_cv_func_shmat=yes + # We can compile using X headers with no special include directory. +ac_x_includes= -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_shmat=no + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +done -+fi -+ + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +-$as_echo "$ac_cv_func_shmat" >&6; } +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no -+ + +- if test $ac_cv_func_shmat = no; then +- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +-$as_echo_n "checking for shmat in -lipc... " >&6; } +-if test "${ac_cv_lib_ipc_shmat+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lipc $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +if test "$ac_x_libraries" = no; then + # Check for the libraries. + # See if we find them without any special options. @@ -34887,45 +66557,61 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <X11/Xlib.h> -+int -+main () -+{ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char shmat (); ++#include <X11/Xlib.h> + int + main () + { +-return shmat (); +XrmInitialize () -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -28557,77 +30995,150 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_ipc_shmat=yes + } && 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= -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_ipc_shmat=no + LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +do @@ -34937,10 +66623,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + done +done -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext + fi + +-rm -rf conftest.dSYM + 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 # $ac_x_libraries = no + +case $ac_x_includes,$ac_x_libraries in #( @@ -34953,7 +66641,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" +esac -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +-$as_echo "$ac_cv_lib_ipc_shmat" >&6; } +-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then +- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +;; #( + *) have_x=yes;; + esac @@ -34974,21 +66666,35 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_x_libraries='$x_libraries'" + { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } -+fi -+ + fi + +- fi +if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define X_DISPLAY_MISSING 1 ++#define X_DISPLAY_MISSING 1 +_ACEOF + + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= +else + if test -n "$x_includes"; then + X_CFLAGS="$X_CFLAGS -I$x_includes" -+ fi -+ + fi + +- # Check for libraries that X11R6 Xt/Xaw programs need. +- ac_save_LDFLAGS=$LDFLAGS +- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" +- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to +- # check for ICE first), but we must link in the order -lSM -lICE or +- # we get undefined symbols. So assume we have SM if we have ICE. +- # These have to be linked with before -lX11, unlike the other +- # libraries we check for below, so use a different variable. +- # John Interrante, Karl Berry +- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } +-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then +- $as_echo_n "(cached) " >&6 + # It would also be nice to do this for all -L options, not just this one. + if test -n "$x_libraries"; then + X_LIBS="$X_LIBS -L$x_libraries" @@ -35035,69 +66741,127 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" -+else + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lICE $X_EXTRA_LIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char IceConnectionNumber (); + int + main () + { +-return IceConnectionNumber (); + -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -28638,97 +31149,56 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_ICE_IceConnectionNumber=yes + } && 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 + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_ICE_IceConnectionNumber=no + { echo "$as_me:$LINENO: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6; } -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+ + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then +- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi + +- LDFLAGS=$ac_save_LDFLAGS +- +-fi +- +- if test x$no_x = xyes ; then +- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5 +-$as_echo "$as_me: error: X development libraries not found" >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- x_cflags="$X_CFLAGS" +- x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS" +- +- GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags" +- GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" +- GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS" +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 -+ + fi + +- # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. +- x_extra_libs= +- +- gtk_save_cppflags="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $X_CFLAGS" +- +- gtk_save_LIBS=$LIBS +- LIBS="$x_libs_for_checks $LIBS" + # Check for system-dependent libraries X programs must link with. + # Do this before checking for the system-independent R6 libraries + # (-lICE), since we may need -lsocket or whatever for X linking. -+ + +- # Sanity check for the X11 and Xext libraries. While everything we need from +- # Xext is optional, the chances a system has *none* of these things is so +- # small that we just unconditionally require it. +- { $as_echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 +-$as_echo_n "checking for XOpenDisplay... " >&6; } +-if test "${ac_cv_func_XOpenDisplay+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF + if test "$ISC" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" + else @@ -35106,129 +66870,223 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XOpenDisplay (); -+int -+main () -+{ -+return XOpenDisplay (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define XOpenDisplay to an innocuous variant, in case <limits.h> declares XOpenDisplay. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define XOpenDisplay innocuous_XOpenDisplay +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char XOpenDisplay (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef XOpenDisplay + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -28737,13 +31207,6 @@ + extern "C" + #endif + char XOpenDisplay (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_XOpenDisplay || defined __stub___XOpenDisplay +-choke me +-#endif +- + int + main () + { +@@ -28758,70 +31221,36 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_XOpenDisplay=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_func_XOpenDisplay=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 +-$as_echo "$ac_cv_func_XOpenDisplay" >&6; } +-if test "x$ac_cv_func_XOpenDisplay" = x""yes; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ : -+else + : + else +- { { $as_echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 +-$as_echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +- { $as_echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 +-$as_echo_n "checking for XextFindDisplay... " >&6; } +-if test "${ac_cv_func_XextFindDisplay+set}" = set; then +- $as_echo_n "(cached) " >&6 + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet $LIBS" +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define XextFindDisplay to an innocuous variant, in case <limits.h> declares XextFindDisplay. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define XextFindDisplay innocuous_XextFindDisplay +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char XextFindDisplay (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef XextFindDisplay + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -28829,18 +31258,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XextFindDisplay (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_XextFindDisplay || defined __stub___XextFindDisplay +-choke me +-#endif +- +char dnet_ntoa (); -+int -+main () -+{ + int + main () + { +-return XextFindDisplay (); +return dnet_ntoa (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -28851,60 +31273,134 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_XextFindDisplay=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_dnet_ntoa=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_XextFindDisplay=no + ac_cv_lib_dnet_dnet_ntoa=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext + fi + +-rm -rf conftest.dSYM + 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 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5 +-$as_echo "$ac_cv_func_XextFindDisplay" >&6; } +-if test "x$ac_cv_func_XextFindDisplay" = x""yes; then +- : +-else +- { { $as_echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 +-$as_echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -+fi -+ + fi + +- { $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 +-$as_echo_n "checking for XRenderQueryExtension... " >&6; } +-if test "${ac_cv_func_XRenderQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet_stub $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define XRenderQueryExtension to an innocuous variant, in case <limits.h> declares XRenderQueryExtension. + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -35308,76 +67166,103 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define XRenderQueryExtension innocuous_XRenderQueryExtension +#define gethostbyname innocuous_gethostbyname -+ -+/* System header to define __stub macros and hopefully few prototypes, + + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char XRenderQueryExtension (); below. + which can conflict with char gethostbyname (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +@@ -28914,7 +31410,7 @@ + # include <assert.h> + #endif + +-#undef XRenderQueryExtension +#undef gethostbyname -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -28922,18 +31418,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XRenderQueryExtension (); +char gethostbyname (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined __stub_XRenderQueryExtension || defined __stub___XRenderQueryExtension +#if defined __stub_gethostbyname || defined __stub___gethostbyname -+choke me -+#endif -+ -+int -+main () -+{ + choke me + #endif + + int + main () + { +-return XRenderQueryExtension (); +return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -28944,155 +31440,178 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_XRenderQueryExtension=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_gethostbyname=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_XRenderQueryExtension=no + ac_cv_func_gethostbyname=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 +-$as_echo "$ac_cv_func_XRenderQueryExtension" >&6; } +-if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then +- : +-else +- { { $as_echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 +-$as_echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +- +- # Check for xReply +{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } -+ + +- { $as_echo "$as_me:$LINENO: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5 +-$as_echo_n "checking if <X11/extensions/XIproto.h> is needed for xReply... " >&6; } +- cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_func_gethostbyname = no; then + { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } @@ -35387,11 +67272,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $LIBS" +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <X11/Xlibint.h> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -35400,37 +67286,49 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +extern "C" +#endif +char gethostbyname (); -+int -+main () -+{ + int + main () + { +-xReply *rep; +return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_nsl_gethostbyname=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- cat >conftest.$ac_ext <<_ACEOF + ac_cv_lib_nsl_gethostbyname=no +fi + @@ -35453,11 +67351,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <X11/extensions/XIproto.h> +-#include <X11/Xlibint.h> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -35466,40 +67366,62 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +extern "C" +#endif +char gethostbyname (); -+int -+main () -+{ + int + main () + { +-xReply *rep; +return gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-cat >>confdefs.h <<\_ACEOF +-#define NEED_XIPROTO_H_FOR_XREPLY 1 +-_ACEOF +- + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_bsd_gethostbyname=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: result: unknown" >&5 +-$as_echo "unknown" >&6; } +- { { $as_echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 +-$as_echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} +- { (exit 1); exit 1; }; } + ac_cv_lib_bsd_gethostbyname=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -35508,11 +67430,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } +if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +- # Check for XConvertCase, XInternAtoms (X11R6 specific) +- +- + fi + fi -+ + +-for ac_func in XConvertCase XInternAtoms +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + # lieder@skyler.mavd.honeywell.com says without -lsocket, + # socket/setsockopt and other routines are undefined under SCO ODT + # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary @@ -35524,383 +67458,594 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for connect... $ECHO_C" >&6; } +if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -29100,12 +31619,12 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +/* Define connect to an innocuous variant, in case <limits.h> declares connect. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +#define connect innocuous_connect -+ -+/* System header to define __stub macros and hopefully few prototypes, + + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. + which can conflict with char connect (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +@@ -29115,7 +31634,7 @@ + # include <assert.h> + #endif + +-#undef $ac_func +#undef connect -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -29123,18 +31642,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char $ac_func (); +char connect (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +#if defined __stub_connect || defined __stub___connect -+choke me -+#endif -+ -+int -+main () -+{ + choke me + #endif + + int + main () + { +-return $ac_func (); +return connect (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -29145,81 +31664,46 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_connect=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" + ac_cv_func_connect=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done +- +{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6; } -+ + +- # Generic X11R6 check needed for XIM support; we could +- # probably use this to replace the above, but we'll +- # leave the separate checks for XConvertCase and XInternAtoms +- # for clarity +- +- have_x11r6=false +- { $as_echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 +-$as_echo_n "checking for XAddConnectionWatch... " >&6; } +-if test "${ac_cv_func_XAddConnectionWatch+set}" = set; then +- $as_echo_n "(cached) " >&6 + if test $ac_cv_func_connect = no; then + { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } +if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define XAddConnectionWatch to an innocuous variant, in case <limits.h> declares XAddConnectionWatch. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define XAddConnectionWatch innocuous_XAddConnectionWatch +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char XAddConnectionWatch (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef XAddConnectionWatch + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -29227,18 +31711,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XAddConnectionWatch (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_XAddConnectionWatch || defined __stub___XAddConnectionWatch +-choke me +-#endif +- +char connect (); -+int -+main () -+{ + int + main () + { +-return XAddConnectionWatch (); +return connect (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -29249,73 +31726,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_XAddConnectionWatch=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_socket_connect=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_XAddConnectionWatch=no + ac_cv_lib_socket_connect=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext + fi + +-rm -rf conftest.dSYM + 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 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 +-$as_echo "$ac_cv_func_XAddConnectionWatch" >&6; } +-if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then +- have_x11r6=true +-fi +- +- +- if $have_x11r6; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_X11R6 1 +-_ACEOF +- +- fi +- +- +-if $have_x11r6; then +- HAVE_X11R6_TRUE= +- HAVE_X11R6_FALSE='#' +-else +- HAVE_X11R6_TRUE='#' +- HAVE_X11R6_FALSE= +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } +if test $ac_cv_lib_socket_connect = yes; then + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -+fi -+ + fi + + fi -+ + +- # Check for XKB support. +- +- if test "x$enable_xkb" = "xyes"; then +- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 +-$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XKB 1 +-_ACEOF +- +- elif test "x$enable_xkb" = "xmaybe"; then +- { $as_echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 +-$as_echo_n "checking for XkbQueryExtension... " >&6; } +-if test "${ac_cv_func_XkbQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 + # Guillermo Gomez says -lposix is necessary on A/UX. + { echo "$as_me:$LINENO: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6; } +if test "${ac_cv_func_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -29323,12 +31770,12 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define XkbQueryExtension to an innocuous variant, in case <limits.h> declares XkbQueryExtension. +/* Define remove to an innocuous variant, in case <limits.h> declares remove. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define XkbQueryExtension innocuous_XkbQueryExtension +#define remove innocuous_remove -+ -+/* System header to define __stub macros and hopefully few prototypes, + + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char XkbQueryExtension (); below. + which can conflict with char remove (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +@@ -29338,7 +31785,7 @@ + # include <assert.h> + #endif + +-#undef XkbQueryExtension +#undef remove -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -29346,18 +31793,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XkbQueryExtension (); +char remove (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined __stub_XkbQueryExtension || defined __stub___XkbQueryExtension +#if defined __stub_remove || defined __stub___remove -+choke me -+#endif -+ -+int -+main () -+{ + choke me + #endif + + int + main () + { +-return XkbQueryExtension (); +return remove (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -29368,77 +31815,46 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_XkbQueryExtension=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_remove=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_XkbQueryExtension=no + ac_cv_func_remove=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5 +-$as_echo "$ac_cv_func_XkbQueryExtension" >&6; } +-if test "x$ac_cv_func_XkbQueryExtension" = x""yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XKB 1 +-_ACEOF +- +-fi +- +- else +- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 +-$as_echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} +- fi +- +- # Check for shaped window extension +{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6; } -+ + +- { $as_echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 +-$as_echo_n "checking for XShapeCombineMask... " >&6; } +-if test "${ac_cv_func_XShapeCombineMask+set}" = set; then +- $as_echo_n "(cached) " >&6 + if test $ac_cv_func_remove = no; then + { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } +if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix $LIBS" +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define XShapeCombineMask to an innocuous variant, in case <limits.h> declares XShapeCombineMask. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define XShapeCombineMask innocuous_XShapeCombineMask +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char XShapeCombineMask (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef XShapeCombineMask + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -29446,18 +31862,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XShapeCombineMask (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_XShapeCombineMask || defined __stub___XShapeCombineMask +-choke me +-#endif +- +char remove (); -+int -+main () -+{ + int + main () + { +-return XShapeCombineMask (); +return remove (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -29468,52 +31877,43 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_XShapeCombineMask=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_posix_remove=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_XShapeCombineMask=no + ac_cv_lib_posix_remove=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext + fi + +-rm -rf conftest.dSYM + 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 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 +-$as_echo "$ac_cv_func_XShapeCombineMask" >&6; } +-if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SHAPE_EXT 1 +-_ACEOF +- +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } +if test $ac_cv_lib_posix_remove = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -+fi -+ + fi + + fi -+ + +- # X SYNC check +- gtk_save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $x_cflags" +- +- { $as_echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 +-$as_echo_n "checking for XSyncQueryExtension... " >&6; } +-if test "${ac_cv_func_XSyncQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + { echo "$as_me:$LINENO: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } +if test "${ac_cv_func_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -29521,12 +31921,12 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define XSyncQueryExtension to an innocuous variant, in case <limits.h> declares XSyncQueryExtension. +/* Define shmat to an innocuous variant, in case <limits.h> declares shmat. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define XSyncQueryExtension innocuous_XSyncQueryExtension +#define shmat innocuous_shmat -+ -+/* System header to define __stub macros and hopefully few prototypes, + + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char XSyncQueryExtension (); below. + which can conflict with char shmat (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +@@ -29536,7 +31936,7 @@ + # include <assert.h> + #endif + +-#undef XSyncQueryExtension +#undef shmat -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -29544,18 +31944,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XSyncQueryExtension (); +char shmat (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined __stub_XSyncQueryExtension || defined __stub___XSyncQueryExtension +#if defined __stub_shmat || defined __stub___shmat -+choke me -+#endif -+ -+int -+main () -+{ + choke me + #endif + + int + main () + { +-return XSyncQueryExtension (); +return shmat (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -29566,128 +31966,123 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_XSyncQueryExtension=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_shmat=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_XSyncQueryExtension=no + ac_cv_func_shmat=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 +-$as_echo "$ac_cv_func_XSyncQueryExtension" >&6; } +-if test "x$ac_cv_func_XSyncQueryExtension" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 +-$as_echo_n "checking for X11/extensions/sync.h... " >&6; } +-if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6; } + @@ -35909,16 +68054,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } +if test "${ac_cv_lib_ipc_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lipc $LIBS" +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <X11/Xlib.h> + +-#include <X11/extensions/sync.h> +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -35933,46 +68081,80 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (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 + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_ipc_shmat=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_header_X11_extensions_sync_h=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_lib_ipc_shmat=no -+fi -+ + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 +-$as_echo "$ac_cv_header_X11_extensions_sync_h" >&6; } +-if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XSYNC 1 +-_ACEOF + +-else +- : +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 + fi +- +- +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } +if test $ac_cv_lib_ipc_shmat = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -+fi -+ + fi + + fi + fi -+ + +- CFLAGS="$gtk_save_CFLAGS" +- +- # Xshm checks +- +- if test "x$enable_shm" = "xyes"; then +- # Check for the XShm extension, normally in Xext +- { $as_echo "$as_me:$LINENO: checking for XShmAttach" >&5 +-$as_echo_n "checking for XShmAttach... " >&6; } +-if test "${ac_cv_func_XShmAttach+set}" = set; then +- $as_echo_n "(cached) " >&6 + # Check for libraries that X11R6 Xt/Xaw programs need. + ac_save_LDFLAGS=$LDFLAGS + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" @@ -35986,61 +68168,110 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lICE $X_EXTRA_LIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define XShmAttach to an innocuous variant, in case <limits.h> declares XShmAttach. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define XShmAttach innocuous_XShmAttach +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char XShmAttach (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef XShmAttach + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -29695,18 +32090,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XShmAttach (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_XShmAttach || defined __stub___XShmAttach +-choke me +-#endif +- +char IceConnectionNumber (); -+int -+main () -+{ + int + main () + { +-return XShmAttach (); +return IceConnectionNumber (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -29717,52 +32105,93 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_XShmAttach=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_ICE_IceConnectionNumber=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_XShmAttach=no + ac_cv_lib_ICE_IceConnectionNumber=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext + fi + +-rm -rf conftest.dSYM + 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 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 +-$as_echo "$ac_cv_func_XShmAttach" >&6; } +-if test "x$ac_cv_func_XShmAttach" = x""yes; then +- : +-else +- # On AIX, it is in XextSam instead +- { $as_echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 +-$as_echo_n "checking for XShmAttach in -lXextSam... " >&6; } +-if test "${ac_cv_lib_XextSam_XShmAttach+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXextSam $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then @@ -36056,7 +68287,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: error: X development libraries not found" >&2;} + { (exit 1); exit 1; }; } + fi -+ ++ + x_cflags="$X_CFLAGS" + x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS" + @@ -36073,7 +68304,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + + gtk_save_LIBS=$LIBS + LIBS="$x_libs_for_checks $LIBS" -+ ++ + # Sanity check for the X11 and Xext libraries. While everything we need from + # Xext is optional, the chances a system has *none* of these things is so + # small that we just unconditionally require it. @@ -36084,10 +68315,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +/* Define XOpenDisplay to an innocuous variant, in case <limits.h> declares XOpenDisplay. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define XOpenDisplay innocuous_XOpenDisplay @@ -36104,13 +68335,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#endif + +#undef XOpenDisplay -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -29770,11 +32199,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XShmAttach (); +char XOpenDisplay (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named @@ -36119,43 +68351,63 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +choke me +#endif + -+int -+main () -+{ + int + main () + { +-return XShmAttach (); +return XOpenDisplay (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -29785,213 +32221,236 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_XextSam_XShmAttach=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_XOpenDisplay=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_XextSam_XShmAttach=no + ac_cv_func_XOpenDisplay=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 +-$as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } +-if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then +- case "$x_extra_libs " in +- *-lXextSam[\ \ ]*) ;; +- *) x_extra_libs="-lXextSam $x_extra_libs" ;; +- esac +- + fi +- +{ echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6; } +if test $ac_cv_func_XOpenDisplay = yes; then @@ -36164,19 +68416,37 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { { echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 +echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} + { (exit 1); exit 1; }; } -+fi -+ + fi + +- fi +- +- if test "x$enable_shm" = "xyes"; then +- # Check for shared memory +- if test "${ac_cv_header_sys_ipc_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 +-$as_echo_n "checking for sys/ipc.h... " >&6; } +-if test "${ac_cv_header_sys_ipc_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 +-$as_echo "$ac_cv_header_sys_ipc_h" >&6; } + { echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 +echo $ECHO_N "checking for XextFindDisplay... $ECHO_C" >&6; } +if test "${ac_cv_func_XextFindDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 +-$as_echo_n "checking sys/ipc.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <sys/ipc.h> +/* Define XextFindDisplay to an innocuous variant, in case <limits.h> declares XextFindDisplay. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define XextFindDisplay innocuous_XextFindDisplay @@ -36215,33 +68485,46 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_XextFindDisplay=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + ac_cv_func_XextFindDisplay=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi @@ -36254,18 +68537,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi -+ + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 +-$as_echo_n "checking sys/ipc.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + { echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 +echo $ECHO_N "checking for XRenderQueryExtension... $ECHO_C" >&6; } +if test "${ac_cv_func_XRenderQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <sys/ipc.h> +/* Define XRenderQueryExtension to an innocuous variant, in case <limits.h> declares XRenderQueryExtension. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define XRenderQueryExtension innocuous_XRenderQueryExtension @@ -36304,57 +68592,134 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + test ! -s conftest.err +- }; then +- ac_header_preproc=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_XRenderQueryExtension=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 +-$as_echo_n "checking for sys/ipc.h... " >&6; } +-if test "${ac_cv_header_sys_ipc_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_sys_ipc_h=$ac_header_preproc + ac_cv_func_XRenderQueryExtension=no -+fi -+ + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 +-$as_echo "$ac_cv_header_sys_ipc_h" >&6; } + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext -+fi + fi +-if test "x$ac_cv_header_sys_ipc_h" = x""yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_IPC_H 1 +-_ACEOF +- +{ echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_func_XRenderQueryExtension" >&6; } +if test $ac_cv_func_XRenderQueryExtension = yes; then + : -+else + else +- no_sys_ipc=yes + { { echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 +echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} + { (exit 1); exit 1; }; } -+fi -+ -+ + fi + + +- if test "${ac_cv_header_sys_shm_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 +-$as_echo_n "checking for sys/shm.h... " >&6; } +-if test "${ac_cv_header_sys_shm_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 +-$as_echo "$ac_cv_header_sys_shm_h" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 +-$as_echo_n "checking sys/shm.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + # Check for xReply + + { echo "$as_me:$LINENO: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5 +echo $ECHO_N "checking if <X11/extensions/XIproto.h> is needed for xReply... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <sys/shm.h> +#include <X11/Xlibint.h> +int +main () @@ -36363,90 +68728,242 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -29999,151 +32458,35 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; 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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 +-$as_echo_n "checking sys/shm.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/shm.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no +-fi +- +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 +-$as_echo_n "checking for sys/shm.h... " >&6; } +-if test "${ac_cv_header_sys_shm_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_sys_shm_h=$ac_header_preproc +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 +-$as_echo "$ac_cv_header_sys_shm_h" >&6; } +- +-fi +-if test "x$ac_cv_header_sys_shm_h" = x""yes; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SHM_H 1 +-_ACEOF +- +-else +- no_sys_shm=yes +-fi +- +- +- +- # Check for the X shared memory extension header file +- have_xshm=no +- { $as_echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 +-$as_echo_n "checking X11/extensions/XShm.h... " >&6; } +- if test "x$no_xext_lib" = "xyes"; then +- : +- else +- gtk_save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $x_cflags" +- cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-#include <stdlib.h> +-#include <sys/types.h> +-#include <sys/ipc.h> +-#include <sys/shm.h> +-#include <X11/Xlib.h> +-#include <X11/Xutil.h> +-#include <X11/extensions/XShm.h> +- +#include <X11/extensions/XIproto.h> +#include <X11/Xlibint.h> -+int -+main () -+{ + int + main () + { +-XShmSegmentInfo *x_shm_info; +xReply *rep; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -30154,56 +32497,51 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- have_xshm=yes + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } -+ ++ +cat >>confdefs.h <<\_ACEOF -+@%:@define NEED_XIPROTO_H_FOR_XREPLY 1 ++#define NEED_XIPROTO_H_FOR_XREPLY 1 +_ACEOF + -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- + { echo "$as_me:$LINENO: result: unknown" >&5 +echo "${ECHO_T}unknown" >&6; } + { { echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 +echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$gtk_save_CFLAGS" +- fi +- { $as_echo "$as_me:$LINENO: result: $have_xshm" >&5 +-$as_echo "$have_xshm" >&6; } +- if test $have_xshm = yes ; then +fi -+ + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XSHM_H 1 +-_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ + +- fi +- fi + # Check for XConvertCase, XInternAtoms (X11R6 specific) -+ -+ -+ + +- if test "x$enable_xinerama" = "xyes"; then +- # Check for Xinerama extension (Solaris impl or Xfree impl) +- gtk_save_cppflags="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $x_cflags" + +- case "$host" in +- *-*-solaris*) +- # Check for solaris +- { $as_echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 +-$as_echo_n "checking for Xinerama support on Solaris... " >&6; } + +- have_solaris_xinerama=false +- { $as_echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 +-$as_echo_n "checking for XineramaGetInfo... " >&6; } +-if test "${ac_cv_func_XineramaGetInfo+set}" = set; then +- $as_echo_n "(cached) " >&6 +for ac_func in XConvertCase XInternAtoms +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -36454,110 +68971,210 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -30211,12 +32549,12 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define XineramaGetInfo to an innocuous variant, in case <limits.h> declares XineramaGetInfo. +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define XineramaGetInfo innocuous_XineramaGetInfo +#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, + + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char XineramaGetInfo (); below. + which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +@@ -30226,7 +32564,7 @@ + # include <assert.h> + #endif + +-#undef XineramaGetInfo +#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -30234,18 +32572,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XineramaGetInfo (); +char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined __stub_XineramaGetInfo || defined __stub___XineramaGetInfo +#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ -+int -+main () -+{ + choke me + #endif + + int + main () + { +-return XineramaGetInfo (); +return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -30256,132 +32594,74 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_func_XineramaGetInfo=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_func_XineramaGetInfo=no + eval "$as_ac_var=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 +-$as_echo "$ac_cv_func_XineramaGetInfo" >&6; } +-if test "x$ac_cv_func_XineramaGetInfo" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 +-$as_echo_n "checking for X11/extensions/xinerama.h... " >&6; } +-if test "${ac_cv_header_X11_extensions_xinerama_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <X11/Xlib.h> +- +-#include <X11/extensions/xinerama.h> +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_header_X11_extensions_xinerama_h=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 +-$as_echo "$ac_cv_header_X11_extensions_xinerama_h" >&6; } +-if test "x$ac_cv_header_X11_extensions_xinerama_h" = x""yes; then +- have_solaris_xinerama=true +-else +- : +-fi +- + + fi +done -+ -+ + + +- if $have_solaris_xinerama ; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_SOLARIS_XINERAMA 1 +-_ACEOF +- +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XINERAMA 1 +-_ACEOF +- +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- fi +- ;; +- *) +- # Check for XFree +- { $as_echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 +-$as_echo_n "checking for Xinerama support on XFree86... " >&6; } + # Generic X11R6 check needed for XIM support; we could + # probably use this to replace the above, but we'll -+ # leave the separate checks for XConvertCase and XInternAtoms ++ # leave the separate checks for XConvertCase and XInternAtoms + # for clarity -+ + +- have_xfree_xinerama=false +- if $PKG_CONFIG --exists xinerama ; then +- have_xfree_xinerama=true +- X_PACKAGES="$X_PACKAGES xinerama" +- else +- { $as_echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 +-$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } +-if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 + have_x11r6=false + { echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 +echo $ECHO_N "checking for XAddConnectionWatch... $ECHO_C" >&6; } +if test "${ac_cv_func_XAddConnectionWatch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lXinerama $LIBS" +-cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +/* Define XAddConnectionWatch to an innocuous variant, in case <limits.h> declares XAddConnectionWatch. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define XAddConnectionWatch innocuous_XAddConnectionWatch @@ -36574,13 +69191,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#endif + +#undef XAddConnectionWatch -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -30389,11 +32669,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char XineramaQueryExtension (); +char XAddConnectionWatch (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named @@ -36589,76 +69207,146 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +choke me +#endif + -+int -+main () -+{ + int + main () + { +-return XineramaQueryExtension (); +return XAddConnectionWatch (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -30404,418 +32691,280 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_Xinerama_XineramaQueryExtension=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_XAddConnectionWatch=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_Xinerama_XineramaQueryExtension=no + ac_cv_func_XAddConnectionWatch=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 +-$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } +-if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +-$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } +-if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <X11/Xlib.h> +{ echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 +echo "${ECHO_T}$ac_cv_func_XAddConnectionWatch" >&6; } +if test $ac_cv_func_XAddConnectionWatch = yes; then + have_x11r6=true +fi -+ -+ + +-#include <X11/extensions/Xinerama.h> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_header_X11_extensions_Xinerama_h=no +-fi + if $have_x11r6; then -+ + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +-$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } +-if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then +- case "$x_extra_libs " in +- *-lXinerama[\ \ ]*) ;; +- *) x_extra_libs="-lXinerama $x_extra_libs" ;; +- esac +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_X11R6 1 ++#define HAVE_X11R6 1 +_ACEOF -+ + +- have_xfree_xinerama=true + fi + if $have_x11r6; then + HAVE_X11R6_TRUE= + HAVE_X11R6_FALSE='#' -+else + else +- : + HAVE_X11R6_TRUE='#' + HAVE_X11R6_FALSE= -+fi -+ -+ + fi + + +-fi +- +- fi + # Check for XKB support. -+ + +- if $have_xfree_xinerama ; then + if test "x$enable_xkb" = "xyes"; then + { echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 +echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XKB 1 -+_ACEOF -+ + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_XFREE_XINERAMA 1 ++#define HAVE_XKB 1 + _ACEOF + +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XINERAMA 1 + elif test "x$enable_xkb" = "xmaybe"; then + { echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 +echo $ECHO_N "checking for XkbQueryExtension... $ECHO_C" >&6; } @@ -36667,27 +69355,53 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF + _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define XkbQueryExtension to an innocuous variant, in case <limits.h> declares XkbQueryExtension. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define XkbQueryExtension innocuous_XkbQueryExtension -+ + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- fi +- ;; +- esac +- fi +- +- # set up things for XInput +- +- if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define XINPUT_XFREE 1 +-_ACEOF +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char XkbQueryExtension (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ -+ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif -+ + +- if $PKG_CONFIG --exists xi ; then +- X_PACKAGES="$X_PACKAGES xi" +- else +- case "$x_extra_libs " in +- *-lXi[\ \ ]*) ;; +- *) x_extra_libs="-lXi $x_extra_libs" ;; +- esac +#undef XkbQueryExtension -+ + +- fi +- else +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -36701,7 +69415,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#if defined __stub_XkbQueryExtension || defined __stub___XkbQueryExtension +choke me +#endif -+ + +-cat >>confdefs.h <<\_ACEOF +-#define XINPUT_NONE 1 +int +main () +{ @@ -36709,7 +69425,15 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +- +- fi +- +- +- +-if test x$with_xinput = xxfree || test x$with_xinput = xyes; then +- XINPUT_XFREE_TRUE= +- XINPUT_XFREE_FALSE='#' +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in @@ -36729,33 +69453,45 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_XkbQueryExtension=yes -+else + else +- XINPUT_XFREE_TRUE='#' +- XINPUT_XFREE_FALSE= +-fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_cv_func_XkbQueryExtension=no +fi -+ + +- # Check for the RANDR extension +- if $PKG_CONFIG --exists "xrandr >= 1.2" ; then +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 +echo "${ECHO_T}$ac_cv_func_XkbQueryExtension" >&6; } +if test $ac_cv_func_XkbQueryExtension = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XKB 1 -+_ACEOF -+ + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_RANDR 1 ++#define HAVE_XKB 1 + _ACEOF + +fi -+ + +- X_PACKAGES="$X_PACKAGES xrandr" + else + { echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 +echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} -+ fi -+ + fi + +- # Checks for Xcursor library +- +- if $PKG_CONFIG --exists xcursor ; then + # Check for shaped window extension -+ + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XCURSOR 1 + { echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 +echo $ECHO_N "checking for XShapeCombineMask... $ECHO_C" >&6; } +if test "${ac_cv_func_XShapeCombineMask+set}" = set; then @@ -36763,27 +69499,31 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF + _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define XShapeCombineMask to an innocuous variant, in case <limits.h> declares XShapeCombineMask. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define XShapeCombineMask innocuous_XShapeCombineMask -+ + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char XShapeCombineMask (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ -+ + +- X_PACKAGES="$X_PACKAGES xcursor" +- fi +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif -+ + +- # Checks for XFixes extension +#undef XShapeCombineMask -+ + +- if $PKG_CONFIG --exists xfixes ; then +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -36797,7 +69537,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#if defined __stub_XShapeCombineMask || defined __stub___XShapeCombineMask +choke me +#endif -+ + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XFIXES 1 +int +main () +{ @@ -36805,7 +69547,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in @@ -36828,28 +69570,247 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_cv_func_XShapeCombineMask=no +fi -+ + +- X_PACKAGES="$X_PACKAGES xfixes" +- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" +- fi +- +- # Checks for Xcomposite extension +- +- if $PKG_CONFIG --exists xcomposite ; then +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 +echo "${ECHO_T}$ac_cv_func_XShapeCombineMask" >&6; } +if test $ac_cv_func_XShapeCombineMask = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_SHAPE_EXT 1 -+_ACEOF -+ + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_XCOMPOSITE 1 ++#define HAVE_SHAPE_EXT 1 + _ACEOF + +fi -+ -+ + +- X_PACKAGES="$X_PACKAGES xcomposite" +- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite" +- fi +- +- # Checks for Xdamage extension + +- if $PKG_CONFIG --exists xdamage ; then + # X SYNC check + gtk_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $x_cflags" -+ + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_XDAMAGE 1 +-_ACEOF +- +- +- X_PACKAGES="$X_PACKAGES xdamage" +- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" +- fi +- +- if $have_base_x_pc ; then +- GDK_EXTRA_LIBS="$x_extra_libs" +- else +- GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" +- fi +- +- CPPFLAGS="$gtk_save_cppflags" +- LIBS="$gtk_save_libs" +- +- +- +-if true; then +- USE_X11_TRUE= +- USE_X11_FALSE='#' +-else +- USE_X11_TRUE='#' +- USE_X11_FALSE= +-fi +- +-else +- +- +-if false; then +- XINPUT_XFREE_TRUE= +- XINPUT_XFREE_FALSE='#' +-else +- XINPUT_XFREE_TRUE='#' +- XINPUT_XFREE_FALSE= +-fi +- +- +- +-if false; then +- USE_X11_TRUE= +- USE_X11_FALSE='#' +-else +- USE_X11_TRUE='#' +- USE_X11_FALSE= +-fi +- +- +- +-if false; then +- HAVE_X11R6_TRUE= +- HAVE_X11R6_FALSE='#' +-else +- HAVE_X11R6_TRUE='#' +- HAVE_X11R6_FALSE= +-fi +- +-fi +- +-if test "x$gdktarget" = "xwin32"; then +- GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" +- +- +-if true; then +- USE_WIN32_TRUE= +- USE_WIN32_FALSE='#' +-else +- USE_WIN32_TRUE='#' +- USE_WIN32_FALSE= +-fi +- +-else +- +- +-if false; then +- USE_WIN32_TRUE= +- USE_WIN32_FALSE='#' +-else +- USE_WIN32_TRUE='#' +- USE_WIN32_FALSE= +-fi +- +-fi +- +-if test "x$gdktarget" = "xquartz"; then +- GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" +- +- +-if true; then +- USE_QUARTZ_TRUE= +- USE_QUARTZ_FALSE='#' +-else +- USE_QUARTZ_TRUE='#' +- USE_QUARTZ_FALSE= +-fi +- +-else +- +- +-if false; then +- USE_QUARTZ_TRUE= +- USE_QUARTZ_FALSE='#' +-else +- USE_QUARTZ_TRUE='#' +- USE_QUARTZ_FALSE= +-fi +- +-fi +- +-GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" +-GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" +- +- +- +- +- +- +- +-if test "x$gdktarget" = "xdirectfb"; then +- DIRECTFB_REQUIRED_VERSION=0.9.24 +- { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 +-$as_echo_n "checking for DirectFB... " >&6; } +- +- if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } +- GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" +- GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" +- else +- { { $as_echo "$as_me:$LINENO: error: +-*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend +-*** are required. The latest version of DirectFB is always available +-*** from http://www.directfb.org/. +- " >&5 +-$as_echo "$as_me: error: +-*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend +-*** are required. The latest version of DirectFB is always available +-*** from http://www.directfb.org/. +- " >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- +-if true; then +- USE_DIRECTFB_TRUE= +- USE_DIRECTFB_FALSE='#' +-else +- USE_DIRECTFB_TRUE='#' +- USE_DIRECTFB_FALSE= +-fi +- +-else +- +- +-if false; then +- USE_DIRECTFB_TRUE= +- USE_DIRECTFB_FALSE='#' +-else +- USE_DIRECTFB_TRUE='#' +- USE_DIRECTFB_FALSE= +-fi +- +-fi +- +- +-# Check for Pango flags +- +-if test "x$gdktarget" = "xwin32"; then +- PANGO_PACKAGES="pangowin32 pangocairo" +-else +- PANGO_PACKAGES="pango pangocairo" +-fi +- +-{ $as_echo "$as_me:$LINENO: checking Pango flags" >&5 +-$as_echo_n "checking Pango flags... " >&6; } +-if $PKG_CONFIG --exists $PANGO_PACKAGES ; then +- PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` +- PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` +- +- { $as_echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 +-$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; } +-else +- { { $as_echo "$as_me:$LINENO: error: +-*** Pango not found. Pango built with Cairo support is required +-*** to build GTK+. See http://www.pango.org for Pango information. +-" >&5 +-$as_echo "$as_me: error: +-*** Pango not found. Pango built with Cairo support is required +-*** to build GTK+. See http://www.pango.org for Pango information. +-" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-CFLAGS="$CFLAGS $PANGO_CFLAGS" +- +-if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then +- : +-else +- gtk_save_LIBS="$LIBS" +- LIBS="$PANGO_LIBS $LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ + { echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 +echo $ECHO_N "checking for XSyncQueryExtension... $ECHO_C" >&6; } +if test "${ac_cv_func_XSyncQueryExtension+set}" = set; then @@ -36857,10 +69818,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +/* Define XSyncQueryExtension to an innocuous variant, in case <limits.h> declares XSyncQueryExtension. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define XSyncQueryExtension innocuous_XSyncQueryExtension @@ -36877,13 +69838,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#endif + +#undef XSyncQueryExtension -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -30823,11 +32972,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char pango_context_new (); +char XSyncQueryExtension (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named @@ -36892,43 +69854,59 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +choke me +#endif + -+int -+main () -+{ + int + main () + { +-return pango_context_new (); +return XSyncQueryExtension (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -30838,103 +32994,123 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- : + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_XSyncQueryExtension=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- { { $as_echo "$as_me:$LINENO: error: +-*** Can't link to Pango. Pango is required to build +-*** GTK+. For more information see http://www.pango.org" >&5 +-$as_echo "$as_me: error: +-*** Can't link to Pango. Pango is required to build +-*** GTK+. For more information see http://www.pango.org" >&2;} +- { (exit 1); exit 1; }; } + ac_cv_func_XSyncQueryExtension=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +- LIBS="$gtk_save_LIBS" + fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_func_XSyncQueryExtension" >&6; } +if test $ac_cv_func_XSyncQueryExtension = yes; then @@ -36944,8 +69922,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <X11/Xlib.h> -+ -+@%:@include <X11/extensions/sync.h> + +-CFLAGS="$saved_cflags" +-LDFLAGS="$saved_ldflags" ++#include <X11/extensions/sync.h> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" @@ -36968,45 +69948,87 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" +-if test "x$gdktarget" = "xx11"; then +- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" + ac_cv_header_X11_extensions_sync_h=no -+fi -+ + fi +-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" +-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" + +-# +-# If we aren't writing explicit dependencies, then don't put the extra libraries we need +-# into the pkg-config files +-# +-if test $enable_explicit_deps != yes ; then +- GDK_PACKAGES="$PANGO_PACKAGES" +- GDK_EXTRA_LIBS= +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_sync_h" >&6; } +if test $ac_cv_header_X11_extensions_sync_h = yes; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XSYNC 1 ++#define HAVE_XSYNC 1 +_ACEOF -+ + +else + : +fi -+ -+ + + +fi -+ -+ + + + CFLAGS="$gtk_save_CFLAGS" -+ + + # Xshm checks -+ + +-######################################## +-# Check for Accessibility Toolkit flags +-######################################## +- +-ATK_PACKAGES=atk +-{ $as_echo "$as_me:$LINENO: checking ATK flags" >&5 +-$as_echo_n "checking ATK flags... " >&6; } +-if $PKG_CONFIG --exists $ATK_PACKAGES ; then +- ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` +- ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` +- +- { $as_echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 +-$as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; } +-else +- { { $as_echo "$as_me:$LINENO: error: +-*** Accessibility Toolkit not found. Accessibility Toolkit is required +-*** to build GTK+. +-" >&5 +-$as_echo "$as_me: error: +-*** Accessibility Toolkit not found. Accessibility Toolkit is required +-*** to build GTK+. +-" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +-if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then +- : + if test "x$enable_shm" = "xyes"; then + # Check for the XShm extension, normally in Xext + { echo "$as_me:$LINENO: checking for XShmAttach" >&5 +echo $ECHO_N "checking for XShmAttach... $ECHO_C" >&6; } +if test "${ac_cv_func_XShmAttach+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- gtk_save_LIBS="$LIBS" +- LIBS="$ATK_LIBS $LIBS" +- cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +/* Define XShmAttach to an innocuous variant, in case <limits.h> declares XShmAttach. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define XShmAttach innocuous_XShmAttach @@ -37023,13 +70045,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#endif + +#undef XShmAttach -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -30942,11 +33118,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char atk_object_get_type (); +char XShmAttach (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named @@ -37038,48 +70061,117 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +choke me +#endif + -+int -+main () -+{ + int + main () + { +-return atk_object_get_type (); +return XShmAttach (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -30957,94 +33140,42 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- : + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_XShmAttach=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- { { $as_echo "$as_me:$LINENO: error: +- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required +- *** to build GTK+" >&5 +-$as_echo "$as_me: error: +- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required +- *** to build GTK+" >&2;} +- { (exit 1); exit 1; }; } + ac_cv_func_XShmAttach=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +- LIBS="$gtk_save_LIBS" +-fi +- +-GTK_PACKAGES="atk cairo gio-2.0" +-if test "x$gdktarget" = "xx11"; then +- GTK_PACKAGES="$GTK_PACKAGES pangoft2" +-fi +-GTK_EXTRA_LIBS= +-GTK_EXTRA_CFLAGS= +-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" +-GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" +- +-if test x"$os_win32" = xyes; then +- GTK_EXTRA_CFLAGS="$msnative_struct" +-fi +- +-GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" +-ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" +-PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" +-CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" +- +-if test $enable_explicit_deps != yes ; then +- GDK_PIXBUF_EXTRA_LIBS= + fi +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-######################## +-# Checks needed for gail +-######################## +- +-old_LIBS="$LIBS" +-{ $as_echo "$as_me:$LINENO: checking for library containing gethostent" >&5 +-$as_echo_n "checking for library containing gethostent... " >&6; } +-if test "${ac_cv_search_gethostent+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 +echo "${ECHO_T}$ac_cv_func_XShmAttach" >&6; } +if test $ac_cv_func_XShmAttach = yes; then + : -+else + else +- ac_func_search_save_LIBS=$LIBS + # On AIX, it is in XextSam instead + { echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 +echo $ECHO_N "checking for XShmAttach in -lXextSam... $ECHO_C" >&6; } @@ -37088,58 +70180,84 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXextSam $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -31058,462 +33189,214 @@ + #ifdef __cplusplus + extern "C" + #endif +-char gethostent (); +char XShmAttach (); -+int -+main () -+{ + int + main () + { +-return gethostent (); +return XShmAttach (); -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _ACEOF +-for ac_lib in '' nsl; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- rm -f conftest.$ac_objext conftest$ac_exeext +rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_search_gethostent=$ac_res + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_XextSam_XShmAttach=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- + ac_cv_lib_XextSam_XShmAttach=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_gethostent+set}" = set; then +- break +-fi +-done +-if test "${ac_cv_search_gethostent+set}" = set; then +- : +-else +- ac_cv_search_gethostent=no + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS -+fi + fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS +{ echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 +echo "${ECHO_T}$ac_cv_lib_XextSam_XShmAttach" >&6; } +if test $ac_cv_lib_XextSam_XShmAttach = yes; then @@ -37148,11 +70266,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *) x_extra_libs="-lXextSam $x_extra_libs" ;; + esac + -+fi -+ -+fi -+ -+ fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 +-$as_echo "$ac_cv_search_gethostent" >&6; } +-ac_res=$ac_cv_search_gethostent +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +-{ $as_echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 +-$as_echo_n "checking for library containing setsockopt... " >&6; } +-if test "${ac_cv_search_setsockopt+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ fi + + if test "x$enable_shm" = "xyes"; then + # Check for shared memory @@ -37164,87 +70291,283 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } -+else + else +- ac_func_search_save_LIBS=$LIBS + # Is the header compilable? +{ echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 +echo $ECHO_N "checking sys/ipc.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char setsockopt (); +-int +-main () +-{ +-return setsockopt (); +- ; +- return 0; +-} +$ac_includes_default -+@%:@include <sys/ipc.h> -+_ACEOF ++#include <sys/ipc.h> + _ACEOF +-for ac_lib in '' socket; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_search_setsockopt=$ac_res + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_setsockopt+set}" = set; then +- break +-fi +-done +-if test "${ac_cv_search_setsockopt+set}" = set; then +- : +-else +- ac_cv_search_setsockopt=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS + ac_header_compiler=no -+fi -+ + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 +-$as_echo "$ac_cv_search_setsockopt" >&6; } +-ac_res=$ac_cv_search_setsockopt +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +-fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ + +-{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 +-$as_echo_n "checking for library containing connect... " >&6; } +-if test "${ac_cv_search_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_func_search_save_LIBS=$LIBS +# Is the header present? +{ echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 +echo $ECHO_N "checking sys/ipc.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <sys/ipc.h> -+_ACEOF + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char connect (); +-int +-main () +-{ +-return connect (); +- ; +- return 0; +-} ++#include <sys/ipc.h> + _ACEOF +-for ac_lib in '' inet; do +- if test -z "$ac_lib"; then +- ac_res="none required" +- else +- ac_res=-l$ac_lib +- LIBS="-l$ac_lib $ac_func_search_save_LIBS" +- fi +- rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext + }; then +- ac_cv_search_connect=$ac_res + ac_header_preproc=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_connect+set}" = set; then +- break +-fi +-done +-if test "${ac_cv_search_connect+set}" = set; then +- : +-else +- ac_cv_search_connect=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 +-$as_echo "$ac_cv_search_connect" >&6; } +-ac_res=$ac_cv_search_connect +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +- + ac_header_preproc=no -+fi -+ + fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +-{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 +-$as_echo_n "checking for struct sockaddr_un.sun_len... " >&6; } +-if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +- #include <sys/un.h> +- +- +-int +-main () +-{ +-static struct sockaddr_un ac_aggr; +-if (ac_aggr.sun_len) +-return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_member_struct_sockaddr_un_sun_len=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +- #include <sys/un.h> +- +- +-int +-main () +-{ +-static struct sockaddr_un ac_aggr; +-if (sizeof ac_aggr.sun_len) +-return 0; +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -37268,134 +70591,291 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; -+esac + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_member_struct_sockaddr_un_sun_len=yes +{ echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 +echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_ipc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_member_struct_sockaddr_un_sun_len=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_header_sys_ipc_h=$ac_header_preproc -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } -+ -+fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 +-$as_echo "$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } +-if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then +- struct_sockaddr_un_sun_len=true +-else +- struct_sockaddr_un_suin_len=false + fi +if test $ac_cv_header_sys_ipc_h = yes; then -+ + +-case $struct_sockaddr_un_sun_len in +- true) +- +-cat >>confdefs.h <<_ACEOF +-#define HAVE_SOCKADDR_UN_SUN_LEN 1 +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_IPC_H 1 -+_ACEOF -+ -+else ++#define HAVE_IPC_H 1 + _ACEOF + +- ;; +- *) +- ;; +-esac +- +-GAIL_INET_LIBS="$LIBS" +- +- +-LIBS="$old_LIBS" +- +-################################################################ +-# Printing system checks +-################################################################ +- +-# Check whether --enable-cups was given. +-if test "${enable_cups+set}" = set; then +- enableval=$enable_cups; +-else +- enable_cups=auto +-fi +- +- +-if test "x$enable_cups" = "xauto" +-then +- # Extract the first word of "cups-config", so it can be a program name with args. +-set dummy cups-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $CUPS_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no" +- ;; +-esac +-fi +-CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG +-if test -n "$CUPS_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 +-$as_echo "$CUPS_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + no_sys_ipc=yes -+fi -+ -+ + fi + + +- if test "x$CUPS_CONFIG" != "xno"; then +- CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'` +- CUPS_LIBS=`$CUPS_CONFIG --libs` +- +- CUPS_API_VERSION=`$CUPS_CONFIG --api-version` +- CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` +- CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` +- +- if test $CUPS_API_MAJOR -gt 1 -o \ +- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_CUPS_API_1_2 1 +-_ACEOF +- +- fi +- +- +- +- +- +- +- if test "${ac_cv_header_cups_cups_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +-$as_echo_n "checking for cups/cups.h... " >&6; } +-if test "${ac_cv_header_cups_cups_h+set}" = set; then +- $as_echo_n "(cached) " >&6 + if test "${ac_cv_header_sys_shm_h+set}" = set; then + { echo "$as_me:$LINENO: checking for sys/shm.h" >&5 +echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_shm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +-$as_echo "$ac_cv_header_cups_cups_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } -+else -+ # Is the header compilable? + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 +-$as_echo_n "checking cups/cups.h usability... " >&6; } +{ echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 +echo $ECHO_N "checking sys/shm.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+@%:@include <sys/shm.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -31521,7 +33404,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <cups/cups.h> ++#include <sys/shm.h> + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -31529,92 +33412,90 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 +-$as_echo_n "checking cups/cups.h presence... " >&6; } +{ echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 +echo $ECHO_N "checking sys/shm.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+@%:@include <sys/shm.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <cups/cups.h> ++#include <sys/shm.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 + (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 +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 @@ -37408,39 +70888,64 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -31623,51 +33504,57 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +-$as_echo_n "checking for cups/cups.h... " >&6; } +-if test "${ac_cv_header_cups_cups_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +{ echo "$as_me:$LINENO: checking for sys/shm.h" >&5 +echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_shm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_cv_header_cups_cups_h=$ac_header_preproc + ac_cv_header_sys_shm_h=$ac_header_preproc -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +-$as_echo "$ac_cv_header_cups_cups_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } -+ -+fi + + fi +-if test "x$ac_cv_header_cups_cups_h" = x""yes; then +- : +-else +- { { $as_echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 +-$as_echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} +- { (exit 1); exit 1; }; } +-fi +- +- +- fi +if test $ac_cv_header_sys_shm_h = yes; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_SHM_H 1 ++#define HAVE_SHM_H 1 +_ACEOF -+ -+else + +-if test "x$CUPS_CONFIG" != "xno"; then +- HAVE_CUPS_TRUE= +- HAVE_CUPS_FALSE='#' + else +- HAVE_CUPS_TRUE='#' +- HAVE_CUPS_FALSE= + no_sys_shm=yes -+fi -+ -+ + fi + + +- gtk_save_cflags="$CFLAGS" +- CFLAGS="$CUPS_CFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ + + # Check for the X shared memory extension header file -+ have_xshm=no ++ have_xshm=no + { echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 +echo $ECHO_N "checking X11/extensions/XShm.h... $ECHO_C" >&6; } + if test "x$no_xext_lib" = "xyes"; then @@ -37450,10 +70955,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + CFLAGS="$CFLAGS $x_cflags" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <cups/http.h> + +#include <stdlib.h> +#include <sys/types.h> @@ -37463,144 +70969,214 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#include <X11/Xutil.h> +#include <X11/extensions/XShm.h> + -+int -+main () -+{ + int + main () + { +-http_t http; char *s = http.authstring; +XShmSegmentInfo *x_shm_info; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -31678,45 +33565,55 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_HTTP_AUTHSTRING /**/ +-_ACEOF +- + have_xshm=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$gtk_save_cflags" + CFLAGS="$gtk_save_CFLAGS" + fi + { echo "$as_me:$LINENO: result: $have_xshm" >&5 +echo "${ECHO_T}$have_xshm" >&6; } + if test $have_xshm = yes ; then -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XSHM_H 1 -+_ACEOF + ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_XSHM_H 1 ++_ACEOF + + fi + fi -+ + + if test "x$enable_xinerama" = "xyes"; then + # Check for Xinerama extension (Solaris impl or Xfree impl) + gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $x_cflags" -+ + +- gtk_save_libs="$LIBS" +- LIBS="$CUPS_LIBS" + case "$host" in + *-*-solaris*) + # Check for solaris + { echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 +echo $ECHO_N "checking for Xinerama support on Solaris... $ECHO_C" >&6; } -+ + +-for ac_func in httpGetAuthString +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + have_solaris_xinerama=false + { echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 +echo $ECHO_N "checking for XineramaGetInfo... $ECHO_C" >&6; } +if test "${ac_cv_func_XineramaGetInfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31724,12 +33621,12 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +/* Define XineramaGetInfo to an innocuous variant, in case <limits.h> declares XineramaGetInfo. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +#define XineramaGetInfo innocuous_XineramaGetInfo -+ -+/* System header to define __stub macros and hopefully few prototypes, + + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. + which can conflict with char XineramaGetInfo (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +@@ -31739,7 +33636,7 @@ + # include <assert.h> + #endif + +-#undef $ac_func +#undef XineramaGetInfo -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -31747,18 +33644,18 @@ + #ifdef __cplusplus + extern "C" + #endif +-char $ac_func (); +char XineramaGetInfo (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +#if defined __stub_XineramaGetInfo || defined __stub___XineramaGetInfo -+choke me -+#endif -+ -+int -+main () -+{ + choke me + #endif + + int + main () + { +-return $ac_func (); +return XineramaGetInfo (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + ; + return 0; + } +@@ -31769,85 +33666,46 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +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 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_XineramaGetInfo=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" + ac_cv_func_XineramaGetInfo=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done +- +- LIBS="$gtk_save_libs" +- +-else +- +- +-if false; then +- HAVE_CUPS_TRUE= +- HAVE_CUPS_FALSE='#' +-else +- HAVE_CUPS_TRUE='#' +- HAVE_CUPS_FALSE= +-fi +- +-fi +- +-gtk_save_cppflags="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" +- +-if test "${ac_cv_header_cairo_pdf_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 +-$as_echo_n "checking for cairo-pdf.h... " >&6; } +-if test "${ac_cv_header_cairo_pdf_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 +-$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 +echo "${ECHO_T}$ac_cv_func_XineramaGetInfo" >&6; } +if test $ac_cv_func_XineramaGetInfo = yes; then @@ -37608,65 +71184,175 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for X11/extensions/xinerama.h... $ECHO_C" >&6; } +if test "${ac_cv_header_X11_extensions_xinerama_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking cairo-pdf.h usability" >&5 +-$as_echo_n "checking cairo-pdf.h usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <cairo-pdf.h> +#include <X11/Xlib.h> + -+@%:@include <X11/extensions/xinerama.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac ++#include <X11/extensions/xinerama.h> + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -31855,3819 +33713,4428 @@ + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + ac_cv_header_X11_extensions_xinerama_h=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + ac_cv_header_X11_extensions_xinerama_h=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 +-$as_echo_n "checking cairo-pdf.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <cairo-pdf.h> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xinerama_h" >&6; } +if test $ac_cv_header_X11_extensions_xinerama_h = yes; then + have_solaris_xinerama=true -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no + : -+fi -+ -+ -+fi -+ -+ + fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 +-$as_echo_n "checking for cairo-pdf.h... " >&6; } +-if test "${ac_cv_header_cairo_pdf_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_cairo_pdf_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 +-$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } + +-fi +-if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then +- : +-else +- { { $as_echo "$as_me:$LINENO: error: +-*** Can't find cairo-pdf.h. You must build Cairo with the pdf +-*** backend enabled." >&5 +-$as_echo "$as_me: error: +-*** Can't find cairo-pdf.h. You must build Cairo with the pdf +-*** backend enabled." >&2;} +- { (exit 1); exit 1; }; } +-fi + + if $have_solaris_xinerama ; then -+ -+cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_SOLARIS_XINERAMA 1 -+_ACEOF + -+ +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XINERAMA 1 ++#define HAVE_SOLARIS_XINERAMA 1 ++_ACEOF + + +-if test "$os_win32" != "yes"; then +- if test "${ac_cv_header_cairo_ps_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 +-$as_echo_n "checking for cairo-ps.h... " >&6; } +-if test "${ac_cv_header_cairo_ps_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 +-$as_echo "$ac_cv_header_cairo_ps_h" >&6; } ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_XINERAMA 1 +_ACEOF + + { echo "$as_me:$LINENO: result: yes" >&5 @@ -37680,25 +71366,30 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Check for XFree + { echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 +echo $ECHO_N "checking for Xinerama support on XFree86... $ECHO_C" >&6; } -+ ++ + have_xfree_xinerama=false + if $PKG_CONFIG --exists xinerama ; then + have_xfree_xinerama=true + X_PACKAGES="$X_PACKAGES xinerama" -+ else ++ else + { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 +echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 +-$as_echo_n "checking cairo-ps.h usability... " >&6; } + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXinerama $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default +-#include <cairo-ps.h> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -37714,33 +71405,51 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ; + return 0; +} -+_ACEOF + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +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 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xinerama_XineramaQueryExtension=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + ac_cv_lib_Xinerama_XineramaQueryExtension=no -+fi -+ + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 +-$as_echo_n "checking cairo-ps.h presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -37754,42 +71463,96 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <cairo-ps.h> +#include <X11/Xlib.h> + -+@%:@include <X11/extensions/Xinerama.h> -+_ACEOF ++#include <X11/extensions/Xinerama.h> + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err + test ! -s conftest.err +- }; then +- ac_header_preproc=yes + } && test -s conftest.$ac_objext; then + ac_cv_header_X11_extensions_Xinerama_h=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no + ac_cv_header_X11_extensions_Xinerama_h=no -+fi -+ + fi + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } +- +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 +-$as_echo_n "checking for cairo-ps.h... " >&6; } +-if test "${ac_cv_header_cairo_ps_h+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_cv_header_cairo_ps_h=$ac_header_preproc +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 +-$as_echo "$ac_cv_header_cairo_ps_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } +if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then @@ -37797,28 +71560,52 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *-lXinerama[\ \ ]*) ;; + *) x_extra_libs="-lXinerama $x_extra_libs" ;; + esac -+ + +-fi +-if test "x$ac_cv_header_cairo_ps_h" = x""yes; then +- : + have_xfree_xinerama=true -+else + else +- { { $as_echo "$as_me:$LINENO: error: +-*** Can't find cairo-ps.h. You must build Cairo with the +-*** postscript backend enabled." >&5 +-$as_echo "$as_me: error: +-*** Can't find cairo-ps.h. You must build Cairo with the +-*** postscript backend enabled." >&2;} +- { (exit 1); exit 1; }; } + : -+fi -+ -+ -+fi -+ + fi + + + fi + +-CPPFLAGS="$gtk_save_cppflags" + fi -+ + + if $have_xfree_xinerama ; then -+ + +-# Check whether --enable-test-print-backend was given. +-if test "${enable_test_print_backend+set}" = set; then +- enableval=$enable_test_print_backend; +-else +- enable_test_print_backend=no +-fi +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XFREE_XINERAMA 1 ++#define HAVE_XFREE_XINERAMA 1 +_ACEOF -+ -+ + + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XINERAMA 1 ++#define HAVE_XINERAMA 1 +_ACEOF -+ + +-if test "x$enable_test_print_backend" != "xno"; then +- TEST_PRINT_BACKEND_TRUE= +- TEST_PRINT_BACKEND_FALSE='#' +-else +- TEST_PRINT_BACKEND_TRUE='#' +- TEST_PRINT_BACKEND_FALSE= +-fi + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else @@ -37828,16 +71615,36 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + esac + fi -+ + + # set up things for XInput -+ + + if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then -+ + +-################################################################ +-# Strip -export-dynamic from the link lines of various libraries +-################################################################ +cat >>confdefs.h <<\_ACEOF -+@%:@define XINPUT_XFREE 1 ++#define XINPUT_XFREE 1 +_ACEOF -+ -+ + +-# +-# pkg-config --libs gmodule includes the "export_dynamic" flag, +-# but this flag is only meaningful for executables. For libraries +-# the effect is undefined; what it causes on Linux is that the +-# export list from -export-symbols-regex is ignored and everything +-# is exported +-# +-# We are using gmodule-no-export now, but I'm leaving the stripping +-# code in place for now, since pango and atk still require gmodule. +-export SED +-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` +-if test -n "$export_dynamic"; then +- GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` +- GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` +- GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` +- GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` +-fi + + if $PKG_CONFIG --exists xi ; then + X_PACKAGES="$X_PACKAGES xi" + else @@ -37845,105 +71652,263 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + *-lXi[\ \ ]*) ;; + *) x_extra_libs="-lXi $x_extra_libs" ;; + esac -+ + +-################################################## +-# Checks for gtk-doc and docbook-tools +-################################################## + fi + else -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define XINPUT_NONE 1 ++#define XINPUT_NONE 1 +_ACEOF -+ + + fi -+ + +-# Check whether --with-html-dir was given. +-if test "${with_html_dir+set}" = set; then +- withval=$with_html_dir; + if test x$with_xinput = xxfree || test x$with_xinput = xyes; then + XINPUT_XFREE_TRUE= + XINPUT_XFREE_FALSE='#' -+else + else +- with_html_dir='${datadir}/gtk-doc/html' + XINPUT_XFREE_TRUE='#' + XINPUT_XFREE_FALSE= -+fi -+ -+ + fi + +- HTML_DIR="$with_html_dir" + + # Check for the RANDR extension + if $PKG_CONFIG --exists "xrandr >= 1.2" ; then -+ + +- # Check whether --enable-gtk-doc was given. +-if test "${enable_gtk_doc+set}" = set; then +- enableval=$enable_gtk_doc; +-else +- enable_gtk_doc=no +-fi +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_RANDR 1 ++#define HAVE_RANDR 1 +_ACEOF -+ -+ + + +- if test x$enable_gtk_doc = xyes; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.8") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- : +-else +- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 +-$as_echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} +- { (exit 1); exit 1; }; } +-fi + X_PACKAGES="$X_PACKAGES xrandr" -+ fi -+ + fi + +- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 +-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 +-$as_echo "$enable_gtk_doc" >&6; } + # Checks for Xcursor library -+ + +- for ac_prog in gtkdoc-check +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- case $GTKDOC_CHECK in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + if $PKG_CONFIG --exists xcursor ; then -+ + +- ;; +-esac +-fi +-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +-if test -n "$GTKDOC_CHECK"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 +-$as_echo "$GTKDOC_CHECK" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XCURSOR 1 ++#define HAVE_XCURSOR 1 +_ACEOF -+ -+ + + +- test -n "$GTKDOC_CHECK" && break +-done + X_PACKAGES="$X_PACKAGES xcursor" + fi -+ + + # Checks for XFixes extension -+ + + if $PKG_CONFIG --exists xfixes ; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XFIXES 1 ++#define HAVE_XFIXES 1 +_ACEOF -+ -+ + +-if test x$enable_gtk_doc = xyes; then +- ENABLE_GTK_DOC_TRUE= +- ENABLE_GTK_DOC_FALSE='#' +-else +- ENABLE_GTK_DOC_TRUE='#' +- ENABLE_GTK_DOC_FALSE= +-fi + + X_PACKAGES="$X_PACKAGES xfixes" + GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" + fi -+ + + # Checks for Xcomposite extension -+ + +-if test -n "$LIBTOOL"; then +- GTK_DOC_USE_LIBTOOL_TRUE= +- GTK_DOC_USE_LIBTOOL_FALSE='#' +-else +- GTK_DOC_USE_LIBTOOL_TRUE='#' +- GTK_DOC_USE_LIBTOOL_FALSE= +-fi + if $PKG_CONFIG --exists xcomposite ; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XCOMPOSITE 1 ++#define HAVE_XCOMPOSITE 1 +_ACEOF -+ -+ + + +-# Extract the first word of "db2html", so it can be a program name with args. +-set dummy db2html; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DB2HTML+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$DB2HTML"; then +- ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_DB2HTML="true" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 + X_PACKAGES="$X_PACKAGES xcomposite" + GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite" -+ fi -+ + fi +-done +-done +-IFS=$as_save_IFS + +- test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false" +-fi +-fi +-DB2HTML=$ac_cv_prog_DB2HTML +-if test -n "$DB2HTML"; then +- { $as_echo "$as_me:$LINENO: result: $DB2HTML" >&5 +-$as_echo "$DB2HTML" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi + # Checks for Xdamage extension + + if $PKG_CONFIG --exists xdamage ; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_XDAMAGE 1 ++#define HAVE_XDAMAGE 1 +_ACEOF -+ -+ + + + X_PACKAGES="$X_PACKAGES xdamage" + GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" + fi -+ + +-if $DB2HTML; then +- HAVE_DOCBOOK_TRUE= +- HAVE_DOCBOOK_FALSE='#' +-else +- HAVE_DOCBOOK_TRUE='#' +- HAVE_DOCBOOK_FALSE= +-fi + if $have_base_x_pc ; then + GDK_EXTRA_LIBS="$x_extra_libs" + else + GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" + fi -+ + + CPPFLAGS="$gtk_save_cppflags" + LIBS="$gtk_save_libs" -+ + +-# Check whether --enable-man was given. +-if test "${enable_man+set}" = set; then +- enableval=$enable_man; enable_man=yes + if true; then + USE_X11_TRUE= + USE_X11_FALSE='#' -+else + else +- enable_man=no + USE_X11_TRUE='#' + USE_X11_FALSE= -+fi -+ -+else + fi + +- +-if test "${enable_man}" != no; then +- # Extract the first word of "xsltproc", so it can be a program name with args. +-set dummy xsltproc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XSLTPROC+set}" = set; then +- $as_echo_n "(cached) " >&6 + else +- case $XSLTPROC in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + if false; then + XINPUT_XFREE_TRUE= + XINPUT_XFREE_FALSE='#' @@ -37951,25 +71916,36 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + XINPUT_XFREE_TRUE='#' + XINPUT_XFREE_FALSE= +fi -+ + +- ;; +-esac + if false; then + USE_X11_TRUE= + USE_X11_FALSE='#' +else + USE_X11_TRUE='#' + USE_X11_FALSE= -+fi + fi +-XSLTPROC=$ac_cv_path_XSLTPROC +-if test -n "$XSLTPROC"; then +- { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +-$as_echo "$XSLTPROC" >&6; } + + if false; then + HAVE_X11R6_TRUE= + HAVE_X11R6_FALSE='#' -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + HAVE_X11R6_TRUE='#' + HAVE_X11R6_FALSE= + fi + +fi -+ -+fi -+ + +- if test -z "$XSLTPROC"; then +- enable_man=no +- fi +if test "x$gdktarget" = "xwin32"; then + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" + if true; then @@ -37979,7 +71955,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + USE_WIN32_TRUE='#' + USE_WIN32_FALSE= +fi -+ + +else + if false; then + USE_WIN32_TRUE= @@ -37988,19 +71964,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + USE_WIN32_TRUE='#' + USE_WIN32_FALSE= +fi -+ + +- # check for the presence of the XML catalog +fi -+ + +-# Check whether --with-xml-catalog was given. +-if test "${with_xml_catalog+set}" = set; then +- withval=$with_xml_catalog; +if test "x$gdktarget" = "xquartz"; then + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" + if true; then + USE_QUARTZ_TRUE= + USE_QUARTZ_FALSE='#' -+else + else +- with_xml_catalog=/etc/xml/catalog + USE_QUARTZ_TRUE='#' + USE_QUARTZ_FALSE= -+fi -+ + fi + +- jh_found_xmlcatalog=true +- XML_CATALOG_FILE="$with_xml_catalog" +else + if false; then + USE_QUARTZ_TRUE= @@ -38009,7 +71992,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + USE_QUARTZ_TRUE='#' + USE_QUARTZ_FALSE= +fi -+ + +- { $as_echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 +-$as_echo_n "checking for XML catalog ($XML_CATALOG_FILE)... " >&6; } +- if test -f "$XML_CATALOG_FILE"; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } +fi + +GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" @@ -38031,48 +72019,110 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +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" -+ else -+ { { echo "$as_me:$LINENO: error: -+*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend -+*** are required. The latest version of DirectFB is always available + else +- jh_found_xmlcatalog=false +- { $as_echo "$as_me:$LINENO: result: not found" >&5 +-$as_echo "not found" >&6; } ++ { { echo "$as_me:$LINENO: error: ++*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend ++*** are required. The latest version of DirectFB is always available +*** from http://www.directfb.org/. + " >&5 -+echo "$as_me: error: -+*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend -+*** are required. The latest version of DirectFB is always available ++echo "$as_me: error: ++*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend ++*** are required. The latest version of DirectFB is always available +*** from http://www.directfb.org/. + " >&2;} + { (exit 1); exit 1; }; } -+ fi -+ + fi + +- # check for the xmlcatalog program +- # Extract the first word of "xmlcatalog", so it can be a program name with args. +-set dummy xmlcatalog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_XMLCATALOG+set}" = set; then +- $as_echo_n "(cached) " >&6 + if true; then + USE_DIRECTFB_TRUE= + USE_DIRECTFB_FALSE='#' -+else + else +- case $XMLCATALOG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_XMLCATALOG="$XMLCATALOG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" +- ;; +-esac + USE_DIRECTFB_TRUE='#' + USE_DIRECTFB_FALSE= -+fi + fi +-XMLCATALOG=$ac_cv_path_XMLCATALOG +-if test -n "$XMLCATALOG"; then +- { $as_echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 +-$as_echo "$XMLCATALOG" >&6; } + +else + if false; then + USE_DIRECTFB_TRUE= + USE_DIRECTFB_FALSE='#' -+else + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + USE_DIRECTFB_TRUE='#' + USE_DIRECTFB_FALSE= + fi + +fi -+ -+fi -+ -+ + +- if test "x$XMLCATALOG" = xno; then +- jh_found_xmlcatalog=false +- fi + +- if $jh_found_xmlcatalog; then +- : +- else +- : +- fi +# Check for Pango flags -+ + +if test "x$gdktarget" = "xwin32"; then + PANGO_PACKAGES="pangowin32 pangocairo" +else + PANGO_PACKAGES="pango pangocairo" +fi -+ + +- { $as_echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 +-$as_echo_n "checking for DocBook XML DTD V4.1.2 in XML catalog... " >&6; } +- if $jh_found_xmlcatalog && \ +- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 +- ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.1.2//EN" >&2) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: not found" >&5 +-$as_echo "not found" >&6; } +- enable_man=no +- fi +{ echo "$as_me:$LINENO: checking Pango flags" >&5 +echo $ECHO_N "checking Pango flags... $ECHO_C" >&6; } +if $PKG_CONFIG --exists $PANGO_PACKAGES ; then @@ -38082,19 +72132,24 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 +echo "${ECHO_T}$PANGO_CFLAGS $PANGO_LIBS" >&6; } +else -+ { { echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: +*** Pango not found. Pango built with Cairo support is required +*** to build GTK+. See http://www.pango.org for Pango information. +" >&5 -+echo "$as_me: error: ++echo "$as_me: error: +*** Pango not found. Pango built with Cairo support is required +*** to build GTK+. See http://www.pango.org for Pango information. +" >&2;} + { (exit 1); exit 1; }; } +fi -+ + +CFLAGS="$CFLAGS $PANGO_CFLAGS" -+ + +- { $as_echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 +-$as_echo_n "checking for DocBook XSL Stylesheets in XML catalog... " >&6; } +- if $jh_found_xmlcatalog && \ +- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 +- ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" >&2) 2>&5 +if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then + : +else @@ -38130,7 +72185,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: not found" >&5 +-$as_echo "not found" >&6; } +- enable_man=no +- fi + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 @@ -38144,24 +72208,27 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ { { echo "$as_me:$LINENO: error: + ++ { { echo "$as_me:$LINENO: error: +*** Can't link to Pango. Pango is required to build +*** GTK+. For more information see http://www.pango.org" >&5 -+echo "$as_me: error: ++echo "$as_me: error: +*** Can't link to Pango. Pango is required to build +*** GTK+. For more information see http://www.pango.org" >&2;} + { (exit 1); exit 1; }; } -+fi -+ + fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gtk_save_LIBS" +fi -+ + +CFLAGS="$saved_cflags" +LDFLAGS="$saved_ldflags" -+ + +-if test x$enable_man != xno; then +- ENABLE_MAN_TRUE= +- ENABLE_MAN_FALSE='#' +GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" +if test "x$gdktarget" = "xx11"; then + GDK_PRIVATE_PACKAGES="$X_PACKAGES" @@ -38175,43 +72242,140 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# +if test $enable_explicit_deps != yes ; then + GDK_EXTRA_LIBS= -+else + else +- ENABLE_MAN_TRUE='#' +- ENABLE_MAN_FALSE= + GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES" -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ + fi + + + +-################################################## +-# Output commands +-################################################## + +-ac_config_commands="$ac_config_commands gdk/gdkconfig.h" + + +-ac_config_files="$ac_config_files config.h.win32 gtk-zip.sh Makefile gdk-pixbuf-2.0.pc gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc gdk-pixbuf-2.0-uninstalled.pc gdk-2.0-uninstalled.pc gtk+-2.0-uninstalled.pc gail-uninstalled.pc m4macros/Makefile po/Makefile.in po-properties/Makefile.in demos/Makefile demos/gtk-demo/Makefile demos/gtk-demo/geninclude.pl tests/Makefile docs/Makefile docs/reference/Makefile docs/reference/gdk-pixbuf/Makefile docs/reference/gdk-pixbuf/version.xml docs/reference/gdk/Makefile docs/reference/gdk/version.xml docs/reference/gtk/Makefile docs/reference/gtk/version.xml docs/reference/libgail-util/Makefile docs/faq/Makefile docs/tools/Makefile docs/tutorial/Makefile gdk-pixbuf/Makefile gdk-pixbuf/gdk_pixbuf.rc gdk-pixbuf/gdk-pixbuf-features.h gdk-pixbuf/pixops/Makefile gdk/Makefile gdk/x11/Makefile gdk/win32/Makefile gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc gdk/quartz/Makefile gdk/directfb/Makefile gdk/tests/Makefile gtk/Makefile gtk/makefile.msc gtk/gtkversion.h gtk/gtk-win32.rc gtk/theme-bits/Makefile gtk/tests/Makefile modules/Makefile modules/other/Makefile modules/other/gail/Makefile modules/other/gail/libgail-util/Makefile modules/other/gail/tests/Makefile modules/engines/Makefile modules/engines/pixbuf/Makefile modules/engines/ms-windows/Makefile modules/engines/ms-windows/Theme/Makefile modules/engines/ms-windows/Theme/gtk-2.0/Makefile modules/input/Makefile modules/printbackends/Makefile modules/printbackends/cups/Makefile modules/printbackends/lpr/Makefile modules/printbackends/file/Makefile modules/printbackends/test/Makefile perf/Makefile contrib/Makefile contrib/gdk-pixbuf-xlib/Makefile contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" + + +-cat >confcache <<\_ACEOF +-# This file is a shell script that caches the results of configure +-# tests run on this system so they can be shared between configure +-# scripts and configure runs, see configure's option --config-cache. +-# It is not useful on other systems. If it contains results you don't +-# want to keep, you may remove or edit it. +-# +-# config.status only pays attention to the cache file if you give it +-# the --recheck option to rerun configure. +-# +-# `ac_cv_env_foo' variables (set or unset) will be overridden when +-# loading this file, other *unset* `ac_cv_foo' will be assigned the +-# following values. + +-_ACEOF +######################################## +# Check for Accessibility Toolkit flags +######################################## -+ + +-# The following way of writing the cache mishandles newlines in values, +-# but we know of no workaround that is simple, portable, and efficient. +-# So, we kill variables containing newlines. +-# Ultrix sh set writes to stderr and can't be redirected directly, +-# and sets the high bit in the cache file unless we assign to the vars. +-( +- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do +- eval ac_val=\$$ac_var +- case $ac_val in #( +- *${as_nl}*) +- case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +- esac +- case $ac_var in #( +- _ | IFS | as_nl) ;; #( +- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( +- *) $as_unset $ac_var ;; +- esac ;; +- esac +- done +ATK_PACKAGES=atk +{ echo "$as_me:$LINENO: checking ATK flags" >&5 +echo $ECHO_N "checking ATK flags... $ECHO_C" >&6; } +if $PKG_CONFIG --exists $ATK_PACKAGES ; then + ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` + ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` -+ + +- (set) 2>&1 | +- case $as_nl`(ac_space=' '; set) 2>&1` in #( +- *${as_nl}ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote +- # substitution turns \\\\ into \\, and sed turns \\ into \). +- sed -n \ +- "s/'/'\\\\''/g; +- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" +- ;; #( +- *) +- # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" +- ;; +- esac | +- sort +-) | +- sed ' +- /^ac_cv_env_/b end +- t clear +- :clear +- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ +- t end +- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ +- :end' >>confcache +-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else +- if test -w "$cache_file"; then +- test "x$cache_file" != "x/dev/null" && +- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 +-$as_echo "$as_me: updating cache $cache_file" >&6;} +- cat confcache >$cache_file +- else +- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} +- fi + { echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 +echo "${ECHO_T}$ATK_CFLAGS $ATK_LIBS" >&6; } +else -+ { { echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: +*** Accessibility Toolkit not found. Accessibility Toolkit is required +*** to build GTK+. +" >&5 -+echo "$as_me: error: ++echo "$as_me: error: +*** Accessibility Toolkit not found. Accessibility Toolkit is required +*** to build GTK+. +" >&2;} + { (exit 1); exit 1; }; } -+fi -+ + fi +-rm -f confcache +- +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-# Let make expand exec_prefix. +-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- +-DEFS=-DHAVE_CONFIG_H +- +-ac_libobjs= +-ac_ltlibobjs= +-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue +- # 1. Remove the extension, and $U if already installed. +- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +- ac_i=`$as_echo "$ac_i" | sed "$ac_script"` +- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR +- # will be set to the directory where LIBOBJS objects are built. +- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" +- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' +-done +-LIBOBJS=$ac_libobjs + +-LTLIBOBJS=$ac_ltlibobjs +if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then + : +else @@ -38223,7 +72387,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -38257,37 +72421,164 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -+ : ++ : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ { { echo "$as_me:$LINENO: error: + +-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" 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 +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_OBJC\" 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 +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"OS_UNIX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"OS_LINUX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${BUILD_GDIPLUS_LOADERS_TRUE}" && test -z "${BUILD_GDIPLUS_LOADERS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${BUILD_DYNAMIC_MODULES_TRUE}" && test -z "${BUILD_DYNAMIC_MODULES_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} ++ { { echo "$as_me:$LINENO: error: + *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required + *** to build GTK+" >&5 -+echo "$as_me: error: ++echo "$as_me: error: + *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required + *** to build GTK+" >&2;} -+ { (exit 1); exit 1; }; } -+fi + { (exit 1); exit 1; }; } + fi +-if test -z "${INCLUDE_PNG_TRUE}" && test -z "${INCLUDE_PNG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNG\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_PNG\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gtk_save_LIBS" -+fi + fi +-if test -z "${INCLUDE_BMP_TRUE}" && test -z "${INCLUDE_BMP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_BMP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_BMP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } + +GTK_PACKAGES="atk cairo gio-2.0" +if test "x$gdktarget" = "xx11"; then + GTK_PACKAGES="$GTK_PACKAGES pangoft2" -+fi + fi +-if test -z "${INCLUDE_WBMP_TRUE}" && test -z "${INCLUDE_WBMP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_WBMP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_WBMP\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +GTK_EXTRA_LIBS= -+GTK_EXTRA_CFLAGS= ++GTK_EXTRA_CFLAGS= +GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" +GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" + +if test x"$os_win32" = xyes; then + GTK_EXTRA_CFLAGS="$msnative_struct" -+fi + fi +-if test -z "${INCLUDE_GIF_TRUE}" && test -z "${INCLUDE_GIF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GIF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_GIF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } + +GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" +ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" @@ -38296,7 +72587,90 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +if test $enable_explicit_deps != yes ; then + GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB" -+fi + fi +-if test -z "${INCLUDE_ICO_TRUE}" && test -z "${INCLUDE_ICO_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICO\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_ICO\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_ANI_TRUE}" && test -z "${INCLUDE_ANI_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ANI\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_ANI\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_JPEG_TRUE}" && test -z "${INCLUDE_JPEG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JPEG\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_JPEG\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_PNM_TRUE}" && test -z "${INCLUDE_PNM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_PNM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_RAS_TRUE}" && test -z "${INCLUDE_RAS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_RAS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_RAS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_TIFF_TRUE}" && test -z "${INCLUDE_TIFF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIFF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_TIFF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_XPM_TRUE}" && test -z "${INCLUDE_XPM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_XPM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_XPM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_XBM_TRUE}" && test -z "${INCLUDE_XBM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_XBM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_XBM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_TGA_TRUE}" && test -z "${INCLUDE_TGA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TGA\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_TGA\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_PCX_TRUE}" && test -z "${INCLUDE_PCX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PCX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_ICNS_TRUE}" && test -z "${INCLUDE_ICNS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_JASPER_TRUE}" && test -z "${INCLUDE_JASPER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } + + + @@ -38381,30 +72755,60 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + -+ -+fi ++ + fi +-if test -z "${INCLUDE_GDIPLUS_TRUE}" && test -z "${INCLUDE_GDIPLUS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext ++ conftest$ac_exeext + if test "${ac_cv_search_gethostent+set}" = set; then + break -+fi + fi +-if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +done +if test "${ac_cv_search_gethostent+set}" = set; then + : +else + ac_cv_search_gethostent=no -+fi + fi +-if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS -+fi + fi +-if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 +echo "${ECHO_T}$ac_cv_search_gethostent" >&6; } +ac_res=$ac_cv_search_gethostent +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi ++ + fi +-if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } + +{ echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 +echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } @@ -38464,31 +72868,296 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + -+ -+fi ++ + fi +-if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext ++ conftest$ac_exeext + if test "${ac_cv_search_setsockopt+set}" = set; then + break -+fi + fi +-if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +done +if test "${ac_cv_search_setsockopt+set}" = set; then + : +else + ac_cv_search_setsockopt=no -+fi + fi +-if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS -+fi + fi +-if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_TIFF_TRUE}" && test -z "${HAVE_TIFF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_TIFF\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_JPEG_TRUE}" && test -z "${HAVE_JPEG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JPEG\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_JASPER_TRUE}" && test -z "${HAVE_JASPER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_MEDIALIB_TRUE}" && test -z "${USE_MEDIALIB_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_MEDIALIB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_MEDIALIB25_TRUE}" && test -z "${USE_MEDIALIB25_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB25\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_MEDIALIB25\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_MMX_TRUE}" && test -z "${USE_MMX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_MMX\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_X11\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_X11\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_WIN32\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${TEST_PRINT_BACKEND_TRUE}" && test -z "${TEST_PRINT_BACKEND_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"TEST_PRINT_BACKEND\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"TEST_PRINT_BACKEND\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +-fi +-if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined. +-Usually this means the macro was only invoked conditionally." >&2;} +- { (exit 1); exit 1; }; } +{ echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 +echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } +ac_res=$ac_cv_search_setsockopt +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+fi + + fi + +-: ${CONFIG_STATUS=./config.status} +-ac_write_fail=0 +-ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-#! $SHELL +-# Generated by $as_me. +-# Run this file to recreate the current configuration. +-# Compiler output produced by configure, useful for debugging +-# configure, is in config.log if it exists. +- +-debug=false +-ac_cs_recheck=false +-ac_cs_silent=false +-SHELL=\${CONFIG_SHELL-$SHELL} +{ echo "$as_me:$LINENO: checking for library containing connect" >&5 +echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; } +if test "${ac_cv_search_connect+set}" = set; then @@ -38497,11 +73166,28 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF + _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+ + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-## --------------------- ## +-## M4sh Initialization. ## +-## --------------------- ## +- +-# 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=: +- # Pre-4.2 versions of Zsh do 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 ;; +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -38529,7 +73215,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; -+esac + esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? @@ -38547,11 +73233,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + -+ -+fi -+ + + fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext ++ conftest$ac_exeext + if test "${ac_cv_search_connect+set}" = set; then + break +fi @@ -38569,10 +73255,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ac_res=$ac_cv_search_connect +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ + +fi -+ -+ + + +-# PATH needs CR +-# Avoid depending upon Character Ranges. +-as_cr_letters='abcdefghijklmnopqrstuvwxyz' +-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +-as_cr_Letters=$as_cr_letters$as_cr_LETTERS +-as_cr_digits='0123456789' +-as_cr_alnum=$as_cr_Letters$as_cr_digits +{ echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 +echo $ECHO_N "checking for struct sockaddr_un.sun_len... $ECHO_C" >&6; } +if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then @@ -38586,7 +73279,37 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +/* end confdefs.h. */ +#include <sys/types.h> + #include <sys/un.h> -+ + +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='printf %s\n' +- as_echo_n='printf %s' +-else +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' + +int +main () @@ -38628,7 +73351,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +/* end confdefs.h. */ +#include <sys/types.h> + #include <sys/un.h> -+ ++ + +int +main () @@ -38663,28 +73386,49 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_struct_sockaddr_un_sun_len=no -+fi -+ + fi + +-# The user is always right. +-if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ + fi + +-# Support unset when possible. +-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +- as_unset=unset +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 +echo "${ECHO_T}$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } +if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then + struct_sockaddr_un_sun_len=true -+else + else +- as_unset=false + struct_sockaddr_un_suin_len=false -+fi -+ -+case $struct_sockaddr_un_sun_len in + fi + ++case $struct_sockaddr_un_sun_len in + true) -+ + +-# IFS +-# We need space, tab and new line, in precisely that order. Quoting is +-# there to prevent editors from complaining about space-tab. +-# (If _AS_PATH_WALK were called with IFS unset, it would disable word +-# splitting by setting IFS to empty value.) +-IFS=" "" $as_nl" +cat >>confdefs.h <<_ACEOF -+@%:@define HAVE_SOCKADDR_UN_SUN_LEN 1 ++#define HAVE_SOCKADDR_UN_SUN_LEN 1 +_ACEOF -+ + +-# Find who we are. Look in the path if we contain no directory separator. +-case $0 in +- *[\\/]* ) as_myself=$0 ;; +- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + ;; + *) + ;; @@ -38701,7 +73445,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +# Check whether --enable-cups was given. +if test "${enable_cups+set}" = set; then -+ enableval=$enable_cups; ++ enableval=$enable_cups; +else + enable_cups=auto +fi @@ -38722,10 +73466,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + for ac_exec_ext in '' $ac_executable_extensions; do + 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" @@ -38733,13 +73478,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + break 2 + fi +done -+done -+IFS=$as_save_IFS -+ + done + IFS=$as_save_IFS + +- ;; + test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no" + ;; -+esac -+fi + esac +-# We did not find ourselves, most probably we were run as `sh COMMAND' +-# in which case we are not to be found in the path. +-if test "x$as_myself" = x; then +- as_myself=$0 + fi +-if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 +- { (exit 1); exit 1; } +CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG +if test -n "$CUPS_CONFIG"; then + { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 @@ -38747,31 +73500,115 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -+fi -+ -+ + fi + +-# Work around bugs in pre-3.0 UWIN ksh. +-for as_var in ENV MAIL MAILPATH +-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +-done +-PS1='$ ' +-PS2='> ' +-PS4='+ ' + +-# NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE + if test "x$CUPS_CONFIG" != "xno"; then + CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'` + CUPS_LIBS=`$CUPS_CONFIG --libs` -+ + +-# Required to use basename. +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +-else +- as_expr=false +-fi + CUPS_API_VERSION=`$CUPS_CONFIG --api-version` + CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` + CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` -+ + +-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +- as_basename=basename +-else +- as_basename=false +-fi + if test $CUPS_API_MAJOR -gt 1 -o \ + $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -+ + +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_CUPS_API_1_2 1 ++#define HAVE_CUPS_API_1_2 1 +_ACEOF -+ + +-# Name of the executable. +-as_me=`$as_basename -- "$0" || +-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ +- X"$0" : 'X\(//\)$' \| \ +- X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | +- sed '/^.*\/\([^/][^/]*\)\/*$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\/\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` + fi -+ -+ -+ -+ -+ -+ + +-# CDPATH. +-$as_unset CDPATH + + + +- as_lineno_1=$LINENO +- as_lineno_2=$LINENO +- test "x$as_lineno_1" != "x$as_lineno_2" && +- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + +- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO +- # uniformly replaced by the line number. The first 'sed' inserts a +- # line-number line after each line using $LINENO; the second 'sed' +- # does the real work. The second script uses 'N' to pair each +- # line-number line with the line containing $LINENO, and appends +- # trailing '-' during substitution so that $LINENO is not a special +- # case at line end. +- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the +- # scripts with optimization help from Paolo Bonzini. Blame Lee +- # E. McMahon (1931-1989) for sed's syntax. :-) +- sed -n ' +- p +- /[$]LINENO/= +- ' <$as_myself | +- sed ' +- s/[$]LINENO.*/&-/ +- t lineno +- b +- :lineno +- N +- :loop +- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ +- t loop +- s/-\n.*// +- ' >$as_me.lineno && +- chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 +- { (exit 1); exit 1; }; } + +- # Don't try to exec as it changes $[0], causing all sort of problems +- # (the dirname of $[0] is not the place where we might find the +- # original and so on. Autoconf is especially sensitive to this). +- . "./$as_me.lineno" +- # Exit status is that of the last command. +- exit +-} + if test "${ac_cv_header_cups_cups_h+set}" = set; then + { echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } @@ -38791,7 +73628,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -+@%:@include <cups/cups.h> ++#include <cups/cups.h> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" @@ -38814,10 +73651,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_header_compiler=no +fi -+ + +-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then +- as_dirname=dirname +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } @@ -38831,7 +73670,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <cups/cups.h> ++#include <cups/cups.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -38850,13 +73689,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test ! -s conftest.err + }; then + ac_header_preproc=yes -+else + else +- as_dirname=false + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no -+fi -+ + fi + +-ECHO_C= ECHO_N= ECHO_T= +-case `echo -n x` in +--n*) +- case `echo 'x\c'` in +- *c*) ECHO_T=' ';; # ECHO_T is single tab character. +- *) ECHO_C='\c';; +- esac;; +-*) +- ECHO_N='-n';; +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } @@ -38884,48 +73733,132 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; -+esac + esac +-if expr a : '\(a\)' >/dev/null 2>&1 && +- test "X`expr 00001 : '.*\(...\)'`" = X001; then +- as_expr=expr +{ echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } +if test "${ac_cv_header_cups_cups_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- as_expr=false + ac_cv_header_cups_cups_h=$ac_header_preproc -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } -+ -+fi + +-rm -f conf$$ conf$$.exe conf$$.file +-if test -d conf$$.dir; then +- rm -f conf$$.dir/conf$$.file +-else +- rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null + fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else +- as_ln_s='cp -p' +- fi +if test $ac_cv_header_cups_cups_h = yes; then + : -+else + else +- as_ln_s='cp -p' + { { echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 +echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} + { (exit 1); exit 1; }; } -+fi -+ -+ -+ fi + fi +-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +-rmdir conf$$.dir 2>/dev/null + +-if mkdir -p . 2>/dev/null; then +- as_mkdir_p=: +-else +- test -d ./-p && rmdir ./-p +- as_mkdir_p=false +-fi + +-if test -x / >/dev/null 2>&1; then +- as_test_x='test -x' +-else +- 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 +- ' + if test "x$CUPS_CONFIG" != "xno"; then + HAVE_CUPS_TRUE= + HAVE_CUPS_FALSE='#' +else + HAVE_CUPS_TRUE='#' + HAVE_CUPS_FALSE= -+fi -+ -+ + fi +-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'" +- +-# Sed expression to map a string onto a valid variable name. +-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +- +- +-exec 6>&1 +- +-# Save the log message, to keep $[0] and so on meaningful, and to +-# report actual input values of CONFIG_FILES etc. instead of their +-# values after options handling. +-ac_log=" +-This file was extended by gtk+ $as_me 2.14.5, which was +-generated by GNU Autoconf 2.63. Invocation command line was +- +- CONFIG_FILES = $CONFIG_FILES +- CONFIG_HEADERS = $CONFIG_HEADERS +- CONFIG_LINKS = $CONFIG_LINKS +- CONFIG_COMMANDS = $CONFIG_COMMANDS +- $ $0 $@ + +-on `(hostname || uname -n) 2>/dev/null | sed 1q` +-" + + gtk_save_cflags="$CFLAGS" + CFLAGS="$CUPS_CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF + _ACEOF +- +-case $ac_config_files in *" +-"*) set x $ac_config_files; shift; ac_config_files=$*;; +-esac +- +-case $ac_config_headers in *" +-"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ @@ -38943,7 +73876,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; -+esac + esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? @@ -38955,26 +73888,55 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then -+ + +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-# Files that config.status was made for. +-config_files="$ac_config_files" +-config_headers="$ac_config_headers" +-config_commands="$ac_config_commands" +- +cat >>confdefs.h <<\_ACEOF -+@%:@define HAVE_HTTP_AUTHSTRING -+_ACEOF -+ ++#define HAVE_HTTP_AUTHSTRING + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-ac_cs_usage="\ +-\`$as_me' instantiates files from templates according to the +-current configuration. +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ + +-Usage: $0 [OPTION]... [FILE]... + +- -h, --help print this help, then exit +- -V, --version print version number and configuration settings, then exit +- -q, --quiet, --silent +- do not print progress messages +- -d, --debug don't remove temporary files +- --recheck update $as_me by reconfiguring in the same conditions +- --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE +- --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE +fi -+ + +-Configuration files: +-$config_files +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gtk_save_cflags" -+ -+ -+ + +-Configuration headers: +-$config_headers + +-Configuration commands: +-$config_commands + +-Report bugs to <bug-autoconf@gnu.org>." + gtk_save_libs="$LIBS" + LIBS="$CUPS_LIBS" -+ + +for ac_func in httpGetAuthString +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -38985,27 +73947,102 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ -+_ACEOF + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-ac_cs_version="\\ +-gtk+ config.status 2.14.5 +-configured by $0, generated by GNU Autoconf 2.63, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func -+ + +-Copyright (C) 2008 Free Software Foundation, Inc. +-This config.status script is free software; the Free Software Foundation +-gives unlimited permission to copy, distribute and modify it." +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ -+ + +-ac_pwd='$ac_pwd' +-srcdir='$srcdir' +-INSTALL='$INSTALL' +-AWK='$AWK' +-test -n "\$AWK" || AWK=awk +-_ACEOF +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif -+ + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-# The default lists apply if the user does not specify any file. +-ac_need_defaults=: +-while test $# != 0 +-do +- case $1 in +- --*=*) +- ac_option=`expr "X$1" : 'X\([^=]*\)='` +- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` +- ac_shift=: +- ;; +- *) +- ac_option=$1 +- ac_optarg=$2 +- ac_shift=shift +- ;; +- esac +- +- case $ac_option in +- # Handling of the options. +- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) +- ac_cs_recheck=: ;; +- --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +- $as_echo "$ac_cs_version"; exit ;; +- --debug | --debu | --deb | --de | --d | -d ) +- debug=: ;; +- --file | --fil | --fi | --f ) +- $ac_shift +- case $ac_optarg in +- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" +- ac_need_defaults=false;; +- --header | --heade | --head | --hea ) +- $ac_shift +- case $ac_optarg in +- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" +- ac_need_defaults=false;; +- --he | --h) +- # Conflict between --help and --header +- { $as_echo "$as_me: error: ambiguous option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; };; +- --help | --hel | -h ) +- $as_echo "$ac_cs_usage"; exit ;; +- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ +- | -silent | --silent | --silen | --sile | --sil | --si | --s) +- ac_cs_silent=: ;; +- +- # This is an error. +- -*) { $as_echo "$as_me: error: unrecognized option: $1 +-Try \`$0 --help' for more information." >&2 +- { (exit 1); exit 1; }; } ;; +- +- *) ac_config_targets="$ac_config_targets $1" +- ac_need_defaults=false ;; +#undef $ac_func -+ + +- esac +- shift +-done +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -39019,7 +74056,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif -+ + +-ac_configure_extra_args= +int +main () +{ @@ -39050,26 +74088,390 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-if $ac_cs_silent; then +- exec 6>/dev/null +- ac_configure_extra_args="$ac_configure_extra_args --silent" + eval "$as_ac_var=no" -+fi -+ + fi + +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-if \$ac_cs_recheck; then +- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +- shift +- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 +- CONFIG_SHELL='$SHELL' +- export CONFIG_SHELL +- exec "\$@" +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext -+fi + fi +- +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-exec 5>>config.log +-{ +- echo +- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +-## Running $as_me. ## +-_ASBOX +- $as_echo "$ac_log" +-} >&5 +- +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF -+@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-# +-# INIT-COMMANDS +-# +-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +- +- +-# 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 +- +-sed_quote_subst='$sed_quote_subst' +-double_quote_subst='$double_quote_subst' +-delay_variable_subst='$delay_variable_subst' +-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' +-AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' +-DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' +-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' +-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' +-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' +-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' +-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' +-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' +-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' +-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' +-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' +-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' +-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' +-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' +-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' +-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' +-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' +-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' +-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' +-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' +-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' +-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' +-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' +-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' +-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' +-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' +-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' +-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' +-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' +-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' +-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' +-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' +-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' +-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' +-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' +-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' +-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' +-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' +-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' +-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' +-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' +-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' +-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' +-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' +-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' +-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' +-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' +-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' +-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' +-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' +-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' +-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' +-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' +-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' +-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' +-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' +-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' +-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' +-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' +-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' +-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' +-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' +-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' +-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' +-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' +-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' +-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' +-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' +-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' +-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' +-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' +-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' +-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' +-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' +-predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' +-postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' +-predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' +-postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' +-LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' +-compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' +- +-LTCC='$LTCC' +-LTCFLAGS='$LTCFLAGS' +-compiler='$compiler_DEFAULT' +- +-# Quote evaled strings. +-for var in SED \ +-GREP \ +-EGREP \ +-FGREP \ +-LD \ +-NM \ +-LN_S \ +-lt_SP2NL \ +-lt_NL2SP \ +-reload_flag \ +-deplibs_check_method \ +-file_magic_cmd \ +-AR \ +-AR_FLAGS \ +-STRIP \ +-RANLIB \ +-CC \ +-CFLAGS \ +-compiler \ +-lt_cv_sys_global_symbol_pipe \ +-lt_cv_sys_global_symbol_to_cdecl \ +-lt_cv_sys_global_symbol_to_c_name_address \ +-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +-SHELL \ +-ECHO \ +-lt_prog_compiler_no_builtin_flag \ +-lt_prog_compiler_wl \ +-lt_prog_compiler_pic \ +-lt_prog_compiler_static \ +-lt_cv_prog_compiler_c_o \ +-need_locks \ +-DSYMUTIL \ +-NMEDIT \ +-LIPO \ +-OTOOL \ +-OTOOL64 \ +-shrext_cmds \ +-export_dynamic_flag_spec \ +-whole_archive_flag_spec \ +-compiler_needs_object \ +-with_gnu_ld \ +-allow_undefined_flag \ +-no_undefined_flag \ +-hardcode_libdir_flag_spec \ +-hardcode_libdir_flag_spec_ld \ +-hardcode_libdir_separator \ +-fix_srcfile_path \ +-exclude_expsyms \ +-include_expsyms \ +-file_list_spec \ +-variables_saved_for_relink \ +-libname_spec \ +-library_names_spec \ +-soname_spec \ +-finish_eval \ +-old_striplib \ +-striplib \ +-compiler_lib_search_dirs \ +-predep_objects \ +-postdep_objects \ +-predeps \ +-postdeps \ +-compiler_lib_search_path \ +-LD_CXX \ +-compiler_CXX \ +-lt_prog_compiler_no_builtin_flag_CXX \ +-lt_prog_compiler_wl_CXX \ +-lt_prog_compiler_pic_CXX \ +-lt_prog_compiler_static_CXX \ +-lt_cv_prog_compiler_c_o_CXX \ +-export_dynamic_flag_spec_CXX \ +-whole_archive_flag_spec_CXX \ +-compiler_needs_object_CXX \ +-with_gnu_ld_CXX \ +-allow_undefined_flag_CXX \ +-no_undefined_flag_CXX \ +-hardcode_libdir_flag_spec_CXX \ +-hardcode_libdir_flag_spec_ld_CXX \ +-hardcode_libdir_separator_CXX \ +-fix_srcfile_path_CXX \ +-exclude_expsyms_CXX \ +-include_expsyms_CXX \ +-file_list_spec_CXX \ +-compiler_lib_search_dirs_CXX \ +-predep_objects_CXX \ +-postdep_objects_CXX \ +-predeps_CXX \ +-postdeps_CXX \ +-compiler_lib_search_path_CXX; do +- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in +- *[\\\\\\\`\\"\\\$]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" +- ;; +- *) +- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +- ;; +- esac +-done + +-# Double-quote double-evaled strings. +-for var in reload_cmds \ +-old_postinstall_cmds \ +-old_postuninstall_cmds \ +-old_archive_cmds \ +-extract_expsyms_cmds \ +-old_archive_from_new_cmds \ +-old_archive_from_expsyms_cmds \ +-archive_cmds \ +-archive_expsym_cmds \ +-module_cmds \ +-module_expsym_cmds \ +-export_symbols_cmds \ +-prelink_cmds \ +-postinstall_cmds \ +-postuninstall_cmds \ +-finish_cmds \ +-sys_lib_search_path_spec \ +-sys_lib_dlsearch_path_spec \ +-old_archive_cmds_CXX \ +-old_archive_from_new_cmds_CXX \ +-old_archive_from_expsyms_cmds_CXX \ +-archive_cmds_CXX \ +-archive_expsym_cmds_CXX \ +-module_cmds_CXX \ +-module_expsym_cmds_CXX \ +-export_symbols_cmds_CXX \ +-prelink_cmds_CXX; do +- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in +- *[\\\\\\\`\\"\\\$]*) +- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" +- ;; +- *) +- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" +- ;; +- esac +fi -+done -+ + done + +-# Fix-up fallback echo if it was mangled by the above quoting rules. +-case \$lt_ECHO in +-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` +- ;; +-esac +- +-ac_aux_dir='$ac_aux_dir' +-xsi_shell='$xsi_shell' +-lt_shell_append='$lt_shell_append' + LIBS="$gtk_save_libs" -+ + +-# See if we are running on zsh, and set the options which allow our +-# commands through without removal of \ escapes INIT. +-if test -n "\${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +else + if false; then + HAVE_CUPS_TRUE= @@ -39077,13 +74479,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + HAVE_CUPS_TRUE='#' + HAVE_CUPS_FALSE= + fi + +fi -+ -+fi -+ + +- PACKAGE='$PACKAGE' +- VERSION='$VERSION' +- TIMESTAMP='$TIMESTAMP' +- RM='$RM' +- ofile='$ofile' +- +- +gtk_save_cppflags="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" -+ + +-ac_aux_dir='$ac_aux_dir' +if test "${ac_cv_header_cairo_pdf_h+set}" = set; then + { echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 +echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } @@ -39103,7 +74513,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -+@%:@include <cairo-pdf.h> ++#include <cairo-pdf.h> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" @@ -39126,14 +74536,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_header_compiler=no +fi -+ + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ + +# Is the header present? +{ echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 +echo $ECHO_N "checking cairo-pdf.h presence... $ECHO_C" >&6; } @@ -39143,7 +74553,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <cairo-pdf.h> ++#include <cairo-pdf.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -39165,14 +74575,27 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + + ac_header_preproc=no +fi -+ + +-if test "x$gdktarget" = "xx11" ; then +- gdk_windowing=' +-#define GDK_WINDOWING_X11' +-elif test "x$gdktarget" = "xwin32" ; then +- gdk_windowing=' +-#define GDK_NATIVE_WINDOW_POINTER +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +-#define GDK_WINDOWING_WIN32' +-elif test "x$gdktarget" = "xquartz" ; then +- gdk_windowing=' +-#define GDK_WINDOWING_QUARTZ' +-elif test "x$gdktarget" = "xdirectfb" ; then +- gdk_windowing=' +-#define GDK_WINDOWING_DIRECTFB' +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -39196,9 +74619,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -39209,25 +74632,35 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_cairo_pdf_h=$ac_header_preproc -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 +echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } -+ -+fi + +-if test x$gdk_wchar_h = xyes; then +- gdk_wc=' +-#define GDK_HAVE_WCHAR_H 1' +-fi +-if test x$gdk_wctype_h = xyes; then +- gdk_wc="\$gdk_wc +-#define GDK_HAVE_WCTYPE_H 1" + fi +-if test x$gdk_working_wctype = xno; then +- gdk_wc="\$gdk_wc +-#define GDK_HAVE_BROKEN_WCTYPE 1" +if test $ac_cv_header_cairo_pdf_h = yes; then + : +else -+ { { echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: +*** Can't find cairo-pdf.h. You must build Cairo with the pdf +*** backend enabled." >&5 -+echo "$as_me: error: ++echo "$as_me: error: +*** Can't find cairo-pdf.h. You must build Cairo with the pdf +*** backend enabled." >&2;} + { (exit 1); exit 1; }; } -+fi -+ -+ -+ + fi + + + +if test "$os_win32" != "yes"; then + if test "${ac_cv_header_cairo_ps_h+set}" = set; then + { echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 @@ -39248,7 +74681,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default -+@%:@include <cairo-ps.h> ++#include <cairo-ps.h> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" @@ -39271,14 +74704,140 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-_ACEOF +- +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- +-# Handling of arguments. +-for ac_config_target in $ac_config_targets +-do +- case $ac_config_target in +- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; +- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; +- "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; +- "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; +- "gdk/gdkconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gdk/gdkconfig.h" ;; +- "config.h.win32") CONFIG_FILES="$CONFIG_FILES config.h.win32" ;; +- "gtk-zip.sh") CONFIG_FILES="$CONFIG_FILES gtk-zip.sh" ;; +- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; +- "gdk-pixbuf-2.0.pc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf-2.0.pc" ;; +- "gdk-2.0.pc") CONFIG_FILES="$CONFIG_FILES gdk-2.0.pc" ;; +- "gtk+-2.0.pc") CONFIG_FILES="$CONFIG_FILES gtk+-2.0.pc" ;; +- "gtk+-unix-print-2.0.pc") CONFIG_FILES="$CONFIG_FILES gtk+-unix-print-2.0.pc" ;; +- "gail.pc") CONFIG_FILES="$CONFIG_FILES gail.pc" ;; +- "gdk-pixbuf-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf-2.0-uninstalled.pc" ;; +- "gdk-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gdk-2.0-uninstalled.pc" ;; +- "gtk+-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gtk+-2.0-uninstalled.pc" ;; +- "gail-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gail-uninstalled.pc" ;; +- "m4macros/Makefile") CONFIG_FILES="$CONFIG_FILES m4macros/Makefile" ;; +- "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; +- "po-properties/Makefile.in") CONFIG_FILES="$CONFIG_FILES po-properties/Makefile.in" ;; +- "demos/Makefile") CONFIG_FILES="$CONFIG_FILES demos/Makefile" ;; +- "demos/gtk-demo/Makefile") CONFIG_FILES="$CONFIG_FILES demos/gtk-demo/Makefile" ;; +- "demos/gtk-demo/geninclude.pl") CONFIG_FILES="$CONFIG_FILES demos/gtk-demo/geninclude.pl" ;; +- "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; +- "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; +- "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; +- "docs/reference/gdk-pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk-pixbuf/Makefile" ;; +- "docs/reference/gdk-pixbuf/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk-pixbuf/version.xml" ;; +- "docs/reference/gdk/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk/Makefile" ;; +- "docs/reference/gdk/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk/version.xml" ;; +- "docs/reference/gtk/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gtk/Makefile" ;; +- "docs/reference/gtk/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gtk/version.xml" ;; +- "docs/reference/libgail-util/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/libgail-util/Makefile" ;; +- "docs/faq/Makefile") CONFIG_FILES="$CONFIG_FILES docs/faq/Makefile" ;; +- "docs/tools/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tools/Makefile" ;; +- "docs/tutorial/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tutorial/Makefile" ;; +- "gdk-pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/Makefile" ;; +- "gdk-pixbuf/gdk_pixbuf.rc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/gdk_pixbuf.rc" ;; +- "gdk-pixbuf/gdk-pixbuf-features.h") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/gdk-pixbuf-features.h" ;; +- "gdk-pixbuf/pixops/Makefile") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/pixops/Makefile" ;; +- "gdk/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/Makefile" ;; +- "gdk/x11/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/x11/Makefile" ;; +- "gdk/win32/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/win32/Makefile" ;; +- "gdk/win32/rc/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/win32/rc/Makefile" ;; +- "gdk/win32/rc/gdk.rc") CONFIG_FILES="$CONFIG_FILES gdk/win32/rc/gdk.rc" ;; +- "gdk/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/quartz/Makefile" ;; +- "gdk/directfb/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/directfb/Makefile" ;; +- "gdk/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/tests/Makefile" ;; +- "gtk/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/Makefile" ;; +- "gtk/makefile.msc") CONFIG_FILES="$CONFIG_FILES gtk/makefile.msc" ;; +- "gtk/gtkversion.h") CONFIG_FILES="$CONFIG_FILES gtk/gtkversion.h" ;; +- "gtk/gtk-win32.rc") CONFIG_FILES="$CONFIG_FILES gtk/gtk-win32.rc" ;; +- "gtk/theme-bits/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/theme-bits/Makefile" ;; +- "gtk/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/tests/Makefile" ;; +- "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; +- "modules/other/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/Makefile" ;; +- "modules/other/gail/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/Makefile" ;; +- "modules/other/gail/libgail-util/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/libgail-util/Makefile" ;; +- "modules/other/gail/tests/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/tests/Makefile" ;; +- "modules/engines/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/Makefile" ;; +- "modules/engines/pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/pixbuf/Makefile" ;; +- "modules/engines/ms-windows/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Makefile" ;; +- "modules/engines/ms-windows/Theme/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Theme/Makefile" ;; +- "modules/engines/ms-windows/Theme/gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Theme/gtk-2.0/Makefile" ;; +- "modules/input/Makefile") CONFIG_FILES="$CONFIG_FILES modules/input/Makefile" ;; +- "modules/printbackends/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/Makefile" ;; +- "modules/printbackends/cups/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/cups/Makefile" ;; +- "modules/printbackends/lpr/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/lpr/Makefile" ;; +- "modules/printbackends/file/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/file/Makefile" ;; +- "modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;; +- "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;; +- "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; +- "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; +- "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; +- +- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} +- { (exit 1); exit 1; }; };; +- esac +-done +- +- +-# If the user did not use the arguments to specify the items to instantiate, +-# then the envvar interface is used. Set only those that are not. +-# We use the long form for the default assignment because of an extremely +-# bizarre bug on SunOS 4.1.3. +-if $ac_need_defaults; then +- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files +- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers +- test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + ac_header_compiler=no -+fi -+ + fi + +-# Have a temporary directory for convenience. Make it in the build tree +-# simply because there is no reason against having it here, and in addition, +-# creating and moving files from /tmp can sometimes cause problems. +-# Hook for its removal unless debugging. +-# Note that there is a small window in which the directory will not be cleaned: +-# after its creation but before its name has been assigned to `$tmp'. +-$debug || +-{ +- tmp= +- trap 'exit_status=$? +- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +-' 0 +- trap '{ (exit 1); exit 1; }' 1 2 13 15 +-} +-# Create a (secure) tmp directory for tmp files. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -+ + +-{ +- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && +- test -n "$tmp" && test -d "$tmp" +-} || +-{ +- tmp=./conf$$-$RANDOM +- (umask 077 && mkdir "$tmp") +-} || +-{ +- $as_echo "$as_me: cannot create a temporary directory in ." >&2 +- { (exit 1); exit 1; } +-} +# Is the header present? +{ echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 +echo $ECHO_N "checking cairo-ps.h presence... $ECHO_C" >&6; } @@ -39288,7 +74847,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -+@%:@include <cairo-ps.h> ++#include <cairo-ps.h> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in @@ -39310,14 +74869,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -+ + +-# Set up the scripts for CONFIG_FILES section. +-# No need to generate them if there are no CONFIG_FILES. +-# This happens for instance with `./config.status config.h'. +-if test -n "$CONFIG_FILES"; then + ac_header_preproc=no +fi -+ + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } -+ + +-ac_cr=' ' +-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` +-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\\r' +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) @@ -39341,9 +74908,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ -+@%:@@%:@ Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B @%:@@%:@ -+@%:@@%:@ --------------------------------------------------------------------- @%:@@%:@ ++## --------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## ++## --------------------------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; @@ -39352,52 +74919,205 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } +if test "${ac_cv_header_cairo_ps_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- ac_cs_awk_cr=$ac_cr + ac_cv_header_cairo_ps_h=$ac_header_preproc -+fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 +echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } -+ + +-echo 'BEGIN {' >"$tmp/subs1.awk" && +-_ACEOF +- +- +-{ +- echo "cat >conf$$subs.awk <<_ACEOF" && +- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && +- echo "_ACEOF" +-} >conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` +-ac_delim='%!_!# ' +-for ac_last_try in false false false false false :; do +- . ./conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +fi +if test $ac_cv_header_cairo_ps_h = yes; then + : +else -+ { { echo "$as_me:$LINENO: error: -+*** Can't find cairo-ps.h. You must build Cairo with the ++ { { echo "$as_me:$LINENO: error: ++*** Can't find cairo-ps.h. You must build Cairo with the +*** postscript backend enabled." >&5 -+echo "$as_me: error: -+*** Can't find cairo-ps.h. You must build Cairo with the ++echo "$as_me: error: ++*** Can't find cairo-ps.h. You must build Cairo with the +*** postscript backend enabled." >&2;} -+ { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; } +fi -+ -+ -+fi -+ + +- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` +- if test $ac_delim_n = $ac_delim_num; then +- break +- elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_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 +-rm -f conf$$subs.sh + +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +-_ACEOF +-sed -n ' +-h +-s/^/S["/; s/!.*/"]=/ +-p +-g +-s/^[^!]*!// +-:repl +-t repl +-s/'"$ac_delim"'$// +-t delim +-:nl +-h +-s/\(.\{148\}\).*/\1/ +-t more1 +-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +-p +-n +-b repl +-:more1 +-s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +-p +-g +-s/.\{148\}// +-t nl +-:delim +-h +-s/\(.\{148\}\).*/\1/ +-t more2 +-s/["\\]/\\&/g; s/^/"/; s/$/"/ +-p +-b +-:more2 +-s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +-p +-g +-s/.\{148\}// +-t delim +-' <conf$$subs.awk | sed ' +-/^[^""]/{ +- N +- s/\n// +-} +-' >>$CONFIG_STATUS || ac_write_fail=1 +-rm -f conf$$subs.awk +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-_ACAWK +-cat >>"\$tmp/subs1.awk" <<_ACAWK && +- for (key in S) S_is_set[key] = 1 +- FS = "" ++fi + +-} +-{ +- line = $ 0 +- nfields = split(line, field, "@") +- substed = 0 +- len = length(field[1]) +- for (i = 2; i < nfields; i++) { +- key = field[i] +- keylen = length(key) +- if (S_is_set[key]) { +- value = S[key] +- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) +- len += length(value) + length(field[++i]) +- substed = 1 +- } else +- len += 1 + keylen +- } +CPPFLAGS="$gtk_save_cppflags" -+ -+ + +- print line +-} + +-_ACAWK +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then +- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +# Check whether --enable-test-print-backend was given. +if test "${enable_test_print_backend+set}" = set; then -+ enableval=$enable_test_print_backend; -+else ++ enableval=$enable_test_print_backend; + else +- cat +-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +-$as_echo "$as_me: error: could not setup config files machinery" >&2;} +- { (exit 1); exit 1; }; } +-_ACEOF + enable_test_print_backend=no +fi -+ + +-# 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 +-# (actually we leave an empty line to preserve line numbers). +-if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ +-s/:*$// +-s/^[^=]*=[ ]*$// +-}' + if test "x$enable_test_print_backend" != "xno"; then + TEST_PRINT_BACKEND_TRUE= + TEST_PRINT_BACKEND_FALSE='#' +else + TEST_PRINT_BACKEND_TRUE='#' + TEST_PRINT_BACKEND_FALSE= -+fi -+ -+ -+ + fi + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-fi # test -n "$CONFIG_FILES" + +-# Set up the scripts for CONFIG_HEADERS section. +-# No need to generate them if there are no CONFIG_HEADERS. +-# This happens for instance with `./config.status Makefile'. +-if test -n "$CONFIG_HEADERS"; then +-cat >"$tmp/defines.awk" <<\_ACAWK || +-BEGIN { +-_ACEOF + +-# Transform confdefs.h into an awk script `defines.awk', embedded as +-# here-document in config.status, that substitutes the proper values into +-# config.h.in to produce config.h. +################################################################ +# Strip -export-dynamic from the link lines of various libraries +################################################################ -+ + +-# Create a delimiter string that does not exist in confdefs.h, to ease +-# handling of long lines. +-ac_delim='%!_!# ' +-for ac_last_try in false false :; do +- ac_t=`sed -n "/$ac_delim/p" confdefs.h` +- if test -z "$ac_t"; then +- break +- elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} +- { (exit 1); exit 1; }; } +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done +# +# pkg-config --libs gmodule includes the "export_dynamic" flag, +# but this flag is only meaningful for executables. For libraries @@ -39415,32 +75135,278 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` + GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` +fi -+ -+ + +-# For the awk script, D is an array of macro values keyed by name, +-# likewise P contains macro parameters if any. Preserve backslash +-# newline sequences. + +-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +-sed -n ' +-s/.\{148\}/&'"$ac_delim"'/g +-t rset +-:rset +-s/^[ ]*#[ ]*define[ ][ ]*/ / +-t def +-d +-:def +-s/\\$// +-t bsnl +-s/["\\]/\\&/g +-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +-D["\1"]=" \3"/p +-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +-d +-:bsnl +-s/["\\]/\\&/g +-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +-D["\1"]=" \3\\\\\\n"\\/p +-t cont +-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +-t cont +-d +-:cont +-n +-s/.\{148\}/&'"$ac_delim"'/g +-t clear +-:clear +-s/\\$// +-t bsnlc +-s/["\\]/\\&/g; s/^/"/; s/$/"/p +-d +-:bsnlc +-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +-b cont +-' <confdefs.h | sed ' +-s/'"$ac_delim"'/"\\\ +-"/g' >>$CONFIG_STATUS || ac_write_fail=1 +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +- for (key in D) D_is_set[key] = 1 +- FS = "" +-} +-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { +- line = \$ 0 +- split(line, arg, " ") +- if (arg[1] == "#") { +- defundef = arg[2] +- mac1 = arg[3] +- } else { +- defundef = substr(arg[1], 2) +- mac1 = arg[2] +- } +- split(mac1, mac2, "(") #) +- macro = mac2[1] +- prefix = substr(line, 1, index(line, defundef) - 1) +- if (D_is_set[macro]) { +- # Preserve the white space surrounding the "#". +- print prefix "define", macro P[macro] D[macro] +- next +- } else { +- # Replace #undef with comments. This is necessary, for example, +- # in the case of _POSIX_SOURCE, which is predefined and required +- # on some systems where configure will not decide to define it. +- if (defundef == "undef") { +- print "/*", prefix defundef, macro, "*/" +- next +- } +- } +-} +-{ print } +-_ACAWK +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +-$as_echo "$as_me: error: could not setup config headers machinery" >&2;} +- { (exit 1); exit 1; }; } +-fi # test -n "$CONFIG_HEADERS" +################################################## +# Checks for gtk-doc and docbook-tools +################################################## -+ -+ -+ + + +-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +-shift +-for ac_tag +-do +- case $ac_tag in +- :[FHLC]) ac_mode=$ac_tag; continue;; +- esac +- case $ac_mode$ac_tag in +- :[FHL]*:*);; +- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} +- { (exit 1); exit 1; }; };; +- :[FH]-) ac_tag=-:-;; +- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; +- esac +- ac_save_IFS=$IFS +- IFS=: +- set x $ac_tag +- IFS=$ac_save_IFS +- shift +- ac_file=$1 +- shift + +- case $ac_mode in +- :L) ac_source=$1;; +- :[FH]) +- ac_file_inputs= +- for ac_f +- do +- case $ac_f in +- -) ac_f="$tmp/stdin";; +- *) # Look for the file first in the build tree, then in the source tree +- # (if the path is not absolute). The absolute path cannot be DOS-style, +- # because $ac_f cannot contain `:'. +- test -f "$ac_f" || +- case $ac_f in +- [\\/$]*) false;; +- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; +- esac || +- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} +- { (exit 1); exit 1; }; };; +- esac +- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- ac_file_inputs="$ac_file_inputs '$ac_f'" +- done +# Check whether --with-html-dir was given. +if test "${with_html_dir+set}" = set; then -+ withval=$with_html_dir; ++ withval=$with_html_dir; +else + with_html_dir='${datadir}/gtk-doc/html' +fi -+ + +- # Let's still pretend it is `configure' which instantiates (i.e., don't +- # use $as_me), people would be surprised to read: +- # /* config.h. Generated by config.status. */ +- configure_input='Generated from '` +- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' +- `' by configure.' +- if test x"$ac_file" != x-; then +- configure_input="$ac_file. $configure_input" +- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 +-$as_echo "$as_me: creating $ac_file" >&6;} +- fi +- # Neutralize special characters interpreted by sed in replacement strings. +- case $configure_input in #( +- *\&* | *\|* | *\\* ) +- ac_sed_conf_input=`$as_echo "$configure_input" | +- sed 's/[\\\\&|]/\\\\&/g'`;; #( +- *) ac_sed_conf_input=$configure_input;; +- esac + HTML_DIR="$with_html_dir" -+ -+ + +- case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ;; +- esac +- ;; +- esac + +- ac_dir=`$as_dirname -- "$ac_file" || +-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X\(//\)[^/]' \| \ +- X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- { as_dir="$ac_dir" +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; +- esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } +- ac_builddir=. + # Check whether --enable-gtk-doc was given. +if test "${enable_gtk_doc+set}" = set; then -+ enableval=$enable_gtk_doc; ++ enableval=$enable_gtk_doc; +else + enable_gtk_doc=no +fi -+ -+ + +-case "$ac_dir" in +-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +-*) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` +- # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` +- case $ac_top_builddir_sub in +- "") ac_top_builddir_sub=. ac_top_build_prefix= ;; +- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +- esac ;; +-esac +-ac_abs_top_builddir=$ac_pwd +-ac_abs_builddir=$ac_pwd$ac_dir_suffix +-# for backward compatibility: +-ac_top_builddir=$ac_top_build_prefix + +-case $srcdir in +- .) # We are building in place. +- ac_srcdir=. +- ac_top_srcdir=$ac_top_builddir_sub +- ac_abs_top_srcdir=$ac_pwd ;; +- [\\/]* | ?:[\\/]* ) # Absolute name. +- ac_srcdir=$srcdir$ac_dir_suffix; +- ac_top_srcdir=$srcdir +- ac_abs_top_srcdir=$srcdir ;; +- *) # Relative name. +- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix +- ac_top_srcdir=$ac_top_build_prefix$srcdir +- ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + if test x$enable_gtk_doc = xyes; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 @@ -39491,7 +75457,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +IFS=$as_save_IFS + + ;; -+esac + esac +-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +fi +GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then @@ -39501,12 +75468,26 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ -+ + + +- case $ac_mode in +- :F) +- # +- # CONFIG_FILE +- # + test -n "$GTKDOC_CHECK" && break +done -+ -+ + +- case $INSTALL in +- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; +- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; +- esac +-_ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-# If the template does not know about datarootdir, expand it. +-# FIXME: This hack should be removed a few years after 2.60. +-ac_datarootdir_hack=; ac_datarootdir_seen= + if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' @@ -39514,7 +75495,32 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ENABLE_GTK_DOC_TRUE='#' + ENABLE_GTK_DOC_FALSE= +fi -+ + +-ac_sed_dataroot=' +-/datarootdir/ { +- p +- q +-} +-/@datadir@/p +-/@docdir@/p +-/@infodir@/p +-/@localedir@/p +-/@mandir@/p +-' +-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +-*datarootdir*) ac_datarootdir_seen=yes;; +-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +-_ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +- ac_datarootdir_hack=' +- s&@datadir@&$datadir&g +- s&@docdir@&$docdir&g +- s&@infodir@&$infodir&g +- s&@localedir@&$localedir&g +- s&@mandir@&$mandir&g +- s&\\\${datarootdir}&$datarootdir&g' ;; + if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' @@ -39609,7 +75615,8 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +IFS=$as_save_IFS + + ;; -+esac + esac +-_ACEOF +fi +XSLTPROC=$ac_cv_path_XSLTPROC +if test -n "$XSLTPROC"; then @@ -39619,31 +75626,101 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ -+ + +-# Neutralize VPATH when `$srcdir' = `.'. +-# Shell code in configure.ac might set extrasub. +-# FIXME: do we really want to maintain this feature? +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-ac_sed_extra="$ac_vpsub +-$extrasub +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-:t +-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s|@configure_input@|$ac_sed_conf_input|;t t +-s&@top_builddir@&$ac_top_builddir_sub&;t t +-s&@top_build_prefix@&$ac_top_build_prefix&;t t +-s&@srcdir@&$ac_srcdir&;t t +-s&@abs_srcdir@&$ac_abs_srcdir&;t t +-s&@top_srcdir@&$ac_top_srcdir&;t t +-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +-s&@builddir@&$ac_builddir&;t t +-s&@abs_builddir@&$ac_abs_builddir&;t t +-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +-s&@INSTALL@&$ac_INSTALL&;t t +-$ac_datarootdir_hack +-" +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } + +-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && +- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && +- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 +-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&2;} + if test -z "$XSLTPROC"; then + enable_man=no + fi + +- rm -f "$tmp/stdin" +- case $ac_file in +- -) cat "$tmp/out" && rm -f "$tmp/out";; +- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; +- esac \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } +- ;; +- :H) +- # +- # CONFIG_HEADER +- # +- if test x"$ac_file" != x-; then +- { +- $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" +- } >"$tmp/config.h" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } +- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then +- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +-$as_echo "$as_me: $ac_file is unchanged" >&6;} +- else +- rm -f "$ac_file" +- mv "$tmp/config.h" "$ac_file" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } +- fi + -+ + # check for the presence of the XML catalog -+ ++ +# Check whether --with-xml-catalog was given. +if test "${with_xml_catalog+set}" = set; then -+ withval=$with_xml_catalog; ++ withval=$with_xml_catalog; +else + with_xml_catalog=/etc/xml/catalog +fi + + jh_found_xmlcatalog=true + XML_CATALOG_FILE="$with_xml_catalog" -+ ++ + { echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 +echo $ECHO_N "checking for XML catalog ($XML_CATALOG_FILE)... $ECHO_C" >&6; } + if test -f "$XML_CATALOG_FILE"; then + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } -+ else + else +- $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +-$as_echo "$as_me: error: could not create -" >&2;} +- { (exit 1); exit 1; }; } + jh_found_xmlcatalog=false + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } @@ -39672,11 +75749,48 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + 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 -+ fi -+done + fi +-# Compute "$ac_file"'s index in $config_headers. +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- "$ac_file" | "$ac_file":* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac + done +-echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || +-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$ac_file" : 'X\(//\)[^/]' \| \ +- X"$ac_file" : 'X\(//\)$' \| \ +- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$ac_file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'`/stamp-h$_am_stamp_count +- ;; +done +IFS=$as_save_IFS -+ + +- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 +-$as_echo "$as_me: executing $ac_file commands" >&6;} +- ;; +- esac + test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" + ;; +esac @@ -39689,11 +75803,104 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -+ -+ + + +- case $ac_file$ac_mode in +- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`$as_dirname -- "$mf" || +-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$mf" : 'X\(//\)[^/]' \| \ +- X"$mf" : 'X\(//\)$' \| \ +- X"$mf" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$mf" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- else +- continue + if test "x$XMLCATALOG" = xno; then + jh_found_xmlcatalog=false -+ fi + fi +- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue +- # Extract the definition of DEP_FILES from the Makefile without +- # running `make'. +- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` +- test -z "$DEPDIR" && continue +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n -e '/^U = / s///p' < "$mf"` +- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" +- # We invoke sed twice because it is the simplest approach to +- # changing $(DEPDIR) to its actual value in the expansion. +- for file in `sed -n -e ' +- /^DEP_FILES = .*\\\\$/ { +- s/^DEP_FILES = // +- :loop +- s/\\\\$// +- p +- n +- /\\\\$/ b loop +- p +- } +- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`$as_dirname -- "$file" || +-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$file" : 'X\(//\)[^/]' \| \ +- X"$file" : 'X\(//\)$' \| \ +- X"$file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$file" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- { as_dir=$dirpart/$fdir +- case $as_dir in #( +- -*) as_dir=./$as_dir;; +- esac +- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { +- as_dirs= +- while :; do +- case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( +- *) as_qdir=$as_dir;; + + if $jh_found_xmlcatalog; then + : @@ -39718,7 +75925,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + enable_man=no + fi + -+ ++ + { echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 +echo $ECHO_N "checking for DocBook XSL Stylesheets in XML catalog... $ECHO_C" >&6; } + if $jh_found_xmlcatalog && \ @@ -39786,13 +75993,45 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac + esac +- as_dirs="'$as_qdir' $as_dirs" +- as_dir=`$as_dirname -- "$as_dir" || +-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_dir" : 'X\(//\)[^/]' \| \ +- X"$as_dir" : 'X\(//\)$' \| \ +- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | +- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)[^/].*/{ +- s//\1/ +- q +- } +- /^X\(\/\/\)$/{ +- s//\1/ +- q +- } +- /^X\(\/\).*/{ +- s//\1/ +- q +- } +- s/.*/./; q'` +- test -d "$as_dir" && break +- done +- test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} +- { (exit 1); exit 1; }; }; } +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac -+ done + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( @@ -39839,7 +76078,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + +ac_libobjs= +ac_ltlibobjs= -+for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue ++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` @@ -39847,12 +76086,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -+done -+LIB@&t@OBJS=$ac_libobjs -+ + done +- ;; +- "libtool":C) ++LIBOBJS=$ac_libobjs + +- # 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 +- setopt NO_GLOB_SUBST +- fi +LTLIBOBJS=$ac_ltlibobjs -+ -+ + +- cfgfile="${ofile}T" +- trap "$RM \"$cfgfile\"; exit 1" 1 2 15 +- $RM "$cfgfile" + +- cat <<_LT_EOF >> "$cfgfile" +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 @@ -40378,23 +76628,262 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF -+#! $SHELL + #! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. -+ + +-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +-# NOTE: Changes made to this file will be lost: look at ltmain.sh. +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008 Free Software Foundation, Inc. +-# Written by Gordon Matzigkeit, 1996 +-# +-# This file is part of GNU Libtool. +-# +-# GNU Libtool is free software; you can redistribute it and/or +-# modify it under the terms of the GNU General Public License as +-# published by the Free Software Foundation; either version 2 of +-# the License, or (at your option) any later version. +-# +-# As a special exception to the GNU General Public License, +-# if you distribute this file as part of a program or library that +-# is built using GNU Libtool, you may include this file under the +-# same distribution terms that you use for the rest of that program. +-# +-# GNU Libtool 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 General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with GNU Libtool; see the file COPYING. If not, a copy +-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +-# obtained by writing to the Free Software Foundation, Inc., +-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +- +- +-# The names of the tagged configurations supported by this script. +-available_tags="CXX " +- +-# ### BEGIN LIBTOOL CONFIG +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Assembler program. +-AS=$AS +- +-# DLL creation program. +-DLLTOOL=$DLLTOOL +- +-# Object dumper program. +-OBJDUMP=$OBJDUMP +- +-# Which release of libtool.m4 was used? +-macro_version=$macro_version +-macro_revision=$macro_revision +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# What type of objects to build. +-pic_mode=$pic_mode +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os +- +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os +- +-# A sed program that does not truncate output. +-SED=$lt_SED +- +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="\$SED -e 1s/^X//" +- +-# A grep program that handles long lines. +-GREP=$lt_GREP +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# A literal string matcher. +-FGREP=$lt_FGREP +- +-# A BSD- or MS-compatible name lister. +-NM=$lt_NM +- +-# Whether we need soft or hard links. +-LN_S=$lt_LN_S +- +-# What is the maximum length of a command? +-max_cmd_len=$max_cmd_len +- +-# Object file suffix (normally "o"). +-objext=$ac_objext +- +-# Executable file suffix (normally ""). +-exeext=$exeext +- +-# whether the shell understands "unset". +-lt_unset=$lt_unset +- +-# turn spaces into newlines. +-SP2NL=$lt_lt_SP2NL +- +-# turn newlines into spaces. +-NL2SP=$lt_lt_NL2SP +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == "file_magic". +-file_magic_cmd=$lt_file_magic_cmd +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A symbol stripping program. +-STRIP=$lt_STRIP +- +-# Commands used to install an old-style archive. +-RANLIB=$lt_RANLIB +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# A C compiler. +-LTCC=$lt_CC +- +-# LTCC compiler flags. +-LTCFLAGS=$lt_CFLAGS +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration. +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair. +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# Transform the output of nm in a C name address pair when lib prefix is needed. +-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# An echo program that does not interpret backslashes. +-ECHO=$lt_ECHO +- +-# Used to examine libraries when file_magic_cmd begins with "file". +-MAGIC_CMD=$MAGIC_CMD +- +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks +- +-# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +-DSYMUTIL=$lt_DSYMUTIL +- +-# Tool to change global to local symbols on Mac OS X. +-NMEDIT=$lt_NMEDIT +- +-# Tool to manipulate fat objects and archives on Mac OS X. +-LIPO=$lt_LIPO +- +-# ldd/readelf like tool for Mach-O binaries on Mac OS X. +-OTOOL=$lt_OTOOL +- +-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +-OTOOL64=$lt_OTOOL64 +- +-# Old archive suffix (normally "a"). +-libext=$libext +- +-# Shared library suffix (normally ".so"). +-shrext_cmds=$lt_shrext_cmds +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at link time. +-variables_saved_for_relink=$lt_variables_saved_for_relink +- +-# Do we need the "lib" prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Library versioning type. +-version_type=$version_type +- +-# Shared library runtime path variable. +-runpath_var=$runpath_var +- +-# Shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Command to use after installation of a shared archive. +-postinstall_cmds=$lt_postinstall_cmds +- +-# Command to use after uninstallation of a shared archive. +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# As "finish_cmds", except a single script fragment to be evaled but +-# not shown. +-finish_eval=$lt_finish_eval +debug=false +ac_cs_recheck=false +ac_cs_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_ACEOF -+ + +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## -+ + +-# Compile-time system search path for libraries. +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -40408,12 +76897,23 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac -+ + +-# Run-time system search path for libraries. +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +fi -+ -+ -+ -+ + +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen + +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self + +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static + +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -40421,7 +76921,7 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits -+ + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh @@ -40434,15 +76934,21 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + fi + rm -f conf$$.sh +fi -+ + +-# The linker used to build libraries. +-LD=$lt_LD +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi -+ -+ + +-# Commands used to build an old-style archive. +-old_archive_cmds=$lt_old_archive_cmds + +-# A language specific compiler. +-CC=$lt_compiler +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. @@ -40451,7 +76957,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +as_nl=' +' +IFS=" "" $as_nl" -+ + +-# Is the compiler the GNU compiler? +-with_gcc=$GCC +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; @@ -40463,7 +76971,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS -+ + +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' @@ -40475,7 +76985,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi -+ + +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var @@ -40483,7 +76995,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +PS1='$ ' +PS2='> ' +PS4='+ ' -+ + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ @@ -40496,7 +77010,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done -+ + +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then @@ -40504,14 +77020,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +else + as_expr=false +fi -+ + +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi -+ -+ + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc + +-# Whether or not to disallow shared libs when runtime libs are static. +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ @@ -40531,17 +77053,27 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + q + } + s/.*/./; q'` -+ + +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec +# CDPATH. +$as_unset CDPATH -+ -+ -+ + +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec + +-# Whether the compiler copes with passing no objects directly. +-compiler_needs_object=$lt_compiler_needs_object + +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ + +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' @@ -40570,7 +77102,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } -+ + +-# Commands used to build a shared archive. +-archive_cmds=$lt_archive_cmds +-archive_expsym_cmds=$lt_archive_expsym_cmds + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). @@ -40578,14 +77113,22 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # Exit status is that of the last command. + exit +} -+ -+ + +-# Commands used to build a loadable module if different from building +-# a shared archive. +-module_cmds=$lt_module_cmds +-module_expsym_cmds=$lt_module_expsym_cmds + +-# Whether we are building with GNU ld or not. +-with_gnu_ld=$lt_with_gnu_ld +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -+ + +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) @@ -40596,14 +77139,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +*) + ECHO_N='-n';; +esac -+ + +-# Flag that enforces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi -+ + +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file @@ -40627,14 +77175,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -+ + +-# If ld is used when linking, flag to hardcode \$libdir into a binary +-# during linking. This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi -+ + +-# Whether we need a single "-rpath" flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else @@ -40657,49 +77210,84 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ' +fi +as_executable_p=$as_test_x -+ + +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary. +-hardcode_direct=$hardcode_direct +# 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'" -+ + +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary and the resulting library dependency is +-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +-# library is relocated. +-hardcode_direct_absolute=$hardcode_direct_absolute +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ + +-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +-# into the resulting binary. +-hardcode_minus_L=$hardcode_minus_L + +-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +-# into the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var +exec 6>&1 -+ + +-# Set to "yes" if building a shared library automatically hardcodes DIR +-# into the library and all subsequent libraries and executables linked +-# against it. +-hardcode_automatic=$hardcode_automatic +# Save the log message, to keep $[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" -+This file was extended by gtk+ $as_me 2.14.4, which was ++This file was extended by gtk+ $as_me 2.14.5, which was +generated by GNU Autoconf 2.61. Invocation command line was -+ + +-# Set to yes if linker adds runtime paths of dependent libraries +-# to runtime path list. +-inherit_rpath=$inherit_rpath + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ -+ + +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" -+ + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +_ACEOF -+ + +-# Set to "yes" if exported symbols are required. +-always_export_symbols=$always_export_symbols +cat >>$CONFIG_STATUS <<_ACEOF +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -+ + +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds +_ACEOF -+ + +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms +cat >>$CONFIG_STATUS <<\_ACEOF +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. -+ + +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms +Usage: $0 [OPTIONS] [FILE]... -+ + +-# Commands necessary for linking programs (against libraries) with templates. +-prelink_cmds=$lt_prelink_cmds + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages @@ -40709,35 +77297,63 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE -+ + +-# Specify filename containing input files. +-file_list_spec=$lt_file_list_spec +Configuration files: +$config_files -+ + +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action +Configuration headers: +$config_headers -+ + +-# The directories searched by this compiler when creating a shared library. +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs +Configuration commands: +$config_commands -+ + +-# Dependencies to place before and after the objects being linked to +-# create a shared library. +-predep_objects=$lt_predep_objects +-postdep_objects=$lt_postdep_objects +-predeps=$lt_predeps +-postdeps=$lt_postdeps +Report bugs to <bug-autoconf@gnu.org>." -+ + +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +ac_cs_version="\\ -+gtk+ config.status 2.14.4 ++gtk+ config.status 2.14.5 +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+ + +-# ### END LIBTOOL CONFIG +Copyright (C) 2006 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." -+ + +-_LT_EOF +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +_ACEOF -+ + +- case $host_os in +- aix3*) +- cat <<\_LT_EOF >> "$cfgfile" +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-_LT_EOF +cat >>$CONFIG_STATUS <<\_ACEOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. @@ -40754,9 +77370,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_option=$1 + ac_optarg=$2 + ac_shift=shift -+ ;; -+ esac -+ + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) @@ -40783,26 +77399,51 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; -+ + +-ltmain="$ac_aux_dir/ltmain.sh" + # This is an error. + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; -+ + + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; -+ + +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) + esac + shift +done -+ + +- case $xsi_shell in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +ac_configure_extra_args= -+ + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +-} +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi -+ + +-# func_basename file +-func_basename () +-{ +- func_basename_result="${1##*/}" +-} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then @@ -40811,34 +77452,90 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi -+ + +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log -+{ + { +- case ${1} in +- */*) func_dirname_result="${1%/*}${2}" ;; +- * ) func_dirname_result="${3}" ;; +- esac +- func_basename_result="${1##*/}" +-} + echo -+ sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX -+@%:@@%:@ Running $as_me. @%:@@%:@ ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 -+ + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-func_stripname () +-{ +- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are +- # positional parameters, so assign one to ordinary parameter first. +- func_stripname_result=${3} +- func_stripname_result=${func_stripname_result#"${1}"} +- func_stripname_result=${func_stripname_result%"${2}"} +-} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -+ -+ -+ + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=${1%%=*} +- func_opt_split_arg=${1#*=} +-} + +-# func_lo2o object +-func_lo2o () +-{ +- case ${1} in +- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; +- *) func_lo2o_result=${1} ;; +- esac +-} + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=${1%.*}.lo +-} +if test "x$gdktarget" = "xx11" ; then + gdk_windowing=' +#define GDK_WINDOWING_X11' +elif test "x$gdktarget" = "xwin32" ; then + gdk_windowing=' +#define GDK_NATIVE_WINDOW_POINTER -+ + +-# func_arith arithmetic-term... +-func_arith () +-{ +- func_arith_result=$(( $* )) +-} +#define GDK_WINDOWING_WIN32' +elif test "x$gdktarget" = "xquartz" ; then + gdk_windowing=' @@ -40847,7 +77544,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + gdk_windowing=' +#define GDK_WINDOWING_DIRECTFB' +fi -+ + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () +-{ +- func_len_result=${#1} +-} +if test x$gdk_wchar_h = xyes; then + gdk_wc=' +#define GDK_HAVE_WCHAR_H 1' @@ -40860,14 +77563,54 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + gdk_wc="\$gdk_wc +#define GDK_HAVE_BROKEN_WCTYPE 1" +fi -+ -+ -+ -+ + +-_LT_EOF +- ;; +- *) # Bourne compatible functions. +- cat << \_LT_EOF >> "$cfgfile" + +-# func_dirname file append nondir_replacement +-# Compute the dirname of FILE. If nonempty, add APPEND to the result, +-# otherwise set result to NONDIR_REPLACEMENT. +-func_dirname () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +-} + +-# func_basename file +-func_basename () +-{ +- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +-} + +_ACEOF -+ + +-# func_stripname prefix suffix name +-# strip PREFIX and SUFFIX off of NAME. +-# PREFIX and SUFFIX must not contain globbing or regex special +-# characters, hashes, percent signs, but SUFFIX may contain a leading +-# dot (in which case that matches only a dot). +-# func_strip_suffix prefix name +-func_stripname () +-{ +- case ${2} in +- .*) func_stripname_result=`$ECHO "X${3}" \ +- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; +- *) func_stripname_result=`$ECHO "X${3}" \ +- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; +- esac +-} +cat >>$CONFIG_STATUS <<\_ACEOF -+ + +-# sed scripts: +-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' +-my_sed_long_arg='1s/^-[^=]*=//' +# Handling of arguments. +for ac_config_target in $ac_config_targets +do @@ -40946,14 +77689,30 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; + "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; + "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; -+ + +-# func_opt_split +-func_opt_split () +-{ +- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` +- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +-} + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +done -+ -+ + +-# func_lo2o object +-func_lo2o () +-{ +- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +-} + +-# func_xform libobj-or-source +-func_xform () +-{ +- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` +-} +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely @@ -40963,7 +77722,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi -+ + +-# func_arith arithmetic-term... +-func_arith () +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. @@ -40971,40 +77732,85 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || -+{ + { +- func_arith_result=`expr "$@"` + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 -+} + } +# Create a (secure) tmp directory for tmp files. -+ -+{ + +-# func_len string +-# STRING may not start with a hyphen. +-func_len () + { +- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +-} +- +-_LT_EOF +-esac +- +-case $lt_shell_append in +- yes) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || -+{ + { +- eval "$1+=\$2" +-} +-_LT_EOF +- ;; +- *) +- cat << \_LT_EOF >> "$cfgfile" +- +-# func_append var value +-# Append VALUE to the end of shell variable VAR. +-func_append () + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || -+{ + { +- eval "$1=\$$1\$2" + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } -+} -+ + } + +-_LT_EOF +- ;; +- esac +- +- +- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +# +# Set up the sed scripts for CONFIG_FILES section. +# -+ + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "$CONFIG_FILES"; then -+ + +- cat <<_LT_EOF >> "$ofile" +_ACEOF -+ -+ -+ + +-# ### BEGIN LIBTOOL TAG CONFIG: CXX + +-# The linker used to build libraries. +-LD=$lt_LD_CXX + +-# Commands used to build an old-style archive. +-old_archive_cmds=$lt_old_archive_cmds_CXX +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF @@ -41106,7 +77912,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +_ACEOF -+ + +-# A language specific compiler. +-CC=$lt_compiler_CXX + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then @@ -41117,13 +77925,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done -+ + +-# Is the compiler the GNU compiler? +-with_gcc=$GCC_CXX +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 -+ + +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b @@ -41141,8 +77953,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF -+ -+ + +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_CXX + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_CXX +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF @@ -41244,7 +78060,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +BUILD_DYNAMIC_MODULES_TRUE!$BUILD_DYNAMIC_MODULES_TRUE$ac_delim +BUILD_DYNAMIC_MODULES_FALSE!$BUILD_DYNAMIC_MODULES_FALSE$ac_delim +_ACEOF -+ + +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_CXX + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then @@ -41255,13 +78073,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done -+ + +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX +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 -+ + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_CXX +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b @@ -41279,8 +78101,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF -+ -+ + +-# Whether or not to disallow shared libs when runtime libs are static. +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX + +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF @@ -41382,7 +78208,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +USE_WIN32_FALSE!$USE_WIN32_FALSE$ac_delim +USE_QUARTZ_TRUE!$USE_QUARTZ_TRUE$ac_delim +_ACEOF -+ + +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then @@ -41393,13 +78221,17 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done -+ + +-# Whether the compiler copes with passing no objects directly. +-compiler_needs_object=$lt_compiler_needs_object_CXX +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 -+ + +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b @@ -41417,8 +78249,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +cat >>$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF -+ -+ + +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX + +-# Commands used to build a shared archive. +-archive_cmds=$lt_archive_cmds_CXX +-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF @@ -41477,10 +78314,14 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +XMLCATALOG!$XMLCATALOG$ac_delim +ENABLE_MAN_TRUE!$ENABLE_MAN_TRUE$ac_delim +ENABLE_MAN_FALSE!$ENABLE_MAN_FALSE$ac_delim -+LIB@&t@OBJS!$LIB@&t@OBJS$ac_delim ++LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF -+ + +-# Commands used to build a loadable module if different from building +-# a shared archive. +-module_cmds=$lt_module_cmds_CXX +-module_expsym_cmds=$lt_module_expsym_cmds_CXX + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then + break + elif $ac_last_try; then @@ -41491,7 +78332,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done -+ + +-# Whether we are building with GNU ld or not. +-with_gnu_ld=$lt_with_gnu_ld_CXX +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` @@ -41517,8 +78360,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF -+ -+ + +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_CXX + +-# Flag that enforces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_CXX +# 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 @@ -41533,11 +78380,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +s/^[^=]*=[ ]*$// +}' +fi -+ + +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX +cat >>$CONFIG_STATUS <<\_ACEOF +fi # test -n "$CONFIG_FILES" -+ -+ + +-# If ld is used when linking, flag to hardcode \$libdir into a binary +-# during linking. This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX + +-# Whether we need a single "-rpath" flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +do + case $ac_tag in @@ -41558,7 +78413,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + shift + ac_file=$1 + shift -+ + +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary. +-hardcode_direct=$hardcode_direct_CXX + case $ac_mode in + :L) ac_source=$1;; + :[FH]) @@ -41581,7 +78439,12 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done -+ + +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary and the resulting library dependency is +-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +-# library is relocated. +-hardcode_direct_absolute=$hardcode_direct_absolute_CXX + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ @@ -41592,13 +78455,19 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi -+ + +-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +-# into the resulting binary. +-hardcode_minus_L=$hardcode_minus_L_CXX + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac -+ + +-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +-# into the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ @@ -41664,7 +78533,11 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. -+ + +-# Set to "yes" if building a shared library automatically hardcodes DIR +-# into the library and all subsequent libraries and executables linked +-# against it. +-hardcode_automatic=$hardcode_automatic_CXX +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) @@ -41680,7 +78553,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix -+ + +-# Set to yes if linker adds runtime paths of dependent libraries +-# to runtime path list. +-inherit_rpath=$inherit_rpath_CXX +case $srcdir in + .) # We are building in place. + ac_srcdir=. @@ -41696,14 +78572,20 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+ -+ + +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_CXX + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path_CXX + case $ac_mode in + :F) + # + # CONFIG_FILE + # -+ + +-# Set to "yes" if exported symbols are required. +-always_export_symbols=$always_export_symbols_CXX + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; @@ -41714,12 +78596,16 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF -+ + +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_CXX +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= -+ + +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_CXX +case `sed -n '/datarootdir/ { + p + q @@ -41745,7 +78631,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF -+ + +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_CXX +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? @@ -41769,7 +78657,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +s&@MKDIR_P@&$ac_MKDIR_P&;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 -f "$tmp/subs-4.sed" >$tmp/out -+ + +-# Commands necessary for linking programs (against libraries) with templates. +-prelink_cmds=$lt_prelink_cmds_CXX +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && @@ -41777,7 +78667,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} -+ + +-# Specify filename containing input files. +-file_list_spec=$lt_file_list_spec_CXX + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out"; rm -f "$tmp/out";; @@ -41789,7 +78681,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + # CONFIG_HEADER + # +_ACEOF -+ + +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_CXX +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail @@ -41809,7 +78703,9 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' -+ + +-# The directories searched by this compiler when creating a shared library. +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX +uniq confdefs.h | + sed -n ' + t rset @@ -41863,7 +78759,13 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + mv conftest.tail conftest.defines +done +rm -f conftest.defines conftest.tail -+ + +-# Dependencies to place before and after the objects being linked to +-# create a shared library. +-predep_objects=$lt_predep_objects_CXX +-postdep_objects=$lt_postdep_objects_CXX +-predeps=$lt_predeps_CXX +-postdeps=$lt_postdeps_CXX +echo "ac_result=$ac_in" >>$CONFIG_STATUS +cat >>$CONFIG_STATUS <<\_ACEOF + if test x"$ac_file" != x-; then @@ -41916,13 +78818,18 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; -+ + +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac -+ -+ + +-# ### END LIBTOOL TAG CONFIG: CXX +-_LT_EOF + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. @@ -42047,26119 +78954,10 @@ Index: gtk+-2.14.4/autom4te.cache/output.0 + echo '# dummy' > "$dirpart/$file" + done +done -+ ;; -+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) -+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -+ esac ;; -+ "default-2":C) case "$CONFIG_FILES" in *po-properties/Makefile.in*) -+ sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile -+ esac ;; -+ "gdk/gdkconfig.h":C) -+ outfile=gdkconfig.h-tmp -+ cat > $outfile <<\_______EOF -+/* gdkconfig.h -+ * -+ * This is a generated file. Please modify `configure.in' -+ */ -+ -+#ifndef GDKCONFIG_H -+#define GDKCONFIG_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+#ifndef GSEAL -+/* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */ -+# ifdef GSEAL_ENABLE -+# define GSEAL(ident) _g_sealed__ ## ident -+# else -+# define GSEAL(ident) ident -+# endif -+#endif /* !GSEAL */ -+ -+_______EOF -+ -+ cat >>$outfile <<_______EOF -+$gdk_windowing -+$gdk_wc -+_______EOF -+ -+ cat >>$outfile <<_______EOF -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+#endif /* GDKCONFIG_H */ -+_______EOF -+ -+ -+ if cmp -s $outfile gdk/gdkconfig.h; then -+ { echo "$as_me:$LINENO: gdk/gdkconfig.h is unchanged" >&5 -+echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} -+ rm -f $outfile -+ else -+ mv $outfile gdk/gdkconfig.h -+ fi -+ ;; -+ -+ esac -+done # for ac_tag -+ -+ -+{ (exit 0); exit 0; } -+_ACEOF -+chmod +x $CONFIG_STATUS -+ac_clean_files=$ac_clean_files_save -+ -+ -+# configure is writing to config.log, and then calls config.status. -+# config.status does its own redirection, appending to config.log. -+# Unfortunately, on DOS this fails, as config.log is still kept open -+# by configure, so config.status won't be able to write to it; its -+# output is simply discarded. So we exec the FD to /dev/null, -+# effectively closing config.log, so it can be properly (re)opened and -+# appended to by config.status. When coming back to configure, we -+# need to make the FD available again. -+if test "$no_create" != yes; then -+ ac_cs_success=: -+ ac_config_status_args= -+ test "$silent" = yes && -+ ac_config_status_args="$ac_config_status_args --quiet" -+ exec 5>/dev/null -+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false -+ exec 5>>config.log -+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which -+ # would make configure fail if this is the last instruction. -+ $ac_cs_success || { (exit 1); exit 1; } -+fi -+ -+ -+echo "configuration: -+ target: $gdktarget" -Index: gtk+-2.14.4/autom4te.cache/requests -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+-2.14.4/autom4te.cache/requests 2008-11-11 18:56:18.936634196 +0100 -@@ -0,0 +1,239 @@ -+# This file was generated by Autom4te Mon Aug 11 20:59:21 PDT 2008. -+# It contains the lists of macros which have been traced. -+# It can be safely removed. -+ -+@request = ( -+ bless( [ -+ '0', -+ 1, -+ [ -+ '/usr/share/autoconf' -+ ], -+ [ -+ '/usr/share/autoconf/autoconf/autoconf.m4f', -+ 'aclocal.m4', -+ 'configure.in' -+ ], -+ { -+ '_LT_AC_TAGCONFIG' => 1, -+ 'AM_PROG_F77_C_O' => 1, -+ 'AC_INIT' => 1, -+ 'm4_pattern_forbid' => 1, -+ 'AC_CANONICAL_TARGET' => 1, -+ 'AC_SUBST' => 1, -+ 'AC_CONFIG_LIBOBJ_DIR' => 1, -+ 'AC_FC_SRCEXT' => 1, -+ 'AC_CANONICAL_HOST' => 1, -+ 'AC_PROG_LIBTOOL' => 1, -+ 'AM_INIT_AUTOMAKE' => 1, -+ 'AC_CONFIG_SUBDIRS' => 1, -+ 'AM_AUTOMAKE_VERSION' => 1, -+ 'LT_CONFIG_LTDL_DIR' => 1, -+ 'AC_REQUIRE_AUX_FILE' => 1, -+ 'AC_CONFIG_LINKS' => 1, -+ 'm4_sinclude' => 1, -+ 'LT_SUPPORTED_TAG' => 1, -+ 'AM_MAINTAINER_MODE' => 1, -+ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, -+ '_m4_warn' => 1, -+ 'AM_PROG_CXX_C_O' => 1, -+ 'AM_ENABLE_MULTILIB' => 1, -+ 'AC_CONFIG_FILES' => 1, -+ 'include' => 1, -+ 'LT_INIT' => 1, -+ 'AM_GNU_GETTEXT' => 1, -+ 'AC_LIBSOURCE' => 1, -+ 'AM_PROG_FC_C_O' => 1, -+ 'AC_CANONICAL_BUILD' => 1, -+ 'AC_FC_FREEFORM' => 1, -+ 'AH_OUTPUT' => 1, -+ '_AM_SUBST_NOTMAKE' => 1, -+ 'AC_CONFIG_AUX_DIR' => 1, -+ 'sinclude' => 1, -+ 'm4_pattern_allow' => 1, -+ 'AM_PROG_CC_C_O' => 1, -+ 'AC_CANONICAL_SYSTEM' => 1, -+ 'AM_CONDITIONAL' => 1, -+ 'AC_CONFIG_HEADERS' => 1, -+ 'AC_DEFINE_TRACE_LITERAL' => 1, -+ 'm4_include' => 1, -+ 'AC_SUBST_TRACE' => 1 -+ } -+ ], 'Autom4te::Request' ), -+ bless( [ -+ '1', -+ 1, -+ [ -+ '/usr/share/autoconf' -+ ], -+ [ -+ '/usr/share/autoconf/autoconf/autoconf.m4f', -+ '/usr/share/aclocal/glib-2.0.m4', -+ '/usr/share/aclocal/glib-gettext.m4', -+ '/usr/share/aclocal/gtk-doc.m4', -+ '/usr/share/aclocal/libtool.m4', -+ '/usr/share/aclocal/pkg.m4', -+ '/usr/share/aclocal-1.10/amversion.m4', -+ '/usr/share/aclocal-1.10/as.m4', -+ '/usr/share/aclocal-1.10/auxdir.m4', -+ '/usr/share/aclocal-1.10/ccstdc.m4', -+ '/usr/share/aclocal-1.10/cond.m4', -+ '/usr/share/aclocal-1.10/depend.m4', -+ '/usr/share/aclocal-1.10/depout.m4', -+ '/usr/share/aclocal-1.10/header.m4', -+ '/usr/share/aclocal-1.10/init.m4', -+ '/usr/share/aclocal-1.10/install-sh.m4', -+ '/usr/share/aclocal-1.10/lead-dot.m4', -+ '/usr/share/aclocal-1.10/maintainer.m4', -+ '/usr/share/aclocal-1.10/make.m4', -+ '/usr/share/aclocal-1.10/missing.m4', -+ '/usr/share/aclocal-1.10/mkdirp.m4', -+ '/usr/share/aclocal-1.10/options.m4', -+ '/usr/share/aclocal-1.10/runlog.m4', -+ '/usr/share/aclocal-1.10/sanity.m4', -+ '/usr/share/aclocal-1.10/strip.m4', -+ '/usr/share/aclocal-1.10/substnot.m4', -+ '/usr/share/aclocal-1.10/tar.m4', -+ 'acinclude.m4', -+ 'configure.in' -+ ], -+ { -+ 'AM_ENABLE_STATIC' => 1, -+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, -+ '_LT_AC_SHELL_INIT' => 1, -+ 'AC_DEFUN' => 1, -+ 'AC_PROG_LIBTOOL' => 1, -+ '_LT_AC_LANG_CXX_CONFIG' => 1, -+ 'AM_PROG_MKDIR_P' => 1, -+ 'AM_AUTOMAKE_VERSION' => 1, -+ 'AM_MISSING_PROG' => 1, -+ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, -+ '_LT_AC_LANG_C_CONFIG' => 1, -+ 'AM_PROG_INSTALL_STRIP' => 1, -+ '_m4_warn' => 1, -+ 'AC_LIBTOOL_OBJDIR' => 1, -+ 'AM_SANITY_CHECK' => 1, -+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, -+ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, -+ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, -+ '_LT_AC_CHECK_DLFCN' => 1, -+ '_AM_PROG_TAR' => 1, -+ 'AC_LIBTOOL_GCJ' => 1, -+ '_LT_AC_LANG_F77' => 1, -+ 'AC_LIBTOOL_CONFIG' => 1, -+ '_AM_SUBST_NOTMAKE' => 1, -+ '_AM_AUTOCONF_VERSION' => 1, -+ 'JH_PATH_XML_CATALOG' => 1, -+ 'AM_DISABLE_SHARED' => 1, -+ '_LT_AC_LANG_CXX' => 1, -+ 'AM_PROG_LIBTOOL' => 1, -+ '_LT_AC_FILE_LTDLL_C' => 1, -+ 'AM_PROG_LD' => 1, -+ 'AU_DEFUN' => 1, -+ 'AC_PROG_NM' => 1, -+ 'AC_LIBTOOL_DLOPEN' => 1, -+ 'AC_PROG_LD' => 1, -+ 'AC_ENABLE_FAST_INSTALL' => 1, -+ 'AC_PROG_LD_GNU' => 1, -+ '_AM_SET_OPTION' => 1, -+ '_LT_LINKER_BOILERPLATE' => 1, -+ 'AC_LIBTOOL_PROG_CC_C_O' => 1, -+ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, -+ 'GLIB_RUN_PROG' => 1, -+ 'JH_CHECK_XML_CATALOG' => 1, -+ 'GTK_ADD_LIB' => 1, -+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, -+ 'AC_DEFUN_ONCE' => 1, -+ '_LT_AC_LANG_GCJ' => 1, -+ 'AM_PATH_GLIB_2_0' => 1, -+ 'fp_PROG_CC_STDC' => 1, -+ 'AC_LIBTOOL_RC' => 1, -+ '_LT_AC_PROG_ECHO_BACKSLASH' => 1, -+ 'AC_DISABLE_FAST_INSTALL' => 1, -+ 'include' => 1, -+ '_LT_AC_SYS_LIBPATH_AIX' => 1, -+ '_LT_AC_TRY_DLOPEN_SELF' => 1, -+ 'LT_AC_PROG_SED' => 1, -+ 'AM_ENABLE_SHARED' => 1, -+ '_LT_AC_LANG_GCJ_CONFIG' => 1, -+ 'AC_ENABLE_SHARED' => 1, -+ '_LT_REQUIRED_DARWIN_CHECKS' => 1, -+ 'AC_ENABLE_STATIC' => 1, -+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, -+ '_LT_AC_TAGVAR' => 1, -+ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, -+ 'AM_CONDITIONAL' => 1, -+ 'm4_include' => 1, -+ 'AM_PROG_INSTALL_SH' => 1, -+ 'AC_PROG_EGREP' => 1, -+ 'AC_PATH_MAGIC' => 1, -+ '_AC_AM_CONFIG_HEADER_HOOK' => 1, -+ 'AM_MAKE_INCLUDE' => 1, -+ '_LT_AC_TAGCONFIG' => 1, -+ 'm4_pattern_forbid' => 1, -+ 'AC_LIBTOOL_COMPILER_OPTION' => 1, -+ 'AC_DISABLE_SHARED' => 1, -+ '_LT_COMPILER_BOILERPLATE' => 1, -+ 'AC_LIBTOOL_WIN32_DLL' => 1, -+ 'AC_LIBTOOL_SETUP' => 1, -+ 'AM_GLIB_GNU_GETTEXT' => 1, -+ 'AC_PROG_LD_RELOAD_FLAG' => 1, -+ 'AM_MISSING_HAS_RUN' => 1, -+ 'AC_LIBTOOL_DLOPEN_SELF' => 1, -+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, -+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1, -+ 'AC_LIBTOOL_LINKER_OPTION' => 1, -+ 'PKG_CHECK_EXISTS' => 1, -+ 'LT_AC_PROG_RC' => 1, -+ 'AC_LIBTOOL_CXX' => 1, -+ 'LT_AC_PROG_GCJ' => 1, -+ '_LT_AC_PROG_CXXCPP' => 1, -+ 'AM_DEP_TRACK' => 1, -+ 'AM_DISABLE_STATIC' => 1, -+ '_AC_PROG_LIBTOOL' => 1, -+ 'AM_CONFIG_HEADER' => 1, -+ 'AM_PROG_CC_STDC' => 1, -+ '_AM_IF_OPTION' => 1, -+ 'AC_PATH_TOOL_PREFIX' => 1, -+ 'm4_pattern_allow' => 1, -+ 'AC_LIBTOOL_F77' => 1, -+ 'AM_SET_LEADING_DOT' => 1, -+ '_AM_DEPENDENCIES' => 1, -+ 'AC_LIBTOOL_LANG_C_CONFIG' => 1, -+ '_LT_AC_SYS_COMPILER' => 1, -+ 'AM_PROG_NM' => 1, -+ 'PKG_CHECK_MODULES' => 1, -+ 'AC_LIBLTDL_CONVENIENCE' => 1, -+ 'AC_DEPLIBS_CHECK_METHOD' => 1, -+ 'jm_MAINTAINER_MODE' => 1, -+ 'AC_LIBLTDL_INSTALLABLE' => 1, -+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, -+ 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, -+ 'AM_GLIB_DEFINE_LOCALEDIR' => 1, -+ 'AM_INIT_AUTOMAKE' => 1, -+ 'AC_DISABLE_STATIC' => 1, -+ 'AM_MAINTAINER_MODE' => 1, -+ '_LT_AC_LOCK' => 1, -+ '_LT_AC_LANG_RC_CONFIG' => 1, -+ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, -+ 'GTK_DOC_CHECK' => 1, -+ 'AM_PROG_AS' => 1, -+ 'AM_AUX_DIR_EXPAND' => 1, -+ '_LT_AC_LANG_F77_CONFIG' => 1, -+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, -+ '_AM_SET_OPTIONS' => 1, -+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, -+ 'AM_RUN_LOG' => 1, -+ 'AC_LIBTOOL_PICMODE' => 1, -+ 'AC_CHECK_LIBM' => 1, -+ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, -+ '_AM_MANGLE_OPTION' => 1, -+ 'GLIB_AC_DIVERT_BEFORE_HELP' => 1, -+ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, -+ 'AM_SET_DEPDIR' => 1, -+ '_LT_CC_BASENAME' => 1, -+ 'PKG_PROG_PKG_CONFIG' => 1 -+ } -+ ], 'Autom4te::Request' ) -+ ); -+ -Index: gtk+-2.14.4/autom4te.cache/traces.0 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gtk+-2.14.4/autom4te.cache/traces.0 2008-11-11 18:55:59.200634578 +0100 -@@ -0,0 +1,2260 @@ -+m4trace:aclocal.m4:8450: -1- m4_include([acinclude.m4]) -+m4trace:configure.in:40: -1- AC_INIT([gtk+], [gtk_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B], [gtk+]) -+m4trace:configure.in:40: -1- m4_pattern_forbid([^_?A[CHUM]_]) -+m4trace:configure.in:40: -1- m4_pattern_forbid([_AC_]) -+m4trace:configure.in:40: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) -+m4trace:configure.in:40: -1- m4_pattern_allow([^AS_FLAGS$]) -+m4trace:configure.in:40: -1- m4_pattern_forbid([^_?m4_]) -+m4trace:configure.in:40: -1- m4_pattern_forbid([^dnl$]) -+m4trace:configure.in:40: -1- m4_pattern_forbid([^_?AS_]) -+m4trace:configure.in:40: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([SHELL]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^SHELL$]) -+m4trace:configure.in:40: -1- AC_SUBST([PATH_SEPARATOR]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([PATH_SEPARATOR]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PATH_SEPARATOR$]) -+m4trace:configure.in:40: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([PACKAGE_NAME]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_NAME$]) -+m4trace:configure.in:40: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([PACKAGE_TARNAME]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) -+m4trace:configure.in:40: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([PACKAGE_VERSION]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_VERSION$]) -+m4trace:configure.in:40: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([PACKAGE_STRING]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_STRING$]) -+m4trace:configure.in:40: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) -+m4trace:configure.in:40: -1- AC_SUBST([exec_prefix], [NONE]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([exec_prefix]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^exec_prefix$]) -+m4trace:configure.in:40: -1- AC_SUBST([prefix], [NONE]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([prefix]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^prefix$]) -+m4trace:configure.in:40: -1- AC_SUBST([program_transform_name], [s,x,x,]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([program_transform_name]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^program_transform_name$]) -+m4trace:configure.in:40: -1- AC_SUBST([bindir], ['${exec_prefix}/bin']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([bindir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^bindir$]) -+m4trace:configure.in:40: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([sbindir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^sbindir$]) -+m4trace:configure.in:40: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([libexecdir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^libexecdir$]) -+m4trace:configure.in:40: -1- AC_SUBST([datarootdir], ['${prefix}/share']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([datarootdir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^datarootdir$]) -+m4trace:configure.in:40: -1- AC_SUBST([datadir], ['${datarootdir}']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([datadir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^datadir$]) -+m4trace:configure.in:40: -1- AC_SUBST([sysconfdir], ['${prefix}/etc']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([sysconfdir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^sysconfdir$]) -+m4trace:configure.in:40: -1- AC_SUBST([sharedstatedir], ['${prefix}/com']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([sharedstatedir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^sharedstatedir$]) -+m4trace:configure.in:40: -1- AC_SUBST([localstatedir], ['${prefix}/var']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([localstatedir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^localstatedir$]) -+m4trace:configure.in:40: -1- AC_SUBST([includedir], ['${prefix}/include']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([includedir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^includedir$]) -+m4trace:configure.in:40: -1- AC_SUBST([oldincludedir], ['/usr/include']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([oldincludedir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^oldincludedir$]) -+m4trace:configure.in:40: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], -+ ['${datarootdir}/doc/${PACKAGE_TARNAME}'], -+ ['${datarootdir}/doc/${PACKAGE}'])]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([docdir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^docdir$]) -+m4trace:configure.in:40: -1- AC_SUBST([infodir], ['${datarootdir}/info']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([infodir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^infodir$]) -+m4trace:configure.in:40: -1- AC_SUBST([htmldir], ['${docdir}']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([htmldir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^htmldir$]) -+m4trace:configure.in:40: -1- AC_SUBST([dvidir], ['${docdir}']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([dvidir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^dvidir$]) -+m4trace:configure.in:40: -1- AC_SUBST([pdfdir], ['${docdir}']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([pdfdir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^pdfdir$]) -+m4trace:configure.in:40: -1- AC_SUBST([psdir], ['${docdir}']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([psdir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^psdir$]) -+m4trace:configure.in:40: -1- AC_SUBST([libdir], ['${exec_prefix}/lib']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([libdir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^libdir$]) -+m4trace:configure.in:40: -1- AC_SUBST([localedir], ['${datarootdir}/locale']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([localedir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^localedir$]) -+m4trace:configure.in:40: -1- AC_SUBST([mandir], ['${datarootdir}/man']) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([mandir]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^mandir$]) -+m4trace:configure.in:40: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_NAME$]) -+m4trace:configure.in:40: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */ -+#undef PACKAGE_NAME]) -+m4trace:configure.in:40: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) -+m4trace:configure.in:40: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME]) -+m4trace:configure.in:40: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_VERSION$]) -+m4trace:configure.in:40: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */ -+#undef PACKAGE_VERSION]) -+m4trace:configure.in:40: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_STRING$]) -+m4trace:configure.in:40: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING]) -+m4trace:configure.in:40: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) -+m4trace:configure.in:40: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT]) -+m4trace:configure.in:40: -1- AC_SUBST([DEFS]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([DEFS]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^DEFS$]) -+m4trace:configure.in:40: -1- AC_SUBST([ECHO_C]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([ECHO_C]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^ECHO_C$]) -+m4trace:configure.in:40: -1- AC_SUBST([ECHO_N]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([ECHO_N]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^ECHO_N$]) -+m4trace:configure.in:40: -1- AC_SUBST([ECHO_T]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([ECHO_T]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^ECHO_T$]) -+m4trace:configure.in:40: -1- AC_SUBST([LIBS]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([LIBS]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^LIBS$]) -+m4trace:configure.in:40: -1- AC_SUBST([build_alias]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([build_alias]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^build_alias$]) -+m4trace:configure.in:40: -1- AC_SUBST([host_alias]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([host_alias]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^host_alias$]) -+m4trace:configure.in:40: -1- AC_SUBST([target_alias]) -+m4trace:configure.in:40: -1- AC_SUBST_TRACE([target_alias]) -+m4trace:configure.in:40: -1- m4_pattern_allow([^target_alias$]) -+m4trace:configure.in:49: -1- AM_INIT_AUTOMAKE([no-define]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) -+m4trace:configure.in:49: -1- AM_AUTOMAKE_VERSION([1.10.1]) -+m4trace:configure.in:49: -1- AC_REQUIRE_AUX_FILE([install-sh]) -+m4trace:configure.in:49: -1- AC_SUBST([INSTALL_PROGRAM]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_PROGRAM]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^INSTALL_PROGRAM$]) -+m4trace:configure.in:49: -1- AC_SUBST([INSTALL_SCRIPT]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_SCRIPT]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^INSTALL_SCRIPT$]) -+m4trace:configure.in:49: -1- AC_SUBST([INSTALL_DATA]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_DATA]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^INSTALL_DATA$]) -+m4trace:configure.in:49: -1- AC_SUBST([am__isrc], [' -I$(srcdir)']) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([am__isrc]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^am__isrc$]) -+m4trace:configure.in:49: -1- _AM_SUBST_NOTMAKE([am__isrc]) -+m4trace:configure.in:49: -1- AC_SUBST([CYGPATH_W]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([CYGPATH_W]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^CYGPATH_W$]) -+m4trace:configure.in:49: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from... -+aclocal.m4:8253: _AM_SET_OPTIONS is expanded from... -+aclocal.m4:7950: AM_INIT_AUTOMAKE is expanded from... -+configure.in:49: the top level]) -+m4trace:configure.in:49: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME']) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([PACKAGE]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^PACKAGE$]) -+m4trace:configure.in:49: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION']) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([VERSION]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^VERSION$]) -+m4trace:configure.in:49: -1- AC_REQUIRE_AUX_FILE([missing]) -+m4trace:configure.in:49: -1- AC_SUBST([ACLOCAL]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([ACLOCAL]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^ACLOCAL$]) -+m4trace:configure.in:49: -1- AC_SUBST([AUTOCONF]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([AUTOCONF]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^AUTOCONF$]) -+m4trace:configure.in:49: -1- AC_SUBST([AUTOMAKE]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([AUTOMAKE]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^AUTOMAKE$]) -+m4trace:configure.in:49: -1- AC_SUBST([AUTOHEADER]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([AUTOHEADER]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^AUTOHEADER$]) -+m4trace:configure.in:49: -1- AC_SUBST([MAKEINFO]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([MAKEINFO]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^MAKEINFO$]) -+m4trace:configure.in:49: -1- AC_SUBST([install_sh]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([install_sh]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^install_sh$]) -+m4trace:configure.in:49: -1- AC_SUBST([STRIP]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([STRIP]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^STRIP$]) -+m4trace:configure.in:49: -1- AC_SUBST([INSTALL_STRIP_PROGRAM]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$]) -+m4trace:configure.in:49: -1- AC_REQUIRE_AUX_FILE([install-sh]) -+m4trace:configure.in:49: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([mkdir_p]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^mkdir_p$]) -+m4trace:configure.in:49: -1- AC_SUBST([AWK]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([AWK]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^AWK$]) -+m4trace:configure.in:49: -1- AC_SUBST([SET_MAKE]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([SET_MAKE]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^SET_MAKE$]) -+m4trace:configure.in:49: -1- AC_SUBST([am__leading_dot]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([am__leading_dot]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^am__leading_dot$]) -+m4trace:configure.in:49: -1- AC_SUBST([AMTAR]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([AMTAR]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^AMTAR$]) -+m4trace:configure.in:49: -1- AC_SUBST([am__tar]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([am__tar]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^am__tar$]) -+m4trace:configure.in:49: -1- AC_SUBST([am__untar]) -+m4trace:configure.in:49: -1- AC_SUBST_TRACE([am__untar]) -+m4trace:configure.in:49: -1- m4_pattern_allow([^am__untar$]) -+m4trace:configure.in:50: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete. -+You should run autoupdate.], [aclocal.m4:7923: AM_CONFIG_HEADER is expanded from... -+configure.in:50: the top level]) -+m4trace:configure.in:50: -1- AC_CONFIG_HEADERS([config.h]) -+m4trace:configure.in:72: -1- AC_SUBST([GTK_MAJOR_VERSION]) -+m4trace:configure.in:72: -1- AC_SUBST_TRACE([GTK_MAJOR_VERSION]) -+m4trace:configure.in:72: -1- m4_pattern_allow([^GTK_MAJOR_VERSION$]) -+m4trace:configure.in:73: -1- AC_SUBST([GTK_MINOR_VERSION]) -+m4trace:configure.in:73: -1- AC_SUBST_TRACE([GTK_MINOR_VERSION]) -+m4trace:configure.in:73: -1- m4_pattern_allow([^GTK_MINOR_VERSION$]) -+m4trace:configure.in:74: -1- AC_SUBST([GTK_MICRO_VERSION]) -+m4trace:configure.in:74: -1- AC_SUBST_TRACE([GTK_MICRO_VERSION]) -+m4trace:configure.in:74: -1- m4_pattern_allow([^GTK_MICRO_VERSION$]) -+m4trace:configure.in:75: -1- AC_SUBST([GTK_INTERFACE_AGE]) -+m4trace:configure.in:75: -1- AC_SUBST_TRACE([GTK_INTERFACE_AGE]) -+m4trace:configure.in:75: -1- m4_pattern_allow([^GTK_INTERFACE_AGE$]) -+m4trace:configure.in:76: -1- AC_SUBST([GTK_BINARY_AGE]) -+m4trace:configure.in:76: -1- AC_SUBST_TRACE([GTK_BINARY_AGE]) -+m4trace:configure.in:76: -1- m4_pattern_allow([^GTK_BINARY_AGE$]) -+m4trace:configure.in:77: -1- AC_SUBST([GTK_API_VERSION]) -+m4trace:configure.in:77: -1- AC_SUBST_TRACE([GTK_API_VERSION]) -+m4trace:configure.in:77: -1- m4_pattern_allow([^GTK_API_VERSION$]) -+m4trace:configure.in:78: -1- AC_SUBST([GTK_VERSION]) -+m4trace:configure.in:78: -1- AC_SUBST_TRACE([GTK_VERSION]) -+m4trace:configure.in:78: -1- m4_pattern_allow([^GTK_VERSION$]) -+m4trace:configure.in:79: -1- AC_SUBST([GTK_BINARY_VERSION]) -+m4trace:configure.in:79: -1- AC_SUBST_TRACE([GTK_BINARY_VERSION]) -+m4trace:configure.in:79: -1- m4_pattern_allow([^GTK_BINARY_VERSION$]) -+m4trace:configure.in:93: -1- AC_SUBST([LT_VERSION_INFO]) -+m4trace:configure.in:93: -1- AC_SUBST_TRACE([LT_VERSION_INFO]) -+m4trace:configure.in:93: -1- m4_pattern_allow([^LT_VERSION_INFO$]) -+m4trace:configure.in:94: -1- AC_SUBST([LT_CURRENT_MINUS_AGE]) -+m4trace:configure.in:94: -1- AC_SUBST_TRACE([LT_CURRENT_MINUS_AGE]) -+m4trace:configure.in:94: -1- m4_pattern_allow([^LT_CURRENT_MINUS_AGE$]) -+m4trace:configure.in:101: -1- AC_SUBST([GAIL_LT_VERSION_INFO], [gail_lt_version_info]) -+m4trace:configure.in:101: -1- AC_SUBST_TRACE([GAIL_LT_VERSION_INFO]) -+m4trace:configure.in:101: -1- m4_pattern_allow([^GAIL_LT_VERSION_INFO$]) -+m4trace:configure.in:102: -1- AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE], [gail_lt_current_minus_age]) -+m4trace:configure.in:102: -1- AC_SUBST_TRACE([GAIL_LT_CURRENT_MINUS_AGE]) -+m4trace:configure.in:102: -1- m4_pattern_allow([^GAIL_LT_CURRENT_MINUS_AGE$]) -+m4trace:configure.in:112: -1- AC_SUBST([GDK_PIXBUF_MAJOR]) -+m4trace:configure.in:112: -1- AC_SUBST_TRACE([GDK_PIXBUF_MAJOR]) -+m4trace:configure.in:112: -1- m4_pattern_allow([^GDK_PIXBUF_MAJOR$]) -+m4trace:configure.in:113: -1- AC_SUBST([GDK_PIXBUF_MINOR]) -+m4trace:configure.in:113: -1- AC_SUBST_TRACE([GDK_PIXBUF_MINOR]) -+m4trace:configure.in:113: -1- m4_pattern_allow([^GDK_PIXBUF_MINOR$]) -+m4trace:configure.in:114: -1- AC_SUBST([GDK_PIXBUF_MICRO]) -+m4trace:configure.in:114: -1- AC_SUBST_TRACE([GDK_PIXBUF_MICRO]) -+m4trace:configure.in:114: -1- m4_pattern_allow([^GDK_PIXBUF_MICRO$]) -+m4trace:configure.in:115: -1- AC_SUBST([GDK_PIXBUF_VERSION]) -+m4trace:configure.in:115: -1- AC_SUBST_TRACE([GDK_PIXBUF_VERSION]) -+m4trace:configure.in:115: -1- m4_pattern_allow([^GDK_PIXBUF_VERSION$]) -+m4trace:configure.in:118: -1- AC_SUBST([GETTEXT_PACKAGE]) -+m4trace:configure.in:118: -1- AC_SUBST_TRACE([GETTEXT_PACKAGE]) -+m4trace:configure.in:118: -1- m4_pattern_allow([^GETTEXT_PACKAGE$]) -+m4trace:configure.in:119: -1- AC_DEFINE_TRACE_LITERAL([GETTEXT_PACKAGE]) -+m4trace:configure.in:119: -1- m4_pattern_allow([^GETTEXT_PACKAGE$]) -+m4trace:configure.in:119: -1- AH_OUTPUT([GETTEXT_PACKAGE], [/* The prefix for our gettext translation domains. */ -+#undef GETTEXT_PACKAGE]) -+m4trace:configure.in:122: -1- AC_CANONICAL_HOST -+m4trace:configure.in:122: -1- AC_CANONICAL_BUILD -+m4trace:configure.in:122: -1- AC_REQUIRE_AUX_FILE([config.sub]) -+m4trace:configure.in:122: -1- AC_REQUIRE_AUX_FILE([config.guess]) -+m4trace:configure.in:122: -1- AC_SUBST([build], [$ac_cv_build]) -+m4trace:configure.in:122: -1- AC_SUBST_TRACE([build]) -+m4trace:configure.in:122: -1- m4_pattern_allow([^build$]) -+m4trace:configure.in:122: -1- AC_SUBST([build_cpu], [$[1]]) -+m4trace:configure.in:122: -1- AC_SUBST_TRACE([build_cpu]) -+m4trace:configure.in:122: -1- m4_pattern_allow([^build_cpu$]) -+m4trace:configure.in:122: -1- AC_SUBST([build_vendor], [$[2]]) -+m4trace:configure.in:122: -1- AC_SUBST_TRACE([build_vendor]) -+m4trace:configure.in:122: -1- m4_pattern_allow([^build_vendor$]) -+m4trace:configure.in:122: -1- AC_SUBST([build_os]) -+m4trace:configure.in:122: -1- AC_SUBST_TRACE([build_os]) -+m4trace:configure.in:122: -1- m4_pattern_allow([^build_os$]) -+m4trace:configure.in:122: -1- AC_SUBST([host], [$ac_cv_host]) -+m4trace:configure.in:122: -1- AC_SUBST_TRACE([host]) -+m4trace:configure.in:122: -1- m4_pattern_allow([^host$]) -+m4trace:configure.in:122: -1- AC_SUBST([host_cpu], [$[1]]) -+m4trace:configure.in:122: -1- AC_SUBST_TRACE([host_cpu]) -+m4trace:configure.in:122: -1- m4_pattern_allow([^host_cpu$]) -+m4trace:configure.in:122: -1- AC_SUBST([host_vendor], [$[2]]) -+m4trace:configure.in:122: -1- AC_SUBST_TRACE([host_vendor]) -+m4trace:configure.in:122: -1- m4_pattern_allow([^host_vendor$]) -+m4trace:configure.in:122: -1- AC_SUBST([host_os]) -+m4trace:configure.in:122: -1- AC_SUBST_TRACE([host_os]) -+m4trace:configure.in:122: -1- m4_pattern_allow([^host_os$]) -+m4trace:configure.in:144: -1- AC_SUBST([LIB_EXE_MACHINE_FLAG]) -+m4trace:configure.in:144: -1- AC_SUBST_TRACE([LIB_EXE_MACHINE_FLAG]) -+m4trace:configure.in:144: -1- m4_pattern_allow([^LIB_EXE_MACHINE_FLAG$]) -+m4trace:configure.in:153: -1- AC_SUBST([CC]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([CC]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^CC$]) -+m4trace:configure.in:153: -1- AC_SUBST([CFLAGS]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([CFLAGS]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^CFLAGS$]) -+m4trace:configure.in:153: -1- AC_SUBST([LDFLAGS]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([LDFLAGS]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^LDFLAGS$]) -+m4trace:configure.in:153: -1- AC_SUBST([LIBS]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([LIBS]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^LIBS$]) -+m4trace:configure.in:153: -1- AC_SUBST([CPPFLAGS]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([CPPFLAGS]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^CPPFLAGS$]) -+m4trace:configure.in:153: -1- AC_SUBST([CC]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([CC]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^CC$]) -+m4trace:configure.in:153: -1- AC_SUBST([CC]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([CC]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^CC$]) -+m4trace:configure.in:153: -1- AC_SUBST([CC]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([CC]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^CC$]) -+m4trace:configure.in:153: -1- AC_SUBST([CC]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([CC]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^CC$]) -+m4trace:configure.in:153: -1- AC_SUBST([ac_ct_CC]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([ac_ct_CC]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^ac_ct_CC$]) -+m4trace:configure.in:153: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([EXEEXT]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^EXEEXT$]) -+m4trace:configure.in:153: -1- AC_SUBST([OBJEXT], [$ac_cv_objext]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([OBJEXT]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^OBJEXT$]) -+m4trace:configure.in:153: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([DEPDIR]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^DEPDIR$]) -+m4trace:configure.in:153: -1- AC_SUBST([am__include]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([am__include]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^am__include$]) -+m4trace:configure.in:153: -1- AC_SUBST([am__quote]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([am__quote]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^am__quote$]) -+m4trace:configure.in:153: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -+m4trace:configure.in:153: -1- AC_SUBST([AMDEP_TRUE]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([AMDEP_TRUE]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^AMDEP_TRUE$]) -+m4trace:configure.in:153: -1- AC_SUBST([AMDEP_FALSE]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([AMDEP_FALSE]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^AMDEP_FALSE$]) -+m4trace:configure.in:153: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE]) -+m4trace:configure.in:153: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE]) -+m4trace:configure.in:153: -1- AC_SUBST([AMDEPBACKSLASH]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([AMDEPBACKSLASH]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^AMDEPBACKSLASH$]) -+m4trace:configure.in:153: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH]) -+m4trace:configure.in:153: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([CCDEPMODE]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^CCDEPMODE$]) -+m4trace:configure.in:153: -1- AM_CONDITIONAL([am__fastdepCC], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) -+m4trace:configure.in:153: -1- AC_SUBST([am__fastdepCC_TRUE]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) -+m4trace:configure.in:153: -1- AC_SUBST([am__fastdepCC_FALSE]) -+m4trace:configure.in:153: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE]) -+m4trace:configure.in:153: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) -+m4trace:configure.in:153: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) -+m4trace:configure.in:153: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) -+m4trace:configure.in:154: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+aclocal.m4:2781: AC_ENABLE_STATIC is expanded from... -+aclocal.m4:2810: AC_DISABLE_STATIC is expanded from... -+aclocal.m4:7255: AM_DISABLE_STATIC is expanded from... -+configure.in:154: the top level]) -+m4trace:configure.in:155: -1- AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes]) -+m4trace:configure.in:155: -1- AC_SUBST([ENABLE_STATIC_TRUE]) -+m4trace:configure.in:155: -1- AC_SUBST_TRACE([ENABLE_STATIC_TRUE]) -+m4trace:configure.in:155: -1- m4_pattern_allow([^ENABLE_STATIC_TRUE$]) -+m4trace:configure.in:155: -1- AC_SUBST([ENABLE_STATIC_FALSE]) -+m4trace:configure.in:155: -1- AC_SUBST_TRACE([ENABLE_STATIC_FALSE]) -+m4trace:configure.in:155: -1- m4_pattern_allow([^ENABLE_STATIC_FALSE$]) -+m4trace:configure.in:155: -1- _AM_SUBST_NOTMAKE([ENABLE_STATIC_TRUE]) -+m4trace:configure.in:155: -1- _AM_SUBST_NOTMAKE([ENABLE_STATIC_FALSE]) -+m4trace:configure.in:161: -1- AC_SUBST([CXX]) -+m4trace:configure.in:161: -1- AC_SUBST_TRACE([CXX]) -+m4trace:configure.in:161: -1- m4_pattern_allow([^CXX$]) -+m4trace:configure.in:161: -1- AC_SUBST([ac_ct_CXX]) -+m4trace:configure.in:161: -1- AC_SUBST_TRACE([ac_ct_CXX]) -+m4trace:configure.in:161: -1- m4_pattern_allow([^ac_ct_CXX$]) -+m4trace:configure.in:162: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from... -+configure.in:162: the top level]) -+m4trace:configure.in:163: -1- _m4_warn([obsolete], [The macro `AC_LANG_CPLUSPLUS' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/c.m4:105: AC_LANG_CPLUSPLUS is expanded from... -+configure.in:163: the top level]) -+m4trace:configure.in:165: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:165: the top level]) -+m4trace:configure.in:165: -1- AC_SUBST([CXX]) -+m4trace:configure.in:165: -1- AC_SUBST_TRACE([CXX]) -+m4trace:configure.in:165: -1- m4_pattern_allow([^CXX$]) -+m4trace:configure.in:165: -1- AC_SUBST([CXXFLAGS]) -+m4trace:configure.in:165: -1- AC_SUBST_TRACE([CXXFLAGS]) -+m4trace:configure.in:165: -1- m4_pattern_allow([^CXXFLAGS$]) -+m4trace:configure.in:165: -1- AC_SUBST([LDFLAGS]) -+m4trace:configure.in:165: -1- AC_SUBST_TRACE([LDFLAGS]) -+m4trace:configure.in:165: -1- m4_pattern_allow([^LDFLAGS$]) -+m4trace:configure.in:165: -1- AC_SUBST([LIBS]) -+m4trace:configure.in:165: -1- AC_SUBST_TRACE([LIBS]) -+m4trace:configure.in:165: -1- m4_pattern_allow([^LIBS$]) -+m4trace:configure.in:165: -1- AC_SUBST([CPPFLAGS]) -+m4trace:configure.in:165: -1- AC_SUBST_TRACE([CPPFLAGS]) -+m4trace:configure.in:165: -1- m4_pattern_allow([^CPPFLAGS$]) -+m4trace:configure.in:165: -1- AC_SUBST([CXX]) -+m4trace:configure.in:165: -1- AC_SUBST_TRACE([CXX]) -+m4trace:configure.in:165: -1- m4_pattern_allow([^CXX$]) -+m4trace:configure.in:165: -1- AC_SUBST([ac_ct_CXX]) -+m4trace:configure.in:165: -1- AC_SUBST_TRACE([ac_ct_CXX]) -+m4trace:configure.in:165: -1- m4_pattern_allow([^ac_ct_CXX$]) -+m4trace:configure.in:165: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type]) -+m4trace:configure.in:165: -1- AC_SUBST_TRACE([CXXDEPMODE]) -+m4trace:configure.in:165: -1- m4_pattern_allow([^CXXDEPMODE$]) -+m4trace:configure.in:165: -1- AM_CONDITIONAL([am__fastdepCXX], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3]) -+m4trace:configure.in:165: -1- AC_SUBST([am__fastdepCXX_TRUE]) -+m4trace:configure.in:165: -1- AC_SUBST_TRACE([am__fastdepCXX_TRUE]) -+m4trace:configure.in:165: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$]) -+m4trace:configure.in:165: -1- AC_SUBST([am__fastdepCXX_FALSE]) -+m4trace:configure.in:165: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE]) -+m4trace:configure.in:165: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$]) -+m4trace:configure.in:165: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE]) -+m4trace:configure.in:165: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE]) -+m4trace:configure.in:166: -1- AM_CONDITIONAL([HAVE_CXX], [test "$CXX" != ""]) -+m4trace:configure.in:166: -1- AC_SUBST([HAVE_CXX_TRUE]) -+m4trace:configure.in:166: -1- AC_SUBST_TRACE([HAVE_CXX_TRUE]) -+m4trace:configure.in:166: -1- m4_pattern_allow([^HAVE_CXX_TRUE$]) -+m4trace:configure.in:166: -1- AC_SUBST([HAVE_CXX_FALSE]) -+m4trace:configure.in:166: -1- AC_SUBST_TRACE([HAVE_CXX_FALSE]) -+m4trace:configure.in:166: -1- m4_pattern_allow([^HAVE_CXX_FALSE$]) -+m4trace:configure.in:166: -1- _AM_SUBST_NOTMAKE([HAVE_CXX_TRUE]) -+m4trace:configure.in:166: -1- _AM_SUBST_NOTMAKE([HAVE_CXX_FALSE]) -+m4trace:configure.in:170: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:170: the top level]) -+m4trace:configure.in:171: -1- AM_CONDITIONAL([HAVE_OBJC], [test "$OBJC" = "yes"]) -+m4trace:configure.in:171: -1- AC_SUBST([HAVE_OBJC_TRUE]) -+m4trace:configure.in:171: -1- AC_SUBST_TRACE([HAVE_OBJC_TRUE]) -+m4trace:configure.in:171: -1- m4_pattern_allow([^HAVE_OBJC_TRUE$]) -+m4trace:configure.in:171: -1- AC_SUBST([HAVE_OBJC_FALSE]) -+m4trace:configure.in:171: -1- AC_SUBST_TRACE([HAVE_OBJC_FALSE]) -+m4trace:configure.in:171: -1- m4_pattern_allow([^HAVE_OBJC_FALSE$]) -+m4trace:configure.in:171: -1- _AM_SUBST_NOTMAKE([HAVE_OBJC_TRUE]) -+m4trace:configure.in:171: -1- _AM_SUBST_NOTMAKE([HAVE_OBJC_FALSE]) -+m4trace:configure.in:173: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from... -+configure.in:173: the top level]) -+m4trace:configure.in:187: -1- AC_PROG_LIBTOOL -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+aclocal.m4:2742: AC_ENABLE_SHARED is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+aclocal.m4:2820: AC_ENABLE_FAST_INSTALL is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+aclocal.m4:2961: AC_PROG_LD is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- AC_SUBST([SED]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([SED]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^SED$]) -+m4trace:configure.in:187: -1- AC_SUBST([GREP]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([GREP]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^GREP$]) -+m4trace:configure.in:187: -1- AC_SUBST([GREP]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([GREP]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^GREP$]) -+m4trace:configure.in:187: -1- AC_SUBST([EGREP]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([EGREP]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^EGREP$]) -+m4trace:configure.in:187: -1- AC_SUBST([EGREP]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([EGREP]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^EGREP$]) -+m4trace:configure.in:187: -1- AC_SUBST([LN_S], [$as_ln_s]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([LN_S]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^LN_S$]) -+m4trace:configure.in:187: -1- AC_SUBST([ECHO]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([ECHO]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^ECHO$]) -+m4trace:configure.in:187: -1- AC_SUBST([AR]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([AR]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^AR$]) -+m4trace:configure.in:187: -1- AC_SUBST([RANLIB]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([RANLIB]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^RANLIB$]) -+m4trace:configure.in:187: -1- AC_SUBST([STRIP]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([STRIP]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^STRIP$]) -+m4trace:configure.in:187: -1- AC_SUBST([DSYMUTIL]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([DSYMUTIL]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^DSYMUTIL$]) -+m4trace:configure.in:187: -1- AC_SUBST([NMEDIT]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([NMEDIT]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^NMEDIT$]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... -+../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... -+../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... -+aclocal.m4:1250: _LT_AC_LOCK is expanded from... -+aclocal.m4:1870: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from... -+aclocal.m4:3494: _LT_AC_LANG_C_CONFIG is expanded from... -+aclocal.m4:3493: AC_LIBTOOL_LANG_C_CONFIG is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- AC_SUBST([DLLTOOL]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([DLLTOOL]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^DLLTOOL$]) -+m4trace:configure.in:187: -1- AC_SUBST([AS]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([AS]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^AS$]) -+m4trace:configure.in:187: -1- AC_SUBST([OBJDUMP]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([OBJDUMP]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^OBJDUMP$]) -+m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */ -+#undef HAVE_DLFCN_H]) -+m4trace:configure.in:187: -1- AC_SUBST([CPP]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([CPP]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^CPP$]) -+m4trace:configure.in:187: -1- AC_SUBST([CPPFLAGS]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([CPPFLAGS]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^CPPFLAGS$]) -+m4trace:configure.in:187: -1- AC_SUBST([CPP]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([CPP]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^CPP$]) -+m4trace:configure.in:187: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^STDC_HEADERS$]) -+m4trace:configure.in:187: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS]) -+m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */ -+#undef HAVE_SYS_TYPES_H]) -+m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */ -+#undef HAVE_SYS_STAT_H]) -+m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */ -+#undef HAVE_STDLIB_H]) -+m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */ -+#undef HAVE_STRING_H]) -+m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */ -+#undef HAVE_MEMORY_H]) -+m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */ -+#undef HAVE_STRINGS_H]) -+m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */ -+#undef HAVE_INTTYPES_H]) -+m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */ -+#undef HAVE_STDINT_H]) -+m4trace:configure.in:187: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */ -+#undef HAVE_UNISTD_H]) -+m4trace:configure.in:187: -1- _LT_AC_TAGCONFIG -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- AC_SUBST([CXXCPP]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([CXXCPP]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^CXXCPP$]) -+m4trace:configure.in:187: -1- AC_SUBST([CPPFLAGS]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([CPPFLAGS]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^CPPFLAGS$]) -+m4trace:configure.in:187: -1- AC_SUBST([CXXCPP]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([CXXCPP]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^CXXCPP$]) -+m4trace:configure.in:187: -1- AC_SUBST([F77]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([F77]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^F77$]) -+m4trace:configure.in:187: -1- AC_SUBST([FFLAGS]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([FFLAGS]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^FFLAGS$]) -+m4trace:configure.in:187: -1- AC_SUBST([LDFLAGS]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([LDFLAGS]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^LDFLAGS$]) -+m4trace:configure.in:187: -1- AC_SUBST([LIBS]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([LIBS]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^LIBS$]) -+m4trace:configure.in:187: -1- AC_SUBST([F77]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([F77]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^F77$]) -+m4trace:configure.in:187: -1- AC_SUBST([ac_ct_F77]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([ac_ct_F77]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^ac_ct_F77$]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from... -+aclocal.m4:4880: _LT_AC_LANG_GCJ_CONFIG is expanded from... -+aclocal.m4:4879: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... -+aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from... -+aclocal.m4:4880: _LT_AC_LANG_GCJ_CONFIG is expanded from... -+aclocal.m4:4879: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from... -+aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from... -+aclocal.m4:4936: _LT_AC_LANG_RC_CONFIG is expanded from... -+aclocal.m4:4935: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... -+aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from... -+aclocal.m4:4936: _LT_AC_LANG_RC_CONFIG is expanded from... -+aclocal.m4:4935: AC_LIBTOOL_LANG_RC_CONFIG is expanded from... -+aclocal.m4:2619: _LT_AC_TAGCONFIG is expanded from... -+aclocal.m4:779: AC_LIBTOOL_SETUP is expanded from... -+aclocal.m4:759: _AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:724: AC_PROG_LIBTOOL is expanded from... -+aclocal.m4:7251: AM_PROG_LIBTOOL is expanded from... -+configure.in:187: the top level]) -+m4trace:configure.in:187: -1- AC_SUBST([LIBTOOL]) -+m4trace:configure.in:187: -1- AC_SUBST_TRACE([LIBTOOL]) -+m4trace:configure.in:187: -1- m4_pattern_allow([^LIBTOOL$]) -+m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([_FILE_OFFSET_BITS]) -+m4trace:configure.in:193: -1- m4_pattern_allow([^_FILE_OFFSET_BITS$]) -+m4trace:configure.in:193: -1- AH_OUTPUT([_FILE_OFFSET_BITS], [/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS]) -+m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([_LARGE_FILES]) -+m4trace:configure.in:193: -1- m4_pattern_allow([^_LARGE_FILES$]) -+m4trace:configure.in:193: -1- AH_OUTPUT([_LARGE_FILES], [/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES]) -+m4trace:configure.in:195: -1- AC_SUBST([CCAS]) -+m4trace:configure.in:195: -1- AC_SUBST_TRACE([CCAS]) -+m4trace:configure.in:195: -1- m4_pattern_allow([^CCAS$]) -+m4trace:configure.in:195: -1- AC_SUBST([CCASFLAGS]) -+m4trace:configure.in:195: -1- AC_SUBST_TRACE([CCASFLAGS]) -+m4trace:configure.in:195: -1- m4_pattern_allow([^CCASFLAGS$]) -+m4trace:configure.in:195: -1- AC_SUBST([CCASDEPMODE], [depmode=$am_cv_CCAS_dependencies_compiler_type]) -+m4trace:configure.in:195: -1- AC_SUBST_TRACE([CCASDEPMODE]) -+m4trace:configure.in:195: -1- m4_pattern_allow([^CCASDEPMODE$]) -+m4trace:configure.in:195: -1- AM_CONDITIONAL([am__fastdepCCAS], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3]) -+m4trace:configure.in:195: -1- AC_SUBST([am__fastdepCCAS_TRUE]) -+m4trace:configure.in:195: -1- AC_SUBST_TRACE([am__fastdepCCAS_TRUE]) -+m4trace:configure.in:195: -1- m4_pattern_allow([^am__fastdepCCAS_TRUE$]) -+m4trace:configure.in:195: -1- AC_SUBST([am__fastdepCCAS_FALSE]) -+m4trace:configure.in:195: -1- AC_SUBST_TRACE([am__fastdepCCAS_FALSE]) -+m4trace:configure.in:195: -1- m4_pattern_allow([^am__fastdepCCAS_FALSE$]) -+m4trace:configure.in:195: -1- _AM_SUBST_NOTMAKE([am__fastdepCCAS_TRUE]) -+m4trace:configure.in:195: -1- _AM_SUBST_NOTMAKE([am__fastdepCCAS_FALSE]) -+m4trace:configure.in:196: -1- AC_SUBST([NM]) -+m4trace:configure.in:196: -1- AC_SUBST_TRACE([NM]) -+m4trace:configure.in:196: -1- m4_pattern_allow([^NM$]) -+m4trace:configure.in:199: -1- AM_MAINTAINER_MODE -+m4trace:configure.in:199: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) -+m4trace:configure.in:199: -1- AC_SUBST([MAINTAINER_MODE_TRUE]) -+m4trace:configure.in:199: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE]) -+m4trace:configure.in:199: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$]) -+m4trace:configure.in:199: -1- AC_SUBST([MAINTAINER_MODE_FALSE]) -+m4trace:configure.in:199: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE]) -+m4trace:configure.in:199: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$]) -+m4trace:configure.in:199: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE]) -+m4trace:configure.in:199: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE]) -+m4trace:configure.in:199: -1- AC_SUBST([MAINT]) -+m4trace:configure.in:199: -1- AC_SUBST_TRACE([MAINT]) -+m4trace:configure.in:199: -1- m4_pattern_allow([^MAINT$]) -+m4trace:configure.in:211: -1- AM_CONDITIONAL([PLATFORM_WIN32], [test "$platform_win32" = "yes"]) -+m4trace:configure.in:211: -1- AC_SUBST([PLATFORM_WIN32_TRUE]) -+m4trace:configure.in:211: -1- AC_SUBST_TRACE([PLATFORM_WIN32_TRUE]) -+m4trace:configure.in:211: -1- m4_pattern_allow([^PLATFORM_WIN32_TRUE$]) -+m4trace:configure.in:211: -1- AC_SUBST([PLATFORM_WIN32_FALSE]) -+m4trace:configure.in:211: -1- AC_SUBST_TRACE([PLATFORM_WIN32_FALSE]) -+m4trace:configure.in:211: -1- m4_pattern_allow([^PLATFORM_WIN32_FALSE$]) -+m4trace:configure.in:211: -1- _AM_SUBST_NOTMAKE([PLATFORM_WIN32_TRUE]) -+m4trace:configure.in:211: -1- _AM_SUBST_NOTMAKE([PLATFORM_WIN32_FALSE]) -+m4trace:configure.in:213: -1- AM_CONDITIONAL([OS_WIN32], [test "$os_win32" = "yes"]) -+m4trace:configure.in:213: -1- AC_SUBST([OS_WIN32_TRUE]) -+m4trace:configure.in:213: -1- AC_SUBST_TRACE([OS_WIN32_TRUE]) -+m4trace:configure.in:213: -1- m4_pattern_allow([^OS_WIN32_TRUE$]) -+m4trace:configure.in:213: -1- AC_SUBST([OS_WIN32_FALSE]) -+m4trace:configure.in:213: -1- AC_SUBST_TRACE([OS_WIN32_FALSE]) -+m4trace:configure.in:213: -1- m4_pattern_allow([^OS_WIN32_FALSE$]) -+m4trace:configure.in:213: -1- _AM_SUBST_NOTMAKE([OS_WIN32_TRUE]) -+m4trace:configure.in:213: -1- _AM_SUBST_NOTMAKE([OS_WIN32_FALSE]) -+m4trace:configure.in:214: -1- AM_CONDITIONAL([OS_UNIX], [test "$os_win32" != "yes"]) -+m4trace:configure.in:214: -1- AC_SUBST([OS_UNIX_TRUE]) -+m4trace:configure.in:214: -1- AC_SUBST_TRACE([OS_UNIX_TRUE]) -+m4trace:configure.in:214: -1- m4_pattern_allow([^OS_UNIX_TRUE$]) -+m4trace:configure.in:214: -1- AC_SUBST([OS_UNIX_FALSE]) -+m4trace:configure.in:214: -1- AC_SUBST_TRACE([OS_UNIX_FALSE]) -+m4trace:configure.in:214: -1- m4_pattern_allow([^OS_UNIX_FALSE$]) -+m4trace:configure.in:214: -1- _AM_SUBST_NOTMAKE([OS_UNIX_TRUE]) -+m4trace:configure.in:214: -1- _AM_SUBST_NOTMAKE([OS_UNIX_FALSE]) -+m4trace:configure.in:215: -1- AM_CONDITIONAL([OS_LINUX], [test "$os_linux" = "yes"]) -+m4trace:configure.in:215: -1- AC_SUBST([OS_LINUX_TRUE]) -+m4trace:configure.in:215: -1- AC_SUBST_TRACE([OS_LINUX_TRUE]) -+m4trace:configure.in:215: -1- m4_pattern_allow([^OS_LINUX_TRUE$]) -+m4trace:configure.in:215: -1- AC_SUBST([OS_LINUX_FALSE]) -+m4trace:configure.in:215: -1- AC_SUBST_TRACE([OS_LINUX_FALSE]) -+m4trace:configure.in:215: -1- m4_pattern_allow([^OS_LINUX_FALSE$]) -+m4trace:configure.in:215: -1- _AM_SUBST_NOTMAKE([OS_LINUX_TRUE]) -+m4trace:configure.in:215: -1- _AM_SUBST_NOTMAKE([OS_LINUX_FALSE]) -+m4trace:configure.in:218: -1- AC_SUBST([WINDRES]) -+m4trace:configure.in:218: -1- AC_SUBST_TRACE([WINDRES]) -+m4trace:configure.in:218: -1- m4_pattern_allow([^WINDRES$]) -+m4trace:configure.in:222: -1- AC_SUBST([ms_librarian]) -+m4trace:configure.in:222: -1- AC_SUBST_TRACE([ms_librarian]) -+m4trace:configure.in:222: -1- m4_pattern_allow([^ms_librarian$]) -+m4trace:configure.in:224: -1- AM_CONDITIONAL([MS_LIB_AVAILABLE], [test x$ms_librarian = xyes]) -+m4trace:configure.in:224: -1- AC_SUBST([MS_LIB_AVAILABLE_TRUE]) -+m4trace:configure.in:224: -1- AC_SUBST_TRACE([MS_LIB_AVAILABLE_TRUE]) -+m4trace:configure.in:224: -1- m4_pattern_allow([^MS_LIB_AVAILABLE_TRUE$]) -+m4trace:configure.in:224: -1- AC_SUBST([MS_LIB_AVAILABLE_FALSE]) -+m4trace:configure.in:224: -1- AC_SUBST_TRACE([MS_LIB_AVAILABLE_FALSE]) -+m4trace:configure.in:224: -1- m4_pattern_allow([^MS_LIB_AVAILABLE_FALSE$]) -+m4trace:configure.in:224: -1- _AM_SUBST_NOTMAKE([MS_LIB_AVAILABLE_TRUE]) -+m4trace:configure.in:224: -1- _AM_SUBST_NOTMAKE([MS_LIB_AVAILABLE_FALSE]) -+m4trace:configure.in:231: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+configure.in:231: the top level]) -+m4trace:configure.in:234: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:234: the top level]) -+m4trace:configure.in:238: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:238: the top level]) -+m4trace:configure.in:242: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:242: the top level]) -+m4trace:configure.in:246: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:246: the top level]) -+m4trace:configure.in:250: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:250: the top level]) -+m4trace:configure.in:255: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+configure.in:255: the top level]) -+m4trace:configure.in:267: -1- AC_SUBST([gdktarget]) -+m4trace:configure.in:267: -1- AC_SUBST_TRACE([gdktarget]) -+m4trace:configure.in:267: -1- m4_pattern_allow([^gdktarget$]) -+m4trace:configure.in:276: -1- AC_SUBST([gdktargetlib]) -+m4trace:configure.in:276: -1- AC_SUBST_TRACE([gdktargetlib]) -+m4trace:configure.in:276: -1- m4_pattern_allow([^gdktargetlib$]) -+m4trace:configure.in:277: -1- AC_SUBST([gtktargetlib]) -+m4trace:configure.in:277: -1- AC_SUBST_TRACE([gtktargetlib]) -+m4trace:configure.in:277: -1- m4_pattern_allow([^gtktargetlib$]) -+m4trace:configure.in:296: -1- AC_DEFINE_TRACE_LITERAL([GTK_COMPILED_WITH_DEBUGGING]) -+m4trace:configure.in:296: -1- m4_pattern_allow([^GTK_COMPILED_WITH_DEBUGGING$]) -+m4trace:configure.in:296: -1- AH_OUTPUT([GTK_COMPILED_WITH_DEBUGGING], [/* Define if debugging is enabled */ -+#undef GTK_COMPILED_WITH_DEBUGGING]) -+m4trace:configure.in:305: -1- _m4_warn([obsolete], [The macro `AM_PROG_CC_STDC' is obsolete. -+You should run autoupdate.], [aclocal.m4:7640: AM_PROG_CC_STDC is expanded from... -+configure.in:305: the top level]) -+m4trace:configure.in:305: -1- AC_SUBST([CC]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([CC]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^CC$]) -+m4trace:configure.in:305: -1- AC_SUBST([CFLAGS]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([CFLAGS]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^CFLAGS$]) -+m4trace:configure.in:305: -1- AC_SUBST([LDFLAGS]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([LDFLAGS]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^LDFLAGS$]) -+m4trace:configure.in:305: -1- AC_SUBST([LIBS]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([LIBS]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^LIBS$]) -+m4trace:configure.in:305: -1- AC_SUBST([CPPFLAGS]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([CPPFLAGS]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^CPPFLAGS$]) -+m4trace:configure.in:305: -1- AC_SUBST([CC]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([CC]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^CC$]) -+m4trace:configure.in:305: -1- AC_SUBST([CC]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([CC]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^CC$]) -+m4trace:configure.in:305: -1- AC_SUBST([CC]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([CC]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^CC$]) -+m4trace:configure.in:305: -1- AC_SUBST([CC]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([CC]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^CC$]) -+m4trace:configure.in:305: -1- AC_SUBST([ac_ct_CC]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([ac_ct_CC]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^ac_ct_CC$]) -+m4trace:configure.in:305: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([CCDEPMODE]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^CCDEPMODE$]) -+m4trace:configure.in:305: -1- AM_CONDITIONAL([am__fastdepCC], [ -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) -+m4trace:configure.in:305: -1- AC_SUBST([am__fastdepCC_TRUE]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) -+m4trace:configure.in:305: -1- AC_SUBST([am__fastdepCC_FALSE]) -+m4trace:configure.in:305: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE]) -+m4trace:configure.in:305: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) -+m4trace:configure.in:305: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) -+m4trace:configure.in:305: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) -+m4trace:configure.in:305: -1- _m4_warn([obsolete], [AM_PROG_CC_STDC: -+ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon -+ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when -+ you adjust the code. You can also remove the above call to -+ AC_PROG_CC if you already called it elsewhere.], [aclocal.m4:7640: AM_PROG_CC_STDC is expanded from... -+configure.in:305: the top level]) -+m4trace:configure.in:306: -1- AC_REQUIRE_AUX_FILE([install-sh]) -+m4trace:configure.in:306: -1- AC_SUBST([INSTALL_PROGRAM]) -+m4trace:configure.in:306: -1- AC_SUBST_TRACE([INSTALL_PROGRAM]) -+m4trace:configure.in:306: -1- m4_pattern_allow([^INSTALL_PROGRAM$]) -+m4trace:configure.in:306: -1- AC_SUBST([INSTALL_SCRIPT]) -+m4trace:configure.in:306: -1- AC_SUBST_TRACE([INSTALL_SCRIPT]) -+m4trace:configure.in:306: -1- m4_pattern_allow([^INSTALL_SCRIPT$]) -+m4trace:configure.in:306: -1- AC_SUBST([INSTALL_DATA]) -+m4trace:configure.in:306: -1- AC_SUBST_TRACE([INSTALL_DATA]) -+m4trace:configure.in:306: -1- m4_pattern_allow([^INSTALL_DATA$]) -+m4trace:configure.in:307: -1- AC_SUBST([SET_MAKE]) -+m4trace:configure.in:307: -1- AC_SUBST_TRACE([SET_MAKE]) -+m4trace:configure.in:307: -1- m4_pattern_allow([^SET_MAKE$]) -+m4trace:configure.in:376: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4trace:configure.in:376: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -+m4trace:configure.in:376: -1- AC_SUBST([PKG_CONFIG]) -+m4trace:configure.in:376: -1- AC_SUBST_TRACE([PKG_CONFIG]) -+m4trace:configure.in:376: -1- m4_pattern_allow([^PKG_CONFIG$]) -+m4trace:configure.in:376: -1- AC_SUBST([PKG_CONFIG]) -+m4trace:configure.in:376: -1- AC_SUBST_TRACE([PKG_CONFIG]) -+m4trace:configure.in:376: -1- m4_pattern_allow([^PKG_CONFIG$]) -+m4trace:configure.in:376: -1- AC_SUBST([BASE_DEPENDENCIES_CFLAGS]) -+m4trace:configure.in:376: -1- AC_SUBST_TRACE([BASE_DEPENDENCIES_CFLAGS]) -+m4trace:configure.in:376: -1- m4_pattern_allow([^BASE_DEPENDENCIES_CFLAGS$]) -+m4trace:configure.in:376: -1- AC_SUBST([BASE_DEPENDENCIES_LIBS]) -+m4trace:configure.in:376: -1- AC_SUBST_TRACE([BASE_DEPENDENCIES_LIBS]) -+m4trace:configure.in:376: -1- m4_pattern_allow([^BASE_DEPENDENCIES_LIBS$]) -+m4trace:configure.in:390: -1- AC_SUBST([LIBTOOL_EXPORT_OPTIONS]) -+m4trace:configure.in:390: -1- AC_SUBST_TRACE([LIBTOOL_EXPORT_OPTIONS]) -+m4trace:configure.in:390: -1- m4_pattern_allow([^LIBTOOL_EXPORT_OPTIONS$]) -+m4trace:configure.in:396: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:396: the top level]) -+m4trace:configure.in:419: -1- AM_CONDITIONAL([DISABLE_EXPLICIT_DEPS], [test $enable_explicit_deps = no]) -+m4trace:configure.in:419: -1- AC_SUBST([DISABLE_EXPLICIT_DEPS_TRUE]) -+m4trace:configure.in:419: -1- AC_SUBST_TRACE([DISABLE_EXPLICIT_DEPS_TRUE]) -+m4trace:configure.in:419: -1- m4_pattern_allow([^DISABLE_EXPLICIT_DEPS_TRUE$]) -+m4trace:configure.in:419: -1- AC_SUBST([DISABLE_EXPLICIT_DEPS_FALSE]) -+m4trace:configure.in:419: -1- AC_SUBST_TRACE([DISABLE_EXPLICIT_DEPS_FALSE]) -+m4trace:configure.in:419: -1- m4_pattern_allow([^DISABLE_EXPLICIT_DEPS_FALSE$]) -+m4trace:configure.in:419: -1- _AM_SUBST_NOTMAKE([DISABLE_EXPLICIT_DEPS_TRUE]) -+m4trace:configure.in:419: -1- _AM_SUBST_NOTMAKE([DISABLE_EXPLICIT_DEPS_FALSE]) -+m4trace:configure.in:424: -1- AC_SUBST([PERL]) -+m4trace:configure.in:424: -1- AC_SUBST_TRACE([PERL]) -+m4trace:configure.in:424: -1- m4_pattern_allow([^PERL$]) -+m4trace:configure.in:427: -1- AC_SUBST([INDENT]) -+m4trace:configure.in:427: -1- AC_SUBST_TRACE([INDENT]) -+m4trace:configure.in:427: -1- m4_pattern_allow([^INDENT$]) -+m4trace:configure.in:435: -1- AC_SUBST([REBUILD]) -+m4trace:configure.in:435: -1- AC_SUBST_TRACE([REBUILD]) -+m4trace:configure.in:435: -1- m4_pattern_allow([^REBUILD$]) -+m4trace:configure.in:437: -1- AH_OUTPUT([HAVE_LSTAT], [/* Define to 1 if you have the `lstat\' function. */ -+#undef HAVE_LSTAT]) -+m4trace:configure.in:437: -1- AH_OUTPUT([HAVE_MKSTEMP], [/* Define to 1 if you have the `mkstemp\' function. */ -+#undef HAVE_MKSTEMP]) -+m4trace:configure.in:437: -1- AH_OUTPUT([HAVE_FLOCKFILE], [/* Define to 1 if you have the `flockfile\' function. */ -+#undef HAVE_FLOCKFILE]) -+m4trace:configure.in:437: -1- AH_OUTPUT([HAVE_GETC_UNLOCKED], [/* Define to 1 if you have the `getc_unlocked\' function. */ -+#undef HAVE_GETC_UNLOCKED]) -+m4trace:configure.in:438: -1- AH_OUTPUT([HAVE_LOCALTIME_R], [/* Define to 1 if you have the `localtime_r\' function. */ -+#undef HAVE_LOCALTIME_R]) -+m4trace:configure.in:442: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+configure.in:442: the top level]) -+m4trace:configure.in:448: -1- AC_DEFINE_TRACE_LITERAL([HAVE__NL_TIME_FIRST_WEEKDAY]) -+m4trace:configure.in:448: -1- m4_pattern_allow([^HAVE__NL_TIME_FIRST_WEEKDAY$]) -+m4trace:configure.in:448: -1- AH_OUTPUT([HAVE__NL_TIME_FIRST_WEEKDAY], [/* Define if _NL_TIME_FIRST_WEEKDAY is available */ -+#undef HAVE__NL_TIME_FIRST_WEEKDAY]) -+m4trace:configure.in:454: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+configure.in:454: the top level]) -+m4trace:configure.in:460: -1- AC_DEFINE_TRACE_LITERAL([HAVE__NL_MEASUREMENT_MEASUREMENT]) -+m4trace:configure.in:460: -1- m4_pattern_allow([^HAVE__NL_MEASUREMENT_MEASUREMENT$]) -+m4trace:configure.in:460: -1- AH_OUTPUT([HAVE__NL_MEASUREMENT_MEASUREMENT], [/* Define if _NL_MEASUREMENT_MEASUREMENT is available */ -+#undef HAVE__NL_MEASUREMENT_MEASUREMENT]) -+m4trace:configure.in:466: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+configure.in:466: the top level]) -+m4trace:configure.in:472: -1- AC_DEFINE_TRACE_LITERAL([HAVE__NL_PAPER_HEIGHT]) -+m4trace:configure.in:472: -1- m4_pattern_allow([^HAVE__NL_PAPER_HEIGHT$]) -+m4trace:configure.in:472: -1- AH_OUTPUT([HAVE__NL_PAPER_HEIGHT], [/* Define if _NL_PAPER_HEIGHT is available */ -+#undef HAVE__NL_PAPER_HEIGHT]) -+m4trace:configure.in:478: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+configure.in:478: the top level]) -+m4trace:configure.in:484: -1- AC_DEFINE_TRACE_LITERAL([HAVE__NL_PAPER_WIDTH]) -+m4trace:configure.in:484: -1- m4_pattern_allow([^HAVE__NL_PAPER_WIDTH$]) -+m4trace:configure.in:484: -1- AH_OUTPUT([HAVE__NL_PAPER_WIDTH], [/* Define if _NL_PAPER_WIDTH is available */ -+#undef HAVE__NL_PAPER_WIDTH]) -+m4trace:configure.in:490: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+configure.in:490: the top level]) -+m4trace:configure.in:496: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SIGSETJMP]) -+m4trace:configure.in:496: -1- m4_pattern_allow([^HAVE_SIGSETJMP$]) -+m4trace:configure.in:496: -1- AH_OUTPUT([HAVE_SIGSETJMP], [/* Define to 1 if sigsetjmp is available */ -+#undef HAVE_SIGSETJMP]) -+m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */ -+#undef HAVE_LOCALE_H]) -+m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... -+../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... -+../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... -+aclocal.m4:281: GLIB_LC_MESSAGES is expanded from... -+aclocal.m4:545: GLIB_GNU_GETTEXT is expanded from... -+aclocal.m4:645: AM_GLIB_GNU_GETTEXT is expanded from... -+configure.in:502: the top level]) -+m4trace:configure.in:502: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^HAVE_LC_MESSAGES$]) -+m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your <locale.h> file defines LC_MESSAGES. */ -+#undef HAVE_LC_MESSAGES]) -+m4trace:configure.in:502: -1- AC_SUBST([USE_NLS]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([USE_NLS]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^USE_NLS$]) -+m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... -+../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... -+../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... -+../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... -+../../lib/autoconf/headers.m4:87: AC_CHECK_HEADER is expanded from... -+aclocal.m4:335: GLIB_WITH_NLS is expanded from... -+aclocal.m4:545: GLIB_GNU_GETTEXT is expanded from... -+aclocal.m4:645: AM_GLIB_GNU_GETTEXT is expanded from... -+configure.in:502: the top level]) -+m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... -+../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from... -+../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from... -+../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... -+../../lib/autoconf/headers.m4:87: AC_CHECK_HEADER is expanded from... -+aclocal.m4:335: GLIB_WITH_NLS is expanded from... -+aclocal.m4:545: GLIB_GNU_GETTEXT is expanded from... -+aclocal.m4:645: AM_GLIB_GNU_GETTEXT is expanded from... -+configure.in:502: the top level]) -+m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ -+#undef HAVE_BIND_TEXTDOMAIN_CODESET]) -+m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ -+#undef HAVE_BIND_TEXTDOMAIN_CODESET]) -+m4trace:configure.in:502: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^HAVE_GETTEXT$]) -+m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */ -+#undef HAVE_GETTEXT]) -+m4trace:configure.in:502: -1- AC_SUBST([MSGFMT]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([MSGFMT]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^MSGFMT$]) -+m4trace:configure.in:502: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define to 1 if you have the `dcgettext\' function. */ -+#undef HAVE_DCGETTEXT]) -+m4trace:configure.in:502: -1- AC_SUBST([MSGFMT_OPTS]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([MSGFMT_OPTS]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^MSGFMT_OPTS$]) -+m4trace:configure.in:502: -1- AC_SUBST([GMSGFMT]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([GMSGFMT]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^GMSGFMT$]) -+m4trace:configure.in:502: -1- AC_SUBST([XGETTEXT]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([XGETTEXT]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^XGETTEXT$]) -+m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... -+../../lib/autoconf/headers.m4:87: AC_CHECK_HEADER is expanded from... -+aclocal.m4:335: GLIB_WITH_NLS is expanded from... -+aclocal.m4:545: GLIB_GNU_GETTEXT is expanded from... -+aclocal.m4:645: AM_GLIB_GNU_GETTEXT is expanded from... -+configure.in:502: the top level]) -+m4trace:configure.in:502: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^ENABLE_NLS$]) -+m4trace:configure.in:502: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */ -+#undef ENABLE_NLS]) -+m4trace:configure.in:502: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/status.m4:848: AC_OUTPUT_COMMANDS is expanded from... -+aclocal.m4:335: GLIB_WITH_NLS is expanded from... -+aclocal.m4:545: GLIB_GNU_GETTEXT is expanded from... -+aclocal.m4:645: AM_GLIB_GNU_GETTEXT is expanded from... -+configure.in:502: the top level]) -+m4trace:configure.in:502: -1- AC_SUBST([CATALOGS]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([CATALOGS]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^CATALOGS$]) -+m4trace:configure.in:502: -1- AC_SUBST([CATOBJEXT]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([CATOBJEXT]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^CATOBJEXT$]) -+m4trace:configure.in:502: -1- AC_SUBST([DATADIRNAME]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([DATADIRNAME]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^DATADIRNAME$]) -+m4trace:configure.in:502: -1- AC_SUBST([GMOFILES]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([GMOFILES]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^GMOFILES$]) -+m4trace:configure.in:502: -1- AC_SUBST([INSTOBJEXT]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([INSTOBJEXT]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^INSTOBJEXT$]) -+m4trace:configure.in:502: -1- AC_SUBST([INTLLIBS]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([INTLLIBS]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^INTLLIBS$]) -+m4trace:configure.in:502: -1- AC_SUBST([PO_IN_DATADIR_TRUE]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([PO_IN_DATADIR_TRUE]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^PO_IN_DATADIR_TRUE$]) -+m4trace:configure.in:502: -1- AC_SUBST([PO_IN_DATADIR_FALSE]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([PO_IN_DATADIR_FALSE]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^PO_IN_DATADIR_FALSE$]) -+m4trace:configure.in:502: -1- AC_SUBST([POFILES]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([POFILES]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^POFILES$]) -+m4trace:configure.in:502: -1- AC_SUBST([POSUB]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([POSUB]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^POSUB$]) -+m4trace:configure.in:502: -1- AC_SUBST([MKINSTALLDIRS]) -+m4trace:configure.in:502: -1- AC_SUBST_TRACE([MKINSTALLDIRS]) -+m4trace:configure.in:502: -1- m4_pattern_allow([^MKINSTALLDIRS$]) -+m4trace:configure.in:504: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/status.m4:848: AC_OUTPUT_COMMANDS is expanded from... -+configure.in:504: the top level]) -+m4trace:configure.in:508: -1- AC_DEFINE_TRACE_LITERAL([GTK_LOCALEDIR]) -+m4trace:configure.in:508: -1- m4_pattern_allow([^GTK_LOCALEDIR$]) -+m4trace:configure.in:508: -1- AH_OUTPUT([GTK_LOCALEDIR], [/* Define the location where the catalogs will be installed */ -+#undef GTK_LOCALEDIR]) -+m4trace:configure.in:521: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2478: AC_TRY_RUN is expanded from... -+configure.in:521: the top level]) -+m4trace:configure.in:516: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2478: AC_TRY_RUN is expanded from... -+configure.in:516: the top level]) -+m4trace:configure.in:565: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:565: the top level]) -+m4trace:configure.in:561: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:561: the top level]) -+m4trace:configure.in:577: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4trace:configure.in:577: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -+m4trace:configure.in:577: -1- AC_SUBST([PKG_CONFIG]) -+m4trace:configure.in:577: -1- AC_SUBST_TRACE([PKG_CONFIG]) -+m4trace:configure.in:577: -1- m4_pattern_allow([^PKG_CONFIG$]) -+m4trace:configure.in:577: -1- AC_SUBST([PKG_CONFIG]) -+m4trace:configure.in:577: -1- AC_SUBST_TRACE([PKG_CONFIG]) -+m4trace:configure.in:577: -1- m4_pattern_allow([^PKG_CONFIG$]) -+m4trace:configure.in:577: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2478: AC_TRY_RUN is expanded from... -+aclocal.m4:29: AM_PATH_GLIB_2_0 is expanded from... -+configure.in:577: the top level]) -+m4trace:configure.in:577: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+aclocal.m4:29: AM_PATH_GLIB_2_0 is expanded from... -+configure.in:577: the top level]) -+m4trace:configure.in:577: -1- AC_SUBST([GLIB_CFLAGS]) -+m4trace:configure.in:577: -1- AC_SUBST_TRACE([GLIB_CFLAGS]) -+m4trace:configure.in:577: -1- m4_pattern_allow([^GLIB_CFLAGS$]) -+m4trace:configure.in:577: -1- AC_SUBST([GLIB_LIBS]) -+m4trace:configure.in:577: -1- AC_SUBST_TRACE([GLIB_LIBS]) -+m4trace:configure.in:577: -1- m4_pattern_allow([^GLIB_LIBS$]) -+m4trace:configure.in:577: -1- AC_SUBST([GLIB_GENMARSHAL]) -+m4trace:configure.in:577: -1- AC_SUBST_TRACE([GLIB_GENMARSHAL]) -+m4trace:configure.in:577: -1- m4_pattern_allow([^GLIB_GENMARSHAL$]) -+m4trace:configure.in:577: -1- AC_SUBST([GOBJECT_QUERY]) -+m4trace:configure.in:577: -1- AC_SUBST_TRACE([GOBJECT_QUERY]) -+m4trace:configure.in:577: -1- m4_pattern_allow([^GOBJECT_QUERY$]) -+m4trace:configure.in:577: -1- AC_SUBST([GLIB_MKENUMS]) -+m4trace:configure.in:577: -1- AC_SUBST_TRACE([GLIB_MKENUMS]) -+m4trace:configure.in:577: -1- m4_pattern_allow([^GLIB_MKENUMS$]) -+m4trace:configure.in:598: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ -+#undef HAVE_BIND_TEXTDOMAIN_CODESET]) -+m4trace:configure.in:602: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PWD_H]) -+m4trace:configure.in:602: -2- m4_pattern_allow([^HAVE_PWD_H$]) -+m4trace:configure.in:602: -2- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if pwd.h is available */ -+#undef HAVE_PWD_H]) -+m4trace:configure.in:601: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the <pwd.h> header file. */ -+#undef HAVE_PWD_H]) -+m4trace:configure.in:605: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TIME_H]) -+m4trace:configure.in:605: -2- m4_pattern_allow([^HAVE_SYS_TIME_H$]) -+m4trace:configure.in:605: -2- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if time.h is available */ -+#undef HAVE_SYS_TIME_H]) -+m4trace:configure.in:604: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */ -+#undef HAVE_SYS_TIME_H]) -+m4trace:configure.in:608: -2- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H]) -+m4trace:configure.in:608: -2- m4_pattern_allow([^HAVE_UNISTD_H$]) -+m4trace:configure.in:608: -2- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if unistd.h is available */ -+#undef HAVE_UNISTD_H]) -+m4trace:configure.in:607: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */ -+#undef HAVE_UNISTD_H]) -+m4trace:configure.in:611: -2- AC_DEFINE_TRACE_LITERAL([HAVE_FTW_H]) -+m4trace:configure.in:611: -2- m4_pattern_allow([^HAVE_FTW_H$]) -+m4trace:configure.in:611: -2- AH_OUTPUT([HAVE_FTW_H], [/* Define to 1 if ftw.h is available */ -+#undef HAVE_FTW_H]) -+m4trace:configure.in:610: -1- AH_OUTPUT([HAVE_FTW_H], [/* Define to 1 if you have the <ftw.h> header file. */ -+#undef HAVE_FTW_H]) -+m4trace:configure.in:615: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:615: the top level]) -+m4trace:configure.in:620: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GNU_FTW]) -+m4trace:configure.in:620: -1- m4_pattern_allow([^HAVE_GNU_FTW$]) -+m4trace:configure.in:620: -1- AH_OUTPUT([HAVE_GNU_FTW], [/* Have GNU ftw */ -+#undef HAVE_GNU_FTW]) -+m4trace:configure.in:630: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS]) -+m4trace:configure.in:630: -1- m4_pattern_allow([^STDC_HEADERS$]) -+m4trace:configure.in:630: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS]) -+m4trace:configure.in:633: -1- AC_DEFINE_TRACE_LITERAL([const]) -+m4trace:configure.in:633: -1- m4_pattern_allow([^const$]) -+m4trace:configure.in:633: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */ -+#undef const]) -+m4trace:configure.in:636: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE]) -+m4trace:configure.in:636: -1- m4_pattern_allow([^RETSIGTYPE$]) -+m4trace:configure.in:636: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */ -+#undef RETSIGTYPE]) -+m4trace:configure.in:637: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */ -+#undef HAVE_STDLIB_H]) -+m4trace:configure.in:637: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */ -+#undef HAVE_UNISTD_H]) -+m4trace:configure.in:637: -1- AH_OUTPUT([HAVE_GETPAGESIZE], [/* Define to 1 if you have the `getpagesize\' function. */ -+#undef HAVE_GETPAGESIZE]) -+m4trace:configure.in:637: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MMAP]) -+m4trace:configure.in:637: -1- m4_pattern_allow([^HAVE_MMAP$]) -+m4trace:configure.in:637: -1- AH_OUTPUT([HAVE_MMAP], [/* Define to 1 if you have a working `mmap\' system call. */ -+#undef HAVE_MMAP]) -+m4trace:configure.in:639: -1- AH_OUTPUT([HAVE_MALLINFO], [/* Define to 1 if you have the `mallinfo\' function. */ -+#undef HAVE_MALLINFO]) -+m4trace:configure.in:640: -1- AH_OUTPUT([HAVE_GETRESUID], [/* Define to 1 if you have the `getresuid\' function. */ -+#undef HAVE_GETRESUID]) -+m4trace:configure.in:641: -1- AC_DEFINE_TRACE_LITERAL([uid_t]) -+m4trace:configure.in:641: -1- m4_pattern_allow([^uid_t$]) -+m4trace:configure.in:641: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */ -+#undef uid_t]) -+m4trace:configure.in:641: -1- AC_DEFINE_TRACE_LITERAL([gid_t]) -+m4trace:configure.in:641: -1- m4_pattern_allow([^gid_t$]) -+m4trace:configure.in:641: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */ -+#undef gid_t]) -+m4trace:configure.in:645: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:645: the top level]) -+m4trace:configure.in:650: -1- _m4_warn([obsolete], [The macro `AC_HEADER_EGREP' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/oldnames.m4:58: AC_HEADER_EGREP is expanded from... -+configure.in:650: the top level]) -+m4trace:configure.in:652: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_SELECT_H]) -+m4trace:configure.in:652: -1- m4_pattern_allow([^HAVE_SYS_SELECT_H$]) -+m4trace:configure.in:652: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if sys/select.h is available */ -+#undef HAVE_SYS_SELECT_H]) -+m4trace:configure.in:656: -1- AC_DEFINE_TRACE_LITERAL([NO_FD_SET]) -+m4trace:configure.in:656: -1- m4_pattern_allow([^NO_FD_SET$]) -+m4trace:configure.in:656: -1- AH_OUTPUT([NO_FD_SET], [/* Define to 1 if fd_set is not available */ -+#undef NO_FD_SET]) -+m4trace:configure.in:664: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2296: AC_TRY_CPP is expanded from... -+configure.in:664: the top level]) -+m4trace:configure.in:666: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WCHAR_H]) -+m4trace:configure.in:666: -1- m4_pattern_allow([^HAVE_WCHAR_H$]) -+m4trace:configure.in:666: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Have wchar.h include file */ -+#undef HAVE_WCHAR_H]) -+m4trace:configure.in:672: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2296: AC_TRY_CPP is expanded from... -+configure.in:672: the top level]) -+m4trace:configure.in:674: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WCTYPE_H]) -+m4trace:configure.in:674: -1- m4_pattern_allow([^HAVE_WCTYPE_H$]) -+m4trace:configure.in:674: -1- AH_OUTPUT([HAVE_WCTYPE_H], [/* Have wctype.h include file */ -+#undef HAVE_WCTYPE_H]) -+m4trace:configure.in:686: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from... -+configure.in:686: the top level]) -+m4trace:configure.in:703: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BROKEN_WCTYPE]) -+m4trace:configure.in:703: -1- m4_pattern_allow([^HAVE_BROKEN_WCTYPE$]) -+m4trace:configure.in:703: -1- AH_OUTPUT([HAVE_BROKEN_WCTYPE], [/* Is the wctype implementation broken */ -+#undef HAVE_BROKEN_WCTYPE]) -+m4trace:configure.in:707: -1- AC_SUBST([GDK_WLIBS]) -+m4trace:configure.in:707: -1- AC_SUBST_TRACE([GDK_WLIBS]) -+m4trace:configure.in:707: -1- m4_pattern_allow([^GDK_WLIBS$]) -+m4trace:configure.in:711: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2296: AC_TRY_CPP is expanded from... -+configure.in:711: the top level]) -+m4trace:configure.in:713: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UXTHEME_H]) -+m4trace:configure.in:713: -1- m4_pattern_allow([^HAVE_UXTHEME_H$]) -+m4trace:configure.in:713: -1- AH_OUTPUT([HAVE_UXTHEME_H], [/* Have uxtheme.h include file */ -+#undef HAVE_UXTHEME_H]) -+m4trace:configure.in:718: -1- AH_OUTPUT([HAVE_CRT_EXTERNS_H], [/* Define to 1 if you have the <crt_externs.h> header file. */ -+#undef HAVE_CRT_EXTERNS_H]) -+m4trace:configure.in:719: -1- AH_OUTPUT([HAVE__NSGETENVIRON], [/* Define to 1 if you have the `_NSGetEnviron\' function. */ -+#undef HAVE__NSGETENVIRON]) -+m4trace:configure.in:736: -1- AC_DEFINE_TRACE_LITERAL([USE_LA_MODULES]) -+m4trace:configure.in:736: -1- m4_pattern_allow([^USE_LA_MODULES$]) -+m4trace:configure.in:736: -1- AH_OUTPUT([USE_LA_MODULES], [/* Whether to load modules via .la files rather than directly */ -+#undef USE_LA_MODULES]) -+m4trace:configure.in:743: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:743: the top level]) -+m4trace:configure.in:775: -1- AC_DEFINE_TRACE_LITERAL([USE_GMODULE]) -+m4trace:configure.in:775: -1- m4_pattern_allow([^USE_GMODULE$]) -+m4trace:configure.in:775: -1- AH_OUTPUT([USE_GMODULE], [/* Define to 1 if gmodule works and should be used */ -+#undef USE_GMODULE]) -+m4trace:configure.in:786: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+configure.in:786: the top level]) -+m4trace:configure.in:789: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+configure.in:789: the top level]) -+m4trace:configure.in:792: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+configure.in:792: the top level]) -+m4trace:configure.in:795: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from... -+configure.in:795: the top level]) -+m4trace:configure.in:799: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:799: the top level]) -+m4trace:configure.in:803: -1- AM_CONDITIONAL([BUILD_GDIPLUS_LOADERS], [ test x$os_win32 = xyes && test x$enable_gdiplus != xno ]) -+m4trace:configure.in:803: -1- AC_SUBST([BUILD_GDIPLUS_LOADERS_TRUE]) -+m4trace:configure.in:803: -1- AC_SUBST_TRACE([BUILD_GDIPLUS_LOADERS_TRUE]) -+m4trace:configure.in:803: -1- m4_pattern_allow([^BUILD_GDIPLUS_LOADERS_TRUE$]) -+m4trace:configure.in:803: -1- AC_SUBST([BUILD_GDIPLUS_LOADERS_FALSE]) -+m4trace:configure.in:803: -1- AC_SUBST_TRACE([BUILD_GDIPLUS_LOADERS_FALSE]) -+m4trace:configure.in:803: -1- m4_pattern_allow([^BUILD_GDIPLUS_LOADERS_FALSE$]) -+m4trace:configure.in:803: -1- _AM_SUBST_NOTMAKE([BUILD_GDIPLUS_LOADERS_TRUE]) -+m4trace:configure.in:803: -1- _AM_SUBST_NOTMAKE([BUILD_GDIPLUS_LOADERS_FALSE]) -+m4trace:configure.in:840: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2296: AC_TRY_CPP is expanded from... -+configure.in:840: the top level]) -+m4trace:configure.in:852: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PROGRESSIVE_JPEG]) -+m4trace:configure.in:852: -2- m4_pattern_allow([^HAVE_PROGRESSIVE_JPEG$]) -+m4trace:configure.in:852: -2- AH_OUTPUT([HAVE_PROGRESSIVE_JPEG], [/* Define to 1 is libjpeg supports progressive JPEG */ -+#undef HAVE_PROGRESSIVE_JPEG]) -+m4trace:configure.in:886: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:886: the top level]) -+m4trace:configure.in:921: -1- AC_SUBST([LIBTIFF]) -+m4trace:configure.in:921: -1- AC_SUBST_TRACE([LIBTIFF]) -+m4trace:configure.in:921: -1- m4_pattern_allow([^LIBTIFF$]) -+m4trace:configure.in:922: -1- AC_SUBST([LIBJPEG]) -+m4trace:configure.in:922: -1- AC_SUBST_TRACE([LIBJPEG]) -+m4trace:configure.in:922: -1- m4_pattern_allow([^LIBJPEG$]) -+m4trace:configure.in:923: -1- AC_SUBST([LIBPNG]) -+m4trace:configure.in:923: -1- AC_SUBST_TRACE([LIBPNG]) -+m4trace:configure.in:923: -1- m4_pattern_allow([^LIBPNG$]) -+m4trace:configure.in:924: -1- AC_SUBST([LIBJASPER]) -+m4trace:configure.in:924: -1- AC_SUBST_TRACE([LIBJASPER]) -+m4trace:configure.in:924: -1- m4_pattern_allow([^LIBJASPER$]) -+m4trace:configure.in:926: -1- AM_CONDITIONAL([BUILD_DYNAMIC_MODULES], [$dynworks]) -+m4trace:configure.in:926: -1- AC_SUBST([BUILD_DYNAMIC_MODULES_TRUE]) -+m4trace:configure.in:926: -1- AC_SUBST_TRACE([BUILD_DYNAMIC_MODULES_TRUE]) -+m4trace:configure.in:926: -1- m4_pattern_allow([^BUILD_DYNAMIC_MODULES_TRUE$]) -+m4trace:configure.in:926: -1- AC_SUBST([BUILD_DYNAMIC_MODULES_FALSE]) -+m4trace:configure.in:926: -1- AC_SUBST_TRACE([BUILD_DYNAMIC_MODULES_FALSE]) -+m4trace:configure.in:926: -1- m4_pattern_allow([^BUILD_DYNAMIC_MODULES_FALSE$]) -+m4trace:configure.in:926: -1- _AM_SUBST_NOTMAKE([BUILD_DYNAMIC_MODULES_TRUE]) -+m4trace:configure.in:926: -1- _AM_SUBST_NOTMAKE([BUILD_DYNAMIC_MODULES_FALSE]) -+m4trace:configure.in:1006: -1- AC_SUBST([INCLUDED_LOADER_OBJ]) -+m4trace:configure.in:1006: -1- AC_SUBST_TRACE([INCLUDED_LOADER_OBJ]) -+m4trace:configure.in:1006: -1- m4_pattern_allow([^INCLUDED_LOADER_OBJ$]) -+m4trace:configure.in:1007: -1- AC_SUBST([INCLUDED_LOADER_DEFINE]) -+m4trace:configure.in:1007: -1- AC_SUBST_TRACE([INCLUDED_LOADER_DEFINE]) -+m4trace:configure.in:1007: -1- m4_pattern_allow([^INCLUDED_LOADER_DEFINE$]) -+m4trace:configure.in:1009: -1- AM_CONDITIONAL([INCLUDE_PNG], [test x"$INCLUDE_png" = xyes]) -+m4trace:configure.in:1009: -1- AC_SUBST([INCLUDE_PNG_TRUE]) -+m4trace:configure.in:1009: -1- AC_SUBST_TRACE([INCLUDE_PNG_TRUE]) -+m4trace:configure.in:1009: -1- m4_pattern_allow([^INCLUDE_PNG_TRUE$]) -+m4trace:configure.in:1009: -1- AC_SUBST([INCLUDE_PNG_FALSE]) -+m4trace:configure.in:1009: -1- AC_SUBST_TRACE([INCLUDE_PNG_FALSE]) -+m4trace:configure.in:1009: -1- m4_pattern_allow([^INCLUDE_PNG_FALSE$]) -+m4trace:configure.in:1009: -1- _AM_SUBST_NOTMAKE([INCLUDE_PNG_TRUE]) -+m4trace:configure.in:1009: -1- _AM_SUBST_NOTMAKE([INCLUDE_PNG_FALSE]) -+m4trace:configure.in:1010: -1- AM_CONDITIONAL([INCLUDE_BMP], [test x"$INCLUDE_bmp" = xyes]) -+m4trace:configure.in:1010: -1- AC_SUBST([INCLUDE_BMP_TRUE]) -+m4trace:configure.in:1010: -1- AC_SUBST_TRACE([INCLUDE_BMP_TRUE]) -+m4trace:configure.in:1010: -1- m4_pattern_allow([^INCLUDE_BMP_TRUE$]) -+m4trace:configure.in:1010: -1- AC_SUBST([INCLUDE_BMP_FALSE]) -+m4trace:configure.in:1010: -1- AC_SUBST_TRACE([INCLUDE_BMP_FALSE]) -+m4trace:configure.in:1010: -1- m4_pattern_allow([^INCLUDE_BMP_FALSE$]) -+m4trace:configure.in:1010: -1- _AM_SUBST_NOTMAKE([INCLUDE_BMP_TRUE]) -+m4trace:configure.in:1010: -1- _AM_SUBST_NOTMAKE([INCLUDE_BMP_FALSE]) -+m4trace:configure.in:1011: -1- AM_CONDITIONAL([INCLUDE_WBMP], [test x"$INCLUDE_wbmp" = xyes]) -+m4trace:configure.in:1011: -1- AC_SUBST([INCLUDE_WBMP_TRUE]) -+m4trace:configure.in:1011: -1- AC_SUBST_TRACE([INCLUDE_WBMP_TRUE]) -+m4trace:configure.in:1011: -1- m4_pattern_allow([^INCLUDE_WBMP_TRUE$]) -+m4trace:configure.in:1011: -1- AC_SUBST([INCLUDE_WBMP_FALSE]) -+m4trace:configure.in:1011: -1- AC_SUBST_TRACE([INCLUDE_WBMP_FALSE]) -+m4trace:configure.in:1011: -1- m4_pattern_allow([^INCLUDE_WBMP_FALSE$]) -+m4trace:configure.in:1011: -1- _AM_SUBST_NOTMAKE([INCLUDE_WBMP_TRUE]) -+m4trace:configure.in:1011: -1- _AM_SUBST_NOTMAKE([INCLUDE_WBMP_FALSE]) -+m4trace:configure.in:1012: -1- AM_CONDITIONAL([INCLUDE_GIF], [test x"$INCLUDE_gif" = xyes]) -+m4trace:configure.in:1012: -1- AC_SUBST([INCLUDE_GIF_TRUE]) -+m4trace:configure.in:1012: -1- AC_SUBST_TRACE([INCLUDE_GIF_TRUE]) -+m4trace:configure.in:1012: -1- m4_pattern_allow([^INCLUDE_GIF_TRUE$]) -+m4trace:configure.in:1012: -1- AC_SUBST([INCLUDE_GIF_FALSE]) -+m4trace:configure.in:1012: -1- AC_SUBST_TRACE([INCLUDE_GIF_FALSE]) -+m4trace:configure.in:1012: -1- m4_pattern_allow([^INCLUDE_GIF_FALSE$]) -+m4trace:configure.in:1012: -1- _AM_SUBST_NOTMAKE([INCLUDE_GIF_TRUE]) -+m4trace:configure.in:1012: -1- _AM_SUBST_NOTMAKE([INCLUDE_GIF_FALSE]) -+m4trace:configure.in:1013: -1- AM_CONDITIONAL([INCLUDE_ICO], [test x"$INCLUDE_ico" = xyes]) -+m4trace:configure.in:1013: -1- AC_SUBST([INCLUDE_ICO_TRUE]) -+m4trace:configure.in:1013: -1- AC_SUBST_TRACE([INCLUDE_ICO_TRUE]) -+m4trace:configure.in:1013: -1- m4_pattern_allow([^INCLUDE_ICO_TRUE$]) -+m4trace:configure.in:1013: -1- AC_SUBST([INCLUDE_ICO_FALSE]) -+m4trace:configure.in:1013: -1- AC_SUBST_TRACE([INCLUDE_ICO_FALSE]) -+m4trace:configure.in:1013: -1- m4_pattern_allow([^INCLUDE_ICO_FALSE$]) -+m4trace:configure.in:1013: -1- _AM_SUBST_NOTMAKE([INCLUDE_ICO_TRUE]) -+m4trace:configure.in:1013: -1- _AM_SUBST_NOTMAKE([INCLUDE_ICO_FALSE]) -+m4trace:configure.in:1014: -1- AM_CONDITIONAL([INCLUDE_ANI], [test x"$INCLUDE_ani" = xyes]) -+m4trace:configure.in:1014: -1- AC_SUBST([INCLUDE_ANI_TRUE]) -+m4trace:configure.in:1014: -1- AC_SUBST_TRACE([INCLUDE_ANI_TRUE]) -+m4trace:configure.in:1014: -1- m4_pattern_allow([^INCLUDE_ANI_TRUE$]) -+m4trace:configure.in:1014: -1- AC_SUBST([INCLUDE_ANI_FALSE]) -+m4trace:configure.in:1014: -1- AC_SUBST_TRACE([INCLUDE_ANI_FALSE]) -+m4trace:configure.in:1014: -1- m4_pattern_allow([^INCLUDE_ANI_FALSE$]) -+m4trace:configure.in:1014: -1- _AM_SUBST_NOTMAKE([INCLUDE_ANI_TRUE]) -+m4trace:configure.in:1014: -1- _AM_SUBST_NOTMAKE([INCLUDE_ANI_FALSE]) -+m4trace:configure.in:1015: -1- AM_CONDITIONAL([INCLUDE_JPEG], [test x"$INCLUDE_jpeg" = xyes]) -+m4trace:configure.in:1015: -1- AC_SUBST([INCLUDE_JPEG_TRUE]) -+m4trace:configure.in:1015: -1- AC_SUBST_TRACE([INCLUDE_JPEG_TRUE]) -+m4trace:configure.in:1015: -1- m4_pattern_allow([^INCLUDE_JPEG_TRUE$]) -+m4trace:configure.in:1015: -1- AC_SUBST([INCLUDE_JPEG_FALSE]) -+m4trace:configure.in:1015: -1- AC_SUBST_TRACE([INCLUDE_JPEG_FALSE]) -+m4trace:configure.in:1015: -1- m4_pattern_allow([^INCLUDE_JPEG_FALSE$]) -+m4trace:configure.in:1015: -1- _AM_SUBST_NOTMAKE([INCLUDE_JPEG_TRUE]) -+m4trace:configure.in:1015: -1- _AM_SUBST_NOTMAKE([INCLUDE_JPEG_FALSE]) -+m4trace:configure.in:1016: -1- AM_CONDITIONAL([INCLUDE_PNM], [test x"$INCLUDE_pnm" = xyes]) -+m4trace:configure.in:1016: -1- AC_SUBST([INCLUDE_PNM_TRUE]) -+m4trace:configure.in:1016: -1- AC_SUBST_TRACE([INCLUDE_PNM_TRUE]) -+m4trace:configure.in:1016: -1- m4_pattern_allow([^INCLUDE_PNM_TRUE$]) -+m4trace:configure.in:1016: -1- AC_SUBST([INCLUDE_PNM_FALSE]) -+m4trace:configure.in:1016: -1- AC_SUBST_TRACE([INCLUDE_PNM_FALSE]) -+m4trace:configure.in:1016: -1- m4_pattern_allow([^INCLUDE_PNM_FALSE$]) -+m4trace:configure.in:1016: -1- _AM_SUBST_NOTMAKE([INCLUDE_PNM_TRUE]) -+m4trace:configure.in:1016: -1- _AM_SUBST_NOTMAKE([INCLUDE_PNM_FALSE]) -+m4trace:configure.in:1017: -1- AM_CONDITIONAL([INCLUDE_RAS], [test x"$INCLUDE_ras" = xyes]) -+m4trace:configure.in:1017: -1- AC_SUBST([INCLUDE_RAS_TRUE]) -+m4trace:configure.in:1017: -1- AC_SUBST_TRACE([INCLUDE_RAS_TRUE]) -+m4trace:configure.in:1017: -1- m4_pattern_allow([^INCLUDE_RAS_TRUE$]) -+m4trace:configure.in:1017: -1- AC_SUBST([INCLUDE_RAS_FALSE]) -+m4trace:configure.in:1017: -1- AC_SUBST_TRACE([INCLUDE_RAS_FALSE]) -+m4trace:configure.in:1017: -1- m4_pattern_allow([^INCLUDE_RAS_FALSE$]) -+m4trace:configure.in:1017: -1- _AM_SUBST_NOTMAKE([INCLUDE_RAS_TRUE]) -+m4trace:configure.in:1017: -1- _AM_SUBST_NOTMAKE([INCLUDE_RAS_FALSE]) -+m4trace:configure.in:1018: -1- AM_CONDITIONAL([INCLUDE_TIFF], [test x"$INCLUDE_tiff" = xyes]) -+m4trace:configure.in:1018: -1- AC_SUBST([INCLUDE_TIFF_TRUE]) -+m4trace:configure.in:1018: -1- AC_SUBST_TRACE([INCLUDE_TIFF_TRUE]) -+m4trace:configure.in:1018: -1- m4_pattern_allow([^INCLUDE_TIFF_TRUE$]) -+m4trace:configure.in:1018: -1- AC_SUBST([INCLUDE_TIFF_FALSE]) -+m4trace:configure.in:1018: -1- AC_SUBST_TRACE([INCLUDE_TIFF_FALSE]) -+m4trace:configure.in:1018: -1- m4_pattern_allow([^INCLUDE_TIFF_FALSE$]) -+m4trace:configure.in:1018: -1- _AM_SUBST_NOTMAKE([INCLUDE_TIFF_TRUE]) -+m4trace:configure.in:1018: -1- _AM_SUBST_NOTMAKE([INCLUDE_TIFF_FALSE]) -+m4trace:configure.in:1019: -1- AM_CONDITIONAL([INCLUDE_XPM], [test x"$INCLUDE_xpm" = xyes]) -+m4trace:configure.in:1019: -1- AC_SUBST([INCLUDE_XPM_TRUE]) -+m4trace:configure.in:1019: -1- AC_SUBST_TRACE([INCLUDE_XPM_TRUE]) -+m4trace:configure.in:1019: -1- m4_pattern_allow([^INCLUDE_XPM_TRUE$]) -+m4trace:configure.in:1019: -1- AC_SUBST([INCLUDE_XPM_FALSE]) -+m4trace:configure.in:1019: -1- AC_SUBST_TRACE([INCLUDE_XPM_FALSE]) -+m4trace:configure.in:1019: -1- m4_pattern_allow([^INCLUDE_XPM_FALSE$]) -+m4trace:configure.in:1019: -1- _AM_SUBST_NOTMAKE([INCLUDE_XPM_TRUE]) -+m4trace:configure.in:1019: -1- _AM_SUBST_NOTMAKE([INCLUDE_XPM_FALSE]) -+m4trace:configure.in:1020: -1- AM_CONDITIONAL([INCLUDE_XBM], [test x"$INCLUDE_xbm" = xyes]) -+m4trace:configure.in:1020: -1- AC_SUBST([INCLUDE_XBM_TRUE]) -+m4trace:configure.in:1020: -1- AC_SUBST_TRACE([INCLUDE_XBM_TRUE]) -+m4trace:configure.in:1020: -1- m4_pattern_allow([^INCLUDE_XBM_TRUE$]) -+m4trace:configure.in:1020: -1- AC_SUBST([INCLUDE_XBM_FALSE]) -+m4trace:configure.in:1020: -1- AC_SUBST_TRACE([INCLUDE_XBM_FALSE]) -+m4trace:configure.in:1020: -1- m4_pattern_allow([^INCLUDE_XBM_FALSE$]) -+m4trace:configure.in:1020: -1- _AM_SUBST_NOTMAKE([INCLUDE_XBM_TRUE]) -+m4trace:configure.in:1020: -1- _AM_SUBST_NOTMAKE([INCLUDE_XBM_FALSE]) -+m4trace:configure.in:1021: -1- AM_CONDITIONAL([INCLUDE_TGA], [test x"$INCLUDE_tga" = xyes]) -+m4trace:configure.in:1021: -1- AC_SUBST([INCLUDE_TGA_TRUE]) -+m4trace:configure.in:1021: -1- AC_SUBST_TRACE([INCLUDE_TGA_TRUE]) -+m4trace:configure.in:1021: -1- m4_pattern_allow([^INCLUDE_TGA_TRUE$]) -+m4trace:configure.in:1021: -1- AC_SUBST([INCLUDE_TGA_FALSE]) -+m4trace:configure.in:1021: -1- AC_SUBST_TRACE([INCLUDE_TGA_FALSE]) -+m4trace:configure.in:1021: -1- m4_pattern_allow([^INCLUDE_TGA_FALSE$]) -+m4trace:configure.in:1021: -1- _AM_SUBST_NOTMAKE([INCLUDE_TGA_TRUE]) -+m4trace:configure.in:1021: -1- _AM_SUBST_NOTMAKE([INCLUDE_TGA_FALSE]) -+m4trace:configure.in:1022: -1- AM_CONDITIONAL([INCLUDE_PCX], [test x"$INCLUDE_pcx" = xyes]) -+m4trace:configure.in:1022: -1- AC_SUBST([INCLUDE_PCX_TRUE]) -+m4trace:configure.in:1022: -1- AC_SUBST_TRACE([INCLUDE_PCX_TRUE]) -+m4trace:configure.in:1022: -1- m4_pattern_allow([^INCLUDE_PCX_TRUE$]) -+m4trace:configure.in:1022: -1- AC_SUBST([INCLUDE_PCX_FALSE]) -+m4trace:configure.in:1022: -1- AC_SUBST_TRACE([INCLUDE_PCX_FALSE]) -+m4trace:configure.in:1022: -1- m4_pattern_allow([^INCLUDE_PCX_FALSE$]) -+m4trace:configure.in:1022: -1- _AM_SUBST_NOTMAKE([INCLUDE_PCX_TRUE]) -+m4trace:configure.in:1022: -1- _AM_SUBST_NOTMAKE([INCLUDE_PCX_FALSE]) -+m4trace:configure.in:1023: -1- AM_CONDITIONAL([INCLUDE_ICNS], [test x"$INCLUDE_icns" = xyes]) -+m4trace:configure.in:1023: -1- AC_SUBST([INCLUDE_ICNS_TRUE]) -+m4trace:configure.in:1023: -1- AC_SUBST_TRACE([INCLUDE_ICNS_TRUE]) -+m4trace:configure.in:1023: -1- m4_pattern_allow([^INCLUDE_ICNS_TRUE$]) -+m4trace:configure.in:1023: -1- AC_SUBST([INCLUDE_ICNS_FALSE]) -+m4trace:configure.in:1023: -1- AC_SUBST_TRACE([INCLUDE_ICNS_FALSE]) -+m4trace:configure.in:1023: -1- m4_pattern_allow([^INCLUDE_ICNS_FALSE$]) -+m4trace:configure.in:1023: -1- _AM_SUBST_NOTMAKE([INCLUDE_ICNS_TRUE]) -+m4trace:configure.in:1023: -1- _AM_SUBST_NOTMAKE([INCLUDE_ICNS_FALSE]) -+m4trace:configure.in:1024: -1- AM_CONDITIONAL([INCLUDE_JASPER], [test x"$INCLUDE_jasper" = xyes]) -+m4trace:configure.in:1024: -1- AC_SUBST([INCLUDE_JASPER_TRUE]) -+m4trace:configure.in:1024: -1- AC_SUBST_TRACE([INCLUDE_JASPER_TRUE]) -+m4trace:configure.in:1024: -1- m4_pattern_allow([^INCLUDE_JASPER_TRUE$]) -+m4trace:configure.in:1024: -1- AC_SUBST([INCLUDE_JASPER_FALSE]) -+m4trace:configure.in:1024: -1- AC_SUBST_TRACE([INCLUDE_JASPER_FALSE]) -+m4trace:configure.in:1024: -1- m4_pattern_allow([^INCLUDE_JASPER_FALSE$]) -+m4trace:configure.in:1024: -1- _AM_SUBST_NOTMAKE([INCLUDE_JASPER_TRUE]) -+m4trace:configure.in:1024: -1- _AM_SUBST_NOTMAKE([INCLUDE_JASPER_FALSE]) -+m4trace:configure.in:1027: -1- AM_CONDITIONAL([INCLUDE_GDIPLUS], [test x"$INCLUDE_gdip_ico" = xyes]) -+m4trace:configure.in:1027: -1- AC_SUBST([INCLUDE_GDIPLUS_TRUE]) -+m4trace:configure.in:1027: -1- AC_SUBST_TRACE([INCLUDE_GDIPLUS_TRUE]) -+m4trace:configure.in:1027: -1- m4_pattern_allow([^INCLUDE_GDIPLUS_TRUE$]) -+m4trace:configure.in:1027: -1- AC_SUBST([INCLUDE_GDIPLUS_FALSE]) -+m4trace:configure.in:1027: -1- AC_SUBST_TRACE([INCLUDE_GDIPLUS_FALSE]) -+m4trace:configure.in:1027: -1- m4_pattern_allow([^INCLUDE_GDIPLUS_FALSE$]) -+m4trace:configure.in:1027: -1- _AM_SUBST_NOTMAKE([INCLUDE_GDIPLUS_TRUE]) -+m4trace:configure.in:1027: -1- _AM_SUBST_NOTMAKE([INCLUDE_GDIPLUS_FALSE]) -+m4trace:configure.in:1035: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [../../lib/autoconf/general.m4:2462: AC_RUN_IFELSE is expanded from... -+configure.in:1035: the top level]) -+m4trace:configure.in:1035: -1- AC_DEFINE_TRACE_LITERAL([GDK_PIXBUF_USE_GIO_MIME]) -+m4trace:configure.in:1035: -1- m4_pattern_allow([^GDK_PIXBUF_USE_GIO_MIME$]) -+m4trace:configure.in:1035: -1- AH_OUTPUT([GDK_PIXBUF_USE_GIO_MIME], [/* Define if gio can sniff image data */ -+#undef GDK_PIXBUF_USE_GIO_MIME]) -+m4trace:configure.in:1112: -1- AM_CONDITIONAL([HAVE_INCLUDED_IMMMODULES], [test "x$included_immodules" != x]) -+m4trace:configure.in:1112: -1- AC_SUBST([HAVE_INCLUDED_IMMMODULES_TRUE]) -+m4trace:configure.in:1112: -1- AC_SUBST_TRACE([HAVE_INCLUDED_IMMMODULES_TRUE]) -+m4trace:configure.in:1112: -1- m4_pattern_allow([^HAVE_INCLUDED_IMMMODULES_TRUE$]) -+m4trace:configure.in:1112: -1- AC_SUBST([HAVE_INCLUDED_IMMMODULES_FALSE]) -+m4trace:configure.in:1112: -1- AC_SUBST_TRACE([HAVE_INCLUDED_IMMMODULES_FALSE]) -+m4trace:configure.in:1112: -1- m4_pattern_allow([^HAVE_INCLUDED_IMMMODULES_FALSE$]) -+m4trace:configure.in:1112: -1- _AM_SUBST_NOTMAKE([HAVE_INCLUDED_IMMMODULES_TRUE]) -+m4trace:configure.in:1112: -1- _AM_SUBST_NOTMAKE([HAVE_INCLUDED_IMMMODULES_FALSE]) -+m4trace:configure.in:1131: -1- AC_SUBST([INCLUDED_IMMODULE_OBJ]) -+m4trace:configure.in:1131: -1- AC_SUBST_TRACE([INCLUDED_IMMODULE_OBJ]) -+m4trace:configure.in:1131: -1- m4_pattern_allow([^INCLUDED_IMMODULE_OBJ$]) -+m4trace:configure.in:1132: -1- AC_SUBST([INCLUDED_IMMODULE_DEFINE]) -+m4trace:configure.in:1132: -1- AC_SUBST_TRACE([INCLUDED_IMMODULE_DEFINE]) -+m4trace:configure.in:1132: -1- m4_pattern_allow([^INCLUDED_IMMODULE_DEFINE$]) -+m4trace:configure.in:1134: -1- AM_CONDITIONAL([INCLUDE_IM_AM_ET], [test x"$INCLUDE_am_et" = xyes]) -+m4trace:configure.in:1134: -1- AC_SUBST([INCLUDE_IM_AM_ET_TRUE]) -+m4trace:configure.in:1134: -1- AC_SUBST_TRACE([INCLUDE_IM_AM_ET_TRUE]) -+m4trace:configure.in:1134: -1- m4_pattern_allow([^INCLUDE_IM_AM_ET_TRUE$]) -+m4trace:configure.in:1134: -1- AC_SUBST([INCLUDE_IM_AM_ET_FALSE]) -+m4trace:configure.in:1134: -1- AC_SUBST_TRACE([INCLUDE_IM_AM_ET_FALSE]) -+m4trace:configure.in:1134: -1- m4_pattern_allow([^INCLUDE_IM_AM_ET_FALSE$]) -+m4trace:configure.in:1134: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_AM_ET_TRUE]) -+m4trace:configure.in:1134: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_AM_ET_FALSE]) -+m4trace:configure.in:1135: -1- AM_CONDITIONAL([INCLUDE_IM_CEDILLA], [test x"$INCLUDE_cedilla" = xyes]) -+m4trace:configure.in:1135: -1- AC_SUBST([INCLUDE_IM_CEDILLA_TRUE]) -+m4trace:configure.in:1135: -1- AC_SUBST_TRACE([INCLUDE_IM_CEDILLA_TRUE]) -+m4trace:configure.in:1135: -1- m4_pattern_allow([^INCLUDE_IM_CEDILLA_TRUE$]) -+m4trace:configure.in:1135: -1- AC_SUBST([INCLUDE_IM_CEDILLA_FALSE]) -+m4trace:configure.in:1135: -1- AC_SUBST_TRACE([INCLUDE_IM_CEDILLA_FALSE]) -+m4trace:configure.in:1135: -1- m4_pattern_allow([^INCLUDE_IM_CEDILLA_FALSE$]) -+m4trace:configure.in:1135: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_CEDILLA_TRUE]) -+m4trace:configure.in:1135: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_CEDILLA_FALSE]) -+m4trace:configure.in:1136: -1- AM_CONDITIONAL([INCLUDE_IM_CYRILLIC_TRANSLIT], [test x"$INCLUDE_cyrillic_translit" = xyes]) -+m4trace:configure.in:1136: -1- AC_SUBST([INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE]) -+m4trace:configure.in:1136: -1- AC_SUBST_TRACE([INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE]) -+m4trace:configure.in:1136: -1- m4_pattern_allow([^INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE$]) -+m4trace:configure.in:1136: -1- AC_SUBST([INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE]) -+m4trace:configure.in:1136: -1- AC_SUBST_TRACE([INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE]) -+m4trace:configure.in:1136: -1- m4_pattern_allow([^INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE$]) -+m4trace:configure.in:1136: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE]) -+m4trace:configure.in:1136: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE]) -+m4trace:configure.in:1137: -1- AM_CONDITIONAL([INCLUDE_IM_IME], [test x"$INCLUDE_ime" = xyes]) -+m4trace:configure.in:1137: -1- AC_SUBST([INCLUDE_IM_IME_TRUE]) -+m4trace:configure.in:1137: -1- AC_SUBST_TRACE([INCLUDE_IM_IME_TRUE]) -+m4trace:configure.in:1137: -1- m4_pattern_allow([^INCLUDE_IM_IME_TRUE$]) -+m4trace:configure.in:1137: -1- AC_SUBST([INCLUDE_IM_IME_FALSE]) -+m4trace:configure.in:1137: -1- AC_SUBST_TRACE([INCLUDE_IM_IME_FALSE]) -+m4trace:configure.in:1137: -1- m4_pattern_allow([^INCLUDE_IM_IME_FALSE$]) -+m4trace:configure.in:1137: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_IME_TRUE]) -+m4trace:configure.in:1137: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_IME_FALSE]) -+m4trace:configure.in:1138: -1- AM_CONDITIONAL([INCLUDE_IM_INUKTITUT], [test x"$INCLUDE_inuktitut" = xyes]) -+m4trace:configure.in:1138: -1- AC_SUBST([INCLUDE_IM_INUKTITUT_TRUE]) -+m4trace:configure.in:1138: -1- AC_SUBST_TRACE([INCLUDE_IM_INUKTITUT_TRUE]) -+m4trace:configure.in:1138: -1- m4_pattern_allow([^INCLUDE_IM_INUKTITUT_TRUE$]) -+m4trace:configure.in:1138: -1- AC_SUBST([INCLUDE_IM_INUKTITUT_FALSE]) -+m4trace:configure.in:1138: -1- AC_SUBST_TRACE([INCLUDE_IM_INUKTITUT_FALSE]) -+m4trace:configure.in:1138: -1- m4_pattern_allow([^INCLUDE_IM_INUKTITUT_FALSE$]) -+m4trace:configure.in:1138: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_INUKTITUT_TRUE]) -+m4trace:configure.in:1138: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_INUKTITUT_FALSE]) -+m4trace:configure.in:1139: -1- AM_CONDITIONAL([INCLUDE_IM_IPA], [test x"$INCLUDE_ipa" = xyes]) -+m4trace:configure.in:1139: -1- AC_SUBST([INCLUDE_IM_IPA_TRUE]) -+m4trace:configure.in:1139: -1- AC_SUBST_TRACE([INCLUDE_IM_IPA_TRUE]) -+m4trace:configure.in:1139: -1- m4_pattern_allow([^INCLUDE_IM_IPA_TRUE$]) -+m4trace:configure.in:1139: -1- AC_SUBST([INCLUDE_IM_IPA_FALSE]) -+m4trace:configure.in:1139: -1- AC_SUBST_TRACE([INCLUDE_IM_IPA_FALSE]) -+m4trace:configure.in:1139: -1- m4_pattern_allow([^INCLUDE_IM_IPA_FALSE$]) -+m4trace:configure.in:1139: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_IPA_TRUE]) -+m4trace:configure.in:1139: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_IPA_FALSE]) -+m4trace:configure.in:1140: -1- AM_CONDITIONAL([INCLUDE_IM_MULTIPRESS], [test x"$INCLUDE_multipress" = xyes]) -+m4trace:configure.in:1140: -1- AC_SUBST([INCLUDE_IM_MULTIPRESS_TRUE]) -+m4trace:configure.in:1140: -1- AC_SUBST_TRACE([INCLUDE_IM_MULTIPRESS_TRUE]) -+m4trace:configure.in:1140: -1- m4_pattern_allow([^INCLUDE_IM_MULTIPRESS_TRUE$]) -+m4trace:configure.in:1140: -1- AC_SUBST([INCLUDE_IM_MULTIPRESS_FALSE]) -+m4trace:configure.in:1140: -1- AC_SUBST_TRACE([INCLUDE_IM_MULTIPRESS_FALSE]) -+m4trace:configure.in:1140: -1- m4_pattern_allow([^INCLUDE_IM_MULTIPRESS_FALSE$]) -+m4trace:configure.in:1140: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_MULTIPRESS_TRUE]) -+m4trace:configure.in:1140: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_MULTIPRESS_FALSE]) -+m4trace:configure.in:1141: -1- AM_CONDITIONAL([INCLUDE_IM_THAI], [test x"$INCLUDE_thai" = xyes]) -+m4trace:configure.in:1141: -1- AC_SUBST([INCLUDE_IM_THAI_TRUE]) -+m4trace:configure.in:1141: -1- AC_SUBST_TRACE([INCLUDE_IM_THAI_TRUE]) -+m4trace:configure.in:1141: -1- m4_pattern_allow([^INCLUDE_IM_THAI_TRUE$]) -+m4trace:configure.in:1141: -1- AC_SUBST([INCLUDE_IM_THAI_FALSE]) -+m4trace:configure.in:1141: -1- AC_SUBST_TRACE([INCLUDE_IM_THAI_FALSE]) -+m4trace:configure.in:1141: -1- m4_pattern_allow([^INCLUDE_IM_THAI_FALSE$]) -+m4trace:configure.in:1141: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_THAI_TRUE]) -+m4trace:configure.in:1141: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_THAI_FALSE]) -+m4trace:configure.in:1142: -1- AM_CONDITIONAL([INCLUDE_IM_TI_ER], [test x"$INCLUDE_ti_er" = xyes]) -+m4trace:configure.in:1142: -1- AC_SUBST([INCLUDE_IM_TI_ER_TRUE]) -+m4trace:configure.in:1142: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ER_TRUE]) -+m4trace:configure.in:1142: -1- m4_pattern_allow([^INCLUDE_IM_TI_ER_TRUE$]) -+m4trace:configure.in:1142: -1- AC_SUBST([INCLUDE_IM_TI_ER_FALSE]) -+m4trace:configure.in:1142: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ER_FALSE]) -+m4trace:configure.in:1142: -1- m4_pattern_allow([^INCLUDE_IM_TI_ER_FALSE$]) -+m4trace:configure.in:1142: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_TI_ER_TRUE]) -+m4trace:configure.in:1142: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_TI_ER_FALSE]) -+m4trace:configure.in:1143: -1- AM_CONDITIONAL([INCLUDE_IM_TI_ET], [test x"$INCLUDE_ti_et" = xyes]) -+m4trace:configure.in:1143: -1- AC_SUBST([INCLUDE_IM_TI_ET_TRUE]) -+m4trace:configure.in:1143: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ET_TRUE]) -+m4trace:configure.in:1143: -1- m4_pattern_allow([^INCLUDE_IM_TI_ET_TRUE$]) -+m4trace:configure.in:1143: -1- AC_SUBST([INCLUDE_IM_TI_ET_FALSE]) -+m4trace:configure.in:1143: -1- AC_SUBST_TRACE([INCLUDE_IM_TI_ET_FALSE]) -+m4trace:configure.in:1143: -1- m4_pattern_allow([^INCLUDE_IM_TI_ET_FALSE$]) -+m4trace:configure.in:1143: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_TI_ET_TRUE]) -+m4trace:configure.in:1143: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_TI_ET_FALSE]) -+m4trace:configure.in:1144: -1- AM_CONDITIONAL([INCLUDE_IM_VIQR], [test x"$INCLUDE_viqr" = xyes]) -+m4trace:configure.in:1144: -1- AC_SUBST([INCLUDE_IM_VIQR_TRUE]) -+m4trace:configure.in:1144: -1- AC_SUBST_TRACE([INCLUDE_IM_VIQR_TRUE]) -+m4trace:configure.in:1144: -1- m4_pattern_allow([^INCLUDE_IM_VIQR_TRUE$]) -+m4trace:configure.in:1144: -1- AC_SUBST([INCLUDE_IM_VIQR_FALSE]) -+m4trace:configure.in:1144: -1- AC_SUBST_TRACE([INCLUDE_IM_VIQR_FALSE]) -+m4trace:configure.in:1144: -1- m4_pattern_allow([^INCLUDE_IM_VIQR_FALSE$]) -+m4trace:configure.in:1144: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_VIQR_TRUE]) -+m4trace:configure.in:1144: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_VIQR_FALSE]) -+m4trace:configure.in:1145: -1- AM_CONDITIONAL([INCLUDE_IM_XIM], [test x"$INCLUDE_xim" = xyes]) -+m4trace:configure.in:1145: -1- AC_SUBST([INCLUDE_IM_XIM_TRUE]) -+m4trace:configure.in:1145: -1- AC_SUBST_TRACE([INCLUDE_IM_XIM_TRUE]) -+m4trace:configure.in:1145: -1- m4_pattern_allow([^INCLUDE_IM_XIM_TRUE$]) -+m4trace:configure.in:1145: -1- AC_SUBST([INCLUDE_IM_XIM_FALSE]) -+m4trace:configure.in:1145: -1- AC_SUBST_TRACE([INCLUDE_IM_XIM_FALSE]) -+m4trace:configure.in:1145: -1- m4_pattern_allow([^INCLUDE_IM_XIM_FALSE$]) -+m4trace:configure.in:1145: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_XIM_TRUE]) -+m4trace:configure.in:1145: -1- _AM_SUBST_NOTMAKE([INCLUDE_IM_XIM_FALSE]) -+m4trace:configure.in:1147: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H]) -+m4trace:configure.in:1147: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$]) -+m4trace:configure.in:1147: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ -+#undef HAVE_SYS_WAIT_H]) -+m4trace:configure.in:1149: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE]) -+m4trace:configure.in:1149: -1- m4_pattern_allow([^RETSIGTYPE$]) -+m4trace:configure.in:1149: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */ -+#undef RETSIGTYPE]) -+m4trace:configure.in:1151: -1- AM_CONDITIONAL([HAVE_TIFF], [test "x$LIBTIFF" != x]) -+m4trace:configure.in:1151: -1- AC_SUBST([HAVE_TIFF_TRUE]) -+m4trace:configure.in:1151: -1- AC_SUBST_TRACE([HAVE_TIFF_TRUE]) -+m4trace:configure.in:1151: -1- m4_pattern_allow([^HAVE_TIFF_TRUE$]) -+m4trace:configure.in:1151: -1- AC_SUBST([HAVE_TIFF_FALSE]) -+m4trace:configure.in:1151: -1- AC_SUBST_TRACE([HAVE_TIFF_FALSE]) -+m4trace:configure.in:1151: -1- m4_pattern_allow([^HAVE_TIFF_FALSE$]) -+m4trace:configure.in:1151: -1- _AM_SUBST_NOTMAKE([HAVE_TIFF_TRUE]) -+m4trace:configure.in:1151: -1- _AM_SUBST_NOTMAKE([HAVE_TIFF_FALSE]) -+m4trace:configure.in:1152: -1- AM_CONDITIONAL([HAVE_PNG], [test "x$LIBPNG" != x]) -+m4trace:configure.in:1152: -1- AC_SUBST([HAVE_PNG_TRUE]) -+m4trace:configure.in:1152: -1- AC_SUBST_TRACE([HAVE_PNG_TRUE]) -+m4trace:configure.in:1152: -1- m4_pattern_allow([^HAVE_PNG_TRUE$]) -+m4trace:configure.in:1152: -1- AC_SUBST([HAVE_PNG_FALSE]) -+m4trace:configure.in:1152: -1- AC_SUBST_TRACE([HAVE_PNG_FALSE]) -+m4trace:configure.in:1152: -1- m4_pattern_allow([^HAVE_PNG_FALSE$]) -+m4trace:configure.in:1152: -1- _AM_SUBST_NOTMAKE([HAVE_PNG_TRUE]) -+m4trace:configure.in:1152: -1- _AM_SUBST_NOTMAKE([HAVE_PNG_FALSE]) -+m4trace:configure.in:1153: -1- AM_CONDITIONAL([HAVE_JPEG], [test "x$LIBJPEG" != x]) -+m4trace:configure.in:1153: -1- AC_SUBST([HAVE_JPEG_TRUE]) -+m4trace:configure.in:1153: -1- AC_SUBST_TRACE([HAVE_JPEG_TRUE]) -+m4trace:configure.in:1153: -1- m4_pattern_allow([^HAVE_JPEG_TRUE$]) -+m4trace:configure.in:1153: -1- AC_SUBST([HAVE_JPEG_FALSE]) -+m4trace:configure.in:1153: -1- AC_SUBST_TRACE([HAVE_JPEG_FALSE]) -+m4trace:configure.in:1153: -1- m4_pattern_allow([^HAVE_JPEG_FALSE$]) -+m4trace:configure.in:1153: -1- _AM_SUBST_NOTMAKE([HAVE_JPEG_TRUE]) -+m4trace:configure.in:1153: -1- _AM_SUBST_NOTMAKE([HAVE_JPEG_FALSE]) -+m4trace:configure.in:1154: -1- AM_CONDITIONAL([HAVE_JASPER], [test "x$LIBJASPER" != x]) -+m4trace:configure.in:1154: -1- AC_SUBST([HAVE_JASPER_TRUE]) -+m4trace:configure.in:1154: -1- AC_SUBST_TRACE([HAVE_JASPER_TRUE]) -+m4trace:configure.in:1154: -1- m4_pattern_allow([^HAVE_JASPER_TRUE$]) -+m4trace:configure.in:1154: -1- AC_SUBST([HAVE_JASPER_FALSE]) -+m4trace:configure.in:1154: -1- AC_SUBST_TRACE([HAVE_JASPER_FALSE]) -+m4trace:configure.in:1154: -1- m4_pattern_allow([^HAVE_JASPER_FALSE$]) -+m4trace:configure.in:1154: -1- _AM_SUBST_NOTMAKE([HAVE_JASPER_TRUE]) -+m4trace:configure.in:1154: -1- _AM_SUBST_NOTMAKE([HAVE_JASPER_FALSE]) -+m4trace:configure.in:1175: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_SYSTEMINFO_H]) -+m4trace:configure.in:1175: -2- m4_pattern_allow([^HAVE_SYS_SYSTEMINFO_H$]) -+m4trace:configure.in:1175: -2- AH_OUTPUT([HAVE_SYS_SYSTEMINFO_H], [/* Define to 1 if sys/systeminfo.h is available */ -+#undef HAVE_SYS_SYSTEMINFO_H]) -+m4trace:configure.in:1178: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_SYSINFO_H]) -+m4trace:configure.in:1178: -2- m4_pattern_allow([^HAVE_SYS_SYSINFO_H$]) -+m4trace:configure.in:1178: -2- AH_OUTPUT([HAVE_SYS_SYSINFO_H], [/* Define to 1 if sys/sysinfo.h is available */ -+#undef HAVE_SYS_SYSINFO_H]) -+m4trace:configure.in:1187: -1- AC_DEFINE_TRACE_LITERAL([USE_MEDIALIB]) -+m4trace:configure.in:1187: -1- m4_pattern_allow([^USE_MEDIALIB$]) -+m4trace:configure.in:1187: -1- AH_OUTPUT([USE_MEDIALIB], [/* Define to 1 if medialib is available and should be used */ -+#undef USE_MEDIALIB]) -+m4trace:configure.in:1196: -1- AC_DEFINE_TRACE_LITERAL([USE_MEDIALIB25]) -+m4trace:configure.in:1196: -1- m4_pattern_allow([^USE_MEDIALIB25$]) -+m4trace:configure.in:1196: -1- AH_OUTPUT([USE_MEDIALIB25], [/* Define to 1 if medialib 2.5 is available */ -+#undef USE_MEDIALIB25]) -+m4trace:configure.in:1200: -1- AM_CONDITIONAL([USE_MEDIALIB], [test $use_mlib = yes]) -+m4trace:configure.in:1200: -1- AC_SUBST([USE_MEDIALIB_TRUE]) -+m4trace:configure.in:1200: -1- AC_SUBST_TRACE([USE_MEDIALIB_TRUE]) -+m4trace:configure.in:1200: -1- m4_pattern_allow([^USE_MEDIALIB_TRUE$]) -+m4trace:configure.in:1200: -1- AC_SUBST([USE_MEDIALIB_FALSE]) -+m4trace:configure.in:1200: -1- AC_SUBST_TRACE([USE_MEDIALIB_FALSE]) -+m4trace:configure.in:1200: -1- m4_pattern_allow([^USE_MEDIALIB_FALSE$]) -+m4trace:configure.in:1200: -1- _AM_SUBST_NOTMAKE([USE_MEDIALIB_TRUE]) -+m4trace:configure.in:1200: -1- _AM_SUBST_NOTMAKE([USE_MEDIALIB_FALSE]) -+m4trace:configure.in:1201: -1- AM_CONDITIONAL([USE_MEDIALIB25], [test $use_mlib25 = yes]) -+m4trace:configure.in:1201: -1- AC_SUBST([USE_MEDIALIB25_TRUE]) -+m4trace:configure.in:1201: -1- AC_SUBST_TRACE([USE_MEDIALIB25_TRUE]) -+m4trace:configure.in:1201: -1- m4_pattern_allow([^USE_MEDIALIB25_TRUE$]) -+m4trace:configure.in:1201: -1- AC_SUBST([USE_MEDIALIB25_FALSE]) -+m4trace:configure.in:1201: -1- AC_SUBST_TRACE([USE_MEDIALIB25_FALSE]) -+m4trace:configure.in:1201: -1- m4_pattern_allow([^USE_MEDIALIB25_FALSE$]) -+m4trace:configure.in:1201: -1- _AM_SUBST_NOTMAKE([USE_MEDIALIB25_TRUE]) -+m4trace:configure.in:1201: -1- _AM_SUBST_NOTMAKE([USE_MEDIALIB25_FALSE]) -+m4trace:configure.in:1234: -1- AC_DEFINE_TRACE_LITERAL([USE_MMX]) -+m4trace:configure.in:1234: -1- m4_pattern_allow([^USE_MMX$]) -+m4trace:configure.in:1234: -1- AH_OUTPUT([USE_MMX], [/* Define to 1 if XXM is available and should be used */ -+#undef USE_MMX]) -+m4trace:configure.in:1242: -1- AM_CONDITIONAL([USE_MMX], [test x$use_mmx_asm = xyes]) -+m4trace:configure.in:1242: -1- AC_SUBST([USE_MMX_TRUE]) -+m4trace:configure.in:1242: -1- AC_SUBST_TRACE([USE_MMX_TRUE]) -+m4trace:configure.in:1242: -1- m4_pattern_allow([^USE_MMX_TRUE$]) -+m4trace:configure.in:1242: -1- AC_SUBST([USE_MMX_FALSE]) -+m4trace:configure.in:1242: -1- AC_SUBST_TRACE([USE_MMX_FALSE]) -+m4trace:configure.in:1242: -1- m4_pattern_allow([^USE_MMX_FALSE$]) -+m4trace:configure.in:1242: -1- _AM_SUBST_NOTMAKE([USE_MMX_TRUE]) -+m4trace:configure.in:1242: -1- _AM_SUBST_NOTMAKE([USE_MMX_FALSE]) -+m4trace:configure.in:1251: -1- AM_CONDITIONAL([CROSS_COMPILING], [test $cross_compiling = yes]) -+m4trace:configure.in:1251: -1- AC_SUBST([CROSS_COMPILING_TRUE]) -+m4trace:configure.in:1251: -1- AC_SUBST_TRACE([CROSS_COMPILING_TRUE]) -+m4trace:configure.in:1251: -1- m4_pattern_allow([^CROSS_COMPILING_TRUE$]) -+m4trace:configure.in:1251: -1- AC_SUBST([CROSS_COMPILING_FALSE]) -+m4trace:configure.in:1251: -1- AC_SUBST_TRACE([CROSS_COMPILING_FALSE]) -+m4trace:configure.in:1251: -1- m4_pattern_allow([^CROSS_COMPILING_FALSE$]) -+m4trace:configure.in:1251: -1- _AM_SUBST_NOTMAKE([CROSS_COMPILING_TRUE]) -+m4trace:configure.in:1251: -1- _AM_SUBST_NOTMAKE([CROSS_COMPILING_FALSE]) -+m4trace:configure.in:1254: -1- AC_SUBST([GDK_PIXBUF_CSOURCE]) -+m4trace:configure.in:1254: -1- AC_SUBST_TRACE([GDK_PIXBUF_CSOURCE]) -+m4trace:configure.in:1254: -1- m4_pattern_allow([^GDK_PIXBUF_CSOURCE$]) -+m4trace:configure.in:1255: -1- AC_SUBST([GTK_UPDATE_ICON_CACHE]) -+m4trace:configure.in:1255: -1- AC_SUBST_TRACE([GTK_UPDATE_ICON_CACHE]) -+m4trace:configure.in:1255: -1- m4_pattern_allow([^GTK_UPDATE_ICON_CACHE$]) -+m4trace:configure.in:1269: -1- AC_SUBST([REBUILD_PNGS]) -+m4trace:configure.in:1269: -1- AC_SUBST_TRACE([REBUILD_PNGS]) -+m4trace:configure.in:1269: -1- m4_pattern_allow([^REBUILD_PNGS$]) -+m4trace:configure.in:1326: -1- AC_SUBST([XMKMF]) -+m4trace:configure.in:1326: -1- AC_SUBST_TRACE([XMKMF]) -+m4trace:configure.in:1326: -1- m4_pattern_allow([^XMKMF$]) -+m4trace:configure.in:1326: -1- AC_DEFINE_TRACE_LITERAL([X_DISPLAY_MISSING]) -+m4trace:configure.in:1326: -1- m4_pattern_allow([^X_DISPLAY_MISSING$]) -+m4trace:configure.in:1326: -1- AH_OUTPUT([X_DISPLAY_MISSING], [/* Define to 1 if the X Window System is missing or not being used. */ -+#undef X_DISPLAY_MISSING]) -+m4trace:configure.in:1326: -1- AC_SUBST([X_CFLAGS]) -+m4trace:configure.in:1326: -1- AC_SUBST_TRACE([X_CFLAGS]) -+m4trace:configure.in:1326: -1- m4_pattern_allow([^X_CFLAGS$]) -+m4trace:configure.in:1326: -1- AC_SUBST([X_PRE_LIBS]) -+m4trace:configure.in:1326: -1- AC_SUBST_TRACE([X_PRE_LIBS]) -+m4trace:configure.in:1326: -1- m4_pattern_allow([^X_PRE_LIBS$]) -+m4trace:configure.in:1326: -1- AC_SUBST([X_LIBS]) -+m4trace:configure.in:1326: -1- AC_SUBST_TRACE([X_LIBS]) -+m4trace:configure.in:1326: -1- m4_pattern_allow([^X_LIBS$]) -+m4trace:configure.in:1326: -1- AC_SUBST([X_EXTRA_LIBS]) -+m4trace:configure.in:1326: -1- AC_SUBST_TRACE([X_EXTRA_LIBS]) -+m4trace:configure.in:1326: -1- m4_pattern_allow([^X_EXTRA_LIBS$]) -+m4trace:configure.in:1361: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:1361: the top level]) -+m4trace:configure.in:1361: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from... -+../../lib/autoconf/general.m4:2359: AC_COMPILE_IFELSE is expanded from... -+../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:1361: the top level]) -+m4trace:configure.in:1361: -1- AC_DEFINE_TRACE_LITERAL([NEED_XIPROTO_H_FOR_XREPLY]) -+m4trace:configure.in:1361: -1- m4_pattern_allow([^NEED_XIPROTO_H_FOR_XREPLY$]) -+m4trace:configure.in:1361: -1- AH_OUTPUT([NEED_XIPROTO_H_FOR_XREPLY], [/* Define if <X11/extensions/XIproto.h> needed for xReply */ -+#undef NEED_XIPROTO_H_FOR_XREPLY]) -+m4trace:configure.in:1375: -1- AH_OUTPUT([HAVE_XCONVERTCASE], [/* Define to 1 if you have the `XConvertCase\' function. */ -+#undef HAVE_XCONVERTCASE]) -+m4trace:configure.in:1375: -1- AH_OUTPUT([HAVE_XINTERNATOMS], [/* Define to 1 if you have the `XInternAtoms\' function. */ -+#undef HAVE_XINTERNATOMS]) -+m4trace:configure.in:1387: -1- AC_DEFINE_TRACE_LITERAL([HAVE_X11R6]) -+m4trace:configure.in:1387: -1- m4_pattern_allow([^HAVE_X11R6$]) -+m4trace:configure.in:1387: -1- AH_OUTPUT([HAVE_X11R6], [/* Define if we have X11R6 */ -+#undef HAVE_X11R6]) -+m4trace:configure.in:1389: -1- AM_CONDITIONAL([HAVE_X11R6], [$have_x11r6]) -+m4trace:configure.in:1389: -1- AC_SUBST([HAVE_X11R6_TRUE]) -+m4trace:configure.in:1389: -1- AC_SUBST_TRACE([HAVE_X11R6_TRUE]) -+m4trace:configure.in:1389: -1- m4_pattern_allow([^HAVE_X11R6_TRUE$]) -+m4trace:configure.in:1389: -1- AC_SUBST([HAVE_X11R6_FALSE]) -+m4trace:configure.in:1389: -1- AC_SUBST_TRACE([HAVE_X11R6_FALSE]) -+m4trace:configure.in:1389: -1- m4_pattern_allow([^HAVE_X11R6_FALSE$]) -+m4trace:configure.in:1389: -1- _AM_SUBST_NOTMAKE([HAVE_X11R6_TRUE]) -+m4trace:configure.in:1389: -1- _AM_SUBST_NOTMAKE([HAVE_X11R6_FALSE]) -+m4trace:configure.in:1395: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XKB]) -+m4trace:configure.in:1395: -1- m4_pattern_allow([^HAVE_XKB$]) -+m4trace:configure.in:1395: -1- AH_OUTPUT([HAVE_XKB], [/* Define to use XKB extension */ -+#undef HAVE_XKB]) -+m4trace:configure.in:1398: -2- AC_DEFINE_TRACE_LITERAL([HAVE_XKB]) -+m4trace:configure.in:1398: -2- m4_pattern_allow([^HAVE_XKB$]) -+m4trace:configure.in:1398: -2- AH_OUTPUT([HAVE_XKB], [/* Define to use XKB extension */ -+#undef HAVE_XKB]) -+m4trace:configure.in:1406: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SHAPE_EXT]) -+m4trace:configure.in:1406: -2- m4_pattern_allow([^HAVE_SHAPE_EXT$]) -+m4trace:configure.in:1406: -2- AH_OUTPUT([HAVE_SHAPE_EXT], [/* Define to 1 if the XShape extension is available */ -+#undef HAVE_SHAPE_EXT]) -+m4trace:configure.in:1413: -2- AC_DEFINE_TRACE_LITERAL([HAVE_XSYNC]) -+m4trace:configure.in:1413: -2- m4_pattern_allow([^HAVE_XSYNC$]) -+m4trace:configure.in:1413: -2- AH_OUTPUT([HAVE_XSYNC], [/* Have the SYNC extension library */ -+#undef HAVE_XSYNC]) -+m4trace:configure.in:1434: -2- AC_DEFINE_TRACE_LITERAL([HAVE_IPC_H]) -+m4trace:configure.in:1434: -2- m4_pattern_allow([^HAVE_IPC_H$]) -+m4trace:configure.in:1434: -2- AH_OUTPUT([HAVE_IPC_H], [/* Define to 1 if ipc.h is available */ -+#undef HAVE_IPC_H]) -+m4trace:configure.in:1438: -2- AC_DEFINE_TRACE_LITERAL([HAVE_SHM_H]) -+m4trace:configure.in:1438: -2- m4_pattern_allow([^HAVE_SHM_H$]) -+m4trace:configure.in:1438: -2- AH_OUTPUT([HAVE_SHM_H], [/* Define to 1 if shm.h is available */ -+#undef HAVE_SHM_H]) -+m4trace:configure.in:1450: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:1450: the top level]) -+m4trace:configure.in:1463: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XSHM_H]) -+m4trace:configure.in:1463: -1- m4_pattern_allow([^HAVE_XSHM_H$]) -+m4trace:configure.in:1463: -1- AH_OUTPUT([HAVE_XSHM_H], [/* Define to 1 if xshm.h is available */ -+#undef HAVE_XSHM_H]) -+m4trace:configure.in:1485: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOLARIS_XINERAMA]) -+m4trace:configure.in:1485: -1- m4_pattern_allow([^HAVE_SOLARIS_XINERAMA$]) -+m4trace:configure.in:1485: -1- AH_OUTPUT([HAVE_SOLARIS_XINERAMA], [/* Define to 1 if solaris xinerama is available */ -+#undef HAVE_SOLARIS_XINERAMA]) -+m4trace:configure.in:1487: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XINERAMA]) -+m4trace:configure.in:1487: -1- m4_pattern_allow([^HAVE_XINERAMA$]) -+m4trace:configure.in:1487: -1- AH_OUTPUT([HAVE_XINERAMA], [/* Define to 1 if xinerama is available */ -+#undef HAVE_XINERAMA]) -+m4trace:configure.in:1511: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XFREE_XINERAMA]) -+m4trace:configure.in:1511: -1- m4_pattern_allow([^HAVE_XFREE_XINERAMA$]) -+m4trace:configure.in:1511: -1- AH_OUTPUT([HAVE_XFREE_XINERAMA], [/* Define to 1 if XFree Xinerama is available */ -+#undef HAVE_XFREE_XINERAMA]) -+m4trace:configure.in:1513: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XINERAMA]) -+m4trace:configure.in:1513: -1- m4_pattern_allow([^HAVE_XINERAMA$]) -+m4trace:configure.in:1513: -1- AH_OUTPUT([HAVE_XINERAMA], [/* Define to 1 is Xinerama is available */ -+#undef HAVE_XINERAMA]) -+m4trace:configure.in:1526: -1- AC_DEFINE_TRACE_LITERAL([XINPUT_XFREE]) -+m4trace:configure.in:1526: -1- m4_pattern_allow([^XINPUT_XFREE$]) -+m4trace:configure.in:1526: -1- AH_OUTPUT([XINPUT_XFREE], [/* Define to 1 if XFree XInput should be used */ -+#undef XINPUT_XFREE]) -+m4trace:configure.in:1535: -1- AC_DEFINE_TRACE_LITERAL([XINPUT_NONE]) -+m4trace:configure.in:1535: -1- m4_pattern_allow([^XINPUT_NONE$]) -+m4trace:configure.in:1535: -1- AH_OUTPUT([XINPUT_NONE], [/* Define to 1 if no XInput should be used */ -+#undef XINPUT_NONE]) -+m4trace:configure.in:1539: -1- AM_CONDITIONAL([XINPUT_XFREE], [test x$with_xinput = xxfree || test x$with_xinput = xyes]) -+m4trace:configure.in:1539: -1- AC_SUBST([XINPUT_XFREE_TRUE]) -+m4trace:configure.in:1539: -1- AC_SUBST_TRACE([XINPUT_XFREE_TRUE]) -+m4trace:configure.in:1539: -1- m4_pattern_allow([^XINPUT_XFREE_TRUE$]) -+m4trace:configure.in:1539: -1- AC_SUBST([XINPUT_XFREE_FALSE]) -+m4trace:configure.in:1539: -1- AC_SUBST_TRACE([XINPUT_XFREE_FALSE]) -+m4trace:configure.in:1539: -1- m4_pattern_allow([^XINPUT_XFREE_FALSE$]) -+m4trace:configure.in:1539: -1- _AM_SUBST_NOTMAKE([XINPUT_XFREE_TRUE]) -+m4trace:configure.in:1539: -1- _AM_SUBST_NOTMAKE([XINPUT_XFREE_FALSE]) -+m4trace:configure.in:1543: -1- AC_DEFINE_TRACE_LITERAL([HAVE_RANDR]) -+m4trace:configure.in:1543: -1- m4_pattern_allow([^HAVE_RANDR$]) -+m4trace:configure.in:1543: -1- AH_OUTPUT([HAVE_RANDR], [/* Have the Xrandr extension library */ -+#undef HAVE_RANDR]) -+m4trace:configure.in:1551: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XCURSOR]) -+m4trace:configure.in:1551: -1- m4_pattern_allow([^HAVE_XCURSOR$]) -+m4trace:configure.in:1551: -1- AH_OUTPUT([HAVE_XCURSOR], [/* Have the Xcursor library */ -+#undef HAVE_XCURSOR]) -+m4trace:configure.in:1559: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XFIXES]) -+m4trace:configure.in:1559: -1- m4_pattern_allow([^HAVE_XFIXES$]) -+m4trace:configure.in:1559: -1- AH_OUTPUT([HAVE_XFIXES], [/* Have the XFIXES X extension */ -+#undef HAVE_XFIXES]) -+m4trace:configure.in:1568: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XCOMPOSITE]) -+m4trace:configure.in:1568: -1- m4_pattern_allow([^HAVE_XCOMPOSITE$]) -+m4trace:configure.in:1568: -1- AH_OUTPUT([HAVE_XCOMPOSITE], [/* Have the XCOMPOSITE X extension */ -+#undef HAVE_XCOMPOSITE]) -+m4trace:configure.in:1577: -1- AC_DEFINE_TRACE_LITERAL([HAVE_XDAMAGE]) -+m4trace:configure.in:1577: -1- m4_pattern_allow([^HAVE_XDAMAGE$]) -+m4trace:configure.in:1577: -1- AH_OUTPUT([HAVE_XDAMAGE], [/* Have the XDAMAGE X extension */ -+#undef HAVE_XDAMAGE]) -+m4trace:configure.in:1592: -1- AM_CONDITIONAL([USE_X11], [true]) -+m4trace:configure.in:1592: -1- AC_SUBST([USE_X11_TRUE]) -+m4trace:configure.in:1592: -1- AC_SUBST_TRACE([USE_X11_TRUE]) -+m4trace:configure.in:1592: -1- m4_pattern_allow([^USE_X11_TRUE$]) -+m4trace:configure.in:1592: -1- AC_SUBST([USE_X11_FALSE]) -+m4trace:configure.in:1592: -1- AC_SUBST_TRACE([USE_X11_FALSE]) -+m4trace:configure.in:1592: -1- m4_pattern_allow([^USE_X11_FALSE$]) -+m4trace:configure.in:1592: -1- _AM_SUBST_NOTMAKE([USE_X11_TRUE]) -+m4trace:configure.in:1592: -1- _AM_SUBST_NOTMAKE([USE_X11_FALSE]) -+m4trace:configure.in:1594: -1- AM_CONDITIONAL([XINPUT_XFREE], [false]) -+m4trace:configure.in:1594: -1- AC_SUBST([XINPUT_XFREE_TRUE]) -+m4trace:configure.in:1594: -1- AC_SUBST_TRACE([XINPUT_XFREE_TRUE]) -+m4trace:configure.in:1594: -1- m4_pattern_allow([^XINPUT_XFREE_TRUE$]) -+m4trace:configure.in:1594: -1- AC_SUBST([XINPUT_XFREE_FALSE]) -+m4trace:configure.in:1594: -1- AC_SUBST_TRACE([XINPUT_XFREE_FALSE]) -+m4trace:configure.in:1594: -1- m4_pattern_allow([^XINPUT_XFREE_FALSE$]) -+m4trace:configure.in:1594: -1- _AM_SUBST_NOTMAKE([XINPUT_XFREE_TRUE]) -+m4trace:configure.in:1594: -1- _AM_SUBST_NOTMAKE([XINPUT_XFREE_FALSE]) -+m4trace:configure.in:1595: -1- AM_CONDITIONAL([USE_X11], [false]) -+m4trace:configure.in:1595: -1- AC_SUBST([USE_X11_TRUE]) -+m4trace:configure.in:1595: -1- AC_SUBST_TRACE([USE_X11_TRUE]) -+m4trace:configure.in:1595: -1- m4_pattern_allow([^USE_X11_TRUE$]) -+m4trace:configure.in:1595: -1- AC_SUBST([USE_X11_FALSE]) -+m4trace:configure.in:1595: -1- AC_SUBST_TRACE([USE_X11_FALSE]) -+m4trace:configure.in:1595: -1- m4_pattern_allow([^USE_X11_FALSE$]) -+m4trace:configure.in:1595: -1- _AM_SUBST_NOTMAKE([USE_X11_TRUE]) -+m4trace:configure.in:1595: -1- _AM_SUBST_NOTMAKE([USE_X11_FALSE]) -+m4trace:configure.in:1596: -1- AM_CONDITIONAL([HAVE_X11R6], [false]) -+m4trace:configure.in:1596: -1- AC_SUBST([HAVE_X11R6_TRUE]) -+m4trace:configure.in:1596: -1- AC_SUBST_TRACE([HAVE_X11R6_TRUE]) -+m4trace:configure.in:1596: -1- m4_pattern_allow([^HAVE_X11R6_TRUE$]) -+m4trace:configure.in:1596: -1- AC_SUBST([HAVE_X11R6_FALSE]) -+m4trace:configure.in:1596: -1- AC_SUBST_TRACE([HAVE_X11R6_FALSE]) -+m4trace:configure.in:1596: -1- m4_pattern_allow([^HAVE_X11R6_FALSE$]) -+m4trace:configure.in:1596: -1- _AM_SUBST_NOTMAKE([HAVE_X11R6_TRUE]) -+m4trace:configure.in:1596: -1- _AM_SUBST_NOTMAKE([HAVE_X11R6_FALSE]) -+m4trace:configure.in:1601: -1- AM_CONDITIONAL([USE_WIN32], [true]) -+m4trace:configure.in:1601: -1- AC_SUBST([USE_WIN32_TRUE]) -+m4trace:configure.in:1601: -1- AC_SUBST_TRACE([USE_WIN32_TRUE]) -+m4trace:configure.in:1601: -1- m4_pattern_allow([^USE_WIN32_TRUE$]) -+m4trace:configure.in:1601: -1- AC_SUBST([USE_WIN32_FALSE]) -+m4trace:configure.in:1601: -1- AC_SUBST_TRACE([USE_WIN32_FALSE]) -+m4trace:configure.in:1601: -1- m4_pattern_allow([^USE_WIN32_FALSE$]) -+m4trace:configure.in:1601: -1- _AM_SUBST_NOTMAKE([USE_WIN32_TRUE]) -+m4trace:configure.in:1601: -1- _AM_SUBST_NOTMAKE([USE_WIN32_FALSE]) -+m4trace:configure.in:1603: -1- AM_CONDITIONAL([USE_WIN32], [false]) -+m4trace:configure.in:1603: -1- AC_SUBST([USE_WIN32_TRUE]) -+m4trace:configure.in:1603: -1- AC_SUBST_TRACE([USE_WIN32_TRUE]) -+m4trace:configure.in:1603: -1- m4_pattern_allow([^USE_WIN32_TRUE$]) -+m4trace:configure.in:1603: -1- AC_SUBST([USE_WIN32_FALSE]) -+m4trace:configure.in:1603: -1- AC_SUBST_TRACE([USE_WIN32_FALSE]) -+m4trace:configure.in:1603: -1- m4_pattern_allow([^USE_WIN32_FALSE$]) -+m4trace:configure.in:1603: -1- _AM_SUBST_NOTMAKE([USE_WIN32_TRUE]) -+m4trace:configure.in:1603: -1- _AM_SUBST_NOTMAKE([USE_WIN32_FALSE]) -+m4trace:configure.in:1608: -1- AM_CONDITIONAL([USE_QUARTZ], [true]) -+m4trace:configure.in:1608: -1- AC_SUBST([USE_QUARTZ_TRUE]) -+m4trace:configure.in:1608: -1- AC_SUBST_TRACE([USE_QUARTZ_TRUE]) -+m4trace:configure.in:1608: -1- m4_pattern_allow([^USE_QUARTZ_TRUE$]) -+m4trace:configure.in:1608: -1- AC_SUBST([USE_QUARTZ_FALSE]) -+m4trace:configure.in:1608: -1- AC_SUBST_TRACE([USE_QUARTZ_FALSE]) -+m4trace:configure.in:1608: -1- m4_pattern_allow([^USE_QUARTZ_FALSE$]) -+m4trace:configure.in:1608: -1- _AM_SUBST_NOTMAKE([USE_QUARTZ_TRUE]) -+m4trace:configure.in:1608: -1- _AM_SUBST_NOTMAKE([USE_QUARTZ_FALSE]) -+m4trace:configure.in:1610: -1- AM_CONDITIONAL([USE_QUARTZ], [false]) -+m4trace:configure.in:1610: -1- AC_SUBST([USE_QUARTZ_TRUE]) -+m4trace:configure.in:1610: -1- AC_SUBST_TRACE([USE_QUARTZ_TRUE]) -+m4trace:configure.in:1610: -1- m4_pattern_allow([^USE_QUARTZ_TRUE$]) -+m4trace:configure.in:1610: -1- AC_SUBST([USE_QUARTZ_FALSE]) -+m4trace:configure.in:1610: -1- AC_SUBST_TRACE([USE_QUARTZ_FALSE]) -+m4trace:configure.in:1610: -1- m4_pattern_allow([^USE_QUARTZ_FALSE$]) -+m4trace:configure.in:1610: -1- _AM_SUBST_NOTMAKE([USE_QUARTZ_TRUE]) -+m4trace:configure.in:1610: -1- _AM_SUBST_NOTMAKE([USE_QUARTZ_FALSE]) -+m4trace:configure.in:1616: -1- AC_SUBST([GDK_PIXBUF_XLIB_PACKAGES]) -+m4trace:configure.in:1616: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_PACKAGES]) -+m4trace:configure.in:1616: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_PACKAGES$]) -+m4trace:configure.in:1617: -1- AC_SUBST([GDK_PIXBUF_XLIB_EXTRA_LIBS]) -+m4trace:configure.in:1617: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_EXTRA_LIBS]) -+m4trace:configure.in:1617: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_EXTRA_LIBS$]) -+m4trace:configure.in:1618: -1- AC_SUBST([GDK_PIXBUF_XLIB_EXTRA_CFLAGS]) -+m4trace:configure.in:1618: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_EXTRA_CFLAGS]) -+m4trace:configure.in:1618: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_EXTRA_CFLAGS$]) -+m4trace:configure.in:1619: -1- AC_SUBST([GDK_PIXBUF_XLIB_DEP_LIBS]) -+m4trace:configure.in:1619: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_DEP_LIBS]) -+m4trace:configure.in:1619: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_DEP_LIBS$]) -+m4trace:configure.in:1620: -1- AC_SUBST([GDK_PIXBUF_XLIB_DEP_CFLAGS]) -+m4trace:configure.in:1620: -1- AC_SUBST_TRACE([GDK_PIXBUF_XLIB_DEP_CFLAGS]) -+m4trace:configure.in:1620: -1- m4_pattern_allow([^GDK_PIXBUF_XLIB_DEP_CFLAGS$]) -+m4trace:configure.in:1638: -1- AM_CONDITIONAL([USE_DIRECTFB], [true]) -+m4trace:configure.in:1638: -1- AC_SUBST([USE_DIRECTFB_TRUE]) -+m4trace:configure.in:1638: -1- AC_SUBST_TRACE([USE_DIRECTFB_TRUE]) -+m4trace:configure.in:1638: -1- m4_pattern_allow([^USE_DIRECTFB_TRUE$]) -+m4trace:configure.in:1638: -1- AC_SUBST([USE_DIRECTFB_FALSE]) -+m4trace:configure.in:1638: -1- AC_SUBST_TRACE([USE_DIRECTFB_FALSE]) -+m4trace:configure.in:1638: -1- m4_pattern_allow([^USE_DIRECTFB_FALSE$]) -+m4trace:configure.in:1638: -1- _AM_SUBST_NOTMAKE([USE_DIRECTFB_TRUE]) -+m4trace:configure.in:1638: -1- _AM_SUBST_NOTMAKE([USE_DIRECTFB_FALSE]) -+m4trace:configure.in:1640: -1- AM_CONDITIONAL([USE_DIRECTFB], [false]) -+m4trace:configure.in:1640: -1- AC_SUBST([USE_DIRECTFB_TRUE]) -+m4trace:configure.in:1640: -1- AC_SUBST_TRACE([USE_DIRECTFB_TRUE]) -+m4trace:configure.in:1640: -1- m4_pattern_allow([^USE_DIRECTFB_TRUE$]) -+m4trace:configure.in:1640: -1- AC_SUBST([USE_DIRECTFB_FALSE]) -+m4trace:configure.in:1640: -1- AC_SUBST_TRACE([USE_DIRECTFB_FALSE]) -+m4trace:configure.in:1640: -1- m4_pattern_allow([^USE_DIRECTFB_FALSE$]) -+m4trace:configure.in:1640: -1- _AM_SUBST_NOTMAKE([USE_DIRECTFB_TRUE]) -+m4trace:configure.in:1640: -1- _AM_SUBST_NOTMAKE([USE_DIRECTFB_FALSE]) -+m4trace:configure.in:1698: -1- AC_SUBST([GDK_PACKAGES]) -+m4trace:configure.in:1698: -1- AC_SUBST_TRACE([GDK_PACKAGES]) -+m4trace:configure.in:1698: -1- m4_pattern_allow([^GDK_PACKAGES$]) -+m4trace:configure.in:1699: -1- AC_SUBST([GDK_PRIVATE_PACKAGES]) -+m4trace:configure.in:1699: -1- AC_SUBST_TRACE([GDK_PRIVATE_PACKAGES]) -+m4trace:configure.in:1699: -1- m4_pattern_allow([^GDK_PRIVATE_PACKAGES$]) -+m4trace:configure.in:1700: -1- AC_SUBST([GDK_EXTRA_LIBS]) -+m4trace:configure.in:1700: -1- AC_SUBST_TRACE([GDK_EXTRA_LIBS]) -+m4trace:configure.in:1700: -1- m4_pattern_allow([^GDK_EXTRA_LIBS$]) -+m4trace:configure.in:1701: -1- AC_SUBST([GDK_EXTRA_CFLAGS]) -+m4trace:configure.in:1701: -1- AC_SUBST_TRACE([GDK_EXTRA_CFLAGS]) -+m4trace:configure.in:1701: -1- m4_pattern_allow([^GDK_EXTRA_CFLAGS$]) -+m4trace:configure.in:1702: -1- AC_SUBST([GDK_DEP_LIBS]) -+m4trace:configure.in:1702: -1- AC_SUBST_TRACE([GDK_DEP_LIBS]) -+m4trace:configure.in:1702: -1- m4_pattern_allow([^GDK_DEP_LIBS$]) -+m4trace:configure.in:1703: -1- AC_SUBST([GDK_DEP_CFLAGS]) -+m4trace:configure.in:1703: -1- AC_SUBST_TRACE([GDK_DEP_CFLAGS]) -+m4trace:configure.in:1703: -1- m4_pattern_allow([^GDK_DEP_CFLAGS$]) -+m4trace:configure.in:1757: -1- AC_SUBST([GDK_PIXBUF_PACKAGES]) -+m4trace:configure.in:1757: -1- AC_SUBST_TRACE([GDK_PIXBUF_PACKAGES]) -+m4trace:configure.in:1757: -1- m4_pattern_allow([^GDK_PIXBUF_PACKAGES$]) -+m4trace:configure.in:1758: -1- AC_SUBST([GDK_PIXBUF_EXTRA_LIBS]) -+m4trace:configure.in:1758: -1- AC_SUBST_TRACE([GDK_PIXBUF_EXTRA_LIBS]) -+m4trace:configure.in:1758: -1- m4_pattern_allow([^GDK_PIXBUF_EXTRA_LIBS$]) -+m4trace:configure.in:1759: -1- AC_SUBST([GDK_PIXBUF_EXTRA_CFLAGS]) -+m4trace:configure.in:1759: -1- AC_SUBST_TRACE([GDK_PIXBUF_EXTRA_CFLAGS]) -+m4trace:configure.in:1759: -1- m4_pattern_allow([^GDK_PIXBUF_EXTRA_CFLAGS$]) -+m4trace:configure.in:1760: -1- AC_SUBST([GDK_PIXBUF_DEP_LIBS]) -+m4trace:configure.in:1760: -1- AC_SUBST_TRACE([GDK_PIXBUF_DEP_LIBS]) -+m4trace:configure.in:1760: -1- m4_pattern_allow([^GDK_PIXBUF_DEP_LIBS$]) -+m4trace:configure.in:1761: -1- AC_SUBST([GDK_PIXBUF_DEP_CFLAGS]) -+m4trace:configure.in:1761: -1- AC_SUBST_TRACE([GDK_PIXBUF_DEP_CFLAGS]) -+m4trace:configure.in:1761: -1- m4_pattern_allow([^GDK_PIXBUF_DEP_CFLAGS$]) -+m4trace:configure.in:1763: -1- AC_SUBST([GTK_PACKAGES]) -+m4trace:configure.in:1763: -1- AC_SUBST_TRACE([GTK_PACKAGES]) -+m4trace:configure.in:1763: -1- m4_pattern_allow([^GTK_PACKAGES$]) -+m4trace:configure.in:1764: -1- AC_SUBST([GTK_EXTRA_LIBS]) -+m4trace:configure.in:1764: -1- AC_SUBST_TRACE([GTK_EXTRA_LIBS]) -+m4trace:configure.in:1764: -1- m4_pattern_allow([^GTK_EXTRA_LIBS$]) -+m4trace:configure.in:1765: -1- AC_SUBST([GTK_EXTRA_CFLAGS]) -+m4trace:configure.in:1765: -1- AC_SUBST_TRACE([GTK_EXTRA_CFLAGS]) -+m4trace:configure.in:1765: -1- m4_pattern_allow([^GTK_EXTRA_CFLAGS$]) -+m4trace:configure.in:1766: -1- AC_SUBST([GTK_DEP_LIBS]) -+m4trace:configure.in:1766: -1- AC_SUBST_TRACE([GTK_DEP_LIBS]) -+m4trace:configure.in:1766: -1- m4_pattern_allow([^GTK_DEP_LIBS$]) -+m4trace:configure.in:1767: -1- AC_SUBST([GTK_DEP_CFLAGS]) -+m4trace:configure.in:1767: -1- AC_SUBST_TRACE([GTK_DEP_CFLAGS]) -+m4trace:configure.in:1767: -1- m4_pattern_allow([^GTK_DEP_CFLAGS$]) -+m4trace:configure.in:1769: -1- AC_SUBST([GLIB_PREFIX]) -+m4trace:configure.in:1769: -1- AC_SUBST_TRACE([GLIB_PREFIX]) -+m4trace:configure.in:1769: -1- m4_pattern_allow([^GLIB_PREFIX$]) -+m4trace:configure.in:1770: -1- AC_SUBST([ATK_PREFIX]) -+m4trace:configure.in:1770: -1- AC_SUBST_TRACE([ATK_PREFIX]) -+m4trace:configure.in:1770: -1- m4_pattern_allow([^ATK_PREFIX$]) -+m4trace:configure.in:1771: -1- AC_SUBST([PANGO_PREFIX]) -+m4trace:configure.in:1771: -1- AC_SUBST_TRACE([PANGO_PREFIX]) -+m4trace:configure.in:1771: -1- m4_pattern_allow([^PANGO_PREFIX$]) -+m4trace:configure.in:1772: -1- AC_SUBST([CAIRO_PREFIX]) -+m4trace:configure.in:1772: -1- AC_SUBST_TRACE([CAIRO_PREFIX]) -+m4trace:configure.in:1772: -1- m4_pattern_allow([^CAIRO_PREFIX$]) -+m4trace:configure.in:1774: -1- AC_SUBST([GTK_DEBUG_FLAGS]) -+m4trace:configure.in:1774: -1- AC_SUBST_TRACE([GTK_DEBUG_FLAGS]) -+m4trace:configure.in:1774: -1- m4_pattern_allow([^GTK_DEBUG_FLAGS$]) -+m4trace:configure.in:1775: -1- AC_SUBST([GTK_XIM_FLAGS]) -+m4trace:configure.in:1775: -1- AC_SUBST_TRACE([GTK_XIM_FLAGS]) -+m4trace:configure.in:1775: -1- m4_pattern_allow([^GTK_XIM_FLAGS$]) -+m4trace:configure.in:1796: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKADDR_UN_SUN_LEN]) -+m4trace:configure.in:1796: -1- m4_pattern_allow([^HAVE_SOCKADDR_UN_SUN_LEN$]) -+m4trace:configure.in:1796: -1- AH_OUTPUT([HAVE_SOCKADDR_UN_SUN_LEN], [/* Have the sockaddr_un.sun_len member */ -+#undef HAVE_SOCKADDR_UN_SUN_LEN]) -+m4trace:configure.in:1804: -1- AC_SUBST([GAIL_INET_LIBS]) -+m4trace:configure.in:1804: -1- AC_SUBST_TRACE([GAIL_INET_LIBS]) -+m4trace:configure.in:1804: -1- m4_pattern_allow([^GAIL_INET_LIBS$]) -+m4trace:configure.in:1812: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:1812: the top level]) -+m4trace:configure.in:1819: -1- AC_SUBST([CUPS_CONFIG]) -+m4trace:configure.in:1819: -1- AC_SUBST_TRACE([CUPS_CONFIG]) -+m4trace:configure.in:1819: -1- m4_pattern_allow([^CUPS_CONFIG$]) -+m4trace:configure.in:1830: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CUPS_API_1_2]) -+m4trace:configure.in:1830: -1- m4_pattern_allow([^HAVE_CUPS_API_1_2$]) -+m4trace:configure.in:1830: -1- AH_OUTPUT([HAVE_CUPS_API_1_2], [/* Define to 1 if CUPS 1.2 API is available */ -+#undef HAVE_CUPS_API_1_2]) -+m4trace:configure.in:1834: -1- AC_SUBST([CUPS_API_MAJOR]) -+m4trace:configure.in:1834: -1- AC_SUBST_TRACE([CUPS_API_MAJOR]) -+m4trace:configure.in:1834: -1- m4_pattern_allow([^CUPS_API_MAJOR$]) -+m4trace:configure.in:1835: -1- AC_SUBST([CUPS_API_MINOR]) -+m4trace:configure.in:1835: -1- AC_SUBST_TRACE([CUPS_API_MINOR]) -+m4trace:configure.in:1835: -1- m4_pattern_allow([^CUPS_API_MINOR$]) -+m4trace:configure.in:1836: -1- AC_SUBST([CUPS_CFLAGS]) -+m4trace:configure.in:1836: -1- AC_SUBST_TRACE([CUPS_CFLAGS]) -+m4trace:configure.in:1836: -1- m4_pattern_allow([^CUPS_CFLAGS$]) -+m4trace:configure.in:1837: -1- AC_SUBST([CUPS_LIBS]) -+m4trace:configure.in:1837: -1- AC_SUBST_TRACE([CUPS_LIBS]) -+m4trace:configure.in:1837: -1- m4_pattern_allow([^CUPS_LIBS$]) -+m4trace:configure.in:1841: -1- AM_CONDITIONAL([HAVE_CUPS], [test "x$CUPS_CONFIG" != "xno"]) -+m4trace:configure.in:1841: -1- AC_SUBST([HAVE_CUPS_TRUE]) -+m4trace:configure.in:1841: -1- AC_SUBST_TRACE([HAVE_CUPS_TRUE]) -+m4trace:configure.in:1841: -1- m4_pattern_allow([^HAVE_CUPS_TRUE$]) -+m4trace:configure.in:1841: -1- AC_SUBST([HAVE_CUPS_FALSE]) -+m4trace:configure.in:1841: -1- AC_SUBST_TRACE([HAVE_CUPS_FALSE]) -+m4trace:configure.in:1841: -1- m4_pattern_allow([^HAVE_CUPS_FALSE$]) -+m4trace:configure.in:1841: -1- _AM_SUBST_NOTMAKE([HAVE_CUPS_TRUE]) -+m4trace:configure.in:1841: -1- _AM_SUBST_NOTMAKE([HAVE_CUPS_FALSE]) -+m4trace:configure.in:1845: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:2367: AC_TRY_COMPILE is expanded from... -+configure.in:1845: the top level]) -+m4trace:configure.in:1845: -1- AC_DEFINE_TRACE_LITERAL([HAVE_HTTP_AUTHSTRING]) -+m4trace:configure.in:1845: -1- m4_pattern_allow([^HAVE_HTTP_AUTHSTRING$]) -+m4trace:configure.in:1845: -1- AH_OUTPUT([HAVE_HTTP_AUTHSTRING], [/* Define if cups http_t authstring field is accessible */ -+#undef HAVE_HTTP_AUTHSTRING]) -+m4trace:configure.in:1851: -1- AC_SUBST([HAVE_HTTP_AUTHSTRING]) -+m4trace:configure.in:1851: -1- AC_SUBST_TRACE([HAVE_HTTP_AUTHSTRING]) -+m4trace:configure.in:1851: -1- m4_pattern_allow([^HAVE_HTTP_AUTHSTRING$]) -+m4trace:configure.in:1855: -1- AH_OUTPUT([HAVE_HTTPGETAUTHSTRING], [/* Define to 1 if you have the `httpGetAuthString\' function. */ -+#undef HAVE_HTTPGETAUTHSTRING]) -+m4trace:configure.in:1859: -1- AM_CONDITIONAL([HAVE_CUPS], [false]) -+m4trace:configure.in:1859: -1- AC_SUBST([HAVE_CUPS_TRUE]) -+m4trace:configure.in:1859: -1- AC_SUBST_TRACE([HAVE_CUPS_TRUE]) -+m4trace:configure.in:1859: -1- m4_pattern_allow([^HAVE_CUPS_TRUE$]) -+m4trace:configure.in:1859: -1- AC_SUBST([HAVE_CUPS_FALSE]) -+m4trace:configure.in:1859: -1- AC_SUBST_TRACE([HAVE_CUPS_FALSE]) -+m4trace:configure.in:1859: -1- m4_pattern_allow([^HAVE_CUPS_FALSE$]) -+m4trace:configure.in:1859: -1- _AM_SUBST_NOTMAKE([HAVE_CUPS_TRUE]) -+m4trace:configure.in:1859: -1- _AM_SUBST_NOTMAKE([HAVE_CUPS_FALSE]) -+m4trace:configure.in:1878: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:1878: the top level]) -+m4trace:configure.in:1882: -1- AM_CONDITIONAL([TEST_PRINT_BACKEND], [test "x$enable_test_print_backend" != "xno"]) -+m4trace:configure.in:1882: -1- AC_SUBST([TEST_PRINT_BACKEND_TRUE]) -+m4trace:configure.in:1882: -1- AC_SUBST_TRACE([TEST_PRINT_BACKEND_TRUE]) -+m4trace:configure.in:1882: -1- m4_pattern_allow([^TEST_PRINT_BACKEND_TRUE$]) -+m4trace:configure.in:1882: -1- AC_SUBST([TEST_PRINT_BACKEND_FALSE]) -+m4trace:configure.in:1882: -1- AC_SUBST_TRACE([TEST_PRINT_BACKEND_FALSE]) -+m4trace:configure.in:1882: -1- m4_pattern_allow([^TEST_PRINT_BACKEND_FALSE$]) -+m4trace:configure.in:1882: -1- _AM_SUBST_NOTMAKE([TEST_PRINT_BACKEND_TRUE]) -+m4trace:configure.in:1882: -1- _AM_SUBST_NOTMAKE([TEST_PRINT_BACKEND_FALSE]) -+m4trace:configure.in:1912: -1- AC_SUBST([HTML_DIR]) -+m4trace:configure.in:1912: -1- AC_SUBST_TRACE([HTML_DIR]) -+m4trace:configure.in:1912: -1- m4_pattern_allow([^HTML_DIR$]) -+m4trace:configure.in:1912: -1- AC_SUBST([GTKDOC_CHECK]) -+m4trace:configure.in:1912: -1- AC_SUBST_TRACE([GTKDOC_CHECK]) -+m4trace:configure.in:1912: -1- m4_pattern_allow([^GTKDOC_CHECK$]) -+m4trace:configure.in:1912: -1- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -+m4trace:configure.in:1912: -1- AC_SUBST([ENABLE_GTK_DOC_TRUE]) -+m4trace:configure.in:1912: -1- AC_SUBST_TRACE([ENABLE_GTK_DOC_TRUE]) -+m4trace:configure.in:1912: -1- m4_pattern_allow([^ENABLE_GTK_DOC_TRUE$]) -+m4trace:configure.in:1912: -1- AC_SUBST([ENABLE_GTK_DOC_FALSE]) -+m4trace:configure.in:1912: -1- AC_SUBST_TRACE([ENABLE_GTK_DOC_FALSE]) -+m4trace:configure.in:1912: -1- m4_pattern_allow([^ENABLE_GTK_DOC_FALSE$]) -+m4trace:configure.in:1912: -1- _AM_SUBST_NOTMAKE([ENABLE_GTK_DOC_TRUE]) -+m4trace:configure.in:1912: -1- _AM_SUBST_NOTMAKE([ENABLE_GTK_DOC_FALSE]) -+m4trace:configure.in:1912: -1- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) -+m4trace:configure.in:1912: -1- AC_SUBST([GTK_DOC_USE_LIBTOOL_TRUE]) -+m4trace:configure.in:1912: -1- AC_SUBST_TRACE([GTK_DOC_USE_LIBTOOL_TRUE]) -+m4trace:configure.in:1912: -1- m4_pattern_allow([^GTK_DOC_USE_LIBTOOL_TRUE$]) -+m4trace:configure.in:1912: -1- AC_SUBST([GTK_DOC_USE_LIBTOOL_FALSE]) -+m4trace:configure.in:1912: -1- AC_SUBST_TRACE([GTK_DOC_USE_LIBTOOL_FALSE]) -+m4trace:configure.in:1912: -1- m4_pattern_allow([^GTK_DOC_USE_LIBTOOL_FALSE$]) -+m4trace:configure.in:1912: -1- _AM_SUBST_NOTMAKE([GTK_DOC_USE_LIBTOOL_TRUE]) -+m4trace:configure.in:1912: -1- _AM_SUBST_NOTMAKE([GTK_DOC_USE_LIBTOOL_FALSE]) -+m4trace:configure.in:1914: -1- AC_SUBST([DB2HTML]) -+m4trace:configure.in:1914: -1- AC_SUBST_TRACE([DB2HTML]) -+m4trace:configure.in:1914: -1- m4_pattern_allow([^DB2HTML$]) -+m4trace:configure.in:1915: -1- AM_CONDITIONAL([HAVE_DOCBOOK], [$DB2HTML]) -+m4trace:configure.in:1915: -1- AC_SUBST([HAVE_DOCBOOK_TRUE]) -+m4trace:configure.in:1915: -1- AC_SUBST_TRACE([HAVE_DOCBOOK_TRUE]) -+m4trace:configure.in:1915: -1- m4_pattern_allow([^HAVE_DOCBOOK_TRUE$]) -+m4trace:configure.in:1915: -1- AC_SUBST([HAVE_DOCBOOK_FALSE]) -+m4trace:configure.in:1915: -1- AC_SUBST_TRACE([HAVE_DOCBOOK_FALSE]) -+m4trace:configure.in:1915: -1- m4_pattern_allow([^HAVE_DOCBOOK_FALSE$]) -+m4trace:configure.in:1915: -1- _AM_SUBST_NOTMAKE([HAVE_DOCBOOK_TRUE]) -+m4trace:configure.in:1915: -1- _AM_SUBST_NOTMAKE([HAVE_DOCBOOK_FALSE]) -+m4trace:configure.in:1917: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from... -+configure.in:1917: the top level]) -+m4trace:configure.in:1926: -1- AC_SUBST([XSLTPROC]) -+m4trace:configure.in:1926: -1- AC_SUBST_TRACE([XSLTPROC]) -+m4trace:configure.in:1926: -1- m4_pattern_allow([^XSLTPROC$]) -+m4trace:configure.in:1932: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. -+You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... -+acinclude.m4:30: JH_PATH_XML_CATALOG is expanded from... -+acinclude.m4:64: JH_CHECK_XML_CATALOG is expanded from... -+configure.in:1932: the top level]) -+m4trace:configure.in:1932: -1- AC_SUBST([XML_CATALOG_FILE]) -+m4trace:configure.in:1932: -1- AC_SUBST_TRACE([XML_CATALOG_FILE]) -+m4trace:configure.in:1932: -1- m4_pattern_allow([^XML_CATALOG_FILE$]) -+m4trace:configure.in:1932: -1- AC_SUBST([XMLCATALOG]) -+m4trace:configure.in:1932: -1- AC_SUBST_TRACE([XMLCATALOG]) -+m4trace:configure.in:1932: -1- m4_pattern_allow([^XMLCATALOG$]) -+m4trace:configure.in:1938: -1- AM_CONDITIONAL([ENABLE_MAN], [test x$enable_man != xno]) -+m4trace:configure.in:1938: -1- AC_SUBST([ENABLE_MAN_TRUE]) -+m4trace:configure.in:1938: -1- AC_SUBST_TRACE([ENABLE_MAN_TRUE]) -+m4trace:configure.in:1938: -1- m4_pattern_allow([^ENABLE_MAN_TRUE$]) -+m4trace:configure.in:1938: -1- AC_SUBST([ENABLE_MAN_FALSE]) -+m4trace:configure.in:1938: -1- AC_SUBST_TRACE([ENABLE_MAN_FALSE]) -+m4trace:configure.in:1938: -1- m4_pattern_allow([^ENABLE_MAN_FALSE$]) -+m4trace:configure.in:1938: -1- _AM_SUBST_NOTMAKE([ENABLE_MAN_TRUE]) -+m4trace:configure.in:1938: -1- _AM_SUBST_NOTMAKE([ENABLE_MAN_FALSE]) -+m4trace:configure.in:2025: -1- AC_CONFIG_FILES([ -+config.h.win32 -+gtk-zip.sh -+Makefile -+gdk-pixbuf-2.0.pc -+gdk-2.0.pc -+gtk+-2.0.pc -+gtk+-unix-print-2.0.pc -+gail.pc -+gdk-pixbuf-2.0-uninstalled.pc -+gdk-2.0-uninstalled.pc -+gtk+-2.0-uninstalled.pc -+gail-uninstalled.pc -+m4macros/Makefile -+po/Makefile.in -+po-properties/Makefile.in -+demos/Makefile -+demos/gtk-demo/Makefile -+demos/gtk-demo/geninclude.pl -+tests/Makefile -+docs/Makefile -+docs/reference/Makefile -+docs/reference/gdk-pixbuf/Makefile -+docs/reference/gdk-pixbuf/version.xml -+docs/reference/gdk/Makefile -+docs/reference/gdk/version.xml -+docs/reference/gtk/Makefile -+docs/reference/gtk/version.xml -+docs/reference/libgail-util/Makefile -+docs/faq/Makefile -+docs/tools/Makefile -+docs/tutorial/Makefile -+gdk-pixbuf/Makefile -+gdk-pixbuf/gdk_pixbuf.rc -+gdk-pixbuf/gdk-pixbuf-features.h -+gdk-pixbuf/pixops/Makefile -+gdk/Makefile -+gdk/x11/Makefile -+gdk/win32/Makefile -+gdk/win32/rc/Makefile -+gdk/win32/rc/gdk.rc -+gdk/quartz/Makefile -+gdk/directfb/Makefile -+gdk/tests/Makefile -+gtk/Makefile -+gtk/makefile.msc -+gtk/gtkversion.h -+gtk/gtk-win32.rc -+gtk/theme-bits/Makefile -+gtk/tests/Makefile -+modules/Makefile -+modules/other/Makefile -+modules/other/gail/Makefile -+modules/other/gail/libgail-util/Makefile -+modules/other/gail/tests/Makefile -+modules/engines/Makefile -+modules/engines/pixbuf/Makefile -+modules/engines/ms-windows/Makefile -+modules/engines/ms-windows/Theme/Makefile -+modules/engines/ms-windows/Theme/gtk-2.0/Makefile -+modules/input/Makefile -+modules/printbackends/Makefile -+modules/printbackends/cups/Makefile -+modules/printbackends/lpr/Makefile -+modules/printbackends/file/Makefile -+modules/printbackends/test/Makefile -+perf/Makefile -+contrib/Makefile -+contrib/gdk-pixbuf-xlib/Makefile -+contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc -+]) -+m4trace:configure.in:2097: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) -+m4trace:configure.in:2097: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -+m4trace:configure.in:2097: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([LTLIBOBJS]) -+m4trace:configure.in:2097: -1- m4_pattern_allow([^LTLIBOBJS$]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([top_builddir]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([srcdir]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([abs_srcdir]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([top_srcdir]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([abs_top_srcdir]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([builddir]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([abs_builddir]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([abs_top_builddir]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([INSTALL]) -+m4trace:configure.in:2097: -1- AC_SUBST_TRACE([MKDIR_P]) -Index: gtk+-2.14.4/configure -=================================================================== ---- gtk+-2.14.4.orig/configure 2008-10-17 06:07:22.000000000 +0200 -+++ gtk+-2.14.4/configure 2008-11-11 18:56:18.936634196 +0100 -@@ -1,11 +1,11 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.63 for gtk+ 2.14.4. -+# Generated by GNU Autoconf 2.61 for gtk+ 2.14.4. - # - # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>. - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## -@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # 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 -@@ -39,45 +39,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --as_nl=' --' --export as_nl --# Printing a long string crashes Solaris 7 /usr/bin/printf. --as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='printf %s\n' -- as_echo_n='printf %s' --else -- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -- as_echo_n='/usr/ucb/echo -n' -- else -- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -- as_echo_n_body='eval -- arg=$1; -- case $arg in -- *"$as_nl"*) -- expr "X$arg" : "X\\(.*\\)$as_nl"; -- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -- esac; -- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -- ' -- export as_echo_n_body -- as_echo_n='sh -c $as_echo_n_body as_echo' -- fi -- export as_echo_body -- as_echo='sh -c $as_echo_body as_echo' --fi -- - # The user is always right. - if test "${PATH_SEPARATOR+set}" != set; then -- PATH_SEPARATOR=: -- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -- PATH_SEPARATOR=';' -- } -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh - fi - - # Support unset when possible. -@@ -93,6 +65,8 @@ fi - # there to prevent editors from complaining about space-tab. - # (If _AS_PATH_WALK were called with IFS unset, it would disable word - # splitting by setting IFS to empty value.) -+as_nl=' -+' - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -@@ -115,7 +89,7 @@ if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then -- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } - fi - -@@ -128,10 +102,17 @@ PS2='> ' - PS4='+ ' - - # NLS nuisances. --LC_ALL=C --export LC_ALL --LANGUAGE=C --export LANGUAGE -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ fi -+done - - # Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -153,7 +134,7 @@ as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X/"$0" | -+echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q -@@ -179,7 +160,7 @@ else - as_have_required=no - fi - -- if test $as_have_required = yes && (eval ": -+ if test $as_have_required = yes && (eval ": - (as_func_return () { - (exit \$1) - } -@@ -261,7 +242,7 @@ IFS=$as_save_IFS - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # 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 -@@ -282,7 +263,7 @@ _ASEOF - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # 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 -@@ -362,10 +343,10 @@ fi - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV -- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- done -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} - fi - - -@@ -434,10 +415,9 @@ fi - - test \$exitcode = 0") || { - echo No shell found that supports shell functions. -- echo Please tell bug-autoconf@gnu.org about your system, -- echo including any error possibly output before this message. -- echo This can help us improve future autoconf versions. -- echo Configuration will now proceed without shell functions. -+ echo Please tell autoconf@gnu.org about your system, -+ echo including any error possibly output before this -+ echo message - } - - -@@ -473,7 +453,7 @@ test \$exitcode = 0") || { - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems -@@ -501,6 +481,7 @@ case `echo -n x` in - *) - ECHO_N='-n';; - esac -+ - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -513,22 +494,19 @@ if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file - else - rm -f conf$$.dir -- mkdir conf$$.dir 2>/dev/null -+ mkdir conf$$.dir - fi --if (echo >conf$$.file) 2>/dev/null; then -- if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -- elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -- else -+echo >conf$$.file -+if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -- fi -+elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln - else - as_ln_s='cp -p' - fi -@@ -553,10 +531,10 @@ else - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then -- test -d "$1/."; -+ test -d "$1/."; - else - case $1 in -- -*)set "./$1";; -+ -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi -@@ -791,424 +769,396 @@ ac_includes_default="\ - # include <unistd.h> - #endif" - --ac_subst_vars='LTLIBOBJS --LIBOBJS --ENABLE_MAN_FALSE --ENABLE_MAN_TRUE --XMLCATALOG --XML_CATALOG_FILE --XSLTPROC --HAVE_DOCBOOK_FALSE --HAVE_DOCBOOK_TRUE --DB2HTML --GTK_DOC_USE_LIBTOOL_FALSE --GTK_DOC_USE_LIBTOOL_TRUE --ENABLE_GTK_DOC_FALSE --ENABLE_GTK_DOC_TRUE --GTKDOC_CHECK --HTML_DIR --TEST_PRINT_BACKEND_FALSE --TEST_PRINT_BACKEND_TRUE --HAVE_HTTP_AUTHSTRING --HAVE_CUPS_FALSE --HAVE_CUPS_TRUE --CUPS_LIBS --CUPS_CFLAGS --CUPS_API_MINOR --CUPS_API_MAJOR --CUPS_CONFIG --GAIL_INET_LIBS --GTK_XIM_FLAGS --GTK_DEBUG_FLAGS --CAIRO_PREFIX --PANGO_PREFIX --ATK_PREFIX --GLIB_PREFIX --GTK_DEP_CFLAGS --GTK_DEP_LIBS --GTK_EXTRA_CFLAGS --GTK_EXTRA_LIBS --GTK_PACKAGES --GDK_PIXBUF_DEP_CFLAGS --GDK_PIXBUF_DEP_LIBS --GDK_PIXBUF_EXTRA_CFLAGS --GDK_PIXBUF_EXTRA_LIBS --GDK_PIXBUF_PACKAGES --GDK_DEP_CFLAGS --GDK_DEP_LIBS --GDK_EXTRA_CFLAGS --GDK_EXTRA_LIBS --GDK_PACKAGES --USE_DIRECTFB_FALSE --USE_DIRECTFB_TRUE --GDK_PIXBUF_XLIB_DEP_CFLAGS --GDK_PIXBUF_XLIB_DEP_LIBS --GDK_PIXBUF_XLIB_EXTRA_CFLAGS --GDK_PIXBUF_XLIB_EXTRA_LIBS --GDK_PIXBUF_XLIB_PACKAGES --USE_QUARTZ_FALSE --USE_QUARTZ_TRUE --USE_WIN32_FALSE --USE_WIN32_TRUE --USE_X11_FALSE --USE_X11_TRUE --XINPUT_XFREE_FALSE --XINPUT_XFREE_TRUE --HAVE_X11R6_FALSE --HAVE_X11R6_TRUE --X_EXTRA_LIBS --X_LIBS --X_PRE_LIBS --X_CFLAGS --XMKMF --REBUILD_PNGS --GTK_UPDATE_ICON_CACHE --GDK_PIXBUF_CSOURCE --CROSS_COMPILING_FALSE --CROSS_COMPILING_TRUE --USE_MMX_FALSE --USE_MMX_TRUE --USE_MEDIALIB25_FALSE --USE_MEDIALIB25_TRUE --USE_MEDIALIB_FALSE --USE_MEDIALIB_TRUE --HAVE_JASPER_FALSE --HAVE_JASPER_TRUE --HAVE_JPEG_FALSE --HAVE_JPEG_TRUE --HAVE_PNG_FALSE --HAVE_PNG_TRUE --HAVE_TIFF_FALSE --HAVE_TIFF_TRUE --INCLUDE_IM_XIM_FALSE --INCLUDE_IM_XIM_TRUE --INCLUDE_IM_VIQR_FALSE --INCLUDE_IM_VIQR_TRUE --INCLUDE_IM_TI_ET_FALSE --INCLUDE_IM_TI_ET_TRUE --INCLUDE_IM_TI_ER_FALSE --INCLUDE_IM_TI_ER_TRUE --INCLUDE_IM_THAI_FALSE --INCLUDE_IM_THAI_TRUE --INCLUDE_IM_MULTIPRESS_FALSE --INCLUDE_IM_MULTIPRESS_TRUE --INCLUDE_IM_IPA_FALSE --INCLUDE_IM_IPA_TRUE --INCLUDE_IM_INUKTITUT_FALSE --INCLUDE_IM_INUKTITUT_TRUE --INCLUDE_IM_IME_FALSE --INCLUDE_IM_IME_TRUE --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE --INCLUDE_IM_CEDILLA_FALSE --INCLUDE_IM_CEDILLA_TRUE --INCLUDE_IM_AM_ET_FALSE --INCLUDE_IM_AM_ET_TRUE --INCLUDED_IMMODULE_DEFINE --INCLUDED_IMMODULE_OBJ --HAVE_INCLUDED_IMMMODULES_FALSE --HAVE_INCLUDED_IMMMODULES_TRUE --INCLUDE_GDIPLUS_FALSE --INCLUDE_GDIPLUS_TRUE --INCLUDE_JASPER_FALSE --INCLUDE_JASPER_TRUE --INCLUDE_ICNS_FALSE --INCLUDE_ICNS_TRUE --INCLUDE_PCX_FALSE --INCLUDE_PCX_TRUE --INCLUDE_TGA_FALSE --INCLUDE_TGA_TRUE --INCLUDE_XBM_FALSE --INCLUDE_XBM_TRUE --INCLUDE_XPM_FALSE --INCLUDE_XPM_TRUE --INCLUDE_TIFF_FALSE --INCLUDE_TIFF_TRUE --INCLUDE_RAS_FALSE --INCLUDE_RAS_TRUE --INCLUDE_PNM_FALSE --INCLUDE_PNM_TRUE --INCLUDE_JPEG_FALSE --INCLUDE_JPEG_TRUE --INCLUDE_ANI_FALSE --INCLUDE_ANI_TRUE --INCLUDE_ICO_FALSE --INCLUDE_ICO_TRUE --INCLUDE_GIF_FALSE --INCLUDE_GIF_TRUE --INCLUDE_WBMP_FALSE --INCLUDE_WBMP_TRUE --INCLUDE_BMP_FALSE --INCLUDE_BMP_TRUE --INCLUDE_PNG_FALSE --INCLUDE_PNG_TRUE --INCLUDED_LOADER_DEFINE --INCLUDED_LOADER_OBJ --BUILD_DYNAMIC_MODULES_FALSE --BUILD_DYNAMIC_MODULES_TRUE --LIBJASPER --LIBPNG --LIBJPEG --LIBTIFF --BUILD_GDIPLUS_LOADERS_FALSE --BUILD_GDIPLUS_LOADERS_TRUE --GDK_WLIBS --GLIB_MKENUMS --GOBJECT_QUERY --GLIB_GENMARSHAL --GLIB_LIBS --GLIB_CFLAGS --MKINSTALLDIRS --POSUB --POFILES --PO_IN_DATADIR_FALSE --PO_IN_DATADIR_TRUE --INTLLIBS --INSTOBJEXT --GMOFILES --DATADIRNAME --CATOBJEXT --CATALOGS --XGETTEXT --GMSGFMT --MSGFMT_OPTS --MSGFMT --USE_NLS --REBUILD --INDENT --PERL --DISABLE_EXPLICIT_DEPS_FALSE --DISABLE_EXPLICIT_DEPS_TRUE --LIBTOOL_EXPORT_OPTIONS --BASE_DEPENDENCIES_LIBS --BASE_DEPENDENCIES_CFLAGS --PKG_CONFIG --gtktargetlib --gdktargetlib --gdktarget --MS_LIB_AVAILABLE_FALSE --MS_LIB_AVAILABLE_TRUE --ms_librarian --WINDRES --OS_LINUX_FALSE --OS_LINUX_TRUE --OS_UNIX_FALSE --OS_UNIX_TRUE --OS_WIN32_FALSE --OS_WIN32_TRUE --PLATFORM_WIN32_FALSE --PLATFORM_WIN32_TRUE --MAINT --MAINTAINER_MODE_FALSE --MAINTAINER_MODE_TRUE --NM --CCASFLAGS --CCAS --LIBTOOL --ac_ct_F77 --FFLAGS --F77 --CXXCPP --CPP --OBJDUMP --AS --DLLTOOL --NMEDIT --DSYMUTIL --RANLIB --AR --ECHO --LN_S --EGREP --GREP --SED --HAVE_OBJC_FALSE --HAVE_OBJC_TRUE --HAVE_CXX_FALSE --HAVE_CXX_TRUE --am__fastdepCXX_FALSE --am__fastdepCXX_TRUE --CXXDEPMODE --CXXFLAGS --ac_ct_CXX --CXX --am__fastdepCC_FALSE --am__fastdepCC_TRUE --CCDEPMODE --AMDEPBACKSLASH --AMDEP_FALSE --AMDEP_TRUE --am__quote --am__include --DEPDIR --OBJEXT --EXEEXT --ac_ct_CC --CPPFLAGS --LDFLAGS --CFLAGS --CC --LIB_EXE_MACHINE_FLAG --host_os --host_vendor --host_cpu --host --build_os --build_vendor --build_cpu --build --GETTEXT_PACKAGE --GDK_PIXBUF_VERSION --GDK_PIXBUF_MICRO --GDK_PIXBUF_MINOR --GDK_PIXBUF_MAJOR --GAIL_LT_CURRENT_MINUS_AGE --GAIL_LT_VERSION_INFO --LT_CURRENT_MINUS_AGE --LT_VERSION_INFO --GTK_BINARY_VERSION --GTK_VERSION --GTK_API_VERSION --GTK_BINARY_AGE --GTK_INTERFACE_AGE --GTK_MICRO_VERSION --GTK_MINOR_VERSION --GTK_MAJOR_VERSION --am__leading_dot --SET_MAKE --AWK --INSTALL_STRIP_PROGRAM --STRIP --install_sh --AMTAR --MAKEINFO --AUTOHEADER --AUTOMAKE --AUTOCONF --ACLOCAL --VERSION --PACKAGE --CYGPATH_W --INSTALL_DATA --INSTALL_SCRIPT --INSTALL_PROGRAM --target_alias --host_alias --build_alias --LIBS --ECHO_T --ECHO_N --ECHO_C --DEFS --mandir --localedir --libdir --psdir --pdfdir --dvidir --htmldir --infodir --docdir --oldincludedir --includedir --localstatedir --sharedstatedir --sysconfdir --datadir --datarootdir --libexecdir --sbindir --bindir --program_transform_name --prefix --exec_prefix --PACKAGE_BUGREPORT --PACKAGE_STRING --PACKAGE_VERSION --PACKAGE_TARNAME --PACKAGE_NAME -+ac_subst_vars='SHELL - PATH_SEPARATOR --SHELL' --ac_subst_files='' --ac_user_opts=' --enable_option_checking --enable_dependency_tracking --enable_static --enable_shared --enable_fast_install --with_gnu_ld --enable_libtool_lock --with_pic --with_tags --enable_largefile --enable_maintainer_mode --enable_debug --enable_shm --enable_xkb --enable_xinerama --enable_rebuilds --enable_visibility --with_xinput --with_gdktarget --enable_explicit_deps --enable_glibtest --enable_modules --with_libpng --with_libjpeg --with_libtiff --with_libjasper --enable_gdiplus --with_included_loaders --with_included_immodules --with_x --enable_cups --enable_test_print_backend --with_html_dir --enable_gtk_doc --enable_man --with_xml_catalog --' -- ac_precious_vars='build_alias -+PACKAGE_NAME -+PACKAGE_TARNAME -+PACKAGE_VERSION -+PACKAGE_STRING -+PACKAGE_BUGREPORT -+exec_prefix -+prefix -+program_transform_name -+bindir -+sbindir -+libexecdir -+datarootdir -+datadir -+sysconfdir -+sharedstatedir -+localstatedir -+includedir -+oldincludedir -+docdir -+infodir -+htmldir -+dvidir -+pdfdir -+psdir -+libdir -+localedir -+mandir -+DEFS -+ECHO_C -+ECHO_N -+ECHO_T -+LIBS -+build_alias - host_alias - target_alias -+INSTALL_PROGRAM -+INSTALL_SCRIPT -+INSTALL_DATA -+am__isrc -+CYGPATH_W -+PACKAGE -+VERSION -+ACLOCAL -+AUTOCONF -+AUTOMAKE -+AUTOHEADER -+MAKEINFO -+install_sh -+STRIP -+INSTALL_STRIP_PROGRAM -+mkdir_p -+AWK -+SET_MAKE -+am__leading_dot -+AMTAR -+am__tar -+am__untar -+GTK_MAJOR_VERSION -+GTK_MINOR_VERSION -+GTK_MICRO_VERSION -+GTK_INTERFACE_AGE -+GTK_BINARY_AGE -+GTK_API_VERSION -+GTK_VERSION -+GTK_BINARY_VERSION -+LT_VERSION_INFO -+LT_CURRENT_MINUS_AGE -+GAIL_LT_VERSION_INFO -+GAIL_LT_CURRENT_MINUS_AGE -+GDK_PIXBUF_MAJOR -+GDK_PIXBUF_MINOR -+GDK_PIXBUF_MICRO -+GDK_PIXBUF_VERSION -+GETTEXT_PACKAGE -+build -+build_cpu -+build_vendor -+build_os -+host -+host_cpu -+host_vendor -+host_os -+LIB_EXE_MACHINE_FLAG - CC - CFLAGS - LDFLAGS --LIBS - CPPFLAGS -+ac_ct_CC -+EXEEXT -+OBJEXT -+DEPDIR -+am__include -+am__quote -+AMDEP_TRUE -+AMDEP_FALSE -+AMDEPBACKSLASH -+CCDEPMODE -+am__fastdepCC_TRUE -+am__fastdepCC_FALSE -+ENABLE_STATIC_TRUE -+ENABLE_STATIC_FALSE - CXX -+ac_ct_CXX - CXXFLAGS --CCC -+CXXDEPMODE -+am__fastdepCXX_TRUE -+am__fastdepCXX_FALSE -+HAVE_CXX_TRUE -+HAVE_CXX_FALSE -+HAVE_OBJC_TRUE -+HAVE_OBJC_FALSE -+SED -+GREP -+EGREP -+LN_S -+ECHO -+AR -+RANLIB -+DSYMUTIL -+NMEDIT -+DLLTOOL -+AS -+OBJDUMP - CPP - CXXCPP - F77 - FFLAGS -+ac_ct_F77 -+LIBTOOL -+CCAS -+CCASFLAGS -+CCASDEPMODE -+am__fastdepCCAS_TRUE -+am__fastdepCCAS_FALSE -+NM -+MAINTAINER_MODE_TRUE -+MAINTAINER_MODE_FALSE -+MAINT -+PLATFORM_WIN32_TRUE -+PLATFORM_WIN32_FALSE -+OS_WIN32_TRUE -+OS_WIN32_FALSE -+OS_UNIX_TRUE -+OS_UNIX_FALSE -+OS_LINUX_TRUE -+OS_LINUX_FALSE -+WINDRES -+ms_librarian -+MS_LIB_AVAILABLE_TRUE -+MS_LIB_AVAILABLE_FALSE -+gdktarget -+gdktargetlib -+gtktargetlib - PKG_CONFIG - BASE_DEPENDENCIES_CFLAGS - BASE_DEPENDENCIES_LIBS --XMKMF' -- -- --# Initialize some variables set by options. --ac_init_help= --ac_init_version=false --ac_unrecognized_opts= --ac_unrecognized_sep= --# The variables have the same names as the options, with --# dashes changed to underlines. --cache_file=/dev/null --exec_prefix=NONE --no_create= --no_recursion= --prefix=NONE --program_prefix=NONE --program_suffix=NONE --program_transform_name=s,x,x, --silent= --site= --srcdir= --verbose= --x_includes=NONE -+LIBTOOL_EXPORT_OPTIONS -+DISABLE_EXPLICIT_DEPS_TRUE -+DISABLE_EXPLICIT_DEPS_FALSE -+PERL -+INDENT -+REBUILD -+USE_NLS -+MSGFMT -+MSGFMT_OPTS -+GMSGFMT -+XGETTEXT -+CATALOGS -+CATOBJEXT -+DATADIRNAME -+GMOFILES -+INSTOBJEXT -+INTLLIBS -+PO_IN_DATADIR_TRUE -+PO_IN_DATADIR_FALSE -+POFILES -+POSUB -+MKINSTALLDIRS -+GLIB_CFLAGS -+GLIB_LIBS -+GLIB_GENMARSHAL -+GOBJECT_QUERY -+GLIB_MKENUMS -+GDK_WLIBS -+BUILD_GDIPLUS_LOADERS_TRUE -+BUILD_GDIPLUS_LOADERS_FALSE -+LIBTIFF -+LIBJPEG -+LIBPNG -+LIBJASPER -+BUILD_DYNAMIC_MODULES_TRUE -+BUILD_DYNAMIC_MODULES_FALSE -+INCLUDED_LOADER_OBJ -+INCLUDED_LOADER_DEFINE -+INCLUDE_PNG_TRUE -+INCLUDE_PNG_FALSE -+INCLUDE_BMP_TRUE -+INCLUDE_BMP_FALSE -+INCLUDE_WBMP_TRUE -+INCLUDE_WBMP_FALSE -+INCLUDE_GIF_TRUE -+INCLUDE_GIF_FALSE -+INCLUDE_ICO_TRUE -+INCLUDE_ICO_FALSE -+INCLUDE_ANI_TRUE -+INCLUDE_ANI_FALSE -+INCLUDE_JPEG_TRUE -+INCLUDE_JPEG_FALSE -+INCLUDE_PNM_TRUE -+INCLUDE_PNM_FALSE -+INCLUDE_RAS_TRUE -+INCLUDE_RAS_FALSE -+INCLUDE_TIFF_TRUE -+INCLUDE_TIFF_FALSE -+INCLUDE_XPM_TRUE -+INCLUDE_XPM_FALSE -+INCLUDE_XBM_TRUE -+INCLUDE_XBM_FALSE -+INCLUDE_TGA_TRUE -+INCLUDE_TGA_FALSE -+INCLUDE_PCX_TRUE -+INCLUDE_PCX_FALSE -+INCLUDE_ICNS_TRUE -+INCLUDE_ICNS_FALSE -+INCLUDE_JASPER_TRUE -+INCLUDE_JASPER_FALSE -+INCLUDE_GDIPLUS_TRUE -+INCLUDE_GDIPLUS_FALSE -+HAVE_INCLUDED_IMMMODULES_TRUE -+HAVE_INCLUDED_IMMMODULES_FALSE -+INCLUDED_IMMODULE_OBJ -+INCLUDED_IMMODULE_DEFINE -+INCLUDE_IM_AM_ET_TRUE -+INCLUDE_IM_AM_ET_FALSE -+INCLUDE_IM_CEDILLA_TRUE -+INCLUDE_IM_CEDILLA_FALSE -+INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE -+INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE -+INCLUDE_IM_IME_TRUE -+INCLUDE_IM_IME_FALSE -+INCLUDE_IM_INUKTITUT_TRUE -+INCLUDE_IM_INUKTITUT_FALSE -+INCLUDE_IM_IPA_TRUE -+INCLUDE_IM_IPA_FALSE -+INCLUDE_IM_MULTIPRESS_TRUE -+INCLUDE_IM_MULTIPRESS_FALSE -+INCLUDE_IM_THAI_TRUE -+INCLUDE_IM_THAI_FALSE -+INCLUDE_IM_TI_ER_TRUE -+INCLUDE_IM_TI_ER_FALSE -+INCLUDE_IM_TI_ET_TRUE -+INCLUDE_IM_TI_ET_FALSE -+INCLUDE_IM_VIQR_TRUE -+INCLUDE_IM_VIQR_FALSE -+INCLUDE_IM_XIM_TRUE -+INCLUDE_IM_XIM_FALSE -+HAVE_TIFF_TRUE -+HAVE_TIFF_FALSE -+HAVE_PNG_TRUE -+HAVE_PNG_FALSE -+HAVE_JPEG_TRUE -+HAVE_JPEG_FALSE -+HAVE_JASPER_TRUE -+HAVE_JASPER_FALSE -+USE_MEDIALIB_TRUE -+USE_MEDIALIB_FALSE -+USE_MEDIALIB25_TRUE -+USE_MEDIALIB25_FALSE -+USE_MMX_TRUE -+USE_MMX_FALSE -+CROSS_COMPILING_TRUE -+CROSS_COMPILING_FALSE -+GDK_PIXBUF_CSOURCE -+GTK_UPDATE_ICON_CACHE -+REBUILD_PNGS -+XMKMF -+X_CFLAGS -+X_PRE_LIBS -+X_LIBS -+X_EXTRA_LIBS -+HAVE_X11R6_TRUE -+HAVE_X11R6_FALSE -+XINPUT_XFREE_TRUE -+XINPUT_XFREE_FALSE -+USE_X11_TRUE -+USE_X11_FALSE -+USE_WIN32_TRUE -+USE_WIN32_FALSE -+USE_QUARTZ_TRUE -+USE_QUARTZ_FALSE -+GDK_PIXBUF_XLIB_PACKAGES -+GDK_PIXBUF_XLIB_EXTRA_LIBS -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS -+GDK_PIXBUF_XLIB_DEP_LIBS -+GDK_PIXBUF_XLIB_DEP_CFLAGS -+USE_DIRECTFB_TRUE -+USE_DIRECTFB_FALSE -+GDK_PACKAGES -+GDK_PRIVATE_PACKAGES -+GDK_EXTRA_LIBS -+GDK_EXTRA_CFLAGS -+GDK_DEP_LIBS -+GDK_DEP_CFLAGS -+GDK_PIXBUF_PACKAGES -+GDK_PIXBUF_EXTRA_LIBS -+GDK_PIXBUF_EXTRA_CFLAGS -+GDK_PIXBUF_DEP_LIBS -+GDK_PIXBUF_DEP_CFLAGS -+GTK_PACKAGES -+GTK_EXTRA_LIBS -+GTK_EXTRA_CFLAGS -+GTK_DEP_LIBS -+GTK_DEP_CFLAGS -+GLIB_PREFIX -+ATK_PREFIX -+PANGO_PREFIX -+CAIRO_PREFIX -+GTK_DEBUG_FLAGS -+GTK_XIM_FLAGS -+GAIL_INET_LIBS -+CUPS_CONFIG -+CUPS_API_MAJOR -+CUPS_API_MINOR -+CUPS_CFLAGS -+CUPS_LIBS -+HAVE_CUPS_TRUE -+HAVE_CUPS_FALSE -+HAVE_HTTP_AUTHSTRING -+TEST_PRINT_BACKEND_TRUE -+TEST_PRINT_BACKEND_FALSE -+HTML_DIR -+GTKDOC_CHECK -+ENABLE_GTK_DOC_TRUE -+ENABLE_GTK_DOC_FALSE -+GTK_DOC_USE_LIBTOOL_TRUE -+GTK_DOC_USE_LIBTOOL_FALSE -+DB2HTML -+HAVE_DOCBOOK_TRUE -+HAVE_DOCBOOK_FALSE -+XSLTPROC -+XML_CATALOG_FILE -+XMLCATALOG -+ENABLE_MAN_TRUE -+ENABLE_MAN_FALSE -+LIBOBJS -+LTLIBOBJS' -+ac_subst_files='' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CXX -+CXXFLAGS -+CCC -+CPP -+CXXCPP -+F77 -+FFLAGS -+CCAS -+CCASFLAGS -+PKG_CONFIG -+BASE_DEPENDENCIES_CFLAGS -+BASE_DEPENDENCIES_LIBS -+XMKMF' -+ -+ -+# Initialize some variables set by options. -+ac_init_help= -+ac_init_version=false -+# The variables have the same names as the options, with -+# dashes changed to underlines. -+cache_file=/dev/null -+exec_prefix=NONE -+no_create= -+no_recursion= -+prefix=NONE -+program_prefix=NONE -+program_suffix=NONE -+program_transform_name=s,x,x, -+silent= -+site= -+srcdir= -+verbose= -+x_includes=NONE - x_libraries=NONE - - # Installation directory options. -@@ -1292,21 +1242,13 @@ do - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) -- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_useropt_orig=$ac_useropt -- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -- case $ac_user_opts in -- *" --"enable_$ac_useropt" --"*) ;; -- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -- ac_unrecognized_sep=', ';; -- esac -- eval enable_$ac_useropt=no ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; -@@ -1319,21 +1261,13 @@ do - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_useropt_orig=$ac_useropt -- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -- case $ac_user_opts in -- *" --"enable_$ac_useropt" --"*) ;; -- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -- ac_unrecognized_sep=', ';; -- esac -- eval enable_$ac_useropt=\$ac_optarg ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -1524,38 +1458,22 @@ do - ac_init_version=: ;; - - -with-* | --with-*) -- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_useropt_orig=$ac_useropt -- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -- case $ac_user_opts in -- *" --"with_$ac_useropt" --"*) ;; -- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -- ac_unrecognized_sep=', ';; -- esac -- eval with_$ac_useropt=\$ac_optarg ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) -- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_useropt_orig=$ac_useropt -- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -- case $ac_user_opts in -- *" --"with_$ac_useropt" --"*) ;; -- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -- ac_unrecognized_sep=', ';; -- esac -- eval with_$ac_useropt=no ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. -@@ -1575,7 +1493,7 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -+ -*) { echo "$as_me: error: unrecognized option: $ac_option - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; -@@ -1584,16 +1502,16 @@ Try \`$0 --help' for more information." - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - -@@ -1602,38 +1520,22 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 -+ { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } - fi - --if test -n "$ac_unrecognized_opts"; then -- case $enable_option_checking in -- no) ;; -- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 -- { (exit 1); exit 1; }; } ;; -- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; -- esac --fi -- --# Check all directory arguments for consistency. -+# Be sure to have absolute directory names. - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir - do - eval ac_val=\$$ac_var -- # Remove trailing slashes. -- case $ac_val in -- */ ) -- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -- eval $ac_var=\$ac_val;; -- esac -- # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } - done - -@@ -1648,7 +1550,7 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes -@@ -1664,10 +1566,10 @@ test "$silent" = yes && exec 6>/dev/null - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- { $as_echo "$as_me: error: working directory cannot be determined" >&2 -+ { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -@@ -1675,12 +1577,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. -- ac_confdir=`$as_dirname -- "$as_myself" || --$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_myself" : 'X\(//\)[^/]' \| \ -- X"$as_myself" : 'X\(//\)$' \| \ -- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_myself" | -+ ac_confdir=`$as_dirname -- "$0" || -+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$0" : 'X\(//\)[^/]' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -1707,12 +1609,12 @@ else - fi - if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi - ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" - ac_abs_confdir=`( -- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 -+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` - # When building in place, set srcdir=. -@@ -1761,9 +1663,9 @@ Configuration: - - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -1773,25 +1675,25 @@ for instance \`--prefix=\$HOME'. - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -- --infodir=DIR info documentation [DATAROOTDIR/info] -- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -- --mandir=DIR man documentation [DATAROOTDIR/man] -- --docdir=DIR documentation root [DATAROOTDIR/doc/gtk+] -- --htmldir=DIR html documentation [DOCDIR] -- --dvidir=DIR dvi documentation [DOCDIR] -- --pdfdir=DIR pdf documentation [DOCDIR] -- --psdir=DIR ps documentation [DOCDIR] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/gtk+] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -1818,19 +1720,18 @@ if test -n "$ac_init_help"; then - cat <<\_ACEOF - - Optional Features: -- --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -- --disable-dependency-tracking Speeds up one-time builds -- --enable-dependency-tracking Do not reject slow dependency extractors -+ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors - --enable-static[=PKGS] build static libraries [default=no] - --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --disable-largefile omit support for large files -- --enable-maintainer-mode enable make rules and dependencies not useful -- (and sometimes confusing) to the casual installer -+ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer - --enable-debug=[no/minimum/yes] - turn on debugging [default=minimum] - --enable-shm support shared memory if available [default=yes] -@@ -1889,6 +1790,8 @@ Some influential environment variables: - CXXCPP C++ preprocessor - F77 Fortran 77 compiler command - FFLAGS Fortran 77 compiler flags -+ CCAS assembler compiler command (defaults to CC) -+ CCASFLAGS assembler compiler flags (defaults to CFLAGS) - PKG_CONFIG path to pkg-config utility - BASE_DEPENDENCIES_CFLAGS - C compiler flags for BASE_DEPENDENCIES, overriding pkg-config -@@ -1907,17 +1810,15 @@ fi - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d "$ac_dir" || -- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -- continue -+ test -d "$ac_dir" || continue - ac_builddir=. - - case "$ac_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -1953,7 +1854,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else -- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -@@ -1963,10 +1864,10 @@ test -n "$ac_init_help" && exit $ac_stat - if $ac_init_version; then - cat <<\_ACEOF - gtk+ configure 2.14.4 --generated by GNU Autoconf 2.63 -+generated by GNU Autoconf 2.61 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1977,7 +1878,7 @@ This file contains any messages produced - running configure, to aid debugging if configure makes a mistake. - - It was created by gtk+ $as_me 2.14.4, which was --generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -@@ -2013,7 +1914,7 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- $as_echo "PATH: $as_dir" -+ echo "PATH: $as_dir" - done - IFS=$as_save_IFS - -@@ -2048,7 +1949,7 @@ do - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) -- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -@@ -2100,12 +2001,11 @@ _ASBOX - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 --$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac -@@ -2135,9 +2035,9 @@ _ASBOX - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- $as_echo "$ac_var='\''$ac_val'\''" -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - -@@ -2152,9 +2052,9 @@ _ASBOX - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- $as_echo "$ac_var='\''$ac_val'\''" -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -2170,8 +2070,8 @@ _ASBOX - echo - fi - test "$ac_signal" != 0 && -- $as_echo "$as_me: caught signal $ac_signal" -- $as_echo "$as_me: exit $exit_status" -+ echo "$as_me: caught signal $ac_signal" -+ echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -@@ -2213,24 +2113,21 @@ _ACEOF - - - # Let the site file select an alternate cache file if it wants to. --# Prefer an explicitly selected file to automatically selected ones. --ac_site_file1=NONE --ac_site_file2=NONE -+# Prefer explicitly selected file to automatically selected ones. - if test -n "$CONFIG_SITE"; then -- ac_site_file1=$CONFIG_SITE -+ set x "$CONFIG_SITE" - elif test "x$prefix" != xNONE; then -- ac_site_file1=$prefix/share/config.site -- ac_site_file2=$prefix/etc/config.site -+ set x "$prefix/share/config.site" "$prefix/etc/config.site" - else -- ac_site_file1=$ac_default_prefix/share/config.site -- ac_site_file2=$ac_default_prefix/etc/config.site -+ set x "$ac_default_prefix/share/config.site" \ -+ "$ac_default_prefix/etc/config.site" - fi --for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+shift -+for ac_site_file - do -- test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then -- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --$as_echo "$as_me: loading site script $ac_site_file" >&6;} -+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -+echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -@@ -2240,16 +2137,16 @@ if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then -- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 --$as_echo "$as_me: loading cache $cache_file" >&6;} -+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi - else -- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 --$as_echo "$as_me: creating cache $cache_file" >&6;} -+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - -@@ -2263,38 +2160,29 @@ for ac_var in $ac_precious_vars; do - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- # differences in whitespace do not lead to failure. -- ac_old_val_w=`echo x $ac_old_val` -- ac_new_val_w=`echo x $ac_new_val` -- if test "$ac_old_val_w" != "$ac_new_val_w"; then -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- ac_cache_corrupted=: -- else -- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 --$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -- eval $ac_var=\$ac_old_val -- fi -- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 --$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 --$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} -+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -+echo "$as_me: former value: $ac_old_val" >&2;} -+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -+echo "$as_me: current value: $ac_new_val" >&2;} -+ ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in -@@ -2304,12 +2192,10 @@ $as_echo "$as_me: current value: \`$ac - fi - done - if $ac_cache_corrupted; then -- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -2350,7 +2236,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - # Save this value here, since automake will set cflags later - cflags_set=${CFLAGS+set} - --am__api_version="1.7" -+am__api_version='1.10' -+ - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then -@@ -2368,8 +2255,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s - fi - done - if test -z "$ac_aux_dir"; then -- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 --$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -2395,12 +2282,11 @@ ac_configure="$SHELL $ac_aux_dir/configu - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --# Reject install programs that cannot install multiple files. --{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --$as_echo_n "checking for a BSD-compatible install... " >&6; } -+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -2429,29 +2315,17 @@ case $as_dir/ in - # program-specific install script used by HP pwplus--don't use. - : - else -- rm -rf conftest.one conftest.two conftest.dir -- echo one > conftest.one -- echo two > conftest.two -- mkdir conftest.dir -- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -- test -s conftest.one && test -s conftest.two && -- test -s conftest.dir/conftest.one && -- test -s conftest.dir/conftest.two -- then -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 - fi - fi - done - done - ;; - esac -- - done - IFS=$as_save_IFS - --rm -rf conftest.one conftest.two conftest.dir - - fi - if test "${ac_cv_path_install+set}" = set; then -@@ -2464,8 +2338,8 @@ fi - INSTALL=$ac_install_sh - fi - fi --{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 --$as_echo "$INSTALL" >&6; } -+{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -2475,8 +2349,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 --$as_echo_n "checking whether build environment is sane... " >&6; } -+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } - # Just in case - sleep 1 - echo timestamp > conftest.file -@@ -2499,9 +2373,9 @@ if ( - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". -- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&5 --$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -2512,24 +2386,26 @@ then - # Ok. - : - else -- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! - Check your system clock" >&5 --$as_echo "$as_me: error: newly created file is older than distributed files! -+echo "$as_me: error: newly created file is older than distributed files! - Check your system clock" >&2;} - { (exit 1); exit 1; }; } - fi --{ $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" --# Double any \ or $. -+# Double any \ or $. echo might interpret backslashes. - # By default was `s,x,x', remove it if useless. --ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' --program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -- -+cat <<\_ACEOF >conftest.sed -+s/[\\$]/&&/g;s/;s,x,x,$// -+_ACEOF -+program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -+rm -f conftest.sed - - # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` -@@ -2540,18 +2416,66 @@ if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " - else - am_missing_run= -- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 --$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} - fi - -+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } -+if test -z "$MKDIR_P"; then -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in mkdir gmkdir; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -+ 'mkdir (GNU coreutils) '* | \ -+ 'mkdir (coreutils) '* | \ -+ 'mkdir (fileutils) '4.1*) -+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext -+ break 3;; -+ esac -+ done -+ done -+done -+IFS=$as_save_IFS -+ -+fi -+ -+ if test "${ac_cv_path_mkdir+set}" = set; then -+ MKDIR_P="$ac_cv_path_mkdir -p" -+ else -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for MKDIR_P within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ test -d ./--version && rmdir ./--version -+ MKDIR_P="$ac_install_sh -d" -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -+echo "${ECHO_T}$MKDIR_P" >&6; } -+ -+mkdir_p="$MKDIR_P" -+case $mkdir_p in -+ [\\/$]* | ?:[\\/]*) ;; -+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -+esac -+ - for ac_prog in gawk mawk nawk awk - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_AWK+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -@@ -2564,7 +2488,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2575,23 +2499,22 @@ fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 --$as_echo "$AWK" >&6; } -+ { echo "$as_me:$LINENO: result: $AWK" >&5 -+echo "${ECHO_T}$AWK" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - - test -n "$AWK" && break - done - --{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } --set x ${MAKE-make} --ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` - if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.make <<\_ACEOF - SHELL = /bin/sh -@@ -2608,12 +2531,12 @@ esac - rm -f conftest.make - fi - if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - SET_MAKE= - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -2626,12 +2549,16 @@ else - fi - rmdir .tst 2>/dev/null - -- # test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 --$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} -+if test "`cd $srcdir && pwd`" != "`pwd`"; then -+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -+ # is not polluted with repeated "-I." -+ am__isrc=' -I$(srcdir)' -+ # test to see if srcdir already configured -+ if test -f $srcdir/config.status; then -+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } -+ fi - fi - - # test whether we have cygpath -@@ -2665,10 +2592,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru - - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -- --AMTAR=${AMTAR-"${am_missing_run}tar"} -- --install_sh=${install_sh-"$am_aux_dir/install-sh"} -+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - - # Installed binaries are usually stripped using `strip' when the user - # run `make install-strip'. However `strip' might not be the right -@@ -2678,10 +2602,10 @@ if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_STRIP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -2694,7 +2618,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2705,11 +2629,11 @@ fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 --$as_echo "$STRIP" >&6; } -+ { echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -2718,10 +2642,10 @@ if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -2734,7 +2658,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2745,11 +2669,11 @@ fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --$as_echo "$ac_ct_STRIP" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_STRIP" = x; then -@@ -2757,8 +2681,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - STRIP=$ac_ct_STRIP -@@ -2768,10 +2696,17 @@ else - fi - - fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. -+# Always define AMTAR for backward compatibility. -+ -+AMTAR=${AMTAR-"${am_missing_run}tar"} -+ -+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -+ -+ - - - -@@ -2855,34 +2790,34 @@ _ACEOF - - # Make sure we can run config.sub. - $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 --$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - --{ $as_echo "$as_me:$LINENO: checking build system type" >&5 --$as_echo_n "checking build system type... " >&6; } -+{ echo "$as_me:$LINENO: checking build system type" >&5 -+echo $ECHO_N "checking build system type... $ECHO_C" >&6; } - if test "${ac_cv_build+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_build_alias=$build_alias - test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` - test "x$ac_build_alias" = x && -- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -+echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } - ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 --$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --$as_echo "$ac_cv_build" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+echo "${ECHO_T}$ac_cv_build" >&6; } - case $ac_cv_build in - *-*-*) ;; --*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 --$as_echo "$as_me: error: invalid value of canonical build" >&2;} -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -+echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; - esac - build=$ac_cv_build -@@ -2899,27 +2834,27 @@ IFS=$ac_save_IFS - case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --{ $as_echo "$as_me:$LINENO: checking host system type" >&5 --$as_echo_n "checking host system type... " >&6; } -+{ echo "$as_me:$LINENO: checking host system type" >&5 -+echo $ECHO_N "checking host system type... $ECHO_C" >&6; } - if test "${ac_cv_host+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build - else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 --$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --$as_echo "$ac_cv_host" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+echo "${ECHO_T}$ac_cv_host" >&6; } - case $ac_cv_host in - *-*-*) ;; --*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 --$as_echo "$as_me: error: invalid value of canonical host" >&2;} -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -+echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; - esac - host=$ac_cv_host -@@ -2938,8 +2873,8 @@ case $host_os in *\ *) host_os=`echo "$h - - - MATH_LIB=-lm --{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5 --$as_echo_n "checking for native Win32... " >&6; } -+{ echo "$as_me:$LINENO: checking for native Win32" >&5 -+echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } - LIB_EXE_MACHINE_FLAG=X86 - case "$host" in - *-*-mingw*) -@@ -2956,8 +2891,8 @@ case "$host" in - os_win32=no - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $os_win32" >&5 --$as_echo "$os_win32" >&6; } -+{ echo "$as_me:$LINENO: result: $os_win32" >&5 -+echo "${ECHO_T}$os_win32" >&6; } - - - -@@ -2975,10 +2910,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2991,7 +2926,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3002,11 +2937,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 --$as_echo "$CC" >&6; } -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -3015,10 +2950,10 @@ if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3031,7 +2966,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3042,11 +2977,11 @@ fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --$as_echo "$ac_ct_CC" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_CC" = x; then -@@ -3054,8 +2989,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - CC=$ac_ct_CC -@@ -3068,10 +3007,10 @@ if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3084,7 +3023,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3095,11 +3034,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 --$as_echo "$CC" >&6; } -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -3108,10 +3047,10 @@ fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3129,7 +3068,7 @@ do - continue - fi - ac_cv_prog_CC="cc" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3152,11 +3091,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 --$as_echo "$CC" >&6; } -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -3167,10 +3106,10 @@ if test -z "$CC"; then - 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 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3183,7 +3122,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3194,11 +3133,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 --$as_echo "$CC" >&6; } -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -3211,10 +3150,10 @@ if test -z "$CC"; then - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3227,7 +3166,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3238,11 +3177,11 @@ fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --$as_echo "$ac_ct_CC" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -3254,8 +3193,12 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - CC=$ac_ct_CC -@@ -3265,50 +3208,44 @@ fi - fi - - --test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -+echo "$as_me: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 --set X $ac_compile --ac_compiler=$2 -+echo "$as_me:$LINENO: checking for C compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` - { (ac_try="$ac_compiler --version >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -v >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -V >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF -@@ -3327,22 +3264,27 @@ main () - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --$as_echo_n "checking for C compiler default output file name... " >&6; } --ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -- --# The possible output files: --ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -- -+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+# -+# List of possible output files, starting from the most likely. -+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -+# only as a last resort. b.out is created by i960 compilers. -+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -+# -+# The IRIX 6 linker writes into existing files which may not be -+# executable, retaining their permissions. Remove them first so a -+# subsequent execution test works. - ac_rmfiles= - for ac_file in $ac_files - do - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac - done -@@ -3353,11 +3295,10 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. - # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -@@ -3368,7 +3309,7 @@ for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most -@@ -3395,27 +3336,25 @@ else - ac_file='' - fi - --{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 --$as_echo "$ac_file" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_file" >&5 -+echo "${ECHO_T}$ac_file" >&6; } - if test -z "$ac_file"; then -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: C compiler cannot create executables -+echo "$as_me: error: C compiler cannot create executables - See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; }; } -+ { (exit 77); exit 77; }; } - fi - - ac_exeext=$ac_cv_exeext - - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --$as_echo_n "checking whether the C compiler works... " >&6; } -+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } - # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then -@@ -3424,53 +3363,49 @@ if test "$cross_compiling" != yes; then - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run C compiled programs. -+echo "$as_me: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - fi - fi - fi --{ $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -+rm -f a.out a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --$as_echo_n "checking whether we are cross compiling... " >&6; } --{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 --$as_echo "$cross_compiling" >&6; } -+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+echo "${ECHO_T}$cross_compiling" >&6; } - --{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 --$as_echo_n "checking for suffix of executables... " >&6; } -+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -@@ -3479,33 +3414,31 @@ $as_echo "$ac_try_echo") >&5 - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac - done - else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - fi - - rm -f conftest$ac_cv_exeext --{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --$as_echo "$ac_cv_exeext" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+echo "${ECHO_T}$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 --$as_echo_n "checking for suffix of object files... " >&6; } -+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } - if test "${ac_cv_objext+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3528,43 +3461,40 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -+echo "$as_me: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --$as_echo "$ac_cv_objext" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+echo "${ECHO_T}$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } - if test "${ac_cv_c_compiler_gnu+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3590,21 +3520,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -3614,19 +3543,15 @@ rm -f core conftest.err conftest.$ac_obj - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --$as_echo "$ac_cv_c_compiler_gnu" >&6; } --if test $ac_compiler_gnu = yes; then -- GCC=yes --else -- GCC= --fi -+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -+GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --$as_echo_n "checking whether $CC accepts -g... " >&6; } -+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cc_g+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes -@@ -3653,21 +3578,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" -@@ -3692,21 +3616,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag -@@ -3732,21 +3655,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -3761,8 +3683,8 @@ fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --$as_echo "$ac_cv_prog_cc_g" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -3778,10 +3700,10 @@ else - CFLAGS= - fi - fi --{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 --$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } - if test "${ac_cv_prog_cc_c89+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_prog_cc_c89=no - ac_save_CC=$CC -@@ -3852,21 +3774,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -3882,15 +3803,15 @@ fi - # AC_CACHE_VAL - case "x$ac_cv_prog_cc_c89" in - x) -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } ;; -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; - xno) -- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 --$as_echo "unsupported" >&6; } ;; -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" -- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 --$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; - esac - - -@@ -3911,8 +3832,8 @@ am__doit: - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 --$as_echo_n "checking for style of include used by $am_make... " >&6; } -+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } - am__include="#" - am__quote= - _am_result=none -@@ -3939,8 +3860,8 @@ if test "$am__include" = "#"; then - fi - - --{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 --$as_echo "$_am_result" >&6; } -+{ echo "$as_me:$LINENO: result: $_am_result" >&5 -+echo "${ECHO_T}$_am_result" >&6; } - rm -f confinc confmf - - # Check whether --enable-dependency-tracking was given. -@@ -3952,9 +3873,7 @@ if test "x$enable_dependency_tracking" ! - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - fi -- -- --if test "x$enable_dependency_tracking" != xno; then -+ if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' - else -@@ -3964,13 +3883,12 @@ fi - - - -- - depcc="$CC" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --$as_echo_n "checking dependency style of $depcc... " >&6; } -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up -@@ -4006,7 +3924,9 @@ else - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- : > sub/conftst$i.h -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -@@ -4030,13 +3950,19 @@ else - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi -@@ -4050,13 +3976,11 @@ else - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 --$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -- -- --if -+ if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= -@@ -4092,16 +4016,24 @@ fi - - - -+ if test "$enable_static" = yes; then -+ ENABLE_STATIC_TRUE= -+ ENABLE_STATIC_FALSE='#' -+else -+ ENABLE_STATIC_TRUE='#' -+ ENABLE_STATIC_FALSE= -+fi -+ - - if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl - 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 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -4114,7 +4046,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4125,11 +4057,11 @@ fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 --$as_echo "$CXX" >&6; } -+ { echo "$as_me:$LINENO: result: $CXX" >&5 -+echo "${ECHO_T}$CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -4142,10 +4074,10 @@ if test -z "$CXX"; then - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -4158,7 +4090,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4169,11 +4101,11 @@ fi - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --$as_echo "$ac_ct_CXX" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -+echo "${ECHO_T}$ac_ct_CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -4185,8 +4117,12 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - CXX=$ac_ct_CXX -@@ -4215,10 +4151,10 @@ if test -z "$CXX"; then - 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 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -4231,7 +4167,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4242,11 +4178,11 @@ fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 --$as_echo "$CXX" >&6; } -+ { echo "$as_me:$LINENO: result: $CXX" >&5 -+echo "${ECHO_T}$CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -4259,10 +4195,10 @@ if test -z "$CXX"; then - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -4275,7 +4211,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4286,11 +4222,11 @@ fi - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --$as_echo "$ac_ct_CXX" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -+echo "${ECHO_T}$ac_ct_CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -4302,8 +4238,12 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - CXX=$ac_ct_CXX -@@ -4313,47 +4253,43 @@ fi - fi - fi - # Provide some information about the compiler. --$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 --set X $ac_compile --ac_compiler=$2 -+echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` - { (ac_try="$ac_compiler --version >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -v >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -V >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - --{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } - if test "${ac_cv_cxx_compiler_gnu+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -4379,21 +4315,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -4403,19 +4338,15 @@ rm -f core conftest.err conftest.$ac_obj - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } --if test $ac_compiler_gnu = yes; then -- GXX=yes --else -- GXX= --fi -+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -+GXX=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS --{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --$as_echo_n "checking whether $CXX accepts -g... " >&6; } -+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cxx_g+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes -@@ -4442,21 +4373,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" -@@ -4481,21 +4411,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -@@ -4521,21 +4450,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -4550,8 +4478,8 @@ fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --$as_echo "$ac_cv_prog_cxx_g" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS - elif test $ac_cv_prog_cxx_g = yes; then -@@ -4575,10 +4503,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - depcc="$CXX" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --$as_echo_n "checking dependency style of $depcc... " >&6; } -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up -@@ -4614,7 +4542,9 @@ else - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c -- : > sub/conftst$i.h -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -@@ -4638,13 +4568,19 @@ else - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi -@@ -4658,13 +4594,11 @@ else - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 --$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } - CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -- -- --if -+ if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= -@@ -4697,30 +4631,27 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CXX= - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- -- --if test "$CXX" != ""; then -+ if test "$CXX" != ""; then - HAVE_CXX_TRUE= - HAVE_CXX_FALSE='#' - else -@@ -4752,30 +4683,27 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - OBJC=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - OBJC=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- -- --if test "$OBJC" = "yes"; then -+ if test "$OBJC" = "yes"; then - HAVE_OBJC_TRUE= - HAVE_OBJC_FALSE='#' - else -@@ -4793,13 +4721,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - if test "$os_win32" = "yes"; then - if test x$enable_static = xyes -o x$enable_static = x; then -- { $as_echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 --$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} -+ { echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 -+echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} - enable_static=no - fi - if test x$enable_shared = xno; then -- { $as_echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 --$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} -+ { echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 -+echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} - fi - enable_shared=yes - fi -@@ -4854,10 +4782,10 @@ else - fi - - --{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 --$as_echo_n "checking for a sed that does not truncate output... " >&6; } -+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } - if test "${lt_cv_path_SED+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # Loop through the user's path and test for sed and gsed. - # Then use that list of sed's as ones to test for truncation. -@@ -4910,40 +4838,45 @@ fi - - SED=$lt_cv_path_SED - --{ $as_echo "$as_me:$LINENO: result: $SED" >&5 --$as_echo "$SED" >&6; } -+{ echo "$as_me:$LINENO: result: $SED" >&5 -+echo "${ECHO_T}$SED" >&6; } - --{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 --$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # Extract the first word of "grep ggrep" to use in msg output -+if test -z "$GREP"; then -+set dummy grep ggrep; ac_prog_name=$2 - if test "${ac_cv_path_GREP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -z "$GREP"; then - ac_path_GREP_found=false -- # Loop through the user's path and test for each of PROGNAME-LIST -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - 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_test_x "$ac_path_GREP"; } || continue --# Check for GNU ac_path_GREP and select it if it is found. -+ 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_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 - *GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; - *) - ac_count=0 -- $as_echo_n 0123456789 >"conftest.in" -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" -- $as_echo 'GREP' >> "conftest.nl" -+ echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` -@@ -4958,60 +4891,74 @@ case `"$ac_path_GREP" --version 2>&1` in - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; - esac - -- $ac_path_GREP_found && break 3 -- done -+ -+ $ac_path_GREP_found && break 3 - done - done -+ -+done - IFS=$as_save_IFS -- if test -z "$ac_cv_path_GREP"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ -+ -+fi -+ -+GREP="$ac_cv_path_GREP" -+if test -z "$GREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -- fi -+fi -+ - else - ac_cv_path_GREP=$GREP - fi - -+ - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 --$as_echo "$ac_cv_path_GREP" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -+echo "${ECHO_T}$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - --{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 --$as_echo_n "checking for egrep... " >&6; } -+{ echo "$as_me:$LINENO: checking for egrep" >&5 -+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } - if test "${ac_cv_path_EGREP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else -- if test -z "$EGREP"; then -+ # Extract the first word of "egrep" to use in msg output -+if test -z "$EGREP"; then -+set dummy egrep; ac_prog_name=$2 -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else - ac_path_EGREP_found=false -- # Loop through the user's path and test for each of PROGNAME-LIST -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - 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_test_x "$ac_path_EGREP"; } || continue --# Check for GNU ac_path_EGREP and select it if it is found. -+ 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_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 - *GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; - *) - ac_count=0 -- $as_echo_n 0123456789 >"conftest.in" -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" -- $as_echo 'EGREP' >> "conftest.nl" -+ echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` -@@ -5026,24 +4973,33 @@ case `"$ac_path_EGREP" --version 2>&1` i - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; - esac - -- $ac_path_EGREP_found && break 3 -- done -+ -+ $ac_path_EGREP_found && break 3 - done - done -+ -+done - IFS=$as_save_IFS -- if test -z "$ac_cv_path_EGREP"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ -+ -+fi -+ -+EGREP="$ac_cv_path_EGREP" -+if test -z "$EGREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -- fi -+fi -+ - else - ac_cv_path_EGREP=$EGREP - fi - -+ - fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 --$as_echo "$ac_cv_path_EGREP" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -@@ -5058,8 +5014,8 @@ fi - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 --$as_echo_n "checking for ld used by $CC... " >&6; } -+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -5088,14 +5044,14 @@ $as_echo_n "checking for ld used by $CC. - ;; - esac - elif test "$with_gnu_ld" = yes; then -- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 --$as_echo_n "checking for GNU ld... " >&6; } -+ { echo "$as_me:$LINENO: checking for GNU ld" >&5 -+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } - else -- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 --$as_echo_n "checking for non-GNU ld... " >&6; } -+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } - fi - if test "${lt_cv_path_LD+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -5125,19 +5081,19 @@ fi - - LD="$lt_cv_path_LD" - if test -n "$LD"; then -- { $as_echo "$as_me:$LINENO: result: $LD" >&5 --$as_echo "$LD" >&6; } -+ { echo "$as_me:$LINENO: result: $LD" >&5 -+echo "${ECHO_T}$LD" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 --$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } --{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 --$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } - if test "${lt_cv_prog_gnu_ld+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. - case `$LD -v 2>&1 </dev/null` in -@@ -5149,20 +5105,20 @@ case `$LD -v 2>&1 </dev/null` in - ;; - esac - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 --$as_echo "$lt_cv_prog_gnu_ld" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$lt_cv_prog_gnu_ld - - --{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 --$as_echo_n "checking for $LD option to reload object files... " >&6; } -+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } - if test "${lt_cv_ld_reload_flag+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_ld_reload_flag='-r' - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 --$as_echo "$lt_cv_ld_reload_flag" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } - reload_flag=$lt_cv_ld_reload_flag - case $reload_flag in - "" | " "*) ;; -@@ -5179,10 +5135,10 @@ case $host_os in - ;; - esac - --{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 --$as_echo_n "checking for BSD-compatible nm... " >&6; } -+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } - if test "${lt_cv_path_NM+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$NM"; then - # Let the user override the test. -@@ -5228,25 +5184,25 @@ else - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm - fi - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 --$as_echo "$lt_cv_path_NM" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -+echo "${ECHO_T}$lt_cv_path_NM" >&6; } - NM="$lt_cv_path_NM" - --{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 --$as_echo_n "checking whether ln -s works... " >&6; } -+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } - LN_S=$as_ln_s - if test "$LN_S" = "ln -s"; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 --$as_echo "no, using $LN_S" >&6; } -+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -+echo "${ECHO_T}no, using $LN_S" >&6; } - fi - --{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 --$as_echo_n "checking how to recognize dependent libraries... " >&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 -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_file_magic_cmd='$MAGIC_CMD' - lt_cv_file_magic_test_file= -@@ -5358,7 +5314,7 @@ 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 -@@ -5429,8 +5385,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* - esac - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 --$as_echo "$lt_cv_deplibs_check_method" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -5464,7 +5420,7 @@ ia64-*-hpux*) - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) -@@ -5479,11 +5435,11 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 5482 "configure"' > conftest.$ac_ext -+ echo '#line 5438 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in -@@ -5521,7 +5477,7 @@ s390*-*linux*|sparc*-*linux*) - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *32-bit*) -@@ -5544,7 +5500,6 @@ s390*-*linux*|sparc*-*linux*) - esac - ;; - *64-bit*) -- libsuff=64 - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" -@@ -5572,10 +5527,10 @@ s390*-*linux*|sparc*-*linux*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" -- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 --$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } - if test "${lt_cv_cc_needs_belf+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -5604,30 +5559,26 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - lt_cv_cc_needs_belf=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -@@ -5637,8 +5588,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 --$as_echo "$lt_cv_cc_needs_belf" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" -@@ -5650,7 +5601,7 @@ sparc*-*solaris*) - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.o` in - *64-bit*) -@@ -5672,10 +5623,10 @@ sparc*-*solaris*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. - set dummy ${ac_tool_prefix}dlltool; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_DLLTOOL+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -@@ -5688,7 +5639,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5699,11 +5650,11 @@ fi - fi - DLLTOOL=$ac_cv_prog_DLLTOOL - if test -n "$DLLTOOL"; then -- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 --$as_echo "$DLLTOOL" >&6; } -+ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -+echo "${ECHO_T}$DLLTOOL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -5712,10 +5663,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. - set dummy dlltool; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -@@ -5728,7 +5679,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5739,11 +5690,11 @@ fi - fi - ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL - if test -n "$ac_ct_DLLTOOL"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 --$as_echo "$ac_ct_DLLTOOL" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_DLLTOOL" = x; then -@@ -5751,8 +5702,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - DLLTOOL=$ac_ct_DLLTOOL -@@ -5764,10 +5719,10 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. - set dummy ${ac_tool_prefix}as; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_AS+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -@@ -5780,7 +5735,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5791,11 +5746,11 @@ fi - fi - AS=$ac_cv_prog_AS - if test -n "$AS"; then -- { $as_echo "$as_me:$LINENO: result: $AS" >&5 --$as_echo "$AS" >&6; } -+ { echo "$as_me:$LINENO: result: $AS" >&5 -+echo "${ECHO_T}$AS" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -5804,10 +5759,10 @@ if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. - set dummy as; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_AS+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -@@ -5820,7 +5775,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5831,11 +5786,11 @@ fi - fi - ac_ct_AS=$ac_cv_prog_ac_ct_AS - if test -n "$ac_ct_AS"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 --$as_echo "$ac_ct_AS" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -+echo "${ECHO_T}$ac_ct_AS" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_AS" = x; then -@@ -5843,8 +5798,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - AS=$ac_ct_AS -@@ -5856,10 +5815,10 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. - set dummy ${ac_tool_prefix}objdump; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_OBJDUMP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -@@ -5872,7 +5831,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5883,11 +5842,11 @@ fi - fi - OBJDUMP=$ac_cv_prog_OBJDUMP - if test -n "$OBJDUMP"; then -- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 --$as_echo "$OBJDUMP" >&6; } -+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -+echo "${ECHO_T}$OBJDUMP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -5896,10 +5855,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. - set dummy objdump; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -@@ -5912,7 +5871,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -5923,11 +5882,11 @@ fi - fi - ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP - if test -n "$ac_ct_OBJDUMP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 --$as_echo "$ac_ct_OBJDUMP" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_OBJDUMP" = x; then -@@ -5935,8 +5894,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - OBJDUMP=$ac_ct_OBJDUMP -@@ -5957,15 +5920,15 @@ ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --$as_echo_n "checking how to run the C preprocessor... " >&6; } -+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -5997,21 +5960,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -@@ -6035,14 +5997,13 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -@@ -6050,7 +6011,7 @@ $as_echo "$ac_try_echo") >&5 - # Broken: success on invalid input. - continue - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -@@ -6075,8 +6036,8 @@ fi - else - ac_cv_prog_CPP=$CPP - fi --{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 --$as_echo "$CPP" >&6; } -+{ echo "$as_me:$LINENO: result: $CPP" >&5 -+echo "${ECHO_T}$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -6104,21 +6065,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -@@ -6142,14 +6102,13 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -@@ -6157,7 +6116,7 @@ $as_echo "$ac_try_echo") >&5 - # Broken: success on invalid input. - continue - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -@@ -6173,13 +6132,11 @@ rm -f conftest.err conftest.$ac_ext - if $ac_preproc_ok; then - : - else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - fi - - ac_ext=c -@@ -6189,10 +6146,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --$as_echo_n "checking for ANSI C header files... " >&6; } -+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } - if test "${ac_cv_header_stdc+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -6219,21 +6176,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -@@ -6325,40 +6281,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - ac_cv_header_stdc=no - fi --rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --$as_echo "$ac_cv_header_stdc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+echo "${ECHO_T}$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -6380,11 +6333,11 @@ fi - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -6402,21 +6355,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -@@ -6424,15 +6376,12 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -6443,21 +6392,20 @@ done - - for ac_header in dlfcn.h - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -6473,33 +6421,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -6513,52 +6460,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -6567,24 +6513,21 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -6601,11 +6544,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 --$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } - if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" -@@ -6637,21 +6580,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -@@ -6675,14 +6617,13 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err -@@ -6690,7 +6631,7 @@ $as_echo "$ac_try_echo") >&5 - # Broken: success on invalid input. - continue - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -@@ -6715,8 +6656,8 @@ fi - else - ac_cv_prog_CXXCPP=$CXXCPP - fi --{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 --$as_echo "$CXXCPP" >&6; } -+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -+echo "${ECHO_T}$CXXCPP" >&6; } - ac_preproc_ok=false - for ac_cxx_preproc_warn_flag in '' yes - do -@@ -6744,21 +6685,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -@@ -6782,14 +6722,13 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err -@@ -6797,7 +6736,7 @@ $as_echo "$ac_try_echo") >&5 - # Broken: success on invalid input. - continue - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -@@ -6813,13 +6752,11 @@ rm -f conftest.err conftest.$ac_ext - if $ac_preproc_ok; then - : - else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - fi - - ac_ext=cpp -@@ -6839,10 +6776,10 @@ if test -n "$ac_tool_prefix"; then - 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 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_F77+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. -@@ -6855,7 +6792,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -6866,11 +6803,11 @@ fi - fi - F77=$ac_cv_prog_F77 - if test -n "$F77"; then -- { $as_echo "$as_me:$LINENO: result: $F77" >&5 --$as_echo "$F77" >&6; } -+ { echo "$as_me:$LINENO: result: $F77" >&5 -+echo "${ECHO_T}$F77" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -6883,10 +6820,10 @@ if test -z "$F77"; then - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_F77+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -@@ -6899,7 +6836,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -6910,11 +6847,11 @@ fi - fi - ac_ct_F77=$ac_cv_prog_ac_ct_F77 - if test -n "$ac_ct_F77"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 --$as_echo "$ac_ct_F77" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -+echo "${ECHO_T}$ac_ct_F77" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -6926,8 +6863,12 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - F77=$ac_ct_F77 -@@ -6936,41 +6877,37 @@ fi - - - # Provide some information about the compiler. --$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 --set X $ac_compile --ac_compiler=$2 -+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` - { (ac_try="$ac_compiler --version >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -v >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -V >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - rm -f a.out - -@@ -6978,10 +6915,10 @@ rm -f a.out - # input file. (Note that this only needs to work for GNU compilers.) - ac_save_ext=$ac_ext - ac_ext=F --{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 --$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } -+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } - if test "${ac_cv_f77_compiler_gnu+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - program main -@@ -6997,21 +6934,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -7021,16 +6957,16 @@ rm -f core conftest.err conftest.$ac_obj - ac_cv_f77_compiler_gnu=$ac_compiler_gnu - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 --$as_echo "$ac_cv_f77_compiler_gnu" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } - ac_ext=$ac_save_ext - ac_test_FFLAGS=${FFLAGS+set} - ac_save_FFLAGS=$FFLAGS - FFLAGS= --{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 --$as_echo_n "checking whether $F77 accepts -g... " >&6; } -+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_f77_g+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - FFLAGS=-g - cat >conftest.$ac_ext <<_ACEOF -@@ -7044,21 +6980,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_prog_f77_g=no -@@ -7067,8 +7002,8 @@ fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 --$as_echo "$ac_cv_prog_f77_g" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } - if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS - elif test $ac_cv_prog_f77_g = yes; then -@@ -7085,11 +7020,7 @@ else - fi - fi - --if test $ac_compiler_gnu = yes; then -- G77=yes --else -- G77= --fi -+G77=`test $ac_compiler_gnu = yes && echo yes` - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7100,10 +7031,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - # find the maximum length of command line arguments --{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 --$as_echo_n "checking the maximum length of command line arguments... " >&6; } -+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } - if test "${lt_cv_sys_max_cmd_len+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - i=0 - teststring="ABCD" -@@ -7212,11 +7143,11 @@ else - fi - - if test -n $lt_cv_sys_max_cmd_len ; then -- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 --$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: none" >&5 --$as_echo "none" >&6; } -+ { echo "$as_me:$LINENO: result: none" >&5 -+echo "${ECHO_T}none" >&6; } - fi - - -@@ -7224,10 +7155,10 @@ fi - - - # Check for command to grab the raw symbol name followed by C symbol from nm. --{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 --$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -+{ 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; } - if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - # These are sane defaults that work on at least a few old systems. -@@ -7332,14 +7263,14 @@ EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then -@@ -7394,7 +7325,7 @@ EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi -@@ -7429,17 +7360,17 @@ if test -z "$lt_cv_sys_global_symbol_pip - lt_cv_sys_global_symbol_to_cdecl= - fi - if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -- { $as_echo "$as_me:$LINENO: result: failed" >&5 --$as_echo "failed" >&6; } -+ { echo "$as_me:$LINENO: result: failed" >&5 -+echo "${ECHO_T}failed" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: ok" >&5 --$as_echo "ok" >&6; } -+ { echo "$as_me:$LINENO: result: ok" >&5 -+echo "${ECHO_T}ok" >&6; } - fi - --{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 --$as_echo_n "checking for objdir... " >&6; } -+{ echo "$as_me:$LINENO: checking for objdir" >&5 -+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } - if test "${lt_cv_objdir+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - rm -f .libs 2>/dev/null - mkdir .libs 2>/dev/null -@@ -7451,8 +7382,8 @@ else - fi - rmdir .libs 2>/dev/null - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 --$as_echo "$lt_cv_objdir" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -+echo "${ECHO_T}$lt_cv_objdir" >&6; } - objdir=$lt_cv_objdir - - -@@ -7503,10 +7434,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_AR+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -@@ -7519,7 +7450,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -7530,11 +7461,11 @@ fi - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- { $as_echo "$as_me:$LINENO: result: $AR" >&5 --$as_echo "$AR" >&6; } -+ { echo "$as_me:$LINENO: result: $AR" >&5 -+echo "${ECHO_T}$AR" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -7543,10 +7474,10 @@ if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -@@ -7559,7 +7490,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -7570,11 +7501,11 @@ fi - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 --$as_echo "$ac_ct_AR" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -+echo "${ECHO_T}$ac_ct_AR" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_AR" = x; then -@@ -7582,8 +7513,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - AR=$ac_ct_AR -@@ -7595,10 +7530,10 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_RANLIB+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -7611,7 +7546,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -7622,11 +7557,11 @@ fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 --$as_echo "$RANLIB" >&6; } -+ { echo "$as_me:$LINENO: result: $RANLIB" >&5 -+echo "${ECHO_T}$RANLIB" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -7635,10 +7570,10 @@ if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -7651,7 +7586,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -7662,11 +7597,11 @@ fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --$as_echo "$ac_ct_RANLIB" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+echo "${ECHO_T}$ac_ct_RANLIB" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_RANLIB" = x; then -@@ -7674,8 +7609,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - RANLIB=$ac_ct_RANLIB -@@ -7687,10 +7626,10 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_STRIP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -7703,7 +7642,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -7714,11 +7653,11 @@ fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 --$as_echo "$STRIP" >&6; } -+ { echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -7727,10 +7666,10 @@ if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -7743,7 +7682,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -7754,11 +7693,11 @@ fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --$as_echo "$ac_ct_STRIP" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_STRIP" = x; then -@@ -7766,8 +7705,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - STRIP=$ac_ct_STRIP -@@ -7830,10 +7773,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - - case $deplibs_check_method in - file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 --$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } - if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $MAGIC_CMD in - [\\/*] | ?:[\\/]*) -@@ -7883,19 +7826,19 @@ fi - - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if test -n "$MAGIC_CMD"; then -- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 --$as_echo "$MAGIC_CMD" >&6; } -+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+echo "${ECHO_T}$MAGIC_CMD" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then -- { $as_echo "$as_me:$LINENO: checking for file" >&5 --$as_echo_n "checking for file... " >&6; } -+ { echo "$as_me:$LINENO: checking for file" >&5 -+echo $ECHO_N "checking for file... $ECHO_C" >&6; } - if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $MAGIC_CMD in - [\\/*] | ?:[\\/]*) -@@ -7945,11 +7888,11 @@ fi - - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if test -n "$MAGIC_CMD"; then -- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 --$as_echo "$MAGIC_CMD" >&6; } -+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+echo "${ECHO_T}$MAGIC_CMD" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - else -@@ -7967,10 +7910,10 @@ esac - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. - set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_DSYMUTIL+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -@@ -7983,7 +7926,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -7994,11 +7937,11 @@ fi - fi - DSYMUTIL=$ac_cv_prog_DSYMUTIL - if test -n "$DSYMUTIL"; then -- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 --$as_echo "$DSYMUTIL" >&6; } -+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -+echo "${ECHO_T}$DSYMUTIL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -8007,10 +7950,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. - set dummy dsymutil; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. -@@ -8023,7 +7966,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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_DSYMUTIL="dsymutil" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8034,11 +7977,11 @@ fi - fi - ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL - if test -n "$ac_ct_DSYMUTIL"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 --$as_echo "$ac_ct_DSYMUTIL" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_DSYMUTIL" = x; then -@@ -8046,8 +7989,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - DSYMUTIL=$ac_ct_DSYMUTIL -@@ -8059,10 +8006,10 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. - set dummy ${ac_tool_prefix}nmedit; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_NMEDIT+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -@@ -8075,7 +8022,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8086,11 +8033,11 @@ fi - fi - NMEDIT=$ac_cv_prog_NMEDIT - if test -n "$NMEDIT"; then -- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 --$as_echo "$NMEDIT" >&6; } -+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -+echo "${ECHO_T}$NMEDIT" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -8099,10 +8046,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. - set dummy nmedit; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. -@@ -8115,7 +8062,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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_NMEDIT="nmedit" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8126,11 +8073,11 @@ fi - fi - ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT - if test -n "$ac_ct_NMEDIT"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 --$as_echo "$ac_ct_NMEDIT" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_NMEDIT" = x; then -@@ -8138,8 +8085,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - NMEDIT=$ac_ct_NMEDIT -@@ -8149,10 +8100,10 @@ else - fi - - -- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 --$as_echo_n "checking for -single_module linker flag... " >&6; } -+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } - if test "${lt_cv_apple_cc_single_mod+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then -@@ -8170,12 +8121,12 @@ else - rm conftest.c - fi - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 --$as_echo "$lt_cv_apple_cc_single_mod" >&6; } -- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 --$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } -+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } - if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS -@@ -8202,37 +8153,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - lt_cv_ld_exported_symbols_list=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 --$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } - case $host_os in - rhapsody* | darwin1.[0123]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -@@ -8344,10 +8291,10 @@ if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' - - --{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 --$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -@@ -8362,11 +8309,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8365: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8312: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8369: \$? = $ac_status" >&5 -+ echo "$as_me:8316: \$? = $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. -@@ -8379,8 +8326,8 @@ else - $rm conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 --$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } - - if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -@@ -8394,8 +8341,8 @@ lt_prog_compiler_wl= - lt_prog_compiler_pic= - lt_prog_compiler_static= - --{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -8626,18 +8573,18 @@ $as_echo_n "checking for $compiler optio - esac - fi - --{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 --$as_echo "$lt_prog_compiler_pic" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic"; then - --{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 --$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_pic_works+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext -@@ -8652,11 +8599,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8655: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8602: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8659: \$? = $ac_status" >&5 -+ echo "$as_me:8606: \$? = $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. -@@ -8669,8 +8616,8 @@ else - $rm conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 --$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in -@@ -8697,10 +8644,10 @@ esac - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" --{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 --$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_static_works+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" -@@ -8725,8 +8672,8 @@ else - LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 --$as_echo "$lt_cv_prog_compiler_static_works" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } - - if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -@@ -8735,10 +8682,10 @@ else - fi - - --{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_c_o+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_c_o=no - $rm -r conftest 2>/dev/null -@@ -8756,11 +8703,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8759: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8706: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:8763: \$? = $ac_status" >&5 -+ echo "$as_me:8710: \$? = $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 -@@ -8782,34 +8729,34 @@ else - $rm conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 --$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --$as_echo_n "checking if we can lock with hard links... " >&6; } -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 --$as_echo "$hard_links" >&6; } -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then -- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi - else - need_locks=no - fi - --{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag= -@@ -9021,12 +8968,13 @@ EOF - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $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= -@@ -9239,21 +9187,18 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -9268,13 +9213,12 @@ 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - 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 -@@ -9309,21 +9253,18 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -9338,13 +9279,12 @@ 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - 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 -@@ -9577,7 +9517,7 @@ if test -z "$aix_libpath"; then aix_libp - 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 -@@ -9796,8 +9736,8 @@ if test -z "$aix_libpath"; then aix_libp - esac - fi - --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 --$as_echo "$ld_shlibs" >&6; } -+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -+echo "${ECHO_T}$ld_shlibs" >&6; } - test "$ld_shlibs" = no && can_build_shared=no - - # -@@ -9817,15 +9757,15 @@ x|xyes) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -+ { 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* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest -@@ -9843,7 +9783,7 @@ $as_echo_n "checking whether -lc should - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no -@@ -9855,16 +9795,16 @@ $as_echo_n "checking whether -lc should - cat conftest.err 1>&5 - fi - $rm conftest* -- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 --$as_echo "$archive_cmds_need_lc" >&6; } -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc" >&6; } - ;; - esac - fi - ;; - esac - --{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --$as_echo_n "checking dynamic linker characteristics... " >&6; } -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -10272,13 +10212,11 @@ linux* | k*bsd*-gnu) - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - - # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ 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 -@@ -10290,6 +10228,18 @@ linux* | k*bsd*-gnu) - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-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='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -10467,19 +10417,19 @@ uts4*) - dynamic_linker=no - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --$as_echo "$dynamic_linker" >&6; } -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - - if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" - fi - - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" - fi -@@ -10491,8 +10441,8 @@ if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } - hardcode_action= - if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var" || \ -@@ -10516,8 +10466,8 @@ else - # directories. - hardcode_action=unsupported - fi --{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 --$as_echo "$hardcode_action" >&6; } -+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -+echo "${ECHO_T}$hardcode_action" >&6; } - - if test "$hardcode_action" = relink; then - # Fast installation is not supported -@@ -10530,13 +10480,13 @@ fi - - striplib= - old_striplib= --{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 --$as_echo_n "checking whether stripping libraries is possible... " >&6; } -+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } - if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else - # FIXME - insert some real tests, host_os isn't really good enough - case $host_os in -@@ -10544,16 +10494,16 @@ else - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - ;; - *) -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - ;; - esac - fi -@@ -10585,10 +10535,10 @@ else - - darwin*) - # if libdl is installed we need to link against it -- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --$as_echo_n "checking for dlopen in -ldl... " >&6; } -+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } - if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" -@@ -10620,37 +10570,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --$as_echo "$ac_cv_lib_dl_dlopen" >&6; } --if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -+if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" - else - -@@ -10663,10 +10609,10 @@ fi - ;; - - *) -- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 --$as_echo_n "checking for shl_load... " >&6; } -+ { echo "$as_me:$LINENO: checking for shl_load" >&5 -+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } - if test "${ac_cv_func_shl_load+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -10719,42 +10665,38 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_shl_load=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 --$as_echo "$ac_cv_func_shl_load" >&6; } --if test "x$ac_cv_func_shl_load" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -+if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" - else -- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 --$as_echo_n "checking for shl_load in -ldld... " >&6; } -+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } - if test "${ac_cv_lib_dld_shl_load+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" -@@ -10786,43 +10728,39 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_shl_load=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 --$as_echo "$ac_cv_lib_dld_shl_load" >&6; } --if test "x$ac_cv_lib_dld_shl_load" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -+if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" - else -- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 --$as_echo_n "checking for dlopen... " >&6; } -+ { echo "$as_me:$LINENO: checking for dlopen" >&5 -+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } - if test "${ac_cv_func_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -10875,42 +10813,38 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_dlopen=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 --$as_echo "$ac_cv_func_dlopen" >&6; } --if test "x$ac_cv_func_dlopen" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -+if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" - else -- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --$as_echo_n "checking for dlopen in -ldl... " >&6; } -+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } - if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" -@@ -10942,43 +10876,39 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --$as_echo "$ac_cv_lib_dl_dlopen" >&6; } --if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -+if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" - else -- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 --$as_echo_n "checking for dlopen in -lsvld... " >&6; } -+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } - if test "${ac_cv_lib_svld_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsvld $LIBS" -@@ -11010,43 +10940,39 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_svld_dlopen=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 --$as_echo "$ac_cv_lib_svld_dlopen" >&6; } --if test "x$ac_cv_lib_svld_dlopen" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -+if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" - else -- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 --$as_echo_n "checking for dld_link in -ldld... " >&6; } -+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } - if test "${ac_cv_lib_dld_dld_link+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" -@@ -11078,37 +11004,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_dld_link=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 --$as_echo "$ac_cv_lib_dld_dld_link" >&6; } --if test "x$ac_cv_lib_dld_dld_link" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -+if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" - fi - -@@ -11147,10 +11069,10 @@ fi - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - -- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 --$as_echo_n "checking whether a program can dlopen itself... " >&6; } -+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } - if test "${lt_cv_dlopen_self+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -@@ -11158,7 +11080,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11161 "configure" -+#line 11083 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11224,7 +11146,7 @@ EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? -@@ -11242,15 +11164,15 @@ rm -fr conftest* - - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 --$as_echo "$lt_cv_dlopen_self" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 --$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } - if test "${lt_cv_dlopen_self_static+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self_static=cross -@@ -11258,7 +11180,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 11261 "configure" -+#line 11183 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11324,7 +11246,7 @@ EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? -@@ -11342,8 +11264,8 @@ rm -fr conftest* - - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 --$as_echo "$lt_cv_dlopen_self_static" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" -@@ -11365,13 +11287,13 @@ fi - - - # Report which library types will actually be built --{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 --$as_echo_n "checking if libtool supports shared libraries... " >&6; } --{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 --$as_echo "$can_build_shared" >&6; } -+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6; } - --{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 --$as_echo_n "checking whether to build shared libraries... " >&6; } -+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and -@@ -11391,15 +11313,15 @@ aix[4-9]*) - fi - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 --$as_echo "$enable_shared" >&6; } -+{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6; } - --{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 --$as_echo_n "checking whether to build static libraries... " >&6; } -+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes --{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 --$as_echo "$enable_static" >&6; } -+{ echo "$as_me:$LINENO: result: $enable_static" >&5 -+echo "${ECHO_T}$enable_static" >&6; } - - # The else clause should only fire when bootstrapping the - # libtool distribution, otherwise you forgot to ship ltmain.sh -@@ -11492,8 +11414,8 @@ if test -f "$ltmain"; then - cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" -- { $as_echo "$as_me:$LINENO: creating $ofile" >&5 --$as_echo "$as_me: creating $ofile" >&6;} -+ { echo "$as_me:$LINENO: creating $ofile" >&5 -+echo "$as_me: creating $ofile" >&6;} - - cat <<__EOF__ >> "$cfgfile" - #! $SHELL -@@ -11905,18 +11827,18 @@ fi - - if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then -- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 --$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} -+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then -- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 --$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} -+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} - else -- { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 --$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} -+ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} - fi - fi - if test -z "$LTCFLAGS"; then -@@ -11933,16 +11855,16 @@ $as_echo "$as_me: WARNING: using \`LTCC= - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in - "") ;; -- *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 --$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} -+ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -+echo "$as_me: error: invalid tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then -- { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 --$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} -+ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -12085,8 +12007,8 @@ fi - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 --$as_echo_n "checking for ld used by $CC... " >&6; } -+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -12115,14 +12037,14 @@ $as_echo_n "checking for ld used by $CC. - ;; - esac - elif test "$with_gnu_ld" = yes; then -- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 --$as_echo_n "checking for GNU ld... " >&6; } -+ { echo "$as_me:$LINENO: checking for GNU ld" >&5 -+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } - else -- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 --$as_echo_n "checking for non-GNU ld... " >&6; } -+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } - fi - if test "${lt_cv_path_LD+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -12152,19 +12074,19 @@ fi - - LD="$lt_cv_path_LD" - if test -n "$LD"; then -- { $as_echo "$as_me:$LINENO: result: $LD" >&5 --$as_echo "$LD" >&6; } -+ { echo "$as_me:$LINENO: result: $LD" >&5 -+echo "${ECHO_T}$LD" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 --$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } --{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 --$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } - if test "${lt_cv_prog_gnu_ld+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. - case `$LD -v 2>&1 </dev/null` in -@@ -12176,8 +12098,8 @@ case `$LD -v 2>&1 </dev/null` in - ;; - esac - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 --$as_echo "$lt_cv_prog_gnu_ld" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$lt_cv_prog_gnu_ld - - -@@ -12227,8 +12149,8 @@ else - fi - - # PORTME: fill in a description of your system's C++ link characteristics --{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - ld_shlibs_CXX=yes - case $host_os in - aix3*) -@@ -12345,21 +12267,18 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -12374,13 +12293,12 @@ 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - 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 -@@ -12416,21 +12334,18 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -12445,13 +12360,12 @@ 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - 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 -@@ -12854,7 +12768,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - 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= -@@ -13181,8 +13095,8 @@ if test -z "$aix_libpath"; then aix_libp - ld_shlibs_CXX=no - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 --$as_echo "$ld_shlibs_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+echo "${ECHO_T}$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - GCC_CXX="$GXX" -@@ -13201,7 +13115,7 @@ EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. -@@ -13357,8 +13271,8 @@ lt_prog_compiler_wl_CXX= - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - --{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -13558,7 +13472,7 @@ $as_echo_n "checking for $compiler optio - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -13641,18 +13555,18 @@ $as_echo_n "checking for $compiler optio - esac - fi - --{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 --$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic_CXX"; then - --{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 --$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext -@@ -13667,11 +13581,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13670: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13584: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:13674: \$? = $ac_status" >&5 -+ echo "$as_me:13588: \$? = $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. -@@ -13684,8 +13598,8 @@ else - $rm conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 --$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in -@@ -13712,10 +13626,10 @@ esac - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" --{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 --$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_static_works_CXX=no - save_LDFLAGS="$LDFLAGS" -@@ -13740,8 +13654,8 @@ else - LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 --$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } - - if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -@@ -13750,10 +13664,10 @@ else - fi - - --{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_c_o_CXX=no - $rm -r conftest 2>/dev/null -@@ -13771,11 +13685,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:13774: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13688: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:13778: \$? = $ac_status" >&5 -+ echo "$as_me:13692: \$? = $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 -@@ -13797,34 +13711,34 @@ else - $rm conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 --$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --$as_echo_n "checking if we can lock with hard links... " >&6; } -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 --$as_echo "$hard_links" >&6; } -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then -- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi - else - need_locks=no - fi - --{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -@@ -13843,14 +13757,17 @@ $as_echo_n "checking whether the $compil - 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' - ;; -+ 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' - ;; - esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 --$as_echo "$ld_shlibs_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+echo "${ECHO_T}$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - # -@@ -13870,15 +13787,15 @@ x|xyes) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -+ { 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* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest -@@ -13896,7 +13813,7 @@ $as_echo_n "checking whether -lc should - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no -@@ -13908,16 +13825,16 @@ $as_echo_n "checking whether -lc should - cat conftest.err 1>&5 - fi - $rm conftest* -- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 --$as_echo "$archive_cmds_need_lc_CXX" >&6; } -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } - ;; - esac - fi - ;; - esac - --{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --$as_echo_n "checking dynamic linker characteristics... " >&6; } -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -14273,13 +14190,11 @@ linux* | k*bsd*-gnu) - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - - # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ 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 -@@ -14291,6 +14206,18 @@ linux* | k*bsd*-gnu) - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-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='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -14468,19 +14395,19 @@ uts4*) - dynamic_linker=no - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --$as_echo "$dynamic_linker" >&6; } -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - - if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" - fi - - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" - fi -@@ -14492,8 +14419,8 @@ if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } - hardcode_action_CXX= - if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var_CXX" || \ -@@ -14517,8 +14444,8 @@ else - # directories. - hardcode_action_CXX=unsupported - fi --{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 --$as_echo "$hardcode_action_CXX" >&6; } -+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -+echo "${ECHO_T}$hardcode_action_CXX" >&6; } - - if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported -@@ -15056,13 +14983,13 @@ done - cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - --{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 --$as_echo_n "checking if libtool supports shared libraries... " >&6; } --{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 --$as_echo "$can_build_shared" >&6; } -+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6; } - --{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 --$as_echo_n "checking whether to build shared libraries... " >&6; } -+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and -@@ -15081,15 +15008,15 @@ aix[4-9]*) - fi - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 --$as_echo "$enable_shared" >&6; } -+{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6; } - --{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 --$as_echo_n "checking whether to build static libraries... " >&6; } -+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes --{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 --$as_echo "$enable_static" >&6; } -+{ echo "$as_me:$LINENO: result: $enable_static" >&5 -+echo "${ECHO_T}$enable_static" >&6; } - - GCC_F77="$G77" - LD_F77="$LD" -@@ -15098,8 +15025,8 @@ lt_prog_compiler_wl_F77= - lt_prog_compiler_pic_F77= - lt_prog_compiler_static_F77= - --{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_F77='-Wl,' -@@ -15330,18 +15257,18 @@ $as_echo_n "checking for $compiler optio - esac - fi - --{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 --$as_echo "$lt_prog_compiler_pic_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic_F77"; then - --{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 --$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext -@@ -15356,11 +15283,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15359: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15286: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15363: \$? = $ac_status" >&5 -+ echo "$as_me:15290: \$? = $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. -@@ -15373,8 +15300,8 @@ else - $rm conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 --$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in -@@ -15401,10 +15328,10 @@ esac - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" --{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 --$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_static_works_F77=no - save_LDFLAGS="$LDFLAGS" -@@ -15429,8 +15356,8 @@ else - LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 --$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } - - if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then - : -@@ -15439,10 +15366,10 @@ else - fi - - --{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_c_o_F77=no - $rm -r conftest 2>/dev/null -@@ -15460,11 +15387,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15463: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15390: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15467: \$? = $ac_status" >&5 -+ echo "$as_me:15394: \$? = $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 -@@ -15486,34 +15413,34 @@ else - $rm conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 --$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --$as_echo_n "checking if we can lock with hard links... " >&6; } -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 --$as_echo "$hard_links" >&6; } -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then -- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi - else - need_locks=no - fi - --{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag_F77= -@@ -15725,12 +15652,13 @@ EOF - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $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= -@@ -15933,21 +15861,18 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -15962,13 +15887,12 @@ 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - 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 -@@ -15993,21 +15917,18 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_f77_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -16022,13 +15943,12 @@ 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - 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 -@@ -16261,7 +16181,7 @@ if test -z "$aix_libpath"; then aix_libp - 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 -@@ -16480,8 +16400,8 @@ if test -z "$aix_libpath"; then aix_libp - esac - fi - --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 --$as_echo "$ld_shlibs_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -+echo "${ECHO_T}$ld_shlibs_F77" >&6; } - test "$ld_shlibs_F77" = no && can_build_shared=no - - # -@@ -16501,15 +16421,15 @@ x|xyes) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -+ { 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* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest -@@ -16527,7 +16447,7 @@ $as_echo_n "checking whether -lc should - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_F77=no -@@ -16539,16 +16459,16 @@ $as_echo_n "checking whether -lc should - cat conftest.err 1>&5 - fi - $rm conftest* -- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 --$as_echo "$archive_cmds_need_lc_F77" >&6; } -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } - ;; - esac - fi - ;; - esac - --{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --$as_echo_n "checking dynamic linker characteristics... " >&6; } -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -16904,13 +16824,11 @@ linux* | k*bsd*-gnu) - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - - # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ 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 -@@ -16922,6 +16840,18 @@ linux* | k*bsd*-gnu) - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-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='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -17099,19 +17029,19 @@ uts4*) - dynamic_linker=no - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --$as_echo "$dynamic_linker" >&6; } -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - - if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" - fi - - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" - fi -@@ -17123,8 +17053,8 @@ if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } - hardcode_action_F77= - if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var_F77" || \ -@@ -17148,8 +17078,8 @@ else - # directories. - hardcode_action_F77=unsupported - fi --{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 --$as_echo "$hardcode_action_F77" >&6; } -+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -+echo "${ECHO_T}$hardcode_action_F77" >&6; } - - if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported -@@ -17659,10 +17589,10 @@ if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - - --{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 --$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -@@ -17677,11 +17607,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17680: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17610: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:17684: \$? = $ac_status" >&5 -+ echo "$as_me:17614: \$? = $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. -@@ -17694,8 +17624,8 @@ else - $rm conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 --$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } - - if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -@@ -17709,8 +17639,8 @@ lt_prog_compiler_wl_GCJ= - lt_prog_compiler_pic_GCJ= - lt_prog_compiler_static_GCJ= - --{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_GCJ='-Wl,' -@@ -17941,18 +17871,18 @@ $as_echo_n "checking for $compiler optio - esac - fi - --{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 --$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic_GCJ"; then - --{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 --$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext -@@ -17967,11 +17897,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:17970: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17900: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:17974: \$? = $ac_status" >&5 -+ echo "$as_me:17904: \$? = $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. -@@ -17984,8 +17914,8 @@ else - $rm conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 --$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } - - if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in -@@ -18012,10 +17942,10 @@ esac - # Check to make sure the static flag actually works. - # - wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" --{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 --$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_static_works_GCJ=no - save_LDFLAGS="$LDFLAGS" -@@ -18040,8 +17970,8 @@ else - LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 --$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } - - if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then - : -@@ -18050,10 +17980,10 @@ else - fi - - --{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_c_o_GCJ=no - $rm -r conftest 2>/dev/null -@@ -18071,11 +18001,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18074: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:18004: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:18078: \$? = $ac_status" >&5 -+ echo "$as_me:18008: \$? = $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 -@@ -18097,34 +18027,34 @@ else - $rm conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 --$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --$as_echo_n "checking if we can lock with hard links... " >&6; } -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 --$as_echo "$hard_links" >&6; } -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then -- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi - else - need_locks=no - fi - --{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag_GCJ= -@@ -18336,12 +18266,13 @@ EOF - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $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= -@@ -18554,21 +18485,18 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -18583,13 +18511,12 @@ 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - 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 -@@ -18624,21 +18551,18 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -18653,13 +18577,12 @@ 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - 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 -@@ -18892,7 +18815,7 @@ if test -z "$aix_libpath"; then aix_libp - 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 -@@ -19111,8 +19034,8 @@ if test -z "$aix_libpath"; then aix_libp - esac - fi - --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 --$as_echo "$ld_shlibs_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } - test "$ld_shlibs_GCJ" = no && can_build_shared=no - - # -@@ -19132,15 +19055,15 @@ x|xyes) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -+ { 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* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest -@@ -19158,7 +19081,7 @@ $as_echo_n "checking whether -lc should - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_GCJ=no -@@ -19170,16 +19093,16 @@ $as_echo_n "checking whether -lc should - cat conftest.err 1>&5 - fi - $rm conftest* -- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 --$as_echo "$archive_cmds_need_lc_GCJ" >&6; } -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } - ;; - esac - fi - ;; - esac - --{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --$as_echo_n "checking dynamic linker characteristics... " >&6; } -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -19535,13 +19458,11 @@ linux* | k*bsd*-gnu) - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - - # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ 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 -@@ -19553,6 +19474,18 @@ linux* | k*bsd*-gnu) - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-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='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -19730,19 +19663,19 @@ uts4*) - dynamic_linker=no - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --$as_echo "$dynamic_linker" >&6; } -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - - if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" - fi - - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" - if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" - fi -@@ -19754,8 +19687,8 @@ if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } - hardcode_action_GCJ= - if test -n "$hardcode_libdir_flag_spec_GCJ" || \ - test -n "$runpath_var_GCJ" || \ -@@ -19779,8 +19712,8 @@ else - # directories. - hardcode_action_GCJ=unsupported - fi --{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 --$as_echo "$hardcode_action_GCJ" >&6; } -+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -+echo "${ECHO_T}$hardcode_action_GCJ" >&6; } - - if test "$hardcode_action_GCJ" = relink; then - # Fast installation is not supported -@@ -20703,8 +20636,8 @@ CC="$lt_save_CC" - ;; - - *) -- { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 --$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} -+ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -+echo "$as_me: error: Unsupported tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -@@ -20723,8 +20656,8 @@ $as_echo "$as_me: error: Unsupported tag - chmod +x "$ofile" - else - rm -f "${ofile}T" -- { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 --$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} -+ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -+echo "$as_me: error: unable to update list of available tagged configurations." >&2;} - { (exit 1); exit 1; }; } - fi - fi -@@ -20769,10 +20702,10 @@ fi - - if test "$enable_largefile" != no; then - -- { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 --$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -+ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } - if test "${ac_cv_sys_largefile_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then -@@ -20809,21 +20742,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - break - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -20837,21 +20769,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -20864,16 +20795,16 @@ rm -f core conftest.err conftest.$ac_obj - rm -f conftest.$ac_ext - fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 --$as_echo "$ac_cv_sys_largefile_CC" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - -- { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 --$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -+ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } - if test "${ac_cv_sys_file_offset_bits+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -20905,21 +20836,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -20956,21 +20886,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -20981,8 +20910,8 @@ rm -f core conftest.err conftest.$ac_obj - break - done - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 --$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } - case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) -@@ -20991,12 +20920,12 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - ;; - esac --rm -rf conftest* -+rm -f conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then -- { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 --$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -+ { 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 -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -21028,21 +20957,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -21079,21 +21007,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -21104,8 +21031,8 @@ rm -f core conftest.err conftest.$ac_obj - break - done - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 --$as_echo "$ac_cv_sys_large_files" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -+echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } - case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) -@@ -21114,24 +21041,132 @@ cat >>confdefs.h <<_ACEOF - _ACEOF - ;; - esac --rm -rf conftest* -+rm -f conftest* - fi - fi - - - # By default we simply use the C compiler to build assembly code. - --: ${CCAS='$(CC)'} --# Set ASFLAGS if not already set. --: ${CCASFLAGS='$(CFLAGS)'} -+test "${CCAS+set}" = set || CCAS=$CC -+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS -+ -+ -+ -+depcc="$CCAS" am_compiler_list= -+ -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_CCAS_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CCAS_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_CCAS_dependencies_compiler_type=none -+fi -+ -+fi -+{ echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CCAS_dependencies_compiler_type" >&6; } -+CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type -+ -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then -+ am__fastdepCCAS_TRUE= -+ am__fastdepCCAS_FALSE='#' -+else -+ am__fastdepCCAS_TRUE='#' -+ am__fastdepCCAS_FALSE= -+fi - - - # Extract the first word of "nm", so it can be a program name with args. - set dummy nm; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_NM+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $NM in - [\\/]* | ?:[\\/]*) -@@ -21146,7 +21181,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -21159,17 +21194,17 @@ esac - fi - NM=$ac_cv_path_NM - if test -n "$NM"; then -- { $as_echo "$as_me:$LINENO: result: $NM" >&5 --$as_echo "$NM" >&6; } -+ { echo "$as_me:$LINENO: result: $NM" >&5 -+echo "${ECHO_T}$NM" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - - --{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 --$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } -+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } - # Check whether --enable-maintainer-mode was given. - if test "${enable_maintainer_mode+set}" = set; then - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -@@ -21177,11 +21212,9 @@ else - USE_MAINTAINER_MODE=no - fi - -- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 --$as_echo "$USE_MAINTAINER_MODE" >&6; } -- -- --if test $USE_MAINTAINER_MODE = yes; then -+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } -+ if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' - else -@@ -21193,8 +21226,8 @@ fi - - - --{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 --$as_echo_n "checking for some Win32 platform... " >&6; } -+{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -+echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } - case "$host" in - *-*-mingw*|*-*-cygwin*) - platform_win32=yes -@@ -21203,11 +21236,9 @@ case "$host" in - platform_win32=no - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 --$as_echo "$platform_win32" >&6; } -- -- --if test "$platform_win32" = "yes"; then -+{ echo "$as_me:$LINENO: result: $platform_win32" >&5 -+echo "${ECHO_T}$platform_win32" >&6; } -+ if test "$platform_win32" = "yes"; then - PLATFORM_WIN32_TRUE= - PLATFORM_WIN32_FALSE='#' - else -@@ -21216,9 +21247,7 @@ else - fi - - -- -- --if test "$os_win32" = "yes"; then -+ if test "$os_win32" = "yes"; then - OS_WIN32_TRUE= - OS_WIN32_FALSE='#' - else -@@ -21226,9 +21255,7 @@ else - OS_WIN32_FALSE= - fi - -- -- --if test "$os_win32" != "yes"; then -+ if test "$os_win32" != "yes"; then - OS_UNIX_TRUE= - OS_UNIX_FALSE='#' - else -@@ -21236,9 +21263,7 @@ else - OS_UNIX_FALSE= - fi - -- -- --if test "$os_linux" = "yes"; then -+ if test "$os_linux" = "yes"; then - OS_LINUX_TRUE= - OS_LINUX_FALSE='#' - else -@@ -21251,10 +21276,10 @@ if test "$os_win32" = "yes"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. - set dummy ${ac_tool_prefix}windres; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_WINDRES+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. -@@ -21267,7 +21292,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -21278,11 +21303,11 @@ fi - fi - WINDRES=$ac_cv_prog_WINDRES - if test -n "$WINDRES"; then -- { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 --$as_echo "$WINDRES" >&6; } -+ { echo "$as_me:$LINENO: result: $WINDRES" >&5 -+echo "${ECHO_T}$WINDRES" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -21291,10 +21316,10 @@ if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. - set dummy windres; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -@@ -21307,7 +21332,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -21318,11 +21343,11 @@ fi - fi - ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES - if test -n "$ac_ct_WINDRES"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 --$as_echo "$ac_ct_WINDRES" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -+echo "${ECHO_T}$ac_ct_WINDRES" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_WINDRES" = x; then -@@ -21330,8 +21355,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - WINDRES=$ac_ct_WINDRES -@@ -21341,16 +21370,16 @@ else - fi - - if test "$WINDRES" = no; then -- { { $as_echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 --$as_echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} -+ { { echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 -+echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} - { (exit 1); exit 1; }; } - fi - # Extract the first word of "lib.exe", so it can be a program name with args. - set dummy lib.exe; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ms_librarian+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ms_librarian"; then - ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. -@@ -21363,7 +21392,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -21375,18 +21404,16 @@ fi - fi - ms_librarian=$ac_cv_prog_ms_librarian - if test -n "$ms_librarian"; then -- { $as_echo "$as_me:$LINENO: result: $ms_librarian" >&5 --$as_echo "$ms_librarian" >&6; } -+ { echo "$as_me:$LINENO: result: $ms_librarian" >&5 -+echo "${ECHO_T}$ms_librarian" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - - fi -- -- --if test x$ms_librarian = xyes; then -+ if test x$ms_librarian = xyes; then - MS_LIB_AVAILABLE_TRUE= - MS_LIB_AVAILABLE_FALSE='#' - else -@@ -21463,8 +21490,8 @@ fi - - case $gdktarget in - x11|win32|quartz|directfb) ;; -- *) { { $as_echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 --$as_echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} -+ *) { { echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 -+echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} - { (exit 1); exit 1; }; };; - esac - -@@ -21499,8 +21526,8 @@ _ACEOF - - - # Build time sanity check... --{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 --$as_echo_n "checking whether build environment is sane... " >&6; } -+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } - # Just in case - sleep 1 - echo timestamp > conftest.file -@@ -21523,9 +21550,9 @@ if ( - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". -- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&5 --$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -21536,20 +21563,20 @@ then - # Ok. - : - else -- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! - Check your system clock" >&5 --$as_echo "$as_me: error: newly created file is older than distributed files! -+echo "$as_me: error: newly created file is older than distributed files! - Check your system clock" >&2;} - { (exit 1); exit 1; }; } - fi --{ $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - - # Checks for programs. --{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 --$as_echo_n "checking for library containing strerror... " >&6; } -+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 -+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } - if test "${ac_cv_search_strerror+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_func_search_save_LIBS=$LIBS - cat >conftest.$ac_ext <<_ACEOF -@@ -21587,30 +21614,26 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_search_strerror=$ac_res - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then -@@ -21625,40 +21648,582 @@ fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 --$as_echo "$ac_cv_search_strerror" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -+echo "${ECHO_T}$ac_cv_search_strerror" >&6; } - ac_res=$ac_cv_search_strerror - if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}gcc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ - -+fi -+if test -z "$ac_cv_prog_CC"; then -+ ac_ct_CC=$CC -+ # Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - --{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 --$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; } --if test "${am_cv_prog_cc_stdc+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- am_cv_prog_cc_stdc=no --ac_save_CC="$CC" --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi -+else -+ CC="$ac_cv_prog_CC" -+fi -+ -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}cc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH - do -- CC="$ac_save_CC $ac_arg" -+ 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_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ fi -+fi -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ ac_prog_rejected=no -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+ ac_cv_prog_CC="cc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# != 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -+ fi -+fi -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+fi -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in cl.exe -+ 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$CC" && break -+ done -+fi -+if test -z "$CC"; then -+ ac_ct_CC=$CC -+ for ac_prog in cl.exe -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_CC" && break -+done -+ -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi -+fi -+ -+fi -+ -+ -+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&5 -+echo "$as_me: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+ -+# Provide some information about the compiler. -+echo "$as_me:$LINENO: checking for C compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -+if test "${ac_cv_c_compiler_gnu+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+ -+int -+main () -+{ -+#ifndef __GNUC__ -+ choke me -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_compiler_gnu=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_c_compiler_gnu=$ac_compiler_gnu -+ -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -+GCC=`test $ac_compiler_gnu = yes && echo yes` -+ac_test_CFLAGS=${CFLAGS+set} -+ac_save_CFLAGS=$CFLAGS -+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_g+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS=$ac_save_CFLAGS -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" -+ fi -+else -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi -+fi -+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_prog_cc_c89=no -+ac_save_CC=$CC -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - #include <stdarg.h> - #include <stdio.h> - #include <sys/types.h> -@@ -21681,66 +22246,202 @@ static char *f (char * (*g) (char **, in - va_end (v); - return s; - } -+ -+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has -+ function prototypes and stuff, but not '\xHH' hex character constants. -+ These don't provoke an error unfortunately, instead are silently treated -+ as 'x'. The following induces an error, until -std is added to get -+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an -+ array size at least. It's necessary to write '\x00'==0 to get something -+ that's true only with -std. */ -+int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -+ -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; - int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); - int argc; - char **argv; -- - int - main () - { -- - return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -- - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+do -+ CC="$ac_save_CC $ac_arg" -+ rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -+ ac_cv_prog_cc_c89=$ac_arg - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --CC="$ac_save_CC" -+rm -f conftest.$ac_ext -+CC=$ac_save_CC - - fi -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; -+ xno) -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&6; } ;; -+ *) -+ CC="$CC $ac_cv_prog_cc_c89" -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -+esac -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+depcc="$CC" am_compiler_list= -+ -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_CC_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CC_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done - --if test -z "$am_cv_prog_cc_stdc"; then -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } -+ cd .. -+ rm -rf conftest.dir - else -- { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 --$as_echo "$am_cv_prog_cc_stdc" >&6; } -+ am_cv_CC_dependencies_compiler_type=none - fi --case "x$am_cv_prog_cc_stdc" in -- x|xno) ;; -- *) CC="$CC $am_cv_prog_cc_stdc" ;; --esac -+ -+fi -+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } -+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -+ -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then -+ am__fastdepCC_TRUE= -+ am__fastdepCC_FALSE='#' -+else -+ am__fastdepCC_TRUE='#' -+ am__fastdepCC_FALSE= -+fi -+ -+ -+ -+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc - - # Find a good install program. We prefer a C program (faster), - # so one script is as good as another. But avoid the broken or -@@ -21755,12 +22456,11 @@ esac - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --# Reject install programs that cannot install multiple files. --{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --$as_echo_n "checking for a BSD-compatible install... " >&6; } -+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -21789,29 +22489,17 @@ case $as_dir/ in - # program-specific install script used by HP pwplus--don't use. - : - else -- rm -rf conftest.one conftest.two conftest.dir -- echo one > conftest.one -- echo two > conftest.two -- mkdir conftest.dir -- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -- test -s conftest.one && test -s conftest.two && -- test -s conftest.dir/conftest.one && -- test -s conftest.dir/conftest.two -- then -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 - fi - fi - done - done - ;; - esac -- - done - IFS=$as_save_IFS - --rm -rf conftest.one conftest.two conftest.dir - - fi - if test "${ac_cv_path_install+set}" = set; then -@@ -21824,8 +22512,8 @@ fi - INSTALL=$ac_install_sh - fi - fi --{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 --$as_echo "$INSTALL" >&6; } -+{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -21835,12 +22523,11 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } --set x ${MAKE-make} --ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` - if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.make <<\_ACEOF - SHELL = /bin/sh -@@ -21857,12 +22544,12 @@ esac - rm -f conftest.make - fi - if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - SET_MAKE= - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -21895,8 +22582,8 @@ CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_I - if test x"$os_win32" = xyes; then - if test x"$GCC" = xyes; then - msnative_struct='' -- { $as_echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 --$as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; } -+ { echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 -+echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6; } - if test -z "$ac_cv_prog_CC"; then - our_gcc="$CC" - else -@@ -21915,14 +22602,14 @@ $as_echo_n "checking how to get MSVC-com - ;; - esac - if test x"$msnative_struct" = x ; then -- { $as_echo "$as_me:$LINENO: result: no way" >&5 --$as_echo "no way" >&6; } -- { $as_echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 --$as_echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} -+ { echo "$as_me:$LINENO: result: no way" >&5 -+echo "${ECHO_T}no way" >&6; } -+ { echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 -+echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} - else - CFLAGS="$CFLAGS $msnative_struct" -- { $as_echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 --$as_echo "${msnative_struct}" >&6; } -+ { echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 -+echo "${ECHO_T}${msnative_struct}" >&6; } - fi - fi - fi -@@ -21942,10 +22629,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. - set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) -@@ -21960,7 +22647,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -21972,11 +22659,11 @@ esac - fi - PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then -- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 --$as_echo "$PKG_CONFIG" >&6; } -+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+echo "${ECHO_T}$PKG_CONFIG" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -21985,10 +22672,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) -@@ -22003,7 +22690,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -22015,11 +22702,11 @@ esac - fi - ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG - if test -n "$ac_pt_PKG_CONFIG"; then -- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 --$as_echo "$ac_pt_PKG_CONFIG" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -22027,8 +22714,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - PKG_CONFIG=$ac_pt_PKG_CONFIG -@@ -22040,54 +22731,58 @@ fi - fi - if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 -- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 --$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } -+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - PKG_CONFIG="" - fi - - fi - - pkg_failed=no --{ $as_echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 --$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; } -+{ echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 -+echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; } - --if test -n "$BASE_DEPENDENCIES_CFLAGS"; then -- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 -+if test -n "$PKG_CONFIG"; then -+ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then -+ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` - else - pkg_failed=yes - fi -- else -- pkg_failed=untried -+ fi -+else -+ pkg_failed=untried - fi --if test -n "$BASE_DEPENDENCIES_LIBS"; then -- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 -+if test -n "$PKG_CONFIG"; then -+ if test -n "$BASE_DEPENDENCIES_LIBS"; then -+ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" -+ else -+ if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` - else - pkg_failed=yes - fi -- else -- pkg_failed=untried -+ fi -+else -+ pkg_failed=untried - fi - - -@@ -22100,14 +22795,14 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` -+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` - else -- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` -+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` - fi - # Put the nasty error message in config.log where it belongs - echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 - -- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: -+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: - - $BASE_DEPENDENCIES_PKG_ERRORS - -@@ -22118,7 +22813,7 @@ Alternatively, you may set the environme - and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - " >&5 --$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: -+echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: - - $BASE_DEPENDENCIES_PKG_ERRORS - -@@ -22131,9 +22826,7 @@ See the pkg-config man page for more det - " >&2;} - { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -+ { { echo "$as_me:$LINENO: 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 - path to pkg-config. - -@@ -22143,7 +22836,7 @@ See the pkg-config man page for more det - - To get pkg-config, see <http://pkg-config.freedesktop.org/>. - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -+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 - path to pkg-config. - -@@ -22153,12 +22846,12 @@ See the pkg-config man page for more det - - To get pkg-config, see <http://pkg-config.freedesktop.org/>. - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - else - BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS - BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - fi - -@@ -22181,8 +22874,8 @@ else - fi - - --{ $as_echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 --$as_echo_n "checking Whether to write dependencies into .pc files... " >&6; } -+{ echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 -+echo $ECHO_N "checking Whether to write dependencies into .pc files... $ECHO_C" >&6; } - case $enable_explicit_deps in - auto) - export SED -@@ -22195,17 +22888,15 @@ case $enable_explicit_deps in - ;; - yes|no) - ;; -- *) { { $as_echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 --$as_echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} -+ *) { { echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 -+echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} - { (exit 1); exit 1; }; } - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 --$as_echo "$enable_explicit_deps" >&6; } -- -+{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 -+echo "${ECHO_T}$enable_explicit_deps" >&6; } - -- --if test $enable_explicit_deps = no; then -+ if test $enable_explicit_deps = no; then - DISABLE_EXPLICIT_DEPS_TRUE= - DISABLE_EXPLICIT_DEPS_FALSE='#' - else -@@ -22221,10 +22912,10 @@ for ac_prog in perl5 perl - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_PERL+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $PERL in - [\\/]* | ?:[\\/]*) -@@ -22239,7 +22930,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -22251,11 +22942,11 @@ esac - fi - PERL=$ac_cv_path_PERL - if test -n "$PERL"; then -- { $as_echo "$as_me:$LINENO: result: $PERL" >&5 --$as_echo "$PERL" >&6; } -+ { echo "$as_me:$LINENO: result: $PERL" >&5 -+echo "${ECHO_T}$PERL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -22266,10 +22957,10 @@ done - # We would like indent, but don't require it. - # Extract the first word of "indent", so it can be a program name with args. - set dummy indent; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_INDENT+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$INDENT"; then - ac_cv_prog_INDENT="$INDENT" # Let the user override the test. -@@ -22282,7 +22973,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -22293,11 +22984,11 @@ fi - fi - INDENT=$ac_cv_prog_INDENT - if test -n "$INDENT"; then -- { $as_echo "$as_me:$LINENO: result: $INDENT" >&5 --$as_echo "$INDENT" >&6; } -+ { echo "$as_me:$LINENO: result: $INDENT" >&5 -+echo "${ECHO_T}$INDENT" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -22316,11 +23007,11 @@ fi - - for ac_func in lstat mkstemp flockfile getc_unlocked - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -22373,42 +23064,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -22417,11 +23101,11 @@ done - - for ac_func in localtime_r - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -22474,42 +23158,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -22517,8 +23194,8 @@ done - - - # _NL_TIME_FIRST_WEEKDAY is an enum and not a define --{ $as_echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 --$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; } -+{ echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 -+echo $ECHO_N "checking for _NL_TIME_FIRST_WEEKDAY... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22543,34 +23220,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - gtk_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_ok=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } -+{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 -+echo "${ECHO_T}$gtk_ok" >&6; } - if test "$gtk_ok" = "yes"; then - - cat >>confdefs.h <<\_ACEOF -@@ -22580,8 +23253,8 @@ _ACEOF - fi - - # _NL_MEASUREMENT_MEASUREMENT is an enum and not a define --{ $as_echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 --$as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; } -+{ echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 -+echo $ECHO_N "checking for _NL_MEASUREMENT_MEASUREMENT... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22606,34 +23279,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - gtk_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_ok=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } -+{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 -+echo "${ECHO_T}$gtk_ok" >&6; } - if test "$gtk_ok" = "yes"; then - - cat >>confdefs.h <<\_ACEOF -@@ -22643,8 +23312,8 @@ _ACEOF - fi - - # _NL_PAPER_HEIGHT is an enum and not a define --{ $as_echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 --$as_echo_n "checking for _NL_PAPER_HEIGHT... " >&6; } -+{ echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 -+echo $ECHO_N "checking for _NL_PAPER_HEIGHT... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22669,34 +23338,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - gtk_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_ok=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } -+{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 -+echo "${ECHO_T}$gtk_ok" >&6; } - if test "$gtk_ok" = "yes"; then - - cat >>confdefs.h <<\_ACEOF -@@ -22706,8 +23371,8 @@ _ACEOF - fi - - # _NL_PAPER_WIDTH is an enum and not a define --{ $as_echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 --$as_echo_n "checking for _NL_PAPER_WIDTH... " >&6; } -+{ echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 -+echo $ECHO_N "checking for _NL_PAPER_WIDTH... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22732,34 +23397,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - gtk_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_ok=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } -+{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 -+echo "${ECHO_T}$gtk_ok" >&6; } - if test "$gtk_ok" = "yes"; then - - cat >>confdefs.h <<\_ACEOF -@@ -22769,8 +23430,8 @@ _ACEOF - fi - - # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable --{ $as_echo "$as_me:$LINENO: checking for sigsetjmp" >&5 --$as_echo_n "checking for sigsetjmp... " >&6; } -+{ echo "$as_me:$LINENO: checking for sigsetjmp" >&5 -+echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22795,34 +23456,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - gtk_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_ok=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } -+{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 -+echo "${ECHO_T}$gtk_ok" >&6; } - if test "$gtk_ok" = "yes"; then - - cat >>confdefs.h <<\_ACEOF -@@ -22837,21 +23494,20 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/L - - for ac_header in locale.h - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22867,33 +23523,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22907,52 +23562,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -22961,24 +23615,21 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -22986,10 +23637,10 @@ fi - done - - if test $ac_cv_header_locale_h = yes; then -- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 --$as_echo_n "checking for LC_MESSAGES... " >&6; } -+ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } - if test "${am_cv_val_LC_MESSAGES+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23012,35 +23663,31 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - am_cv_val_LC_MESSAGES=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_val_LC_MESSAGES=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 --$as_echo "$am_cv_val_LC_MESSAGES" >&6; } -+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -23059,17 +23706,17 @@ _ACEOF - INTLLIBS= - - if test "${ac_cv_header_libintl_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 --$as_echo_n "checking for libintl.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for libintl.h" >&5 -+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } - if test "${ac_cv_header_libintl_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --$as_echo "$ac_cv_header_libintl_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 --$as_echo_n "checking libintl.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 -+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23085,33 +23732,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 --$as_echo_n "checking libintl.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 -+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23125,52 +23771,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -23179,28 +23824,28 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 --$as_echo_n "checking for libintl.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for libintl.h" >&5 -+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } - if test "${ac_cv_header_libintl_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_libintl_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --$as_echo "$ac_cv_header_libintl_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } - - fi --if test "x$ac_cv_header_libintl_h" = x""yes; then -+if test $ac_cv_header_libintl_h = yes; then - gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # -- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 --$as_echo_n "checking for ngettext in libc... " >&6; } -+ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 -+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } - if test "${gt_cv_func_ngettext_libc+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23225,42 +23870,38 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - gt_cv_func_ngettext_libc=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_ngettext_libc=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - fi --{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 --$as_echo "$gt_cv_func_ngettext_libc" >&6; } -+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 -+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then -- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 --$as_echo_n "checking for dgettext in libc... " >&6; } -+ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 -+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } - if test "${gt_cv_func_dgettext_libc+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23285,47 +23926,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - gt_cv_func_dgettext_libc=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_dgettext_libc=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - fi --{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 --$as_echo "$gt_cv_func_dgettext_libc" >&6; } -+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - - for ac_func in bind_textdomain_codeset - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23378,42 +24015,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -23428,10 +24058,10 @@ done - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - -- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 --$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -+ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } - if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl $LIBS" -@@ -23463,41 +24093,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_intl_bindtextdomain=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_bindtextdomain=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 --$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } --if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 --$as_echo_n "checking for ngettext in -lintl... " >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } -+if test $ac_cv_lib_intl_bindtextdomain = yes; then -+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } - if test "${ac_cv_lib_intl_ngettext+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl $LIBS" -@@ -23529,41 +24155,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_intl_ngettext=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 --$as_echo "$ac_cv_lib_intl_ngettext" >&6; } --if test "x$ac_cv_lib_intl_ngettext" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 --$as_echo_n "checking for dgettext in -lintl... " >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -+if test $ac_cv_lib_intl_ngettext = yes; then -+ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } - if test "${ac_cv_lib_intl_dgettext+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl $LIBS" -@@ -23595,37 +24217,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_intl_dgettext=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dgettext=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 --$as_echo "$ac_cv_lib_intl_dgettext" >&6; } --if test "x$ac_cv_lib_intl_dgettext" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } -+if test $ac_cv_lib_intl_dgettext = yes; then - gt_cv_func_dgettext_libintl=yes - fi - -@@ -23635,14 +24253,14 @@ fi - - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 --$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } -- { $as_echo "$as_me:$LINENO: result: " >&5 --$as_echo "" >&6; } -- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 --$as_echo_n "checking for ngettext in -lintl... " >&6; } -+ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 -+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: result: " >&5 -+echo "${ECHO_T}" >&6; } -+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } - if test "${ac_cv_lib_intl_ngettext+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl -liconv $LIBS" -@@ -23674,41 +24292,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_intl_ngettext=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 --$as_echo "$ac_cv_lib_intl_ngettext" >&6; } --if test "x$ac_cv_lib_intl_ngettext" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 --$as_echo_n "checking for dcgettext in -lintl... " >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -+if test $ac_cv_lib_intl_ngettext = yes; then -+ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } - if test "${ac_cv_lib_intl_dcgettext+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lintl -liconv $LIBS" -@@ -23740,37 +24354,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_intl_dcgettext=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dcgettext=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 --$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } --if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } -+if test $ac_cv_lib_intl_dcgettext = yes; then - gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv - else -@@ -23795,11 +24405,11 @@ fi - - for ac_func in bind_textdomain_codeset - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23852,42 +24462,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -23923,10 +24526,10 @@ _ACEOF - - # Extract the first word of "msgfmt", so it can be a program name with args. - set dummy msgfmt; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_MSGFMT+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case "$MSGFMT" in - /*) -@@ -23950,11 +24553,11 @@ esac - fi - MSGFMT="$ac_cv_path_MSGFMT" - if test "$MSGFMT" != "no"; then -- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 --$as_echo "$MSGFMT" >&6; } -+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -+echo "${ECHO_T}$MSGFMT" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" -@@ -23962,11 +24565,11 @@ fi - - for ac_func in dcgettext - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -24019,50 +24622,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - - MSGFMT_OPTS= -- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 --$as_echo_n "checking if msgfmt accepts -c... " >&6; } -+ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 -+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } - cat >conftest.foo <<_ACEOF - - msgid "" -@@ -24076,25 +24672,25 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - - _ACEOF --if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&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=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } --else { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+else { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - echo "$as_me: failed input was:" >&5 - sed 's/^/| /' conftest.foo >&5 - fi - - # Extract the first word of "gmsgfmt", so it can be a program name with args. - set dummy gmsgfmt; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_GMSGFMT+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) -@@ -24109,7 +24705,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -24122,20 +24718,20 @@ esac - fi - GMSGFMT=$ac_cv_path_GMSGFMT - if test -n "$GMSGFMT"; then -- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 --$as_echo "$GMSGFMT" >&6; } -+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -+echo "${ECHO_T}$GMSGFMT" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - - # Extract the first word of "xgettext", so it can be a program name with args. - set dummy xgettext; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_XGETTEXT+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case "$XGETTEXT" in - /*) -@@ -24159,11 +24755,11 @@ esac - fi - XGETTEXT="$ac_cv_path_XGETTEXT" - if test "$XGETTEXT" != ":"; then -- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 --$as_echo "$XGETTEXT" >&6; } -+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -+echo "${ECHO_T}$XGETTEXT" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - cat >conftest.$ac_ext <<_ACEOF -@@ -24188,33 +24784,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - CATOBJEXT=.gmo - DATADIRNAME=share - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in - *-*-solaris*) -- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 --$as_echo_n "checking for bind_textdomain_codeset... " >&6; } -+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } - if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -24267,36 +24860,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_bind_textdomain_codeset=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 --$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } --if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -+if test $ac_cv_func_bind_textdomain_codeset = yes; then - CATOBJEXT=.gmo - DATADIRNAME=share - else -@@ -24312,7 +24901,6 @@ fi - esac - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$glib_save_LIBS" -@@ -24338,8 +24926,8 @@ _ACEOF - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else -- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 --$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } -+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" - fi - fi -@@ -24371,8 +24959,8 @@ $as_echo "found xgettext program is not - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else -- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 --$as_echo_n "checking for catalogs to be installed... " >&6; } -+ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no -@@ -24396,8 +24984,8 @@ $as_echo_n "checking for catalogs to be - fi - done - LINGUAS=$NEW_LINGUAS -- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 --$as_echo "$LINGUAS" >&6; } -+ { echo "$as_me:$LINENO: result: $LINGUAS" >&5 -+echo "${ECHO_T}$LINGUAS" >&6; } - fi - - if test -n "$LINGUAS"; then -@@ -24453,14 +25041,14 @@ _ACEOF - - - --{ $as_echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 --$as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; } -+{ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 -+echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6; } - - gtk_save_LIBS=$LIBS - LIBS="$LIBS -lm" - if test "$cross_compiling" = yes; then -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } - - else - cat >conftest.$ac_ext <<_ACEOF -@@ -24478,27 +25066,25 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) -@@ -24523,82 +25109,78 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- { $as_echo "$as_me:$LINENO: result: -std1" >&5 --$as_echo "-std1" >&6; } -+ { echo "$as_me:$LINENO: result: -std1" >&5 -+echo "${ECHO_T}-std1" >&6; } - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --{ $as_echo "$as_me:$LINENO: result: " >&5 --$as_echo "" >&6; } -+{ echo "$as_me:$LINENO: result: " >&5 -+echo "${ECHO_T}" >&6; } - CFLAGS="$gtk_save_CFLAGS" -- { $as_echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 --$as_echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} -+ { echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 -+echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} - fi --rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi --rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - LIBS=$gtk_save_LIBS - --{ $as_echo "$as_me:$LINENO: checking for the BeOS" >&5 --$as_echo_n "checking for the BeOS... " >&6; } -+{ echo "$as_me:$LINENO: checking for the BeOS" >&5 -+echo $ECHO_N "checking for the BeOS... $ECHO_C" >&6; } - case $host in - *-*-beos*) -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - MATH_LIB= - ;; - *) -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - ;; - esac - - # - # see bug 162979 - # --{ $as_echo "$as_me:$LINENO: checking for HP-UX" >&5 --$as_echo_n "checking for HP-UX... " >&6; } -+{ echo "$as_me:$LINENO: checking for HP-UX" >&5 -+echo $ECHO_N "checking for HP-UX... $ECHO_C" >&6; } - case $host_os in - hpux9* | hpux10* | hpux11*) -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - CFLAGS="$CFLAGS -DHPPEX -DSHMLINK" - ;; - *) -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - ;; - esac - --{ $as_echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 --$as_echo_n "checking for extra flags for POSIX compliance... " >&6; } -+{ echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 -+echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24620,22 +25202,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_save_CFLAGS="$CFLAGS" -@@ -24661,29 +25242,28 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- { $as_echo "$as_me:$LINENO: result: -posix" >&5 --$as_echo "-posix" >&6; } -+ { echo "$as_me:$LINENO: result: -posix" >&5 -+echo "${ECHO_T}-posix" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { $as_echo "$as_me:$LINENO: result: " >&5 --$as_echo "" >&6; } -+ { echo "$as_me:$LINENO: result: " >&5 -+echo "${ECHO_T}" >&6; } - CFLAGS="$gtk_save_CFLAGS" -- { $as_echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 --$as_echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} -+ { echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 -+echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -@@ -24733,10 +25313,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. - set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) -@@ -24751,7 +25331,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -24763,11 +25343,11 @@ esac - fi - PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then -- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 --$as_echo "$PKG_CONFIG" >&6; } -+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+echo "${ECHO_T}$PKG_CONFIG" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -24776,10 +25356,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) -@@ -24794,7 +25374,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -24806,11 +25386,11 @@ esac - fi - ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG - if test -n "$ac_pt_PKG_CONFIG"; then -- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 --$as_echo "$ac_pt_PKG_CONFIG" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_pt_PKG_CONFIG" = x; then -@@ -24818,8 +25398,12 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - PKG_CONFIG=$ac_pt_PKG_CONFIG -@@ -24831,14 +25415,14 @@ fi - fi - if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.16 -- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 --$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } -+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - PKG_CONFIG="" - fi - -@@ -24852,8 +25436,8 @@ fi - fi - - min_glib_version=2.17.6 -- { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 --$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } -+ { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 -+echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; } - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs -@@ -24976,32 +25560,29 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - no_glib=yes - fi --rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - -@@ -25011,12 +25592,12 @@ fi - fi - fi - if test "x$no_glib" = x ; then -- { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 --$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } -+ { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 -+echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } - : - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" -@@ -25053,21 +25634,18 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && 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" -@@ -25078,14 +25656,13 @@ $as_echo "$ac_try_echo") >&5 - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed." - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" -@@ -25097,10 +25674,10 @@ rm -f core conftest.err conftest.$ac_obj - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** GLIB 2.17.6 or better is required. The latest version of - *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** GLIB 2.17.6 or better is required. The latest version of - *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} - { (exit 1); exit 1; }; } -@@ -25128,11 +25705,11 @@ LIBS="$LIBS $GLIB_LIBS" - - for ac_func in bind_textdomain_codeset - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -25185,42 +25762,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -25231,21 +25801,20 @@ LIBS=$gtk_save_LIBS - - for ac_header in pwd.h - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25261,33 +25830,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25301,52 +25869,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25355,24 +25922,21 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - cat >>confdefs.h <<\_ACEOF -@@ -25386,21 +25950,20 @@ done - - for ac_header in sys/time.h - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25416,33 +25979,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25456,52 +26018,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25510,24 +26071,21 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - cat >>confdefs.h <<\_ACEOF -@@ -25541,21 +26099,20 @@ done - - for ac_header in unistd.h - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25571,33 +26128,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25611,52 +26167,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25665,24 +26220,21 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - cat >>confdefs.h <<\_ACEOF -@@ -25696,21 +26248,20 @@ done - - for ac_header in ftw.h - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25726,33 +26277,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25766,52 +26316,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -25820,24 +26369,21 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - cat >>confdefs.h <<\_ACEOF -@@ -25849,8 +26395,8 @@ fi - done - - --{ $as_echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 --$as_echo_n "checking for GNU ftw extensions... " >&6; } -+{ echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 -+echo $ECHO_N "checking for GNU ftw extensions... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25874,21 +26420,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gtk_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_ok=no -@@ -25896,16 +26441,16 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $gtk_ok = yes; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - - cat >>confdefs.h <<\_ACEOF - #define HAVE_GNU_FTW 1 - _ACEOF - - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - saved_cflags="$CFLAGS" -@@ -25913,10 +26458,10 @@ saved_ldflags="$LDFLAGS" - - - # Checks for header files. --{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --$as_echo_n "checking for ANSI C header files... " >&6; } -+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } - if test "${ac_cv_header_stdc+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -25943,21 +26488,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -@@ -26049,40 +26593,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - ac_cv_header_stdc=no - fi --rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --$as_echo "$ac_cv_header_stdc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+echo "${ECHO_T}$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -26093,10 +26634,10 @@ fi - - - # Checks for typedefs, structures, and compiler characteristics. --{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 --$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } - if test "${ac_cv_c_const+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26168,21 +26709,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no -@@ -26190,22 +26730,22 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 --$as_echo "$ac_cv_c_const" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -+echo "${ECHO_T}$ac_cv_c_const" >&6; } - if test $ac_cv_c_const = no; then - - cat >>confdefs.h <<\_ACEOF --#define const /**/ -+#define const - _ACEOF - - fi - - - # Checks for library functions. --{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 --$as_echo_n "checking return type of signal handlers... " >&6; } -+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } - if test "${ac_cv_type_signal+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26230,21 +26770,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void -@@ -26252,8 +26791,8 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 --$as_echo "$ac_cv_type_signal" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -+echo "${ECHO_T}$ac_cv_type_signal" >&6; } - - cat >>confdefs.h <<_ACEOF - #define RETSIGTYPE $ac_cv_type_signal -@@ -26264,21 +26803,20 @@ _ACEOF - - for ac_header in stdlib.h unistd.h - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26294,33 +26832,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26334,52 +26871,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -26388,24 +26924,21 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -26415,11 +26948,11 @@ done - - for ac_func in getpagesize - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26472,51 +27005,44 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - --{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 --$as_echo_n "checking for working mmap... " >&6; } -+{ echo "$as_me:$LINENO: checking for working mmap" >&5 -+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } - if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$cross_compiling" = yes; then - ac_cv_func_mmap_fixed_mapped=no -@@ -26660,39 +27186,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mmap_fixed_mapped=yes - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - ac_cv_func_mmap_fixed_mapped=no - fi --rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 --$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } - if test $ac_cv_func_mmap_fixed_mapped = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -26706,11 +27229,11 @@ rm -f conftest.mmap - - for ac_func in mallinfo - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26763,42 +27286,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -26807,11 +27323,11 @@ done - - for ac_func in getresuid - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26864,51 +27380,44 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - --{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 --$as_echo_n "checking for uid_t in sys/types.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } - if test "${ac_cv_type_uid_t+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -26928,8 +27437,8 @@ fi - rm -f conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 --$as_echo "$ac_cv_type_uid_t" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -+echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } - if test $ac_cv_type_uid_t = no; then - - cat >>confdefs.h <<\_ACEOF -@@ -26945,8 +27454,8 @@ fi - - - # Check if <sys/select.h> needs to be included for fd_set --{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5 --$as_echo_n "checking for fd_set... " >&6; } -+{ echo "$as_me:$LINENO: checking for fd_set" >&5 -+echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26968,21 +27477,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gtk_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_ok=no -@@ -26990,8 +27498,8 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $gtk_ok = yes; then -- { $as_echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 --$as_echo "yes, found in sys/types.h" >&6; } -+ { echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 -+echo "${ECHO_T}yes, found in sys/types.h" >&6; } - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -27014,22 +27522,22 @@ cat >>confdefs.h <<\_ACEOF - #define HAVE_SYS_SELECT_H 1 - _ACEOF - -- { $as_echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 --$as_echo "yes, found in sys/select.h" >&6; } -+ { echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 -+echo "${ECHO_T}yes, found in sys/select.h" >&6; } - else - - cat >>confdefs.h <<\_ACEOF - #define NO_FD_SET 1 - _ACEOF - -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - fi - - # `widechar' tests for gdki18n.h --{ $as_echo "$as_me:$LINENO: checking for wchar.h" >&5 --$as_echo_n "checking for wchar.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for wchar.h" >&5 -+echo $ECHO_N "checking for wchar.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27043,21 +27551,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gdk_wchar_h=no -@@ -27071,12 +27578,12 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - fi --{ $as_echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 --$as_echo "$gdk_wchar_h" >&6; } -+{ echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 -+echo "${ECHO_T}$gdk_wchar_h" >&6; } - - # Check for wctype.h (for iswalnum) --{ $as_echo "$as_me:$LINENO: checking for wctype.h" >&5 --$as_echo_n "checking for wctype.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for wctype.h" >&5 -+echo $ECHO_N "checking for wctype.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27090,21 +27597,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gdk_wctype_h=no -@@ -27118,15 +27624,15 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - fi --{ $as_echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 --$as_echo "$gdk_wctype_h" >&6; } -+{ echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 -+echo "${ECHO_T}$gdk_wctype_h" >&6; } - - # in Solaris 2.5, `iswalnum' is in -lw - GDK_WLIBS= --{ $as_echo "$as_me:$LINENO: checking for iswalnum" >&5 --$as_echo_n "checking for iswalnum... " >&6; } -+{ echo "$as_me:$LINENO: checking for iswalnum" >&5 -+echo $ECHO_N "checking for iswalnum... $ECHO_C" >&6; } - if test "${ac_cv_func_iswalnum+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -27179,42 +27685,38 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_iswalnum=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_iswalnum=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 --$as_echo "$ac_cv_func_iswalnum" >&6; } --if test "x$ac_cv_func_iswalnum" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 -+echo "${ECHO_T}$ac_cv_func_iswalnum" >&6; } -+if test $ac_cv_func_iswalnum = yes; then - : - else -- { $as_echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 --$as_echo_n "checking for iswalnum in -lw... " >&6; } -+ { echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 -+echo $ECHO_N "checking for iswalnum in -lw... $ECHO_C" >&6; } - if test "${ac_cv_lib_w_iswalnum+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lw $LIBS" -@@ -27246,37 +27748,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_w_iswalnum=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_w_iswalnum=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 --$as_echo "$ac_cv_lib_w_iswalnum" >&6; } --if test "x$ac_cv_lib_w_iswalnum" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 -+echo "${ECHO_T}$ac_cv_lib_w_iswalnum" >&6; } -+if test $ac_cv_lib_w_iswalnum = yes; then - GDK_WLIBS=-lw - fi - -@@ -27286,8 +27784,8 @@ fi - oLIBS="$LIBS" - LIBS="$LIBS $GDK_WLIBS" - # The following is necessary for Linux libc-5.4.38 --{ $as_echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5 --$as_echo_n "checking if iswalnum() and friends are properly defined... " >&6; } -+{ echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5 -+echo $ECHO_N "checking if iswalnum() and friends are properly defined... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27322,30 +27820,26 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - gdk_working_wctype=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gdk_working_wctype=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$oLIBS" -@@ -27358,13 +27852,13 @@ _ACEOF - - GDK_WLIBS= - fi --{ $as_echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 --$as_echo "$gdk_working_wctype" >&6; } -+{ echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 -+echo "${ECHO_T}$gdk_working_wctype" >&6; } - - - # Check for uxtheme.h (for MS-Windows Engine) --{ $as_echo "$as_me:$LINENO: checking for uxtheme.h" >&5 --$as_echo_n "checking for uxtheme.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for uxtheme.h" >&5 -+echo $ECHO_N "checking for uxtheme.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27378,21 +27872,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - gtk_uxtheme_h=no -@@ -27406,28 +27899,27 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - fi --{ $as_echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 --$as_echo "$gtk_uxtheme_h" >&6; } -+{ echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 -+echo "${ECHO_T}$gtk_uxtheme_h" >&6; } - - # Checks for gdkspawn - - for ac_header in crt_externs.h - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27443,33 +27935,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27483,52 +27974,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -27537,24 +28027,21 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -27564,11 +28051,11 @@ done - - for ac_func in _NSGetEnviron - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -27621,42 +28108,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -27683,8 +28163,8 @@ _ACEOF - fi - - --{ $as_echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 --$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; } -+{ echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 -+echo $ECHO_N "checking whether to build gmodulized gdk-pixbuf... $ECHO_C" >&6; } - - # Check whether --enable-modules was given. - if test "${enable_modules+set}" = set; then -@@ -27695,13 +28175,13 @@ fi - dynworks=false - deps= - if test x$enable_modules = xno; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- { $as_echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 --$as_echo_n "checking whether dynamic modules work... " >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ { echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 -+echo $ECHO_N "checking whether dynamic modules work... $ECHO_C" >&6; } - ## for loop is to strip newline - tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` - for I in $tmp; do -@@ -27726,11 +28206,11 @@ cat >>confdefs.h <<\_ACEOF - #define USE_GMODULE 1 - _ACEOF - -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - fi - -@@ -27766,9 +28246,7 @@ if test "${enable_gdiplus+set}" = set; t - fi - - -- -- --if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then -+ if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then - BUILD_GDIPLUS_LOADERS_TRUE= - BUILD_GDIPLUS_LOADERS_FALSE='#' - else -@@ -27779,10 +28257,10 @@ fi - - if test x$os_win32 = xno || test x$enable_gdiplus = xno; then - if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -- { $as_echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 --$as_echo_n "checking for TIFFReadRGBAImageOriented in -ltiff... " >&6; } -+ { echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 -+echo $ECHO_N "checking for TIFFReadRGBAImageOriented in -ltiff... $ECHO_C" >&6; } - if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ltiff -lm $LIBS" -@@ -27814,49 +28292,45 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 --$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } --if test "x$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 -+echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } -+if test $ac_cv_lib_tiff_TIFFReadRGBAImageOriented = yes; then - if test "${ac_cv_header_tiffio_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } - if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 --$as_echo_n "checking tiffio.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -+echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27872,33 +28346,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 --$as_echo_n "checking tiffio.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -+echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27912,52 +28385,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -27966,30 +28438,30 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } - if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_tiffio_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - - fi --if test "x$ac_cv_header_tiffio_h" = x""yes; then -+if test $ac_cv_header_tiffio_h = yes; then - TIFF='tiff'; LIBTIFF='-ltiff' - else -- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 --$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} -+ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -+echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} - fi - - - else -- { $as_echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 --$as_echo_n "checking for TIFFWriteScanline in -ltiff... " >&6; } -+ { echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 -+echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6; } - if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ltiff -ljpeg -lz -lm $LIBS" -@@ -28021,49 +28493,45 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_tiff_TIFFWriteScanline=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_tiff_TIFFWriteScanline=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 --$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } --if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 -+echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } -+if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then - if test "${ac_cv_header_tiffio_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } - if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 --$as_echo_n "checking tiffio.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -+echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -28079,33 +28547,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 --$as_echo_n "checking tiffio.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -+echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -28119,52 +28586,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28173,30 +28639,30 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } - if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_tiffio_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - - fi --if test "x$ac_cv_header_tiffio_h" = x""yes; then -+if test $ac_cv_header_tiffio_h = yes; then - TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' - else -- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 --$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} -+ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -+echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} - fi - - - else -- { $as_echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 --$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; } -+ { echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 -+echo $ECHO_N "checking for TIFFFlushData in -ltiff34... $ECHO_C" >&6; } - if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" -@@ -28228,49 +28694,45 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_tiff34_TIFFFlushData=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_tiff34_TIFFFlushData=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 --$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; } --if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 -+echo "${ECHO_T}$ac_cv_lib_tiff34_TIFFFlushData" >&6; } -+if test $ac_cv_lib_tiff34_TIFFFlushData = yes; then - if test "${ac_cv_header_tiffio_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } - if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 --$as_echo_n "checking tiffio.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -+echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -28286,33 +28748,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 --$as_echo_n "checking tiffio.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -+echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -28326,52 +28787,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28380,28 +28840,28 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } - if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_tiffio_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - - fi --if test "x$ac_cv_header_tiffio_h" = x""yes; then -+if test $ac_cv_header_tiffio_h = yes; then - TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' - else -- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 --$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} -+ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -+echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} - fi - - - else -- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 --$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} -+ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 -+echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} - fi - - fi -@@ -28411,11 +28871,11 @@ fi - fi - - if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** Checks for TIFF loader failed. You can build without it by passing - *** --without-libtiff to configure but some programs using GTK+ may - *** not work properly" >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** Checks for TIFF loader failed. You can build without it by passing - *** --without-libtiff to configure but some programs using GTK+ may - *** not work properly" >&2;} -@@ -28425,10 +28885,10 @@ fi - - if test x$os_win32 = xno || test x$enable_gdiplus = xno; then - if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then -- { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 --$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; } -+ { echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 -+echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; } - if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ljpeg $LIBS" -@@ -28460,47 +28920,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_jpeg_jpeg_destroy_decompress=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jpeg_jpeg_destroy_decompress=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 --$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } --if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 -+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } -+if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then - jpeg_ok=yes - else - jpeg_ok=no -- { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 --$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} -+ { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 -+echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} - fi - - if test "$jpeg_ok" = yes; then -- { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 --$as_echo_n "checking for jpeglib.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -28518,35 +28974,34 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - jpeg_ok=no - fi - - rm -f conftest.err conftest.$ac_ext -- { $as_echo "$as_me:$LINENO: result: $jpeg_ok" >&5 --$as_echo "$jpeg_ok" >&6; } -+ { echo "$as_me:$LINENO: result: $jpeg_ok" >&5 -+echo "${ECHO_T}$jpeg_ok" >&6; } - if test "$jpeg_ok" = yes; then - LIBJPEG='-ljpeg' -- { $as_echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 --$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; } -+ { echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 -+echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6; } - if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ljpeg $LIBS" -@@ -28578,60 +29033,56 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_jpeg_jpeg_simple_progression=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jpeg_jpeg_simple_progression=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 --$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } --if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 -+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } -+if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_PROGRESSIVE_JPEG 1 - _ACEOF - - else -- { $as_echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 --$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} -+ { echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 -+echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} - fi - - else -- { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 --$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} -+ { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 -+echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} - fi - fi - fi - - if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** Checks for JPEG loader failed. You can build without it by passing - *** --without-libjpeg to configure but some programs using GTK+ may - *** not work properly" >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** Checks for JPEG loader failed. You can build without it by passing - *** --without-libjpeg to configure but some programs using GTK+ may - *** not work properly" >&2;} -@@ -28640,21 +29091,21 @@ $as_echo "$as_me: error: - fi - - if test x$with_libpng != xno && test -z "$LIBPNG"; then -- { $as_echo "$as_me:$LINENO: checking for libpng12" >&5 --$as_echo_n "checking for libpng12... " >&6; } -+ { echo "$as_me:$LINENO: checking for libpng12" >&5 -+echo $ECHO_N "checking for libpng12... $ECHO_C" >&6; } - if $PKG_CONFIG --exists libpng12 ; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - PNG='png' - PNG_DEP_CFLAGS_PACKAGES=libpng12 - LIBPNG=`$PKG_CONFIG --libs libpng12` - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- { $as_echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 --$as_echo_n "checking for png_read_info in -lpng... " >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 -+echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; } - if test "${ac_cv_lib_png_png_read_info+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lpng -lz -lm $LIBS" -@@ -28686,49 +29137,45 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_png_png_read_info=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_png_png_read_info=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 --$as_echo "$ac_cv_lib_png_png_read_info" >&6; } --if test "x$ac_cv_lib_png_png_read_info" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 -+echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; } -+if test $ac_cv_lib_png_png_read_info = yes; then - if test "${ac_cv_header_png_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for png.h" >&5 --$as_echo_n "checking for png.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for png.h" >&5 -+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } - if test "${ac_cv_header_png_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 --$as_echo "$ac_cv_header_png_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -+echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5 --$as_echo_n "checking png.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking png.h usability" >&5 -+echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -28744,33 +29191,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5 --$as_echo_n "checking png.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking png.h presence" >&5 -+echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -28784,52 +29230,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -28838,18 +29283,18 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for png.h" >&5 --$as_echo_n "checking for png.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for png.h" >&5 -+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } - if test "${ac_cv_header_png_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_png_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 --$as_echo "$ac_cv_header_png_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -+echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - - fi --if test "x$ac_cv_header_png_h" = x""yes; then -+if test $ac_cv_header_png_h = yes; then - png_ok=yes - else - png_ok=no -@@ -28857,13 +29302,13 @@ fi - - - else -- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 --$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} -+ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 -+echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} - fi - - if test "$png_ok" = yes; then -- { $as_echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 --$as_echo_n "checking for png_structp in png.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 -+echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -28885,49 +29330,48 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - png_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - png_ok=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- { $as_echo "$as_me:$LINENO: result: $png_ok" >&5 --$as_echo "$png_ok" >&6; } -+ { echo "$as_me:$LINENO: result: $png_ok" >&5 -+echo "${ECHO_T}$png_ok" >&6; } - if test "$png_ok" = yes; then - PNG='png'; LIBPNG='-lpng -lz' - else -- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 --$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} -+ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 -+echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} - fi - else -- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 --$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} -+ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 -+echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} - fi - fi - fi - - if test x$with_libpng != xno && test -z "$LIBPNG"; then -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** Checks for PNG loader failed. You can build without it by passing - *** --without-libpng to configure but many programs using GTK+ will - *** not work properly. The PNG loader is also needed if you are compiling - *** from CVS." >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** Checks for PNG loader failed. You can build without it by passing - *** --without-libpng to configure but many programs using GTK+ will - *** not work properly. The PNG loader is also needed if you are compiling -@@ -28936,10 +29380,10 @@ $as_echo "$as_me: error: - fi - - if test x$with_libjasper != xno && test -z "$LIBJASPER"; then -- { $as_echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 --$as_echo_n "checking for jas_init in -ljasper... " >&6; } -+ { echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 -+echo $ECHO_N "checking for jas_init in -ljasper... $ECHO_C" >&6; } - if test "${ac_cv_lib_jasper_jas_init+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ljasper -ljpeg $LIBS" -@@ -28971,47 +29415,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_jasper_jas_init=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jasper_jas_init=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 --$as_echo "$ac_cv_lib_jasper_jas_init" >&6; } --if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 -+echo "${ECHO_T}$ac_cv_lib_jasper_jas_init" >&6; } -+if test $ac_cv_lib_jasper_jas_init = yes; then - LIBJASPER=-ljasper - fi - - fi - - if test x$with_libjasper != xno && test -z "$LIBJASPER"; then -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** Checks for JPEG2000 loader failed. You can build without it by passing - *** --without-libjasper to configure" >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** Checks for JPEG2000 loader failed. You can build without it by passing - *** --without-libjasper to configure" >&2;} - { (exit 1); exit 1; }; } -@@ -29022,9 +29462,7 @@ $as_echo "$as_me: error: - - - -- -- --if $dynworks; then -+ if $dynworks; then - BUILD_DYNAMIC_MODULES_TRUE= - BUILD_DYNAMIC_MODULES_FALSE='#' - else -@@ -29036,8 +29474,8 @@ fi - # - # Allow building some or all gdk-pixbuf loaders included - # --{ $as_echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 --$as_echo_n "checking pixbuf loaders to build... " >&6; } -+{ echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 -+echo $ECHO_N "checking pixbuf loaders to build... $ECHO_C" >&6; } - - - # Check whether --with-included_loaders was given. -@@ -29080,8 +29518,8 @@ else - included_loaders="$with_included_loaders" - fi - --{ $as_echo "$as_me:$LINENO: result: $included_loaders" >&5 --$as_echo "$included_loaders" >&6; } -+{ echo "$as_me:$LINENO: result: $included_loaders" >&5 -+echo "${ECHO_T}$included_loaders" >&6; } - - INCLUDED_LOADER_OBJ= - INCLUDED_LOADER_DEFINE= -@@ -29091,8 +29529,8 @@ for loader in $included_loaders; do - if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then - : - else -- { { $as_echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 --$as_echo "$as_me: error: the specified loader $loader does not exist" >&2;} -+ { { echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 -+echo "$as_me: error: the specified loader $loader does not exist" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -29117,9 +29555,7 @@ IFS="$gtk_save_ifs" - - - -- -- --if test x"$INCLUDE_png" = xyes; then -+ if test x"$INCLUDE_png" = xyes; then - INCLUDE_PNG_TRUE= - INCLUDE_PNG_FALSE='#' - else -@@ -29127,9 +29563,7 @@ else - INCLUDE_PNG_FALSE= - fi - -- -- --if test x"$INCLUDE_bmp" = xyes; then -+ if test x"$INCLUDE_bmp" = xyes; then - INCLUDE_BMP_TRUE= - INCLUDE_BMP_FALSE='#' - else -@@ -29137,9 +29571,7 @@ else - INCLUDE_BMP_FALSE= - fi - -- -- --if test x"$INCLUDE_wbmp" = xyes; then -+ if test x"$INCLUDE_wbmp" = xyes; then - INCLUDE_WBMP_TRUE= - INCLUDE_WBMP_FALSE='#' - else -@@ -29147,9 +29579,7 @@ else - INCLUDE_WBMP_FALSE= - fi - -- -- --if test x"$INCLUDE_gif" = xyes; then -+ if test x"$INCLUDE_gif" = xyes; then - INCLUDE_GIF_TRUE= - INCLUDE_GIF_FALSE='#' - else -@@ -29157,9 +29587,7 @@ else - INCLUDE_GIF_FALSE= - fi - -- -- --if test x"$INCLUDE_ico" = xyes; then -+ if test x"$INCLUDE_ico" = xyes; then - INCLUDE_ICO_TRUE= - INCLUDE_ICO_FALSE='#' - else -@@ -29167,9 +29595,7 @@ else - INCLUDE_ICO_FALSE= - fi - -- -- --if test x"$INCLUDE_ani" = xyes; then -+ if test x"$INCLUDE_ani" = xyes; then - INCLUDE_ANI_TRUE= - INCLUDE_ANI_FALSE='#' - else -@@ -29177,9 +29603,7 @@ else - INCLUDE_ANI_FALSE= - fi - -- -- --if test x"$INCLUDE_jpeg" = xyes; then -+ if test x"$INCLUDE_jpeg" = xyes; then - INCLUDE_JPEG_TRUE= - INCLUDE_JPEG_FALSE='#' - else -@@ -29187,9 +29611,7 @@ else - INCLUDE_JPEG_FALSE= - fi - -- -- --if test x"$INCLUDE_pnm" = xyes; then -+ if test x"$INCLUDE_pnm" = xyes; then - INCLUDE_PNM_TRUE= - INCLUDE_PNM_FALSE='#' - else -@@ -29197,9 +29619,7 @@ else - INCLUDE_PNM_FALSE= - fi - -- -- --if test x"$INCLUDE_ras" = xyes; then -+ if test x"$INCLUDE_ras" = xyes; then - INCLUDE_RAS_TRUE= - INCLUDE_RAS_FALSE='#' - else -@@ -29207,9 +29627,7 @@ else - INCLUDE_RAS_FALSE= - fi - -- -- --if test x"$INCLUDE_tiff" = xyes; then -+ if test x"$INCLUDE_tiff" = xyes; then - INCLUDE_TIFF_TRUE= - INCLUDE_TIFF_FALSE='#' - else -@@ -29217,9 +29635,7 @@ else - INCLUDE_TIFF_FALSE= - fi - -- -- --if test x"$INCLUDE_xpm" = xyes; then -+ if test x"$INCLUDE_xpm" = xyes; then - INCLUDE_XPM_TRUE= - INCLUDE_XPM_FALSE='#' - else -@@ -29227,9 +29643,7 @@ else - INCLUDE_XPM_FALSE= - fi - -- -- --if test x"$INCLUDE_xbm" = xyes; then -+ if test x"$INCLUDE_xbm" = xyes; then - INCLUDE_XBM_TRUE= - INCLUDE_XBM_FALSE='#' - else -@@ -29237,9 +29651,7 @@ else - INCLUDE_XBM_FALSE= - fi - -- -- --if test x"$INCLUDE_tga" = xyes; then -+ if test x"$INCLUDE_tga" = xyes; then - INCLUDE_TGA_TRUE= - INCLUDE_TGA_FALSE='#' - else -@@ -29247,9 +29659,7 @@ else - INCLUDE_TGA_FALSE= - fi - -- -- --if test x"$INCLUDE_pcx" = xyes; then -+ if test x"$INCLUDE_pcx" = xyes; then - INCLUDE_PCX_TRUE= - INCLUDE_PCX_FALSE='#' - else -@@ -29257,9 +29667,7 @@ else - INCLUDE_PCX_FALSE= - fi - -- -- --if test x"$INCLUDE_icns" = xyes; then -+ if test x"$INCLUDE_icns" = xyes; then - INCLUDE_ICNS_TRUE= - INCLUDE_ICNS_FALSE='#' - else -@@ -29267,9 +29675,7 @@ else - INCLUDE_ICNS_FALSE= - fi - -- -- --if test x"$INCLUDE_jasper" = xyes; then -+ if test x"$INCLUDE_jasper" = xyes; then - INCLUDE_JASPER_TRUE= - INCLUDE_JASPER_FALSE='#' - else -@@ -29279,9 +29685,7 @@ fi - - # As all GDI+ loaders are either built-in or not, arbitrarily just - # check one of the variables here -- -- --if test x"$INCLUDE_gdip_ico" = xyes; then -+ if test x"$INCLUDE_gdip_ico" = xyes; then - INCLUDE_GDIPLUS_TRUE= - INCLUDE_GDIPLUS_FALSE='#' - else -@@ -29291,20 +29695,18 @@ fi - - - if test x$gio_can_sniff = x; then -- { $as_echo "$as_me:$LINENO: checking if gio can sniff png" >&5 --$as_echo_n "checking if gio can sniff png... " >&6; } -+ { echo "$as_me:$LINENO: checking if gio can sniff png" >&5 -+echo $ECHO_N "checking if gio can sniff png... $ECHO_C" >&6; } - gtk_save_LIBS="$LIBS" - gtk_save_CFLAGS="$CFLAGS" - LIBS="`$PKG_CONFIG --libs gio-2.0`" - CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" - if test "$cross_compiling" = yes; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling -+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run test program while cross compiling -+echo "$as_me: error: cannot run test program while cross compiling - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -29348,21 +29750,19 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - gio_can_sniff=yes - -@@ -29371,20 +29771,19 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) - gio_can_sniff=no - fi --rm -rf conftest.dSYM - rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - -- { $as_echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 --$as_echo "$gio_can_sniff" >&6; } -+ { echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 -+echo "${ECHO_T}$gio_can_sniff" >&6; } - LIBS="$gtk_save_LIBS" - CFLAGS="$gtk_save_CFLAGS" - fi -@@ -29392,8 +29791,8 @@ fi - # - # Allow building some or all immodules included - # --{ $as_echo "$as_me:$LINENO: checking immodules to build" >&5 --$as_echo_n "checking immodules to build... " >&6; } -+{ echo "$as_me:$LINENO: checking immodules to build" >&5 -+echo $ECHO_N "checking immodules to build... $ECHO_C" >&6; } - - - # Check whether --with-included_immodules was given. -@@ -29428,11 +29827,9 @@ else - included_immodules="$with_included_immodules" - fi - --{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 --$as_echo "$included_immodules" >&6; } -- -- --if test "x$included_immodules" != x; then -+{ echo "$as_me:$LINENO: result: $included_immodules" >&5 -+echo "${ECHO_T}$included_immodules" >&6; } -+ if test "x$included_immodules" != x; then - HAVE_INCLUDED_IMMMODULES_TRUE= - HAVE_INCLUDED_IMMMODULES_FALSE='#' - else -@@ -29450,8 +29847,8 @@ for immodule in $included_immodules; do - if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then - : - else -- { { $as_echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 --$as_echo "$as_me: error: the specified input method $immodule does not exist" >&2;} -+ { { echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 -+echo "$as_me: error: the specified input method $immodule does not exist" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -29463,9 +29860,7 @@ IFS="$gtk_save_ifs" - - - -- -- --if test x"$INCLUDE_am_et" = xyes; then -+ if test x"$INCLUDE_am_et" = xyes; then - INCLUDE_IM_AM_ET_TRUE= - INCLUDE_IM_AM_ET_FALSE='#' - else -@@ -29473,9 +29868,7 @@ else - INCLUDE_IM_AM_ET_FALSE= - fi - -- -- --if test x"$INCLUDE_cedilla" = xyes; then -+ if test x"$INCLUDE_cedilla" = xyes; then - INCLUDE_IM_CEDILLA_TRUE= - INCLUDE_IM_CEDILLA_FALSE='#' - else -@@ -29483,9 +29876,7 @@ else - INCLUDE_IM_CEDILLA_FALSE= - fi - -- -- --if test x"$INCLUDE_cyrillic_translit" = xyes; then -+ if test x"$INCLUDE_cyrillic_translit" = xyes; then - INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= - INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' - else -@@ -29493,9 +29884,7 @@ else - INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= - fi - -- -- --if test x"$INCLUDE_ime" = xyes; then -+ if test x"$INCLUDE_ime" = xyes; then - INCLUDE_IM_IME_TRUE= - INCLUDE_IM_IME_FALSE='#' - else -@@ -29503,9 +29892,7 @@ else - INCLUDE_IM_IME_FALSE= - fi - -- -- --if test x"$INCLUDE_inuktitut" = xyes; then -+ if test x"$INCLUDE_inuktitut" = xyes; then - INCLUDE_IM_INUKTITUT_TRUE= - INCLUDE_IM_INUKTITUT_FALSE='#' - else -@@ -29513,9 +29900,7 @@ else - INCLUDE_IM_INUKTITUT_FALSE= - fi - -- -- --if test x"$INCLUDE_ipa" = xyes; then -+ if test x"$INCLUDE_ipa" = xyes; then - INCLUDE_IM_IPA_TRUE= - INCLUDE_IM_IPA_FALSE='#' - else -@@ -29523,9 +29908,7 @@ else - INCLUDE_IM_IPA_FALSE= - fi - -- -- --if test x"$INCLUDE_multipress" = xyes; then -+ if test x"$INCLUDE_multipress" = xyes; then - INCLUDE_IM_MULTIPRESS_TRUE= - INCLUDE_IM_MULTIPRESS_FALSE='#' - else -@@ -29533,9 +29916,7 @@ else - INCLUDE_IM_MULTIPRESS_FALSE= - fi - -- -- --if test x"$INCLUDE_thai" = xyes; then -+ if test x"$INCLUDE_thai" = xyes; then - INCLUDE_IM_THAI_TRUE= - INCLUDE_IM_THAI_FALSE='#' - else -@@ -29543,9 +29924,7 @@ else - INCLUDE_IM_THAI_FALSE= - fi - -- -- --if test x"$INCLUDE_ti_er" = xyes; then -+ if test x"$INCLUDE_ti_er" = xyes; then - INCLUDE_IM_TI_ER_TRUE= - INCLUDE_IM_TI_ER_FALSE='#' - else -@@ -29553,9 +29932,7 @@ else - INCLUDE_IM_TI_ER_FALSE= - fi - -- -- --if test x"$INCLUDE_ti_et" = xyes; then -+ if test x"$INCLUDE_ti_et" = xyes; then - INCLUDE_IM_TI_ET_TRUE= - INCLUDE_IM_TI_ET_FALSE='#' - else -@@ -29563,9 +29940,7 @@ else - INCLUDE_IM_TI_ET_FALSE= - fi - -- -- --if test x"$INCLUDE_viqr" = xyes; then -+ if test x"$INCLUDE_viqr" = xyes; then - INCLUDE_IM_VIQR_TRUE= - INCLUDE_IM_VIQR_FALSE='#' - else -@@ -29573,9 +29948,7 @@ else - INCLUDE_IM_VIQR_FALSE= - fi - -- -- --if test x"$INCLUDE_xim" = xyes; then -+ if test x"$INCLUDE_xim" = xyes; then - INCLUDE_IM_XIM_TRUE= - INCLUDE_IM_XIM_FALSE='#' - else -@@ -29584,10 +29957,10 @@ else - fi - - --{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 --$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -+{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } - if test "${ac_cv_header_sys_wait_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -29620,21 +29993,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_sys_wait_h=no -@@ -29642,8 +30014,8 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 --$as_echo "$ac_cv_header_sys_wait_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } - if test $ac_cv_header_sys_wait_h = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -29653,10 +30025,10 @@ _ACEOF - fi - - --{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 --$as_echo_n "checking return type of signal handlers... " >&6; } -+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } - if test "${ac_cv_type_signal+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -29681,21 +30053,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void -@@ -29703,8 +30074,8 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 --$as_echo "$ac_cv_type_signal" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -+echo "${ECHO_T}$ac_cv_type_signal" >&6; } - - cat >>confdefs.h <<_ACEOF - #define RETSIGTYPE $ac_cv_type_signal -@@ -29712,9 +30083,7 @@ _ACEOF - - - -- -- --if test "x$LIBTIFF" != x; then -+ if test "x$LIBTIFF" != x; then - HAVE_TIFF_TRUE= - HAVE_TIFF_FALSE='#' - else -@@ -29722,9 +30091,7 @@ else - HAVE_TIFF_FALSE= - fi - -- -- --if test "x$LIBPNG" != x; then -+ if test "x$LIBPNG" != x; then - HAVE_PNG_TRUE= - HAVE_PNG_FALSE='#' - else -@@ -29732,9 +30099,7 @@ else - HAVE_PNG_FALSE= - fi - -- -- --if test "x$LIBJPEG" != x; then -+ if test "x$LIBJPEG" != x; then - HAVE_JPEG_TRUE= - HAVE_JPEG_FALSE='#' - else -@@ -29742,9 +30107,7 @@ else - HAVE_JPEG_FALSE= - fi - -- -- --if test "x$LIBJASPER" != x; then -+ if test "x$LIBJASPER" != x; then - HAVE_JASPER_TRUE= - HAVE_JASPER_FALSE='#' - else -@@ -29772,17 +30135,17 @@ fi - # support. - # - if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 --$as_echo_n "checking for sys/systeminfo.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 -+echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } - if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 --$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 --$as_echo_n "checking sys/systeminfo.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 -+echo $ECHO_N "checking sys/systeminfo.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -29798,33 +30161,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h presence" >&5 --$as_echo_n "checking sys/systeminfo.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking sys/systeminfo.h presence" >&5 -+echo $ECHO_N "checking sys/systeminfo.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -29838,52 +30200,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -29892,18 +30253,18 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 --$as_echo_n "checking for sys/systeminfo.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 -+echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } - if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_sys_systeminfo_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 --$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } - - fi --if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then -+if test $ac_cv_header_sys_systeminfo_h = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_SYS_SYSTEMINFO_H 1 -@@ -29913,17 +30274,17 @@ fi - - - if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 --$as_echo_n "checking for sys/sysinfo.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 -+echo $ECHO_N "checking for sys/sysinfo.h... $ECHO_C" >&6; } - if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 --$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 --$as_echo_n "checking sys/sysinfo.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 -+echo $ECHO_N "checking sys/sysinfo.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -29939,33 +30300,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 --$as_echo_n "checking sys/sysinfo.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 -+echo $ECHO_N "checking sys/sysinfo.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -29979,52 +30339,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -30033,18 +30392,18 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 --$as_echo_n "checking for sys/sysinfo.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 -+echo $ECHO_N "checking for sys/sysinfo.h... $ECHO_C" >&6; } - if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_sys_sysinfo_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 --$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } - - fi --if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then -+if test $ac_cv_header_sys_sysinfo_h = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_SYS_SYSINFO_H 1 -@@ -30054,15 +30413,15 @@ fi - - - --{ $as_echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 --$as_echo_n "checking for mediaLib 2.3... " >&6; } -+{ echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 -+echo $ECHO_N "checking for mediaLib 2.3... $ECHO_C" >&6; } - use_mlib25=no - # Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib - # patch requires. --{ $as_echo "$as_me:$LINENO: checking for mlib_ImageSetStruct in -lmlib" >&5 --$as_echo_n "checking for mlib_ImageSetStruct in -lmlib... " >&6; } -+{ echo "$as_me:$LINENO: checking for mlib_ImageSetStruct in -lmlib" >&5 -+echo $ECHO_N "checking for mlib_ImageSetStruct in -lmlib... $ECHO_C" >&6; } - if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lmlib $LIBS" -@@ -30094,37 +30453,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_mlib_mlib_ImageSetStruct=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_mlib_mlib_ImageSetStruct=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 --$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } --if test "x$ac_cv_lib_mlib_mlib_ImageSetStruct" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 -+echo "${ECHO_T}$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } -+if test $ac_cv_lib_mlib_mlib_ImageSetStruct = yes; then - use_mlib=yes - else - use_mlib=no -@@ -30138,14 +30493,14 @@ _ACEOF - - MEDIA_LIB=-lmlib - -- { $as_echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 --$as_echo_n "checking for mediaLib 2.5... " >&6; } -+ { echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 -+echo $ECHO_N "checking for mediaLib 2.5... $ECHO_C" >&6; } - # Check for a mediaLib 2.5 function since that is what is needed for - # gdk_rgb_convert integration. -- { $as_echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 --$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; } -+ { echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 -+echo $ECHO_N "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... $ECHO_C" >&6; } - if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lmlib $LIBS" -@@ -30177,37 +30532,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 --$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } --if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 -+echo "${ECHO_T}$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } -+if test $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint = yes; then - use_mlib25=yes - else - use_mlib25=no -@@ -30221,9 +30572,7 @@ _ACEOF - - fi - fi -- -- --if test $use_mlib = yes; then -+ if test $use_mlib = yes; then - USE_MEDIALIB_TRUE= - USE_MEDIALIB_FALSE='#' - else -@@ -30231,9 +30580,7 @@ else - USE_MEDIALIB_FALSE= - fi - -- -- --if test $use_mlib25 = yes; then -+ if test $use_mlib25 = yes; then - USE_MEDIALIB25_TRUE= - USE_MEDIALIB25_FALSE='#' - else -@@ -30248,8 +30595,8 @@ fi - # - # This code is partially taken from Mesa - # --{ $as_echo "$as_me:$LINENO: checking for x86 platform" >&5 --$as_echo_n "checking for x86 platform... " >&6; } -+{ echo "$as_me:$LINENO: checking for x86 platform" >&5 -+echo $ECHO_N "checking for x86 platform... $ECHO_C" >&6; } - case $host_cpu in - i386|i486|i586|i686|i786|k6|k7) - use_x86_asm=yes -@@ -30257,21 +30604,21 @@ case $host_cpu in - *) - use_x86_asm=no - esac --{ $as_echo "$as_me:$LINENO: result: $use_x86_asm" >&5 --$as_echo "$use_x86_asm" >&6; } -+{ echo "$as_me:$LINENO: result: $use_x86_asm" >&5 -+echo "${ECHO_T}$use_x86_asm" >&6; } - - use_mmx_asm=no - if test $use_x86_asm = yes; then - save_ac_ext=$ac_ext - ac_ext=S - -- { $as_echo "$as_me:$LINENO: checking compiler support for MMX" >&5 --$as_echo_n "checking compiler support for MMX... " >&6; } -+ { echo "$as_me:$LINENO: checking compiler support for MMX" >&5 -+echo $ECHO_N "checking compiler support for MMX... $ECHO_C" >&6; } - cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - use_mmx_asm=yes - fi -@@ -30285,17 +30632,15 @@ cat >>confdefs.h <<\_ACEOF - #define USE_MMX 1 - _ACEOF - -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - fi - -- -- --if test x$use_mmx_asm = xyes; then -+ if test x$use_mmx_asm = xyes; then - USE_MMX_TRUE= - USE_MMX_FALSE='#' - else -@@ -30310,9 +30655,7 @@ if test -z "$LIBPNG" && test x"$os_win32 - fi - - -- -- --if test $cross_compiling = yes; then -+ if test $cross_compiling = yes; then - CROSS_COMPILING_TRUE= - CROSS_COMPILING_FALSE='#' - else -@@ -30324,10 +30667,10 @@ fi - if test $cross_compiling = yes; then - # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. - set dummy gdk-pixbuf-csource; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $GDK_PIXBUF_CSOURCE in - [\\/]* | ?:[\\/]*) -@@ -30342,7 +30685,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -30355,20 +30698,20 @@ esac - fi - GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE - if test -n "$GDK_PIXBUF_CSOURCE"; then -- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 --$as_echo "$GDK_PIXBUF_CSOURCE" >&6; } -+ { echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 -+echo "${ECHO_T}$GDK_PIXBUF_CSOURCE" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - - # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. - set dummy gtk-update-icon-cache; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $GTK_UPDATE_ICON_CACHE in - [\\/]* | ?:[\\/]*) -@@ -30383,7 +30726,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -30396,11 +30739,11 @@ esac - fi - GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE - if test -n "$GTK_UPDATE_ICON_CACHE"; then -- { $as_echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 --$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; } -+ { echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 -+echo "${ECHO_T}$GTK_UPDATE_ICON_CACHE" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -30411,11 +30754,11 @@ fi - - if test ! -f $srcdir/gtk/gtkbuiltincache.h && - test "x$REBUILD_PNGS" = "x#" ; then -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** gtkbuiltincache.h is not in the tree, and cannot be built - *** because you don't have libpng, or (when cross-compiling) you - *** don't have a prebuilt gtk-update-icon-cache on the build system." >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** gtkbuiltincache.h is not in the tree, and cannot be built - *** because you don't have libpng, or (when cross-compiling) you - *** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} -@@ -30452,9 +30795,9 @@ if test "x$gdktarget" = "xx11"; then - # settings. - # - if $PKG_CONFIG --exists fontconfig; then : ; else -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} - { (exit 1); exit 1; }; } - fi -@@ -30482,8 +30825,8 @@ $as_echo "$as_me: error: - GTK_PACKAGES_FOR_X="x11" - else - have_base_x_pc=false -- { $as_echo "$as_me:$LINENO: checking for X" >&5 --$as_echo_n "checking for X... " >&6; } -+ { echo "$as_me:$LINENO: checking for X" >&5 -+echo $ECHO_N "checking for X... $ECHO_C" >&6; } - - - # Check whether --with-x was given. -@@ -30497,11 +30840,11 @@ if test "x$with_x" = xno; then - have_x=disabled - else - case $x_includes,$x_libraries in #( -- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 --$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} -+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 -+echo "$as_me: error: Cannot use X directory names containing '" >&2;} - { (exit 1); exit 1; }; };; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # One or both of the vars are not set, and there is no cached value. - ac_x_includes=no ac_x_libraries=no -@@ -30522,7 +30865,7 @@ _ACEOF - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -- for ac_extension in a so sl dylib la dll; do -+ for ac_extension in a so sl; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break -@@ -30536,7 +30879,7 @@ _ACEOF - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in -- /usr/lib | /usr/lib64 | /lib | /lib64) ;; -+ /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi -@@ -30597,14 +30940,13 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -@@ -30612,7 +30954,7 @@ $as_echo "$ac_try_echo") >&5 - # We can compile using X headers with no special include directory. - ac_x_includes= - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do -@@ -30653,33 +30995,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && 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= - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS=$ac_save_LIBS --for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` - do - # Don't even attempt the hair of trying to link an X program! -- for ac_extension in a so sl dylib la dll; do -+ for ac_extension in a so sl; do - if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 -@@ -30688,7 +31027,6 @@ do - done - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi # $ac_x_libraries = no -@@ -30711,8 +31049,8 @@ fi - fi # $with_x != no - - if test "$have_x" != yes; then -- { $as_echo "$as_me:$LINENO: result: $have_x" >&5 --$as_echo "$have_x" >&6; } -+ { echo "$as_me:$LINENO: result: $have_x" >&5 -+echo "${ECHO_T}$have_x" >&6; } - no_x=yes - else - # If each of the values was on the command line, it overrides each guess. -@@ -30722,8 +31060,8 @@ else - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" -- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 --$as_echo "libraries $x_libraries, headers $x_includes" >&6; } -+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } - fi - - if test "$no_x" = yes; then -@@ -30744,8 +31082,8 @@ else - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . -- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 --$as_echo_n "checking whether -R must be followed by a space... " >&6; } -+ { 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" - ac_xsave_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes -@@ -30770,26 +31108,23 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ } && 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS="$ac_xsave_LIBS -R $x_libraries" -@@ -30814,38 +31149,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ } && 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { $as_echo "$as_me:$LINENO: result: neither works" >&5 --$as_echo "neither works" >&6; } -+ { echo "$as_me:$LINENO: result: neither works" >&5 -+echo "${ECHO_T}neither works" >&6; } - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi - --rm -rf conftest.dSYM - 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 -@@ -30891,30 +31221,27 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 --$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } - if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldnet $LIBS" -@@ -30946,45 +31273,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_dnet_dnet_ntoa=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dnet_dnet_ntoa=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 --$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } --if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } -+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" - fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then -- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 --$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } - if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldnet_stub $LIBS" -@@ -31016,44 +31339,39 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dnet_stub_dnet_ntoa=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 --$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } --if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -+if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" - fi - - fi - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" -@@ -31066,10 +31384,10 @@ rm -f core conftest.err conftest.$ac_obj - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. -- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 --$as_echo_n "checking for gethostbyname... " >&6; } -+ { echo "$as_me:$LINENO: checking for gethostbyname" >&5 -+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } - if test "${ac_cv_func_gethostbyname+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31122,41 +31440,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_gethostbyname=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_gethostbyname=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 --$as_echo "$ac_cv_func_gethostbyname" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } - - if test $ac_cv_func_gethostbyname = no; then -- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 --$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -+ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } - if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lnsl $LIBS" -@@ -31188,45 +31502,41 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_nsl_gethostbyname=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_nsl_gethostbyname=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 --$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } --if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } -+if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" - fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then -- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 --$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -+ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } - if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lbsd $LIBS" -@@ -31258,37 +31568,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_bsd_gethostbyname=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_bsd_gethostbyname=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 --$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } --if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } -+if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" - fi - -@@ -31302,10 +31608,10 @@ fi - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. -- { $as_echo "$as_me:$LINENO: checking for connect" >&5 --$as_echo_n "checking for connect... " >&6; } -+ { echo "$as_me:$LINENO: checking for connect" >&5 -+echo $ECHO_N "checking for connect... $ECHO_C" >&6; } - if test "${ac_cv_func_connect+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31358,41 +31664,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_connect=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_connect=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 --$as_echo "$ac_cv_func_connect" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -+echo "${ECHO_T}$ac_cv_func_connect" >&6; } - - if test $ac_cv_func_connect = no; then -- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 --$as_echo_n "checking for connect in -lsocket... " >&6; } -+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } - if test "${ac_cv_lib_socket_connect+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -@@ -31424,47 +31726,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_socket_connect=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_connect=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 --$as_echo "$ac_cv_lib_socket_connect" >&6; } --if test "x$ac_cv_lib_socket_connect" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } -+if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" - fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. -- { $as_echo "$as_me:$LINENO: checking for remove" >&5 --$as_echo_n "checking for remove... " >&6; } -+ { echo "$as_me:$LINENO: checking for remove" >&5 -+echo $ECHO_N "checking for remove... $ECHO_C" >&6; } - if test "${ac_cv_func_remove+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31517,41 +31815,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_remove=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_remove=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 --$as_echo "$ac_cv_func_remove" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -+echo "${ECHO_T}$ac_cv_func_remove" >&6; } - - if test $ac_cv_func_remove = no; then -- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 --$as_echo_n "checking for remove in -lposix... " >&6; } -+ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } - if test "${ac_cv_lib_posix_remove+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lposix $LIBS" -@@ -31583,47 +31877,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_posix_remove=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_posix_remove=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 --$as_echo "$ac_cv_lib_posix_remove" >&6; } --if test "x$ac_cv_lib_posix_remove" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } -+if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" - fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -- { $as_echo "$as_me:$LINENO: checking for shmat" >&5 --$as_echo_n "checking for shmat... " >&6; } -+ { echo "$as_me:$LINENO: checking for shmat" >&5 -+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } - if test "${ac_cv_func_shmat+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31676,41 +31966,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_shmat=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shmat=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 --$as_echo "$ac_cv_func_shmat" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -+echo "${ECHO_T}$ac_cv_func_shmat" >&6; } - - if test $ac_cv_func_shmat = no; then -- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 --$as_echo_n "checking for shmat in -lipc... " >&6; } -+ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } - if test "${ac_cv_lib_ipc_shmat+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lipc $LIBS" -@@ -31742,37 +32028,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_ipc_shmat=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ipc_shmat=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 --$as_echo "$ac_cv_lib_ipc_shmat" >&6; } --if test "x$ac_cv_lib_ipc_shmat" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } -+if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" - fi - -@@ -31788,10 +32070,10 @@ fi - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry -- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 --$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -+ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } - if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lICE $X_EXTRA_LIBS $LIBS" -@@ -31823,37 +32105,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_ICE_IceConnectionNumber=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ICE_IceConnectionNumber=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 --$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } --if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" - fi - -@@ -31862,8 +32140,8 @@ fi - fi - - if test x$no_x = xyes ; then -- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5 --$as_echo "$as_me: error: X development libraries not found" >&2;} -+ { { echo "$as_me:$LINENO: error: X development libraries not found" >&5 -+echo "$as_me: error: X development libraries not found" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -31887,10 +32165,10 @@ $as_echo "$as_me: error: X development l - # Sanity check for the X11 and Xext libraries. While everything we need from - # Xext is optional, the chances a system has *none* of these things is so - # small that we just unconditionally require it. -- { $as_echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 --$as_echo_n "checking for XOpenDisplay... " >&6; } -+ { echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 -+echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6; } - if test "${ac_cv_func_XOpenDisplay+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31943,47 +32221,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_XOpenDisplay=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XOpenDisplay=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 --$as_echo "$ac_cv_func_XOpenDisplay" >&6; } --if test "x$ac_cv_func_XOpenDisplay" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 -+echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6; } -+if test $ac_cv_func_XOpenDisplay = yes; then - : - else -- { { $as_echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 --$as_echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} -+ { { echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 -+echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - -- { $as_echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 --$as_echo_n "checking for XextFindDisplay... " >&6; } -+ { echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 -+echo $ECHO_N "checking for XextFindDisplay... $ECHO_C" >&6; } - if test "${ac_cv_func_XextFindDisplay+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -32036,47 +32310,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_XextFindDisplay=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XextFindDisplay=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5 --$as_echo "$ac_cv_func_XextFindDisplay" >&6; } --if test "x$ac_cv_func_XextFindDisplay" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5 -+echo "${ECHO_T}$ac_cv_func_XextFindDisplay" >&6; } -+if test $ac_cv_func_XextFindDisplay = yes; then - : - else -- { { $as_echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 --$as_echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} -+ { { echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 -+echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - -- { $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 --$as_echo_n "checking for XRenderQueryExtension... " >&6; } -+ { echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 -+echo $ECHO_N "checking for XRenderQueryExtension... $ECHO_C" >&6; } - if test "${ac_cv_func_XRenderQueryExtension+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -32129,48 +32399,44 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_XRenderQueryExtension=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XRenderQueryExtension=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 --$as_echo "$ac_cv_func_XRenderQueryExtension" >&6; } --if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_func_XRenderQueryExtension" >&6; } -+if test $ac_cv_func_XRenderQueryExtension = yes; then - : - else -- { { $as_echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 --$as_echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} -+ { { echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 -+echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - - - # Check for xReply - -- { $as_echo "$as_me:$LINENO: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5 --$as_echo_n "checking if <X11/extensions/XIproto.h> is needed for xReply... " >&6; } -+ { echo "$as_me:$LINENO: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5 -+echo $ECHO_N "checking if <X11/extensions/XIproto.h> is needed for xReply... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -32192,22 +32458,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -@@ -32232,33 +32497,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - - cat >>confdefs.h <<\_ACEOF - #define NEED_XIPROTO_H_FOR_XREPLY 1 - _ACEOF - - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { $as_echo "$as_me:$LINENO: result: unknown" >&5 --$as_echo "unknown" >&6; } -- { { $as_echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 --$as_echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} -+ { echo "$as_me:$LINENO: result: unknown" >&5 -+echo "${ECHO_T}unknown" >&6; } -+ { { echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 -+echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -32273,11 +32537,11 @@ rm -f core conftest.err conftest.$ac_obj - - for ac_func in XConvertCase XInternAtoms - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -32330,42 +32594,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -32378,10 +32635,10 @@ done - # for clarity - - have_x11r6=false -- { $as_echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 --$as_echo_n "checking for XAddConnectionWatch... " >&6; } -+ { echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 -+echo $ECHO_N "checking for XAddConnectionWatch... $ECHO_C" >&6; } - if test "${ac_cv_func_XAddConnectionWatch+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -32434,36 +32691,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_XAddConnectionWatch=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XAddConnectionWatch=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 --$as_echo "$ac_cv_func_XAddConnectionWatch" >&6; } --if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 -+echo "${ECHO_T}$ac_cv_func_XAddConnectionWatch" >&6; } -+if test $ac_cv_func_XAddConnectionWatch = yes; then - have_x11r6=true - fi - -@@ -32475,9 +32728,7 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - fi -- -- --if $have_x11r6; then -+ if $have_x11r6; then - HAVE_X11R6_TRUE= - HAVE_X11R6_FALSE='#' - else -@@ -32489,18 +32740,18 @@ fi - # Check for XKB support. - - if test "x$enable_xkb" = "xyes"; then -- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 --$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 -+echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} - - cat >>confdefs.h <<\_ACEOF - #define HAVE_XKB 1 - _ACEOF - - elif test "x$enable_xkb" = "xmaybe"; then -- { $as_echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 --$as_echo_n "checking for XkbQueryExtension... " >&6; } -+ { echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 -+echo $ECHO_N "checking for XkbQueryExtension... $ECHO_C" >&6; } - if test "${ac_cv_func_XkbQueryExtension+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -32553,36 +32804,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_XkbQueryExtension=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XkbQueryExtension=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5 --$as_echo "$ac_cv_func_XkbQueryExtension" >&6; } --if test "x$ac_cv_func_XkbQueryExtension" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_func_XkbQueryExtension" >&6; } -+if test $ac_cv_func_XkbQueryExtension = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_XKB 1 -@@ -32591,16 +32838,16 @@ _ACEOF - fi - - else -- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 --$as_echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 -+echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} - fi - - # Check for shaped window extension - -- { $as_echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 --$as_echo_n "checking for XShapeCombineMask... " >&6; } -+ { echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 -+echo $ECHO_N "checking for XShapeCombineMask... $ECHO_C" >&6; } - if test "${ac_cv_func_XShapeCombineMask+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -32653,36 +32900,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_XShapeCombineMask=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XShapeCombineMask=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 --$as_echo "$ac_cv_func_XShapeCombineMask" >&6; } --if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 -+echo "${ECHO_T}$ac_cv_func_XShapeCombineMask" >&6; } -+if test $ac_cv_func_XShapeCombineMask = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_SHAPE_EXT 1 -@@ -32695,10 +32938,10 @@ fi - gtk_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $x_cflags" - -- { $as_echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 --$as_echo_n "checking for XSyncQueryExtension... " >&6; } -+ { echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 -+echo $ECHO_N "checking for XSyncQueryExtension... $ECHO_C" >&6; } - if test "${ac_cv_func_XSyncQueryExtension+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -32751,40 +32994,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_XSyncQueryExtension=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XSyncQueryExtension=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 --$as_echo "$ac_cv_func_XSyncQueryExtension" >&6; } --if test "x$ac_cv_func_XSyncQueryExtension" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 --$as_echo_n "checking for X11/extensions/sync.h... " >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_func_XSyncQueryExtension" >&6; } -+if test $ac_cv_func_XSyncQueryExtension = yes; then -+ { echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 -+echo $ECHO_N "checking for X11/extensions/sync.h... $ECHO_C" >&6; } - if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -32802,21 +33041,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_X11_extensions_sync_h=no -@@ -32824,9 +33062,9 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 --$as_echo "$ac_cv_header_X11_extensions_sync_h" >&6; } --if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_sync_h" >&6; } -+if test $ac_cv_header_X11_extensions_sync_h = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_XSYNC 1 -@@ -32846,10 +33084,10 @@ fi - - if test "x$enable_shm" = "xyes"; then - # Check for the XShm extension, normally in Xext -- { $as_echo "$as_me:$LINENO: checking for XShmAttach" >&5 --$as_echo_n "checking for XShmAttach... " >&6; } -+ { echo "$as_me:$LINENO: checking for XShmAttach" >&5 -+echo $ECHO_N "checking for XShmAttach... $ECHO_C" >&6; } - if test "${ac_cv_func_XShmAttach+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -32902,43 +33140,39 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_XShmAttach=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XShmAttach=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 --$as_echo "$ac_cv_func_XShmAttach" >&6; } --if test "x$ac_cv_func_XShmAttach" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 -+echo "${ECHO_T}$ac_cv_func_XShmAttach" >&6; } -+if test $ac_cv_func_XShmAttach = yes; then - : - else - # On AIX, it is in XextSam instead -- { $as_echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 --$as_echo_n "checking for XShmAttach in -lXextSam... " >&6; } -+ { echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 -+echo $ECHO_N "checking for XShmAttach in -lXextSam... $ECHO_C" >&6; } - if test "${ac_cv_lib_XextSam_XShmAttach+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lXextSam $LIBS" -@@ -32970,37 +33204,33 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_XextSam_XShmAttach=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_XextSam_XShmAttach=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 --$as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } --if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 -+echo "${ECHO_T}$ac_cv_lib_XextSam_XShmAttach" >&6; } -+if test $ac_cv_lib_XextSam_XShmAttach = yes; then - case "$x_extra_libs " in - *-lXextSam[\ \ ]*) ;; - *) x_extra_libs="-lXextSam $x_extra_libs" ;; -@@ -33015,17 +33245,17 @@ fi - if test "x$enable_shm" = "xyes"; then - # Check for shared memory - if test "${ac_cv_header_sys_ipc_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 --$as_echo_n "checking for sys/ipc.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 -+echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } - if test "${ac_cv_header_sys_ipc_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 --$as_echo "$ac_cv_header_sys_ipc_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 --$as_echo_n "checking sys/ipc.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 -+echo $ECHO_N "checking sys/ipc.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -33041,33 +33271,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 --$as_echo_n "checking sys/ipc.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 -+echo $ECHO_N "checking sys/ipc.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -33081,52 +33310,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -33135,18 +33363,18 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 --$as_echo_n "checking for sys/ipc.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 -+echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } - if test "${ac_cv_header_sys_ipc_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_sys_ipc_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 --$as_echo "$ac_cv_header_sys_ipc_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } - - fi --if test "x$ac_cv_header_sys_ipc_h" = x""yes; then -+if test $ac_cv_header_sys_ipc_h = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_IPC_H 1 -@@ -33158,17 +33386,17 @@ fi - - - if test "${ac_cv_header_sys_shm_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 --$as_echo_n "checking for sys/shm.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for sys/shm.h" >&5 -+echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } - if test "${ac_cv_header_sys_shm_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 --$as_echo "$ac_cv_header_sys_shm_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 --$as_echo_n "checking sys/shm.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 -+echo $ECHO_N "checking sys/shm.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -33184,33 +33412,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 --$as_echo_n "checking sys/shm.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 -+echo $ECHO_N "checking sys/shm.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -33224,52 +33451,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -33278,18 +33504,18 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 --$as_echo_n "checking for sys/shm.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for sys/shm.h" >&5 -+echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } - if test "${ac_cv_header_sys_shm_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_sys_shm_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 --$as_echo "$ac_cv_header_sys_shm_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } - - fi --if test "x$ac_cv_header_sys_shm_h" = x""yes; then -+if test $ac_cv_header_sys_shm_h = yes; then - - cat >>confdefs.h <<\_ACEOF - #define HAVE_SHM_H 1 -@@ -33303,8 +33529,8 @@ fi - - # Check for the X shared memory extension header file - have_xshm=no -- { $as_echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 --$as_echo_n "checking X11/extensions/XShm.h... " >&6; } -+ { echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 -+echo $ECHO_N "checking X11/extensions/XShm.h... $ECHO_C" >&6; } - if test "x$no_xext_lib" = "xyes"; then - : - else -@@ -33339,21 +33565,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - have_xshm=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -33362,8 +33587,8 @@ fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$gtk_save_CFLAGS" - fi -- { $as_echo "$as_me:$LINENO: result: $have_xshm" >&5 --$as_echo "$have_xshm" >&6; } -+ { echo "$as_me:$LINENO: result: $have_xshm" >&5 -+echo "${ECHO_T}$have_xshm" >&6; } - if test $have_xshm = yes ; then - - cat >>confdefs.h <<\_ACEOF -@@ -33381,14 +33606,14 @@ _ACEOF - case "$host" in - *-*-solaris*) - # Check for solaris -- { $as_echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 --$as_echo_n "checking for Xinerama support on Solaris... " >&6; } -+ { echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 -+echo $ECHO_N "checking for Xinerama support on Solaris... $ECHO_C" >&6; } - - have_solaris_xinerama=false -- { $as_echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 --$as_echo_n "checking for XineramaGetInfo... " >&6; } -+ { echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 -+echo $ECHO_N "checking for XineramaGetInfo... $ECHO_C" >&6; } - if test "${ac_cv_func_XineramaGetInfo+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -33441,40 +33666,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_XineramaGetInfo=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_XineramaGetInfo=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 --$as_echo "$ac_cv_func_XineramaGetInfo" >&6; } --if test "x$ac_cv_func_XineramaGetInfo" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 --$as_echo_n "checking for X11/extensions/xinerama.h... " >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 -+echo "${ECHO_T}$ac_cv_func_XineramaGetInfo" >&6; } -+if test $ac_cv_func_XineramaGetInfo = yes; then -+ { echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 -+echo $ECHO_N "checking for X11/extensions/xinerama.h... $ECHO_C" >&6; } - if test "${ac_cv_header_X11_extensions_xinerama_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -33492,21 +33713,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_X11_extensions_xinerama_h=no -@@ -33514,9 +33734,9 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 --$as_echo "$ac_cv_header_X11_extensions_xinerama_h" >&6; } --if test "x$ac_cv_header_X11_extensions_xinerama_h" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_xinerama_h" >&6; } -+if test $ac_cv_header_X11_extensions_xinerama_h = yes; then - have_solaris_xinerama=true - else - : -@@ -33537,27 +33757,27 @@ cat >>confdefs.h <<\_ACEOF - #define HAVE_XINERAMA 1 - _ACEOF - -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - ;; - *) - # Check for XFree -- { $as_echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 --$as_echo_n "checking for Xinerama support on XFree86... " >&6; } -+ { echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 -+echo $ECHO_N "checking for Xinerama support on XFree86... $ECHO_C" >&6; } - - have_xfree_xinerama=false - if $PKG_CONFIG --exists xinerama ; then - have_xfree_xinerama=true - X_PACKAGES="$X_PACKAGES xinerama" - else -- { $as_echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 --$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } -+ { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 -+echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; } - if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lXinerama $LIBS" -@@ -33589,41 +33809,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_Xinerama_XineramaQueryExtension=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_Xinerama_XineramaQueryExtension=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 --$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } --if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 --$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } -+if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then -+ { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -+echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } - if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -33641,21 +33857,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_X11_extensions_Xinerama_h=no -@@ -33663,9 +33878,9 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 --$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } --if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } -+if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then - case "$x_extra_libs " in - *-lXinerama[\ \ ]*) ;; - *) x_extra_libs="-lXinerama $x_extra_libs" ;; -@@ -33692,11 +33907,11 @@ cat >>confdefs.h <<\_ACEOF - #define HAVE_XINERAMA 1 - _ACEOF - -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - ;; - esac -@@ -33728,9 +33943,7 @@ _ACEOF - - fi - -- -- --if test x$with_xinput = xxfree || test x$with_xinput = xyes; then -+ if test x$with_xinput = xxfree || test x$with_xinput = xyes; then - XINPUT_XFREE_TRUE= - XINPUT_XFREE_FALSE='#' - else -@@ -33810,9 +34023,7 @@ _ACEOF - CPPFLAGS="$gtk_save_cppflags" - LIBS="$gtk_save_libs" - -- -- --if true; then -+ if true; then - USE_X11_TRUE= - USE_X11_FALSE='#' - else -@@ -33821,9 +34032,7 @@ else - fi - - else -- -- --if false; then -+ if false; then - XINPUT_XFREE_TRUE= - XINPUT_XFREE_FALSE='#' - else -@@ -33831,9 +34040,7 @@ else - XINPUT_XFREE_FALSE= - fi - -- -- --if false; then -+ if false; then - USE_X11_TRUE= - USE_X11_FALSE='#' - else -@@ -33841,9 +34048,7 @@ else - USE_X11_FALSE= - fi - -- -- --if false; then -+ if false; then - HAVE_X11R6_TRUE= - HAVE_X11R6_FALSE='#' - else -@@ -33855,9 +34060,7 @@ fi - - if test "x$gdktarget" = "xwin32"; then - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" -- -- --if true; then -+ if true; then - USE_WIN32_TRUE= - USE_WIN32_FALSE='#' - else -@@ -33866,9 +34069,7 @@ else - fi - - else -- -- --if false; then -+ if false; then - USE_WIN32_TRUE= - USE_WIN32_FALSE='#' - else -@@ -33880,9 +34081,7 @@ fi - - if test "x$gdktarget" = "xquartz"; then - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" -- -- --if true; then -+ if true; then - USE_QUARTZ_TRUE= - USE_QUARTZ_FALSE='#' - else -@@ -33891,9 +34090,7 @@ else - fi - - else -- -- --if false; then -+ if false; then - USE_QUARTZ_TRUE= - USE_QUARTZ_FALSE='#' - else -@@ -33913,22 +34110,22 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG - - - if test "x$gdktarget" = "xdirectfb"; then -- DIRECTFB_REQUIRED_VERSION=0.9.24 -- { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 --$as_echo_n "checking for DirectFB... " >&6; } -+ DIRECTFB_REQUIRED_VERSION=0.9.26 -+ { echo "$as_me:$LINENO: checking for DirectFB" >&5 -+echo $ECHO_N "checking for DirectFB... $ECHO_C" >&6; } - - if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then -- { $as_echo "$as_me:$LINENO: result: found" >&5 --$as_echo "found" >&6; } -+ { 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" - else -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend - *** are required. The latest version of DirectFB is always available - *** from http://www.directfb.org/. - " >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend - *** are required. The latest version of DirectFB is always available - *** from http://www.directfb.org/. -@@ -33936,9 +34133,7 @@ $as_echo "$as_me: error: - { (exit 1); exit 1; }; } - fi - -- -- --if true; then -+ if true; then - USE_DIRECTFB_TRUE= - USE_DIRECTFB_FALSE='#' - else -@@ -33947,9 +34142,7 @@ else - fi - - else -- -- --if false; then -+ if false; then - USE_DIRECTFB_TRUE= - USE_DIRECTFB_FALSE='#' - else -@@ -33968,20 +34161,20 @@ else - PANGO_PACKAGES="pango pangocairo" - fi - --{ $as_echo "$as_me:$LINENO: checking Pango flags" >&5 --$as_echo_n "checking Pango flags... " >&6; } -+{ echo "$as_me:$LINENO: checking Pango flags" >&5 -+echo $ECHO_N "checking Pango flags... $ECHO_C" >&6; } - if $PKG_CONFIG --exists $PANGO_PACKAGES ; then - PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` - PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` - -- { $as_echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 --$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; } -+ { echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 -+echo "${ECHO_T}$PANGO_CFLAGS $PANGO_LIBS" >&6; } - else -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** Pango not found. Pango built with Cairo support is required - *** to build GTK+. See http://www.pango.org for Pango information. - " >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** Pango not found. Pango built with Cairo support is required - *** to build GTK+. See http://www.pango.org for Pango information. - " >&2;} -@@ -34023,36 +34216,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** Can't link to Pango. Pango is required to build - *** GTK+. For more information see http://www.pango.org" >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** Can't link to Pango. Pango is required to build - *** GTK+. For more information see http://www.pango.org" >&2;} - { (exit 1); exit 1; }; } - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gtk_save_LIBS" -@@ -34063,18 +34252,19 @@ LDFLAGS="$saved_ldflags" - - GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" - if test "x$gdktarget" = "xx11"; then -- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" -+ GDK_PRIVATE_PACKAGES="$X_PACKAGES" - fi --GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" --GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" -+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" - - # - # If we aren't writing explicit dependencies, then don't put the extra libraries we need - # into the pkg-config files - # - if test $enable_explicit_deps != yes ; then -- GDK_PACKAGES="$PANGO_PACKAGES" - GDK_EXTRA_LIBS= -+else -+ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES" - fi - - -@@ -34084,25 +34274,26 @@ fi - - - -+ - ######################################## - # Check for Accessibility Toolkit flags - ######################################## - - ATK_PACKAGES=atk --{ $as_echo "$as_me:$LINENO: checking ATK flags" >&5 --$as_echo_n "checking ATK flags... " >&6; } -+{ echo "$as_me:$LINENO: checking ATK flags" >&5 -+echo $ECHO_N "checking ATK flags... $ECHO_C" >&6; } - if $PKG_CONFIG --exists $ATK_PACKAGES ; then - ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` - ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` - -- { $as_echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 --$as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; } -+ { echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 -+echo "${ECHO_T}$ATK_CFLAGS $ATK_LIBS" >&6; } - else -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** Accessibility Toolkit not found. Accessibility Toolkit is required - *** to build GTK+. - " >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** Accessibility Toolkit not found. Accessibility Toolkit is required - *** to build GTK+. - " >&2;} -@@ -34142,36 +34333,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required - *** to build GTK+" >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required - *** to build GTK+" >&2;} - { (exit 1); exit 1; }; } - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gtk_save_LIBS" -@@ -34196,7 +34383,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr - CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" - - if test $enable_explicit_deps != yes ; then -- GDK_PIXBUF_EXTRA_LIBS= -+ GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB" - fi - - -@@ -34224,10 +34411,10 @@ fi - ######################## - - old_LIBS="$LIBS" --{ $as_echo "$as_me:$LINENO: checking for library containing gethostent" >&5 --$as_echo_n "checking for library containing gethostent... " >&6; } -+{ echo "$as_me:$LINENO: checking for library containing gethostent" >&5 -+echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6; } - if test "${ac_cv_search_gethostent+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_func_search_save_LIBS=$LIBS - cat >conftest.$ac_ext <<_ACEOF -@@ -34265,30 +34452,26 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_search_gethostent=$ac_res - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_gethostent+set}" = set; then -@@ -34303,18 +34486,18 @@ fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 --$as_echo "$ac_cv_search_gethostent" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 -+echo "${ECHO_T}$ac_cv_search_gethostent" >&6; } - ac_res=$ac_cv_search_gethostent - if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - --{ $as_echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 --$as_echo_n "checking for library containing setsockopt... " >&6; } -+{ echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 -+echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } - if test "${ac_cv_search_setsockopt+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_func_search_save_LIBS=$LIBS - cat >conftest.$ac_ext <<_ACEOF -@@ -34352,30 +34535,26 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_search_setsockopt=$ac_res - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_setsockopt+set}" = set; then -@@ -34390,18 +34569,18 @@ fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 --$as_echo "$ac_cv_search_setsockopt" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 -+echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } - ac_res=$ac_cv_search_setsockopt - if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - --{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 --$as_echo_n "checking for library containing connect... " >&6; } -+{ echo "$as_me:$LINENO: checking for library containing connect" >&5 -+echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; } - if test "${ac_cv_search_connect+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_func_search_save_LIBS=$LIBS - cat >conftest.$ac_ext <<_ACEOF -@@ -34439,30 +34618,26 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_search_connect=$ac_res - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_connect+set}" = set; then -@@ -34477,8 +34652,8 @@ fi - rm conftest.$ac_ext - LIBS=$ac_func_search_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 --$as_echo "$ac_cv_search_connect" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 -+echo "${ECHO_T}$ac_cv_search_connect" >&6; } - ac_res=$ac_cv_search_connect - if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -@@ -34486,10 +34661,10 @@ if test "$ac_res" != no; then - fi - - --{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 --$as_echo_n "checking for struct sockaddr_un.sun_len... " >&6; } -+{ echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 -+echo $ECHO_N "checking for struct sockaddr_un.sun_len... $ECHO_C" >&6; } - if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -34517,21 +34692,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_sockaddr_un_sun_len=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -@@ -34560,21 +34734,20 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_member_struct_sockaddr_un_sun_len=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_member_struct_sockaddr_un_sun_len=no -@@ -34585,9 +34758,9 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 --$as_echo "$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } --if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 -+echo "${ECHO_T}$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } -+if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then - struct_sockaddr_un_sun_len=true - else - struct_sockaddr_un_suin_len=false -@@ -34626,10 +34799,10 @@ if test "x$enable_cups" = "xauto" - then - # Extract the first word of "cups-config", so it can be a program name with args. - set dummy cups-config; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $CUPS_CONFIG in - [\\/]* | ?:[\\/]*) -@@ -34644,7 +34817,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -34657,11 +34830,11 @@ esac - fi - CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG - if test -n "$CUPS_CONFIG"; then -- { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 --$as_echo "$CUPS_CONFIG" >&6; } -+ { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 -+echo "${ECHO_T}$CUPS_CONFIG" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -34688,17 +34861,17 @@ _ACEOF - - - if test "${ac_cv_header_cups_cups_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 --$as_echo_n "checking for cups/cups.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -+echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } - if test "${ac_cv_header_cups_cups_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 --$as_echo "$ac_cv_header_cups_cups_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 --$as_echo_n "checking cups/cups.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 -+echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -34714,33 +34887,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 --$as_echo_n "checking cups/cups.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 -+echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -34754,52 +34926,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -34808,30 +34979,28 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 --$as_echo_n "checking for cups/cups.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -+echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } - if test "${ac_cv_header_cups_cups_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_cups_cups_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 --$as_echo "$ac_cv_header_cups_cups_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } - - fi --if test "x$ac_cv_header_cups_cups_h" = x""yes; then -+if test $ac_cv_header_cups_cups_h = yes; then - : - else -- { { $as_echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 --$as_echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} -+ { { echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 -+echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} - { (exit 1); exit 1; }; } - fi - - - fi -- -- --if test "x$CUPS_CONFIG" != "xno"; then -+ if test "x$CUPS_CONFIG" != "xno"; then - HAVE_CUPS_TRUE= - HAVE_CUPS_FALSE='#' - else -@@ -34863,25 +35032,24 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - - cat >>confdefs.h <<\_ACEOF --#define HAVE_HTTP_AUTHSTRING /**/ -+#define HAVE_HTTP_AUTHSTRING - _ACEOF - - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -34897,11 +35065,11 @@ rm -f core conftest.err conftest.$ac_obj - - for ac_func in httpGetAuthString - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -34954,42 +35122,35 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -34998,9 +35159,7 @@ done - LIBS="$gtk_save_libs" - - else -- -- --if false; then -+ if false; then - HAVE_CUPS_TRUE= - HAVE_CUPS_FALSE='#' - else -@@ -35014,17 +35173,17 @@ gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" - - if test "${ac_cv_header_cairo_pdf_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 --$as_echo_n "checking for cairo-pdf.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 -+echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } - if test "${ac_cv_header_cairo_pdf_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 --$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking cairo-pdf.h usability" >&5 --$as_echo_n "checking cairo-pdf.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking cairo-pdf.h usability" >&5 -+echo $ECHO_N "checking cairo-pdf.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -35040,33 +35199,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 --$as_echo_n "checking cairo-pdf.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 -+echo $ECHO_N "checking cairo-pdf.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -35080,52 +35238,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -35134,24 +35291,24 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 --$as_echo_n "checking for cairo-pdf.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 -+echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } - if test "${ac_cv_header_cairo_pdf_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_cairo_pdf_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 --$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } - - fi --if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then -+if test $ac_cv_header_cairo_pdf_h = yes; then - : - else -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** Can't find cairo-pdf.h. You must build Cairo with the pdf - *** backend enabled." >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** Can't find cairo-pdf.h. You must build Cairo with the pdf - *** backend enabled." >&2;} - { (exit 1); exit 1; }; } -@@ -35161,17 +35318,17 @@ fi - - if test "$os_win32" != "yes"; then - if test "${ac_cv_header_cairo_ps_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 --$as_echo_n "checking for cairo-ps.h... " >&6; } -+ { echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 -+echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } - if test "${ac_cv_header_cairo_ps_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 --$as_echo "$ac_cv_header_cairo_ps_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 --$as_echo_n "checking cairo-ps.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 -+echo $ECHO_N "checking cairo-ps.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -35187,33 +35344,32 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 --$as_echo_n "checking cairo-ps.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 -+echo $ECHO_N "checking cairo-ps.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -35227,52 +35383,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: cairo-ps.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: cairo-ps.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: cairo-ps.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -35281,24 +35436,24 @@ _ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 --$as_echo_n "checking for cairo-ps.h... " >&6; } -+{ echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 -+echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } - if test "${ac_cv_header_cairo_ps_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_cairo_ps_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 --$as_echo "$ac_cv_header_cairo_ps_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } - - fi --if test "x$ac_cv_header_cairo_ps_h" = x""yes; then -+if test $ac_cv_header_cairo_ps_h = yes; then - : - else -- { { $as_echo "$as_me:$LINENO: error: -+ { { echo "$as_me:$LINENO: error: - *** Can't find cairo-ps.h. You must build Cairo with the - *** postscript backend enabled." >&5 --$as_echo "$as_me: error: -+echo "$as_me: error: - *** Can't find cairo-ps.h. You must build Cairo with the - *** postscript backend enabled." >&2;} - { (exit 1); exit 1; }; } -@@ -35317,9 +35472,7 @@ else - enable_test_print_backend=no - fi - -- -- --if test "x$enable_test_print_backend" != "xno"; then -+ if test "x$enable_test_print_backend" != "xno"; then - TEST_PRINT_BACKEND_TRUE= - TEST_PRINT_BACKEND_FALSE='#' - else -@@ -35378,32 +35531,32 @@ fi - - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.8") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - : - else -- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 --$as_echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} -+ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 -+echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} - { (exit 1); exit 1; }; } - fi - fi - -- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 --$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } -- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 --$as_echo "$enable_gtk_doc" >&6; } -+ { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 -+echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 -+echo "${ECHO_T}$enable_gtk_doc" >&6; } - - for ac_prog in gtkdoc-check - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $GTKDOC_CHECK in - [\\/]* | ?:[\\/]*) -@@ -35418,7 +35571,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -35430,11 +35583,11 @@ esac - fi - GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK - if test -n "$GTKDOC_CHECK"; then -- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 --$as_echo "$GTKDOC_CHECK" >&6; } -+ { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 -+echo "${ECHO_T}$GTKDOC_CHECK" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -35442,9 +35595,7 @@ fi - done - - -- -- --if test x$enable_gtk_doc = xyes; then -+ if test x$enable_gtk_doc = xyes; then - ENABLE_GTK_DOC_TRUE= - ENABLE_GTK_DOC_FALSE='#' - else -@@ -35452,9 +35603,7 @@ else - ENABLE_GTK_DOC_FALSE= - fi - -- -- --if test -n "$LIBTOOL"; then -+ if test -n "$LIBTOOL"; then - GTK_DOC_USE_LIBTOOL_TRUE= - GTK_DOC_USE_LIBTOOL_FALSE='#' - else -@@ -35466,10 +35615,10 @@ fi - - # Extract the first word of "db2html", so it can be a program name with args. - set dummy db2html; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_DB2HTML+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$DB2HTML"; then - ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test. -@@ -35482,7 +35631,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -35494,17 +35643,15 @@ fi - fi - DB2HTML=$ac_cv_prog_DB2HTML - if test -n "$DB2HTML"; then -- { $as_echo "$as_me:$LINENO: result: $DB2HTML" >&5 --$as_echo "$DB2HTML" >&6; } -+ { echo "$as_me:$LINENO: result: $DB2HTML" >&5 -+echo "${ECHO_T}$DB2HTML" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -- -- --if $DB2HTML; then -+ if $DB2HTML; then - HAVE_DOCBOOK_TRUE= - HAVE_DOCBOOK_FALSE='#' - else -@@ -35524,10 +35671,10 @@ fi - if test "${enable_man}" != no; then - # Extract the first word of "xsltproc", so it can be a program name with args. - set dummy xsltproc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_XSLTPROC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $XSLTPROC in - [\\/]* | ?:[\\/]*) -@@ -35542,7 +35689,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -35554,11 +35701,11 @@ esac - fi - XSLTPROC=$ac_cv_path_XSLTPROC - if test -n "$XSLTPROC"; then -- { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 --$as_echo "$XSLTPROC" >&6; } -+ { echo "$as_me:$LINENO: result: $XSLTPROC" >&5 -+echo "${ECHO_T}$XSLTPROC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -35579,24 +35726,24 @@ fi - jh_found_xmlcatalog=true - XML_CATALOG_FILE="$with_xml_catalog" - -- { $as_echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 --$as_echo_n "checking for XML catalog ($XML_CATALOG_FILE)... " >&6; } -+ { echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 -+echo $ECHO_N "checking for XML catalog ($XML_CATALOG_FILE)... $ECHO_C" >&6; } - if test -f "$XML_CATALOG_FILE"; then -- { $as_echo "$as_me:$LINENO: result: found" >&5 --$as_echo "found" >&6; } -+ { echo "$as_me:$LINENO: result: found" >&5 -+echo "${ECHO_T}found" >&6; } - else - jh_found_xmlcatalog=false -- { $as_echo "$as_me:$LINENO: result: not found" >&5 --$as_echo "not found" >&6; } -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - fi - - # check for the xmlcatalog program - # Extract the first word of "xmlcatalog", so it can be a program name with args. - set dummy xmlcatalog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_XMLCATALOG+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - case $XMLCATALOG in - [\\/]* | ?:[\\/]*) -@@ -35611,7 +35758,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -35624,11 +35771,11 @@ esac - fi - XMLCATALOG=$ac_cv_path_XMLCATALOG - if test -n "$XMLCATALOG"; then -- { $as_echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 --$as_echo "$XMLCATALOG" >&6; } -+ { echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 -+echo "${ECHO_T}$XMLCATALOG" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -35643,44 +35790,42 @@ fi - fi - - -- { $as_echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 --$as_echo_n "checking for DocBook XML DTD V4.1.2 in XML catalog... " >&6; } -+ { echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 -+echo $ECHO_N "checking for DocBook XML DTD V4.1.2 in XML catalog... $ECHO_C" >&6; } - if $jh_found_xmlcatalog && \ -- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 -+ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 - ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.1.2//EN" >&2) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- { $as_echo "$as_me:$LINENO: result: found" >&5 --$as_echo "found" >&6; } -+ { echo "$as_me:$LINENO: result: found" >&5 -+echo "${ECHO_T}found" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: not found" >&5 --$as_echo "not found" >&6; } -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - enable_man=no - fi - - -- { $as_echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 --$as_echo_n "checking for DocBook XSL Stylesheets in XML catalog... " >&6; } -+ { echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 -+echo $ECHO_N "checking for DocBook XSL Stylesheets in XML catalog... $ECHO_C" >&6; } - if $jh_found_xmlcatalog && \ -- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 -+ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 - ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" >&2) 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- { $as_echo "$as_me:$LINENO: result: found" >&5 --$as_echo "found" >&6; } -+ { echo "$as_me:$LINENO: result: found" >&5 -+echo "${ECHO_T}found" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: not found" >&5 --$as_echo "not found" >&6; } -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - enable_man=no - fi - - fi - -- -- --if test x$enable_man != xno; then -+ if test x$enable_man != xno; then - ENABLE_MAN_TRUE= - ENABLE_MAN_FALSE='#' - else -@@ -35727,12 +35872,11 @@ _ACEOF - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 --$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac -@@ -35765,12 +35909,12 @@ $as_echo "$as_me: WARNING: cache variabl - if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && -- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 --$as_echo "$as_me: updating cache $cache_file" >&6;} -+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 --$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} -+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -35786,7 +35930,7 @@ ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -- ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ ac_i=`echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -@@ -35798,510 +35942,530 @@ LTLIBOBJS=$ac_ltlibobjs - - - if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -+echo "$as_me: error: conditional \"AMDEP\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+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 --$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+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 -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. -+echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. -+echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. -+echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined. -+echo "$as_me: error: conditional \"OS_WIN32\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"OS_UNIX\" was never defined. -+echo "$as_me: error: conditional \"OS_UNIX\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"OS_LINUX\" was never defined. -+echo "$as_me: error: conditional \"OS_LINUX\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. -+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. -+echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${BUILD_GDIPLUS_LOADERS_TRUE}" && test -z "${BUILD_GDIPLUS_LOADERS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. -+echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${BUILD_DYNAMIC_MODULES_TRUE}" && test -z "${BUILD_DYNAMIC_MODULES_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. -+echo "$as_me: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_PNG_TRUE}" && test -z "${INCLUDE_PNG_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNG\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNG\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_PNG\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_PNG\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_BMP_TRUE}" && test -z "${INCLUDE_BMP_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_BMP\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_BMP\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_BMP\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_BMP\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_WBMP_TRUE}" && test -z "${INCLUDE_WBMP_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_WBMP\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_WBMP\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_WBMP\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_WBMP\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_GIF_TRUE}" && test -z "${INCLUDE_GIF_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GIF\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GIF\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_GIF\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_GIF\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_ICO_TRUE}" && test -z "${INCLUDE_ICO_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICO\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICO\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_ICO\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_ICO\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_ANI_TRUE}" && test -z "${INCLUDE_ANI_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ANI\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ANI\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_ANI\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_ANI\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_JPEG_TRUE}" && test -z "${INCLUDE_JPEG_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JPEG\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JPEG\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_JPEG\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_JPEG\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_PNM_TRUE}" && test -z "${INCLUDE_PNM_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNM\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNM\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_PNM\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_PNM\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_RAS_TRUE}" && test -z "${INCLUDE_RAS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_RAS\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_RAS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_RAS\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_RAS\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_TIFF_TRUE}" && test -z "${INCLUDE_TIFF_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIFF\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIFF\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_TIFF\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_TIFF\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_XPM_TRUE}" && test -z "${INCLUDE_XPM_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_XPM\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_XPM\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_XPM\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_XPM\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_XBM_TRUE}" && test -z "${INCLUDE_XBM_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_XBM\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_XBM\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_XBM\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_XBM\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_TGA_TRUE}" && test -z "${INCLUDE_TGA_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TGA\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TGA\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_TGA\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_TGA\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_PCX_TRUE}" && test -z "${INCLUDE_PCX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PCX\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PCX\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_ICNS_TRUE}" && test -z "${INCLUDE_ICNS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_JASPER_TRUE}" && test -z "${INCLUDE_JASPER_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_GDIPLUS_TRUE}" && test -z "${INCLUDE_GDIPLUS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. -+echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. -+echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_TIFF_TRUE}" && test -z "${HAVE_TIFF_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_TIFF\" was never defined. -+echo "$as_me: error: conditional \"HAVE_TIFF\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. -+echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_JPEG_TRUE}" && test -z "${HAVE_JPEG_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JPEG\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JPEG\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. -+echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_JASPER_TRUE}" && test -z "${HAVE_JASPER_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. -+echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_MEDIALIB_TRUE}" && test -z "${USE_MEDIALIB_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_MEDIALIB\" was never defined. -+echo "$as_me: error: conditional \"USE_MEDIALIB\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_MEDIALIB25_TRUE}" && test -z "${USE_MEDIALIB25_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB25\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB25\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_MEDIALIB25\" was never defined. -+echo "$as_me: error: conditional \"USE_MEDIALIB25\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_MMX_TRUE}" && test -z "${USE_MMX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_MMX\" was never defined. -+echo "$as_me: error: conditional \"USE_MMX\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. -+echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. -+echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. -+echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_X11\" was never defined. -+echo "$as_me: error: conditional \"USE_X11\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. -+echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_X11\" was never defined. -+echo "$as_me: error: conditional \"USE_X11\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. -+echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_WIN32\" was never defined. -+echo "$as_me: error: conditional \"USE_WIN32\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_WIN32\" was never defined. -+echo "$as_me: error: conditional \"USE_WIN32\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. -+echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. -+echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. -+echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. -+echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. -+echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. -+echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${TEST_PRINT_BACKEND_TRUE}" && test -z "${TEST_PRINT_BACKEND_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"TEST_PRINT_BACKEND\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"TEST_PRINT_BACKEND\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"TEST_PRINT_BACKEND\" was never defined. -+echo "$as_me: error: conditional \"TEST_PRINT_BACKEND\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. -+echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -+echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. -+echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined. -+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined. -+echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined. - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi - - : ${CONFIG_STATUS=./config.status} --ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -+echo "$as_me: creating $CONFIG_STATUS" >&6;} -+cat >$CONFIG_STATUS <<_ACEOF - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -36314,7 +36478,7 @@ ac_cs_silent=false - SHELL=\${CONFIG_SHELL-$SHELL} - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<\_ACEOF - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## -@@ -36324,7 +36488,7 @@ DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # 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 -@@ -36346,45 +36510,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --as_nl=' --' --export as_nl --# Printing a long string crashes Solaris 7 /usr/bin/printf. --as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='printf %s\n' -- as_echo_n='printf %s' --else -- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -- as_echo_n='/usr/ucb/echo -n' -- else -- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -- as_echo_n_body='eval -- arg=$1; -- case $arg in -- *"$as_nl"*) -- expr "X$arg" : "X\\(.*\\)$as_nl"; -- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -- esac; -- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -- ' -- export as_echo_n_body -- as_echo_n='sh -c $as_echo_n_body as_echo' -- fi -- export as_echo_body -- as_echo='sh -c $as_echo_body as_echo' --fi -- - # The user is always right. - if test "${PATH_SEPARATOR+set}" != set; then -- PATH_SEPARATOR=: -- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -- PATH_SEPARATOR=';' -- } -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh - fi - - # Support unset when possible. -@@ -36400,6 +36536,8 @@ fi - # there to prevent editors from complaining about space-tab. - # (If _AS_PATH_WALK were called with IFS unset, it would disable word - # splitting by setting IFS to empty value.) -+as_nl=' -+' - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -@@ -36422,7 +36560,7 @@ if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then -- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } - fi - -@@ -36435,10 +36573,17 @@ PS2='> ' - PS4='+ ' - - # NLS nuisances. --LC_ALL=C --export LC_ALL --LANGUAGE=C --export LANGUAGE -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ fi -+done - - # Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -36460,7 +36605,7 @@ as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X/"$0" | -+echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q -@@ -36511,7 +36656,7 @@ $as_unset CDPATH - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems -@@ -36539,6 +36684,7 @@ case `echo -n x` in - *) - ECHO_N='-n';; - esac -+ - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -36551,22 +36697,19 @@ if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file - else - rm -f conf$$.dir -- mkdir conf$$.dir 2>/dev/null -+ mkdir conf$$.dir - fi --if (echo >conf$$.file) 2>/dev/null; then -- if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -- elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -- else -+echo >conf$$.file -+if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -- fi -+elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln - else - as_ln_s='cp -p' - fi -@@ -36591,10 +36734,10 @@ else - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then -- test -d "$1/."; -+ test -d "$1/."; - else - case $1 in -- -*)set "./$1";; -+ -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi -@@ -36617,7 +36760,7 @@ exec 6>&1 - # values after options handling. - ac_log=" - This file was extended by gtk+ $as_me 2.14.4, which was --generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -36630,16 +36773,7 @@ on `(hostname || uname -n) 2>/dev/null | - - _ACEOF - --case $ac_config_files in *" --"*) set x $ac_config_files; shift; ac_config_files=$*;; --esac -- --case $ac_config_headers in *" --"*) set x $ac_config_headers; shift; ac_config_headers=$*;; --esac -- -- --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<_ACEOF - # Files that config.status was made for. - config_files="$ac_config_files" - config_headers="$ac_config_headers" -@@ -36647,23 +36781,22 @@ config_commands="$ac_config_commands" - - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ - \`$as_me' instantiates files from templates according to the - current configuration. - --Usage: $0 [OPTION]... [FILE]... -+Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit -- -q, --quiet, --silent -- do not print progress messages -+ -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -- --header=FILE[:TEMPLATE] -- instantiate the configuration header FILE -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE -+ --header=FILE[:TEMPLATE] -+ instantiate the configuration header FILE - - Configuration files: - $config_files -@@ -36677,25 +36810,25 @@ $config_commands - Report bugs to <bug-autoconf@gnu.org>." - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ - gtk+ config.status 2.14.4 --configured by $0, generated by GNU Autoconf 2.63, -- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.61, -+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2008 Free Software Foundation, Inc. -+Copyright (C) 2006 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - - ac_pwd='$ac_pwd' - srcdir='$srcdir' - INSTALL='$INSTALL' --AWK='$AWK' --test -n "\$AWK" || AWK=awk -+MKDIR_P='$MKDIR_P' - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --# The default lists apply if the user does not specify any file. -+cat >>$CONFIG_STATUS <<\_ACEOF -+# If no file are specified by the user, then we need to provide default -+# value. By we need to know if files were specified by the user. - ac_need_defaults=: - while test $# != 0 - do -@@ -36717,36 +36850,30 @@ do - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -- $as_echo "$ac_cs_version"; exit ;; -+ echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- case $ac_optarg in -- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" -+ CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift -- case $ac_optarg in -- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" -+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header -- { $as_echo "$as_me: error: ambiguous option: $1 -+ { echo "$as_me: error: ambiguous option: $1 - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; - --help | --hel | -h ) -- $as_echo "$ac_cs_usage"; exit ;; -+ echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { $as_echo "$as_me: error: unrecognized option: $1 -+ -*) { echo "$as_me: error: unrecognized option: $1 - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - -@@ -36765,29 +36892,27 @@ if $ac_cs_silent; then - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<_ACEOF - if \$ac_cs_recheck; then -- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -- shift -- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -- CONFIG_SHELL='$SHELL' -+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -+ CONFIG_SHELL=$SHELL - export CONFIG_SHELL -- exec "\$@" -+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - fi - - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<\_ACEOF - exec 5>>config.log - { - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX - ## Running $as_me. ## - _ASBOX -- $as_echo "$ac_log" -+ echo "$ac_log" - } >&5 - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<_ACEOF - # - # INIT-COMMANDS - # -@@ -36829,7 +36954,7 @@ fi - - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<\_ACEOF - - # Handling of arguments. - for ac_config_target in $ac_config_targets -@@ -36910,8 +37035,8 @@ do - "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; - "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; - -- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -+echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac - done -@@ -36952,144 +37077,536 @@ $debug || - (umask 077 && mkdir "$tmp") - } || - { -- $as_echo "$as_me: cannot create a temporary directory in ." >&2 -+ echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } - } - --# Set up the scripts for CONFIG_FILES section. --# No need to generate them if there are no CONFIG_FILES. --# This happens for instance with `./config.status config.h'. -+# -+# Set up the sed scripts for CONFIG_FILES section. -+# -+ -+# No need to generate the scripts if there are no CONFIG_FILES. -+# This happens for instance when ./config.status config.h - if test -n "$CONFIG_FILES"; then - -+_ACEOF - --ac_cr=' ' --ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` --if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -- ac_cs_awk_cr='\\r' --else -- ac_cs_awk_cr=$ac_cr -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+SHELL!$SHELL$ac_delim -+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -+PACKAGE_NAME!$PACKAGE_NAME$ac_delim -+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -+PACKAGE_STRING!$PACKAGE_STRING$ac_delim -+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -+exec_prefix!$exec_prefix$ac_delim -+prefix!$prefix$ac_delim -+program_transform_name!$program_transform_name$ac_delim -+bindir!$bindir$ac_delim -+sbindir!$sbindir$ac_delim -+libexecdir!$libexecdir$ac_delim -+datarootdir!$datarootdir$ac_delim -+datadir!$datadir$ac_delim -+sysconfdir!$sysconfdir$ac_delim -+sharedstatedir!$sharedstatedir$ac_delim -+localstatedir!$localstatedir$ac_delim -+includedir!$includedir$ac_delim -+oldincludedir!$oldincludedir$ac_delim -+docdir!$docdir$ac_delim -+infodir!$infodir$ac_delim -+htmldir!$htmldir$ac_delim -+dvidir!$dvidir$ac_delim -+pdfdir!$pdfdir$ac_delim -+psdir!$psdir$ac_delim -+libdir!$libdir$ac_delim -+localedir!$localedir$ac_delim -+mandir!$mandir$ac_delim -+DEFS!$DEFS$ac_delim -+ECHO_C!$ECHO_C$ac_delim -+ECHO_N!$ECHO_N$ac_delim -+ECHO_T!$ECHO_T$ac_delim -+LIBS!$LIBS$ac_delim -+build_alias!$build_alias$ac_delim -+host_alias!$host_alias$ac_delim -+target_alias!$target_alias$ac_delim -+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -+INSTALL_DATA!$INSTALL_DATA$ac_delim -+am__isrc!$am__isrc$ac_delim -+CYGPATH_W!$CYGPATH_W$ac_delim -+PACKAGE!$PACKAGE$ac_delim -+VERSION!$VERSION$ac_delim -+ACLOCAL!$ACLOCAL$ac_delim -+AUTOCONF!$AUTOCONF$ac_delim -+AUTOMAKE!$AUTOMAKE$ac_delim -+AUTOHEADER!$AUTOHEADER$ac_delim -+MAKEINFO!$MAKEINFO$ac_delim -+install_sh!$install_sh$ac_delim -+STRIP!$STRIP$ac_delim -+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -+mkdir_p!$mkdir_p$ac_delim -+AWK!$AWK$ac_delim -+SET_MAKE!$SET_MAKE$ac_delim -+am__leading_dot!$am__leading_dot$ac_delim -+AMTAR!$AMTAR$ac_delim -+am__tar!$am__tar$ac_delim -+am__untar!$am__untar$ac_delim -+GTK_MAJOR_VERSION!$GTK_MAJOR_VERSION$ac_delim -+GTK_MINOR_VERSION!$GTK_MINOR_VERSION$ac_delim -+GTK_MICRO_VERSION!$GTK_MICRO_VERSION$ac_delim -+GTK_INTERFACE_AGE!$GTK_INTERFACE_AGE$ac_delim -+GTK_BINARY_AGE!$GTK_BINARY_AGE$ac_delim -+GTK_API_VERSION!$GTK_API_VERSION$ac_delim -+GTK_VERSION!$GTK_VERSION$ac_delim -+GTK_BINARY_VERSION!$GTK_BINARY_VERSION$ac_delim -+LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim -+LT_CURRENT_MINUS_AGE!$LT_CURRENT_MINUS_AGE$ac_delim -+GAIL_LT_VERSION_INFO!$GAIL_LT_VERSION_INFO$ac_delim -+GAIL_LT_CURRENT_MINUS_AGE!$GAIL_LT_CURRENT_MINUS_AGE$ac_delim -+GDK_PIXBUF_MAJOR!$GDK_PIXBUF_MAJOR$ac_delim -+GDK_PIXBUF_MINOR!$GDK_PIXBUF_MINOR$ac_delim -+GDK_PIXBUF_MICRO!$GDK_PIXBUF_MICRO$ac_delim -+GDK_PIXBUF_VERSION!$GDK_PIXBUF_VERSION$ac_delim -+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim -+build!$build$ac_delim -+build_cpu!$build_cpu$ac_delim -+build_vendor!$build_vendor$ac_delim -+build_os!$build_os$ac_delim -+host!$host$ac_delim -+host_cpu!$host_cpu$ac_delim -+host_vendor!$host_vendor$ac_delim -+host_os!$host_os$ac_delim -+LIB_EXE_MACHINE_FLAG!$LIB_EXE_MACHINE_FLAG$ac_delim -+CC!$CC$ac_delim -+CFLAGS!$CFLAGS$ac_delim -+LDFLAGS!$LDFLAGS$ac_delim -+CPPFLAGS!$CPPFLAGS$ac_delim -+ac_ct_CC!$ac_ct_CC$ac_delim -+EXEEXT!$EXEEXT$ac_delim -+OBJEXT!$OBJEXT$ac_delim -+DEPDIR!$DEPDIR$ac_delim -+am__include!$am__include$ac_delim -+am__quote!$am__quote$ac_delim -+AMDEP_TRUE!$AMDEP_TRUE$ac_delim -+AMDEP_FALSE!$AMDEP_FALSE$ac_delim -+_ACEOF -+ -+ 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 -+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 - --echo 'BEGIN {' >"$tmp/subs1.awk" && -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+_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 -+CEOF$ac_eof - _ACEOF - - --{ -- echo "cat >conf$$subs.awk <<_ACEOF" && -- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -- echo "_ACEOF" --} >conf$$subs.sh || -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } --ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do -- . ./conf$$subs.sh || -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } -+ cat >conf$$subs.sed <<_ACEOF -+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -+CCDEPMODE!$CCDEPMODE$ac_delim -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -+ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim -+ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim -+CXX!$CXX$ac_delim -+ac_ct_CXX!$ac_ct_CXX$ac_delim -+CXXFLAGS!$CXXFLAGS$ac_delim -+CXXDEPMODE!$CXXDEPMODE$ac_delim -+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -+HAVE_CXX_TRUE!$HAVE_CXX_TRUE$ac_delim -+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 -+ECHO!$ECHO$ac_delim -+AR!$AR$ac_delim -+RANLIB!$RANLIB$ac_delim -+DSYMUTIL!$DSYMUTIL$ac_delim -+NMEDIT!$NMEDIT$ac_delim -+DLLTOOL!$DLLTOOL$ac_delim -+AS!$AS$ac_delim -+OBJDUMP!$OBJDUMP$ac_delim -+CPP!$CPP$ac_delim -+CXXCPP!$CXXCPP$ac_delim -+F77!$F77$ac_delim -+FFLAGS!$FFLAGS$ac_delim -+ac_ct_F77!$ac_ct_F77$ac_delim -+LIBTOOL!$LIBTOOL$ac_delim -+CCAS!$CCAS$ac_delim -+CCASFLAGS!$CCASFLAGS$ac_delim -+CCASDEPMODE!$CCASDEPMODE$ac_delim -+am__fastdepCCAS_TRUE!$am__fastdepCCAS_TRUE$ac_delim -+am__fastdepCCAS_FALSE!$am__fastdepCCAS_FALSE$ac_delim -+NM!$NM$ac_delim -+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim -+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim -+MAINT!$MAINT$ac_delim -+PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim -+PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim -+OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim -+OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim -+OS_UNIX_TRUE!$OS_UNIX_TRUE$ac_delim -+OS_UNIX_FALSE!$OS_UNIX_FALSE$ac_delim -+OS_LINUX_TRUE!$OS_LINUX_TRUE$ac_delim -+OS_LINUX_FALSE!$OS_LINUX_FALSE$ac_delim -+WINDRES!$WINDRES$ac_delim -+ms_librarian!$ms_librarian$ac_delim -+MS_LIB_AVAILABLE_TRUE!$MS_LIB_AVAILABLE_TRUE$ac_delim -+MS_LIB_AVAILABLE_FALSE!$MS_LIB_AVAILABLE_FALSE$ac_delim -+gdktarget!$gdktarget$ac_delim -+gdktargetlib!$gdktargetlib$ac_delim -+gtktargetlib!$gtktargetlib$ac_delim -+PKG_CONFIG!$PKG_CONFIG$ac_delim -+BASE_DEPENDENCIES_CFLAGS!$BASE_DEPENDENCIES_CFLAGS$ac_delim -+BASE_DEPENDENCIES_LIBS!$BASE_DEPENDENCIES_LIBS$ac_delim -+LIBTOOL_EXPORT_OPTIONS!$LIBTOOL_EXPORT_OPTIONS$ac_delim -+DISABLE_EXPLICIT_DEPS_TRUE!$DISABLE_EXPLICIT_DEPS_TRUE$ac_delim -+DISABLE_EXPLICIT_DEPS_FALSE!$DISABLE_EXPLICIT_DEPS_FALSE$ac_delim -+PERL!$PERL$ac_delim -+INDENT!$INDENT$ac_delim -+REBUILD!$REBUILD$ac_delim -+USE_NLS!$USE_NLS$ac_delim -+MSGFMT!$MSGFMT$ac_delim -+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim -+GMSGFMT!$GMSGFMT$ac_delim -+XGETTEXT!$XGETTEXT$ac_delim -+CATALOGS!$CATALOGS$ac_delim -+CATOBJEXT!$CATOBJEXT$ac_delim -+DATADIRNAME!$DATADIRNAME$ac_delim -+GMOFILES!$GMOFILES$ac_delim -+INSTOBJEXT!$INSTOBJEXT$ac_delim -+INTLLIBS!$INTLLIBS$ac_delim -+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim -+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim -+POFILES!$POFILES$ac_delim -+POSUB!$POSUB$ac_delim -+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim -+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim -+GLIB_LIBS!$GLIB_LIBS$ac_delim -+GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim -+GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim -+GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim -+GDK_WLIBS!$GDK_WLIBS$ac_delim -+BUILD_GDIPLUS_LOADERS_TRUE!$BUILD_GDIPLUS_LOADERS_TRUE$ac_delim -+BUILD_GDIPLUS_LOADERS_FALSE!$BUILD_GDIPLUS_LOADERS_FALSE$ac_delim -+LIBTIFF!$LIBTIFF$ac_delim -+LIBJPEG!$LIBJPEG$ac_delim -+LIBPNG!$LIBPNG$ac_delim -+LIBJASPER!$LIBJASPER$ac_delim -+BUILD_DYNAMIC_MODULES_TRUE!$BUILD_DYNAMIC_MODULES_TRUE$ac_delim -+BUILD_DYNAMIC_MODULES_FALSE!$BUILD_DYNAMIC_MODULES_FALSE$ac_delim -+_ACEOF - -- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -- if test $ac_delim_n = $ac_delim_num; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { { 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 --rm -f conf$$subs.sh - --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -+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-2.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+_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 -+CEOF$ac_eof - _ACEOF --sed -n ' --h --s/^/S["/; s/!.*/"]=/ --p --g --s/^[^!]*!// --:repl --t repl --s/'"$ac_delim"'$// --t delim --:nl --h --s/\(.\{148\}\).*/\1/ --t more1 --s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ --p --n --b repl --:more1 --s/["\\]/\\&/g; s/^/"/; s/$/"\\/ --p --g --s/.\{148\}// --t nl --:delim --h --s/\(.\{148\}\).*/\1/ --t more2 --s/["\\]/\\&/g; s/^/"/; s/$/"/ --p --b --:more2 --s/["\\]/\\&/g; s/^/"/; s/$/"\\/ --p --g --s/.\{148\}// --t delim --' <conf$$subs.awk | sed ' --/^[^""]/{ -- N -- s/\n// --} --' >>$CONFIG_STATUS || ac_write_fail=1 --rm -f conf$$subs.awk --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --_ACAWK --cat >>"\$tmp/subs1.awk" <<_ACAWK && -- for (key in S) S_is_set[key] = 1 -- FS = "" - --} --{ -- line = $ 0 -- nfields = split(line, field, "@") -- substed = 0 -- len = length(field[1]) -- for (i = 2; i < nfields; i++) { -- key = field[i] -- keylen = length(key) -- if (S_is_set[key]) { -- value = S[key] -- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -- len += length(value) + length(field[++i]) -- substed = 1 -- } else -- len += 1 + keylen -- } - -- print line --} -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim -+INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim -+INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim -+INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim -+INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim -+INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim -+INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim -+INCLUDE_WBMP_FALSE!$INCLUDE_WBMP_FALSE$ac_delim -+INCLUDE_GIF_TRUE!$INCLUDE_GIF_TRUE$ac_delim -+INCLUDE_GIF_FALSE!$INCLUDE_GIF_FALSE$ac_delim -+INCLUDE_ICO_TRUE!$INCLUDE_ICO_TRUE$ac_delim -+INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_delim -+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 -+INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim -+INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim -+INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim -+INCLUDE_TIFF_FALSE!$INCLUDE_TIFF_FALSE$ac_delim -+INCLUDE_XPM_TRUE!$INCLUDE_XPM_TRUE$ac_delim -+INCLUDE_XPM_FALSE!$INCLUDE_XPM_FALSE$ac_delim -+INCLUDE_XBM_TRUE!$INCLUDE_XBM_TRUE$ac_delim -+INCLUDE_XBM_FALSE!$INCLUDE_XBM_FALSE$ac_delim -+INCLUDE_TGA_TRUE!$INCLUDE_TGA_TRUE$ac_delim -+INCLUDE_TGA_FALSE!$INCLUDE_TGA_FALSE$ac_delim -+INCLUDE_PCX_TRUE!$INCLUDE_PCX_TRUE$ac_delim -+INCLUDE_PCX_FALSE!$INCLUDE_PCX_FALSE$ac_delim -+INCLUDE_ICNS_TRUE!$INCLUDE_ICNS_TRUE$ac_delim -+INCLUDE_ICNS_FALSE!$INCLUDE_ICNS_FALSE$ac_delim -+INCLUDE_JASPER_TRUE!$INCLUDE_JASPER_TRUE$ac_delim -+INCLUDE_JASPER_FALSE!$INCLUDE_JASPER_FALSE$ac_delim -+INCLUDE_GDIPLUS_TRUE!$INCLUDE_GDIPLUS_TRUE$ac_delim -+INCLUDE_GDIPLUS_FALSE!$INCLUDE_GDIPLUS_FALSE$ac_delim -+HAVE_INCLUDED_IMMMODULES_TRUE!$HAVE_INCLUDED_IMMMODULES_TRUE$ac_delim -+HAVE_INCLUDED_IMMMODULES_FALSE!$HAVE_INCLUDED_IMMMODULES_FALSE$ac_delim -+INCLUDED_IMMODULE_OBJ!$INCLUDED_IMMODULE_OBJ$ac_delim -+INCLUDED_IMMODULE_DEFINE!$INCLUDED_IMMODULE_DEFINE$ac_delim -+INCLUDE_IM_AM_ET_TRUE!$INCLUDE_IM_AM_ET_TRUE$ac_delim -+INCLUDE_IM_AM_ET_FALSE!$INCLUDE_IM_AM_ET_FALSE$ac_delim -+INCLUDE_IM_CEDILLA_TRUE!$INCLUDE_IM_CEDILLA_TRUE$ac_delim -+INCLUDE_IM_CEDILLA_FALSE!$INCLUDE_IM_CEDILLA_FALSE$ac_delim -+INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE!$INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE$ac_delim -+INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE!$INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE$ac_delim -+INCLUDE_IM_IME_TRUE!$INCLUDE_IM_IME_TRUE$ac_delim -+INCLUDE_IM_IME_FALSE!$INCLUDE_IM_IME_FALSE$ac_delim -+INCLUDE_IM_INUKTITUT_TRUE!$INCLUDE_IM_INUKTITUT_TRUE$ac_delim -+INCLUDE_IM_INUKTITUT_FALSE!$INCLUDE_IM_INUKTITUT_FALSE$ac_delim -+INCLUDE_IM_IPA_TRUE!$INCLUDE_IM_IPA_TRUE$ac_delim -+INCLUDE_IM_IPA_FALSE!$INCLUDE_IM_IPA_FALSE$ac_delim -+INCLUDE_IM_MULTIPRESS_TRUE!$INCLUDE_IM_MULTIPRESS_TRUE$ac_delim -+INCLUDE_IM_MULTIPRESS_FALSE!$INCLUDE_IM_MULTIPRESS_FALSE$ac_delim -+INCLUDE_IM_THAI_TRUE!$INCLUDE_IM_THAI_TRUE$ac_delim -+INCLUDE_IM_THAI_FALSE!$INCLUDE_IM_THAI_FALSE$ac_delim -+INCLUDE_IM_TI_ER_TRUE!$INCLUDE_IM_TI_ER_TRUE$ac_delim -+INCLUDE_IM_TI_ER_FALSE!$INCLUDE_IM_TI_ER_FALSE$ac_delim -+INCLUDE_IM_TI_ET_TRUE!$INCLUDE_IM_TI_ET_TRUE$ac_delim -+INCLUDE_IM_TI_ET_FALSE!$INCLUDE_IM_TI_ET_FALSE$ac_delim -+INCLUDE_IM_VIQR_TRUE!$INCLUDE_IM_VIQR_TRUE$ac_delim -+INCLUDE_IM_VIQR_FALSE!$INCLUDE_IM_VIQR_FALSE$ac_delim -+INCLUDE_IM_XIM_TRUE!$INCLUDE_IM_XIM_TRUE$ac_delim -+INCLUDE_IM_XIM_FALSE!$INCLUDE_IM_XIM_FALSE$ac_delim -+HAVE_TIFF_TRUE!$HAVE_TIFF_TRUE$ac_delim -+HAVE_TIFF_FALSE!$HAVE_TIFF_FALSE$ac_delim -+HAVE_PNG_TRUE!$HAVE_PNG_TRUE$ac_delim -+HAVE_PNG_FALSE!$HAVE_PNG_FALSE$ac_delim -+HAVE_JPEG_TRUE!$HAVE_JPEG_TRUE$ac_delim -+HAVE_JPEG_FALSE!$HAVE_JPEG_FALSE$ac_delim -+HAVE_JASPER_TRUE!$HAVE_JASPER_TRUE$ac_delim -+HAVE_JASPER_FALSE!$HAVE_JASPER_FALSE$ac_delim -+USE_MEDIALIB_TRUE!$USE_MEDIALIB_TRUE$ac_delim -+USE_MEDIALIB_FALSE!$USE_MEDIALIB_FALSE$ac_delim -+USE_MEDIALIB25_TRUE!$USE_MEDIALIB25_TRUE$ac_delim -+USE_MEDIALIB25_FALSE!$USE_MEDIALIB25_FALSE$ac_delim -+USE_MMX_TRUE!$USE_MMX_TRUE$ac_delim -+USE_MMX_FALSE!$USE_MMX_FALSE$ac_delim -+CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim -+CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim -+GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim -+GTK_UPDATE_ICON_CACHE!$GTK_UPDATE_ICON_CACHE$ac_delim -+REBUILD_PNGS!$REBUILD_PNGS$ac_delim -+XMKMF!$XMKMF$ac_delim -+X_CFLAGS!$X_CFLAGS$ac_delim -+X_PRE_LIBS!$X_PRE_LIBS$ac_delim -+X_LIBS!$X_LIBS$ac_delim -+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim -+HAVE_X11R6_TRUE!$HAVE_X11R6_TRUE$ac_delim -+HAVE_X11R6_FALSE!$HAVE_X11R6_FALSE$ac_delim -+XINPUT_XFREE_TRUE!$XINPUT_XFREE_TRUE$ac_delim -+XINPUT_XFREE_FALSE!$XINPUT_XFREE_FALSE$ac_delim -+USE_X11_TRUE!$USE_X11_TRUE$ac_delim -+USE_X11_FALSE!$USE_X11_FALSE$ac_delim -+USE_WIN32_TRUE!$USE_WIN32_TRUE$ac_delim -+USE_WIN32_FALSE!$USE_WIN32_FALSE$ac_delim -+USE_QUARTZ_TRUE!$USE_QUARTZ_TRUE$ac_delim -+_ACEOF - --_ACAWK -+ 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 -+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-3.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" --else -- cat --fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 --$as_echo "$as_me: error: could not setup config files machinery" >&2;} -+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 -+CEOF$ac_eof -+_ACEOF -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim -+GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim -+GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim -+GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim -+USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim -+USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim -+GDK_PACKAGES!$GDK_PACKAGES$ac_delim -+GDK_PRIVATE_PACKAGES!$GDK_PRIVATE_PACKAGES$ac_delim -+GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim -+GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim -+GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim -+GDK_DEP_CFLAGS!$GDK_DEP_CFLAGS$ac_delim -+GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim -+GDK_PIXBUF_EXTRA_LIBS!$GDK_PIXBUF_EXTRA_LIBS$ac_delim -+GDK_PIXBUF_EXTRA_CFLAGS!$GDK_PIXBUF_EXTRA_CFLAGS$ac_delim -+GDK_PIXBUF_DEP_LIBS!$GDK_PIXBUF_DEP_LIBS$ac_delim -+GDK_PIXBUF_DEP_CFLAGS!$GDK_PIXBUF_DEP_CFLAGS$ac_delim -+GTK_PACKAGES!$GTK_PACKAGES$ac_delim -+GTK_EXTRA_LIBS!$GTK_EXTRA_LIBS$ac_delim -+GTK_EXTRA_CFLAGS!$GTK_EXTRA_CFLAGS$ac_delim -+GTK_DEP_LIBS!$GTK_DEP_LIBS$ac_delim -+GTK_DEP_CFLAGS!$GTK_DEP_CFLAGS$ac_delim -+GLIB_PREFIX!$GLIB_PREFIX$ac_delim -+ATK_PREFIX!$ATK_PREFIX$ac_delim -+PANGO_PREFIX!$PANGO_PREFIX$ac_delim -+CAIRO_PREFIX!$CAIRO_PREFIX$ac_delim -+GTK_DEBUG_FLAGS!$GTK_DEBUG_FLAGS$ac_delim -+GTK_XIM_FLAGS!$GTK_XIM_FLAGS$ac_delim -+GAIL_INET_LIBS!$GAIL_INET_LIBS$ac_delim -+CUPS_CONFIG!$CUPS_CONFIG$ac_delim -+CUPS_API_MAJOR!$CUPS_API_MAJOR$ac_delim -+CUPS_API_MINOR!$CUPS_API_MINOR$ac_delim -+CUPS_CFLAGS!$CUPS_CFLAGS$ac_delim -+CUPS_LIBS!$CUPS_LIBS$ac_delim -+HAVE_CUPS_TRUE!$HAVE_CUPS_TRUE$ac_delim -+HAVE_CUPS_FALSE!$HAVE_CUPS_FALSE$ac_delim -+HAVE_HTTP_AUTHSTRING!$HAVE_HTTP_AUTHSTRING$ac_delim -+TEST_PRINT_BACKEND_TRUE!$TEST_PRINT_BACKEND_TRUE$ac_delim -+TEST_PRINT_BACKEND_FALSE!$TEST_PRINT_BACKEND_FALSE$ac_delim -+HTML_DIR!$HTML_DIR$ac_delim -+GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim -+ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim -+ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim -+GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim -+GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim -+DB2HTML!$DB2HTML$ac_delim -+HAVE_DOCBOOK_TRUE!$HAVE_DOCBOOK_TRUE$ac_delim -+HAVE_DOCBOOK_FALSE!$HAVE_DOCBOOK_FALSE$ac_delim -+XSLTPROC!$XSLTPROC$ac_delim -+XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim -+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` = 57; 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 -@@ -37105,133 +37622,19 @@ s/^[^=]*=[ ]*$// - }' - fi - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<\_ACEOF - fi # test -n "$CONFIG_FILES" - --# Set up the scripts for CONFIG_HEADERS section. --# No need to generate them if there are no CONFIG_HEADERS. --# This happens for instance with `./config.status Makefile'. --if test -n "$CONFIG_HEADERS"; then --cat >"$tmp/defines.awk" <<\_ACAWK || --BEGIN { --_ACEOF -- --# Transform confdefs.h into an awk script `defines.awk', embedded as --# here-document in config.status, that substitutes the proper values into --# config.h.in to produce config.h. -- --# Create a delimiter string that does not exist in confdefs.h, to ease --# handling of long lines. --ac_delim='%!_!# ' --for ac_last_try in false false :; do -- ac_t=`sed -n "/$ac_delim/p" confdefs.h` -- if test -z "$ac_t"; then -- break -- elif $ac_last_try; then -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} -- { (exit 1); exit 1; }; } -- else -- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -- fi --done -- --# For the awk script, D is an array of macro values keyed by name, --# likewise P contains macro parameters if any. Preserve backslash --# newline sequences. -- --ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* --sed -n ' --s/.\{148\}/&'"$ac_delim"'/g --t rset --:rset --s/^[ ]*#[ ]*define[ ][ ]*/ / --t def --d --:def --s/\\$// --t bsnl --s/["\\]/\\&/g --s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ --D["\1"]=" \3"/p --s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p --d --:bsnl --s/["\\]/\\&/g --s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ --D["\1"]=" \3\\\\\\n"\\/p --t cont --s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p --t cont --d --:cont --n --s/.\{148\}/&'"$ac_delim"'/g --t clear --:clear --s/\\$// --t bsnlc --s/["\\]/\\&/g; s/^/"/; s/$/"/p --d --:bsnlc --s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p --b cont --' <confdefs.h | sed ' --s/'"$ac_delim"'/"\\\ --"/g' >>$CONFIG_STATUS || ac_write_fail=1 -- --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -- for (key in D) D_is_set[key] = 1 -- FS = "" --} --/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { -- line = \$ 0 -- split(line, arg, " ") -- if (arg[1] == "#") { -- defundef = arg[2] -- mac1 = arg[3] -- } else { -- defundef = substr(arg[1], 2) -- mac1 = arg[2] -- } -- split(mac1, mac2, "(") #) -- macro = mac2[1] -- prefix = substr(line, 1, index(line, defundef) - 1) -- if (D_is_set[macro]) { -- # Preserve the white space surrounding the "#". -- print prefix "define", macro P[macro] D[macro] -- next -- } else { -- # Replace #undef with comments. This is necessary, for example, -- # in the case of _POSIX_SOURCE, which is predefined and required -- # on some systems where configure will not decide to define it. -- if (defundef == "undef") { -- print "/*", prefix defundef, macro, "*/" -- next -- } -- } --} --{ print } --_ACAWK --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 --$as_echo "$as_me: error: could not setup config headers machinery" >&2;} -- { (exit 1); exit 1; }; } --fi # test -n "$CONFIG_HEADERS" -- - --eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" --shift --for ac_tag -+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS - do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 --$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} -+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -+echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -@@ -37260,38 +37663,26 @@ $as_echo "$as_me: error: invalid tag $ac - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 --$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac -- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -- ac_file_inputs="$ac_file_inputs '$ac_f'" -+ ac_file_inputs="$ac_file_inputs $ac_f" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ -- configure_input='Generated from '` -- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -- `' by configure.' -+ configure_input="Generated from "`IFS=: -+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" -- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 --$as_echo "$as_me: creating $ac_file" >&6;} -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} - fi -- # Neutralize special characters interpreted by sed in replacement strings. -- case $configure_input in #( -- *\&* | *\|* | *\\* ) -- ac_sed_conf_input=`$as_echo "$configure_input" | -- sed 's/[\\\\&|]/\\\\&/g'`;; #( -- *) ac_sed_conf_input=$configure_input;; -- esac - - case $ac_tag in -- *:-:* | *:-) cat >"$tmp/stdin" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } ;; -+ *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; - esac -@@ -37301,7 +37692,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$ac_file" | -+echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -37327,7 +37718,7 @@ $as_echo X"$ac_file" | - as_dirs= - while :; do - case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" -@@ -37336,7 +37727,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -+echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -37357,17 +37748,17 @@ $as_echo X"$as_dir" | - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - - case "$ac_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -37405,15 +37796,19 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -+ ac_MKDIR_P=$MKDIR_P -+ case $MKDIR_P in -+ [\\/$]* | ?:[\\/]* ) ;; -+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; -+ esac - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<\_ACEOF - # If the template does not know about datarootdir, expand it. - # FIXME: This hack should be removed a few years after 2.60. - ac_datarootdir_hack=; ac_datarootdir_seen= - --ac_sed_dataroot=' --/datarootdir/ { -+case `sed -n '/datarootdir/ { - p - q - } -@@ -37422,14 +37817,13 @@ ac_sed_dataroot=' - /@infodir@/p - /@localedir@/p - /@mandir@/p --' --case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+' $ac_file_inputs` in - *datarootdir*) ac_datarootdir_seen=yes;; - *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 --$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<_ACEOF - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g -@@ -37443,16 +37837,15 @@ _ACEOF - # Neutralize VPATH when `$srcdir' = `.'. - # Shell code in configure.ac might set extrasub. - # FIXME: do we really want to maintain this feature? --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --ac_sed_extra="$ac_vpsub -+cat >>$CONFIG_STATUS <<_ACEOF -+ sed "$ac_vpsub - $extrasub - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+cat >>$CONFIG_STATUS <<\_ACEOF - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s|@configure_input@|$ac_sed_conf_input|;t t -+s&@configure_input@&$configure_input&;t t - s&@top_builddir@&$ac_top_builddir_sub&;t t --s&@top_build_prefix@&$ac_top_build_prefix&;t t - s&@srcdir@&$ac_srcdir&;t t - s&@abs_srcdir@&$ac_abs_srcdir&;t t - s&@top_srcdir@&$ac_top_srcdir&;t t -@@ -37461,75 +37854,138 @@ s&@builddir@&$ac_builddir&;t t - s&@abs_builddir@&$ac_abs_builddir&;t t - s&@abs_top_builddir@&$ac_abs_top_builddir&;t t - s&@INSTALL@&$ac_INSTALL&;t t -+s&@MKDIR_P@&$ac_MKDIR_P&;t t - $ac_datarootdir_hack --" --eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -+" $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"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&5 --$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in -- -) cat "$tmp/out" && rm -f "$tmp/out";; -- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -- esac \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -+ -) cat "$tmp/out"; rm -f "$tmp/out";; -+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; -+ esac ;; - :H) - # - # CONFIG_HEADER - # -+_ACEOF -+ -+# Transform confdefs.h into a sed script `conftest.defines', that -+# substitutes the proper values into config.h.in to produce config.h. -+rm -f conftest.defines conftest.tail -+# First, append a space to every undef/define line, to ease matching. -+echo 's/$/ /' >conftest.defines -+# Then, protect against being on the right side of a sed subst, or in -+# an unquoted here document, in config.status. If some macros were -+# called several times there might be several #defines for the same -+# symbol, which is useless. But do not sort them, since the last -+# AC_DEFINE must be honored. -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -+# NAME is the cpp macro being defined, VALUE is the value it is being given. -+# PARAMS is the parameter list in the macro definition--in most cases, it's -+# just an empty string. -+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -+ac_dB='\\)[ (].*,\\1define\\2' -+ac_dC=' ' -+ac_dD=' ,' -+ -+uniq confdefs.h | -+ sed -n ' -+ t rset -+ :rset -+ s/^[ ]*#[ ]*define[ ][ ]*// -+ t ok -+ d -+ :ok -+ s/[\\&,]/\\&/g -+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p -+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p -+ ' >>conftest.defines -+ -+# Remove the space that was appended to ease matching. -+# Then replace #undef with comments. This is necessary, for -+# example, in the case of _POSIX_SOURCE, which is predefined and required -+# on some systems where configure will not decide to define it. -+# (The regexp can be short, since the line contains either #define or #undef.) -+echo 's/ $// -+s,^[ #]*u.*,/* & */,' >>conftest.defines -+ -+# Break up conftest.defines: -+ac_max_sed_lines=50 -+ -+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -+# et cetera. -+ac_in='$ac_file_inputs' -+ac_out='"$tmp/out1"' -+ac_nxt='"$tmp/out2"' -+ -+while : -+do -+ # Write a here document: -+ cat >>$CONFIG_STATUS <<_ACEOF -+ # First, check the format of the line: -+ cat >"\$tmp/defines.sed" <<\\CEOF -+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -+b -+:def -+_ACEOF -+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS -+ echo 'CEOF -+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS -+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in -+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail -+ grep . conftest.tail >/dev/null || break -+ rm -f conftest.defines -+ mv conftest.tail conftest.defines -+done -+rm -f conftest.defines conftest.tail -+ -+echo "ac_result=$ac_in" >>$CONFIG_STATUS -+cat >>$CONFIG_STATUS <<\_ACEOF - if test x"$ac_file" != x-; then -- { -- $as_echo "/* $configure_input */" \ -- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" -- } >"$tmp/config.h" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then -- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 --$as_echo "$as_me: $ac_file is unchanged" >&6;} -+ echo "/* $configure_input */" >"$tmp/config.h" -+ cat "$ac_result" >>"$tmp/config.h" -+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then -+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -+echo "$as_me: $ac_file is unchanged" >&6;} - else -- rm -f "$ac_file" -- mv "$tmp/config.h" "$ac_file" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -+ rm -f $ac_file -+ mv "$tmp/config.h" $ac_file - fi - else -- $as_echo "/* $configure_input */" \ -- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 --$as_echo "$as_me: error: could not create -" >&2;} -- { (exit 1); exit 1; }; } -+ echo "/* $configure_input */" -+ cat "$ac_result" - fi --# Compute "$ac_file"'s index in $config_headers. -+ rm -f "$tmp/out12" -+# Compute $ac_file's index in $config_headers. -+_am_arg=$ac_file - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- "$ac_file" | "$ac_file":* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$ac_file" | -+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$_am_arg" : 'X\(//\)[^/]' \| \ -+ X"$_am_arg" : 'X\(//\)$' \| \ -+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -37549,8 +38005,8 @@ $as_echo X"$ac_file" | - s/.*/./; q'`/stamp-h$_am_stamp_count - ;; - -- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 --$as_echo "$as_me: executing $ac_file commands" >&6;} -+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -+echo "$as_me: executing $ac_file commands" >&6;} - ;; - esac - -@@ -37564,14 +38020,15 @@ $as_echo "$as_me: executing $ac_file com - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. -- # So let's grep whole file. -- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$mf" | -+echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -37592,27 +38049,21 @@ $as_echo X"$mf" | - else - continue - fi -- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n -e '/^U = / s///p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n -e ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -+ U=`sed -n 's/^U = //p' < "$mf"` -+ # Find all dependency output files, they are included files with -+ # $(DEPDIR) in their names. We invoke sed twice because it is the -+ # simplest approach to changing $(DEPDIR) to its actual value in the -+ # expansion. -+ for file in `sed -n " -+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue -@@ -37621,7 +38072,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$file" | -+echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -37647,7 +38098,7 @@ $as_echo X"$file" | - as_dirs= - while :; do - case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" -@@ -37656,7 +38107,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -+echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -37677,8 +38128,8 @@ $as_echo X"$as_dir" | - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" -@@ -37733,8 +38184,8 @@ _______EOF + "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +@@ -35717,8 +38184,8 @@ if cmp -s $outfile gdk/gdkconfig.h; then @@ -68170,7 +78968,7 @@ Index: gtk+-2.14.4/configure rm -f $outfile else mv $outfile gdk/gdkconfig.h -@@ -37750,11 +38201,6 @@ _ACEOF +@@ -35734,11 +38201,6 @@ chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save @@ -68182,7 +78980,7 @@ Index: gtk+-2.14.4/configure # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. -@@ -37776,10 +38222,6 @@ if test "$no_create" != yes; then +@@ -35760,10 +38222,6 @@ # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi @@ -68193,10 +78991,9 @@ Index: gtk+-2.14.4/configure echo "configuration: -Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2008-10-17 06:07:13.000000000 +0200 -+++ gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in 2008-11-11 18:55:59.872634930 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.5/contrib/gdk-pixbuf-xlib/Makefile.in +--- gtk+2.0-2.14.5.old/contrib/gdk-pixbuf-xlib/Makefile.in 2008-11-24 07:41:38.000000000 +0100 ++++ gtk+2.0-2.14.5/contrib/gdk-pixbuf-xlib/Makefile.in 2008-11-25 11:09:45.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -68228,7 +79025,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +34,65 @@ POST_INSTALL = : +@@ -37,10 +34,65 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -68296,7 +79093,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +103,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +103,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -68320,7 +79117,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +128,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +128,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -68328,8 +79125,9 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +135,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -68338,9 +79136,13 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +161,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +161,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -68348,7 +79150,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +180,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +180,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -68357,7 +79159,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +190,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +190,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -68450,7 +79252,20 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +219,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +214,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -68473,10 +79288,12 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +238,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +238,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -68485,7 +79302,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +249,10 @@ SED = @SED@ +@@ -300,28 +249,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -68514,7 +79331,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +261,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +261,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -68524,11 +79341,12 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -68544,15 +79362,17 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +302,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +301,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +311,11 @@ program_transform_name = @program_transf +@@ -377,9 +311,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -68565,7 +79385,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,29 +346,23 @@ XVFB_START = \ +@@ -410,29 +346,23 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -68595,7 +79415,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in libgdk_pixbuf_xlib_2_0_la_SOURCES = \ gdk-pixbuf-xlib-private.h \ gdk-pixbuf-xlib.c \ -@@ -436,99 +370,80 @@ libgdk_pixbuf_xlib_2_0_la_SOURCES = \ +@@ -440,99 +370,80 @@ gdk-pixbuf-xlib-drawable.c \ gdk-pixbuf-xlibrgb.c @@ -68733,7 +79553,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -539,100 +454,75 @@ distclean-compile: +@@ -543,100 +454,75 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdk-pixbuf-xlibrgb.Plo@am__quote@ .c.o: @@ -68863,7 +79683,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -642,23 +532,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -646,23 +532,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -68896,7 +79716,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -670,29 +560,23 @@ GTAGS: +@@ -674,29 +560,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -68939,7 +79759,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -707,9 +591,10 @@ check-am: all-am +@@ -711,9 +591,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) @@ -68952,7 +79772,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -729,7 +614,7 @@ mostlyclean-generic: +@@ -733,7 +614,7 @@ clean-generic: distclean-generic: @@ -68961,7 +79781,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -743,12 +628,14 @@ distclean: distclean-am +@@ -747,12 +628,14 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -68977,7 +79797,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in info: info-am info-am: -@@ -756,12 +643,20 @@ info-am: +@@ -760,12 +643,20 @@ install-data-am: install-libgdk_pixbuf_xlibincludeHEADERS \ install-pkgconfigDATA @@ -68998,7 +79818,7 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -782,23 +677,27 @@ ps: ps-am +@@ -786,23 +677,27 @@ ps-am: @@ -69038,10 +79858,9 @@ Index: gtk+-2.14.4/contrib/gdk-pixbuf-xlib/Makefile.in uninstall-libgdk_pixbuf_xlibincludeHEADERS \ uninstall-pkgconfigDATA -Index: gtk+-2.14.4/contrib/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/contrib/Makefile.in 2008-10-17 06:07:13.000000000 +0200 -+++ gtk+-2.14.4/contrib/Makefile.in 2008-11-11 18:55:59.676634461 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile.in gtk+2.0-2.14.5/contrib/Makefile.in +--- gtk+2.0-2.14.5.old/contrib/Makefile.in 2008-11-24 07:41:38.000000000 +0100 ++++ gtk+2.0-2.14.5/contrib/Makefile.in 2008-11-25 11:09:45.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -69072,7 +79891,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +31,36 @@ POST_INSTALL = : +@@ -37,11 +31,36 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -69111,7 +79930,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -52,22 +71,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -69135,7 +79954,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -82,21 +96,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -69143,8 +79962,9 @@ Index: gtk+-2.14.4/contrib/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -91,10 +103,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -69153,9 +79973,13 @@ Index: gtk+-2.14.4/contrib/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -121,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -120,6 +129,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -69163,7 +79987,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +148,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -69172,7 +79996,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,98 +158,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -69265,7 +80089,20 @@ Index: gtk+-2.14.4/contrib/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -257,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -252,32 +182,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -69288,10 +80125,12 @@ Index: gtk+-2.14.4/contrib/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -288,8 +206,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -69300,7 +80139,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +217,10 @@ SED = @SED@ +@@ -301,28 +217,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -69329,7 +80168,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -331,22 +229,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -69339,11 +80178,12 @@ Index: gtk+-2.14.4/contrib/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -69359,15 +80199,17 @@ Index: gtk+-2.14.4/contrib/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -366,6 +270,7 @@ libexecdir = @libexecdir@ +@@ -368,8 +269,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -374,9 +279,11 @@ program_transform_name = @program_transf +@@ -378,9 +279,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -69380,7 +80222,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -407,31 +314,39 @@ XVFB_START = \ +@@ -411,31 +314,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -69439,7 +80281,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -439,10 +354,6 @@ mostlyclean-libtool: +@@ -443,10 +354,6 @@ clean-libtool: -rm -rf .libs _libs @@ -69450,7 +80292,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -450,7 +361,13 @@ uninstall-info-am: +@@ -454,7 +361,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -69465,7 +80307,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -462,15 +379,20 @@ $(RECURSIVE_TARGETS): +@@ -466,15 +379,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -69490,7 +80332,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -491,7 +413,7 @@ maintainer-clean-recursive: +@@ -495,7 +413,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -69499,7 +80341,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -502,35 +424,30 @@ ctags-recursive: +@@ -506,35 +424,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -69542,7 +80384,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -538,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -542,23 +455,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -69575,7 +80417,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -566,29 +483,23 @@ GTAGS: +@@ -570,29 +483,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -69618,7 +80460,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -601,13 +512,17 @@ distdir: $(DISTFILES) +@@ -605,13 +512,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -69640,7 +80482,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -618,7 +533,6 @@ check: check-recursive +@@ -622,7 +533,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -69648,7 +80490,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -638,7 +552,7 @@ mostlyclean-generic: +@@ -642,7 +552,7 @@ clean-generic: distclean-generic: @@ -69657,7 +80499,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -649,25 +563,34 @@ clean-am: clean-generic clean-libtool mo +@@ -653,25 +563,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -69694,7 +80536,7 @@ Index: gtk+-2.14.4/contrib/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -686,26 +609,24 @@ ps: ps-recursive +@@ -690,26 +609,24 @@ ps-am: @@ -69737,10 +80579,9 @@ Index: gtk+-2.14.4/contrib/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/demos/gtk-demo/Makefile.in 2008-10-17 06:07:13.000000000 +0200 -+++ gtk+-2.14.4/demos/gtk-demo/Makefile.in 2008-11-11 18:56:00.205135150 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.5/demos/gtk-demo/Makefile.in +--- gtk+2.0-2.14.5.old/demos/gtk-demo/Makefile.in 2008-11-24 07:41:38.000000000 +0100 ++++ gtk+2.0-2.14.5/demos/gtk-demo/Makefile.in 2008-11-25 11:09:45.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -69771,7 +80612,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,65 @@ POST_INSTALL = : +@@ -37,10 +33,65 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -69839,7 +80680,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +102,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +102,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -69863,7 +80704,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +127,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +127,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -69871,8 +80712,9 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +134,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -69881,9 +80723,13 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +160,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +160,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -69891,7 +80737,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +179,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +179,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -69900,7 +80746,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +189,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +189,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -69993,7 +80839,20 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +218,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +213,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -70016,10 +80875,12 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +237,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +237,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -70028,7 +80889,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +248,10 @@ SED = @SED@ +@@ -300,28 +248,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -70057,7 +80918,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +260,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +260,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -70067,11 +80928,12 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -70087,15 +80949,17 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +301,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +300,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,17 +310,16 @@ program_transform_name = @program_transf +@@ -377,17 +310,16 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -70117,7 +80981,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in TEST_PROGS = ### testing rules -@@ -409,9 +345,7 @@ XVFB_START = \ +@@ -413,9 +345,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -70127,7 +80991,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in demos = \ appwindow.c \ assistant.c \ -@@ -444,7 +378,6 @@ demos = \ +@@ -448,7 +378,6 @@ tree_store.c \ ui_manager.c @@ -70135,7 +80999,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in INCLUDES = \ -DDEMOCODEDIR="\"$(democodedir)\"" \ -I$(top_srcdir) \ -@@ -454,34 +387,26 @@ INCLUDES = \ +@@ -458,34 +387,26 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -70170,7 +81034,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in IMAGEFILES = alphatest.png \ apple-red.png \ background.jpg \ -@@ -497,93 +422,55 @@ IMAGEFILES = alphatest.png \ +@@ -501,93 +422,55 @@ gnu-keys.png \ gtk-logo-rgb.gif @@ -70295,7 +81159,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in else :; fi; \ done -@@ -591,8 +478,8 @@ uninstall-binPROGRAMS: +@@ -595,8 +478,8 @@ @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -70306,7 +81170,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in done clean-binPROGRAMS: -@@ -603,10 +490,10 @@ clean-binPROGRAMS: +@@ -607,10 +490,10 @@ done gtk-demo$(EXEEXT): $(gtk_demo_OBJECTS) $(gtk_demo_DEPENDENCIES) @rm -f gtk-demo$(EXEEXT) @@ -70319,7 +81183,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -644,82 +531,58 @@ distclean-compile: +@@ -648,82 +531,58 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_manager.Po@am__quote@ .c.o: @@ -70424,7 +81288,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -729,23 +592,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -733,23 +592,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -70457,7 +81321,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -757,29 +620,23 @@ GTAGS: +@@ -761,29 +620,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -70500,7 +81364,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -795,9 +652,10 @@ check-am: all-am +@@ -799,9 +652,10 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) $(DATA) @@ -70513,7 +81377,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am -@@ -818,7 +676,7 @@ mostlyclean-generic: +@@ -822,7 +676,7 @@ clean-generic: distclean-generic: @@ -70522,7 +81386,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -833,24 +691,34 @@ distclean: distclean-am +@@ -837,24 +691,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -70558,7 +81422,7 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -871,21 +739,24 @@ ps: ps-am +@@ -875,21 +739,24 @@ ps-am: @@ -70594,10 +81458,9 @@ Index: gtk+-2.14.4/demos/gtk-demo/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/demos/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/demos/Makefile.in 2008-10-17 06:07:13.000000000 +0200 -+++ gtk+-2.14.4/demos/Makefile.in 2008-11-11 18:56:00.044634863 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.in gtk+2.0-2.14.5/demos/Makefile.in +--- gtk+2.0-2.14.5.old/demos/Makefile.in 2008-11-24 07:41:38.000000000 +0100 ++++ gtk+2.0-2.14.5/demos/Makefile.in 2008-11-25 11:09:45.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -70627,7 +81490,7 @@ Index: gtk+-2.14.4/demos/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +32,74 @@ POST_INSTALL = : +@@ -37,11 +32,74 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -70704,7 +81567,7 @@ Index: gtk+-2.14.4/demos/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,22 +110,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -52,22 +110,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -70728,7 +81591,7 @@ Index: gtk+-2.14.4/demos/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,8 +135,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -82,21 +135,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -70736,8 +81599,9 @@ Index: gtk+-2.14.4/demos/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -91,10 +142,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -70746,9 +81610,13 @@ Index: gtk+-2.14.4/demos/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -121,6 +168,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -120,6 +168,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -70756,7 +81624,7 @@ Index: gtk+-2.14.4/demos/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +187,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +187,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -70765,7 +81633,7 @@ Index: gtk+-2.14.4/demos/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,91 +197,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,98 +197,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -70858,7 +81726,20 @@ Index: gtk+-2.14.4/demos/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -257,24 +226,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -252,32 +221,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -70881,10 +81762,12 @@ Index: gtk+-2.14.4/demos/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +245,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -288,8 +245,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -70893,7 +81776,7 @@ Index: gtk+-2.14.4/demos/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +256,10 @@ SED = @SED@ +@@ -301,28 +256,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -70922,7 +81805,7 @@ Index: gtk+-2.14.4/demos/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +268,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -331,22 +268,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -70932,11 +81815,12 @@ Index: gtk+-2.14.4/demos/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -70952,15 +81836,17 @@ Index: gtk+-2.14.4/demos/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -366,6 +309,7 @@ libexecdir = @libexecdir@ +@@ -368,8 +308,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -374,24 +318,18 @@ program_transform_name = @program_transf +@@ -378,24 +318,18 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -70991,7 +81877,7 @@ Index: gtk+-2.14.4/demos/Makefile.in TEST_PROGS = ### testing rules -@@ -417,9 +355,7 @@ XVFB_START = \ +@@ -421,9 +355,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -71001,7 +81887,7 @@ Index: gtk+-2.14.4/demos/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -428,131 +364,74 @@ INCLUDES = \ +@@ -432,131 +364,74 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -71162,7 +82048,7 @@ Index: gtk+-2.14.4/demos/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -562,25 +441,25 @@ clean-noinstPROGRAMS: +@@ -566,25 +441,25 @@ done pixbuf-demo$(EXEEXT): $(pixbuf_demo_OBJECTS) $(pixbuf_demo_DEPENDENCIES) @rm -f pixbuf-demo$(EXEEXT) @@ -71195,7 +82081,7 @@ Index: gtk+-2.14.4/demos/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -594,37 +473,25 @@ distclean-compile: +@@ -598,37 +473,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpixbuf.Po@am__quote@ .c.o: @@ -71245,7 +82131,7 @@ Index: gtk+-2.14.4/demos/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -632,10 +499,6 @@ mostlyclean-libtool: +@@ -636,10 +499,6 @@ clean-libtool: -rm -rf .libs _libs @@ -71256,7 +82142,7 @@ Index: gtk+-2.14.4/demos/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -643,7 +506,13 @@ uninstall-info-am: +@@ -647,7 +506,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -71271,7 +82157,7 @@ Index: gtk+-2.14.4/demos/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -655,15 +524,20 @@ $(RECURSIVE_TARGETS): +@@ -659,15 +524,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -71296,7 +82182,7 @@ Index: gtk+-2.14.4/demos/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -684,7 +558,7 @@ maintainer-clean-recursive: +@@ -688,7 +558,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -71305,7 +82191,7 @@ Index: gtk+-2.14.4/demos/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -695,35 +569,30 @@ ctags-recursive: +@@ -699,35 +569,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -71348,7 +82234,7 @@ Index: gtk+-2.14.4/demos/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -731,23 +600,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -735,23 +600,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -71381,7 +82267,7 @@ Index: gtk+-2.14.4/demos/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -759,29 +628,23 @@ GTAGS: +@@ -763,29 +628,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -71424,7 +82310,7 @@ Index: gtk+-2.14.4/demos/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -792,15 +655,19 @@ distdir: $(DISTFILES) +@@ -796,15 +655,19 @@ || exit 1; \ fi; \ done @@ -71449,7 +82335,7 @@ Index: gtk+-2.14.4/demos/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -812,7 +679,6 @@ check: $(BUILT_SOURCES) +@@ -816,7 +679,6 @@ all-am: Makefile $(PROGRAMS) installdirs: installdirs-recursive installdirs-am: @@ -71457,7 +82343,7 @@ Index: gtk+-2.14.4/demos/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -833,7 +699,7 @@ mostlyclean-generic: +@@ -837,7 +699,7 @@ clean-generic: distclean-generic: @@ -71466,7 +82352,7 @@ Index: gtk+-2.14.4/demos/Makefile.in -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -849,24 +715,34 @@ distclean: distclean-recursive +@@ -853,24 +715,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -71502,7 +82388,7 @@ Index: gtk+-2.14.4/demos/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -887,27 +763,25 @@ ps: ps-recursive +@@ -891,27 +763,25 @@ ps-am: @@ -71547,10 +82433,291 @@ Index: gtk+-2.14.4/demos/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/docs/faq/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/docs/faq/Makefile.in 2008-10-17 06:07:14.000000000 +0200 -+++ gtk+-2.14.4/docs/faq/Makefile.in 2008-11-11 18:56:00.452635181 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/depcomp gtk+2.0-2.14.5/depcomp +--- gtk+2.0-2.14.5.old/depcomp 2007-09-18 16:10:46.000000000 +0200 ++++ gtk+2.0-2.14.5/depcomp 2008-11-25 11:09:53.000000000 +0100 +@@ -1,7 +1,10 @@ + #! /bin/sh +- + # depcomp - compile a program generating dependencies as side-effects +-# Copyright 1999, 2000, 2003 Free Software Foundation, Inc. ++ ++scriptversion=2007-03-29.01 ++ ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software ++# Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -15,8 +18,8 @@ + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -25,22 +28,45 @@ + + # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. + ++case $1 in ++ '') ++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2 ++ exit 1; ++ ;; ++ -h | --h*) ++ cat <<\EOF ++Usage: depcomp [--help] [--version] PROGRAM [ARGS] ++ ++Run PROGRAMS ARGS to compile a file, generating dependencies ++as side-effects. ++ ++Environment variables: ++ depmode Dependency tracking mode. ++ source Source file read by `PROGRAMS ARGS'. ++ object Object file output by `PROGRAMS ARGS'. ++ DEPDIR directory where to store dependencies. ++ depfile Dependency file to output. ++ tmpdepfile Temporary file to use when outputing dependencies. ++ libtool Whether libtool is used (yes/no). ++ ++Report bugs to <bug-automake@gnu.org>. ++EOF ++ exit $? ++ ;; ++ -v | --v*) ++ echo "depcomp $scriptversion" ++ exit $? ++ ;; ++esac ++ + if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 + fi +-# `libtool' can also be set to `yes' or `no'. +- +-if test -z "$depfile"; then +- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` +- dir=`echo "$object" | sed 's,/.*$,/,'` +- if test "$dir" = "$object"; then +- dir= +- fi +- # FIXME: should be _deps on DOS. +- depfile="$dir.deps/$base" +-fi + ++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. ++depfile=${depfile-`echo "$object" | ++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} + tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + + rm -f "$tmpdepfile" +@@ -66,7 +92,20 @@ + ## gcc 3 implements dependency tracking that does exactly what + ## we want. Yay! Note: for some reason libtool 1.4 doesn't like + ## it if -MD -MP comes after the -MF stuff. Hmm. +- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" ++## Unfortunately, FreeBSD c89 acceptance of flags depends upon ++## the command line argument order; so add the flags where they ++## appear in depend2.am. Note that the slowdown incurred here ++## affects only configure: in makefiles, %FASTDEP% shortcuts this. ++ for arg ++ do ++ case $arg in ++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; ++ *) set fnord "$@" "$arg" ;; ++ esac ++ shift # fnord ++ shift # $arg ++ done ++ "$@" + stat=$? + if test $stat -eq 0; then : + else +@@ -176,34 +215,39 @@ + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. +- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` +- tmpdepfile="$stripped.u" ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$base.u ++ tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else ++ tmpdepfile1=$dir$base.u ++ tmpdepfile2=$dir$base.u ++ tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + +- if test -f "$tmpdepfile"; then : +- else +- stripped=`echo "$stripped" | sed 's,^.*/,,'` +- tmpdepfile="$stripped.u" +- fi +- + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then +- outname="$stripped.o" + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. +- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" +- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" ++ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" ++ # That's a tab and a space in the []. ++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile +@@ -251,6 +295,46 @@ + rm -f "$tmpdepfile" + ;; + ++hp2) ++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64 ++ # compilers, which have integrated preprocessors. The correct option ++ # to use with these is +Maked; it writes dependencies to a file named ++ # 'foo.d', which lands next to the object file, wherever that ++ # happens to be. ++ # Much of this is similar to the tru64 case; see comments there. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` ++ if test "$libtool" = yes; then ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir.libs/$base.d ++ "$@" -Wc,+Maked ++ else ++ tmpdepfile1=$dir$base.d ++ tmpdepfile2=$dir$base.d ++ "$@" +Maked ++ fi ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile1" "$tmpdepfile2" ++ exit $stat ++ fi ++ ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" ++ do ++ test -f "$tmpdepfile" && break ++ done ++ if test -f "$tmpdepfile"; then ++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" ++ # Add `dependent.h:' lines. ++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" ++ else ++ echo "#dummy" > "$depfile" ++ fi ++ rm -f "$tmpdepfile" "$tmpdepfile2" ++ ;; ++ + tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. +@@ -262,27 +346,43 @@ + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then +- tmpdepfile1="$dir.libs/$base.lo.d" +- tmpdepfile2="$dir.libs/$base.d" ++ # With Tru64 cc, shared objects can also be used to make a ++ # static library. This mechanism is used in libtool 1.4 series to ++ # handle both shared and static libraries in a single compilation. ++ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. ++ # ++ # With libtool 1.5 this exception was removed, and libtool now ++ # generates 2 separate objects for the 2 libraries. These two ++ # compilations output dependencies in $dir.libs/$base.o.d and ++ # in $dir$base.o.d. We have to check for both files, because ++ # one of the two compilations can be disabled. We should prefer ++ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is ++ # automatically cleaned when .libs/ is deleted, while ignoring ++ # the former would cause a distcleancheck panic. ++ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 ++ tmpdepfile2=$dir$base.o.d # libtool 1.5 ++ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 ++ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else +- tmpdepfile1="$dir$base.o.d" +- tmpdepfile2="$dir$base.d" ++ tmpdepfile1=$dir$base.o.d ++ tmpdepfile2=$dir$base.d ++ tmpdepfile3=$dir$base.d ++ tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else +- rm -f "$tmpdepfile1" "$tmpdepfile2" ++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + +- if test -f "$tmpdepfile1"; then +- tmpdepfile="$tmpdepfile1" +- else +- tmpdepfile="$tmpdepfile2" +- fi ++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" ++ do ++ test -f "$tmpdepfile" && break ++ done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. +@@ -426,7 +526,8 @@ + done + + "$@" -E | +- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | ++ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ ++ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" +@@ -477,3 +578,12 @@ + esac + + exit 0 ++ ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefile.in gtk+2.0-2.14.5/docs/faq/Makefile.in +--- gtk+2.0-2.14.5.old/docs/faq/Makefile.in 2008-11-24 07:41:39.000000000 +0100 ++++ gtk+2.0-2.14.5/docs/faq/Makefile.in 2008-11-25 11:09:46.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -71581,7 +82748,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,23 @@ POST_INSTALL = : +@@ -37,10 +31,23 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -71607,7 +82774,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +58,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +58,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -71631,7 +82798,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +83,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +83,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -71639,8 +82806,9 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +90,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -71649,9 +82817,13 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +116,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -71659,7 +82831,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +135,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +135,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -71668,7 +82840,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +145,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +145,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -71761,7 +82933,20 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +174,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +169,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -71784,10 +82969,12 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +193,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +193,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -71796,7 +82983,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +204,10 @@ SED = @SED@ +@@ -300,28 +204,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -71825,7 +83012,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +216,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +216,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -71835,11 +83022,12 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -71855,15 +83043,17 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +257,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +256,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,16 +266,16 @@ program_transform_name = @program_transf +@@ -377,16 +266,16 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -71884,7 +83074,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in TEST_PROGS = ### testing rules -@@ -408,61 +301,67 @@ XVFB_START = \ +@@ -412,61 +301,67 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -71986,7 +83176,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -480,7 +379,6 @@ check-am: all-am +@@ -484,7 +379,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile @@ -71994,7 +83184,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -501,7 +399,7 @@ mostlyclean-generic: +@@ -505,7 +399,7 @@ clean-generic: distclean-generic: @@ -72003,7 +83193,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -512,7 +410,7 @@ clean-am: clean-generic clean-libtool mo +@@ -516,7 +410,7 @@ distclean: distclean-am -rm -f Makefile @@ -72012,7 +83202,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in dvi: dvi-am -@@ -524,12 +422,20 @@ info-am: +@@ -528,12 +422,20 @@ install-data-am: @@ -72033,7 +83223,7 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -540,25 +446,27 @@ mostlyclean: mostlyclean-am +@@ -544,25 +446,27 @@ mostlyclean-am: mostlyclean-generic mostlyclean-libtool @@ -72072,10 +83262,9 @@ Index: gtk+-2.14.4/docs/faq/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/docs/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/docs/Makefile.in 2008-10-17 06:07:13.000000000 +0200 -+++ gtk+-2.14.4/docs/Makefile.in 2008-11-11 18:56:00.332634944 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in gtk+2.0-2.14.5/docs/Makefile.in +--- gtk+2.0-2.14.5.old/docs/Makefile.in 2008-11-24 07:41:39.000000000 +0100 ++++ gtk+2.0-2.14.5/docs/Makefile.in 2008-11-25 11:09:46.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -72106,7 +83295,7 @@ Index: gtk+-2.14.4/docs/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ POST_INSTALL = : +@@ -37,10 +31,35 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -72144,7 +83333,7 @@ Index: gtk+-2.14.4/docs/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +70,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -72168,7 +83357,7 @@ Index: gtk+-2.14.4/docs/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +95,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -72176,8 +83365,9 @@ Index: gtk+-2.14.4/docs/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -72186,9 +83376,13 @@ Index: gtk+-2.14.4/docs/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -72196,7 +83390,7 @@ Index: gtk+-2.14.4/docs/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +147,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -72205,7 +83399,7 @@ Index: gtk+-2.14.4/docs/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +157,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -72298,7 +83492,20 @@ Index: gtk+-2.14.4/docs/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +181,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -72321,10 +83528,12 @@ Index: gtk+-2.14.4/docs/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +205,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -72333,7 +83542,7 @@ Index: gtk+-2.14.4/docs/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +216,10 @@ SED = @SED@ +@@ -300,28 +216,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -72362,7 +83571,7 @@ Index: gtk+-2.14.4/docs/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +228,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -72372,11 +83581,12 @@ Index: gtk+-2.14.4/docs/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -72392,15 +83602,17 @@ Index: gtk+-2.14.4/docs/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +268,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,30 +278,20 @@ program_transform_name = @program_transf +@@ -377,30 +278,20 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -72439,7 +83651,7 @@ Index: gtk+-2.14.4/docs/Makefile.in TEST_PROGS = ### testing rules -@@ -422,31 +317,39 @@ XVFB_START = \ +@@ -426,31 +317,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -72498,7 +83710,7 @@ Index: gtk+-2.14.4/docs/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -454,10 +357,6 @@ mostlyclean-libtool: +@@ -458,10 +357,6 @@ clean-libtool: -rm -rf .libs _libs @@ -72509,7 +83721,7 @@ Index: gtk+-2.14.4/docs/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -465,7 +364,13 @@ uninstall-info-am: +@@ -469,7 +364,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -72524,7 +83736,7 @@ Index: gtk+-2.14.4/docs/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -477,15 +382,20 @@ $(RECURSIVE_TARGETS): +@@ -481,15 +382,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -72549,7 +83761,7 @@ Index: gtk+-2.14.4/docs/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -506,7 +416,7 @@ maintainer-clean-recursive: +@@ -510,7 +416,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -72558,7 +83770,7 @@ Index: gtk+-2.14.4/docs/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -517,35 +427,30 @@ ctags-recursive: +@@ -521,35 +427,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -72601,7 +83813,7 @@ Index: gtk+-2.14.4/docs/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -553,23 +458,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -557,23 +458,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -72634,7 +83846,7 @@ Index: gtk+-2.14.4/docs/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -581,29 +486,23 @@ GTAGS: +@@ -585,29 +486,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -72677,7 +83889,7 @@ Index: gtk+-2.14.4/docs/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -614,15 +513,19 @@ distdir: $(DISTFILES) +@@ -618,15 +513,19 @@ || exit 1; \ fi; \ done @@ -72702,7 +83914,7 @@ Index: gtk+-2.14.4/docs/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -633,7 +536,6 @@ check: check-recursive +@@ -637,7 +536,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -72710,7 +83922,7 @@ Index: gtk+-2.14.4/docs/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -653,7 +555,7 @@ mostlyclean-generic: +@@ -657,7 +555,7 @@ clean-generic: distclean-generic: @@ -72719,7 +83931,7 @@ Index: gtk+-2.14.4/docs/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -664,25 +566,34 @@ clean-am: clean-generic clean-libtool mo +@@ -668,25 +566,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -72756,7 +83968,7 @@ Index: gtk+-2.14.4/docs/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -701,26 +612,24 @@ ps: ps-recursive +@@ -705,26 +612,24 @@ ps-am: @@ -72799,10 +84011,9 @@ Index: gtk+-2.14.4/docs/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/docs/reference/gdk/Makefile.in 2008-10-17 06:07:14.000000000 +0200 -+++ gtk+-2.14.4/docs/reference/gdk/Makefile.in 2008-11-11 18:56:00.856634922 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.5/docs/reference/gdk/Makefile.in +--- gtk+2.0-2.14.5.old/docs/reference/gdk/Makefile.in 2008-11-24 07:41:39.000000000 +0100 ++++ gtk+2.0-2.14.5/docs/reference/gdk/Makefile.in 2008-11-25 11:09:46.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -72833,7 +84044,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,24 @@ POST_INSTALL = : +@@ -43,10 +37,24 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -72860,7 +84071,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -57,22 +65,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -57,22 +65,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -72884,7 +84095,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,8 +90,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -87,21 +90,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -72892,8 +84103,9 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -96,10 +97,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -72902,9 +84114,13 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -126,6 +123,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -125,6 +123,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -72912,7 +84128,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -144,8 +142,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -143,8 +142,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -72921,7 +84137,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -156,91 +152,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -155,98 +152,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -73014,7 +84230,20 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -262,24 +181,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -257,32 +176,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -73037,10 +84266,12 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -290,8 +200,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -293,8 +200,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -73049,7 +84280,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -303,28 +211,10 @@ SED = @SED@ +@@ -306,28 +211,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -73078,7 +84309,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -333,22 +223,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -336,22 +223,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -73088,11 +84319,12 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -73108,15 +84340,17 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -371,6 +264,7 @@ libexecdir = @libexecdir@ +@@ -373,8 +263,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -379,22 +273,18 @@ program_transform_name = @program_transf +@@ -383,22 +273,18 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -73145,7 +84379,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in TEST_PROGS = ### testing rules -@@ -420,7 +310,6 @@ XVFB_START = \ +@@ -424,7 +310,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -73153,7 +84387,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in AUTOMAKE_OPTIONS = 1.6 # The name of the module. -@@ -470,7 +359,6 @@ INCLUDES = \ +@@ -474,7 +359,6 @@ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -73161,7 +84395,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib) # Extra options to supply to gtkdoc-mkdb -@@ -572,7 +460,6 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix +@@ -576,12 +460,9 @@ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -73169,7 +84403,12 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -583,13 +470,10 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make + # which are more like other make's VPATH, when it comes to +@@ -589,13 +470,10 @@ # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -73183,7 +84422,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -597,31 +481,45 @@ SCANOBJ_FILES = \ +@@ -603,31 +481,45 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -73243,7 +84482,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -629,39 +527,29 @@ mostlyclean-libtool: +@@ -635,39 +527,29 @@ clean-libtool: -rm -rf .libs _libs @@ -73296,7 +84535,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -679,7 +567,6 @@ check-am: all-am +@@ -685,7 +567,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile all-local @@ -73304,7 +84543,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -701,7 +588,7 @@ clean-generic: +@@ -707,7 +588,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -73313,7 +84552,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -712,25 +599,34 @@ clean-am: clean-generic clean-libtool cl +@@ -718,25 +599,34 @@ distclean: distclean-am -rm -f Makefile @@ -73350,7 +84589,7 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -750,18 +646,23 @@ ps: ps-am +@@ -756,18 +646,23 @@ ps-am: @@ -73384,10 +84623,97 @@ Index: gtk+-2.14.4/docs/reference/gdk/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/docs/reference/gdk-pixbuf/Makefile.in 2008-10-17 06:07:14.000000000 +0200 -+++ gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in 2008-11-11 18:56:00.716634237 +0100 +@@ -828,8 +723,6 @@ + + docs: html-build.stamp + +-$(REPORT_FILES): sgml-build.stamp +- + #### scan #### + + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +@@ -838,7 +731,7 @@ + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ +@@ -883,12 +776,7 @@ + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html +- mkhtml_options=""; \ +- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +- if test "$(?)" = "0"; then \ +- mkhtml_options=--path="$(srcdir)"; \ +- fi +- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +@@ -909,37 +797,23 @@ + cd $(srcdir) && rm -rf xml html + + install-data-local: +- installfiles=`echo $(srcdir)/html/*`; \ ++ -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +- else \ +- installdir="$(DESTDIR)$(TARGET_DIR)"; \ +- fi; \ +- $(mkinstalldirs) $${installdir} ; \ ++ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ +- $(INSTALL_DATA) $$i $${installdir}; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ +- fi; \ +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ ++ echo '-- Installing $(srcdir)/html/index.sgml' ; \ ++ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ ++ which gtkdoc-rebase >/dev/null && \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + uninstall-local: +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +- else \ +- installdir="$(DESTDIR)$(TARGET_DIR)"; \ +- fi; \ +- rm -rf $${installdir} ++ rm -f $(DESTDIR)$(TARGET_DIR)/* + + # + # Require gtk-doc when making dist +@@ -959,8 +833,7 @@ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14.5/docs/reference/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.14.5.old/docs/reference/gdk-pixbuf/Makefile.in 2008-11-24 07:41:39.000000000 +0100 ++++ gtk+2.0-2.14.5/docs/reference/gdk-pixbuf/Makefile.in 2008-11-25 11:09:46.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -73418,7 +84744,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,28 @@ POST_INSTALL = : +@@ -43,10 +37,28 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -73449,7 +84775,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -57,22 +69,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -57,22 +69,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -73473,7 +84799,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,8 +94,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -87,21 +94,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -73481,8 +84807,9 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -96,10 +101,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -73491,9 +84818,13 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -126,6 +127,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -125,6 +127,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -73501,7 +84832,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -144,8 +146,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -143,8 +146,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -73510,7 +84841,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -156,91 +156,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -155,98 +156,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -73603,7 +84934,20 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -262,24 +185,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -257,32 +180,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -73626,10 +84970,12 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -290,8 +204,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -293,8 +204,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -73638,7 +84984,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -303,28 +215,10 @@ SED = @SED@ +@@ -306,28 +215,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -73667,7 +85013,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -333,22 +227,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -336,22 +227,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -73677,11 +85023,12 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -73697,15 +85044,17 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -371,6 +268,7 @@ libexecdir = @libexecdir@ +@@ -373,8 +267,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -379,28 +277,19 @@ program_transform_name = @program_transf +@@ -383,28 +277,19 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -73741,7 +85090,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in TEST_PROGS = ### testing rules -@@ -426,7 +315,6 @@ XVFB_START = \ +@@ -430,7 +315,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -73749,7 +85098,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in AUTOMAKE_OPTIONS = 1.6 # The name of the module. -@@ -458,7 +346,6 @@ IGNORE_HFILES = \ +@@ -462,7 +346,6 @@ xpm-color-table.h \ test-images.h @@ -73757,7 +85106,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -@@ -466,7 +353,6 @@ INCLUDES = \ +@@ -470,7 +353,6 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -73765,7 +85114,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in GTKDOC_LIBS = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -496,7 +382,6 @@ FIXXREF_OPTIONS = --extra-dir=$(GLIB_PRE +@@ -500,12 +382,9 @@ --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -73773,7 +85122,12 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -507,13 +392,10 @@ FIXXREF_OPTIONS = --extra-dir=$(GLIB_PRE +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make + # which are more like other make's VPATH, when it comes to +@@ -513,13 +392,10 @@ # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -73787,7 +85141,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -521,40 +403,49 @@ SCANOBJ_FILES = \ +@@ -527,40 +403,49 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -73856,7 +85210,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -562,15 +453,9 @@ mostlyclean-libtool: +@@ -568,15 +453,9 @@ clean-libtool: -rm -rf .libs _libs @@ -73873,7 +85227,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ -@@ -589,8 +474,8 @@ install-man1: $(man1_MANS) $(man_MANS) +@@ -595,8 +474,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -73884,7 +85238,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in done uninstall-man1: @$(NORMAL_UNINSTALL) -@@ -610,8 +495,8 @@ uninstall-man1: +@@ -616,8 +495,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -73895,7 +85249,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in done tags: TAGS TAGS: -@@ -619,29 +504,23 @@ TAGS: +@@ -625,29 +504,23 @@ ctags: CTAGS CTAGS: @@ -73938,7 +85292,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -659,9 +538,10 @@ check-am: all-am +@@ -665,9 +538,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(MANS) all-local @@ -73951,7 +85305,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -682,7 +562,7 @@ clean-generic: +@@ -688,7 +562,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -73960,7 +85314,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -693,25 +573,34 @@ clean-am: clean-generic clean-libtool cl +@@ -699,25 +573,34 @@ distclean: distclean-am -rm -f Makefile @@ -73997,7 +85351,7 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -731,21 +620,25 @@ ps: ps-am +@@ -737,21 +620,25 @@ ps-am: @@ -74032,10 +85386,97 @@ Index: gtk+-2.14.4/docs/reference/gdk-pixbuf/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/docs/reference/gtk/Makefile.in 2008-10-17 06:07:14.000000000 +0200 -+++ gtk+-2.14.4/docs/reference/gtk/Makefile.in 2008-11-11 18:56:01.024635254 +0100 +@@ -812,8 +699,6 @@ + + docs: html-build.stamp + +-$(REPORT_FILES): sgml-build.stamp +- + #### scan #### + + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +@@ -822,7 +707,7 @@ + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ +@@ -867,12 +752,7 @@ + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html +- mkhtml_options=""; \ +- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +- if test "$(?)" = "0"; then \ +- mkhtml_options=--path="$(srcdir)"; \ +- fi +- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +@@ -893,37 +773,23 @@ + cd $(srcdir) && rm -rf xml html + + install-data-local: +- installfiles=`echo $(srcdir)/html/*`; \ ++ -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +- else \ +- installdir="$(DESTDIR)$(TARGET_DIR)"; \ +- fi; \ +- $(mkinstalldirs) $${installdir} ; \ ++ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ +- $(INSTALL_DATA) $$i $${installdir}; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ +- fi; \ +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ ++ echo '-- Installing $(srcdir)/html/index.sgml' ; \ ++ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ ++ which gtkdoc-rebase >/dev/null && \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + uninstall-local: +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +- else \ +- installdir="$(DESTDIR)$(TARGET_DIR)"; \ +- fi; \ +- rm -rf $${installdir} ++ rm -f $(DESTDIR)$(TARGET_DIR)/* + + # + # Require gtk-doc when making dist +@@ -943,8 +809,7 @@ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.5/docs/reference/gtk/Makefile.in +--- gtk+2.0-2.14.5.old/docs/reference/gtk/Makefile.in 2008-11-24 07:41:39.000000000 +0100 ++++ gtk+2.0-2.14.5/docs/reference/gtk/Makefile.in 2008-11-25 11:09:46.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -74066,7 +85507,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,28 @@ POST_INSTALL = : +@@ -43,10 +37,28 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -74097,7 +85538,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -57,25 +69,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -57,25 +69,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -74125,7 +85566,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -90,8 +94,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -90,21 +94,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -74133,8 +85574,9 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -99,10 +101,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -74143,9 +85585,13 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -129,6 +127,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -128,6 +127,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -74153,7 +85599,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -147,8 +146,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -146,8 +146,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -74162,7 +85608,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -159,91 +156,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -158,98 +156,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -74255,7 +85701,20 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -265,24 +185,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -260,32 +180,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -74278,10 +85737,12 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,8 +204,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -296,8 +204,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -74290,7 +85751,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -306,28 +215,10 @@ SED = @SED@ +@@ -309,28 +215,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -74319,7 +85780,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -336,22 +227,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -339,22 +227,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -74329,11 +85790,12 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -74349,15 +85811,17 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -374,6 +268,7 @@ libexecdir = @libexecdir@ +@@ -376,8 +267,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -382,22 +277,18 @@ program_transform_name = @program_transf +@@ -386,22 +277,18 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -74386,7 +85850,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in TEST_PROGS = ### testing rules -@@ -423,7 +314,6 @@ XVFB_START = \ +@@ -427,7 +314,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -74394,7 +85858,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in AUTOMAKE_OPTIONS = 1.6 # The name of the module. -@@ -531,7 +421,6 @@ INCLUDES = \ +@@ -535,7 +421,6 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -74402,7 +85866,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in GTKDOC_LIBS = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -576,7 +465,6 @@ content_files = \ +@@ -580,7 +465,6 @@ gtk-builder-convert.xml \ visual_index.xml @@ -74410,7 +85874,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in expand_content_files = \ glossary.xml \ migrating-checklist.sgml \ -@@ -766,7 +654,6 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix +@@ -770,12 +654,9 @@ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -74418,7 +85882,12 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -777,13 +664,10 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make + # which are more like other make's VPATH, when it comes to +@@ -783,13 +664,10 @@ # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -74432,7 +85901,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -791,40 +675,49 @@ SCANOBJ_FILES = \ +@@ -797,40 +675,49 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -74501,7 +85970,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -832,15 +725,9 @@ mostlyclean-libtool: +@@ -838,15 +725,9 @@ clean-libtool: -rm -rf .libs _libs @@ -74518,7 +85987,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ -@@ -859,8 +746,8 @@ install-man1: $(man1_MANS) $(man_MANS) +@@ -865,8 +746,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -74529,7 +85998,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in done uninstall-man1: @$(NORMAL_UNINSTALL) -@@ -880,8 +767,8 @@ uninstall-man1: +@@ -886,8 +767,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -74540,7 +86009,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in done tags: TAGS TAGS: -@@ -889,29 +776,23 @@ TAGS: +@@ -895,29 +776,23 @@ ctags: CTAGS CTAGS: @@ -74583,7 +86052,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -929,9 +810,10 @@ check-am: all-am +@@ -935,9 +810,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(MANS) all-local @@ -74596,7 +86065,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -952,7 +834,7 @@ clean-generic: +@@ -958,7 +834,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -74605,7 +86074,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -963,25 +845,34 @@ clean-am: clean-generic clean-libtool cl +@@ -969,25 +845,34 @@ distclean: distclean-am -rm -f Makefile @@ -74642,7 +86111,7 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1001,21 +892,25 @@ ps: ps-am +@@ -1007,21 +892,25 @@ ps-am: @@ -74677,10 +86146,97 @@ Index: gtk+-2.14.4/docs/reference/gtk/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/docs/reference/libgail-util/Makefile.in 2008-10-17 06:07:14.000000000 +0200 -+++ gtk+-2.14.4/docs/reference/libgail-util/Makefile.in 2008-11-11 18:56:01.160634382 +0100 +@@ -1082,8 +971,6 @@ + + docs: html-build.stamp + +-$(REPORT_FILES): sgml-build.stamp +- + #### scan #### + + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +@@ -1092,7 +979,7 @@ + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ +@@ -1137,12 +1024,7 @@ + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html +- mkhtml_options=""; \ +- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +- if test "$(?)" = "0"; then \ +- mkhtml_options=--path="$(srcdir)"; \ +- fi +- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +@@ -1163,37 +1045,23 @@ + cd $(srcdir) && rm -rf xml html + + install-data-local: +- installfiles=`echo $(srcdir)/html/*`; \ ++ -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +- else \ +- installdir="$(DESTDIR)$(TARGET_DIR)"; \ +- fi; \ +- $(mkinstalldirs) $${installdir} ; \ ++ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ +- $(INSTALL_DATA) $$i $${installdir}; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ +- fi; \ +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ ++ echo '-- Installing $(srcdir)/html/index.sgml' ; \ ++ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ ++ which gtkdoc-rebase >/dev/null && \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + uninstall-local: +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +- else \ +- installdir="$(DESTDIR)$(TARGET_DIR)"; \ +- fi; \ +- rm -rf $${installdir} ++ rm -f $(DESTDIR)$(TARGET_DIR)/* + + # + # Require gtk-doc when making dist +@@ -1213,8 +1081,7 @@ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.14.5/docs/reference/libgail-util/Makefile.in +--- gtk+2.0-2.14.5.old/docs/reference/libgail-util/Makefile.in 2008-11-24 07:41:39.000000000 +0100 ++++ gtk+2.0-2.14.5/docs/reference/libgail-util/Makefile.in 2008-11-25 11:09:46.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -74711,7 +86267,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,23 @@ POST_INSTALL = : +@@ -43,10 +37,23 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -74737,7 +86293,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -57,22 +64,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -57,22 +64,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -74761,7 +86317,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,8 +89,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -87,21 +89,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -74769,8 +86325,9 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -96,10 +96,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -74779,9 +86336,13 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -126,6 +122,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -125,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -74789,7 +86350,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -144,8 +141,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -143,8 +141,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -74798,7 +86359,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -156,91 +151,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -155,98 +151,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -74891,7 +86452,20 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -262,24 +180,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -257,32 +175,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -74914,10 +86488,12 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -290,8 +199,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -293,8 +199,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -74926,7 +86502,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -303,28 +210,10 @@ SED = @SED@ +@@ -306,28 +210,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -74955,7 +86531,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -333,22 +222,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -336,22 +222,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -74965,11 +86541,12 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -74985,15 +86562,17 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -371,6 +263,7 @@ libexecdir = @libexecdir@ +@@ -373,8 +262,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -379,13 +272,13 @@ program_transform_name = @program_transf +@@ -383,13 +272,13 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -75010,7 +86589,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in EXTRA_DIST = \ $(content_files) \ $(HTML_IMAGES) \ -@@ -418,7 +311,6 @@ XVFB_START = \ +@@ -422,7 +311,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -75018,7 +86597,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in AUTOMAKE_OPTIONS = 1.7 # The name of the module. -@@ -441,16 +333,13 @@ INCLUDES = \ +@@ -445,21 +333,16 @@ -I$(top_builddir) \ $(DEP_CFLAGS) @@ -75035,7 +86614,12 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -461,13 +350,10 @@ HTML_IMAGES = +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute + + # We set GPATH here; this gives us semantics for GNU make + # which are more like other make's VPATH, when it comes to +@@ -467,13 +350,10 @@ # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -75049,7 +86633,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -475,69 +361,73 @@ SCANOBJ_FILES = \ +@@ -481,69 +361,73 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -75159,7 +86743,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -555,7 +445,6 @@ check-am: all-am +@@ -561,7 +445,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile all-local @@ -75167,7 +86751,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -577,7 +466,7 @@ clean-generic: +@@ -583,7 +466,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -75176,7 +86760,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -588,25 +477,34 @@ clean-am: clean-generic clean-libtool cl +@@ -594,25 +477,34 @@ distclean: distclean-am -rm -f Makefile @@ -75213,7 +86797,7 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -626,18 +524,23 @@ ps: ps-am +@@ -632,18 +524,23 @@ ps-am: @@ -75247,10 +86831,97 @@ Index: gtk+-2.14.4/docs/reference/libgail-util/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/docs/reference/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/docs/reference/Makefile.in 2008-10-17 06:07:14.000000000 +0200 -+++ gtk+-2.14.4/docs/reference/Makefile.in 2008-11-11 18:56:00.576634530 +0100 +@@ -704,8 +601,6 @@ + + docs: html-build.stamp + +-$(REPORT_FILES): sgml-build.stamp +- + #### scan #### + + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +@@ -714,7 +609,7 @@ + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ +@@ -759,12 +654,7 @@ + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html +- mkhtml_options=""; \ +- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +- if test "$(?)" = "0"; then \ +- mkhtml_options=--path="$(srcdir)"; \ +- fi +- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +@@ -785,37 +675,23 @@ + cd $(srcdir) && rm -rf xml html + + install-data-local: +- installfiles=`echo $(srcdir)/html/*`; \ ++ -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +- else \ +- installdir="$(DESTDIR)$(TARGET_DIR)"; \ +- fi; \ +- $(mkinstalldirs) $${installdir} ; \ ++ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ +- $(INSTALL_DATA) $$i $${installdir}; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ +- fi; \ +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ ++ echo '-- Installing $(srcdir)/html/index.sgml' ; \ ++ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ ++ which gtkdoc-rebase >/dev/null && \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + uninstall-local: +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +- else \ +- installdir="$(DESTDIR)$(TARGET_DIR)"; \ +- fi; \ +- rm -rf $${installdir} ++ rm -f $(DESTDIR)$(TARGET_DIR)/* + + # + # Require gtk-doc when making dist +@@ -835,8 +711,7 @@ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/Makefile.in gtk+2.0-2.14.5/docs/reference/Makefile.in +--- gtk+2.0-2.14.5.old/docs/reference/Makefile.in 2008-11-24 07:41:39.000000000 +0100 ++++ gtk+2.0-2.14.5/docs/reference/Makefile.in 2008-11-25 11:09:46.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -75281,7 +86952,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ POST_INSTALL = : +@@ -37,10 +31,35 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -75319,7 +86990,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +70,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -75343,7 +87014,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +95,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -75351,8 +87022,9 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -75361,9 +87033,13 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -75371,7 +87047,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +147,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -75380,7 +87056,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +157,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -75473,7 +87149,20 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +181,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -75496,10 +87185,12 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +205,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -75508,7 +87199,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +216,10 @@ SED = @SED@ +@@ -300,28 +216,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -75537,7 +87228,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +228,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -75547,11 +87238,12 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -75567,15 +87259,17 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +268,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +278,11 @@ program_transform_name = @program_transf +@@ -377,9 +278,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -75588,7 +87282,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,31 +313,39 @@ XVFB_START = \ +@@ -410,31 +313,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -75647,7 +87341,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -438,10 +353,6 @@ mostlyclean-libtool: +@@ -442,10 +353,6 @@ clean-libtool: -rm -rf .libs _libs @@ -75658,7 +87352,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -449,7 +360,13 @@ uninstall-info-am: +@@ -453,7 +360,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -75673,7 +87367,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): +@@ -465,15 +378,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -75698,7 +87392,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -490,7 +412,7 @@ maintainer-clean-recursive: +@@ -494,7 +412,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -75707,7 +87401,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -501,35 +423,30 @@ ctags-recursive: +@@ -505,35 +423,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -75750,7 +87444,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -541,23 +454,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -75783,7 +87477,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -565,29 +482,23 @@ GTAGS: +@@ -569,29 +482,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -75826,7 +87520,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -598,15 +509,19 @@ distdir: $(DISTFILES) +@@ -602,15 +509,19 @@ || exit 1; \ fi; \ done @@ -75851,7 +87545,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -617,7 +532,6 @@ check: check-recursive +@@ -621,7 +532,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -75859,7 +87553,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -637,7 +551,7 @@ mostlyclean-generic: +@@ -641,7 +551,7 @@ clean-generic: distclean-generic: @@ -75868,7 +87562,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo +@@ -652,25 +562,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -75905,7 +87599,7 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -685,26 +608,24 @@ ps: ps-recursive +@@ -689,26 +608,24 @@ ps-am: @@ -75948,10 +87642,9 @@ Index: gtk+-2.14.4/docs/reference/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/docs/tools/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/docs/tools/Makefile.in 2008-10-17 06:07:14.000000000 +0200 -+++ gtk+-2.14.4/docs/tools/Makefile.in 2008-11-11 18:56:01.300634089 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makefile.in gtk+2.0-2.14.5/docs/tools/Makefile.in +--- gtk+2.0-2.14.5.old/docs/tools/Makefile.in 2008-11-24 07:41:39.000000000 +0100 ++++ gtk+2.0-2.14.5/docs/tools/Makefile.in 2008-11-25 11:09:46.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -75981,7 +87674,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,46 @@ POST_INSTALL = : +@@ -37,10 +32,46 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -76030,7 +87723,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +82,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +82,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -76054,7 +87747,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +107,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +107,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -76062,8 +87755,9 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +114,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -76072,9 +87766,13 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +140,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +140,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -76082,7 +87780,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +159,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +159,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -76091,7 +87789,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +169,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +169,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -76184,7 +87882,20 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +198,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +193,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -76207,10 +87918,12 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +217,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +217,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -76219,7 +87932,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +228,10 @@ SED = @SED@ +@@ -300,28 +228,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -76248,7 +87961,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +240,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +240,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -76258,11 +87971,12 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -76278,15 +87992,17 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +281,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +280,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +290,11 @@ program_transform_name = @program_transf +@@ -377,9 +290,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -76299,7 +88015,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,7 +325,6 @@ XVFB_START = \ +@@ -410,7 +325,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -76307,7 +88023,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -415,24 +333,17 @@ INCLUDES = \ +@@ -419,24 +333,17 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -76332,7 +88048,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in doc_shooter_DEPENDENCIES = $(DEPS) doc_shooter_LDADD = $(LDADDS) doc_shooter_SOURCES = \ -@@ -442,46 +353,39 @@ doc_shooter_SOURCES = \ +@@ -446,46 +353,39 @@ widgets.c \ widgets.h @@ -76406,7 +88122,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -491,10 +395,10 @@ clean-noinstPROGRAMS: +@@ -495,10 +395,10 @@ done doc-shooter$(EXEEXT): $(doc_shooter_OBJECTS) $(doc_shooter_DEPENDENCIES) @rm -f doc-shooter$(EXEEXT) @@ -76419,7 +88135,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -504,37 +408,25 @@ distclean-compile: +@@ -508,37 +408,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widgets.Po@am__quote@ .c.o: @@ -76469,7 +88185,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -542,26 +434,15 @@ mostlyclean-libtool: +@@ -546,26 +434,15 @@ clean-libtool: -rm -rf .libs _libs @@ -76499,7 +88215,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -571,23 +452,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -575,23 +452,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -76532,7 +88248,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -599,29 +480,23 @@ GTAGS: +@@ -603,29 +480,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -76575,7 +88291,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -636,7 +511,6 @@ check-am: all-am +@@ -640,7 +511,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -76583,7 +88299,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -657,7 +531,7 @@ mostlyclean-generic: +@@ -661,7 +531,7 @@ clean-generic: distclean-generic: @@ -76592,7 +88308,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -671,24 +545,34 @@ distclean: distclean-am +@@ -675,24 +545,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -76628,7 +88344,7 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -709,19 +593,23 @@ ps: ps-am +@@ -713,19 +593,23 @@ ps-am: @@ -76661,10 +88377,9 @@ Index: gtk+-2.14.4/docs/tools/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/docs/tutorial/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/docs/tutorial/Makefile.in 2008-10-17 06:07:14.000000000 +0200 -+++ gtk+-2.14.4/docs/tutorial/Makefile.in 2008-11-11 18:56:01.424636372 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Makefile.in gtk+2.0-2.14.5/docs/tutorial/Makefile.in +--- gtk+2.0-2.14.5.old/docs/tutorial/Makefile.in 2008-11-24 07:41:40.000000000 +0100 ++++ gtk+2.0-2.14.5/docs/tutorial/Makefile.in 2008-11-25 11:09:47.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -76695,7 +88410,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,23 @@ POST_INSTALL = : +@@ -37,10 +31,23 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -76721,7 +88436,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +58,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +58,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -76745,7 +88460,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +83,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +83,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -76753,8 +88468,9 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +90,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -76763,9 +88479,13 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +116,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -76773,7 +88493,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +135,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +135,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -76782,7 +88502,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +145,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +145,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -76875,7 +88595,20 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +174,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +169,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -76898,10 +88631,12 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +193,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +193,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -76910,7 +88645,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +204,10 @@ SED = @SED@ +@@ -300,28 +204,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -76939,7 +88674,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +216,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +216,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -76949,11 +88684,12 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -76969,15 +88705,17 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +257,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +256,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,47 +266,27 @@ program_transform_name = @program_transf +@@ -377,47 +266,27 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -77039,7 +88777,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in TEST_PROGS = ### testing rules -@@ -439,61 +312,67 @@ XVFB_START = \ +@@ -443,61 +312,67 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -77141,7 +88879,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -511,7 +390,6 @@ check-am: all-am +@@ -515,7 +390,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile @@ -77149,7 +88887,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -532,7 +410,7 @@ mostlyclean-generic: +@@ -536,7 +410,7 @@ clean-generic: distclean-generic: @@ -77158,7 +88896,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -543,7 +421,7 @@ clean-am: clean-generic clean-libtool mo +@@ -547,7 +421,7 @@ distclean: distclean-am -rm -f Makefile @@ -77167,7 +88905,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in dvi: dvi-am -@@ -555,12 +433,20 @@ info-am: +@@ -559,12 +433,20 @@ install-data-am: @@ -77188,7 +88926,7 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -571,25 +457,27 @@ mostlyclean: mostlyclean-am +@@ -575,25 +457,27 @@ mostlyclean-am: mostlyclean-generic mostlyclean-libtool @@ -77227,10 +88965,9 @@ Index: gtk+-2.14.4/docs/tutorial/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gdk/directfb/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gdk/directfb/Makefile.in 2008-10-17 06:07:15.000000000 +0200 -+++ gtk+-2.14.4/gdk/directfb/Makefile.in 2008-11-11 18:56:02.409135030 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Makefile.in gtk+2.0-2.14.5/gdk/directfb/Makefile.in +--- gtk+2.0-2.14.5.old/gdk/directfb/Makefile.in 2008-11-24 07:41:41.000000000 +0100 ++++ gtk+2.0-2.14.5/gdk/directfb/Makefile.in 2008-11-25 11:09:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -77261,7 +88998,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,60 @@ POST_INSTALL = : +@@ -37,10 +33,60 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -77324,7 +89061,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +97,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +97,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -77348,7 +89085,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +122,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +122,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -77356,8 +89093,9 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +129,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -77366,9 +89104,13 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +155,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +155,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -77376,7 +89118,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +174,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +174,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -77385,7 +89127,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +184,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +184,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -77478,7 +89220,20 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +213,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +208,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -77501,10 +89256,12 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +232,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +232,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -77513,7 +89270,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +243,10 @@ SED = @SED@ +@@ -300,28 +243,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -77542,7 +89299,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +255,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +255,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -77552,11 +89309,12 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -77572,15 +89330,17 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +296,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +295,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,14 +305,16 @@ program_transform_name = @program_transf +@@ -377,14 +305,16 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -77599,7 +89359,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in TEST_PROGS = ### testing rules -@@ -406,9 +340,7 @@ XVFB_START = \ +@@ -410,9 +340,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -77609,7 +89369,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \ -DGDK_COMPILATION \ -@@ -419,13 +351,10 @@ INCLUDES = \ +@@ -423,13 +351,10 @@ @GTK_DEBUG_FLAGS@ \ @GDK_DEP_CFLAGS@ @@ -77623,7 +89383,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in libgdk_directfb_la_SOURCES = \ gdkapplaunchcontext-directfb.c \ gdkcolor-directfb.c \ -@@ -458,98 +387,57 @@ libgdk_directfb_la_SOURCES = \ +@@ -462,98 +387,57 @@ gdkwindowid.c \ x-cursors.xbm @@ -77752,7 +89512,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -581,82 +469,58 @@ distclean-compile: +@@ -585,82 +469,58 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowid.Plo@am__quote@ .c.o: @@ -77857,7 +89617,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -666,23 +530,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -670,23 +530,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -77890,7 +89650,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -694,29 +558,23 @@ GTAGS: +@@ -698,29 +558,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -77933,7 +89693,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -731,9 +589,10 @@ check-am: all-am +@@ -735,9 +589,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -77946,7 +89706,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -753,7 +612,7 @@ mostlyclean-generic: +@@ -757,7 +612,7 @@ clean-generic: distclean-generic: @@ -77955,7 +89715,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -767,24 +626,34 @@ distclean: distclean-am +@@ -771,24 +626,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -77991,7 +89751,7 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -805,19 +674,23 @@ ps: ps-am +@@ -809,19 +674,23 @@ ps-am: @@ -78025,10 +89785,9 @@ Index: gtk+-2.14.4/gdk/directfb/Makefile.in uninstall-libgdkincludeHEADERS # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gdk/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gdk/Makefile.in 2008-10-17 06:07:15.000000000 +0200 -+++ gtk+-2.14.4/gdk/Makefile.in 2008-11-11 18:56:02.252634832 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in gtk+2.0-2.14.5/gdk/Makefile.in +--- gtk+2.0-2.14.5.old/gdk/Makefile.in 2008-11-24 07:41:41.000000000 +0100 ++++ gtk+2.0-2.14.5/gdk/Makefile.in 2008-11-25 11:09:47.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -78060,7 +89819,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +34,143 @@ POST_INSTALL = : +@@ -37,10 +34,143 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -78206,7 +89965,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +181,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +181,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -78230,7 +89989,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +206,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +206,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -78238,8 +89997,9 @@ Index: gtk+-2.14.4/gdk/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +213,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -78248,9 +90008,13 @@ Index: gtk+-2.14.4/gdk/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +239,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +239,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -78258,7 +90022,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +258,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +258,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -78267,7 +90031,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +268,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +268,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -78360,7 +90124,20 @@ Index: gtk+-2.14.4/gdk/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +297,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +292,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -78383,10 +90160,12 @@ Index: gtk+-2.14.4/gdk/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +316,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +316,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -78395,7 +90174,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +327,10 @@ SED = @SED@ +@@ -300,28 +327,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -78424,7 +90203,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +339,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +339,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -78434,11 +90213,12 @@ Index: gtk+-2.14.4/gdk/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -78454,15 +90234,17 @@ Index: gtk+-2.14.4/gdk/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +380,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +379,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,31 +389,21 @@ program_transform_name = @program_transf +@@ -377,31 +389,21 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -78503,7 +90285,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in TEST_PROGS = ### testing rules -@@ -423,10 +429,8 @@ XVFB_START = \ +@@ -427,10 +429,8 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -78514,7 +90296,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -436,9 +440,7 @@ INCLUDES = \ +@@ -440,9 +440,7 @@ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -78524,7 +90306,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined # libtool stuff: set version and export symbols for resolving -@@ -452,7 +454,6 @@ LDADD = \ +@@ -456,7 +454,6 @@ $(LIBTOOL_EXPORT_OPTIONS) @USE_MEDIALIB_FALSE@medialib_sources = @@ -78532,7 +90314,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in @USE_MEDIALIB_TRUE@medialib_sources = \ @USE_MEDIALIB_TRUE@ gdkmedialib.c -@@ -496,17 +497,14 @@ gdk_public_h_sources = \ +@@ -500,17 +497,14 @@ gdkvisual.h \ gdkwindow.h @@ -78550,7 +90332,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in gdk_c_sources = \ $(medialib_sources) \ gdk.c \ -@@ -543,7 +541,6 @@ gdk_c_sources = \ +@@ -547,7 +541,6 @@ gdkwindow.c \ gdkwindowimpl.c @@ -78558,7 +90340,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in gdk_built_sources = \ gdkaliasdef.c \ gdkenumtypes.c \ -@@ -553,7 +550,6 @@ gdk_built_sources = \ +@@ -557,7 +550,6 @@ $(gdk_built_private_headers) @@ -78566,7 +90348,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in # # setup GDK sources and their dependencies # -@@ -566,40 +562,31 @@ common_sources = \ +@@ -570,40 +562,31 @@ gdkenumtypes.c \ gdkmarshalers.h @@ -78607,7 +90389,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h EXTRA_HEADERS = -@@ -613,183 +600,79 @@ BUILT_SOURCES = \ +@@ -617,183 +600,79 @@ $(gdk_built_sources) \ gdkconfig.h @@ -78831,7 +90613,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -828,64 +711,47 @@ distclean-compile: +@@ -832,64 +711,47 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowimpl.Plo@am__quote@ .c.o: @@ -78915,7 +90697,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -895,7 +761,13 @@ uninstall-gdkincludeHEADERS: +@@ -899,7 +761,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -78930,7 +90712,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -907,15 +779,20 @@ $(RECURSIVE_TARGETS): +@@ -911,15 +779,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -78955,7 +90737,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -936,7 +813,7 @@ maintainer-clean-recursive: +@@ -940,7 +813,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -78964,7 +90746,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -947,35 +824,30 @@ ctags-recursive: +@@ -951,35 +824,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -79007,7 +90789,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -983,23 +855,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -987,23 +855,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -79040,7 +90822,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1013,9 +885,9 @@ distclean-tags: +@@ -1017,9 +885,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -79052,7 +90834,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1024,25 +896,25 @@ check-TESTS: $(TESTS) +@@ -1028,25 +896,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -79088,7 +90870,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in ;; \ esac; \ else \ -@@ -1067,46 +939,40 @@ check-TESTS: $(TESTS) +@@ -1071,46 +939,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -79152,7 +90934,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1119,13 +985,17 @@ distdir: $(DISTFILES) +@@ -1123,13 +985,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -79174,7 +90956,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -1137,8 +1007,9 @@ check: $(BUILT_SOURCES) +@@ -1141,8 +1007,9 @@ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -79186,7 +90968,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -1159,14 +1030,14 @@ mostlyclean-generic: +@@ -1163,14 +1030,14 @@ clean-generic: distclean-generic: @@ -79203,7 +90985,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ -@@ -1176,26 +1047,36 @@ distclean: distclean-recursive +@@ -1180,26 +1047,36 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -79241,7 +91023,7 @@ Index: gtk+-2.14.4/gdk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -1216,32 +1097,30 @@ ps: ps-recursive +@@ -1220,32 +1097,30 @@ ps-am: @@ -79296,10 +91078,9 @@ Index: gtk+-2.14.4/gdk/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gdk/quartz/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gdk/quartz/Makefile.in 2008-10-17 06:07:16.000000000 +0200 -+++ gtk+-2.14.4/gdk/quartz/Makefile.in 2008-11-11 18:56:02.560633893 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makefile.in gtk+2.0-2.14.5/gdk/quartz/Makefile.in +--- gtk+2.0-2.14.5.old/gdk/quartz/Makefile.in 2008-11-24 07:41:41.000000000 +0100 ++++ gtk+2.0-2.14.5/gdk/quartz/Makefile.in 2008-11-25 11:09:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -79330,7 +91111,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ POST_INSTALL = : +@@ -37,10 +33,59 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -79392,7 +91173,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +96,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -79416,7 +91197,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +121,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -79424,8 +91205,9 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -79434,9 +91216,13 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +154,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -79444,7 +91230,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +173,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -79453,7 +91239,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +183,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -79546,7 +91332,20 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +207,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -79569,10 +91368,12 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +231,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -79581,7 +91382,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +242,10 @@ SED = @SED@ +@@ -300,28 +242,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -79610,7 +91411,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +254,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -79620,11 +91421,12 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -79640,15 +91442,17 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +294,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +304,11 @@ program_transform_name = @program_transf +@@ -377,9 +304,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -79661,7 +91465,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +339,7 @@ XVFB_START = \ +@@ -410,9 +339,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -79671,7 +91475,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -419,11 +350,8 @@ INCLUDES = \ +@@ -423,11 +350,8 @@ $(GDK_DEP_CFLAGS) \ "-xobjective-c" @@ -79683,7 +91487,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in libgdk_quartz_la_SOURCES = \ GdkQuartzView.c \ GdkQuartzView.h \ -@@ -462,98 +390,56 @@ libgdk_quartz_la_SOURCES = \ +@@ -466,98 +390,56 @@ gdkwindow-quartz.h \ xcursors.h @@ -79812,7 +91616,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -587,82 +473,58 @@ distclean-compile: +@@ -591,82 +473,58 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-quartz.Plo@am__quote@ .c.o: @@ -79917,7 +91721,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -672,23 +534,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -676,23 +534,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -79950,7 +91754,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -700,29 +562,23 @@ GTAGS: +@@ -704,29 +562,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -79993,7 +91797,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -737,9 +593,10 @@ check-am: all-am +@@ -741,9 +593,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -80006,7 +91810,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -759,7 +616,7 @@ mostlyclean-generic: +@@ -763,7 +616,7 @@ clean-generic: distclean-generic: @@ -80015,7 +91819,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -773,24 +630,34 @@ distclean: distclean-am +@@ -777,24 +630,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -80051,7 +91855,7 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -811,19 +678,23 @@ ps: ps-am +@@ -815,19 +678,23 @@ ps-am: @@ -80085,10 +91889,9 @@ Index: gtk+-2.14.4/gdk/quartz/Makefile.in uninstall-libgdkincludeHEADERS # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gdk/tests/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gdk/tests/Makefile.in 2008-10-17 06:07:16.000000000 +0200 -+++ gtk+-2.14.4/gdk/tests/Makefile.in 2008-11-11 18:56:02.700634089 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefile.in gtk+2.0-2.14.5/gdk/tests/Makefile.in +--- gtk+2.0-2.14.5.old/gdk/tests/Makefile.in 2008-11-24 07:41:41.000000000 +0100 ++++ gtk+2.0-2.14.5/gdk/tests/Makefile.in 2008-11-25 11:09:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -80119,7 +91922,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,47 @@ POST_INSTALL = : +@@ -37,10 +31,47 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -80169,7 +91972,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +82,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +82,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -80193,7 +91996,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +107,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +107,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -80201,8 +92004,9 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +114,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -80211,9 +92015,13 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +140,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +140,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -80221,7 +92029,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +159,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +159,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -80230,7 +92038,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +169,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +169,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -80323,7 +92131,20 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +198,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +193,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -80346,10 +92167,12 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +217,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +217,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -80358,7 +92181,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +228,10 @@ SED = @SED@ +@@ -300,28 +228,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -80387,7 +92210,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +240,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +240,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -80397,11 +92220,12 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -80417,15 +92241,17 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +281,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +280,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +290,11 @@ program_transform_name = @program_transf +@@ -377,9 +290,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -80438,7 +92264,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,20 +325,15 @@ XVFB_START = \ +@@ -410,20 +325,15 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -80459,7 +92285,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in check_gdk_cairo_SOURCES = \ check-gdk-cairo.c \ $(NULL) -@@ -430,50 +344,43 @@ check_gdk_cairo_LDADD = \ +@@ -434,50 +344,43 @@ $(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la \ $(NULL) @@ -80537,7 +92363,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; for p in $$list; do \ -@@ -483,10 +390,10 @@ clean-checkPROGRAMS: +@@ -487,10 +390,10 @@ done check-gdk-cairo$(EXEEXT): $(check_gdk_cairo_OBJECTS) $(check_gdk_cairo_DEPENDENCIES) @rm -f check-gdk-cairo$(EXEEXT) @@ -80550,7 +92376,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -494,37 +401,25 @@ distclean-compile: +@@ -498,37 +401,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gdk-cairo.Po@am__quote@ .c.o: @@ -80600,7 +92426,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -532,26 +427,15 @@ mostlyclean-libtool: +@@ -536,26 +427,15 @@ clean-libtool: -rm -rf .libs _libs @@ -80630,7 +92456,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -561,23 +445,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -565,23 +445,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -80663,7 +92489,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -591,9 +475,9 @@ distclean-tags: +@@ -595,9 +475,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -80675,7 +92501,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -602,25 +486,25 @@ check-TESTS: $(TESTS) +@@ -606,25 +486,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -80711,7 +92537,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in ;; \ esac; \ else \ -@@ -645,46 +529,40 @@ check-TESTS: $(TESTS) +@@ -649,46 +529,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -80775,7 +92601,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -700,7 +578,6 @@ check-am: all-am +@@ -704,7 +578,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile @@ -80783,7 +92609,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -722,37 +599,48 @@ clean-generic: +@@ -726,37 +599,48 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -80835,7 +92661,7 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -773,18 +661,23 @@ ps: ps-am +@@ -777,18 +661,23 @@ ps-am: @@ -80868,10 +92694,9 @@ Index: gtk+-2.14.4/gdk/tests/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gdk/win32/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gdk/win32/Makefile.in 2008-10-17 06:07:16.000000000 +0200 -+++ gtk+-2.14.4/gdk/win32/Makefile.in 2008-11-11 18:56:02.860634243 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefile.in gtk+2.0-2.14.5/gdk/win32/Makefile.in +--- gtk+2.0-2.14.5.old/gdk/win32/Makefile.in 2008-11-24 07:41:41.000000000 +0100 ++++ gtk+2.0-2.14.5/gdk/win32/Makefile.in 2008-11-25 11:09:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -80902,7 +92727,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,69 @@ POST_INSTALL = : +@@ -37,10 +33,69 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -80974,7 +92799,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +106,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +106,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -80998,7 +92823,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +131,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +131,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -81006,8 +92831,9 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +138,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -81016,9 +92842,13 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +164,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +164,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -81026,7 +92856,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +183,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +183,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -81035,7 +92865,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +193,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +193,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -81128,7 +92958,20 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +222,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +217,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -81151,10 +92994,12 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +241,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +241,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -81163,7 +93008,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +252,10 @@ SED = @SED@ +@@ -300,28 +252,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -81192,7 +93037,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +264,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +264,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -81202,11 +93047,12 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -81222,15 +93068,17 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +305,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +304,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,17 +314,16 @@ program_transform_name = @program_transf +@@ -377,17 +314,16 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -81252,7 +93100,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in TEST_PROGS = ### testing rules -@@ -409,9 +349,7 @@ XVFB_START = \ +@@ -413,9 +349,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -81262,7 +93110,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DINSIDE_GDK_WIN32 \ -@@ -423,13 +361,9 @@ INCLUDES = \ +@@ -427,13 +361,9 @@ $(GDK_WIN32_EXTRA_CFLAGS)\ -DGDK_COMPILATION @@ -81276,7 +93124,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in libgdk_win32_la_SOURCES = \ xcursors.h \ gdkapplaunchcontext-win32.c \ -@@ -467,103 +401,56 @@ libgdk_win32_la_SOURCES = \ +@@ -471,103 +401,56 @@ wintab.h \ pktdef.h @@ -81410,7 +93258,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -596,64 +483,47 @@ distclean-compile: +@@ -600,64 +483,47 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-win32.Plo@am__quote@ .c.o: @@ -81494,7 +93342,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -663,7 +533,13 @@ uninstall-libgdkincludeHEADERS: +@@ -667,7 +533,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -81509,7 +93357,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -675,15 +551,20 @@ $(RECURSIVE_TARGETS): +@@ -679,15 +551,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -81534,7 +93382,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -704,7 +585,7 @@ maintainer-clean-recursive: +@@ -708,7 +585,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -81543,7 +93391,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -715,35 +596,30 @@ ctags-recursive: +@@ -719,35 +596,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -81586,7 +93434,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -751,23 +627,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -755,23 +627,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -81619,7 +93467,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -779,29 +655,23 @@ GTAGS: +@@ -783,29 +655,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -81662,7 +93510,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -812,15 +682,19 @@ distdir: $(DISTFILES) +@@ -816,15 +682,19 @@ || exit 1; \ fi; \ done @@ -81687,7 +93535,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -831,8 +705,9 @@ check: check-recursive +@@ -835,8 +705,9 @@ all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -81699,7 +93547,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -852,7 +727,7 @@ mostlyclean-generic: +@@ -856,7 +727,7 @@ clean-generic: distclean-generic: @@ -81708,7 +93556,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -866,24 +741,34 @@ distclean: distclean-recursive +@@ -870,24 +741,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -81744,7 +93592,7 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -904,28 +789,26 @@ ps: ps-recursive +@@ -908,28 +789,26 @@ ps-am: @@ -81790,10 +93638,9 @@ Index: gtk+-2.14.4/gdk/win32/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gdk/win32/rc/Makefile.in 2008-10-17 06:07:16.000000000 +0200 -+++ gtk+-2.14.4/gdk/win32/rc/Makefile.in 2008-11-11 18:56:02.980634481 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.5/gdk/win32/rc/Makefile.in +--- gtk+2.0-2.14.5.old/gdk/win32/rc/Makefile.in 2008-11-24 07:41:41.000000000 +0100 ++++ gtk+2.0-2.14.5/gdk/win32/rc/Makefile.in 2008-11-25 11:09:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -81823,7 +93670,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,24 @@ POST_INSTALL = : +@@ -37,10 +32,24 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -81850,7 +93697,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +60,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +60,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -81874,7 +93721,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +85,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +85,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -81882,8 +93729,9 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +92,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -81892,9 +93740,13 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +118,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +118,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -81902,7 +93754,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +137,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +137,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -81911,7 +93763,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +147,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +147,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -82004,7 +93856,20 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +176,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +171,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -82027,10 +93892,12 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +195,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +195,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -82039,7 +93906,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +206,10 @@ SED = @SED@ +@@ -300,28 +206,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -82068,7 +93935,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +218,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +218,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -82078,11 +93945,12 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -82098,15 +93966,17 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +259,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +258,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,18 +268,16 @@ program_transform_name = @program_transf +@@ -377,18 +268,16 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -82129,7 +93999,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in TEST_PROGS = ### testing rules -@@ -410,27 +303,40 @@ XVFB_START = \ +@@ -414,27 +303,40 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -82185,7 +94055,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -438,39 +344,29 @@ mostlyclean-libtool: +@@ -442,39 +344,29 @@ clean-libtool: -rm -rf .libs _libs @@ -82238,7 +94108,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -485,7 +381,6 @@ check-am: all-am +@@ -489,7 +381,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) @@ -82246,7 +94116,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -506,7 +401,7 @@ mostlyclean-generic: +@@ -510,7 +401,7 @@ clean-generic: distclean-generic: @@ -82255,7 +94125,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -517,24 +412,34 @@ clean-am: clean-generic clean-libtool mo +@@ -521,24 +412,34 @@ distclean: distclean-am -rm -f Makefile @@ -82291,7 +94161,7 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -553,17 +458,21 @@ ps: ps-am +@@ -557,17 +458,21 @@ ps-am: @@ -82321,10 +94191,9 @@ Index: gtk+-2.14.4/gdk/win32/rc/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gdk/x11/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gdk/x11/Makefile.in 2008-10-17 06:07:16.000000000 +0200 -+++ gtk+-2.14.4/gdk/x11/Makefile.in 2008-11-11 18:56:03.152634902 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile.in gtk+2.0-2.14.5/gdk/x11/Makefile.in +--- gtk+2.0-2.14.5.old/gdk/x11/Makefile.in 2008-11-24 07:41:42.000000000 +0100 ++++ gtk+2.0-2.14.5/gdk/x11/Makefile.in 2008-11-25 11:09:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -82356,7 +94225,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,12 +34,86 @@ POST_INSTALL = : +@@ -37,12 +34,86 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -82445,7 +94314,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -53,22 +124,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -53,22 +124,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -82469,7 +94338,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,8 +149,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -83,21 +149,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -82477,8 +94346,9 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -92,10 +156,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -82487,9 +94357,13 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -122,6 +182,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -121,6 +182,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -82497,7 +94371,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -140,8 +201,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -139,8 +201,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -82506,7 +94380,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -152,91 +211,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -151,98 +211,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -82599,7 +94473,20 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -258,24 +240,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -253,32 +235,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -82622,10 +94509,12 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -286,8 +259,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -289,8 +259,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -82634,7 +94523,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -299,28 +270,10 @@ SED = @SED@ +@@ -302,28 +270,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -82663,7 +94552,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -329,22 +282,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -332,22 +282,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -82673,11 +94562,12 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -82693,15 +94583,17 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,6 +323,7 @@ libexecdir = @libexecdir@ +@@ -369,8 +322,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -375,9 +332,11 @@ program_transform_name = @program_transf +@@ -379,9 +332,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -82714,7 +94606,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -385,12 +344,8 @@ GTESTER_REPORT = gtester-report # in $P +@@ -389,12 +344,8 @@ # We need to include all these C files here since the conditionals # don't seem to be correctly expanded for the dist files. @@ -82728,7 +94620,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in TEST_PROGS = ### testing rules -@@ -416,9 +371,7 @@ XVFB_START = \ +@@ -420,9 +371,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -82738,7 +94630,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -428,178 +381,69 @@ INCLUDES = \ +@@ -432,178 +381,69 @@ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -82959,7 +94851,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -609,10 +453,10 @@ clean-noinstPROGRAMS: +@@ -613,10 +453,10 @@ done checksettings$(EXEEXT): $(checksettings_OBJECTS) $(checksettings_DEPENDENCIES) @rm -f checksettings$(EXEEXT) @@ -82972,7 +94864,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -652,82 +496,58 @@ distclean-compile: +@@ -656,82 +496,58 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsettings-common.Plo@am__quote@ .c.o: @@ -83077,7 +94969,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -737,23 +557,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -741,23 +557,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -83110,7 +95002,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -767,9 +587,9 @@ distclean-tags: +@@ -771,9 +587,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -83122,7 +95014,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -778,25 +598,25 @@ check-TESTS: $(TESTS) +@@ -782,25 +598,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -83158,7 +95050,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in ;; \ esac; \ else \ -@@ -821,46 +641,40 @@ check-TESTS: $(TESTS) +@@ -825,46 +641,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -83222,7 +95114,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -875,9 +689,10 @@ check-am: all-am +@@ -879,9 +689,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) @@ -83235,7 +95127,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -897,7 +712,7 @@ mostlyclean-generic: +@@ -901,7 +712,7 @@ clean-generic: distclean-generic: @@ -83244,7 +95136,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -911,24 +726,34 @@ distclean: distclean-am +@@ -915,24 +726,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -83280,7 +95172,7 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -949,20 +774,24 @@ ps: ps-am +@@ -953,20 +774,24 @@ ps-am: @@ -83314,10 +95206,9 @@ Index: gtk+-2.14.4/gdk/x11/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gdk-pixbuf/Makefile.in 2008-10-17 06:07:15.000000000 +0200 -+++ gtk+-2.14.4/gdk-pixbuf/Makefile.in 2008-11-11 18:56:01.868634561 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.5/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.14.5.old/gdk-pixbuf/Makefile.in 2008-11-24 07:41:40.000000000 +0100 ++++ gtk+2.0-2.14.5/gdk-pixbuf/Makefile.in 2008-11-25 11:09:47.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -83350,7 +95241,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,1440 +35,1367 @@ POST_INSTALL = : +@@ -37,1444 +35,1367 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -83403,7 +95294,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ +-DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ @@ -83413,8 +95304,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ -EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ +-FGREP = @FGREP@ -GAIL_INET_LIBS = @GAIL_INET_LIBS@ -GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ -GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ @@ -83559,6 +95449,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ +-LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBJASPER = @LIBJASPER@ -LIBJPEG = @LIBJPEG@ @@ -83569,6 +95460,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in -LIBTOOL = @LIBTOOL@ -LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ -LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -83592,6 +95484,8 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ @@ -83647,7 +95541,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -83682,6 +95576,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -ms_librarian = @ms_librarian@ -oldincludedir = @oldincludedir@ @@ -86058,7 +97953,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -@@ -1479,116 +1404,115 @@ clean-noinstLTLIBRARIES: +@@ -1483,116 +1404,115 @@ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ @@ -86226,7 +98121,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in else :; fi; \ done -@@ -1596,8 +1520,8 @@ uninstall-binPROGRAMS: +@@ -1600,8 +1520,8 @@ @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -86237,7 +98132,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in done clean-binPROGRAMS: -@@ -1615,16 +1539,16 @@ clean-noinstPROGRAMS: +@@ -1619,16 +1539,16 @@ done gdk-pixbuf-csource$(EXEEXT): $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_DEPENDENCIES) @rm -f gdk-pixbuf-csource$(EXEEXT) @@ -86258,7 +98153,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -1672,64 +1596,47 @@ distclean-compile: +@@ -1676,64 +1596,47 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gdk-pixbuf.Po@am__quote@ .c.o: @@ -86342,7 +98237,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -1739,7 +1646,13 @@ uninstall-libgdk_pixbufincludeHEADERS: +@@ -1743,7 +1646,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -86357,7 +98252,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1751,15 +1664,20 @@ $(RECURSIVE_TARGETS): +@@ -1755,15 +1664,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -86382,7 +98277,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -1780,7 +1698,7 @@ maintainer-clean-recursive: +@@ -1784,7 +1698,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -86391,7 +98286,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1791,35 +1709,30 @@ ctags-recursive: +@@ -1795,35 +1709,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -86434,7 +98329,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -1827,23 +1740,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -1831,23 +1740,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -86467,7 +98362,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1857,9 +1770,9 @@ distclean-tags: +@@ -1861,9 +1770,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -86479,7 +98374,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1868,25 +1781,25 @@ check-TESTS: $(TESTS) +@@ -1872,25 +1781,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -86515,7 +98410,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in ;; \ esac; \ else \ -@@ -1911,46 +1824,40 @@ check-TESTS: $(TESTS) +@@ -1915,46 +1824,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -86579,7 +98474,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1961,15 +1868,19 @@ distdir: $(DISTFILES) +@@ -1965,15 +1868,19 @@ || exit 1; \ fi; \ done @@ -86604,7 +98499,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -1978,13 +1889,16 @@ check-am: all-am +@@ -1982,13 +1889,16 @@ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive @@ -86624,7 +98519,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -2006,13 +1920,13 @@ clean-generic: +@@ -2010,13 +1920,13 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -86640,7 +98535,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -@@ -2023,12 +1937,14 @@ distclean: distclean-recursive +@@ -2027,12 +1937,14 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -86656,7 +98551,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in info: info-recursive info-am: -@@ -2038,12 +1954,20 @@ install-data-am: install-libgdk_pixbufin +@@ -2042,12 +1954,20 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -86677,7 +98572,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -2064,35 +1988,34 @@ ps: ps-recursive +@@ -2068,35 +1988,34 @@ ps-am: @@ -86738,10 +98633,9 @@ Index: gtk+-2.14.4/gdk-pixbuf/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gdk-pixbuf/pixops/Makefile.in 2008-10-17 06:07:15.000000000 +0200 -+++ gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in 2008-11-11 18:56:02.024634625 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.5/gdk-pixbuf/pixops/Makefile.in +--- gtk+2.0-2.14.5.old/gdk-pixbuf/pixops/Makefile.in 2008-11-24 07:41:40.000000000 +0100 ++++ gtk+2.0-2.14.5/gdk-pixbuf/pixops/Makefile.in 2008-11-25 11:09:47.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -86772,7 +98666,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ POST_INSTALL = : +@@ -37,10 +33,59 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -86834,7 +98728,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +96,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -86858,7 +98752,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +121,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -86866,8 +98760,9 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -86876,9 +98771,13 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +154,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -86886,7 +98785,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +173,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -86895,7 +98794,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +183,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -86988,7 +98887,20 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +207,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -87011,10 +98923,12 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +231,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -87023,7 +98937,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +242,10 @@ SED = @SED@ +@@ -300,28 +242,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -87052,7 +98966,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +254,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -87062,11 +98976,12 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -87082,15 +98997,17 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +294,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,18 +304,16 @@ program_transform_name = @program_transf +@@ -377,18 +304,16 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -87113,7 +99030,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in TEST_PROGS = ### testing rules -@@ -410,97 +339,70 @@ XVFB_START = \ +@@ -414,97 +339,70 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -87240,7 +99157,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -510,58 +412,62 @@ clean-noinstPROGRAMS: +@@ -514,58 +412,62 @@ done timescale$(EXEEXT): $(timescale_OBJECTS) $(timescale_DEPENDENCIES) @rm -f timescale$(EXEEXT) @@ -87332,7 +99249,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -569,26 +475,15 @@ mostlyclean-libtool: +@@ -573,26 +475,15 @@ clean-libtool: -rm -rf .libs _libs @@ -87362,7 +99279,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -598,23 +493,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -602,23 +493,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -87395,7 +99312,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -626,29 +521,23 @@ GTAGS: +@@ -630,29 +521,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -87438,7 +99355,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -663,7 +552,6 @@ check-am: all-am +@@ -667,7 +552,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) @@ -87446,7 +99363,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -684,7 +572,7 @@ mostlyclean-generic: +@@ -688,7 +572,7 @@ clean-generic: distclean-generic: @@ -87455,7 +99372,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -698,24 +586,34 @@ distclean: distclean-am +@@ -702,24 +586,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -87491,7 +99408,7 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -736,19 +634,23 @@ ps: ps-am +@@ -740,19 +634,23 @@ ps-am: @@ -87521,10 +99438,9 @@ Index: gtk+-2.14.4/gdk-pixbuf/pixops/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gtk/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gtk/Makefile.in 2008-10-17 06:07:17.000000000 +0200 -+++ gtk+-2.14.4/gtk/Makefile.in 2008-11-11 18:56:03.684634570 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in gtk+2.0-2.14.5/gtk/Makefile.in +--- gtk+2.0-2.14.5.old/gtk/Makefile.in 2008-11-24 07:41:42.000000000 +0100 ++++ gtk+2.0-2.14.5/gtk/Makefile.in 2008-11-25 11:09:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -87558,7 +99474,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,7 +36,13 @@ POST_INSTALL = : +@@ -37,7 +36,13 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -87572,7 +99488,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in @OS_LINUX_TRUE@am__append_1 = abicheck.sh pltcheck.sh @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_2 = $(INCLUDED_IMMODULE_OBJ) @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_3 = $(INCLUDED_IMMODULE_OBJ) -@@ -61,1756 +66,945 @@ host_triplet = @host@ +@@ -61,1760 +66,945 @@ @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_12 = gtksearchenginequartz.h @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_quartz_c_sources) @USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_14 = $(gtk_use_stub_c_sources) @@ -87623,7 +99539,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ +-DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ @@ -87633,8 +99549,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ -EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ +-FGREP = @FGREP@ -GAIL_INET_LIBS = @GAIL_INET_LIBS@ -GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ -GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ @@ -87779,6 +99694,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ +-LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBJASPER = @LIBJASPER@ -LIBJPEG = @LIBJPEG@ @@ -87789,6 +99705,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in -LIBTOOL = @LIBTOOL@ -LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ -LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -87812,6 +99729,8 @@ Index: gtk+-2.14.4/gtk/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ @@ -87867,7 +99786,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -87902,6 +99821,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -ms_librarian = @ms_librarian@ -oldincludedir = @oldincludedir@ @@ -90262,7 +102182,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -@@ -1830,25 +1024,26 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk +@@ -1834,25 +1024,26 @@ gtkfilechooserdialog.c gtkfilechooserembed.c \ gtkfilechooserentry.c gtkfilechoosersettings.c \ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ @@ -90308,7 +102228,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -@@ -1856,8 +1051,8 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk +@@ -1860,8 +1051,8 @@ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ @@ -90319,7 +102239,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in gtktextbuffer.c gtktextbufferrichtext.c \ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -@@ -1872,370 +1067,501 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk +@@ -1876,370 +1067,501 @@ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ @@ -91137,7 +103057,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in else :; fi; \ done -@@ -2243,8 +1569,8 @@ uninstall-binPROGRAMS: +@@ -2247,8 +1569,8 @@ @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -91148,7 +103068,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in done clean-binPROGRAMS: -@@ -2255,20 +1581,19 @@ clean-binPROGRAMS: +@@ -2259,20 +1581,19 @@ done gtk-query-immodules-2.0$(EXEEXT): $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_DEPENDENCIES) @rm -f gtk-query-immodules-2.0$(EXEEXT) @@ -91174,7 +103094,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in else :; fi; \ done -@@ -2276,12 +1601,12 @@ uninstall-binSCRIPTS: +@@ -2280,12 +1601,12 @@ @$(NORMAL_UNINSTALL) @list='$(bin_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ @@ -91190,7 +103110,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -2547,82 +1872,64 @@ distclean-compile: +@@ -2551,82 +1872,64 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updateiconcache.Po@am__quote@ .c.o: @@ -91299,7 +103219,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -2632,7 +1939,13 @@ uninstall-gtkunixprintincludeHEADERS: +@@ -2636,7 +1939,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -91314,7 +103234,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2644,15 +1957,20 @@ $(RECURSIVE_TARGETS): +@@ -2648,15 +1957,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -91339,7 +103259,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -2673,7 +1991,7 @@ maintainer-clean-recursive: +@@ -2677,7 +1991,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -91348,7 +103268,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2684,35 +2002,30 @@ ctags-recursive: +@@ -2688,35 +2002,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -91391,7 +103311,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -2720,23 +2033,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -2724,23 +2033,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -91424,7 +103344,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -2750,9 +2063,9 @@ distclean-tags: +@@ -2754,9 +2063,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -91436,7 +103356,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -2761,25 +2074,25 @@ check-TESTS: $(TESTS) +@@ -2765,25 +2074,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -91472,7 +103392,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in ;; \ esac; \ else \ -@@ -2804,46 +2117,40 @@ check-TESTS: $(TESTS) +@@ -2808,46 +2117,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -91536,7 +103456,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -2856,13 +2163,17 @@ distdir: $(DISTFILES) +@@ -2860,13 +2163,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -91558,7 +103478,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -2877,8 +2188,9 @@ install-binPROGRAMS: install-libLTLIBRAR +@@ -2881,8 +2188,9 @@ installdirs: installdirs-recursive installdirs-am: @@ -91570,7 +103490,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -2900,13 +2212,13 @@ clean-generic: +@@ -2904,13 +2212,13 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -91586,7 +103506,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -@@ -2916,12 +2228,14 @@ distclean: distclean-recursive +@@ -2920,12 +2228,14 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -91602,7 +103522,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in info: info-recursive info-am: -@@ -2929,15 +2243,23 @@ info-am: +@@ -2933,15 +2243,23 @@ install-data-am: install-data-local install-gtkincludeHEADERS \ install-gtkunixprintincludeHEADERS @@ -91626,7 +103546,7 @@ Index: gtk+-2.14.4/gtk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -2960,35 +2282,34 @@ ps-am: +@@ -2964,35 +2282,34 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-gtkincludeHEADERS \ @@ -91685,10 +103605,9 @@ Index: gtk+-2.14.4/gtk/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gtk/tests/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gtk/tests/Makefile.in 2008-10-17 06:07:17.000000000 +0200 -+++ gtk+-2.14.4/gtk/tests/Makefile.in 2008-11-11 18:56:03.864635659 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefile.in gtk+2.0-2.14.5/gtk/tests/Makefile.in +--- gtk+2.0-2.14.5.old/gtk/tests/Makefile.in 2008-11-24 07:41:42.000000000 +0100 ++++ gtk+2.0-2.14.5/gtk/tests/Makefile.in 2008-11-25 11:09:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -91718,7 +103637,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +32,86 @@ POST_INSTALL = : +@@ -37,11 +32,86 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -91807,7 +103726,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,22 +122,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -52,22 +122,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -91831,7 +103750,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,8 +147,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -82,21 +147,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -91839,8 +103758,9 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -91,10 +154,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -91849,9 +103769,13 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -121,6 +180,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -120,6 +180,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -91859,7 +103783,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +199,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +199,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -91868,7 +103792,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,91 +209,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,98 +209,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -91961,7 +103885,20 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -257,24 +238,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -252,32 +233,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -91984,10 +103921,12 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +257,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -288,8 +257,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -91996,7 +103935,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +268,10 @@ SED = @SED@ +@@ -301,28 +268,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -92025,7 +103964,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +280,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -331,22 +280,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -92035,11 +103974,12 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -92055,15 +103995,17 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -366,6 +321,7 @@ libexecdir = @libexecdir@ +@@ -368,8 +320,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -374,16 +330,19 @@ program_transform_name = @program_transf +@@ -378,16 +330,19 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -92086,7 +104028,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in ### testing rules -@@ -408,7 +367,6 @@ XVFB_START = \ +@@ -412,7 +367,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -92094,7 +104036,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -418,20 +376,16 @@ INCLUDES = \ +@@ -422,20 +376,16 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -92115,7 +104057,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in testing_SOURCES = testing.c testing_LDADD = $(progs_ldadd) liststore_SOURCES = liststore.c -@@ -466,128 +420,39 @@ defaultvalue_SOURCES = defaultvalue.c pi +@@ -470,128 +420,39 @@ defaultvalue_LDADD = $(progs_ldadd) textbuffer_SOURCES = textbuffer.c pixbuf-init.c textbuffer_LDADD = $(progs_ldadd) @@ -92271,7 +104213,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -597,37 +462,37 @@ clean-noinstPROGRAMS: +@@ -601,37 +462,37 @@ done builder$(EXEEXT): $(builder_OBJECTS) $(builder_DEPENDENCIES) @rm -f builder$(EXEEXT) @@ -92320,7 +104262,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -645,37 +510,25 @@ distclean-compile: +@@ -649,37 +510,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview-scrolling.Po@am__quote@ .c.o: @@ -92370,7 +104312,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -683,26 +536,15 @@ mostlyclean-libtool: +@@ -687,26 +536,15 @@ clean-libtool: -rm -rf .libs _libs @@ -92400,7 +104342,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -712,23 +554,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -716,23 +554,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -92433,7 +104375,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -740,29 +582,23 @@ GTAGS: +@@ -744,29 +582,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -92476,7 +104418,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -777,7 +613,6 @@ check-am: all-am +@@ -781,7 +613,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -92484,7 +104426,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -798,7 +633,7 @@ mostlyclean-generic: +@@ -802,7 +633,7 @@ clean-generic: distclean-generic: @@ -92493,7 +104435,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -812,24 +647,34 @@ distclean: distclean-am +@@ -816,24 +647,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -92529,7 +104471,7 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -850,18 +695,23 @@ ps: ps-am +@@ -854,18 +695,23 @@ ps-am: @@ -92562,10 +104504,9 @@ Index: gtk+-2.14.4/gtk/tests/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/gtk/theme-bits/Makefile.in 2008-10-17 06:07:17.000000000 +0200 -+++ gtk+-2.14.4/gtk/theme-bits/Makefile.in 2008-11-11 18:56:04.021135368 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.5/gtk/theme-bits/Makefile.in +--- gtk+2.0-2.14.5.old/gtk/theme-bits/Makefile.in 2008-11-24 07:41:43.000000000 +0100 ++++ gtk+2.0-2.14.5/gtk/theme-bits/Makefile.in 2008-11-25 11:09:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -92595,7 +104536,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,42 @@ POST_INSTALL = : +@@ -37,10 +32,42 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -92640,7 +104581,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +78,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +78,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -92664,7 +104605,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +103,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +103,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -92672,8 +104613,9 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +110,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -92682,9 +104624,13 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +136,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +136,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -92692,7 +104638,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +155,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +155,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -92701,7 +104647,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +165,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +165,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -92794,7 +104740,20 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +194,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +189,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -92817,10 +104776,12 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +213,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +213,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -92829,7 +104790,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +224,10 @@ SED = @SED@ +@@ -300,28 +224,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -92858,7 +104819,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +236,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +236,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -92868,11 +104829,12 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -92888,15 +104850,17 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +277,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +276,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,14 +286,17 @@ program_transform_name = @program_transf +@@ -377,14 +286,17 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -92916,7 +104880,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in TEST_PROGS = ### testing rules -@@ -406,56 +322,46 @@ XVFB_START = \ +@@ -410,56 +322,46 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -93000,7 +104964,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -465,10 +371,10 @@ clean-noinstPROGRAMS: +@@ -469,10 +371,10 @@ done decompose-bits$(EXEEXT): $(decompose_bits_OBJECTS) $(decompose_bits_DEPENDENCIES) @rm -f decompose-bits$(EXEEXT) @@ -93013,7 +104977,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -476,37 +382,25 @@ distclean-compile: +@@ -480,37 +382,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decompose-bits.Po@am__quote@ .c.o: @@ -93063,7 +105027,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -514,26 +408,15 @@ mostlyclean-libtool: +@@ -518,26 +408,15 @@ clean-libtool: -rm -rf .libs _libs @@ -93093,7 +105057,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -543,23 +426,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -547,23 +426,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -93126,7 +105090,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -571,29 +454,23 @@ GTAGS: +@@ -575,29 +454,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -93169,7 +105133,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -608,7 +485,6 @@ check-am: all-am +@@ -612,7 +485,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -93177,7 +105141,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -629,7 +505,7 @@ mostlyclean-generic: +@@ -633,7 +505,7 @@ clean-generic: distclean-generic: @@ -93186,7 +105150,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -643,24 +519,34 @@ distclean: distclean-am +@@ -647,24 +519,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -93222,7 +105186,7 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -681,18 +567,23 @@ ps: ps-am +@@ -685,18 +567,23 @@ ps-am: @@ -93255,47 +105219,15036 @@ Index: gtk+-2.14.4/gtk/theme-bits/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/ltmain.sh -=================================================================== ---- gtk+-2.14.4.orig/ltmain.sh 2008-08-30 00:27:25.000000000 +0200 -+++ gtk+-2.14.4/ltmain.sh 2008-04-29 22:21:21.000000000 +0200 -@@ -43,7 +43,7 @@ EXIT_FAILURE=1 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk-doc.make gtk+2.0-2.14.5/gtk-doc.make +--- gtk+2.0-2.14.5.old/gtk-doc.make 2008-11-21 07:57:58.000000000 +0100 ++++ gtk+2.0-2.14.5/gtk-doc.make 2008-11-25 11:09:32.000000000 +0100 +@@ -7,11 +7,9 @@ + if GTK_DOC_USE_LIBTOOL + GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-GTKDOC_RUN = $(LIBTOOL) --mode=execute + else + GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +-GTKDOC_RUN = sh -c + endif + + # We set GPATH here; this gives us semantics for GNU make +@@ -55,8 +53,6 @@ + + docs: html-build.stamp + +-$(REPORT_FILES): sgml-build.stamp +- + #### scan #### + + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +@@ -65,7 +61,7 @@ + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ +@@ -111,12 +107,7 @@ + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html +- mkhtml_options=""; \ +- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +- if test "$(?)" = "0"; then \ +- mkhtml_options=--path="$(srcdir)"; \ +- fi +- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +@@ -137,37 +128,24 @@ + cd $(srcdir) && rm -rf xml html + + install-data-local: +- installfiles=`echo $(srcdir)/html/*`; \ ++ -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +- else \ +- installdir="$(DESTDIR)$(TARGET_DIR)"; \ +- fi; \ +- $(mkinstalldirs) $${installdir} ; \ ++ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ +- $(INSTALL_DATA) $$i $${installdir}; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ +- mv -f $${installdir}/$(DOC_MODULE).devhelp \ +- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ +- fi; \ +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ ++ echo '-- Installing $(srcdir)/html/index.sgml' ; \ ++ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ ++ which gtkdoc-rebase >/dev/null && \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi ++ + + uninstall-local: +- if test -n "$(DOC_MODULE_VERSION)"; then \ +- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ +- else \ +- installdir="$(DESTDIR)$(TARGET_DIR)"; \ +- fi; \ +- rm -rf $${installdir} ++ rm -f $(DESTDIR)$(TARGET_DIR)/* + + # + # Require gtk-doc when making dist +@@ -190,7 +168,6 @@ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- ! which gtkdoc-rebase >/dev/null 2>&1 || \ +- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/install-sh gtk+2.0-2.14.5/install-sh +--- gtk+2.0-2.14.5.old/install-sh 2007-09-18 16:10:46.000000000 +0200 ++++ gtk+2.0-2.14.5/install-sh 2008-11-25 11:09:45.000000000 +0100 +@@ -1,7 +1,8 @@ + #!/bin/sh +-# + # install - install a program, script, or datafile +-# ++ ++scriptversion=2006-12-25.00 ++ + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the + # following copyright and license. +@@ -38,257 +39,481 @@ + # when there is no Makefile. + # + # This script is compatible with the BSD install script, but was written +-# from scratch. It can only install one file at a time, a restriction +-# shared with many OS's install programs. ++# from scratch. + ++nl=' ++' ++IFS=" "" $nl" + + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. +-doit="${DOITPROG-}" +- ++doit=${DOITPROG-} ++if test -z "$doit"; then ++ doit_exec=exec ++else ++ doit_exec=$doit ++fi + +-# put in absolute paths if you don't have them in your path; or use env. vars. ++# Put in absolute file names if you don't have them in your path; ++# or use environment vars. + +-mvprog="${MVPROG-mv}" +-cpprog="${CPPROG-cp}" +-chmodprog="${CHMODPROG-chmod}" +-chownprog="${CHOWNPROG-chown}" +-chgrpprog="${CHGRPPROG-chgrp}" +-stripprog="${STRIPPROG-strip}" +-rmprog="${RMPROG-rm}" +-mkdirprog="${MKDIRPROG-mkdir}" +- +-transformbasename="" +-transform_arg="" +-instcmd="$mvprog" +-chmodcmd="$chmodprog 0755" +-chowncmd="" +-chgrpcmd="" +-stripcmd="" ++chgrpprog=${CHGRPPROG-chgrp} ++chmodprog=${CHMODPROG-chmod} ++chownprog=${CHOWNPROG-chown} ++cmpprog=${CMPPROG-cmp} ++cpprog=${CPPROG-cp} ++mkdirprog=${MKDIRPROG-mkdir} ++mvprog=${MVPROG-mv} ++rmprog=${RMPROG-rm} ++stripprog=${STRIPPROG-strip} ++ ++posix_glob='?' ++initialize_posix_glob=' ++ test "$posix_glob" != "?" || { ++ if (set -f) 2>/dev/null; then ++ posix_glob= ++ else ++ posix_glob=: ++ fi ++ } ++' ++ ++posix_mkdir= ++ ++# Desired mode of installed file. ++mode=0755 ++ ++chgrpcmd= ++chmodcmd=$chmodprog ++chowncmd= ++mvcmd=$mvprog + rmcmd="$rmprog -f" +-mvcmd="$mvprog" +-src="" +-dst="" +-dir_arg="" +- +-while [ x"$1" != x ]; do +- case $1 in +- -c) instcmd=$cpprog +- shift +- continue;; +- +- -d) dir_arg=true +- shift +- continue;; +- +- -m) chmodcmd="$chmodprog $2" +- shift +- shift +- continue;; +- +- -o) chowncmd="$chownprog $2" +- shift +- shift +- continue;; +- +- -g) chgrpcmd="$chgrpprog $2" +- shift +- shift +- continue;; +- +- -s) stripcmd=$stripprog +- shift +- continue;; +- +- -t=*) transformarg=`echo $1 | sed 's/-t=//'` +- shift +- continue;; +- +- -b=*) transformbasename=`echo $1 | sed 's/-b=//'` +- shift +- continue;; ++stripcmd= + +- *) if [ x"$src" = x ] +- then +- src=$1 +- else +- # this colon is to work around a 386BSD /bin/sh bug +- : +- dst=$1 +- fi +- shift +- continue;; +- esac +-done ++src= ++dst= ++dir_arg= ++dst_arg= + +-if [ x"$src" = x ] +-then +- echo "$0: no input file specified" >&2 +- exit 1 +-else +- : +-fi ++copy_on_change=false ++no_target_directory= + +-if [ x"$dir_arg" != x ]; then +- dst=$src +- src="" +- +- if [ -d "$dst" ]; then +- instcmd=: +- chmodcmd="" +- else +- instcmd=$mkdirprog +- fi +-else ++usage="\ ++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++ or: $0 [OPTION]... SRCFILES... DIRECTORY ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... + +-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +-# might cause directories to be created, which would be especially bad +-# if $src (and thus $dsttmp) contains '*'. +- +- if [ -f "$src" ] || [ -d "$src" ] +- then +- : +- else +- echo "$0: $src does not exist" >&2 +- exit 1 +- fi ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. + +- if [ x"$dst" = x ] +- then +- echo "$0: no destination specified" >&2 +- exit 1 +- else +- : +- fi ++Options: ++ --help display this help and exit. ++ --version display version info and exit. + +-# If destination is a directory, append the input filename; if your system +-# does not like double slashes in filenames, you may need to add some logic ++ -c (ignored) ++ -C install only if different (preserve the last data modification time) ++ -d create directories instead of installing files. ++ -g GROUP $chgrpprog installed files to GROUP. ++ -m MODE $chmodprog installed files to MODE. ++ -o USER $chownprog installed files to USER. ++ -s $stripprog installed files. ++ -t DIRECTORY install into DIRECTORY. ++ -T report an error if DSTFILE is a directory. + +- if [ -d "$dst" ] +- then +- dst=$dst/`basename "$src"` +- else +- : +- fi +-fi ++Environment variables override the default commands: ++ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG ++ RMPROG STRIPPROG ++" + +-## this sed command emulates the dirname command +-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ++while test $# -ne 0; do ++ case $1 in ++ -c) ;; + +-# Make sure that the destination directory exists. +-# this part is taken from Noah Friedman's mkinstalldirs script ++ -C) copy_on_change=true;; + +-# Skip lots of stat calls in the usual case. +-if [ ! -d "$dstdir" ]; then +-defaultIFS=' +- ' +-IFS="${IFS-$defaultIFS}" +- +-oIFS=$IFS +-# Some sh's can't handle IFS=/ for some reason. +-IFS='%' +-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +-IFS=$oIFS +- +-pathcomp='' +- +-while [ $# -ne 0 ] ; do +- pathcomp=$pathcomp$1 +- shift +- +- if [ ! -d "$pathcomp" ] ; +- then +- $mkdirprog "$pathcomp" +- else +- : +- fi ++ -d) dir_arg=true;; + +- pathcomp=$pathcomp/ +-done +-fi ++ -g) chgrpcmd="$chgrpprog $2" ++ shift;; + +-if [ x"$dir_arg" != x ] +-then +- $doit $instcmd "$dst" && +- +- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi +-else ++ --help) echo "$usage"; exit $?;; + +-# If we're going to rename the final executable, determine the name now. ++ -m) mode=$2 ++ case $mode in ++ *' '* | *' '* | *' ++'* | *'*'* | *'?'* | *'['*) ++ echo "$0: invalid mode: $mode" >&2 ++ exit 1;; ++ esac ++ shift;; + +- if [ x"$transformarg" = x ] +- then +- dstfile=`basename "$dst"` +- else +- dstfile=`basename "$dst" $transformbasename | +- sed $transformarg`$transformbasename +- fi ++ -o) chowncmd="$chownprog $2" ++ shift;; + +-# don't allow the sed command to completely eliminate the filename ++ -s) stripcmd=$stripprog;; + +- if [ x"$dstfile" = x ] +- then +- dstfile=`basename "$dst"` +- else +- : +- fi ++ -t) dst_arg=$2 ++ shift;; + +-# Make a couple of temp file names in the proper directory. ++ -T) no_target_directory=true;; + +- dsttmp=$dstdir/_inst.$$_ +- rmtmp=$dstdir/_rm.$$_ ++ --version) echo "$0 $scriptversion"; exit $?;; + +-# Trap to clean up temp files at exit. ++ --) shift ++ break;; + +- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 +- trap '(exit $?); exit' 1 2 13 15 ++ -*) echo "$0: invalid option: $1" >&2 ++ exit 1;; + +-# Move or copy the file name to the temp name ++ *) break;; ++ esac ++ shift ++done + +- $doit $instcmd "$src" "$dsttmp" && ++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then ++ # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dst_arg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dst_arg" ++ shift # fnord ++ fi ++ shift # arg ++ dst_arg=$arg ++ done ++fi + +-# and set any options; do chmod last to preserve setuid bits ++if test $# -eq 0; then ++ if test -z "$dir_arg"; then ++ echo "$0: no input file specified." >&2 ++ exit 1 ++ fi ++ # It's OK to call `install-sh -d' without argument. ++ # This can happen when creating conditional directories. ++ exit 0 ++fi + +-# If any of these fail, we abort the whole thing. If we want to +-# ignore errors from any of these, just make sure not to ignore +-# errors from the above "$doit $instcmd $src $dsttmp" command. ++if test -z "$dir_arg"; then ++ trap '(exit $?); exit' 1 2 13 15 + +- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && ++ # Set umask so as not to create temps with too-generous modes. ++ # However, 'strip' requires both read and write access to temps. ++ case $mode in ++ # Optimize common cases. ++ *644) cp_umask=133;; ++ *755) cp_umask=22;; ++ ++ *[0-7]) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw='% 200' ++ fi ++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; ++ *) ++ if test -z "$stripcmd"; then ++ u_plus_rw= ++ else ++ u_plus_rw=,u+rw ++ fi ++ cp_umask=$mode$u_plus_rw;; ++ esac ++fi + +-# Now remove or move aside any old file at destination location. We try this +-# two ways since rm can't unlink itself on some systems and the destination +-# file might be busy for other reasons. In this case, the final cleanup +-# might fail but the new file should still install successfully. ++for src ++do ++ # Protect names starting with `-'. ++ case $src in ++ -*) src=./$src;; ++ esac ++ ++ if test -n "$dir_arg"; then ++ dst=$src ++ dstdir=$dst ++ test -d "$dstdir" ++ dstdir_status=$? ++ else ++ ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # might cause directories to be created, which would be especially bad ++ # if $src (and thus $dsttmp) contains '*'. ++ if test ! -f "$src" && test ! -d "$src"; then ++ echo "$0: $src does not exist." >&2 ++ exit 1 ++ fi ++ ++ if test -z "$dst_arg"; then ++ echo "$0: no destination specified." >&2 ++ exit 1 ++ fi ++ ++ dst=$dst_arg ++ # Protect names starting with `-'. ++ case $dst in ++ -*) dst=./$dst;; ++ esac + +-{ +- if [ -f "$dstdir/$dstfile" ] +- then +- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || +- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || +- { +- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 +- (exit 1); exit +- } ++ # If destination is a directory, append the input filename; won't work ++ # if double slashes aren't ignored. ++ if test -d "$dst"; then ++ if test -n "$no_target_directory"; then ++ echo "$0: $dst_arg: Is a directory" >&2 ++ exit 1 ++ fi ++ dstdir=$dst ++ dst=$dstdir/`basename "$src"` ++ dstdir_status=0 ++ else ++ # Prefer dirname, but fall back on a substitute if dirname fails. ++ dstdir=` ++ (dirname "$dst") 2>/dev/null || ++ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$dst" : 'X\(//\)[^/]' \| \ ++ X"$dst" : 'X\(//\)$' \| \ ++ X"$dst" : 'X\(/\)' \| . 2>/dev/null || ++ echo X"$dst" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q' ++ ` ++ ++ test -d "$dstdir" ++ dstdir_status=$? ++ fi ++ fi ++ ++ obsolete_mkdir_used=false ++ ++ if test $dstdir_status != 0; then ++ case $posix_mkdir in ++ '') ++ # Create intermediate dirs using mode 755 as modified by the umask. ++ # This is like FreeBSD 'install' as of 1997-10-28. ++ umask=`umask` ++ case $stripcmd.$umask in ++ # Optimize common cases. ++ *[2367][2367]) mkdir_umask=$umask;; ++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; ++ ++ *[0-7]) ++ mkdir_umask=`expr $umask + 22 \ ++ - $umask % 100 % 40 + $umask % 20 \ ++ - $umask % 10 % 4 + $umask % 2 ++ `;; ++ *) mkdir_umask=$umask,go-w;; ++ esac ++ ++ # With -d, create the new directory with the user-specified mode. ++ # Otherwise, rely on $mkdir_umask. ++ if test -n "$dir_arg"; then ++ mkdir_mode=-m$mode + else +- : ++ mkdir_mode= + fi +-} && + +-# Now rename the file to the real destination. ++ posix_mkdir=false ++ case $umask in ++ *[123567][0-7][0-7]) ++ # POSIX mkdir -p sets u+wx bits regardless of umask, which ++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ++ ;; ++ *) ++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ ++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ ++ if (umask $mkdir_umask && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ then ++ if test -z "$dir_arg" || { ++ # Check for POSIX incompatibilities with -m. ++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or ++ # other-writeable bit of parent directory when it shouldn't. ++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ++ ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ case $ls_ld_tmpdir in ++ d????-?r-*) different_mode=700;; ++ d????-?--*) different_mode=755;; ++ *) false;; ++ esac && ++ $mkdirprog -m$different_mode -p -- "$tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" ++ } ++ } ++ then posix_mkdir=: ++ fi ++ rmdir "$tmpdir/d" "$tmpdir" ++ else ++ # Remove any dirs left behind by ancient mkdir implementations. ++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ fi ++ trap '' 0;; ++ esac;; ++ esac + +- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ++ if ++ $posix_mkdir && ( ++ umask $mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ++ ) ++ then : ++ else ++ ++ # The umask is ridiculous, or mkdir does not conform to POSIX, ++ # or it failed possibly due to a race condition. Create the ++ # directory the slow way, step by step, checking for races as we go. ++ ++ case $dstdir in ++ /*) prefix='/';; ++ -*) prefix='./';; ++ *) prefix='';; ++ esac ++ ++ eval "$initialize_posix_glob" ++ ++ oIFS=$IFS ++ IFS=/ ++ $posix_glob set -f ++ set fnord $dstdir ++ shift ++ $posix_glob set +f ++ IFS=$oIFS ++ ++ prefixes= ++ ++ for d ++ do ++ test -z "$d" && continue ++ ++ prefix=$prefix$d ++ if test -d "$prefix"; then ++ prefixes= ++ else ++ if $posix_mkdir; then ++ (umask=$mkdir_umask && ++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break ++ # Don't fail if two instances are running concurrently. ++ test -d "$prefix" || exit 1 ++ else ++ case $prefix in ++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; ++ *) qprefix=$prefix;; ++ esac ++ prefixes="$prefixes '$qprefix'" ++ fi ++ fi ++ prefix=$prefix/ ++ done + +-fi && ++ if test -n "$prefixes"; then ++ # Don't fail if two instances are running concurrently. ++ (umask $mkdir_umask && ++ eval "\$doit_exec \$mkdirprog $prefixes") || ++ test -d "$dstdir" || exit 1 ++ obsolete_mkdir_used=true ++ fi ++ fi ++ fi ++ ++ if test -n "$dir_arg"; then ++ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && ++ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || ++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 ++ else ++ ++ # Make a couple of temp file names in the proper directory. ++ dsttmp=$dstdir/_inst.$$_ ++ rmtmp=$dstdir/_rm.$$_ ++ ++ # Trap to clean up those temp files at exit. ++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ ++ # Copy the file name to the temp name. ++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && ++ ++ # and set any options; do chmod last to preserve setuid bits. ++ # ++ # If any of these fail, we abort the whole thing. If we want to ++ # ignore errors from any of these, just make sure not to ignore ++ # errors from the above "$doit $cpprog $src $dsttmp" command. ++ # ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && ++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && ++ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && ++ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && ++ ++ # If -C, don't bother to copy if it wouldn't change the file. ++ if $copy_on_change && ++ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && ++ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && ++ ++ eval "$initialize_posix_glob" && ++ $posix_glob set -f && ++ set X $old && old=:$2:$4:$5:$6 && ++ set X $new && new=:$2:$4:$5:$6 && ++ $posix_glob set +f && ++ ++ test "$old" = "$new" && ++ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 ++ then ++ rm -f "$dsttmp" ++ else ++ # Rename the file to the real destination. ++ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || ++ ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ { ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ test ! -f "$dst" || ++ $doit $rmcmd -f "$dst" 2>/dev/null || ++ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && ++ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } ++ } || ++ { echo "$0: cannot unlink or rename $dst" >&2 ++ (exit 1); exit 1 ++ } ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dst" ++ } ++ fi || exit 1 + +-# The final little trick to "correctly" pass the exit status to the exit trap. ++ trap '' 0 ++ fi ++done + +-{ +- (exit 0); exit +-} ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2.0-2.14.5/ltmain.sh +--- gtk+2.0-2.14.5.old/ltmain.sh 2008-11-13 14:17:20.000000000 +0100 ++++ gtk+2.0-2.14.5/ltmain.sh 2008-04-29 22:21:21.000000000 +0200 +@@ -1,83 +1,52 @@ +-# Generated from ltmain.m4sh. +- +-# ltmain.sh (GNU libtool) 2.2.6 +-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 +- +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 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. +- +-# GNU Libtool is free software; you can redistribute it and/or modify ++# 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, 2006, ++# 2007, 2008 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 + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + # +-# As a special exception to the GNU General Public License, +-# if you distribute this file as part of a program or library that +-# is built using GNU Libtool, you may include this file under the +-# same distribution terms that you use for the rest of that program. +-# +-# GNU Libtool is distributed in the hope that it will be useful, but ++# This program 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 + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with GNU Libtool; see the file COPYING. If not, a copy +-# can be downloaded from http://www.gnu.org/licenses/gpl.html, +-# or obtained by writing to the Free Software Foundation, Inc., +-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +- +-# Usage: $progname [OPTION]... [MODE-ARG]... +-# +-# Provide generalized library-building support services. ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # +-# --config show all configuration variables +-# --debug enable verbose shell tracing +-# -n, --dry-run display commands without modifying any files +-# --features display basic configuration information and exit +-# --mode=MODE use operation mode MODE +-# --preserve-dup-deps don't remove duplicate dependency libraries +-# --quiet, --silent don't print informational messages +-# --tag=TAG use configuration variables from tag TAG +-# -v, --verbose print informational messages (default) +-# --version print version information +-# -h, --help print short or long help message +-# +-# MODE must be one of the following: +-# +-# clean remove files from the build directory +-# compile compile a source file into a libtool object +-# execute automatically set library path, then run a program +-# finish complete the installation of libtool libraries +-# install install libraries or executables +-# link create a library or an executable +-# uninstall remove libraries from an installed directory +-# +-# MODE-ARGS vary depending on the MODE. +-# Try `$progname --help --mode=MODE' for a more detailed description of MODE. +-# +-# When reporting a bug, please describe a test case to reproduce it and +-# include the following information: +-# +-# host-triplet: $host +-# shell: $SHELL +-# compiler: $LTCC +-# compiler flags: $LTCFLAGS +-# linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.2.6 +-# automake: $automake_version +-# autoconf: $autoconf_version +-# +-# Report bugs to <bug-libtool@gnu.org>. ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++basename="s,^.*/,,g" ++ ++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh ++# is ksh but when the shell is invoked as "sh" and the current value of ++# the _XPG environment variable is not equal to 1 (one), the special ++# positional parameter $0, within a function call, is the name of the ++# function. ++progpath="$0" ++ ++# The name of this program: ++progname=`echo "$progpath" | $SED $basename` ++modename="$progname" ++ ++# Global variables: ++EXIT_SUCCESS=0 ++EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.5.26 +-VERSION=2.2.6 +-TIMESTAMP="" +-package_revision=1.3012 +VERSION="1.5.26 Debian 1.5.26-4" - TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" ++TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" - # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -@@ -2135,7 +2135,10 @@ EOF - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; -- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; +-# Be Bourne compatible ++# 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=: +@@ -91,261 +60,104 @@ + BIN_SH=xpg4; export BIN_SH # for Tru64 + DUALCASE=1; export DUALCASE # for MKS sh + +-# NLS nuisances: We save the old values to restore during execute mode. ++# Check that we have a working $echo. ++if test "X$1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X$1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then ++ # Yippee, $echo works! ++ : ++else ++ # Restart under the correct shell, and then maybe $echo will work. ++ exec $SHELL "$progpath" --no-reexec ${1+"$@"} ++fi ++ ++if test "X$1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat <<EOF ++$* ++EOF ++ exit $EXIT_SUCCESS ++fi ++ ++default_mode= ++help="Try \`$progname --help' for more information." ++magic="%%%MAGIC variable%%%" ++mkdir="mkdir" ++mv="mv -f" ++rm="rm -f" ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed="${SED}"' -e 1s/^X//' ++sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' ++# test EBCDIC or ASCII ++case `echo X|tr X '\101'` in ++ A) # ASCII based system ++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++ SP2NL='tr \040 \012' ++ NL2SP='tr \015\012 \040\040' ++ ;; ++ *) # EBCDIC based system ++ SP2NL='tr \100 \n' ++ NL2SP='tr \r\n \100\100' ++ ;; ++esac ++ ++# NLS nuisances. + # Only set LANG and LC_ALL to C if already set. + # These must not be set unconditionally because not all systems understand + # e.g. LANG=C (notably SCO). +-lt_user_locale= +-lt_safe_locale= ++# We save the old values to restore during execute mode. ++lt_env= + for lt_var in LANG LANGUAGE 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 ++ save_$lt_var=\$$lt_var ++ lt_env=\"$lt_var=\$$lt_var \$lt_env\" ++ $lt_var=C + export $lt_var +- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" +- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" + done + +-$lt_unset CDPATH +- +- +- +- +- +-: ${CP="cp -f"} +-: ${ECHO="echo"} +-: ${EGREP="/bin/grep -E"} +-: ${FGREP="/bin/grep -F"} +-: ${GREP="/bin/grep"} +-: ${LN_S="ln -s"} +-: ${MAKE="make"} +-: ${MKDIR="mkdir"} +-: ${MV="mv -f"} +-: ${RM="rm -f"} +-: ${SED="/bin/sed"} +-: ${SHELL="${CONFIG_SHELL-/bin/sh}"} +-: ${Xsed="$SED -e 1s/^X//"} +- +-# Global variables: +-EXIT_SUCCESS=0 +-EXIT_FAILURE=1 +-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. +- +-exit_status=$EXIT_SUCCESS ++if test -n "$lt_env"; then ++ lt_env="env $lt_env" ++fi + + # Make sure IFS has a sensible default + lt_nl=' + ' + IFS=" $lt_nl" + +-dirname="s,/[^/]*$,," +-basename="s,^.*/,," +- +-# func_dirname_and_basename file append nondir_replacement +-# perform func_basename and func_dirname in a single function +-# call: +-# dirname: Compute the dirname of FILE. If nonempty, +-# add APPEND to the result, otherwise set result +-# to NONDIR_REPLACEMENT. +-# value returned in "$func_dirname_result" +-# basename: Compute filename of FILE. +-# value retuned in "$func_basename_result" +-# Implementation must be kept synchronized with func_dirname +-# and func_basename. For efficiency, we do not delegate to +-# those functions but instead duplicate the functionality here. +-func_dirname_and_basename () +-{ +- # Extract subdirectory from the argument. +- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` +- if test "X$func_dirname_result" = "X${1}"; then +- func_dirname_result="${3}" +- else +- func_dirname_result="$func_dirname_result${2}" +- fi +- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +-} +- +-# Generated shell functions inserted here. +- +-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +-# is ksh but when the shell is invoked as "sh" and the current value of +-# the _XPG environment variable is not equal to 1 (one), the special +-# positional parameter $0, within a function call, is the name of the +-# function. +-progpath="$0" +- +-# The name of this program: +-# In the unlikely event $progname began with a '-', it would play havoc with +-# func_echo (imagine progname=-n), so we prepend ./ in that case: +-func_dirname_and_basename "$progpath" +-progname=$func_basename_result +-case $progname in +- -*) progname=./$progname ;; +-esac +- +-# Make sure we have an absolute path for reexecution: +-case $progpath in +- [\\/]*|[A-Za-z]:\\*) ;; +- *[\\/]*) +- progdir=$func_dirname_result +- progdir=`cd "$progdir" && pwd` +- progpath="$progdir/$progname" +- ;; +- *) +- save_IFS="$IFS" +- IFS=: +- for progdir in $PATH; do +- IFS="$save_IFS" +- test -x "$progdir/$progname" && break +- done +- IFS="$save_IFS" +- test -n "$progdir" || progdir=`pwd` +- progpath="$progdir/$progname" +- ;; +-esac +- +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed="${SED}"' -e 1s/^X//' +-sed_quote_subst='s/\([`"$\\]\)/\\\1/g' +- +-# Same as above, but do not quote variable references. +-double_quote_subst='s/\(["`\\]\)/\\\1/g' +- +-# Re-`\' parameter expansions in output of double_quote_subst that were +-# `\'-ed in input to the same. If an odd number of `\' preceded a '$' +-# in input to double_quote_subst, that '$' was protected from expansion. +-# Since each input `\' is now two `\'s, look for any number of runs of +-# four `\'s followed by two `\'s and then a '$'. `\' that '$'. +-bs='\\' +-bs2='\\\\' +-bs4='\\\\\\\\' +-dollar='\$' +-sed_double_backslash="\ +- s/$bs4/&\\ +-/g +- s/^$bs2$dollar/$bs&/ +- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g +- s/\n//g" +- +-# Standard options: +-opt_dry_run=false +-opt_help=false +-opt_quiet=false +-opt_verbose=false +-opt_warning=: +- +-# func_echo arg... +-# Echo program name prefixed message, along with the current mode +-# name if it has been set yet. +-func_echo () +-{ +- $ECHO "$progname${mode+: }$mode: $*" +-} +- +-# func_verbose arg... +-# Echo program name prefixed message in verbose mode only. +-func_verbose () +-{ +- $opt_verbose && func_echo ${1+"$@"} +- +- # A bug in bash halts the script if the last line of a function +- # fails when set -e is in force, so we need another command to +- # work around that: +- : +-} +- +-# func_error arg... +-# Echo program name prefixed message to standard error. +-func_error () +-{ +- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 +-} +- +-# func_warning arg... +-# Echo program name prefixed warning message to standard error. +-func_warning () +-{ +- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 +- +- # bash bug again: +- : +-} +- +-# func_fatal_error arg... +-# Echo program name prefixed message to standard error, and exit. +-func_fatal_error () +-{ +- func_error ${1+"$@"} +- exit $EXIT_FAILURE +-} +- +-# func_fatal_help arg... +-# Echo program name prefixed message to standard error, followed by +-# a help hint, and exit. +-func_fatal_help () +-{ +- func_error ${1+"$@"} +- func_fatal_error "$help" +-} +-help="Try \`$progname --help' for more information." ## default +- +- +-# func_grep expression filename +-# Check whether EXPRESSION matches any line of FILENAME, without output. +-func_grep () +-{ +- $GREP "$1" "$2" >/dev/null 2>&1 +-} +- +- +-# func_mkdir_p directory-path +-# Make sure the entire path to DIRECTORY-PATH is available. +-func_mkdir_p () +-{ +- my_directory_path="$1" +- my_dir_list= +- +- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then +- +- # Protect directory names starting with `-' +- case $my_directory_path in +- -*) my_directory_path="./$my_directory_path" ;; +- esac +- +- # While some portion of DIR does not yet exist... +- while test ! -d "$my_directory_path"; do +- # ...make a list in topmost first order. Use a colon delimited +- # list incase some portion of path contains whitespace. +- my_dir_list="$my_directory_path:$my_dir_list" +- +- # If the last portion added has no slash in it, the list is done +- case $my_directory_path in */*) ;; *) break ;; esac +- +- # ...otherwise throw away the child directory and loop +- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` +- done +- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` +- +- save_mkdir_p_IFS="$IFS"; IFS=':' +- for my_dir in $my_dir_list; do +- IFS="$save_mkdir_p_IFS" +- # mkdir can fail with a `File exist' error if two processes +- # try to create one of the directories concurrently. Don't +- # stop in that case! +- $MKDIR "$my_dir" 2>/dev/null || : +- done +- IFS="$save_mkdir_p_IFS" ++if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ $echo "$modename: not configured to build any kind of library" 1>&2 ++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ++ exit $EXIT_FAILURE ++fi + +- # Bail out if we (or some other process) failed to create a directory. +- test -d "$my_directory_path" || \ +- func_fatal_error "Failed to create \`$1'" +- fi +-} ++# Global variables. ++mode=$default_mode ++nonopt= ++prev= ++prevopt= ++run= ++show="$echo" ++show_help= ++execute_dlfiles= ++duplicate_deps=no ++preserve_args= ++lo2o="s/\\.lo\$/.${objext}/" ++o2lo="s/\\.${objext}\$/.lo/" ++extracted_archives= ++extracted_serial=0 + ++##################################### ++# Shell function definitions: ++# This seems to be the best place for them + + # func_mktempdir [string] + # Make a temporary directory that won't clash with other running +@@ -355,7 +167,7 @@ + { + my_template="${TMPDIR-/tmp}/${1-$progname}" + +- if test "$opt_dry_run" = ":"; then ++ if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else +@@ -364,784 +176,523 @@ + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then +- # Failing that, at least try and use $RANDOM to avoid a race +- my_tmpdir="${my_template}-${RANDOM-0}$$" ++ # Failing that, at least try and use $RANDOM to avoid a race ++ my_tmpdir="${my_template}-${RANDOM-0}$$" + +- save_mktempdir_umask=`umask` +- umask 0077 +- $MKDIR "$my_tmpdir" +- umask $save_mktempdir_umask ++ save_mktempdir_umask=`umask` ++ umask 0077 ++ $mkdir "$my_tmpdir" ++ umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure +- test -d "$my_tmpdir" || \ +- func_fatal_error "cannot create temporary directory \`$my_tmpdir'" ++ test -d "$my_tmpdir" || { ++ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 ++ exit $EXIT_FAILURE ++ } + fi + +- $ECHO "X$my_tmpdir" | $Xsed ++ $echo "X$my_tmpdir" | $Xsed + } + + +-# func_quote_for_eval arg +-# Aesthetically quote ARG to be evaled later. +-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT +-# is double-quoted, suitable for a subsequent eval, whereas +-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters +-# which are still active within double quotes backslashified. +-func_quote_for_eval () ++# func_win32_libid arg ++# return the library type of file 'arg' ++# ++# Need a lot of goo to handle *both* DLLs and import libs ++# Has to be a shell function in order to 'eat' the argument ++# that is supplied when $file_magic_command is called. ++func_win32_libid () + { +- case $1 in +- *[\\\`\"\$]*) +- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; +- *) +- func_quote_for_eval_unquoted_result="$1" ;; +- esac +- +- case $func_quote_for_eval_unquoted_result in +- # Double-quote args containing shell metacharacters to delay +- # word splitting, command substitution and and variable +- # expansion for a subsequent eval. +- # Many Bourne shells cannot handle close brackets correctly +- # in scan sets, so we specify it separately. +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" +- ;; +- *) +- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" ++ win32_libid_type="unknown" ++ win32_fileres=`file -L $1 2>/dev/null` ++ case $win32_fileres in ++ *ar\ archive\ import\ library*) # definitely import ++ win32_libid_type="x86 archive import" ++ ;; ++ *ar\ archive*) # could be an import, or static ++ 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 ++ } ++ }'` ++ case $win32_nmres in ++ import*) win32_libid_type="x86 archive import";; ++ *) win32_libid_type="x86 archive static";; ++ esac ++ fi ++ ;; ++ *DLL*) ++ win32_libid_type="x86 DLL" ++ ;; ++ *executable*) # but shell scripts are "executable" too... ++ case $win32_fileres in ++ *MS\ Windows\ PE\ Intel*) ++ win32_libid_type="x86 DLL" ++ ;; + esac ++ ;; ++ esac ++ $echo $win32_libid_type + } + + +-# func_quote_for_expand arg +-# Aesthetically quote ARG to be evaled later; same as above, +-# but do not quote variable references. +-func_quote_for_expand () ++# func_infer_tag arg ++# Infer tagged configuration to use if any are available and ++# if one wasn't chosen via the "--tag" command line option. ++# Only attempt this if the compiler in the base compile ++# command doesn't match the default compiler. ++# arg is usually of the form 'gcc ...' ++func_infer_tag () + { +- case $1 in +- *[\\\`\"]*) +- my_arg=`$ECHO "X$1" | $Xsed \ +- -e "$double_quote_subst" -e "$sed_double_backslash"` ;; ++ if test -n "$available_tags" && test -z "$tagname"; then ++ CC_quoted= ++ for arg in $CC; do ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ CC_quoted="$CC_quoted $arg" ++ done ++ case $@ in ++ # Blanks in the command may have been stripped by the calling shell, ++ # but not from the CC environment variable when configure was run. ++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; ++ # Blanks at the start of $base_compile will cause this to fail ++ # if we don't check for them as well. + *) +- my_arg="$1" ;; +- esac +- +- case $my_arg in +- # Double-quote args containing shell metacharacters to delay +- # word splitting and command substitution for a subsequent eval. +- # Many Bourne shells cannot handle close brackets correctly +- # in scan sets, so we specify it separately. +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- my_arg="\"$my_arg\"" +- ;; +- esac +- +- func_quote_for_expand_result="$my_arg" ++ for z in $available_tags; do ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then ++ # Evaluate the configuration. ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ CC_quoted= ++ for arg in $CC; do ++ # Double-quote args containing other shell metacharacters. ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ CC_quoted="$CC_quoted $arg" ++ done ++ case "$@ " in ++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ++ # The compiler in the base compile command matches ++ # the one in the tagged configuration. ++ # Assume this is the tagged configuration we want. ++ tagname=$z ++ break ++ ;; ++ esac ++ fi ++ done ++ # If $tagname still isn't set, then no tagged configuration ++ # was found and let the user know that the "--tag" command ++ # line option must be used. ++ if test -z "$tagname"; then ++ $echo "$modename: unable to infer tagged configuration" ++ $echo "$modename: specify a tag with \`--tag'" 1>&2 ++ exit $EXIT_FAILURE ++# else ++# $echo "$modename: using $tagname tagged configuration" ++ fi ++ ;; ++ esac ++ fi + } + + +-# func_show_eval cmd [fail_exp] +-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +-# is given, then evaluate it. +-func_show_eval () ++# func_extract_an_archive dir oldlib ++func_extract_an_archive () + { +- my_cmd="$1" +- my_fail_exp="${2-:}" +- +- ${opt_silent-false} || { +- func_quote_for_expand "$my_cmd" +- eval "func_echo $func_quote_for_expand_result" +- } ++ f_ex_an_ar_dir="$1"; shift ++ f_ex_an_ar_oldlib="$1" + +- if ${opt_dry_run-false}; then :; else +- eval "$my_cmd" +- my_status=$? +- if test "$my_status" -eq 0; then :; else +- eval "(exit $my_status); $my_fail_exp" +- fi ++ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" ++ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? ++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 ++ exit $EXIT_FAILURE + fi + } + +- +-# func_show_eval_locale cmd [fail_exp] +-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is +-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +-# is given, then evaluate it. Use the saved locale for evaluation. +-func_show_eval_locale () ++# func_extract_archives gentop oldlib ... ++func_extract_archives () + { +- my_cmd="$1" +- my_fail_exp="${2-:}" +- +- ${opt_silent-false} || { +- func_quote_for_expand "$my_cmd" +- eval "func_echo $func_quote_for_expand_result" +- } ++ my_gentop="$1"; shift ++ my_oldlibs=${1+"$@"} ++ my_oldobjs="" ++ my_xlib="" ++ my_xabs="" ++ my_xdir="" ++ my_status="" + +- if ${opt_dry_run-false}; then :; else +- eval "$lt_user_locale +- $my_cmd" +- my_status=$? +- eval "$lt_safe_locale" +- if test "$my_status" -eq 0; then :; else +- eval "(exit $my_status); $my_fail_exp" +- fi ++ $show "${rm}r $my_gentop" ++ $run ${rm}r "$my_gentop" ++ $show "$mkdir $my_gentop" ++ $run $mkdir "$my_gentop" ++ my_status=$? ++ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then ++ exit $my_status + fi +-} +- +- + ++ for my_xlib in $my_oldlibs; do ++ # Extract the objects. ++ case $my_xlib in ++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; ++ *) my_xabs=`pwd`"/$my_xlib" ;; ++ esac ++ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` ++ 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" + +- +-# func_version +-# Echo version message to standard output and exit. +-func_version () +-{ +- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { +- s/^# // +- s/^# *$// +- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ +- p +- }' < "$progpath" +- exit $? +-} +- +-# func_usage +-# Echo short help message to standard output and exit. +-func_usage () +-{ +- $SED -n '/^# Usage:/,/# -h/ { +- s/^# // +- s/^# *$// +- s/\$progname/'$progname'/ +- p +- }' < "$progpath" +- $ECHO +- $ECHO "run \`$progname --help | more' for full usage" +- exit $? +-} +- +-# func_help +-# Echo long help message to standard output and exit. +-func_help () +-{ +- $SED -n '/^# Usage:/,/# Report bugs to/ { +- s/^# // +- s/^# *$// +- s*\$progname*'$progname'* +- s*\$host*'"$host"'* +- s*\$SHELL*'"$SHELL"'* +- s*\$LTCC*'"$LTCC"'* +- s*\$LTCFLAGS*'"$LTCFLAGS"'* +- s*\$LD*'"$LD"'* +- s/\$with_gnu_ld/'"$with_gnu_ld"'/ +- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ +- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ +- p +- }' < "$progpath" +- exit $? +-} +- +-# func_missing_arg argname +-# Echo program name prefixed message to standard error and set global +-# exit_cmd. +-func_missing_arg () +-{ +- func_error "missing argument for $1" +- exit_cmd=exit ++ $show "${rm}r $my_xdir" ++ $run ${rm}r "$my_xdir" ++ $show "$mkdir $my_xdir" ++ $run $mkdir "$my_xdir" ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then ++ exit $exit_status ++ fi ++ case $host in ++ *-darwin*) ++ $show "Extracting $my_xabs" ++ # Do not bother doing anything if just a dry run ++ if test -z "$run"; then ++ darwin_orig_dir=`pwd` ++ cd $my_xdir || exit $? ++ darwin_archive=$my_xabs ++ darwin_curdir=`pwd` ++ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` ++ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` ++ if test -n "$darwin_arches"; then ++ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` ++ darwin_arch= ++ $show "$darwin_base_archive has multiple architectures $darwin_arches" ++ for darwin_arch in $darwin_arches ; do ++ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" ++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ func_extract_an_archive "`pwd`" "${darwin_base_archive}" ++ cd "$darwin_curdir" ++ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" ++ done # $darwin_arches ++ ## Okay now we have a bunch of thin objects, gotta fatten them up :) ++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` ++ darwin_file= ++ darwin_files= ++ for darwin_file in $darwin_filelist; do ++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ lipo -create -output "$darwin_file" $darwin_files ++ done # $darwin_filelist ++ ${rm}r unfat-$$ ++ cd "$darwin_orig_dir" ++ else ++ cd "$darwin_orig_dir" ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ fi # $darwin_arches ++ fi # $run ++ ;; ++ *) ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ ;; ++ esac ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ done ++ func_extract_archives_result="$my_oldobjs" + } ++# End of Shell function definitions ++##################################### + +-exit_cmd=: +- +- +- ++# Darwin sucks ++eval std_shrext=\"$shrext_cmds\" + ++disable_libs=no + +-# Check that we have a working $ECHO. +-if test "X$1" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +-elif test "X$1" = X--fallback-echo; then +- # Avoid inline document here, it may be left over +- : +-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then +- # Yippee, $ECHO works! +- : +-else +- # Restart under the correct shell, and then maybe $ECHO will work. +- exec $SHELL "$progpath" --no-reexec ${1+"$@"} +-fi +- +-if test "X$1" = X--fallback-echo; then +- # used as fallback echo ++# Parse our command line options once, thoroughly. ++while test "$#" -gt 0 ++do ++ arg="$1" + shift +- cat <<EOF +-$* +-EOF +- exit $EXIT_SUCCESS +-fi +- +-magic="%%%MAGIC variable%%%" +-magic_exe="%%%MAGIC EXE variable%%%" +- +-# Global variables. +-# $mode is unset +-nonopt= +-execute_dlfiles= +-preserve_args= +-lo2o="s/\\.lo\$/.${objext}/" +-o2lo="s/\\.${objext}\$/.lo/" +-extracted_archives= +-extracted_serial=0 + +-opt_dry_run=false +-opt_duplicate_deps=false +-opt_silent=false +-opt_debug=: ++ case $arg in ++ -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; ++ *) optarg= ;; ++ esac + +-# If this variable is set in any of the actions, the command in it +-# will be execed at the end. This prevents here-documents from being +-# left over by shells. +-exec_cmd= ++ # If the previous option needs an argument, assign it. ++ if test -n "$prev"; then ++ case $prev in ++ execute_dlfiles) ++ execute_dlfiles="$execute_dlfiles $arg" ++ ;; ++ tag) ++ tagname="$arg" ++ preserve_args="${preserve_args}=$arg" ++ ++ # Check whether tagname contains only valid characters ++ case $tagname in ++ *[!-_A-Za-z0-9,/]*) ++ $echo "$progname: invalid tag name: $tagname" 1>&2 ++ exit $EXIT_FAILURE ++ ;; ++ esac + +-# func_fatal_configuration arg... +-# Echo program name prefixed message to standard error, followed by +-# a configuration failure hint, and exit. +-func_fatal_configuration () +-{ +- func_error ${1+"$@"} +- func_error "See the $PACKAGE documentation for more information." +- func_fatal_error "Fatal configuration error." +-} ++ case $tagname in ++ CC) ++ # Don't test for the "default" C tag, as we know, it's there, but ++ # not specially marked. ++ ;; ++ *) ++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then ++ taglist="$taglist $tagname" ++ # Evaluate the configuration. ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" ++ else ++ $echo "$progname: ignoring unknown tag $tagname" 1>&2 ++ fi ++ ;; ++ esac ++ ;; ++ *) ++ eval "$prev=\$arg" ++ ;; ++ esac + ++ prev= ++ prevopt= ++ continue ++ fi + +-# func_config +-# Display the configuration for all the tags in this script. +-func_config () +-{ +- re_begincf='^# ### BEGIN LIBTOOL' +- re_endcf='^# ### END LIBTOOL' ++ # Have we seen a non-optional argument yet? ++ case $arg in ++ --help) ++ show_help=yes ++ ;; + +- # Default configuration. +- $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" ++ --version) ++ echo "\ ++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP ++ ++Copyright (C) 2008 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 $? ++ ;; + ++ --config) ++ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath + # Now print the configurations for the tags. + for tagname in $taglist; do +- $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" ++ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" + done +- + exit $? +-} ++ ;; + +-# func_features +-# Display the features supported by this script. +-func_features () +-{ +- $ECHO "host: $host" ++ --debug) ++ $echo "$progname: enabling shell trace mode" ++ set -x ++ preserve_args="$preserve_args $arg" ++ ;; ++ ++ --dry-run | -n) ++ run=: ++ ;; ++ ++ --features) ++ $echo "host: $host" + if test "$build_libtool_libs" = yes; then +- $ECHO "enable shared libraries" ++ $echo "enable shared libraries" + else +- $ECHO "disable shared libraries" ++ $echo "disable shared libraries" + fi + if test "$build_old_libs" = yes; then +- $ECHO "enable static libraries" ++ $echo "enable static libraries" + else +- $ECHO "disable static libraries" ++ $echo "disable static libraries" + fi +- + exit $? +-} +- +-# func_enable_tag tagname +-# Verify that TAGNAME is valid, and either flag an error and exit, or +-# enable the TAGNAME tag. We also add TAGNAME to the global $taglist +-# variable here. +-func_enable_tag () +-{ +- # Global variable: +- tagname="$1" +- +- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" +- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" +- sed_extractcf="/$re_begincf/,/$re_endcf/p" +- +- # Validate tagname. +- case $tagname in +- *[!-_A-Za-z0-9,/]*) +- func_fatal_error "invalid tag name: $tagname" +- ;; +- esac ++ ;; + +- # Don't test for the "default" C tag, as we know it's +- # there but not specially marked. +- case $tagname in +- CC) ;; +- *) +- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then +- taglist="$taglist $tagname" ++ --finish) mode="finish" ;; + +- # Evaluate the configuration. Be careful to quote the path +- # and the sed script, to avoid splitting on whitespace, but +- # also don't use non-portable quotes within backquotes within +- # quotes we have to do it in 2 steps: +- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` +- eval "$extractedcf" +- else +- func_error "ignoring unknown tag $tagname" +- fi +- ;; +- esac +-} ++ --mode) prevopt="--mode" prev=mode ;; ++ --mode=*) mode="$optarg" ;; + +-# Parse options once, thoroughly. This comes as soon as possible in +-# the script to make things like `libtool --version' happen quickly. +-{ ++ --preserve-dup-deps) duplicate_deps="yes" ;; + +- # Shorthand for --mode=foo, only valid as the first argument +- case $1 in +- clean|clea|cle|cl) +- shift; set dummy --mode clean ${1+"$@"}; shift ++ --quiet | --silent) ++ show=: ++ preserve_args="$preserve_args $arg" + ;; +- compile|compil|compi|comp|com|co|c) +- shift; set dummy --mode compile ${1+"$@"}; shift +- ;; +- execute|execut|execu|exec|exe|ex|e) +- shift; set dummy --mode execute ${1+"$@"}; shift ++ ++ --tag) ++ prevopt="--tag" ++ prev=tag ++ preserve_args="$preserve_args --tag" + ;; +- finish|finis|fini|fin|fi|f) +- shift; set dummy --mode finish ${1+"$@"}; shift ++ --tag=*) ++ set tag "$optarg" ${1+"$@"} ++ shift ++ prev=tag ++ preserve_args="$preserve_args --tag" + ;; +- install|instal|insta|inst|ins|in|i) +- shift; set dummy --mode install ${1+"$@"}; shift ++ ++ -dlopen) ++ prevopt="-dlopen" ++ prev=execute_dlfiles + ;; +- link|lin|li|l) +- shift; set dummy --mode link ${1+"$@"}; shift ++ ++ -*) ++ $echo "$modename: unrecognized option \`$arg'" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE + ;; +- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) +- shift; set dummy --mode uninstall ${1+"$@"}; shift ++ ++ *) ++ nonopt="$arg" ++ break + ;; + esac ++done + +- # Parse non-mode specific arguments: +- while test "$#" -gt 0; do +- opt="$1" +- shift +- +- case $opt in +- --config) func_config ;; +- +- --debug) preserve_args="$preserve_args $opt" +- func_echo "enabling shell trace mode" +- opt_debug='set -x' +- $opt_debug +- ;; +- +- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break +- execute_dlfiles="$execute_dlfiles $1" +- shift +- ;; +- +- --dry-run | -n) opt_dry_run=: ;; +- --features) func_features ;; +- --finish) mode="finish" ;; +- +- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break +- case $1 in +- # Valid mode arguments: +- clean) ;; +- compile) ;; +- execute) ;; +- finish) ;; +- install) ;; +- link) ;; +- relink) ;; +- uninstall) ;; +- +- # Catch anything else as an error +- *) func_error "invalid argument for $opt" +- exit_cmd=exit +- break +- ;; +- esac +- +- mode="$1" +- shift +- ;; +- +- --preserve-dup-deps) +- opt_duplicate_deps=: ;; +- +- --quiet|--silent) preserve_args="$preserve_args $opt" +- opt_silent=: +- ;; +- +- --verbose| -v) preserve_args="$preserve_args $opt" +- opt_silent=false +- ;; +- +- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break +- preserve_args="$preserve_args $opt $1" +- func_enable_tag "$1" # tagname is set here +- shift +- ;; +- +- # Separate optargs to long options: +- -dlopen=*|--mode=*|--tag=*) +- func_opt_split "$opt" +- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} +- shift +- ;; +- +- -\?|-h) func_usage ;; +- --help) opt_help=: ;; +- --version) func_version ;; ++if test -n "$prevopt"; then ++ $echo "$modename: option \`$prevopt' requires an argument" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++fi + +- -*) func_fatal_help "unrecognized option \`$opt'" ;; ++case $disable_libs in ++no) ++ ;; ++shared) ++ build_libtool_libs=no ++ build_old_libs=yes ++ ;; ++static) ++ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` ++ ;; ++esac + +- *) nonopt="$opt" +- break +- ;; +- esac +- done ++# If this variable is set in any of the actions, the command in it ++# will be execed at the end. This prevents here-documents from being ++# left over by shells. ++exec_cmd= + ++if test -z "$show_help"; then + +- case $host in +- *cygwin* | *mingw* | *pw32* | *cegcc*) +- # don't eliminate duplications in $postdeps and $predeps +- opt_duplicate_compiler_generated_deps=: ++ # Infer the operation mode. ++ if test -z "$mode"; then ++ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 ++ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 ++ case $nonopt in ++ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) ++ mode=link ++ for arg ++ do ++ case $arg in ++ -c) ++ mode=compile ++ break ++ ;; ++ esac ++ done + ;; +- *) +- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ *db | *dbx | *strace | *truss) ++ mode=execute + ;; +- esac +- +- # Having warned about all mis-specified options, bail out if +- # anything was wrong. +- $exit_cmd $EXIT_FAILURE +-} ++ *install*|cp|mv) ++ mode=install ++ ;; ++ *rm) ++ mode=uninstall ++ ;; ++ *) ++ # If we have no mode, but dlfiles were specified, then do execute mode. ++ test -n "$execute_dlfiles" && mode=execute + +-# func_check_version_match +-# Ensure that we are using m4 macros, and libtool script from the same +-# release of libtool. +-func_check_version_match () +-{ +- if test "$package_revision" != "$macro_revision"; then +- if test "$VERSION" != "$macro_version"; then +- if test -z "$macro_version"; then +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from an older release. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +-$progname: and run autoconf again. +-_LT_EOF ++ # Just use the default operation mode. ++ if test -z "$mode"; then ++ if test -n "$nonopt"; then ++ $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 ++ else ++ $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 ++ fi + fi +- else +- cat >&2 <<_LT_EOF +-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +-$progname: but the definition of this LT_INIT comes from revision $macro_revision. +-$progname: You should recreate aclocal.m4 with macros from revision $package_revision +-$progname: of $PACKAGE $VERSION and run autoconf again. +-_LT_EOF +- fi +- +- exit $EXIT_MISMATCH +- fi +-} +- +- +-## ----------- ## +-## Main. ## +-## ----------- ## +- +-$opt_help || { +- # Sanity checks first: +- func_check_version_match +- +- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then +- func_fatal_configuration "not configured to build any kind of library" ++ ;; ++ esac + fi + +- test -z "$mode" && func_fatal_error "error: you must specify a MODE." +- +- +- # Darwin sucks +- eval std_shrext=\"$shrext_cmds\" +- +- + # Only execute mode is allowed to have -dlopen flags. + if test -n "$execute_dlfiles" && test "$mode" != execute; then +- func_error "unrecognized option \`-dlopen'" +- $ECHO "$help" 1>&2 ++ $echo "$modename: unrecognized option \`-dlopen'" 1>&2 ++ $echo "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help="$help" +- help="Try \`$progname --help --mode=$mode' for more information." +-} ++ help="Try \`$modename --help --mode=$mode' for more information." + ++ # These modes are in order of execution frequency so that they run quickly. ++ case $mode in ++ # libtool compile mode ++ compile) ++ modename="$modename: compile" ++ # Get the compilation command and the source file. ++ base_compile= ++ srcfile="$nonopt" # always keep a non-empty value in "srcfile" ++ suppress_opt=yes ++ suppress_output= ++ arg_mode=normal ++ libobj= ++ later= + +-# func_lalib_p file +-# True iff FILE is a libtool `.la' library or `.lo' object file. +-# This function is only a basic sanity check; it will hardly flush out +-# determined imposters. +-func_lalib_p () +-{ +- test -f "$1" && +- $SED -e 4q "$1" 2>/dev/null \ +- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +-} ++ for arg ++ do ++ case $arg_mode in ++ arg ) ++ # do not "continue". Instead, add this to base_compile ++ lastarg="$arg" ++ arg_mode=normal ++ ;; + +-# func_lalib_unsafe_p file +-# True iff FILE is a libtool `.la' library or `.lo' object file. +-# This function implements the same check as func_lalib_p without +-# resorting to external programs. To this end, it redirects stdin and +-# closes it afterwards, without saving the original file descriptor. +-# As a safety measure, use it only where a negative result would be +-# fatal anyway. Works if `file' does not exist. +-func_lalib_unsafe_p () +-{ +- lalib_p=no +- if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then +- for lalib_p_l in 1 2 3 4 +- do +- read lalib_p_line +- case "$lalib_p_line" in +- \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; +- esac +- done +- exec 0<&5 5<&- +- fi +- test "$lalib_p" = yes +-} ++ target ) ++ libobj="$arg" ++ arg_mode=normal ++ continue ++ ;; + +-# func_ltwrapper_script_p file +-# True iff FILE is a libtool wrapper script +-# This function is only a basic sanity check; it will hardly flush out +-# determined imposters. +-func_ltwrapper_script_p () +-{ +- func_lalib_p "$1" +-} ++ normal ) ++ # Accept any command-line options. ++ case $arg in ++ -o) ++ if test -n "$libobj" ; then ++ $echo "$modename: you cannot specify \`-o' more than once" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ arg_mode=target ++ continue ++ ;; + +-# func_ltwrapper_executable_p file +-# True iff FILE is a libtool wrapper executable +-# This function is only a basic sanity check; it will hardly flush out +-# determined imposters. +-func_ltwrapper_executable_p () +-{ +- func_ltwrapper_exec_suffix= +- case $1 in +- *.exe) ;; +- *) func_ltwrapper_exec_suffix=.exe ;; +- esac +- $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +-} +- +-# func_ltwrapper_scriptname file +-# Assumes file is an ltwrapper_executable +-# uses $file to determine the appropriate filename for a +-# temporary ltwrapper_script. +-func_ltwrapper_scriptname () +-{ +- func_ltwrapper_scriptname_result="" +- if func_ltwrapper_executable_p "$1"; then +- func_dirname_and_basename "$1" "" "." +- func_stripname '' '.exe' "$func_basename_result" +- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +- fi +-} +- +-# func_ltwrapper_p file +-# True iff FILE is a libtool wrapper script or wrapper executable +-# This function is only a basic sanity check; it will hardly flush out +-# determined imposters. +-func_ltwrapper_p () +-{ +- func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" +-} +- +- +-# func_execute_cmds commands fail_cmd +-# Execute tilde-delimited COMMANDS. +-# If FAIL_CMD is given, eval that upon failure. +-# FAIL_CMD may read-access the current command in variable CMD! +-func_execute_cmds () +-{ +- $opt_debug +- save_ifs=$IFS; IFS='~' +- for cmd in $1; do +- IFS=$save_ifs +- eval cmd=\"$cmd\" +- func_show_eval "$cmd" "${2-:}" +- done +- IFS=$save_ifs +-} +- +- +-# func_source file +-# Source FILE, adding directory component if necessary. +-# Note that it is not necessary on cygwin/mingw to append a dot to +-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe +-# behavior happens only for exec(3), not for open(2)! Also, sourcing +-# `FILE.' does not work on cygwin managed mounts. +-func_source () +-{ +- $opt_debug +- case $1 in +- */* | *\\*) . "$1" ;; +- *) . "./$1" ;; +- esac +-} +- +- +-# func_infer_tag arg +-# Infer tagged configuration to use if any are available and +-# if one wasn't chosen via the "--tag" command line option. +-# Only attempt this if the compiler in the base compile +-# command doesn't match the default compiler. +-# arg is usually of the form 'gcc ...' +-func_infer_tag () +-{ +- $opt_debug +- if test -n "$available_tags" && test -z "$tagname"; then +- CC_quoted= +- for arg in $CC; do +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" +- done +- case $@ in +- # Blanks in the command may have been stripped by the calling shell, +- # but not from the CC environment variable when configure was run. +- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; +- # Blanks at the start of $base_compile will cause this to fail +- # if we don't check for them as well. +- *) +- for z in $available_tags; do +- if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" +- CC_quoted= +- for arg in $CC; do +- # Double-quote args containing other shell metacharacters. +- func_quote_for_eval "$arg" +- CC_quoted="$CC_quoted $func_quote_for_eval_result" +- done +- case "$@ " in +- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) +- # The compiler in the base compile command matches +- # the one in the tagged configuration. +- # Assume this is the tagged configuration we want. +- tagname=$z +- break +- ;; +- esac +- fi +- done +- # If $tagname still isn't set, then no tagged configuration +- # was found and let the user know that the "--tag" command +- # line option must be used. +- if test -z "$tagname"; then +- func_echo "unable to infer tagged configuration" +- func_fatal_error "specify a tag with \`--tag'" +-# else +-# func_verbose "using $tagname tagged configuration" +- fi +- ;; +- esac +- fi +-} +- +- +- +-# func_write_libtool_object output_name pic_name nonpic_name +-# Create a libtool object file (analogous to a ".la" file), +-# but don't create it if we're doing a dry run. +-func_write_libtool_object () +-{ +- write_libobj=${1} +- if test "$build_libtool_libs" = yes; then +- write_lobj=\'${2}\' +- else +- write_lobj=none +- fi +- +- if test "$build_old_libs" = yes; then +- write_oldobj=\'${3}\' +- else +- write_oldobj=none +- fi +- +- $opt_dry_run || { +- cat >${write_libobj}T <<EOF +-# $write_libobj - a libtool object file +-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +-# +-# Please DO NOT delete this file! +-# It is necessary for linking the library. +- +-# Name of the PIC object. +-pic_object=$write_lobj +- +-# Name of the non-PIC object +-non_pic_object=$write_oldobj +- +-EOF +- $MV "${write_libobj}T" "${write_libobj}" +- } +-} +- +-# func_mode_compile arg... +-func_mode_compile () +-{ +- $opt_debug +- # Get the compilation command and the source file. +- base_compile= +- srcfile="$nonopt" # always keep a non-empty value in "srcfile" +- suppress_opt=yes +- suppress_output= +- arg_mode=normal +- libobj= +- later= +- pie_flag= +- +- for arg +- do +- case $arg_mode in +- arg ) +- # do not "continue". Instead, add this to base_compile +- lastarg="$arg" +- arg_mode=normal +- ;; +- +- target ) +- libobj="$arg" +- arg_mode=normal +- continue +- ;; +- +- normal ) +- # Accept any command-line options. +- case $arg in +- -o) +- test -n "$libobj" && \ +- func_fatal_error "you cannot specify \`-o' more than once" +- arg_mode=target +- continue +- ;; +- +- -pie | -fpie | -fPIE) +- pie_flag="$pie_flag $arg" +- continue +- ;; +- +- -shared | -static | -prefer-pic | -prefer-non-pic) ++ -static | -prefer-pic | -prefer-non-pic) + later="$later $arg" + continue + ;; +@@ -1157,25 +708,31 @@ + ;; # replaced later. I would guess that would be a bug. + + -Wc,*) +- func_stripname '-Wc,' '' "$arg" +- args=$func_stripname_result ++ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` + lastarg= + save_ifs="$IFS"; IFS=',' +- for arg in $args; do ++ for arg in $args; do + IFS="$save_ifs" +- func_quote_for_eval "$arg" +- lastarg="$lastarg $func_quote_for_eval_result" ++ ++ # Double-quote args containing other shell metacharacters. ++ # Many Bourne shells cannot handle close brackets correctly ++ # in scan sets, so we specify it separately. ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ lastarg="$lastarg $arg" + done + IFS="$save_ifs" +- func_stripname ' ' '' "$lastarg" +- lastarg=$func_stripname_result ++ lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` + + # Add the arguments to base_compile. + base_compile="$base_compile $lastarg" + continue + ;; + +- *) ++ * ) + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # +@@ -1187,42 +744,66 @@ + esac # case $arg_mode + + # Aesthetically quote the previous argument. +- func_quote_for_eval "$lastarg" +- base_compile="$base_compile $func_quote_for_eval_result" ++ lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` ++ ++ case $lastarg in ++ # Double-quote args containing other shell metacharacters. ++ # Many Bourne shells cannot handle close brackets correctly ++ # in scan sets, and some SunOS ksh mistreat backslash-escaping ++ # in scan sets (worked around with variable expansion), ++ # and furthermore cannot handle '|' '&' '(' ')' in scan sets ++ # at all, so we specify them separately. ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ lastarg="\"$lastarg\"" ++ ;; ++ esac ++ ++ base_compile="$base_compile $lastarg" + done # for arg + + case $arg_mode in + arg) +- func_fatal_error "you must specify an argument for -Xcompile" ++ $echo "$modename: you must specify an argument for -Xcompile" ++ exit $EXIT_FAILURE + ;; + target) +- func_fatal_error "you must specify a target with \`-o'" ++ $echo "$modename: you must specify a target with \`-o'" 1>&2 ++ exit $EXIT_FAILURE + ;; + *) + # Get the name of the library object. +- test -z "$libobj" && { +- func_basename "$srcfile" +- libobj="$func_basename_result" +- } ++ [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` + ;; + esac + + # Recognize several different file suffixes. + # If the user specifies -o file.o, it is replaced with file.lo ++ xform='[cCFSifmso]' + case $libobj in +- *.[cCFSifmso] | \ +- *.ada | *.adb | *.ads | *.asm | \ +- *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ +- *.[fF][09]? | *.for | *.java | *.obj | *.sx) +- func_xform "$libobj" +- libobj=$func_xform_result +- ;; ++ *.ada) xform=ada ;; ++ *.adb) xform=adb ;; ++ *.ads) xform=ads ;; ++ *.asm) xform=asm ;; ++ *.c++) xform=c++ ;; ++ *.cc) xform=cc ;; ++ *.ii) xform=ii ;; ++ *.class) xform=class ;; ++ *.cpp) xform=cpp ;; ++ *.cxx) xform=cxx ;; ++ *.[fF][09]?) xform=[fF][09]. ;; ++ *.for) xform=for ;; ++ *.java) xform=java ;; ++ *.obj) xform=obj ;; ++ *.sx) xform=sx ;; + esac + ++ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` ++ + case $libobj in +- *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; ++ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; + *) +- func_fatal_error "cannot determine name of library object from \`$libobj'" ++ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 ++ exit $EXIT_FAILURE + ;; + esac + +@@ -1230,15 +811,7 @@ + + for arg in $later; do + case $arg in +- -shared) +- test "$build_libtool_libs" != yes && \ +- func_fatal_configuration "can not build a shared library" +- build_old_libs=no +- continue +- ;; +- + -static) +- build_libtool_libs=no + build_old_libs=yes + continue + ;; +@@ -1255,17 +828,28 @@ + esac + done + +- func_quote_for_eval "$libobj" +- test "X$libobj" != "X$func_quote_for_eval_result" \ +- && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ +- && func_warning "libobj name \`$libobj' may not contain shell special characters." +- func_dirname_and_basename "$obj" "/" "" +- objname="$func_basename_result" +- xdir="$func_dirname_result" ++ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` ++ case $qlibobj in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ qlibobj="\"$qlibobj\"" ;; ++ esac ++ test "X$libobj" != "X$qlibobj" \ ++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ ++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." ++ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` ++ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` ++ if test "X$xdir" = "X$obj"; then ++ xdir= ++ else ++ xdir=$xdir/ ++ fi + lobj=${xdir}$objdir/$objname + +- test -z "$base_compile" && \ +- func_fatal_help "you must specify a compilation command" ++ if test -z "$base_compile"; then ++ $echo "$modename: you must specify a compilation command" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + + # Delete any leftover library objects. + if test "$build_old_libs" = yes; then +@@ -1274,9 +858,12 @@ + removelist="$lobj $libobj ${libobj}T" + fi + ++ $run $rm $removelist ++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 ++ + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in +- cygwin* | mingw* | pw32* | os2* | cegcc*) ++ cygwin* | mingw* | pw32* | os2*) + pic_mode=default + ;; + esac +@@ -1288,8 +875,10 @@ + # Calculate the filename of the output object if compiler does + # not support -o with -c + if test "$compiler_c_o" = no; then +- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} ++ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" ++ removelist="$removelist $output_obj $lockfile" ++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 + else + output_obj= + need_locks=no +@@ -1299,13 +888,13 @@ + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test "$need_locks" = yes; then +- until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do +- func_echo "Waiting for $lockfile to be removed" ++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do ++ $show "Waiting for $lockfile to be removed" + sleep 2 + done + elif test "$need_locks" = warn; then + if test -f "$lockfile"; then +- $ECHO "\ ++ $echo "\ + *** ERROR, $lockfile exists and contains: + `cat $lockfile 2>/dev/null` + +@@ -1316,22 +905,34 @@ + avoid parallel builds (make -j) in this platform, or get a better + compiler." + +- $opt_dry_run || $RM $removelist ++ $run $rm $removelist + exit $EXIT_FAILURE + fi +- removelist="$removelist $output_obj" +- $ECHO "$srcfile" > "$lockfile" ++ $echo "$srcfile" > "$lockfile" + fi + +- $opt_dry_run || $RM $removelist +- removelist="$removelist $lockfile" +- trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 +- + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" + fi +- func_quote_for_eval "$srcfile" +- qsrcfile=$func_quote_for_eval_result ++ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` ++ case $qsrcfile in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ qsrcfile="\"$qsrcfile\"" ;; ++ esac ++ ++ $run $rm "$libobj" "${libobj}T" ++ ++ # Create a libtool object file (analogous to a ".la" file), ++ # but don't create it if we're doing a dry run. ++ test -z "$run" && cat > ${libobj}T <<EOF ++# $libobj - a libtool object file ++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP ++# ++# Please DO NOT delete this file! ++# It is necessary for linking the library. ++ ++# Name of the PIC object. ++EOF + + # Only build a PIC object if we are building libtool libraries. + if test "$build_libtool_libs" = yes; then +@@ -1345,19 +946,32 @@ + command="$base_compile $qsrcfile" + fi + +- func_mkdir_p "$xdir$objdir" ++ if test ! -d "${xdir}$objdir"; then ++ $show "$mkdir ${xdir}$objdir" ++ $run $mkdir ${xdir}$objdir ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then ++ exit $exit_status ++ fi ++ fi + + if test -z "$output_obj"; then + # Place PIC objects in $objdir + command="$command -o $lobj" + fi + +- func_show_eval_locale "$command" \ +- 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' ++ $run $rm "$lobj" "$output_obj" ++ ++ $show "$command" ++ if $run eval $lt_env "$command"; then : ++ else ++ test -n "$output_obj" && $run $rm $removelist ++ exit $EXIT_FAILURE ++ fi + + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then +- $ECHO "\ ++ $echo "\ + *** ERROR, $lockfile contains: + `cat $lockfile 2>/dev/null` + +@@ -1371,27 +985,45 @@ + avoid parallel builds (make -j) in this platform, or get a better + compiler." + +- $opt_dry_run || $RM $removelist ++ $run $rm $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then +- func_show_eval '$MV "$output_obj" "$lobj"' \ +- 'error=$?; $opt_dry_run || $RM $removelist; exit $error' ++ $show "$mv $output_obj $lobj" ++ if $run $mv $output_obj $lobj; then : ++ else ++ error=$? ++ $run $rm $removelist ++ exit $error ++ fi + fi + ++ # Append the name of the PIC object to the libtool object file. ++ test -z "$run" && cat >> ${libobj}T <<EOF ++pic_object='$objdir/$objname' ++ ++EOF ++ + # Allow error messages only from the first compilation. + if test "$suppress_opt" = yes; then +- suppress_output=' >/dev/null 2>&1' ++ suppress_output=' >/dev/null 2>&1' + fi ++ else ++ # No PIC object so indicate it doesn't exist in the libtool ++ # object file. ++ test -z "$run" && cat >> ${libobj}T <<EOF ++pic_object=none ++ ++EOF + fi + + # Only build a position-dependent object if we build old libraries. + if test "$build_old_libs" = yes; then + if test "$pic_mode" != yes; then + # Don't build PIC code +- command="$base_compile $qsrcfile$pie_flag" ++ command="$base_compile $qsrcfile" + else + command="$base_compile $qsrcfile $pic_flag" + fi +@@ -1401,12 +1033,17 @@ + + # Suppress compiler output if we already did a PIC compilation. + command="$command$suppress_output" +- func_show_eval_locale "$command" \ +- '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' ++ $run $rm "$obj" "$output_obj" ++ $show "$command" ++ if $run eval $lt_env "$command"; then : ++ else ++ $run $rm $removelist ++ exit $EXIT_FAILURE ++ fi + + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then +- $ECHO "\ ++ $echo "\ + *** ERROR, $lockfile contains: + `cat $lockfile 2>/dev/null` + +@@ -1420,6777 +1057,5485 @@ + avoid parallel builds (make -j) in this platform, or get a better + compiler." + +- $opt_dry_run || $RM $removelist ++ $run $rm $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed + if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then +- func_show_eval '$MV "$output_obj" "$obj"' \ +- 'error=$?; $opt_dry_run || $RM $removelist; exit $error' ++ $show "$mv $output_obj $obj" ++ if $run $mv $output_obj $obj; then : ++ else ++ error=$? ++ $run $rm $removelist ++ exit $error ++ fi + fi ++ ++ # Append the name of the non-PIC object the libtool object file. ++ # Only append if the libtool object file exists. ++ test -z "$run" && cat >> ${libobj}T <<EOF ++# Name of the non-PIC object. ++non_pic_object='$objname' ++ ++EOF ++ else ++ # Append the name of the non-PIC object the libtool object file. ++ # Only append if the libtool object file exists. ++ test -z "$run" && cat >> ${libobj}T <<EOF ++# Name of the non-PIC object. ++non_pic_object=none ++ ++EOF + fi + +- $opt_dry_run || { +- func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" ++ $run $mv "${libobj}T" "${libobj}" + +- # Unlock the critical section if it was locked +- if test "$need_locks" != no; then +- removelist=$lockfile +- $RM "$lockfile" +- fi +- } ++ # Unlock the critical section if it was locked ++ if test "$need_locks" != no; then ++ $run $rm "$lockfile" ++ fi + + exit $EXIT_SUCCESS +-} ++ ;; + +-$opt_help || { +-test "$mode" = compile && func_mode_compile ${1+"$@"} +-} ++ # libtool link mode ++ link | relink) ++ modename="$modename: link" ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ # It is impossible to link a dll without this setting, and ++ # we shouldn't force the makefile maintainer to figure out ++ # which system we are compiling for in order to pass an extra ++ # flag for every libtool invocation. ++ # allow_undefined=no + +-func_mode_help () +-{ +- # We need to display help for each of the modes. +- case $mode in +- "") +- # Generic help is extracted from the usage comments +- # at the start of this file. +- func_help +- ;; ++ # FIXME: Unfortunately, there are problems with the above when trying ++ # to make a dll which has undefined symbols, in which case not ++ # even a static library is built. For now, we need to specify ++ # -no-undefined on the libtool link line when we can be certain ++ # that all symbols are satisfied, otherwise we get a static library. ++ allow_undefined=yes ++ ;; ++ *) ++ allow_undefined=yes ++ ;; ++ esac ++ libtool_args="$nonopt" ++ base_compile="$nonopt $@" ++ compile_command="$nonopt" ++ finalize_command="$nonopt" + +- clean) +- $ECHO \ +-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... ++ compile_rpath= ++ finalize_rpath= ++ compile_shlibpath= ++ finalize_shlibpath= ++ convenience= ++ old_convenience= ++ deplibs= ++ old_deplibs= ++ compiler_flags= ++ linker_flags= ++ dllsearchpath= ++ lib_search_path=`pwd` ++ inst_prefix_dir= + +-Remove files from the build directory. ++ avoid_version=no ++ dlfiles= ++ dlprefiles= ++ dlself=no ++ export_dynamic=no ++ export_symbols= ++ export_symbols_regex= ++ generated= ++ libobjs= ++ ltlibs= ++ module=no ++ no_install=no ++ objs= ++ non_pic_objects= ++ notinst_path= # paths that contain not-installed libtool libraries ++ precious_files_regex= ++ prefer_static_libs=no ++ preload=no ++ prev= ++ prevarg= ++ release= ++ rpath= ++ xrpath= ++ perm_rpath= ++ temp_rpath= ++ thread_safe=no ++ vinfo= ++ vinfo_number=no ++ single_module="${wl}-single_module" + +-RM is the name of the program to use to delete files associated with each FILE +-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +-to RM. ++ func_infer_tag $base_compile + +-If FILE is a libtool library, object or program, all the files associated +-with it are deleted. Otherwise, only FILE itself is deleted using RM." +- ;; +- +- compile) +- $ECHO \ +-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE +- +-Compile a source file into a libtool library object. +- +-This mode accepts the following additional options: +- +- -o OUTPUT-FILE set the output file name to OUTPUT-FILE +- -no-suppress do not suppress compiler output for multiple passes +- -prefer-pic try to building PIC objects only +- -prefer-non-pic try to building non-PIC objects only +- -shared do not build a \`.o' file suitable for static linking +- -static only build a \`.o' file suitable for static linking +- +-COMPILE-COMMAND is a command to be used in creating a \`standard' object file +-from the given SOURCEFILE. +- +-The output file name is determined by removing the directory component from +-SOURCEFILE, then substituting the C source code suffix \`.c' with the +-library object suffix, \`.lo'." +- ;; +- +- execute) +- $ECHO \ +-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... +- +-Automatically set library path, then run a program. +- +-This mode accepts the following additional options: +- +- -dlopen FILE add the directory containing FILE to the library path +- +-This mode sets the library path environment variable according to \`-dlopen' +-flags. +- +-If any of the ARGS are libtool executable wrappers, then they are translated +-into their corresponding uninstalled binary, and any of their required library +-directories are added to the library path. +- +-Then, COMMAND is executed, with ARGS as arguments." +- ;; +- +- finish) +- $ECHO \ +-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... ++ # We need to know -static, to get the right output filenames. ++ for arg ++ do ++ case $arg in ++ -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 ++ if test -n "$link_static_flag"; then ++ dlopen_self=$dlopen_self_static ++ fi ++ prefer_static_libs=yes ++ ;; ++ -static) ++ if test -z "$pic_flag" && test -n "$link_static_flag"; then ++ dlopen_self=$dlopen_self_static ++ fi ++ prefer_static_libs=built ++ ;; ++ -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 ++ ;; ++ esac ++ done + +-Complete the installation of libtool libraries. ++ # See if our shared archives depend on static archives. ++ test -n "$old_archive_from_new_cmds" && build_old_libs=yes + +-Each LIBDIR is a directory that contains libtool libraries. ++ # Go through the arguments, transforming them on the way. ++ while test "$#" -gt 0; do ++ arg="$1" ++ shift ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test ++ ;; ++ *) qarg=$arg ;; ++ esac ++ libtool_args="$libtool_args $qarg" + +-The commands that this mode executes may require superuser privileges. Use +-the \`--dry-run' option if you just want to see what would be executed." +- ;; ++ # If the previous option needs an argument, assign it. ++ if test -n "$prev"; then ++ case $prev in ++ output) ++ compile_command="$compile_command @OUTPUT@" ++ finalize_command="$finalize_command @OUTPUT@" ++ ;; ++ esac + +- install) +- $ECHO \ +-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... ++ case $prev in ++ dlfiles|dlprefiles) ++ if test "$preload" = no; then ++ # Add the symbol object into the linking commands. ++ compile_command="$compile_command @SYMFILE@" ++ finalize_command="$finalize_command @SYMFILE@" ++ preload=yes ++ fi ++ case $arg in ++ *.la | *.lo) ;; # We handle these cases below. ++ force) ++ if test "$dlself" = no; then ++ dlself=needless ++ export_dynamic=yes ++ fi ++ prev= ++ continue ++ ;; ++ self) ++ if test "$prev" = dlprefiles; then ++ dlself=yes ++ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then ++ dlself=yes ++ else ++ dlself=needless ++ export_dynamic=yes ++ fi ++ prev= ++ continue ++ ;; ++ *) ++ if test "$prev" = dlfiles; then ++ dlfiles="$dlfiles $arg" ++ else ++ dlprefiles="$dlprefiles $arg" ++ fi ++ prev= ++ continue ++ ;; ++ esac ++ ;; ++ expsyms) ++ export_symbols="$arg" ++ if test ! -f "$arg"; then ++ $echo "$modename: symbol file \`$arg' does not exist" ++ exit $EXIT_FAILURE ++ fi ++ prev= ++ continue ++ ;; ++ expsyms_regex) ++ export_symbols_regex="$arg" ++ prev= ++ continue ++ ;; ++ inst_prefix) ++ inst_prefix_dir="$arg" ++ prev= ++ continue ++ ;; ++ precious_regex) ++ precious_files_regex="$arg" ++ prev= ++ continue ++ ;; ++ release) ++ release="-$arg" ++ prev= ++ continue ++ ;; ++ objectlist) ++ if test -f "$arg"; then ++ save_arg=$arg ++ moreargs= ++ for fil in `cat $save_arg` ++ do ++# moreargs="$moreargs $fil" ++ arg=$fil ++ # A libtool-controlled object. + +-Install executables or libraries. ++ # Check to see that this really is a libtool object. ++ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then ++ pic_object= ++ non_pic_object= + +-INSTALL-COMMAND is the installation command. The first component should be +-either the \`install' or \`cp' program. ++ # Read the .lo file ++ # If there is no directory component, then add one. ++ case $arg in ++ */* | *\\*) . $arg ;; ++ *) . ./$arg ;; ++ esac + +-The following components of INSTALL-COMMAND are treated specially: ++ if test -z "$pic_object" || \ ++ test -z "$non_pic_object" || ++ test "$pic_object" = none && \ ++ test "$non_pic_object" = none; then ++ $echo "$modename: cannot find name of object for \`$arg'" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation ++ # Extract subdirectory from the argument. ++ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` ++ if test "X$xdir" = "X$arg"; then ++ xdir= ++ else ++ xdir="$xdir/" ++ fi + +-The rest of the components are interpreted as arguments to that command (only +-BSD-compatible install options are recognized)." +- ;; ++ if test "$pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ pic_object="$xdir$pic_object" + +- link) +- $ECHO \ +-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... ++ if test "$prev" = dlfiles; then ++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then ++ dlfiles="$dlfiles $pic_object" ++ prev= ++ continue ++ else ++ # If libtool objects are unsupported, then we need to preload. ++ prev=dlprefiles ++ fi ++ fi + +-Link object files or libraries together to form another library, or to +-create an executable program. ++ # CHECK ME: I think I busted this. -Ossama ++ if test "$prev" = dlprefiles; then ++ # Preload the old-style object. ++ dlprefiles="$dlprefiles $pic_object" ++ prev= ++ fi + +-LINK-COMMAND is a command using the C compiler that you would use to create +-a program from several object files. ++ # A PIC object. ++ libobjs="$libobjs $pic_object" ++ arg="$pic_object" ++ fi + +-The following components of LINK-COMMAND are treated specially: ++ # Non-PIC object. ++ if test "$non_pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ non_pic_object="$xdir$non_pic_object" + +- -all-static do not do any dynamic linking at all +- -avoid-version do not add a version suffix if possible +- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime +- -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 +- -export-symbols-regex 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 +- -no-fast-install disable the fast-install mode +- -no-install link a not-installable executable +- -no-undefined declare that a library does not refer to external symbols +- -o OUTPUT-FILE create OUTPUT-FILE from the specified objects +- -objectlist FILE Use a list of object files found in FILE to specify objects +- -precious-files-regex REGEX +- don't remove output files matching REGEX +- -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 +- -shared only do dynamic linking of libtool libraries +- -shrext SUFFIX override the standard shared library file extension +- -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] +- -weak LIBNAME declare that the target provides the LIBNAME interface ++ # A standard non-PIC object ++ non_pic_objects="$non_pic_objects $non_pic_object" ++ if test -z "$pic_object" || test "$pic_object" = none ; then ++ arg="$non_pic_object" ++ fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ non_pic_objects="$non_pic_objects $non_pic_object" ++ fi ++ else ++ # Only an error if not doing a dry-run. ++ if test -z "$run"; then ++ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 ++ exit $EXIT_FAILURE ++ else ++ # Dry-run case. + +-All other options (arguments beginning with \`-') are ignored. ++ # Extract subdirectory from the argument. ++ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` ++ if test "X$xdir" = "X$arg"; then ++ xdir= ++ else ++ xdir="$xdir/" ++ fi + +-Every other argument is treated as a filename. Files ending in \`.la' are +-treated as uninstalled libtool libraries, other files are standard or library +-object files. +- +-If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +-only library objects (\`.lo' files) may be specified, and \`-rpath' is +-required, except when creating a convenience library. +- +-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +-using \`ar' and \`ranlib', or on Windows using \`lib'. +- +-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +-is created, otherwise an executable program is created." +- ;; +- +- uninstall) +- $ECHO \ +-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... ++ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` ++ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` ++ libobjs="$libobjs $pic_object" ++ non_pic_objects="$non_pic_objects $non_pic_object" ++ fi ++ fi ++ done ++ else ++ $echo "$modename: link input file \`$save_arg' does not exist" ++ exit $EXIT_FAILURE ++ fi ++ arg=$save_arg ++ prev= ++ continue ++ ;; ++ rpath | xrpath) ++ # We need an absolute path. ++ case $arg in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ $echo "$modename: only absolute run-paths are allowed" 1>&2 ++ exit $EXIT_FAILURE ++ ;; ++ esac ++ if test "$prev" = rpath; then ++ case "$rpath " in ++ *" $arg "*) ;; ++ *) rpath="$rpath $arg" ;; ++ esac ++ else ++ case "$xrpath " in ++ *" $arg "*) ;; ++ *) xrpath="$xrpath $arg" ;; ++ esac ++ fi ++ prev= ++ continue ++ ;; ++ xcompiler) ++ compiler_flags="$compiler_flags $qarg" ++ prev= ++ compile_command="$compile_command $qarg" ++ finalize_command="$finalize_command $qarg" ++ continue ++ ;; ++ xlinker) ++ linker_flags="$linker_flags $qarg" ++ compiler_flags="$compiler_flags $wl$qarg" ++ prev= ++ compile_command="$compile_command $wl$qarg" ++ finalize_command="$finalize_command $wl$qarg" ++ continue ++ ;; ++ xcclinker) ++ linker_flags="$linker_flags $qarg" ++ compiler_flags="$compiler_flags $qarg" ++ prev= ++ compile_command="$compile_command $qarg" ++ finalize_command="$finalize_command $qarg" ++ continue ++ ;; ++ shrext) ++ shrext_cmds="$arg" ++ prev= ++ continue ++ ;; ++ darwin_framework|darwin_framework_skip) ++ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ prev= ++ continue ++ ;; ++ *) ++ eval "$prev=\"\$arg\"" ++ prev= ++ continue ++ ;; ++ esac ++ fi # test -n "$prev" + +-Remove libraries from an installation directory. ++ prevarg="$arg" + +-RM is the name of the program to use to delete files associated with each FILE +-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +-to RM. ++ case $arg in ++ -all-static) ++ if test -n "$link_static_flag"; then ++ compile_command="$compile_command $link_static_flag" ++ finalize_command="$finalize_command $link_static_flag" ++ fi ++ continue ++ ;; + +-If FILE is a libtool library, all the files associated with it are deleted. +-Otherwise, only FILE itself is deleted using RM." +- ;; ++ -allow-undefined) ++ # FIXME: remove this flag sometime in the future. ++ $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 ++ continue ++ ;; + +- *) +- func_fatal_help "invalid operation mode \`$mode'" +- ;; +- esac ++ -avoid-version) ++ avoid_version=yes ++ continue ++ ;; + +- $ECHO +- $ECHO "Try \`$progname --help' for more information about other modes." ++ -dlopen) ++ prev=dlfiles ++ continue ++ ;; + +- exit $? +-} ++ -dlpreopen) ++ prev=dlprefiles ++ continue ++ ;; + +- # Now that we've collected a possible --mode arg, show help if necessary +- $opt_help && func_mode_help ++ -export-dynamic) ++ export_dynamic=yes ++ continue ++ ;; + ++ -export-symbols | -export-symbols-regex) ++ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then ++ $echo "$modename: more than one -exported-symbols argument is not allowed" ++ exit $EXIT_FAILURE ++ fi ++ if test "X$arg" = "X-export-symbols"; then ++ prev=expsyms ++ else ++ prev=expsyms_regex ++ fi ++ continue ++ ;; + +-# func_mode_execute arg... +-func_mode_execute () +-{ +- $opt_debug +- # The first argument is the command name. +- cmd="$nonopt" +- test -z "$cmd" && \ +- func_fatal_help "you must specify a COMMAND" ++ -framework|-arch|-isysroot) ++ case " $CC " in ++ *" ${arg} ${1} "* | *" ${arg} ${1} "*) ++ prev=darwin_framework_skip ;; ++ *) compiler_flags="$compiler_flags $arg" ++ prev=darwin_framework ;; ++ esac ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ continue ++ ;; + +- # Handle -dlopen flags immediately. +- for file in $execute_dlfiles; do +- test -f "$file" \ +- || func_fatal_help "\`$file' is not a file" ++ -inst-prefix-dir) ++ prev=inst_prefix ++ continue ++ ;; + +- dir= +- case $file in +- *.la) +- # Check to see that this really is a libtool archive. +- func_lalib_unsafe_p "$file" \ +- || func_fatal_help "\`$lib' is not a valid libtool archive" ++ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* ++ # so, if we see these flags be careful not to treat them like -L ++ -L[A-Z][A-Z]*:*) ++ case $with_gcc/$host in ++ no/*-*-irix* | /*-*-irix*) ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ ;; ++ esac ++ continue ++ ;; + +- # Read the libtool library. +- dlname= +- library_names= +- func_source "$file" ++ -L*) ++ dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` ++ # We need an absolute path. ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ absdir=`cd "$dir" && pwd` ++ if test -z "$absdir"; then ++ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 ++ absdir="$dir" ++ notinst_path="$notinst_path $dir" ++ fi ++ dir="$absdir" ++ ;; ++ esac ++ case "$deplibs " in ++ *" -L$dir "*) ;; ++ *) ++ deplibs="$deplibs -L$dir" ++ lib_search_path="$lib_search_path $dir" ++ ;; ++ esac ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` ++ case :$dllsearchpath: in ++ *":$dir:"*) ;; ++ *) dllsearchpath="$dllsearchpath:$dir";; ++ esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac ++ ;; ++ esac ++ continue ++ ;; + +- # Skip this library if it cannot be dlopened. +- if test -z "$dlname"; then +- # Warn if it was a shared library. +- test -n "$library_names" && \ +- func_warning "\`$file' was not linked with \`-export-dynamic'" +- continue ++ -l*) ++ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) ++ # These systems don't actually have a C or math library (as such) ++ continue ++ ;; ++ *-*-os2*) ++ # These systems don't actually have a C library (as such) ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ # Do not include libc due to us having libc/libc_r. ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C and math libraries are in the System framework ++ deplibs="$deplibs -framework System" ++ continue ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ test "X$arg" = "X-lc" && continue ++ ;; ++ esac ++ elif test "X$arg" = "X-lc_r"; then ++ case $host in ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ # Do not include libc_r directly, use -pthread flag. ++ continue ++ ;; ++ esac + fi ++ deplibs="$deplibs $arg" ++ continue ++ ;; + +- func_dirname "$file" "" "." +- dir="$func_dirname_result" +- +- if test -f "$dir/$objdir/$dlname"; then +- dir="$dir/$objdir" +- else +- if test ! -f "$dir/$dlname"; then +- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" +- fi +- fi ++ # Tru64 UNIX uses -model [arg] to determine the layout of C++ ++ # classes, name mangling, and exception handling. ++ -model) ++ compile_command="$compile_command $arg" ++ compiler_flags="$compiler_flags $arg" ++ finalize_command="$finalize_command $arg" ++ prev=xcompiler ++ continue + ;; + +- *.lo) +- # Just add the directory containing the .lo file. +- func_dirname "$file" "" "." +- dir="$func_dirname_result" ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ compiler_flags="$compiler_flags $arg" ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ continue + ;; + +- *) +- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" ++ -multi_module) ++ single_module="${wl}-multi_module" + continue + ;; +- esac + +- # Get the absolute pathname. +- absdir=`cd "$dir" && pwd` +- test -n "$absdir" && dir="$absdir" ++ -module) ++ module=yes ++ continue ++ ;; + +- # Now add the directory to shlibpath_var. +- if eval "test -z \"\$$shlibpath_var\""; then +- eval "$shlibpath_var=\"\$dir\"" +- else +- eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" +- fi +- done ++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler ++ # -r[0-9][0-9]* specifies the processor on the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler ++ # +DA*, +DD* enable 64-bit mode on the HP compiler ++ # -q* pass through compiler args for the IBM compiler ++ # -m* pass through architecture-specific compiler args for GCC ++ # -m*, -t[45]*, -txscale* pass through architecture-specific ++ # compiler args 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*| \ ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + +- # This variable tells wrapper scripts just to set shlibpath_var +- # rather than running their programs. +- libtool_execute_magic="$magic" ++ # Unknown arguments in both finalize_command and compile_command need ++ # to be aesthetically quoted because they are evaled later. ++ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ compiler_flags="$compiler_flags $arg" ++ continue ++ ;; + +- # Check if any of the arguments is a wrapper script. +- args= +- for file +- do +- case $file in +- -*) ;; +- *) +- # Do a test to see if this is really a libtool program. +- if func_ltwrapper_script_p "$file"; then +- func_source "$file" +- # Transform arg to wrapped name. +- file="$progdir/$program" +- elif func_ltwrapper_executable_p "$file"; then +- func_ltwrapper_scriptname "$file" +- func_source "$func_ltwrapper_scriptname_result" +- # Transform arg to wrapped name. +- file="$progdir/$program" +- fi ++ -shrext) ++ prev=shrext ++ continue + ;; +- esac +- # Quote arguments (to preserve shell metacharacters). +- func_quote_for_eval "$file" +- args="$args $func_quote_for_eval_result" +- done +- +- if test "X$opt_dry_run" = Xfalse; then +- if test -n "$shlibpath_var"; then +- # Export the shlibpath_var. +- eval "export $shlibpath_var" +- fi +- +- # Restore saved environment variables +- for lt_var in LANG LANGUAGE 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 +- else +- $lt_unset $lt_var +- fi" +- done +- +- # Now prepare to actually exec the command. +- exec_cmd="\$cmd$args" +- else +- # Display what would be done. +- if test -n "$shlibpath_var"; then +- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" +- $ECHO "export $shlibpath_var" +- fi +- $ECHO "$cmd$args" +- exit $EXIT_SUCCESS +- fi +-} +- +-test "$mode" = execute && func_mode_execute ${1+"$@"} +- +- +-# func_mode_finish arg... +-func_mode_finish () +-{ +- $opt_debug +- libdirs="$nonopt" +- admincmds= +- +- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then +- for dir +- do +- libdirs="$libdirs $dir" +- done +- +- for libdir in $libdirs; do +- if test -n "$finish_cmds"; then +- # Do each command in the finish commands. +- func_execute_cmds "$finish_cmds" 'admincmds="$admincmds +-'"$cmd"'"' +- fi +- if test -n "$finish_eval"; then +- # Do the single finish_eval. +- eval cmds=\"$finish_eval\" +- $opt_dry_run || eval "$cmds" || admincmds="$admincmds +- $cmds" +- fi +- done +- fi + +- # Exit here if they wanted silent mode. +- $opt_silent && exit $EXIT_SUCCESS ++ -no-fast-install) ++ fast_install=no ++ continue ++ ;; + +- $ECHO "X----------------------------------------------------------------------" | $Xsed +- $ECHO "Libraries have been installed in:" +- for libdir in $libdirs; do +- $ECHO " $libdir" +- done +- $ECHO +- $ECHO "If you ever happen to want to link against installed libraries" +- $ECHO "in a given directory, LIBDIR, you must either use libtool, and" +- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" +- $ECHO "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" +- $ECHO " during execution" +- fi +- if test -n "$runpath_var"; then +- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" +- $ECHO " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval flag=\"$hardcode_libdir_flag_spec\" ++ -no-install) ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) ++ # The PATH hackery in wrapper scripts is required on Windows ++ # 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 ++ ;; ++ *) no_install=yes ;; ++ esac ++ continue ++ ;; + +- $ECHO " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $ECHO " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- $ECHO ++ -no-undefined) ++ allow_undefined=no ++ continue ++ ;; + +- $ECHO "See any operating system documentation about shared libraries for" +- case $host in +- solaris2.[6789]|solaris2.1[0-9]) +- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" +- $ECHO "pages." ++ -objectlist) ++ prev=objectlist ++ continue + ;; +- *) +- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." +- ;; +- esac +- $ECHO "X----------------------------------------------------------------------" | $Xsed +- exit $EXIT_SUCCESS +-} + +-test "$mode" = finish && func_mode_finish ${1+"$@"} ++ -o) prev=output ;; + ++ -precious-files-regex) ++ prev=precious_regex ++ continue ++ ;; + +-# func_mode_install arg... +-func_mode_install () +-{ +- $opt_debug +- # There may be an optional sh(1) argument at the beginning of +- # install_prog (especially on Windows NT). +- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || +- # Allow the use of GNU shtool's install command. +- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then +- # Aesthetically quote it. +- func_quote_for_eval "$nonopt" +- install_prog="$func_quote_for_eval_result " +- arg=$1 +- shift +- else +- install_prog= +- arg=$nonopt +- fi ++ -release) ++ prev=release ++ continue ++ ;; + +- # The real first argument should be the name of the installation program. +- # Aesthetically quote it. +- func_quote_for_eval "$arg" +- install_prog="$install_prog$func_quote_for_eval_result" ++ -rpath) ++ prev=rpath ++ continue ++ ;; + +- # We need to accept at least all the BSD install flags. +- dest= +- files= +- opts= +- prev= +- install_type= +- isdir=no +- stripme= +- for arg +- do +- if test -n "$dest"; then +- files="$files $dest" +- dest=$arg ++ -R) ++ prev=xrpath + continue +- fi ++ ;; + +- case $arg in +- -d) isdir=yes ;; +- -f) +- case " $install_prog " in +- *[\\\ /]cp\ *) ;; +- *) prev=$arg ;; ++ -R*) ++ dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` ++ # We need an absolute path. ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ $echo "$modename: only absolute run-paths are allowed" 1>&2 ++ exit $EXIT_FAILURE ++ ;; + esac ++ case "$xrpath " in ++ *" $dir "*) ;; ++ *) xrpath="$xrpath $dir" ;; ++ esac ++ continue + ;; +- -g | -m | -o) +- prev=$arg ++ ++ -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 ++ # would be equivalent was wrong. It would break on at least ++ # Digital Unix and AIX. ++ continue + ;; +- -s) +- stripme=" -s" ++ ++ -thread-safe) ++ thread_safe=yes + continue + ;; +- -*) ++ ++ -version-info) ++ prev=vinfo ++ continue + ;; +- *) +- # If the previous option needed an argument, then skip it. +- if test -n "$prev"; then +- prev= +- else +- dest=$arg +- continue +- fi ++ -version-number) ++ prev=vinfo ++ vinfo_number=yes ++ continue + ;; +- esac + +- # Aesthetically quote the argument. +- func_quote_for_eval "$arg" +- install_prog="$install_prog $func_quote_for_eval_result" +- done ++ -Wc,*) ++ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` ++ arg= ++ save_ifs="$IFS"; IFS=',' ++ for flag in $args; do ++ IFS="$save_ifs" ++ case $flag in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ flag="\"$flag\"" ++ ;; ++ esac ++ arg="$arg $wl$flag" ++ compiler_flags="$compiler_flags $flag" ++ done ++ IFS="$save_ifs" ++ arg=`$echo "X$arg" | $Xsed -e "s/^ //"` ++ ;; + +- test -z "$install_prog" && \ +- func_fatal_help "you must specify an install program" ++ -Wl,*) ++ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` ++ arg= ++ save_ifs="$IFS"; IFS=',' ++ for flag in $args; do ++ IFS="$save_ifs" ++ case $flag in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ flag="\"$flag\"" ++ ;; ++ esac ++ arg="$arg $wl$flag" ++ compiler_flags="$compiler_flags $wl$flag" ++ linker_flags="$linker_flags $flag" ++ done ++ IFS="$save_ifs" ++ arg=`$echo "X$arg" | $Xsed -e "s/^ //"` ++ ;; + +- test -n "$prev" && \ +- func_fatal_help "the \`$prev' option requires an argument" ++ -Xcompiler) ++ prev=xcompiler ++ continue ++ ;; + +- if test -z "$files"; then +- if test -z "$dest"; then +- func_fatal_help "no file or destination specified" +- else +- func_fatal_help "you must specify a destination" +- fi +- fi ++ -Xlinker) ++ prev=xlinker ++ continue ++ ;; + +- # Strip any trailing slash from the destination. +- func_stripname '' '/' "$dest" +- dest=$func_stripname_result +- +- # Check to see that the destination is a directory. +- test -d "$dest" && isdir=yes +- if test "$isdir" = yes; then +- destdir="$dest" +- destname= +- else +- func_dirname_and_basename "$dest" "" "." +- destdir="$func_dirname_result" +- destname="$func_basename_result" ++ -XCClinker) ++ prev=xcclinker ++ continue ++ ;; + +- # Not a directory, so check to see that there is only one file specified. +- set dummy $files; shift +- test "$#" -gt 1 && \ +- func_fatal_help "\`$dest' is not a directory" +- fi +- case $destdir in +- [\\/]* | [A-Za-z]:[\\/]*) ;; +- *) +- for file in $files; do +- case $file in +- *.lo) ;; +- *) +- func_fatal_help "\`$destdir' must be an absolute directory name" ++ # Some other compiler flag. ++ -* | +*) ++ # Unknown arguments in both finalize_command and compile_command need ++ # to be aesthetically quoted because they are evaled later. ++ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" + ;; + esac +- done +- ;; +- esac +- +- # This variable tells wrapper scripts just to set variables rather +- # than running their programs. +- libtool_install_magic="$magic" +- +- staticlibs= +- future_libdirs= +- current_libdirs= +- for file in $files; do ++ ;; + +- # Do each installation. +- case $file in +- *.$libext) +- # Do the static libraries later. +- staticlibs="$staticlibs $file" ++ *.$objext) ++ # A standard object. ++ objs="$objs $arg" + ;; + +- *.la) +- # Check to see that this really is a libtool archive. +- func_lalib_unsafe_p "$file" \ +- || func_fatal_help "\`$file' is not a valid libtool archive" ++ *.lo) ++ # A libtool-controlled object. + +- library_names= +- old_library= +- relink_command= +- func_source "$file" ++ # Check to see that this really is a libtool object. ++ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then ++ pic_object= ++ non_pic_object= + +- # Add the libdir to current_libdirs if it is the destination. +- if test "X$destdir" = "X$libdir"; then +- case "$current_libdirs " in +- *" $libdir "*) ;; +- *) current_libdirs="$current_libdirs $libdir" ;; +- esac +- else +- # Note the libdir as a future libdir. +- case "$future_libdirs " in +- *" $libdir "*) ;; +- *) future_libdirs="$future_libdirs $libdir" ;; ++ # Read the .lo file ++ # If there is no directory component, then add one. ++ case $arg in ++ */* | *\\*) . $arg ;; ++ *) . ./$arg ;; + esac +- fi +- +- func_dirname "$file" "/" "" +- dir="$func_dirname_result" +- dir="$dir$objdir" +- +- if test -n "$relink_command"; then +- # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` + +- # Don't allow the user to place us outside of our expected +- # location b/c this prevents finding dependent libraries that +- # are installed to the same prefix. +- # At present, this check doesn't affect windows .dll's that +- # are installed into $libdir/../bin (currently, that works fine) +- # but it's something to keep an eye on. +- test "$inst_prefix_dir" = "$destdir" && \ +- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" ++ if test -z "$pic_object" || \ ++ test -z "$non_pic_object" || ++ test "$pic_object" = none && \ ++ test "$non_pic_object" = none; then ++ $echo "$modename: cannot find name of object for \`$arg'" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- if test -n "$inst_prefix_dir"; then +- # Stick the inst_prefix_dir data into the link command. +- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` +- else +- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` ++ # Extract subdirectory from the argument. ++ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` ++ if test "X$xdir" = "X$arg"; then ++ xdir= ++ else ++ xdir="$xdir/" + fi + +- func_warning "relinking \`$file'" +- func_show_eval "$relink_command" \ +- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' +- fi ++ if test "$pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ pic_object="$xdir$pic_object" + +- # See the names of the shared library. +- set dummy $library_names; shift +- if test -n "$1"; then +- realname="$1" +- shift ++ if test "$prev" = dlfiles; then ++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then ++ dlfiles="$dlfiles $pic_object" ++ prev= ++ continue ++ else ++ # If libtool objects are unsupported, then we need to preload. ++ prev=dlprefiles ++ fi ++ fi + +- srcname="$realname" +- test -n "$relink_command" && srcname="$realname"T ++ # CHECK ME: I think I busted this. -Ossama ++ if test "$prev" = dlprefiles; then ++ # Preload the old-style object. ++ dlprefiles="$dlprefiles $pic_object" ++ prev= ++ fi + +- # Install the shared library and build the symlinks. +- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ +- 'exit $?' +- tstripme="$stripme" +- case $host_os in +- cygwin* | mingw* | pw32* | cegcc*) +- case $realname in +- *.dll.a) +- tstripme="" +- ;; +- esac +- ;; +- esac +- if test -n "$tstripme" && test -n "$striplib"; then +- func_show_eval "$striplib $destdir/$realname" 'exit $?' ++ # A PIC object. ++ libobjs="$libobjs $pic_object" ++ arg="$pic_object" + fi + +- if test "$#" -gt 0; then +- # Delete the old symlinks, and create new ones. +- # Try `ln -sf' first, because the `ln' binary might depend on +- # the symlink we replace! Solaris /bin/ln does not understand -f, +- # so we also need to try rm && ln -s. +- for linkname +- do +- test "$linkname" != "$realname" \ +- && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" +- done ++ # Non-PIC object. ++ if test "$non_pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ non_pic_object="$xdir$non_pic_object" ++ ++ # A standard non-PIC object ++ non_pic_objects="$non_pic_objects $non_pic_object" ++ if test -z "$pic_object" || test "$pic_object" = none ; then ++ arg="$non_pic_object" ++ fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ non_pic_objects="$non_pic_objects $non_pic_object" + fi ++ else ++ # Only an error if not doing a dry-run. ++ if test -z "$run"; then ++ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 ++ exit $EXIT_FAILURE ++ else ++ # Dry-run case. + +- # Do each command in the postinstall commands. +- lib="$destdir/$realname" +- func_execute_cmds "$postinstall_cmds" 'exit $?' +- fi ++ # Extract subdirectory from the argument. ++ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` ++ if test "X$xdir" = "X$arg"; then ++ xdir= ++ else ++ xdir="$xdir/" ++ fi + +- # Install the pseudo-library for information purposes. +- func_basename "$file" +- name="$func_basename_result" +- instname="$dir/$name"i +- func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' ++ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` ++ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` ++ libobjs="$libobjs $pic_object" ++ non_pic_objects="$non_pic_objects $non_pic_object" ++ fi ++ fi ++ ;; + +- # Maybe install the static library, too. +- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ *.$libext) ++ # An archive. ++ deplibs="$deplibs $arg" ++ old_deplibs="$old_deplibs $arg" ++ continue + ;; + +- *.lo) +- # Install (i.e. copy) a libtool object. ++ *.la) ++ # A libtool-controlled library. + +- # Figure out destination file name, if it wasn't already specified. +- if test -n "$destname"; then +- destfile="$destdir/$destname" ++ if test "$prev" = dlfiles; then ++ # This library was specified with -dlopen. ++ dlfiles="$dlfiles $arg" ++ prev= ++ elif test "$prev" = dlprefiles; then ++ # The library was specified with -dlpreopen. ++ dlprefiles="$dlprefiles $arg" ++ prev= + else +- func_basename "$file" +- destfile="$func_basename_result" +- destfile="$destdir/$destfile" ++ deplibs="$deplibs $arg" + fi ++ continue ++ ;; + +- # Deduce the name of the destination old-style object file. +- case $destfile in +- *.lo) +- func_lo2o "$destfile" +- staticdest=$func_lo2o_result +- ;; +- *.$objext) +- staticdest="$destfile" +- destfile= +- ;; +- *) +- func_fatal_help "cannot copy a libtool object to \`$destfile'" ++ # Some other compiler argument. ++ *) ++ # Unknown arguments in both finalize_command and compile_command need ++ # to be aesthetically quoted because they are evaled later. ++ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" + ;; + esac +- +- # Install the libtool object if requested. +- test -n "$destfile" && \ +- func_show_eval "$install_prog $file $destfile" 'exit $?' +- +- # Install the old object if enabled. +- if test "$build_old_libs" = yes; then +- # Deduce the name of the old-style object file. +- func_lo2o "$file" +- staticobj=$func_lo2o_result +- func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' +- fi +- exit $EXIT_SUCCESS + ;; ++ esac # arg + +- *) +- # Figure out destination file name, if it wasn't already specified. +- if test -n "$destname"; then +- destfile="$destdir/$destname" +- else +- func_basename "$file" +- destfile="$func_basename_result" +- destfile="$destdir/$destfile" +- fi ++ # Now actually substitute the argument into the commands. ++ if test -n "$arg"; then ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ fi ++ done # argument parsing loop + +- # If the file is missing, and there is a .exe on the end, strip it +- # because it is most likely a libtool script we actually want to +- # install +- stripped_ext="" +- case $file in +- *.exe) +- if test ! -f "$file"; then +- func_stripname '' '.exe' "$file" +- file=$func_stripname_result +- stripped_ext=".exe" +- fi +- ;; +- esac ++ if test -n "$prev"; then ++ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- # Do a test to see if this is really a libtool program. +- case $host in +- *cygwin* | *mingw*) +- if func_ltwrapper_executable_p "$file"; then +- func_ltwrapper_scriptname "$file" +- wrapper=$func_ltwrapper_scriptname_result +- else +- func_stripname '' '.exe' "$file" +- wrapper=$func_stripname_result +- fi +- ;; +- *) +- wrapper=$file +- ;; +- esac +- if func_ltwrapper_script_p "$wrapper"; then +- notinst_deplibs= +- relink_command= ++ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then ++ eval arg=\"$export_dynamic_flag_spec\" ++ compile_command="$compile_command $arg" ++ finalize_command="$finalize_command $arg" ++ fi + +- func_source "$wrapper" ++ oldlibs= ++ # calculate the name of the file, without its directory ++ outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` ++ libobjs_save="$libobjs" + +- # Check the variables that should have been set. +- test -z "$generated_by_libtool_version" && \ +- func_fatal_error "invalid libtool wrapper script \`$wrapper'" ++ if test -n "$shlibpath_var"; then ++ # get the directories listed in $shlibpath_var ++ eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` ++ else ++ shlib_search_path= ++ fi ++ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" ++ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + +- finalize=yes +- for lib in $notinst_deplibs; do +- # Check to see that each library is installed. +- libdir= +- if test -f "$lib"; then +- func_source "$lib" +- fi +- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test +- if test -n "$libdir" && test ! -f "$libfile"; then +- func_warning "\`$lib' has not been installed in \`$libdir'" +- finalize=no +- fi +- done +- +- relink_command= +- func_source "$wrapper" +- +- outputname= +- if test "$fast_install" = no && test -n "$relink_command"; then +- $opt_dry_run || { +- if test "$finalize" = yes; then +- tmpdir=`func_mktempdir` +- func_basename "$file$stripped_ext" +- file="$func_basename_result" +- outputname="$tmpdir/$file" +- # Replace the output file specification. +- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` +- +- $opt_silent || { +- func_quote_for_expand "$relink_command" +- eval "func_echo $func_quote_for_expand_result" +- } +- if eval "$relink_command"; then : +- else +- func_error "error: relink \`$file' with the above command before installing it" +- $opt_dry_run || ${RM}r "$tmpdir" +- continue +- fi +- file="$outputname" +- else +- func_warning "cannot relink \`$file'" +- fi +- } +- else +- # Install the binary that we compiled earlier. +- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` +- fi +- fi +- +- # remove .exe since cygwin /usr/bin/install will append another +- # one anyway +- case $install_prog,$host in +- */usr/bin/install*,*cygwin*) +- case $file:$destfile in +- *.exe:*.exe) +- # this is ok +- ;; +- *.exe:*) +- destfile=$destfile.exe +- ;; +- *:*.exe) +- func_stripname '' '.exe' "$destfile" +- destfile=$func_stripname_result +- ;; +- esac +- ;; +- esac +- func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' +- $opt_dry_run || if test -n "$outputname"; then +- ${RM}r "$tmpdir" +- fi +- ;; +- esac +- done +- +- for file in $staticlibs; do +- func_basename "$file" +- name="$func_basename_result" +- +- # Set up the ranlib parameters. +- oldlib="$destdir/$name" +- +- func_show_eval "$install_prog \$file \$oldlib" 'exit $?' +- +- if test -n "$stripme" && test -n "$old_striplib"; then +- func_show_eval "$old_striplib $oldlib" 'exit $?' +- fi +- +- # Do each command in the postinstall commands. +- func_execute_cmds "$old_postinstall_cmds" 'exit $?' +- done +- +- test -n "$future_libdirs" && \ +- func_warning "remember to run \`$progname --finish$future_libdirs'" +- +- if test -n "$current_libdirs"; then +- # Maybe just do a dry run. +- $opt_dry_run && current_libdirs=" -n$current_libdirs" +- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' ++ output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` ++ if test "X$output_objdir" = "X$output"; then ++ output_objdir="$objdir" + else +- exit $EXIT_SUCCESS ++ output_objdir="$output_objdir/$objdir" + fi +-} +- +-test "$mode" = install && func_mode_install ${1+"$@"} +- +- +-# func_generate_dlsyms outputname originator pic_p +-# Extract symbols from dlprefiles and create ${outputname}S.o with +-# a dlpreopen symbol table. +-func_generate_dlsyms () +-{ +- $opt_debug +- my_outputname="$1" +- my_originator="$2" +- my_pic_p="${3-no}" +- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` +- my_dlsyms= +- +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- if test -n "$NM" && test -n "$global_symbol_pipe"; then +- my_dlsyms="${my_outputname}S.c" +- else +- func_error "not configured to extract global symbols from dlpreopened files" ++ # Create the object directory. ++ if test ! -d "$output_objdir"; then ++ $show "$mkdir $output_objdir" ++ $run $mkdir $output_objdir ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then ++ exit $exit_status + fi + fi + +- if test -n "$my_dlsyms"; then +- case $my_dlsyms in +- "") ;; +- *.c) +- # Discover the nlist of each of the dlfiles. +- nlist="$output_objdir/${my_outputname}.nm" +- +- func_show_eval "$RM $nlist ${nlist}S ${nlist}T" +- +- # Parse the name list into a source file. +- func_verbose "creating $output_objdir/$my_dlsyms" +- +- $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ +-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ +-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +- +-#ifdef __cplusplus +-extern \"C\" { +-#endif +- +-/* External symbol declarations for the compiler. */\ +-" +- +- if test "$dlself" = yes; then +- func_verbose "generating symbol list for \`$output'" +- +- $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" +- +- # Add our own program objects to the symbol list. +- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +- for progfile in $progfiles; do +- func_verbose "extracting global C symbols from \`$progfile'" +- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" +- done +- +- if test -n "$exclude_expsyms"; then +- $opt_dry_run || { +- eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' +- eval '$MV "$nlist"T "$nlist"' +- } +- fi +- +- if test -n "$export_symbols_regex"; then +- $opt_dry_run || { +- eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' +- eval '$MV "$nlist"T "$nlist"' +- } +- fi +- +- # Prepare the list of exported symbols +- if test -z "$export_symbols"; then +- export_symbols="$output_objdir/$outputname.exp" +- $opt_dry_run || { +- $RM $export_symbols +- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' +- case $host in +- *cygwin* | *mingw* | *cegcc* ) +- eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' +- eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' +- ;; +- esac +- } +- else +- $opt_dry_run || { +- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' +- eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' +- eval '$MV "$nlist"T "$nlist"' +- case $host in +- *cygwin | *mingw* | *cegcc* ) +- eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' +- eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' +- ;; +- esac +- } +- fi +- fi +- +- for dlprefile in $dlprefiles; do +- func_verbose "extracting global C symbols from \`$dlprefile'" +- func_basename "$dlprefile" +- name="$func_basename_result" +- $opt_dry_run || { +- eval '$ECHO ": $name " >> "$nlist"' +- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" +- } +- done +- +- $opt_dry_run || { +- # Make sure we have at least an empty file. +- test -f "$nlist" || : > "$nlist" +- +- if test -n "$exclude_expsyms"; then +- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T +- $MV "$nlist"T "$nlist" +- fi +- +- # Try sorting and uniquifying the output. +- if $GREP -v "^: " < "$nlist" | +- if sort -k 3 </dev/null >/dev/null 2>&1; then +- sort -k 3 +- else +- sort +2 +- fi | +- uniq > "$nlist"S; then +- : +- else +- $GREP -v "^: " < "$nlist" > "$nlist"S +- fi +- +- if test -f "$nlist"S; then +- eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' +- else +- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" +- fi ++ # Determine the type of output ++ case $output in ++ "") ++ $echo "$modename: you must specify an output file" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ ;; ++ *.$libext) linkmode=oldlib ;; ++ *.lo | *.$objext) linkmode=obj ;; ++ *.la) linkmode=lib ;; ++ *) linkmode=prog ;; # Anything else should be a program. ++ esac + +- $ECHO >> "$output_objdir/$my_dlsyms" "\ ++ case $host in ++ *cygwin* | *mingw* | *pw32*) ++ # don't eliminate duplications in $postdeps and $predeps ++ duplicate_compiler_generated_deps=yes ++ ;; ++ *) ++ duplicate_compiler_generated_deps=$duplicate_deps ++ ;; ++ esac ++ specialdeplibs= + +-/* The mapping between symbol names and symbols. */ +-typedef struct { +- const char *name; +- void *address; +-} lt_dlsymlist; +-" +- case $host in +- *cygwin* | *mingw* | *cegcc* ) +- $ECHO >> "$output_objdir/$my_dlsyms" "\ +-/* DATA imports from DLLs on WIN32 con't be const, because +- runtime relocations are performed -- see ld's documentation +- on pseudo-relocs. */" +- lt_dlsym_const= ;; +- *osf5*) +- echo >> "$output_objdir/$my_dlsyms" "\ +-/* This system does not cope well with relocations in const data */" +- lt_dlsym_const= ;; +- *) +- lt_dlsym_const=const ;; +- esac ++ libs= ++ # Find all interdependent deplibs by searching for libraries ++ # that are linked more than once (e.g. -la -lb -la) ++ for deplib in $deplibs; do ++ if test "X$duplicate_deps" = "Xyes" ; then ++ case "$libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ libs="$libs $deplib" ++ done + +- $ECHO >> "$output_objdir/$my_dlsyms" "\ +-extern $lt_dlsym_const lt_dlsymlist +-lt_${my_prefix}_LTX_preloaded_symbols[]; +-$lt_dlsym_const lt_dlsymlist +-lt_${my_prefix}_LTX_preloaded_symbols[] = +-{\ +- { \"$my_originator\", (void *) 0 }," ++ if test "$linkmode" = lib; then ++ libs="$predeps $libs $compiler_lib_search_path $postdeps" + +- case $need_lib_prefix in +- no) +- eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" +- ;; +- *) +- eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" +- ;; ++ # Compute libraries that are listed more than once in $predeps ++ # $postdeps and mark them as special (i.e., whose duplicates are ++ # not to be eliminated). ++ pre_post_deps= ++ if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then ++ for pre_post_dep in $predeps $postdeps; do ++ case "$pre_post_deps " in ++ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + esac +- $ECHO >> "$output_objdir/$my_dlsyms" "\ +- {0, (void *) 0} +-}; +- +-/* This works around a problem in FreeBSD linker */ +-#ifdef FREEBSD_WORKAROUND +-static const void *lt_preloaded_setup() { +- return lt_${my_prefix}_LTX_preloaded_symbols; +-} +-#endif +- +-#ifdef __cplusplus +-} +-#endif\ +-" +- } # !$opt_dry_run ++ pre_post_deps="$pre_post_deps $pre_post_dep" ++ done ++ fi ++ pre_post_deps= ++ fi + +- pic_flag_for_symtable= +- case "$compile_command " in +- *" -static "*) ;; +- *) +- case $host in +- # compiling the symbol table file with pic_flag works around +- # a FreeBSD bug that causes programs to crash when -lm is +- # linked before any other PIC object. But we must not use +- # pic_flag when linking with -static. The problem exists in +- # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. +- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) +- pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; +- *-*-hpux*) +- pic_flag_for_symtable=" $pic_flag" ;; ++ deplibs= ++ newdependency_libs= ++ newlib_search_path= ++ need_relink=no # whether we're linking any uninstalled libtool libraries ++ notinst_deplibs= # not-installed libtool libraries ++ case $linkmode in ++ lib) ++ passes="conv link" ++ for file in $dlfiles $dlprefiles; do ++ case $file in ++ *.la) ;; + *) +- if test "X$my_pic_p" != Xno; then +- pic_flag_for_symtable=" $pic_flag" +- fi ++ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 ++ exit $EXIT_FAILURE + ;; + esac ++ done ++ ;; ++ prog) ++ compile_deplibs= ++ finalize_deplibs= ++ alldeplibs=no ++ newdlfiles= ++ newdlprefiles= ++ passes="conv scan dlopen dlpreopen link" ++ ;; ++ *) passes="conv" ++ ;; ++ esac ++ for pass in $passes; do ++ if test "$linkmode,$pass" = "lib,link" || ++ test "$linkmode,$pass" = "prog,scan"; then ++ libs="$deplibs" ++ deplibs= ++ fi ++ if test "$linkmode" = prog; then ++ case $pass in ++ dlopen) libs="$dlfiles" ;; ++ dlpreopen) libs="$dlprefiles" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -+ ;; + ;; esac - fi - if test "$pass" = dlopen; then -@@ -3269,6 +3272,11 @@ EOF - revision="$number_minor" - lt_irix_increment=no - ;; +- symtab_cflags= +- for arg in $LTCFLAGS; do +- case $arg in +- -pie | -fpie | -fPIE) ;; +- *) symtab_cflags="$symtab_cflags $arg" ;; +- esac +- done +- +- # Now compile the dynamic symbol file. +- func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' +- +- # Clean up the generated files. +- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' +- +- # Transform the symbol file into the correct name. +- symfileobj="$output_objdir/${my_outputname}S.$objext" +- case $host in +- *cygwin* | *mingw* | *cegcc* ) +- if test -f "$output_objdir/$my_outputname.def"; then +- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` +- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` ++ fi ++ if test "$pass" = dlopen; then ++ # Collect dlpreopened libraries ++ save_deplibs="$deplibs" ++ deplibs= ++ fi ++ for deplib in $libs; do ++ lib= ++ found=no ++ case $deplib in ++ -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" + else +- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` +- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ compiler_flags="$compiler_flags $deplib" + fi ++ continue + ;; +- *) +- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` +- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` +- ;; +- esac +- ;; +- *) +- func_fatal_error "unknown suffix for \`$my_dlsyms'" +- ;; +- esac +- else +- # We keep going just in case the user didn't refer to +- # lt_preloaded_symbols. The linker will fail if global_symbol_pipe +- # 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@%%"` +- fi +-} +- +-# func_win32_libid arg +-# return the library type of file 'arg' +-# +-# Need a lot of goo to handle *both* DLLs and import libs +-# Has to be a shell function in order to 'eat' the argument +-# that is supplied when $file_magic_command is called. +-func_win32_libid () +-{ +- $opt_debug +- win32_libid_type="unknown" +- win32_fileres=`file -L $1 2>/dev/null` +- case $win32_fileres in +- *ar\ archive\ import\ library*) # definitely import +- win32_libid_type="x86 archive import" +- ;; +- *ar\ archive*) # could be an import, or static +- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | +- $EGREP '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 +- } +- }'` +- case $win32_nmres in +- import*) win32_libid_type="x86 archive import";; +- *) win32_libid_type="x86 archive static";; +- esac +- fi +- ;; +- *DLL*) +- win32_libid_type="x86 DLL" +- ;; +- *executable*) # but shell scripts are "executable" too... +- case $win32_fileres in +- *MS\ Windows\ PE\ Intel*) +- win32_libid_type="x86 DLL" +- ;; +- esac +- ;; +- esac +- $ECHO "$win32_libid_type" +-} +- ++ -l*) ++ if test "$linkmode" != lib && test "$linkmode" != prog; then ++ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 ++ continue ++ fi ++ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` ++ if test "$linkmode" = lib; then ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ else ++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ fi ++ for searchdir in $searchdirs; do ++ for search_ext in .la $std_shrext .so .a; do ++ # Search the libtool library ++ lib="$searchdir/lib${name}${search_ext}" ++ if test -f "$lib"; then ++ if test "$search_ext" = ".la"; then ++ found=yes ++ else ++ found=no ++ fi ++ break 2 ++ fi ++ done ++ done ++ if test "$found" != yes; then ++ # deplib doesn't seem to be a libtool library ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" ++ fi ++ continue ++ else # deplib is a libtool library ++ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, ++ # We need to do some special things here, and not later. ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $deplib "*) ++ if (${SED} -e '2q' $lib | ++ grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then ++ library_names= ++ old_library= ++ case $lib in ++ */* | *\\*) . $lib ;; ++ *) . ./$lib ;; ++ esac ++ for l in $old_library $library_names; do ++ ll="$l" ++ done ++ if test "X$ll" = "X$old_library" ; then # only static version available ++ found=no ++ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` ++ test "X$ladir" = "X$lib" && ladir="." ++ lib=$ladir/$old_library ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" ++ fi ++ continue ++ fi ++ fi ++ ;; ++ *) ;; ++ esac ++ fi ++ fi ++ ;; # -l ++ -L*) ++ case $linkmode in ++ lib) ++ deplibs="$deplib $deplibs" ++ test "$pass" = conv && continue ++ newdependency_libs="$deplib $newdependency_libs" ++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ++ ;; ++ prog) ++ if test "$pass" = conv; then ++ deplibs="$deplib $deplibs" ++ continue ++ fi ++ if test "$pass" = scan; then ++ deplibs="$deplib $deplibs" ++ else ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ fi ++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ++ ;; ++ *) ++ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 ++ ;; ++ esac # linkmode ++ continue ++ ;; # -L ++ -R*) ++ if test "$pass" = link; then ++ dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` ++ # Make sure the xrpath contains only unique directories. ++ case "$xrpath " in ++ *" $dir "*) ;; ++ *) xrpath="$xrpath $dir" ;; ++ esac ++ fi ++ deplibs="$deplib $deplibs" ++ continue ++ ;; ++ *.la) lib="$deplib" ;; ++ *.$libext) ++ if test "$pass" = conv; then ++ deplibs="$deplib $deplibs" ++ continue ++ fi ++ case $linkmode in ++ lib) ++ valid_a_lib=no ++ case $deplibs_check_method in ++ match_pattern*) ++ set dummy $deplibs_check_method ++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` ++ if eval $echo \"$deplib\" 2>/dev/null \ ++ | $SED 10q \ ++ | $EGREP "$match_pattern_regex" > /dev/null; then ++ valid_a_lib=yes ++ fi ++ ;; ++ pass_all) ++ valid_a_lib=yes ++ ;; ++ esac ++ if test "$valid_a_lib" != yes; then ++ $echo ++ $echo "*** Warning: Trying to link with static lib archive $deplib." ++ $echo "*** I have the capability to make that library automatically link in when" ++ $echo "*** you link to this library. But I can only do this if you have a" ++ $echo "*** shared version of the library, which you do not appear to have" ++ $echo "*** because the file extensions .$libext of this argument makes me believe" ++ $echo "*** that it is just a static archive that I should not used here." ++ else ++ $echo ++ $echo "*** Warning: Linking the shared library $output against the" ++ $echo "*** static library $deplib is not portable!" ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; ++ prog) ++ if test "$pass" != link; then ++ deplibs="$deplib $deplibs" ++ else ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ fi ++ continue ++ ;; ++ esac # linkmode ++ ;; # *.$libext ++ *.lo | *.$objext) ++ if test "$pass" = conv; then ++ deplibs="$deplib $deplibs" ++ elif test "$linkmode" = prog; then ++ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then ++ # If there is no dlopen support or we're linking statically, ++ # we need to preload. ++ newdlprefiles="$newdlprefiles $deplib" ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ newdlfiles="$newdlfiles $deplib" ++ fi ++ fi ++ continue ++ ;; ++ %DEPLIBS%) ++ alldeplibs=yes ++ continue ++ ;; ++ esac # case $deplib ++ if test "$found" = yes || test -f "$lib"; then : ++ else ++ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 ++ exit $EXIT_FAILURE ++ fi + ++ # Check to see that this really is a libtool archive. ++ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : ++ else ++ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +-# func_extract_an_archive dir oldlib +-func_extract_an_archive () +-{ +- $opt_debug +- f_ex_an_ar_dir="$1"; shift +- f_ex_an_ar_oldlib="$1" +- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' +- if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" +- fi +-} ++ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` ++ test "X$ladir" = "X$lib" && ladir="." + ++ dlname= ++ dlopen= ++ dlpreopen= ++ libdir= ++ library_names= ++ old_library= ++ # If the library was installed with an old release of libtool, ++ # it will not redefine variables installed, or shouldnotlink ++ installed=yes ++ shouldnotlink=no ++ avoidtemprpath= + +-# func_extract_archives gentop oldlib ... +-func_extract_archives () +-{ +- $opt_debug +- my_gentop="$1"; shift +- my_oldlibs=${1+"$@"} +- my_oldobjs="" +- my_xlib="" +- my_xabs="" +- my_xdir="" + +- for my_xlib in $my_oldlibs; do +- # Extract the objects. +- case $my_xlib in +- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; +- *) my_xabs=`pwd`"/$my_xlib" ;; +- esac +- func_basename "$my_xlib" +- my_xlib="$func_basename_result" +- my_xlib_u=$my_xlib +- while :; do +- case " $extracted_archives " in +- *" $my_xlib_u "*) +- func_arith $extracted_serial + 1 +- extracted_serial=$func_arith_result +- my_xlib_u=lt$extracted_serial-$my_xlib ;; +- *) break ;; ++ # Read the .la file ++ case $lib in ++ */* | *\\*) . $lib ;; ++ *) . ./$lib ;; + esac +- done +- extracted_archives="$extracted_archives $my_xlib_u" +- my_xdir="$my_gentop/$my_xlib_u" + +- func_mkdir_p "$my_xdir" +- +- case $host in +- *-darwin*) +- func_verbose "Extracting $my_xabs" +- # Do not bother doing anything if just a dry run +- $opt_dry_run || { +- darwin_orig_dir=`pwd` +- cd $my_xdir || exit $? +- darwin_archive=$my_xabs +- darwin_curdir=`pwd` +- darwin_base_archive=`basename "$darwin_archive"` +- darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` +- if test -n "$darwin_arches"; then +- darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` +- darwin_arch= +- func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" +- for darwin_arch in $darwin_arches ; do +- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" +- $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" +- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" +- func_extract_an_archive "`pwd`" "${darwin_base_archive}" +- cd "$darwin_curdir" +- $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" +- done # $darwin_arches +- ## Okay now we've a bunch of thin objects, gotta fatten them up :) +- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` +- darwin_file= +- darwin_files= +- for darwin_file in $darwin_filelist; do +- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` +- $LIPO -create -output "$darwin_file" $darwin_files +- done # $darwin_filelist +- $RM -rf unfat-$$ +- cd "$darwin_orig_dir" +- else +- cd $darwin_orig_dir +- func_extract_an_archive "$my_xdir" "$my_xabs" +- fi # $darwin_arches +- } # !$opt_dry_run +- ;; +- *) +- func_extract_an_archive "$my_xdir" "$my_xabs" +- ;; +- esac +- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` +- done +- +- func_extract_archives_result="$my_oldobjs" +-} ++ if test "$linkmode,$pass" = "lib,link" || ++ test "$linkmode,$pass" = "prog,scan" || ++ { test "$linkmode" != prog && test "$linkmode" != lib; }; then ++ test -n "$dlopen" && dlfiles="$dlfiles $dlopen" ++ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" ++ fi + ++ if test "$pass" = conv; then ++ # Only check for convenience libraries ++ deplibs="$lib $deplibs" ++ if test -z "$libdir"; then ++ if test -z "$old_library"; then ++ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ # It is a libtool convenience library, so add in its objects. ++ convenience="$convenience $ladir/$objdir/$old_library" ++ old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if test "X$duplicate_deps" = "Xyes" ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done ++ elif test "$linkmode" != prog && test "$linkmode" != lib; then ++ $echo "$modename: \`$lib' is not a convenience library" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ continue ++ fi # $pass = conv + + +-# func_emit_wrapper_part1 [arg=no] +-# +-# Emit the first part of a libtool wrapper script on stdout. +-# For more information, see the description associated with +-# func_emit_wrapper(), below. +-func_emit_wrapper_part1 () +-{ +- func_emit_wrapper_part1_arg1=no +- if test -n "$1" ; then +- func_emit_wrapper_part1_arg1=$1 ++ # Get the name of the library we link against. ++ linklib= ++ for l in $old_library $library_names; do ++ linklib="$l" ++ done ++ if test -z "$linklib"; then ++ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 ++ exit $EXIT_FAILURE + fi + +- $ECHO "\ +-#! $SHELL ++ # This library was specified with -dlopen. ++ if test "$pass" = dlopen; then ++ if test -z "$libdir"; then ++ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ if test -z "$dlname" || ++ test "$dlopen_support" != yes || ++ test "$build_libtool_libs" = no; then ++ # If there is no dlname, no dlopen support or we're linking ++ # statically, we need to preload. We also need to preload any ++ # dependent libraries so libltdl's deplib preloader doesn't ++ # bomb out in the load deplibs phase. ++ dlprefiles="$dlprefiles $lib $dependency_libs" ++ else ++ newdlfiles="$newdlfiles $lib" ++ fi ++ continue ++ fi # $pass = dlopen + +-# $output - temporary wrapper script for $objdir/$outputname +-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +-# +-# The $output program cannot be directly executed until all the libtool +-# libraries that it depends on are installed. +-# +-# This wrapper script should never be moved out of the build directory. +-# If it is, it will not operate correctly. ++ # We need an absolute path. ++ case $ladir in ++ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; ++ *) ++ abs_ladir=`cd "$ladir" && pwd` ++ if test -z "$abs_ladir"; then ++ $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 ++ $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 ++ abs_ladir="$ladir" ++ fi ++ ;; ++ esac ++ laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` + +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed='${SED} -e 1s/^X//' +-sed_quote_subst='$sed_quote_subst' ++ # Find the relevant object directory and library name. ++ if test "X$installed" = Xyes; then ++ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ $echo "$modename: warning: library \`$lib' was moved." 1>&2 ++ dir="$ladir" ++ absdir="$abs_ladir" ++ libdir="$abs_ladir" ++ else ++ dir="$libdir" ++ absdir="$libdir" ++ fi ++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes ++ else ++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ dir="$ladir" ++ absdir="$abs_ladir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ else ++ dir="$ladir/$objdir" ++ absdir="$abs_ladir/$objdir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ fi ++ fi # $installed = yes ++ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` + +-# Be 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 ++ # This library was specified with -dlpreopen. ++ if test "$pass" = dlpreopen; then ++ if test -z "$libdir"; then ++ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ # Prefer using a static library (so that no silly _DYNAMIC symbols ++ # are required to link). ++ if test -n "$old_library"; then ++ newdlprefiles="$newdlprefiles $dir/$old_library" ++ # Otherwise, use the dlname, so that lt_dlopen finds it. ++ elif test -n "$dlname"; then ++ newdlprefiles="$newdlprefiles $dir/$dlname" ++ else ++ newdlprefiles="$newdlprefiles $dir/$linklib" ++ fi ++ fi # $pass = dlpreopen + +-# 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 ++ if test -z "$libdir"; then ++ # Link the convenience library ++ if test "$linkmode" = lib; then ++ deplibs="$dir/$old_library $deplibs" ++ elif test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$dir/$old_library $compile_deplibs" ++ finalize_deplibs="$dir/$old_library $finalize_deplibs" ++ else ++ deplibs="$lib $deplibs" # used for prog,scan pass ++ fi ++ continue ++ fi + +-relink_command=\"$relink_command\" + +-# This environment variable determines our operation mode. +-if test \"\$libtool_install_magic\" = \"$magic\"; then +- # install mode needs the following variables: +- generated_by_libtool_version='$macro_version' +- notinst_deplibs='$notinst_deplibs' +-else +- # When we are sourced in execute mode, \$file and \$ECHO are already set. +- if test \"\$libtool_execute_magic\" != \"$magic\"; then +- ECHO=\"$qecho\" +- file=\"\$0\" +- # Make sure echo works. +- if test \"X\$1\" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then +- # Yippee, \$ECHO works! +- : +- else +- # Restart under the correct shell, and then maybe \$ECHO will work. +- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} +- fi +- fi\ +-" +- $ECHO "\ ++ if test "$linkmode" = prog && test "$pass" != link; then ++ newlib_search_path="$newlib_search_path $ladir" ++ deplibs="$lib $deplibs" + +- # Find the directory that this script lives in. +- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` +- test \"x\$thisdir\" = \"x\$file\" && thisdir=. ++ linkalldeplibs=no ++ if test "$link_all_deplibs" != no || test -z "$library_names" || ++ test "$build_libtool_libs" = no; then ++ linkalldeplibs=yes ++ fi + +- # Follow symbolic links until we get to the real thisdir. +- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` +- while test -n \"\$file\"; do +- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ case $deplib in ++ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test ++ esac ++ # Need to link against all dependency_libs? ++ if test "$linkalldeplibs" = yes; then ++ deplibs="$deplib $deplibs" ++ else ++ # Need to hardcode shared library paths ++ # or/and link against static libraries ++ newdependency_libs="$deplib $newdependency_libs" ++ fi ++ if test "X$duplicate_deps" = "Xyes" ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done # for deplib ++ continue ++ fi # $linkmode = prog... + +- # If there was a directory component, then change thisdir. +- if test \"x\$destdir\" != \"x\$file\"; then +- case \"\$destdir\" in +- [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; +- *) thisdir=\"\$thisdir/\$destdir\" ;; +- esac +- fi ++ if test "$linkmode,$pass" = "prog,link"; then ++ if test -n "$library_names" && ++ { { 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. ++ case "$temp_rpath " in ++ *" $dir "*) ;; ++ *" $absdir "*) ;; ++ *) temp_rpath="$temp_rpath $absdir" ;; ++ esac ++ fi + +- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` +- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` +- done +-" +-} +-# end: func_emit_wrapper_part1 ++ # Hardcode the library path. ++ # Skip directories that are in the system default run-time ++ # search path. ++ case " $sys_lib_dlsearch_path " in ++ *" $absdir "*) ;; ++ *) ++ case "$compile_rpath " in ++ *" $absdir "*) ;; ++ *) compile_rpath="$compile_rpath $absdir" ++ esac ++ ;; ++ esac ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) ++ case "$finalize_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_rpath="$finalize_rpath $libdir" ++ esac ++ ;; ++ esac ++ fi # $linkmode,$pass = prog,link... + +-# func_emit_wrapper_part2 [arg=no] +-# +-# Emit the second part of a libtool wrapper script on stdout. +-# For more information, see the description associated with +-# func_emit_wrapper(), below. +-func_emit_wrapper_part2 () +-{ +- func_emit_wrapper_part2_arg1=no +- if test -n "$1" ; then +- func_emit_wrapper_part2_arg1=$1 +- fi +- +- $ECHO "\ +- +- # Usually 'no', except on cygwin/mingw when embedded into +- # the cwrapper. +- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 +- if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then +- # special case for '.' +- if test \"\$thisdir\" = \".\"; then +- thisdir=\`pwd\` +- fi +- # remove .libs from thisdir +- case \"\$thisdir\" in +- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; +- $objdir ) thisdir=. ;; +- esac +- fi ++ if test "$alldeplibs" = yes && ++ { test "$deplibs_check_method" = pass_all || ++ { test "$build_libtool_libs" = yes && ++ test -n "$library_names"; }; }; then ++ # We only need to search for static libraries ++ continue ++ fi ++ fi + +- # Try to get the absolute directory name. +- absdir=\`cd \"\$thisdir\" && pwd\` +- test -n \"\$absdir\" && thisdir=\"\$absdir\" +-" ++ link_static=no # Whether the deplib will be linked statically ++ use_static_libs=$prefer_static_libs ++ if test "$use_static_libs" = built && test "$installed" = yes ; then ++ use_static_libs=no ++ fi ++ if test -n "$library_names" && ++ { test "$use_static_libs" = no || test -z "$old_library"; }; then ++ if test "$installed" = no; then ++ notinst_deplibs="$notinst_deplibs $lib" ++ need_relink=yes ++ fi ++ # This is a shared library + +- if test "$fast_install" = yes; then +- $ECHO "\ +- program=lt-'$outputname'$exeext +- progdir=\"\$thisdir/$objdir\" +- +- if test ! -f \"\$progdir/\$program\" || +- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ +- test \"X\$file\" != \"X\$progdir/\$program\"; }; then +- +- file=\"\$\$-\$program\" ++ # Warn about portability, can't link against -module's on ++ # some systems (darwin) ++ if test "$shouldnotlink" = yes && test "$pass" = link ; then ++ $echo ++ if test "$linkmode" = prog; then ++ $echo "*** Warning: Linking the executable $output against the loadable module" ++ else ++ $echo "*** Warning: Linking the shared library $output against the loadable module" ++ fi ++ $echo "*** $linklib is not portable!" ++ fi ++ if test "$linkmode" = lib && ++ test "$hardcode_into_libs" = yes; then ++ # Hardcode the library path. ++ # Skip directories that are in the system default run-time ++ # search path. ++ case " $sys_lib_dlsearch_path " in ++ *" $absdir "*) ;; ++ *) ++ case "$compile_rpath " in ++ *" $absdir "*) ;; ++ *) compile_rpath="$compile_rpath $absdir" ++ esac ++ ;; ++ esac ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) ++ case "$finalize_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_rpath="$finalize_rpath $libdir" ++ esac ++ ;; ++ esac ++ fi + +- if test ! -d \"\$progdir\"; then +- $MKDIR \"\$progdir\" +- else +- $RM \"\$progdir/\$file\" +- fi" ++ if test -n "$old_archive_from_expsyms_cmds"; then ++ # figure out the soname ++ set dummy $library_names ++ realname="$2" ++ shift; shift ++ libname=`eval \\$echo \"$libname_spec\"` ++ # use dlname if we got it. it's perfectly good, no? ++ if test -n "$dlname"; then ++ soname="$dlname" ++ elif test -n "$soname_spec"; then ++ # bleh windows ++ case $host in ++ *cygwin* | mingw*) ++ major=`expr $current - $age` ++ versuffix="-$major" ++ ;; ++ esac ++ eval soname=\"$soname_spec\" ++ else ++ soname="$realname" ++ fi + +- $ECHO "\ ++ # Make a new name for the extract_expsyms_cmds to use ++ soroot="$soname" ++ soname=`$echo $soroot | ${SED} -e 's/^.*\///'` ++ newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" + +- # relink executable if necessary +- if test -n \"\$relink_command\"; then +- if relink_command_output=\`eval \$relink_command 2>&1\`; then : +- else +- $ECHO \"\$relink_command_output\" >&2 +- $RM \"\$progdir/\$file\" +- exit 1 +- fi +- fi ++ # If the library has no export list, then create one now ++ if test -f "$output_objdir/$soname-def"; then : ++ else ++ $show "extracting exported symbol list from \`$soname'" ++ save_ifs="$IFS"; IFS='~' ++ cmds=$extract_expsyms_cmds ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $show "$cmd" ++ $run eval "$cmd" || exit $? ++ done ++ IFS="$save_ifs" ++ fi + +- $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || +- { $RM \"\$progdir/\$program\"; +- $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } +- $RM \"\$progdir/\$file\" +- fi" +- else +- $ECHO "\ +- program='$outputname' +- progdir=\"\$thisdir/$objdir\" +-" +- fi ++ # Create $newlib ++ if test -f "$output_objdir/$newlib"; then :; else ++ $show "generating import library for \`$soname'" ++ save_ifs="$IFS"; IFS='~' ++ cmds=$old_archive_from_expsyms_cmds ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $show "$cmd" ++ $run eval "$cmd" || exit $? ++ done ++ IFS="$save_ifs" ++ fi ++ # make sure the library variables are pointing to the new library ++ dir=$output_objdir ++ linklib=$newlib ++ fi # test -n "$old_archive_from_expsyms_cmds" + +- $ECHO "\ ++ if test "$linkmode" = prog || test "$mode" != relink; then ++ add_shlibpath= ++ add_dir= ++ add= ++ lib_linked=yes ++ case $hardcode_action in ++ immediate | unsupported) ++ if test "$hardcode_direct" = no; then ++ add="$dir/$linklib" ++ case $host in ++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; ++ *-*-sysv4*uw2*) add_dir="-L$dir" ;; ++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ ++ *-*-unixware7*) add_dir="-L$dir" ;; ++ *-*-darwin* ) ++ # if the lib is a module then we can not link against ++ # it, someone is ignoring the new warnings I added ++ if /usr/bin/file -L $add 2> /dev/null | ++ $EGREP ": [^:]* bundle" >/dev/null ; then ++ $echo "** Warning, lib $linklib is a module, not a shared library" ++ if test -z "$old_library" ; then ++ $echo ++ $echo "** And there doesn't seem to be a static archive available" ++ $echo "** The link will probably fail, sorry" ++ else ++ add="$dir/$old_library" ++ fi ++ fi ++ esac ++ elif test "$hardcode_minus_L" = no; then ++ case $host in ++ *-*-sunos*) add_shlibpath="$dir" ;; ++ esac ++ add_dir="-L$dir" ++ add="-l$name" ++ elif test "$hardcode_shlibpath_var" = no; then ++ add_shlibpath="$dir" ++ add="-l$name" ++ else ++ lib_linked=no ++ fi ++ ;; ++ relink) ++ if test "$hardcode_direct" = yes; then ++ add="$dir/$linklib" ++ elif test "$hardcode_minus_L" = yes; then ++ add_dir="-L$dir" ++ # Try looking first in the location we're being installed to. ++ if test -n "$inst_prefix_dir"; then ++ case $libdir in ++ [\\/]*) ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ ;; ++ esac ++ fi ++ add="-l$name" ++ elif test "$hardcode_shlibpath_var" = yes; then ++ add_shlibpath="$dir" ++ add="-l$name" ++ else ++ lib_linked=no ++ fi ++ ;; ++ *) lib_linked=no ;; ++ esac + +- if test -f \"\$progdir/\$program\"; then" ++ if test "$lib_linked" != yes; then ++ $echo "$modename: configuration error: unsupported hardcode properties" ++ exit $EXIT_FAILURE ++ fi + +- # Export our shlibpath_var if we have one. +- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then +- $ECHO "\ +- # Add our own library path to $shlibpath_var +- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" ++ if test -n "$add_shlibpath"; then ++ case :$compile_shlibpath: in ++ *":$add_shlibpath:"*) ;; ++ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; ++ esac ++ fi ++ if test "$linkmode" = prog; then ++ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" ++ test -n "$add" && compile_deplibs="$add $compile_deplibs" ++ else ++ test -n "$add_dir" && deplibs="$add_dir $deplibs" ++ test -n "$add" && deplibs="$add $deplibs" ++ if test "$hardcode_direct" != yes && \ ++ test "$hardcode_minus_L" != yes && \ ++ test "$hardcode_shlibpath_var" = yes; then ++ case :$finalize_shlibpath: in ++ *":$libdir:"*) ;; ++ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ esac ++ fi ++ fi ++ fi + +- # Some systems cannot cope with colon-terminated $shlibpath_var +- # The second colon is a workaround for a bug in BeOS R4 sed +- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` ++ if test "$linkmode" = prog || test "$mode" = relink; then ++ add_shlibpath= ++ add_dir= ++ add= ++ # Finalize command for both is simple: just hardcode it. ++ if test "$hardcode_direct" = yes; then ++ add="$libdir/$linklib" ++ elif test "$hardcode_minus_L" = yes; then ++ add_dir="-L$libdir" ++ add="-l$name" ++ elif test "$hardcode_shlibpath_var" = yes; then ++ case :$finalize_shlibpath: in ++ *":$libdir:"*) ;; ++ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ esac ++ add="-l$name" ++ elif test "$hardcode_automatic" = yes; then ++ if test -n "$inst_prefix_dir" && ++ test -f "$inst_prefix_dir$libdir/$linklib" ; then ++ add="$inst_prefix_dir$libdir/$linklib" ++ else ++ add="$libdir/$linklib" ++ fi ++ else ++ # We cannot seem to hardcode it, guess we'll fake it. ++ add_dir="-L$libdir" ++ # Try looking first in the location we're being installed to. ++ if test -n "$inst_prefix_dir"; then ++ case $libdir in ++ [\\/]*) ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ ;; ++ esac ++ fi ++ add="-l$name" ++ fi + +- export $shlibpath_var +-" +- fi ++ if test "$linkmode" = prog; then ++ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" ++ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" ++ else ++ test -n "$add_dir" && deplibs="$add_dir $deplibs" ++ test -n "$add" && deplibs="$add $deplibs" ++ fi ++ fi ++ elif test "$linkmode" = prog; then ++ # Here we assume that one of hardcode_direct or hardcode_minus_L ++ # is not unsupported. This is valid on all known static and ++ # shared platforms. ++ if test "$hardcode_direct" != unsupported; then ++ test -n "$old_library" && linklib="$old_library" ++ compile_deplibs="$dir/$linklib $compile_deplibs" ++ finalize_deplibs="$dir/$linklib $finalize_deplibs" ++ else ++ compile_deplibs="-l$name -L$dir $compile_deplibs" ++ finalize_deplibs="-l$name -L$dir $finalize_deplibs" ++ fi ++ elif test "$build_libtool_libs" = yes; then ++ # Not a shared library ++ if test "$deplibs_check_method" != pass_all; then ++ # We're trying link a shared library against a static one ++ # but the system doesn't support it. + +- # fixup the dll searchpath if we need to. +- if test -n "$dllsearchpath"; then +- $ECHO "\ +- # Add the dll search path components to the executable PATH +- PATH=$dllsearchpath:\$PATH +-" +- fi ++ # Just print a warning and add the library to dependency_libs so ++ # that the program can be linked against the static library. ++ $echo ++ $echo "*** Warning: This system can not link to static lib archive $lib." ++ $echo "*** I have the capability to make that library automatically link in when" ++ $echo "*** you link to this library. But I can only do this if you have a" ++ $echo "*** shared version of the library, which you do not appear to have." ++ if test "$module" = yes; then ++ $echo "*** But as you try to build a module library, libtool will still create " ++ $echo "*** a static module, that should work as long as the dlopening application" ++ $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." ++ if test -z "$global_symbol_pipe"; then ++ $echo ++ $echo "*** However, this would only work if libtool was able to extract symbol" ++ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" ++ $echo "*** not find such a program. So, this module is probably useless." ++ $echo "*** \`nm' from GNU binutils and a full rebuild may help." ++ fi ++ if test "$build_old_libs" = no; then ++ build_libtool_libs=module ++ build_old_libs=yes ++ else ++ build_libtool_libs=no ++ fi ++ fi ++ else ++ deplibs="$dir/$old_library $deplibs" ++ link_static=yes ++ fi ++ fi # link shared/static library? + +- $ECHO "\ +- if test \"\$libtool_execute_magic\" != \"$magic\"; then +- # Run the actual program with our arguments. +-" +- case $host in +- # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2* | *-cegcc*) +- $ECHO "\ +- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +-" +- ;; ++ if test "$linkmode" = lib; then ++ if test -n "$dependency_libs" && ++ { test "$hardcode_into_libs" != yes || ++ test "$build_old_libs" = yes || ++ test "$link_static" = yes; }; then ++ # Extract -R from dependency_libs ++ temp_deplibs= ++ for libdir in $dependency_libs; do ++ case $libdir in ++ -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` ++ case " $xrpath " in ++ *" $temp_xrpath "*) ;; ++ *) xrpath="$xrpath $temp_xrpath";; ++ esac;; ++ *) temp_deplibs="$temp_deplibs $libdir";; ++ esac ++ done ++ dependency_libs="$temp_deplibs" ++ fi + +- *) +- $ECHO "\ +- exec \"\$progdir/\$program\" \${1+\"\$@\"} +-" +- ;; +- esac +- $ECHO "\ +- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 +- exit 1 +- fi +- else +- # The program doesn't exist. +- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 +- \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 +- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 +- exit 1 +- fi +-fi\ +-" +-} +-# end: func_emit_wrapper_part2 ++ newlib_search_path="$newlib_search_path $absdir" ++ # Link against this library ++ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" ++ # ... and its dependency_libs ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ newdependency_libs="$deplib $newdependency_libs" ++ if test "X$duplicate_deps" = "Xyes" ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done + ++ if test "$link_all_deplibs" != no; then ++ # Add the search paths of all dependency libraries ++ for deplib in $dependency_libs; do ++ case $deplib in ++ -L*) path="$deplib" ;; ++ *.la) ++ dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` ++ test "X$dir" = "X$deplib" && dir="." ++ # We need an absolute path. ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; ++ *) ++ absdir=`cd "$dir" && pwd` ++ if test -z "$absdir"; then ++ $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 ++ absdir="$dir" ++ fi ++ ;; ++ esac ++ if grep "^installed=no" $deplib > /dev/null; then ++ path="$absdir/$objdir" ++ else ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ if test -z "$libdir"; then ++ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ if test "$absdir" != "$libdir"; then ++ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 ++ fi ++ path="$absdir" ++ fi ++ depdepl= ++ case $host in ++ *-*-darwin*) ++ # we do not want to link against static libs, ++ # but need to link against shared ++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ if test -n "$deplibrary_names" ; then ++ for tmp in $deplibrary_names ; do ++ depdepl=$tmp ++ done ++ if test -f "$deplibdir/$depdepl" ; then ++ depdepl="$deplibdir/$depdepl" ++ elif test -f "$path/$depdepl" ; then ++ depdepl="$path/$depdepl" ++ else ++ # Can't find it, oh well... ++ depdepl= ++ fi ++ # do not add paths which are already there ++ case " $newlib_search_path " in ++ *" $path "*) ;; ++ *) newlib_search_path="$newlib_search_path $path";; ++ esac ++ fi ++ path="" ++ ;; ++ *) ++ path="-L$path" ++ ;; ++ esac ++ ;; ++ -l*) ++ case $host in ++ *-*-darwin*) ++ # Again, we only want to link against shared libraries ++ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` ++ for tmp in $newlib_search_path ; do ++ if test -f "$tmp/lib$tmp_libs.dylib" ; then ++ eval depdepl="$tmp/lib$tmp_libs.dylib" ++ break ++ fi ++ done ++ path="" ++ ;; ++ *) continue ;; ++ esac ++ ;; ++ *) continue ;; ++ esac ++ case " $deplibs " in ++ *" $path "*) ;; ++ *) deplibs="$path $deplibs" ;; ++ esac ++ case " $deplibs " in ++ *" $depdepl "*) ;; ++ *) deplibs="$depdepl $deplibs" ;; ++ esac ++ done ++ fi # link_all_deplibs != no ++ fi # linkmode = lib ++ done # for deplib in $libs ++ dependency_libs="$newdependency_libs" ++ if test "$pass" = dlpreopen; then ++ # Link the dlpreopened libraries before other libraries ++ for deplib in $save_deplibs; do ++ deplibs="$deplib $deplibs" ++ done ++ fi ++ if test "$pass" != dlopen; then ++ if test "$pass" != conv; then ++ # Make sure lib_search_path contains only unique directories. ++ lib_search_path= ++ for dir in $newlib_search_path; do ++ case "$lib_search_path " in ++ *" $dir "*) ;; ++ *) lib_search_path="$lib_search_path $dir" ;; ++ esac ++ done ++ newlib_search_path= ++ fi + +-# func_emit_wrapper [arg=no] +-# +-# Emit a libtool wrapper script on stdout. +-# Don't directly open a file because we may want to +-# incorporate the script contents within a cygwin/mingw +-# wrapper executable. Must ONLY be called from within +-# func_mode_link because it depends on a number of variables +-# set therein. +-# +-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +-# variable will take. If 'yes', then the emitted script +-# will assume that the directory in which it is stored is +-# the $objdir directory. This is a cygwin/mingw-specific +-# behavior. +-func_emit_wrapper () +-{ +- func_emit_wrapper_arg1=no +- if test -n "$1" ; then +- func_emit_wrapper_arg1=$1 ++ if test "$linkmode,$pass" != "prog,link"; then ++ vars="deplibs" ++ else ++ vars="compile_deplibs finalize_deplibs" + fi ++ for var in $vars dependency_libs; do ++ # Add libraries to $var in reverse order ++ eval tmp_libs=\"\$$var\" ++ new_libs= ++ for deplib in $tmp_libs; do ++ # FIXME: Pedantically, this is the right thing to do, so ++ # that some nasty dependency loop isn't accidentally ++ # broken: ++ #new_libs="$deplib $new_libs" ++ # Pragmatically, this seems to cause very few problems in ++ # practice: ++ case $deplib in ++ -L*) new_libs="$deplib $new_libs" ;; ++ -R*) ;; ++ *) ++ # And here is the reason: when a library appears more ++ # than once as an explicit dependence of a library, or ++ # is implicitly linked in more than once by the ++ # compiler, it is considered special, and multiple ++ # occurrences thereof are not removed. Compare this ++ # with having the same library being listed as a ++ # dependency of multiple other libraries: in this case, ++ # we know (pedantically, we assume) the library does not ++ # need to be listed more than once, so we keep only the ++ # last copy. This is not always right, but it is rare ++ # enough that we require users that really mean to play ++ # such unportable linking tricks to link the library ++ # using -Wl,-lname, so that libtool does not consider it ++ # for duplicate removal. ++ case " $specialdeplibs " in ++ *" $deplib "*) new_libs="$deplib $new_libs" ;; ++ *) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$deplib $new_libs" ;; ++ esac ++ ;; ++ esac ++ ;; ++ esac ++ done ++ tmp_libs= ++ for deplib in $new_libs; do ++ case $deplib in ++ -L*) ++ case " $tmp_libs " in ++ *" $deplib "*) ;; ++ *) tmp_libs="$tmp_libs $deplib" ;; ++ esac ++ ;; ++ *) tmp_libs="$tmp_libs $deplib" ;; ++ esac ++ done ++ eval $var=\"$tmp_libs\" ++ done # for var ++ fi ++ # Last step: remove runtime libs from dependency_libs ++ # (they stay in deplibs) ++ tmp_libs= ++ for i in $dependency_libs ; do ++ case " $predeps $postdeps $compiler_lib_search_path " in ++ *" $i "*) ++ i="" ++ ;; ++ esac ++ if test -n "$i" ; then ++ tmp_libs="$tmp_libs $i" ++ fi ++ done ++ dependency_libs=$tmp_libs ++ done # for pass ++ if test "$linkmode" = prog; then ++ dlfiles="$newdlfiles" ++ dlprefiles="$newdlprefiles" ++ fi + +- # split this up so that func_emit_cwrapperexe_src +- # can call each part independently. +- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" +- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" +-} ++ case $linkmode in ++ oldlib) ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; ++ esac + ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 ++ fi + +-# func_to_host_path arg +-# +-# Convert paths to host format when used with build tools. +-# Intended for use with "native" mingw (where libtool itself +-# is running under the msys shell), or in the following cross- +-# build environments: +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# where wine is equipped with the `winepath' executable. +-# In the native mingw case, the (msys) shell automatically +-# converts paths for any non-msys applications it launches, +-# but that facility isn't available from inside the cwrapper. +-# Similar accommodations are necessary for $host mingw and +-# $build cygwin. Calling this function does no harm for other +-# $host/$build combinations not listed above. +-# +-# ARG is the path (on $build) that should be converted to +-# the proper representation for $host. The result is stored +-# in $func_to_host_path_result. +-func_to_host_path () +-{ +- func_to_host_path_result="$1" +- if test -n "$1" ; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- case $build in +- *mingw* ) # actually, msys +- # awkward: cmd appends spaces to result +- lt_sed_strip_trailing_spaces="s/[ ]*\$//" +- func_to_host_path_tmp1=`( cmd //c echo "$1" |\ +- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` +- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_path_tmp1=`cygpath -w "$1"` +- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # Unfortunately, winepath does not exit with a non-zero +- # error code, so we are forced to check the contents of +- # stdout. On the other hand, if the command is not +- # found, the shell will set an exit code of 127 and print +- # *an error message* to stdout. So we must check for both +- # error code of zero AND non-empty stdout, which explains +- # the odd construction: +- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` +- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then +- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ +- $SED -e "$lt_sed_naive_backslashify"` +- else +- # Allow warning below. +- func_to_host_path_result="" +- fi +- ;; +- esac +- if test -z "$func_to_host_path_result" ; then +- func_error "Could not determine host path corresponding to" +- func_error " '$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback: +- func_to_host_path_result="$1" +- fi +- ;; +- esac +- fi +-} +-# end: func_to_host_path ++ if test -n "$rpath"; then ++ $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 ++ fi + +-# func_to_host_pathlist arg +-# +-# Convert pathlists to host format when used with build tools. +-# See func_to_host_path(), above. This function supports the +-# following $build/$host combinations (but does no harm for +-# combinations not listed here): +-# $build $host +-# mingw (msys) mingw [e.g. native] +-# cygwin mingw +-# *nix + wine mingw +-# +-# Path separators are also converted from $build format to +-# $host format. If ARG begins or ends with a path separator +-# character, it is preserved (but converted to $host format) +-# on output. +-# +-# ARG is a pathlist (on $build) that should be converted to +-# the proper representation on $host. The result is stored +-# in $func_to_host_pathlist_result. +-func_to_host_pathlist () +-{ +- func_to_host_pathlist_result="$1" +- if test -n "$1" ; then +- case $host in +- *mingw* ) +- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' +- # Remove leading and trailing path separator characters from +- # ARG. msys behavior is inconsistent here, cygpath turns them +- # into '.;' and ';.', and winepath ignores them completely. +- func_to_host_pathlist_tmp2="$1" +- # Once set for this call, this variable should not be +- # reassigned. It is used in tha fallback case. +- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ +- $SED -e 's|^:*||' -e 's|:*$||'` +- case $build in +- *mingw* ) # Actually, msys. +- # Awkward: cmd appends spaces to result. +- lt_sed_strip_trailing_spaces="s/[ ]*\$//" +- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ +- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` +- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- *cygwin* ) +- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` +- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ +- $SED -e "$lt_sed_naive_backslashify"` +- ;; +- * ) +- # unfortunately, winepath doesn't convert pathlists +- func_to_host_pathlist_result="" +- func_to_host_pathlist_oldIFS=$IFS +- IFS=: +- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do +- IFS=$func_to_host_pathlist_oldIFS +- if test -n "$func_to_host_pathlist_f" ; then +- func_to_host_path "$func_to_host_pathlist_f" +- if test -n "$func_to_host_path_result" ; then +- if test -z "$func_to_host_pathlist_result" ; then +- func_to_host_pathlist_result="$func_to_host_path_result" +- else +- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" +- fi +- fi +- fi +- IFS=: +- done +- IFS=$func_to_host_pathlist_oldIFS +- ;; +- esac +- if test -z "$func_to_host_pathlist_result" ; then +- func_error "Could not determine the host path(s) corresponding to" +- func_error " '$1'" +- func_error "Continuing, but uninstalled executables may not work." +- # Fallback. This may break if $1 contains DOS-style drive +- # specifications. The fix is not to complicate the expression +- # below, but for the user to provide a working wine installation +- # with winepath so that path translation in the cross-to-mingw +- # case works properly. +- lt_replace_pathsep_nix_to_dos="s|:|;|g" +- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ +- $SED -e "$lt_replace_pathsep_nix_to_dos"` +- fi +- # Now, add the leading and trailing path separators back +- case "$1" in +- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" +- ;; +- esac +- case "$1" in +- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" +- ;; +- esac +- ;; +- esac +- fi +-} +-# end: func_to_host_pathlist ++ if test -n "$xrpath"; then ++ $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 ++ fi + +-# func_emit_cwrapperexe_src +-# emit the source code for a wrapper executable on stdout +-# Must ONLY be called from within func_mode_link because +-# it depends on a number of variable set therein. +-func_emit_cwrapperexe_src () +-{ +- cat <<EOF ++ if test -n "$vinfo"; then ++ $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 ++ fi + +-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname +- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++ if test -n "$release"; then ++ $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 ++ fi + +- The $output program cannot be directly executed until all the libtool +- libraries that it depends on are installed. ++ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then ++ $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 ++ fi + +- This wrapper executable should never be moved out of the build directory. +- If it is, it will not operate correctly. +- +- Currently, it simply execs the wrapper *script* "$SHELL $output", +- but could eventually absorb all of the scripts functionality and +- exec $objdir/$outputname directly. +-*/ +-EOF +- cat <<"EOF" +-#include <stdio.h> +-#include <stdlib.h> +-#ifdef _MSC_VER +-# include <direct.h> +-# include <process.h> +-# include <io.h> +-# define setmode _setmode +-#else +-# include <unistd.h> +-# include <stdint.h> +-# ifdef __CYGWIN__ +-# include <io.h> +-# define HAVE_SETENV +-# ifdef __STRICT_ANSI__ +-char *realpath (const char *, char *); +-int putenv (char *); +-int setenv (const char *, const char *, int); +-# endif +-# endif +-#endif +-#include <malloc.h> +-#include <stdarg.h> +-#include <assert.h> +-#include <string.h> +-#include <ctype.h> +-#include <errno.h> +-#include <fcntl.h> +-#include <sys/stat.h> ++ # Now set the variables for building old libraries. ++ build_libtool_libs=no ++ oldlibs="$output" ++ objs="$objs$old_deplibs" ++ ;; + +-#if defined(PATH_MAX) +-# define LT_PATHMAX PATH_MAX +-#elif defined(MAXPATHLEN) +-# define LT_PATHMAX MAXPATHLEN +-#else +-# define LT_PATHMAX 1024 +-#endif ++ lib) ++ # Make sure we only generate libraries of the form `libNAME.la'. ++ case $outputname in ++ lib*) ++ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" ++ ;; ++ *) ++ if test "$module" = no; then ++ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ if test "$need_lib_prefix" != no; then ++ # Add the "lib" prefix for modules if required ++ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" ++ else ++ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` ++ fi ++ ;; ++ esac + +-#ifndef S_IXOTH +-# define S_IXOTH 0 +-#endif +-#ifndef S_IXGRP +-# define S_IXGRP 0 +-#endif ++ if test -n "$objs"; then ++ if test "$deplibs_check_method" != pass_all; then ++ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 ++ exit $EXIT_FAILURE ++ else ++ $echo ++ $echo "*** Warning: Linking the shared library $output against the non-libtool" ++ $echo "*** objects $objs is not portable!" ++ libobjs="$libobjs $objs" ++ fi ++ fi + +-#ifdef _MSC_VER +-# define S_IXUSR _S_IEXEC +-# define stat _stat +-# ifndef _INTPTR_T_DEFINED +-# define intptr_t int +-# endif +-#endif ++ if test "$dlself" != no; then ++ $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 ++ fi + +-#ifndef DIR_SEPARATOR +-# define DIR_SEPARATOR '/' +-# define PATH_SEPARATOR ':' +-#endif ++ set dummy $rpath ++ if test "$#" -gt 2; then ++ $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 ++ fi ++ install_libdir="$2" + +-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ +- defined (__OS2__) +-# define HAVE_DOS_BASED_FILE_SYSTEM +-# define FOPEN_WB "wb" +-# ifndef DIR_SEPARATOR_2 +-# define DIR_SEPARATOR_2 '\\' +-# endif +-# ifndef PATH_SEPARATOR_2 +-# define PATH_SEPARATOR_2 ';' +-# endif +-#endif ++ oldlibs= ++ if test -z "$rpath"; then ++ if test "$build_libtool_libs" = yes; then ++ # Building a libtool convenience library. ++ # Some compilers have problems with a `.al' extension so ++ # convenience libraries should have the same extension an ++ # archive normally would. ++ oldlibs="$output_objdir/$libname.$libext $oldlibs" ++ build_libtool_libs=convenience ++ build_old_libs=yes ++ fi + +-#ifndef DIR_SEPARATOR_2 +-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +-#else /* DIR_SEPARATOR_2 */ +-# define IS_DIR_SEPARATOR(ch) \ +- (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +-#endif /* DIR_SEPARATOR_2 */ ++ if test -n "$vinfo"; then ++ $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 ++ fi + +-#ifndef PATH_SEPARATOR_2 +-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +-#else /* PATH_SEPARATOR_2 */ +-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +-#endif /* PATH_SEPARATOR_2 */ ++ if test -n "$release"; then ++ $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 ++ fi ++ else + +-#ifdef __CYGWIN__ +-# define FOPEN_WB "wb" +-#endif ++ # Parse the version information argument. ++ save_ifs="$IFS"; IFS=':' ++ set dummy $vinfo 0 0 0 ++ IFS="$save_ifs" + +-#ifndef FOPEN_WB +-# define FOPEN_WB "w" +-#endif +-#ifndef _O_BINARY +-# define _O_BINARY 0 +-#endif ++ if test -n "$8"; then ++ $echo "$modename: too many parameters to \`-version-info'" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +-#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +-#define XFREE(stale) do { \ +- if (stale) { free ((void *) stale); stale = 0; } \ +-} while (0) ++ # convert absolute version numbers to libtool ages ++ # this retains compatibility with .la files and attempts ++ # to make the code below a bit more comprehensible + +-#undef LTWRAPPER_DEBUGPRINTF +-#if defined DEBUGWRAPPER +-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +-static void +-ltwrapper_debugprintf (const char *fmt, ...) +-{ +- va_list args; +- va_start (args, fmt); +- (void) vfprintf (stderr, fmt, args); +- va_end (args); +-} +-#else +-# define LTWRAPPER_DEBUGPRINTF(args) +-#endif ++ case $vinfo_number in ++ yes) ++ number_major="$2" ++ number_minor="$3" ++ number_revision="$4" ++ # ++ # There are really only two kinds -- those that ++ # use the current revision as the major version ++ # and those that subtract age and use age as ++ # a minor version. But, then there is irix ++ # which has an extra 1 added just for fun ++ # ++ case $version_type in ++ darwin|linux|osf|windows|none) ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" ++ ;; ++ freebsd-aout|freebsd-elf|sunos) ++ current="$number_major" ++ revision="$number_minor" ++ age="0" ++ ;; ++ irix|nonstopux) ++ 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 ++ ;; ++ no) ++ current="$2" ++ revision="$3" ++ age="$4" ++ ;; ++ esac + +-const char *program_name = NULL; ++ # Check that each of the things are valid numbers. ++ case $current in ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; ++ *) ++ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 ++ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 ++ exit $EXIT_FAILURE ++ ;; ++ esac + +-void *xmalloc (size_t num); +-char *xstrdup (const char *string); +-const char *base_name (const char *name); +-char *find_executable (const char *wrapper); +-char *chase_symlinks (const char *pathspec); +-int make_executable (const char *path); +-int check_executable (const char *path); +-char *strendzap (char *str, const char *pat); +-void lt_fatal (const char *message, ...); +-void lt_setenv (const char *name, const char *value); +-char *lt_extend_str (const char *orig_value, const char *add, int to_end); +-void lt_opt_process_env_set (const char *arg); +-void lt_opt_process_env_prepend (const char *arg); +-void lt_opt_process_env_append (const char *arg); +-int lt_split_name_value (const char *arg, char** name, char** value); +-void lt_update_exe_path (const char *name, const char *value); +-void lt_update_lib_path (const char *name, const char *value); ++ case $revision in ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; ++ *) ++ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 ++ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 ++ exit $EXIT_FAILURE ++ ;; ++ esac + +-static const char *script_text_part1 = +-EOF ++ case $age in ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; ++ *) ++ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 ++ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 ++ exit $EXIT_FAILURE ++ ;; ++ esac + +- func_emit_wrapper_part1 yes | +- $SED -e 's/\([\\"]\)/\\\1/g' \ +- -e 's/^/ "/' -e 's/$/\\n"/' +- echo ";" +- cat <<EOF ++ if test "$age" -gt "$current"; then ++ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 ++ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +-static const char *script_text_part2 = +-EOF +- func_emit_wrapper_part2 yes | +- $SED -e 's/\([\\"]\)/\\\1/g' \ +- -e 's/^/ "/' -e 's/$/\\n"/' +- echo ";" +- +- cat <<EOF +-const char * MAGIC_EXE = "$magic_exe"; +-const char * LIB_PATH_VARNAME = "$shlibpath_var"; +-EOF ++ # Calculate the version variables. ++ major= ++ versuffix= ++ verstring= ++ case $version_type in ++ none) ;; + +- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then +- func_to_host_pathlist "$temp_rpath" +- cat <<EOF +-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; +-EOF +- else +- cat <<"EOF" +-const char * LIB_PATH_VALUE = ""; +-EOF +- fi ++ darwin) ++ # Like Linux, but with the current version available in ++ # verstring for coding it into the library header ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" ++ # Darwin ld doesn't like 0 for these options... ++ minor_current=`expr $current + 1` ++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" ++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ++ ;; + +- if test -n "$dllsearchpath"; then +- func_to_host_pathlist "$dllsearchpath:" +- cat <<EOF +-const char * EXE_PATH_VARNAME = "PATH"; +-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; +-EOF +- else +- cat <<"EOF" +-const char * EXE_PATH_VARNAME = ""; +-const char * EXE_PATH_VALUE = ""; +-EOF +- fi ++ freebsd-aout) ++ major=".$current" ++ versuffix=".$current.$revision"; ++ ;; + +- if test "$fast_install" = yes; then +- cat <<EOF +-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */ +-EOF +- else +- cat <<EOF +-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */ +-EOF +- fi ++ freebsd-elf) ++ major=".$current" ++ versuffix=".$current"; ++ ;; + ++ irix | nonstopux) ++ 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 ;; ++ esac ++ verstring="$verstring_prefix$major.$revision" + +- cat <<"EOF" ++ # Add in all the interfaces that we are compatible with. ++ loop=$revision ++ while test "$loop" -ne 0; do ++ iface=`expr $revision - $loop` ++ loop=`expr $loop - 1` ++ verstring="$verstring_prefix$major.$iface:$verstring" ++ done + +-#define LTWRAPPER_OPTION_PREFIX "--lt-" +-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 ++ # Before this point, $major must not contain `.'. ++ major=.$major ++ versuffix="$major.$revision" ++ ;; + +-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; +-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; ++ linux) ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" ++ ;; + +-static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; ++ osf) ++ major=.`expr $current - $age` ++ versuffix=".$current.$age.$revision" ++ verstring="$current.$age.$revision" + +-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; +-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; +- /* argument is putenv-style "foo=bar", value of foo is set to bar */ ++ # Add in all the interfaces that we are compatible with. ++ loop=$age ++ while test "$loop" -ne 0; do ++ iface=`expr $current - $loop` ++ loop=`expr $loop - 1` ++ verstring="$verstring:${iface}.0" ++ done + +-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; +-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; +- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ ++ # Make executables depend on our current version. ++ verstring="$verstring:${current}.0" ++ ;; + +-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; +-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; +- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ ++ sunos) ++ major=".$current" ++ versuffix=".$current.$revision" ++ ;; + +-int +-main (int argc, char *argv[]) +-{ +- char **newargz; +- int newargc; +- char *tmp_pathspec; +- char *actual_cwrapper_path; +- char *actual_cwrapper_name; +- char *target_name; +- char *lt_argv_zero; +- intptr_t rval = 127; ++ windows) ++ # Use '-' rather than '.', since we only want one ++ # extension on DOS 8.3 filesystems. ++ major=`expr $current - $age` ++ versuffix="-$major" ++ ;; + +- int i; ++ *) ++ $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 + +- program_name = (char *) xstrdup (base_name (argv[0])); +- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); +- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); +- +- /* very simple arg parsing; don't want to rely on getopt */ +- for (i = 1; i < argc; i++) +- { +- if (strcmp (argv[i], dumpscript_opt) == 0) +- { +-EOF +- case "$host" in +- *mingw* | *cygwin* ) +- # make stdout use "unix" line endings +- echo " setmode(1,_O_BINARY);" +- ;; +- esac +- +- cat <<"EOF" +- printf ("%s", script_text_part1); +- printf ("%s", script_text_part2); +- return 0; +- } +- } +- +- newargz = XMALLOC (char *, argc + 1); +- tmp_pathspec = find_executable (argv[0]); +- if (tmp_pathspec == NULL) +- lt_fatal ("Couldn't find %s", argv[0]); +- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", +- tmp_pathspec)); +- +- actual_cwrapper_path = chase_symlinks (tmp_pathspec); +- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", +- actual_cwrapper_path)); +- XFREE (tmp_pathspec); +- +- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); +- strendzap (actual_cwrapper_path, actual_cwrapper_name); +- +- /* wrapper name transforms */ +- strendzap (actual_cwrapper_name, ".exe"); +- tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1); +- XFREE (actual_cwrapper_name); +- actual_cwrapper_name = tmp_pathspec; +- tmp_pathspec = 0; +- +- /* target_name transforms -- use actual target program name; might have lt- prefix */ +- target_name = xstrdup (base_name (TARGET_PROGRAM_NAME)); +- strendzap (target_name, ".exe"); +- tmp_pathspec = lt_extend_str (target_name, ".exe", 1); +- XFREE (target_name); +- target_name = tmp_pathspec; +- tmp_pathspec = 0; +- +- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", +- target_name)); +-EOF +- +- cat <<EOF +- newargz[0] = +- XMALLOC (char, (strlen (actual_cwrapper_path) + +- strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1)); +- strcpy (newargz[0], actual_cwrapper_path); +- strcat (newargz[0], "$objdir"); +- strcat (newargz[0], "/"); +-EOF +- +- cat <<"EOF" +- /* stop here, and copy so we don't have to do this twice */ +- tmp_pathspec = xstrdup (newargz[0]); +- +- /* do NOT want the lt- prefix here, so use actual_cwrapper_name */ +- strcat (newargz[0], actual_cwrapper_name); +- +- /* DO want the lt- prefix here if it exists, so use target_name */ +- lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1); +- XFREE (tmp_pathspec); +- tmp_pathspec = NULL; +-EOF +- +- case $host_os in +- mingw*) +- cat <<"EOF" +- { +- char* p; +- while ((p = strchr (newargz[0], '\\')) != NULL) +- { +- *p = '/'; +- } +- while ((p = strchr (lt_argv_zero, '\\')) != NULL) +- { +- *p = '/'; +- } +- } +-EOF ++ # Clear the version info if we defaulted, and they specified a release. ++ if test -z "$vinfo" && test -n "$release"; then ++ major= ++ case $version_type in ++ darwin) ++ # we can't check for "0.0" in archive_cmds due to quoting ++ # problems, so we reset it completely ++ verstring= + ;; +- esac +- +- cat <<"EOF" +- XFREE (target_name); +- XFREE (actual_cwrapper_path); +- XFREE (actual_cwrapper_name); +- +- lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ +- lt_setenv ("DUALCASE", "1"); /* for MSK sh */ +- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); +- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); +- +- newargc=0; +- for (i = 1; i < argc; i++) +- { +- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) +- { +- if (argv[i][env_set_opt_len] == '=') +- { +- const char *p = argv[i] + env_set_opt_len + 1; +- lt_opt_process_env_set (p); +- } +- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) +- { +- lt_opt_process_env_set (argv[++i]); /* don't copy */ +- } +- else +- lt_fatal ("%s missing required argument", env_set_opt); +- continue; +- } +- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) +- { +- if (argv[i][env_prepend_opt_len] == '=') +- { +- const char *p = argv[i] + env_prepend_opt_len + 1; +- lt_opt_process_env_prepend (p); +- } +- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) +- { +- lt_opt_process_env_prepend (argv[++i]); /* don't copy */ +- } +- else +- lt_fatal ("%s missing required argument", env_prepend_opt); +- continue; +- } +- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) +- { +- if (argv[i][env_append_opt_len] == '=') +- { +- const char *p = argv[i] + env_append_opt_len + 1; +- lt_opt_process_env_append (p); +- } +- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) +- { +- lt_opt_process_env_append (argv[++i]); /* don't copy */ +- } +- else +- lt_fatal ("%s missing required argument", env_append_opt); +- continue; +- } +- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) +- { +- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX +- namespace, but it is not one of the ones we know about and +- have already dealt with, above (inluding dump-script), then +- report an error. Otherwise, targets might begin to believe +- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX +- namespace. The first time any user complains about this, we'll +- need to make LTWRAPPER_OPTION_PREFIX a configure-time option +- or a configure.ac-settable value. +- */ +- lt_fatal ("Unrecognized option in %s namespace: '%s'", +- ltwrapper_option_prefix, argv[i]); +- } +- /* otherwise ... */ +- newargz[++newargc] = xstrdup (argv[i]); +- } +- newargz[++newargc] = NULL; +- +- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); +- for (i = 0; i < newargc; i++) +- { +- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); +- } +- +-EOF +- +- case $host_os in +- mingw*) +- cat <<"EOF" +- /* execv doesn't actually work on mingw as expected on unix */ +- rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); +- if (rval == -1) +- { +- /* failed to start process */ +- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); +- return 127; +- } +- return rval; +-EOF +- ;; +- *) +- cat <<"EOF" +- execv (lt_argv_zero, newargz); +- return rval; /* =127, but avoids unused variable warning */ +-EOF +- ;; +- esac +- +- cat <<"EOF" +-} +- +-void * +-xmalloc (size_t num) +-{ +- void *p = (void *) malloc (num); +- if (!p) +- lt_fatal ("Memory exhausted"); +- +- return p; +-} +- +-char * +-xstrdup (const char *string) +-{ +- return string ? strcpy ((char *) xmalloc (strlen (string) + 1), +- string) : NULL; +-} +- +-const char * +-base_name (const char *name) +-{ +- const char *base; +- +-#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- /* Skip over the disk name in MSDOS pathnames. */ +- if (isalpha ((unsigned char) name[0]) && name[1] == ':') +- name += 2; +-#endif +- +- for (base = name; *name; name++) +- if (IS_DIR_SEPARATOR (*name)) +- base = name + 1; +- return base; +-} ++ *) ++ verstring="0.0" ++ ;; ++ esac ++ if test "$need_version" = no; then ++ versuffix= ++ else ++ versuffix=".0.0" ++ fi ++ fi + +-int +-check_executable (const char *path) +-{ +- struct stat st; ++ # Remove version info from name if versioning should be avoided ++ if test "$avoid_version" = yes && test "$need_version" = no; then ++ major= ++ versuffix= ++ verstring="" ++ fi + +- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); +- if ((!path) || (!*path)) +- return 0; ++ # Check to see if the archive will have undefined symbols. ++ if test "$allow_undefined" = yes; then ++ if test "$allow_undefined_flag" = unsupported; then ++ $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 ++ build_libtool_libs=no ++ build_old_libs=yes ++ fi ++ else ++ # Don't allow undefined symbols. ++ allow_undefined_flag="$no_undefined_flag" ++ fi ++ fi + +- if ((stat (path, &st) >= 0) +- && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) +- return 1; +- else +- return 0; +-} ++ if test "$mode" != relink; then ++ # Remove our outputs, but don't remove object files since they ++ # may have been created when compiling PIC objects. ++ removelist= ++ tempremovelist=`$echo "$output_objdir/*"` ++ for p in $tempremovelist; do ++ case $p in ++ *.$objext) ++ ;; ++ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) ++ if test "X$precious_files_regex" != "X"; then ++ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 ++ then ++ continue ++ fi ++ fi ++ removelist="$removelist $p" ++ ;; ++ *) ;; ++ esac ++ done ++ if test -n "$removelist"; then ++ $show "${rm}r $removelist" ++ $run ${rm}r $removelist ++ fi ++ fi + +-int +-make_executable (const char *path) +-{ +- int rval = 0; +- struct stat st; ++ # Now set the variables for building old libraries. ++ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then ++ oldlibs="$oldlibs $output_objdir/$libname.$libext" + +- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", +- path ? (*path ? path : "EMPTY!") : "NULL!")); +- if ((!path) || (!*path)) +- return 0; ++ # Transform .lo files to .o files. ++ oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` ++ fi + +- if (stat (path, &st) >= 0) +- { +- rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); +- } +- return rval; +-} ++ # 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 + +-/* Searches for the full path of the wrapper. Returns +- newly allocated full path name if found, NULL otherwise +- Does not chase symlinks, even on platforms that support them. +-*/ +-char * +-find_executable (const char *wrapper) +-{ +- int has_slash = 0; +- const char *p; +- const char *p_next; +- /* static buffer for getcwd */ +- char tmp[LT_PATHMAX + 1]; +- int tmp_len; +- char *concat_name; ++ if test -n "$xrpath"; then ++ # If the user specified any rpath flags, then add them. ++ temp_xrpath= ++ for libdir in $xrpath; do ++ temp_xrpath="$temp_xrpath -R$libdir" ++ case "$finalize_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_rpath="$finalize_rpath $libdir" ;; ++ esac ++ done ++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then ++ dependency_libs="$temp_xrpath $dependency_libs" ++ fi ++ fi + +- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", +- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); ++ # Make sure dlfiles contains only unique files that won't be dlpreopened ++ old_dlfiles="$dlfiles" ++ dlfiles= ++ for lib in $old_dlfiles; do ++ case " $dlprefiles $dlfiles " in ++ *" $lib "*) ;; ++ *) dlfiles="$dlfiles $lib" ;; ++ esac ++ done + +- if ((wrapper == NULL) || (*wrapper == '\0')) +- return NULL; ++ # Make sure dlprefiles contains only unique files ++ old_dlprefiles="$dlprefiles" ++ dlprefiles= ++ for lib in $old_dlprefiles; do ++ case "$dlprefiles " in ++ *" $lib "*) ;; ++ *) dlprefiles="$dlprefiles $lib" ;; ++ esac ++ done + +- /* Absolute path? */ +-#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') +- { +- concat_name = xstrdup (wrapper); +- if (check_executable (concat_name)) +- return concat_name; +- XFREE (concat_name); +- } +- else +- { +-#endif +- if (IS_DIR_SEPARATOR (wrapper[0])) +- { +- concat_name = xstrdup (wrapper); +- if (check_executable (concat_name)) +- return concat_name; +- XFREE (concat_name); +- } +-#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- } +-#endif ++ if test "$build_libtool_libs" = yes; then ++ if test -n "$rpath"; then ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) ++ # these systems don't actually have a c library (as such)! ++ ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework ++ deplibs="$deplibs -framework System" ++ ;; ++ *-*-netbsd*) ++ # Don't link with libc until the a.out ld.so is fixed. ++ ;; ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ # Do not include libc due to us having libc/libc_r. ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ ;; ++ *) ++ # Add libc to deplibs on all other systems if necessary. ++ if test "$build_libtool_need_lc" = "yes"; then ++ deplibs="$deplibs -lc" ++ fi ++ ;; ++ esac ++ fi + +- for (p = wrapper; *p; p++) +- if (*p == '/') +- { +- has_slash = 1; +- break; +- } +- if (!has_slash) +- { +- /* no slashes; search PATH */ +- const char *path = getenv ("PATH"); +- if (path != NULL) +- { +- for (p = path; *p; p = p_next) +- { +- const char *q; +- size_t p_len; +- for (q = p; *q; q++) +- if (IS_PATH_SEPARATOR (*q)) +- break; +- p_len = q - p; +- p_next = (*q == '\0' ? q : q + 1); +- if (p_len == 0) +- { +- /* empty path: current directory */ +- if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); +- tmp_len = strlen (tmp); +- concat_name = +- XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); +- memcpy (concat_name, tmp, tmp_len); +- concat_name[tmp_len] = '/'; +- strcpy (concat_name + tmp_len + 1, wrapper); +- } +- else +- { +- concat_name = +- XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); +- memcpy (concat_name, p, p_len); +- concat_name[p_len] = '/'; +- strcpy (concat_name + p_len + 1, wrapper); +- } +- if (check_executable (concat_name)) +- return concat_name; +- XFREE (concat_name); +- } +- } +- /* not found in PATH; assume curdir */ +- } +- /* Relative path | not found in path: prepend cwd */ +- if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); +- tmp_len = strlen (tmp); +- concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); +- memcpy (concat_name, tmp, tmp_len); +- concat_name[tmp_len] = '/'; +- strcpy (concat_name + tmp_len + 1, wrapper); +- +- if (check_executable (concat_name)) +- return concat_name; +- XFREE (concat_name); +- return NULL; +-} +- +-char * +-chase_symlinks (const char *pathspec) +-{ +-#ifndef S_ISLNK +- return xstrdup (pathspec); +-#else +- char buf[LT_PATHMAX]; +- struct stat s; +- char *tmp_pathspec = xstrdup (pathspec); +- char *p; +- int has_symlinks = 0; +- while (strlen (tmp_pathspec) && !has_symlinks) +- { +- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", +- tmp_pathspec)); +- if (lstat (tmp_pathspec, &s) == 0) +- { +- if (S_ISLNK (s.st_mode) != 0) +- { +- has_symlinks = 1; +- break; +- } +- +- /* search backwards for last DIR_SEPARATOR */ +- p = tmp_pathspec + strlen (tmp_pathspec) - 1; +- while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) +- p--; +- if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) +- { +- /* no more DIR_SEPARATORS left */ +- break; +- } +- *p = '\0'; +- } +- else +- { +- char *errstr = strerror (errno); +- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); +- } +- } +- XFREE (tmp_pathspec); +- +- if (!has_symlinks) +- { +- return xstrdup (pathspec); +- } +- +- tmp_pathspec = realpath (pathspec, buf); +- if (tmp_pathspec == 0) +- { +- lt_fatal ("Could not follow symlinks for %s", pathspec); +- } +- return xstrdup (tmp_pathspec); +-#endif +-} +- +-char * +-strendzap (char *str, const char *pat) +-{ +- size_t len, patlen; +- +- assert (str != NULL); +- assert (pat != NULL); ++ # Transform deplibs into only deplibs that can be linked in shared. ++ name_save=$name ++ libname_save=$libname ++ release_save=$release ++ versuffix_save=$versuffix ++ major_save=$major ++ # I'm not sure if I'm treating the release correctly. I think ++ # release should show up in the -l (ie -lgmp5) so we don't want to ++ # add it in twice. Is that correct? ++ release="" ++ versuffix="" ++ major="" ++ newdeplibs= ++ droppeddeps=no ++ case $deplibs_check_method in ++ pass_all) ++ # Don't check for shared/static. Everything works. ++ # This might be a little naive. We might want to check ++ # whether the library exists or not. But this is on ++ # osf3 & osf4 and I'm not really sure... Just ++ # implementing what was already the behavior. ++ newdeplibs=$deplibs ++ ;; ++ test_compile) ++ # This code stresses the "libraries are programs" paradigm to its ++ # limits. Maybe even breaks it. We compile a program, linking it ++ # against the deplibs as a proxy for the library. Then we can check ++ # whether they linked in statically or dynamically with ldd. ++ $rm conftest.c ++ cat > conftest.c <<EOF ++ int main() { return 0; } ++EOF ++ $rm conftest ++ 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" != "0"; then ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $i "*) ++ newdeplibs="$newdeplibs $i" ++ i="" ++ ;; ++ esac ++ fi ++ if test -n "$i" ; then ++ libname=`eval \\$echo \"$libname_spec\"` ++ deplib_matches=`eval \\$echo \"$library_names_spec\"` ++ set dummy $deplib_matches ++ deplib_match=$2 ++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then ++ newdeplibs="$newdeplibs $i" ++ else ++ droppeddeps=yes ++ $echo ++ $echo "*** Warning: dynamic linker does not accept needed library $i." ++ $echo "*** I have the capability to make that library automatically link in when" ++ $echo "*** you link to this library. But I can only do this if you have a" ++ $echo "*** shared version of the library, which I believe you do not have" ++ $echo "*** because a test_compile did reveal that the linker did not use it for" ++ $echo "*** its dynamic dependency list that programs get resolved with at runtime." ++ fi ++ fi ++ else ++ newdeplibs="$newdeplibs $i" ++ fi ++ done ++ else ++ # Error occurred in the first compile. Let's try to salvage ++ # the situation: Compile a separate program for each library. ++ 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" != "0"; then ++ $rm conftest ++ 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 ++ *" $i "*) ++ newdeplibs="$newdeplibs $i" ++ i="" ++ ;; ++ esac ++ fi ++ if test -n "$i" ; then ++ libname=`eval \\$echo \"$libname_spec\"` ++ deplib_matches=`eval \\$echo \"$library_names_spec\"` ++ set dummy $deplib_matches ++ deplib_match=$2 ++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then ++ newdeplibs="$newdeplibs $i" ++ else ++ droppeddeps=yes ++ $echo ++ $echo "*** Warning: dynamic linker does not accept needed library $i." ++ $echo "*** I have the capability to make that library automatically link in when" ++ $echo "*** you link to this library. But I can only do this if you have a" ++ $echo "*** shared version of the library, which you do not appear to have" ++ $echo "*** because a test_compile did reveal that the linker did not use this one" ++ $echo "*** as a dynamic dependency that programs can get resolved with at runtime." ++ fi ++ fi ++ else ++ 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 "*** library that it depends on before this library will be fully" ++ $echo "*** functional. Installing it before continuing would be even better." ++ fi ++ else ++ newdeplibs="$newdeplibs $i" ++ fi ++ done ++ fi ++ ;; ++ file_magic*) ++ set dummy $deplibs_check_method ++ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` ++ for a_deplib in $deplibs; do ++ name=`expr $a_deplib : '-l\(.*\)'` ++ # If $name is empty we are operating on a -L argument. ++ if test "$name" != "" && test "$name" != "0"; then ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $a_deplib "*) ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ ;; ++ esac ++ fi ++ if test -n "$a_deplib" ; then ++ libname=`eval \\$echo \"$libname_spec\"` ++ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ for potent_lib in $potential_libs; do ++ # Follow soft links. ++ if ls -lLd "$potent_lib" 2>/dev/null \ ++ | grep " -> " >/dev/null; then ++ continue ++ fi ++ # The statement above tries to avoid entering an ++ # endless loop below, in case of cyclic links. ++ # We might still enter an endless loop, since a link ++ # loop can be closed while we follow links, ++ # but so what? ++ potlib="$potent_lib" ++ while test -h "$potlib" 2>/dev/null; do ++ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` ++ case $potliblink in ++ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; ++ *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; ++ esac ++ done ++ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ ++ | ${SED} 10q \ ++ | $EGREP "$file_magic_regex" > /dev/null; then ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ break 2 ++ fi ++ done ++ done ++ fi ++ if test -n "$a_deplib" ; then ++ droppeddeps=yes ++ $echo ++ $echo "*** Warning: linker path does not have real file for library $a_deplib." ++ $echo "*** I have the capability to make that library automatically link in when" ++ $echo "*** you link to this library. But I can only do this if you have a" ++ $echo "*** shared version of the library, which you do not appear to have" ++ $echo "*** because I did check the linker path looking for a file starting" ++ if test -z "$potlib" ; then ++ $echo "*** with $libname but no candidates were found. (...for file magic test)" ++ else ++ $echo "*** with $libname and none of the candidates passed a file format test" ++ $echo "*** using a file magic. Last file checked: $potlib" ++ fi ++ fi ++ else ++ # Add a -L argument. ++ newdeplibs="$newdeplibs $a_deplib" ++ fi ++ done # Gone through all deplibs. ++ ;; ++ match_pattern*) ++ set dummy $deplibs_check_method ++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` ++ for a_deplib in $deplibs; do ++ name=`expr $a_deplib : '-l\(.*\)'` ++ # If $name is empty we are operating on a -L argument. ++ if test -n "$name" && test "$name" != "0"; then ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $a_deplib "*) ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ ;; ++ esac ++ fi ++ if test -n "$a_deplib" ; then ++ libname=`eval \\$echo \"$libname_spec\"` ++ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ for potent_lib in $potential_libs; do ++ potlib="$potent_lib" # see symlink-check above in file_magic test ++ if eval $echo \"$potent_lib\" 2>/dev/null \ ++ | ${SED} 10q \ ++ | $EGREP "$match_pattern_regex" > /dev/null; then ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ break 2 ++ fi ++ done ++ done ++ fi ++ if test -n "$a_deplib" ; then ++ droppeddeps=yes ++ $echo ++ $echo "*** Warning: linker path does not have real file for library $a_deplib." ++ $echo "*** I have the capability to make that library automatically link in when" ++ $echo "*** you link to this library. But I can only do this if you have a" ++ $echo "*** shared version of the library, which you do not appear to have" ++ $echo "*** because I did check the linker path looking for a file starting" ++ if test -z "$potlib" ; then ++ $echo "*** with $libname but no candidates were found. (...for regex pattern test)" ++ else ++ $echo "*** with $libname and none of the candidates passed a file format test" ++ $echo "*** using a regex pattern. Last file checked: $potlib" ++ fi ++ fi ++ else ++ # Add a -L argument. ++ newdeplibs="$newdeplibs $a_deplib" ++ fi ++ done # Gone through all deplibs. ++ ;; ++ none | unknown | *) ++ newdeplibs="" ++ tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ ++ -e 's/ -[LR][^ ]*//g'` ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ for i in $predeps $postdeps ; do ++ # can't use Xsed below, because $i might contain '/' ++ tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` ++ done ++ fi ++ if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ ++ | grep . >/dev/null; then ++ $echo ++ if test "X$deplibs_check_method" = "Xnone"; then ++ $echo "*** Warning: inter-library dependencies are not supported in this platform." ++ else ++ $echo "*** Warning: inter-library dependencies are not known to be supported." ++ fi ++ $echo "*** All declared inter-library dependencies are being dropped." ++ droppeddeps=yes ++ fi ++ ;; ++ esac ++ versuffix=$versuffix_save ++ major=$major_save ++ release=$release_save ++ libname=$libname_save ++ name=$name_save + +- len = strlen (str); +- patlen = strlen (pat); ++ case $host in ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # On Rhapsody replace the C library is the System framework ++ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` ++ ;; ++ esac + +- if (patlen <= len) +- { +- str += len - patlen; +- if (strcmp (str, pat) == 0) +- *str = '\0'; +- } +- return str; +-} ++ if test "$droppeddeps" = yes; then ++ if test "$module" = yes; then ++ $echo ++ $echo "*** Warning: libtool could not satisfy all declared inter-library" ++ $echo "*** dependencies of module $libname. Therefore, libtool will create" ++ $echo "*** a static module, that should work as long as the dlopening" ++ $echo "*** application is linked with the -dlopen flag." ++ if test -z "$global_symbol_pipe"; then ++ $echo ++ $echo "*** However, this would only work if libtool was able to extract symbol" ++ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" ++ $echo "*** not find such a program. So, this module is probably useless." ++ $echo "*** \`nm' from GNU binutils and a full rebuild may help." ++ fi ++ if test "$build_old_libs" = no; then ++ oldlibs="$output_objdir/$libname.$libext" ++ build_libtool_libs=module ++ build_old_libs=yes ++ else ++ build_libtool_libs=no ++ fi ++ else ++ $echo "*** The inter-library dependencies that have been dropped here will be" ++ $echo "*** automatically added whenever a program is linked with this library" ++ $echo "*** or is declared to -dlopen it." + +-static void +-lt_error_core (int exit_status, const char *mode, +- const char *message, va_list ap) +-{ +- fprintf (stderr, "%s: %s: ", program_name, mode); +- vfprintf (stderr, message, ap); +- fprintf (stderr, ".\n"); ++ if test "$allow_undefined" = no; then ++ $echo ++ $echo "*** Since this library must not contain undefined symbols," ++ $echo "*** because either the platform does not support them or" ++ $echo "*** it was explicitly requested with -no-undefined," ++ $echo "*** libtool will only create a static version of it." ++ if test "$build_old_libs" = no; then ++ oldlibs="$output_objdir/$libname.$libext" ++ build_libtool_libs=module ++ build_old_libs=yes ++ else ++ build_libtool_libs=no ++ fi ++ fi ++ fi ++ fi ++ # Done checking deplibs! ++ deplibs=$newdeplibs ++ fi + +- if (exit_status >= 0) +- exit (exit_status); +-} + +-void +-lt_fatal (const char *message, ...) +-{ +- va_list ap; +- va_start (ap, message); +- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); +- va_end (ap); +-} ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ deplibs="$new_libs" + +-void +-lt_setenv (const char *name, const char *value) +-{ +- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", +- (name ? name : "<NULL>"), +- (value ? value : "<NULL>"))); +- { +-#ifdef HAVE_SETENV +- /* always make a copy, for consistency with !HAVE_SETENV */ +- char *str = xstrdup (value); +- setenv (name, str, 1); +-#else +- int len = strlen (name) + 1 + strlen (value) + 1; +- char *str = XMALLOC (char, len); +- sprintf (str, "%s=%s", name, value); +- if (putenv (str) != EXIT_SUCCESS) +- { +- XFREE (str); +- } +-#endif +- } +-} + +-char * +-lt_extend_str (const char *orig_value, const char *add, int to_end) +-{ +- char *new_value; +- if (orig_value && *orig_value) +- { +- int orig_value_len = strlen (orig_value); +- int add_len = strlen (add); +- new_value = XMALLOC (char, add_len + orig_value_len + 1); +- if (to_end) +- { +- strcpy (new_value, orig_value); +- strcpy (new_value + orig_value_len, add); +- } +- else +- { +- strcpy (new_value, add); +- strcpy (new_value + add_len, orig_value); +- } +- } +- else +- { +- new_value = xstrdup (add); +- } +- return new_value; +-} ++ # All the library-specific variables (install_libdir is set above). ++ library_names= ++ old_library= ++ dlname= + +-int +-lt_split_name_value (const char *arg, char** name, char** value) +-{ +- const char *p; +- int len; +- if (!arg || !*arg) +- return 1; ++ # Test again, we may have decided not to build it any more ++ if test "$build_libtool_libs" = yes; then ++ if test "$hardcode_into_libs" = yes; then ++ # Hardcode the library paths ++ hardcode_libdirs= ++ dep_rpath= ++ rpath="$finalize_rpath" ++ test "$mode" != relink && rpath="$compile_rpath$rpath" ++ for libdir in $rpath; do ++ if test -n "$hardcode_libdir_flag_spec"; then ++ if test -n "$hardcode_libdir_separator"; then ++ if test -z "$hardcode_libdirs"; then ++ hardcode_libdirs="$libdir" ++ else ++ # Just accumulate the unique libdirs. ++ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in ++ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ++ ;; ++ *) ++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ ;; ++ esac ++ fi ++ else ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ dep_rpath="$dep_rpath $flag" ++ fi ++ elif test -n "$runpath_var"; then ++ case "$perm_rpath " in ++ *" $libdir "*) ;; ++ *) perm_rpath="$perm_rpath $libdir" ;; ++ esac ++ fi ++ done ++ # Substitute the hardcoded libdirs into the rpath. ++ if test -n "$hardcode_libdir_separator" && ++ test -n "$hardcode_libdirs"; then ++ libdir="$hardcode_libdirs" ++ if test -n "$hardcode_libdir_flag_spec_ld"; then ++ 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 ++ fi ++ if test -n "$runpath_var" && test -n "$perm_rpath"; then ++ # We should set the runpath_var. ++ rpath= ++ for dir in $perm_rpath; do ++ rpath="$rpath$dir:" ++ done ++ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" ++ fi ++ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" ++ fi + +- p = strchr (arg, (int)'='); ++ shlibpath="$finalize_shlibpath" ++ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ if test -n "$shlibpath"; then ++ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" ++ fi + +- if (!p) +- return 1; ++ # Get the real and link names of the library. ++ eval shared_ext=\"$shrext_cmds\" ++ eval library_names=\"$library_names_spec\" ++ set dummy $library_names ++ realname="$2" ++ shift; shift + +- *value = xstrdup (++p); ++ if test -n "$soname_spec"; then ++ eval soname=\"$soname_spec\" ++ else ++ soname="$realname" ++ fi ++ if test -z "$dlname"; then ++ dlname=$soname ++ fi + +- len = strlen (arg) - strlen (*value); +- *name = XMALLOC (char, len); +- strncpy (*name, arg, len-1); +- (*name)[len - 1] = '\0'; ++ lib="$output_objdir/$realname" ++ linknames= ++ for link ++ do ++ linknames="$linknames $link" ++ done + +- return 0; +-} ++ # Use standard objects if they are pic ++ test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + +-void +-lt_opt_process_env_set (const char *arg) +-{ +- char *name = NULL; +- char *value = NULL; ++ # Prepare the list of exported symbols ++ if test -z "$export_symbols"; then ++ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then ++ $show "generating symbol list for \`$libname.la'" ++ export_symbols="$output_objdir/$libname.exp" ++ $run $rm $export_symbols ++ cmds=$export_symbols_cmds ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ if len=`expr "X$cmd" : ".*"` && ++ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ $show "$cmd" ++ $run eval "$cmd" || exit $? ++ skipped_export=false ++ else ++ # The command line is too long to execute in one step. ++ $show "using reloadable object file for export list..." ++ skipped_export=: ++ # Break out early, otherwise skipped_export may be ++ # set to false by a later but shorter cmd. ++ break ++ fi ++ done ++ IFS="$save_ifs" ++ if test -n "$export_symbols_regex"; then ++ $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" ++ $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' ++ $show "$mv \"${export_symbols}T\" \"$export_symbols\"" ++ $run eval '$mv "${export_symbols}T" "$export_symbols"' ++ fi ++ fi ++ fi + +- if (lt_split_name_value (arg, &name, &value) != 0) +- { +- XFREE (name); +- XFREE (value); +- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); +- } ++ if test -n "$export_symbols" && test -n "$include_expsyms"; then ++ $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' ++ fi + +- lt_setenv (name, value); +- XFREE (name); +- XFREE (value); +-} ++ tmp_deplibs= ++ for test_deplib in $deplibs; do ++ case " $convenience " in ++ *" $test_deplib "*) ;; ++ *) ++ tmp_deplibs="$tmp_deplibs $test_deplib" ++ ;; ++ esac ++ done ++ deplibs="$tmp_deplibs" + +-void +-lt_opt_process_env_prepend (const char *arg) +-{ +- char *name = NULL; +- char *value = NULL; +- char *new_value = NULL; ++ if test -n "$convenience"; then ++ if test -n "$whole_archive_flag_spec"; then ++ save_libobjs=$libobjs ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" ++ else ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" + +- if (lt_split_name_value (arg, &name, &value) != 0) +- { +- XFREE (name); +- XFREE (value); +- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); +- } ++ func_extract_archives $gentop $convenience ++ libobjs="$libobjs $func_extract_archives_result" ++ fi ++ fi ++ ++ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then ++ eval flag=\"$thread_safe_flag_spec\" ++ linker_flags="$linker_flags $flag" ++ fi + +- new_value = lt_extend_str (getenv (name), value, 0); +- lt_setenv (name, new_value); +- XFREE (new_value); +- XFREE (name); +- XFREE (value); +-} ++ # Make a backup of the uninstalled library when relinking ++ if test "$mode" = relink; then ++ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? ++ fi + +-void +-lt_opt_process_env_append (const char *arg) +-{ +- char *name = NULL; +- char *value = NULL; +- char *new_value = NULL; ++ # Do each of the archive commands. ++ if test "$module" = yes && test -n "$module_cmds" ; then ++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then ++ eval test_cmds=\"$module_expsym_cmds\" ++ cmds=$module_expsym_cmds ++ else ++ eval test_cmds=\"$module_cmds\" ++ cmds=$module_cmds ++ fi ++ else ++ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then ++ eval test_cmds=\"$archive_expsym_cmds\" ++ cmds=$archive_expsym_cmds ++ else ++ eval test_cmds=\"$archive_cmds\" ++ cmds=$archive_cmds ++ fi ++ fi + +- if (lt_split_name_value (arg, &name, &value) != 0) +- { +- XFREE (name); +- XFREE (value); +- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); +- } ++ if test "X$skipped_export" != "X:" && ++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` && ++ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ : ++ else ++ # The command line is too long to link in one step, link piecewise. ++ $echo "creating reloadable object files..." + +- new_value = lt_extend_str (getenv (name), value, 1); +- lt_setenv (name, new_value); +- XFREE (new_value); +- XFREE (name); +- XFREE (value); +-} ++ # Save the value of $output and $libobjs because we want to ++ # use them later. If we have whole_archive_flag_spec, we ++ # want to use save_libobjs as it was before ++ # whole_archive_flag_spec was expanded, because we can't ++ # assume the linker understands whole_archive_flag_spec. ++ # This may have to be revisited, in case too many ++ # convenience libraries get linked in and end up exceeding ++ # the spec. ++ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then ++ save_libobjs=$libobjs ++ fi ++ save_output=$output ++ output_la=`$echo "X$output" | $Xsed -e "$basename"` + +-void +-lt_update_exe_path (const char *name, const char *value) +-{ +- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", +- (name ? name : "<NULL>"), +- (value ? value : "<NULL>"))); ++ # Clear the reloadable object creation command queue and ++ # initialize k to one. ++ test_cmds= ++ concat_cmds= ++ objlist= ++ delfiles= ++ last_robj= ++ k=1 ++ output=$output_objdir/$output_la-${k}.$objext ++ # Loop over the list of objects to be linked. ++ for obj in $save_libobjs ++ do ++ eval test_cmds=\"$reload_cmds $objlist $last_robj\" ++ if test "X$objlist" = X || ++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && ++ test "$len" -le "$max_cmd_len"; }; then ++ objlist="$objlist $obj" ++ else ++ # The command $test_cmds is almost too long, add a ++ # command to the queue. ++ if test "$k" -eq 1 ; then ++ # The first file doesn't have a previous command to add. ++ eval concat_cmds=\"$reload_cmds $objlist $last_robj\" ++ else ++ # All subsequent reloadable object files will link in ++ # the last one created. ++ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" ++ fi ++ last_robj=$output_objdir/$output_la-${k}.$objext ++ k=`expr $k + 1` ++ output=$output_objdir/$output_la-${k}.$objext ++ objlist=$obj ++ len=1 ++ fi ++ done ++ # Handle the remaining objects by creating one last ++ # reloadable object file. All subsequent reloadable object ++ # files will link in the last one created. ++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ ++ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + +- if (name && *name && value && *value) +- { +- char *new_value = lt_extend_str (getenv (name), value, 0); +- /* some systems can't cope with a ':'-terminated path #' */ +- int len = strlen (new_value); +- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) +- { +- new_value[len-1] = '\0'; +- } +- lt_setenv (name, new_value); +- XFREE (new_value); +- } +-} ++ if ${skipped_export-false}; then ++ $show "generating symbol list for \`$libname.la'" ++ export_symbols="$output_objdir/$libname.exp" ++ $run $rm $export_symbols ++ libobjs=$output ++ # Append the command to create the export file. ++ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" ++ fi ++ ++ # Set up a command to remove the reloadable object files ++ # after they are used. ++ i=0 ++ while test "$i" -lt "$k" ++ do ++ i=`expr $i + 1` ++ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" ++ done + +-void +-lt_update_lib_path (const char *name, const char *value) +-{ +- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", +- (name ? name : "<NULL>"), +- (value ? value : "<NULL>"))); +- +- if (name && *name && value && *value) +- { +- char *new_value = lt_extend_str (getenv (name), value, 0); +- lt_setenv (name, new_value); +- XFREE (new_value); +- } +-} ++ $echo "creating a temporary reloadable object file: $output" + ++ # Loop through the commands generated above and execute them. ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $concat_cmds; do ++ IFS="$save_ifs" ++ $show "$cmd" ++ $run eval "$cmd" || exit $? ++ done ++ IFS="$save_ifs" + +-EOF +-} +-# end: func_emit_cwrapperexe_src ++ libobjs=$output ++ # Restore the value of output. ++ output=$save_output + +-# func_mode_link arg... +-func_mode_link () +-{ +- $opt_debug +- case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) +- # It is impossible to link a dll without this setting, and +- # we shouldn't force the makefile maintainer to figure out +- # which system we are compiling for in order to pass an extra +- # flag for every libtool invocation. +- # allow_undefined=no ++ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" ++ fi ++ # Expand the library linking commands again to reset the ++ # value of $libobjs for piecewise linking. + +- # FIXME: Unfortunately, there are problems with the above when trying +- # to make a dll which has undefined symbols, in which case not +- # even a static library is built. For now, we need to specify +- # -no-undefined on the libtool link line when we can be certain +- # that all symbols are satisfied, otherwise we get a static library. +- allow_undefined=yes +- ;; +- *) +- allow_undefined=yes +- ;; +- esac +- libtool_args=$nonopt +- base_compile="$nonopt $@" +- compile_command=$nonopt +- finalize_command=$nonopt ++ # Do each of the archive commands. ++ if test "$module" = yes && test -n "$module_cmds" ; then ++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then ++ cmds=$module_expsym_cmds ++ else ++ cmds=$module_cmds ++ fi ++ else ++ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then ++ cmds=$archive_expsym_cmds ++ else ++ cmds=$archive_cmds ++ fi ++ fi + +- compile_rpath= +- finalize_rpath= +- compile_shlibpath= +- finalize_shlibpath= +- convenience= +- old_convenience= +- deplibs= +- old_deplibs= +- compiler_flags= +- linker_flags= +- dllsearchpath= +- lib_search_path=`pwd` +- inst_prefix_dir= +- new_inherited_linker_flags= ++ # Append the command to remove the reloadable object files ++ # to the just-reset $cmds. ++ eval cmds=\"\$cmds~\$rm $delfiles\" ++ fi ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $show "$cmd" ++ $run eval "$cmd" || { ++ lt_exit=$? + +- avoid_version=no +- dlfiles= +- dlprefiles= +- dlself=no +- export_dynamic=no +- export_symbols= +- export_symbols_regex= +- generated= +- libobjs= +- ltlibs= +- module=no +- no_install=no +- objs= +- non_pic_objects= +- precious_files_regex= +- prefer_static_libs=no +- preload=no +- prev= +- prevarg= +- release= +- rpath= +- xrpath= +- perm_rpath= +- temp_rpath= +- thread_safe=no +- vinfo= +- vinfo_number=no +- weak_libs= +- single_module="${wl}-single_module" +- func_infer_tag $base_compile ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' ++ fi + +- # We need to know -static, to get the right output filenames. +- for arg +- do +- case $arg in +- -shared) +- test "$build_libtool_libs" != yes && \ +- func_fatal_configuration "can not build a shared library" +- build_old_libs=no +- break +- ;; +- -all-static | -static | -static-libtool-libs) +- case $arg in +- -all-static) +- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then +- func_warning "complete static linking is impossible in this configuration" +- fi +- if test -n "$link_static_flag"; then +- dlopen_self=$dlopen_self_static +- fi +- prefer_static_libs=yes +- ;; +- -static) +- if test -z "$pic_flag" && test -n "$link_static_flag"; then +- dlopen_self=$dlopen_self_static +- fi +- prefer_static_libs=built +- ;; +- -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 +- ;; +- esac +- done ++ exit $lt_exit ++ } ++ done ++ IFS="$save_ifs" + +- # See if our shared archives depend on static archives. +- test -n "$old_archive_from_new_cmds" && build_old_libs=yes ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? + +- # Go through the arguments, transforming them on the way. +- while test "$#" -gt 0; do +- arg="$1" +- shift +- func_quote_for_eval "$arg" +- qarg=$func_quote_for_eval_unquoted_result +- func_append libtool_args " $func_quote_for_eval_result" ++ if test -n "$convenience"; then ++ if test -z "$whole_archive_flag_spec"; then ++ $show "${rm}r $gentop" ++ $run ${rm}r "$gentop" ++ fi ++ fi + +- # If the previous option needs an argument, assign it. +- if test -n "$prev"; then +- case $prev in +- output) +- func_append compile_command " @OUTPUT@" +- func_append finalize_command " @OUTPUT@" +- ;; +- esac ++ exit $EXIT_SUCCESS ++ fi + +- case $prev in +- dlfiles|dlprefiles) +- if test "$preload" = no; then +- # Add the symbol object into the linking commands. +- func_append compile_command " @SYMFILE@" +- func_append finalize_command " @SYMFILE@" +- preload=yes ++ # Create links to the real library. ++ for linkname in $linknames; do ++ if test "$realname" != "$linkname"; then ++ $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" ++ $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? + fi +- case $arg in +- *.la | *.lo) ;; # We handle these cases below. +- force) +- if test "$dlself" = no; then +- dlself=needless +- export_dynamic=yes +- fi +- prev= +- continue +- ;; +- self) +- if test "$prev" = dlprefiles; then +- dlself=yes +- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then +- dlself=yes +- else +- dlself=needless +- export_dynamic=yes +- fi +- prev= +- continue +- ;; +- *) +- if test "$prev" = dlfiles; then +- dlfiles="$dlfiles $arg" +- else +- dlprefiles="$dlprefiles $arg" +- fi +- prev= +- continue +- ;; +- esac +- ;; +- expsyms) +- export_symbols="$arg" +- test -f "$arg" \ +- || func_fatal_error "symbol file \`$arg' does not exist" +- prev= +- continue +- ;; +- expsyms_regex) +- export_symbols_regex="$arg" +- prev= +- continue +- ;; +- framework) +- case $host in +- *-*-darwin*) +- case "$deplibs " in +- *" $qarg.ltframework "*) ;; +- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later +- ;; +- esac +- ;; +- esac +- prev= +- continue +- ;; +- inst_prefix) +- inst_prefix_dir="$arg" +- prev= +- continue +- ;; +- objectlist) +- if test -f "$arg"; then +- save_arg=$arg +- moreargs= +- for fil in `cat "$save_arg"` +- do +-# moreargs="$moreargs $fil" +- arg=$fil +- # A libtool-controlled object. ++ done + +- # Check to see that this really is a libtool object. +- if func_lalib_unsafe_p "$arg"; then +- pic_object= +- non_pic_object= ++ # If -module or -export-dynamic was specified, set the dlname. ++ if test "$module" = yes || test "$export_dynamic" = yes; then ++ # On all known operating systems, these are identical. ++ dlname="$soname" ++ fi ++ fi ++ ;; + +- # Read the .lo file +- func_source "$arg" ++ obj) ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; ++ esac + +- if test -z "$pic_object" || +- test -z "$non_pic_object" || +- test "$pic_object" = none && +- test "$non_pic_object" = none; then +- func_fatal_error "cannot find name of object for \`$arg'" +- fi ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 ++ fi + +- # Extract subdirectory from the argument. +- func_dirname "$arg" "/" "" +- xdir="$func_dirname_result" ++ if test -n "$rpath"; then ++ $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 ++ fi + +- if test "$pic_object" != none; then +- # Prepend the subdirectory the object is found in. +- pic_object="$xdir$pic_object" ++ if test -n "$xrpath"; then ++ $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 ++ fi + +- if test "$prev" = dlfiles; then +- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" +- prev= +- continue +- else +- # If libtool objects are unsupported, then we need to preload. +- prev=dlprefiles +- fi +- fi ++ if test -n "$vinfo"; then ++ $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 ++ fi + +- # CHECK ME: I think I busted this. -Ossama +- if test "$prev" = dlprefiles; then +- # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" +- prev= +- fi ++ if test -n "$release"; then ++ $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 ++ fi + +- # A PIC object. +- func_append libobjs " $pic_object" +- arg="$pic_object" +- fi ++ case $output in ++ *.lo) ++ if test -n "$objs$old_deplibs"; then ++ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ libobj="$output" ++ obj=`$echo "X$output" | $Xsed -e "$lo2o"` ++ ;; ++ *) ++ libobj= ++ obj="$output" ++ ;; ++ esac + +- # Non-PIC object. +- if test "$non_pic_object" != none; then +- # Prepend the subdirectory the object is found in. +- non_pic_object="$xdir$non_pic_object" ++ # Delete the old objects. ++ $run $rm $obj $libobj + +- # A standard non-PIC object +- func_append non_pic_objects " $non_pic_object" +- if test -z "$pic_object" || test "$pic_object" = none ; then +- arg="$non_pic_object" +- fi +- else +- # If the PIC object exists, use it instead. +- # $xdir was prepended to $pic_object above. +- non_pic_object="$pic_object" +- func_append non_pic_objects " $non_pic_object" +- fi +- else +- # Only an error if not doing a dry-run. +- if $opt_dry_run; then +- # Extract subdirectory from the argument. +- func_dirname "$arg" "/" "" +- xdir="$func_dirname_result" ++ # Objects from convenience libraries. This assumes ++ # single-version convenience libraries. Whenever we create ++ # different ones for PIC/non-PIC, this we'll have to duplicate ++ # the extraction. ++ reload_conv_objs= ++ gentop= ++ # reload_cmds runs $LD directly, so let us get rid of ++ # -Wl from whole_archive_flag_spec and hope we can get by with ++ # turning comma into space.. ++ wl= + +- func_lo2o "$arg" +- pic_object=$xdir$objdir/$func_lo2o_result +- non_pic_object=$xdir$func_lo2o_result +- func_append libobjs " $pic_object" +- func_append non_pic_objects " $non_pic_object" +- else +- func_fatal_error "\`$arg' is not a valid libtool object" +- fi +- fi +- done +- else +- func_fatal_error "link input file \`$arg' does not exist" +- fi +- arg=$save_arg +- prev= +- continue +- ;; +- precious_regex) +- precious_files_regex="$arg" +- prev= +- continue +- ;; +- release) +- release="-$arg" +- prev= +- continue +- ;; +- rpath | xrpath) +- # We need an absolute path. +- case $arg in +- [\\/]* | [A-Za-z]:[\\/]*) ;; +- *) +- func_fatal_error "only absolute run-paths are allowed" +- ;; +- esac +- if test "$prev" = rpath; then +- case "$rpath " in +- *" $arg "*) ;; +- *) rpath="$rpath $arg" ;; +- esac +- else +- case "$xrpath " in +- *" $arg "*) ;; +- *) xrpath="$xrpath $arg" ;; +- esac +- fi +- prev= +- continue +- ;; +- shrext) +- shrext_cmds="$arg" +- prev= +- continue +- ;; +- weak) +- weak_libs="$weak_libs $arg" +- prev= +- continue +- ;; +- xcclinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $qarg" +- prev= +- func_append compile_command " $qarg" +- func_append finalize_command " $qarg" +- continue +- ;; +- xcompiler) +- compiler_flags="$compiler_flags $qarg" +- prev= +- func_append compile_command " $qarg" +- func_append finalize_command " $qarg" +- continue +- ;; +- xlinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $wl$qarg" +- prev= +- func_append compile_command " $wl$qarg" +- func_append finalize_command " $wl$qarg" +- continue +- ;; +- *) +- eval "$prev=\"\$arg\"" +- prev= +- continue +- ;; +- esac +- fi # test -n "$prev" ++ if test -n "$convenience"; then ++ if test -n "$whole_archive_flag_spec"; then ++ 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" + +- prevarg="$arg" ++ func_extract_archives $gentop $convenience ++ reload_conv_objs="$reload_objs $func_extract_archives_result" ++ fi ++ fi + +- case $arg in +- -all-static) +- if test -n "$link_static_flag"; then +- # See comment for -static flag below, for more details. +- func_append compile_command " $link_static_flag" +- func_append finalize_command " $link_static_flag" ++ # Create the old-style object. ++ reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test ++ ++ output="$obj" ++ cmds=$reload_cmds ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $show "$cmd" ++ $run eval "$cmd" || exit $? ++ done ++ IFS="$save_ifs" ++ ++ # Exit if we aren't doing a library object file. ++ if test -z "$libobj"; then ++ if test -n "$gentop"; then ++ $show "${rm}r $gentop" ++ $run ${rm}r $gentop + fi +- continue +- ;; + +- -allow-undefined) +- # FIXME: remove this flag sometime in the future. +- func_fatal_error "\`-allow-undefined' must not be used because it is the default" +- ;; ++ exit $EXIT_SUCCESS ++ fi + +- -avoid-version) +- avoid_version=yes +- continue +- ;; ++ if test "$build_libtool_libs" != yes; then ++ if test -n "$gentop"; then ++ $show "${rm}r $gentop" ++ $run ${rm}r $gentop ++ fi + +- -dlopen) +- prev=dlfiles +- continue +- ;; ++ # Create an invalid libtool object if no PIC, so that we don't ++ # accidentally link it into a program. ++ # $show "echo timestamp > $libobj" ++ # $run eval "echo timestamp > $libobj" || exit $? ++ exit $EXIT_SUCCESS ++ fi + +- -dlpreopen) +- prev=dlprefiles +- continue +- ;; ++ if test -n "$pic_flag" || test "$pic_mode" != default; then ++ # Only do commands if we really have different PIC objects. ++ reload_objs="$libobjs $reload_conv_objs" ++ output="$libobj" ++ cmds=$reload_cmds ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $show "$cmd" ++ $run eval "$cmd" || exit $? ++ done ++ IFS="$save_ifs" ++ fi + +- -export-dynamic) +- export_dynamic=yes +- continue +- ;; ++ if test -n "$gentop"; then ++ $show "${rm}r $gentop" ++ $run ${rm}r $gentop ++ fi + +- -export-symbols | -export-symbols-regex) +- if test -n "$export_symbols" || test -n "$export_symbols_regex"; then +- func_fatal_error "more than one -exported-symbols argument is not allowed" +- fi +- if test "X$arg" = "X-export-symbols"; then +- prev=expsyms +- else +- prev=expsyms_regex ++ exit $EXIT_SUCCESS ++ ;; ++ ++ prog) ++ case $host in ++ *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; ++ esac ++ if test -n "$vinfo"; then ++ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 ++ fi ++ ++ if test -n "$release"; then ++ $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 ++ fi ++ ++ if test "$preload" = yes; then ++ if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && ++ test "$dlopen_self_static" = unknown; then ++ $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." + fi +- continue +- ;; ++ fi + +- -framework) +- prev=framework +- continue ++ case $host in ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # On Rhapsody replace the C library is the System framework ++ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ++ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` + ;; ++ esac + +- -inst-prefix-dir) +- prev=inst_prefix +- continue +- ;; ++ case $host in ++ *darwin*) ++ # Don't allow lazy linking, it breaks C++ global constructors ++ if test "$tagname" = CXX ; then ++ compile_command="$compile_command ${wl}-bind_at_load" ++ finalize_command="$finalize_command ${wl}-bind_at_load" ++ fi ++ ;; ++ esac + +- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* +- # so, if we see these flags be careful not to treat them like -L +- -L[A-Z][A-Z]*:*) +- case $with_gcc/$host in +- no/*-*-irix* | /*-*-irix*) +- func_append compile_command " $arg" +- func_append finalize_command " $arg" +- ;; +- esac +- continue +- ;; + +- -L*) +- func_stripname '-L' '' "$arg" +- dir=$func_stripname_result +- if test -z "$dir"; then +- if test "$#" -gt 0; then +- func_fatal_error "require no space between \`-L' and \`$1'" +- else +- func_fatal_error "need path for \`-L' option" +- fi +- fi +- # We need an absolute path. +- case $dir in +- [\\/]* | [A-Za-z]:[\\/]*) ;; ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; + *) +- absdir=`cd "$dir" && pwd` +- test -z "$absdir" && \ +- func_fatal_error "cannot determine absolute directory name of \`$dir'" +- dir="$absdir" ++ case " $compile_deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac + ;; + esac +- case "$deplibs " in +- *" -L$dir "*) ;; +- *) +- deplibs="$deplibs -L$dir" +- lib_search_path="$lib_search_path $dir" ++ done ++ for deplib in $compile_deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac + ;; ++ *) new_libs="$new_libs $deplib" ;; + esac ++ done ++ compile_deplibs="$new_libs" ++ ++ ++ compile_command="$compile_command $compile_deplibs" ++ finalize_command="$finalize_command $finalize_deplibs" ++ ++ if test -n "$rpath$xrpath"; then ++ # If the user specified any rpath flags, then add them. ++ for libdir in $rpath $xrpath; do ++ # This is the magic to use -rpath. ++ case "$finalize_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_rpath="$finalize_rpath $libdir" ;; ++ esac ++ done ++ fi ++ ++ # Now hardcode the library paths ++ rpath= ++ hardcode_libdirs= ++ for libdir in $compile_rpath $finalize_rpath; do ++ if test -n "$hardcode_libdir_flag_spec"; then ++ if test -n "$hardcode_libdir_separator"; then ++ if test -z "$hardcode_libdirs"; then ++ hardcode_libdirs="$libdir" ++ else ++ # Just accumulate the unique libdirs. ++ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in ++ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ++ ;; ++ *) ++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ ;; ++ esac ++ fi ++ else ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ rpath="$rpath $flag" ++ fi ++ elif test -n "$runpath_var"; then ++ case "$perm_rpath " in ++ *" $libdir "*) ;; ++ *) perm_rpath="$perm_rpath $libdir" ;; ++ esac ++ fi + case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) +- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) ++ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` + case :$dllsearchpath: in +- *":$dir:"*) ;; +- ::) dllsearchpath=$dir;; +- *) dllsearchpath="$dllsearchpath:$dir";; ++ *":$libdir:"*) ;; ++ *) dllsearchpath="$dllsearchpath:$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; +- ::) dllsearchpath=$testbindir;; + *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; - no) -Index: gtk+-2.14.4/m4macros/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/m4macros/Makefile.in 2008-10-17 06:07:17.000000000 +0200 -+++ gtk+-2.14.4/m4macros/Makefile.in 2008-11-11 18:56:04.137134538 +0100 + esac +- continue +- ;; ++ done ++ # Substitute the hardcoded libdirs into the rpath. ++ if test -n "$hardcode_libdir_separator" && ++ test -n "$hardcode_libdirs"; then ++ libdir="$hardcode_libdirs" ++ eval rpath=\" $hardcode_libdir_flag_spec\" ++ fi ++ compile_rpath="$rpath" + +- -l*) +- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then +- case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) +- # These systems don't actually have a C or math library (as such) +- continue +- ;; +- *-*-os2*) +- # These systems don't actually have a C library (as such) +- test "X$arg" = "X-lc" && continue +- ;; +- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) +- # Do not include libc due to us having libc/libc_r. +- test "X$arg" = "X-lc" && continue +- ;; +- *-*-rhapsody* | *-*-darwin1.[012]) +- # Rhapsody C and math libraries are in the System framework +- deplibs="$deplibs System.ltframework" +- continue +- ;; +- *-*-sco3.2v5* | *-*-sco5v6*) +- # Causes problems with __ctype +- test "X$arg" = "X-lc" && continue +- ;; +- *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) +- # Compiler inserts libc in the correct place for threads to work +- test "X$arg" = "X-lc" && continue +- ;; ++ rpath= ++ hardcode_libdirs= ++ for libdir in $finalize_rpath; do ++ if test -n "$hardcode_libdir_flag_spec"; then ++ if test -n "$hardcode_libdir_separator"; then ++ if test -z "$hardcode_libdirs"; then ++ hardcode_libdirs="$libdir" ++ else ++ # Just accumulate the unique libdirs. ++ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in ++ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ++ ;; ++ *) ++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ ;; ++ esac ++ fi ++ else ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ rpath="$rpath $flag" ++ fi ++ elif test -n "$runpath_var"; then ++ case "$finalize_perm_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + esac +- elif test "X$arg" = "X-lc_r"; then +- case $host in +- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) +- # Do not include libc_r directly, use -pthread flag. +- continue +- ;; +- esac + fi +- deplibs="$deplibs $arg" +- continue +- ;; ++ done ++ # Substitute the hardcoded libdirs into the rpath. ++ if test -n "$hardcode_libdir_separator" && ++ test -n "$hardcode_libdirs"; then ++ libdir="$hardcode_libdirs" ++ eval rpath=\" $hardcode_libdir_flag_spec\" ++ fi ++ finalize_rpath="$rpath" + +- -module) +- module=yes +- continue +- ;; ++ if test -n "$libobjs" && test "$build_old_libs" = yes; then ++ # Transform all the library objects into standard objects. ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ fi + +- # Tru64 UNIX uses -model [arg] to determine the layout of C++ +- # classes, name mangling, and exception handling. +- # Darwin uses the -arch flag to determine output architecture. +- -model|-arch|-isysroot) +- compiler_flags="$compiler_flags $arg" +- func_append compile_command " $arg" +- func_append finalize_command " $arg" +- prev=xcompiler +- continue +- ;; ++ dlsyms= ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ if test -n "$NM" && test -n "$global_symbol_pipe"; then ++ dlsyms="${outputname}S.c" ++ else ++ $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 ++ fi ++ fi + +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) +- compiler_flags="$compiler_flags $arg" +- func_append compile_command " $arg" +- func_append finalize_command " $arg" +- case "$new_inherited_linker_flags " in +- *" $arg "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; +- esac +- continue +- ;; ++ if test -n "$dlsyms"; then ++ case $dlsyms in ++ "") ;; ++ *.c) ++ # Discover the nlist of each of the dlfiles. ++ nlist="$output_objdir/${outputname}.nm" + +- -multi_module) +- single_module="${wl}-multi_module" +- continue +- ;; ++ $show "$rm $nlist ${nlist}S ${nlist}T" ++ $run $rm "$nlist" "${nlist}S" "${nlist}T" + +- -no-fast-install) +- fast_install=no +- continue +- ;; ++ # Parse the name list into a source file. ++ $show "creating $output_objdir/$dlsyms" + +- -no-install) +- case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) +- # The PATH hackery in wrapper scripts is required on Windows +- # and Darwin in order for the loader to find any dlls it needs. +- func_warning "\`-no-install' is ignored for $host" +- func_warning "assuming \`-no-fast-install' instead" +- fast_install=no +- ;; +- *) no_install=yes ;; +- esac +- continue +- ;; ++ test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ ++/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ ++/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ + +- -no-undefined) +- allow_undefined=no +- continue +- ;; ++#ifdef __cplusplus ++extern \"C\" { ++#endif + +- -objectlist) +- prev=objectlist +- continue +- ;; ++/* Prevent the only kind of declaration conflicts we can make. */ ++#define lt_preloaded_symbols some_other_symbol + +- -o) prev=output ;; ++/* External symbol declarations for the compiler. */\ ++" + +- -precious-files-regex) +- prev=precious_regex +- continue +- ;; ++ if test "$dlself" = yes; then ++ $show "generating symbol list for \`$output'" + +- -release) +- prev=release +- continue +- ;; ++ test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" + +- -rpath) +- prev=rpath +- continue +- ;; ++ # Add our own program objects to the symbol list. ++ progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ for arg in $progfiles; do ++ $show "extracting global C symbols from \`$arg'" ++ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" ++ done + +- -R) +- prev=xrpath +- continue +- ;; ++ if test -n "$exclude_expsyms"; then ++ $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ $run eval '$mv "$nlist"T "$nlist"' ++ fi ++ ++ if test -n "$export_symbols_regex"; then ++ $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ $run eval '$mv "$nlist"T "$nlist"' ++ fi ++ ++ # Prepare the list of exported symbols ++ if test -z "$export_symbols"; then ++ export_symbols="$output_objdir/$outputname.exp" ++ $run $rm $export_symbols ++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ case $host in ++ *cygwin* | *mingw* ) ++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac ++ else ++ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ $run eval 'mv "$nlist"T "$nlist"' ++ case $host in ++ *cygwin* | *mingw* ) ++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac ++ fi ++ fi + +- -R*) +- func_stripname '-R' '' "$arg" +- dir=$func_stripname_result +- # We need an absolute path. +- case $dir in +- [\\/]* | [A-Za-z]:[\\/]*) ;; +- *) +- func_fatal_error "only absolute run-paths are allowed" +- ;; +- esac +- case "$xrpath " in +- *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; +- esac +- continue +- ;; ++ for arg in $dlprefiles; do ++ $show "extracting global C symbols from \`$arg'" ++ name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` ++ $run eval '$echo ": $name " >> "$nlist"' ++ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" ++ done + +- -shared) +- # The effects of -shared are defined in a previous loop. +- continue +- ;; ++ if test -z "$run"; then ++ # Make sure we have at least an empty file. ++ test -f "$nlist" || : > "$nlist" ++ ++ if test -n "$exclude_expsyms"; then ++ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T ++ $mv "$nlist"T "$nlist" ++ fi + +- -shrext) +- prev=shrext +- continue +- ;; ++ # Try sorting and uniquifying the output. ++ if grep -v "^: " < "$nlist" | ++ if sort -k 3 </dev/null >/dev/null 2>&1; then ++ sort -k 3 ++ else ++ sort +2 ++ fi | ++ uniq > "$nlist"S; then ++ : ++ else ++ grep -v "^: " < "$nlist" > "$nlist"S ++ fi + +- -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 +- # would be equivalent was wrong. It would break on at least +- # Digital Unix and AIX. +- continue +- ;; ++ if test -f "$nlist"S; then ++ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' ++ else ++ $echo '/* NONE */' >> "$output_objdir/$dlsyms" ++ fi + +- -thread-safe) +- thread_safe=yes +- continue +- ;; ++ $echo >> "$output_objdir/$dlsyms" "\ + +- -version-info) +- prev=vinfo +- continue +- ;; ++#undef lt_preloaded_symbols + +- -version-number) +- prev=vinfo +- vinfo_number=yes +- continue +- ;; ++#if defined (__STDC__) && __STDC__ ++# define lt_ptr void * ++#else ++# define lt_ptr char * ++# define const ++#endif + +- -weak) +- prev=weak +- continue +- ;; ++/* The mapping between symbol names and symbols. */ ++" + +- -Wc,*) +- func_stripname '-Wc,' '' "$arg" +- args=$func_stripname_result +- arg= +- save_ifs="$IFS"; IFS=',' +- for flag in $args; do +- IFS="$save_ifs" +- func_quote_for_eval "$flag" +- arg="$arg $wl$func_quote_for_eval_result" +- compiler_flags="$compiler_flags $func_quote_for_eval_result" +- done +- IFS="$save_ifs" +- func_stripname ' ' '' "$arg" +- arg=$func_stripname_result +- ;; ++ case $host in ++ *cygwin* | *mingw* ) ++ $echo >> "$output_objdir/$dlsyms" "\ ++/* DATA imports from DLLs on WIN32 can't be const, because ++ runtime relocations are performed -- see ld's documentation ++ on pseudo-relocs */ ++struct { ++" ++ ;; ++ * ) ++ $echo >> "$output_objdir/$dlsyms" "\ ++const struct { ++" ++ ;; ++ esac + +- -Wl,*) +- func_stripname '-Wl,' '' "$arg" +- args=$func_stripname_result +- arg= +- save_ifs="$IFS"; IFS=',' +- for flag in $args; do +- IFS="$save_ifs" +- func_quote_for_eval "$flag" +- arg="$arg $wl$func_quote_for_eval_result" +- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" +- linker_flags="$linker_flags $func_quote_for_eval_result" +- done +- IFS="$save_ifs" +- func_stripname ' ' '' "$arg" +- arg=$func_stripname_result +- ;; + +- -Xcompiler) +- prev=xcompiler +- continue +- ;; ++ $echo >> "$output_objdir/$dlsyms" "\ ++ const char *name; ++ lt_ptr address; ++} ++lt_preloaded_symbols[] = ++{\ ++" + +- -Xlinker) +- prev=xlinker +- continue +- ;; ++ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" + +- -XCClinker) +- prev=xcclinker +- continue +- ;; ++ $echo >> "$output_objdir/$dlsyms" "\ ++ {0, (lt_ptr) 0} ++}; + +- # -msg_* for osf cc +- -msg_*) +- func_quote_for_eval "$arg" +- arg="$func_quote_for_eval_result" +- ;; ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt_preloaded_symbols; ++} ++#endif + +- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler +- # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler +- # +DA*, +DD* enable 64-bit mode on the HP compiler +- # -q* pass through compiler args for the IBM compiler +- # -m*, -t[45]*, -txscale* pass through architecture-specific +- # compiler args for GCC +- # -F/path gives path to uninstalled frameworks, gcc on darwin +- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC +- # @file GCC response files +- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) +- func_quote_for_eval "$arg" +- arg="$func_quote_for_eval_result" +- func_append compile_command " $arg" +- func_append finalize_command " $arg" +- compiler_flags="$compiler_flags $arg" +- continue +- ;; ++#ifdef __cplusplus ++} ++#endif\ ++" ++ fi + +- # Some other compiler flag. +- -* | +*) +- func_quote_for_eval "$arg" +- arg="$func_quote_for_eval_result" +- ;; ++ pic_flag_for_symtable= ++ case $host in ++ # compiling the symbol table file with pic_flag works around ++ # a FreeBSD bug that causes programs to crash when -lm is ++ # linked before any other PIC object. But we must not use ++ # pic_flag when linking with -static. The problem exists in ++ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. ++ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) ++ case "$compile_command " in ++ *" -static "*) ;; ++ *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; ++ esac;; ++ *-*-hpux*) ++ case "$compile_command " in ++ *" -static "*) ;; ++ *) pic_flag_for_symtable=" $pic_flag";; ++ esac ++ esac + +- *.$objext) +- # A standard object. +- objs="$objs $arg" +- ;; ++ # Now compile the dynamic symbol file. ++ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" ++ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? ++ ++ # Clean up the generated files. ++ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" ++ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" ++ ++ # Transform the symbol file into the correct name. ++ case $host in ++ *cygwin* | *mingw* ) ++ if test -f "$output_objdir/${outputname}.def" ; then ++ 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" | $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" | $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 ++ ;; ++ *) ++ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 ++ exit $EXIT_FAILURE ++ ;; ++ esac ++ else ++ # We keep going just in case the user didn't refer to ++ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe ++ # really was required. + +- *.lo) +- # A libtool-controlled object. ++ # Nullify the symbol file. ++ 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 + +- # Check to see that this really is a libtool object. +- if func_lalib_unsafe_p "$arg"; then +- pic_object= +- non_pic_object= ++ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then ++ # Replace the output file specification. ++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` ++ link_command="$compile_command$compile_rpath" + +- # Read the .lo file +- func_source "$arg" ++ # We have no uninstalled library dependencies, so finalize right now. ++ $show "$link_command" ++ $run eval "$link_command" ++ exit_status=$? + +- if test -z "$pic_object" || +- test -z "$non_pic_object" || +- test "$pic_object" = none && +- test "$non_pic_object" = none; then +- func_fatal_error "cannot find name of object for \`$arg'" +- fi ++ # Delete the generated files. ++ if test -n "$dlsyms"; then ++ $show "$rm $output_objdir/${outputname}S.${objext}" ++ $run $rm "$output_objdir/${outputname}S.${objext}" ++ fi + +- # Extract subdirectory from the argument. +- func_dirname "$arg" "/" "" +- xdir="$func_dirname_result" ++ exit $exit_status ++ fi + +- if test "$pic_object" != none; then +- # Prepend the subdirectory the object is found in. +- pic_object="$xdir$pic_object" ++ if test -n "$shlibpath_var"; then ++ # We should set the shlibpath_var ++ rpath= ++ for dir in $temp_rpath; do ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]*) ++ # Absolute path. ++ rpath="$rpath$dir:" ++ ;; ++ *) ++ # Relative path: add a thisdir entry. ++ rpath="$rpath\$thisdir/$dir:" ++ ;; ++ esac ++ done ++ temp_rpath="$rpath" ++ fi + +- if test "$prev" = dlfiles; then +- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" +- prev= +- continue +- else +- # If libtool objects are unsupported, then we need to preload. +- prev=dlprefiles +- fi +- fi ++ if test -n "$compile_shlibpath$finalize_shlibpath"; then ++ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" ++ fi ++ if test -n "$finalize_shlibpath"; then ++ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" ++ fi + +- # CHECK ME: I think I busted this. -Ossama +- if test "$prev" = dlprefiles; then +- # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" +- prev= +- fi ++ compile_var= ++ finalize_var= ++ if test -n "$runpath_var"; then ++ if test -n "$perm_rpath"; then ++ # We should set the runpath_var. ++ rpath= ++ for dir in $perm_rpath; do ++ rpath="$rpath$dir:" ++ done ++ compile_var="$runpath_var=\"$rpath\$$runpath_var\" " ++ fi ++ if test -n "$finalize_perm_rpath"; then ++ # We should set the runpath_var. ++ rpath= ++ for dir in $finalize_perm_rpath; do ++ rpath="$rpath$dir:" ++ done ++ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " ++ fi ++ fi + +- # A PIC object. +- func_append libobjs " $pic_object" +- arg="$pic_object" +- fi ++ if test "$no_install" = yes; then ++ # We don't need to create a wrapper script. ++ link_command="$compile_var$compile_command$compile_rpath" ++ # Replace the output file specification. ++ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` ++ # Delete the old output file. ++ $run $rm $output ++ # Link the executable and exit ++ $show "$link_command" ++ $run eval "$link_command" || exit $? ++ exit $EXIT_SUCCESS ++ fi + +- # Non-PIC object. +- if test "$non_pic_object" != none; then +- # Prepend the subdirectory the object is found in. +- non_pic_object="$xdir$non_pic_object" ++ if test "$hardcode_action" = relink; then ++ # Fast installation is not supported ++ link_command="$compile_var$compile_command$compile_rpath" ++ relink_command="$finalize_var$finalize_command$finalize_rpath" + +- # A standard non-PIC object +- func_append non_pic_objects " $non_pic_object" +- if test -z "$pic_object" || test "$pic_object" = none ; then +- arg="$non_pic_object" +- fi ++ $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 ++ $echo "$modename: \`$output' will be relinked during installation" 1>&2 ++ else ++ 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" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` + else +- # If the PIC object exists, use it instead. +- # $xdir was prepended to $pic_object above. +- non_pic_object="$pic_object" +- func_append non_pic_objects " $non_pic_object" ++ # fast_install is set to needless ++ relink_command= + fi + else +- # Only an error if not doing a dry-run. +- if $opt_dry_run; then +- # Extract subdirectory from the argument. +- func_dirname "$arg" "/" "" +- xdir="$func_dirname_result" +- +- func_lo2o "$arg" +- pic_object=$xdir$objdir/$func_lo2o_result +- non_pic_object=$xdir$func_lo2o_result +- func_append libobjs " $pic_object" +- func_append non_pic_objects " $non_pic_object" +- else +- func_fatal_error "\`$arg' is not a valid libtool object" +- fi ++ link_command="$compile_var$compile_command$compile_rpath" ++ relink_command="$finalize_var$finalize_command$finalize_rpath" + fi +- ;; ++ fi + +- *.$libext) +- # An archive. +- deplibs="$deplibs $arg" +- old_deplibs="$old_deplibs $arg" +- continue +- ;; ++ # Replace the output file specification. ++ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + +- *.la) +- # A libtool-controlled library. ++ # Delete the old output files. ++ $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname + +- if test "$prev" = dlfiles; then +- # This library was specified with -dlopen. +- dlfiles="$dlfiles $arg" +- prev= +- elif test "$prev" = dlprefiles; then +- # The library was specified with -dlpreopen. +- dlprefiles="$dlprefiles $arg" +- prev= +- else +- deplibs="$deplibs $arg" +- fi +- continue +- ;; ++ $show "$link_command" ++ $run eval "$link_command" || exit $? + +- # Some other compiler argument. +- *) +- # Unknown arguments in both finalize_command and compile_command need +- # to be aesthetically quoted because they are evaled later. +- func_quote_for_eval "$arg" +- arg="$func_quote_for_eval_result" +- ;; +- esac # arg ++ # Now create the wrapper script. ++ $show "creating $output" + +- # Now actually substitute the argument into the commands. +- if test -n "$arg"; then +- func_append compile_command " $arg" +- func_append finalize_command " $arg" +- fi +- done # argument parsing loop ++ # Quote the relink command for shipping. ++ if test -n "$relink_command"; then ++ # Preserve any variables that may affect compiler behavior ++ for var in $variables_saved_for_relink; do ++ if eval test -z \"\${$var+set}\"; then ++ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" ++ elif eval var_value=\$$var; test -z "$var_value"; then ++ relink_command="$var=; export $var; $relink_command" ++ else ++ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` ++ relink_command="$var=\"$var_value\"; export $var; $relink_command" ++ fi ++ done ++ relink_command="(cd `pwd`; $relink_command)" ++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` ++ fi + +- test -n "$prev" && \ +- func_fatal_help "the \`$prevarg' option requires an argument" ++ # Quote $echo for shipping. ++ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then ++ case $progpath in ++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; ++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; ++ esac ++ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` ++ else ++ qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` ++ fi + +- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then +- eval arg=\"$export_dynamic_flag_spec\" +- func_append compile_command " $arg" +- func_append finalize_command " $arg" +- fi ++ # Only actually do things if our run command is non-null. ++ if test -z "$run"; then ++ # win32 will think the script is a binary if it has ++ # a .exe suffix, so we strip it off here. ++ case $output in ++ *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; ++ esac ++ # test for cygwin because mv fails w/o .exe extensions ++ case $host in ++ *cygwin*) ++ exeext=.exe ++ outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; ++ *) exeext= ;; ++ esac ++ case $host in ++ *cygwin* | *mingw* ) ++ output_name=`basename $output` ++ output_path=`dirname $output` ++ cwrappersource="$output_path/$objdir/lt-$output_name.c" ++ cwrapper="$output_path/$output_name.exe" ++ $rm $cwrappersource $cwrapper ++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + +- oldlibs= +- # calculate the name of the file, without its directory +- func_basename "$output" +- outputname="$func_basename_result" +- libobjs_save="$libobjs" ++ cat > $cwrappersource <<EOF + +- if test -n "$shlibpath_var"; then +- # get the directories listed in $shlibpath_var +- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` +- else +- shlib_search_path= +- fi +- eval sys_lib_search_path=\"$sys_lib_search_path_spec\" +- eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" ++/* $cwrappersource - temporary wrapper executable for $objdir/$outputname ++ Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP + +- func_dirname "$output" "/" "" +- output_objdir="$func_dirname_result$objdir" +- # Create the object directory. +- func_mkdir_p "$output_objdir" ++ The $output program cannot be directly executed until all the libtool ++ libraries that it depends on are installed. + +- # Determine the type of output +- case $output in +- "") +- func_fatal_help "you must specify an output file" +- ;; +- *.$libext) linkmode=oldlib ;; +- *.lo | *.$objext) linkmode=obj ;; +- *.la) linkmode=lib ;; +- *) linkmode=prog ;; # Anything else should be a program. +- esac ++ This wrapper executable should never be moved out of the build directory. ++ If it is, it will not operate correctly. + +- specialdeplibs= ++ Currently, it simply execs the wrapper *script* "/bin/sh $output", ++ but could eventually absorb all of the scripts functionality and ++ exec $objdir/$outputname directly. ++*/ ++EOF ++ cat >> $cwrappersource<<"EOF" ++#include <stdio.h> ++#include <stdlib.h> ++#include <unistd.h> ++#include <malloc.h> ++#include <stdarg.h> ++#include <assert.h> ++#include <string.h> ++#include <ctype.h> ++#include <sys/stat.h> + +- libs= +- # Find all interdependent deplibs by searching for libraries +- # that are linked more than once (e.g. -la -lb -la) +- for deplib in $deplibs; do +- if $opt_duplicate_deps ; then +- case "$libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- libs="$libs $deplib" +- done ++#if defined(PATH_MAX) ++# define LT_PATHMAX PATH_MAX ++#elif defined(MAXPATHLEN) ++# define LT_PATHMAX MAXPATHLEN ++#else ++# define LT_PATHMAX 1024 ++#endif + +- if test "$linkmode" = lib; then +- libs="$predeps $libs $compiler_lib_search_path $postdeps" ++#ifndef DIR_SEPARATOR ++# define DIR_SEPARATOR '/' ++# define PATH_SEPARATOR ':' ++#endif + +- # Compute libraries that are listed more than once in $predeps +- # $postdeps and mark them as special (i.e., whose duplicates are +- # not to be eliminated). +- pre_post_deps= +- if $opt_duplicate_compiler_generated_deps; then +- for pre_post_dep in $predeps $postdeps; do +- case "$pre_post_deps " in +- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; +- esac +- pre_post_deps="$pre_post_deps $pre_post_dep" +- done +- fi +- pre_post_deps= +- fi ++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ ++ defined (__OS2__) ++# define HAVE_DOS_BASED_FILE_SYSTEM ++# ifndef DIR_SEPARATOR_2 ++# define DIR_SEPARATOR_2 '\\' ++# endif ++# ifndef PATH_SEPARATOR_2 ++# define PATH_SEPARATOR_2 ';' ++# endif ++#endif + +- deplibs= +- newdependency_libs= +- newlib_search_path= +- need_relink=no # whether we're linking any uninstalled libtool libraries +- notinst_deplibs= # not-installed libtool libraries +- notinst_path= # paths that contain not-installed libtool libraries ++#ifndef DIR_SEPARATOR_2 ++# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) ++#else /* DIR_SEPARATOR_2 */ ++# define IS_DIR_SEPARATOR(ch) \ ++ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) ++#endif /* DIR_SEPARATOR_2 */ + +- case $linkmode in +- lib) +- passes="conv dlpreopen link" +- for file in $dlfiles $dlprefiles; do +- case $file in +- *.la) ;; +- *) +- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" +- ;; +- esac +- done +- ;; +- prog) +- compile_deplibs= +- finalize_deplibs= +- alldeplibs=no +- newdlfiles= +- newdlprefiles= +- passes="conv scan dlopen dlpreopen link" +- ;; +- *) passes="conv" +- ;; +- esac ++#ifndef PATH_SEPARATOR_2 ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) ++#else /* PATH_SEPARATOR_2 */ ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) ++#endif /* PATH_SEPARATOR_2 */ + +- for pass in $passes; do +- # The preopen pass in lib mode reverses $deplibs; put it back here +- # so that -L comes before libs that need it for instance... +- if test "$linkmode,$pass" = "lib,link"; then +- ## FIXME: Find the place where the list is rebuilt in the wrong +- ## order, and fix it there properly +- tmp_deplibs= +- for deplib in $deplibs; do +- tmp_deplibs="$deplib $tmp_deplibs" +- done +- deplibs="$tmp_deplibs" +- fi ++#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) ++#define XFREE(stale) do { \ ++ if (stale) { free ((void *) stale); stale = 0; } \ ++} while (0) + +- if test "$linkmode,$pass" = "lib,link" || +- test "$linkmode,$pass" = "prog,scan"; then +- libs="$deplibs" +- deplibs= +- fi +- if test "$linkmode" = prog; then +- case $pass in +- dlopen) libs="$dlfiles" ;; +- dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; +- esac +- fi +- if test "$linkmode,$pass" = "lib,dlpreopen"; then +- # Collect and forward deplibs of preopened libtool libs +- for lib in $dlprefiles; do +- # Ignore non-libtool-libs +- dependency_libs= +- case $lib in +- *.la) func_source "$lib" ;; +- esac ++/* -DDEBUG is fairly common in CFLAGS. */ ++#undef DEBUG ++#if defined DEBUGWRAPPER ++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) ++#else ++# define DEBUG(format, ...) ++#endif + +- # Collect preopened libtool deplibs, except any this library +- # has declared as weak libs +- for deplib in $dependency_libs; do +- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` +- case " $weak_libs " in +- *" $deplib_base "*) ;; +- *) deplibs="$deplibs $deplib" ;; +- esac +- done +- done +- libs="$dlprefiles" +- fi +- if test "$pass" = dlopen; then +- # Collect dlpreopened libraries +- save_deplibs="$deplibs" +- deplibs= +- fi ++const char *program_name = NULL; + +- for deplib in $libs; do +- lib= +- found=no +- case $deplib in +- -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" +- else +- compiler_flags="$compiler_flags $deplib" +- if test "$linkmode" = lib ; then +- case "$new_inherited_linker_flags " in +- *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; +- esac +- fi +- fi +- continue +- ;; +- -l*) +- if test "$linkmode" != lib && test "$linkmode" != prog; then +- func_warning "\`-l' is ignored for archives/objects" +- continue +- fi +- func_stripname '-l' '' "$deplib" +- name=$func_stripname_result +- if test "$linkmode" = lib; then +- searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" +- else +- searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" +- fi +- for searchdir in $searchdirs; do +- for search_ext in .la $std_shrext .so .a; do +- # Search the libtool library +- lib="$searchdir/lib${name}${search_ext}" +- if test -f "$lib"; then +- if test "$search_ext" = ".la"; then +- found=yes +- else +- found=no +- fi +- break 2 +- fi +- done +- done +- if test "$found" != yes; then +- # deplib doesn't seem to be a libtool library +- if test "$linkmode,$pass" = "prog,link"; then +- compile_deplibs="$deplib $compile_deplibs" +- finalize_deplibs="$deplib $finalize_deplibs" +- else +- deplibs="$deplib $deplibs" +- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" +- fi +- continue +- else # deplib is a libtool library +- # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, +- # We need to do some special things here, and not later. +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +- case " $predeps $postdeps " in +- *" $deplib "*) +- if func_lalib_p "$lib"; then +- library_names= +- old_library= +- func_source "$lib" +- for l in $old_library $library_names; do +- ll="$l" +- done +- if test "X$ll" = "X$old_library" ; then # only static version available +- found=no +- func_dirname "$lib" "" "." +- ladir="$func_dirname_result" +- lib=$ladir/$old_library +- if test "$linkmode,$pass" = "prog,link"; then +- compile_deplibs="$deplib $compile_deplibs" +- finalize_deplibs="$deplib $finalize_deplibs" +- else +- deplibs="$deplib $deplibs" +- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" +- fi +- continue +- fi +- fi +- ;; +- *) ;; +- esac +- fi +- fi +- ;; # -l +- *.ltframework) +- if test "$linkmode,$pass" = "prog,link"; then +- compile_deplibs="$deplib $compile_deplibs" +- finalize_deplibs="$deplib $finalize_deplibs" +- else +- deplibs="$deplib $deplibs" +- if test "$linkmode" = lib ; then +- case "$new_inherited_linker_flags " in +- *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; +- esac +- fi +- fi +- continue +- ;; +- -L*) +- case $linkmode in +- lib) +- deplibs="$deplib $deplibs" +- test "$pass" = conv && continue +- newdependency_libs="$deplib $newdependency_libs" +- func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" +- ;; +- prog) +- if test "$pass" = conv; then +- deplibs="$deplib $deplibs" +- continue +- fi +- if test "$pass" = scan; then +- deplibs="$deplib $deplibs" +- else +- compile_deplibs="$deplib $compile_deplibs" +- finalize_deplibs="$deplib $finalize_deplibs" +- fi +- func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" +- ;; +- *) +- func_warning "\`-L' is ignored for archives/objects" +- ;; +- esac # linkmode +- continue +- ;; # -L +- -R*) +- if test "$pass" = link; then +- func_stripname '-R' '' "$deplib" +- dir=$func_stripname_result +- # Make sure the xrpath contains only unique directories. +- case "$xrpath " in +- *" $dir "*) ;; +- *) xrpath="$xrpath $dir" ;; +- esac +- fi +- deplibs="$deplib $deplibs" +- continue +- ;; +- *.la) lib="$deplib" ;; +- *.$libext) +- if test "$pass" = conv; then +- deplibs="$deplib $deplibs" +- continue +- fi +- case $linkmode in +- lib) +- # Linking convenience modules into shared libraries is allowed, +- # but linking other static libraries is non-portable. +- case " $dlpreconveniencelibs " in +- *" $deplib "*) ;; +- *) +- valid_a_lib=no +- case $deplibs_check_method in +- match_pattern*) +- set dummy $deplibs_check_method; shift +- match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` +- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ +- | $EGREP "$match_pattern_regex" > /dev/null; then +- valid_a_lib=yes +- fi +- ;; +- pass_all) +- valid_a_lib=yes +- ;; +- esac +- if test "$valid_a_lib" != yes; then +- $ECHO +- $ECHO "*** Warning: Trying to link with static lib archive $deplib." +- $ECHO "*** I have the capability to make that library automatically link in when" +- $ECHO "*** you link to this library. But I can only do this if you have a" +- $ECHO "*** shared version of the library, which you do not appear to have" +- $ECHO "*** because the file extensions .$libext of this argument makes me believe" +- $ECHO "*** that it is just a static archive that I should not use here." +- else +- $ECHO +- $ECHO "*** Warning: Linking the shared library $output against the" +- $ECHO "*** static library $deplib is not portable!" +- deplibs="$deplib $deplibs" +- fi +- ;; +- esac +- continue +- ;; +- prog) +- if test "$pass" != link; then +- deplibs="$deplib $deplibs" +- else +- compile_deplibs="$deplib $compile_deplibs" +- finalize_deplibs="$deplib $finalize_deplibs" +- fi +- continue +- ;; +- esac # linkmode +- ;; # *.$libext +- *.lo | *.$objext) +- if test "$pass" = conv; then +- deplibs="$deplib $deplibs" +- elif test "$linkmode" = prog; then +- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then +- # If there is no dlopen support or we're linking statically, +- # we need to preload. +- newdlprefiles="$newdlprefiles $deplib" +- compile_deplibs="$deplib $compile_deplibs" +- finalize_deplibs="$deplib $finalize_deplibs" +- else +- newdlfiles="$newdlfiles $deplib" +- fi +- fi +- continue +- ;; +- %DEPLIBS%) +- alldeplibs=yes +- continue +- ;; +- esac # case $deplib ++void * xmalloc (size_t num); ++char * xstrdup (const char *string); ++const char * base_name (const char *name); ++char * find_executable(const char *wrapper); ++int check_executable(const char *path); ++char * strendzap(char *str, const char *pat); ++void lt_fatal (const char *message, ...); + +- if test "$found" = yes || test -f "$lib"; then : +- else +- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" +- fi ++int ++main (int argc, char *argv[]) ++{ ++ char **newargz; ++ int i; + +- # Check to see that this really is a libtool archive. +- func_lalib_unsafe_p "$lib" \ +- || func_fatal_error "\`$lib' is not a valid libtool archive" ++ program_name = (char *) xstrdup (base_name (argv[0])); ++ DEBUG("(main) argv[0] : %s\n",argv[0]); ++ DEBUG("(main) program_name : %s\n",program_name); ++ newargz = XMALLOC(char *, argc+2); ++EOF + +- func_dirname "$lib" "" "." +- ladir="$func_dirname_result" ++ cat >> $cwrappersource <<EOF ++ newargz[0] = (char *) xstrdup("$SHELL"); ++EOF + +- dlname= +- dlopen= +- dlpreopen= +- libdir= +- library_names= +- old_library= +- inherited_linker_flags= +- # If the library was installed with an old release of libtool, +- # it will not redefine variables installed, or shouldnotlink +- installed=yes +- shouldnotlink=no +- avoidtemprpath= ++ cat >> $cwrappersource <<"EOF" ++ newargz[1] = find_executable(argv[0]); ++ if (newargz[1] == NULL) ++ lt_fatal("Couldn't find %s", argv[0]); ++ DEBUG("(main) found exe at : %s\n",newargz[1]); ++ /* we know the script has the same name, without the .exe */ ++ /* so make sure newargz[1] doesn't end in .exe */ ++ strendzap(newargz[1],".exe"); ++ for (i = 1; i < argc; i++) ++ newargz[i+1] = xstrdup(argv[i]); ++ newargz[argc+1] = NULL; + ++ for (i=0; i<argc+1; i++) ++ { ++ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); ++ ; ++ } + +- # Read the .la file +- func_source "$lib" ++EOF + +- # Convert "-framework foo" to "foo.ltframework" +- if test -n "$inherited_linker_flags"; then +- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` +- for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do +- case " $new_inherited_linker_flags " in +- *" $tmp_inherited_linker_flag "*) ;; +- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; +- esac +- done +- fi +- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- if test "$linkmode,$pass" = "lib,link" || +- test "$linkmode,$pass" = "prog,scan" || +- { test "$linkmode" != prog && test "$linkmode" != lib; }; then +- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" +- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" +- fi ++ case $host_os in ++ mingw*) ++ cat >> $cwrappersource <<EOF ++ execv("$SHELL",(char const **)newargz); ++EOF ++ ;; ++ *) ++ cat >> $cwrappersource <<EOF ++ execv("$SHELL",newargz); ++EOF ++ ;; ++ esac + +- if test "$pass" = conv; then +- # Only check for convenience libraries +- deplibs="$lib $deplibs" +- if test -z "$libdir"; then +- if test -z "$old_library"; then +- func_fatal_error "cannot find name of link library for \`$lib'" +- fi +- # It is a libtool convenience library, so add in its objects. +- convenience="$convenience $ladir/$objdir/$old_library" +- old_convenience="$old_convenience $ladir/$objdir/$old_library" +- elif test "$linkmode" != prog && test "$linkmode" != lib; then +- func_fatal_error "\`$lib' is not a convenience library" +- fi +- tmp_libs= +- for deplib in $dependency_libs; do +- deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done +- continue +- fi # $pass = conv ++ cat >> $cwrappersource <<"EOF" ++ return 127; ++} + ++void * ++xmalloc (size_t num) ++{ ++ void * p = (void *) malloc (num); ++ if (!p) ++ lt_fatal ("Memory exhausted"); + +- # Get the name of the library we link against. +- linklib= +- for l in $old_library $library_names; do +- linklib="$l" +- done +- if test -z "$linklib"; then +- func_fatal_error "cannot find name of link library for \`$lib'" +- fi ++ return p; ++} + +- # This library was specified with -dlopen. +- if test "$pass" = dlopen; then +- if test -z "$libdir"; then +- func_fatal_error "cannot -dlopen a convenience library: \`$lib'" +- fi +- if test -z "$dlname" || +- test "$dlopen_support" != yes || +- test "$build_libtool_libs" = no; then +- # If there is no dlname, no dlopen support or we're linking +- # statically, we need to preload. We also need to preload any +- # dependent libraries so libltdl's deplib preloader doesn't +- # bomb out in the load deplibs phase. +- dlprefiles="$dlprefiles $lib $dependency_libs" +- else +- newdlfiles="$newdlfiles $lib" +- fi +- continue +- fi # $pass = dlopen ++char * ++xstrdup (const char *string) ++{ ++ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL ++; ++} + +- # We need an absolute path. +- case $ladir in +- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; +- *) +- abs_ladir=`cd "$ladir" && pwd` +- if test -z "$abs_ladir"; then +- func_warning "cannot determine absolute directory name of \`$ladir'" +- func_warning "passing it literally to the linker, although it might fail" +- abs_ladir="$ladir" +- fi +- ;; +- esac +- func_basename "$lib" +- laname="$func_basename_result" ++const char * ++base_name (const char *name) ++{ ++ const char *base; + +- # Find the relevant object directory and library name. +- if test "X$installed" = Xyes; then +- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then +- func_warning "library \`$lib' was moved." +- dir="$ladir" +- absdir="$abs_ladir" +- libdir="$abs_ladir" +- else +- dir="$libdir" +- absdir="$libdir" +- fi +- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes +- else +- if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then +- dir="$ladir" +- absdir="$abs_ladir" +- # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" +- else +- dir="$ladir/$objdir" +- absdir="$abs_ladir/$objdir" +- # Remove this search path later +- notinst_path="$notinst_path $abs_ladir" +- fi +- fi # $installed = yes +- func_stripname 'lib' '.la' "$laname" +- name=$func_stripname_result ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ /* Skip over the disk name in MSDOS pathnames. */ ++ if (isalpha ((unsigned char)name[0]) && name[1] == ':') ++ name += 2; ++#endif + +- # This library was specified with -dlpreopen. +- if test "$pass" = dlpreopen; then +- if test -z "$libdir" && test "$linkmode" = prog; then +- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" +- fi +- # Prefer using a static library (so that no silly _DYNAMIC symbols +- # are required to link). +- if test -n "$old_library"; then +- newdlprefiles="$newdlprefiles $dir/$old_library" +- # Keep a list of preopened convenience libraries to check +- # that they are being used correctly in the link pass. +- test -z "$libdir" && \ +- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" +- # Otherwise, use the dlname, so that lt_dlopen finds it. +- elif test -n "$dlname"; then +- newdlprefiles="$newdlprefiles $dir/$dlname" +- else +- newdlprefiles="$newdlprefiles $dir/$linklib" +- fi +- fi # $pass = dlpreopen +- +- if test -z "$libdir"; then +- # Link the convenience library +- if test "$linkmode" = lib; then +- deplibs="$dir/$old_library $deplibs" +- elif test "$linkmode,$pass" = "prog,link"; then +- compile_deplibs="$dir/$old_library $compile_deplibs" +- finalize_deplibs="$dir/$old_library $finalize_deplibs" +- else +- deplibs="$lib $deplibs" # used for prog,scan pass +- fi +- continue +- fi +- +- +- if test "$linkmode" = prog && test "$pass" != link; then +- newlib_search_path="$newlib_search_path $ladir" +- deplibs="$lib $deplibs" +- +- linkalldeplibs=no +- if test "$link_all_deplibs" != no || test -z "$library_names" || +- test "$build_libtool_libs" = no; then +- linkalldeplibs=yes +- fi +- +- tmp_libs= +- for deplib in $dependency_libs; do +- case $deplib in +- -L*) func_stripname '-L' '' "$deplib" +- newlib_search_path="$newlib_search_path $func_stripname_result" +- ;; +- esac +- # Need to link against all dependency_libs? +- if test "$linkalldeplibs" = yes; then +- deplibs="$deplib $deplibs" +- else +- # Need to hardcode shared library paths +- # or/and link against static libraries +- newdependency_libs="$deplib $newdependency_libs" +- fi +- if $opt_duplicate_deps ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done # for deplib +- continue +- fi # $linkmode = prog... +- +- if test "$linkmode,$pass" = "prog,link"; then +- if test -n "$library_names" && +- { { 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. +- case "$temp_rpath:" in +- *"$absdir:"*) ;; +- *) temp_rpath="$temp_rpath$absdir:" ;; +- esac +- fi +- +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac +- fi # $linkmode,$pass = prog,link... +- +- if test "$alldeplibs" = yes && +- { test "$deplibs_check_method" = pass_all || +- { test "$build_libtool_libs" = yes && +- test -n "$library_names"; }; }; then +- # We only need to search for static libraries +- continue +- fi +- fi +- +- link_static=no # Whether the deplib will be linked statically +- use_static_libs=$prefer_static_libs +- if test "$use_static_libs" = built && test "$installed" = yes; then +- use_static_libs=no +- fi +- if test -n "$library_names" && +- { test "$use_static_libs" = no || test -z "$old_library"; }; then +- case $host in +- *cygwin* | *mingw* | *cegcc*) +- # No point in relinking DLLs because paths are not encoded +- notinst_deplibs="$notinst_deplibs $lib" +- need_relink=no +- ;; +- *) +- if test "$installed" = no; then +- notinst_deplibs="$notinst_deplibs $lib" +- need_relink=yes +- fi +- ;; +- esac +- # This is a shared library +- +- # Warn about portability, can't link against -module's on some +- # systems (darwin). Don't bleat about dlopened modules though! +- dlopenmodule="" +- for dlpremoduletest in $dlprefiles; do +- if test "X$dlpremoduletest" = "X$lib"; then +- dlopenmodule="$dlpremoduletest" +- break +- fi +- done +- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then +- $ECHO +- if test "$linkmode" = prog; then +- $ECHO "*** Warning: Linking the executable $output against the loadable module" +- else +- $ECHO "*** Warning: Linking the shared library $output against the loadable module" +- fi +- $ECHO "*** $linklib is not portable!" +- fi +- if test "$linkmode" = lib && +- test "$hardcode_into_libs" = yes; then +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) compile_rpath="$compile_rpath $absdir" +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" +- esac +- ;; +- esac +- fi +- +- if test -n "$old_archive_from_expsyms_cmds"; then +- # figure out the soname +- set dummy $library_names +- shift +- realname="$1" +- shift +- libname=`eval "\\$ECHO \"$libname_spec\""` +- # use dlname if we got it. it's perfectly good, no? +- if test -n "$dlname"; then +- soname="$dlname" +- elif test -n "$soname_spec"; then +- # bleh windows +- case $host in +- *cygwin* | mingw* | *cegcc*) +- func_arith $current - $age +- major=$func_arith_result +- versuffix="-$major" +- ;; +- esac +- eval soname=\"$soname_spec\" +- else +- soname="$realname" +- fi +- +- # Make a new name for the extract_expsyms_cmds to use +- soroot="$soname" +- func_basename "$soroot" +- soname="$func_basename_result" +- func_stripname 'lib' '.dll' "$soname" +- newlib=libimp-$func_stripname_result.a +- +- # If the library has no export list, then create one now +- if test -f "$output_objdir/$soname-def"; then : +- else +- func_verbose "extracting exported symbol list from \`$soname'" +- func_execute_cmds "$extract_expsyms_cmds" 'exit $?' +- fi +- +- # Create $newlib +- if test -f "$output_objdir/$newlib"; then :; else +- func_verbose "generating import library for \`$soname'" +- func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' +- fi +- # make sure the library variables are pointing to the new library +- dir=$output_objdir +- linklib=$newlib +- fi # test -n "$old_archive_from_expsyms_cmds" +- +- if test "$linkmode" = prog || test "$mode" != relink; then +- add_shlibpath= +- add_dir= +- add= +- lib_linked=yes +- case $hardcode_action in +- immediate | unsupported) +- if test "$hardcode_direct" = no; then +- add="$dir/$linklib" +- case $host in +- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; +- *-*-sysv4*uw2*) add_dir="-L$dir" ;; +- *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ +- *-*-unixware7*) add_dir="-L$dir" ;; +- *-*-darwin* ) +- # if the lib is a (non-dlopened) module then we can not +- # link against it, someone is ignoring the earlier warnings +- if /usr/bin/file -L $add 2> /dev/null | +- $GREP ": [^:]* bundle" >/dev/null ; then +- if test "X$dlopenmodule" != "X$lib"; then +- $ECHO "*** Warning: lib $linklib is a module, not a shared library" +- if test -z "$old_library" ; then +- $ECHO +- $ECHO "*** And there doesn't seem to be a static archive available" +- $ECHO "*** The link will probably fail, sorry" +- else +- add="$dir/$old_library" +- fi +- elif test -n "$old_library"; then +- add="$dir/$old_library" +- fi +- fi +- esac +- elif test "$hardcode_minus_L" = no; then +- case $host in +- *-*-sunos*) add_shlibpath="$dir" ;; +- esac +- add_dir="-L$dir" +- add="-l$name" +- elif test "$hardcode_shlibpath_var" = no; then +- add_shlibpath="$dir" +- add="-l$name" +- else +- lib_linked=no +- fi +- ;; +- relink) +- if test "$hardcode_direct" = yes && +- test "$hardcode_direct_absolute" = no; then +- add="$dir/$linklib" +- elif test "$hardcode_minus_L" = yes; then +- add_dir="-L$dir" +- # Try looking first in the location we're being installed to. +- if test -n "$inst_prefix_dir"; then +- case $libdir in +- [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" +- ;; +- esac +- fi +- add="-l$name" +- elif test "$hardcode_shlibpath_var" = yes; then +- add_shlibpath="$dir" +- add="-l$name" +- else +- lib_linked=no +- fi +- ;; +- *) lib_linked=no ;; +- esac +- +- if test "$lib_linked" != yes; then +- func_fatal_configuration "unsupported hardcode properties" +- fi +- +- if test -n "$add_shlibpath"; then +- case :$compile_shlibpath: in +- *":$add_shlibpath:"*) ;; +- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; +- esac +- fi +- if test "$linkmode" = prog; then +- test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" +- test -n "$add" && compile_deplibs="$add $compile_deplibs" +- else +- test -n "$add_dir" && deplibs="$add_dir $deplibs" +- test -n "$add" && deplibs="$add $deplibs" +- if test "$hardcode_direct" != yes && +- test "$hardcode_minus_L" != yes && +- test "$hardcode_shlibpath_var" = yes; then +- case :$finalize_shlibpath: in +- *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; +- esac +- fi +- fi +- fi +- +- if test "$linkmode" = prog || test "$mode" = relink; then +- add_shlibpath= +- add_dir= +- add= +- # Finalize command for both is simple: just hardcode it. +- if test "$hardcode_direct" = yes && +- test "$hardcode_direct_absolute" = no; then +- add="$libdir/$linklib" +- elif test "$hardcode_minus_L" = yes; then +- add_dir="-L$libdir" +- add="-l$name" +- elif test "$hardcode_shlibpath_var" = yes; then +- case :$finalize_shlibpath: in +- *":$libdir:"*) ;; +- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; +- esac +- add="-l$name" +- elif test "$hardcode_automatic" = yes; then +- if test -n "$inst_prefix_dir" && +- test -f "$inst_prefix_dir$libdir/$linklib" ; then +- add="$inst_prefix_dir$libdir/$linklib" +- else +- add="$libdir/$linklib" +- fi +- else +- # We cannot seem to hardcode it, guess we'll fake it. +- add_dir="-L$libdir" +- # Try looking first in the location we're being installed to. +- if test -n "$inst_prefix_dir"; then +- case $libdir in +- [\\/]*) +- add_dir="$add_dir -L$inst_prefix_dir$libdir" +- ;; +- esac +- fi +- add="-l$name" +- fi +- +- if test "$linkmode" = prog; then +- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" +- test -n "$add" && finalize_deplibs="$add $finalize_deplibs" +- else +- test -n "$add_dir" && deplibs="$add_dir $deplibs" +- test -n "$add" && deplibs="$add $deplibs" +- fi +- fi +- elif test "$linkmode" = prog; then +- # Here we assume that one of hardcode_direct or hardcode_minus_L +- # is not unsupported. This is valid on all known static and +- # shared platforms. +- if test "$hardcode_direct" != unsupported; then +- test -n "$old_library" && linklib="$old_library" +- compile_deplibs="$dir/$linklib $compile_deplibs" +- finalize_deplibs="$dir/$linklib $finalize_deplibs" +- else +- compile_deplibs="-l$name -L$dir $compile_deplibs" +- finalize_deplibs="-l$name -L$dir $finalize_deplibs" +- fi +- elif test "$build_libtool_libs" = yes; then +- # Not a shared library +- if test "$deplibs_check_method" != pass_all; then +- # We're trying link a shared library against a static one +- # but the system doesn't support it. +- +- # Just print a warning and add the library to dependency_libs so +- # that the program can be linked against the static library. +- $ECHO +- $ECHO "*** Warning: This system can not link to static lib archive $lib." +- $ECHO "*** I have the capability to make that library automatically link in when" +- $ECHO "*** you link to this library. But I can only do this if you have a" +- $ECHO "*** shared version of the library, which you do not appear to have." +- if test "$module" = yes; then +- $ECHO "*** But as you try to build a module library, libtool will still create " +- $ECHO "*** a static module, that should work as long as the dlopening application" +- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." +- if test -z "$global_symbol_pipe"; then +- $ECHO +- $ECHO "*** However, this would only work if libtool was able to extract symbol" +- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" +- $ECHO "*** not find such a program. So, this module is probably useless." +- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." +- fi +- if test "$build_old_libs" = no; then +- build_libtool_libs=module +- build_old_libs=yes +- else +- build_libtool_libs=no +- fi +- fi +- else +- deplibs="$dir/$old_library $deplibs" +- link_static=yes +- fi +- fi # link shared/static library? +- +- if test "$linkmode" = lib; then +- if test -n "$dependency_libs" && +- { test "$hardcode_into_libs" != yes || +- test "$build_old_libs" = yes || +- test "$link_static" = yes; }; then +- # Extract -R from dependency_libs +- temp_deplibs= +- for libdir in $dependency_libs; do +- case $libdir in +- -R*) func_stripname '-R' '' "$libdir" +- temp_xrpath=$func_stripname_result +- case " $xrpath " in +- *" $temp_xrpath "*) ;; +- *) xrpath="$xrpath $temp_xrpath";; +- esac;; +- *) temp_deplibs="$temp_deplibs $libdir";; +- esac +- done +- dependency_libs="$temp_deplibs" +- fi +- +- newlib_search_path="$newlib_search_path $absdir" +- # Link against this library +- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" +- # ... and its dependency_libs +- tmp_libs= +- for deplib in $dependency_libs; do +- newdependency_libs="$deplib $newdependency_libs" +- if $opt_duplicate_deps ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done +- +- if test "$link_all_deplibs" != no; then +- # Add the search paths of all dependency libraries +- for deplib in $dependency_libs; do +- case $deplib in +- -L*) path="$deplib" ;; +- *.la) +- func_dirname "$deplib" "" "." +- dir="$func_dirname_result" +- # We need an absolute path. +- case $dir in +- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; +- *) +- absdir=`cd "$dir" && pwd` +- if test -z "$absdir"; then +- func_warning "cannot determine absolute directory name of \`$dir'" +- absdir="$dir" +- fi +- ;; +- esac +- if $GREP "^installed=no" $deplib > /dev/null; then +- case $host in +- *-*-darwin*) +- depdepl= +- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` +- if test -n "$deplibrary_names" ; then +- for tmp in $deplibrary_names ; do +- depdepl=$tmp +- done +- if test -f "$absdir/$objdir/$depdepl" ; then +- depdepl="$absdir/$objdir/$depdepl" +- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` +- if test -z "$darwin_install_name"; then +- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` +- fi +- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" +- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" +- path= +- fi +- fi +- ;; +- *) +- path="-L$absdir/$objdir" +- ;; +- esac +- else +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` +- test -z "$libdir" && \ +- func_fatal_error "\`$deplib' is not a valid libtool archive" +- test "$absdir" != "$libdir" && \ +- func_warning "\`$deplib' seems to be moved" +- +- path="-L$absdir" +- fi +- ;; +- esac +- case " $deplibs " in +- *" $path "*) ;; +- *) deplibs="$path $deplibs" ;; +- esac +- done +- fi # link_all_deplibs != no +- fi # linkmode = lib +- done # for deplib in $libs +- if test "$pass" = link; then +- if test "$linkmode" = "prog"; then +- compile_deplibs="$new_inherited_linker_flags $compile_deplibs" +- finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" +- else +- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- fi +- fi +- dependency_libs="$newdependency_libs" +- if test "$pass" = dlpreopen; then +- # Link the dlpreopened libraries before other libraries +- for deplib in $save_deplibs; do +- deplibs="$deplib $deplibs" +- done +- fi +- if test "$pass" != dlopen; then +- if test "$pass" != conv; then +- # Make sure lib_search_path contains only unique directories. +- lib_search_path= +- for dir in $newlib_search_path; do +- case "$lib_search_path " in +- *" $dir "*) ;; +- *) lib_search_path="$lib_search_path $dir" ;; +- esac +- done +- newlib_search_path= +- fi +- +- if test "$linkmode,$pass" != "prog,link"; then +- vars="deplibs" +- else +- vars="compile_deplibs finalize_deplibs" +- fi +- for var in $vars dependency_libs; do +- # Add libraries to $var in reverse order +- eval tmp_libs=\"\$$var\" +- new_libs= +- for deplib in $tmp_libs; do +- # FIXME: Pedantically, this is the right thing to do, so +- # that some nasty dependency loop isn't accidentally +- # broken: +- #new_libs="$deplib $new_libs" +- # Pragmatically, this seems to cause very few problems in +- # practice: +- case $deplib in +- -L*) new_libs="$deplib $new_libs" ;; +- -R*) ;; +- *) +- # And here is the reason: when a library appears more +- # than once as an explicit dependence of a library, or +- # is implicitly linked in more than once by the +- # compiler, it is considered special, and multiple +- # occurrences thereof are not removed. Compare this +- # with having the same library being listed as a +- # dependency of multiple other libraries: in this case, +- # we know (pedantically, we assume) the library does not +- # need to be listed more than once, so we keep only the +- # last copy. This is not always right, but it is rare +- # enough that we require users that really mean to play +- # such unportable linking tricks to link the library +- # using -Wl,-lname, so that libtool does not consider it +- # for duplicate removal. +- case " $specialdeplibs " in +- *" $deplib "*) new_libs="$deplib $new_libs" ;; +- *) +- case " $new_libs " in +- *" $deplib "*) ;; +- *) new_libs="$deplib $new_libs" ;; +- esac +- ;; +- esac +- ;; +- esac +- done +- tmp_libs= +- for deplib in $new_libs; do +- case $deplib in +- -L*) +- case " $tmp_libs " in +- *" $deplib "*) ;; +- *) tmp_libs="$tmp_libs $deplib" ;; +- esac +- ;; +- *) tmp_libs="$tmp_libs $deplib" ;; +- esac +- done +- eval $var=\"$tmp_libs\" +- done # for var +- fi +- # Last step: remove runtime libs from dependency_libs +- # (they stay in deplibs) +- tmp_libs= +- for i in $dependency_libs ; do +- case " $predeps $postdeps $compiler_lib_search_path " in +- *" $i "*) +- i="" +- ;; +- esac +- if test -n "$i" ; then +- tmp_libs="$tmp_libs $i" +- fi +- done +- dependency_libs=$tmp_libs +- done # for pass +- if test "$linkmode" = prog; then +- dlfiles="$newdlfiles" +- fi +- if test "$linkmode" = prog || test "$linkmode" = lib; then +- dlprefiles="$newdlprefiles" +- fi +- +- case $linkmode in +- oldlib) +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- func_warning "\`-dlopen' is ignored for archives" +- fi +- +- case " $deplibs" in +- *\ -l* | *\ -L*) +- func_warning "\`-l' and \`-L' are ignored for archives" ;; +- esac +- +- test -n "$rpath" && \ +- func_warning "\`-rpath' is ignored for archives" +- +- test -n "$xrpath" && \ +- func_warning "\`-R' is ignored for archives" +- +- test -n "$vinfo" && \ +- func_warning "\`-version-info/-version-number' is ignored for archives" +- +- test -n "$release" && \ +- func_warning "\`-release' is ignored for archives" +- +- test -n "$export_symbols$export_symbols_regex" && \ +- func_warning "\`-export-symbols' is ignored for archives" +- +- # Now set the variables for building old libraries. +- build_libtool_libs=no +- oldlibs="$output" +- objs="$objs$old_deplibs" +- ;; +- +- lib) +- # Make sure we only generate libraries of the form `libNAME.la'. +- case $outputname in +- lib*) +- func_stripname 'lib' '.la' "$outputname" +- name=$func_stripname_result +- eval shared_ext=\"$shrext_cmds\" +- eval libname=\"$libname_spec\" +- ;; +- *) +- test "$module" = no && \ +- func_fatal_help "libtool library \`$output' must begin with \`lib'" +- +- if test "$need_lib_prefix" != no; then +- # Add the "lib" prefix for modules if required +- func_stripname '' '.la' "$outputname" +- name=$func_stripname_result +- eval shared_ext=\"$shrext_cmds\" +- eval libname=\"$libname_spec\" +- else +- func_stripname '' '.la' "$outputname" +- libname=$func_stripname_result +- fi +- ;; +- esac +- +- if test -n "$objs"; then +- if test "$deplibs_check_method" != pass_all; then +- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" +- else +- $ECHO +- $ECHO "*** Warning: Linking the shared library $output against the non-libtool" +- $ECHO "*** objects $objs is not portable!" +- libobjs="$libobjs $objs" +- fi +- fi +- +- test "$dlself" != no && \ +- func_warning "\`-dlopen self' is ignored for libtool libraries" +- +- set dummy $rpath +- shift +- test "$#" -gt 1 && \ +- func_warning "ignoring multiple \`-rpath's for a libtool library" +- +- install_libdir="$1" +- +- oldlibs= +- if test -z "$rpath"; then +- if test "$build_libtool_libs" = yes; then +- # Building a libtool convenience library. +- # Some compilers have problems with a `.al' extension so +- # convenience libraries should have the same extension an +- # archive normally would. +- oldlibs="$output_objdir/$libname.$libext $oldlibs" +- build_libtool_libs=convenience +- build_old_libs=yes +- fi +- +- test -n "$vinfo" && \ +- func_warning "\`-version-info/-version-number' is ignored for convenience libraries" +- +- test -n "$release" && \ +- func_warning "\`-release' is ignored for convenience libraries" +- else +- +- # Parse the version information argument. +- save_ifs="$IFS"; IFS=':' +- set dummy $vinfo 0 0 0 +- shift +- IFS="$save_ifs" +- +- test -n "$7" && \ +- func_fatal_help "too many parameters to \`-version-info'" +- +- # convert absolute version numbers to libtool ages +- # this retains compatibility with .la files and attempts +- # to make the code below a bit more comprehensible +- +- case $vinfo_number in +- yes) +- number_major="$1" +- number_minor="$2" +- number_revision="$3" +- # +- # There are really only two kinds -- those that +- # use the current revision as the major version +- # and those that subtract age and use age as +- # a minor version. But, then there is irix +- # which has an extra 1 added just for fun +- # +- case $version_type in +- darwin|linux|osf|windows|none) +- func_arith $number_major + $number_minor +- current=$func_arith_result +- age="$number_minor" +- revision="$number_revision" +- ;; +- freebsd-aout|freebsd-elf|sunos) +- current="$number_major" +- revision="$number_minor" +- age="0" +- ;; +- irix|nonstopux) +- func_arith $number_major + $number_minor +- current=$func_arith_result +- age="$number_minor" +- revision="$number_minor" +- lt_irix_increment=no +- ;; +- esac +- ;; +- no) +- current="$1" +- revision="$2" +- age="$3" +- ;; +- esac +- +- # Check that each of the things are valid numbers. +- case $current in +- 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; +- *) +- func_error "CURRENT \`$current' must be a nonnegative integer" +- func_fatal_error "\`$vinfo' is not valid version information" +- ;; +- esac +- +- case $revision in +- 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; +- *) +- func_error "REVISION \`$revision' must be a nonnegative integer" +- func_fatal_error "\`$vinfo' is not valid version information" +- ;; +- esac +- +- case $age in +- 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; +- *) +- func_error "AGE \`$age' must be a nonnegative integer" +- func_fatal_error "\`$vinfo' is not valid version information" +- ;; +- esac +- +- if test "$age" -gt "$current"; then +- func_error "AGE \`$age' is greater than the current interface number \`$current'" +- func_fatal_error "\`$vinfo' is not valid version information" +- fi +- +- # Calculate the version variables. +- major= +- versuffix= +- verstring= +- case $version_type in +- none) ;; +- +- darwin) +- # Like Linux, but with the current version available in +- # verstring for coding it into the library header +- func_arith $current - $age +- major=.$func_arith_result +- versuffix="$major.$age.$revision" +- # Darwin ld doesn't like 0 for these options... +- func_arith $current + 1 +- minor_current=$func_arith_result +- 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) +- major=".$current" +- versuffix=".$current.$revision"; +- ;; +- +- freebsd-elf) +- major=".$current" +- versuffix=".$current" +- ;; +- +- irix | nonstopux) +- if test "X$lt_irix_increment" = "Xno"; then +- func_arith $current - $age +- else +- func_arith $current - $age + 1 +- fi +- major=$func_arith_result +- +- case $version_type in +- nonstopux) verstring_prefix=nonstopux ;; +- *) verstring_prefix=sgi ;; +- esac +- verstring="$verstring_prefix$major.$revision" +- +- # Add in all the interfaces that we are compatible with. +- loop=$revision +- while test "$loop" -ne 0; do +- func_arith $revision - $loop +- iface=$func_arith_result +- func_arith $loop - 1 +- loop=$func_arith_result +- verstring="$verstring_prefix$major.$iface:$verstring" +- done +- +- # Before this point, $major must not contain `.'. +- major=.$major +- versuffix="$major.$revision" +- ;; +- +- linux) +- func_arith $current - $age +- major=.$func_arith_result +- versuffix="$major.$age.$revision" +- ;; +- +- osf) +- func_arith $current - $age +- major=.$func_arith_result +- versuffix=".$current.$age.$revision" +- verstring="$current.$age.$revision" +- +- # Add in all the interfaces that we are compatible with. +- loop=$age +- while test "$loop" -ne 0; do +- func_arith $current - $loop +- iface=$func_arith_result +- func_arith $loop - 1 +- loop=$func_arith_result +- verstring="$verstring:${iface}.0" +- done +- +- # Make executables depend on our current version. +- verstring="$verstring:${current}.0" +- ;; +- +- qnx) +- major=".$current" +- versuffix=".$current" +- ;; +- +- sunos) +- major=".$current" +- versuffix=".$current.$revision" +- ;; +- +- windows) +- # Use '-' rather than '.', since we only want one +- # extension on DOS 8.3 filesystems. +- func_arith $current - $age +- major=$func_arith_result +- versuffix="-$major" +- ;; +- +- *) +- func_fatal_configuration "unknown library version type \`$version_type'" +- ;; +- esac +- +- # Clear the version info if we defaulted, and they specified a release. +- if test -z "$vinfo" && test -n "$release"; then +- major= +- case $version_type in +- darwin) +- # we can't check for "0.0" in archive_cmds due to quoting +- # problems, so we reset it completely +- verstring= +- ;; +- *) +- verstring="0.0" +- ;; +- esac +- if test "$need_version" = no; then +- versuffix= +- else +- versuffix=".0.0" +- fi +- fi +- +- # Remove version info from name if versioning should be avoided +- if test "$avoid_version" = yes && test "$need_version" = no; then +- major= +- versuffix= +- verstring="" +- fi +- +- # Check to see if the archive will have undefined symbols. +- if test "$allow_undefined" = yes; then +- if test "$allow_undefined_flag" = unsupported; then +- func_warning "undefined symbols not allowed in $host shared libraries" +- build_libtool_libs=no +- build_old_libs=yes +- fi +- else +- # Don't allow undefined symbols. +- allow_undefined_flag="$no_undefined_flag" +- fi +- +- fi +- +- func_generate_dlsyms "$libname" "$libname" "yes" +- libobjs="$libobjs $symfileobj" +- test "X$libobjs" = "X " && libobjs= +- +- if test "$mode" != relink; then +- # Remove our outputs, but don't remove object files since they +- # may have been created when compiling PIC objects. +- removelist= +- tempremovelist=`$ECHO "$output_objdir/*"` +- for p in $tempremovelist; do +- case $p in +- *.$objext | *.gcno) +- ;; +- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) +- if test "X$precious_files_regex" != "X"; then +- if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 +- then +- continue +- fi +- fi +- removelist="$removelist $p" +- ;; +- *) ;; +- esac +- done +- test -n "$removelist" && \ +- func_show_eval "${RM}r \$removelist" +- fi +- +- # Now set the variables for building old libraries. +- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then +- oldlibs="$oldlibs $output_objdir/$libname.$libext" +- +- # Transform .lo files to .o files. +- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` +- fi +- +- # Eliminate all temporary directories. +- #for path in $notinst_path; do +- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` +- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` +- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` +- #done +- +- if test -n "$xrpath"; then +- # If the user specified any rpath flags, then add them. +- temp_xrpath= +- for libdir in $xrpath; do +- temp_xrpath="$temp_xrpath -R$libdir" +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; +- esac +- done +- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then +- dependency_libs="$temp_xrpath $dependency_libs" +- fi +- fi +- +- # Make sure dlfiles contains only unique files that won't be dlpreopened +- old_dlfiles="$dlfiles" +- dlfiles= +- for lib in $old_dlfiles; do +- case " $dlprefiles $dlfiles " in +- *" $lib "*) ;; +- *) dlfiles="$dlfiles $lib" ;; +- esac +- done +- +- # Make sure dlprefiles contains only unique files +- old_dlprefiles="$dlprefiles" +- dlprefiles= +- for lib in $old_dlprefiles; do +- case "$dlprefiles " in +- *" $lib "*) ;; +- *) dlprefiles="$dlprefiles $lib" ;; +- esac +- done +- +- if test "$build_libtool_libs" = yes; then +- if test -n "$rpath"; then +- case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) +- # these systems don't actually have a c library (as such)! +- ;; +- *-*-rhapsody* | *-*-darwin1.[012]) +- # Rhapsody C library is in the System framework +- deplibs="$deplibs System.ltframework" +- ;; +- *-*-netbsd*) +- # Don't link with libc until the a.out ld.so is fixed. +- ;; +- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) +- # Do not include libc due to us having libc/libc_r. +- ;; +- *-*-sco3.2v5* | *-*-sco5v6*) +- # Causes problems with __ctype +- ;; +- *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) +- # Compiler inserts libc in the correct place for threads to work +- ;; +- *) +- # Add libc to deplibs on all other systems if necessary. +- if test "$build_libtool_need_lc" = "yes"; then +- deplibs="$deplibs -lc" +- fi +- ;; +- esac +- fi +- +- # Transform deplibs into only deplibs that can be linked in shared. +- name_save=$name +- libname_save=$libname +- release_save=$release +- versuffix_save=$versuffix +- major_save=$major +- # I'm not sure if I'm treating the release correctly. I think +- # release should show up in the -l (ie -lgmp5) so we don't want to +- # add it in twice. Is that correct? +- release="" +- versuffix="" +- major="" +- newdeplibs= +- droppeddeps=no +- case $deplibs_check_method in +- pass_all) +- # Don't check for shared/static. Everything works. +- # This might be a little naive. We might want to check +- # whether the library exists or not. But this is on +- # osf3 & osf4 and I'm not really sure... Just +- # implementing what was already the behavior. +- newdeplibs=$deplibs +- ;; +- test_compile) +- # This code stresses the "libraries are programs" paradigm to its +- # limits. Maybe even breaks it. We compile a program, linking it +- # against the deplibs as a proxy for the library. Then we can check +- # whether they linked in statically or dynamically with ldd. +- $opt_dry_run || $RM conftest.c +- cat > conftest.c <<EOF +- int main() { return 0; } +-EOF +- $opt_dry_run || $RM conftest +- if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then +- ldd_output=`ldd conftest` +- for i in $deplibs; do +- case $i in +- -l*) +- func_stripname -l '' "$i" +- name=$func_stripname_result +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +- case " $predeps $postdeps " in +- *" $i "*) +- newdeplibs="$newdeplibs $i" +- i="" +- ;; +- esac +- fi +- if test -n "$i" ; then +- libname=`eval "\\$ECHO \"$libname_spec\""` +- deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` +- set dummy $deplib_matches; shift +- deplib_match=$1 +- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" +- else +- droppeddeps=yes +- $ECHO +- $ECHO "*** Warning: dynamic linker does not accept needed library $i." +- $ECHO "*** I have the capability to make that library automatically link in when" +- $ECHO "*** you link to this library. But I can only do this if you have a" +- $ECHO "*** shared version of the library, which I believe you do not have" +- $ECHO "*** because a test_compile did reveal that the linker did not use it for" +- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." +- fi +- fi +- ;; +- *) +- newdeplibs="$newdeplibs $i" +- ;; +- esac +- done +- else +- # Error occurred in the first compile. Let's try to salvage +- # the situation: Compile a separate program for each library. +- for i in $deplibs; do +- case $i in +- -l*) +- func_stripname -l '' "$i" +- name=$func_stripname_result +- $opt_dry_run || $RM conftest +- 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 +- *" $i "*) +- newdeplibs="$newdeplibs $i" +- i="" +- ;; +- esac +- fi +- if test -n "$i" ; then +- libname=`eval "\\$ECHO \"$libname_spec\""` +- deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` +- set dummy $deplib_matches; shift +- deplib_match=$1 +- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then +- newdeplibs="$newdeplibs $i" +- else +- droppeddeps=yes +- $ECHO +- $ECHO "*** Warning: dynamic linker does not accept needed library $i." +- $ECHO "*** I have the capability to make that library automatically link in when" +- $ECHO "*** you link to this library. But I can only do this if you have a" +- $ECHO "*** shared version of the library, which you do not appear to have" +- $ECHO "*** because a test_compile did reveal that the linker did not use this one" +- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." +- fi +- fi +- else +- 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 "*** library that it depends on before this library will be fully" +- $ECHO "*** functional. Installing it before continuing would be even better." +- fi +- ;; +- *) +- newdeplibs="$newdeplibs $i" +- ;; +- esac +- done +- fi +- ;; +- file_magic*) +- set dummy $deplibs_check_method; shift +- file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` +- for a_deplib in $deplibs; do +- case $a_deplib in +- -l*) +- func_stripname -l '' "$a_deplib" +- name=$func_stripname_result +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +- case " $predeps $postdeps " in +- *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" +- a_deplib="" +- ;; +- esac +- fi +- if test -n "$a_deplib" ; then +- libname=`eval "\\$ECHO \"$libname_spec\""` +- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do +- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` +- for potent_lib in $potential_libs; do +- # Follow soft links. +- if ls -lLd "$potent_lib" 2>/dev/null | +- $GREP " -> " >/dev/null; then +- continue +- fi +- # The statement above tries to avoid entering an +- # endless loop below, in case of cyclic links. +- # We might still enter an endless loop, since a link +- # loop can be closed while we follow links, +- # but so what? +- potlib="$potent_lib" +- while test -h "$potlib" 2>/dev/null; do +- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` +- case $potliblink in +- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; +- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; +- esac +- done +- if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | +- $SED -e 10q | +- $EGREP "$file_magic_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" +- a_deplib="" +- break 2 +- fi +- done +- done +- fi +- if test -n "$a_deplib" ; then +- droppeddeps=yes +- $ECHO +- $ECHO "*** Warning: linker path does not have real file for library $a_deplib." +- $ECHO "*** I have the capability to make that library automatically link in when" +- $ECHO "*** you link to this library. But I can only do this if you have a" +- $ECHO "*** shared version of the library, which you do not appear to have" +- $ECHO "*** because I did check the linker path looking for a file starting" +- if test -z "$potlib" ; then +- $ECHO "*** with $libname but no candidates were found. (...for file magic test)" +- else +- $ECHO "*** with $libname and none of the candidates passed a file format test" +- $ECHO "*** using a file magic. Last file checked: $potlib" +- fi +- fi +- ;; +- *) +- # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" +- ;; +- esac +- done # Gone through all deplibs. +- ;; +- match_pattern*) +- set dummy $deplibs_check_method; shift +- match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` +- for a_deplib in $deplibs; do +- case $a_deplib in +- -l*) +- func_stripname -l '' "$a_deplib" +- name=$func_stripname_result +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +- case " $predeps $postdeps " in +- *" $a_deplib "*) +- newdeplibs="$newdeplibs $a_deplib" +- a_deplib="" +- ;; +- esac +- fi +- if test -n "$a_deplib" ; then +- libname=`eval "\\$ECHO \"$libname_spec\""` +- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do +- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` +- for potent_lib in $potential_libs; do +- potlib="$potent_lib" # see symlink-check above in file_magic test +- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ +- $EGREP "$match_pattern_regex" > /dev/null; then +- newdeplibs="$newdeplibs $a_deplib" +- a_deplib="" +- break 2 +- fi +- done +- done +- fi +- if test -n "$a_deplib" ; then +- droppeddeps=yes +- $ECHO +- $ECHO "*** Warning: linker path does not have real file for library $a_deplib." +- $ECHO "*** I have the capability to make that library automatically link in when" +- $ECHO "*** you link to this library. But I can only do this if you have a" +- $ECHO "*** shared version of the library, which you do not appear to have" +- $ECHO "*** because I did check the linker path looking for a file starting" +- if test -z "$potlib" ; then +- $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" +- else +- $ECHO "*** with $libname and none of the candidates passed a file format test" +- $ECHO "*** using a regex pattern. Last file checked: $potlib" +- fi +- fi +- ;; +- *) +- # Add a -L argument. +- newdeplibs="$newdeplibs $a_deplib" +- ;; +- esac +- done # Gone through all deplibs. +- ;; +- none | unknown | *) +- newdeplibs="" +- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ +- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` +- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then +- for i in $predeps $postdeps ; do +- # can't use Xsed below, because $i might contain '/' +- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` +- done +- fi +- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | +- $GREP . >/dev/null; then +- $ECHO +- if test "X$deplibs_check_method" = "Xnone"; then +- $ECHO "*** Warning: inter-library dependencies are not supported in this platform." +- else +- $ECHO "*** Warning: inter-library dependencies are not known to be supported." +- fi +- $ECHO "*** All declared inter-library dependencies are being dropped." +- droppeddeps=yes +- fi +- ;; +- esac +- versuffix=$versuffix_save +- major=$major_save +- release=$release_save +- libname=$libname_save +- name=$name_save ++ for (base = name; *name; name++) ++ if (IS_DIR_SEPARATOR (*name)) ++ base = name + 1; ++ return base; ++} + +- case $host in +- *-*-rhapsody* | *-*-darwin1.[012]) +- # On Rhapsody replace the C library with the System framework +- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` +- ;; +- esac ++int ++check_executable(const char * path) ++{ ++ struct stat st; + +- if test "$droppeddeps" = yes; then +- if test "$module" = yes; then +- $ECHO +- $ECHO "*** Warning: libtool could not satisfy all declared inter-library" +- $ECHO "*** dependencies of module $libname. Therefore, libtool will create" +- $ECHO "*** a static module, that should work as long as the dlopening" +- $ECHO "*** application is linked with the -dlopen flag." +- if test -z "$global_symbol_pipe"; then +- $ECHO +- $ECHO "*** However, this would only work if libtool was able to extract symbol" +- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" +- $ECHO "*** not find such a program. So, this module is probably useless." +- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." +- fi +- if test "$build_old_libs" = no; then +- oldlibs="$output_objdir/$libname.$libext" +- build_libtool_libs=module +- build_old_libs=yes +- else +- build_libtool_libs=no +- fi +- else +- $ECHO "*** The inter-library dependencies that have been dropped here will be" +- $ECHO "*** automatically added whenever a program is linked with this library" +- $ECHO "*** or is declared to -dlopen it." ++ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); ++ if ((!path) || (!*path)) ++ return 0; + +- if test "$allow_undefined" = no; then +- $ECHO +- $ECHO "*** Since this library must not contain undefined symbols," +- $ECHO "*** because either the platform does not support them or" +- $ECHO "*** it was explicitly requested with -no-undefined," +- $ECHO "*** libtool will only create a static version of it." +- if test "$build_old_libs" = no; then +- oldlibs="$output_objdir/$libname.$libext" +- build_libtool_libs=module +- build_old_libs=yes +- else +- build_libtool_libs=no +- fi +- fi +- fi +- fi +- # Done checking deplibs! +- deplibs=$newdeplibs +- fi +- # Time to change all our "foo.ltframework" stuff back to "-framework foo" +- case $host in +- *-*-darwin*) +- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- ;; +- esac ++ if ((stat (path, &st) >= 0) && ++ ( ++ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ ++#if defined (S_IXOTH) ++ ((st.st_mode & S_IXOTH) == S_IXOTH) || ++#endif ++#if defined (S_IXGRP) ++ ((st.st_mode & S_IXGRP) == S_IXGRP) || ++#endif ++ ((st.st_mode & S_IXUSR) == S_IXUSR)) ++ ) ++ return 1; ++ else ++ return 0; ++} + +- # move library search paths that coincide with paths to not yet +- # installed libraries to the beginning of the library search list +- new_libs= +- for path in $notinst_path; do +- case " $new_libs " in +- *" -L$path/$objdir "*) ;; +- *) +- case " $deplibs " in +- *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; +- esac +- ;; +- esac +- done +- for deplib in $deplibs; do +- case $deplib in +- -L*) +- case " $new_libs " in +- *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; +- esac +- ;; +- *) new_libs="$new_libs $deplib" ;; +- esac +- done +- deplibs="$new_libs" ++/* Searches for the full path of the wrapper. Returns ++ newly allocated full path name if found, NULL otherwise */ ++char * ++find_executable (const char* wrapper) ++{ ++ int has_slash = 0; ++ const char* p; ++ const char* p_next; ++ /* static buffer for getcwd */ ++ char tmp[LT_PATHMAX + 1]; ++ int tmp_len; ++ char* concat_name; + +- # All the library-specific variables (install_libdir is set above). +- library_names= +- old_library= +- dlname= ++ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); + +- # Test again, we may have decided not to build it any more +- if test "$build_libtool_libs" = yes; then +- if test "$hardcode_into_libs" = yes; then +- # Hardcode the library paths +- hardcode_libdirs= +- dep_rpath= +- rpath="$finalize_rpath" +- test "$mode" != relink && rpath="$compile_rpath$rpath" +- for libdir in $rpath; do +- if test -n "$hardcode_libdir_flag_spec"; then +- if test -n "$hardcode_libdir_separator"; then +- if test -z "$hardcode_libdirs"; then +- hardcode_libdirs="$libdir" +- else +- # Just accumulate the unique libdirs. +- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in +- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) +- ;; +- *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" +- ;; +- esac +- fi +- else +- eval flag=\"$hardcode_libdir_flag_spec\" +- dep_rpath="$dep_rpath $flag" +- fi +- elif test -n "$runpath_var"; then +- case "$perm_rpath " in +- *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; +- esac +- fi +- done +- # Substitute the hardcoded libdirs into the rpath. +- if test -n "$hardcode_libdir_separator" && +- 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\" +- else +- eval dep_rpath=\"$hardcode_libdir_flag_spec\" +- fi +- fi +- if test -n "$runpath_var" && test -n "$perm_rpath"; then +- # We should set the runpath_var. +- rpath= +- for dir in $perm_rpath; do +- rpath="$rpath$dir:" +- done +- eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" +- fi +- test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" +- fi ++ if ((wrapper == NULL) || (*wrapper == '\0')) ++ return NULL; ++ ++ /* Absolute path? */ ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } ++ else ++ { ++#endif ++ if (IS_DIR_SEPARATOR (wrapper[0])) ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ } ++#endif ++ ++ for (p = wrapper; *p; p++) ++ if (*p == '/') ++ { ++ has_slash = 1; ++ break; ++ } ++ if (!has_slash) ++ { ++ /* no slashes; search PATH */ ++ const char* path = getenv ("PATH"); ++ if (path != NULL) ++ { ++ for (p = path; *p; p = p_next) ++ { ++ const char* q; ++ size_t p_len; ++ for (q = p; *q; q++) ++ if (IS_PATH_SEPARATOR(*q)) ++ break; ++ p_len = q - p; ++ p_next = (*q == '\0' ? q : q + 1); ++ if (p_len == 0) ++ { ++ /* empty path: current directory */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen(tmp); ++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ } ++ else ++ { ++ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, p, p_len); ++ concat_name[p_len] = '/'; ++ strcpy (concat_name + p_len + 1, wrapper); ++ } ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ } ++ } ++ /* not found in PATH; assume curdir */ ++ } ++ /* Relative path | not found in path: prepend cwd */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen(tmp); ++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ ++ if (check_executable(concat_name)) ++ return concat_name; ++ XFREE(concat_name); ++ return NULL; ++} ++ ++char * ++strendzap(char *str, const char *pat) ++{ ++ size_t len, patlen; ++ ++ assert(str != NULL); ++ assert(pat != NULL); ++ ++ len = strlen(str); ++ patlen = strlen(pat); ++ ++ if (patlen <= len) ++ { ++ str += len - patlen; ++ if (strcmp(str, pat) == 0) ++ *str = '\0'; ++ } ++ return str; ++} ++ ++static void ++lt_error_core (int exit_status, const char * mode, ++ const char * message, va_list ap) ++{ ++ fprintf (stderr, "%s: %s: ", program_name, mode); ++ vfprintf (stderr, message, ap); ++ fprintf (stderr, ".\n"); ++ ++ if (exit_status >= 0) ++ exit (exit_status); ++} ++ ++void ++lt_fatal (const char *message, ...) ++{ ++ va_list ap; ++ va_start (ap, message); ++ lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ va_end (ap); ++} ++EOF ++ # we should really use a build-platform specific compiler ++ # here, but OTOH, the wrappers (shell script and this C one) ++ # are only useful if you want to execute the "real" binary. ++ # Since the "real" binary is built for $host, then this ++ # wrapper might as well be built for $host, too. ++ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource ++ ;; ++ esac ++ $rm $output ++ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 ++ ++ $echo > $output "\ ++#! $SHELL ++ ++# $output - temporary wrapper script for $objdir/$outputname ++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP ++# ++# The $output program cannot be directly executed until all the libtool ++# libraries that it depends on are installed. ++# ++# This wrapper script should never be moved out of the build directory. ++# If it is, it will not operate correctly. ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++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 ++ ++relink_command=\"$relink_command\" ++ ++# This environment variable determines our operation mode. ++if test \"\$libtool_install_magic\" = \"$magic\"; then ++ # install mode needs the following variable: ++ notinst_deplibs='$notinst_deplibs' ++else ++ # When we are sourced in execute mode, \$file and \$echo are already set. ++ if test \"\$libtool_execute_magic\" != \"$magic\"; then ++ echo=\"$qecho\" ++ file=\"\$0\" ++ # Make sure echo works. ++ if test \"X\$1\" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++ elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then ++ # Yippee, \$echo works! ++ : ++ else ++ # Restart under the correct shell, and then maybe \$echo will work. ++ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} ++ fi ++ fi\ ++" ++ $echo >> $output "\ + +- shlibpath="$finalize_shlibpath" +- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" +- if test -n "$shlibpath"; then +- eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" +- fi ++ # Find the directory that this script lives in. ++ thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` ++ test \"x\$thisdir\" = \"x\$file\" && thisdir=. + +- # Get the real and link names of the library. +- eval shared_ext=\"$shrext_cmds\" +- eval library_names=\"$library_names_spec\" +- set dummy $library_names +- shift +- realname="$1" +- shift ++ # Follow symbolic links until we get to the real thisdir. ++ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` ++ while test -n \"\$file\"; do ++ destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + +- if test -n "$soname_spec"; then +- eval soname=\"$soname_spec\" +- else +- soname="$realname" +- fi +- if test -z "$dlname"; then +- dlname=$soname +- fi ++ # If there was a directory component, then change thisdir. ++ if test \"x\$destdir\" != \"x\$file\"; then ++ case \"\$destdir\" in ++ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; ++ *) thisdir=\"\$thisdir/\$destdir\" ;; ++ esac ++ fi + +- lib="$output_objdir/$realname" +- linknames= +- for link +- do +- linknames="$linknames $link" +- done ++ file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` ++ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` ++ done + +- # Use standard objects if they are pic +- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +- test "X$libobjs" = "X " && libobjs= ++ # Try to get the absolute directory name. ++ absdir=\`cd \"\$thisdir\" && pwd\` ++ test -n \"\$absdir\" && thisdir=\"\$absdir\" ++" + +- delfiles= +- if test -n "$export_symbols" && test -n "$include_expsyms"; then +- $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" +- export_symbols="$output_objdir/$libname.uexp" +- delfiles="$delfiles $export_symbols" +- fi +- +- orig_export_symbols= +- case $host_os in +- cygwin* | mingw* | cegcc*) +- if test -n "$export_symbols" && test -z "$export_symbols_regex"; then +- # exporting using user supplied symfile +- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then +- # and it's NOT already a .def file. Must figure out +- # which of the given symbols are data symbols and tag +- # them as such. So, trigger use of export_symbols_cmds. +- # export_symbols gets reassigned inside the "prepare +- # the list of exported symbols" if statement, so the +- # include_expsyms logic still works. +- orig_export_symbols="$export_symbols" +- export_symbols= +- always_export_symbols=yes +- fi +- fi +- ;; +- esac ++ if test "$fast_install" = yes; then ++ $echo >> $output "\ ++ program=lt-'$outputname'$exeext ++ progdir=\"\$thisdir/$objdir\" + +- # Prepare the list of exported symbols +- if test -z "$export_symbols"; then +- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then +- func_verbose "generating symbol list for \`$libname.la'" +- export_symbols="$output_objdir/$libname.exp" +- $opt_dry_run || $RM $export_symbols +- cmds=$export_symbols_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- func_len " $cmd" +- len=$func_len_result +- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then +- func_show_eval "$cmd" 'exit $?' +- skipped_export=false +- else +- # The command line is too long to execute in one step. +- func_verbose "using reloadable object file for export list..." +- skipped_export=: +- # Break out early, otherwise skipped_export may be +- # set to false by a later but shorter cmd. +- break +- fi +- done +- IFS="$save_ifs" +- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then +- func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' +- func_show_eval '$MV "${export_symbols}T" "$export_symbols"' +- fi +- fi +- fi ++ if test ! -f \"\$progdir/\$program\" || \\ ++ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ ++ test \"X\$file\" != \"X\$progdir/\$program\"; }; then + +- if test -n "$export_symbols" && test -n "$include_expsyms"; then +- tmp_export_symbols="$export_symbols" +- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' +- fi +- +- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then +- # The given exports_symbols file has to be filtered, so filter it. +- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" +- # FIXME: $output_objdir/$libname.filter potentially contains lots of +- # 's' commands which not all seds can handle. GNU sed should be fine +- # though. Also, the filter scales superlinearly with the number of +- # global variables. join(1) would be nice here, but unfortunately +- # isn't a blessed tool. +- $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" +- export_symbols=$output_objdir/$libname.def +- $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols +- fi ++ file=\"\$\$-\$program\" + +- tmp_deplibs= +- for test_deplib in $deplibs; do +- case " $convenience " in +- *" $test_deplib "*) ;; +- *) +- tmp_deplibs="$tmp_deplibs $test_deplib" +- ;; +- esac +- done +- deplibs="$tmp_deplibs" ++ if test ! -d \"\$progdir\"; then ++ $mkdir \"\$progdir\" ++ else ++ $rm \"\$progdir/\$file\" ++ fi" + +- if test -n "$convenience"; then +- if test -n "$whole_archive_flag_spec" && +- test "$compiler_needs_object" = yes && +- test -z "$libobjs"; then +- # extract the archives, so we have objects to list. +- # TODO: could optimize this to just extract one archive. +- whole_archive_flag_spec= +- fi +- if test -n "$whole_archive_flag_spec"; then +- save_libobjs=$libobjs +- eval libobjs=\"\$libobjs $whole_archive_flag_spec\" +- test "X$libobjs" = "X " && libobjs= +- else +- gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ $echo >> $output "\ + +- func_extract_archives $gentop $convenience +- libobjs="$libobjs $func_extract_archives_result" +- test "X$libobjs" = "X " && libobjs= +- fi +- fi ++ # relink executable if necessary ++ if test -n \"\$relink_command\"; then ++ if relink_command_output=\`eval \$relink_command 2>&1\`; then : ++ else ++ $echo \"\$relink_command_output\" >&2 ++ $rm \"\$progdir/\$file\" ++ exit $EXIT_FAILURE ++ fi ++ fi + +- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then +- eval flag=\"$thread_safe_flag_spec\" +- linker_flags="$linker_flags $flag" ++ $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || ++ { $rm \"\$progdir/\$program\"; ++ $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } ++ $rm \"\$progdir/\$file\" ++ fi" ++ else ++ $echo >> $output "\ ++ program='$outputname' ++ progdir=\"\$thisdir/$objdir\" ++" + fi + +- # Make a backup of the uninstalled library when relinking +- if test "$mode" = relink; then +- $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? +- fi ++ $echo >> $output "\ + +- # Do each of the archive commands. +- if test "$module" = yes && test -n "$module_cmds" ; then +- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- eval test_cmds=\"$module_expsym_cmds\" +- cmds=$module_expsym_cmds +- else +- eval test_cmds=\"$module_cmds\" +- cmds=$module_cmds +- fi +- else +- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval test_cmds=\"$archive_expsym_cmds\" +- cmds=$archive_expsym_cmds +- else +- eval test_cmds=\"$archive_cmds\" +- cmds=$archive_cmds +- fi ++ if test -f \"\$progdir/\$program\"; then" ++ ++ # Export our shlibpath_var if we have one. ++ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then ++ $echo >> $output "\ ++ # Add our own library path to $shlibpath_var ++ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" ++ ++ # Some systems cannot cope with colon-terminated $shlibpath_var ++ # The second colon is a workaround for a bug in BeOS R4 sed ++ $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` ++ ++ export $shlibpath_var ++" + fi + +- if test "X$skipped_export" != "X:" && +- func_len " $test_cmds" && +- len=$func_len_result && +- test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then +- : +- else +- # The command line is too long to link in one step, link piecewise +- # or, if using GNU ld and skipped_export is not :, use a linker +- # script. ++ # fixup the dll searchpath if we need to. ++ if test -n "$dllsearchpath"; then ++ $echo >> $output "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:\$PATH ++" ++ fi + +- # Save the value of $output and $libobjs because we want to +- # use them later. If we have whole_archive_flag_spec, we +- # want to use save_libobjs as it was before +- # whole_archive_flag_spec was expanded, because we can't +- # assume the linker understands whole_archive_flag_spec. +- # This may have to be revisited, in case too many +- # convenience libraries get linked in and end up exceeding +- # the spec. +- if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then +- save_libobjs=$libobjs +- fi +- save_output=$output +- output_la=`$ECHO "X$output" | $Xsed -e "$basename"` ++ $echo >> $output "\ ++ if test \"\$libtool_execute_magic\" != \"$magic\"; then ++ # Run the actual program with our arguments. ++" ++ case $host in ++ # Backslashes separate directories on plain windows ++ *-*-mingw | *-*-os2*) ++ $echo >> $output "\ ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} ++" ++ ;; + +- # Clear the reloadable object creation command queue and +- # initialize k to one. +- test_cmds= +- concat_cmds= +- objlist= +- last_robj= +- k=1 ++ *) ++ $echo >> $output "\ ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} ++" ++ ;; ++ esac ++ $echo >> $output "\ ++ \$echo \"\$0: cannot exec \$program \$*\" ++ exit $EXIT_FAILURE ++ fi ++ else ++ # The program doesn't exist. ++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 ++ \$echo \"This script is just a wrapper for \$program.\" 1>&2 ++ $echo \"See the $PACKAGE documentation for more information.\" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++fi\ ++" ++ chmod +x $output ++ fi ++ exit $EXIT_SUCCESS ++ ;; ++ esac + +- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then +- output=${output_objdir}/${output_la}.lnkscript +- func_verbose "creating GNU ld script: $output" +- $ECHO 'INPUT (' > $output +- for obj in $save_libobjs +- do +- $ECHO "$obj" >> $output +- done +- $ECHO ')' >> $output +- delfiles="$delfiles $output" +- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then +- output=${output_objdir}/${output_la}.lnk +- func_verbose "creating linker input file list: $output" +- : > $output +- set x $save_libobjs +- shift +- firstobj= +- if test "$compiler_needs_object" = yes; then +- firstobj="$1 " +- shift +- fi +- for obj +- do +- $ECHO "$obj" >> $output +- done +- delfiles="$delfiles $output" +- output=$firstobj\"$file_list_spec$output\" +- else +- if test -n "$save_libobjs"; then +- func_verbose "creating reloadable object files..." +- output=$output_objdir/$output_la-${k}.$objext +- eval test_cmds=\"$reload_cmds\" +- func_len " $test_cmds" +- len0=$func_len_result +- len=$len0 +- +- # Loop over the list of objects to be linked. +- for obj in $save_libobjs +- do +- func_len " $obj" +- func_arith $len + $func_len_result +- len=$func_arith_result +- if test "X$objlist" = X || +- test "$len" -lt "$max_cmd_len"; then +- func_append objlist " $obj" +- else +- # The command $test_cmds is almost too long, add a +- # command to the queue. +- if test "$k" -eq 1 ; then +- # The first file doesn't have a previous command to add. +- eval concat_cmds=\"$reload_cmds $objlist $last_robj\" +- else +- # All subsequent reloadable object files will link in +- # the last one created. +- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" +- fi +- last_robj=$output_objdir/$output_la-${k}.$objext +- func_arith $k + 1 +- k=$func_arith_result +- output=$output_objdir/$output_la-${k}.$objext +- objlist=$obj +- func_len " $last_robj" +- func_arith $len0 + $func_len_result +- len=$func_arith_result +- fi +- done +- # Handle the remaining objects by creating one last +- # reloadable object file. All subsequent reloadable object +- # files will link in the last one created. +- test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" +- if test -n "$last_robj"; then +- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" +- fi +- delfiles="$delfiles $output" ++ # See if we need to build an old-fashioned archive. ++ for oldlib in $oldlibs; do + +- else +- output= +- fi ++ if test "$build_libtool_libs" = convenience; then ++ oldobjs="$libobjs_save" ++ addlibs="$convenience" ++ build_libtool_libs=no ++ else ++ if test "$build_libtool_libs" = module; then ++ oldobjs="$libobjs_save" ++ build_libtool_libs=no ++ else ++ oldobjs="$old_deplibs $non_pic_objects" ++ fi ++ addlibs="$old_convenience" ++ fi + +- if ${skipped_export-false}; then +- func_verbose "generating symbol list for \`$libname.la'" +- export_symbols="$output_objdir/$libname.exp" +- $opt_dry_run || $RM $export_symbols +- libobjs=$output +- # Append the command to create the export file. +- test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" +- if test -n "$last_robj"; then +- eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" +- fi +- fi ++ if test -n "$addlibs"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" + +- test -n "$save_libobjs" && +- func_verbose "creating a temporary reloadable object file: $output" ++ func_extract_archives $gentop $addlibs ++ oldobjs="$oldobjs $func_extract_archives_result" ++ fi + +- # Loop through the commands generated above and execute them. +- save_ifs="$IFS"; IFS='~' +- for cmd in $concat_cmds; do +- IFS="$save_ifs" +- $opt_silent || { +- func_quote_for_expand "$cmd" +- eval "func_echo $func_quote_for_expand_result" +- } +- $opt_dry_run || eval "$cmd" || { +- lt_exit=$? +- +- # Restore the uninstalled library and exit +- if test "$mode" = relink; then +- ( cd "$output_objdir" && \ +- $RM "${realname}T" && \ +- $MV "${realname}U" "$realname" ) +- fi ++ # Do each command in the archive commands. ++ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then ++ cmds=$old_archive_from_new_cmds ++ else ++ # POSIX demands no paths to be encoded in archives. We have ++ # to avoid creating archives with duplicate basenames if we ++ # might have to extract them afterwards, e.g., when creating a ++ # static archive out of a convenience library, or when linking ++ # the entirety of a libtool archive into another (currently ++ # not supported by libtool). ++ if (for obj in $oldobjs ++ do ++ $echo "X$obj" | $Xsed -e 's%^.*/%%' ++ done | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ $echo "copying selected object files to avoid basename conflicts..." + +- exit $lt_exit +- } +- done +- IFS="$save_ifs" ++ if test -z "$gentop"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" + +- if test -n "$export_symbols_regex" && ${skipped_export-false}; then +- func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' +- func_show_eval '$MV "${export_symbols}T" "$export_symbols"' ++ $show "${rm}r $gentop" ++ $run ${rm}r "$gentop" ++ $show "$mkdir $gentop" ++ $run $mkdir "$gentop" ++ exit_status=$? ++ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then ++ exit $exit_status + fi + fi + +- if ${skipped_export-false}; then +- if test -n "$export_symbols" && test -n "$include_expsyms"; then +- tmp_export_symbols="$export_symbols" +- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" +- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' +- fi +- +- if test -n "$orig_export_symbols"; then +- # The given exports_symbols file has to be filtered, so filter it. +- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" +- # FIXME: $output_objdir/$libname.filter potentially contains lots of +- # 's' commands which not all seds can handle. GNU sed should be fine +- # though. Also, the filter scales superlinearly with the number of +- # global variables. join(1) would be nice here, but unfortunately +- # isn't a blessed tool. +- $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter +- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" +- export_symbols=$output_objdir/$libname.def +- $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols +- fi +- fi ++ save_oldobjs=$oldobjs ++ oldobjs= ++ counter=1 ++ for obj in $save_oldobjs ++ do ++ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` ++ case " $oldobjs " in ++ " ") oldobjs=$obj ;; ++ *[\ /]"$objbase "*) ++ while :; do ++ # Make sure we don't pick an alternate name that also ++ # overlaps. ++ newobj=lt$counter-$objbase ++ counter=`expr $counter + 1` ++ case " $oldobjs " in ++ *[\ /]"$newobj "*) ;; ++ *) if test ! -f "$gentop/$newobj"; then break; fi ;; ++ esac ++ done ++ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" ++ $run ln "$obj" "$gentop/$newobj" || ++ $run cp "$obj" "$gentop/$newobj" ++ oldobjs="$oldobjs $gentop/$newobj" ++ ;; ++ *) oldobjs="$oldobjs $obj" ;; ++ esac ++ done ++ fi + +- libobjs=$output +- # Restore the value of output. +- output=$save_output ++ eval cmds=\"$old_archive_cmds\" + +- if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then +- eval libobjs=\"\$libobjs $whole_archive_flag_spec\" +- test "X$libobjs" = "X " && libobjs= +- fi +- # Expand the library linking commands again to reset the +- # value of $libobjs for piecewise linking. ++ if len=`expr "X$cmds" : ".*"` && ++ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ cmds=$old_archive_cmds ++ else ++ # the command line is too long to link in one step, link in parts ++ $echo "using piecewise archive linking..." ++ save_RANLIB=$RANLIB ++ RANLIB=: ++ objlist= ++ concat_cmds= ++ save_oldobjs=$oldobjs + +- # Do each of the archive commands. +- if test "$module" = yes && test -n "$module_cmds" ; then +- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then +- cmds=$module_expsym_cmds ++ # Is there a better way of finding the last object in the list? ++ for obj in $save_oldobjs ++ do ++ last_oldobj=$obj ++ done ++ for obj in $save_oldobjs ++ do ++ oldobjs="$objlist $obj" ++ objlist="$objlist $obj" ++ eval test_cmds=\"$old_archive_cmds\" ++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && ++ test "$len" -le "$max_cmd_len"; then ++ : + else +- cmds=$module_cmds ++ # the above command should be used before it gets too long ++ oldobjs=$objlist ++ if test "$obj" = "$last_oldobj" ; then ++ RANLIB=$save_RANLIB ++ fi ++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ ++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" ++ objlist= + fi ++ done ++ RANLIB=$save_RANLIB ++ oldobjs=$objlist ++ if test "X$oldobjs" = "X" ; then ++ eval cmds=\"\$concat_cmds\" + else +- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- cmds=$archive_expsym_cmds +- else +- cmds=$archive_cmds +- fi ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi +- +- if test -n "$delfiles"; then +- # Append the command to remove temporary files to $cmds. +- eval cmds=\"\$cmds~\$RM $delfiles\" +- fi +- +- # Add any objects from preloaded convenience libraries +- if test -n "$dlprefiles"; then +- gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" +- +- func_extract_archives $gentop $dlprefiles +- libobjs="$libobjs $func_extract_archives_result" +- test "X$libobjs" = "X " && libobjs= +- fi +- +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $opt_silent || { +- func_quote_for_expand "$cmd" +- eval "func_echo $func_quote_for_expand_result" +- } +- $opt_dry_run || eval "$cmd" || { +- lt_exit=$? +- +- # Restore the uninstalled library and exit +- if test "$mode" = relink; then +- ( cd "$output_objdir" && \ +- $RM "${realname}T" && \ +- $MV "${realname}U" "$realname" ) +- fi +- +- exit $lt_exit +- } +- done ++ fi ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ eval cmd=\"$cmd\" + IFS="$save_ifs" ++ $show "$cmd" ++ $run eval "$cmd" || exit $? ++ done ++ IFS="$save_ifs" ++ done + +- # Restore the uninstalled library and exit +- if test "$mode" = relink; then +- $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? +- +- if test -n "$convenience"; then +- if test -z "$whole_archive_flag_spec"; then +- func_show_eval '${RM}r "$gentop"' +- fi +- fi +- +- exit $EXIT_SUCCESS +- fi ++ if test -n "$generated"; then ++ $show "${rm}r$generated" ++ $run ${rm}r$generated ++ fi + +- # Create links to the real library. +- for linkname in $linknames; do +- if test "$realname" != "$linkname"; then +- func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' +- fi +- done ++ # Now create the libtool archive. ++ case $output in ++ *.la) ++ old_library= ++ test "$build_old_libs" = yes && old_library="$libname.$libext" ++ $show "creating $output" + +- # If -module or -export-dynamic was specified, set the dlname. +- if test "$module" = yes || test "$export_dynamic" = yes; then +- # On all known operating systems, these are identical. +- dlname="$soname" ++ # Preserve any variables that may affect compiler behavior ++ for var in $variables_saved_for_relink; do ++ if eval test -z \"\${$var+set}\"; then ++ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" ++ elif eval var_value=\$$var; test -z "$var_value"; then ++ relink_command="$var=; export $var; $relink_command" ++ else ++ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` ++ relink_command="$var=\"$var_value\"; export $var; $relink_command" + fi ++ 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" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` ++ if test "$hardcode_automatic" = yes ; then ++ relink_command= + fi +- ;; +- +- obj) +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- func_warning "\`-dlopen' is ignored for objects" +- fi +- +- case " $deplibs" in +- *\ -l* | *\ -L*) +- func_warning "\`-l' and \`-L' are ignored for objects" ;; +- esac +- +- test -n "$rpath" && \ +- func_warning "\`-rpath' is ignored for objects" +- +- test -n "$xrpath" && \ +- func_warning "\`-R' is ignored for objects" +- +- test -n "$vinfo" && \ +- func_warning "\`-version-info' is ignored for objects" +- +- test -n "$release" && \ +- func_warning "\`-release' is ignored for objects" +- +- case $output in +- *.lo) +- test -n "$objs$old_deplibs" && \ +- func_fatal_error "cannot build library object \`$output' from non-libtool objects" +- +- libobj=$output +- func_lo2o "$libobj" +- obj=$func_lo2o_result +- ;; +- *) +- libobj= +- obj="$output" +- ;; +- esac +- +- # Delete the old objects. +- $opt_dry_run || $RM $obj $libobj + +- # Objects from convenience libraries. This assumes +- # single-version convenience libraries. Whenever we create +- # different ones for PIC/non-PIC, this we'll have to duplicate +- # the extraction. +- reload_conv_objs= +- gentop= +- # reload_cmds runs $LD directly, so let us get rid of +- # -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 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" ++ # Only create the output if not a dry run. ++ if test -z "$run"; then ++ for installed in no yes; do ++ if test "$installed" = yes; then ++ if test -z "$install_libdir"; then ++ break ++ fi ++ output="$output_objdir/$outputname"i ++ # Replace all uninstalled libtool libraries with the installed ones ++ newdependency_libs= ++ for deplib in $dependency_libs; do ++ case $deplib in ++ *.la) ++ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ if test -z "$libdir"; then ++ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ newdependency_libs="$newdependency_libs $libdir/$name" ++ ;; ++ *) newdependency_libs="$newdependency_libs $deplib" ;; ++ esac ++ done ++ dependency_libs="$newdependency_libs" ++ newdlfiles= ++ for lib in $dlfiles; do ++ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ if test -z "$libdir"; then ++ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ newdlfiles="$newdlfiles $libdir/$name" ++ done ++ dlfiles="$newdlfiles" ++ newdlprefiles= ++ for lib in $dlprefiles; do ++ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ if test -z "$libdir"; then ++ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ newdlprefiles="$newdlprefiles $libdir/$name" ++ done ++ dlprefiles="$newdlprefiles" ++ else ++ newdlfiles= ++ for lib in $dlfiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlfiles="$newdlfiles $abs" ++ done ++ dlfiles="$newdlfiles" ++ newdlprefiles= ++ for lib in $dlprefiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlprefiles="$newdlprefiles $abs" ++ done ++ dlprefiles="$newdlprefiles" ++ fi ++ $rm $output ++ # place dlname in correct position for cygwin ++ tdlname=$dlname ++ case $host,$output,$installed,$module,$dlname in ++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; ++ esac ++ $echo > $output "\ ++# $outputname - a libtool library file ++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP ++# ++# Please DO NOT delete this file! ++# It is necessary for linking the library. + +- func_extract_archives $gentop $convenience +- reload_conv_objs="$reload_objs $func_extract_archives_result" +- fi +- fi ++# The name that we can dlopen(3). ++dlname='$tdlname' + +- # Create the old-style object. +- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test ++# Names of this library. ++library_names='$library_names' + +- output="$obj" +- func_execute_cmds "$reload_cmds" 'exit $?' ++# The name of the static archive. ++old_library='$old_library' + +- # Exit if we aren't doing a library object file. +- if test -z "$libobj"; then +- if test -n "$gentop"; then +- func_show_eval '${RM}r "$gentop"' +- fi ++# Libraries that this one depends upon. ++dependency_libs='$dependency_libs' + +- exit $EXIT_SUCCESS +- fi ++# Version information for $libname. ++current=$current ++age=$age ++revision=$revision + +- if test "$build_libtool_libs" != yes; then +- if test -n "$gentop"; then +- func_show_eval '${RM}r "$gentop"' +- fi ++# Is this an already installed library? ++installed=$installed + +- # Create an invalid libtool object if no PIC, so that we don't +- # accidentally link it into a program. +- # $show "echo timestamp > $libobj" +- # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? +- exit $EXIT_SUCCESS +- fi ++# Should we warn about portability when linking against -modules? ++shouldnotlink=$module + +- if test -n "$pic_flag" || test "$pic_mode" != default; then +- # Only do commands if we really have different PIC objects. +- reload_objs="$libobjs $reload_conv_objs" +- output="$libobj" +- func_execute_cmds "$reload_cmds" 'exit $?' +- fi ++# Files to dlopen/dlpreopen ++dlopen='$dlfiles' ++dlpreopen='$dlprefiles' + +- if test -n "$gentop"; then +- func_show_eval '${RM}r "$gentop"' ++# Directory that this library needs to be installed in: ++libdir='$install_libdir'" ++ if test "$installed" = no && test "$need_relink" = yes; then ++ $echo >> $output "\ ++relink_command=\"$relink_command\"" ++ fi ++ done + fi + +- exit $EXIT_SUCCESS ++ # Do a symbolic link so that the libtool archive can be found in ++ # LD_LIBRARY_PATH before the program is installed. ++ $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" ++ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? + ;; ++ esac ++ exit $EXIT_SUCCESS ++ ;; + +- prog) +- case $host in +- *cygwin*) func_stripname '' '.exe' "$output" +- output=$func_stripname_result.exe;; ++ # libtool install mode ++ install) ++ modename="$modename: install" ++ ++ # There may be an optional sh(1) argument at the beginning of ++ # install_prog (especially on Windows NT). ++ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || ++ # Allow the use of GNU shtool's install command. ++ $echo "X$nonopt" | grep shtool > /dev/null; then ++ # Aesthetically quote it. ++ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; + esac +- test -n "$vinfo" && \ +- func_warning "\`-version-info' is ignored for programs" ++ install_prog="$arg " ++ arg="$1" ++ shift ++ else ++ install_prog= ++ arg=$nonopt ++ fi + +- test -n "$release" && \ +- func_warning "\`-release' is ignored for programs" ++ # The real first argument should be the name of the installation program. ++ # Aesthetically quote it. ++ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" ++ ;; ++ esac ++ install_prog="$install_prog$arg" + +- test "$preload" = yes \ +- && test "$dlopen_support" = unknown \ +- && test "$dlopen_self" = unknown \ +- && test "$dlopen_self_static" = unknown && \ +- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." ++ # We need to accept at least all the BSD install flags. ++ dest= ++ files= ++ opts= ++ prev= ++ install_type= ++ isdir=no ++ stripme= ++ for arg ++ do ++ if test -n "$dest"; then ++ files="$files $dest" ++ dest=$arg ++ continue ++ fi + +- case $host in +- *-*-rhapsody* | *-*-darwin1.[012]) +- # On Rhapsody replace the C library is the System framework +- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` +- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ case $arg in ++ -d) isdir=yes ;; ++ -f) ++ case " $install_prog " in ++ *[\\\ /]cp\ *) ;; ++ *) prev=$arg ;; ++ esac ++ ;; ++ -g | -m | -o) prev=$arg ;; ++ -s) ++ stripme=" -s" ++ continue ++ ;; ++ -*) ++ ;; ++ *) ++ # If the previous option needed an argument, then skip it. ++ if test -n "$prev"; then ++ prev= ++ else ++ dest=$arg ++ continue ++ fi + ;; + esac + +- case $host in +- *-*-darwin*) +- # Don't allow lazy linking, it breaks C++ global constructors +- # But is supposedly fixed on 10.4 or later (yay!). +- if test "$tagname" = CXX ; then +- case ${MACOSX_DEPLOYMENT_TARGET-10.0} in +- 10.[0123]) +- compile_command="$compile_command ${wl}-bind_at_load" +- finalize_command="$finalize_command ${wl}-bind_at_load" +- ;; +- esac +- fi +- # Time to change all our "foo.ltframework" stuff back to "-framework foo" +- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ # Aesthetically quote the argument. ++ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` ++ case $arg in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ arg="\"$arg\"" + ;; + esac ++ install_prog="$install_prog $arg" ++ done ++ ++ if test -z "$install_prog"; then ++ $echo "$modename: you must specify an install program" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + ++ if test -n "$prev"; then ++ $echo "$modename: the \`$prev' option requires an argument" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- # move library search paths that coincide with paths to not yet +- # installed libraries to the beginning of the library search list +- new_libs= +- for path in $notinst_path; do +- case " $new_libs " in +- *" -L$path/$objdir "*) ;; ++ if test -z "$files"; then ++ if test -z "$dest"; then ++ $echo "$modename: no file or destination specified" 1>&2 ++ else ++ $echo "$modename: you must specify a destination" 1>&2 ++ fi ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ ++ # Strip any trailing slash from the destination. ++ dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` ++ ++ # Check to see that the destination is a directory. ++ test -d "$dest" && isdir=yes ++ if test "$isdir" = yes; then ++ destdir="$dest" ++ destname= ++ else ++ destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` ++ test "X$destdir" = "X$dest" && destdir=. ++ destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` ++ ++ # Not a directory, so check to see that there is only one file specified. ++ set dummy $files ++ if test "$#" -gt 2; then ++ $echo "$modename: \`$dest' is not a directory" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ fi ++ case $destdir in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ for file in $files; do ++ case $file in ++ *.lo) ;; + *) +- case " $compile_deplibs " in +- *" -L$path/$objdir "*) +- new_libs="$new_libs -L$path/$objdir" ;; +- esac +- ;; +- esac +- done +- for deplib in $compile_deplibs; do +- case $deplib in +- -L*) +- case " $new_libs " in +- *" $deplib "*) ;; +- *) new_libs="$new_libs $deplib" ;; +- esac ++ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE + ;; +- *) new_libs="$new_libs $deplib" ;; + esac + done +- compile_deplibs="$new_libs" ++ ;; ++ esac + ++ # This variable tells wrapper scripts just to set variables rather ++ # than running their programs. ++ libtool_install_magic="$magic" + +- compile_command="$compile_command $compile_deplibs" +- finalize_command="$finalize_command $finalize_deplibs" ++ staticlibs= ++ future_libdirs= ++ current_libdirs= ++ for file in $files; do + +- if test -n "$rpath$xrpath"; then +- # If the user specified any rpath flags, then add them. +- for libdir in $rpath $xrpath; do +- # This is the magic to use -rpath. +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) finalize_rpath="$finalize_rpath $libdir" ;; +- esac +- done +- fi ++ # Do each installation. ++ case $file in ++ *.$libext) ++ # Do the static libraries later. ++ staticlibs="$staticlibs $file" ++ ;; + +- # Now hardcode the library paths +- rpath= +- hardcode_libdirs= +- for libdir in $compile_rpath $finalize_rpath; do +- if test -n "$hardcode_libdir_flag_spec"; then +- if test -n "$hardcode_libdir_separator"; then +- if test -z "$hardcode_libdirs"; then +- hardcode_libdirs="$libdir" +- else +- # Just accumulate the unique libdirs. +- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in +- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) +- ;; +- *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" +- ;; +- esac +- fi +- else +- eval flag=\"$hardcode_libdir_flag_spec\" +- rpath="$rpath $flag" +- fi +- elif test -n "$runpath_var"; then +- case "$perm_rpath " in +- *" $libdir "*) ;; +- *) perm_rpath="$perm_rpath $libdir" ;; +- esac ++ *.la) ++ # Check to see that this really is a libtool archive. ++ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : ++ else ++ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE + fi +- case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) +- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` +- case :$dllsearchpath: in +- *":$libdir:"*) ;; +- ::) dllsearchpath=$libdir;; +- *) dllsearchpath="$dllsearchpath:$libdir";; +- esac +- case :$dllsearchpath: in +- *":$testbindir:"*) ;; +- ::) dllsearchpath=$testbindir;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; +- esac +- ;; ++ ++ library_names= ++ old_library= ++ relink_command= ++ # If there is no directory component, then add one. ++ case $file in ++ */* | *\\*) . $file ;; ++ *) . ./$file ;; + esac +- done +- # Substitute the hardcoded libdirs into the rpath. +- if test -n "$hardcode_libdir_separator" && +- test -n "$hardcode_libdirs"; then +- libdir="$hardcode_libdirs" +- eval rpath=\" $hardcode_libdir_flag_spec\" +- fi +- compile_rpath="$rpath" + +- rpath= +- hardcode_libdirs= +- for libdir in $finalize_rpath; do +- if test -n "$hardcode_libdir_flag_spec"; then +- if test -n "$hardcode_libdir_separator"; then +- if test -z "$hardcode_libdirs"; then +- hardcode_libdirs="$libdir" +- else +- # Just accumulate the unique libdirs. +- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in +- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) +- ;; +- *) +- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" +- ;; +- esac +- fi +- else +- eval flag=\"$hardcode_libdir_flag_spec\" +- rpath="$rpath $flag" +- fi +- elif test -n "$runpath_var"; then +- case "$finalize_perm_rpath " in ++ # Add the libdir to current_libdirs if it is the destination. ++ if test "X$destdir" = "X$libdir"; then ++ case "$current_libdirs " in + *" $libdir "*) ;; +- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ *) current_libdirs="$current_libdirs $libdir" ;; ++ esac ++ else ++ # Note the libdir as a future libdir. ++ case "$future_libdirs " in ++ *" $libdir "*) ;; ++ *) future_libdirs="$future_libdirs $libdir" ;; + esac + fi +- done +- # Substitute the hardcoded libdirs into the rpath. +- if test -n "$hardcode_libdir_separator" && +- test -n "$hardcode_libdirs"; then +- libdir="$hardcode_libdirs" +- eval rpath=\" $hardcode_libdir_flag_spec\" +- fi +- finalize_rpath="$rpath" +- +- if test -n "$libobjs" && test "$build_old_libs" = yes; then +- # Transform all the library objects into standard objects. +- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +- fi + +- func_generate_dlsyms "$outputname" "@PROGRAM@" "no" ++ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ ++ test "X$dir" = "X$file/" && dir= ++ dir="$dir$objdir" + +- # template prelinking step +- if test -n "$prelink_cmds"; then +- func_execute_cmds "$prelink_cmds" 'exit $?' +- fi ++ if test -n "$relink_command"; then ++ # Determine the prefix the user has applied to our future dir. ++ inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` + +- wrappers_required=yes +- case $host in +- *cygwin* | *mingw* ) +- if test "$build_libtool_libs" != yes; then +- wrappers_required=no +- fi +- ;; +- *cegcc) +- # Disable wrappers for cegcc, we are cross compiling anyway. +- wrappers_required=no +- ;; +- *) +- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then +- wrappers_required=no +- fi +- ;; +- esac +- if test "$wrappers_required" = no; then +- # Replace the output file specification. +- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` +- link_command="$compile_command$compile_rpath" ++ # Don't allow the user to place us outside of our expected ++ # location b/c this prevents finding dependent libraries that ++ # are installed to the same prefix. ++ # At present, this check doesn't affect windows .dll's that ++ # are installed into $libdir/../bin (currently, that works fine) ++ # but it's something to keep an eye on. ++ if test "$inst_prefix_dir" = "$destdir"; then ++ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- # We have no uninstalled library dependencies, so finalize right now. +- exit_status=0 +- func_show_eval "$link_command" 'exit_status=$?' ++ if test -n "$inst_prefix_dir"; then ++ # Stick the inst_prefix_dir data into the link command. ++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` ++ else ++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` ++ fi + +- # Delete the generated files. +- if test -f "$output_objdir/${outputname}S.${objext}"; then +- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' ++ $echo "$modename: warning: relinking \`$file'" 1>&2 ++ $show "$relink_command" ++ if $run eval "$relink_command"; then : ++ else ++ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 ++ exit $EXIT_FAILURE ++ fi + fi + +- exit $exit_status +- fi ++ # See the names of the shared library. ++ set dummy $library_names ++ if test -n "$2"; then ++ realname="$2" ++ shift ++ shift + +- if test -n "$compile_shlibpath$finalize_shlibpath"; then +- compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" +- fi +- if test -n "$finalize_shlibpath"; then +- finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" +- fi ++ srcname="$realname" ++ test -n "$relink_command" && srcname="$realname"T + +- compile_var= +- finalize_var= +- if test -n "$runpath_var"; then +- if test -n "$perm_rpath"; then +- # We should set the runpath_var. +- rpath= +- for dir in $perm_rpath; do +- rpath="$rpath$dir:" +- done +- compile_var="$runpath_var=\"$rpath\$$runpath_var\" " +- fi +- if test -n "$finalize_perm_rpath"; then +- # We should set the runpath_var. +- rpath= +- for dir in $finalize_perm_rpath; do +- rpath="$rpath$dir:" ++ # Install the shared library and build the symlinks. ++ $show "$install_prog $dir/$srcname $destdir/$realname" ++ $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? ++ if test -n "$stripme" && test -n "$striplib"; then ++ $show "$striplib $destdir/$realname" ++ $run eval "$striplib $destdir/$realname" || exit $? ++ fi ++ ++ if test "$#" -gt 0; then ++ # Delete the old symlinks, and create new ones. ++ # Try `ln -sf' first, because the `ln' binary might depend on ++ # the symlink we replace! Solaris /bin/ln does not understand -f, ++ # so we also need to try rm && ln -s. ++ for linkname ++ do ++ if test "$linkname" != "$realname"; then ++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" ++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" ++ fi ++ done ++ fi ++ ++ # Do each command in the postinstall commands. ++ lib="$destdir/$realname" ++ cmds=$postinstall_cmds ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $show "$cmd" ++ $run eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' ++ fi ++ ++ exit $lt_exit ++ } + done +- finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " ++ IFS="$save_ifs" + fi +- fi + +- if test "$no_install" = yes; then +- # We don't need to create a wrapper script. +- link_command="$compile_var$compile_command$compile_rpath" +- # Replace the output file specification. +- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` +- # Delete the old output file. +- $opt_dry_run || $RM $output +- # Link the executable and exit +- func_show_eval "$link_command" 'exit $?' +- exit $EXIT_SUCCESS +- fi ++ # Install the pseudo-library for information purposes. ++ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` ++ instname="$dir/$name"i ++ $show "$install_prog $instname $destdir/$name" ++ $run eval "$install_prog $instname $destdir/$name" || exit $? + +- if test "$hardcode_action" = relink; then +- # Fast installation is not supported +- link_command="$compile_var$compile_command$compile_rpath" +- relink_command="$finalize_var$finalize_command$finalize_rpath" ++ # Maybe install the static library, too. ++ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ ;; + +- func_warning "this platform does not like uninstalled shared libraries" +- func_warning "\`$output' will be relinked during installation" +- else +- 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'` +- else +- # fast_install is set to needless +- relink_command= +- fi ++ *.lo) ++ # Install (i.e. copy) a libtool object. ++ ++ # Figure out destination file name, if it wasn't already specified. ++ if test -n "$destname"; then ++ destfile="$destdir/$destname" + else +- link_command="$compile_var$compile_command$compile_rpath" +- relink_command="$finalize_var$finalize_command$finalize_rpath" ++ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` ++ destfile="$destdir/$destfile" + fi +- fi + +- # Replace the output file specification. +- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` ++ # Deduce the name of the destination old-style object file. ++ case $destfile in ++ *.lo) ++ staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` ++ ;; ++ *.$objext) ++ staticdest="$destfile" ++ destfile= ++ ;; ++ *) ++ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ ;; ++ esac + +- # Delete the old output files. +- $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname ++ # Install the libtool object if requested. ++ if test -n "$destfile"; then ++ $show "$install_prog $file $destfile" ++ $run eval "$install_prog $file $destfile" || exit $? ++ fi + +- func_show_eval "$link_command" 'exit $?' ++ # Install the old object if enabled. ++ if test "$build_old_libs" = yes; then ++ # Deduce the name of the old-style object file. ++ staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` + +- # Now create the wrapper script. +- func_verbose "creating $output" ++ $show "$install_prog $staticobj $staticdest" ++ $run eval "$install_prog \$staticobj \$staticdest" || exit $? ++ fi ++ exit $EXIT_SUCCESS ++ ;; + +- # Quote the relink command for shipping. +- if test -n "$relink_command"; then +- # Preserve any variables that may affect compiler behavior +- for var in $variables_saved_for_relink; do +- if eval test -z \"\${$var+set}\"; then +- relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" +- elif eval var_value=\$$var; test -z "$var_value"; then +- relink_command="$var=; export $var; $relink_command" +- else +- func_quote_for_eval "$var_value" +- relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" +- fi +- done +- relink_command="(cd `pwd`; $relink_command)" +- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` +- fi ++ *) ++ # Figure out destination file name, if it wasn't already specified. ++ if test -n "$destname"; then ++ destfile="$destdir/$destname" ++ else ++ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` ++ destfile="$destdir/$destfile" ++ fi + +- # Quote $ECHO for shipping. +- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then +- case $progpath in +- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; +- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; ++ # If the file is missing, and there is a .exe on the end, strip it ++ # because it is most likely a libtool script we actually want to ++ # install ++ stripped_ext="" ++ case $file in ++ *.exe) ++ if test ! -f "$file"; then ++ file=`$echo $file|${SED} 's,.exe$,,'` ++ stripped_ext=".exe" ++ fi ++ ;; + esac +- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` +- else +- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` +- fi + +- # Only actually do things if not in dry run mode. +- $opt_dry_run || { +- # win32 will think the script is a binary if it has +- # a .exe suffix, so we strip it off here. +- case $output in +- *.exe) func_stripname '' '.exe' "$output" +- output=$func_stripname_result ;; +- esac +- # test for cygwin because mv fails w/o .exe extensions ++ # Do a test to see if this is really a libtool program. + case $host in +- *cygwin*) +- exeext=.exe +- func_stripname '' '.exe' "$outputname" +- outputname=$func_stripname_result ;; +- *) exeext= ;; ++ *cygwin*|*mingw*) ++ wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` ++ ;; ++ *) ++ wrapper=$file ++ ;; + esac +- case $host in +- *cygwin* | *mingw* ) +- func_dirname_and_basename "$output" "" "." +- output_name=$func_basename_result +- output_path=$func_dirname_result +- cwrappersource="$output_path/$objdir/lt-$output_name.c" +- cwrapper="$output_path/$output_name.exe" +- $RM $cwrappersource $cwrapper +- trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 +- +- func_emit_cwrapperexe_src > $cwrappersource +- +- # The wrapper executable is built using the $host compiler, +- # because it contains $host paths and files. If cross- +- # compiling, it, like the target executable, must be +- # executed on the $host or under an emulation environment. +- $opt_dry_run || { +- $LTCC $LTCFLAGS -o $cwrapper $cwrappersource +- $STRIP $cwrapper +- } ++ if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then ++ notinst_deplibs= ++ relink_command= ++ ++ # Note that it is not necessary on cygwin/mingw to append a dot to ++ # foo even if both foo and FILE.exe exist: automatic-append-.exe ++ # behavior happens only for exec(3), not for open(2)! Also, sourcing ++ # `FILE.' does not work on cygwin managed mounts. ++ # ++ # If there is no directory component, then add one. ++ case $wrapper in ++ */* | *\\*) . ${wrapper} ;; ++ *) . ./${wrapper} ;; ++ esac ++ ++ # Check the variables that should have been set. ++ if test -z "$notinst_deplibs"; then ++ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ ++ finalize=yes ++ for lib in $notinst_deplibs; do ++ # Check to see that each library is installed. ++ libdir= ++ if test -f "$lib"; then ++ # If there is no directory component, then add one. ++ case $lib in ++ */* | *\\*) . $lib ;; ++ *) . ./$lib ;; ++ esac ++ fi ++ libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test ++ if test -n "$libdir" && test ! -f "$libfile"; then ++ $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 ++ finalize=no ++ fi ++ done ++ ++ relink_command= ++ # Note that it is not necessary on cygwin/mingw to append a dot to ++ # foo even if both foo and FILE.exe exist: automatic-append-.exe ++ # behavior happens only for exec(3), not for open(2)! Also, sourcing ++ # `FILE.' does not work on cygwin managed mounts. ++ # ++ # If there is no directory component, then add one. ++ case $wrapper in ++ */* | *\\*) . ${wrapper} ;; ++ *) . ./${wrapper} ;; ++ esac ++ ++ outputname= ++ if test "$fast_install" = no && test -n "$relink_command"; then ++ if test "$finalize" = yes && test -z "$run"; then ++ tmpdir=`func_mktempdir` ++ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` ++ outputname="$tmpdir/$file" ++ # Replace the output file specification. ++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` + +- # Now, create the wrapper script for func_source use: +- func_ltwrapper_scriptname $cwrapper +- $RM $func_ltwrapper_scriptname_result +- trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 +- $opt_dry_run || { +- # note: this script will not be executed, so do not chmod. +- if test "x$build" = "x$host" ; then +- $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result ++ $show "$relink_command" ++ if $run eval "$relink_command"; then : + else +- func_emit_wrapper no > $func_ltwrapper_scriptname_result ++ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 ++ ${rm}r "$tmpdir" ++ continue + fi +- } +- ;; +- * ) +- $RM $output +- trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 ++ file="$outputname" ++ else ++ $echo "$modename: warning: cannot relink \`$file'" 1>&2 ++ fi ++ else ++ # Install the binary that we compiled earlier. ++ file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` ++ fi ++ fi + +- func_emit_wrapper no > $output +- chmod +x $output ++ # remove .exe since cygwin /usr/bin/install will append another ++ # one anyway ++ case $install_prog,$host in ++ */usr/bin/install*,*cygwin*) ++ case $file:$destfile in ++ *.exe:*.exe) ++ # this is ok ++ ;; ++ *.exe:*) ++ destfile=$destfile.exe ++ ;; ++ *:*.exe) ++ destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` ++ ;; ++ esac + ;; + esac +- } +- exit $EXIT_SUCCESS +- ;; +- esac ++ $show "$install_prog$stripme $file $destfile" ++ $run eval "$install_prog\$stripme \$file \$destfile" || exit $? ++ test -n "$outputname" && ${rm}r "$tmpdir" ++ ;; ++ esac ++ done + +- # See if we need to build an old-fashioned archive. +- for oldlib in $oldlibs; do ++ for file in $staticlibs; do ++ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + +- if test "$build_libtool_libs" = convenience; then +- oldobjs="$libobjs_save $symfileobj" +- addlibs="$convenience" +- build_libtool_libs=no +- else +- if test "$build_libtool_libs" = module; then +- oldobjs="$libobjs_save" +- build_libtool_libs=no +- else +- oldobjs="$old_deplibs $non_pic_objects" +- if test "$preload" = yes && test -f "$symfileobj"; then +- oldobjs="$oldobjs $symfileobj" +- fi +- fi +- addlibs="$old_convenience" +- fi ++ # Set up the ranlib parameters. ++ oldlib="$destdir/$name" + +- if test -n "$addlibs"; then +- gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ $show "$install_prog $file $oldlib" ++ $run eval "$install_prog \$file \$oldlib" || exit $? + +- func_extract_archives $gentop $addlibs +- oldobjs="$oldobjs $func_extract_archives_result" ++ if test -n "$stripme" && test -n "$old_striplib"; then ++ $show "$old_striplib $oldlib" ++ $run eval "$old_striplib $oldlib" || exit $? + fi + +- # Do each command in the archive commands. +- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then +- cmds=$old_archive_from_new_cmds +- else ++ # Do each command in the postinstall commands. ++ cmds=$old_postinstall_cmds ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $show "$cmd" ++ $run eval "$cmd" || exit $? ++ done ++ IFS="$save_ifs" ++ done + +- # Add any objects from preloaded convenience libraries +- if test -n "$dlprefiles"; then +- gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ if test -n "$future_libdirs"; then ++ $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 ++ fi + +- func_extract_archives $gentop $dlprefiles +- oldobjs="$oldobjs $func_extract_archives_result" +- fi ++ if test -n "$current_libdirs"; then ++ # Maybe just do a dry run. ++ test -n "$run" && current_libdirs=" -n$current_libdirs" ++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' ++ else ++ exit $EXIT_SUCCESS ++ fi ++ ;; + +- # POSIX demands no paths to be encoded in archives. We have +- # to avoid creating archives with duplicate basenames if we +- # might have to extract them afterwards, e.g., when creating a +- # static archive out of a convenience library, or when linking +- # the entirety of a libtool archive into another (currently +- # not supported by libtool). +- if (for obj in $oldobjs +- do +- func_basename "$obj" +- $ECHO "$func_basename_result" +- done | sort | sort -uc >/dev/null 2>&1); then +- : +- else +- $ECHO "copying selected object files to avoid basename conflicts..." +- gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" +- func_mkdir_p "$gentop" +- save_oldobjs=$oldobjs +- oldobjs= +- counter=1 +- for obj in $save_oldobjs +- do +- func_basename "$obj" +- objbase="$func_basename_result" +- case " $oldobjs " in +- " ") oldobjs=$obj ;; +- *[\ /]"$objbase "*) +- while :; do +- # Make sure we don't pick an alternate name that also +- # overlaps. +- newobj=lt$counter-$objbase +- func_arith $counter + 1 +- counter=$func_arith_result +- case " $oldobjs " in +- *[\ /]"$newobj "*) ;; +- *) if test ! -f "$gentop/$newobj"; then break; fi ;; +- esac +- done +- func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" +- oldobjs="$oldobjs $gentop/$newobj" +- ;; +- *) oldobjs="$oldobjs $obj" ;; +- esac +- done +- fi +- eval cmds=\"$old_archive_cmds\" ++ # libtool finish mode ++ finish) ++ modename="$modename: finish" ++ libdirs="$nonopt" ++ admincmds= + +- func_len " $cmds" +- len=$func_len_result +- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then +- cmds=$old_archive_cmds +- else +- # the command line is too long to link in one step, link in parts +- func_verbose "using piecewise archive linking..." +- save_RANLIB=$RANLIB +- RANLIB=: +- objlist= +- concat_cmds= +- save_oldobjs=$oldobjs +- oldobjs= +- # Is there a better way of finding the last object in the list? +- for obj in $save_oldobjs +- do +- last_oldobj=$obj +- done +- eval test_cmds=\"$old_archive_cmds\" +- func_len " $test_cmds" +- len0=$func_len_result +- len=$len0 +- for obj in $save_oldobjs +- do +- func_len " $obj" +- func_arith $len + $func_len_result +- len=$func_arith_result +- func_append objlist " $obj" +- if test "$len" -lt "$max_cmd_len"; then +- : +- else +- # the above command should be used before it gets too long +- oldobjs=$objlist +- if test "$obj" = "$last_oldobj" ; then +- RANLIB=$save_RANLIB +- fi +- test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" +- objlist= +- len=$len0 +- fi ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ for dir ++ do ++ libdirs="$libdirs $dir" ++ done ++ ++ for libdir in $libdirs; do ++ if test -n "$finish_cmds"; then ++ # Do each command in the finish commands. ++ cmds=$finish_cmds ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $show "$cmd" ++ $run eval "$cmd" || admincmds="$admincmds ++ $cmd" + done +- RANLIB=$save_RANLIB +- oldobjs=$objlist +- if test "X$oldobjs" = "X" ; then +- eval cmds=\"\$concat_cmds\" +- else +- eval cmds=\"\$concat_cmds~\$old_archive_cmds\" +- fi ++ IFS="$save_ifs" + fi +- fi +- func_execute_cmds "$cmds" 'exit $?' ++ if test -n "$finish_eval"; then ++ # Do the single finish_eval. ++ eval cmds=\"$finish_eval\" ++ $run eval "$cmds" || admincmds="$admincmds ++ $cmds" ++ fi ++ done ++ fi ++ ++ # Exit here if they wanted silent mode. ++ test "$show" = : && exit $EXIT_SUCCESS ++ ++ $echo "X----------------------------------------------------------------------" | $Xsed ++ $echo "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $echo " $libdir" + done ++ $echo ++ $echo "If you ever happen to want to link against installed libraries" ++ $echo "in a given directory, LIBDIR, you must either use libtool, and" ++ $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ $echo "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ $echo " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ $echo " - add LIBDIR to the \`$runpath_var' environment variable" ++ $echo " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" + +- test -n "$generated" && \ +- func_show_eval "${RM}r$generated" ++ $echo " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $echo " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ $echo ++ $echo "See any operating system documentation about shared libraries for" ++ $echo "more information, such as the ld(1) and ld.so(8) manual pages." ++ $echo "X----------------------------------------------------------------------" | $Xsed ++ exit $EXIT_SUCCESS ++ ;; + +- # Now create the libtool archive. +- case $output in +- *.la) +- old_library= +- test "$build_old_libs" = yes && old_library="$libname.$libext" +- func_verbose "creating $output" ++ # libtool execute mode ++ execute) ++ modename="$modename: execute" + +- # Preserve any variables that may affect compiler behavior +- for var in $variables_saved_for_relink; do +- if eval test -z \"\${$var+set}\"; then +- relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" +- elif eval var_value=\$$var; test -z "$var_value"; then +- relink_command="$var=; export $var; $relink_command" +- else +- func_quote_for_eval "$var_value" +- relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" +- fi +- 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"` +- if test "$hardcode_automatic" = yes ; then +- relink_command= +- fi ++ # The first argument is the command name. ++ cmd="$nonopt" ++ if test -z "$cmd"; then ++ $echo "$modename: you must specify a COMMAND" 1>&2 ++ $echo "$help" ++ exit $EXIT_FAILURE ++ fi + +- # Only create the output if not a dry run. +- $opt_dry_run || { +- for installed in no yes; do +- if test "$installed" = yes; then +- if test -z "$install_libdir"; then +- break +- fi +- output="$output_objdir/$outputname"i +- # Replace all uninstalled libtool libraries with the installed ones +- newdependency_libs= +- for deplib in $dependency_libs; do +- case $deplib in +- *.la) +- func_basename "$deplib" +- name="$func_basename_result" +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` +- test -z "$libdir" && \ +- func_fatal_error "\`$deplib' is not a valid libtool archive" +- newdependency_libs="$newdependency_libs $libdir/$name" +- ;; +- *) newdependency_libs="$newdependency_libs $deplib" ;; +- esac +- done +- dependency_libs="$newdependency_libs" +- newdlfiles= ++ # Handle -dlopen flags immediately. ++ for file in $execute_dlfiles; do ++ if test ! -f "$file"; then ++ $echo "$modename: \`$file' is not a file" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +- for lib in $dlfiles; do +- case $lib in +- *.la) +- func_basename "$lib" +- name="$func_basename_result" +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` +- test -z "$libdir" && \ +- func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlfiles="$newdlfiles $libdir/$name" +- ;; +- *) newdlfiles="$newdlfiles $lib" ;; +- esac +- done +- dlfiles="$newdlfiles" +- newdlprefiles= +- for lib in $dlprefiles; do +- case $lib in +- *.la) +- # Only pass preopened files to the pseudo-archive (for +- # eventual linking with the app. that links it) if we +- # didn't already link the preopened objects directly into +- # the library: +- func_basename "$lib" +- name="$func_basename_result" +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` +- test -z "$libdir" && \ +- func_fatal_error "\`$lib' is not a valid libtool archive" +- newdlprefiles="$newdlprefiles $libdir/$name" +- ;; +- esac +- done +- dlprefiles="$newdlprefiles" +- else +- newdlfiles= +- for lib in $dlfiles; do +- case $lib in +- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; +- *) abs=`pwd`"/$lib" ;; +- esac +- newdlfiles="$newdlfiles $abs" +- done +- dlfiles="$newdlfiles" +- newdlprefiles= +- for lib in $dlprefiles; do +- case $lib in +- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; +- *) abs=`pwd`"/$lib" ;; +- esac +- newdlprefiles="$newdlprefiles $abs" +- done +- dlprefiles="$newdlprefiles" +- fi +- $RM $output +- # place dlname in correct position for cygwin +- tdlname=$dlname +- case $host,$output,$installed,$module,$dlname in +- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; +- esac +- $ECHO > $output "\ +-# $outputname - a libtool library file +-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +-# +-# Please DO NOT delete this file! +-# It is necessary for linking the library. ++ dir= ++ case $file in ++ *.la) ++ # Check to see that this really is a libtool archive. ++ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : ++ else ++ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + +-# The name that we can dlopen(3). +-dlname='$tdlname' ++ # Read the libtool library. ++ dlname= ++ library_names= + +-# Names of this library. +-library_names='$library_names' ++ # If there is no directory component, then add one. ++ case $file in ++ */* | *\\*) . $file ;; ++ *) . ./$file ;; ++ esac + +-# The name of the static archive. +-old_library='$old_library' ++ # Skip this library if it cannot be dlopened. ++ if test -z "$dlname"; then ++ # Warn if it was a shared library. ++ test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" ++ continue ++ fi + +-# Linker flags that can not go in dependency_libs. +-inherited_linker_flags='$new_inherited_linker_flags' ++ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` ++ test "X$dir" = "X$file" && dir=. + +-# Libraries that this one depends upon. +-dependency_libs='$dependency_libs' ++ if test -f "$dir/$objdir/$dlname"; then ++ dir="$dir/$objdir" ++ else ++ if test ! -f "$dir/$dlname"; then ++ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++ fi ++ ;; + +-# Names of additional weak libraries provided by this library +-weak_library_names='$weak_libs' ++ *.lo) ++ # Just add the directory containing the .lo file. ++ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` ++ test "X$dir" = "X$file" && dir=. ++ ;; + +-# Version information for $libname. +-current=$current +-age=$age +-revision=$revision ++ *) ++ $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 ++ continue ++ ;; ++ esac + +-# Is this an already installed library? +-installed=$installed ++ # Get the absolute pathname. ++ absdir=`cd "$dir" && pwd` ++ test -n "$absdir" && dir="$absdir" + +-# Should we warn about portability when linking against -modules? +-shouldnotlink=$module ++ # Now add the directory to shlibpath_var. ++ if eval "test -z \"\$$shlibpath_var\""; then ++ eval "$shlibpath_var=\"\$dir\"" ++ else ++ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" ++ fi ++ done + +-# Files to dlopen/dlpreopen +-dlopen='$dlfiles' +-dlpreopen='$dlprefiles' ++ # This variable tells wrapper scripts just to set shlibpath_var ++ # rather than running their programs. ++ libtool_execute_magic="$magic" + +-# Directory that this library needs to be installed in: +-libdir='$install_libdir'" +- if test "$installed" = no && test "$need_relink" = yes; then +- $ECHO >> $output "\ +-relink_command=\"$relink_command\"" +- fi +- done +- } ++ # Check if any of the arguments is a wrapper script. ++ args= ++ for file ++ do ++ case $file in ++ -*) ;; ++ *) ++ # Do a test to see if this is really a libtool program. ++ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then ++ # If there is no directory component, then add one. ++ case $file in ++ */* | *\\*) . $file ;; ++ *) . ./$file ;; ++ esac + +- # Do a symbolic link so that the libtool archive can be found in +- # LD_LIBRARY_PATH before the program is installed. +- func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' +- ;; +- esac +- exit $EXIT_SUCCESS +-} ++ # Transform arg to wrapped name. ++ file="$progdir/$program" ++ fi ++ ;; ++ esac ++ # Quote arguments (to preserve shell metacharacters). ++ file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` ++ args="$args \"$file\"" ++ done ++ ++ if test -z "$run"; then ++ if test -n "$shlibpath_var"; then ++ # Export the shlibpath_var. ++ eval "export $shlibpath_var" ++ fi + +-{ test "$mode" = link || test "$mode" = relink; } && +- func_mode_link ${1+"$@"} ++ # Restore saved environment variables ++ for lt_var in LANG LANGUAGE 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" ++ else ++ # Display what would be done. ++ if test -n "$shlibpath_var"; then ++ eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" ++ $echo "export $shlibpath_var" ++ fi ++ $echo "$cmd$args" ++ exit $EXIT_SUCCESS ++ fi ++ ;; + +-# func_mode_uninstall arg... +-func_mode_uninstall () +-{ +- $opt_debug +- RM="$nonopt" ++ # libtool clean and uninstall mode ++ clean | uninstall) ++ modename="$modename: $mode" ++ rm="$nonopt" + files= + rmforce= + exit_status=0 +@@ -8202,28 +6547,30 @@ + for arg + do + case $arg in +- -f) RM="$RM $arg"; rmforce=yes ;; +- -*) RM="$RM $arg" ;; ++ -f) rm="$rm $arg"; rmforce=yes ;; ++ -*) rm="$rm $arg" ;; + *) files="$files $arg" ;; + esac + done + +- test -z "$RM" && \ +- func_fatal_help "you must specify an RM program" ++ if test -z "$rm"; then ++ $echo "$modename: you must specify an RM program" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ fi + + rmdirs= + + origobjdir="$objdir" + for file in $files; do +- func_dirname "$file" "" "." +- dir="$func_dirname_result" +- if test "X$dir" = X.; then ++ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` ++ if test "X$dir" = "X$file"; then ++ dir=. + objdir="$origobjdir" + else + objdir="$dir/$origobjdir" + fi +- func_basename "$file" +- name="$func_basename_result" ++ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + test "$mode" = uninstall && objdir="$dir" + + # Remember objdir for removal later, being careful to avoid duplicates +@@ -8235,9 +6582,9 @@ + fi + + # Don't error if the file doesn't exist and rm -f was used. +- if { test -L "$file"; } >/dev/null 2>&1 || +- { test -h "$file"; } >/dev/null 2>&1 || +- test -f "$file"; then ++ if (test -L "$file") >/dev/null 2>&1 \ ++ || (test -h "$file") >/dev/null 2>&1 \ ++ || test -f "$file"; then + : + elif test -d "$file"; then + exit_status=1 +@@ -8251,8 +6598,8 @@ + case $name in + *.la) + # Possibly a libtool archive, so verify it. +- if func_lalib_p "$file"; then +- func_source $dir/$name ++ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then ++ . $dir/$name + + # Delete the libtool libraries and symlinks. + for n in $library_names; do +@@ -8267,17 +6614,39 @@ + *" $dlname "*) ;; + *) rmfiles="$rmfiles $objdir/$dlname" ;; + esac +- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then + # Do each command in the postuninstall commands. +- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' ++ cmds=$postuninstall_cmds ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $show "$cmd" ++ $run eval "$cmd" ++ if test "$?" -ne 0 && test "$rmforce" != yes; then ++ exit_status=1 ++ fi ++ done ++ IFS="$save_ifs" + fi + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. +- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' ++ cmds=$old_postuninstall_cmds ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $show "$cmd" ++ $run eval "$cmd" ++ if test "$?" -ne 0 && test "$rmforce" != yes; then ++ exit_status=1 ++ fi ++ done ++ IFS="$save_ifs" + fi + # FIXME: should reinstall the best remaining shared library. + ;; +@@ -8287,20 +6656,20 @@ + + *.lo) + # Possibly a libtool object, so verify it. +- if func_lalib_p "$file"; then ++ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then + + # Read the .lo file +- func_source $dir/$name ++ . $dir/$name + + # Add PIC object to the list of files to remove. +- if test -n "$pic_object" && +- test "$pic_object" != none; then ++ if test -n "$pic_object" \ ++ && test "$pic_object" != none; then + rmfiles="$rmfiles $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. +- if test -n "$non_pic_object" && +- test "$non_pic_object" != none; then ++ if test -n "$non_pic_object" \ ++ && test "$non_pic_object" != none; then + rmfiles="$rmfiles $dir/$non_pic_object" + fi + fi +@@ -8311,26 +6680,17 @@ + noexename=$name + case $file in + *.exe) +- func_stripname '' '.exe' "$file" +- file=$func_stripname_result +- func_stripname '' '.exe' "$name" +- noexename=$func_stripname_result ++ file=`$echo $file|${SED} 's,.exe$,,'` ++ noexename=`$echo $name|${SED} 's,.exe$,,'` + # $file with .exe has already been added to rmfiles, + # add $file without .exe + rmfiles="$rmfiles $file" + ;; + esac + # Do a test to see if this is a libtool program. +- if func_ltwrapper_p "$file"; then +- if func_ltwrapper_executable_p "$file"; then +- func_ltwrapper_scriptname "$file" +- relink_command= +- func_source $func_ltwrapper_scriptname_result +- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" +- else +- relink_command= +- func_source $dir/$noexename +- fi ++ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then ++ relink_command= ++ . $dir/$noexename + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles +@@ -8345,38 +6705,239 @@ + fi + ;; + esac +- func_show_eval "$RM $rmfiles" 'exit_status=1' ++ $show "$rm $rmfiles" ++ $run $rm $rmfiles || exit_status=1 + done + objdir="$origobjdir" + + # Try to remove the ${objdir}s in the directories where we deleted files + for dir in $rmdirs; do + if test -d "$dir"; then +- func_show_eval "rmdir $dir >/dev/null 2>&1" ++ $show "rmdir $dir" ++ $run rmdir $dir >/dev/null 2>&1 + fi + done + + exit $exit_status +-} +- +-{ test "$mode" = uninstall || test "$mode" = clean; } && +- func_mode_uninstall ${1+"$@"} ++ ;; + +-test -z "$mode" && { +- help="$generic_help" +- func_fatal_help "you must specify a MODE" +-} ++ "") ++ $echo "$modename: you must specify a MODE" 1>&2 ++ $echo "$generic_help" 1>&2 ++ exit $EXIT_FAILURE ++ ;; ++ esac + +-test -z "$exec_cmd" && \ +- func_fatal_help "invalid operation mode \`$mode'" ++ if test -z "$exec_cmd"; then ++ $echo "$modename: invalid operation mode \`$mode'" 1>&2 ++ $echo "$generic_help" 1>&2 ++ exit $EXIT_FAILURE ++ fi ++fi # test -z "$show_help" + + if test -n "$exec_cmd"; then +- eval exec "$exec_cmd" ++ eval exec $exec_cmd + exit $EXIT_FAILURE + fi + +-exit $exit_status ++# We need to display help for each of the modes. ++case $mode in ++"") $echo \ ++"Usage: $modename [OPTION]... [MODE-ARG]... ++ ++Provide generalized library-building support services. ++ ++ --config show all configuration variables ++ --debug enable verbose shell tracing ++-n, --dry-run display commands without modifying any files ++ --features display basic configuration information and exit ++ --finish same as \`--mode=finish' ++ --help display this help message and exit ++ --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] ++ --quiet same as \`--silent' ++ --silent don't print informational messages ++ --tag=TAG use configuration variables from tag TAG ++ --version print version information ++ ++MODE must be one of the following: ++ ++ clean remove files from the build directory ++ compile compile a source file into a libtool object ++ execute automatically set library path, then run a program ++ finish complete the installation of libtool libraries ++ install install libraries or executables ++ link create a library or an executable ++ uninstall remove libraries from an installed directory ++ ++MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for ++a more detailed description of MODE. ++ ++Report bugs to <bug-libtool@gnu.org>." ++ exit $EXIT_SUCCESS ++ ;; ++ ++clean) ++ $echo \ ++"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... ++ ++Remove files from the build directory. ++ ++RM is the name of the program to use to delete files associated with each FILE ++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed ++to RM. ++ ++If FILE is a libtool library, object or program, all the files associated ++with it are deleted. Otherwise, only FILE itself is deleted using RM." ++ ;; ++ ++compile) ++ $echo \ ++"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE ++ ++Compile a source file into a libtool library object. ++ ++This mode accepts the following additional options: ++ ++ -o OUTPUT-FILE set the output file name to OUTPUT-FILE ++ -prefer-pic try to building PIC objects only ++ -prefer-non-pic try to building non-PIC objects only ++ -static always build a \`.o' file suitable for static linking ++ ++COMPILE-COMMAND is a command to be used in creating a \`standard' object file ++from the given SOURCEFILE. ++ ++The output file name is determined by removing the directory component from ++SOURCEFILE, then substituting the C source code suffix \`.c' with the ++library object suffix, \`.lo'." ++ ;; ++ ++execute) ++ $echo \ ++"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... ++ ++Automatically set library path, then run a program. ++ ++This mode accepts the following additional options: ++ ++ -dlopen FILE add the directory containing FILE to the library path ++ ++This mode sets the library path environment variable according to \`-dlopen' ++flags. ++ ++If any of the ARGS are libtool executable wrappers, then they are translated ++into their corresponding uninstalled binary, and any of their required library ++directories are added to the library path. ++ ++Then, COMMAND is executed, with ARGS as arguments." ++ ;; ++ ++finish) ++ $echo \ ++"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... ++ ++Complete the installation of libtool libraries. ++ ++Each LIBDIR is a directory that contains libtool libraries. ++ ++The commands that this mode executes may require superuser privileges. Use ++the \`--dry-run' option if you just want to see what would be executed." ++ ;; ++ ++install) ++ $echo \ ++"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... ++ ++Install executables or libraries. ++ ++INSTALL-COMMAND is the installation command. The first component should be ++either the \`install' or \`cp' program. ++ ++The rest of the components are interpreted as arguments to that command (only ++BSD-compatible install options are recognized)." ++ ;; ++ ++link) ++ $echo \ ++"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... ++ ++Link object files or libraries together to form another library, or to ++create an executable program. + ++LINK-COMMAND is a command using the C compiler that you would use to create ++a program from several object files. ++ ++The following components of LINK-COMMAND are treated specially: ++ ++ -all-static do not do any dynamic linking at all ++ -avoid-version do not add a version suffix if possible ++ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime ++ -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 ++ -export-symbols-regex 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 ++ -no-fast-install disable the fast-install mode ++ -no-install link a not-installable executable ++ -no-undefined declare that a library does not refer to external symbols ++ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects ++ -objectlist FILE Use a list of object files found in FILE to specify objects ++ -precious-files-regex REGEX ++ don't remove output files matching REGEX ++ -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 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] ++ ++All other options (arguments beginning with \`-') are ignored. ++ ++Every other argument is treated as a filename. Files ending in \`.la' are ++treated as uninstalled libtool libraries, other files are standard or library ++object files. ++ ++If the OUTPUT-FILE ends in \`.la', then a libtool library is created, ++only library objects (\`.lo' files) may be specified, and \`-rpath' is ++required, except when creating a convenience library. ++ ++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created ++using \`ar' and \`ranlib', or on Windows using \`lib'. ++ ++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file ++is created, otherwise an executable program is created." ++ ;; ++ ++uninstall) ++ $echo \ ++"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... ++ ++Remove libraries from an installation directory. ++ ++RM is the name of the program to use to delete files associated with each FILE ++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed ++to RM. ++ ++If FILE is a libtool library, all the files associated with it are deleted. ++Otherwise, only FILE itself is deleted using RM." ++ ;; ++ ++*) ++ $echo "$modename: invalid operation mode \`$mode'" 1>&2 ++ $echo "$help" 1>&2 ++ exit $EXIT_FAILURE ++ ;; ++esac ++ ++$echo ++$echo "Try \`$modename --help' for more information about other modes." ++ ++exit $? + + # The TAGs below are defined such that we never get into a situation + # in which we disable both kinds of libraries. Given conflicting +@@ -8390,17 +6951,14 @@ + # configuration. But we'll never go from static-only to shared-only. + + # ### BEGIN LIBTOOL TAG CONFIG: disable-shared +-build_libtool_libs=no +-build_old_libs=yes ++disable_libs=shared + # ### END LIBTOOL TAG CONFIG: disable-shared + + # ### BEGIN LIBTOOL TAG CONFIG: disable-static +-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` ++disable_libs=static + # ### END LIBTOOL TAG CONFIG: disable-static + + # Local Variables: + # mode:shell-script + # sh-indentation:2 + # End: +-# vi:sw=2 +- +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefile.in gtk+2.0-2.14.5/m4macros/Makefile.in +--- gtk+2.0-2.14.5.old/m4macros/Makefile.in 2008-11-24 07:41:43.000000000 +0100 ++++ gtk+2.0-2.14.5/m4macros/Makefile.in 2008-11-25 11:09:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -93325,7 +120278,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,32 @@ POST_INSTALL = : +@@ -37,10 +32,32 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -93360,7 +120313,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +68,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +68,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -93384,7 +120337,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +93,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -93392,8 +120345,9 @@ Index: gtk+-2.14.4/m4macros/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +100,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -93402,9 +120356,13 @@ Index: gtk+-2.14.4/m4macros/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +126,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +126,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -93412,7 +120370,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +145,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +145,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -93421,7 +120379,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +155,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +155,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -93514,7 +120472,20 @@ Index: gtk+-2.14.4/m4macros/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +184,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +179,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -93537,10 +120508,12 @@ Index: gtk+-2.14.4/m4macros/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +203,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +203,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -93549,7 +120522,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +214,10 @@ SED = @SED@ +@@ -300,28 +214,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -93578,7 +120551,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +226,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +226,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -93588,11 +120561,12 @@ Index: gtk+-2.14.4/m4macros/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -93608,15 +120582,17 @@ Index: gtk+-2.14.4/m4macros/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +267,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +266,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +276,11 @@ program_transform_name = @program_transf +@@ -377,9 +276,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -93629,7 +120605,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,56 +311,63 @@ XVFB_START = \ +@@ -410,56 +311,63 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -93720,7 +120696,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in done tags: TAGS TAGS: -@@ -463,29 +375,23 @@ TAGS: +@@ -467,29 +375,23 @@ ctags: CTAGS CTAGS: @@ -93763,7 +120739,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -500,9 +406,10 @@ check-am: all-am +@@ -504,9 +406,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) @@ -93776,7 +120752,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -522,7 +429,7 @@ mostlyclean-generic: +@@ -526,7 +429,7 @@ clean-generic: distclean-generic: @@ -93785,7 +120761,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -533,24 +440,34 @@ clean-am: clean-generic clean-libtool mo +@@ -537,24 +440,34 @@ distclean: distclean-am -rm -f Makefile @@ -93821,7 +120797,7 @@ Index: gtk+-2.14.4/m4macros/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -569,17 +486,22 @@ ps: ps-am +@@ -573,17 +486,22 @@ ps-am: @@ -93850,10 +120826,9 @@ Index: gtk+-2.14.4/m4macros/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/Makefile.in 2008-10-17 06:07:13.000000000 +0200 -+++ gtk+-2.14.4/Makefile.in 2008-11-11 18:56:07.673135343 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+2.0-2.14.5/Makefile.in +--- gtk+2.0-2.14.5.old/Makefile.in 2008-11-24 17:08:14.000000000 +0100 ++++ gtk+2.0-2.14.5/Makefile.in 2008-11-25 11:09:53.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -93883,7 +120858,7 @@ Index: gtk+-2.14.4/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +32,71 @@ POST_INSTALL = : +@@ -37,11 +32,71 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -93957,7 +120932,7 @@ Index: gtk+-2.14.4/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,22 +107,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -52,22 +107,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -93981,7 +120956,7 @@ Index: gtk+-2.14.4/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,8 +132,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -82,21 +132,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -93989,8 +120964,9 @@ Index: gtk+-2.14.4/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -91,10 +139,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -93999,9 +120975,13 @@ Index: gtk+-2.14.4/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -121,6 +165,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -120,6 +165,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -94009,7 +120989,7 @@ Index: gtk+-2.14.4/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +184,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +184,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -94018,7 +120998,7 @@ Index: gtk+-2.14.4/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,91 +194,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,98 +194,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -94111,7 +121091,20 @@ Index: gtk+-2.14.4/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -257,24 +223,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -252,32 +218,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -94134,10 +121127,12 @@ Index: gtk+-2.14.4/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +242,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -288,8 +242,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -94146,7 +121141,7 @@ Index: gtk+-2.14.4/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +253,10 @@ SED = @SED@ +@@ -301,28 +253,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -94175,7 +121170,7 @@ Index: gtk+-2.14.4/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +265,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -331,22 +265,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -94185,11 +121180,12 @@ Index: gtk+-2.14.4/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -94205,15 +121201,17 @@ Index: gtk+-2.14.4/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -366,6 +306,7 @@ libexecdir = @libexecdir@ +@@ -368,8 +305,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -374,122 +315,70 @@ program_transform_name = @program_transf +@@ -378,122 +315,70 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -94394,7 +121392,7 @@ Index: gtk+-2.14.4/Makefile.in TEST_PROGS = ### testing rules -@@ -516,17 +405,17 @@ XVFB_START = \ +@@ -520,17 +405,17 @@ && DISPLAY=:$$XID && export DISPLAY @@ -94417,9 +121415,9 @@ Index: gtk+-2.14.4/Makefile.in DISTCLEANFILES = \ gtk+-unix-print-2.0.pc \ gtk+-$(GDKTARGET)-2.0.pc \ -@@ -536,95 +425,83 @@ DISTCLEANFILES = \ - gdk-$(GDKTARGET)-2.0-uninstalled.pc \ - gail-uninstalled.pc +@@ -541,96 +426,83 @@ + gail-uninstalled.pc \ + config.lt - DEFAULT_GDKTARGET = x11 @@ -94445,10 +121443,11 @@ Index: gtk+-2.14.4/Makefile.in -DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ - $(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog INSTALL \ - Makefile.am NEWS acinclude.m4 aclocal.m4 compile config.guess \ -- config.h.in config.h.win32.in config.sub configure.in depcomp \ -- gail-uninstalled.pc.in gail.pc.in 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 \ +- config.h.in config.h.win32.in config.sub configure configure.in \ +- depcomp gail-uninstalled.pc.in gail.pc.in \ +- 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) @@ -94555,7 +121554,7 @@ Index: gtk+-2.14.4/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -@@ -635,24 +512,22 @@ clean-libtool: +@@ -641,24 +513,22 @@ distclean-libtool: -rm -f libtool @@ -94587,7 +121586,7 @@ Index: gtk+-2.14.4/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -662,7 +537,13 @@ uninstall-pkgconfigDATA: +@@ -668,7 +538,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -94602,7 +121601,7 @@ Index: gtk+-2.14.4/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -674,15 +555,20 @@ $(RECURSIVE_TARGETS): +@@ -680,15 +556,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -94627,7 +121626,7 @@ Index: gtk+-2.14.4/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -703,7 +589,7 @@ maintainer-clean-recursive: +@@ -709,7 +590,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -94636,7 +121635,7 @@ Index: gtk+-2.14.4/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -714,35 +600,30 @@ ctags-recursive: +@@ -720,35 +601,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -94679,7 +121678,7 @@ Index: gtk+-2.14.4/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -750,23 +631,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -756,23 +632,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -94712,7 +121711,7 @@ Index: gtk+-2.14.4/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -778,40 +659,25 @@ GTAGS: +@@ -784,40 +660,25 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -94767,7 +121766,7 @@ Index: gtk+-2.14.4/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -822,15 +688,19 @@ distdir: $(DISTFILES) +@@ -828,15 +689,19 @@ || exit 1; \ fi; \ done @@ -94792,7 +121791,7 @@ Index: gtk+-2.14.4/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -841,22 +711,55 @@ distdir: $(DISTFILES) +@@ -847,22 +712,55 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -94853,7 +121852,7 @@ Index: gtk+-2.14.4/Makefile.in chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst -@@ -876,19 +779,20 @@ distcheck: dist +@@ -882,19 +780,20 @@ distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ @@ -94879,7 +121878,7 @@ Index: gtk+-2.14.4/Makefile.in distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -@@ -913,8 +817,9 @@ check: check-recursive +@@ -919,8 +818,9 @@ all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: @@ -94891,7 +121890,7 @@ Index: gtk+-2.14.4/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -934,7 +839,7 @@ mostlyclean-generic: +@@ -940,7 +840,7 @@ clean-generic: distclean-generic: @@ -94900,7 +121899,7 @@ Index: gtk+-2.14.4/Makefile.in -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -947,13 +852,15 @@ clean-am: clean-generic clean-libtool mo +@@ -953,13 +853,15 @@ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile @@ -94918,7 +121917,7 @@ Index: gtk+-2.14.4/Makefile.in info: info-recursive info-am: -@@ -962,12 +869,20 @@ install-data-am: install-pkgconfigDATA +@@ -968,12 +870,20 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -94939,7 +121938,7 @@ Index: gtk+-2.14.4/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -988,29 +903,28 @@ ps: ps-recursive +@@ -994,29 +904,28 @@ ps-am: @@ -94989,10 +121988,570 @@ Index: gtk+-2.14.4/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/engines/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/engines/Makefile.in 2008-10-17 06:07:17.000000000 +0200 -+++ gtk+-2.14.4/modules/engines/Makefile.in 2008-11-11 18:56:04.377134524 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/missing gtk+2.0-2.14.5/missing +--- gtk+2.0-2.14.5.old/missing 2007-09-18 16:10:46.000000000 +0200 ++++ gtk+2.0-2.14.5/missing 2008-11-25 11:09:45.000000000 +0100 +@@ -1,6 +1,10 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. +-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. ++ ++scriptversion=2006-05-10.23 ++ ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 ++# Free Software Foundation, Inc. + # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -15,8 +19,8 @@ + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++# 02110-1301, USA. + + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -29,6 +33,8 @@ + fi + + run=: ++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' ++sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + + # In the cases where this matters, `missing' is being run in the + # srcdir already. +@@ -38,18 +44,24 @@ + configure_ac=configure.in + fi + +-case "$1" in ++msg="missing on your system" ++ ++case $1 in + --run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 ++ # Exit code 63 means version mismatch. This often happens ++ # when the user try to use an ancient version of a tool on ++ # a file that requires a minimum version. In this case we ++ # we should proceed has if the program had been absent, or ++ # if --run hadn't been passed. ++ if test $? = 63; then ++ run=: ++ msg="probably too old" ++ fi + ;; +-esac +- +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case "$1" in + + -h|--h|--he|--hel|--help) + echo "\ +@@ -67,6 +79,7 @@ + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' ++ autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c +@@ -74,11 +87,15 @@ + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags +- yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ++ yacc create \`y.tab.[ch]', if possible, from existing .[ch] ++ ++Send bug reports to <bug-automake@gnu.org>." ++ exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) +- echo "missing 0.4 - GNU automake" ++ echo "missing $scriptversion (GNU Automake)" ++ exit $? + ;; + + -*) +@@ -87,14 +104,44 @@ + exit 1 + ;; + +- aclocal*) ++esac ++ ++# Now exit if we have it, but it failed. Also exit now if we ++# don't have it and --version was passed (most likely to detect ++# the program). ++case $1 in ++ lex|yacc) ++ # Not GNU programs, they don't have --version. ++ ;; ++ ++ tar) ++ if test -n "$run"; then ++ echo 1>&2 "ERROR: \`tar' requires --run" ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ exit 1 ++ fi ++ ;; ++ ++ *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ # Could not run --version or --help. This is probably someone ++ # running `$TOOL --version' or `$TOOL --help' to check whether ++ # $TOOL exists and not knowing $TOOL uses missing. ++ exit 1 + fi ++ ;; ++esac + ++# If it does not exist, or fails to run (possibly an outdated version), ++# try to emulate it. ++case $1 in ++ aclocal*) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." +@@ -102,13 +149,8 @@ + ;; + + autoconf) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." +@@ -116,13 +158,8 @@ + ;; + + autoheader) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." +@@ -130,7 +167,7 @@ + test -z "$files" && files="config.h" + touch_files= + for f in $files; do +- case "$f" in ++ case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; +@@ -140,13 +177,8 @@ + ;; + + automake*) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." +@@ -156,20 +188,15 @@ + ;; + + autom4te) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is needed, and you do not seem to have it handy on your +- system. You might have modified some files without having the ++WARNING: \`$1' is needed, but is $msg. ++ You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + +- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` +- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else +@@ -185,74 +212,67 @@ + + bison|yacc) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi +- if [ ! -f y.tab.h ]; then ++ if test ! -f y.tab.h; then + echo >y.tab.h + fi +- if [ ! -f y.tab.c ]; then ++ if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c +- if [ $# -ne 1 ]; then ++ if test $# -ne 1; then + eval LASTARG="\${$#}" +- case "$LASTARG" in ++ case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` +- if [ -f "$SRCFILE" ]; then ++ if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi +- if [ ! -f lex.yy.c ]; then ++ if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man) +- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then +- # We have it, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` +- if test -z "$file"; then +- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` +- fi +- if [ -f "$file" ]; then ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` ++ if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file +@@ -262,32 +282,36 @@ + ;; + + makeinfo) +- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then +- # We have makeinfo, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." +- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` ++ # The file to touch is that specified with -o ... ++ file=`echo "$*" | sed -n "$sed_output"` ++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then +- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` +- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` +- fi ++ # ... or it is the one specified with @setfilename ... ++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` ++ file=`sed -n ' ++ /^@setfilename/{ ++ s/.* \([^ ]*\) *$/\1/ ++ p ++ q ++ }' $infile` ++ # ... or it is derived from the source name (dir/f.texi becomes f.info) ++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info ++ fi ++ # If the file does not exist, the user really needs makeinfo; ++ # let's fail without touching anything. ++ test -f $file || exit 1 + touch $file + ;; + + tar) + shift +- if test -n "$run"; then +- echo 1>&2 "ERROR: \`tar' requires --run" +- exit 1 +- fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error +@@ -300,13 +324,13 @@ + fi + firstarg="$1" + if shift; then +- case "$firstarg" in ++ case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac +- case "$firstarg" in ++ case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 +@@ -323,8 +347,8 @@ + + *) + echo 1>&2 "\ +-WARNING: \`$1' is needed, and you do not seem to have it handy on your +- system. You might have modified some files without having the ++WARNING: \`$1' is needed, and is $msg. ++ You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case +@@ -334,3 +358,10 @@ + esac + + exit 0 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/mkinstalldirs gtk+2.0-2.14.5/mkinstalldirs +--- gtk+2.0-2.14.5.old/mkinstalldirs 2007-09-18 16:10:46.000000000 +0200 ++++ gtk+2.0-2.14.5/mkinstalldirs 2008-11-25 11:09:53.000000000 +0100 +@@ -1,21 +1,36 @@ + #! /bin/sh + # mkinstalldirs --- make directory hierarchy +-# Author: Noah Friedman <friedman@prep.ai.mit.edu> +-# Created: 1993-05-16 +-# Public domain + ++scriptversion=2006-05-11.19 ++ ++# Original author: Noah Friedman <friedman@prep.ai.mit.edu> ++# Created: 1993-05-16 ++# Public domain. ++# ++# This file is maintained in Automake, please report ++# bugs to <bug-automake@gnu.org> or send patches to ++# <automake-patches@gnu.org>. ++ ++nl=' ++' ++IFS=" "" $nl" + errstatus=0 +-dirmode="" ++dirmode= + + usage="\ +-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." ++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... ++ ++Create each directory DIR (with mode MODE, if specified), including all ++leading file name components. ++ ++Report bugs to <bug-automake@gnu.org>." + + # process command line arguments + while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help +- echo "$usage" 1>&2 +- exit 0 ++ echo "$usage" ++ exit $? + ;; + -m) # -m PERM arg + shift +@@ -23,6 +38,10 @@ + dirmode=$1 + shift + ;; ++ --version) ++ echo "$0 $scriptversion" ++ exit $? ++ ;; + --) # stop option processing + shift + break +@@ -50,30 +69,58 @@ + 0) exit 0 ;; + esac + ++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and ++# mkdir -p a/c at the same time, both will detect that a is missing, ++# one will create a, then the other will try to create a and die with ++# a "File exists" error. This is a problem when calling mkinstalldirs ++# from a parallel make. We use --version in the probe to restrict ++# ourselves to GNU mkdir, which is thread-safe. + case $dirmode in + '') +- if mkdir -p -- . 2>/dev/null; then ++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" ++ else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ test -d ./-p && rmdir ./-p ++ test -d ./--version && rmdir ./--version + fi + ;; + *) +- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && ++ test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" ++ else ++ # Clean up after NextStep and OpenStep mkdir. ++ for d in ./-m ./-p ./--version "./$dirmode"; ++ do ++ test -d $d && rmdir $d ++ done + fi + ;; + esac + + for file + do +- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ++ case $file in ++ /*) pathcomp=/ ;; ++ *) pathcomp= ;; ++ esac ++ oIFS=$IFS ++ IFS=/ ++ set fnord $file + shift ++ IFS=$oIFS + +- pathcomp= + for d + do +- pathcomp="$pathcomp$d" ++ test "x$d" = x && continue ++ ++ pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac +@@ -84,21 +131,21 @@ + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then +- errstatus=$lasterr ++ errstatus=$lasterr + else +- if test ! -z "$dirmode"; then ++ if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" +- lasterr="" +- chmod "$dirmode" "$pathcomp" || lasterr=$? ++ lasterr= ++ chmod "$dirmode" "$pathcomp" || lasterr=$? + +- if test ! -z "$lasterr"; then +- errstatus=$lasterr +- fi +- fi ++ if test ! -z "$lasterr"; then ++ errstatus=$lasterr ++ fi ++ fi + fi + fi + +- pathcomp="$pathcomp/" ++ pathcomp=$pathcomp/ + done + done + +@@ -107,5 +154,8 @@ + # Local Variables: + # mode: shell-script + # sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" + # End: +-# mkinstalldirs ends here +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/Makefile.in gtk+2.0-2.14.5/modules/engines/Makefile.in +--- gtk+2.0-2.14.5.old/modules/engines/Makefile.in 2008-11-24 07:41:43.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/engines/Makefile.in 2008-11-25 11:09:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -95023,7 +122582,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ POST_INSTALL = : +@@ -37,10 +31,35 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -95061,7 +122620,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +70,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -95085,7 +122644,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +95,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -95093,8 +122652,9 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -95103,9 +122663,13 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -95113,7 +122677,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +147,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -95122,7 +122686,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +157,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -95215,7 +122779,20 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +181,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -95238,10 +122815,12 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +205,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -95250,7 +122829,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +216,10 @@ SED = @SED@ +@@ -300,28 +216,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -95279,7 +122858,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +228,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -95289,11 +122868,12 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -95309,15 +122889,17 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +268,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +278,11 @@ program_transform_name = @program_transf +@@ -377,9 +278,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -95330,7 +122912,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,33 +313,40 @@ XVFB_START = \ +@@ -410,33 +313,40 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -95391,7 +122973,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -440,10 +354,6 @@ mostlyclean-libtool: +@@ -444,10 +354,6 @@ clean-libtool: -rm -rf .libs _libs @@ -95402,7 +122984,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -451,7 +361,13 @@ uninstall-info-am: +@@ -455,7 +361,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -95417,7 +122999,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -463,15 +379,20 @@ $(RECURSIVE_TARGETS): +@@ -467,15 +379,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -95442,7 +123024,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -492,7 +413,7 @@ maintainer-clean-recursive: +@@ -496,7 +413,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -95451,7 +123033,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -503,35 +424,30 @@ ctags-recursive: +@@ -507,35 +424,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -95494,7 +123076,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -539,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -543,23 +455,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -95527,7 +123109,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -567,29 +483,23 @@ GTAGS: +@@ -571,29 +483,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -95570,7 +123152,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -602,13 +512,17 @@ distdir: $(DISTFILES) +@@ -606,13 +512,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -95592,7 +123174,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -619,7 +533,6 @@ check: check-recursive +@@ -623,7 +533,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -95600,7 +123182,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -639,7 +552,7 @@ mostlyclean-generic: +@@ -643,7 +552,7 @@ clean-generic: distclean-generic: @@ -95609,7 +123191,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -650,25 +563,34 @@ clean-am: clean-generic clean-libtool mo +@@ -654,25 +563,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -95646,7 +123228,7 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -687,26 +609,24 @@ ps: ps-recursive +@@ -691,26 +609,24 @@ ps-am: @@ -95689,10 +123271,9 @@ Index: gtk+-2.14.4/modules/engines/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/engines/ms-windows/Makefile.in 2008-10-17 06:07:18.000000000 +0200 -+++ gtk+-2.14.4/modules/engines/ms-windows/Makefile.in 2008-11-11 18:56:04.532634944 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.14.5/modules/engines/ms-windows/Makefile.in +--- gtk+2.0-2.14.5.old/modules/engines/ms-windows/Makefile.in 2008-11-24 07:41:43.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/engines/ms-windows/Makefile.in 2008-11-25 11:09:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -95722,7 +123303,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,67 @@ POST_INSTALL = : +@@ -37,10 +32,67 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -95792,7 +123373,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +103,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +103,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -95816,7 +123397,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +128,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +128,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -95824,8 +123405,9 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +135,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -95834,9 +123416,13 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +161,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +161,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -95844,7 +123430,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +180,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +180,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -95853,7 +123439,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +190,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +190,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -95946,7 +123532,20 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +219,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +214,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -95969,10 +123568,12 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +238,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +238,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -95981,7 +123582,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +249,10 @@ SED = @SED@ +@@ -300,28 +249,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -96010,7 +123611,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +261,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +261,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -96020,11 +123621,12 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -96040,15 +123642,17 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +302,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +301,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +311,11 @@ program_transform_name = @program_transf +@@ -377,9 +311,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -96061,7 +123665,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +346,7 @@ XVFB_START = \ +@@ -410,9 +346,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -96071,7 +123675,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -416,18 +354,14 @@ INCLUDES = \ +@@ -420,18 +354,14 @@ -DGDK_DISABLE_DEPRECATED \ $(GTK_DEP_CFLAGS) @@ -96090,7 +123694,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in libwimp_la_SOURCES = \ msw_rc_style.c \ msw_rc_style.h \ -@@ -438,95 +372,75 @@ libwimp_la_SOURCES = \ +@@ -442,95 +372,75 @@ xp_theme_defs.h \ xp_theme.h @@ -96223,7 +123827,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -537,37 +451,25 @@ distclean-compile: +@@ -541,37 +451,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xp_theme.Plo@am__quote@ .c.o: @@ -96273,7 +123877,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -575,10 +477,6 @@ mostlyclean-libtool: +@@ -579,10 +477,6 @@ clean-libtool: -rm -rf .libs _libs @@ -96284,7 +123888,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -586,7 +484,13 @@ uninstall-info-am: +@@ -590,7 +484,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -96299,7 +123903,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -598,15 +502,20 @@ $(RECURSIVE_TARGETS): +@@ -602,15 +502,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -96324,7 +123928,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -627,7 +536,7 @@ maintainer-clean-recursive: +@@ -631,7 +536,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -96333,7 +123937,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -638,35 +547,30 @@ ctags-recursive: +@@ -642,35 +547,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -96376,7 +123980,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -674,23 +578,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -678,23 +578,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -96409,7 +124013,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -702,29 +606,23 @@ GTAGS: +@@ -706,29 +606,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -96452,7 +124056,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -735,15 +633,19 @@ distdir: $(DISTFILES) +@@ -739,15 +633,19 @@ || exit 1; \ fi; \ done @@ -96477,7 +124081,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -754,8 +656,9 @@ check: check-recursive +@@ -758,8 +656,9 @@ all-am: Makefile $(LTLIBRARIES) installdirs: installdirs-recursive installdirs-am: @@ -96489,7 +124093,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -775,7 +678,7 @@ mostlyclean-generic: +@@ -779,7 +678,7 @@ clean-generic: distclean-generic: @@ -96498,7 +124102,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -789,24 +692,34 @@ distclean: distclean-recursive +@@ -793,24 +692,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -96534,7 +124138,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -827,28 +740,27 @@ ps: ps-recursive +@@ -831,28 +740,27 @@ ps-am: @@ -96581,10 +124185,9 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-10-17 06:07:18.000000000 +0200 -+++ gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-11-11 18:56:04.768634352 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.14.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +--- gtk+2.0-2.14.5.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-11-24 07:41:43.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-11-25 11:09:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -96614,7 +124217,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,32 @@ POST_INSTALL = : +@@ -37,10 +32,32 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -96649,7 +124252,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +68,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +68,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -96673,7 +124276,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +93,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -96681,8 +124284,9 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +100,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -96691,9 +124295,13 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +126,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +126,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -96701,7 +124309,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +145,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +145,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -96710,7 +124318,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +155,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +155,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -96803,7 +124411,20 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +184,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +179,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -96826,10 +124447,12 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +203,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +203,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -96838,7 +124461,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +214,10 @@ SED = @SED@ +@@ -300,28 +214,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -96867,7 +124490,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +226,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +226,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -96877,11 +124500,12 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -96897,15 +124521,17 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +267,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +266,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +276,11 @@ program_transform_name = @program_transf +@@ -377,9 +276,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -96918,7 +124544,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,54 +311,62 @@ XVFB_START = \ +@@ -410,54 +311,62 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -97007,7 +124633,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in done tags: TAGS TAGS: -@@ -461,29 +374,23 @@ TAGS: +@@ -465,29 +374,23 @@ ctags: CTAGS CTAGS: @@ -97050,7 +124676,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -498,9 +405,10 @@ check-am: all-am +@@ -502,9 +405,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) @@ -97063,7 +124689,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -520,7 +428,7 @@ mostlyclean-generic: +@@ -524,7 +428,7 @@ clean-generic: distclean-generic: @@ -97072,7 +124698,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -531,24 +439,34 @@ clean-am: clean-generic clean-libtool mo +@@ -535,24 +439,34 @@ distclean: distclean-am -rm -f Makefile @@ -97108,7 +124734,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -567,17 +485,21 @@ ps: ps-am +@@ -571,17 +485,21 @@ ps-am: @@ -97138,10 +124764,9 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/engines/ms-windows/Theme/Makefile.in 2008-10-17 06:07:18.000000000 +0200 -+++ gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in 2008-11-11 18:56:04.652634693 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.14.5/modules/engines/ms-windows/Theme/Makefile.in +--- gtk+2.0-2.14.5.old/modules/engines/ms-windows/Theme/Makefile.in 2008-11-24 07:41:43.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/engines/ms-windows/Theme/Makefile.in 2008-11-25 11:09:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -97172,7 +124797,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ POST_INSTALL = : +@@ -37,10 +31,35 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -97210,7 +124835,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +70,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -97234,7 +124859,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +95,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -97242,8 +124867,9 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -97252,9 +124878,13 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -97262,7 +124892,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +147,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -97271,7 +124901,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +157,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -97364,7 +124994,20 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +181,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -97387,10 +125030,12 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +205,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -97399,7 +125044,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +216,10 @@ SED = @SED@ +@@ -300,28 +216,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -97428,7 +125073,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +228,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -97438,11 +125083,12 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -97458,15 +125104,17 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +268,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +278,11 @@ program_transform_name = @program_transf +@@ -377,9 +278,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -97479,7 +125127,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,31 +313,39 @@ XVFB_START = \ +@@ -410,31 +313,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -97538,7 +125186,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -438,10 +353,6 @@ mostlyclean-libtool: +@@ -442,10 +353,6 @@ clean-libtool: -rm -rf .libs _libs @@ -97549,7 +125197,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -449,7 +360,13 @@ uninstall-info-am: +@@ -453,7 +360,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -97564,7 +125212,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): +@@ -465,15 +378,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -97589,7 +125237,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -490,7 +412,7 @@ maintainer-clean-recursive: +@@ -494,7 +412,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -97598,7 +125246,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -501,35 +423,30 @@ ctags-recursive: +@@ -505,35 +423,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -97641,7 +125289,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -541,23 +454,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -97674,7 +125322,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -565,29 +482,23 @@ GTAGS: +@@ -569,29 +482,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -97717,7 +125365,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -598,15 +509,19 @@ distdir: $(DISTFILES) +@@ -602,15 +509,19 @@ || exit 1; \ fi; \ done @@ -97742,7 +125390,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -617,7 +532,6 @@ check: check-recursive +@@ -621,7 +532,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -97750,7 +125398,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -637,7 +551,7 @@ mostlyclean-generic: +@@ -641,7 +551,7 @@ clean-generic: distclean-generic: @@ -97759,7 +125407,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo +@@ -652,25 +562,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -97796,7 +125444,7 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -685,26 +608,24 @@ ps: ps-recursive +@@ -689,26 +608,24 @@ ps-am: @@ -97839,10 +125487,9 @@ Index: gtk+-2.14.4/modules/engines/ms-windows/Theme/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/engines/pixbuf/Makefile.in 2008-10-17 06:07:18.000000000 +0200 -+++ gtk+-2.14.4/modules/engines/pixbuf/Makefile.in 2008-11-11 18:56:04.912634147 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.5/modules/engines/pixbuf/Makefile.in +--- gtk+2.0-2.14.5.old/modules/engines/pixbuf/Makefile.in 2008-11-24 07:41:43.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/engines/pixbuf/Makefile.in 2008-11-25 11:09:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -97872,7 +125519,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,58 @@ POST_INSTALL = : +@@ -37,10 +32,58 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -97933,7 +125580,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +94,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +94,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -97957,7 +125604,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +119,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +119,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -97965,8 +125612,9 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +126,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -97975,9 +125623,13 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +152,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +152,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -97985,7 +125637,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +171,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +171,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -97994,7 +125646,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +181,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +181,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -98087,7 +125739,20 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +210,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +205,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -98110,10 +125775,12 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +229,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +229,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -98122,7 +125789,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +240,10 @@ SED = @SED@ +@@ -300,28 +240,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -98151,7 +125818,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +252,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +252,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -98161,11 +125828,12 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -98181,15 +125849,17 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +293,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +292,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +302,11 @@ program_transform_name = @program_transf +@@ -377,9 +302,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -98202,7 +125872,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +337,7 @@ XVFB_START = \ +@@ -410,9 +337,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -98212,7 +125882,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -416,18 +345,14 @@ INCLUDES = \ +@@ -420,18 +345,14 @@ -DGDK_DISABLE_DEPRECATED \ $(GTK_DEP_CFLAGS) @@ -98231,7 +125901,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in libpixmap_la_SOURCES = \ pixbuf-draw.c \ pixbuf-main.c \ -@@ -437,85 +362,73 @@ libpixmap_la_SOURCES = \ +@@ -441,85 +362,73 @@ pixbuf-style.h \ pixbuf.h @@ -98354,7 +126024,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -526,37 +439,25 @@ distclean-compile: +@@ -530,37 +439,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf-render.Plo@am__quote@ .c.o: @@ -98404,7 +126074,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -564,26 +465,15 @@ mostlyclean-libtool: +@@ -568,26 +465,15 @@ clean-libtool: -rm -rf .libs _libs @@ -98434,7 +126104,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -593,23 +483,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -597,23 +483,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -98467,7 +126137,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -621,29 +511,23 @@ GTAGS: +@@ -625,29 +511,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -98510,7 +126180,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -658,9 +542,10 @@ check-am: all-am +@@ -662,9 +542,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) @@ -98523,7 +126193,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -680,7 +565,7 @@ mostlyclean-generic: +@@ -684,7 +565,7 @@ clean-generic: distclean-generic: @@ -98532,7 +126202,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -694,24 +579,34 @@ distclean: distclean-am +@@ -698,24 +579,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -98568,7 +126238,7 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -732,20 +627,24 @@ ps: ps-am +@@ -736,20 +627,24 @@ ps-am: @@ -98603,10 +126273,9 @@ Index: gtk+-2.14.4/modules/engines/pixbuf/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/input/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/input/Makefile.in 2008-10-17 06:07:18.000000000 +0200 -+++ gtk+-2.14.4/modules/input/Makefile.in 2008-11-11 18:56:05.216634586 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Makefile.in gtk+2.0-2.14.5/modules/input/Makefile.in +--- gtk+2.0-2.14.5.old/modules/input/Makefile.in 2008-11-24 07:41:44.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/input/Makefile.in 2008-11-25 11:09:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -98637,7 +126306,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,256 @@ POST_INSTALL = : +@@ -37,10 +33,256 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -98896,7 +126565,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +293,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +293,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -98920,7 +126589,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +318,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +318,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -98928,8 +126597,9 @@ Index: gtk+-2.14.4/modules/input/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +325,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -98938,9 +126608,13 @@ Index: gtk+-2.14.4/modules/input/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +351,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +351,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -98948,7 +126622,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +370,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +370,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -98957,7 +126631,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +380,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +380,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -99050,7 +126724,20 @@ Index: gtk+-2.14.4/modules/input/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +409,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +404,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -99073,10 +126760,12 @@ Index: gtk+-2.14.4/modules/input/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +428,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +428,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -99085,7 +126774,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +439,10 @@ SED = @SED@ +@@ -300,28 +439,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -99114,7 +126803,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +451,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +451,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -99124,11 +126813,12 @@ Index: gtk+-2.14.4/modules/input/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -99144,15 +126834,17 @@ Index: gtk+-2.14.4/modules/input/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +492,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +491,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +501,11 @@ program_transform_name = @program_transf +@@ -377,9 +501,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -99165,7 +126857,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +536,7 @@ XVFB_START = \ +@@ -410,9 +536,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -99175,7 +126867,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -420,22 +548,18 @@ INCLUDES = \ +@@ -424,22 +548,18 @@ $(GTK_DEP_CFLAGS) \ $(INCLUDED_IMMODULE_DEFINE) @@ -99198,7 +126890,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_xim_la_SOURCES = \ gtkimcontextxim.c \ -@@ -446,42 +570,36 @@ libstatic_im_xim_la_SOURCES = $(im_xim_l +@@ -450,42 +570,36 @@ im_xim_la_LIBADD = $(LDADDS) @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE@STATIC_XIM_MODULE = libstatic-im-xim.la @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@XIM_MODULE = im-xim.la @@ -99241,7 +126933,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in im_thai_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_thai_la_SOURCES = \ thai-charprop.c \ -@@ -494,28 +612,24 @@ libstatic_im_thai_la_SOURCES = $(im_thai +@@ -498,28 +612,24 @@ im_thai_la_LIBADD = $(LDADDS) @INCLUDE_IM_THAI_TRUE@STATIC_THAI_MODULE = libstatic-im-thai.la @INCLUDE_IM_THAI_FALSE@THAI_MODULE = im-thai.la @@ -99270,7 +126962,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in im_ime_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_ime_la_SOURCES = \ gtkimcontextime.c \ -@@ -528,7 +642,6 @@ im_ime_la_LIBADD = -limm32 $(LDADDS) +@@ -532,7 +642,6 @@ libstatic_im_ime_la_LIBADD = -limm32 @INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE@STATIC_IME_MODULE = libstatic-im-ime.la @INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@IME_MODULE = im-ime.la @@ -99278,7 +126970,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\" im_multipress_la_CPPFLAGS = $(multipress_defs) libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS) -@@ -542,13 +655,11 @@ libstatic_im_multipress_la_SOURCES = $(i +@@ -546,13 +655,11 @@ im_multipress_la_LIBADD = $(LDADDS) @INCLUDE_IM_MULTIPRESS_TRUE@STATIC_MULTIPRESS_MODULE = libstatic-im-multipress.la @INCLUDE_IM_MULTIPRESS_FALSE@MULTIPRESS_MODULE = im-multipress.la @@ -99294,7 +126986,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in @BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \ @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \ @BUILD_DYNAMIC_MODULES_TRUE@ $(CEDILLA_MODULE) \ -@@ -563,7 +674,6 @@ dist_imconffile_DATA = im-multipress.con +@@ -567,7 +674,6 @@ @BUILD_DYNAMIC_MODULES_TRUE@ $(VIQR_MODULE) \ @BUILD_DYNAMIC_MODULES_TRUE@ $(XIM_MODULE) @@ -99302,7 +126994,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in noinst_LTLIBRARIES = \ $(STATIC_AM_ET_MODULE) \ $(STATIC_CEDILLA_MODULE) \ -@@ -578,234 +688,64 @@ noinst_LTLIBRARIES = \ +@@ -582,234 +688,64 @@ $(STATIC_VIQR_MODULE) \ $(STATIC_XIM_MODULE) @@ -99572,7 +127264,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -@@ -814,61 +754,61 @@ clean-noinstLTLIBRARIES: +@@ -818,61 +754,61 @@ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ @@ -99660,7 +127352,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -894,214 +834,86 @@ distclean-compile: +@@ -898,214 +834,86 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thai-charprop.Plo@am__quote@ .c.o: @@ -99913,7 +127605,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -1111,23 +923,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -1115,23 +923,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -99946,7 +127638,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1139,29 +951,23 @@ GTAGS: +@@ -1143,29 +951,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -99989,7 +127681,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1175,10 +981,12 @@ distdir: $(DISTFILES) +@@ -1179,10 +981,12 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am @@ -100004,7 +127696,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -1199,7 +1007,7 @@ clean-generic: +@@ -1203,7 +1007,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -100013,7 +127705,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1213,12 +1021,14 @@ distclean: distclean-am +@@ -1217,12 +1021,14 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -100029,7 +127721,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in info: info-am info-am: -@@ -1227,12 +1037,20 @@ install-data-am: install-dist_imconffile +@@ -1231,12 +1037,20 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -100050,7 +127742,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1253,22 +1071,27 @@ ps: ps-am +@@ -1257,22 +1071,27 @@ ps-am: @@ -100085,7 +127777,7 @@ Index: gtk+-2.14.4/modules/input/Makefile.in # call as: $(XVFB_START) && someprogram -@@ -1351,7 +1174,18 @@ uninstall-local: +@@ -1355,7 +1174,18 @@ included-modules: $(noinst_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES) @@ -100105,10 +127797,9 @@ Index: gtk+-2.14.4/modules/input/Makefile.in @CROSS_COMPILING_FALSE@all-local: gtk.immodules # Tell versions [3.59,3.63) of GNU make to not export all variables. -Index: gtk+-2.14.4/modules/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/Makefile.in 2008-10-17 06:07:17.000000000 +0200 -+++ gtk+-2.14.4/modules/Makefile.in 2008-11-11 18:56:04.257134776 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile.in gtk+2.0-2.14.5/modules/Makefile.in +--- gtk+2.0-2.14.5.old/modules/Makefile.in 2008-11-24 07:41:43.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/Makefile.in 2008-11-25 11:09:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -100139,7 +127830,7 @@ Index: gtk+-2.14.4/modules/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +31,36 @@ POST_INSTALL = : +@@ -37,11 +31,36 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -100178,7 +127869,7 @@ Index: gtk+-2.14.4/modules/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -52,22 +71,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -100202,7 +127893,7 @@ Index: gtk+-2.14.4/modules/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -82,21 +96,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -100210,8 +127901,9 @@ Index: gtk+-2.14.4/modules/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -91,10 +103,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -100220,9 +127912,13 @@ Index: gtk+-2.14.4/modules/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -121,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -120,6 +129,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -100230,7 +127926,7 @@ Index: gtk+-2.14.4/modules/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -138,8 +148,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -100239,7 +127935,7 @@ Index: gtk+-2.14.4/modules/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -150,98 +158,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -100332,7 +128028,20 @@ Index: gtk+-2.14.4/modules/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -257,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -252,32 +182,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -100355,10 +128064,12 @@ Index: gtk+-2.14.4/modules/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -288,8 +206,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -100367,7 +128078,7 @@ Index: gtk+-2.14.4/modules/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +217,10 @@ SED = @SED@ +@@ -301,28 +217,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -100396,7 +128107,7 @@ Index: gtk+-2.14.4/modules/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -331,22 +229,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -100406,11 +128117,12 @@ Index: gtk+-2.14.4/modules/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -100426,15 +128138,17 @@ Index: gtk+-2.14.4/modules/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -366,6 +270,7 @@ libexecdir = @libexecdir@ +@@ -368,8 +269,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -374,9 +279,11 @@ program_transform_name = @program_transf +@@ -378,9 +279,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -100447,7 +128161,7 @@ Index: gtk+-2.14.4/modules/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -407,31 +314,39 @@ XVFB_START = \ +@@ -411,31 +314,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -100506,7 +128220,7 @@ Index: gtk+-2.14.4/modules/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -439,10 +354,6 @@ mostlyclean-libtool: +@@ -443,10 +354,6 @@ clean-libtool: -rm -rf .libs _libs @@ -100517,7 +128231,7 @@ Index: gtk+-2.14.4/modules/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -450,7 +361,13 @@ uninstall-info-am: +@@ -454,7 +361,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -100532,7 +128246,7 @@ Index: gtk+-2.14.4/modules/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -462,15 +379,20 @@ $(RECURSIVE_TARGETS): +@@ -466,15 +379,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -100557,7 +128271,7 @@ Index: gtk+-2.14.4/modules/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -491,7 +413,7 @@ maintainer-clean-recursive: +@@ -495,7 +413,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -100566,7 +128280,7 @@ Index: gtk+-2.14.4/modules/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -502,35 +424,30 @@ ctags-recursive: +@@ -506,35 +424,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -100609,7 +128323,7 @@ Index: gtk+-2.14.4/modules/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -538,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -542,23 +455,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -100642,7 +128356,7 @@ Index: gtk+-2.14.4/modules/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -566,29 +483,23 @@ GTAGS: +@@ -570,29 +483,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -100685,7 +128399,7 @@ Index: gtk+-2.14.4/modules/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -601,13 +512,17 @@ distdir: $(DISTFILES) +@@ -605,13 +512,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -100707,7 +128421,7 @@ Index: gtk+-2.14.4/modules/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -618,7 +533,6 @@ check: check-recursive +@@ -622,7 +533,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -100715,7 +128429,7 @@ Index: gtk+-2.14.4/modules/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -638,7 +552,7 @@ mostlyclean-generic: +@@ -642,7 +552,7 @@ clean-generic: distclean-generic: @@ -100724,7 +128438,7 @@ Index: gtk+-2.14.4/modules/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -649,25 +563,34 @@ clean-am: clean-generic clean-libtool mo +@@ -653,25 +563,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -100761,7 +128475,7 @@ Index: gtk+-2.14.4/modules/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -686,26 +609,24 @@ ps: ps-recursive +@@ -690,26 +609,24 @@ ps-am: @@ -100804,10 +128518,9 @@ Index: gtk+-2.14.4/modules/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/other/gail/libgail-util/Makefile.in 2008-10-17 06:07:19.000000000 +0200 -+++ gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in 2008-11-11 18:56:05.936635035 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.14.5/modules/other/gail/libgail-util/Makefile.in +--- gtk+2.0-2.14.5.old/modules/other/gail/libgail-util/Makefile.in 2008-11-24 07:41:45.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/other/gail/libgail-util/Makefile.in 2008-11-25 11:09:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -100839,7 +128552,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +34,60 @@ POST_INSTALL = : +@@ -37,10 +34,60 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -100902,7 +128615,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +98,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +98,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -100926,7 +128639,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +123,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +123,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -100934,8 +128647,9 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +130,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -100944,9 +128658,13 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +156,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +156,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -100954,7 +128672,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +175,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +175,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -100963,7 +128681,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +185,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +185,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -101056,7 +128774,20 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +214,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +209,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -101079,10 +128810,12 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +233,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +233,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -101091,7 +128824,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +244,10 @@ SED = @SED@ +@@ -300,28 +244,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -101120,7 +128853,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +256,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +256,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -101130,11 +128863,12 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -101150,15 +128884,17 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +297,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +296,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +306,11 @@ program_transform_name = @program_transf +@@ -377,9 +306,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -101171,7 +128907,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -408,32 +343,24 @@ XVFB_START = \ +@@ -412,32 +343,24 @@ @OS_WIN32_TRUE@export_symbols = -export-symbols gailutil.def @OS_WIN32_TRUE@no_undefined = -no-undefined @@ -101204,7 +128940,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in libgailutil_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -444,102 +371,87 @@ libgailutil_la_CPPFLAGS = \ +@@ -448,102 +371,87 @@ -DGDK_DISABLE_DEPRECATED\ -DGTK_DISABLE_DEPRECATED @@ -101344,7 +129080,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -548,148 +460,72 @@ distclean-compile: +@@ -552,148 +460,72 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgailutil_la-gailtextutil.Plo@am__quote@ .c.o: @@ -101523,7 +129259,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -699,23 +535,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -703,23 +535,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -101556,7 +129292,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -727,29 +563,23 @@ GTAGS: +@@ -731,29 +563,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -101599,7 +129335,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -764,9 +594,10 @@ check-am: all-am +@@ -768,9 +594,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) @@ -101612,7 +129348,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -786,7 +617,7 @@ mostlyclean-generic: +@@ -790,7 +617,7 @@ clean-generic: distclean-generic: @@ -101621,7 +129357,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -800,24 +631,34 @@ distclean: distclean-am +@@ -804,24 +631,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -101657,7 +129393,7 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -838,21 +679,25 @@ ps: ps-am +@@ -842,21 +679,25 @@ ps-am: @@ -101694,10 +129430,9 @@ Index: gtk+-2.14.4/modules/other/gail/libgail-util/Makefile.in uninstall-libgailutilincludeHEADERS uninstall-local # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/other/gail/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/other/gail/Makefile.in 2008-10-17 06:07:19.000000000 +0200 -+++ gtk+-2.14.4/modules/other/gail/Makefile.in 2008-11-11 18:56:05.764634613 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/gail/Makefile.in gtk+2.0-2.14.5/modules/other/gail/Makefile.in +--- gtk+2.0-2.14.5.old/modules/other/gail/Makefile.in 2008-11-24 07:41:45.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/other/gail/Makefile.in 2008-11-25 11:09:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -101728,7 +129463,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,100 @@ POST_INSTALL = : +@@ -37,10 +33,100 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -101831,7 +129566,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +137,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +137,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -101855,7 +129590,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +162,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +162,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -101863,8 +129598,9 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +169,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -101873,9 +129609,13 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +195,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +195,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -101883,7 +129623,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +214,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +214,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -101892,7 +129632,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +224,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +224,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -101985,7 +129725,20 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +253,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +248,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -102008,10 +129761,12 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +272,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +272,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -102020,7 +129775,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +283,10 @@ SED = @SED@ +@@ -300,28 +283,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -102049,7 +129804,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +295,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +295,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -102059,11 +129814,12 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -102079,15 +129835,17 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +336,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +335,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +345,11 @@ program_transform_name = @program_transf +@@ -377,9 +345,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -102100,7 +129858,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,14 +380,10 @@ XVFB_START = \ +@@ -410,14 +380,10 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -102115,7 +129873,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in gail_c_sources = \ gail-private-macros.h \ gail.c \ -@@ -472,9 +442,7 @@ gail_c_sources = \ +@@ -476,9 +442,7 @@ gailwidget.c \ gailwindow.c @@ -102125,7 +129883,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in gail_private_h_sources = \ gail.h \ gailadjustment.h \ -@@ -532,21 +500,17 @@ gail_private_h_sources = \ +@@ -536,21 +500,17 @@ gailutil.h \ gailwindow.h @@ -102147,7 +129905,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in libgail_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/modules/other \ -@@ -558,13 +522,11 @@ libgail_la_CPPFLAGS = \ +@@ -562,13 +522,11 @@ -DGDK_DISABLE_DEPRECATED \ $(AM_CPPFLAGS) @@ -102161,7 +129919,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in libgail_la_LIBADD = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -573,178 +535,76 @@ libgail_la_LIBADD = \ +@@ -577,178 +535,76 @@ $(GTK_DEP_LIBS) \ $(INTLLIBS) @@ -102377,7 +130135,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -806,1879 +666,432 @@ distclean-compile: +@@ -810,1879 +666,432 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgail_la-gailwindow.Plo@am__quote@ .c.o: @@ -104496,7 +132254,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -2688,7 +1101,13 @@ uninstall-libgailincludeHEADERS: +@@ -2692,7 +1101,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -104511,7 +132269,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2700,15 +1119,20 @@ $(RECURSIVE_TARGETS): +@@ -2704,15 +1119,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -104536,7 +132294,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -2729,7 +1153,7 @@ maintainer-clean-recursive: +@@ -2733,7 +1153,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -104545,7 +132303,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2740,35 +1164,30 @@ ctags-recursive: +@@ -2744,35 +1164,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -104588,7 +132346,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -2776,23 +1195,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -2780,23 +1195,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -104621,7 +132379,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -2804,29 +1223,23 @@ GTAGS: +@@ -2808,29 +1223,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -104664,7 +132422,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -2837,15 +1250,19 @@ distdir: $(DISTFILES) +@@ -2841,15 +1250,19 @@ || exit 1; \ fi; \ done @@ -104689,7 +132447,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -2856,8 +1273,9 @@ check: check-recursive +@@ -2860,8 +1273,9 @@ all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -104701,7 +132459,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -2877,7 +1295,7 @@ mostlyclean-generic: +@@ -2881,7 +1295,7 @@ clean-generic: distclean-generic: @@ -104710,7 +132468,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -2891,24 +1309,35 @@ distclean: distclean-recursive +@@ -2895,24 +1309,35 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -104748,7 +132506,7 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -2929,30 +1358,28 @@ ps: ps-recursive +@@ -2933,30 +1358,28 @@ ps-am: @@ -104798,10 +132556,9 @@ Index: gtk+-2.14.4/modules/other/gail/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/other/gail/tests/Makefile.in 2008-10-17 06:07:19.000000000 +0200 -+++ gtk+-2.14.4/modules/other/gail/tests/Makefile.in 2008-11-11 18:56:06.192634399 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14.5/modules/other/gail/tests/Makefile.in +--- gtk+2.0-2.14.5.old/modules/other/gail/tests/Makefile.in 2008-11-24 07:41:45.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/other/gail/tests/Makefile.in 2008-11-25 11:09:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -104831,7 +132588,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,183 @@ POST_INSTALL = : +@@ -37,10 +32,183 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -105017,7 +132774,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +219,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +219,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -105041,7 +132798,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +244,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +244,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -105049,8 +132806,9 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +251,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -105059,9 +132817,13 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +277,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +277,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -105069,7 +132831,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +296,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +296,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -105078,7 +132840,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +306,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +306,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -105171,7 +132933,20 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +335,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +330,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -105194,10 +132969,12 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +354,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +354,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -105206,7 +132983,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +365,10 @@ SED = @SED@ +@@ -300,28 +365,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -105235,7 +133012,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +377,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +377,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -105245,11 +133022,12 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -105265,15 +133043,17 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +418,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +417,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +427,11 @@ program_transform_name = @program_transf +@@ -377,9 +427,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -105286,7 +133066,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,15 +462,11 @@ XVFB_START = \ +@@ -410,15 +462,11 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -105302,7 +133082,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in noinst_LTLIBRARIES = \ libtestaction.la \ libtestbutton.la \ -@@ -435,7 +487,6 @@ noinst_LTLIBRARIES = \ +@@ -439,7 +487,6 @@ libtesttreetable.la \ libtestvalues.la @@ -105310,7 +133090,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -444,34 +495,28 @@ AM_CPPFLAGS = \ +@@ -448,34 +495,28 @@ -I$(top_builddir)/gtk \ -DGDK_DISABLE_DEPRECATED @@ -105345,7 +133125,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestaction_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -479,13 +524,11 @@ libtestaction_la_LDFLAGS = \ +@@ -483,13 +524,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105359,7 +133139,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestbutton_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -493,13 +536,11 @@ libtestbutton_la_LDFLAGS = \ +@@ -497,13 +536,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105373,7 +133153,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestcombo_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -507,11 +548,9 @@ libtestcombo_la_LDFLAGS = \ +@@ -511,11 +548,9 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105385,7 +133165,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestcomponent_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -519,11 +558,9 @@ libtestcomponent_la_LDFLAGS = \ +@@ -523,11 +558,9 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105397,7 +133177,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestimage_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -531,13 +568,11 @@ libtestimage_la_LDFLAGS = \ +@@ -535,13 +568,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105411,7 +133191,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestmenuitem_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -545,13 +580,11 @@ libtestmenuitem_la_LDFLAGS = \ +@@ -549,13 +580,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105425,7 +133205,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestnotebook_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -559,13 +592,11 @@ libtestnotebook_la_LDFLAGS = \ +@@ -563,13 +592,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105439,7 +133219,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestobject_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -573,13 +604,11 @@ libtestobject_la_LDFLAGS = \ +@@ -577,13 +604,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105453,7 +133233,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestoptionmenu_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -587,13 +616,11 @@ libtestoptionmenu_la_LDFLAGS = \ +@@ -591,13 +616,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105467,7 +133247,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestpaned_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -601,13 +628,11 @@ libtestpaned_la_LDFLAGS = \ +@@ -605,13 +628,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105481,7 +133261,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestprops_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -615,11 +640,9 @@ libtestprops_la_LDFLAGS = \ +@@ -619,11 +640,9 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105493,7 +133273,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestselection_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -627,11 +650,9 @@ libtestselection_la_LDFLAGS = \ +@@ -631,11 +650,9 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105505,7 +133285,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libteststatusbar_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -639,7 +660,6 @@ libteststatusbar_la_LDFLAGS = \ +@@ -643,7 +660,6 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105513,7 +133293,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtesttable_la_SOURCES = \ testlib.c \ testlib.h \ -@@ -647,7 +667,6 @@ libtesttable_la_SOURCES = \ +@@ -651,7 +667,6 @@ testtextlib.h \ testtable.c @@ -105521,7 +133301,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtesttable_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -655,7 +674,6 @@ libtesttable_la_LDFLAGS = \ +@@ -659,7 +674,6 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105529,7 +133309,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtesttext_la_SOURCES = \ testlib.c \ testlib.h \ -@@ -663,7 +681,6 @@ libtesttext_la_SOURCES = \ +@@ -667,7 +681,6 @@ testtextlib.h \ testtext.c @@ -105537,7 +133317,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtesttext_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -671,13 +688,11 @@ libtesttext_la_LDFLAGS = \ +@@ -675,13 +688,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105551,7 +133331,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtesttoplevel_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -685,13 +700,11 @@ libtesttoplevel_la_LDFLAGS = \ +@@ -689,13 +700,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105565,7 +133345,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtesttreetable_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -699,11 +712,9 @@ libtesttreetable_la_LDFLAGS = \ +@@ -703,11 +712,9 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105577,7 +133357,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in libtestvalues_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -711,150 +722,63 @@ libtestvalues_la_LDFLAGS = \ +@@ -715,150 +722,63 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -105763,7 +133543,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -@@ -863,51 +787,51 @@ clean-noinstLTLIBRARIES: +@@ -867,51 +787,51 @@ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ @@ -105836,7 +133616,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -935,37 +859,25 @@ distclean-compile: +@@ -939,37 +859,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testvalues.Plo@am__quote@ .c.o: @@ -105886,7 +133666,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -973,26 +885,15 @@ mostlyclean-libtool: +@@ -977,26 +885,15 @@ clean-libtool: -rm -rf .libs _libs @@ -105916,7 +133696,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -1002,23 +903,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -1006,23 +903,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -105949,7 +133729,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1030,29 +931,23 @@ GTAGS: +@@ -1034,29 +931,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -105992,7 +133772,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1067,9 +962,10 @@ check-am: all-am +@@ -1071,9 +962,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) @@ -106005,7 +133785,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -1089,7 +985,7 @@ mostlyclean-generic: +@@ -1093,7 +985,7 @@ clean-generic: distclean-generic: @@ -106014,7 +133794,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1103,24 +999,34 @@ distclean: distclean-am +@@ -1107,24 +999,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -106050,7 +133830,7 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1141,20 +1047,24 @@ ps: ps-am +@@ -1145,20 +1047,24 @@ ps-am: @@ -106084,10 +133864,9 @@ Index: gtk+-2.14.4/modules/other/gail/tests/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/other/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/other/Makefile.in 2008-10-17 06:07:18.000000000 +0200 -+++ gtk+-2.14.4/modules/other/Makefile.in 2008-11-11 18:56:05.336634824 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Makefile.in gtk+2.0-2.14.5/modules/other/Makefile.in +--- gtk+2.0-2.14.5.old/modules/other/Makefile.in 2008-11-24 07:41:44.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/other/Makefile.in 2008-11-25 11:09:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -106118,7 +133897,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ POST_INSTALL = : +@@ -37,10 +31,35 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -106156,7 +133935,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +70,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -106180,7 +133959,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +95,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -106188,8 +133967,9 @@ Index: gtk+-2.14.4/modules/other/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -106198,9 +133978,13 @@ Index: gtk+-2.14.4/modules/other/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -106208,7 +133992,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +147,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -106217,7 +134001,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +157,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -106310,7 +134094,20 @@ Index: gtk+-2.14.4/modules/other/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +181,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -106333,10 +134130,12 @@ Index: gtk+-2.14.4/modules/other/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +205,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -106345,7 +134144,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +216,10 @@ SED = @SED@ +@@ -300,28 +216,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -106374,7 +134173,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +228,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -106384,11 +134183,12 @@ Index: gtk+-2.14.4/modules/other/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -106404,15 +134204,17 @@ Index: gtk+-2.14.4/modules/other/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +268,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +278,11 @@ program_transform_name = @program_transf +@@ -377,9 +278,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -106425,7 +134227,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,31 +313,39 @@ XVFB_START = \ +@@ -410,31 +313,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -106484,7 +134286,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -438,10 +353,6 @@ mostlyclean-libtool: +@@ -442,10 +353,6 @@ clean-libtool: -rm -rf .libs _libs @@ -106495,7 +134297,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -449,7 +360,13 @@ uninstall-info-am: +@@ -453,7 +360,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -106510,7 +134312,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): +@@ -465,15 +378,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -106535,7 +134337,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -490,7 +412,7 @@ maintainer-clean-recursive: +@@ -494,7 +412,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -106544,7 +134346,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -501,35 +423,30 @@ ctags-recursive: +@@ -505,35 +423,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -106587,7 +134389,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -541,23 +454,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -106620,7 +134422,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -565,29 +482,23 @@ GTAGS: +@@ -569,29 +482,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -106663,7 +134465,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -598,15 +509,19 @@ distdir: $(DISTFILES) +@@ -602,15 +509,19 @@ || exit 1; \ fi; \ done @@ -106688,7 +134490,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -617,7 +532,6 @@ check: check-recursive +@@ -621,7 +532,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -106696,7 +134498,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -637,7 +551,7 @@ mostlyclean-generic: +@@ -641,7 +551,7 @@ clean-generic: distclean-generic: @@ -106705,7 +134507,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo +@@ -652,25 +562,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -106742,7 +134544,7 @@ Index: gtk+-2.14.4/modules/other/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -685,26 +608,24 @@ ps: ps-recursive +@@ -689,26 +608,24 @@ ps-am: @@ -106785,10 +134587,9 @@ Index: gtk+-2.14.4/modules/other/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/printbackends/cups/Makefile.in 2008-10-17 06:07:20.000000000 +0200 -+++ gtk+-2.14.4/modules/printbackends/cups/Makefile.in 2008-11-11 18:56:06.468634212 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.14.5/modules/printbackends/cups/Makefile.in +--- gtk+2.0-2.14.5.old/modules/printbackends/cups/Makefile.in 2008-11-24 07:41:45.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/printbackends/cups/Makefile.in 2008-11-25 11:09:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -106819,7 +134620,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ POST_INSTALL = : +@@ -37,10 +33,59 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -106881,7 +134682,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +96,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -106905,7 +134706,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +121,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -106913,8 +134714,9 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -106923,9 +134725,13 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +154,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -106933,7 +134739,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +173,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -106942,7 +134748,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +183,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -107035,7 +134841,20 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +207,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -107058,10 +134877,12 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +231,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -107070,7 +134891,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +242,10 @@ SED = @SED@ +@@ -300,28 +242,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -107099,7 +134920,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +254,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -107109,11 +134930,12 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -107129,15 +134951,17 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +294,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +304,11 @@ program_transform_name = @program_transf +@@ -377,9 +304,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -107150,7 +134974,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +339,7 @@ XVFB_START = \ +@@ -410,9 +339,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -107160,7 +134984,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -420,107 +351,90 @@ INCLUDES = \ +@@ -424,107 +351,90 @@ $(GTK_DEP_CFLAGS) \ $(GTK_DEBUG_FLAGS) @@ -107305,7 +135129,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -530,37 +444,25 @@ distclean-compile: +@@ -534,37 +444,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintercups.Plo@am__quote@ .c.o: @@ -107355,7 +135179,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -568,26 +470,15 @@ mostlyclean-libtool: +@@ -572,26 +470,15 @@ clean-libtool: -rm -rf .libs _libs @@ -107385,7 +135209,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -597,23 +488,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -601,23 +488,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -107418,7 +135242,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -625,29 +516,23 @@ GTAGS: +@@ -629,29 +516,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -107461,7 +135285,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -662,9 +547,10 @@ check-am: all-am +@@ -666,9 +547,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -107474,7 +135298,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -684,7 +570,7 @@ mostlyclean-generic: +@@ -688,7 +570,7 @@ clean-generic: distclean-generic: @@ -107483,7 +135307,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -698,24 +584,34 @@ distclean: distclean-am +@@ -702,24 +584,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -107519,7 +135343,7 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -736,20 +632,24 @@ ps: ps-am +@@ -740,20 +632,24 @@ ps-am: @@ -107555,10 +135379,9 @@ Index: gtk+-2.14.4/modules/printbackends/cups/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/printbackends/file/Makefile.in 2008-10-17 06:07:20.000000000 +0200 -+++ gtk+-2.14.4/modules/printbackends/file/Makefile.in 2008-11-11 18:56:06.628633877 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbackends/file/Makefile.in gtk+2.0-2.14.5/modules/printbackends/file/Makefile.in +--- gtk+2.0-2.14.5.old/modules/printbackends/file/Makefile.in 2008-11-24 07:41:45.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/printbackends/file/Makefile.in 2008-11-25 11:09:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -107589,7 +135412,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ POST_INSTALL = : +@@ -37,10 +33,59 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -107651,7 +135474,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +96,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -107675,7 +135498,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +121,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -107683,8 +135506,9 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -107693,9 +135517,13 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +154,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -107703,7 +135531,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +173,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -107712,7 +135540,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +183,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -107805,7 +135633,20 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +207,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -107828,10 +135669,12 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +231,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -107840,7 +135683,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +242,10 @@ SED = @SED@ +@@ -300,28 +242,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -107869,7 +135712,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +254,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -107879,11 +135722,12 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -107899,15 +135743,17 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +294,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +304,11 @@ program_transform_name = @program_transf +@@ -377,9 +304,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -107920,7 +135766,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,17 +339,12 @@ XVFB_START = \ +@@ -410,17 +339,12 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -107938,7 +135784,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in libprintbackend_file_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -426,100 +354,86 @@ libprintbackend_file_la_CPPFLAGS = \ +@@ -430,100 +354,86 @@ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(AM_CPPFLAGS) @@ -108076,7 +135922,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -527,70 +441,32 @@ distclean-compile: +@@ -531,70 +441,32 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo@am__quote@ .c.o: @@ -108163,7 +136009,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -598,26 +474,15 @@ mostlyclean-libtool: +@@ -602,26 +474,15 @@ clean-libtool: -rm -rf .libs _libs @@ -108193,7 +136039,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -627,23 +492,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -631,23 +492,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -108226,7 +136072,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -655,29 +520,23 @@ GTAGS: +@@ -659,29 +520,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -108269,7 +136115,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -692,9 +551,10 @@ check-am: all-am +@@ -696,9 +551,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -108282,7 +136128,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -714,7 +574,7 @@ mostlyclean-generic: +@@ -718,7 +574,7 @@ clean-generic: distclean-generic: @@ -108291,7 +136137,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -728,24 +588,34 @@ distclean: distclean-am +@@ -732,24 +588,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -108327,7 +136173,7 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -766,20 +636,24 @@ ps: ps-am +@@ -770,20 +636,24 @@ ps-am: @@ -108363,10 +136209,9 @@ Index: gtk+-2.14.4/modules/printbackends/file/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/printbackends/lpr/Makefile.in 2008-10-17 06:07:20.000000000 +0200 -+++ gtk+-2.14.4/modules/printbackends/lpr/Makefile.in 2008-11-11 18:56:06.788634031 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14.5/modules/printbackends/lpr/Makefile.in +--- gtk+2.0-2.14.5.old/modules/printbackends/lpr/Makefile.in 2008-11-24 07:41:46.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/printbackends/lpr/Makefile.in 2008-11-25 11:09:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -108397,7 +136242,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,56 @@ POST_INSTALL = : +@@ -37,10 +33,56 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -108456,7 +136301,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +93,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +93,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -108480,7 +136325,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +118,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +118,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -108488,8 +136333,9 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +125,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -108498,9 +136344,13 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +151,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +151,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -108508,7 +136358,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +170,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +170,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -108517,7 +136367,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +180,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +180,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -108610,7 +136460,20 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +209,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +204,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -108633,10 +136496,12 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +228,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +228,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -108645,7 +136510,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +239,10 @@ SED = @SED@ +@@ -300,28 +239,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -108674,7 +136539,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +251,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +251,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -108684,11 +136549,12 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -108704,15 +136570,17 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +292,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +291,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +301,11 @@ program_transform_name = @program_transf +@@ -377,9 +301,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -108725,7 +136593,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +336,7 @@ XVFB_START = \ +@@ -410,9 +336,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -108735,7 +136603,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -419,98 +347,85 @@ INCLUDES = \ +@@ -423,98 +347,85 @@ $(GTK_DEP_CFLAGS) \ $(GTK_DEBUG_FLAGS) @@ -108871,7 +136739,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -518,37 +433,25 @@ distclean-compile: +@@ -522,37 +433,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintbackendlpr.Plo@am__quote@ .c.o: @@ -108921,7 +136789,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -556,26 +459,15 @@ mostlyclean-libtool: +@@ -560,26 +459,15 @@ clean-libtool: -rm -rf .libs _libs @@ -108951,7 +136819,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -585,23 +477,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -589,23 +477,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -108984,7 +136852,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -613,29 +505,23 @@ GTAGS: +@@ -617,29 +505,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -109027,7 +136895,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -650,9 +536,10 @@ check-am: all-am +@@ -654,9 +536,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -109040,7 +136908,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -672,7 +559,7 @@ mostlyclean-generic: +@@ -676,7 +559,7 @@ clean-generic: distclean-generic: @@ -109049,7 +136917,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -686,24 +573,34 @@ distclean: distclean-am +@@ -690,24 +573,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -109085,7 +136953,7 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -724,20 +621,24 @@ ps: ps-am +@@ -728,20 +621,24 @@ ps-am: @@ -109121,10 +136989,9 @@ Index: gtk+-2.14.4/modules/printbackends/lpr/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/printbackends/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/printbackends/Makefile.in 2008-10-17 06:07:19.000000000 +0200 -+++ gtk+-2.14.4/modules/printbackends/Makefile.in 2008-11-11 18:56:06.312635125 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbackends/Makefile.in gtk+2.0-2.14.5/modules/printbackends/Makefile.in +--- gtk+2.0-2.14.5.old/modules/printbackends/Makefile.in 2008-11-24 07:41:45.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/printbackends/Makefile.in 2008-11-25 11:09:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -109155,7 +137022,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,12 +31,36 @@ POST_INSTALL = : +@@ -37,12 +31,36 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -109194,7 +137061,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -53,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -53,22 +71,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -109218,7 +137085,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -83,21 +96,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -109226,8 +137093,9 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -92,10 +103,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -109236,9 +137104,13 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -122,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -121,6 +129,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -109246,7 +137118,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -140,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -139,8 +148,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -109255,7 +137127,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -152,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -151,98 +158,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -109348,7 +137220,20 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -258,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -253,32 +182,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -109371,10 +137256,12 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -286,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -289,8 +206,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -109383,7 +137270,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -299,28 +217,10 @@ SED = @SED@ +@@ -302,28 +217,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -109412,7 +137299,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -329,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -332,22 +229,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -109422,11 +137309,12 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -109442,15 +137330,17 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,6 +270,7 @@ libexecdir = @libexecdir@ +@@ -369,8 +269,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -375,9 +279,11 @@ program_transform_name = @program_transf +@@ -379,9 +279,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -109463,7 +137353,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -408,32 +314,40 @@ XVFB_START = \ +@@ -412,32 +314,40 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -109523,7 +137413,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -441,10 +355,6 @@ mostlyclean-libtool: +@@ -445,10 +355,6 @@ clean-libtool: -rm -rf .libs _libs @@ -109534,7 +137424,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -452,7 +362,13 @@ uninstall-info-am: +@@ -456,7 +362,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -109549,7 +137439,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -464,15 +380,20 @@ $(RECURSIVE_TARGETS): +@@ -468,15 +380,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -109574,7 +137464,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -493,7 +414,7 @@ maintainer-clean-recursive: +@@ -497,7 +414,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -109583,7 +137473,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -504,35 +425,30 @@ ctags-recursive: +@@ -508,35 +425,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -109626,7 +137516,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -540,23 +456,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE +@@ -544,23 +456,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -109659,7 +137549,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -568,29 +484,23 @@ GTAGS: +@@ -572,29 +484,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -109702,7 +137592,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -603,13 +513,17 @@ distdir: $(DISTFILES) +@@ -607,13 +513,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -109724,7 +137614,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -620,7 +534,6 @@ check: check-recursive +@@ -624,7 +534,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -109732,7 +137622,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -640,7 +553,7 @@ mostlyclean-generic: +@@ -644,7 +553,7 @@ clean-generic: distclean-generic: @@ -109741,7 +137631,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -651,25 +564,34 @@ clean-am: clean-generic clean-libtool mo +@@ -655,25 +564,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -109778,7 +137668,7 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -688,26 +610,24 @@ ps: ps-recursive +@@ -692,26 +610,24 @@ ps-am: @@ -109821,10 +137711,9 @@ Index: gtk+-2.14.4/modules/printbackends/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/modules/printbackends/test/Makefile.in 2008-10-17 06:07:20.000000000 +0200 -+++ gtk+-2.14.4/modules/printbackends/test/Makefile.in 2008-11-11 18:56:06.940634494 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbackends/test/Makefile.in gtk+2.0-2.14.5/modules/printbackends/test/Makefile.in +--- gtk+2.0-2.14.5.old/modules/printbackends/test/Makefile.in 2008-11-24 07:41:46.000000000 +0100 ++++ gtk+2.0-2.14.5/modules/printbackends/test/Makefile.in 2008-11-25 11:09:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -109855,7 +137744,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,58 @@ POST_INSTALL = : +@@ -37,10 +33,58 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -109916,7 +137805,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +95,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +95,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -109940,7 +137829,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +120,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +120,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -109948,8 +137837,9 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +127,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -109958,9 +137848,13 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +153,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +153,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -109968,7 +137862,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +172,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +172,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -109977,7 +137871,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +182,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +182,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -110070,7 +137964,20 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +211,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +206,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -110093,10 +138000,12 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +230,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +230,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -110105,7 +138014,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +241,10 @@ SED = @SED@ +@@ -300,28 +241,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -110134,7 +138043,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +253,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +253,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -110144,11 +138053,12 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -110164,15 +138074,17 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +294,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +293,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +303,11 @@ program_transform_name = @program_transf +@@ -377,9 +303,11 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -110185,7 +138097,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,17 +338,12 @@ XVFB_START = \ +@@ -410,17 +338,12 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -110203,7 +138115,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in libprintbackend_test_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -426,98 +353,85 @@ libprintbackend_test_la_CPPFLAGS = \ +@@ -430,98 +353,85 @@ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(AM_CPPFLAGS) @@ -110339,7 +138251,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -525,70 +439,32 @@ distclean-compile: +@@ -529,70 +439,32 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo@am__quote@ .c.o: @@ -110426,7 +138338,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -596,26 +472,15 @@ mostlyclean-libtool: +@@ -600,26 +472,15 @@ clean-libtool: -rm -rf .libs _libs @@ -110456,7 +138368,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -625,23 +490,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -629,23 +490,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -110489,7 +138401,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -653,29 +518,23 @@ GTAGS: +@@ -657,29 +518,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -110532,7 +138444,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -690,9 +549,10 @@ check-am: all-am +@@ -694,9 +549,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -110545,7 +138457,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -712,7 +572,7 @@ mostlyclean-generic: +@@ -716,7 +572,7 @@ clean-generic: distclean-generic: @@ -110554,7 +138466,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -726,24 +586,34 @@ distclean: distclean-am +@@ -730,24 +586,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -110590,7 +138502,7 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -764,20 +634,24 @@ ps: ps-am +@@ -768,20 +634,24 @@ ps-am: @@ -110626,10 +138538,9 @@ Index: gtk+-2.14.4/modules/printbackends/test/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/perf/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/perf/Makefile.in 2008-10-17 06:07:20.000000000 +0200 -+++ gtk+-2.14.4/perf/Makefile.in 2008-11-11 18:56:07.092634470 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in gtk+2.0-2.14.5/perf/Makefile.in +--- gtk+2.0-2.14.5.old/perf/Makefile.in 2008-11-24 07:41:46.000000000 +0100 ++++ gtk+2.0-2.14.5/perf/Makefile.in 2008-11-25 11:09:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -110659,7 +138570,7 @@ Index: gtk+-2.14.4/perf/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,43 @@ POST_INSTALL = : +@@ -37,10 +32,43 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -110705,7 +138616,7 @@ Index: gtk+-2.14.4/perf/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +79,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -51,22 +79,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -110729,7 +138640,7 @@ Index: gtk+-2.14.4/perf/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,8 +104,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -81,21 +104,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -110737,8 +138648,9 @@ Index: gtk+-2.14.4/perf/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -90,10 +111,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -110747,9 +138659,13 @@ Index: gtk+-2.14.4/perf/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -120,6 +137,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -119,6 +137,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -110757,7 +138673,7 @@ Index: gtk+-2.14.4/perf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +156,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -137,8 +156,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -110766,7 +138682,7 @@ Index: gtk+-2.14.4/perf/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,91 +166,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -149,98 +166,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -110859,7 +138775,20 @@ Index: gtk+-2.14.4/perf/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -256,24 +195,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -251,32 +190,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -110882,10 +138811,12 @@ Index: gtk+-2.14.4/perf/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +214,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -287,8 +214,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -110894,7 +138825,7 @@ Index: gtk+-2.14.4/perf/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +225,10 @@ SED = @SED@ +@@ -300,28 +225,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -110923,7 +138854,7 @@ Index: gtk+-2.14.4/perf/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +237,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -330,22 +237,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -110933,11 +138864,12 @@ Index: gtk+-2.14.4/perf/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -110953,15 +138885,17 @@ Index: gtk+-2.14.4/perf/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,6 +278,7 @@ libexecdir = @libexecdir@ +@@ -367,8 +277,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,20 +287,17 @@ program_transform_name = @program_transf +@@ -377,20 +287,17 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -110987,7 +138921,7 @@ Index: gtk+-2.14.4/perf/Makefile.in TEST_PROGS = ### testing rules -@@ -412,7 +323,6 @@ XVFB_START = \ +@@ -416,7 +323,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -110995,7 +138929,7 @@ Index: gtk+-2.14.4/perf/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -422,27 +332,18 @@ INCLUDES = \ +@@ -426,27 +332,18 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -111023,7 +138957,7 @@ Index: gtk+-2.14.4/perf/Makefile.in testperf_SOURCES = \ appwindow.c \ gtkwidgetprofiler.c \ -@@ -456,68 +357,54 @@ testperf_SOURCES = \ +@@ -460,68 +357,54 @@ typebuiltins.h \ widgets.h @@ -111119,7 +139053,7 @@ Index: gtk+-2.14.4/perf/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -527,10 +414,10 @@ clean-noinstPROGRAMS: +@@ -531,10 +414,10 @@ done testperf$(EXEEXT): $(testperf_OBJECTS) $(testperf_DEPENDENCIES) @rm -f testperf$(EXEEXT) @@ -111132,7 +139066,7 @@ Index: gtk+-2.14.4/perf/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -544,37 +431,25 @@ distclean-compile: +@@ -548,37 +431,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/typebuiltins.Po@am__quote@ .c.o: @@ -111182,7 +139116,7 @@ Index: gtk+-2.14.4/perf/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -582,26 +457,15 @@ mostlyclean-libtool: +@@ -586,26 +457,15 @@ clean-libtool: -rm -rf .libs _libs @@ -111212,7 +139146,7 @@ Index: gtk+-2.14.4/perf/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -611,23 +475,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -615,23 +475,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -111245,7 +139179,7 @@ Index: gtk+-2.14.4/perf/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -639,29 +503,23 @@ GTAGS: +@@ -643,29 +503,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -111288,7 +139222,7 @@ Index: gtk+-2.14.4/perf/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -677,7 +535,6 @@ check-am: all-am +@@ -681,7 +535,6 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) @@ -111296,7 +139230,7 @@ Index: gtk+-2.14.4/perf/Makefile.in installdirs: install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -@@ -699,13 +556,13 @@ mostlyclean-generic: +@@ -703,13 +556,13 @@ clean-generic: distclean-generic: @@ -111312,7 +139246,7 @@ Index: gtk+-2.14.4/perf/Makefile.in clean: clean-am clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ -@@ -715,24 +572,34 @@ distclean: distclean-am +@@ -719,24 +572,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -111348,7 +139282,7 @@ Index: gtk+-2.14.4/perf/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -753,18 +620,23 @@ ps: ps-am +@@ -757,18 +620,23 @@ ps-am: @@ -111381,10 +139315,66 @@ Index: gtk+-2.14.4/perf/Makefile.in # call as: $(XVFB_START) && someprogram -Index: gtk+-2.14.4/tests/Makefile.in -=================================================================== ---- gtk+-2.14.4.orig/tests/Makefile.in 2008-10-17 06:07:21.000000000 +0200 -+++ gtk+-2.14.4/tests/Makefile.in 2008-11-11 18:56:07.473134785 +0100 +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/po/Makefile.in.in gtk+2.0-2.14.5/po/Makefile.in.in +--- gtk+2.0-2.14.5.old/po/Makefile.in.in 2008-11-24 07:36:02.000000000 +0100 ++++ gtk+2.0-2.14.5/po/Makefile.in.in 2008-11-25 11:09:32.000000000 +0100 +@@ -25,6 +25,7 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + libdir = @libdir@ + localedir = $(libdir)/locale +@@ -40,6 +41,7 @@ + GENCAT = @GENCAT@ + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ ++MSGFMT_OPTS = @MSGFMT_OPTS@ + XGETTEXT = @XGETTEXT@ + MSGMERGE = msgmerge + +@@ -54,7 +56,7 @@ + SOURCES = + POFILES = @POFILES@ + GMOFILES = @GMOFILES@ +-DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in POTFILES.skip $(GETTEXT_PACKAGE).pot \ ++DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ + $(POFILES) $(GMOFILES) $(SOURCES) + + POTFILES = \ +@@ -78,7 +80,7 @@ + + .po.gmo: + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ +- && rm -f $$file && $(GMSGFMT) -c -o $$file $< ++ && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $< + + .po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ +@@ -92,7 +94,7 @@ + + $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ +- --add-comments --keyword=_ --keyword=N_ --keyword=Q_ \ ++ --add-comments --keyword=_ --keyword=N_ \ + --flag=g_strdup_printf:1:c-format \ + --flag=g_string_printf:2:c-format \ + --flag=g_string_append_printf:2:c-format \ +@@ -108,10 +110,6 @@ + --flag=g_snprintf:3:c-format \ + --flag=g_scanner_error:2:c-format \ + --flag=g_scanner_warn:2:c-format \ +- --flag=gtk_message_dialog_format_secondary_markup:2:c-format \ +- --flag=gtk_message_dialog_format_secondary_text:2:c-format \ +- --flag=gtk_message_dialog_new:5:c-format \ +- --flag=gtk_message_dialog_new_with_markup:5:c-format \ + --files-from=$(srcdir)/POTFILES.in \ + && test ! -f $(GETTEXT_PACKAGE).po \ + || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ +diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.in gtk+2.0-2.14.5/tests/Makefile.in +--- gtk+2.0-2.14.5.old/tests/Makefile.in 2008-11-24 07:41:47.000000000 +0100 ++++ gtk+2.0-2.14.5/tests/Makefile.in 2008-11-25 11:09:53.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -111414,7 +139404,7 @@ Index: gtk+-2.14.4/tests/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,12 +32,274 @@ POST_INSTALL = : +@@ -37,12 +32,274 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -111691,7 +139681,7 @@ Index: gtk+-2.14.4/tests/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -53,22 +310,17 @@ AUTOMAKE = @AUTOMAKE@ +@@ -53,22 +310,17 @@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -111715,7 +139705,7 @@ Index: gtk+-2.14.4/tests/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,8 +335,6 @@ DATADIRNAME = @DATADIRNAME@ +@@ -83,21 +335,16 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -111723,8 +139713,9 @@ Index: gtk+-2.14.4/tests/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ -@@ -92,10 +342,6 @@ ECHO_C = @ECHO_C@ +-DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ + ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -111733,9 +139724,13 @@ Index: gtk+-2.14.4/tests/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -@@ -122,6 +368,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X +-FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ + GAIL_INET_LIBS = @GAIL_INET_LIBS@ + GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ + GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ +@@ -121,6 +368,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -111743,7 +139738,7 @@ Index: gtk+-2.14.4/tests/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -140,8 +387,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION +@@ -139,8 +387,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -111752,7 +139747,7 @@ Index: gtk+-2.14.4/tests/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -152,91 +397,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ +@@ -151,98 +397,20 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -111845,7 +139840,20 @@ Index: gtk+-2.14.4/tests/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -258,24 +426,15 @@ LTLIBOBJS = @LTLIBOBJS@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ +-LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBJASPER = @LIBJASPER@ + LIBJPEG = @LIBJPEG@ +@@ -253,32 +421,20 @@ + LIBTOOL = @LIBTOOL@ + LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ + LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ +-LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -111868,10 +139876,12 @@ Index: gtk+-2.14.4/tests/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ +-OTOOL = @OTOOL@ +-OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -286,8 +445,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ +@@ -289,8 +445,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -111880,7 +139890,7 @@ Index: gtk+-2.14.4/tests/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -299,28 +456,10 @@ SED = @SED@ +@@ -302,28 +456,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -111909,7 +139919,7 @@ Index: gtk+-2.14.4/tests/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -329,22 +468,25 @@ X_CFLAGS = @X_CFLAGS@ +@@ -332,22 +468,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -111919,11 +139929,12 @@ Index: gtk+-2.14.4/tests/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ +-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ ++ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -111939,15 +139950,17 @@ Index: gtk+-2.14.4/tests/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,6 +509,7 @@ libexecdir = @libexecdir@ +@@ -369,8 +508,8 @@ + libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +-lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -375,37 +518,21 @@ program_transform_name = @program_transf +@@ -379,37 +518,21 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -111993,7 +140006,7 @@ Index: gtk+-2.14.4/tests/Makefile.in TEST_PROGS = ### testing rules -@@ -431,7 +558,6 @@ XVFB_START = \ +@@ -435,7 +558,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -112001,7 +140014,7 @@ Index: gtk+-2.14.4/tests/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -441,89 +567,21 @@ INCLUDES = \ +@@ -445,89 +567,21 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -112093,7 +140106,7 @@ Index: gtk+-2.14.4/tests/Makefile.in simple_DEPENDENCIES = $(TEST_DEPS) print_editor_DEPENDENCIES = $(TEST_DEPS) testicontheme_DEPENDENCIES = $(TEST_DEPS) -@@ -578,7 +636,6 @@ testactions_DEPENDENCIES = $(TEST_DEPS) +@@ -582,7 +636,6 @@ testgrouping_DEPENDENCIES = $(TEST_DEPS) testtooltips_DEPENDENCIES = $(TEST_DEPS) testvolumebutton_DEPENDENCIES = $(TEST_DEPS) @@ -112101,7 +140114,7 @@ Index: gtk+-2.14.4/tests/Makefile.in simple_LDADD = $(LDADDS) print_editor_LDADD = $(LDADDS) testaccel_LDADD = $(LDADDS) -@@ -640,700 +697,125 @@ testactions_LDADD = $(LDADDS) +@@ -644,700 +697,125 @@ testgrouping_LDADD = $(LDADDS) testtooltips_LDADD = $(LDADDS) testvolumebutton_LDADD = $(LDADDS) @@ -112829,7 +140842,7 @@ Index: gtk+-2.14.4/tests/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -1343,193 +825,193 @@ clean-noinstPROGRAMS: +@@ -1347,193 +825,193 @@ done autotestkeywords$(EXEEXT): $(autotestkeywords_OBJECTS) $(autotestkeywords_DEPENDENCIES) @rm -f autotestkeywords$(EXEEXT) @@ -113086,7 +141099,7 @@ Index: gtk+-2.14.4/tests/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -1601,130 +1083,76 @@ distclean-compile: +@@ -1605,130 +1083,76 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treestoretest.Po@am__quote@ .c.o: @@ -113250,7 +141263,7 @@ Index: gtk+-2.14.4/tests/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -1734,23 +1162,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP +@@ -1738,23 +1162,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -113283,7 +141296,7 @@ Index: gtk+-2.14.4/tests/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1764,9 +1192,9 @@ distclean-tags: +@@ -1768,9 +1192,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -113295,7 +141308,7 @@ Index: gtk+-2.14.4/tests/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1775,25 +1203,25 @@ check-TESTS: $(TESTS) +@@ -1779,25 +1203,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -113331,7 +141344,7 @@ Index: gtk+-2.14.4/tests/Makefile.in ;; \ esac; \ else \ -@@ -1818,46 +1246,40 @@ check-TESTS: $(TESTS) +@@ -1822,46 +1246,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -113395,7 +141408,7 @@ Index: gtk+-2.14.4/tests/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1872,7 +1294,6 @@ check-am: all-am +@@ -1876,7 +1294,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -113403,7 +141416,7 @@ Index: gtk+-2.14.4/tests/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -1893,7 +1314,7 @@ mostlyclean-generic: +@@ -1897,7 +1314,7 @@ clean-generic: distclean-generic: @@ -113412,7 +141425,7 @@ Index: gtk+-2.14.4/tests/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1907,24 +1328,34 @@ distclean: distclean-am +@@ -1911,24 +1328,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -113448,7 +141461,7 @@ Index: gtk+-2.14.4/tests/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1945,18 +1376,23 @@ ps: ps-am +@@ -1949,18 +1376,23 @@ ps-am: From 797a5dd5f7b77fbe72fc056c647f479d335b425f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <lool@dooz.org> Date: Fri, 28 Nov 2008 18:04:52 +0000 Subject: [PATCH 23/29] Don't purge /etc/gtk-2.0/gdk-pixbuf.loaders and /etc/gtk-2.0/gtk.immodules during first configuration. --- debian/changelog | 7 +++++++ debian/libgtk2.0-0.postinst.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 649bc23332..bf8b27ff68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gtk+2.0 (2.14.5-2) UNRELEASED; urgency=low + + * Don't purge /etc/gtk-2.0/gdk-pixbuf.loaders and /etc/gtk-2.0/gtk.immodules + during first configuration. + + -- Loic Minier <lool@dooz.org> Fri, 28 Nov 2008 19:04:18 +0100 + gtk+2.0 (2.14.5-1) experimental; urgency=low [ Josselin Mouette ] diff --git a/debian/libgtk2.0-0.postinst.in b/debian/libgtk2.0-0.postinst.in index 3f66040032..322c183ca1 100644 --- a/debian/libgtk2.0-0.postinst.in +++ b/debian/libgtk2.0-0.postinst.in @@ -5,7 +5,7 @@ set -e # versions prior to 2.10.1-1 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.3-2"; then +if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt-nl "2.10.3-2"; 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 From 6c8b6e2c666f84c4451387e4e1cd9db5cd4cf157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@debian.org> Date: Thu, 8 Jan 2009 07:09:04 +0000 Subject: [PATCH 24/29] * New upstream bugfix release: + debian/patches/070_mandatory-relibtoolize.patch: - Regenerated for the new version. --- debian/changelog | 10 +- debian/control | 2 +- .../patches/070_mandatory-relibtoolize.patch | 128999 ++++++--------- 3 files changed, 47009 insertions(+), 82002 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf8b27ff68..51bc5e5387 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -gtk+2.0 (2.14.5-2) UNRELEASED; urgency=low +gtk+2.0 (2.14.7-1) experimental; urgency=low + [ Loic Minier ] * Don't purge /etc/gtk-2.0/gdk-pixbuf.loaders and /etc/gtk-2.0/gtk.immodules during first configuration. - -- Loic Minier <lool@dooz.org> Fri, 28 Nov 2008 19:04:18 +0100 + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/070_mandatory-relibtoolize.patch: + - Regenerated for the new version. + + -- Sebastian Dröge <slomo@debian.org> Thu, 08 Jan 2009 08:06:02 +0100 gtk+2.0 (2.14.5-1) experimental; urgency=low diff --git a/debian/control b/debian/control index d2f3c08a8b..672e1ba23a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ 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>, Gustavo Noronha Silva <kov@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org> +Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Gustavo Noronha Silva <kov@debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org> Build-Depends: debhelper (>= 5.0.22), gettext, pkg-config, diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index 85233747f1..397004c6a1 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -1,6 +1,6 @@ -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2.0-2.14.5/aclocal.m4 ---- gtk+2.0-2.14.5.old/aclocal.m4 2008-11-24 07:41:24.000000000 +0100 -+++ gtk+2.0-2.14.5/aclocal.m4 2008-11-25 11:09:38.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 +--- gtk+2.0-2.14.7.old/aclocal.m4 2009-01-07 22:51:55.000000000 +0100 ++++ gtk+2.0-2.14.7/aclocal.m4 2009-01-08 08:03:43.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- @@ -12,7 +12,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -11,10782 +11,8440 @@ +@@ -11,1155 +11,1543 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @@ -30,8 +30,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -AC_DIVERT_POP()])])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(AC_AUTOCONF_VERSION, [2.61],, -+[m4_warning([this file was generated for autoconf 2.61. ++m4_if(AC_AUTOCONF_VERSION, [2.63],, ++[m4_warning([this file was generated for autoconf 2.63. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -317,10 +317,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -- --_AM_IF_OPTION([no-define],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + ifelse([$2], , :, [$2]) @@ -372,6 +368,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + rm -f conf.glibtest +]) +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +- -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl @@ -423,11 +423,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright 2002 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# @@ -461,10 +456,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) --# This program 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 General Public License for more details. +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros @@ -477,9 +472,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +dnl definitions in terms of our private definitions. +dnl --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# This program 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 General Public License for more details. +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], @@ -494,11 +490,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + fi + fi]) --# AM_AUTOMAKE_VERSION(VERSION) --# ---------------------------- --# Automake X.Y traces this macro to ensure aclocal.m4 has been --# generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, @@ -539,12 +533,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +AC_SUBST($1)dnl +]) --# AM_SET_CURRENT_AUTOMAKE_VERSION --# ------------------------------- --# Call AM_AUTOMAKE_VERSION so it can be traced. --# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. --AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.7.9])]) +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], @@ -552,26 +545,28 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + [USE_NLS=yes + AC_SUBST(USE_NLS) --# Helper functions for option handling. -*- Autoconf -*- +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.7.9])]) + gt_cv_have_gettext=no --# Copyright 2001, 2002 Free Software Foundation, Inc. +-# Helper functions for option handling. -*- Autoconf -*- + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= +-# Copyright 2001, 2002 Free Software Foundation, Inc. ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -+ AC_CHECK_HEADER(libintl.h, -+ [gt_cv_func_dgettext_libintl="no" -+ libintl_extra_libs="" - --# This program 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 General Public License for more details. + # + # First check in libc + # @@ -599,10 +594,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. +-# This program 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 General Public License for more details. + # + # If we don't have everything we want, check in libintl + # @@ -615,7 +610,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) --# serial 2 +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) @@ -627,10 +625,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + :,-liconv) + fi --# _AM_MANGLE_OPTION(NAME) --# ----------------------- --AC_DEFUN([_AM_MANGLE_OPTION], --[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +-# serial 2 + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), @@ -643,11 +638,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" --# _AM_SET_OPTION(NAME) --# ------------------------------ --# Set option NAME. Presently that only means defining a flag for this option. --AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else @@ -659,11 +653,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + fi + fi --# _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- --# OPTIONS is a space-separated list of Automake options. --AC_DEFUN([_AM_SET_OPTIONS], --[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes @@ -729,19 +723,21 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + fi + ]) --# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) --# ------------------------------------------- --# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. --AC_DEFUN([_AM_IF_OPTION], --[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi --# --# Check to make sure that the build environment is sane. --# +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the @@ -755,23 +751,22 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + fi + fi --# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +-# +-# Check to make sure that the build environment is sane. +-# + # We need to process the po/ directory. + POSUB=po --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) --# This program 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 General Public License for more details. +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. @@ -780,10 +775,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + POFILES="$POFILES $lang.po" + done --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. +-# This program 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 General Public License for more details. + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) @@ -797,7 +792,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + AC_SUBST(POSUB) + ]) --# serial 3 +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation @@ -815,23 +813,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + GLIB_LC_MESSAGES + GLIB_WITH_NLS --# AM_SANITY_CHECK --# --------------- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` +-# serial 3 + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= @@ -862,7 +844,24 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -+ + +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done @@ -935,8 +934,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - -# -*- Autoconf -*- - -- --# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" @@ -944,29 +941,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + [Define the location where the catalogs will be installed]) +]) --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 3 -- --# AM_MISSING_PROG(NAME, PROGRAM) --# ------------------------------ --AC_DEFUN([AM_MISSING_PROG], --[AC_REQUIRE([AM_MISSING_HAS_RUN]) --$1=${$1-"${am_missing_run}$2"} --AC_SUBST($1)]) +-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. +dnl +dnl Now the definitions that aclocal will find +dnl @@ -975,6 +950,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the @@ -991,6 +970,45 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) +-# This program 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 General Public License for more details. + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++dnl -*- mode: autoconf -*- + +-# serial 3 ++# serial 1 + +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) ++dnl Usage: ++dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ++AC_DEFUN([GTK_DOC_CHECK], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ dnl for overriding the documentation installation directory ++ 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]) + ++ dnl enable/disable documentation building ++ AC_ARG_ENABLE([gtk-doc], ++ AS_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [[default=no]]]),, ++ [enable_gtk_doc=no]) + -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. @@ -1006,44 +1024,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - --# AM_AUX_DIR_EXPAND -+dnl -*- mode: autoconf -*- - --# Copyright 2001 Free Software Foundation, Inc. -+# serial 1 - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+dnl Usage: -+dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -+AC_DEFUN([GTK_DOC_CHECK], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ dnl for overriding the documentation installation directory -+ 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]) - --# This program 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 General Public License for more details. -+ dnl enable/disable documentation building -+ AC_ARG_ENABLE([gtk-doc], -+ AS_HELP_STRING([--enable-gtk-doc], -+ [use gtk-doc to build documentation [[default=no]]]),, -+ [enable_gtk_doc=no]) - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. + if test x$enable_gtk_doc = xyes; then + ifelse([$1],[], + [PKG_CHECK_EXISTS([gtk-doc],, @@ -1052,6 +1032,65 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) + fi +-# AM_AUX_DIR_EXPAND ++ AC_MSG_CHECKING([whether to build gtk-doc documentation]) ++ AC_MSG_RESULT($enable_gtk_doc) + +-# Copyright 2001 Free Software Foundation, Inc. ++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++]) + +-# This program is distributed in the hope that it will be useful, ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++ ++m4_define([_LT_COPYING], [dnl ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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 General Public License for more details. +- ++# + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. ++# along with GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++]) + -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -1089,106 +1128,68 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. -+ AC_MSG_CHECKING([whether to build gtk-doc documentation]) -+ AC_MSG_RESULT($enable_gtk_doc) ++# serial 56 LT_INIT -# Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50]) -+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) -AC_DEFUN([AM_AUX_DIR_EXPAND], [ -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++# LT_PREREQ(VERSION) ++# ------------------ ++# Complain and exit if this libtool version is less that VERSION. ++m4_defun([LT_PREREQ], ++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, ++ [m4_default([$3], ++ [m4_fatal([Libtool version $1 or higher is required], ++ 63)])], ++ [$2])]) ++ ++ ++# _LT_CHECK_BUILDDIR ++# ------------------ ++# Complain if the absolute build directory name contains unusual characters ++m4_defun([_LT_CHECK_BUILDDIR], ++[case `pwd` in ++ *\ * | *\ *) ++ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; ++esac ]) -# AM_PROG_INSTALL_SH --# ------------------ --# Define $install_sh. -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - --# Copyright 2001 Free Software Foundation, Inc. -+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. - --# This program 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 General Public License for more details. -+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -+# ----------------------------------------------------------- -+# If this macro is not defined by Autoconf, define it here. -+m4_ifdef([AC_PROVIDE_IFELSE], -+ [], -+ [m4_define([AC_PROVIDE_IFELSE], -+ [m4_ifdef([AC_PROVIDE_$1], -+ [$2], [$3])])]) - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. - --AC_DEFUN([AM_PROG_INSTALL_SH], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"$am_aux_dir/install-sh"} --AC_SUBST(install_sh)]) -+# AC_PROG_LIBTOOL -+# --------------- -+AC_DEFUN([AC_PROG_LIBTOOL], -+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -+ AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [AC_LIBTOOL_CXX], -+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -+ ])]) -+dnl And a similar setup for Fortran 77 support -+ AC_PROVIDE_IFELSE([AC_PROG_F77], -+ [AC_LIBTOOL_F77], -+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -+])]) + -+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. -+ AC_PROVIDE_IFELSE([AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], -+ [AC_LIBTOOL_GCJ], -+ [ifdef([AC_PROG_GCJ], -+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([A][M_PROG_GCJ], -+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -+ ifdef([LT_AC_PROG_GCJ], -+ [define([LT_AC_PROG_GCJ], -+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -+])])# AC_PROG_LIBTOOL - --# AM_PROG_INSTALL_STRIP ++# LT_INIT([OPTIONS]) + # ------------------ +-# Define $install_sh. ++AC_DEFUN([LT_INIT], ++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++AC_BEFORE([$0], [LT_LANG])dnl ++AC_BEFORE([$0], [LT_OUTPUT])dnl ++AC_BEFORE([$0], [LTDL_INIT])dnl ++m4_require([_LT_CHECK_BUILDDIR])dnl ++ ++dnl Autoconf doesn't catch unexpanded LT_ macros by default: ++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl ++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl ++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 ++dnl unless we require an AC_DEFUNed macro: ++AC_REQUIRE([LTOPTIONS_VERSION])dnl ++AC_REQUIRE([LTSUGAR_VERSION])dnl ++AC_REQUIRE([LTVERSION_VERSION])dnl ++AC_REQUIRE([LTOBSOLETE_VERSION])dnl ++m4_require([_LT_PROG_LTMAIN])dnl -# Copyright 2001 Free Software Foundation, Inc. -+# _AC_PROG_LIBTOOL -+# ---------------- -+AC_DEFUN([_AC_PROG_LIBTOOL], -+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl ++dnl Parse OPTIONS ++_LT_SET_OPTIONS([$0], [$1]) -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS="$ltmain" -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -1202,9 +1203,64 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -+# Prevent multiple expansion -+define([AC_PROG_LIBTOOL], []) -+])# _AC_PROG_LIBTOOL ++_LT_SETUP + +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} +-AC_SUBST(install_sh)]) ++# Only expand once: ++m4_define([LT_INIT]) ++])# LT_INIT ++ ++# Old names: ++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) ++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PROG_LIBTOOL], []) ++dnl AC_DEFUN([AM_PROG_LIBTOOL], []) + +-# AM_PROG_INSTALL_STRIP + +-# Copyright 2001 Free Software Foundation, Inc. ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++m4_defun([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. + +-# This program 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 General Public License for more details. ++# _LT_FILEUTILS_DEFAULTS ++# ---------------------- ++# It is okay to use these file commands and assume they have been set ++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. ++m4_defun([_LT_FILEUTILS_DEFAULTS], ++[: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++])# _LT_FILEUTILS_DEFAULTS + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially @@ -1222,51 +1278,66 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) --fi ++# _LT_SETUP ++# --------- ++m4_defun([_LT_SETUP], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++_LT_DECL([], [host_alias], [0], [The host system])dnl ++_LT_DECL([], [host], [0])dnl ++_LT_DECL([], [host_os], [0])dnl ++dnl ++_LT_DECL([], [build_alias], [0], [The build system])dnl ++_LT_DECL([], [build], [0])dnl ++_LT_DECL([], [build_os], [0])dnl ++dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++dnl ++AC_REQUIRE([AC_PROG_LN_S])dnl ++test -z "$LN_S" && LN_S="ln -s" ++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl ++dnl ++AC_REQUIRE([LT_CMD_MAX_LEN])dnl ++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl ++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl ++dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_CMD_RELOAD])dnl ++m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CMD_OLD_ARCHIVE])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++ ++_LT_CONFIG_LIBTOOL_INIT([ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++]) ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST + fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. -+# AC_LIBTOOL_SETUP -+# ---------------- -+AC_DEFUN([AC_LIBTOOL_SETUP], -+[AC_PREREQ(2.50)dnl -+AC_REQUIRE([AC_ENABLE_SHARED])dnl -+AC_REQUIRE([AC_ENABLE_STATIC])dnl -+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_PROG_LD])dnl -+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -+AC_REQUIRE([AC_PROG_NM])dnl ++_LT_CHECK_OBJDIR -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -+AC_REQUIRE([AC_PROG_LN_S])dnl -+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -+AC_REQUIRE([AC_OBJEXT])dnl -+AC_REQUIRE([AC_EXEEXT])dnl -+dnl -+AC_LIBTOOL_SYS_MAX_CMD_LEN -+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+AC_LIBTOOL_OBJDIR ++m4_require([_LT_TAG_COMPILER])dnl ++_LT_PROG_ECHO_BACKSLASH -# This program 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 General Public License for more details. -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+_LT_AC_PROG_ECHO_BACKSLASH - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some @@ -1279,11 +1350,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + ;; +esac --# serial 1 +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e 1s/^X//' -+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] ++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +-# serial 1 ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\([["`\\]]\)/\\\1/g' -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. @@ -1297,14 +1374,14 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) -+# Same as above, but do not quote variable references. -+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] - --# serial 5 -*- Autoconf -*- +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' +-# serial 5 -*- Autoconf -*- ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + -# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' @@ -1313,62 +1390,50 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -+# Constants: -+rm="rm -f" ++# Global variables: ++ofile=libtool ++can_build_shared=yes -# This program 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 General Public License for more details. -+# Global variables: -+default_ofile=libtool -+can_build_shared=yes ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ltmain="$ac_aux_dir/ltmain.sh" -+ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" -+AC_CHECK_TOOL(AR, ar, false) -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+AC_CHECK_TOOL(STRIP, strip, :) ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" - +# Set sane defaults for various variables -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld -+test -z "$LN_S" && LN_S="ln -s" -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+test -z "$NM" && NM=nm -+test -z "$SED" && SED=sed -+test -z "$OBJDUMP" && OBJDUMP=objdump -+test -z "$RANLIB" && RANLIB=: -+test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= ++_LT_CC_BASENAME([$compiler]) + ++# Only perform the check for file, if the check method requires it ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ _LT_PATH_MAGIC ++ fi ++ ;; ++esac -# _AM_DEPENDENCIES(NAME) -# ---------------------- @@ -1385,23 +1450,18 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl -- ++# Use C for the default configuration in the libtool script ++LT_SUPPORTED_TAG([CC]) ++_LT_LANG_C_CONFIG ++_LT_LANG_DEFAULT_CONFIG ++_LT_CONFIG_COMMANDS ++])# _LT_SETUP + -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], @@ -1423,17 +1483,22 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub -+_LT_CC_BASENAME([$compiler]) ++# _LT_PROG_LTMAIN ++# --------------- ++# Note that this code is called both from `configure', and `config.status' ++# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, ++# `config.status' has no value for ac_aux_dir unless we are using Automake, ++# so we pass a copy along to make sure it has a sensible value anyway. ++m4_defun([_LT_PROG_LTMAIN], ++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl ++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) ++ltmain="$ac_aux_dir/ltmain.sh" ++])# _LT_PROG_LTMAIN - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -+# Only perform the check for file, if the check method requires it -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ AC_PATH_MAGIC - fi +- fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and @@ -1448,7 +1513,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - : > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -- + - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll @@ -1481,7 +1546,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - fi - fi - done -- + - cd .. - rm -rf conftest.dir -else @@ -1493,10 +1558,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) -+ ;; -+esac ++# So that we can recreate a full libtool script including additional ++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS ++# in macros and then make a single call at the end using the `libtool' ++# label. -+_LT_REQUIRED_DARWIN_CHECKS -# AM_SET_DEPDIR -# ------------- @@ -1505,22 +1571,39 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl --]) -+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+enable_win32_dll=yes, enable_win32_dll=no) ++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) ++# ---------------------------------------- ++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL_INIT], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], ++ [$1 ++])])]) + -+AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_INIT]) ++ ++ ++# _LT_CONFIG_LIBTOOL([COMMANDS]) ++# ------------------------------ ++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) ++ ++ ++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) ++# ----------------------------------------------------- ++m4_defun([_LT_CONFIG_SAVE_COMMANDS], ++[_LT_CONFIG_LIBTOOL([$1]) ++_LT_CONFIG_LIBTOOL_INIT([$2]) + ]) -+AC_ARG_WITH([pic], -+ [AC_HELP_STRING([--with-pic], -+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -+ [pic_mode="$withval"], -+ [pic_mode=default]) -+test -z "$pic_mode" && pic_mode=default -# AM_DEP_TRACK -# ------------ @@ -1534,47 +1617,125 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) --]) -+# Use C for the default configuration in the libtool script -+tagname= -+AC_LIBTOOL_LANG_C_CONFIG -+_LT_AC_TAGCONFIG -+])# AC_LIBTOOL_SETUP ++# _LT_FORMAT_COMMENT([COMMENT]) ++# ----------------------------- ++# Add leading comment marks to the start of each line, and a trailing ++# full-stop to the whole comment if one is not present already. ++m4_define([_LT_FORMAT_COMMENT], ++[m4_ifval([$1], [ ++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], ++ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) ++)]) ++ ++ ++ ++ ++ ++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) ++# ------------------------------------------------------------------- ++# CONFIGNAME is the name given to the value in the libtool script. ++# VARNAME is the (base) name used in the configure script. ++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on ++# VARNAME. Any other value will be used directly. ++m4_define([_LT_DECL], ++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], ++ [m4_ifval([$1], [$1], [$2])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) ++ m4_ifval([$4], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], ++ [tagged?], [m4_ifval([$5], [yes], [no])])]) + ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. -+# _LT_AC_SYS_COMPILER -+# ------------------- -+AC_DEFUN([_LT_AC_SYS_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl ++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) ++# -------------------------------------------------------- ++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) ++ ++ ++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_tag_varnames], ++[_lt_decl_filter([tagged?], [yes], $@)]) ++ ++ ++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) ++# --------------------------------------------------------- ++m4_define([_lt_decl_filter], ++[m4_case([$#], ++ [0], [m4_fatal([$0: too few arguments: $#])], ++ [1], [m4_fatal([$0: too few arguments: $#: $1])], ++ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], ++ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], ++ [lt_dict_filter([lt_decl_dict], $@)])[]dnl ++]) -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -# This program 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 General Public License for more details. -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) ++# -------------------------------------------------- ++m4_define([lt_decl_quote_varnames], ++[_lt_decl_filter([value], [1], $@)]) ++ ++ ++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_dquote_varnames], ++[_lt_decl_filter([value], [2], $@)]) ++ ++ ++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_varnames_tagged], ++[m4_assert([$# <= 2])dnl ++_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), ++ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) ++m4_define([_lt_decl_varnames_tagged], ++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) ++ ++ ++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_all_varnames], ++[_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_if([$2], [], ++ m4_quote(lt_decl_varnames), ++ m4_quote(m4_shift($@))))[]dnl ++]) ++m4_define([_lt_decl_all_varnames], ++[lt_join($@, lt_decl_varnames_tagged([$1], ++ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl ++]) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -+# Allow CC to be a program name with arguments. -+compiler=$CC -+])# _LT_AC_SYS_COMPILER -#serial 2 ++# _LT_CONFIG_STATUS_DECLARE([VARNAME]) ++# ------------------------------------ ++# Quote a variable value, and forward it to `config.status' so that its ++# declaration there will have the same value as in `configure'. VARNAME ++# must have a single quote delimited value for this to work. ++m4_define([_LT_CONFIG_STATUS_DECLARE], ++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) ++ -# _AM_OUTPUT_DEPENDENCY_COMMANDS --# ------------------------------ ++# _LT_CONFIG_STATUS_DECLARATIONS + # ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. @@ -1619,25 +1780,36 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+AC_DEFUN([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac - done +-done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS -- -- ++# We delimit libtool config variables with single quotes, so when ++# we write them to config.status, we have to be sure to quote all ++# embedded single quotes properly. In configure, this macro expands ++# each variable declared with _LT_DECL (and _LT_TAGDECL) into: ++# ++# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' ++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), ++ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) + + -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. --# ++# _LT_LIBTOOL_TAGS ++# ---------------- ++# Output comment and list of tags supported by the script ++m4_defun([_LT_LIBTOOL_TAGS], ++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl ++available_tags="_LT_TAGS"dnl ++]) ++ ++ ++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) ++# ----------------------------------- ++# Extract the dictionary values for VARNAME (optionally with TAG) and ++# expand to a commented shell variable setting: + # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. @@ -1645,61 +1817,59 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++# # Some comment about what VAR is for. ++# visible_name=$lt_internal_name ++m4_define([_LT_LIBTOOL_DECLARE], ++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], ++ [description])))[]dnl ++m4_pushdef([_libtool_name], ++ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl ++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), ++ [0], [_libtool_name=[$]$1], ++ [1], [_libtool_name=$lt_[]$1], ++ [2], [_libtool_name=$lt_[]$1], ++ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl ++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl ]) -# Check to see how 'make' treats includes. -*- Autoconf -*- -- + -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. ++# _LT_LIBTOOL_CONFIG_VARS ++# ----------------------- ++# Produce commented declarations of non-tagged libtool config variables ++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' ++# script. Tagged libtool config variables (even for the LIBTOOL CONFIG ++# section) are produced by _LT_LIBTOOL_TAG_VARS. ++m4_defun([_LT_LIBTOOL_CONFIG_VARS], ++[m4_foreach([_lt_var], ++ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -+# _LT_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+AC_DEFUN([_LT_COMPILER_BOILERPLATE], -+[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* -+])# _LT_COMPILER_BOILERPLATE -# This program 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 General Public License for more details. ++# _LT_LIBTOOL_TAG_VARS(TAG) ++# ------------------------- ++m4_define([_LT_LIBTOOL_TAG_VARS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+AC_DEFUN([_LT_LINKER_BOILERPLATE], -+[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 -r conftest* -+])# _LT_LINKER_BOILERPLATE -# serial 2 -+# _LT_REQUIRED_DARWIN_CHECKS -+# -------------------------- -+# Check for some things on darwin -+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ -+ case $host_os in -+ rhapsody* | darwin*) -+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++# _LT_TAGVAR(VARNAME, [TAGNAME]) ++# ------------------------------ ++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) -# AM_MAKE_INCLUDE() -# ----------------- @@ -1735,144 +1905,60 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - am__include=.include - am__quote="\"" - _am_result=BSD -+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -+ [lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* - fi +- fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -+ rm conftest.c -+ fi]) -+ AC_CACHE_CHECK([for -exported_symbols_list linker flag], -+ [lt_cv_ld_exported_symbols_list], -+ [lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [lt_cv_ld_exported_symbols_list=yes], -+ [lt_cv_ld_exported_symbols_list=no]) -+ LDFLAGS="$save_LDFLAGS" -+ ]) -+ case $host_os in -+ rhapsody* | darwin1.[[0123]]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac - ]) - +-]) +- -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. -+# _LT_AC_SYS_LIBPATH_AIX -+# ---------------------- -+# Links a minimal program and checks the executable -+# for the system default hardcoded library path. In most cases, -+# this is /usr/lib:/lib, but when the MPI compilers are used -+# the location of the communication and MPI libs are included too. -+# 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_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 "$lt_aix_libpath_sed"` -+fi],[]) -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+])# _LT_AC_SYS_LIBPATH_AIX -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - +- -# This program 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 General Public License for more details. -+# _LT_AC_SHELL_INIT(ARG) -+# ---------------------- -+AC_DEFUN([_LT_AC_SHELL_INIT], -+[ifdef([AC_DIVERSION_NOTICE], -+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -+ [AC_DIVERT_PUSH(NOTICE)]) -+$1 -+AC_DIVERT_POP -+])# _LT_AC_SHELL_INIT - +- -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. ++# _LT_CONFIG_COMMANDS ++# ------------------- ++# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of ++# variables for single and double quote escaping we saved from calls ++# to _LT_DECL, we can put quote escaped variables declarations ++# into `config.status', and then the shell code to quote escape them in ++# for loops in `config.status'. Finally, any additional code accumulated ++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. ++m4_defun([_LT_CONFIG_COMMANDS], ++[AC_PROVIDE_IFELSE([LT_OUTPUT], ++ dnl If the libtool generation code has been placed in $CONFIG_LT, ++ dnl instead of duplicating it all over again into config.status, ++ dnl then we will have config.status run $CONFIG_LT later, so it ++ dnl needs to know what name is stored there: ++ [AC_CONFIG_COMMANDS([libtool], ++ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], ++ dnl If the libtool generation code is destined for config.status, ++ dnl expand the accumulated commands and init code now: ++ [AC_CONFIG_COMMANDS([libtool], ++ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) ++])#_LT_CONFIG_COMMANDS -# serial 5 -+# _LT_AC_PROG_ECHO_BACKSLASH -+# -------------------------- -+# Add some code to the start of the generated configure script which -+# will find an echo command which doesn't interpret backslashes. -+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -+[_LT_AC_SHELL_INIT([ -+# Check that we are running under the correct shell. -+SHELL=${CONFIG_SHELL-/bin/sh} -AC_PREREQ(2.52) -+case X$ECHO in -+X*--fallback-echo) -+ # Remove one level of quotation (which was required for Make). -+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+ ;; -+esac ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], ++[ -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- @@ -1885,434 +1971,2427 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -if $2; then - $1_TRUE= - $1_FALSE='#' -+echo=${ECHO-echo} -+if test "X[$]1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X[$]1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $echo works! -+ : - else +-else - $1_TRUE='#' - $1_FALSE= -+ # Restart under the correct shell. -+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} - fi +-fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) -- --# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- -- --# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. -- --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -- --# This program 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 General Public License for more details. -- --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --AC_PREREQ([2.52]) -- --# serial 6 -- --# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. --AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -- --# Helper functions for option handling. -*- Autoconf -*- --# --# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. --# Written by Gary V. Vaughan, 2004 --# --# This file is free software; the Free Software Foundation gives --# unlimited permission to copy and/or distribute it, with or without --# modifications, as long as this notice is preserved. -- --# serial 6 ltoptions.m4 -- --# This is to help aclocal find these macros, as it can't see m4_define. --AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) -- -- --# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) --# ------------------------------------------ --m4_define([_LT_MANGLE_OPTION], --[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) -- -- --# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) --# --------------------------------------- --# Set option OPTION-NAME for macro MACRO-NAME, and if there is a --# matching handler defined, dispatch to it. Other OPTION-NAMEs are --# saved as a flag. --m4_define([_LT_SET_OPTION], --[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl --m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), -- _LT_MANGLE_DEFUN([$1], [$2]), -- [m4_warning([Unknown $1 option `$2'])])[]dnl --]) -- -- --# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) --# ------------------------------------------------------------ --# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. --m4_define([_LT_IF_OPTION], --[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) -- -- --# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) --# ------------------------------------------------------- --# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME --# are set. --m4_define([_LT_UNLESS_OPTIONS], --[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), -- [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), -- [m4_define([$0_found])])])[]dnl --m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 --])[]dnl --]) - -+if test "X[$]1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat <<EOF -+[$]* -+EOF -+ exit 0 -+fi - --# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) --# ---------------------------------------- --# OPTION-LIST is a space-separated list of Libtool options associated --# with MACRO-NAME. If any OPTION has a matching handler declared with --# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about --# the unknown option and exit. --m4_defun([_LT_SET_OPTIONS], --[# Set options --m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), -- [_LT_SET_OPTION([$1], _LT_Option)]) -- --m4_if([$1],[LT_INIT],[ -- dnl -- dnl Simply set some default values (i.e off) if boolean options were not -- dnl specified: -- _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no -- ]) -- _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no -- ]) -- dnl -- dnl If no reference was made to various pairs of opposing options, then -- dnl we run the default mode handler for the pair. For example, if neither -- dnl `shared' nor `disable-shared' was passed, we enable building of shared -- dnl archives by default: -- _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) -- _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) -- _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) -- _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], -- [_LT_ENABLE_FAST_INSTALL]) -- ]) --])# _LT_SET_OPTIONS -- +# 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 -+if test -z "$ECHO"; then -+if test "X${echo_test_string+set}" != Xset; then -+# find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && -+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -+ then -+ break -+ fi -+ done -+fi - --# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) --# ----------------------------------------- --m4_define([_LT_MANGLE_DEFUN], --[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) -+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. - -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$dir/echo" -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" - --# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) --# ----------------------------------------------- --m4_define([LT_OPTION_DEFINE], --[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl --])# LT_OPTION_DEFINE -+ if test "X$echo" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ echo='print -r' -+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -+ else -+ # Try using printf. -+ echo='printf %s\n' -+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ else -+ # maybe with a smaller string... -+ prev=: - -+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -+ then -+ break -+ fi -+ prev="$cmd" -+ done - --# dlopen --# ------ --LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes --]) -+ if test "$prev" != 'sed 50q "[$]0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ echo=echo -+ fi -+ fi -+ fi -+ fi -+fi -+fi - --AU_DEFUN([AC_LIBTOOL_DLOPEN], --[_LT_SET_OPTION([LT_INIT], [dlopen]) --AC_DIAGNOSE([obsolete], --[$0: Remove this warning and the call to _LT_SET_OPTION when you --put the `dlopen' option into LT_INIT's first parameter.]) --]) -+# Copy echo and quote the copy suitably for passing to libtool from -+# the Makefile, instead of quoting the original, which is used later. -+ECHO=$echo -+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -+fi - --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) -+AC_SUBST(ECHO) -+])])# _LT_AC_PROG_ECHO_BACKSLASH - - --# win32-dll --# --------- --# Declare package support for building win32 dll's. --LT_OPTION_DEFINE([LT_INIT], [win32-dll], --[enable_win32_dll=yes -+# _LT_AC_LOCK -+# ----------- -+AC_DEFUN([_LT_AC_LOCK], -+[AC_ARG_ENABLE([libtool-lock], -+ [AC_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. - case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) -- AC_CHECK_TOOL(AS, as, false) -- AC_CHECK_TOOL(DLLTOOL, dlltool, false) -- AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ia64-*-hpux*) -+ # 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.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" +-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++_LT_CONFIG_STATUS_DECLARATIONS ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# Quote evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_quote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac -+ fi -+ rm -rf conftest* ++done + +-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. ++# Double-quote double-evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_dquote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done + +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\[$]0 --fallback-echo"')dnl " ++ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` + ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* - ;; ++esac + +-# This program 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 General Public License for more details. ++_LT_OUTPUT_LIBTOOL_INIT ++]) + +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. + +-AC_PREREQ([2.52]) ++# LT_OUTPUT ++# --------- ++# This macro allows early generation of the libtool script (before ++# AC_OUTPUT is called), incase it is used in configure for compilation ++# tests. ++AC_DEFUN([LT_OUTPUT], ++[: ${CONFIG_LT=./config.lt} ++AC_MSG_NOTICE([creating $CONFIG_LT]) ++cat >"$CONFIG_LT" <<_LTEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate a libtool stub with the current configuration. ++ ++lt_cl_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AS_SHELL_SANITIZE ++_AS_PREPARE + +-# serial 6 ++exec AS_MESSAGE_FD>&1 ++exec AS_MESSAGE_LOG_FD>>config.log ++{ ++ echo ++ AS_BOX([Running $as_me.]) ++} >&AS_MESSAGE_LOG_FD ++ ++lt_cl_help="\ ++\`$as_me' creates a local libtool stub from the current configuration, ++for use in further configure time tests before the real libtool is ++generated. ++ ++Usage: $[0] [[OPTIONS]] ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ ++Report bugs to <bug-libtool@gnu.org>." ++ ++lt_cl_version="\ ++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl ++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) ++configured by $[0], generated by m4_PACKAGE_STRING. ++ ++Copyright (C) 2008 Free Software Foundation, Inc. ++This config.lt script is free software; the Free Software Foundation ++gives unlimited permision to copy, distribute and modify it." + +-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++while test $[#] != 0 ++do ++ case $[1] in ++ --version | --v* | -V ) ++ echo "$lt_cl_version"; exit 0 ;; ++ --help | --h* | -h ) ++ echo "$lt_cl_help"; exit 0 ;; ++ --debug | --d* | -d ) ++ debug=: ;; ++ --quiet | --q* | --silent | --s* | -q ) ++ lt_cl_silent=: ;; + +-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++ -*) AC_MSG_ERROR([unrecognized option: $[1] ++Try \`$[0] --help' for more information.]) ;; + +-# serial 52 AC_PROG_LIBTOOL ++ *) AC_MSG_ERROR([unrecognized argument: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ esac ++ shift ++done + ++if $lt_cl_silent; then ++ exec AS_MESSAGE_FD>/dev/null ++fi ++_LTEOF + +-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +-# ----------------------------------------------------------- +-# If this macro is not defined by Autoconf, define it here. +-m4_ifdef([AC_PROVIDE_IFELSE], +- [], +- [m4_define([AC_PROVIDE_IFELSE], +- [m4_ifdef([AC_PROVIDE_$1], +- [$2], [$3])])]) ++cat >>"$CONFIG_LT" <<_LTEOF ++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AC_MSG_NOTICE([creating $ofile]) ++_LT_OUTPUT_LIBTOOL_COMMANDS ++AS_EXIT(0) ++_LTEOF ++chmod +x "$CONFIG_LT" ++ ++# configure is writing to config.log, but config.lt does its own redirection, ++# appending to config.log, which fails on DOS, as config.log is still kept ++# open by configure. Here we exec the FD to /dev/null, effectively closing ++# config.log, so it can be properly (re)opened and appended to by config.lt. ++if test "$no_create" != yes; then ++ lt_cl_success=: ++ test "$silent" = yes && ++ lt_config_lt_args="$lt_config_lt_args --quiet" ++ exec AS_MESSAGE_LOG_FD>/dev/null ++ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++ exec AS_MESSAGE_LOG_FD>>config.log ++ $lt_cl_success || AS_EXIT(1) ++fi ++])# LT_OUTPUT + + +-# AC_PROG_LIBTOOL ++# _LT_CONFIG(TAG) + # --------------- +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. +- AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [AC_LIBTOOL_CXX], +- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX +- ])]) +-dnl And a similar setup for Fortran 77 support +- AC_PROVIDE_IFELSE([AC_PROG_F77], +- [AC_LIBTOOL_F77], +- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +-])]) +- +-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. +- AC_PROVIDE_IFELSE([AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], +- [AC_LIBTOOL_GCJ], +- [ifdef([AC_PROG_GCJ], +- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([A][M_PROG_GCJ], +- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) +- ifdef([LT_AC_PROG_GCJ], +- [define([LT_AC_PROG_GCJ], +- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +-])])# AC_PROG_LIBTOOL +- +- +-# _AC_PROG_LIBTOOL +-# ---------------- +-AC_DEFUN([_AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl +- +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl +- +-# Prevent multiple expansion +-define([AC_PROG_LIBTOOL], []) +-])# _AC_PROG_LIBTOOL +- +- +-# AC_LIBTOOL_SETUP +-# ---------------- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.50)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +- +-AC_REQUIRE([AC_PROG_LN_S])dnl +-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-AC_REQUIRE([AC_OBJEXT])dnl +-AC_REQUIRE([AC_EXEEXT])dnl +-dnl +-AC_LIBTOOL_SYS_MAX_CMD_LEN +-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-AC_LIBTOOL_OBJDIR ++# If TAG is the built-in tag, create an initial libtool script with a ++# default configuration from the untagged config vars. Otherwise add code ++# to config.status for appending the configuration named by TAG from the ++# matching tagged config vars. ++m4_defun([_LT_CONFIG], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_CONFIG_SAVE_COMMANDS([ ++ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl ++ m4_if(_LT_TAG, [C], [ ++ # 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 ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" + +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +-_LT_AC_PROG_ECHO_BACKSLASH ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL + +-case $host_os in +-aix3*) +- # AIX sometimes has problems with the GCC collect2 program. For some +- # reason, if we set the COLLECT_NAMES environment variable, the problems +- # vanish in a puff of smoke. +- if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +- fi +- ;; -esac - +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed='sed -e 1s/^X//' +-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] +- +-# Same as above, but do not quote variable references. +-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] +- +-# Sed substitution to delay expansion of an escaped shell variable in a +-# double_quote_subst'ed string. +-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++_LT_COPYING ++_LT_LIBTOOL_TAGS + +-# Sed substitution to avoid accidental globbing in evaled expressions +-no_glob_subst='s/\*/\\\*/g' ++# ### BEGIN LIBTOOL CONFIG ++_LT_LIBTOOL_CONFIG_VARS ++_LT_LIBTOOL_TAG_VARS ++# ### END LIBTOOL CONFIG + +-# Constants: +-rm="rm -f" ++_LT_EOF + +-# Global variables: +-default_ofile=libtool +-can_build_shared=yes ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac + +-# All known linkers require a `.a' archive for static linking (except MSVC, +-# which needs '.lib'). +-libext=a +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" +-with_gnu_ld="$lt_cv_prog_gnu_ld" ++ _LT_PROG_LTMAIN + +-AC_CHECK_TOOL(AR, ar, false) +-AC_CHECK_TOOL(RANLIB, ranlib, :) +-AC_CHECK_TOOL(STRIP, strip, :) ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +-old_CC="$CC" +-old_CFLAGS="$CFLAGS" ++ _LT_PROG_XSI_SHELLFNS + +-# Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as --_LT_DECL([], [AS], [0], [Assembler program])dnl -- +-test -z "$CC" && CC=cc +-test -z "$LTCC" && LTCC=$CC +-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$DLLTOOL" && DLLTOOL=dlltool --_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl - +-test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump --_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl --])# win32-dll -+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" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *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" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: +-test -z "$ac_objext" && ac_objext=o ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) --AU_DEFUN([AC_LIBTOOL_WIN32_DLL], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl --_LT_SET_OPTION([LT_INIT], [win32-dll]) --AC_DIAGNOSE([obsolete], --[$0: Remove this warning and the call to _LT_SET_OPTION when you --put the `win32-dll' option into LT_INIT's first parameter.]) +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++], ++[cat <<_LT_EOF >> "$ofile" + +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" +- ;; +- *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi ++dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded ++dnl in a comment (ie after a #). ++# ### BEGIN LIBTOOL TAG CONFIG: $1 ++_LT_LIBTOOL_TAG_VARS(_LT_TAG) ++# ### END LIBTOOL TAG CONFIG: $1 ++_LT_EOF ++])dnl /m4_if ++], ++[m4_if([$1], [], [ ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile'], []) ++])dnl /_LT_CONFIG_SAVE_COMMANDS ++])# _LT_CONFIG ++ ++ ++# LT_SUPPORTED_TAG(TAG) ++# --------------------- ++# Trace this macro to discover what tags are supported by the libtool ++# --tag option, using: ++# autoconf --trace 'LT_SUPPORTED_TAG:$1' ++AC_DEFUN([LT_SUPPORTED_TAG], []) ++ ++ ++# C support is built-in for now ++m4_define([_LT_LANG_C_enabled], []) ++m4_define([_LT_TAGS], []) + +-_LT_CC_BASENAME([$compiler]) + +-# Only perform the check for file, if the check method requires it +-case $deplibs_check_method in +-file_magic*) +- if test "$file_magic_cmd" = '$MAGIC_CMD'; then +- AC_PATH_MAGIC +- fi +- ;; +-esac ++# LT_LANG(LANG) ++# ------------- ++# Enable libtool support for the given language if not already enabled. ++AC_DEFUN([LT_LANG], ++[AC_BEFORE([$0], [LT_OUTPUT])dnl ++m4_case([$1], ++ [C], [_LT_LANG(C)], ++ [C++], [_LT_LANG(CXX)], ++ [Java], [_LT_LANG(GCJ)], ++ [Fortran 77], [_LT_LANG(F77)], ++ [Fortran], [_LT_LANG(FC)], ++ [Windows Resource], [_LT_LANG(RC)], ++ [m4_ifdef([_LT_LANG_]$1[_CONFIG], ++ [_LT_LANG($1)], ++ [m4_fatal([$0: unsupported language: "$1"])])])dnl ++])# LT_LANG + +-_LT_REQUIRED_DARWIN_CHECKS + +-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-enable_win32_dll=yes, enable_win32_dll=no) +- +-AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++# _LT_LANG(LANGNAME) ++# ------------------ ++m4_defun([_LT_LANG], ++[m4_ifdef([_LT_LANG_]$1[_enabled], [], ++ [LT_SUPPORTED_TAG([$1])dnl ++ m4_append([_LT_TAGS], [$1 ])dnl ++ m4_define([_LT_LANG_]$1[_enabled], [])dnl ++ _LT_LANG_$1_CONFIG($1)])dnl ++])# _LT_LANG + +-AC_ARG_WITH([pic], +- [AC_HELP_STRING([--with-pic], +- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], +- [pic_mode="$withval"], +- [pic_mode=default]) +-test -z "$pic_mode" && pic_mode=default + +-# Use C for the default configuration in the libtool script +-tagname= +-AC_LIBTOOL_LANG_C_CONFIG +-_LT_AC_TAGCONFIG +-])# AC_LIBTOOL_SETUP ++# _LT_LANG_DEFAULT_CONFIG ++# ----------------------- ++m4_defun([_LT_LANG_DEFAULT_CONFIG], ++[AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [LT_LANG(CXX)], ++ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [LT_LANG(F77)], ++ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_FC], ++ [LT_LANG(FC)], ++ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) ++ ++dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal ++dnl pulling things in needlessly. ++AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([LT_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [m4_ifdef([AC_PROG_GCJ], ++ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([A][M_PROG_GCJ], ++ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([LT_PROG_GCJ], ++ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) ++ ++AC_PROVIDE_IFELSE([LT_PROG_RC], ++ [LT_LANG(RC)], ++ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) ++])# _LT_LANG_DEFAULT_CONFIG ++ ++# Obsolete macros: ++AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) ++AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) ++AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) ++AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_CXX], []) ++dnl AC_DEFUN([AC_LIBTOOL_F77], []) ++dnl AC_DEFUN([AC_LIBTOOL_FC], []) ++dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) + + +-# _LT_AC_SYS_COMPILER +-# ------------------- +-AC_DEFUN([_LT_AC_SYS_COMPILER], ++# _LT_TAG_COMPILER ++# ---------------- ++m4_defun([_LT_TAG_COMPILER], + [AC_REQUIRE([AC_PROG_CC])dnl + ++_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl ++_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl ++_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl ++_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl ++ + # If no C compiler was specified, use CC. + LTCC=${LTCC-"$CC"} + +@@ -1168,36 +1556,20 @@ + + # Allow CC to be a program name with arguments. + compiler=$CC +-])# _LT_AC_SYS_COMPILER +- +- +-# _LT_CC_BASENAME(CC) +-# ------------------- +-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +-AC_DEFUN([_LT_CC_BASENAME], +-[for cc_temp in $1""; do +- case $cc_temp in +- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; +- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) ++])# _LT_TAG_COMPILER + + + # _LT_COMPILER_BOILERPLATE + # ------------------------ + # Check for compiler boilerplate output or warnings with + # the simple compiler test code. +-AC_DEFUN([_LT_COMPILER_BOILERPLATE], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl ++m4_defun([_LT_COMPILER_BOILERPLATE], ++[m4_require([_LT_DECL_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* ++$RM conftest* + ])# _LT_COMPILER_BOILERPLATE + + +@@ -1205,39 +1577,57 @@ + # ---------------------- + # Check for linker boilerplate output or warnings with + # the simple link test code. +-AC_DEFUN([_LT_LINKER_BOILERPLATE], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl ++m4_defun([_LT_LINKER_BOILERPLATE], ++[m4_require([_LT_DECL_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 -r conftest* ++$RM -r conftest* + ])# _LT_LINKER_BOILERPLATE + + # _LT_REQUIRED_DARWIN_CHECKS +-# -------------------------- +-# Check for some things on darwin +-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ ++# ------------------------- ++m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ AC_CHECK_TOOL([LIPO], [lipo], [:]) ++ AC_CHECK_TOOL([OTOOL], [otool], [:]) ++ AC_CHECK_TOOL([OTOOL64], [otool64], [:]) ++ _LT_DECL([], [DSYMUTIL], [1], ++ [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) ++ _LT_DECL([], [NMEDIT], [1], ++ [Tool to change global to local symbols on Mac OS X]) ++ _LT_DECL([], [LIPO], [1], ++ [Tool to manipulate fat objects and archives on Mac OS X]) ++ _LT_DECL([], [OTOOL], [1], ++ [ldd/readelf like tool for Mach-O binaries on Mac OS X]) ++ _LT_DECL([], [OTOOL64], [1], ++ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then +- # By default we will add the -single_module flag. You can override +- # by either setting the environment variable LT_MULTI_MODULE +- # non-empty at configure time, or by adding -multi_module to the +- # link flags. +- echo "int foo(void){return 1;}" > conftest.c +- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +- -dynamiclib ${wl}-single_module conftest.c +- if test -f libconftest.dylib; then +- lt_cv_apple_cc_single_mod=yes +- rm -rf libconftest.dylib* +- fi +- rm conftest.c ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ rm -rf libconftest.dylib* ++ echo "int foo(void){return 1;}" > conftest.c ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++ _lt_result=$? ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ lt_cv_apple_cc_single_mod=yes ++ else ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ fi ++ rm -rf libconftest.dylib* ++ rm -f conftest.* + fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], +@@ -1246,26 +1636,26 @@ + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], +- [lt_cv_ld_exported_symbols_list=yes], +- [lt_cv_ld_exported_symbols_list=no]) +- LDFLAGS="$save_LDFLAGS" ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" + ]) + case $host_os in +- rhapsody* | darwin1.[[0123]]) ++ rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- darwin*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- 10.[[012]]*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- 10.*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac +@@ -1275,10 +1665,10 @@ + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else +- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":"; then +- _lt_dsymutil="~$DSYMUTIL \$lib || :" ++ _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi +@@ -1286,16 +1676,51 @@ + esac + ]) + +-# _LT_AC_SYS_LIBPATH_AIX +-# ---------------------- ++ ++# _LT_DARWIN_LINKER_FEATURES ++# -------------------------- ++# Checks for linker and compiler features on darwin ++m4_defun([_LT_DARWIN_LINKER_FEATURES], ++[ ++ m4_require([_LT_REQUIRED_DARWIN_CHECKS]) ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=echo ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ m4_if([$1], [CXX], ++[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi ++],[]) ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++]) ++ ++# _LT_SYS_MODULE_PATH_AIX ++# ----------------------- + # Links a minimal program and checks the executable + # for the system default hardcoded library path. In most cases, + # this is /usr/lib:/lib, but when the MPI compilers are used + # the location of the communication and MPI libs are included too. + # 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_REQUIRE([LT_AC_PROG_SED])dnl ++m4_defun([_LT_SYS_MODULE_PATH_AIX], ++[m4_require([_LT_DECL_SED])dnl + AC_LINK_IFELSE(AC_LANG_PROGRAM,[ + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -1310,45 +1735,45 @@ + 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 ++])# _LT_SYS_MODULE_PATH_AIX + + +-# _LT_AC_SHELL_INIT(ARG) +-# ---------------------- +-AC_DEFUN([_LT_AC_SHELL_INIT], ++# _LT_SHELL_INIT(ARG) ++# ------------------- ++m4_define([_LT_SHELL_INIT], + [ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) + $1 + AC_DIVERT_POP +-])# _LT_AC_SHELL_INIT ++])# _LT_SHELL_INIT + + +-# _LT_AC_PROG_ECHO_BACKSLASH +-# -------------------------- ++# _LT_PROG_ECHO_BACKSLASH ++# ----------------------- + # Add some code to the start of the generated configure script which + # will find an echo command which doesn't interpret backslashes. +-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +-[_LT_AC_SHELL_INIT([ ++m4_defun([_LT_PROG_ECHO_BACKSLASH], ++[_LT_SHELL_INIT([ + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + +-case X$ECHO in ++case X$lt_ECHO in + X*--fallback-echo) + # Remove one level of quotation (which was required for Make). +- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; + esac + +-echo=${ECHO-echo} ++ECHO=${lt_ECHO-echo} + if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $ECHO works! + : + else + # Restart under the correct shell. +@@ -1358,9 +1783,9 @@ + if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift +- cat <<EOF ++ cat <<_LT_EOF + [$]* +-EOF ++_LT_EOF + exit 0 + fi + +@@ -1368,124 +1793,127 @@ + # if CDPATH is set. + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +-if test -z "$ECHO"; then +-if test "X${echo_test_string+set}" != Xset; then +-# find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if (echo_test_string=`eval $cmd`) 2>/dev/null && +- echo_test_string=`eval $cmd` && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break +- fi +- done +-fi ++if test -z "$lt_ECHO"; then ++ if test "X${echo_test_string+set}" != Xset; then ++ # find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++ then ++ break ++ fi ++ done ++ fi + +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +-else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++ else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. + +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do +- IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" + +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL [$]0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL [$]0 --fallback-echo" ++ if test "X$ECHO" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ ECHO='print -r' ++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} + else +- # maybe with a smaller string... +- prev=: ++ # Try using printf. ++ ECHO='printf %s\n' ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: + +- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done + +- if test "$prev" != 'sed 50q "[$]0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} +- else +- # Oops. We lost completely, so just stick with echo. +- echo=echo +- fi ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ ECHO=echo ++ fi ++ fi + fi + fi + fi + fi +-fi + + # Copy echo and quote the copy suitably for passing to libtool from + # the Makefile, instead of quoting the original, which is used later. +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++lt_ECHO=$ECHO ++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" + fi + +-AC_SUBST(ECHO) +-])])# _LT_AC_PROG_ECHO_BACKSLASH ++AC_SUBST(lt_ECHO) ++]) ++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) ++_LT_DECL([], [ECHO], [1], ++ [An echo program that does not interpret backslashes]) ++])# _LT_PROG_ECHO_BACKSLASH + + +-# _LT_AC_LOCK +-# ----------- +-AC_DEFUN([_LT_AC_LOCK], ++# _LT_ENABLE_LOCK ++# --------------- ++m4_defun([_LT_ENABLE_LOCK], + [AC_ARG_ENABLE([libtool-lock], +- [AC_HELP_STRING([--disable-libtool-lock], +- [avoid locking (might break parallel builds)])]) ++ [AS_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) + test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + # Some flags need to be propagated to the compiler or linker for good +@@ -1496,12 +1924,12 @@ + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; + esac + fi + rm -rf conftest* +@@ -1510,80 +1938,79 @@ + # Find out which ABI we are using. + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi + fi + rm -rf conftest* + ;; + + x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +-s390*-*linux*|sparc*-*linux*) ++s390*-*linux*|s390*-*tpf*|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" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *64-bit*) +- libsuff=64 +- 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" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; ++ *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" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *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" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*|s390*-*tpf*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; + esac + fi + rm -rf conftest* +@@ -1595,7 +2022,7 @@ + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) +- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +@@ -1611,7 +2038,7 @@ + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; +@@ -1621,30 +2048,63 @@ + fi + rm -rf conftest* + ;; - --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) +-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) +- ;; +- ]) + esac + + need_locks="$enable_libtool_lock" ++])# _LT_ENABLE_LOCK ++ ++ ++# _LT_CMD_OLD_ARCHIVE ++# ------------------- ++m4_defun([_LT_CMD_OLD_ARCHIVE], ++[AC_CHECK_TOOL(AR, ar, false) ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1]) ++ ++AC_CHECK_TOOL(STRIP, strip, :) ++test -z "$STRIP" && STRIP=: ++_LT_DECL([], [STRIP], [1], [A symbol stripping program]) ++ ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++test -z "$RANLIB" && RANLIB=: ++_LT_DECL([], [RANLIB], [1], ++ [Commands used to install an old-style archive]) ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= + +-])# _LT_AC_LOCK ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++_LT_DECL([], [old_postinstall_cmds], [2]) ++_LT_DECL([], [old_postuninstall_cmds], [2]) ++_LT_TAGDECL([], [old_archive_cmds], [2], ++ [Commands used to build an old-style archive]) ++])# _LT_CMD_OLD_ARCHIVE + + +-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, + # [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) + # ---------------------------------------------------------------- + # Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED]) ++AC_DEFUN([_LT_COMPILER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl + AC_CACHE_CHECK([$1], [$2], + [$2=no +- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or +@@ -1664,29 +2124,35 @@ + 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. +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi +- $rm conftest* ++ $RM conftest* + ]) + + if test x"[$]$2" = xyes; then +- ifelse([$5], , :, [$5]) ++ m4_if([$5], , :, [$5]) + else +- ifelse([$6], , :, [$6]) ++ m4_if([$6], , :, [$6]) + fi +-])# AC_LIBTOOL_COMPILER_OPTION ++])# _LT_COMPILER_OPTION + +- +-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +-# [ACTION-SUCCESS], [ACTION-FAILURE]) +-# ------------------------------------------------------------ +-# Check whether the given compiler option works +-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl ++# Old name: ++AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) ++ ++ ++# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------- ++# Check whether the given linker option works ++AC_DEFUN([_LT_LINKER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl + AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" +@@ -1698,7 +2164,7 @@ + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes +@@ -1707,22 +2173,28 @@ + $2=yes + fi + fi +- $rm -r conftest* ++ $RM -r conftest* + LDFLAGS="$save_LDFLAGS" + ]) + + if test x"[$]$2" = xyes; then +- ifelse([$4], , :, [$4]) ++ m4_if([$4], , :, [$4]) + else +- ifelse([$5], , :, [$5]) ++ m4_if([$5], , :, [$5]) + fi +-])# AC_LIBTOOL_LINKER_OPTION ++])# _LT_LINKER_OPTION + ++# Old name: ++AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + +-# AC_LIBTOOL_SYS_MAX_CMD_LEN +-# -------------------------- +-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +-[# find the maximum length of command line arguments ++ ++# LT_CMD_MAX_LEN ++#--------------- ++AC_DEFUN([LT_CMD_MAX_LEN], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++# find the maximum length of command line arguments + AC_MSG_CHECKING([the maximum length of command line arguments]) + AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 +@@ -1744,7 +2216,7 @@ + lt_cv_sys_max_cmd_len=-1; + ;; + +- cygwin* | mingw*) ++ cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, +@@ -1799,7 +2271,7 @@ + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi +@@ -1810,20 +2282,28 @@ + 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 ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done + 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 && ++ # 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. ++ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++ = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + 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. ++ # 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 + ;; +@@ -1834,27 +2314,35 @@ + else + AC_MSG_RESULT(none) + fi +-])# AC_LIBTOOL_SYS_MAX_CMD_LEN ++max_cmd_len=$lt_cv_sys_max_cmd_len ++_LT_DECL([], [max_cmd_len], [0], ++ [What is the maximum length of a command?]) ++])# LT_CMD_MAX_LEN + ++# Old name: ++AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + +-# _LT_AC_CHECK_DLFCN +-# ------------------ +-AC_DEFUN([_LT_AC_CHECK_DLFCN], +-[AC_CHECK_HEADERS(dlfcn.h)dnl +-])# _LT_AC_CHECK_DLFCN ++ ++# _LT_HEADER_DLFCN ++# ---------------- ++m4_defun([_LT_HEADER_DLFCN], ++[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl ++])# _LT_HEADER_DLFCN + + +-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +-# --------------------------------------------------------------------- +-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# ---------------------------------------------------------------- ++m4_defun([_LT_TRY_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl + if test "$cross_compiling" = yes; then : + [$4] + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown +- cat > conftest.$ac_ext <<EOF ++ cat > conftest.$ac_ext <<_LT_EOF + [#line __oline__ "configure" + #include "confdefs.h" + +@@ -1896,10 +2384,6 @@ + # endif + #endif + +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- + void fnord() { int i=42;} + int main () + { +@@ -1915,9 +2399,9 @@ + else + puts (dlerror ()); + +- exit (status); ++ return status; + }] +-EOF ++_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? +@@ -1932,13 +2416,13 @@ + fi + fi + rm -fr conftest* +-])# _LT_AC_TRY_DLOPEN_SELF ++])# _LT_TRY_DLOPEN_SELF + + +-# AC_LIBTOOL_DLOPEN_SELF +-# ---------------------- +-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl ++# LT_SYS_DLOPEN_SELF ++# ------------------ ++AC_DEFUN([LT_SYS_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown +@@ -1954,15 +2438,15 @@ + lt_cv_dlopen_self=yes + ;; + +- mingw* | pw32*) ++ mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= +- ;; ++ ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= +- ;; ++ ;; + + darwin*) + # if libdl is installed we need to link against it +@@ -1972,7 +2456,7 @@ + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) +- ;; ++ ;; + + *) + AC_CHECK_FUNC([shl_load], +@@ -2014,7 +2498,7 @@ + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl +- _LT_AC_TRY_DLOPEN_SELF( ++ _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) +@@ -2022,8 +2506,8 @@ + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], +- lt_cv_dlopen_self_static, [dnl +- _LT_AC_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static, [dnl ++ _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) +@@ -2045,19 +2529,32 @@ + *) enable_dlopen_self_static=unknown ;; + esac + fi +-])# AC_LIBTOOL_DLOPEN_SELF ++_LT_DECL([dlopen_support], [enable_dlopen], [0], ++ [Whether dlopen is supported]) ++_LT_DECL([dlopen_self], [enable_dlopen_self], [0], ++ [Whether dlopen of programs is supported]) ++_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], ++ [Whether dlopen of statically linked programs is supported]) ++])# LT_SYS_DLOPEN_SELF ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +-# --------------------------------- +-# 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_PROG_SED])dnl +-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++# _LT_COMPILER_C_O([TAGNAME]) ++# --------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler. ++# This macro does not hard code the compiler like AC_PROG_CC_C_O. ++m4_defun([_LT_COMPILER_C_O], ++[m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_TAG_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 +- $rm -r conftest 2>/dev/null ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out +@@ -2081,37 +2578,41 @@ + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD +- $rm conftest* ++ $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out + cd .. +- rmdir conftest +- $rm conftest* ++ $RM -r conftest ++ $RM conftest* + ]) +-])# AC_LIBTOOL_PROG_CC_C_O ++_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], ++ [Does compiler simultaneously support -c and -o options?]) ++])# _LT_COMPILER_C_O + + +-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +-# ----------------------------------------- ++# _LT_COMPILER_FILE_LOCKS([TAGNAME]) ++# ---------------------------------- + # Check to see if we can do hard links to lock some files if needed +-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +-[AC_REQUIRE([_LT_AC_LOCK])dnl ++m4_defun([_LT_COMPILER_FILE_LOCKS], ++[m4_require([_LT_ENABLE_LOCK])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_COMPILER_C_O([$1]) + + hard_links="nottested" +-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes +- $rm conftest* ++ $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no +@@ -2124,12 +2625,13 @@ + else + need_locks=no + fi +-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS ++_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) ++])# _LT_COMPILER_FILE_LOCKS + + +-# AC_LIBTOOL_OBJDIR +-# ----------------- +-AC_DEFUN([AC_LIBTOOL_OBJDIR], ++# _LT_CHECK_OBJDIR ++# ---------------- ++m4_defun([_LT_CHECK_OBJDIR], + [AC_CACHE_CHECK([for objdir], [lt_cv_objdir], + [rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null +@@ -2141,40 +2643,46 @@ + fi + rmdir .libs 2>/dev/null]) + objdir=$lt_cv_objdir +-])# AC_LIBTOOL_OBJDIR ++_LT_DECL([], [objdir], [0], ++ [The name of the directory that contains temporary libtool files])dnl ++m4_pattern_allow([LT_OBJDIR])dnl ++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", ++ [Define to the sub-directory in which libtool stores uninstalled libraries.]) ++])# _LT_CHECK_OBJDIR + + +-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +-# ---------------------------------------------- ++# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) ++# -------------------------------------- + # Check hardcoding attributes. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], ++m4_defun([_LT_LINKER_HARDCODE_LIBPATH], + [AC_MSG_CHECKING([how to hardcode library paths into programs]) +-_LT_AC_TAGVAR(hardcode_action, $1)= +-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ +- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ +- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++_LT_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || ++ test -n "$_LT_TAGVAR(runpath_var, $1)" || ++ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + +- # We can hardcode non-existant directories. +- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && ++ # We can hardcode non-existent directories. ++ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && +- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. +- _LT_AC_TAGVAR(hardcode_action, $1)=relink ++ _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. +- _LT_AC_TAGVAR(hardcode_action, $1)=immediate ++ _LT_TAGVAR(hardcode_action, $1)=immediate + fi + else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. +- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported ++ _LT_TAGVAR(hardcode_action, $1)=unsupported + fi +-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) ++AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then ++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || ++ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then + # Fast installation is not supported + enable_fast_install=no + elif test "$shlibpath_overrides_runpath" = yes || +@@ -2182,73 +2690,70 @@ + # Fast installation is not necessary + enable_fast_install=needless + fi +-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH ++_LT_TAGDECL([], [hardcode_action], [0], ++ [How to hardcode a shared library path into an executable]) ++])# _LT_LINKER_HARDCODE_LIBPATH + + +-# AC_LIBTOOL_SYS_LIB_STRIP +-# ------------------------ +-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +-[striplib= ++# _LT_CMD_STRIPLIB ++# ---------------- ++m4_defun([_LT_CMD_STRIPLIB], ++[m4_require([_LT_DECL_EGREP]) ++striplib= + old_striplib= + AC_MSG_CHECKING([whether stripping libraries is possible]) +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- old_striplib="$STRIP -S" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +-fi +- ;; +- *) +- AC_MSG_RESULT([no]) ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) + ;; + esac + fi +-])# AC_LIBTOOL_SYS_LIB_STRIP ++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) ++_LT_DECL([], [striplib], [1]) ++])# _LT_CMD_STRIPLIB + + +-# AC_LIBTOOL_SYS_DYNAMIC_LINKER ++# _LT_SYS_DYNAMIC_LINKER([TAG]) + # ----------------------------- + # PORTME Fill in your ld.so characteristics +-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl ++m4_defun([_LT_SYS_DYNAMIC_LINKER], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_OBJDUMP])dnl ++m4_require([_LT_DECL_SED])dnl + AC_MSG_CHECKING([dynamic linker characteristics]) +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" +-m4_if($1,[],[ ++m4_if([$1], ++ [], [ + if test "$GCC" = yes; 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 $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. +- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else +- lt_search_path_spec=`echo "$lt_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. +@@ -2262,7 +2767,7 @@ + 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 ' ++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' + BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; +@@ -2282,10 +2787,23 @@ + 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` ++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` + else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + fi]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -2322,7 +2840,7 @@ + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no +@@ -2348,9 +2866,18 @@ + ;; + + amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac + ;; + + beos*) +@@ -2373,25 +2900,28 @@ + # libtool to hard-code these into programs + ;; + +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname' ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ +- $rm \$dlpath' ++ $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in +@@ -2400,20 +2930,20 @@ + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- mingw*) ++ mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- 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 ';[c-zC-Z]:/' >/dev/null]; 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 ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ 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"` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) +@@ -2437,13 +2967,13 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +- m4_if([$1], [],[ +- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) ++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' + ;; + +@@ -2536,18 +3066,18 @@ + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH +@@ -2624,17 +3154,26 @@ + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no ++ # Some binutils ld are patched to set DT_RUNPATH ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ ++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], ++ [shlibpath_overrides_runpath=yes])]) ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # 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>/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="$sys_lib_dlsearch_path_spec $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 +@@ -2646,11 +3185,23 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-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='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' +@@ -2671,14 +3222,16 @@ + shlibpath_overrides_runpath=yes + ;; + +-nto-qnx*) +- version_type=linux ++*nto* | *qnx*) ++ version_type=qnx + 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=yes ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' + ;; + + openbsd*) +@@ -2687,13 +3240,13 @@ + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no +@@ -2765,7 +3318,6 @@ + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) +@@ -2796,13 +3348,12 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +@@ -2812,6 +3363,17 @@ + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ 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}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -2826,302 +3388,72 @@ + AC_MSG_RESULT([$dynamic_linker]) + test "$dynamic_linker" = no && can_build_shared=no + +-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +- + variables_saved_for_relink="PATH $shlibpath_var $runpath_var" + if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi +-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++fi + +-# _LT_AC_TAGCONFIG +-# ---------------- +-AC_DEFUN([_LT_AC_TAGCONFIG], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl +-AC_ARG_WITH([tags], +- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], +- [include additional configurations @<:@automatic@:>@])], +- [tagnames="$withval"]) +- +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- AC_MSG_WARN([output file `$ofile' does not exist]) +- fi +- +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) +- else +- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) +- fi +- fi +- if test -z "$LTCFLAGS"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" +- fi ++_LT_DECL([], [variables_saved_for_relink], [1], ++ [Variables whose values should be saved in libtool wrapper scripts and ++ restored at link time]) ++_LT_DECL([], [need_lib_prefix], [0], ++ [Do we need the "lib" prefix for modules?]) ++_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) ++_LT_DECL([], [version_type], [0], [Library versioning type]) ++_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) ++_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) ++_LT_DECL([], [shlibpath_overrides_runpath], [0], ++ [Is shlibpath searched before the hard-coded library search path?]) ++_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) ++_LT_DECL([], [library_names_spec], [1], ++ [[List of archive names. First name is the real one, the rest are links. ++ The last name is the one that the linker finds with -lNAME]]) ++_LT_DECL([], [soname_spec], [1], ++ [[The coded name of the library, if different from the real name]]) ++_LT_DECL([], [postinstall_cmds], [2], ++ [Command to use after installation of a shared archive]) ++_LT_DECL([], [postuninstall_cmds], [2], ++ [Command to use after uninstallation of a shared archive]) ++_LT_DECL([], [finish_cmds], [2], ++ [Commands used to finish a libtool library installation in a directory]) ++_LT_DECL([], [finish_eval], [1], ++ [[As "finish_cmds", except a single script fragment to be evaled but ++ not shown]]) ++_LT_DECL([], [hardcode_into_libs], [0], ++ [Whether we should hardcode library paths into libraries]) ++_LT_DECL([], [sys_lib_search_path_spec], [2], ++ [Compile-time system search path for libraries]) ++_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], ++ [Run-time system search path for libraries]) ++])# _LT_SYS_DYNAMIC_LINKER + +- # Extract list of available tagged configurations in $ofile. +- # Note that this assumes the entire list is on one line. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in +- "") ;; +- *) AC_MSG_ERROR([invalid tag name: $tagname]) +- ;; +- esac +- +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- AC_MSG_ERROR([tag name \"$tagname\" already exists]) +- fi +- +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile +- +- case $tagname in +- CXX) +- if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- AC_LIBTOOL_LANG_CXX_CONFIG +- else +- tagname="" +- fi +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- AC_LIBTOOL_LANG_F77_CONFIG +- else +- tagname="" +- fi +- ;; +- +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then +- AC_LIBTOOL_LANG_GCJ_CONFIG +- else +- tagname="" +- fi +- ;; +- +- RC) +- AC_LIBTOOL_LANG_RC_CONFIG +- ;; +- +- *) +- AC_MSG_ERROR([Unsupported tag name: $tagname]) +- ;; +- esac +- +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi +- fi +- done +- IFS="$lt_save_ifs" +- +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" +- else +- rm -f "${ofile}T" +- AC_MSG_ERROR([unable to update list of available tagged configurations.]) +- fi +-fi +-])# _LT_AC_TAGCONFIG - - --# _LT_ENABLE_SHARED([DEFAULT]) --# ---------------------------- --# implement the --enable-shared flag, and supports the `shared' and --# `disable-shared' LT_INIT options. +-# AC_LIBTOOL_DLOPEN +-# ----------------- +-# enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], +- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_DLOPEN +- +- +-# AC_LIBTOOL_WIN32_DLL +-# -------------------- +-# declare package support for building win32 DLLs +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +-])# AC_LIBTOOL_WIN32_DLL +- +- +-# AC_ENABLE_SHARED([DEFAULT]) +-# --------------------------- +-# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --m4_define([_LT_ENABLE_SHARED], --[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +-AC_DEFUN([AC_ENABLE_SHARED], +-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([shared], -- [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -- [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], +- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], +- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; @@ -2325,190 +4404,33 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -+ [AC_LANG_PUSH(C) -+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LANG_POP]) -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+sparc*-*solaris*) -+ # 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 -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" - fi +- fi - done - IFS="$lt_save_ifs" -+ ;; -+ esac - ;; +- ;; - esac], -- [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -+[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -+ AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+ AC_CHECK_TOOL(AS, as, false) -+ AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ ;; -+ ]) -+esac - -- _LT_DECL([build_libtool_libs], [enable_shared], [0], -- [Whether or not to build shared libraries]) --])# _LT_ENABLE_SHARED -+need_locks="$enable_libtool_lock" - --LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) --LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) -+])# _LT_AC_LOCK - --# Old names: --AC_DEFUN([AC_ENABLE_SHARED], --[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -+ -+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------------------- -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -+[AC_REQUIRE([LT_AC_PROG_SED]) -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -+ 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. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ 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. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ fi -+ $rm conftest* - ]) - +- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +-])# AC_ENABLE_SHARED +- +- +-# AC_DISABLE_SHARED +-# ----------------- +-# set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], --[_LT_SET_OPTION([LT_INIT], [disable-shared]) -+if test x"[$]$2" = xyes; then -+ ifelse([$5], , :, [$5]) -+else -+ ifelse([$6], , :, [$6]) -+fi -+])# AC_LIBTOOL_COMPILER_OPTION -+ -+ -+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ------------------------------------------------------------ -+# Check whether the given compiler option works -+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $3" -+ 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 -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ else -+ $2=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" - ]) - --AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) --AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -+if test x"[$]$2" = xyes; then -+ ifelse([$4], , :, [$4]) -+else -+ ifelse([$5], , :, [$5]) -+fi -+])# AC_LIBTOOL_LINKER_OPTION -+ - --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AM_ENABLE_SHARED], []) --dnl AC_DEFUN([AM_DISABLE_SHARED], []) -+# AC_LIBTOOL_SYS_MAX_CMD_LEN -+# -------------------------- -+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -+[# find the maximum length of command line arguments -+AC_MSG_CHECKING([the maximum length of command line arguments]) -+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -+ i=0 -+ teststring="ABCD" - -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; - -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; - --# _LT_ENABLE_STATIC([DEFAULT]) --# ---------------------------- --# implement the --enable-static flag, and support the `static' and --# `disable-static' LT_INIT options. +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no) +-])# AC_DISABLE_SHARED +- +- +-# AC_ENABLE_STATIC([DEFAULT]) +-# --------------------------- +-# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --m4_define([_LT_ENABLE_STATIC], --[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +-AC_DEFUN([AC_ENABLE_STATIC], +-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([static], -- [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], -- [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], +- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], +- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; @@ -2526,147 +4448,28 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - IFS="$lt_save_ifs" - ;; - esac], -- [enable_static=]_LT_ENABLE_STATIC_DEFAULT) -+ cygwin* | mingw*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; - -- _LT_DECL([build_old_libs], [enable_static], [0], -- [Whether or not to build static libraries]) --])# _LT_ENABLE_STATIC -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; - --LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) --LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ 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` -+ ;; - --# Old names: --AC_DEFUN([AC_ENABLE_STATIC], --[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) --]) -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; - +- [enable_static=]AC_ENABLE_STATIC_DEFAULT) +-])# AC_ENABLE_STATIC +- +- +-# AC_DISABLE_STATIC +-# ----------------- +-# set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], --[_LT_SET_OPTION([LT_INIT], [disable-static]) -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ 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` -+ fi -+ ;; -+ esac - ]) -+if test -n $lt_cv_sys_max_cmd_len ; then -+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -+else -+ AC_MSG_RESULT(none) -+fi -+])# AC_LIBTOOL_SYS_MAX_CMD_LEN - --AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) --AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AM_ENABLE_STATIC], []) --dnl AC_DEFUN([AM_DISABLE_STATIC], []) -+# _LT_AC_CHECK_DLFCN -+# ------------------ -+AC_DEFUN([_LT_AC_CHECK_DLFCN], -+[AC_CHECK_HEADERS(dlfcn.h)dnl -+])# _LT_AC_CHECK_DLFCN - - -+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -+# --------------------------------------------------------------------- -+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "$cross_compiling" = yes; then : -+ [$4] -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext <<EOF -+[#line __oline__ "configure" -+#include "confdefs.h" - --# _LT_ENABLE_FAST_INSTALL([DEFAULT]) --# ---------------------------------- --# implement the --enable-fast-install flag, and support the `fast-install' --# and `disable-fast-install' LT_INIT options. +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no) +-])# AC_DISABLE_STATIC +- +- +-# AC_ENABLE_FAST_INSTALL([DEFAULT]) +-# --------------------------------- +-# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --m4_define([_LT_ENABLE_FAST_INSTALL], --[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +-AC_DEFUN([AC_ENABLE_FAST_INSTALL], +-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([fast-install], -- [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -- [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], +- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], +- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; @@ -2684,4510 +4487,49 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - IFS="$lt_save_ifs" - ;; - esac], -- [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) -- --_LT_DECL([fast_install], [enable_fast_install], [0], -- [Whether or not to optimize for fast installation])dnl --])# _LT_ENABLE_FAST_INSTALL -- --LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) --LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) -- --# Old names: --AU_DEFUN([AC_ENABLE_FAST_INSTALL], --[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) --AC_DIAGNOSE([obsolete], --[$0: Remove this warning and the call to _LT_SET_OPTION when you put --the `fast-install' option into LT_INIT's first parameter.]) --]) -- --AU_DEFUN([AC_DISABLE_FAST_INSTALL], --[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) --AC_DIAGNOSE([obsolete], --[$0: Remove this warning and the call to _LT_SET_OPTION when you put --the `disable-fast-install' option into LT_INIT's first parameter.]) --]) -- --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) --dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +-])# AC_ENABLE_FAST_INSTALL - - --# _LT_WITH_PIC([MODE]) --# -------------------- --# implement the --with-pic flag, and support the `pic-only' and `no-pic' --# LT_INIT options. --# MODE is either `yes' or `no'. If omitted, it defaults to `both'. --m4_define([_LT_WITH_PIC], --[AC_ARG_WITH([pic], -- [AS_HELP_STRING([--with-pic], -- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -- [pic_mode="$withval"], -- [pic_mode=default]) -+#if HAVE_DLFCN_H -+#include <dlfcn.h> -+#endif - --test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) -+#include <stdio.h> - --_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl --])# _LT_WITH_PIC -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif - --LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) --LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif - --# Old name: --AU_DEFUN([AC_LIBTOOL_PICMODE], --[_LT_SET_OPTION([LT_INIT], [pic-only]) --AC_DIAGNOSE([obsolete], --[$0: Remove this warning and the call to _LT_SET_OPTION when you --put the `pic-only' option into LT_INIT's first parameter.]) --]) -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif - --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; - -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); - --m4_define([_LTDL_MODE], []) --LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], -- [m4_define([_LTDL_MODE], [nonrecursive])]) --LT_OPTION_DEFINE([LTDL_INIT], [recursive], -- [m4_define([_LTDL_MODE], [recursive])]) --LT_OPTION_DEFINE([LTDL_INIT], [subproject], -- [m4_define([_LTDL_MODE], [subproject])]) -- --m4_define([_LTDL_TYPE], []) --LT_OPTION_DEFINE([LTDL_INIT], [installable], -- [m4_define([_LTDL_TYPE], [installable])]) --LT_OPTION_DEFINE([LTDL_INIT], [convenience], -- [m4_define([_LTDL_TYPE], [convenience])]) -+ exit (status); -+}] -+EOF -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) $1 ;; -+ x$lt_dlneed_uscore) $2 ;; -+ x$lt_dlunknown|x*) $3 ;; -+ esac -+ else : -+ # compilation failed -+ $3 -+ fi -+fi -+rm -fr conftest* -+])# _LT_AC_TRY_DLOPEN_SELF - --# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- --# --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008 Free Software Foundation, Inc. --# Written by Gordon Matzigkeit, 1996 --# --# This file is free software; the Free Software Foundation gives --# unlimited permission to copy and/or distribute it, with or without --# modifications, as long as this notice is preserved. -- --m4_define([_LT_COPYING], [dnl --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008 Free Software Foundation, Inc. --# Written by Gordon Matzigkeit, 1996 --# --# This file is part of GNU Libtool. --# --# GNU Libtool is free software; you can redistribute it and/or --# modify it under the terms of the GNU General Public License as --# published by the Free Software Foundation; either version 2 of --# the License, or (at your option) any later version. --# --# As a special exception to the GNU General Public License, --# if you distribute this file as part of a program or library that --# is built using GNU Libtool, you may include this file under the --# same distribution terms that you use for the rest of that program. --# --# GNU Libtool 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 General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with GNU Libtool; see the file COPYING. If not, a copy --# can be downloaded from http://www.gnu.org/licenses/gpl.html, or --# obtained by writing to the Free Software Foundation, Inc., --# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --]) - --# serial 56 LT_INIT -+# AC_LIBTOOL_DLOPEN_SELF -+# ---------------------- -+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= - -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; - --# LT_PREREQ(VERSION) --# ------------------ --# Complain and exit if this libtool version is less that VERSION. --m4_defun([LT_PREREQ], --[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, -- [m4_default([$3], -- [m4_fatal([Libtool version $1 or higher is required], -- 63)])], -- [$2])]) -+ mingw* | pw32*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; - -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; - --# _LT_CHECK_BUILDDIR --# ------------------ --# Complain if the absolute build directory name contains unusual characters --m4_defun([_LT_CHECK_BUILDDIR], --[case `pwd` in -- *\ * | *\ *) -- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; --esac --]) -+ darwin*) -+ # if libdl is installed we need to link against it -+ AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ]) -+ ;; - -+ *) -+ AC_CHECK_FUNC([shl_load], -+ [lt_cv_dlopen="shl_load"], -+ [AC_CHECK_LIB([dld], [shl_load], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], -+ [AC_CHECK_FUNC([dlopen], -+ [lt_cv_dlopen="dlopen"], -+ [AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -+ [AC_CHECK_LIB([svld], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -+ [AC_CHECK_LIB([dld], [dld_link], -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ;; -+ esac - --# LT_INIT([OPTIONS]) --# ------------------ --AC_DEFUN([LT_INIT], --[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT --AC_BEFORE([$0], [LT_LANG])dnl --AC_BEFORE([$0], [LT_OUTPUT])dnl --AC_BEFORE([$0], [LTDL_INIT])dnl --m4_require([_LT_CHECK_BUILDDIR])dnl -- --dnl Autoconf doesn't catch unexpanded LT_ macros by default: --m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl --m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl --dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 --dnl unless we require an AC_DEFUNed macro: --AC_REQUIRE([LTOPTIONS_VERSION])dnl --AC_REQUIRE([LTSUGAR_VERSION])dnl --AC_REQUIRE([LTVERSION_VERSION])dnl --AC_REQUIRE([LTOBSOLETE_VERSION])dnl --m4_require([_LT_PROG_LTMAIN])dnl -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi - --dnl Parse OPTIONS --_LT_SET_OPTIONS([$0], [$1]) -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - --# This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ltmain" -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' --AC_SUBST(LIBTOOL)dnl -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" - --_LT_SETUP -+ AC_CACHE_CHECK([whether a program can dlopen itself], -+ lt_cv_dlopen_self, [dnl -+ _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -+ ]) - --# Only expand once: --m4_define([LT_INIT]) --])# LT_INIT -- --# Old names: --AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) --AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_PROG_LIBTOOL], []) --dnl AC_DEFUN([AM_PROG_LIBTOOL], []) -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -+ lt_cv_dlopen_self_static, [dnl -+ _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -+ ]) -+ fi - -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac - --# _LT_CC_BASENAME(CC) --# ------------------- --# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. --m4_defun([_LT_CC_BASENAME], --[for cc_temp in $1""; do -- case $cc_temp in -- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -- \-*) ;; -- *) break;; -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; - esac --done --cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` --]) - -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+])# AC_LIBTOOL_DLOPEN_SELF - --# _LT_FILEUTILS_DEFAULTS --# ---------------------- --# It is okay to use these file commands and assume they have been set --# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. --m4_defun([_LT_FILEUTILS_DEFAULTS], --[: ${CP="cp -f"} --: ${MV="mv -f"} --: ${RM="rm -f"} --])# _LT_FILEUTILS_DEFAULTS - -+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -+# --------------------------------- -+# 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_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 -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - --# _LT_SETUP --# --------- --m4_defun([_LT_SETUP], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl --_LT_DECL([], [host_alias], [0], [The host system])dnl --_LT_DECL([], [host], [0])dnl --_LT_DECL([], [host_os], [0])dnl --dnl --_LT_DECL([], [build_alias], [0], [The build system])dnl --_LT_DECL([], [build], [0])dnl --_LT_DECL([], [build_os], [0])dnl --dnl --AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([LT_PATH_LD])dnl --AC_REQUIRE([LT_PATH_NM])dnl --dnl --AC_REQUIRE([AC_PROG_LN_S])dnl --test -z "$LN_S" && LN_S="ln -s" --_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl --dnl --AC_REQUIRE([LT_CMD_MAX_LEN])dnl --_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl --_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl --dnl --m4_require([_LT_FILEUTILS_DEFAULTS])dnl --m4_require([_LT_CHECK_SHELL_FEATURES])dnl --m4_require([_LT_CMD_RELOAD])dnl --m4_require([_LT_CHECK_MAGIC_METHOD])dnl --m4_require([_LT_CMD_OLD_ARCHIVE])dnl --m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -- --_LT_CONFIG_LIBTOOL_INIT([ --# See if we are running on zsh, and set the options which allow our --# commands through without removal of \ escapes INIT. --if test -n "\${ZSH_VERSION+set}" ; then -- setopt NO_GLOB_SUBST --fi -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ fi -+ fi -+ chmod u+w . 2>&AS_MESSAGE_LOG_FD -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* - ]) --if test -n "${ZSH_VERSION+set}" ; then -- setopt NO_GLOB_SUBST --fi -+])# AC_LIBTOOL_PROG_CC_C_O - --_LT_CHECK_OBJDIR - --m4_require([_LT_TAG_COMPILER])dnl --_LT_PROG_ECHO_BACKSLASH -+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -+# ----------------------------------------- -+# Check to see if we can do hard links to lock some files if needed -+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -+[AC_REQUIRE([_LT_AC_LOCK])dnl - --case $host_os in --aix3*) -- # AIX sometimes has problems with the GCC collect2 program. For some -- # reason, if we set the COLLECT_NAMES environment variable, the problems -- # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -- fi -- ;; --esac -- --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' -- --# Same as above, but do not quote variable references. --double_quote_subst='s/\([["`\\]]\)/\\\1/g' -- --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -- --# Sed substitution to delay expansion of an escaped single quote. --delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -- --# Sed substitution to avoid accidental globbing in evaled expressions --no_glob_subst='s/\*/\\\*/g' -- --# Global variables: --ofile=libtool --can_build_shared=yes -- --# All known linkers require a `.a' archive for static linking (except MSVC, --# which needs '.lib'). --libext=a -- --with_gnu_ld="$lt_cv_prog_gnu_ld" -- --old_CC="$CC" --old_CFLAGS="$CFLAGS" -- --# Set sane defaults for various variables --test -z "$CC" && CC=cc --test -z "$LTCC" && LTCC=$CC --test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS --test -z "$LD" && LD=ld --test -z "$ac_objext" && ac_objext=o -- --_LT_CC_BASENAME([$compiler]) -- --# Only perform the check for file, if the check method requires it --test -z "$MAGIC_CMD" && MAGIC_CMD=file --case $deplibs_check_method in --file_magic*) -- if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- _LT_PATH_MAGIC -+hard_links="nottested" -+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ AC_MSG_CHECKING([if we can lock with hard links]) -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ AC_MSG_RESULT([$hard_links]) -+ if test "$hard_links" = no; then -+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -+ need_locks=warn - fi -- ;; --esac -- --# Use C for the default configuration in the libtool script --LT_SUPPORTED_TAG([CC]) --_LT_LANG_C_CONFIG --_LT_LANG_DEFAULT_CONFIG --_LT_CONFIG_COMMANDS --])# _LT_SETUP -- -- --# _LT_PROG_LTMAIN --# --------------- --# Note that this code is called both from `configure', and `config.status' --# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, --# `config.status' has no value for ac_aux_dir unless we are using Automake, --# so we pass a copy along to make sure it has a sensible value anyway. --m4_defun([_LT_PROG_LTMAIN], --[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl --_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) --ltmain="$ac_aux_dir/ltmain.sh" --])# _LT_PROG_LTMAIN -+else -+ need_locks=no -+fi -+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - - -+# AC_LIBTOOL_OBJDIR -+# ----------------- -+AC_DEFUN([AC_LIBTOOL_OBJDIR], -+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -+[rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null]) -+objdir=$lt_cv_objdir -+])# AC_LIBTOOL_OBJDIR - --# So that we can recreate a full libtool script including additional --# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS --# in macros and then make a single call at the end using the `libtool' --# label. - -+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -+# ---------------------------------------------- -+# Check hardcoding attributes. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -+[AC_MSG_CHECKING([how to hardcode library paths into programs]) -+_LT_AC_TAGVAR(hardcode_action, $1)= -+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ -+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ -+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - --# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) --# ---------------------------------------- --# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. --m4_define([_LT_CONFIG_LIBTOOL_INIT], --[m4_ifval([$1], -- [m4_append([_LT_OUTPUT_LIBTOOL_INIT], -- [$1 --])])]) -+ # We can hardcode non-existant directories. -+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && -+ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then -+ # Linking always hardcodes the temporary library directory. -+ _LT_AC_TAGVAR(hardcode_action, $1)=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -+fi -+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) - --# Initialize. --m4_define([_LT_OUTPUT_LIBTOOL_INIT]) -+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH - - --# _LT_CONFIG_LIBTOOL([COMMANDS]) --# ------------------------------ --# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. --m4_define([_LT_CONFIG_LIBTOOL], --[m4_ifval([$1], -- [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], -- [$1 --])])]) -- --# Initialize. --m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) -- -- --# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) --# ----------------------------------------------------- --m4_defun([_LT_CONFIG_SAVE_COMMANDS], --[_LT_CONFIG_LIBTOOL([$1]) --_LT_CONFIG_LIBTOOL_INIT([$2]) --]) -+# AC_LIBTOOL_SYS_LIB_STRIP -+# ------------------------ -+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -+[striplib= -+old_striplib= -+AC_MSG_CHECKING([whether stripping libraries is possible]) -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ AC_MSG_RESULT([yes]) -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+fi -+ ;; -+ *) -+ AC_MSG_RESULT([no]) -+ ;; -+ esac -+fi -+])# AC_LIBTOOL_SYS_LIB_STRIP - - --# _LT_FORMAT_COMMENT([COMMENT]) -+# AC_LIBTOOL_SYS_DYNAMIC_LINKER - # ----------------------------- --# Add leading comment marks to the start of each line, and a trailing --# full-stop to the whole comment if one is not present already. --m4_define([_LT_FORMAT_COMMENT], --[m4_ifval([$1], [ --m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], -- [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) --)]) -+# PORTME Fill in your ld.so characteristics -+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([dynamic linker characteristics]) -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+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 -+ 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. -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ 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]) -+need_lib_prefix=unknown -+hardcode_into_libs=no - -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown - -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH - -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; - -+aix[[4-9]]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[[01]] | aix4.[[01]].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so -+ # instead of lib<name>.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; - --# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) --# ------------------------------------------------------------------- --# CONFIGNAME is the name given to the value in the libtool script. --# VARNAME is the (base) name used in the configure script. --# VALUE may be 0, 1 or 2 for a computed quote escaped value based on --# VARNAME. Any other value will be used directly. --m4_define([_LT_DECL], --[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], -- [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], -- [m4_ifval([$1], [$1], [$2])]) -- lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) -- m4_ifval([$4], -- [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) -- lt_dict_add_subkey([lt_decl_dict], [$2], -- [tagged?], [m4_ifval([$5], [yes], [no])])]) --]) -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; - -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; - --# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) --# -------------------------------------------------------- --m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) -- -- --# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) --# ------------------------------------------------ --m4_define([lt_decl_tag_varnames], --[_lt_decl_filter([tagged?], [yes], $@)]) -- -- --# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) --# --------------------------------------------------------- --m4_define([_lt_decl_filter], --[m4_case([$#], -- [0], [m4_fatal([$0: too few arguments: $#])], -- [1], [m4_fatal([$0: too few arguments: $#: $1])], -- [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], -- [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], -- [lt_dict_filter([lt_decl_dict], $@)])[]dnl --]) -+bsdi[[45]]*) -+ version_type=linux -+ 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' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; - -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no - --# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) --# -------------------------------------------------- --m4_define([lt_decl_quote_varnames], --[_lt_decl_filter([value], [1], $@)]) -- -- --# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) --# --------------------------------------------------- --m4_define([lt_decl_dquote_varnames], --[_lt_decl_filter([value], [2], $@)]) -- -- --# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) --# --------------------------------------------------- --m4_define([lt_decl_varnames_tagged], --[m4_assert([$# <= 2])dnl --_$0(m4_quote(m4_default([$1], [[, ]])), -- m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), -- m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) --m4_define([_lt_decl_varnames_tagged], --[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) -- -- --# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) --# ------------------------------------------------ --m4_define([lt_decl_all_varnames], --[_$0(m4_quote(m4_default([$1], [[, ]])), -- m4_if([$2], [], -- m4_quote(lt_decl_varnames), -- m4_quote(m4_shift($@))))[]dnl --]) --m4_define([_lt_decl_all_varnames], --[lt_join($@, lt_decl_varnames_tagged([$1], -- lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl --]) -- -- --# _LT_CONFIG_STATUS_DECLARE([VARNAME]) --# ------------------------------------ --# Quote a variable value, and forward it to `config.status' so that its --# declaration there will have the same value as in `configure'. VARNAME --# must have a single quote delimited value for this to work. --m4_define([_LT_CONFIG_STATUS_DECLARE], --[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) -- -- --# _LT_CONFIG_STATUS_DECLARATIONS --# ------------------------------ --# We delimit libtool config variables with single quotes, so when --# we write them to config.status, we have to be sure to quote all --# embedded single quotes properly. In configure, this macro expands --# each variable declared with _LT_DECL (and _LT_TAGDECL) into: --# --# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' --m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], --[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), -- [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) -- -- --# _LT_LIBTOOL_TAGS --# ---------------- --# Output comment and list of tags supported by the script --m4_defun([_LT_LIBTOOL_TAGS], --[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl --available_tags="_LT_TAGS"dnl --]) -- -- --# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) --# ----------------------------------- --# Extract the dictionary values for VARNAME (optionally with TAG) and --# expand to a commented shell variable setting: --# --# # Some comment about what VAR is for. --# visible_name=$lt_internal_name --m4_define([_LT_LIBTOOL_DECLARE], --[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], -- [description])))[]dnl --m4_pushdef([_libtool_name], -- m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl --m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), -- [0], [_libtool_name=[$]$1], -- [1], [_libtool_name=$lt_[]$1], -- [2], [_libtool_name=$lt_[]$1], -- [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl --m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl --]) -- -- --# _LT_LIBTOOL_CONFIG_VARS +-# AC_DISABLE_FAST_INSTALL -# ----------------------- --# Produce commented declarations of non-tagged libtool config variables --# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' --# script. Tagged libtool config variables (even for the LIBTOOL CONFIG --# section) are produced by _LT_LIBTOOL_TAG_VARS. --m4_defun([_LT_LIBTOOL_CONFIG_VARS], --[m4_foreach([_lt_var], -- m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), -- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) +-# set the default to --disable-fast-install +-AC_DEFUN([AC_DISABLE_FAST_INSTALL], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no) +-])# AC_DISABLE_FAST_INSTALL - - --# _LT_LIBTOOL_TAG_VARS(TAG) --# ------------------------- --m4_define([_LT_LIBTOOL_TAG_VARS], --[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), -- [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) -- -- --# _LT_TAGVAR(VARNAME, [TAGNAME]) --# ------------------------------ --m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) -- -- --# _LT_CONFIG_COMMANDS --# ------------------- --# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of --# variables for single and double quote escaping we saved from calls --# to _LT_DECL, we can put quote escaped variables declarations --# into `config.status', and then the shell code to quote escape them in --# for loops in `config.status'. Finally, any additional code accumulated --# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. --m4_defun([_LT_CONFIG_COMMANDS], --[AC_PROVIDE_IFELSE([LT_OUTPUT], -- dnl If the libtool generation code has been placed in $CONFIG_LT, -- dnl instead of duplicating it all over again into config.status, -- dnl then we will have config.status run $CONFIG_LT later, so it -- dnl needs to know what name is stored there: -- [AC_CONFIG_COMMANDS([libtool], -- [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], -- dnl If the libtool generation code is destined for config.status, -- dnl expand the accumulated commands and init code now: -- [AC_CONFIG_COMMANDS([libtool], -- [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) --])#_LT_CONFIG_COMMANDS -- -- --# Initialize. --m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], --[ -- --# 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 -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes - --sed_quote_subst='$sed_quote_subst' --double_quote_subst='$double_quote_subst' --delay_variable_subst='$delay_variable_subst' --_LT_CONFIG_STATUS_DECLARATIONS --LTCC='$LTCC' --LTCFLAGS='$LTCFLAGS' --compiler='$compiler_DEFAULT' -- --# Quote evaled strings. --for var in lt_decl_all_varnames([[ \ --]], lt_decl_quote_varnames); do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -- *[[\\\\\\\`\\"\\\$]]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -- ;; -- *) -- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; -- esac --done -- --# Double-quote double-evaled strings. --for var in lt_decl_all_varnames([[ \ --]], lt_decl_dquote_varnames); do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -- *[[\\\\\\\`\\"\\\$]]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ 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 ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ 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 - ;; -- *) -- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac --done -+ ;; - --# Fix-up fallback echo if it was mangled by the above quoting rules. --case \$lt_ECHO in --*'\\\[$]0 --fallback-echo"')dnl " -- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH - ;; --esac -- --_LT_OUTPUT_LIBTOOL_INIT --]) -- - --# LT_OUTPUT --# --------- --# This macro allows early generation of the libtool script (before --# AC_OUTPUT is called), incase it is used in configure for compilation --# tests. --AC_DEFUN([LT_OUTPUT], --[: ${CONFIG_LT=./config.lt} --AC_MSG_NOTICE([creating $CONFIG_LT]) --cat >"$CONFIG_LT" <<_LTEOF --#! $SHELL --# Generated by $as_me. --# Run this file to recreate a libtool stub with the current configuration. -- --lt_cl_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_LTEOF -- --cat >>"$CONFIG_LT" <<\_LTEOF --AS_SHELL_SANITIZE --_AS_PREPARE -- --exec AS_MESSAGE_FD>&1 --exec AS_MESSAGE_LOG_FD>>config.log --{ -- echo -- AS_BOX([Running $as_me.]) --} >&AS_MESSAGE_LOG_FD -- --lt_cl_help="\ --\`$as_me' creates a local libtool stub from the current configuration, --for use in further configure time tests before the real libtool is --generated. -- --Usage: $[0] [[OPTIONS]] -- -- -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -- -d, --debug don't remove temporary files -- --Report bugs to <bug-libtool@gnu.org>." -- --lt_cl_version="\ --m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl --m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) --configured by $[0], generated by m4_PACKAGE_STRING. -- --Copyright (C) 2008 Free Software Foundation, Inc. --This config.lt script is free software; the Free Software Foundation --gives unlimited permision to copy, distribute and modify it." -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ 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' -+ ;; - --while test $[#] != 0 --do -- case $[1] in -- --version | --v* | -V ) -- echo "$lt_cl_version"; exit 0 ;; -- --help | --h* | -h ) -- echo "$lt_cl_help"; exit 0 ;; -- --debug | --d* | -d ) -- debug=: ;; -- --quiet | --q* | --silent | --s* | -q ) -- lt_cl_silent=: ;; -+dgux*) -+ 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 -+ ;; - -- -*) AC_MSG_ERROR([unrecognized option: $[1] --Try \`$[0] --help' for more information.]) ;; -+freebsd1*) -+ dynamic_linker=no -+ ;; - -- *) AC_MSG_ERROR([unrecognized argument: $[1] --Try \`$[0] --help' for more information.]) ;; -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[[123]]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; - esac -- shift --done -- --if $lt_cl_silent; then -- exec AS_MESSAGE_FD>/dev/null --fi --_LTEOF -- --cat >>"$CONFIG_LT" <<_LTEOF --_LT_OUTPUT_LIBTOOL_COMMANDS_INIT --_LTEOF -- --cat >>"$CONFIG_LT" <<\_LTEOF --AC_MSG_NOTICE([creating $ofile]) --_LT_OUTPUT_LIBTOOL_COMMANDS --AS_EXIT(0) --_LTEOF --chmod +x "$CONFIG_LT" -- --# configure is writing to config.log, but config.lt does its own redirection, --# appending to config.log, which fails on DOS, as config.log is still kept --# open by configure. Here we exec the FD to /dev/null, effectively closing --# config.log, so it can be properly (re)opened and appended to by config.lt. --if test "$no_create" != yes; then -- lt_cl_success=: -- test "$silent" = yes && -- lt_config_lt_args="$lt_config_lt_args --quiet" -- exec AS_MESSAGE_LOG_FD>/dev/null -- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -- exec AS_MESSAGE_LOG_FD>>config.log -- $lt_cl_success || AS_EXIT(1) --fi --])# LT_OUTPUT -- -- --# _LT_CONFIG(TAG) --# --------------- --# If TAG is the built-in tag, create an initial libtool script with a --# default configuration from the untagged config vars. Otherwise add code --# to config.status for appending the configuration named by TAG from the --# matching tagged config vars. --m4_defun([_LT_CONFIG], --[m4_require([_LT_FILEUTILS_DEFAULTS])dnl --_LT_CONFIG_SAVE_COMMANDS([ -- m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl -- m4_if(_LT_TAG, [C], [ -- # 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 -- setopt NO_GLOB_SUBST -- fi -- -- cfgfile="${ofile}T" -- trap "$RM \"$cfgfile\"; exit 1" 1 2 15 -- $RM "$cfgfile" -- -- cat <<_LT_EOF >> "$cfgfile" --#! $SHELL -- --# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: --# NOTE: Changes made to this file will be lost: look at ltmain.sh. --# --_LT_COPYING --_LT_LIBTOOL_TAGS -- --# ### BEGIN LIBTOOL CONFIG --_LT_LIBTOOL_CONFIG_VARS --_LT_LIBTOOL_TAG_VARS --# ### END LIBTOOL CONFIG -- --_LT_EOF -- -+ shlibpath_var=LD_LIBRARY_PATH - case $host_os in -- aix3*) -- cat <<\_LT_EOF >> "$cfgfile" --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES --fi --_LT_EOF -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[[01]]* | freebsdelf3.[[01]]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ -+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes - ;; - esac -+ ;; - -- _LT_PROG_LTMAIN -- -- # We use sed instead of cat because bash on DJGPP gets confused if -- # if finds mixed CR/LF and LF-only lines. Since sed operates in -- # text mode, it properly converts lines to CR/LF. This bash problem -- # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- _LT_PROG_XSI_SHELLFNS -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || -- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -- chmod +x "$ofile" --], --[cat <<_LT_EOF >> "$ofile" -- --dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded --dnl in a comment (ie after a #). --# ### BEGIN LIBTOOL TAG CONFIG: $1 --_LT_LIBTOOL_TAG_VARS(_LT_TAG) --# ### END LIBTOOL TAG CONFIG: $1 --_LT_EOF --])dnl /m4_if --], --[m4_if([$1], [], [ -- PACKAGE='$PACKAGE' -- VERSION='$VERSION' -- TIMESTAMP='$TIMESTAMP' -- RM='$RM' -- ofile='$ofile'], []) --])dnl /_LT_CONFIG_SAVE_COMMANDS --])# _LT_CONFIG -- -- --# LT_SUPPORTED_TAG(TAG) --# --------------------- --# Trace this macro to discover what tags are supported by the libtool --# --tag option, using: --# autoconf --trace 'LT_SUPPORTED_TAG:$1' --AC_DEFUN([LT_SUPPORTED_TAG], []) -- -- --# C support is built-in for now --m4_define([_LT_LANG_C_enabled], []) --m4_define([_LT_TAGS], []) -- -- --# LT_LANG(LANG) --# ------------- --# Enable libtool support for the given language if not already enabled. --AC_DEFUN([LT_LANG], --[AC_BEFORE([$0], [LT_OUTPUT])dnl --m4_case([$1], -- [C], [_LT_LANG(C)], -- [C++], [_LT_LANG(CXX)], -- [Java], [_LT_LANG(GCJ)], -- [Fortran 77], [_LT_LANG(F77)], -- [Fortran], [_LT_LANG(FC)], -- [Windows Resource], [_LT_LANG(RC)], -- [m4_ifdef([_LT_LANG_]$1[_CONFIG], -- [_LT_LANG($1)], -- [m4_fatal([$0: unsupported language: "$1"])])])dnl --])# LT_LANG -- -- --# _LT_LANG(LANGNAME) --# ------------------ --m4_defun([_LT_LANG], --[m4_ifdef([_LT_LANG_]$1[_enabled], [], -- [LT_SUPPORTED_TAG([$1])dnl -- m4_append([_LT_TAGS], [$1 ])dnl -- m4_define([_LT_LANG_]$1[_enabled], [])dnl -- _LT_LANG_$1_CONFIG($1)])dnl --])# _LT_LANG -- -- --# _LT_LANG_DEFAULT_CONFIG --# ----------------------- --m4_defun([_LT_LANG_DEFAULT_CONFIG], --[AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [LT_LANG(CXX)], -- [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) -- --AC_PROVIDE_IFELSE([AC_PROG_F77], -- [LT_LANG(F77)], -- [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) -- --AC_PROVIDE_IFELSE([AC_PROG_FC], -- [LT_LANG(FC)], -- [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) -- --dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal --dnl pulling things in needlessly. --AC_PROVIDE_IFELSE([AC_PROG_GCJ], -- [LT_LANG(GCJ)], -- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -- [LT_LANG(GCJ)], -- [AC_PROVIDE_IFELSE([LT_PROG_GCJ], -- [LT_LANG(GCJ)], -- [m4_ifdef([AC_PROG_GCJ], -- [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) -- m4_ifdef([A][M_PROG_GCJ], -- [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) -- m4_ifdef([LT_PROG_GCJ], -- [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -- --AC_PROVIDE_IFELSE([LT_PROG_RC], -- [LT_LANG(RC)], -- [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) --])# _LT_LANG_DEFAULT_CONFIG -- --# Obsolete macros: --AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) --AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) --AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) --AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIBTOOL_CXX], []) --dnl AC_DEFUN([AC_LIBTOOL_F77], []) --dnl AC_DEFUN([AC_LIBTOOL_FC], []) --dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -+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 -+ hardcode_into_libs=yes -+ ;; - -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; - --# _LT_TAG_COMPILER --# ---------------- --m4_defun([_LT_TAG_COMPILER], --[AC_REQUIRE([AC_PROG_CC])dnl -+interix[[3-9]]*) -+ 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' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; - --_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl --_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl --_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl --_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; - --# If no C compiler was specified, use CC. --LTCC=${LTCC-"$CC"} -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; - --# If no C compiler flags were specified, use CFLAGS. --LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+# This must be Linux ELF. -+linux* | k*bsd*-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' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes - --# Allow CC to be a program name with arguments. --compiler=$CC --])# _LT_TAG_COMPILER -+ # 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>/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 -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; - --# _LT_COMPILER_BOILERPLATE --# ------------------------ --# Check for compiler boilerplate output or warnings with --# the simple compiler test code. --m4_defun([_LT_COMPILER_BOILERPLATE], --[m4_require([_LT_DECL_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* --])# _LT_COMPILER_BOILERPLATE -+netbsdelf*-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='NetBSD ld.elf_so' -+ ;; - -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - --# _LT_LINKER_BOILERPLATE --# ---------------------- --# Check for linker boilerplate output or warnings with --# the simple link test code. --m4_defun([_LT_LINKER_BOILERPLATE], --[m4_require([_LT_DECL_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 -r conftest* --])# _LT_LINKER_BOILERPLATE -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; - --# _LT_REQUIRED_DARWIN_CHECKS --# ------------------------- --m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ -- case $host_os in -- rhapsody* | darwin*) -- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -- AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -- AC_CHECK_TOOL([LIPO], [lipo], [:]) -- AC_CHECK_TOOL([OTOOL], [otool], [:]) -- AC_CHECK_TOOL([OTOOL64], [otool64], [:]) -- _LT_DECL([], [DSYMUTIL], [1], -- [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) -- _LT_DECL([], [NMEDIT], [1], -- [Tool to change global to local symbols on Mac OS X]) -- _LT_DECL([], [LIPO], [1], -- [Tool to manipulate fat objects and archives on Mac OS X]) -- _LT_DECL([], [OTOOL], [1], -- [ldd/readelf like tool for Mach-O binaries on Mac OS X]) -- _LT_DECL([], [OTOOL64], [1], -- [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) -+nto-qnx*) -+ 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=yes -+ ;; - -- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -- [lt_cv_apple_cc_single_mod=no -- if test -z "${LT_MULTI_MODULE}"; then -- # By default we will add the -single_module flag. You can override -- # by either setting the environment variable LT_MULTI_MODULE -- # non-empty at configure time, or by adding -multi_module to the -- # link flags. -- rm -rf libconftest.dylib* -- echo "int foo(void){return 1;}" > conftest.c -- echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ---dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD -- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -- -dynamiclib -Wl,-single_module conftest.c 2>conftest.err -- _lt_result=$? -- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then -- lt_cv_apple_cc_single_mod=yes -- else -- cat conftest.err >&AS_MESSAGE_LOG_FD -- fi -- rm -rf libconftest.dylib* -- rm -f conftest.* -- fi]) -- AC_CACHE_CHECK([for -exported_symbols_list linker flag], -- [lt_cv_ld_exported_symbols_list], -- [lt_cv_ld_exported_symbols_list=no -- save_LDFLAGS=$LDFLAGS -- echo "_main" > conftest.sym -- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -- [lt_cv_ld_exported_symbols_list=yes], -- [lt_cv_ld_exported_symbols_list=no]) -- LDFLAGS="$save_LDFLAGS" -- ]) -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in -- rhapsody* | darwin1.[[012]]) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -- darwin1.*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- darwin*) # darwin 5.x on -- # if running on 10.5 or later, the deployment target defaults -- # to the OS version, if on x86, and 10.4, the deployment -- # target defaults to 10.4. Don't you love it? -- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- 10.[[012]]*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- 10.*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ openbsd2.[[89]] | openbsd2.[[89]].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; - esac -- ;; -- esac -- if test "$lt_cv_apple_cc_single_mod" = "yes"; then -- _lt_dar_single_mod='$single_module' -- fi -- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -- else -- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- if test "$DSYMUTIL" != ":"; then -- _lt_dsymutil='~$DSYMUTIL $lib || :' -- else -- _lt_dsymutil= -- fi -- ;; -- esac --]) -- -- --# _LT_DARWIN_LINKER_FEATURES +-# AC_LIBTOOL_PICMODE([MODE]) -# -------------------------- --# Checks for linker and compiler features on darwin --m4_defun([_LT_DARWIN_LINKER_FEATURES], --[ -- m4_require([_LT_REQUIRED_DARWIN_CHECKS]) -- _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_TAGVAR(hardcode_direct, $1)=no -- _LT_TAGVAR(hardcode_automatic, $1)=yes -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_TAGVAR(whole_archive_flag_spec, $1)='' -- _LT_TAGVAR(link_all_deplibs, $1)=yes -- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -- case $cc_basename in -- ifort*) _lt_dar_can_shared=yes ;; -- *) _lt_dar_can_shared=$GCC ;; -- esac -- if test "$_lt_dar_can_shared" = "yes"; then -- output_verbose_link_cmd=echo -- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -- m4_if([$1], [CXX], --[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -- fi --],[]) - else -- _LT_TAGVAR(ld_shlibs, $1)=no -+ shlibpath_overrides_runpath=yes - fi --]) -- --# _LT_SYS_MODULE_PATH_AIX --# ----------------------- --# Links a minimal program and checks the executable --# for the system default hardcoded library path. In most cases, --# this is /usr/lib:/lib, but when the MPI compilers are used --# the location of the communication and MPI libs are included too. --# If we don't find anything, use the default library path according --# to the aix ld manual. --m4_defun([_LT_SYS_MODULE_PATH_AIX], --[m4_require([_LT_DECL_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 "$lt_aix_libpath_sed"` --fi],[]) --if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi --])# _LT_SYS_MODULE_PATH_AIX +-# implement the --with-pic flag +-# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +-AC_DEFUN([AC_LIBTOOL_PICMODE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-pic_mode=ifelse($#,1,$1,default) +-])# AC_LIBTOOL_PICMODE - - --# _LT_SHELL_INIT(ARG) +-# AC_PROG_EGREP +-# ------------- +-# This is predefined starting with Autoconf 2.54, so this conditional +-# definition can be removed once we require Autoconf 2.54 or later. +-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], +- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 +- then ac_cv_prog_egrep='grep -E' +- else ac_cv_prog_egrep='egrep' +- fi]) +- EGREP=$ac_cv_prog_egrep +- AC_SUBST([EGREP]) +-])]) +- +- +-# AC_PATH_TOOL_PREFIX -# ------------------- --m4_define([_LT_SHELL_INIT], --[ifdef([AC_DIVERSION_NOTICE], -- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -- [AC_DIVERT_PUSH(NOTICE)]) --$1 --AC_DIVERT_POP --])# _LT_SHELL_INIT -+ ;; - -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; - --# _LT_PROG_ECHO_BACKSLASH --# ----------------------- --# Add some code to the start of the generated configure script which --# will find an echo command which doesn't interpret backslashes. --m4_defun([_LT_PROG_ECHO_BACKSLASH], --[_LT_SHELL_INIT([ --# Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; - --case X$lt_ECHO in --X*--fallback-echo) -- # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+rdos*) -+ dynamic_linker=no - ;; --esac - --ECHO=${lt_ECHO-echo} --if test "X[$]1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X[$]1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then -- # Yippee, $ECHO works! -- : --else -- # Restart under the correct shell. -- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} --fi -+solaris*) -+ 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=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; - --if test "X[$]1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <<_LT_EOF --[$]* --_LT_EOF -- exit 0 --fi -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; - --# 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 -+sysv4 | sysv4.3*) -+ version_type=linux -+ 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 -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; - --if test -z "$lt_ECHO"; then -- if test "X${echo_test_string+set}" != Xset; then -- # find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if { echo_test_string=`eval $cmd`; } 2>/dev/null && -- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null -- then -- break -- fi -- done -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH - fi -+ ;; - -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no - else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -- -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -- IFS="$lt_save_ifs" -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$dir/echo" -- break -- fi -- done -- IFS="$lt_save_ifs" -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; - -- if test "X$ECHO" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- ECHO='print -r' -- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -- else -- # Try using printf. -- ECHO='printf %s\n' -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -+uts4*) -+ version_type=linux -+ 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 -+ ;; - -- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -+*) -+ dynamic_linker=no -+ ;; -+esac -+AC_MSG_RESULT([$dynamic_linker]) -+test "$dynamic_linker" = no && can_build_shared=no - -- if test "$prev" != 'sed 50q "[$]0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -- else -- # Oops. We lost completely, so just stick with echo. -- ECHO=echo -- fi -- fi -- fi -- fi -- fi --fi -+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], -+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], -+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - --# Copy echo and quote the copy suitably for passing to libtool from --# the Makefile, instead of quoting the original, which is used later. --lt_ECHO=$ECHO --if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi -+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - --AC_SUBST(lt_ECHO) --]) --_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) --_LT_DECL([], [ECHO], [1], -- [An echo program that does not interpret backslashes]) --])# _LT_PROG_ECHO_BACKSLASH - -+# _LT_AC_TAGCONFIG -+# ---------------- -+AC_DEFUN([_LT_AC_TAGCONFIG], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_ARG_WITH([tags], -+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], -+ [include additional configurations @<:@automatic@:>@])], -+ [tagnames="$withval"]) -+ -+if test -f "$ltmain" && test -n "$tagnames"; then -+ if test ! -f "${ofile}"; then -+ AC_MSG_WARN([output file `$ofile' does not exist]) -+ fi -+ -+ if test -z "$LTCC"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -+ if test -z "$LTCC"; then -+ AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) -+ else -+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) -+ fi -+ fi -+ if test -z "$LTCFLAGS"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -+ fi - --# _LT_ENABLE_LOCK --# --------------- --m4_defun([_LT_ENABLE_LOCK], --[AC_ARG_ENABLE([libtool-lock], -- [AS_HELP_STRING([--disable-libtool-lock], -- [avoid locking (might break parallel builds)])]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ # Extract list of available tagged configurations in $ofile. -+ # Note that this assumes the entire list is on one line. -+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --ia64-*-hpux*) -- # 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.$ac_objext` in -- *ELF-32*) -- HPUX_IA64_MODE="32" -- ;; -- *ELF-64*) -- HPUX_IA64_MODE="64" -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for tagname in $tagnames; do -+ IFS="$lt_save_ifs" -+ # Check whether tagname contains only valid characters -+ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in -+ "") ;; -+ *) AC_MSG_ERROR([invalid tag name: $tagname]) - ;; - esac -- fi -- rm -rf conftest* -- ;; --*-*-irix6*) -- # Find out which ABI we are using. -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- if test "$lt_cv_prog_gnu_ld" = yes; then -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -melf32bsmip" -- ;; -- *N32*) -- LD="${LD-ld} -melf32bmipn32" -- ;; -- *64-bit*) -- LD="${LD-ld} -melf64bmip" -- ;; -- esac -- else -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -32" -- ;; -- *N32*) -- LD="${LD-ld} -n32" -- ;; -- *64-bit*) -- LD="${LD-ld} -64" -- ;; -- esac -+ -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -+ then -+ AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi -- fi -- rm -rf conftest* -- ;; - --x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ --s390*-*linux*|s390*-*tpf*|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" -- ;; -- ppc64-*linux*|powerpc64-*linux*) -- LD="${LD-ld} -m elf32ppclinux" -- ;; -- s390x-*linux*) -- LD="${LD-ld} -m elf_s390" -- ;; -- sparc64-*linux*) -- LD="${LD-ld} -m elf32_sparc" -- ;; -- esac -+ # Update the list of available tags. -+ if test -n "$tagname"; then -+ echo appending configuration tag \"$tagname\" to $ofile -+ -+ case $tagname in -+ CXX) -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_LIBTOOL_LANG_CXX_CONFIG -+ else -+ tagname="" -+ fi - ;; -- *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" -- ;; -- ppc*-*linux*|powerpc*-*linux*) -- LD="${LD-ld} -m elf64ppc" -- ;; -- s390*-*linux*|s390*-*tpf*) -- LD="${LD-ld} -m elf64_s390" -- ;; -- sparc*-*linux*) -- LD="${LD-ld} -m elf64_sparc" -- ;; -- esac -+ -+ F77) -+ if test -n "$F77" && test "X$F77" != "Xno"; then -+ AC_LIBTOOL_LANG_F77_CONFIG -+ else -+ tagname="" -+ fi - ;; -- esac -- fi -- rm -rf conftest* -- ;; - --*-*-sco3.2v5*) -- # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -belf" -- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -- [AC_LANG_PUSH(C) -- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -- AC_LANG_POP]) -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -- fi -- ;; --sparc*-*solaris*) -- # 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 -- *64-bit*) -- case $lt_cv_prog_gnu_ld in -- yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) -- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -- LD="${LD-ld} -64" -+ GCJ) -+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -+ AC_LIBTOOL_LANG_GCJ_CONFIG -+ else -+ tagname="" - fi - ;; -+ -+ RC) -+ AC_LIBTOOL_LANG_RC_CONFIG -+ ;; -+ -+ *) -+ AC_MSG_ERROR([Unsupported tag name: $tagname]) -+ ;; - esac -- ;; -- esac -- fi -- rm -rf conftest* -- ;; --esac - --need_locks="$enable_libtool_lock" --])# _LT_ENABLE_LOCK -+ # Append the new tag name to the list of available tags. -+ if test -n "$tagname" ; then -+ available_tags="$available_tags $tagname" -+ fi -+ fi -+ done -+ IFS="$lt_save_ifs" - -+ # Now substitute the updated list of available tags. -+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -+ mv "${ofile}T" "$ofile" -+ chmod +x "$ofile" -+ else -+ rm -f "${ofile}T" -+ AC_MSG_ERROR([unable to update list of available tagged configurations.]) -+ fi -+fi -+])# _LT_AC_TAGCONFIG - --# _LT_CMD_OLD_ARCHIVE --# ------------------- --m4_defun([_LT_CMD_OLD_ARCHIVE], --[AC_CHECK_TOOL(AR, ar, false) --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --_LT_DECL([], [AR], [1], [The archiver]) --_LT_DECL([], [AR_FLAGS], [1]) - --AC_CHECK_TOOL(STRIP, strip, :) --test -z "$STRIP" && STRIP=: --_LT_DECL([], [STRIP], [1], [A symbol stripping program]) -+# AC_LIBTOOL_DLOPEN -+# ----------------- -+# enable checks for dlopen support -+AC_DEFUN([AC_LIBTOOL_DLOPEN], -+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -+])# AC_LIBTOOL_DLOPEN - --AC_CHECK_TOOL(RANLIB, ranlib, :) --test -z "$RANLIB" && RANLIB=: --_LT_DECL([], [RANLIB], [1], -- [Commands used to install an old-style archive]) - --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -+# AC_LIBTOOL_WIN32_DLL -+# -------------------- -+# declare package support for building win32 DLLs -+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -+])# AC_LIBTOOL_WIN32_DLL - --if test -n "$RANLIB"; then -- case $host_os in -- openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -- ;; -- *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -- ;; -- esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" --fi --_LT_DECL([], [old_postinstall_cmds], [2]) --_LT_DECL([], [old_postuninstall_cmds], [2]) --_LT_TAGDECL([], [old_archive_cmds], [2], -- [Commands used to build an old-style archive]) --])# _LT_CMD_OLD_ARCHIVE -- -- --# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, --# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) --# ---------------------------------------------------------------- --# Check whether the given compiler option works --AC_DEFUN([_LT_COMPILER_OPTION], --[m4_require([_LT_FILEUTILS_DEFAULTS])dnl --m4_require([_LT_DECL_SED])dnl --AC_CACHE_CHECK([$1], [$2], -- [$2=no -- m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -- 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. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- # The option is referenced via a variable to avoid confusing sed. -- lt_compile=`echo "$ac_compile" | $SED \ -- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -- (eval "$lt_compile" 2>conftest.err) -- ac_status=$? -- cat conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -- 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. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- $2=yes -- fi -- fi -- $RM conftest* --]) -- --if test x"[$]$2" = xyes; then -- m4_if([$5], , :, [$5]) --else -- m4_if([$6], , :, [$6]) --fi --])# _LT_COMPILER_OPTION -- --# Old name: --AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) -- -- --# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, --# [ACTION-SUCCESS], [ACTION-FAILURE]) --# ---------------------------------------------------- --# Check whether the given linker option works --AC_DEFUN([_LT_LINKER_OPTION], --[m4_require([_LT_FILEUTILS_DEFAULTS])dnl --m4_require([_LT_DECL_SED])dnl --AC_CACHE_CHECK([$1], [$2], -- [$2=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $3" -- 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 -- if test -s conftest.err; then -- # Append any errors to the config.log. -- cat conftest.err 1>&AS_MESSAGE_LOG_FD -- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if diff conftest.exp conftest.er2 >/dev/null; then -- $2=yes -- fi -- else -- $2=yes -- fi -- fi -- $RM -r conftest* -- LDFLAGS="$save_LDFLAGS" --]) -- --if test x"[$]$2" = xyes; then -- m4_if([$4], , :, [$4]) --else -- m4_if([$5], , :, [$5]) --fi --])# _LT_LINKER_OPTION -- --# Old name: --AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - -+# AC_ENABLE_SHARED([DEFAULT]) -+# --------------------------- -+# implement the --enable-shared flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_SHARED], -+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([shared], -+ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -+ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -+])# AC_ENABLE_SHARED - --# LT_CMD_MAX_LEN --#--------------- --AC_DEFUN([LT_CMD_MAX_LEN], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl --# find the maximum length of command line arguments --AC_MSG_CHECKING([the maximum length of command line arguments]) --AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -- i=0 -- teststring="ABCD" - -- case $build_os in -- msdosdjgpp*) -- # On DJGPP, this test can blow up pretty badly due to problems in libc -- # (any single argument exceeding 2000 bytes causes a buffer overrun -- # during glob expansion). Even if it were fixed, the result of this -- # check would be larger than it should be. -- lt_cv_sys_max_cmd_len=12288; # 12K is about right -- ;; -+# AC_DISABLE_SHARED -+# ----------------- -+# set the default shared flag to --disable-shared -+AC_DEFUN([AC_DISABLE_SHARED], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_SHARED(no) -+])# AC_DISABLE_SHARED - -- gnu*) -- # Under GNU Hurd, this test is not required because there is -- # no limit to the length of command line arguments. -- # Libtool will interpret -1 as no limit whatsoever -- lt_cv_sys_max_cmd_len=-1; -- ;; - -- cygwin* | mingw* | cegcc*) -- # On Win9x/ME, this test blows up -- it succeeds, but takes -- # about 5 minutes as the teststring grows exponentially. -- # Worse, since 9x/ME are not pre-emptively multitasking, -- # you end up with a "frozen" computer, even though with patience -- # the test eventually succeeds (with a max line length of 256k). -- # Instead, let's just punt: use the minimum linelength reported by -- # all of the supported platforms: 8192 (on NT/2K/XP). -- lt_cv_sys_max_cmd_len=8192; -- ;; -+# AC_ENABLE_STATIC([DEFAULT]) -+# --------------------------- -+# implement the --enable-static flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_STATIC], -+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([static], -+ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], -+ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_static=]AC_ENABLE_STATIC_DEFAULT) -+])# AC_ENABLE_STATIC - -- amigaos*) -- # On AmigaOS with pdksh, this test takes hours, literally. -- # So we just punt and use a minimum line length of 8192. -- lt_cv_sys_max_cmd_len=8192; -- ;; - -- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -- # This has been around since 386BSD, at least. Likely further. -- if test -x /sbin/sysctl; then -- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -- elif test -x /usr/sbin/sysctl; then -- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -- else -- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -- fi -- # And add a safety zone -- 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` -- ;; -+# AC_DISABLE_STATIC -+# ----------------- -+# set the default static flag to --disable-static -+AC_DEFUN([AC_DISABLE_STATIC], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_STATIC(no) -+])# AC_DISABLE_STATIC - -- interix*) -- # We know the value 262144 and hardcode it with a safety zone (like BSD) -- lt_cv_sys_max_cmd_len=196608 -- ;; - -- osf*) -- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -- # nice to cause kernel panics so lets avoid the loop below. -- # First set a reasonable default. -- lt_cv_sys_max_cmd_len=16384 -- # -- if test -x /sbin/sysconfig; then -- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -- *1*) lt_cv_sys_max_cmd_len=-1 ;; -- esac -- fi -- ;; -- sco3.2v5*) -- lt_cv_sys_max_cmd_len=102400 -- ;; -- sysv5* | sco5v6* | sysv4.2uw2*) -- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -- if test -n "$kargmax"; then -- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -- else -- lt_cv_sys_max_cmd_len=32768 -- fi -- ;; -- *) -- 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 -- # Make teststring a little bigger before we do anything with it. -- # a 1K string should be a reasonable start. -- for i in 1 2 3 4 5 6 7 8 ; do -- teststring=$teststring$teststring -- done -- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -- # 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. -- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ -- = "XX$teststring$teststring"; } >/dev/null 2>&1 && -- test $i != 17 # 1/2 MB should be enough -- do -- i=`expr $i + 1` -- teststring=$teststring$teststring -+# AC_ENABLE_FAST_INSTALL([DEFAULT]) -+# --------------------------------- -+# implement the --enable-fast-install flag -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+AC_DEFUN([AC_ENABLE_FAST_INSTALL], -+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -+AC_ARG_ENABLE([fast-install], -+ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -+ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi - done -- # Only check the string length outside the loop. -- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` -- 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 --]) --if test -n $lt_cv_sys_max_cmd_len ; then -- AC_MSG_RESULT($lt_cv_sys_max_cmd_len) --else -- AC_MSG_RESULT(none) --fi --max_cmd_len=$lt_cv_sys_max_cmd_len --_LT_DECL([], [max_cmd_len], [0], -- [What is the maximum length of a command?]) --])# LT_CMD_MAX_LEN -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -+])# AC_ENABLE_FAST_INSTALL - --# Old name: --AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - -+# AC_DISABLE_FAST_INSTALL -+# ----------------------- -+# set the default to --disable-fast-install -+AC_DEFUN([AC_DISABLE_FAST_INSTALL], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+AC_ENABLE_FAST_INSTALL(no) -+])# AC_DISABLE_FAST_INSTALL - --# _LT_HEADER_DLFCN --# ---------------- --m4_defun([_LT_HEADER_DLFCN], --[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl --])# _LT_HEADER_DLFCN - -+# AC_LIBTOOL_PICMODE([MODE]) -+# -------------------------- -+# implement the --with-pic flag -+# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -+AC_DEFUN([AC_LIBTOOL_PICMODE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+pic_mode=ifelse($#,1,$1,default) -+])# AC_LIBTOOL_PICMODE - --# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, --# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) --# ---------------------------------------------------------------- --m4_defun([_LT_TRY_DLOPEN_SELF], --[m4_require([_LT_HEADER_DLFCN])dnl --if test "$cross_compiling" = yes; then : -- [$4] --else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<_LT_EOF --[#line __oline__ "configure" --#include "confdefs.h" - --#if HAVE_DLFCN_H --#include <dlfcn.h> --#endif -+# AC_PROG_EGREP -+# ------------- -+# This is predefined starting with Autoconf 2.54, so this conditional -+# definition can be removed once we require Autoconf 2.54 or later. -+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], -+ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -+ then ac_cv_prog_egrep='grep -E' -+ else ac_cv_prog_egrep='egrep' -+ fi]) -+ EGREP=$ac_cv_prog_egrep -+ AC_SUBST([EGREP]) -+])]) - --#include <stdio.h> - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -+# AC_PATH_TOOL_PREFIX -+# ------------------- -+# 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]) -+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -+[case $MAGIC_CMD in -+[[\\/*] | ?:[\\/]*]) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+dnl $ac_dummy forces splitting on constant user-supplied paths. -+dnl POSIX.2 word splitting is done only on the output of word expansions, -+dnl not every word. This closes a longstanding sh security hole. -+ ac_dummy="ifelse([$2], , $PATH, [$2])" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$1; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/$1" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <<EOF 1>&2 - --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org - --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -+EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac]) -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ AC_MSG_RESULT($MAGIC_CMD) -+else -+ AC_MSG_RESULT(no) -+fi -+])# AC_PATH_TOOL_PREFIX - -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -- else -- puts (dlerror ()); - -- return status; --}] --_LT_EOF -- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) $1 ;; -- x$lt_dlneed_uscore) $2 ;; -- x$lt_dlunknown|x*) $3 ;; -- esac -- else : -- # compilation failed -- $3 -+# AC_PATH_MAGIC -+# ------------- -+# 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 -+ if test -n "$ac_tool_prefix"; then -+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) -+ else -+ MAGIC_CMD=: - fi - fi --rm -fr conftest* --])# _LT_TRY_DLOPEN_SELF -- -- --# LT_SYS_DLOPEN_SELF --# ------------------ --AC_DEFUN([LT_SYS_DLOPEN_SELF], --[m4_require([_LT_HEADER_DLFCN])dnl --if test "x$enable_dlopen" != xyes; then -- enable_dlopen=unknown -- enable_dlopen_self=unknown -- enable_dlopen_self_static=unknown --else -- lt_cv_dlopen=no -- lt_cv_dlopen_libs= -- -- case $host_os in -- beos*) -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ;; -- -- mingw* | pw32* | cegcc*) -- lt_cv_dlopen="LoadLibrary" -- lt_cv_dlopen_libs= -- ;; -+])# AC_PATH_MAGIC - -- cygwin*) -- lt_cv_dlopen="dlopen" -- lt_cv_dlopen_libs= -- ;; - -- darwin*) -- # if libdl is installed we need to link against it -- AC_CHECK_LIB([dl], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -- lt_cv_dlopen="dyld" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ]) -+# AC_PROG_LD -+# ---------- -+# find the pathname to the GNU or non-GNU linker -+AC_DEFUN([AC_PROG_LD], -+[AC_ARG_WITH([gnu-ld], -+ [AC_HELP_STRING([--with-gnu-ld], -+ [assume the C compiler uses GNU ld @<:@default=no@:>@])], -+ [test "$withval" = no || with_gnu_ld=yes], -+ [with_gnu_ld=no]) -+AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ AC_MSG_CHECKING([for ld used by $CC]) -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [[\\/]]* | ?:[[\\/]]*) -+ re_direlt='/[[^/]][[^/]]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld - ;; -- - *) -- AC_CHECK_FUNC([shl_load], -- [lt_cv_dlopen="shl_load"], -- [AC_CHECK_LIB([dld], [shl_load], -- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], -- [AC_CHECK_FUNC([dlopen], -- [lt_cv_dlopen="dlopen"], -- [AC_CHECK_LIB([dl], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -- [AC_CHECK_LIB([svld], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -- [AC_CHECK_LIB([dld], [dld_link], -- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) -- ]) -- ]) -- ]) -- ]) -- ]) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown - ;; - esac -+elif test "$with_gnu_ld" = yes; then -+ AC_MSG_CHECKING([for GNU ld]) -+else -+ AC_MSG_CHECKING([for non-GNU ld]) -+fi -+AC_CACHE_VAL(lt_cv_path_LD, -+[if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in -+ *GNU* | *'with BFD'*) -+ test "$with_gnu_ld" != no && break -+ ;; -+ *) -+ test "$with_gnu_ld" != yes && break -+ ;; -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+else -+ lt_cv_path_LD="$LD" # Let the user override the test with a path. -+fi]) -+LD="$lt_cv_path_LD" -+if test -n "$LD"; then -+ AC_MSG_RESULT($LD) -+else -+ AC_MSG_RESULT(no) -+fi -+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -+AC_PROG_LD_GNU -+])# AC_PROG_LD - -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -- enable_dlopen=no -- fi - -- case $lt_cv_dlopen in -- dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+# AC_PROG_LD_GNU -+# -------------- -+AC_DEFUN([AC_PROG_LD_GNU], -+[AC_REQUIRE([AC_PROG_EGREP])dnl -+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -+[# I'd rather use --version here, but apparently some GNU lds only accept -v. -+case `$LD -v 2>&1 </dev/null` in -+*GNU* | *'with BFD'*) -+ lt_cv_prog_gnu_ld=yes -+ ;; -+*) -+ lt_cv_prog_gnu_ld=no -+ ;; -+esac]) -+with_gnu_ld=$lt_cv_prog_gnu_ld -+])# AC_PROG_LD_GNU - -- save_LDFLAGS="$LDFLAGS" -- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - -- save_LIBS="$LIBS" -- LIBS="$lt_cv_dlopen_libs $LIBS" -- -- AC_CACHE_CHECK([whether a program can dlopen itself], -- lt_cv_dlopen_self, [dnl -- _LT_TRY_DLOPEN_SELF( -- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -- ]) -- -- if test "x$lt_cv_dlopen_self" = xyes; then -- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -- AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -- lt_cv_dlopen_self_static, [dnl -- _LT_TRY_DLOPEN_SELF( -- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -- ]) -+# AC_PROG_LD_RELOAD_FLAG -+# ---------------------- -+# find reload flag for linker -+# -- PORTME Some linkers may need a different reload flag. -+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], -+[AC_CACHE_CHECK([for $LD option to reload object files], -+ lt_cv_ld_reload_flag, -+ [lt_cv_ld_reload_flag='-r']) -+reload_flag=$lt_cv_ld_reload_flag -+case $reload_flag in -+"" | " "*) ;; -+*) reload_flag=" $reload_flag" ;; -+esac -+reload_cmds='$LD$reload_flag -o $output$reload_objs' -+case $host_os in -+ darwin*) -+ if test "$GCC" = yes; then -+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -+ else -+ reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi -- -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" - ;; -- esac -- -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac -+esac -+])# AC_PROG_LD_RELOAD_FLAG - -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -- esac --fi --_LT_DECL([dlopen_support], [enable_dlopen], [0], -- [Whether dlopen is supported]) --_LT_DECL([dlopen_self], [enable_dlopen_self], [0], -- [Whether dlopen of programs is supported]) --_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], -- [Whether dlopen of statically linked programs is supported]) --])# LT_SYS_DLOPEN_SELF -- --# Old name: --AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - -+# AC_DEPLIBS_CHECK_METHOD -+# ----------------------- -+# 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 recognize dependent libraries], -+lt_cv_deplibs_check_method, -+[lt_cv_file_magic_cmd='$MAGIC_CMD' -+lt_cv_file_magic_test_file= -+lt_cv_deplibs_check_method='unknown' -+# Need to set the preceding variable on all platforms that support -+# interlibrary dependencies. -+# 'none' -- dependencies not supported. -+# `unknown' -- same as none, but documents that we really don't know. -+# 'pass_all' -- all dependencies passed with no checks. -+# 'test_compile' -- check by making test program. -+# 'file_magic [[regex]]' -- check by looking for files in library path -+# which responds to the $file_magic_cmd with a given extended regex. -+# If you have `file' or equivalent on your system and you're not sure -+# whether `pass_all' will *always* work, you probably want this one. - --# _LT_COMPILER_C_O([TAGNAME]) --# --------------------------- --# Check to see if options -c and -o are simultaneously supported by compiler. --# This macro does not hard code the compiler like AC_PROG_CC_C_O. --m4_defun([_LT_COMPILER_C_O], --[m4_require([_LT_DECL_SED])dnl --m4_require([_LT_FILEUTILS_DEFAULTS])dnl --m4_require([_LT_TAG_COMPILER])dnl --AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -- [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -- $RM -r conftest 2>/dev/null -- mkdir conftest -- cd conftest -- mkdir out -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+case $host_os in -+aix[[4-9]]*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- lt_compiler_flag="-o out/conftest2.$ac_objext" -- # Insert the option either (1) after the last *FLAGS variable, or -- # (2) before a word containing "conftest.", or (3) at the end. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- lt_compile=`echo "$ac_compile" | $SED \ -- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -- (eval "$lt_compile" 2>out/conftest.err) -- ac_status=$? -- cat out/conftest.err >&AS_MESSAGE_LOG_FD -- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -- if (exit $ac_status) && test -s out/conftest2.$ac_objext -- then -- # The compiler can only warn and ignore the option if not recognized -- # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -- fi -- fi -- chmod u+w . 2>&AS_MESSAGE_LOG_FD -- $RM conftest* -- # SGI C++ compiler will create directory out/ii_files/ for -- # template instantiation -- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -- $RM out/* && rmdir out -- cd .. -- $RM -r conftest -- $RM conftest* --]) --_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], -- [Does compiler simultaneously support -c and -o options?]) --])# _LT_COMPILER_C_O -+beos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -+bsdi[[45]]*) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' -+ lt_cv_file_magic_cmd='/usr/bin/file -L' -+ lt_cv_file_magic_test_file=/shlib/libc.so -+ ;; - --# _LT_COMPILER_FILE_LOCKS([TAGNAME]) --# ---------------------------------- --# Check to see if we can do hard links to lock some files if needed --m4_defun([_LT_COMPILER_FILE_LOCKS], --[m4_require([_LT_ENABLE_LOCK])dnl --m4_require([_LT_FILEUTILS_DEFAULTS])dnl --_LT_COMPILER_C_O([$1]) -+cygwin*) -+ # func_win32_libid is a shell function defined in ltmain.sh -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ ;; - --hard_links="nottested" --if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -- # do not overwrite the value of need_locks provided by the user -- AC_MSG_CHECKING([if we can lock with hard links]) -- hard_links=yes -- $RM conftest* -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- touch conftest.a -- ln conftest.a conftest.b 2>&5 || hard_links=no -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- AC_MSG_RESULT([$hard_links]) -- if test "$hard_links" = no; then -- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -- need_locks=warn -+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', -+ # 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 --else -- need_locks=no --fi --_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) --])# _LT_COMPILER_FILE_LOCKS -- -- --# _LT_CHECK_OBJDIR --# ---------------- --m4_defun([_LT_CHECK_OBJDIR], --[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], --[rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- lt_cv_objdir=.libs --else -- # MS-DOS does not allow filenames that begin with a dot. -- lt_cv_objdir=_libs --fi --rmdir .libs 2>/dev/null]) --objdir=$lt_cv_objdir --_LT_DECL([], [objdir], [0], -- [The name of the directory that contains temporary libtool files])dnl --m4_pattern_allow([LT_OBJDIR])dnl --AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", -- [Define to the sub-directory in which libtool stores uninstalled libraries.]) --])# _LT_CHECK_OBJDIR -- -+ ;; - --# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) --# -------------------------------------- --# Check hardcoding attributes. --m4_defun([_LT_LINKER_HARDCODE_LIBPATH], --[AC_MSG_CHECKING([how to hardcode library paths into programs]) --_LT_TAGVAR(hardcode_action, $1)= --if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || -- test -n "$_LT_TAGVAR(runpath_var, $1)" || -- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+darwin* | rhapsody*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- # We can hardcode non-existent directories. -- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && -- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then -- # Linking always hardcodes the temporary library directory. -- _LT_TAGVAR(hardcode_action, $1)=relink -+freebsd* | dragonfly*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ case $host_cpu in -+ i*86 ) -+ # Not sure whether the presence of OpenBSD here was a mistake. -+ # Let's accept both of them until this is cleared up. -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ ;; -+ esac - else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- _LT_TAGVAR(hardcode_action, $1)=immediate -+ lt_cv_deplibs_check_method=pass_all - fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- _LT_TAGVAR(hardcode_action, $1)=unsupported --fi --AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -- --if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || -- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless --fi --_LT_TAGDECL([], [hardcode_action], [0], -- [How to hardcode a shared library path into an executable]) --])# _LT_LINKER_HARDCODE_LIBPATH -+ ;; - -+gnu*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - --# _LT_CMD_STRIPLIB --# ---------------- --m4_defun([_LT_CMD_STRIPLIB], --[m4_require([_LT_DECL_EGREP]) --striplib= --old_striplib= --AC_MSG_CHECKING([whether stripping libraries is possible]) --if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -- test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- AC_MSG_RESULT([yes]) --else --# FIXME - insert some real tests, host_os isn't really good enough -- case $host_os in -- darwin*) -- if test -n "$STRIP" ; then -- striplib="$STRIP -x" -- old_striplib="$STRIP -S" -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) -- fi -+hpux10.20* | hpux11*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ case $host_cpu in -+ ia64*) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' -+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ ;; -+ hppa*64*) -+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) -- AC_MSG_RESULT([no]) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -+ lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac --fi --_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) --_LT_DECL([], [striplib], [1]) --])# _LT_CMD_STRIPLIB -+ ;; - -+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)$' -+ ;; - --# _LT_SYS_DYNAMIC_LINKER([TAG]) --# ----------------------------- --# PORTME Fill in your ld.so characteristics --m4_defun([_LT_SYS_DYNAMIC_LINKER], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl --m4_require([_LT_DECL_EGREP])dnl --m4_require([_LT_FILEUTILS_DEFAULTS])dnl --m4_require([_LT_DECL_OBJDUMP])dnl --m4_require([_LT_DECL_SED])dnl --AC_MSG_CHECKING([dynamic linker characteristics]) --m4_if([$1], -- [], [ --if test "$GCC" = yes; then -- case $host_os in -- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -- *) lt_awk_arg="/^libraries:/" ;; -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; - 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. -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+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 -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - 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]) --library_names_spec= --libname_spec='lib$name' --soname_spec= --shrext_cmds=".so" --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" --need_lib_prefix=unknown --hardcode_into_libs=no -- --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --need_version=unknown -+ ;; - --case $host_os in --aix3*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -- shlibpath_var=LIBPATH -+newos6*) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=/usr/lib/libnls.so -+ ;; - -- # AIX 3 has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}${shared_ext}$major' -+nto-qnx*) -+ lt_cv_deplibs_check_method=unknown - ;; - --aix[[4-9]]*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- hardcode_into_libs=yes -- if test "$host_cpu" = ia64; then -- # AIX 5 supports IA64 -- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -+openbsd*) -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else -- # With GCC up to 2.95.x, collect2 would create an import file -- # for dependence libraries. The import file would start with -- # the line `#! .'. This would cause the generated library to -- # depend on `.', always an invalid library. This was fixed in -- # development snapshots of GCC prior to 3.0. -- case $host_os in -- aix4 | aix4.[[01]] | aix4.[[01]].*) -- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -- echo ' yes ' -- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then -- : -- else -- can_build_shared=no -- fi -- ;; -- esac -- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -- # soname into executable. Probably we can add versioning support to -- # collect2, so additional links can be useful in future. -- if test "$aix_use_runtimelinking" = yes; then -- # If using run time linking (on AIX 4.2 or later) use lib<name>.so -- # instead of lib<name>.a to let people know that these are not -- # typical AIX shared libraries. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- else -- # We preserve .a as extension for shared libraries through AIX4.2 -- # and later when we are not doing run time linking. -- library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}${shared_ext}$major' -- fi -- shlibpath_var=LIBPATH -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - --amigaos*) -- case $host_cpu in -- powerpc) -- # Since July 2007 AmigaOS4 officially supports .so libraries. -- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- ;; -- m68k) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -- ;; -- esac -+osf3* | osf4* | osf5*) -+ lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -- library_names_spec='${libname}${shared_ext}' -- dynamic_linker="$host_os ld.so" -- shlibpath_var=LIBRARY_PATH -+rdos*) -+ lt_cv_deplibs_check_method=pass_all - ;; - --bsdi[[45]]*) -- version_type=linux -- 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' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- # the default ld.so.conf also contains /usr/contrib/lib and -- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -- # libtool to hard-code these into programs -+solaris*) -+ lt_cv_deplibs_check_method=pass_all - ;; - --cygwin* | mingw* | pw32* | cegcc*) -- version_type=windows -- shrext_cmds=".dll" -- need_version=no -- need_lib_prefix=no -- -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -- library_names_spec='$libname.dll.a' -- # DLL is installed to $(libdir)/../bin by postinstall_cmds -- postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -- dldir=$destdir/`dirname \$dlpath`~ -- test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname~ -- chmod a+x \$dldir/$dlname~ -- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -- fi' -- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -- dlpath=$dir/\$dldll~ -- $RM \$dlpath' -- shlibpath_overrides_runpath=yes -- -- case $host_os in -- cygwin*) -- # Cygwin DLLs use 'cyg' prefix rather than 'lib' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -- ;; -- mingw* | cegcc*) -- # MinGW DLLs use traditional 'lib' prefix -- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- 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 ';[c-zC-Z]:/' >/dev/null]; then -- # It is most probably a Windows format PATH printed by -- # mingw gcc, but we are running on Cygwin. Gcc prints its search -- # path with ; separators, and with drive letters. We can handle the -- # drive letters (cygwin fileutils understands them), so leave them, -- # especially as we might pass files found there to a mingw objdump, -- # which wouldn't understand a cygwinified path. Ahh. -- 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 -- ;; -- pw32*) -- # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- ;; -- esac -+sysv4 | sysv4.3*) -+ case $host_vendor in -+ motorola) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; -- -- *) -- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ncr) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ sequent) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -+ ;; -+ sni) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -+ lt_cv_file_magic_test_file=/lib/libc.so -+ ;; -+ siemens) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ pc) -+ lt_cv_deplibs_check_method=pass_all - ;; - esac -- dynamic_linker='Win32 ld.exe' -- # FIXME: first we should search . and the directory the executable is in -- shlibpath_var=PATH -- ;; -- --darwin* | rhapsody*) -- dynamic_linker="$host_os dyld" -- version_type=darwin -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' -- soname_spec='${libname}${release}${major}$shared_ext' -- shlibpath_overrides_runpath=yes -- shlibpath_var=DYLD_LIBRARY_PATH -- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' --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' - ;; - --dgux*) -- 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 -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all - ;; -+esac -+]) -+file_magic_cmd=$lt_cv_file_magic_cmd -+deplibs_check_method=$lt_cv_deplibs_check_method -+test -z "$deplibs_check_method" && deplibs_check_method=unknown -+])# AC_DEPLIBS_CHECK_METHOD - --freebsd1*) -- dynamic_linker=no -- ;; - --freebsd* | dragonfly*) -- # DragonFly does not have aout. When/if they implement a new -- # versioning mechanism, adjust this. -- if test -x /usr/bin/objformat; then -- objformat=`/usr/bin/objformat` -- else -- case $host_os in -- freebsd[[123]]*) objformat=aout ;; -- *) objformat=elf ;; -- esac -+# AC_PROG_NM -+# ---------- -+# find the pathname to a BSD-compatible name lister -+AC_DEFUN([AC_PROG_NM], -+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, -+[if test -n "$NM"; then -+ # Let the user override the test. -+ lt_cv_path_NM="$NM" -+else -+ lt_nm_to_check="${ac_tool_prefix}nm" -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ lt_nm_to_check="$lt_nm_to_check nm" - fi -- version_type=freebsd-$objformat -- case $version_type in -- freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- need_version=no -- need_lib_prefix=no -- ;; -- freebsd-*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -- need_version=yes -- ;; -- esac -- shlibpath_var=LD_LIBRARY_PATH -- case $host_os in -- freebsd2*) -- shlibpath_overrides_runpath=yes -- ;; -- freebsd3.[[01]]* | freebsdelf3.[[01]]*) -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ -- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- *) # from 4.6 on, and DragonFly -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- esac -- ;; -+ for lt_tmp_nm in $lt_nm_to_check; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+ done -+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -+fi]) -+NM="$lt_cv_path_NM" -+])# AC_PROG_NM - --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 -- hardcode_into_libs=yes -- ;; - --hpux9* | hpux10* | hpux11*) -- # Give a soname corresponding to the major version so that dld.sl refuses to -- # link against other versions. -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- case $host_cpu in -- ia64*) -- shrext_cmds='.so' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.so" -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- if test "X$HPUX_IA64_MODE" = X32; then -- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -- else -- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -- fi -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- hppa*64*) -- shrext_cmds='.sl' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- *) -- shrext_cmds='.sl' -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- ;; -- esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -- postinstall_cmds='chmod 555 $lib' -+# AC_CHECK_LIBM -+# ------------- -+# check for math library -+AC_DEFUN([AC_CHECK_LIBM], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+LIBM= -+case $host in -+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+ # These system don't have libm, or don't need it - ;; -- --interix[[3-9]]*) -- 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' -- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -+*-ncr-sysv4.3*) -+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -- --irix5* | irix6* | nonstopux*) -- case $host_os in -- nonstopux*) version_type=nonstopux ;; -- *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -- else -- version_type=irix -- fi ;; -- esac -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -- case $host_os in -- irix5* | nonstopux*) -- libsuff= shlibsuff= -- ;; -- *) -- case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -- libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -- libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -- libsuff=64 shlibsuff=64 libmagic=64-bit;; -- *) libsuff= shlibsuff= libmagic=never-match;; -- esac -- ;; -- esac -- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- hardcode_into_libs=yes -+*) -+ AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -+esac -+])# AC_CHECK_LIBM - --# No shared lib support for Linux oldld, aout, or coff. --linux*oldld* | linux*aout* | linux*coff*) -- dynamic_linker=no -- ;; - --# This must be Linux ELF. --linux* | k*bsd*-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' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- # Some binutils ld are patched to set DT_RUNPATH -- save_LDFLAGS=$LDFLAGS -- save_libdir=$libdir -- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ -- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], -- [shlibpath_overrides_runpath=yes])]) -- LDFLAGS=$save_LDFLAGS -- libdir=$save_libdir -+# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -+# ----------------------------------- -+# sets LIBLTDL to the link flags for the libltdl convenience library and -+# LTDLINCL to the include flags for the libltdl header and adds -+# --enable-ltdl-convenience to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -+# (note the single quotes!). If your package is not flat and you're not -+# using automake, define top_builddir and top_srcdir appropriately in -+# the Makefiles. -+AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ case $enable_ltdl_convenience in -+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -+ "") enable_ltdl_convenience=yes -+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -+ esac -+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la -+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -+ # For backwards non-gettext consistent compatibility... -+ INCLTDL="$LTDLINCL" -+])# AC_LIBLTDL_CONVENIENCE - -- # This implies no fast_install, which is unacceptable. -- # Some rework will be needed to allow for fast_install -- # before this can be enabled. -- hardcode_into_libs=yes - -- # 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>/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" -+# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -+# ----------------------------------- -+# sets LIBLTDL to the link flags for the libltdl installable library and -+# LTDLINCL to the include flags for the libltdl header and adds -+# --enable-ltdl-install to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# and an installed libltdl is not found, it is assumed to be `libltdl'. -+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -+# '${top_srcdir}/' (note the single quotes!). If your package is not -+# flat and you're not using automake, define top_builddir and top_srcdir -+# appropriately in the Makefiles. -+# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -+AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -+ AC_CHECK_LIB(ltdl, lt_dlinit, -+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], -+ [if test x"$enable_ltdl_install" = xno; then -+ AC_MSG_WARN([libltdl not installed, but installation disabled]) -+ else -+ enable_ltdl_install=yes -+ fi -+ ]) -+ if test x"$enable_ltdl_install" = x"yes"; then -+ ac_configure_args="$ac_configure_args --enable-ltdl-install" -+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la -+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -+ else -+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -+ LIBLTDL="-lltdl" -+ LTDLINCL= - fi -+ # For backwards non-gettext consistent compatibility... -+ INCLTDL="$LTDLINCL" -+])# AC_LIBLTDL_INSTALLABLE - -- # We used to test for /lib/ld.so.1 and disable shared libraries on -- # powerpc, because MkLinux only supported shared libraries with the -- # GNU dynamic linker. Since this was broken with cross compilers, -- # most powerpc-linux boxes support dynamic linking these days and -- # people can always --disable-shared, the test was removed, and we -- # assume the GNU/Linux dynamic linker is in use. -- dynamic_linker='GNU/Linux ld.so' -- ;; - --netbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- dynamic_linker='NetBSD (a.out) ld.so' -- else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- dynamic_linker='NetBSD ld.elf_so' -- fi -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -+# AC_LIBTOOL_CXX -+# -------------- -+# enable support for C++ libraries -+AC_DEFUN([AC_LIBTOOL_CXX], -+[AC_REQUIRE([_LT_AC_LANG_CXX]) -+])# AC_LIBTOOL_CXX - --newsos6) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- ;; - --*nto* | *qnx*) -- version_type=qnx -- 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='ldqnx.so' -- ;; -+# _LT_AC_LANG_CXX -+# --------------- -+AC_DEFUN([_LT_AC_LANG_CXX], -+[AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -+])# _LT_AC_LANG_CXX - --openbsd*) -- version_type=sunos -- sys_lib_dlsearch_path_spec="/usr/lib" -- need_lib_prefix=no -- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -- case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -- esac -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case $host_os in -- openbsd2.[[89]] | openbsd2.[[89]].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -- else -- shlibpath_overrides_runpath=yes -- fi -- ;; -+# _LT_AC_PROG_CXXCPP -+# ------------------ -+AC_DEFUN([_LT_AC_PROG_CXXCPP], -+[ -+AC_REQUIRE([AC_PROG_CXX]) -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+fi -+])# _LT_AC_PROG_CXXCPP - --os2*) -- libname_spec='$name' -- shrext_cmds=".dll" -- need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -- dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -- ;; -+# AC_LIBTOOL_F77 -+# -------------- -+# enable support for Fortran 77 libraries -+AC_DEFUN([AC_LIBTOOL_F77], -+[AC_REQUIRE([_LT_AC_LANG_F77]) -+])# AC_LIBTOOL_F77 - --osf3* | osf4* | osf5*) -- version_type=osf -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -- ;; - --rdos*) -- dynamic_linker=no -- ;; -+# _LT_AC_LANG_F77 -+# --------------- -+AC_DEFUN([_LT_AC_LANG_F77], -+[AC_REQUIRE([AC_PROG_F77]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -+])# _LT_AC_LANG_F77 - --solaris*) -- 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=yes -- hardcode_into_libs=yes -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' -- ;; - --sunos4*) -- version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- fi -- need_version=yes -- ;; -+# AC_LIBTOOL_GCJ -+# -------------- -+# enable support for GCJ libraries -+AC_DEFUN([AC_LIBTOOL_GCJ], -+[AC_REQUIRE([_LT_AC_LANG_GCJ]) -+])# AC_LIBTOOL_GCJ - --sysv4 | sysv4.3*) -- version_type=linux -- 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 -- case $host_vendor in -- sni) -- shlibpath_overrides_runpath=no -- need_lib_prefix=no -- runpath_var=LD_RUN_PATH -- ;; -- siemens) -- need_lib_prefix=no -- ;; -- motorola) -- need_lib_prefix=no -- need_version=no -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -- ;; -- esac -- ;; - --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -- shlibpath_var=LD_LIBRARY_PATH -- fi -- ;; -+# _LT_AC_LANG_GCJ -+# --------------- -+AC_DEFUN([_LT_AC_LANG_GCJ], -+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], -+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], -+ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], -+ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], -+ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -+])# _LT_AC_LANG_GCJ - --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- version_type=freebsd-elf -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- if test "$with_gnu_ld" = yes; then -- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -- else -- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -- case $host_os in -- sco3.2v5*) -- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -- ;; -- esac -- fi -- sys_lib_dlsearch_path_spec='/usr/lib' -- ;; - --tpf*) -- # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -- 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}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -+# AC_LIBTOOL_RC -+# ------------- -+# enable support for Windows resource files -+AC_DEFUN([AC_LIBTOOL_RC], -+[AC_REQUIRE([LT_AC_PROG_RC]) -+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -+])# AC_LIBTOOL_RC - --uts4*) -- version_type=linux -- 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 -- ;; - --*) -- dynamic_linker=no -+# AC_LIBTOOL_LANG_C_CONFIG -+# ------------------------ -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -+AC_DEFUN([_LT_AC_LANG_C_CONFIG], -+[lt_save_CC="$CC" -+AC_LANG_PUSH(C) -+ -+# Source file extension for C test sources. -+ac_ext=c -+ -+# Object file extension for compiled C test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+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);}' -+ -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+AC_LIBTOOL_SYS_LIB_STRIP -+AC_LIBTOOL_DLOPEN_SELF -+ -+# Report which library types will actually be built -+AC_MSG_CHECKING([if libtool supports shared libraries]) -+AC_MSG_RESULT([$can_build_shared]) -+ -+AC_MSG_CHECKING([whether to build shared libraries]) -+test "$can_build_shared" = "no" && enable_shared=no -+ -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case $host_os in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi - ;; -+ -+aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; - esac --AC_MSG_RESULT([$dynamic_linker]) --test "$dynamic_linker" = no && can_build_shared=no -+AC_MSG_RESULT([$enable_shared]) - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" --fi -+AC_MSG_CHECKING([whether to build static libraries]) -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+AC_MSG_RESULT([$enable_static]) - --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" --fi --if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" --fi -+AC_LIBTOOL_CONFIG($1) - --_LT_DECL([], [variables_saved_for_relink], [1], -- [Variables whose values should be saved in libtool wrapper scripts and -- restored at link time]) --_LT_DECL([], [need_lib_prefix], [0], -- [Do we need the "lib" prefix for modules?]) --_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) --_LT_DECL([], [version_type], [0], [Library versioning type]) --_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) --_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) --_LT_DECL([], [shlibpath_overrides_runpath], [0], -- [Is shlibpath searched before the hard-coded library search path?]) --_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) --_LT_DECL([], [library_names_spec], [1], -- [[List of archive names. First name is the real one, the rest are links. -- The last name is the one that the linker finds with -lNAME]]) --_LT_DECL([], [soname_spec], [1], -- [[The coded name of the library, if different from the real name]]) --_LT_DECL([], [postinstall_cmds], [2], -- [Command to use after installation of a shared archive]) --_LT_DECL([], [postuninstall_cmds], [2], -- [Command to use after uninstallation of a shared archive]) --_LT_DECL([], [finish_cmds], [2], -- [Commands used to finish a libtool library installation in a directory]) --_LT_DECL([], [finish_eval], [1], -- [[As "finish_cmds", except a single script fragment to be evaled but -- not shown]]) --_LT_DECL([], [hardcode_into_libs], [0], -- [Whether we should hardcode library paths into libraries]) --_LT_DECL([], [sys_lib_search_path_spec], [2], -- [Compile-time system search path for libraries]) --_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], -- [Run-time system search path for libraries]) --])# _LT_SYS_DYNAMIC_LINKER -+AC_LANG_POP -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_C_CONFIG - - --# _LT_PATH_TOOL_PREFIX(TOOL) -+# AC_LIBTOOL_LANG_CXX_CONFIG - # -------------------------- -# find a file program which can recognize shared library --AC_DEFUN([_LT_PATH_TOOL_PREFIX], --[m4_require([_LT_DECL_EGREP])dnl +-AC_DEFUN([AC_PATH_TOOL_PREFIX], +-[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in @@ -7200,4422 +4542,514 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. -- ac_dummy="m4_if([$2], , $PATH, [$2])" +- ac_dummy="ifelse([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$1; then -- lt_cv_path_MAGIC_CMD="$ac_dir/$1" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "file_magic "*) -- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- $EGREP "$file_magic_regex" > /dev/null; then -- : -- else -- cat <<_LT_EOF 1>&2 -- --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -+[AC_LANG_PUSH(C++) -+AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) ++# _LT_PATH_TOOL_PREFIX(TOOL) ++# -------------------------- ++# find a file program which can recognize shared library ++AC_DEFUN([_LT_PATH_TOOL_PREFIX], ++[m4_require([_LT_DECL_EGREP])dnl ++AC_MSG_CHECKING([for $1]) ++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++[case $MAGIC_CMD in ++[[\\/*] | ?:[\\/]*]) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++dnl $ac_dummy forces splitting on constant user-supplied paths. ++dnl POSIX.2 word splitting is done only on the output of word expansions, ++dnl not every word. This closes a longstanding sh security hole. ++ ac_dummy="m4_if([$2], , $PATH, [$2])" ++ for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$1; then +@@ -3135,7 +3467,7 @@ + $EGREP "$file_magic_regex" > /dev/null; then + : + else +- cat <<EOF 1>&2 ++ cat <<_LT_EOF 1>&2 + + *** Warning: the command libtool uses to detect shared libraries, + *** $file_magic_cmd, produces output that libtool cannot recognize. +@@ -3146,7 +3478,7 @@ + *** may want to report the problem to your system manager and/or to + *** bug-libtool@gnu.org + +-EOF ++_LT_EOF + fi ;; + esac + fi +@@ -3163,37 +3495,47 @@ + else + AC_MSG_RESULT(no) + fi +-])# AC_PATH_TOOL_PREFIX ++_LT_DECL([], [MAGIC_CMD], [0], ++ [Used to examine libraries when file_magic_cmd begins with "file"])dnl ++])# _LT_PATH_TOOL_PREFIX + ++# Old name: ++AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + +-# AC_PATH_MAGIC +-# ------------- + -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_AC_TAGVAR(allow_undefined_flag, $1)= -+_LT_AC_TAGVAR(always_export_symbols, $1)=no -+_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_direct, $1)=no -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+_LT_AC_TAGVAR(hardcode_automatic, $1)=no -+_LT_AC_TAGVAR(module_cmds, $1)= -+_LT_AC_TAGVAR(module_expsym_cmds, $1)= -+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_AC_TAGVAR(no_undefined_flag, $1)= -+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++# _LT_PATH_MAGIC ++# -------------- + # 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) ++m4_defun([_LT_PATH_MAGIC], ++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then +- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi + fi +-])# AC_PATH_MAGIC ++])# _LT_PATH_MAGIC --_LT_EOF -- fi ;; -- esac -- fi -- break -- fi -- done -- IFS="$lt_save_ifs" -- MAGIC_CMD="$lt_save_MAGIC_CMD" -- ;; --esac]) --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then -- AC_MSG_RESULT($MAGIC_CMD) --else -- AC_MSG_RESULT(no) --fi --_LT_DECL([], [MAGIC_CMD], [0], -- [Used to examine libraries when file_magic_cmd begins with "file"])dnl --])# _LT_PATH_TOOL_PREFIX -+# Dependencies to place before and after the object being linked: -+_LT_AC_TAGVAR(predep_objects, $1)= -+_LT_AC_TAGVAR(postdep_objects, $1)= -+_LT_AC_TAGVAR(predeps, $1)= -+_LT_AC_TAGVAR(postdeps, $1)= -+_LT_AC_TAGVAR(compiler_lib_search_path, $1)= -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= --# Old name: --AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) -+# Source file extension for C++ test sources. -+ac_ext=cpp - -+# Object file extension for compiled C++ test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext - --# _LT_PATH_MAGIC --# -------------- --# find a file program which can recognize a shared library --m4_defun([_LT_PATH_MAGIC], --[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) --if test -z "$lt_cv_path_MAGIC_CMD"; then -- if test -n "$ac_tool_prefix"; then -- _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) -- else -- MAGIC_CMD=: -- fi --fi --])# _LT_PATH_MAGIC -+# Code to be used in simple compile tests -+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); }' - --# LT_PATH_LD --# ---------- --# find the pathname to the GNU or non-GNU linker --AC_DEFUN([LT_PATH_LD], --[AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl --m4_require([_LT_DECL_SED])dnl --m4_require([_LT_DECL_EGREP])dnl -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER - --AC_ARG_WITH([gnu-ld], -- [AS_HELP_STRING([--with-gnu-ld], +-# AC_PROG_LD ++# LT_PATH_LD + # ---------- + # find the pathname to the GNU or non-GNU linker +-AC_DEFUN([AC_PROG_LD], +-[AC_ARG_WITH([gnu-ld], +- [AC_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], -- [with_gnu_ld=no])dnl -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE - --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- AC_MSG_CHECKING([for ld used by $CC]) -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [[\\/]]* | ?:[[\\/]]*) -- re_direlt='/[[^/]][[^/]]*/\.\./' -- # Canonicalize the pathname of ld -- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` -- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac --elif test "$with_gnu_ld" = yes; then -- AC_MSG_CHECKING([for GNU ld]) -+# Allow CC to be a program name with arguments. -+lt_save_CC=$CC -+lt_save_LD=$LD -+lt_save_GCC=$GCC -+GCC=$GXX -+lt_save_with_gnu_ld=$with_gnu_ld -+lt_save_path_LD=$lt_cv_path_LD -+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx - else -- AC_MSG_CHECKING([for non-GNU ld]) -+ $as_unset lt_cv_prog_gnu_ld - fi --AC_CACHE_VAL(lt_cv_path_LD, --[if test -z "$LD"; then -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- lt_cv_path_LD="$ac_dir/$ac_prog" -- # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some variants of GNU ld only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in -- *GNU* | *'with BFD'*) -- test "$with_gnu_ld" != no && break -- ;; -- *) -- test "$with_gnu_ld" != yes && break -- ;; -- esac -- fi -- done -- IFS="$lt_save_ifs" -+if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX - else -- lt_cv_path_LD="$LD" # Let the user override the test with a path. --fi]) --LD="$lt_cv_path_LD" --if test -n "$LD"; then -- AC_MSG_RESULT($LD) -+ $as_unset lt_cv_path_LD -+fi -+test -z "${LDCXX+set}" || LD=$LDCXX -+CC=${CXX-"c++"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+ -+# We don't want -fno-exception wen compiling C++ code, so set the -+# no_builtin_flag separately -+if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else -- AC_MSG_RESULT(no) -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi --test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) --_LT_PATH_LD_GNU --AC_SUBST([LD]) - --_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) --])# LT_PATH_LD -+if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration - --# Old names: --AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) --AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AM_PROG_LD], []) --dnl AC_DEFUN([AC_PROG_LD], []) -- -- --# _LT_PATH_LD_GNU --#- -------------- --m4_defun([_LT_PATH_LD_GNU], --[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, --[# I'd rather use --version here, but apparently some GNU lds only accept -v. --case `$LD -v 2>&1 </dev/null` in --*GNU* | *'with BFD'*) -- lt_cv_prog_gnu_ld=yes -- ;; --*) -- lt_cv_prog_gnu_ld=no -- ;; --esac]) --with_gnu_ld=$lt_cv_prog_gnu_ld --])# _LT_PATH_LD_GNU -+ AC_PROG_LD - -+ # Check if GNU C++ uses GNU ld as the underlying linker, since the -+ # archiving commands below assume that GNU ld is being used. -+ if test "$with_gnu_ld" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - --# _LT_CMD_RELOAD --# -------------- --# find reload flag for linker --# -- PORTME Some linkers may need a different reload flag. --m4_defun([_LT_CMD_RELOAD], --[AC_CACHE_CHECK([for $LD option to reload object files], -- lt_cv_ld_reload_flag, -- [lt_cv_ld_reload_flag='-r']) --reload_flag=$lt_cv_ld_reload_flag --case $reload_flag in --"" | " "*) ;; --*) reload_flag=" $reload_flag" ;; --esac --reload_cmds='$LD$reload_flag -o $output$reload_objs' --case $host_os in -- darwin*) -- if test "$GCC" = yes; then -- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' -+ -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -+ grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else -- reload_cmds='$LD$reload_flag -o $output$reload_objs' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi -- ;; --esac --_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl --_LT_DECL([], [reload_cmds], [2])dnl --])# _LT_CMD_RELOAD -+ else -+ with_gnu_ld=no -+ wlarc= - -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi - --# _LT_CHECK_MAGIC_METHOD --# ---------------------- --# how to check for library dependencies --# -- PORTME fill in with the dynamic library characteristics --m4_defun([_LT_CHECK_MAGIC_METHOD], --[m4_require([_LT_DECL_EGREP]) --m4_require([_LT_DECL_OBJDUMP]) --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= --lt_cv_deplibs_check_method='unknown' --# Need to set the preceding variable on all platforms that support --# interlibrary dependencies. --# 'none' -- dependencies not supported. --# `unknown' -- same as none, but documents that we really don't know. --# 'pass_all' -- all dependencies passed with no checks. --# 'test_compile' -- check by making test program. --# 'file_magic [[regex]]' -- check by looking for files in library path --# which responds to the $file_magic_cmd with a given extended regex. --# If you have `file' or equivalent on your system and you're not sure --# whether `pass_all' will *always* work, you probably want this one. -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -+ -+else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= -+fi - -+# PORTME: fill in a description of your system's C++ link characteristics -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+_LT_AC_TAGVAR(ld_shlibs, $1)=yes - case $host_os in --aix[[4-9]]*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ aix3*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aix[[4-9]]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no - --beos*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac - --bsdi[[45]]*) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- lt_cv_file_magic_test_file=/shlib/libc.so -- ;; -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - --cygwin*) -- # func_win32_libid is a shell function defined in ltmain.sh -- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -- lt_cv_file_magic_cmd='func_win32_libid' -- ;; -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_AC_TAGVAR(archive_cmds, $1)='' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - --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', -- # 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 -- ;; -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi - --cegcc) -- # use the weaker test based on 'objdump'. See mingw*. -- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -- ;; -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - --darwin* | rhapsody*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - --freebsd* | dragonfly*) -- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then -- case $host_cpu in -- i*86 ) -- # Not sure whether the presence of OpenBSD here was a mistake. -- # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -- ;; -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; - esac -- else -- lt_cv_deplibs_check_method=pass_all -- fi -- ;; -+ ;; - --gnu*) -- lt_cv_deplibs_check_method=pass_all -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _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 -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi - ;; -+ darwin* | rhapsody*) -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi -+ else -+ 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` $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 $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}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; - --hpux10.20* | hpux11*) -- lt_cv_file_magic_cmd=/usr/bin/file -- case $host_cpu in -- ia64*) -- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' -- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac - ;; -- hppa*64*) -- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -+ freebsd[[12]]*) -+ # C++ shared libraries reported to be fairly broken before switch to ELF -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- *) -- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -- lt_cv_file_magic_test_file=/usr/lib/libc.sl -+ freebsd-elf*) -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; -- esac -- ;; -- --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)$' -- ;; -- --irix5* | irix6* | nonstopux*) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- lt_cv_deplibs_check_method=pass_all -- ;; -+ freebsd* | dragonfly*) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ ;; -+ gnu*) -+ ;; -+ hpux9*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - --# This must be Linux ELF. --linux* | k*bsd*-gnu) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ case $host_cpu in -+ hppa*64*|ia64*) ;; -+ *) -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac - --netbsd*) -- 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 -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' -- fi -- ;; -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ 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' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _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' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # SGI C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ fi -+ fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ esac -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc*) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - --newos6*) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libnls.so -- ;; -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - --*nto* | *qnx*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # 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*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ m88k*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ 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= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ openbsd*) -+ 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 -+ ;; -+ osf3*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - --openbsd*) -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' -- else -- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -- fi -- ;; -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $rm $lib.exp' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - --osf3* | osf4* | osf5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ else -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ psos*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ lcc*) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes -+ _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)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # 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)='-z allextract$convenience -z defaultextract' -+ ;; -+ esac -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - --rdos*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ output_verbose_link_cmd='echo' - --solaris*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ # 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' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ # The C++ compiler must be used to create the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -+ if $CC --version | grep -v '^2\.7' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - --sysv4 | sysv4.3*) -- case $host_vendor in -- motorola) -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ 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 - ;; -- ncr) -- lt_cv_deplibs_check_method=pass_all -+ 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 -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac - ;; -- sequent) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ # So that behaviour is only enabled if SCOABSPATH is set to a -+ # non-empty value in the environment. Most likely only useful for -+ # creating official distributions of packages. -+ # This is a hack until libtool officially supports absolute path -+ # names for shared libraries. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac - ;; -- sni) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -- lt_cv_file_magic_test_file=/lib/libc.so -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac - ;; -- siemens) -- lt_cv_deplibs_check_method=pass_all -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- pc) -- lt_cv_deplibs_check_method=pass_all -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- esac -- ;; -- --tpf*) -- lt_cv_deplibs_check_method=pass_all -- ;; - esac --]) --file_magic_cmd=$lt_cv_file_magic_cmd --deplibs_check_method=$lt_cv_deplibs_check_method --test -z "$deplibs_check_method" && deplibs_check_method=unknown -+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - --_LT_DECL([], [deplibs_check_method], [1], -- [Method to check whether dependent libraries are shared objects]) --_LT_DECL([], [file_magic_cmd], [1], -- [Command to use when deplibs_check_method == "file_magic"]) --])# _LT_CHECK_MAGIC_METHOD -+_LT_AC_TAGVAR(GCC, $1)="$GXX" -+_LT_AC_TAGVAR(LD, $1)="$LD" - -+AC_LIBTOOL_POSTDEP_PREDEP($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - --# LT_PATH_NM --# ---------- --# find the pathname to a BSD- or MS-compatible name lister --AC_DEFUN([LT_PATH_NM], --[AC_REQUIRE([AC_PROG_CC])dnl --AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, --[if test -n "$NM"; then -- # Let the user override the test. -- lt_cv_path_NM="$NM" --else -- lt_nm_to_check="${ac_tool_prefix}nm" -- 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 -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- tmp_nm="$ac_dir/$lt_tmp_nm" -- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -- # Check to see if the nm accepts a BSD-compat flag. -- # Adding the `sed 1q' prevents false positives on HP-UX, which says: -- # nm: unknown option "B" ignored -- # Tru64's nm complains that /dev/null is an invalid object file -- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -- */dev/null* | *'Invalid file or object type'*) -- lt_cv_path_NM="$tmp_nm -B" -- break -- ;; -- *) -- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -- */dev/null*) -- lt_cv_path_NM="$tmp_nm -p" -- break -- ;; -- *) -- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -- continue # so that we can try to find one that supports BSD flags -- ;; -- esac -- ;; -- esac -- fi -- done -- IFS="$lt_save_ifs" -- done -- : ${lt_cv_path_NM=no} --fi]) --if test "$lt_cv_path_NM" != "no"; then -- NM="$lt_cv_path_NM" -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_POP -+CC=$lt_save_CC -+LDCXX=$LD -+LD=$lt_save_LD -+GCC=$lt_save_GCC -+with_gnu_ldcxx=$with_gnu_ld -+with_gnu_ld=$lt_save_with_gnu_ld -+lt_cv_path_LDCXX=$lt_cv_path_LD -+lt_cv_path_LD=$lt_save_path_LD -+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+])# AC_LIBTOOL_LANG_CXX_CONFIG -+ -+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -+# ------------------------------------ -+# Figure out "hidden" library dependencies from verbose -+# compiler output when linking a shared library. -+# Parse the compiler output and extract the necessary -+# objects, libraries and library flags. -+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+dnl we can't use the lt_simple_compile_test_code here, -+dnl because it contains code intended for an executable, -+dnl not a library. It's possible we should let each -+dnl tag define a new lt_????_link_test_code variable, -+dnl but it's only used here... -+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF -+int a; -+void foo (void) { a = 0; } -+EOF -+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF -+class Foo -+{ -+public: -+ Foo (void) { a = 0; } -+private: -+ int a; -+}; -+EOF -+],[$1],[F77],[cat > conftest.$ac_ext <<EOF -+ subroutine foo -+ implicit none -+ integer*4 a -+ a=0 -+ return -+ end -+EOF -+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF -+public class foo { -+ private int a; -+ public void bar (void) { -+ a = 0; -+ } -+}; -+EOF -+]) -+dnl Parse the compiler output and extract the necessary -+dnl objects, libraries and library flags. -+if AC_TRY_EVAL(ac_compile); then -+ # Parse the compiler output and extract the necessary -+ # objects, libraries and library flags. -+ -+ # Sentinel used to keep track of whether or not we are before -+ # the conftest object file. -+ pre_test_object_deps_done=no -+ -+ # The `*' in the case matches for architectures that use `case' in -+ # $output_verbose_cmd can trigger glob expansion during the loop -+ # eval without this substitution. -+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` -+ -+ for p in `eval $output_verbose_link_cmd`; do -+ case $p in -+ -+ -L* | -R* | -l*) -+ # Some compilers place space between "-{L,R}" and the path. -+ # Remove the space. -+ if test $p = "-L" \ -+ || test $p = "-R"; then -+ prev=$p -+ continue -+ else -+ prev= -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ case $p in -+ -L* | -R*) -+ # Internal compiler library paths should come after those -+ # provided the user. The postdeps already come after the -+ # user supplied libs so there is no need to process them. -+ if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" -+ else -+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" -+ fi -+ ;; -+ # The "-l" case would never come before the object being -+ # linked, so don't bother handling this case. -+ esac -+ else -+ if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then -+ _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" -+ else -+ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" -+ fi -+ fi -+ ;; -+ -+ *.$objext) -+ # This assumes that the test object file only shows up -+ # once in the compiler output. -+ if test "$p" = "conftest.$objext"; then -+ pre_test_object_deps_done=yes -+ continue -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then -+ _LT_AC_TAGVAR(predep_objects, $1)="$p" -+ else -+ _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" -+ fi -+ else -+ if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then -+ _LT_AC_TAGVAR(postdep_objects, $1)="$p" -+ else -+ _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" -+ fi -+ fi -+ ;; -+ -+ *) ;; # Ignore the rest. -+ -+ esac -+ done -+ -+ # Clean up. -+ rm -f a.out a.exe - else -- # Didn't find any BSD compatible name lister, look for dumpbin. -- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) -- AC_SUBST([DUMPBIN]) -- if test "$DUMPBIN" != ":"; then -- NM="$DUMPBIN" -- fi -+ echo "libtool.m4: error: problem compiling $1 test program" - fi --test -z "$NM" && NM=nm --AC_SUBST([NM]) --_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - --AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], -- [lt_cv_nm_interface="BSD nm" -- echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) -- (eval "$ac_compile" 2>conftest.err) -- cat conftest.err >&AS_MESSAGE_LOG_FD -- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) -- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) -- cat conftest.err >&AS_MESSAGE_LOG_FD -- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) -- cat conftest.out >&AS_MESSAGE_LOG_FD -- if $GREP 'External.*some_variable' conftest.out > /dev/null; then -- lt_cv_nm_interface="MS dumpbin" -- fi -- rm -f conftest*]) --])# LT_PATH_NM -- --# Old names: --AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) --AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AM_PROG_NM], []) --dnl AC_DEFUN([AC_PROG_NM], []) -+$rm -f confest.$objext - -+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= -+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi - --# LT_LIB_M --# -------- --# check for math library --AC_DEFUN([LT_LIB_M], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl --LIBM= --case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -- # These system don't have libm, or don't need it -+# PORTME: override above test on systems where it is broken -+ifelse([$1],[CXX], -+[case $host_os in -+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)= -+ _LT_AC_TAGVAR(postdep_objects,$1)= -+ _LT_AC_TAGVAR(postdeps,$1)= - ;; --*-ncr-sysv4.3*) -- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") -+ -+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 - ;; --*) -- AC_CHECK_LIB(m, cos, LIBM="-lm") -+ -+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. -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac - ;; - esac --AC_SUBST([LIBM]) --])# LT_LIB_M -+]) -+case " $_LT_AC_TAGVAR(postdeps, $1) " in -+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -+esac -+])# AC_LIBTOOL_POSTDEP_PREDEP - --# Old name: --AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_CHECK_LIBM], []) -+# AC_LIBTOOL_LANG_F77_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) -+AC_DEFUN([_LT_AC_LANG_F77_CONFIG], -+[AC_REQUIRE([AC_PROG_F77]) -+AC_LANG_PUSH(Fortran 77) - -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_AC_TAGVAR(allow_undefined_flag, $1)= -+_LT_AC_TAGVAR(always_export_symbols, $1)=no -+_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_direct, $1)=no -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+_LT_AC_TAGVAR(hardcode_automatic, $1)=no -+_LT_AC_TAGVAR(module_cmds, $1)= -+_LT_AC_TAGVAR(module_expsym_cmds, $1)= -+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_AC_TAGVAR(no_undefined_flag, $1)= -+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - --# _LT_COMPILER_NO_RTTI([TAGNAME]) --# ------------------------------- --m4_defun([_LT_COMPILER_NO_RTTI], --[m4_require([_LT_TAG_COMPILER])dnl -+# Source file extension for f77 test sources. -+ac_ext=f - --_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+# Object file extension for compiled f77 test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext - --if test "$GCC" = yes; then -- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" - -- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -- lt_cv_prog_compiler_rtti_exceptions, -- [-fno-rtti -fno-exceptions], [], -- [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) --fi --_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], -- [Compiler flag to turn off builtin functions]) --])# _LT_COMPILER_NO_RTTI -+# Code to be used in simple link tests -+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 - --# _LT_CMD_GLOBAL_SYMBOLS --# ---------------------- --m4_defun([_LT_CMD_GLOBAL_SYMBOLS], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl +- [with_gnu_ld=no]) +-AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([LT_PATH_NM])dnl --AC_REQUIRE([LT_PATH_LD])dnl --m4_require([_LT_DECL_SED])dnl --m4_require([_LT_DECL_EGREP])dnl --m4_require([_LT_TAG_COMPILER])dnl -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE ++AC_DEFUN([LT_PATH_LD], ++[AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_DECL_EGREP])dnl ++ ++AC_ARG_WITH([gnu-ld], ++ [AS_HELP_STRING([--with-gnu-ld], ++ [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++ [test "$withval" = no || with_gnu_ld=yes], ++ [with_gnu_ld=no])dnl ++ + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +@@ -3210,9 +3552,9 @@ + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; +@@ -3262,15 +3604,24 @@ + AC_MSG_RESULT(no) + fi + test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +-AC_PROG_LD_GNU +-])# AC_PROG_LD ++_LT_PATH_LD_GNU ++AC_SUBST([LD]) --# Check for command to grab the raw symbol name followed by C symbol from nm. --AC_MSG_CHECKING([command to parse $NM output from $compiler object]) --AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], --[ --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${F77-"f77"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) ++_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) ++])# LT_PATH_LD --# Character class describing NM global symbol codes. --symcode='[[BCDEGRST]]' -+AC_MSG_CHECKING([if libtool supports shared libraries]) -+AC_MSG_RESULT([$can_build_shared]) +-# AC_PROG_LD_GNU +-# -------------- +-AC_DEFUN([AC_PROG_LD_GNU], +-[AC_REQUIRE([AC_PROG_EGREP])dnl +-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, ++# Old names: ++AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) ++AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_PROG_LD], []) ++dnl AC_DEFUN([AC_PROG_LD], []) ++ ++ ++# _LT_PATH_LD_GNU ++#- -------------- ++m4_defun([_LT_PATH_LD_GNU], ++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, + [# I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 </dev/null` in + *GNU* | *'with BFD'*) +@@ -3281,14 +3632,14 @@ + ;; + esac]) + with_gnu_ld=$lt_cv_prog_gnu_ld +-])# AC_PROG_LD_GNU ++])# _LT_PATH_LD_GNU --# Regexp to match symbols that can be accessed directly from C. --sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -+AC_MSG_CHECKING([whether to build shared libraries]) -+test "$can_build_shared" = "no" && enable_shared=no --# Define system-specific variables. -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. - case $host_os in --aix*) -- symcode='[[BCDT]]' -- ;; --cygwin* | mingw* | pw32* | cegcc*) -- symcode='[[ABCDGISTW]]' -- ;; --hpux*) -- if test "$host_cpu" = ia64; then -- symcode='[[ABCDEGRST]]' -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' +-# AC_PROG_LD_RELOAD_FLAG +-# ---------------------- ++# _LT_CMD_RELOAD ++# -------------- + # find reload flag for linker + # -- PORTME Some linkers may need a different reload flag. +-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], ++m4_defun([_LT_CMD_RELOAD], + [AC_CACHE_CHECK([for $LD option to reload object files], + lt_cv_ld_reload_flag, + [lt_cv_ld_reload_flag='-r']) +@@ -3307,15 +3658,19 @@ + fi + ;; + esac +-])# AC_PROG_LD_RELOAD_FLAG ++_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl ++_LT_DECL([], [reload_cmds], [2])dnl ++])# _LT_CMD_RELOAD + + +-# AC_DEPLIBS_CHECK_METHOD +-# ----------------------- ++# _LT_CHECK_MAGIC_METHOD ++# ---------------------- + # 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 recognize dependent libraries], ++m4_defun([_LT_CHECK_MAGIC_METHOD], ++[m4_require([_LT_DECL_EGREP]) ++m4_require([_LT_DECL_OBJDUMP]) ++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= +@@ -3365,12 +3720,18 @@ fi ;; --irix* | nonstopux*) -- symcode='[[BCDEGRST]]' -- ;; --osf*) -- symcode='[[BCDEGQRST]]' -- ;; --solaris*) -- symcode='[[BDRT]]' -- ;; --sco3.2v5*) -- symcode='[[DT]]' -- ;; --sysv4.2uw2*) -- symcode='[[DT]]' -- ;; --sysv5* | sco5v6* | unixware* | OpenUNIX*) -- symcode='[[ABDT]]' -- ;; --sysv4) -- symcode='[[DFNSTU]]' -+aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi + ++cegcc) ++ # use the weaker test based on 'objdump'. See mingw*. ++ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ ;; ++ + darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + + freebsd* | dragonfly*) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. +@@ -3427,8 +3788,8 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++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 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' +@@ -3441,12 +3802,12 @@ + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown ++*nto* | *qnx*) ++ lt_cv_deplibs_check_method=pass_all + ;; + + openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' +@@ -3465,6 +3826,10 @@ + lt_cv_deplibs_check_method=pass_all + ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ + sysv4 | sysv4.3*) + case $host_vendor in + motorola) +@@ -3492,7 +3857,7 @@ + esac + ;; + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++tpf*) + lt_cv_deplibs_check_method=pass_all ;; esac -+AC_MSG_RESULT([$enable_shared]) - --# If we're using GNU nm, then use its standard symbol codes. --case `$NM -V 2>&1` in --*GNU* | *'with BFD'*) -- symcode='[[ABCDGIRSTW]]' ;; --esac -+AC_MSG_CHECKING([whether to build static libraries]) -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+AC_MSG_RESULT([$enable_static]) +@@ -3500,14 +3865,20 @@ + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +-])# AC_DEPLIBS_CHECK_METHOD + -+_LT_AC_TAGVAR(GCC, $1)="$G77" -+_LT_AC_TAGVAR(LD, $1)="$LD" -+ -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - --# Transform an extracted symbol line into a proper C declaration. --# Some systems (esp. on ia64) link data and code symbols differently, --# so use this general approach. --lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+AC_LIBTOOL_CONFIG($1) - --# Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+AC_LANG_POP -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_F77_CONFIG - --# Handle CRLF in mingw tool chain --opt_cr= --case $build_os in --mingw*) -- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp -- ;; --esac - --# Try without a prefix underscore, then with it. --for ac_symprfx in "" "_"; do -+# AC_LIBTOOL_LANG_GCJ_CONFIG -+# -------------------------- -+# Ensure that the configuration vars for the C compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) -+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], -+[AC_LANG_SAVE - -- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -- symxfrm="\\1 $ac_symprfx\\2 \\2" -+# Source file extension for Java test sources. -+ac_ext=java - -- # Write the raw and C identifiers. -- if test "$lt_cv_nm_interface" = "MS dumpbin"; then -- # Fake it for dumpbin and say T for any non-static function -- # and D for any global variable. -- # Also find C++ and __fastcall symbols from MSVC++, -- # which start with @ or ?. -- lt_cv_sys_global_symbol_pipe="$AWK ['"\ --" {last_section=section; section=\$ 3};"\ --" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ --" \$ 0!~/External *\|/{next};"\ --" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ --" {if(hide[section]) next};"\ --" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ --" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ --" s[1]~/^[@?]/{print s[1], s[1]; next};"\ --" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ --" ' prfx=^$ac_symprfx]" -- else -- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -- fi -+# Object file extension for compiled Java test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext - -- # Check to see that the pipe works correctly. -- pipe_works=no -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="class foo {}" - -- rm -f conftest* -- cat > conftest.$ac_ext <<_LT_EOF --#ifdef __cplusplus --extern "C" { --#endif --char nm_test_var; --void nm_test_func(void); --void nm_test_func(void){} --#ifdef __cplusplus --} --#endif --int main(){nm_test_var='a';nm_test_func();return(0);} --_LT_EOF -+# Code to be used in simple link tests -+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -- if AC_TRY_EVAL(ac_compile); then -- # Now try to grab the symbols. -- nlist=conftest.nm -- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER - -- # Make sure that we snagged all the symbols we need. -- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then -- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then -- cat <<_LT_EOF > conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE - --_LT_EOF -- # Now generate the symbol file. -- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${GCJ-"gcj"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) - -- cat <<_LT_EOF >> conftest.$ac_ext -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- void *address; --} --lt__PROGRAM__LTX_preloaded_symbols[[]] = --{ -- { "@PROGRAM@", (void *) 0 }, --_LT_EOF -- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext -- cat <<\_LT_EOF >> conftest.$ac_ext -- {0, (void *) 0} --}; -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds - --/* This works around a problem in FreeBSD linker */ --#ifdef FREEBSD_WORKAROUND --static const void *lt_preloaded_setup() { -- return lt__PROGRAM__LTX_preloaded_symbols; --} --#endif -+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -+AC_LIBTOOL_PROG_COMPILER_PIC($1) -+AC_LIBTOOL_PROG_CC_C_O($1) -+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -+AC_LIBTOOL_PROG_LD_SHLIBS($1) -+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) - --#ifdef __cplusplus --} --#endif --_LT_EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -- pipe_works=yes -- fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -- else -- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -- cat conftest.$ac_ext >&5 -- fi -- rm -rf conftest* conftst* -+AC_LIBTOOL_CONFIG($1) - -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -- fi --done --]) --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- lt_cv_sys_global_symbol_to_cdecl= --fi --if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -- AC_MSG_RESULT(failed) --else -- AC_MSG_RESULT(ok) --fi -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_GCJ_CONFIG - --_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], -- [Take the output of nm and produce a listing of raw symbols and C names]) --_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -- [Transform the output of nm in a proper C declaration]) --_LT_DECL([global_symbol_to_c_name_address], -- [lt_cv_sys_global_symbol_to_c_name_address], [1], -- [Transform the output of nm in a C name address pair]) --_LT_DECL([global_symbol_to_c_name_address_lib_prefix], -- [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], -- [Transform the output of nm in a C name address pair when lib prefix is needed]) --]) # _LT_CMD_GLOBAL_SYMBOLS - -+# AC_LIBTOOL_LANG_RC_CONFIG -+# ------------------------- -+# Ensure that the configuration vars for the Windows resource compiler are -+# suitably defined. Those variables are subsequently used by -+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) -+AC_DEFUN([_LT_AC_LANG_RC_CONFIG], -+[AC_LANG_SAVE - --# _LT_COMPILER_PIC([TAGNAME]) --# --------------------------- --m4_defun([_LT_COMPILER_PIC], --[m4_require([_LT_TAG_COMPILER])dnl --_LT_TAGVAR(lt_prog_compiler_wl, $1)= --_LT_TAGVAR(lt_prog_compiler_pic, $1)= --_LT_TAGVAR(lt_prog_compiler_static, $1)= -+# Source file extension for RC test sources. -+ac_ext=rc - --AC_MSG_CHECKING([for $compiler option to produce PIC]) --m4_if([$1], [CXX], [ -- # C++ specific cases for pic, static, wl, etc. -- if test "$GXX" = yes; then -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+# Object file extension for compiled RC test sources. -+objext=o -+_LT_AC_TAGVAR(objext, $1)=$objext - -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- fi -- ;; -+# Code to be used in simple compile tests -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - -- amigaos*) -- case $host_cpu in -- powerpc) -- # see comment about AmigaOS4 .so support -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- m68k) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -- ;; -- esac -- ;; -+# Code to be used in simple link tests -+lt_simple_link_test_code="$lt_simple_compile_test_code" - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -- # 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 -- m4_if([$1], [GCJ], [], -- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -- ;; -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -- ;; -- *djgpp*) -- # DJGPP does not support shared libraries at all -- _LT_TAGVAR(lt_prog_compiler_pic, $1)= -- ;; -- interix[[3-9]]*) -- # Interix 3.x gcc -fpic/-fPIC options generate broken code. -- # Instead, we relocate shared libraries at runtime. -- ;; -- sysv4*MP*) -- if test -d /usr/nec; then -- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -- fi -- ;; -- hpux*) -- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -- # sets the default TLS model and affects inlining. -- case $host_cpu in -- hppa*64*) -- ;; -- *) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- ;; -- *qnx* | *nto*) -- # QNX uses GNU C++, but need to define -shared option too, otherwise -- # it will coredump. -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_AC_SYS_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${RC-"windres"} -+compiler=$CC -+_LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ -+AC_LIBTOOL_CONFIG($1) -+ -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# AC_LIBTOOL_LANG_RC_CONFIG -+ -+ -+# AC_LIBTOOL_CONFIG([TAGNAME]) -+# ---------------------------- -+# If TAGNAME is not passed, then create an initial libtool script -+# with a default configuration from the untagged config vars. Otherwise -+# add code to config.status for appending the configuration named by -+# TAGNAME from the matching tagged config vars. -+AC_DEFUN([AC_LIBTOOL_CONFIG], -+[# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # 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 -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ _LT_AC_TAGVAR(compiler, $1) \ -+ _LT_AC_TAGVAR(CC, $1) \ -+ _LT_AC_TAGVAR(LD, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ -+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ -+ _LT_AC_TAGVAR(old_archive_cmds, $1) \ -+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ -+ _LT_AC_TAGVAR(predep_objects, $1) \ -+ _LT_AC_TAGVAR(postdep_objects, $1) \ -+ _LT_AC_TAGVAR(predeps, $1) \ -+ _LT_AC_TAGVAR(postdeps, $1) \ -+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ -+ _LT_AC_TAGVAR(archive_cmds, $1) \ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ -+ _LT_AC_TAGVAR(postinstall_cmds, $1) \ -+ _LT_AC_TAGVAR(postuninstall_cmds, $1) \ -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ -+ _LT_AC_TAGVAR(allow_undefined_flag, $1) \ -+ _LT_AC_TAGVAR(no_undefined_flag, $1) \ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ -+ _LT_AC_TAGVAR(hardcode_automatic, $1) \ -+ _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 -+ -+ case $var in -+ _LT_AC_TAGVAR(old_archive_cmds, $1) | \ -+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ -+ _LT_AC_TAGVAR(archive_cmds, $1) | \ -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ -+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac -- else -- case $host_os in -- aix[[4-9]]*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- else -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -- fi -- ;; -- chorus*) -- case $cc_basename in -- cxch68*) -- # Green Hills C++ Compiler -- # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -- ;; -- esac -- ;; -- dgux*) -- case $cc_basename in -- ec++*) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- ;; -- ghcx*) -- # Green Hills C++ Compiler -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- ;; -- *) -- ;; -- esac -- ;; -- freebsd* | dragonfly*) -- # FreeBSD uses GNU C++ -- ;; -- hpux9* | hpux10* | hpux11*) -- case $cc_basename in -- CC*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -- if test "$host_cpu" != ia64; then -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -- fi -- ;; -- aCC*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -- ;; -- esac -- ;; -- *) -- ;; -- esac -- ;; -- interix*) -- # This is c89, which is MS Visual C++ (no shared libs) -- # Anyone wants to do a port? -- ;; -- irix5* | irix6* | nonstopux*) -- case $cc_basename in -- CC*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- # CC pic flag -KPIC is the default. -- ;; -- *) -- ;; -- esac -- ;; -- linux* | k*bsd*-gnu) -- case $cc_basename in -- KCC*) -- # KAI C++ Compiler -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- ecpc* ) -- # old Intel C++ for x86_64 which still supported -KPIC. -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -- ;; -- icpc* ) -- # Intel C++, used to be incompatible with GCC. -- # ICC 10 doesn't accept -KPIC any more. -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -- ;; -- pgCC* | pgcpp*) -- # Portland Group C++ compiler -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- cxx*) -- # Compaq C++ -- # Make sure the PIC flag is empty. It appears that all Alpha -- # Linux and Compaq Tru64 Unix objects are PIC. -- _LT_TAGVAR(lt_prog_compiler_pic, $1)= -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -- xlc* | xlC*) -- # IBM XL 8.0 on PPC -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' -- ;; -- *) -- case `$CC -V 2>&1 | sed 5q` in -- *Sun\ C*) -- # Sun C++ 5.9 -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -- ;; -- esac -- ;; -- esac -- ;; -- lynxos*) -- ;; -- m88k*) -- ;; -- mvs*) -- case $cc_basename in -- cxx*) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -- ;; -- *) -- ;; -- esac -- ;; -- netbsd*) -- ;; -- *qnx* | *nto*) -- # QNX uses GNU C++, but need to define -shared option too, otherwise -- # it will coredump. -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -- ;; -- osf3* | osf4* | osf5*) -- case $cc_basename in -- KCC*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- ;; -- cxx*) -- # Digital/Compaq C++ -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # Make sure the PIC flag is empty. It appears that all Alpha -- # Linux and Compaq Tru64 Unix objects are PIC. -- _LT_TAGVAR(lt_prog_compiler_pic, $1)= -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -- *) -- ;; -- esac -- ;; -- psos*) -- ;; -- solaris*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.2, 5.x and Centerline C++ -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -- ;; -- gcx*) -- # Green Hills C++ Compiler -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -- ;; -- *) -- ;; -- esac -- ;; -- sunos4*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.x -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- lcc*) -- # Lucid -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- ;; -- *) -- ;; -- esac -- ;; -- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -- case $cc_basename in -- CC*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- esac -- ;; -- tandem*) -- case $cc_basename in -- NCC*) -- # NonStop-UX NCC 3.20 -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- ;; -- *) -- ;; -- esac -- ;; -- vxworks*) -- ;; -- *) -- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- ;; -- esac -- fi --], --[ -- if test "$GCC" = yes; then -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ done - -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- fi -- ;; -+ case $lt_echo in -+ *'\[$]0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` -+ ;; -+ esac - -- amigaos*) -- case $host_cpu in -- powerpc) -- # see comment about AmigaOS4 .so support -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- m68k) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -- ;; -- esac -- ;; -+ifelse([$1], [], -+ [cfgfile="${ofile}T" -+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -+ $rm -f "$cfgfile" -+ AC_MSG_NOTICE([creating $ofile])], -+ [cfgfile="$ofile"]) - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -+ cat <<__EOF__ >> "$cfgfile" -+ifelse([$1], [], -+[#! $SHELL - -- mingw* | cygwin* | pw32* | os2* | cegcc*) -- # 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 -- m4_if([$1], [GCJ], [], -- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -- ;; -+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. -+# -+# This file is part of GNU Libtool: -+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program 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 -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. - -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -- ;; -+# A sed program that does not truncate output. -+SED=$lt_SED - -- hpux*) -- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -- # sets the default TLS model and affects inlining. -- case $host_cpu in -- hppa*64*) -- # +Z the default -- ;; -- *) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- ;; -+# Sed that helps us avoid accidentally triggering echo(1) options like -n. -+Xsed="$SED -e 1s/^X//" - -- interix[[3-9]]*) -- # Interix 3.x gcc -fpic/-fPIC options generate broken code. -- # Instead, we relocate shared libraries at runtime. -- ;; -+# 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 - -- msdosdjgpp*) -- # Just because we use GCC doesn't mean we suddenly get shared libraries -- # on systems that don't support them. -- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- enable_shared=no -- ;; -+# The names of the tagged configurations supported by this script. -+available_tags= - -- *nto* | *qnx*) -- # QNX uses GNU C++, but need to define -shared option too, otherwise -- # it will coredump. -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -- ;; -+# ### BEGIN LIBTOOL CONFIG], -+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) - -- sysv4*MP*) -- if test -d /usr/nec; then -- _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -- fi -- ;; -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -- *) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- else -- # PORTME Check for flag to pass linker flags through the system compiler. -- case $host_os in -- aix*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- else -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -- fi -- ;; -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL - -- mingw* | cygwin* | pw32* | os2* | cegcc*) -- # 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). -- m4_if([$1], [GCJ], [], -- [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -- ;; -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared - -- hpux9* | hpux10* | hpux11*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -- ;; -- esac -- # Is there a better lt_prog_compiler_static that works with the bundled CC? -- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -- ;; -+# Whether or not to build static libraries. -+build_old_libs=$enable_static - -- irix5* | irix6* | nonstopux*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # PIC (with -KPIC) is the default. -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) - -- linux* | k*bsd*-gnu) -- case $cc_basename in -- # old Intel for x86_64 which still supported -KPIC. -- ecc*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -- ;; -- # icc used to be incompatible with GCC. -- # ICC 10 doesn't accept -KPIC any more. -- icc* | ifort*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -- ;; -- # Lahey Fortran 8.1. -- lf95*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' -- ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -- # Portland Group compilers (*not* the Pentium gcc compiler, -- # which looks to be a dead project) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- ccc*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # All Alpha code is PIC. -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -- xl*) -- # IBM XL C 8.0/Fortran 10.1 on PPC -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' -- ;; -- *) -- case `$CC -V 2>&1 | sed 5q` in -- *Sun\ C*) -- # Sun C 5.9 -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- ;; -- *Sun\ F*) -- # Sun Fortran 8.3 passes all unrecognized flags to the linker -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='' -- ;; -- esac -- ;; -- esac -- ;; -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) - -- newsos6) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install - -- *nto* | *qnx*) -- # QNX uses GNU C++, but need to define -shared option too, otherwise -- # it will coredump. -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -- ;; -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os - -- osf3* | osf4* | osf5*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # All OSF/1 code is PIC. -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - -- rdos*) -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -+# An echo program that does not interpret backslashes. -+echo=$lt_echo - -- solaris*) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- case $cc_basename in -- f77* | f90* | f95*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -- *) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -- esac -- ;; -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS - -- sunos4*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# A C compiler. -+LTCC=$lt_LTCC - -- sysv4 | sysv4.2uw2* | sysv4.3*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS - -- sysv4*MP*) -- if test -d /usr/nec ;then -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- fi -- ;; -+# A language-specific compiler. -+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - -- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# Is the compiler the GNU C compiler? -+with_gcc=$_LT_AC_TAGVAR(GCC, $1) - -- unicos*) -- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- ;; -+# An ERE matcher. -+EGREP=$lt_EGREP - -- uts4*) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# The linker used to build libraries. -+LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - -- *) -- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- ;; -- esac -- fi --]) --case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -- *djgpp*) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)= -- ;; -- *) -- _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" -- ;; --esac --AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) --_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -- [How to pass a linker flag through the compiler]) -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S - --# --# Check to make sure the PIC flag actually works. --# --if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then -- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], -- [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], -- [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], -- [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in -- "" | " "*) ;; -- *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; -- esac], -- [_LT_TAGVAR(lt_prog_compiler_pic, $1)= -- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) --fi --_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], -- [Additional compiler flags for building library objects]) -+# A BSD-compatible nm program. -+NM=$lt_NM - --# --# Check to make sure the static flag actually works. --# --wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" --_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -- _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), -- $lt_tmp_static_flag, -- [], -- [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) --_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], -- [Compiler flag to prevent dynamic linking]) --])# _LT_COMPILER_PIC -+# A symbol stripping program -+STRIP=$lt_STRIP - -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD - --# _LT_LINKER_SHLIBS([TAGNAME]) --# ---------------------------- --# See if the linker supports building shared libraries. --m4_defun([_LT_LINKER_SHLIBS], --[AC_REQUIRE([LT_PATH_LD])dnl --AC_REQUIRE([LT_PATH_NM])dnl --m4_require([_LT_FILEUTILS_DEFAULTS])dnl --m4_require([_LT_DECL_EGREP])dnl --m4_require([_LT_DECL_SED])dnl --m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl --m4_require([_LT_TAG_COMPILER])dnl --AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) --m4_if([$1], [CXX], [ -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- case $host_os in -- aix[[4-9]]*) -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -- else -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -- fi -- ;; -- pw32*) -- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -- ;; -- cygwin* | mingw* | cegcc*) -- _LT_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_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -- esac -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] --], [ -- runpath_var= -- _LT_TAGVAR(allow_undefined_flag, $1)= -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(archive_cmds, $1)= -- _LT_TAGVAR(archive_expsym_cmds, $1)= -- _LT_TAGVAR(compiler_needs_object, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -- _LT_TAGVAR(export_dynamic_flag_spec, $1)= -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- _LT_TAGVAR(hardcode_automatic, $1)=no -- _LT_TAGVAR(hardcode_direct, $1)=no -- _LT_TAGVAR(hardcode_direct_absolute, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -- _LT_TAGVAR(hardcode_libdir_separator, $1)= -- _LT_TAGVAR(hardcode_minus_L, $1)=no -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_TAGVAR(inherit_rpath, $1)=no -- _LT_TAGVAR(link_all_deplibs, $1)=unknown -- _LT_TAGVAR(module_cmds, $1)= -- _LT_TAGVAR(module_expsym_cmds, $1)= -- _LT_TAGVAR(old_archive_from_new_cmds, $1)= -- _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= -- _LT_TAGVAR(thread_safe_flag_spec, $1)= -- _LT_TAGVAR(whole_archive_flag_spec, $1)= -- # include_expsyms should be a list of space-separated symbols to be *always* -- # included in the symbol list -- _LT_TAGVAR(include_expsyms, $1)= -- # exclude_expsyms can be an extended regexp of symbols to exclude -- # it will be wrapped by ` (' and `)$', so one must not match beginning or -- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -- # as well as any symbol that contains `d'. -- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -- # platforms (ab)use it in PIC code, but their linkers get confused if -- # the symbol is explicitly referenced. Since portable code cannot -- # rely on this symbol name, it's probably fine to never include it in -- # preloaded symbol tables. -- # Exclude shared library initialization/finalization symbols. --dnl Note also adjust exclude_expsyms for C++ above. -- extract_expsyms_cmds= -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" - -- case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -- # FIXME: the MSVC++ port hasn't been tested in a loooong time -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$GCC" != yes; then -- with_gnu_ld=no -- fi -- ;; -- interix*) -- # we just hope/assume this is gcc and not c89 (= MSVC++) -- with_gnu_ld=yes -- ;; -- openbsd*) -- with_gnu_ld=no -- ;; -- esac -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" - -- _LT_TAGVAR(ld_shlibs, $1)=yes -- if test "$with_gnu_ld" = yes; then -- # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' -+# Used on cygwin: assembler. -+AS="$AS" - -- # Set some defaults for GNU ld with shared library support. These -- # are reset later if shared libraries are not supported. Putting them -- # here allows them to be overridden if necessary. -- runpath_var=LD_RUN_PATH -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then -- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- _LT_TAGVAR(whole_archive_flag_spec, $1)= -- fi -- supports_anon_versioning=no -- case `$LD -v 2>&1` in -- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -- *\ 2.11.*) ;; # other 2.11 versions -- *) supports_anon_versioning=yes ;; -- esac -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir - -- # See if GNU ld supports shared libraries. -- case $host_os in -- aix[[3-9]]*) -- # On AIX/PPC, the GNU linker is very broken -- if test "$host_cpu" != ia64; then -- _LT_TAGVAR(ld_shlibs, $1)=no -- cat <<_LT_EOF 1>&2 -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported --*** to be unable to reliably create shared libraries on AIX. --*** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -+# How to pass a linker flag through the compiler. -+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - --_LT_EOF -- fi -- ;; -+# Object file suffix (normally "o"). -+objext="$ac_objext" - -- amigaos*) -- case $host_cpu in -- powerpc) -- # see comment about AmigaOS4 .so support -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='' -- ;; -- m68k) -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- ;; -- esac -- ;; -+# Old archive suffix (normally "a"). -+libext="$libext" - -- beos*) -- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' - -- cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_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' -+# Executable file suffix (normally ""). -+exeext="$exeext" - -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+# Additional compiler flags for building library objects. -+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -+pic_mode=$pic_mode - -- interix[[3-9]]*) -- _LT_TAGVAR(hardcode_direct, $1)=no -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -- # Instead, shared libraries are loaded at an image base (0x10000000 by -- # default) and relocated if they conflict, which is a slow very memory -- # consuming and fragmenting process. To avoid this, we pick a random, -- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -- # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- _LT_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' -- ;; -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - -- gnu* | linux* | tpf* | k*bsd*-gnu) -- tmp_diet=no -- if test "$host_os" = linux-dietlibc; then -- case $cc_basename in -- diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) -- esac -- fi -- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ -- && test "$tmp_diet" = no -- then -- tmp_addflag= -- tmp_sharedflag='-shared' -- case $cc_basename,$host_cpu in -- pgcc*) # Portland Group C compiler -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -- tmp_addflag=' $pic_flag' -- ;; -- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -- tmp_addflag=' $pic_flag -Mnomain' ;; -- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -- tmp_addflag=' -i_dynamic' ;; -- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -- tmp_addflag=' -i_dynamic -nofor_main' ;; -- ifc* | ifort*) # Intel Fortran compiler -- tmp_addflag=' -nofor_main' ;; -- lf95*) # Lahey Fortran 8.1 -- _LT_TAGVAR(whole_archive_flag_spec, $1)= -- tmp_sharedflag='--shared' ;; -- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) -- tmp_sharedflag='-qmkshrobj' -- tmp_addflag= ;; -- esac -- case `$CC -V 2>&1 | sed 5q` in -- *Sun\ C*) # Sun C 5.9 -- _LT_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' -- _LT_TAGVAR(compiler_needs_object, $1)=yes -- tmp_sharedflag='-G' ;; -- *Sun\ F*) # Sun Fortran 8.3 -- tmp_sharedflag='-G' ;; -- esac -- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - -- if test "x$supports_anon_versioning" = xyes; then -- _LT_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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- fi -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks - -- case $cc_basename in -- xlf*) -- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself -- _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -- if test "x$supports_anon_versioning" = xyes; then -- _LT_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~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -- fi -- ;; -- esac -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix - -- netbsd*) -- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -- wlarc= -- else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- fi -- ;; -+# Do we need a version for libraries? -+need_version=$need_version - -- solaris*) -- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then -- _LT_TAGVAR(ld_shlibs, $1)=no -- cat <<_LT_EOF 1>&2 -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen - --*** Warning: The releases 2.8.* of the GNU linker cannot reliably --*** create shared libraries on Solaris systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.9.1 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self - --_LT_EOF -- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static - -- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -- case `$LD -v 2>&1` in -- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -- _LT_TAGVAR(ld_shlibs, $1)=no -- cat <<_LT_EOF 1>&2 -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) - --*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not --*** reliably create shared libraries on SCO systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.16.91.0.3 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) - --_LT_EOF -- ;; -- *) -- # For security reasons, it is highly recommended that you always -- # use absolute paths for naming shared libraries, and exclude the -- # DT_RUNPATH tag from executables and libraries. But doing so -- # requires that you compile everything twice, which is a pain. -- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) - -- sunos4*) -- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- wlarc= -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) - -- *) -- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) - -- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then -- runpath_var= -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -- _LT_TAGVAR(export_dynamic_flag_spec, $1)= -- _LT_TAGVAR(whole_archive_flag_spec, $1)= -- fi -- else -- # PORTME fill in a description of your system's linker (not GNU ld) -- case $host_os in -- aix3*) -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=yes -- _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -- # Note: this linker hardcodes the directories in LIBPATH if there -- # are no directories specified by -L. -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- _LT_TAGVAR(hardcode_direct, $1)=unsupported -- fi -- ;; -+# Library versioning type. -+version_type=$version_type - -- aix[[4-9]]*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -- else -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -- fi -- aix_use_runtimelinking=no -+# Format of library name prefix. -+libname_spec=$lt_libname_spec - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -- for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi -- done -- ;; -- esac -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds - -- _LT_TAGVAR(archive_cmds, $1)='' -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_TAGVAR(link_all_deplibs, $1)=yes -- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) - -- if test "$GCC" = yes; then -- case $host_os in aix4.[[012]]|aix4.[[012]].*) -- # We only want to do this on AIX 4.2 and lower, the check -- # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && -- strings "$collect2name" | $GREP resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- : -- else -- # We have old collect2 -- _LT_TAGVAR(hardcode_direct, $1)=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)= -- fi -- ;; -- esac -- shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -- fi -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) - -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' -- # It seems that -bexpall does not export symbols beginning with -- # underscore (_), so it is better to generate a list of symbols to export. -- _LT_TAGVAR(always_export_symbols, $1)=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- _LT_TAGVAR(allow_undefined_flag, $1)='-berok' -- # Determine the default libpath from the value encoded in an -- # empty executable. -- _LT_SYS_MODULE_PATH_AIX -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an -- # empty executable. -- _LT_SYS_MODULE_PATH_AIX -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -- fi -- fi -- ;; -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds - -- amigaos*) -- case $host_cpu in -- powerpc) -- # see comment about AmigaOS4 .so support -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='' -- ;; -- m68k) -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- ;; -- esac -- ;; -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) - -- bsdi[[45]]*) -- _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -- ;; -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib - -- cygwin* | mingw* | pw32* | cegcc*) -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # The linker will automatically build a .lib file if we build a DLL. -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -- # FIXME: Should let the user specify the lib program. -- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- ;; -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) - -- darwin* | rhapsody*) -- _LT_DARWIN_LINKER_FEATURES($1) -- ;; -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) - -- dgux*) -- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) - -- freebsd1*) -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) - -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | dragonfly*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method - -- hpux9*) -- if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- else -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- fi -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_TAGVAR(hardcode_direct, $1)=yes -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- ;; -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) - -- hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -- fi -- if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- fi -- ;; -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) - -- hpux11*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case $host_cpu in -- hppa*64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- else -- case $host_cpu in -- hppa*64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- fi -- if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds - -- case $host_cpu in -- hppa*64*|ia64*) -- _LT_TAGVAR(hardcode_direct, $1)=no -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- *) -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- ;; -- esac -- fi -- ;; -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -- irix5* | irix6* | nonstopux*) -- if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- # Try to use the -exported_symbol ld option, if it does not -- # work, assume that -exports_file does not work either and -- # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- AC_LINK_IFELSE(int foo(void) {}, -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -- ) -- LDFLAGS="$save_LDFLAGS" -- else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -- fi -- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_TAGVAR(inherit_rpath, $1)=yes -- _LT_TAGVAR(link_all_deplibs, $1)=yes -- ;; -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -- netbsd*) -- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -- else -- _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -- fi -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -- newsos6) -- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var - -- *nto* | *qnx*) -- ;; -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var - -- openbsd*) -- if test -f /usr/libexec/ld.so; then -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- else -- case $host_os in -- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- ;; -- *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- ;; -- esac -- fi -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -- os2*) -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -- ;; -+# How to hardcode a shared library path into an executable. -+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) - -- osf3*) -- if test "$GCC" = yes; then -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs - -- osf4* | osf5*) # as osf3* with the addition of -msym flag -- if test "$GCC" = yes; then -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- else -- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) - -- # Both c and cxx compiler support -rpath directly -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -- fi -- _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) - -- solaris*) -- _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' -- if test "$GCC" = yes; then -- wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -- else -- case `$CC -V 2>&1` in -- *"Compilers 5.0"*) -- wlarc='' -- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' -- ;; -- *) -- wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -- ;; -- esac -- fi -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- case $host_os in -- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -- *) -- # 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?) -- if test "$GCC" = yes; then -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -- else -- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -- fi -- ;; -- esac -- _LT_TAGVAR(link_all_deplibs, $1)=yes -- ;; -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - -- sunos4*) -- if test "x$host_vendor" = xsequent; then -- # Use $CC to link under sequent, because it throws in some extra .o -- # files that make .init and .fini sections work. -- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -- fi -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) - -- sysv4) -- case $host_vendor in -- sni) -- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -- ;; -- siemens) -- ## LD is ld it makes a PLAMLIB -- ## CC just makes a GrossModule. -- _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -- _LT_TAGVAR(hardcode_direct, $1)=no -- ;; -- motorola) -- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -- ;; -- esac -- runpath_var='LD_RUN_PATH' -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) - -- sysv4.3*) -- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -- ;; -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) - -- sysv4*MP*) -- if test -d /usr/nec; then -- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- _LT_TAGVAR(ld_shlibs, $1)=yes -- fi -- ;; -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) - -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- runpath_var='LD_RUN_PATH' -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" - -- if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- ;; -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) - -- sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -- # link with -lc, and that would cause any symbols used from libc to -- # always be unresolved, which means just about no library would -- # ever link correctly. If we're not using GNU ld we use -z text -- # though, which does catch some bad symbols but isn't as heavy-handed -- # as -z defs. -- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -- _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_TAGVAR(link_all_deplibs, $1)=yes -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -- runpath_var='LD_RUN_PATH' -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -- if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- ;; -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -- uts4*) -- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path - -- *) -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -+# Set to yes if exported symbols are required. -+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) - -- if test x$host_vendor = xsni; then -- case $host in -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' -- ;; -- esac -- fi -- fi --]) --AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) --test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) - --_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds - --_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl --_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl --_LT_DECL([], [extract_expsyms_cmds], [2], -- [The commands to extract the exported symbol list from a shared archive]) -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) - --# --# Do we need to explicitly link libc? --# --case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in --x|xyes) -- # Assume -lc should be added -- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+# Symbols that must always be exported. -+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) - -- if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $_LT_TAGVAR(archive_cmds, $1) in -- *'~'*) -- # FIXME: we may have to deal with multi-command sequences. -- ;; -- '$CC '*) -- # Test whether the compiler implicitly links with -lc since on some -- # systems, -lgcc has to come before -lc. If gcc already passes -lc -- # to ld, don't add -lc before -lgcc. -- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -- $RM conftest* -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ifelse([$1],[], -+[# ### END LIBTOOL CONFIG], -+[# ### END LIBTOOL TAG CONFIG: $tagname]) - -- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) -- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) -- _LT_TAGVAR(allow_undefined_flag, $1)= -- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) -- then -- _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- else -- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -- fi -- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $RM conftest* -- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) -- ;; -- esac -- fi -- ;; --esac -- --_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], -- [Whether or not to add -lc for building shared libraries]) --_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], -- [enable_shared_with_static_runtimes], [0], -- [Whether or not to disallow shared libs when runtime libs are static]) --_LT_TAGDECL([], [export_dynamic_flag_spec], [1], -- [Compiler flag to allow reflexive dlopens]) --_LT_TAGDECL([], [whole_archive_flag_spec], [1], -- [Compiler flag to generate shared objects directly from archives]) --_LT_TAGDECL([], [compiler_needs_object], [1], -- [Whether the compiler copes with passing no objects directly]) --_LT_TAGDECL([], [old_archive_from_new_cmds], [2], -- [Create an old-style archive from a shared archive]) --_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], -- [Create a temporary old-style archive to link instead of a shared archive]) --_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) --_LT_TAGDECL([], [archive_expsym_cmds], [2]) --_LT_TAGDECL([], [module_cmds], [2], -- [Commands used to build a loadable module if different from building -- a shared archive.]) --_LT_TAGDECL([], [module_expsym_cmds], [2]) --_LT_TAGDECL([], [with_gnu_ld], [1], -- [Whether we are building with GNU ld or not]) --_LT_TAGDECL([], [allow_undefined_flag], [1], -- [Flag that allows shared libraries with undefined symbols to be built]) --_LT_TAGDECL([], [no_undefined_flag], [1], -- [Flag that enforces no undefined symbols]) --_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], -- [Flag to hardcode $libdir into a binary during linking. -- This must work even if $libdir does not exist]) --_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], -- [[If ld is used when linking, flag to hardcode $libdir into a binary -- during linking. This must work even if $libdir does not exist]]) --_LT_TAGDECL([], [hardcode_libdir_separator], [1], -- [Whether we need a single "-rpath" flag with a separated argument]) --_LT_TAGDECL([], [hardcode_direct], [0], -- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes -- DIR into the resulting binary]) --_LT_TAGDECL([], [hardcode_direct_absolute], [0], -- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes -- DIR into the resulting binary and the resulting library dependency is -- "absolute", i.e impossible to change by setting ${shlibpath_var} if the -- library is relocated]) --_LT_TAGDECL([], [hardcode_minus_L], [0], -- [Set to "yes" if using the -LDIR flag during linking hardcodes DIR -- into the resulting binary]) --_LT_TAGDECL([], [hardcode_shlibpath_var], [0], -- [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -- into the resulting binary]) --_LT_TAGDECL([], [hardcode_automatic], [0], -- [Set to "yes" if building a shared library automatically hardcodes DIR -- into the library and all subsequent libraries and executables linked -- against it]) --_LT_TAGDECL([], [inherit_rpath], [0], -- [Set to yes if linker adds runtime paths of dependent libraries -- to runtime path list]) --_LT_TAGDECL([], [link_all_deplibs], [0], -- [Whether libtool must link a program against all its dependency libraries]) --_LT_TAGDECL([], [fix_srcfile_path], [1], -- [Fix the shell variable $srcfile for the compiler]) --_LT_TAGDECL([], [always_export_symbols], [0], -- [Set to "yes" if exported symbols are required]) --_LT_TAGDECL([], [export_symbols_cmds], [2], -- [The commands to list exported symbols]) --_LT_TAGDECL([], [exclude_expsyms], [1], -- [Symbols that should not be listed in the preloaded symbols]) --_LT_TAGDECL([], [include_expsyms], [1], -- [Symbols that must always be exported]) --_LT_TAGDECL([], [prelink_cmds], [2], -- [Commands necessary for linking programs (against libraries) with templates]) --_LT_TAGDECL([], [file_list_spec], [1], -- [Specify filename containing input files]) --dnl FIXME: Not yet implemented --dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], --dnl [Compiler flag to generate thread safe objects]) --])# _LT_LINKER_SHLIBS -- -- --# _LT_LANG_C_CONFIG([TAG]) --# ------------------------ --# Ensure that the configuration variables for a C compiler are suitably --# defined. These variables are subsequently used by _LT_CONFIG to write --# the compiler configuration to `libtool'. --m4_defun([_LT_LANG_C_CONFIG], --[m4_require([_LT_DECL_EGREP])dnl --lt_save_CC="$CC" --AC_LANG_PUSH(C) -- --# Source file extension for C test sources. --ac_ext=c -- --# Object file extension for compiled C test sources. --objext=o --_LT_TAGVAR(objext, $1)=$objext -- --# Code to be used in simple compile tests --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);}' -- --_LT_TAG_COMPILER --# Save the default compiler, since it gets overwritten when the other --# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. --compiler_DEFAULT=$CC -- --# save warnings/boilerplate of simple test code --_LT_COMPILER_BOILERPLATE --_LT_LINKER_BOILERPLATE -- --if test -n "$compiler"; then -- _LT_COMPILER_NO_RTTI($1) -- _LT_COMPILER_PIC($1) -- _LT_COMPILER_C_O($1) -- _LT_COMPILER_FILE_LOCKS($1) -- _LT_LINKER_SHLIBS($1) -- _LT_SYS_DYNAMIC_LINKER($1) -- _LT_LINKER_HARDCODE_LIBPATH($1) -- LT_SYS_DLOPEN_SELF -- _LT_CMD_STRIPLIB -- -- # Report which library types will actually be built -- AC_MSG_CHECKING([if libtool supports shared libraries]) -- AC_MSG_RESULT([$can_build_shared]) -+__EOF__ - -- AC_MSG_CHECKING([whether to build shared libraries]) -- test "$can_build_shared" = "no" && enable_shared=no -- -- # On AIX, shared libraries and static libraries use the same namespace, and -- # are all built from PIC. -+ifelse([$1],[], [ - case $host_os in - aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -+ cat <<\EOF >> "$cfgfile" - -- aix[[4-9]]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+EOF - ;; - esac -- AC_MSG_RESULT([$enable_shared]) - -- AC_MSG_CHECKING([whether to build static libraries]) -- # Make sure either enable_shared or enable_static is yes. -- test "$enable_shared" = yes || enable_static=yes -- AC_MSG_RESULT([$enable_static]) -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - -- _LT_CONFIG($1) -+ mv -f "$cfgfile" "$ofile" || \ -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+]) ++_LT_DECL([], [deplibs_check_method], [1], ++ [Method to check whether dependent libraries are shared objects]) ++_LT_DECL([], [file_magic_cmd], [1], ++ [Command to use when deplibs_check_method == "file_magic"]) ++])# _LT_CHECK_MAGIC_METHOD + + +-# AC_PROG_NM ++# LT_PATH_NM + # ---------- +-# find the pathname to a BSD-compatible name lister +-AC_DEFUN([AC_PROG_NM], +-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, ++# find the pathname to a BSD- or MS-compatible name lister ++AC_DEFUN([LT_PATH_NM], ++[AC_REQUIRE([AC_PROG_CC])dnl ++AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, + [if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +@@ -3549,16 +3920,51 @@ + done + IFS="$lt_save_ifs" + done +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++ : ${lt_cv_path_NM=no} + fi]) +-NM="$lt_cv_path_NM" +-])# AC_PROG_NM ++if test "$lt_cv_path_NM" != "no"; then ++ NM="$lt_cv_path_NM" +else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" ++ # Didn't find any BSD compatible name lister, look for dumpbin. ++ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) ++ AC_SUBST([DUMPBIN]) ++ if test "$DUMPBIN" != ":"; then ++ NM="$DUMPBIN" + fi - fi --AC_LANG_POP --CC="$lt_save_CC" --])# _LT_LANG_C_CONFIG -+])# AC_LIBTOOL_CONFIG ++fi ++test -z "$NM" && NM=nm ++AC_SUBST([NM]) ++_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + ++AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], ++ [lt_cv_nm_interface="BSD nm" ++ echo "int some_variable = 0;" > conftest.$ac_ext ++ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$ac_compile" 2>conftest.err) ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) ++ cat conftest.out >&AS_MESSAGE_LOG_FD ++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++ lt_cv_nm_interface="MS dumpbin" ++ fi ++ rm -f conftest*]) ++])# LT_PATH_NM ++ ++# Old names: ++AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) ++AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_PROG_NM], []) ++dnl AC_DEFUN([AC_PROG_NM], []) + +-# AC_CHECK_LIBM +-# ------------- ++ ++# LT_LIB_M ++# -------- + # check for math library +-AC_DEFUN([AC_CHECK_LIBM], ++AC_DEFUN([LT_LIB_M], + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + LIBM= + case $host in +@@ -3573,5028 +3979,5782 @@ + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; + esac +-])# AC_CHECK_LIBM ++AC_SUBST([LIBM]) ++])# LT_LIB_M + ++# Old name: ++AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_CHECK_LIBM], []) + +-# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl convenience library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-convenience to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +-# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +-# (note the single quotes!). If your package is not flat and you're not +-# using automake, define top_builddir and top_srcdir appropriately in +-# the Makefiles. +-AC_DEFUN([AC_LIBLTDL_CONVENIENCE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- case $enable_ltdl_convenience in +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_CONVENIENCE + ++# _LT_COMPILER_NO_RTTI([TAGNAME]) ++# ------------------------------- ++m4_defun([_LT_COMPILER_NO_RTTI], ++[m4_require([_LT_TAG_COMPILER])dnl + +-# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) +-# ----------------------------------- +-# sets LIBLTDL to the link flags for the libltdl installable library and +-# LTDLINCL to the include flags for the libltdl header and adds +-# --enable-ltdl-install to the configure arguments. Note that +-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +-# and an installed libltdl is not found, it is assumed to be `libltdl'. +-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with +-# '${top_srcdir}/' (note the single quotes!). If your package is not +-# flat and you're not using automake, define top_builddir and top_srcdir +-# appropriately in the Makefiles. +-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +-AC_DEFUN([AC_LIBLTDL_INSTALLABLE], +-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- AC_CHECK_LIB(ltdl, lt_dlinit, +- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], +- [if test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- else +- enable_ltdl_install=yes +- fi +- ]) +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la +- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- LTDLINCL= +- fi +- # For backwards non-gettext consistent compatibility... +- INCLTDL="$LTDLINCL" +-])# AC_LIBLTDL_INSTALLABLE ++_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + ++if test "$GCC" = yes; then ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + +-# AC_LIBTOOL_CXX +-# -------------- +-# enable support for C++ libraries +-AC_DEFUN([AC_LIBTOOL_CXX], +-[AC_REQUIRE([_LT_AC_LANG_CXX]) +-])# AC_LIBTOOL_CXX ++ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++ lt_cv_prog_compiler_rtti_exceptions, ++ [-fno-rtti -fno-exceptions], [], ++ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++fi ++_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], ++ [Compiler flag to turn off builtin functions]) ++])# _LT_COMPILER_NO_RTTI --# _LT_PROG_CXX --# ------------ --# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ --# compiler, we have our own version here. --m4_defun([_LT_PROG_CXX], --[ --pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) --AC_PROG_CXX +-# _LT_AC_LANG_CXX +-# --------------- +-AC_DEFUN([_LT_AC_LANG_CXX], +-[AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) +-])# _LT_AC_LANG_CXX ++# _LT_CMD_GLOBAL_SYMBOLS ++# ---------------------- ++m4_defun([_LT_CMD_GLOBAL_SYMBOLS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++AC_REQUIRE([LT_PATH_LD])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_TAG_COMPILER])dnl + +-# _LT_AC_PROG_CXXCPP +-# ------------------ +-AC_DEFUN([_LT_AC_PROG_CXXCPP], ++# Check for command to grab the raw symbol name followed by C symbol from nm. ++AC_MSG_CHECKING([command to parse $NM output from $compiler object]) ++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], + [ +-AC_REQUIRE([AC_PROG_CXX]) -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - AC_PROG_CXXCPP --else -- _lt_caught_CXX_error=yes -+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -+# ------------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+ -+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+ -+if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ -+ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -+ lt_cv_prog_compiler_rtti_exceptions, -+ [-fno-rtti -fno-exceptions], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) - fi --popdef([AC_MSG_ERROR]) --])# _LT_PROG_CXX -+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI - --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([_LT_PROG_CXX], []) - -+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+# --------------------------------- -+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. -+AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -+[ +-fi +-])# _LT_AC_PROG_CXXCPP +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] --# _LT_LANG_CXX_CONFIG([TAG]) --# -------------------------- --# Ensure that the configuration variables for a C++ compiler are suitably --# defined. These variables are subsequently used by _LT_CONFIG to write --# the compiler configuration to `libtool'. --m4_defun([_LT_LANG_CXX_CONFIG], --[AC_REQUIRE([_LT_PROG_CXX])dnl --m4_require([_LT_FILEUTILS_DEFAULTS])dnl --m4_require([_LT_DECL_EGREP])dnl -- --AC_LANG_PUSH(C++) --_LT_TAGVAR(archive_cmds_need_lc, $1)=no --_LT_TAGVAR(allow_undefined_flag, $1)= --_LT_TAGVAR(always_export_symbols, $1)=no --_LT_TAGVAR(archive_expsym_cmds, $1)= --_LT_TAGVAR(compiler_needs_object, $1)=no --_LT_TAGVAR(export_dynamic_flag_spec, $1)= --_LT_TAGVAR(hardcode_direct, $1)=no --_LT_TAGVAR(hardcode_direct_absolute, $1)=no --_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= --_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= --_LT_TAGVAR(hardcode_libdir_separator, $1)= --_LT_TAGVAR(hardcode_minus_L, $1)=no --_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported --_LT_TAGVAR(hardcode_automatic, $1)=no --_LT_TAGVAR(inherit_rpath, $1)=no --_LT_TAGVAR(module_cmds, $1)= --_LT_TAGVAR(module_expsym_cmds, $1)= --_LT_TAGVAR(link_all_deplibs, $1)=unknown --_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds --_LT_TAGVAR(no_undefined_flag, $1)= --_LT_TAGVAR(whole_archive_flag_spec, $1)= --_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no +-# AC_LIBTOOL_F77 +-# -------------- +-# enable support for Fortran 77 libraries +-AC_DEFUN([AC_LIBTOOL_F77], +-[AC_REQUIRE([_LT_AC_LANG_F77]) +-])# AC_LIBTOOL_F77 +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' --# Source file extension for C++ test sources. --ac_ext=cpp +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' --# Object file extension for compiled C++ test sources. --objext=o --_LT_TAGVAR(objext, $1)=$objext -+# Transform an extracted symbol line into a proper C declaration -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - --# No sense in running all these tests if we already determined that --# the CXX compiler isn't working. Some variables (like enable_shared) --# are currently assumed to apply to all compilers on this platform, --# and will be corrupted by setting them based on a non-working compiler. --if test "$_lt_caught_CXX_error" != yes; then -- # Code to be used in simple compile tests -- 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); }' -- -- # ltmain only uses $CC for tagged configurations so make sure $CC is set. -- _LT_TAG_COMPILER -- -- # save warnings/boilerplate of simple test code -- _LT_COMPILER_BOILERPLATE -- _LT_LINKER_BOILERPLATE -- -- # Allow CC to be a program name with arguments. -- lt_save_CC=$CC -- lt_save_LD=$LD -- lt_save_GCC=$GCC -- GCC=$GXX -- lt_save_with_gnu_ld=$with_gnu_ld -- lt_save_path_LD=$lt_cv_path_LD -- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -- else -- $as_unset lt_cv_prog_gnu_ld -+# Transform an extracted symbol line into symbol name and symbol address -+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'" -+ +-# _LT_AC_LANG_F77 +-# --------------- +-AC_DEFUN([_LT_AC_LANG_F77], +-[AC_REQUIRE([AC_PROG_F77]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) +-])# _LT_AC_LANG_F77 +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; -+cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; -+hpux*) # Its linker distinguishes data from code symbols ++hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' - fi -- if test -n "${lt_cv_path_LDCXX+set}"; then -- lt_cv_path_LD=$lt_cv_path_LDCXX -- else -- $as_unset lt_cv_path_LD -+ 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* | 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'" -+ 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'" - fi -- test -z "${LDCXX+set}" || LD=$LDCXX -- CC=${CXX-"c++"} -- compiler=$CC -- _LT_TAGVAR(compiler, $1)=$CC -- _LT_CC_BASENAME([$compiler]) -- -- if test -n "$compiler"; then -- # We don't want -fno-exception when compiling C++ code, so set the -- # no_builtin_flag separately -- if test "$GXX" = yes; then -- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -- else -- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -- fi ++ fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' @@ -11640,119 +5074,261 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + ;; +esac -- if test "$GXX" = yes; then -- # Set up default GNU C++ configuration -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac - -- LT_PATH_LD +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac -- # Check if GNU C++ uses GNU ld as the underlying linker, since the -- # archiving commands below assume that GNU ld is being used. -- if test "$with_gnu_ld" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- -- # If archive_cmds runs LD, not CC, wlarc should be empty -- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -- # investigate it a little bit more. (MM) -- wlarc='${wl}' -- -- # ancient GNU ld didn't support --whole-archive et. al. -- if eval "`$CC -print-prog-name=ld` --help 2>&1" | -- $GREP 'no-whole-archive' > /dev/null; then -- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- _LT_TAGVAR(whole_archive_flag_spec, $1)= -- fi -- else -- with_gnu_ld=no -- wlarc= -+# Try without a prefix undercore, then with it. +-# AC_LIBTOOL_GCJ +-# -------------- +-# enable support for GCJ libraries +-AC_DEFUN([AC_LIBTOOL_GCJ], +-[AC_REQUIRE([_LT_AC_LANG_GCJ]) +-])# AC_LIBTOOL_GCJ ++# Transform an extracted symbol line into a proper C declaration. ++# Some systems (esp. on ia64) link data and code symbols differently, ++# so use this general approach. ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + ++# Transform an extracted symbol line into symbol name and symbol address ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +-# _LT_AC_LANG_GCJ +-# --------------- +-AC_DEFUN([_LT_AC_LANG_GCJ], +-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], +- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], +- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], +- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], +- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) +-])# _LT_AC_LANG_GCJ ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac + ++# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do -- # A generic and very simple default shared library creation -- # command for GNU C++ for the case where it uses the native -- # linker, instead of GNU ld. If possible, this setting should -- # overridden to take advantage of the native linker features on -- # the platform it is being used on. -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- fi +-# AC_LIBTOOL_RC +-# ------------- +-# enable support for Windows resource files +-AC_DEFUN([AC_LIBTOOL_RC], +-[AC_REQUIRE([LT_AC_PROG_RC]) +-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) +-])# AC_LIBTOOL_RC + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + # Write the raw and C identifiers. -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ # Fake it for dumpbin and say T for any non-static function ++ # and D for any global variable. ++ # Also find C++ and __fastcall symbols from MSVC++, ++ # which start with @ or ?. ++ lt_cv_sys_global_symbol_pipe="$AWK ['"\ ++" {last_section=section; section=\$ 3};"\ ++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++" \$ 0!~/External *\|/{next};"\ ++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ ++" {if(hide[section]) next};"\ ++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ ++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ ++" s[1]~/^[@?]/{print s[1], s[1]; next};"\ ++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++" ' prfx=^$ac_symprfx]" ++ else ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ fi -- else -- GXX=no -- with_gnu_ld=no -- wlarc= -- fi +-# AC_LIBTOOL_LANG_C_CONFIG +-# ------------------------ +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +-AC_DEFUN([_LT_AC_LANG_C_CONFIG], +-[lt_save_CC="$CC" +-AC_LANG_PUSH(C) +- +-# Source file extension for C test sources. +-ac_ext=c +- +-# Object file extension for compiled C test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-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);}' +- +-_LT_AC_SYS_COMPILER +- +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE +- +-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +-AC_LIBTOOL_SYS_LIB_STRIP +-AC_LIBTOOL_DLOPEN_SELF +- +-# Report which library types will actually be built +-AC_MSG_CHECKING([if libtool supports shared libraries]) +-AC_MSG_RESULT([$can_build_shared]) +- +-AC_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=no +- +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case $host_os in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +- +-aix[[4-9]]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; +-esac +-AC_MSG_RESULT([$enable_shared]) +- +-AC_MSG_CHECKING([whether to build static libraries]) +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-AC_MSG_RESULT([$enable_static]) +- +-AC_LIBTOOL_CONFIG($1) +- +-AC_LANG_POP +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_C_CONFIG +- +- +-# AC_LIBTOOL_LANG_CXX_CONFIG +-# -------------------------- +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) +-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], +-[AC_LANG_PUSH(C++) +-AC_REQUIRE([AC_PROG_CXX]) +-AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +- +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_AC_TAGVAR(allow_undefined_flag, $1)= +-_LT_AC_TAGVAR(always_export_symbols, $1)=no +-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_direct, $1)=no +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +-_LT_AC_TAGVAR(hardcode_automatic, $1)=no +-_LT_AC_TAGVAR(module_cmds, $1)= +-_LT_AC_TAGVAR(module_expsym_cmds, $1)= +-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_AC_TAGVAR(no_undefined_flag, $1)= +-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- +-# Dependencies to place before and after the object being linked: +-_LT_AC_TAGVAR(predep_objects, $1)= +-_LT_AC_TAGVAR(postdep_objects, $1)= +-_LT_AC_TAGVAR(predeps, $1)= +-_LT_AC_TAGVAR(postdeps, $1)= +-_LT_AC_TAGVAR(compiler_lib_search_path, $1)= +-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +- +-# Source file extension for C++ test sources. +-ac_ext=cpp +- +-# Object file extension for compiled C++ test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext +- +-# Code to be used in simple compile tests +-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); }' +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER +- +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE + # Check to see that the pipe works correctly. + pipe_works=no -- # PORTME: fill in a description of your system's C++ link characteristics -- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -- _LT_TAGVAR(ld_shlibs, $1)=yes -- case $host_os in -- aix3*) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- aix[[4-9]]*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- aix_use_runtimelinking=no +-# Allow CC to be a program name with arguments. +-lt_save_CC=$CC +-lt_save_LD=$LD +-lt_save_GCC=$GCC +-GCC=$GXX +-lt_save_with_gnu_ld=$with_gnu_ld +-lt_save_path_LD=$lt_cv_path_LD +-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +-else +- $as_unset lt_cv_prog_gnu_ld +-fi +-if test -n "${lt_cv_path_LDCXX+set}"; then +- lt_cv_path_LD=$lt_cv_path_LDCXX +-else +- $as_unset lt_cv_path_LD +-fi +-test -z "${LDCXX+set}" || LD=$LDCXX +-CC=${CXX-"c++"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) + rm -f conftest* -+ cat > conftest.$ac_ext <<EOF ++ cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; -+void nm_test_func(){} ++void nm_test_func(void); ++void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} -+EOF ++_LT_EOF -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -- for ld_flag in $LDFLAGS; do -- case $ld_flag in -- *-brtl*) -- aix_use_runtimelinking=yes -- break -- ;; -- esac -- done -- ;; -- esac +-# We don't want -fno-exception wen compiling C++ code, so set the +-# no_builtin_flag separately +-if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +-else +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +-fi + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm @@ -11764,204 +5340,104 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + rm -f "$nlist"T + fi -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi +-if test "$GXX" = yes; then +- # Set up default GNU C++ configuration + # Make sure that we snagged all the symbols we need. -+ if grep ' nm_test_var$' "$nlist" >/dev/null; then -+ if grep ' nm_test_func$' "$nlist" >/dev/null; then -+ cat <<EOF > conftest.$ac_ext ++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then ++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then ++ cat <<_LT_EOF > conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -- -- _LT_TAGVAR(archive_cmds, $1)='' -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_TAGVAR(link_all_deplibs, $1)=yes -- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -- -- if test "$GXX" = yes; then -- case $host_os in aix4.[[012]]|aix4.[[012]].*) -- # We only want to do this on AIX 4.2 and lower, the check -- # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && -- strings "$collect2name" | $GREP resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- : -- else -- # We have old collect2 -- _LT_TAGVAR(hardcode_direct, $1)=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- _LT_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)= -- fi -- esac -- shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -- fi -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -+EOF +- AC_PROG_LD ++_LT_EOF + # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' -- # It seems that -bexpall does not export symbols beginning with -- # underscore (_), so it is better to generate a list of symbols to -- # export. -- _LT_TAGVAR(always_export_symbols, $1)=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- _LT_TAGVAR(allow_undefined_flag, $1)='-berok' -- # Determine the default libpath from the value encoded in an empty -- # executable. -- _LT_SYS_MODULE_PATH_AIX -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ cat <<EOF >> conftest.$ac_ext -+#if defined (__STDC__) && __STDC__ -+# define lt_ptr_t void * -+#else -+# define lt_ptr_t char * -+# define const -+#endif +- # Check if GNU C++ uses GNU ld as the underlying linker, since the +- # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ cat <<_LT_EOF >> conftest.$ac_ext -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -- _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an -- # empty executable. -- _LT_SYS_MODULE_PATH_AIX -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -- # This is similar to how AIX traditionally builds its shared -- # libraries. -- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -- fi -- fi -- ;; -+/* The mapping between symbol names and symbols. */ +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++/* The mapping between symbol names and symbols. */ +const struct { + const char *name; -+ lt_ptr_t address; ++ void *address; +} -+lt_preloaded_symbols[[]] = ++lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ -+EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -+ cat <<\EOF >> conftest.$ac_ext -+ {0, (lt_ptr_t) 0} ++ { "@PROGRAM@", (void *) 0 }, ++_LT_EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++ cat <<\_LT_EOF >> conftest.$ac_ext ++ {0, (void *) 0} +}; -- beos*) -- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- # If archive_cmds runs LD, not CC, wlarc should be empty +- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to +- # investigate it a little bit more. (MM) +- wlarc='${wl}' ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt__PROGRAM__LTX_preloaded_symbols; ++} ++#endif + +- # ancient GNU ld didn't support --whole-archive et. al. +- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ +- grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +#ifdef __cplusplus +} +#endif -+EOF ++_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" - else -- _LT_TAGVAR(ld_shlibs, $1)=no ++ else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi -- ;; -- -- chorus*) -- case $cc_basename in -- *) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; ++ fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi -+ else + else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -+ fi -+ else + fi + else +- with_gnu_ld=no +- wlarc= +- +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 -+ fi + fi + rm -rf conftest* conftst* -- cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(always_export_symbols, $1)=no -- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- darwin* | rhapsody*) -- _LT_DARWIN_LINKER_FEATURES($1) -- ;; + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break @@ -11975,59 +5451,379 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) -+else + else +- GXX=no +- with_gnu_ld=no +- wlarc= + AC_MSG_RESULT(ok) -+fi -+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -+ -+ -+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -+# --------------------------------------- -+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= + fi +-# PORTME: fill in a description of your system's C++ link characteristics +-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +-_LT_AC_TAGVAR(ld_shlibs, $1)=yes +-case $host_os in +- aix3*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aix[[4-9]]*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no +- +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done +- ;; +- esac +- +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], ++ [Take the output of nm and produce a listing of raw symbols and C names]) ++_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], ++ [Transform the output of nm in a proper C declaration]) ++_LT_DECL([global_symbol_to_c_name_address], ++ [lt_cv_sys_global_symbol_to_c_name_address], [1], ++ [Transform the output of nm in a C name address pair]) ++_LT_DECL([global_symbol_to_c_name_address_lib_prefix], ++ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], ++ [Transform the output of nm in a C name address pair when lib prefix is needed]) ++]) # _LT_CMD_GLOBAL_SYMBOLS + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + +- if test "$GXX" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- : +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi ++# _LT_COMPILER_PIC([TAGNAME]) ++# --------------------------- ++m4_defun([_LT_COMPILER_PIC], ++[m4_require([_LT_TAG_COMPILER])dnl ++_LT_TAGVAR(lt_prog_compiler_wl, $1)= ++_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++_LT_TAGVAR(lt_prog_compiler_static, $1)= + +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +AC_MSG_CHECKING([for $compiler option to produce PIC]) -+ ifelse([$1],[CXX],[ ++m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else + case $host_os in + aix*) + # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then + if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +- +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _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 +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- darwin* | rhapsody*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" +- if test "$GXX" = yes ; then +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- if test "$lt_cv_apple_cc_single_mod" != "yes"; then +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +- fi +- else +- 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` $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 $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}' +- ;; +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; +- +- dgux*) +- case $cc_basename in +- ec++*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- freebsd[[12]]*) +- # C++ shared libraries reported to be fairly broken before switch to ELF +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- freebsd-elf*) +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- ;; +- freebsd* | dragonfly*) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- ;; +- gnu*) +- ;; +- hpux9*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no + # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; +- esac +- ;; +- hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; + case $host_cpu in +- hppa*64*|ia64*) ;; +- *) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac +- fi +- case $host_cpu in +- hppa*64*|ia64*) +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, +- # but as the default +- # location of the library. + ;; +- esac + +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- aCC*) +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; -+ mingw* | cygwin* | os2* | pw32*) ++ mingw* | cygwin* | os2* | pw32* | cegcc*) + # 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 + m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. @@ -12035,22 +5831,28 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + ;; + sysv4*MP*) + if test -d /usr/nec; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. + case $host_cpu in -+ hppa*64*|ia64*) ++ hppa*64*) + ;; + *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; + *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else @@ -12059,848 +5861,804 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler -+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -+ ;; -+ esac -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; - dgux*) -- case $cc_basename in -- ec++*) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no ++ # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; +- *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then ++ dgux*) + case $cc_basename in + ec++*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; -- ghcx*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ;; + ghcx*) - # Green Hills C++ Compiler -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no ++ # Green Hills C++ Compiler ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; + *) - ;; -- esac -- ;; -- -- freebsd[[12]]*) -- # C++ shared libraries reported to be fairly broken before -- # switch to ELF -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- -- freebsd-elf*) -- _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- ;; -- ++ ;; + esac + ;; - freebsd* | dragonfly*) -- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -- # conventions -- _LT_TAGVAR(ld_shlibs, $1)=yes -- ;; -- -- gnu*) -- ;; -- -- hpux9*) -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -- # but as the default -- # location of the library. -- -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- aCC*) -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -- ;; -- *) -- if test "$GXX" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- else -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; -- -- hpux10*|hpux11*) -- if test $with_gnu_ld = no; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- -- case $host_cpu in -- hppa*64*|ia64*) -- ;; -- *) -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- ;; -- esac -- fi -- case $host_cpu in -- hppa*64*|ia64*) -- _LT_TAGVAR(hardcode_direct, $1)=no -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- *) -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -- # but as the default -- # location of the library. -- ;; -- esac -- -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no ++ freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi - ;; -- aCC*) ++ ;; + aCC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' case $host_cpu in -- hppa*64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + hppa*64*|ia64*) + # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; esac -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' - ;; -- *) -- if test "$GXX" = yes; then -- if test $with_gnu_ld = no; then -- case $host_cpu in -- hppa*64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- esac -- fi -- else -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi -+ *) - ;; -- esac -- ;; -- -- interix[[3-9]]*) -- _LT_TAGVAR(hardcode_direct, $1)=no -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -- # Instead, shared libraries are loaded at an image base (0x10000000 by -- # default) and relocated if they conflict, which is a slow very memory -- # consuming and fragmenting process. To avoid this, we pick a random, -- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -- # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- _LT_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' +- fi +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi - ;; -- irix5* | irix6*) -- case $cc_basename in -- CC*) -- # SGI C++ -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- esac +- ;; +- 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' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _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' +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC*) +- # SGI C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - -- # Archives containing C++ object files must be created using -- # "CC -ar", where "CC" is the IRIX C++ compiler. This is -- # necessary to make sure instantiated templates are included -- # in the archive. -- _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' +- # Archives containing C++ object files must be created using +- # "CC -ar", where "CC" is the IRIX C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ ;; + esac -+ ;; + ;; +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' +- fi +- fi +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? -+ ;; + ;; +- esac +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; +- linux* | k*bsd*-gnu) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- ;; +- icpc*) +- # Intel C++ +- with_gnu_ld=yes +- # version 8.0 and above of icpc choke on multiply defined symbols +- # if we add $predep_objects and $postdep_objects, however 7.1 and +- # earlier do not add the objects themselves. +- case `$CC -V 2>&1` in +- *"Version 7."*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- *) # Version 8.0 or newer +- tmp_idyn= +- case $host_cpu in +- ia64*) tmp_idyn=' -i_dynamic';; +- esac +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. - ;; -- *) -- if test "$GXX" = yes; then -- if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' -- fi -- fi -- _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ;; + *) - ;; -- esac -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_TAGVAR(inherit_rpath, $1)=yes ++ ;; + esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +- ;; +- pgCC* | pgcpp*) +- # Portland Group C++ compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - ;; +- cxx*) +- # Compaq C++ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - -+ esac -+ ;; - linux* | k*bsd*-gnu) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # 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' - -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- # 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 -Bstatic", where "CC" is the KAI C++ compiler. -- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- # 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' +- ;; ++ linux* | k*bsd*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; -- icpc* | ecpc* ) -+ icpc* | ecpc*) - # Intel C++ -- with_gnu_ld=yes -- # version 8.0 and above of icpc choke on multiply defined symbols -- # if we add $predep_objects and $postdep_objects, however 7.1 and -- # earlier do not add the objects themselves. -- case `$CC -V 2>&1` in -- *"Version 7."*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- ;; -- *) # Version 8.0 or newer -- tmp_idyn= -- case $host_cpu in -- ia64*) tmp_idyn=' -i_dynamic';; -- esac -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- ;; -- esac -- _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ ecpc* ) ++ # old Intel C++ for x86_64 which still supported -KPIC. ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ icpc* ) ++ # Intel C++, used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) -+ # Portland Group C++ compiler. -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; -- pgCC* | pgcpp*) -- # Portland Group C++ compiler -- case `$CC -V` in -- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) -- _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -- _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -- $RANLIB $oldlib' -- _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -- ;; -- *) # Version 6 will use weak symbols -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -- ;; -- esac -- -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -- ;; - cxx*) - # Compaq C++ -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -- -- runpath_var=LD_RUN_PATH -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' -- ;; -- xl*) -- # IBM XL 8.0 on PPC, with GNU ld -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- if test "x$supports_anon_versioning" = xyes; then -- _LT_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 -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- fi ++ # Portland Group C++ compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ cxx*) ++ # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _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_TAGVAR(no_undefined_flag, $1)=' -zdefs' -- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_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' -- _LT_TAGVAR(compiler_needs_object, $1)=yes -- -- # 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ _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 - ;; ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ xlc* | xlC*) ++ # IBM XL 8.0 on PPC ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ esac ++ ;; esac ;; +- esac +- ;; +- lynxos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- m88k*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- netbsd*) +- 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= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; +- openbsd2*) +- # C++ shared libraries are fairly broken +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- openbsd*) +- 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 +- ;; +- osf3*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler - - lynxos*) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' +- +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' ++ lynxos*) ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - m88k*) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi ++ m88k*) ;; +- esac +- ;; +- osf4* | osf5*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler - - mvs*) -- case $cc_basename in -- cxx*) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- cxx*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ +- $rm $lib.exp' +- +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' ++ mvs*) + case $cc_basename in + cxx*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no - ;; - esac ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ++ ;; ++ *) ++ ;; ++ esac ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - -- netbsd*) -- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -- wlarc= -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- fi -- # Workaround some broken pre-1.5 toolchains -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -- ;; +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - -- *nto* | *qnx*) -- _LT_TAGVAR(ld_shlibs, $1)=yes -- ;; +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -- openbsd2*) -- # C++ shared libraries are fairly broken -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- -- openbsd*) -- if test -f /usr/libexec/ld.so; then -- _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- _LT_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_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_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- fi -- output_verbose_link_cmd=echo - else -- _LT_TAGVAR(ld_shlibs, $1)=no +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi + netbsd* | netbsdelf*-gnu) ;; -- - osf3* | osf4* | osf5*) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -- -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # Archives containing C++ object files must be created using -- # the KAI C++ compiler. -- case $host in -- osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; -- *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; -- esac +- esac +- ;; +- psos*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- lcc*) +- # Lucid +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; ++ osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; -- RCC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ ;; + RCC*) - # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; -- cxx*) -- case $host in -- osf3*) -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- ;; -- *) -- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -- echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ -- $RM $lib.exp' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -- ;; -- esac ++ # Rational C++ 2.4.1 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ cxx*) ++ # Digital/Compaq C++ ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ *) ++ ;; ++ esac + ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ psos*) + ;; +- esac +- ;; +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes +- _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)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ ;; + *) +- # 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)='-z allextract$convenience -z defaultextract' + ;; + esac +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- +- 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' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- +- # The C++ compiler must be used to create the archive. +- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; +- *) +- # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' +- if $CC --version | grep -v '^2\.7' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' -+ cxx*) -+ # Digital/Compaq C++ -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- case $host in -- osf3*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- ;; -- *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- ;; -- esac +- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=: +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- fi - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -- -- else -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- fi - ;; -- esac -- ;; -- -+ esac -+ ;; - psos*) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- -- sunos4*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.x -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- lcc*) -- # Lucid -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; -- -+ ;; - solaris*) -- case $cc_basename in -- CC*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ sunos4*) + case $cc_basename in -+ CC*) - # Sun C++ 4.2, 5.x and Centerline C++ -- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes -- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -- -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- case $host_os in -- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -- *) -- # The compiler driver will combine and reorder linker options, -- # but understands `-z linker_flag'. -- # Supported since Solaris 2.6 (maybe 2.5.1?) -- _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -- ;; -- esac -- _LT_TAGVAR(link_all_deplibs, $1)=yes -- -- 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ _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 ' - ;; -- gcx*) -+ gcx*) - # Green Hills C++ Compiler -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- -- # The C++ compiler must be used to create the archive. -- _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; -- *) -- # GNU C++ compiler with Solaris linker -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -- if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -- else -- # g++ 2.7 appears to require `-G' NOT `-shared' on this -- # platform. -- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -- fi -- -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -- case $host_os in -- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -- *) -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -- ;; -- esac -- fi -+ *) - ;; -- esac -- ;; -- -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- runpath_var='LD_RUN_PATH' -- -- case $cc_basename in -- CC*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- ;; -- -- sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -- # link with -lc, and that would cause any symbols used from libc to -- # always be unresolved, which means just about no library would -- # ever link correctly. If we're not using GNU ld we use -z text -- # though, which does catch some bad symbols but isn't as heavy-handed -- # as -z defs. -- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -- _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' -- _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_TAGVAR(link_all_deplibs, $1)=yes -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -- runpath_var='LD_RUN_PATH' -- -+ esac -+ ;; -+ sunos4*) - case $cc_basename in -- CC*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + CC*) + # Sun C++ 4.x -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; - esac -- ;; +- esac +- fi ++ esac + ;; +- esac +- ;; +- 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 +- runpath_var='LD_RUN_PATH' - -+ ;; - tandem*) -- case $cc_basename in -- NCC*) +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ esac + ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ tandem*) + case $cc_basename in + NCC*) - # NonStop-UX NCC 3.20 -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; -- -- vxworks*) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- -- *) -- # FIXME: insert proper C++ library support -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; ++ # NonStop-UX NCC 3.20 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ;; ++ *) ++ ;; ++ esac + ;; - esac +- ;; +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- # For security reasons, it is highly recommended that you always +- # use absolute paths for naming shared libraries, and exclude the +- # DT_RUNPATH tag from executables and libraries. But doing so +- # requires that you compile everything twice, which is a pain. +- # So that behaviour is only enabled if SCOABSPATH is set to a +- # non-empty value in the environment. Most likely only useful for +- # creating official distributions of packages. +- # This is a hack until libtool officially supports absolute path +- # names for shared libraries. +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' - -- AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -- -- _LT_TAGVAR(GCC, $1)="$GXX" -- _LT_TAGVAR(LD, $1)="$LD" -- -- ## CAVEAT EMPTOR: -- ## There is no encapsulation within the following macros, do not change -- ## the running order or otherwise move them around unless you know exactly -- ## what you are doing... -- _LT_SYS_HIDDEN_LIBDEPS($1) -- _LT_COMPILER_PIC($1) -- _LT_COMPILER_C_O($1) -- _LT_COMPILER_FILE_LOCKS($1) -- _LT_LINKER_SHLIBS($1) -- _LT_SYS_DYNAMIC_LINKER($1) -- _LT_LINKER_HARDCODE_LIBPATH($1) -- -- _LT_CONFIG($1) -- fi # test -n "$compiler" -- -- CC=$lt_save_CC -- LDCXX=$LD -- LD=$lt_save_LD -- GCC=$lt_save_GCC -- with_gnu_ld=$lt_save_with_gnu_ld -- lt_cv_path_LDCXX=$lt_cv_path_LD -- lt_cv_path_LD=$lt_save_path_LD -- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld --fi # test "$_lt_caught_CXX_error" != yes -- +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ vxworks*) + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- ;; +- vxworks*) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +-esac +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ fi ++], ++[ ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + +-_LT_AC_TAGVAR(GCC, $1)="$GXX" +-_LT_AC_TAGVAR(LD, $1)="$LD" ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; + +-AC_LIBTOOL_POSTDEP_PREDEP($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac ++ ;; + +-AC_LIBTOOL_CONFIG($1) ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; + -AC_LANG_POP --])# _LT_LANG_CXX_CONFIG -- -- --# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) --# --------------------------------- +-CC=$lt_save_CC +-LDCXX=$LD +-LD=$lt_save_LD +-GCC=$lt_save_GCC +-with_gnu_ldcxx=$with_gnu_ld +-with_gnu_ld=$lt_save_with_gnu_ld +-lt_cv_path_LDCXX=$lt_cv_path_LD +-lt_cv_path_LD=$lt_save_path_LD +-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +-])# AC_LIBTOOL_LANG_CXX_CONFIG ++ mingw* | cygwin* | pw32* | os2* | cegcc*) ++ # 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 ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + +-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +-# ------------------------------------ -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. --m4_defun([_LT_SYS_HIDDEN_LIBDEPS], --[m4_require([_LT_FILEUTILS_DEFAULTS])dnl --# Dependencies to place before and after the object being linked: --_LT_TAGVAR(predep_objects, $1)= --_LT_TAGVAR(postdep_objects, $1)= --_LT_TAGVAR(predeps, $1)= --_LT_TAGVAR(postdeps, $1)= --_LT_TAGVAR(compiler_lib_search_path, $1)= -- +-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], +-[AC_REQUIRE([LT_AC_PROG_SED])dnl -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... --m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF -int a; -void foo (void) { a = 0; } --_LT_EOF --], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +-EOF +-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF -class Foo -{ -public: @@ -12908,80 +6666,115 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -private: - int a; -}; --_LT_EOF --], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF +-EOF +-],[$1],[F77],[cat > conftest.$ac_ext <<EOF - subroutine foo - implicit none - integer*4 a - a=0 - return - end --_LT_EOF --], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF -- subroutine foo -- implicit none -- integer a -- a=0 -- return -- end --_LT_EOF --], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +-EOF +-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF -public class foo { - private int a; - public void bar (void) { - a = 0; - } -}; --_LT_EOF +-EOF -]) -dnl Parse the compiler output and extract the necessary -dnl objects, libraries and library flags. -if AC_TRY_EVAL(ac_compile); then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. -- ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; + - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no -- -- for p in `eval "$output_verbose_link_cmd"`; do ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; + +- # The `*' in the case matches for architectures that use `case' in +- # $output_verbose_cmd can trigger glob expansion during the loop +- # eval without this substitution. +- output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` ++ interix[[3-9]]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; + +- for p in `eval $output_verbose_link_cmd`; do - case $p in -- ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ enable_shared=no ++ ;; + - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. -- if test $p = "-L" || -- test $p = "-R"; then +- if test $p = "-L" \ +- || test $p = "-R"; then - prev=$p - continue - else - prev= - fi -- ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; + - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. -- if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then -- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" +- if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then +- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" - else -- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" +- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else -- if test -z "$_LT_TAGVAR(postdeps, $1)"; then -- _LT_TAGVAR(postdeps, $1)="${prev}${p}" +- if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then +- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" - else -- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" +- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" - fi - fi - ;; -- ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; + - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. @@ -12989,51 +6782,169 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - pre_test_object_deps_done=yes - continue - fi -- ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; + - if test "$pre_test_object_deps_done" = no; then -- if test -z "$_LT_TAGVAR(predep_objects, $1)"; then -- _LT_TAGVAR(predep_objects, $1)="$p" +- if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then +- _LT_AC_TAGVAR(predep_objects, $1)="$p" - else -- _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" +- _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" - fi - else -- if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then -- _LT_TAGVAR(postdep_objects, $1)="$p" +- if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then +- _LT_AC_TAGVAR(postdep_objects, $1)="$p" - else -- _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" +- _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" - fi - fi - ;; -- ++ mingw* | cygwin* | pw32* | os2* | cegcc*) ++ # 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). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; + - *) ;; # Ignore the rest. -- ++ hpux9* | hpux10* | hpux11*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ ;; + - esac - done -- ++ irix5* | irix6* | nonstopux*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC (with -KPIC) is the default. ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; + - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling $1 test program" -fi -- --$RM -f confest.$objext -- ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ # old Intel for x86_64 which still supported -KPIC. ++ ecc*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ccc*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All Alpha code is PIC. ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ xl*) ++ # IBM XL C 8.0/Fortran 10.1 on PPC ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ++ ;; ++ esac ++ ;; ++ esac ++ ;; + +-$rm -f confest.$objext ++ newsos6) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + +-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= +-if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then +- _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +-fi ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; + -# PORTME: override above test on systems where it is broken --m4_if([$1], [CXX], +-ifelse([$1],[CXX], -[case $host_os in -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_TAGVAR(predep_objects,$1)= -- _LT_TAGVAR(postdep_objects,$1)= -- _LT_TAGVAR(postdeps,$1)= +- _LT_AC_TAGVAR(predep_objects,$1)= +- _LT_AC_TAGVAR(postdep_objects,$1)= +- _LT_AC_TAGVAR(postdeps,$1)= - ;; -- ++ osf3* | osf4* | osf5*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All OSF/1 code is PIC. ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; + -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 @@ -13041,16 +6952,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes -- ;; ++ rdos*) ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; - esac -- - if test "$solaris_use_stlport4" != yes; then -- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' +- _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -- + -solaris*) - case $cc_basename in - CC*) @@ -13061,777 +6973,265 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes -- ;; ++ solaris*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ esac + ;; - 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. - if test "$solaris_use_stlport4" != yes; then -- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' +- _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -esac -]) -- --case " $_LT_TAGVAR(postdeps, $1) " in --*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +-case " $_LT_AC_TAGVAR(postdeps, $1) " in +-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -esac -- _LT_TAGVAR(compiler_lib_search_dirs, $1)= --if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then -- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` --fi --_LT_TAGDECL([], [compiler_lib_search_dirs], [1], -- [The directories searched by this compiler when creating a shared library]) --_LT_TAGDECL([], [predep_objects], [1], -- [Dependencies to place before and after the objects being linked to -- create a shared library]) --_LT_TAGDECL([], [postdep_objects], [1]) --_LT_TAGDECL([], [predeps], [1]) --_LT_TAGDECL([], [postdeps], [1]) --_LT_TAGDECL([], [compiler_lib_search_path], [1], -- [The library search path used internally by the compiler when linking -- a shared library]) --])# _LT_SYS_HIDDEN_LIBDEPS +-])# AC_LIBTOOL_POSTDEP_PREDEP - -- --# _LT_PROG_F77 --# ------------ --# Since AC_PROG_F77 is broken, in that it returns the empty string --# if there is no fortran compiler, we have our own version here. --m4_defun([_LT_PROG_F77], --[ --pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) --AC_PROG_F77 --if test -z "$F77" || test "X$F77" = "Xno"; then -- _lt_disable_F77=yes --fi --popdef([AC_MSG_ERROR]) --])# _LT_PROG_F77 -- --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([_LT_PROG_F77], []) -- -- --# _LT_LANG_F77_CONFIG([TAG]) +-# AC_LIBTOOL_LANG_F77_CONFIG -# -------------------------- --# Ensure that the configuration variables for a Fortran 77 compiler are --# suitably defined. These variables are subsequently used by _LT_CONFIG --# to write the compiler configuration to `libtool'. --m4_defun([_LT_LANG_F77_CONFIG], --[AC_REQUIRE([_LT_PROG_F77])dnl +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) +-AC_DEFUN([_LT_AC_LANG_F77_CONFIG], +-[AC_REQUIRE([AC_PROG_F77]) -AC_LANG_PUSH(Fortran 77) - --_LT_TAGVAR(archive_cmds_need_lc, $1)=no --_LT_TAGVAR(allow_undefined_flag, $1)= --_LT_TAGVAR(always_export_symbols, $1)=no --_LT_TAGVAR(archive_expsym_cmds, $1)= --_LT_TAGVAR(export_dynamic_flag_spec, $1)= --_LT_TAGVAR(hardcode_direct, $1)=no --_LT_TAGVAR(hardcode_direct_absolute, $1)=no --_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= --_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= --_LT_TAGVAR(hardcode_libdir_separator, $1)= --_LT_TAGVAR(hardcode_minus_L, $1)=no --_LT_TAGVAR(hardcode_automatic, $1)=no --_LT_TAGVAR(inherit_rpath, $1)=no --_LT_TAGVAR(module_cmds, $1)= --_LT_TAGVAR(module_expsym_cmds, $1)= --_LT_TAGVAR(link_all_deplibs, $1)=unknown --_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds --_LT_TAGVAR(no_undefined_flag, $1)= --_LT_TAGVAR(whole_archive_flag_spec, $1)= --_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -- +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +-_LT_AC_TAGVAR(allow_undefined_flag, $1)= +-_LT_AC_TAGVAR(always_export_symbols, $1)=no +-_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_direct, $1)=no +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +-_LT_AC_TAGVAR(hardcode_automatic, $1)=no +-_LT_AC_TAGVAR(module_cmds, $1)= +-_LT_AC_TAGVAR(module_expsym_cmds, $1)= +-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +-_LT_AC_TAGVAR(no_undefined_flag, $1)= +-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ sunos4*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + -# Source file extension for f77 test sources. -ac_ext=f -- ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + -# Object file extension for compiled f77 test sources. -objext=o --_LT_TAGVAR(objext, $1)=$objext -- --# No sense in running all these tests if we already determined that --# the F77 compiler isn't working. Some variables (like enable_shared) --# are currently assumed to apply to all compilers on this platform, --# and will be corrupted by setting them based on a non-working compiler. --if test "$_lt_disable_F77" != yes; then -- # Code to be used in simple compile tests -- lt_simple_compile_test_code="\ -- subroutine t -- return -- end --" -- -- # Code to be used in simple link tests -- lt_simple_link_test_code="\ -- program t -- end --" -- -- # ltmain only uses $CC for tagged configurations so make sure $CC is set. -- _LT_TAG_COMPILER -- -- # save warnings/boilerplate of simple test code -- _LT_COMPILER_BOILERPLATE -- _LT_LINKER_BOILERPLATE -- -- # Allow CC to be a program name with arguments. -- lt_save_CC="$CC" -- lt_save_GCC=$GCC -- CC=${F77-"f77"} -- compiler=$CC -- _LT_TAGVAR(compiler, $1)=$CC -- _LT_CC_BASENAME([$compiler]) -- GCC=$G77 -- if test -n "$compiler"; then -- AC_MSG_CHECKING([if libtool supports shared libraries]) -- AC_MSG_RESULT([$can_build_shared]) -- -- AC_MSG_CHECKING([whether to build shared libraries]) -- test "$can_build_shared" = "no" && enable_shared=no -- -- # On AIX, shared libraries and static libraries use the same namespace, and -- # are all built from PIC. -- case $host_os in -- aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -- aix[[4-9]]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -- ;; -- esac -- AC_MSG_RESULT([$enable_shared]) -- -- AC_MSG_CHECKING([whether to build static libraries]) -- # Make sure either enable_shared or enable_static is yes. -- test "$enable_shared" = yes || enable_static=yes -- AC_MSG_RESULT([$enable_static]) -- -- _LT_TAGVAR(GCC, $1)="$G77" -- _LT_TAGVAR(LD, $1)="$LD" -- -- ## CAVEAT EMPTOR: -- ## There is no encapsulation within the following macros, do not change -- ## the running order or otherwise move them around unless you know exactly -- ## what you are doing... -- _LT_COMPILER_PIC($1) -- _LT_COMPILER_C_O($1) -- _LT_COMPILER_FILE_LOCKS($1) -- _LT_LINKER_SHLIBS($1) -- _LT_SYS_DYNAMIC_LINKER($1) -- _LT_LINKER_HARDCODE_LIBPATH($1) -- -- _LT_CONFIG($1) -- fi # test -n "$compiler" -- -- GCC=$lt_save_GCC -- CC="$lt_save_CC" --fi # test "$_lt_disable_F77" != yes -- --AC_LANG_POP --])# _LT_LANG_F77_CONFIG -- -- --# _LT_PROG_FC --# ----------- --# Since AC_PROG_FC is broken, in that it returns the empty string --# if there is no fortran compiler, we have our own version here. --m4_defun([_LT_PROG_FC], --[ --pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) --AC_PROG_FC --if test -z "$FC" || test "X$FC" = "Xno"; then -- _lt_disable_FC=yes --fi --popdef([AC_MSG_ERROR]) --])# _LT_PROG_FC -- --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([_LT_PROG_FC], []) -- -- --# _LT_LANG_FC_CONFIG([TAG]) --# ------------------------- --# Ensure that the configuration variables for a Fortran compiler are --# suitably defined. These variables are subsequently used by _LT_CONFIG --# to write the compiler configuration to `libtool'. --m4_defun([_LT_LANG_FC_CONFIG], --[AC_REQUIRE([_LT_PROG_FC])dnl --AC_LANG_PUSH(Fortran) -- --_LT_TAGVAR(archive_cmds_need_lc, $1)=no --_LT_TAGVAR(allow_undefined_flag, $1)= --_LT_TAGVAR(always_export_symbols, $1)=no --_LT_TAGVAR(archive_expsym_cmds, $1)= --_LT_TAGVAR(export_dynamic_flag_spec, $1)= --_LT_TAGVAR(hardcode_direct, $1)=no --_LT_TAGVAR(hardcode_direct_absolute, $1)=no --_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= --_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= --_LT_TAGVAR(hardcode_libdir_separator, $1)= --_LT_TAGVAR(hardcode_minus_L, $1)=no --_LT_TAGVAR(hardcode_automatic, $1)=no --_LT_TAGVAR(inherit_rpath, $1)=no --_LT_TAGVAR(module_cmds, $1)= --_LT_TAGVAR(module_expsym_cmds, $1)= --_LT_TAGVAR(link_all_deplibs, $1)=unknown --_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds --_LT_TAGVAR(no_undefined_flag, $1)= --_LT_TAGVAR(whole_archive_flag_spec, $1)= --_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -- --# Source file extension for fc test sources. --ac_ext=${ac_fc_srcext-f} -- --# Object file extension for compiled fc test sources. --objext=o --_LT_TAGVAR(objext, $1)=$objext -- --# No sense in running all these tests if we already determined that --# the FC compiler isn't working. Some variables (like enable_shared) --# are currently assumed to apply to all compilers on this platform, --# and will be corrupted by setting them based on a non-working compiler. --if test "$_lt_disable_FC" != yes; then -- # Code to be used in simple compile tests -- lt_simple_compile_test_code="\ -- subroutine t -- return -- end --" -- -- # Code to be used in simple link tests -- lt_simple_link_test_code="\ -- program t -- end --" -- -- # ltmain only uses $CC for tagged configurations so make sure $CC is set. -- _LT_TAG_COMPILER -- -- # save warnings/boilerplate of simple test code -- _LT_COMPILER_BOILERPLATE -- _LT_LINKER_BOILERPLATE -- -- # Allow CC to be a program name with arguments. -- lt_save_CC="$CC" -- lt_save_GCC=$GCC -- CC=${FC-"f95"} -- compiler=$CC -- GCC=$ac_cv_fc_compiler_gnu -- -- _LT_TAGVAR(compiler, $1)=$CC -- _LT_CC_BASENAME([$compiler]) -- -- if test -n "$compiler"; then -- AC_MSG_CHECKING([if libtool supports shared libraries]) -- AC_MSG_RESULT([$can_build_shared]) -- -- AC_MSG_CHECKING([whether to build shared libraries]) -- test "$can_build_shared" = "no" && enable_shared=no -- -- # On AIX, shared libraries and static libraries use the same namespace, and -- # are all built from PIC. -- case $host_os in -- aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -- aix[[4-9]]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -- ;; -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ esac -+ ;; -+ vxworks*) -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; - esac -- AC_MSG_RESULT([$enable_shared]) -- -- AC_MSG_CHECKING([whether to build static libraries]) -- # Make sure either enable_shared or enable_static is yes. -- test "$enable_shared" = yes || enable_static=yes -- AC_MSG_RESULT([$enable_static]) -- -- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" -- _LT_TAGVAR(LD, $1)="$LD" -- -- ## CAVEAT EMPTOR: -- ## There is no encapsulation within the following macros, do not change -- ## the running order or otherwise move them around unless you know exactly -- ## what you are doing... -- _LT_SYS_HIDDEN_LIBDEPS($1) -- _LT_COMPILER_PIC($1) -- _LT_COMPILER_C_O($1) -- _LT_COMPILER_FILE_LOCKS($1) -- _LT_LINKER_SHLIBS($1) -- _LT_SYS_DYNAMIC_LINKER($1) -- _LT_LINKER_HARDCODE_LIBPATH($1) -- -- _LT_CONFIG($1) -- fi # test -n "$compiler" -- -- GCC=$lt_save_GCC -- CC="$lt_save_CC" --fi # test "$_lt_disable_FC" != yes -+ fi -+], -+[ -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - --AC_LANG_POP --])# _LT_LANG_FC_CONFIG -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; - -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; - --# _LT_LANG_GCJ_CONFIG([TAG]) --# -------------------------- --# Ensure that the configuration variables for the GNU Java Compiler compiler --# are suitably defined. These variables are subsequently used by _LT_CONFIG --# to write the compiler configuration to `libtool'. --m4_defun([_LT_LANG_GCJ_CONFIG], --[AC_REQUIRE([LT_PROG_GCJ])dnl --AC_LANG_SAVE -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; - --# Source file extension for Java test sources. --ac_ext=java -+ 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 -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - --# Object file extension for compiled Java test sources. --objext=o --_LT_TAGVAR(objext, $1)=$objext -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; - --# Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}" -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; - --# Code to be used in simple link tests --lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ enable_shared=no -+ ;; - --# ltmain only uses $CC for tagged configurations so make sure $CC is set. --_LT_TAG_COMPILER -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; - --# save warnings/boilerplate of simple test code --_LT_COMPILER_BOILERPLATE --_LT_LINKER_BOILERPLATE -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; - --# Allow CC to be a program name with arguments. --lt_save_CC="$CC" --lt_save_GCC=$GCC --GCC=yes --CC=${GCJ-"gcj"} --compiler=$CC --_LT_TAGVAR(compiler, $1)=$CC --_LT_TAGVAR(LD, $1)="$LD" --_LT_CC_BASENAME([$compiler]) -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; - --# GCJ did not exist at the time GCC didn't implicitly link libc in. --_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ 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). -+ m4_if([$1], [GCJ], [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - --_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+ hpux9* | hpux10* | hpux11*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ ;; - --if test -n "$compiler"; then -- _LT_COMPILER_NO_RTTI($1) -- _LT_COMPILER_PIC($1) -- _LT_COMPILER_C_O($1) -- _LT_COMPILER_FILE_LOCKS($1) -- _LT_LINKER_SHLIBS($1) -- _LT_LINKER_HARDCODE_LIBPATH($1) -+ irix5* | irix6* | nonstopux*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC (with -KPIC) is the default. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; - -- _LT_CONFIG($1) --fi -+ newsos6) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --AC_LANG_RESTORE -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ ccc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # 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 -+ ;; - --GCC=$lt_save_GCC --CC="$lt_save_CC" --])# _LT_LANG_GCJ_CONFIG -+ osf3* | osf4* | osf5*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All OSF/1 code is PIC. -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; - -+ rdos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; - --# _LT_LANG_RC_CONFIG([TAG]) --# ------------------------- --# Ensure that the configuration variables for the Windows resource compiler --# are suitably defined. These variables are subsequently used by _LT_CONFIG --# to write the compiler configuration to `libtool'. --m4_defun([_LT_LANG_RC_CONFIG], --[AC_REQUIRE([LT_PROG_RC])dnl --AC_LANG_SAVE -+ solaris*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -+ esac -+ ;; - --# Source file extension for RC test sources. --ac_ext=rc -+ sunos4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# Object file extension for compiled RC test sources. --objext=o --_LT_TAGVAR(objext, $1)=$objext -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# Code to be used in simple compile tests --lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' +-_LT_AC_TAGVAR(objext, $1)=$objext + sysv4*MP*) + if test -d /usr/nec ;then -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; --# Code to be used in simple link tests --lt_simple_link_test_code="$lt_simple_compile_test_code" +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="\ +- subroutine t +- return +- end +-" + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; + +-# Code to be used in simple link tests +-lt_simple_link_test_code="\ +- program t +- end +-" ++ unicos*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; -# ltmain only uses $CC for tagged configurations so make sure $CC is set. --_LT_TAG_COMPILER -+ unicos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +-_LT_AC_SYS_COMPILER ++ uts4*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE -+ uts4*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# Allow CC to be a program name with arguments. --lt_save_CC="$CC" --lt_save_GCC=$GCC --GCC= --CC=${RC-"windres"} --compiler=$CC --_LT_TAGVAR(compiler, $1)=$CC --_LT_CC_BASENAME([$compiler]) --_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + *) -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) - --if test -n "$compiler"; then -- : -- _LT_CONFIG($1) -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then -+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), -+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], -+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in -+ "" | " "*) ;; -+ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; -+ esac], -+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) - fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac ++AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) --GCC=$lt_save_GCC --AC_LANG_RESTORE --CC="$lt_save_CC" --])# _LT_LANG_RC_CONFIG +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${F77-"f77"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then ++ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], ++ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], ++ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in ++ "" | " "*) ;; ++ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++ esac], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++fi ++_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], ++ [Additional compiler flags for building library objects]) + +-AC_MSG_CHECKING([if libtool supports shared libraries]) +-AC_MSG_RESULT([$can_build_shared]) +# +# Check to make sure the static flag actually works. +# -+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" -+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), ++wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" ++_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], -+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -+]) ++ [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) ++_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], ++ [Compiler flag to prevent dynamic linking]) ++])# _LT_COMPILER_PIC +-AC_MSG_CHECKING([whether to build shared libraries]) +-test "$can_build_shared" = "no" && enable_shared=no --# LT_PROG_GCJ --# ----------- --AC_DEFUN([LT_PROG_GCJ], --[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], -- [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], -- [AC_CHECK_TOOL(GCJ, gcj,) -- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -- AC_SUBST(GCJFLAGS)])])[]dnl --]) -+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -+# ------------------------------------ +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case $host_os in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi ++# _LT_LINKER_SHLIBS([TAGNAME]) ++# ---------------------------- +# See if the linker supports building shared libraries. -+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl ++m4_defun([_LT_LINKER_SHLIBS], ++[AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_TAG_COMPILER])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' ++m4_if([$1], [CXX], [ ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) -+ _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_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; +-aix[[4-9]]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi ++ cygwin* | mingw* | cegcc*) ++ _LT_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' + ;; +-esac +-AC_MSG_RESULT([$enable_shared]) + linux* | k*bsd*-gnu) -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no ++ _LT_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' ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -+],[ ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++], [ + runpath_var= -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)= -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)= -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= -+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no -+ _LT_AC_TAGVAR(module_cmds, $1)= -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(allow_undefined_flag, $1)= ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)= ++ _LT_TAGVAR(archive_expsym_cmds, $1)= ++ _LT_TAGVAR(compiler_needs_object, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(hardcode_automatic, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= ++ _LT_TAGVAR(hardcode_minus_L, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_TAGVAR(inherit_rpath, $1)=no ++ _LT_TAGVAR(link_all_deplibs, $1)=unknown ++ _LT_TAGVAR(module_cmds, $1)= ++ _LT_TAGVAR(module_expsym_cmds, $1)= ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)= ++ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++ _LT_TAGVAR(thread_safe_flag_spec, $1)= ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list -+ _LT_AC_TAGVAR(include_expsyms, $1)= ++ _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. -+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot @@ -13840,10 +7240,23 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ _LT_CC_BASENAME([$compiler]) + +-AC_MSG_CHECKING([whether to build static libraries]) +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-AC_MSG_RESULT([$enable_static]) +- +-_LT_AC_TAGVAR(GCC, $1)="$G77" +-_LT_AC_TAGVAR(LD, $1)="$LD" +- +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + case $host_os in -+ cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. @@ -13860,29 +7273,29 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + ;; + esac --# Old name: --AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([LT_AC_PROG_GCJ], []) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes +-AC_LIBTOOL_CONFIG($1) ++ _LT_TAGVAR(ld_shlibs, $1)=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' +-AC_LANG_POP +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_F77_CONFIG + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= ++ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in ++ case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -13890,96 +7303,83 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + *) supports_anon_versioning=yes ;; + esac --# LT_PROG_RC --# ---------- --AC_DEFUN([LT_PROG_RC], --[AC_CHECK_TOOL(RC, windres,) --]) + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <<EOF 1>&2 ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 --# Old name: --AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([LT_AC_PROG_RC], []) +-# AC_LIBTOOL_LANG_GCJ_CONFIG +-# -------------------------- +-# Ensure that the configuration vars for the C compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) +-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], +-[AC_LANG_SAVE +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. -+EOF +-# Source file extension for Java test sources. +-ac_ext=java ++_LT_EOF + fi + ;; --# _LT_DECL_EGREP --# -------------- --# If we don't have a new enough Autoconf to choose the best grep --# available, choose the one first in the user's PATH. --m4_defun([_LT_DECL_EGREP], --[AC_REQUIRE([AC_PROG_EGREP])dnl --AC_REQUIRE([AC_PROG_FGREP])dnl --test -z "$GREP" && GREP=grep --_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) --_LT_DECL([], [EGREP], [1], [An ERE matcher]) --_LT_DECL([], [FGREP], [1], [A literal string matcher]) --dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too --AC_SUBST([GREP]) --]) +-# Object file extension for compiled Java test sources. +-objext=o +-_LT_AC_TAGVAR(objext, $1)=$objext + amigaos*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ -+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='' ++ ;; ++ m68k) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac + ;; +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}" + beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc + # support --undefined. This deserves some investigation. FIXME -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; --# _LT_DECL_OBJDUMP --# -------------- --# If we don't have a new enough Autoconf to choose the best objdump --# available, choose the one first in the user's PATH. --m4_defun([_LT_DECL_OBJDUMP], --[AC_CHECK_TOOL(OBJDUMP, objdump, false) --test -z "$OBJDUMP" && OBJDUMP=objdump --_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) --AC_SUBST([OBJDUMP]) --]) -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +-# Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _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/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_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' -+ 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' +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; @@ -13987,72 +7387,5895 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no ++ _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; --# _LT_DECL_SED --# ------------ --# Check for a fully-functional sed program, that truncates --# as few characters as possible. Prefer GNU sed if found. --m4_defun([_LT_DECL_SED], --[AC_PROG_SED --test -z "$SED" && SED=sed --Xsed="$SED -e 1s/^X//" --_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) --_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], -- [Sed that helps us avoid accidentally triggering echo(1) options like -n]) --])# _LT_DECL_SED +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE + 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' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _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' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_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' + ;; --m4_ifndef([AC_PROG_SED], [ --# 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 # --# macro and use it instead. # -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${GCJ-"gcj"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) ++ gnu* | linux* | tpf* | k*bsd*-gnu) ++ tmp_diet=no ++ if test "$host_os" = linux-dietlibc; then ++ case $cc_basename in ++ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) ++ esac ++ fi ++ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ ++ && test "$tmp_diet" = no ++ then + tmp_addflag= ++ tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ pgcc*) # Portland Group C compiler ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; ++ lf95*) # Lahey Fortran 8.1 ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ tmp_sharedflag='--shared' ;; ++ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++ tmp_sharedflag='-qmkshrobj' ++ tmp_addflag= ;; + esac + 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' ++ _LT_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' ++ _LT_TAGVAR(compiler_needs_object, $1)=yes + 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' ++ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' --m4_defun([AC_PROG_SED], +-# GCJ did not exist at the time GCC didn't implicitly link libc in. +-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_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 '"$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(old_archive_cmds, $1)=$old_archive_cmds ++ case $cc_basename in ++ xlf*) ++ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_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~ ++ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ esac ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + +-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +-AC_LIBTOOL_PROG_COMPILER_PIC($1) +-AC_LIBTOOL_PROG_CC_C_O($1) +-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +-AC_LIBTOOL_PROG_LD_SHLIBS($1) +-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; + +-AC_LIBTOOL_CONFIG($1) ++ solaris*) ++ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 + +-AC_LANG_RESTORE +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_GCJ_CONFIG ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. + ++_LT_EOF ++ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + +-# AC_LIBTOOL_LANG_RC_CONFIG +-# ------------------------- +-# Ensure that the configuration vars for the Windows resource compiler are +-# suitably defined. Those variables are subsequently used by +-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) +-AC_DEFUN([_LT_AC_LANG_RC_CONFIG], +-[AC_LANG_SAVE +- +-# Source file extension for RC test sources. +-ac_ext=rc +- +-# Object file extension for compiled RC test sources. +-objext=o +-_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 }' +- +-# Code to be used in simple link tests +-lt_simple_link_test_code="$lt_simple_compile_test_code" +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +-_LT_AC_SYS_COMPILER +- +-# save warnings/boilerplate of simple test code +-_LT_COMPILER_BOILERPLATE +-_LT_LINKER_BOILERPLATE +- +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${RC-"windres"} +-compiler=$CC +-_LT_AC_TAGVAR(compiler, $1)=$CC +-_LT_CC_BASENAME([$compiler]) +-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes +- +-AC_LIBTOOL_CONFIG($1) ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 + +-AC_LANG_RESTORE +-CC="$lt_save_CC" +-])# AC_LIBTOOL_LANG_RC_CONFIG ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. + ++_LT_EOF ++ ;; ++ *) ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + +-# AC_LIBTOOL_CONFIG([TAGNAME]) +-# ---------------------------- +-# If TAGNAME is not passed, then create an initial libtool script +-# with a default configuration from the untagged config vars. Otherwise +-# add code to config.status for appending the configuration named by +-# TAGNAME from the matching tagged config vars. +-AC_DEFUN([AC_LIBTOOL_CONFIG], +-[# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # 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 +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- _LT_AC_TAGVAR(compiler, $1) \ +- _LT_AC_TAGVAR(CC, $1) \ +- _LT_AC_TAGVAR(LD, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ +- _LT_AC_TAGVAR(old_archive_cmds, $1) \ +- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ +- _LT_AC_TAGVAR(predep_objects, $1) \ +- _LT_AC_TAGVAR(postdep_objects, $1) \ +- _LT_AC_TAGVAR(predeps, $1) \ +- _LT_AC_TAGVAR(postdeps, $1) \ +- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ +- _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ +- _LT_AC_TAGVAR(archive_cmds, $1) \ +- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ +- _LT_AC_TAGVAR(postinstall_cmds, $1) \ +- _LT_AC_TAGVAR(postuninstall_cmds, $1) \ +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ +- _LT_AC_TAGVAR(allow_undefined_flag, $1) \ +- _LT_AC_TAGVAR(no_undefined_flag, $1) \ +- _LT_AC_TAGVAR(export_symbols_cmds, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ +- _LT_AC_TAGVAR(hardcode_automatic, $1) \ +- _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 +- +- case $var in +- _LT_AC_TAGVAR(old_archive_cmds, $1) | \ +- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ +- _LT_AC_TAGVAR(archive_cmds, $1) | \ +- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ +- _LT_AC_TAGVAR(module_cmds, $1) | \ +- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ +- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" ++ sunos4*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; ++ + *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi + ;; + esac +- done +- +- case $lt_echo in +- *'\[$]0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` +- ;; +- esac + +-ifelse([$1], [], +- [cfgfile="${ofile}T" +- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 +- $rm -f "$cfgfile" +- AC_MSG_NOTICE([creating $ofile])], +- [cfgfile="$ofile"]) +- +- cat <<__EOF__ >> "$cfgfile" +-ifelse([$1], [], +-[#! $SHELL ++ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then ++ runpath_var= ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported ++ fi ++ ;; + +-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is part of GNU Libtool: +-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 +-# +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program 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 +-# General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-# +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. ++ aix[[4-9]]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no + +-# A sed program that does not truncate output. +-SED=$lt_SED ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac + +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e 1s/^X//" ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi + +-# 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 ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + +-# The names of the tagged configurations supported by this script. +-available_tags= ++ _LT_TAGVAR(archive_cmds, $1)='' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + +-# ### BEGIN LIBTOOL CONFIG], +-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi + +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; + +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='' ++ ;; ++ m68k) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac ++ ;; + +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared ++ bsdi[[45]]*) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++ ;; + +-# Whether or not to build static libraries. +-build_old_libs=$enable_static ++ cygwin* | mingw* | pw32* | cegcc*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) ++ darwin* | rhapsody*) ++ _LT_DARWIN_LINKER_FEATURES($1) ++ ;; + +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) ++ dgux*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install ++ freebsd1*) ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; + +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# An echo program that does not interpret backslashes. +-echo=$lt_echo ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS ++ hpux9*) ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_direct, $1)=yes + +-# A C compiler. +-LTCC=$lt_LTCC ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; + +-# LTCC compiler flags. +-LTCFLAGS=$lt_LTCFLAGS ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ fi ++ ;; + +-# A language-specific compiler. +-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: + +-# Is the compiler the GNU C compiler? +-with_gcc=$_LT_AC_TAGVAR(GCC, $1) ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + +-# An ERE matcher. +-EGREP=$lt_EGREP ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac ++ fi ++ ;; + +-# The linker used to build libraries. +-LD=$lt_[]_LT_AC_TAGVAR(LD, $1) ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ # Try to use the -exported_symbol ld option, if it does not ++ # work, assume that -exports_file does not work either and ++ # implicitly export all symbols. ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE(int foo(void) {}, ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ ) ++ LDFLAGS="$save_LDFLAGS" ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' ++ fi ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(inherit_rpath, $1)=yes ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ;; + +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# A BSD-compatible nm program. +-NM=$lt_NM ++ newsos6) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# A symbol stripping program +-STRIP=$lt_STRIP ++ *nto* | *qnx*) ++ ;; + +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ else ++ case $host_os in ++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" ++ os2*) ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ ;; + +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" ++ osf3*) ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; + +-# Used on cygwin: assembler. +-AS="$AS" ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ else ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ ++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir ++ # Both c and cxx compiler support -rpath directly ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ fi ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; + +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds ++ solaris*) ++ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ else ++ case `$CC -V 2>&1` in ++ *"Compilers 5.0"*) ++ wlarc='' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++ ;; ++ *) ++ wlarc='${wl}' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ ;; ++ esac ++ fi ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # 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?) ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ fi ++ ;; ++ esac ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ;; + +-# How to pass a linker flag through the compiler. +-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# Object file suffix (normally "o"). +-objext="$ac_objext" ++ sysv4) ++ case $host_vendor in ++ sni) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ ;; ++ motorola) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# Old archive suffix (normally "a"). +-libext="$libext" ++ sysv4.3*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++ ;; + +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ fi ++ ;; + +-# Executable file suffix (normally ""). +-exeext="$exeext" ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +-pic_mode=$pic_mode ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; + +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' + +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; + +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks ++ uts4*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; + +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix ++ *) ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac + +-# Do we need a version for libraries? +-need_version=$need_version ++ if test x$host_vendor = xsni; then ++ case $host in ++ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' ++ ;; ++ esac ++ fi ++ fi ++]) ++AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen ++_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld + +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self ++_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl ++_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl ++_LT_DECL([], [extract_expsyms_cmds], [2], ++ [The commands to extract the exported symbol list from a shared archive]) + +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static ++# ++# Do we need to explicitly link libc? ++# ++case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in ++x|xyes) ++ # Assume -lc should be added ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $_LT_TAGVAR(archive_cmds, $1) in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++ $RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) ++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) ++ _LT_TAGVAR(allow_undefined_flag, $1)= ++ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) ++ then ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ else ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++ fi ++ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $RM conftest* ++ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) ++ ;; ++ esac ++ fi ++ ;; ++esac + +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) ++_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], ++ [Whether or not to add -lc for building shared libraries]) ++_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], ++ [enable_shared_with_static_runtimes], [0], ++ [Whether or not to disallow shared libs when runtime libs are static]) ++_LT_TAGDECL([], [export_dynamic_flag_spec], [1], ++ [Compiler flag to allow reflexive dlopens]) ++_LT_TAGDECL([], [whole_archive_flag_spec], [1], ++ [Compiler flag to generate shared objects directly from archives]) ++_LT_TAGDECL([], [compiler_needs_object], [1], ++ [Whether the compiler copes with passing no objects directly]) ++_LT_TAGDECL([], [old_archive_from_new_cmds], [2], ++ [Create an old-style archive from a shared archive]) ++_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], ++ [Create a temporary old-style archive to link instead of a shared archive]) ++_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) ++_LT_TAGDECL([], [archive_expsym_cmds], [2]) ++_LT_TAGDECL([], [module_cmds], [2], ++ [Commands used to build a loadable module if different from building ++ a shared archive.]) ++_LT_TAGDECL([], [module_expsym_cmds], [2]) ++_LT_TAGDECL([], [with_gnu_ld], [1], ++ [Whether we are building with GNU ld or not]) ++_LT_TAGDECL([], [allow_undefined_flag], [1], ++ [Flag that allows shared libraries with undefined symbols to be built]) ++_LT_TAGDECL([], [no_undefined_flag], [1], ++ [Flag that enforces no undefined symbols]) ++_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], ++ [Flag to hardcode $libdir into a binary during linking. ++ This must work even if $libdir does not exist]) ++_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], ++ [[If ld is used when linking, flag to hardcode $libdir into a binary ++ during linking. This must work even if $libdir does not exist]]) ++_LT_TAGDECL([], [hardcode_libdir_separator], [1], ++ [Whether we need a single "-rpath" flag with a separated argument]) ++_LT_TAGDECL([], [hardcode_direct], [0], ++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++ DIR into the resulting binary]) ++_LT_TAGDECL([], [hardcode_direct_absolute], [0], ++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++ DIR into the resulting binary and the resulting library dependency is ++ "absolute", i.e impossible to change by setting ${shlibpath_var} if the ++ library is relocated]) ++_LT_TAGDECL([], [hardcode_minus_L], [0], ++ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++ into the resulting binary]) ++_LT_TAGDECL([], [hardcode_shlibpath_var], [0], ++ [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++ into the resulting binary]) ++_LT_TAGDECL([], [hardcode_automatic], [0], ++ [Set to "yes" if building a shared library automatically hardcodes DIR ++ into the library and all subsequent libraries and executables linked ++ against it]) ++_LT_TAGDECL([], [inherit_rpath], [0], ++ [Set to yes if linker adds runtime paths of dependent libraries ++ to runtime path list]) ++_LT_TAGDECL([], [link_all_deplibs], [0], ++ [Whether libtool must link a program against all its dependency libraries]) ++_LT_TAGDECL([], [fix_srcfile_path], [1], ++ [Fix the shell variable $srcfile for the compiler]) ++_LT_TAGDECL([], [always_export_symbols], [0], ++ [Set to "yes" if exported symbols are required]) ++_LT_TAGDECL([], [export_symbols_cmds], [2], ++ [The commands to list exported symbols]) ++_LT_TAGDECL([], [exclude_expsyms], [1], ++ [Symbols that should not be listed in the preloaded symbols]) ++_LT_TAGDECL([], [include_expsyms], [1], ++ [Symbols that must always be exported]) ++_LT_TAGDECL([], [prelink_cmds], [2], ++ [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [file_list_spec], [1], ++ [Specify filename containing input files]) ++dnl FIXME: Not yet implemented ++dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], ++dnl [Compiler flag to generate thread safe objects]) ++])# _LT_LINKER_SHLIBS + +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) + +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) ++# _LT_LANG_C_CONFIG([TAG]) ++# ------------------------ ++# Ensure that the configuration variables for a C compiler are suitably ++# defined. These variables are subsequently used by _LT_CONFIG to write ++# the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_C_CONFIG], ++[m4_require([_LT_DECL_EGREP])dnl ++lt_save_CC="$CC" ++AC_LANG_PUSH(C) + +-# Library versioning type. +-version_type=$version_type ++# Source file extension for C test sources. ++ac_ext=c + +-# Format of library name prefix. +-libname_spec=$lt_libname_spec ++# Object file extension for compiled C test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext + +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;" + +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(){return(0);}' + +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds ++_LT_TAG_COMPILER ++# Save the default compiler, since it gets overwritten when the other ++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. ++compiler_DEFAULT=$CC + +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE + +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) ++if test -n "$compiler"; then ++ _LT_COMPILER_NO_RTTI($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ LT_SYS_DLOPEN_SELF ++ _LT_CMD_STRIPLIB ++ ++ # Report which library types will actually be built ++ AC_MSG_CHECKING([if libtool supports shared libraries]) ++ AC_MSG_RESULT([$can_build_shared]) + +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) +-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds ++ AC_MSG_CHECKING([whether to build shared libraries]) ++ test "$can_build_shared" = "no" && enable_shared=no + +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) +-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. ++ case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; + +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib ++ aix[[4-9]]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ AC_MSG_RESULT([$enable_shared]) + +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) ++ AC_MSG_CHECKING([whether to build static libraries]) ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ AC_MSG_RESULT([$enable_static]) + +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) ++ _LT_CONFIG($1) ++fi ++AC_LANG_POP ++CC="$lt_save_CC" ++])# _LT_LANG_C_CONFIG + +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) + +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) ++# _LT_PROG_CXX ++# ------------ ++# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ ++# compiler, we have our own version here. ++m4_defun([_LT_PROG_CXX], ++[ ++pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) ++AC_PROG_CXX ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_PROG_CXXCPP ++else ++ _lt_caught_CXX_error=yes ++fi ++popdef([AC_MSG_ERROR]) ++])# _LT_PROG_CXX + +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([_LT_PROG_CXX], []) + +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) + +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method ++# _LT_LANG_CXX_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for a C++ compiler are suitably ++# defined. These variables are subsequently used by _LT_CONFIG to write ++# the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_CXX_CONFIG], ++[AC_REQUIRE([_LT_PROG_CXX])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_EGREP])dnl ++ ++AC_LANG_PUSH(C++) ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_TAGVAR(allow_undefined_flag, $1)= ++_LT_TAGVAR(always_export_symbols, $1)=no ++_LT_TAGVAR(archive_expsym_cmds, $1)= ++_LT_TAGVAR(compiler_needs_object, $1)=no ++_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_TAGVAR(hardcode_direct, $1)=no ++_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_TAGVAR(hardcode_minus_L, $1)=no ++_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++_LT_TAGVAR(hardcode_automatic, $1)=no ++_LT_TAGVAR(inherit_rpath, $1)=no ++_LT_TAGVAR(module_cmds, $1)= ++_LT_TAGVAR(module_expsym_cmds, $1)= ++_LT_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(no_undefined_flag, $1)= ++_LT_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd ++# Source file extension for C++ test sources. ++ac_ext=cpp + +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) ++# Object file extension for compiled C++ test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext + +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) ++# No sense in running all these tests if we already determined that ++# the CXX compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_caught_CXX_error" != yes; then ++ # Code to be used in simple compile tests ++ 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); }' ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC=$CC ++ lt_save_LD=$LD ++ lt_save_GCC=$GCC ++ GCC=$GXX ++ lt_save_with_gnu_ld=$with_gnu_ld ++ lt_save_path_LD=$lt_cv_path_LD ++ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++ else ++ $as_unset lt_cv_prog_gnu_ld ++ fi ++ if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++ else ++ $as_unset lt_cv_path_LD ++ fi ++ test -z "${LDCXX+set}" || LD=$LDCXX ++ CC=${CXX-"c++"} ++ compiler=$CC ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_CC_BASENAME([$compiler]) + +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds ++ if test -n "$compiler"; then ++ # We don't want -fno-exception when compiling C++ code, so set the ++ # no_builtin_flag separately ++ if test "$GXX" = yes; then ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ else ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++ fi + +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval ++ if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration + +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ LT_PATH_LD + +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test "$with_gnu_ld" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' ++ ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | ++ $GREP 'no-whole-archive' > /dev/null; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ with_gnu_ld=no ++ wlarc= + +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ fi + +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var ++ else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++ fi + +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ # PORTME: fill in a description of your system's C++ link characteristics ++ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ case $host_os in ++ aix3*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aix[[4-9]]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ aix_use_runtimelinking=no + +-# How to hardcode a shared library path into an executable. +-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac + +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi + +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ _LT_TAGVAR(archive_cmds, $1)='' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' ++ ++ if test "$GXX" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi + +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to ++ # export. ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty ++ # executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared ++ # libraries. ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; + +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) ++ beos*) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; + +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ darwin* | rhapsody*) ++ _LT_DARWIN_LINKER_FEATURES($1) ++ ;; + +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; + +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) ++ freebsd[[12]]*) ++ # C++ shared libraries reported to be fairly broken before ++ # switch to ELF ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; + +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ freebsd-elf*) ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ ;; + +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ ;; + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path ++ gnu*) ++ ;; + +-# Set to yes if exported symbols are required. +-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) ++ hpux9*) ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ ;; ++ *) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ interix[[3-9]]*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_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' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' ++ fi ++ fi ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ esac ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(inherit_rpath, $1)=yes ++ ;; + +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc* | ecpc* ) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ case `$CC -V` in ++ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) ++ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ ++ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $RANLIB $oldlib' ++ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ;; ++ *) # Version 6 will use weak symbols ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ;; ++ esac + +-# Symbols that must always be exported. +-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + +-ifelse([$1],[], +-[# ### END LIBTOOL CONFIG], +-[# ### END LIBTOOL TAG CONFIG: $tagname]) ++ runpath_var=LD_RUN_PATH ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: + +-__EOF__ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' ++ ;; ++ xl*) ++ # IBM XL 8.0 on PPC, with GNU ld ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_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 -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_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' ++ _LT_TAGVAR(compiler_needs_object, $1)=yes ++ ++ # 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; ++ esac ++ ;; + +-ifelse([$1],[], [ +- case $host_os in +- aix3*) +- cat <<\EOF >> "$cfgfile" ++ lynxos*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; + +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-EOF +- ;; +- esac ++ m88k*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; + +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; + +- mv -f "$cfgfile" "$ofile" || \ +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +-]) +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +-])# AC_LIBTOOL_CONFIG ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++ wlarc= ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; + ++ *nto* | *qnx*) ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ ;; + +-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) +-# ------------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], +-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_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_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_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd=echo ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; + +-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ case $host in ++ osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; ++ *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; ++ esac ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ case $host in ++ osf3*) ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ ;; ++ *) ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $RM $lib.exp' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ ;; ++ esac + +-if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: + +- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], +- lt_cv_prog_compiler_rtti_exceptions, +- [-fno-rtti -fno-exceptions], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +-fi +-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ case $host in ++ osf3*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ;; ++ esac ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ ++ else ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; + ++ psos*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; + +-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +-# --------------------------------- +-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. +-AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +-[ +-# These are sane defaults that work on at least a few old systems. +-# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; + +-# Character class describing NM global symbol codes. +-symcode='[[BCDEGRST]]' ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes ++ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ ;; ++ esac ++ _LT_TAGVAR(link_all_deplibs, $1)=yes + +-# Regexp to match symbols that can be accessed directly from C. +-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' ++ output_verbose_link_cmd='echo' + +-# Transform an extracted symbol line into a proper C declaration +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" ++ # 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + +-# Transform an extracted symbol line into symbol name and symbol address +-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'" ++ # The C++ compiler must be used to create the archive. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++ if $CC --version | $GREP -v '^2\.7' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ fi ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ ;; + +-# Define system-specific variables. +-case $host_os in +-aix*) +- symcode='[[BCDT]]' +- ;; +-cygwin* | mingw* | pw32*) +- symcode='[[ABCDGISTW]]' +- ;; +-hpux*) # Its linker distinguishes data from code symbols +- if test "$host_cpu" = ia64; then +- symcode='[[ABCDEGRST]]' +- fi +- 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* | 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'" +- 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'" +- fi +- ;; +-irix* | nonstopux*) +- symcode='[[BCDEGRST]]' +- ;; +-osf*) +- symcode='[[BCDEGQRST]]' +- ;; +-solaris*) +- symcode='[[BDRT]]' +- ;; +-sco3.2v5*) +- symcode='[[DT]]' +- ;; +-sysv4.2uw2*) +- symcode='[[DT]]' +- ;; +-sysv5* | sco5v6* | unixware* | OpenUNIX*) +- symcode='[[ABDT]]' +- ;; +-sysv4) +- symcode='[[DFNSTU]]' +- ;; +-esac ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' + +-# Handle CRLF in mingw tool chain +-opt_cr= +-case $build_os in +-mingw*) +- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp +- ;; +-esac ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; + +-# If we're using GNU nm, then use its standard symbol codes. +-case `$NM -V 2>&1` in +-*GNU* | *'with BFD'*) +- symcode='[[ABCDGIRSTW]]' ;; +-esac ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' + +-# Try without a prefix undercore, then with it. +-for ac_symprfx in "" "_"; do ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; + +- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. +- symxfrm="\\1 $ac_symprfx\\2 \\2" ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; + +- # Write the raw and C identifiers. +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; + +- # Check to see that the pipe works correctly. +- pipe_works=no ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac + +- rm -f conftest* +- cat > conftest.$ac_ext <<EOF +-#ifdef __cplusplus +-extern "C" { +-#endif +-char nm_test_var; +-void nm_test_func(){} +-#ifdef __cplusplus +-} +-#endif +-int main(){nm_test_var='a';nm_test_func();return(0);} +-EOF ++ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +- if AC_TRY_EVAL(ac_compile); then +- # Now try to grab the symbols. +- nlist=conftest.nm +- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then +- # Try sorting and uniquifying the output. +- if sort "$nlist" | uniq > "$nlist"T; then +- mv -f "$nlist"T "$nlist" +- else +- rm -f "$nlist"T +- fi ++ _LT_TAGVAR(GCC, $1)="$GXX" ++ _LT_TAGVAR(LD, $1)="$LD" + +- # Make sure that we snagged all the symbols we need. +- if grep ' nm_test_var$' "$nlist" >/dev/null; then +- if grep ' nm_test_func$' "$nlist" >/dev/null; then +- cat <<EOF > conftest.$ac_ext +-#ifdef __cplusplus +-extern "C" { +-#endif ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ _LT_SYS_HIDDEN_LIBDEPS($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi # test -n "$compiler" ++ ++ CC=$lt_save_CC ++ LDCXX=$LD ++ LD=$lt_save_LD ++ GCC=$lt_save_GCC ++ with_gnu_ld=$lt_save_with_gnu_ld ++ lt_cv_path_LDCXX=$lt_cv_path_LD ++ lt_cv_path_LD=$lt_save_path_LD ++ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++fi # test "$_lt_caught_CXX_error" != yes + +-EOF +- # Now generate the symbol file. +- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' ++AC_LANG_POP ++])# _LT_LANG_CXX_CONFIG + +- cat <<EOF >> conftest.$ac_ext +-#if defined (__STDC__) && __STDC__ +-# define lt_ptr_t void * +-#else +-# define lt_ptr_t char * +-# define const +-#endif + +-/* The mapping between symbol names and symbols. */ +-const struct { +- const char *name; +- lt_ptr_t address; +-} +-lt_preloaded_symbols[[]] = ++# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) ++# --------------------------------- ++# Figure out "hidden" library dependencies from verbose ++# compiler output when linking a shared library. ++# Parse the compiler output and extract the necessary ++# objects, libraries and library flags. ++m4_defun([_LT_SYS_HIDDEN_LIBDEPS], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++# Dependencies to place before and after the object being linked: ++_LT_TAGVAR(predep_objects, $1)= ++_LT_TAGVAR(postdep_objects, $1)= ++_LT_TAGVAR(predeps, $1)= ++_LT_TAGVAR(postdeps, $1)= ++_LT_TAGVAR(compiler_lib_search_path, $1)= ++ ++dnl we can't use the lt_simple_compile_test_code here, ++dnl because it contains code intended for an executable, ++dnl not a library. It's possible we should let each ++dnl tag define a new lt_????_link_test_code variable, ++dnl but it's only used here... ++m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF ++int a; ++void foo (void) { a = 0; } ++_LT_EOF ++], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF ++class Foo + { +-EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext +- cat <<\EOF >> conftest.$ac_ext +- {0, (lt_ptr_t) 0} ++public: ++ Foo (void) { a = 0; } ++private: ++ int a; + }; ++_LT_EOF ++], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF ++ subroutine foo ++ implicit none ++ integer*4 a ++ a=0 ++ return ++ end ++_LT_EOF ++], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF ++ subroutine foo ++ implicit none ++ integer a ++ a=0 ++ return ++ end ++_LT_EOF ++], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF ++public class foo { ++ private int a; ++ public void bar (void) { ++ a = 0; ++ } ++}; ++_LT_EOF ++]) ++dnl Parse the compiler output and extract the necessary ++dnl objects, libraries and library flags. ++if AC_TRY_EVAL(ac_compile); then ++ # Parse the compiler output and extract the necessary ++ # objects, libraries and library flags. + +-#ifdef __cplusplus +-} +-#endif +-EOF +- # Now try linking the two files. +- mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" +- LIBS="conftstm.$ac_objext" +- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" +- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then +- pipe_works=yes +- fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" +- else +- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD +- fi +- else +- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD +- cat conftest.$ac_ext >&5 +- fi +- rm -rf conftest* conftst* ++ # Sentinel used to keep track of whether or not we are before ++ # the conftest object file. ++ pre_test_object_deps_done=no + +- # Do not use the global_symbol_pipe unless it works. +- if test "$pipe_works" = yes; then +- break +- else +- lt_cv_sys_global_symbol_pipe= +- fi +-done +-]) +-if test -z "$lt_cv_sys_global_symbol_pipe"; then +- lt_cv_sys_global_symbol_to_cdecl= +-fi +-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- AC_MSG_RESULT(failed) ++ for p in `eval "$output_verbose_link_cmd"`; do ++ case $p in ++ ++ -L* | -R* | -l*) ++ # Some compilers place space between "-{L,R}" and the path. ++ # Remove the space. ++ if test $p = "-L" || ++ test $p = "-R"; then ++ prev=$p ++ continue ++ else ++ prev= ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ case $p in ++ -L* | -R*) ++ # Internal compiler library paths should come after those ++ # provided the user. The postdeps already come after the ++ # user supplied libs so there is no need to process them. ++ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" ++ else ++ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" ++ fi ++ ;; ++ # The "-l" case would never come before the object being ++ # linked, so don't bother handling this case. ++ esac ++ else ++ if test -z "$_LT_TAGVAR(postdeps, $1)"; then ++ _LT_TAGVAR(postdeps, $1)="${prev}${p}" ++ else ++ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" ++ fi ++ fi ++ ;; ++ ++ *.$objext) ++ # This assumes that the test object file only shows up ++ # once in the compiler output. ++ if test "$p" = "conftest.$objext"; then ++ pre_test_object_deps_done=yes ++ continue ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then ++ _LT_TAGVAR(predep_objects, $1)="$p" ++ else ++ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" ++ fi ++ else ++ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then ++ _LT_TAGVAR(postdep_objects, $1)="$p" ++ else ++ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" ++ fi ++ fi ++ ;; ++ ++ *) ;; # Ignore the rest. ++ ++ esac ++ done ++ ++ # Clean up. ++ rm -f a.out a.exe + else +- AC_MSG_RESULT(ok) ++ echo "libtool.m4: error: problem compiling $1 test program" + fi +-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + ++$RM -f confest.$objext + +-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) +-# --------------------------------------- +-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], +-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= ++# PORTME: override above test on systems where it is broken ++m4_if([$1], [CXX], ++[case $host_os in ++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_TAGVAR(predep_objects,$1)= ++ _LT_TAGVAR(postdep_objects,$1)= ++ _LT_TAGVAR(postdeps,$1)= ++ ;; + +-AC_MSG_CHECKING([for $compiler option to produce PIC]) +- ifelse([$1],[CXX],[ +- # C++ specific cases for pic, static, wl, etc. +- if test "$GXX" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 + +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- fi +- ;; +- amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' +- ;; +- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; +- 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 +- m4_if([$1], [GCJ], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) +- ;; +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' +- ;; +- *djgpp*) +- # DJGPP does not support shared libraries at all +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- ;; +- interix[[3-9]]*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. +- ;; +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +- fi +- ;; +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac ++ # 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 + ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ esac ++ ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_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 +- else ++ ++ # 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. ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++esac ++]) ++ ++case " $_LT_TAGVAR(postdeps, $1) " in ++*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; ++esac ++ _LT_TAGVAR(compiler_lib_search_dirs, $1)= ++if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then ++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++_LT_TAGDECL([], [compiler_lib_search_dirs], [1], ++ [The directories searched by this compiler when creating a shared library]) ++_LT_TAGDECL([], [predep_objects], [1], ++ [Dependencies to place before and after the objects being linked to ++ create a shared library]) ++_LT_TAGDECL([], [postdep_objects], [1]) ++_LT_TAGDECL([], [predeps], [1]) ++_LT_TAGDECL([], [postdeps], [1]) ++_LT_TAGDECL([], [compiler_lib_search_path], [1], ++ [The library search path used internally by the compiler when linking ++ a shared library]) ++])# _LT_SYS_HIDDEN_LIBDEPS ++ ++ ++# _LT_PROG_F77 ++# ------------ ++# Since AC_PROG_F77 is broken, in that it returns the empty string ++# if there is no fortran compiler, we have our own version here. ++m4_defun([_LT_PROG_F77], ++[ ++pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) ++AC_PROG_F77 ++if test -z "$F77" || test "X$F77" = "Xno"; then ++ _lt_disable_F77=yes ++fi ++popdef([AC_MSG_ERROR]) ++])# _LT_PROG_F77 ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([_LT_PROG_F77], []) ++ ++ ++# _LT_LANG_F77_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for a Fortran 77 compiler are ++# suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_F77_CONFIG], ++[AC_REQUIRE([_LT_PROG_F77])dnl ++AC_LANG_PUSH(Fortran 77) ++ ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_TAGVAR(allow_undefined_flag, $1)= ++_LT_TAGVAR(always_export_symbols, $1)=no ++_LT_TAGVAR(archive_expsym_cmds, $1)= ++_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_TAGVAR(hardcode_direct, $1)=no ++_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_TAGVAR(hardcode_minus_L, $1)=no ++_LT_TAGVAR(hardcode_automatic, $1)=no ++_LT_TAGVAR(inherit_rpath, $1)=no ++_LT_TAGVAR(module_cmds, $1)= ++_LT_TAGVAR(module_expsym_cmds, $1)= ++_LT_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(no_undefined_flag, $1)= ++_LT_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ ++# Source file extension for f77 test sources. ++ac_ext=f ++ ++# Object file extension for compiled f77 test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# No sense in running all these tests if we already determined that ++# the F77 compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_disable_F77" != yes; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code="\ ++ program t ++ end ++" ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC="$CC" ++ lt_save_GCC=$GCC ++ CC=${F77-"f77"} ++ compiler=$CC ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_CC_BASENAME([$compiler]) ++ GCC=$G77 ++ if test -n "$compiler"; then ++ AC_MSG_CHECKING([if libtool supports shared libraries]) ++ AC_MSG_RESULT([$can_build_shared]) ++ ++ AC_MSG_CHECKING([whether to build shared libraries]) ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. + case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; + aix[[4-9]]*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no + fi +- ;; +- chorus*) +- case $cc_basename in +- cxch68*) +- # Green Hills C++ Compiler +- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" +- ;; +- esac +- ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- ;; +- esac +- ;; +- dgux*) +- case $cc_basename in +- ec++*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- *) +- ;; +- esac +- ;; +- freebsd* | dragonfly*) +- # FreeBSD uses GNU C++ +- ;; +- hpux9* | hpux10* | hpux11*) +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +- if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- fi +- ;; +- aCC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- ;; +- esac +- ;; +- *) +- ;; +- esac +- ;; +- interix*) +- # This is c89, which is MS Visual C++ (no shared libs) +- # Anyone wants to do a port? +- ;; +- irix5* | irix6* | nonstopux*) +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- # CC pic flag -KPIC is the default. +- ;; +- *) +- ;; +- esac +- ;; +- linux* | k*bsd*-gnu) +- case $cc_basename in +- KCC*) +- # KAI C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- icpc* | ecpc*) +- # Intel C++ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +- ;; +- pgCC* | pgcpp*) +- # Portland Group C++ compiler. +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- cxx*) +- # Compaq C++ +- # Make sure the PIC flag is empty. It appears that all Alpha +- # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _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 +- ;; +- lynxos*) +- ;; +- m88k*) +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' +- ;; +- *) +- ;; +- esac +- ;; +- netbsd*) +- ;; +- osf3* | osf4* | osf5*) +- case $cc_basename in +- KCC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- cxx*) +- # Digital/Compaq C++ +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # Make sure the PIC flag is empty. It appears that all Alpha +- # Linux and Compaq Tru64 Unix objects are PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; +- *) +- ;; +- esac +- ;; +- psos*) +- ;; +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- _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 ' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- ;; +- *) +- ;; +- esac +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- lcc*) +- # Lucid +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- ;; +- *) +- ;; +- esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- ;; +- *) +- ;; +- esac +- ;; +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- case $cc_basename in +- CC*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- esac +- ;; +- vxworks*) +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; ++ ;; + esac +- fi +-], ++ AC_MSG_RESULT([$enable_shared]) ++ ++ AC_MSG_CHECKING([whether to build static libraries]) ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ AC_MSG_RESULT([$enable_static]) ++ ++ _LT_TAGVAR(GCC, $1)="$G77" ++ _LT_TAGVAR(LD, $1)="$LD" ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi # test -n "$compiler" ++ ++ GCC=$lt_save_GCC ++ CC="$lt_save_CC" ++fi # test "$_lt_disable_F77" != yes ++ ++AC_LANG_POP ++])# _LT_LANG_F77_CONFIG ++ ++ ++# _LT_PROG_FC ++# ----------- ++# Since AC_PROG_FC is broken, in that it returns the empty string ++# if there is no fortran compiler, we have our own version here. ++m4_defun([_LT_PROG_FC], + [ +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ++pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) ++AC_PROG_FC ++if test -z "$FC" || test "X$FC" = "Xno"; then ++ _lt_disable_FC=yes ++fi ++popdef([AC_MSG_ERROR]) ++])# _LT_PROG_FC ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([_LT_PROG_FC], []) ++ ++ ++# _LT_LANG_FC_CONFIG([TAG]) ++# ------------------------- ++# Ensure that the configuration variables for a Fortran compiler are ++# suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_FC_CONFIG], ++[AC_REQUIRE([_LT_PROG_FC])dnl ++AC_LANG_PUSH(Fortran) ++ ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_TAGVAR(allow_undefined_flag, $1)= ++_LT_TAGVAR(always_export_symbols, $1)=no ++_LT_TAGVAR(archive_expsym_cmds, $1)= ++_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_TAGVAR(hardcode_direct, $1)=no ++_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_TAGVAR(hardcode_minus_L, $1)=no ++_LT_TAGVAR(hardcode_automatic, $1)=no ++_LT_TAGVAR(inherit_rpath, $1)=no ++_LT_TAGVAR(module_cmds, $1)= ++_LT_TAGVAR(module_expsym_cmds, $1)= ++_LT_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(no_undefined_flag, $1)= ++_LT_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ ++# Source file extension for fc test sources. ++ac_ext=${ac_fc_srcext-f} ++ ++# Object file extension for compiled fc test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# No sense in running all these tests if we already determined that ++# the FC compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_disable_FC" != yes; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code="\ ++ program t ++ end ++" ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC="$CC" ++ lt_save_GCC=$GCC ++ CC=${FC-"f95"} ++ compiler=$CC ++ GCC=$ac_cv_fc_compiler_gnu ++ ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_CC_BASENAME([$compiler]) ++ ++ if test -n "$compiler"; then ++ AC_MSG_CHECKING([if libtool supports shared libraries]) ++ AC_MSG_RESULT([$can_build_shared]) ++ ++ AC_MSG_CHECKING([whether to build shared libraries]) ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. ++ case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ aix[[4-9]]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ AC_MSG_RESULT([$enable_shared]) + +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- fi +- ;; ++ AC_MSG_CHECKING([whether to build static libraries]) ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ AC_MSG_RESULT([$enable_static]) ++ ++ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" ++ _LT_TAGVAR(LD, $1)="$LD" ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ _LT_SYS_HIDDEN_LIBDEPS($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi # test -n "$compiler" ++ ++ GCC=$lt_save_GCC ++ CC="$lt_save_CC" ++fi # test "$_lt_disable_FC" != yes + +- amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' +- ;; ++AC_LANG_POP ++])# _LT_LANG_FC_CONFIG + +- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; + +- 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 +- m4_if([$1], [GCJ], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) +- ;; ++# _LT_LANG_GCJ_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for the GNU Java Compiler compiler ++# are suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_GCJ_CONFIG], ++[AC_REQUIRE([LT_PROG_GCJ])dnl ++AC_LANG_SAVE + +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' +- ;; ++# Source file extension for Java test sources. ++ac_ext=java + +- interix[[3-9]]*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. +- ;; ++# Object file extension for compiled Java test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext + +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- enable_shared=no +- ;; ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="class foo {}" + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic +- fi +- ;; ++# Code to be used in simple link tests ++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- ;; ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_TAG_COMPILER + +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' +- ;; +- esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- else +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++lt_save_GCC=$GCC ++GCC=yes ++CC=${GCJ-"gcj"} ++compiler=$CC ++_LT_TAGVAR(compiler, $1)=$CC ++_LT_TAGVAR(LD, $1)="$LD" ++_LT_CC_BASENAME([$compiler]) ++ ++# GCJ did not exist at the time GCC didn't implicitly link libc in. ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++ ++if test -n "$compiler"; then ++ _LT_COMPILER_NO_RTTI($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++fi ++ ++AC_LANG_RESTORE ++ ++GCC=$lt_save_GCC ++CC="$lt_save_CC" ++])# _LT_LANG_GCJ_CONFIG ++ ++ ++# _LT_LANG_RC_CONFIG([TAG]) ++# ------------------------- ++# Ensure that the configuration variables for the Windows resource compiler ++# are suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_RC_CONFIG], ++[AC_REQUIRE([LT_PROG_RC])dnl ++AC_LANG_SAVE ++ ++# Source file extension for RC test sources. ++ac_ext=rc ++ ++# Object file extension for compiled RC test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++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" ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_TAG_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++lt_save_GCC=$GCC ++GCC= ++CC=${RC-"windres"} ++compiler=$CC ++_LT_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) ++_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ ++if test -n "$compiler"; then ++ : ++ _LT_CONFIG($1) ++fi ++ ++GCC=$lt_save_GCC ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# _LT_LANG_RC_CONFIG ++ ++ ++# LT_PROG_GCJ ++# ----------- ++AC_DEFUN([LT_PROG_GCJ], ++[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], ++ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], ++ [AC_CHECK_TOOL(GCJ, gcj,) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS)])])[]dnl ++]) ++ ++# Old name: ++AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([LT_AC_PROG_GCJ], []) ++ ++ ++# LT_PROG_RC ++# ---------- ++AC_DEFUN([LT_PROG_RC], ++[AC_CHECK_TOOL(RC, windres,) ++]) ++ ++# Old name: ++AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([LT_AC_PROG_RC], []) ++ ++ ++# _LT_DECL_EGREP ++# -------------- ++# If we don't have a new enough Autoconf to choose the best grep ++# available, choose the one first in the user's PATH. ++m4_defun([_LT_DECL_EGREP], ++[AC_REQUIRE([AC_PROG_EGREP])dnl ++AC_REQUIRE([AC_PROG_FGREP])dnl ++test -z "$GREP" && GREP=grep ++_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) ++_LT_DECL([], [EGREP], [1], [An ERE matcher]) ++_LT_DECL([], [FGREP], [1], [A literal string matcher]) ++dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too ++AC_SUBST([GREP]) ++]) ++ ++ ++# _LT_DECL_OBJDUMP ++# -------------- ++# If we don't have a new enough Autoconf to choose the best objdump ++# available, choose the one first in the user's PATH. ++m4_defun([_LT_DECL_OBJDUMP], ++[AC_CHECK_TOOL(OBJDUMP, objdump, false) ++test -z "$OBJDUMP" && OBJDUMP=objdump ++_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) ++AC_SUBST([OBJDUMP]) ++]) ++ ++ ++# _LT_DECL_SED ++# ------------ ++# Check for a fully-functional sed program, that truncates ++# as few characters as possible. Prefer GNU sed if found. ++m4_defun([_LT_DECL_SED], ++[AC_PROG_SED ++test -z "$SED" && SED=sed ++Xsed="$SED -e 1s/^X//" ++_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) ++_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], ++ [Sed that helps us avoid accidentally triggering echo(1) options like -n]) ++])# _LT_DECL_SED ++ ++m4_ifndef([AC_PROG_SED], [ ++# 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 # ++# macro and use it instead. # ++ ++m4_defun([AC_PROG_SED], ++[AC_MSG_CHECKING([for a sed that does not truncate output]) ++AC_CACHE_VAL(lt_cv_path_SED, ++[# Loop through the user's path and test for sed and gsed. ++# Then use that list of sed's as ones to test for truncation. ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ 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 ++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi +- ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- ;; +- esac +- ;; ++ 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 ++# along with /bin/sed that truncates output. ++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++ test ! -f $lt_ac_sed && continue ++ cat /dev/null > conftest.in ++ lt_ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++ # Check for GNU sed and select it if it is found. ++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++ lt_cv_path_SED=$lt_ac_sed ++ break ++ fi ++ while true; do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >>conftest.nl ++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++ cmp -s conftest.out conftest.nl || break ++ # 10000 chars as input seems more than enough ++ test $lt_ac_count -gt 10 && break ++ lt_ac_count=`expr $lt_ac_count + 1` ++ if test $lt_ac_count -gt $lt_ac_max; then ++ lt_ac_max=$lt_ac_count ++ lt_cv_path_SED=$lt_ac_sed ++ fi ++ done ++done ++]) ++SED=$lt_cv_path_SED ++AC_SUBST([SED]) ++AC_MSG_RESULT([$SED]) ++])#AC_PROG_SED ++])#m4_ifndef + +- 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). +- m4_if([$1], [GCJ], [], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) +- ;; ++# Old name: ++AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([LT_AC_PROG_SED], []) + +- hpux9* | hpux10* | hpux11*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' +- ;; + +- irix5* | irix6* | nonstopux*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # PIC (with -KPIC) is the default. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; ++# _LT_CHECK_SHELL_FEATURES ++# ------------------------ ++# Find out whether the shell is Bourne or XSI compatible, ++# or has some other useful features. ++m4_defun([_LT_CHECK_SHELL_FEATURES], ++[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) ++# Try some XSI features ++xsi_shell=no ++( _lt_dummy="a/b/c" ++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,, \ ++ && eval 'test $(( 1 + 1 )) -eq 2 \ ++ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ ++ && xsi_shell=yes ++AC_MSG_RESULT([$xsi_shell]) ++_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) ++ ++AC_MSG_CHECKING([whether the shell understands "+="]) ++lt_shell_append=no ++( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ ++ >/dev/null 2>&1 \ ++ && lt_shell_append=yes ++AC_MSG_RESULT([$lt_shell_append]) ++_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) ++ ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ lt_unset=unset ++else ++ lt_unset=false ++fi ++_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl ++ ++# test EBCDIC or ASCII ++case `echo X|tr X '\101'` in ++ A) # ASCII based system ++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++ lt_SP2NL='tr \040 \012' ++ lt_NL2SP='tr \015\012 \040\040' ++ ;; ++ *) # EBCDIC based system ++ lt_SP2NL='tr \100 \n' ++ lt_NL2SP='tr \r\n \100\100' ++ ;; ++esac ++_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl ++_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ++])# _LT_CHECK_SHELL_FEATURES ++ ++ ++# _LT_PROG_XSI_SHELLFNS ++# --------------------- ++# Bourne and XSI compatible variants of some useful shell functions. ++m4_defun([_LT_PROG_XSI_SHELLFNS], ++[case $xsi_shell in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result="${1##*/}" ++} ++ ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}" ++} ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++func_stripname () ++{ ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"} ++} ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=${1%%=*} ++ func_opt_split_arg=${1#*=} ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=${1%.*}.lo ++} + +- newsos6) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=$(( $[*] )) ++} + +- linux* | k*bsd*-gnu) +- case $cc_basename in +- icc* | ecc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' +- ;; +- pgcc* | pgf77* | pgf90* | pgf95*) +- # Portland Group compilers (*not* the Pentium gcc compiler, +- # which looks to be a dead project) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; +- ccc*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # 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 +- ;; ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=${#1} ++} + +- osf3* | osf4* | osf5*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- # All OSF/1 code is PIC. +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; ++_LT_EOF ++ ;; ++ *) # Bourne compatible functions. ++ cat << \_LT_EOF >> "$cfgfile" + +- rdos*) +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' +- ;; ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} + +- solaris*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- case $cc_basename in +- f77* | f90* | f95*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; +- esac +- ;; ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++} + +- sunos4*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++dnl func_dirname_and_basename ++dnl A portable version of this function is already defined in general.m4sh ++dnl so there is no need for it here. ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; ++ esac ++} + +- sysv4 | sysv4.2uw2* | sysv4.3*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# sed scripts: ++my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' ++my_sed_long_arg='1s/^-[[^=]]*=//' + +- sysv4*MP*) +- if test -d /usr/nec ;then +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- fi +- ;; ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` ++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` ++} + +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` ++} + +- unicos*) +- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` ++} + +- uts4*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' +- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' +- ;; ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "$[@]"` ++} + +- *) +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no +- ;; +- esac +- fi +-]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` ++} + +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then +- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], +- _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), +- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], +- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in +- "" | " "*) ;; +- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; +- esac], +- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +-fi +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ++_LT_EOF ++esac ++ ++case $lt_shell_append in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$[1]+=\$[2]" ++} ++_LT_EOF + ;; + *) +- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$[1]=\$$[1]\$[2]" ++} ++ ++_LT_EOF + ;; +-esac ++ esac ++]) + ++# Helper functions for option handling. -*- Autoconf -*- + # +-# Check to make sure the static flag actually works. ++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gary V. Vaughan, 2004 + # +-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], +- _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), +- $lt_tmp_static_flag, +- [], +- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++ ++# serial 6 ltoptions.m4 ++ ++# This is to help aclocal find these macros, as it can't see m4_define. ++AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ++ ++ ++# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) ++# ------------------------------------------ ++m4_define([_LT_MANGLE_OPTION], ++[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) ++ ++ ++# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) ++# --------------------------------------- ++# Set option OPTION-NAME for macro MACRO-NAME, and if there is a ++# matching handler defined, dispatch to it. Other OPTION-NAMEs are ++# saved as a flag. ++m4_define([_LT_SET_OPTION], ++[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl ++m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), ++ _LT_MANGLE_DEFUN([$1], [$2]), ++ [m4_warning([Unknown $1 option `$2'])])[]dnl + ]) + + +-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +-# ------------------------------------ +-# See if the linker supports building shared libraries. +-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +-[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 +- aix[[4-9]]*) +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- fi +- ;; +- pw32*) +- _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 '\''s/.* //'\'' | sort | uniq > $export_symbols' +- ;; +- esac +- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +-],[ +- runpath_var= +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no +- _LT_AC_TAGVAR(archive_cmds, $1)= +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= +- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +- _LT_AC_TAGVAR(hardcode_automatic, $1)=no +- _LT_AC_TAGVAR(module_cmds, $1)= +- _LT_AC_TAGVAR(module_expsym_cmds, $1)= +- _LT_AC_TAGVAR(always_export_symbols, $1)=no +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- # include_expsyms should be a list of space-separated symbols to be *always* +- # included in the symbol list +- _LT_AC_TAGVAR(include_expsyms, $1)= +- # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. +- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] +- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out +- # platforms (ab)use it in PIC code, but their linkers get confused if +- # the symbol is explicitly referenced. Since portable code cannot +- # rely on this symbol name, it's probably fine to never include it in +- # preloaded symbol tables. +- # Exclude shared library initialization/finalization symbols. +-dnl Note also adjust exclude_expsyms for C++ above. +- extract_expsyms_cmds= +- # Just being paranoid about ensuring that cc_basename is set. +- _LT_CC_BASENAME([$compiler]) +- case $host_os in +- cygwin* | mingw* | pw32*) +- # FIXME: the MSVC++ port hasn't been tested in a loooong time +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- with_gnu_ld=no +- fi +- ;; +- interix*) +- # we just hope/assume this is gcc and not c89 (= MSVC++) +- with_gnu_ld=yes +- ;; +- openbsd*) +- with_gnu_ld=no +- ;; +- esac ++# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------------------------ ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++m4_define([_LT_IF_OPTION], ++[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- if test "$with_gnu_ld" = yes; then +- # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' + +- # Set some defaults for GNU ld with shared library support. These +- # are reset later if shared libraries are not supported. Putting them +- # here allows them to be overridden if necessary. +- runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac ++# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) ++# ------------------------------------------------------- ++# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME ++# are set. ++m4_define([_LT_UNLESS_OPTIONS], ++[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), ++ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), ++ [m4_define([$0_found])])])[]dnl ++m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 ++])[]dnl ++]) + +- # See if GNU ld supports shared libraries. +- case $host_os in +- aix[[3-9]]*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <<EOF 1>&2 + +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported +-*** to be unable to reliably create shared libraries on AIX. +-*** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. ++# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) ++# ---------------------------------------- ++# OPTION-LIST is a space-separated list of Libtool options associated ++# with MACRO-NAME. If any OPTION has a matching handler declared with ++# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about ++# the unknown option and exit. ++m4_defun([_LT_SET_OPTIONS], ++[# Set options ++m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), ++ [_LT_SET_OPTION([$1], _LT_Option)]) ++ ++m4_if([$1],[LT_INIT],[ ++ dnl ++ dnl Simply set some default values (i.e off) if boolean options were not ++ dnl specified: ++ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no ++ ]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no ++ ]) ++ dnl ++ dnl If no reference was made to various pairs of opposing options, then ++ dnl we run the default mode handler for the pair. For example, if neither ++ dnl `shared' nor `disable-shared' was passed, we enable building of shared ++ dnl archives by default: ++ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], ++ [_LT_ENABLE_FAST_INSTALL]) ++ ]) ++])# _LT_SET_OPTIONS + +-EOF +- fi +- ;; + +- amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- +- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; + +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) ++# ----------------------------------------- ++m4_define([_LT_MANGLE_DEFUN], ++[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, +- # as there is no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _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/'\'' -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' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) ++# ----------------------------------------------- ++m4_define([LT_OPTION_DEFINE], ++[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl ++])# LT_OPTION_DEFINE + +- 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' +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- _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' +- ;; + +- 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 +- pgcc*) # Portland Group C compiler +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag' +- ;; +- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 +- tmp_addflag=' -i_dynamic' ;; +- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 +- tmp_addflag=' -i_dynamic -nofor_main' ;; +- ifc* | ifort*) # Intel Fortran compiler +- tmp_addflag=' -nofor_main' ;; +- esac +- 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' ++# dlopen ++# ------ ++LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes ++]) ++ ++AU_DEFUN([AC_LIBTOOL_DLOPEN], ++[_LT_SET_OPTION([LT_INIT], [dlopen]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `dlopen' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) ++ ++ ++# win32-dll ++# --------- ++# Declare package support for building win32 dll's. ++LT_OPTION_DEFINE([LT_INIT], [win32-dll], ++[enable_win32_dll=yes ++ ++case $host in ++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) ++ AC_CHECK_TOOL(AS, as, false) ++ AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++ AC_CHECK_TOOL(OBJDUMP, objdump, false) ++ ;; ++esac ++ ++test -z "$AS" && AS=as ++_LT_DECL([], [AS], [0], [Assembler program])dnl ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl ++ ++test -z "$OBJDUMP" && OBJDUMP=objdump ++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl ++])# win32-dll ++ ++AU_DEFUN([AC_LIBTOOL_WIN32_DLL], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++_LT_SET_OPTION([LT_INIT], [win32-dll]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `win32-dll' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + +- 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ ++# _LT_ENABLE_SHARED([DEFAULT]) ++# ---------------------------- ++# implement the --enable-shared flag, and supports the `shared' and ++# `disable-shared' LT_INIT options. ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++m4_define([_LT_ENABLE_SHARED], ++[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl ++AC_ARG_ENABLE([shared], ++ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes + fi +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi ++ done ++ IFS="$lt_save_ifs" + ;; ++ esac], ++ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + +- netbsd*) +- 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= +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- fi +- ;; ++ _LT_DECL([build_libtool_libs], [enable_shared], [0], ++ [Whether or not to build shared libraries]) ++])# _LT_ENABLE_SHARED + +- solaris*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <<EOF 1>&2 ++LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +-*** Warning: The releases 2.8.* of the GNU linker cannot reliably +-*** create shared libraries on Solaris systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.9.1 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. ++# Old names: ++AC_DEFUN([AC_ENABLE_SHARED], ++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ++]) + +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++AC_DEFUN([AC_DISABLE_SHARED], ++[_LT_SET_OPTION([LT_INIT], [disable-shared]) ++]) + +- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) +- case `$LD -v 2>&1` in +- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- cat <<_LT_EOF 1>&2 ++AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +-*** reliably create shared libraries on SCO systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_ENABLE_SHARED], []) ++dnl AC_DEFUN([AM_DISABLE_SHARED], []) + +-_LT_EOF +- ;; +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; +- esac +- ;; + +- sunos4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- wlarc= +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; + ++# _LT_ENABLE_STATIC([DEFAULT]) ++# ---------------------------- ++# implement the --enable-static flag, and support the `static' and ++# `disable-static' LT_INIT options. ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++m4_define([_LT_ENABLE_STATIC], ++[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl ++AC_ARG_ENABLE([static], ++ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; + *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" + ;; +- esac ++ esac], ++ [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + +- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then +- runpath_var= +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +- fi +- else +- # PORTME fill in a description of your system's linker (not GNU ld) +- case $host_os in +- aix3*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- fi +- ;; ++ _LT_DECL([build_old_libs], [enable_static], [0], ++ [Whether or not to build static libraries]) ++])# _LT_ENABLE_STATIC + +- aix[[4-9]]*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- else +- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' +- fi +- aix_use_runtimelinking=no ++LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- ;; +- esac ++# Old names: ++AC_DEFUN([AC_ENABLE_STATIC], ++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) ++]) + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi ++AC_DEFUN([AC_DISABLE_STATIC], ++[_LT_SET_OPTION([LT_INIT], [disable-static]) ++]) + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +- _LT_AC_TAGVAR(archive_cmds, $1)='' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_ENABLE_STATIC], []) ++dnl AC_DEFUN([AM_DISABLE_STATIC], []) + +- if test "$GCC" = yes; then +- case $host_os in aix4.[[012]]|aix4.[[012]].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- : +- else +- # We have old collect2 +- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi + +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- _LT_AC_TAGVAR(always_export_symbols, $1)=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- _LT_AC_SYS_LIBPATH_AIX +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ ++# _LT_ENABLE_FAST_INSTALL([DEFAULT]) ++# ---------------------------------- ++# implement the --enable-fast-install flag, and support the `fast-install' ++# and `disable-fast-install' LT_INIT options. ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++m4_define([_LT_ENABLE_FAST_INSTALL], ++[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl ++AC_ARG_ENABLE([fast-install], ++ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes + fi +- fi ++ done ++ IFS="$lt_save_ifs" + ;; ++ esac], ++ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + +- amigaos*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- # see comment about different semantics on the GNU ld section +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++_LT_DECL([fast_install], [enable_fast_install], [0], ++ [Whether or not to optimize for fast installation])dnl ++])# _LT_ENABLE_FAST_INSTALL ++ ++LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) ++ ++# Old names: ++AU_DEFUN([AC_ENABLE_FAST_INSTALL], ++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++the `fast-install' option into LT_INIT's first parameter.]) ++]) + +- bsdi[[45]]*) +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic +- ;; ++AU_DEFUN([AC_DISABLE_FAST_INSTALL], ++[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++the `disable-fast-install' option into LT_INIT's first parameter.]) ++]) + +- cygwin* | mingw* | pw32*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # 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(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' +- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes +- ;; ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) ++dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + +- darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[[012]]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- if test "$GCC" = yes ; then +- output_verbose_link_cmd='echo' +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- else +- 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` $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 $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}' +- ;; +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi +- ;; + +- dgux*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# _LT_WITH_PIC([MODE]) ++# -------------------- ++# implement the --with-pic flag, and support the `pic-only' and `no-pic' ++# LT_INIT options. ++# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++m4_define([_LT_WITH_PIC], ++[AC_ARG_WITH([pic], ++ [AS_HELP_STRING([--with-pic], ++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++ [pic_mode="$withval"], ++ [pic_mode=default]) + +- freebsd1*) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; ++test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + +- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +- # support. Future versions do this automatically, but an explicit c++rt0.o +- # does not break anything, and helps significantly (at the cost of a little +- # extra space). +- freebsd2.2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ++])# _LT_WITH_PIC + +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) ++ ++# Old name: ++AU_DEFUN([AC_LIBTOOL_PICMODE], ++[_LT_SET_OPTION([LT_INIT], [pic-only]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `pic-only' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- 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 +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; + +- hpux9*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes ++m4_define([_LTDL_MODE], []) ++LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], ++ [m4_define([_LTDL_MODE], [nonrecursive])]) ++LT_OPTION_DEFINE([LTDL_INIT], [recursive], ++ [m4_define([_LTDL_MODE], [recursive])]) ++LT_OPTION_DEFINE([LTDL_INIT], [subproject], ++ [m4_define([_LTDL_MODE], [subproject])]) + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' +- ;; ++m4_define([_LTDL_TYPE], []) ++LT_OPTION_DEFINE([LTDL_INIT], [installable], ++ [m4_define([_LTDL_TYPE], [installable])]) ++LT_OPTION_DEFINE([LTDL_INIT], [convenience], ++ [m4_define([_LTDL_TYPE], [convenience])]) + +- hpux10*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +- fi +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ++# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- ++# ++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gary V. Vaughan, 2004 ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. + +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++# serial 6 ltsugar.m4 + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- fi +- ;; ++# This is to help aclocal find these macros, as it can't see m4_define. ++AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + +- hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- case $host_cpu in +- hppa*64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' +- _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' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; +- *) +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++# lt_join(SEP, ARG1, [ARG2...]) ++# ----------------------------- ++# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their ++# associated separator. ++# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier ++# versions in m4sugar had bugs. ++m4_define([lt_join], ++[m4_if([$#], [1], [], ++ [$#], [2], [[$2]], ++ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) ++m4_define([_lt_join], ++[m4_if([$#$2], [2], [], ++ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- ;; +- esac +- fi +- ;; + +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- ;; ++# lt_car(LIST) ++# lt_cdr(LIST) ++# ------------ ++# Manipulate m4 lists. ++# These macros are necessary as long as will still need to support ++# Autoconf-2.59 which quotes differently. ++m4_define([lt_car], [[$1]]) ++m4_define([lt_cdr], ++[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], ++ [$#], 1, [], ++ [m4_dquote(m4_shift($@))])]) ++m4_define([lt_unquote], $1) ++ ++ ++# lt_append(MACRO-NAME, STRING, [SEPARATOR]) ++# ------------------------------------------ ++# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. ++# Note that neither SEPARATOR nor STRING are expanded; they are appended ++# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). ++# No SEPARATOR is output if MACRO-NAME was previously undefined (different ++# than defined and empty). ++# ++# This macro is needed until we can rely on Autoconf 2.62, since earlier ++# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. ++m4_define([lt_append], ++[m4_define([$1], ++ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + +- netbsd*) +- 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 +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; + +- newsos6) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; + +- openbsd*) +- 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 +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- fi +- ;; ++# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) ++# ---------------------------------------------------------- ++# Produce a SEP delimited list of all paired combinations of elements of ++# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list ++# has the form PREFIXmINFIXSUFFIXn. ++# Needed until we can rely on m4_combine added in Autoconf 2.62. ++m4_define([lt_combine], ++[m4_if(m4_eval([$# > 3]), [1], ++ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl ++[[m4_foreach([_Lt_prefix], [$2], ++ [m4_foreach([_Lt_suffix], ++ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, ++ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) ++ ++ ++# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) ++# ----------------------------------------------------------------------- ++# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited ++# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. ++m4_define([lt_if_append_uniq], ++[m4_ifdef([$1], ++ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], ++ [lt_append([$1], [$2], [$3])$4], ++ [$5])], ++ [lt_append([$1], [$2], [$3])$4])]) + +- os2*) +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +- ;; + +- osf3*) +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; ++# lt_dict_add(DICT, KEY, VALUE) ++# ----------------------------- ++m4_define([lt_dict_add], ++[m4_define([$1($2)], [$3])]) + +- osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' +- else +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + +- # Both c and cxx compiler support -rpath directly +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +- ;; ++# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) ++# -------------------------------------------- ++m4_define([lt_dict_add_subkey], ++[m4_define([$1($2:$3)], [$4])]) + +- solaris*) +- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' +- if test "$GCC" = yes; then +- wlarc='${wl}' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' +- else +- wlarc='' +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- case $host_os in +- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; +- *) +- # 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?) +- 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 +- ;; + +- sunos4*) +- if test "x$host_vendor" = xsequent; then +- # Use $CC to link under sequent, because it throws in some extra .o +- # files that make .init and .fini sections work. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes +- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++# lt_dict_fetch(DICT, KEY, [SUBKEY]) ++# ---------------------------------- ++m4_define([lt_dict_fetch], ++[m4_ifval([$3], ++ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), ++ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + +- sysv4) +- case $host_vendor in +- sni) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? +- ;; +- siemens) +- ## LD is ld it makes a PLAMLIB +- ## CC just makes a GrossModule. +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no +- ;; +- motorola) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie +- ;; +- esac +- runpath_var='LD_RUN_PATH' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; + +- sysv4.3*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' +- ;; ++# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) ++# ----------------------------------------------------------------- ++m4_define([lt_if_dict_fetch], ++[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], ++ [$5], ++ [$6])]) + +- sysv4*MP*) +- if test -d /usr/nec; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- _LT_AC_TAGVAR(ld_shlibs, $1)=yes +- fi +- ;; + +- 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 +- runpath_var='LD_RUN_PATH' ++# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) ++# -------------------------------------------------------------- ++m4_define([lt_dict_filter], ++[m4_if([$5], [], [], ++ [lt_join(m4_quote(m4_default([$4], [[, ]])), ++ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), ++ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl ++]) + +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; ++# ltversion.m4 -- version numbers -*- Autoconf -*- ++# ++# Copyright (C) 2004 Free Software Foundation, Inc. ++# Written by Scott James Remnant, 2004 ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. + +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' +- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' ++# Generated from ltversion.in. + +- if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; ++# serial 3012 ltversion.m4 ++# This file is part of GNU Libtool + +- uts4*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +- ;; ++m4_define([LT_PACKAGE_VERSION], [2.2.6]) ++m4_define([LT_PACKAGE_REVISION], [1.3012]) + +- *) +- _LT_AC_TAGVAR(ld_shlibs, $1)=no +- ;; +- esac +- fi ++AC_DEFUN([LTVERSION_VERSION], ++[macro_version='2.2.6' ++macro_revision='1.3012' ++_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) ++_LT_DECL(, macro_revision, 0) + ]) +-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + ++# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- + # +-# Do we need to explicitly link libc? ++# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. ++# Written by Scott James Remnant, 2004. + # +-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in +-x|xyes) +- # Assume -lc should be added +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++ ++# serial 4 lt~obsolete.m4 ++ ++# These exist entirely to fool aclocal when bootstrapping libtool. ++# ++# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) ++# which have later been changed to m4_define as they aren't part of the ++# exported API, or moved to Autoconf or Automake where they belong. ++# ++# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN ++# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us ++# using a macro with the same name in our local m4/libtool.m4 it'll ++# pull the old libtool.m4 in (it doesn't see our shiny new m4_define ++# and doesn't know about Autoconf macros at all.) ++# ++# So we provide this file, which has a silly filename so it's always ++# included after everything else. This provides aclocal with the ++# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything ++# because those macros already exist, or will be overwritten later. ++# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. ++# ++# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. ++# Yes, that means every name once taken will need to remain here until ++# we give up compatibility with versions before 1.7, at which point ++# we need to keep only those names which we still refer to. ++ ++# This is to help aclocal find these macros, as it can't see m4_define. ++AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) ++ ++m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) ++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) ++m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) ++m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) ++m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) ++m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) ++m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) ++m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) ++m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) ++m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) ++m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) ++m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) ++m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) ++m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) ++m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) ++m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) ++m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) ++m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) ++m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) ++m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) ++m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) ++m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) ++m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) ++m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) ++m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) ++m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) ++m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) ++m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) ++m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) ++m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) ++m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) ++m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) ++m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) ++m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) ++m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) ++m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) ++m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) ++m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) ++m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) ++m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) ++m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) ++m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) ++m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) ++m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) ++m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) + +- if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $_LT_AC_TAGVAR(archive_cmds, $1) in +- *'~'*) +- # FIXME: we may have to deal with multi-command sequences. +- ;; +- '$CC '*) +- # Test whether the compiler implicitly links with -lc since on some +- # systems, -lgcc has to come before -lc. If gcc already passes -lc +- # to ld, don't add -lc before -lgcc. +- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) +- $rm conftest* +- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- ++# ++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program 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 ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. + +- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then +- soname=conftest +- lib=conftest +- libobjs=conftest.$ac_objext +- deplibs= +- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) +- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +- compiler_flags=-v +- linker_flags=-v +- verstring= +- output_objdir=. +- libname=conftest +- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)= +- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) +- then +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +- else +- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes +- fi +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag +- else +- cat conftest.err 1>&5 +- fi +- $rm conftest* +- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) +- ;; +- esac +- fi +- ;; +-esac +-])# AC_LIBTOOL_PROG_LD_SHLIBS ++# PKG_PROG_PKG_CONFIG([MIN-VERSION]) ++# ---------------------------------- ++AC_DEFUN([PKG_PROG_PKG_CONFIG], ++[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++])# PKG_PROG_PKG_CONFIG ++ ++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) ++# ++# Check to see whether a particular set of modules exists. Similar ++# to PKG_CHECK_MODULES(), but does not set variables or print errors. ++# ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_EXISTS], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) + + +-# _LT_AC_FILE_LTDLL_C +-# ------------------- +-# Be careful that the start marker always follows a newline. +-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ +-# /* ltdll.c starts here */ +-# #define WIN32_LEAN_AND_MEAN +-# #include <windows.h> +-# #undef WIN32_LEAN_AND_MEAN +-# #include <stdio.h> +-# +-# #ifndef __CYGWIN__ +-# # ifdef __CYGWIN32__ +-# # define __CYGWIN__ __CYGWIN32__ +-# # endif +-# #endif +-# +-# #ifdef __cplusplus +-# extern "C" { +-# #endif +-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +-# #ifdef __cplusplus +-# } +-# #endif +-# +-# #ifdef __CYGWIN__ +-# #include <cygwin/cygwin_dll.h> +-# DECLARE_CYGWIN_DLL( DllMain ); +-# #endif +-# HINSTANCE __hDllInstance_base; +-# +-# BOOL APIENTRY +-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +-# { +-# __hDllInstance_base = hInst; +-# return TRUE; +-# } +-# /* ltdll.c ends here */ +-])# _LT_AC_FILE_LTDLL_C ++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) ++# --------------------------------------------- ++m4_define([_PKG_CONFIG], ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried ++fi[]dnl ++])# _PKG_CONFIG ++ ++# _PKG_SHORT_ERRORS_SUPPORTED ++# ----------------------------- ++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++])# _PKG_SHORT_ERRORS_SUPPORTED + + +-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +-# --------------------------------- +-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) + +-# old names +-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +-AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +-# This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL]) ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) + +-AC_DEFUN([LT_AC_PROG_GCJ], +-[AC_CHECK_TOOL(GCJ, gcj, no) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +- AC_SUBST(GCJFLAGS) +-]) ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + +-AC_DEFUN([LT_AC_PROG_RC], +-[AC_CHECK_TOOL(RC, windres, no) +-]) ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: + ++$$1_PKG_ERRORS + +-# Cheap backport of AS_EXECUTABLE_P and required macros +-# from Autoconf 2.59; we should not use $as_executable_p directly. ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + +-# _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' ++_PKG_TEXT ++])], ++ [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 ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++_PKG_TEXT ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], ++ [$4]) + else +- as_executable_p='test -f' +-fi +-])])# _AS_TEST_PREPARE ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES + +-# 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 ++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# 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 # +-# macro and use it instead. # +-# LT_AC_PROG_SED +-# -------------- +-# Check for a fully-functional sed program, that truncates +-# as few characters as possible. Prefer GNU sed if found. +-AC_DEFUN([LT_AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. @@ -14064,18 +13287,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 - 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" -+ 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 '"$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 +- fi - done - done -done @@ -14114,2186 +13328,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) --])#AC_PROG_SED --])#m4_ifndef -- --# Old name: --AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([LT_AC_PROG_SED], []) -- -+ ;; - --# _LT_CHECK_SHELL_FEATURES --# ------------------------ --# Find out whether the shell is Bourne or XSI compatible, --# or has some other useful features. --m4_defun([_LT_CHECK_SHELL_FEATURES], --[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) --# Try some XSI features --xsi_shell=no --( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -- && eval 'test $(( 1 + 1 )) -eq 2 \ -- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ -- && xsi_shell=yes --AC_MSG_RESULT([$xsi_shell]) --_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) -- --AC_MSG_CHECKING([whether the shell understands "+="]) --lt_shell_append=no --( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ -- >/dev/null 2>&1 \ -- && lt_shell_append=yes --AC_MSG_RESULT([$lt_shell_append]) --_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) -+ 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= -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; - --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- lt_unset=unset --else -- lt_unset=false --fi --_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <<EOF 1>&2 - --# test EBCDIC or ASCII --case `echo X|tr X '\101'` in -- A) # ASCII based system -- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr -- lt_SP2NL='tr \040 \012' -- lt_NL2SP='tr \015\012 \040\040' -- ;; -- *) # EBCDIC based system -- lt_SP2NL='tr \100 \n' -- lt_NL2SP='tr \r\n \100\100' -- ;; --esac --_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl --_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl --])# _LT_CHECK_SHELL_FEATURES -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# _LT_PROG_XSI_SHELLFNS --# --------------------- --# Bourne and XSI compatible variants of some useful shell functions. --m4_defun([_LT_PROG_XSI_SHELLFNS], --[case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 - --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -+ sunos4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac - --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then -+ runpath_var= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ fi -+ ;; - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -+ aix[[4-9]]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $[*] )) --} -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -+ _LT_AC_TAGVAR(archive_cmds, $1)='' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` --} -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi - --dnl func_dirname_and_basename --dnl A portable version of this function is already defined in general.m4sh --dnl so there is no need for it here. -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -- esac --} -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ _LT_AC_SYS_LIBPATH_AIX -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - --# sed scripts: --my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[[^=]]*=//' -+ amigaos*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ # see comment about different semantics on the GNU ld section -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` --} -+ bsdi[[45]]*) -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -+ ;; - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` --} -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # 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(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` --} -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ 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` $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 $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}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$[@]"` --} -+ dgux*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` --} -+ freebsd1*) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; - --_LT_EOF --esac -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]+=\$[2]" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$[1]=\$$[1]\$[2]" --} -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ 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 -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --_LT_EOF -- ;; -- esac --]) -+ hpux9*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes - --# ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*- --# --# Copyright (C) 1999-2006, 2007, 2008 Free Software Foundation, Inc. --# Written by Thomas Tanner, 1999 --# --# This file is free software; the Free Software Foundation gives --# unlimited permission to copy and/or distribute it, with or without --# modifications, as long as this notice is preserved. -- --# serial 17 LTDL_INIT -- --# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE]) --# ------------------------------------------ --# DIRECTORY contains the libltdl sources. It is okay to call this --# function multiple times, as long as the same DIRECTORY is always given. --AC_DEFUN([LT_CONFIG_LTDL_DIR], --[AC_BEFORE([$0], [LTDL_INIT]) --_$0($*) --])# LT_CONFIG_LTDL_DIR -- --# We break this out into a separate macro, so that we can call it safely --# internally without being caught accidentally by the sed scan in libtoolize. --m4_defun([_LT_CONFIG_LTDL_DIR], --[dnl remove trailing slashes --m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$])) --m4_case(_LTDL_DIR, -- [], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply `.' -- m4_if(_ARG_DIR, [.], -- [], -- [m4_define([_LTDL_DIR], _ARG_DIR) -- _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])])], -- [m4_if(_ARG_DIR, _LTDL_DIR, -- [], -- [m4_fatal([multiple libltdl directories: `]_LTDL_DIR[', `]_ARG_DIR['])])]) --m4_popdef([_ARG_DIR]) --])# _LT_CONFIG_LTDL_DIR -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; - --# Initialise: --m4_define([_LTDL_DIR], []) -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - --# _LT_BUILD_PREFIX --# ---------------- --# If Autoconf is new enough, expand to `${top_build_prefix}', otherwise --# to `${top_builddir}/'. --m4_define([_LT_BUILD_PREFIX], --[m4_ifdef([AC_AUTOCONF_VERSION], -- [m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.62]), -- [-1], [m4_ifdef([_AC_HAVE_TOP_BUILD_PREFIX], -- [${top_build_prefix}], -- [${top_builddir}/])], -- [${top_build_prefix}])], -- [${top_builddir}/])[]dnl --]) -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ fi -+ ;; - -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - --# LTDL_CONVENIENCE --# ---------------- --# sets LIBLTDL to the link flags for the libltdl convenience library and --# LTDLINCL to the include flags for the libltdl header and adds --# --enable-ltdl-convenience to the configure arguments. Note that --# AC_CONFIG_SUBDIRS is not called here. LIBLTDL will be prefixed with --# '${top_build_prefix}' if available, otherwise with '${top_builddir}/', --# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single --# quotes!). If your package is not flat and you're not using automake, --# define top_build_prefix, top_builddir, and top_srcdir appropriately --# in your Makefiles. --AC_DEFUN([LTDL_CONVENIENCE], --[AC_BEFORE([$0], [LTDL_INIT])dnl --dnl Although the argument is deprecated and no longer documented, --dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one --dnl here make sure it is the same as any other declaration of libltdl's --dnl location! This also ensures lt_ltdl_dir is set when configure.ac is --dnl not yet using an explicit LT_CONFIG_LTDL_DIR. --m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl --_$0() --])# LTDL_CONVENIENCE -- --# AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools, --# now we have LT_CONFIG_LTDL_DIR: --AU_DEFUN([AC_LIBLTDL_CONVENIENCE], --[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) --_LTDL_CONVENIENCE]) -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIBLTDL_CONVENIENCE], []) -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ fi -+ ;; - -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ ;; - --# _LTDL_CONVENIENCE --# ----------------- --# Code shared by LTDL_CONVENIENCE and LTDL_INIT([convenience]). --m4_defun([_LTDL_CONVENIENCE], --[case $enable_ltdl_convenience in -- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -- "") enable_ltdl_convenience=yes -- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; --esac --LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la" --LTDLDEPS=$LIBLTDL --LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}" -+ 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 -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --AC_SUBST([LIBLTDL]) --AC_SUBST([LTDLDEPS]) --AC_SUBST([LTDLINCL]) -+ newsos6) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# For backwards non-gettext consistent compatibility... --INCLTDL="$LTDLINCL" --AC_SUBST([INCLTDL]) --])# _LTDL_CONVENIENCE -+ openbsd*) -+ 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 -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - -+ os2*) -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; - --# LTDL_INSTALLABLE --# ---------------- --# sets LIBLTDL to the link flags for the libltdl installable library --# and LTDLINCL to the include flags for the libltdl header and adds --# --enable-ltdl-install to the configure arguments. Note that --# AC_CONFIG_SUBDIRS is not called from here. If an installed libltdl --# is not found, LIBLTDL will be prefixed with '${top_build_prefix}' if --# available, otherwise with '${top_builddir}/', and LTDLINCL will be --# prefixed with '${top_srcdir}/' (note the single quotes!). If your --# package is not flat and you're not using automake, define top_build_prefix, --# top_builddir, and top_srcdir appropriately in your Makefiles. --# In the future, this macro may have to be called after LT_INIT. --AC_DEFUN([LTDL_INSTALLABLE], --[AC_BEFORE([$0], [LTDL_INIT])dnl --dnl Although the argument is deprecated and no longer documented, --dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one --dnl here make sure it is the same as any other declaration of libltdl's --dnl location! This also ensures lt_ltdl_dir is set when configure.ac is --dnl not yet using an explicit LT_CONFIG_LTDL_DIR. --m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl --_$0() --])# LTDL_INSTALLABLE -- --# AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools, --# now we have LT_CONFIG_LTDL_DIR: --AU_DEFUN([AC_LIBLTDL_INSTALLABLE], --[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) --_LTDL_INSTALLABLE]) -+ osf3*) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; - --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], []) -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ else -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - -+ # Both c and cxx compiler support -rpath directly -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; - --# _LTDL_INSTALLABLE --# ----------------- --# Code shared by LTDL_INSTALLABLE and LTDL_INIT([installable]). --m4_defun([_LTDL_INSTALLABLE], --[if test -f $prefix/lib/libltdl.la; then -- lt_save_LDFLAGS="$LDFLAGS" -- LDFLAGS="-L$prefix/lib $LDFLAGS" -- AC_CHECK_LIB([ltdl], [lt_dlinit], [lt_lib_ltdl=yes]) -- LDFLAGS="$lt_save_LDFLAGS" -- if test x"${lt_lib_ltdl-no}" = xyes; then -- if test x"$enable_ltdl_install" != xyes; then -- # Don't overwrite $prefix/lib/libltdl.la without --enable-ltdl-install -- AC_MSG_WARN([not overwriting libltdl at $prefix, force with `--enable-ltdl-install']) -- enable_ltdl_install=no -- fi -- elif test x"$enable_ltdl_install" = xno; then -- AC_MSG_WARN([libltdl not installed, but installation disabled]) -- fi --fi -+ solaris*) -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # 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?) -+ 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 -+ ;; - --# If configure.ac declared an installable ltdl, and the user didn't override --# with --disable-ltdl-install, we will install the shipped libltdl. --case $enable_ltdl_install in -- no) ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -- LIBLTDL="-lltdl" -- LTDLDEPS= -- LTDLINCL= -- ;; -- *) enable_ltdl_install=yes -- ac_configure_args="$ac_configure_args --enable-ltdl-install" -- LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdl.la" -- LTDLDEPS=$LIBLTDL -- LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}" -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; --esac - --AC_SUBST([LIBLTDL]) --AC_SUBST([LTDLDEPS]) --AC_SUBST([LTDLINCL]) -+ sysv4) -+ case $host_vendor in -+ sni) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ ;; -+ motorola) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# For backwards non-gettext consistent compatibility... --INCLTDL="$LTDLINCL" --AC_SUBST([INCLTDL]) --])# LTDL_INSTALLABLE -+ sysv4.3*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -+ ;; - -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes -+ fi -+ ;; - --# _LTDL_MODE_DISPATCH --# ------------------- --m4_define([_LTDL_MODE_DISPATCH], --[dnl If _LTDL_DIR is `.', then we are configuring libltdl itself: --m4_if(_LTDL_DIR, [], -- [], -- dnl if _LTDL_MODE was not set already, the default value is `subproject': -- [m4_case(m4_default(_LTDL_MODE, [subproject]), -- [subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR) -- _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])], -- [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"; lt_libobj_prefix="$lt_ltdl_dir/"])], -- [recursive], [], -- [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])dnl --dnl Be careful not to expand twice: --m4_define([$0], []) --])# _LTDL_MODE_DISPATCH -+ 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 -+ runpath_var='LD_RUN_PATH' - -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; - --# _LT_LIBOBJ(MODULE_NAME) --# ----------------------- --# Like AC_LIBOBJ, except that MODULE_NAME goes into _LT_LIBOBJS instead --# of into LIBOBJS. --AC_DEFUN([_LT_LIBOBJ], [ -- m4_pattern_allow([^_LT_LIBOBJS$]) -- _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext" --])# _LT_LIBOBJS -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' - -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; - --# LTDL_INIT([OPTIONS]) --# -------------------- --# Clients of libltdl can use this macro to allow the installer to --# choose between a shipped copy of the ltdl sources or a preinstalled --# version of the library. If the shipped ltdl sources are not in a --# subdirectory named libltdl, the directory name must be given by --# LT_CONFIG_LTDL_DIR. --AC_DEFUN([LTDL_INIT], --[dnl Parse OPTIONS --_LT_SET_OPTIONS([$0], [$1]) -- --dnl We need to keep our own list of libobjs separate from our parent project, --dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while --dnl we look for our own LIBOBJs. --m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ])) --m4_pushdef([AC_LIBSOURCES]) -- --dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: --m4_if(_LTDL_MODE, [], -- [m4_define([_LTDL_MODE], m4_default([$2], [subproject])) -- m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])], -- [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])]) -- --AC_ARG_WITH([included_ltdl], -- [AS_HELP_STRING([--with-included-ltdl], -- [use the GNU ltdl sources included here])]) -- --if test "x$with_included_ltdl" != xyes; then -- # We are not being forced to use the included libltdl sources, so -- # decide whether there is a useful installed version we can use. -- AC_CHECK_HEADER([ltdl.h], -- [AC_CHECK_DECL([lt_dlinterface_register], -- [AC_CHECK_LIB([ltdl], [lt_dladvise_preload], -- [with_included_ltdl=no], -- [with_included_ltdl=yes])], -- [with_included_ltdl=yes], -- [AC_INCLUDES_DEFAULT -- #include <ltdl.h>])], -- [with_included_ltdl=yes], -- [AC_INCLUDES_DEFAULT] -- ) --fi -- --dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE --dnl was called yet, then for old times' sake, we assume libltdl is in an --dnl eponymous directory: --AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])]) -- --AC_ARG_WITH([ltdl_include], -- [AS_HELP_STRING([--with-ltdl-include=DIR], -- [use the ltdl headers installed in DIR])]) -+ uts4*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --if test -n "$with_ltdl_include"; then -- if test -f "$with_ltdl_include/ltdl.h"; then : -- else -- AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include']) -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac - fi --else -- with_ltdl_include=no --fi -+]) -+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - --AC_ARG_WITH([ltdl_lib], -- [AS_HELP_STRING([--with-ltdl-lib=DIR], -- [use the libltdl.la installed in DIR])]) -+# -+# Do we need to explicitly link libc? -+# -+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -+x|xyes) -+ # Assume -lc should be added -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - --if test -n "$with_ltdl_lib"; then -- if test -f "$with_ltdl_lib/libltdl.la"; then : -- else -- AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib']) -- fi --else -- with_ltdl_lib=no --fi -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $_LT_AC_TAGVAR(archive_cmds, $1) in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -+ $rm conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - --case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in -- ,yes,no,no,) -- m4_case(m4_default(_LTDL_TYPE, [convenience]), -- [convenience], [_LTDL_CONVENIENCE], -- [installable], [_LTDL_INSTALLABLE], -- [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)]) -- ;; -- ,no,no,no,) -- # If the included ltdl is not to be used, then use the -- # preinstalled libltdl we found. -- AC_DEFINE([HAVE_LTDL], [1], -- [Define this if a modern libltdl is already installed]) -- LIBLTDL=-lltdl -- LTDLDEPS= -- LTDLINCL= -- ;; -- ,no*,no,*) -- AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together]) -- ;; -- *) with_included_ltdl=no -- LIBLTDL="-L$with_ltdl_lib -lltdl" -- LTDLDEPS= -- LTDLINCL="-I$with_ltdl_include" -- ;; -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)= -+ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -+ then -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ else -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+ fi -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) -+ ;; -+ esac -+ fi -+ ;; - esac --INCLTDL="$LTDLINCL" -+])# AC_LIBTOOL_PROG_LD_SHLIBS - --# Report our decision... --AC_MSG_CHECKING([where to find libltdl headers]) --AC_MSG_RESULT([$LTDLINCL]) --AC_MSG_CHECKING([where to find libltdl library]) --AC_MSG_RESULT([$LIBLTDL]) -- --_LTDL_SETUP -- --dnl restore autoconf definition. --m4_popdef([AC_LIBOBJ]) --m4_popdef([AC_LIBSOURCES]) -- --AC_CONFIG_COMMANDS_PRE([ -- _ltdl_libobjs= -- _ltdl_ltlibobjs= -- if test -n "$_LT_LIBOBJS"; then -- # Remove the extension. -- _lt_sed_drop_objext='s/\.o$//;s/\.obj$//' -- for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do -- _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext" -- _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo" -- done -- fi -- AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs]) -- AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs]) --]) - --# Only expand once: --m4_define([LTDL_INIT]) --])# LTDL_INIT -- --# Old names: --AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)]) --AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)]) --AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LIB_LTDL], []) --dnl AC_DEFUN([AC_WITH_LTDL], []) --dnl AC_DEFUN([LT_WITH_LTDL], []) -+# _LT_AC_FILE_LTDLL_C -+# ------------------- -+# Be careful that the start marker always follows a newline. -+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -+# /* ltdll.c starts here */ -+# #define WIN32_LEAN_AND_MEAN -+# #include <windows.h> -+# #undef WIN32_LEAN_AND_MEAN -+# #include <stdio.h> -+# -+# #ifndef __CYGWIN__ -+# # ifdef __CYGWIN32__ -+# # define __CYGWIN__ __CYGWIN32__ -+# # endif -+# #endif -+# -+# #ifdef __cplusplus -+# extern "C" { -+# #endif -+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -+# #ifdef __cplusplus -+# } -+# #endif -+# -+# #ifdef __CYGWIN__ -+# #include <cygwin/cygwin_dll.h> -+# DECLARE_CYGWIN_DLL( DllMain ); -+# #endif -+# HINSTANCE __hDllInstance_base; -+# -+# BOOL APIENTRY -+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -+# { -+# __hDllInstance_base = hInst; -+# return TRUE; -+# } -+# /* ltdll.c ends here */ -+])# _LT_AC_FILE_LTDLL_C - - --# _LTDL_SETUP --# ----------- --# Perform all the checks necessary for compilation of the ltdl objects --# -- including compiler checks and header checks. This is a public --# interface mainly for the benefit of libltdl's own configure.ac, most --# other users should call LTDL_INIT instead. --AC_DEFUN([_LTDL_SETUP], --[AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([LT_SYS_MODULE_EXT])dnl --AC_REQUIRE([LT_SYS_MODULE_PATH])dnl --AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl --AC_REQUIRE([LT_LIB_DLLOAD])dnl --AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl --AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl --AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl --AC_REQUIRE([gl_FUNC_ARGZ])dnl -- --m4_require([_LT_CHECK_OBJDIR])dnl --m4_require([_LT_HEADER_DLFCN])dnl --m4_require([_LT_CHECK_DLPREOPEN])dnl --m4_require([_LT_DECL_SED])dnl -- --dnl Don't require this, or it will be expanded earlier than the code --dnl that sets the variables it relies on: --_LT_ENABLE_INSTALL -- --dnl _LTDL_MODE specific code must be called at least once: --_LTDL_MODE_DISPATCH -- --# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS --# the user used. This is so that ltdl.h can pick up the parent projects --# config.h file, The first file in AC_CONFIG_HEADERS must contain the --# definitions required by ltdl.c. --# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility). --AC_CONFIG_COMMANDS_PRE([dnl --m4_pattern_allow([^LT_CONFIG_H$])dnl --m4_ifset([AH_HEADER], -- [LT_CONFIG_H=AH_HEADER], -- [m4_ifset([AC_LIST_HEADERS], -- [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[ ]]*,,;s,[[ :]].*$,,'`], -- [])])]) --AC_SUBST([LT_CONFIG_H]) -- --AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h], -- [], [], [AC_INCLUDES_DEFAULT]) -- --AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) --AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) -- --AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension]) -- --name=ltdl --LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` --AC_SUBST([LTDLOPEN]) --])# _LTDL_SETUP -+# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -+# --------------------------------- -+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) - - --# _LT_ENABLE_INSTALL --# ------------------ --m4_define([_LT_ENABLE_INSTALL], --[AC_ARG_ENABLE([ltdl-install], -- [AS_HELP_STRING([--enable-ltdl-install], [install libltdl])]) -- --case ,${enable_ltdl_install},${enable_ltdl_convenience} in -- *yes*) ;; -- *) enable_ltdl_convenience=yes ;; --esac -+# old names -+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) - --m4_ifdef([AM_CONDITIONAL], --[AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno) -- AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)]) --])# _LT_ENABLE_INSTALL -+# This is just to silence aclocal about the macro not being used -+ifelse([AC_DISABLE_FAST_INSTALL]) - -+AC_DEFUN([LT_AC_PROG_GCJ], -+[AC_CHECK_TOOL(GCJ, gcj, no) -+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ AC_SUBST(GCJFLAGS) -+]) - --# LT_SYS_DLOPEN_DEPLIBS --# --------------------- --AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], --[AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_CACHE_CHECK([whether deplibs are loaded by dlopen], -- [lt_cv_sys_dlopen_deplibs], -- [# PORTME does your system automatically load deplibs for dlopen? -- # or its logical equivalent (e.g. shl_load for HP-UX < 11) -- # For now, we just catch OSes we know something about -- in the -- # future, we'll try test this programmatically. -- lt_cv_sys_dlopen_deplibs=unknown -- case $host_os in -- aix3*|aix4.1.*|aix4.2.*) -- # Unknown whether this is true for these versions of AIX, but -- # we want this `case' here to explicitly catch those versions. -- lt_cv_sys_dlopen_deplibs=unknown -- ;; -- aix[[4-9]]*) -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- amigaos*) -- case $host_cpu in -- powerpc) -- lt_cv_sys_dlopen_deplibs=no -- ;; -- esac -- ;; -- darwin*) -- # Assuming the user has installed a libdl from somewhere, this is true -- # If you are looking for one http://www.opendarwin.org/projects/dlcompat -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- freebsd* | dragonfly*) -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- gnu* | linux* | k*bsd*-gnu) -- # GNU and its variants, using gnu ld.so (Glibc) -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- hpux10*|hpux11*) -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- interix*) -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- irix[[12345]]*|irix6.[[01]]*) -- # Catch all versions of IRIX before 6.2, and indicate that we don't -- # know how it worked for any of those versions. -- lt_cv_sys_dlopen_deplibs=unknown -- ;; -- irix*) -- # The case above catches anything before 6.2, and it's known that -- # at 6.2 and later dlopen does load deplibs. -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- netbsd*) -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- openbsd*) -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- osf[[1234]]*) -- # dlopen did load deplibs (at least at 4.x), but until the 5.x series, -- # it did *not* use an RPATH in a shared library to find objects the -- # library depends on, so we explicitly say `no'. -- lt_cv_sys_dlopen_deplibs=no -- ;; -- osf5.0|osf5.0a|osf5.1) -- # dlopen *does* load deplibs and with the right loader patch applied -- # it even uses RPATH in a shared library to search for shared objects -- # that the library depends on, but there's no easy way to know if that -- # patch is installed. Since this is the case, all we can really -- # say is unknown -- it depends on the patch being installed. If -- # it is, this changes to `yes'. Without it, it would be `no'. -- lt_cv_sys_dlopen_deplibs=unknown -- ;; -- osf*) -- # the two cases above should catch all versions of osf <= 5.1. Read -- # the comments above for what we know about them. -- # At > 5.1, deplibs are loaded *and* any RPATH in a shared library -- # is used to find them so we can finally say `yes'. -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- qnx*) -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- solaris*) -- lt_cv_sys_dlopen_deplibs=yes -- ;; -- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- libltdl_cv_sys_dlopen_deplibs=yes -- ;; -- esac -- ]) --if test "$lt_cv_sys_dlopen_deplibs" != yes; then -- AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1], -- [Define if the OS needs help to load dependent libraries for dlopen().]) --fi --])# LT_SYS_DLOPEN_DEPLIBS -+AC_DEFUN([LT_AC_PROG_RC], -+[AC_CHECK_TOOL(RC, windres, no) -+]) - --# Old name: --AU_ALIAS([AC_LTDL_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], []) - -+# Cheap backport of AS_EXECUTABLE_P and required macros -+# from Autoconf 2.59; we should not use $as_executable_p directly. - --# LT_SYS_MODULE_EXT --# ----------------- --AC_DEFUN([LT_SYS_MODULE_EXT], --[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl --AC_CACHE_CHECK([which extension is used for runtime loadable modules], -- [libltdl_cv_shlibext], --[ --module=yes --eval libltdl_cv_shlibext=$shrext_cmds -- ]) --if test -n "$libltdl_cv_shlibext"; then -- m4_pattern_allow([LT_MODULE_EXT])dnl -- AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"], -- [Define to the extension used for runtime loadable modules, say, ".so".]) -+# _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 --])# LT_SYS_MODULE_EXT -- --# Old name: --AU_ALIAS([AC_LTDL_SHLIBEXT], [LT_SYS_MODULE_EXT]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LTDL_SHLIBEXT], []) -- -- --# LT_SYS_MODULE_PATH --# ------------------ --AC_DEFUN([LT_SYS_MODULE_PATH], --[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl --AC_CACHE_CHECK([which variable specifies run-time module search path], -- [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"]) --if test -n "$lt_cv_module_path_var"; then -- m4_pattern_allow([LT_MODULE_PATH_VAR])dnl -- AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"], -- [Define to the name of the environment variable that determines the run-time module search path.]) --fi --])# LT_SYS_MODULE_PATH -- --# Old name: --AU_ALIAS([AC_LTDL_SHLIBPATH], [LT_SYS_MODULE_PATH]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LTDL_SHLIBPATH], []) -+])])# _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 - --# LT_SYS_DLSEARCH_PATH --# -------------------- --AC_DEFUN([LT_SYS_DLSEARCH_PATH], --[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl --AC_CACHE_CHECK([for the default library search path], -- [lt_cv_sys_dlsearch_path], -- [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"]) --if test -n "$lt_cv_sys_dlsearch_path"; then -- sys_dlsearch_path= -- for dir in $lt_cv_sys_dlsearch_path; do -- if test -z "$sys_dlsearch_path"; then -- sys_dlsearch_path="$dir" -- else -- sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir" -- fi -+# 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 # -+# macro and use it instead. # -+# LT_AC_PROG_SED -+# -------------- -+# Check for a fully-functional sed program, that truncates -+# as few characters as possible. Prefer GNU sed if found. -+AC_DEFUN([LT_AC_PROG_SED], -+[AC_MSG_CHECKING([for a sed that does not truncate output]) -+AC_CACHE_VAL(lt_cv_path_SED, -+[# Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ 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 -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -+ fi -+ done - done -- m4_pattern_allow([LT_DLSEARCH_PATH])dnl -- AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"], -- [Define to the system default library search path.]) --fi --])# LT_SYS_DLSEARCH_PATH -- --# Old name: --AU_ALIAS([AC_LTDL_SYSSEARCHPATH], [LT_SYS_DLSEARCH_PATH]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LTDL_SYSSEARCHPATH], []) -- -- --# _LT_CHECK_DLPREOPEN --# ------------------- --m4_defun([_LT_CHECK_DLPREOPEN], --[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl --AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen], -- [libltdl_cv_preloaded_symbols], -- [if test -n "$lt_cv_sys_global_symbol_pipe"; then -- libltdl_cv_preloaded_symbols=yes -- else -- libltdl_cv_preloaded_symbols=no -+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 -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break - fi -- ]) --if test x"$libltdl_cv_preloaded_symbols" = xyes; then -- AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1], -- [Define if libtool can extract symbol lists from object files.]) --fi --])# _LT_CHECK_DLPREOPEN -- -- --# LT_LIB_DLLOAD --# ------------- --AC_DEFUN([LT_LIB_DLLOAD], --[m4_pattern_allow([^LT_DLLOADERS$]) --LT_DLLOADERS= --AC_SUBST([LT_DLLOADERS]) -- --AC_LANG_PUSH([C]) -- --LIBADD_DLOPEN= --AC_SEARCH_LIBS([dlopen], [dl], -- [AC_DEFINE([HAVE_LIBDL], [1], -- [Define if you have the libdl library or equivalent.]) -- if test "$ac_cv_search_dlopen" != "none required" ; then -- LIBADD_DLOPEN="-ldl" -- fi -- libltdl_cv_lib_dl_dlopen="yes" -- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], -- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H --# include <dlfcn.h> --#endif -- ]], [[dlopen(0, 0);]])], -- [AC_DEFINE([HAVE_LIBDL], [1], -- [Define if you have the libdl library or equivalent.]) -- libltdl_cv_func_dlopen="yes" -- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], -- [AC_CHECK_LIB([svld], [dlopen], -- [AC_DEFINE([HAVE_LIBDL], [1], -- [Define if you have the libdl library or equivalent.]) -- LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes" -- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])]) --if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes --then -- lt_save_LIBS="$LIBS" -- LIBS="$LIBS $LIBADD_DLOPEN" -- AC_CHECK_FUNCS([dlerror]) -- LIBS="$lt_save_LIBS" --fi --AC_SUBST([LIBADD_DLOPEN]) -- --LIBADD_SHL_LOAD= --AC_CHECK_FUNC([shl_load], -- [AC_DEFINE([HAVE_SHL_LOAD], [1], -- [Define if you have the shl_load function.]) -- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"], -- [AC_CHECK_LIB([dld], [shl_load], -- [AC_DEFINE([HAVE_SHL_LOAD], [1], -- [Define if you have the shl_load function.]) -- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la" -- LIBADD_SHL_LOAD="-ldld"])]) --AC_SUBST([LIBADD_SHL_LOAD]) -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+]) -+SED=$lt_cv_path_SED -+AC_SUBST([SED]) -+AC_MSG_RESULT([$SED]) -+]) - --case $host_os in --darwin[[1567]].*) --# We only want this for pre-Mac OS X 10.4. -- AC_CHECK_FUNC([_dyld_func_lookup], -- [AC_DEFINE([HAVE_DYLD], [1], -- [Define if you have the _dyld_func_lookup function.]) -- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"]) -- ;; --beos*) -- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" -- ;; --cygwin* | mingw* | os2* | pw32*) -- AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]]) -- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la" -- ;; --esac -+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -+# -+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program 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 -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. - --AC_CHECK_LIB([dld], [dld_link], -- [AC_DEFINE([HAVE_DLD], [1], -- [Define if you have the GNU dld library.]) -- LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"]) --AC_SUBST([LIBADD_DLD_LINK]) -- --m4_pattern_allow([^LT_DLPREOPEN$]) --LT_DLPREOPEN= --if test -n "$LT_DLLOADERS" --then -- for lt_loader in $LT_DLLOADERS; do -- LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader " -- done -- AC_DEFINE([HAVE_LIBDLLOADER], [1], -- [Define if libdlloader will be built on this platform]) -+# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -+# ---------------------------------- -+AC_DEFUN([PKG_PROG_PKG_CONFIG], -+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) - fi --AC_SUBST([LT_DLPREOPEN]) -- --dnl This isn't used anymore, but set it for backwards compatibility --LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD" --AC_SUBST([LIBADD_DL]) -- --AC_LANG_POP --])# LT_LIB_DLLOAD -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=m4_default([$1], [0.9.0]) -+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ PKG_CONFIG="" -+ fi -+ -+fi[]dnl -+])# PKG_PROG_PKG_CONFIG - --# Old name: --AU_ALIAS([AC_LTDL_DLLIB], [LT_LIB_DLLOAD]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LTDL_DLLIB], []) -+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# -+# Check to see whether a particular set of modules exists. Similar -+# to PKG_CHECK_MODULES(), but does not set variables or print errors. -+# -+# -+# Similar to PKG_CHECK_MODULES, make sure that the first instance of -+# this or PKG_CHECK_MODULES is called, or make sure to call -+# PKG_CHECK_EXISTS manually -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_EXISTS], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+if test -n "$PKG_CONFIG" && \ -+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -+ m4_ifval([$2], [$2], [:]) -+m4_ifvaln([$3], [else -+ $3])dnl -+fi]) - - --# LT_SYS_SYMBOL_USCORE --# -------------------- --# does the compiler prefix global symbols with an underscore? --AC_DEFUN([LT_SYS_SYMBOL_USCORE], --[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl --AC_CACHE_CHECK([for _ prefix in compiled symbols], -- [lt_cv_sys_symbol_underscore], -- [lt_cv_sys_symbol_underscore=no -- cat > conftest.$ac_ext <<_LT_EOF --void nm_test_func(){} --int main(){nm_test_func;return 0;} --_LT_EOF -- if AC_TRY_EVAL(ac_compile); then -- # Now try to grab the symbols. -- ac_nlist=conftest.nm -- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then -- # See whether the symbols have a leading underscore. -- if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then -- lt_cv_sys_symbol_underscore=yes -- else -- if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then -- : -- else -- echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD -- fi -- fi -+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -+# --------------------------------------------- -+m4_define([_PKG_CONFIG], -+[if test -n "$PKG_CONFIG"; then -+ if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" - else -- echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -+ [pkg_failed=yes]) - fi -- else -- echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD -- cat conftest.c >&AS_MESSAGE_LOG_FD -- fi -- rm -rf conftest* -- ]) -- sys_symbol_underscore=$lt_cv_sys_symbol_underscore -- AC_SUBST([sys_symbol_underscore]) --])# LT_SYS_SYMBOL_USCORE -- --# Old name: --AU_ALIAS([AC_LTDL_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], []) -- -- --# LT_FUNC_DLSYM_USCORE --# -------------------- --AC_DEFUN([LT_FUNC_DLSYM_USCORE], --[AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl --if test x"$lt_cv_sys_symbol_underscore" = xyes; then -- if test x"$libltdl_cv_func_dlopen" = xyes || -- test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then -- AC_CACHE_CHECK([whether we have to add an underscore for dlsym], -- [libltdl_cv_need_uscore], -- [libltdl_cv_need_uscore=unknown -- save_LIBS="$LIBS" -- LIBS="$LIBS $LIBADD_DLOPEN" -- _LT_TRY_DLOPEN_SELF( -- [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes], -- [], [libltdl_cv_need_uscore=cross]) -- LIBS="$save_LIBS" -- ]) -- fi --fi -+else -+ pkg_failed=untried -+fi[]dnl -+])# _PKG_CONFIG - --if test x"$libltdl_cv_need_uscore" = xyes; then -- AC_DEFINE([NEED_USCORE], [1], -- [Define if dlsym() requires a leading underscore in symbol names.]) --fi --])# LT_FUNC_DLSYM_USCORE -+# _PKG_SHORT_ERRORS_SUPPORTED -+# ----------------------------- -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])# _PKG_SHORT_ERRORS_SUPPORTED - --# Old name: --AU_ALIAS([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE]) --dnl aclocal-1.4 backwards compatibility: --dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], []) - --# Portability macros for glibc argz. -*- Autoconf -*- -+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+# [ACTION-IF-NOT-FOUND]) - # --# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. --# Written by Gary V. Vaughan <gary@gnu.org> - # --# This file is free software; the Free Software Foundation gives --# unlimited permission to copy and/or distribute it, with or without --# modifications, as long as this notice is preserved. -- --# serial 5 argz.m4 -- --AC_DEFUN([gl_FUNC_ARGZ], --[gl_PREREQ_ARGZ -- --AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT]) -- --AC_CHECK_TYPES([error_t], -- [], -- [AC_DEFINE([error_t], [int], -- [Define to a type to use for `error_t' if it is not otherwise available.]) -- AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h -- does not typedef error_t.])], -- [#if defined(HAVE_ARGZ_H) --# include <argz.h> --#endif]) -- --ARGZ_H= --AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \ -- argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])]) -- --dnl if have system argz functions, allow forced use of --dnl libltdl-supplied implementation (and default to do so --dnl on "known bad" systems). Could use a runtime check, but --dnl (a) detecting malloc issues is notoriously unreliable --dnl (b) only known system that declares argz functions, --dnl provides them, yet they are broken, is cygwin --dnl releases prior to 16-Mar-2007 (1.5.24 and earlier) --dnl So, it's more straightforward simply to special case --dnl this for known bad systems. --AS_IF([test -z "$ARGZ_H"], -- [AC_CACHE_CHECK( -- [if argz actually works], -- [lt_cv_sys_argz_works], -- [[case $host_os in #( -- *cygwin*) -- lt_cv_sys_argz_works=no -- if test "$cross_compiling" != no; then -- lt_cv_sys_argz_works="guessing no" -- else -- lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' -- save_IFS=$IFS -- IFS=-. -- set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` -- IFS=$save_IFS -- lt_os_major=${2-0} -- lt_os_minor=${3-0} -- lt_os_micro=${4-0} -- if test "$lt_os_major" -gt 1 \ -- || { test "$lt_os_major" -eq 1 \ -- && { test "$lt_os_minor" -gt 5 \ -- || { test "$lt_os_minor" -eq 5 \ -- && test "$lt_os_micro" -gt 24; }; }; }; then -- lt_cv_sys_argz_works=yes -- fi -- fi -- ;; #( -- *) lt_cv_sys_argz_works=yes ;; -- esac]]) -- AS_IF([test $lt_cv_sys_argz_works = yes], -- [AC_DEFINE([HAVE_WORKING_ARGZ], 1, -- [This value is set to 1 to indicate that the system argz facility works])], -- [ARGZ_H=argz.h -- AC_LIBOBJ([argz])])]) -- --AC_SUBST([ARGZ_H]) --]) -- --# Prerequisites of lib/argz.c. --AC_DEFUN([gl_PREREQ_ARGZ], [:]) -- --# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -+# Note that if there is a possibility the first call to -+# PKG_CHECK_MODULES might not happen, you should be sure to include an -+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac - # --# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. --# Written by Gary V. Vaughan, 2004 - # --# This file is free software; the Free Software Foundation gives --# unlimited permission to copy and/or distribute it, with or without --# modifications, as long as this notice is preserved. -- --# serial 6 ltsugar.m4 -- --# This is to help aclocal find these macros, as it can't see m4_define. --AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) -- -- --# lt_join(SEP, ARG1, [ARG2...]) --# ----------------------------- --# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their --# associated separator. --# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier --# versions in m4sugar had bugs. --m4_define([lt_join], --[m4_if([$#], [1], [], -- [$#], [2], [[$2]], -- [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) --m4_define([_lt_join], --[m4_if([$#$2], [2], [], -- [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_MODULES], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -+pkg_failed=no -+AC_MSG_CHECKING([for $1]) - --# lt_car(LIST) --# lt_cdr(LIST) --# ------------ --# Manipulate m4 lists. --# These macros are necessary as long as will still need to support --# Autoconf-2.59 which quotes differently. --m4_define([lt_car], [[$1]]) --m4_define([lt_cdr], --[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], -- [$#], 1, [], -- [m4_dquote(m4_shift($@))])]) --m4_define([lt_unquote], $1) -- -- --# lt_append(MACRO-NAME, STRING, [SEPARATOR]) --# ------------------------------------------ --# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. --# Note that neither SEPARATOR nor STRING are expanded; they are appended --# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). --# No SEPARATOR is output if MACRO-NAME was previously undefined (different --# than defined and empty). --# --# This macro is needed until we can rely on Autoconf 2.62, since earlier --# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. --m4_define([lt_append], --[m4_define([$1], -- m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) - -+if test $pkg_failed = yes; then -+ _PKG_SHORT_ERRORS_SUPPORTED -+ if test $_pkg_short_errors_supported = yes; then -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` -+ else -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - --# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) --# ---------------------------------------------------------- --# Produce a SEP delimited list of all paired combinations of elements of --# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list --# has the form PREFIXmINFIXSUFFIXn. --# Needed until we can rely on m4_combine added in Autoconf 2.62. --m4_define([lt_combine], --[m4_if(m4_eval([$# > 3]), [1], -- [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl --[[m4_foreach([_Lt_prefix], [$2], -- [m4_foreach([_Lt_suffix], -- ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, -- [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) -- -- --# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) --# ----------------------------------------------------------------------- --# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited --# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. --m4_define([lt_if_append_uniq], --[m4_ifdef([$1], -- [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], -- [lt_append([$1], [$2], [$3])$4], -- [$5])], -- [lt_append([$1], [$2], [$3])$4])]) -+ ifelse([$4], , [AC_MSG_ERROR(dnl -+[Package requirements ($2) were not met: - -+$$1_PKG_ERRORS - --# lt_dict_add(DICT, KEY, VALUE) --# ----------------------------- --m4_define([lt_dict_add], --[m4_define([$1($2)], [$3])]) -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - -+_PKG_TEXT -+])], -+ [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 -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. - --# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) --# -------------------------------------------- --m4_define([lt_dict_add_subkey], --[m4_define([$1($2:$3)], [$4])]) -+_PKG_TEXT - -+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], -+ [$4]) -+else -+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -+ AC_MSG_RESULT([yes]) -+ ifelse([$3], , :, [$3]) -+fi[]dnl -+])# PKG_CHECK_MODULES - --# lt_dict_fetch(DICT, KEY, [SUBKEY]) --# ---------------------------------- --m4_define([lt_dict_fetch], --[m4_ifval([$3], -- m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), -- m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) -+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. - +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -16305,14 +13339,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.10.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -+]) + ]) --# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) --# ----------------------------------------------------------------- --m4_define([lt_if_dict_fetch], --[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], -- [$5], -- [$6])]) +-# Figure out how to run the assembler. -*- Autoconf -*- +- +-# serial 2 +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. @@ -16320,6 +13351,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) +-# Copyright 2001 Free Software Foundation, Inc. +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. @@ -16330,39 +13362,38 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) --# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) --# -------------------------------------------------------------- --m4_define([lt_dict_filter], --[m4_if([$5], [], [], -- [lt_join(m4_quote(m4_default([$4], [[, ]])), -- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), -- [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl --]) +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +# Figure out how to run the assembler. -*- Autoconf -*- --# ltversion.m4 -- version numbers -*- Autoconf -*- --# --# Copyright (C) 2004 Free Software Foundation, Inc. --# Written by Scott James Remnant, 2004 +-# This program 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 General Public License for more details. +# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # --# This file is free software; the Free Software Foundation gives --# unlimited permission to copy and/or distribute it, with or without --# modifications, as long as this notice is preserved. ++# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. --# Generated from ltversion.in. +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +# serial 5 --# serial 3012 ltversion.m4 --# This file is part of GNU Libtool -+# AM_PROG_AS -+# ---------- -+AC_DEFUN([AM_PROG_AS], -+[# By default we simply use the C compiler to build assembly code. -+AC_REQUIRE([AC_PROG_CC]) + # AM_PROG_AS + # ---------- + AC_DEFUN([AM_PROG_AS], + [# By default we simply use the C compiler to build assembly code. + AC_REQUIRE([AC_PROG_CC]) +-: ${CCAS='$(CC)'} +-# Set ASFLAGS if not already set. +-: ${CCASFLAGS='$(CFLAGS)'} +-AC_SUBST(CCAS) +-AC_SUBST(CCASFLAGS)]) +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS +AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) @@ -16370,29 +13401,25 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl +]) --m4_define([LT_PACKAGE_VERSION], [2.2.6]) --m4_define([LT_PACKAGE_REVISION], [1.3012]) +-# Add --enable-maintainer-mode option to configure. +-# From Jim Meyering +# AM_AUX_DIR_EXPAND -*- Autoconf -*- --AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.2.6' --macro_revision='1.3012' --_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) --_LT_DECL(, macro_revision, 0) --]) +-# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. --# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. - # --# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. --# Written by Scott James Remnant, 2004. ++# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, @@ -16400,98 +13427,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. - # --# This file is free software; the Free Software Foundation gives --# unlimited permission to copy and/or distribute it, with or without --# modifications, as long as this notice is preserved. -- --# serial 4 lt~obsolete.m4 -- --# These exist entirely to fool aclocal when bootstrapping libtool. --# --# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) --# which have later been changed to m4_define as they aren't part of the --# exported API, or moved to Autoconf or Automake where they belong. --# --# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN --# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us --# using a macro with the same name in our local m4/libtool.m4 it'll --# pull the old libtool.m4 in (it doesn't see our shiny new m4_define --# and doesn't know about Autoconf macros at all.) --# --# So we provide this file, which has a silly filename so it's always --# included after everything else. This provides aclocal with the --# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything --# because those macros already exist, or will be overwritten later. --# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. --# --# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. --# Yes, that means every name once taken will need to remain here until --# we give up compatibility with versions before 1.7, at which point --# we need to keep only those names which we still refer to. -- --# This is to help aclocal find these macros, as it can't see m4_define. --AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) -- --m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) --m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) --m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) --m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) --m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) --m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) --m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) --m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) --m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) --m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) --m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) --m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) --m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) --m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) --m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) --m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) --m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) --m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) --m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) --m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) --m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) --m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) --m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) --m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) --m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) --m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) --m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) --m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) --m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) --m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) --m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) --m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) --m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) --m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) --m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) --m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) --m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) --m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) --m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) --m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) --m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) --m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) --m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) --m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) --m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) --m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) --m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) --m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) --m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) --m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) --m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) --m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) --m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) --m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) --m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -- --# Figure out how to run the assembler. -*- Autoconf -*- -- --# serial 2 ++# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing @@ -16518,7 +13454,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. --# Copyright 2001 Free Software Foundation, Inc. +-# This program 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 General Public License for more details. +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl @@ -16526,42 +13465,23 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +am_aux_dir=`cd $ac_aux_dir && pwd` +]) --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. --# This program 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 General Public License for more details. +-# serial 2 +# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. ++ +# serial 4 - --# AM_PROG_AS --# ---------- --AC_DEFUN([AM_PROG_AS], --[# By default we simply use the C compiler to build assembly code. --AC_REQUIRE([AC_PROG_CC]) --: ${CCAS='$(CC)'} --# Set ASFLAGS if not already set. --: ${CCASFLAGS='$(CFLAGS)'} --AC_SUBST(CCAS) --AC_SUBST(CCASFLAGS)]) ++ +# This was merged into AC_PROG_CC in Autoconf. - --# Add --enable-maintainer-mode option to configure. --# From Jim Meyering ++ +AU_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +AC_DIAGNOSE([obsolete], [$0: @@ -16572,31 +13492,18 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +]) +AU_DEFUN([fp_PROG_CC_STDC]) - --# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. ++ +# AM_CONDITIONAL -*- Autoconf -*- - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. ++ +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - --# This program 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 General Public License for more details. ++ +# serial 8 - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. ++ +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. @@ -16620,8 +13527,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) - --# serial 2 ++ +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# @@ -18267,1579 +15173,390 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/aclocal.m4 gtk+2 +]) # _AM_PROG_TAR +m4_include([acinclude.m4]) -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/config.h.in gtk+2.0-2.14.5/config.h.in ---- gtk+2.0-2.14.5.old/config.h.in 2008-11-24 07:41:28.000000000 +0100 -+++ gtk+2.0-2.14.5/config.h.in 2008-11-25 11:09:44.000000000 +0100 -@@ -210,10 +210,6 @@ +diff -Naur gtk+2.0-2.14.7.old/config.h.in gtk+2.0-2.14.7/config.h.in +--- gtk+2.0-2.14.7.old/config.h.in 2009-01-07 22:51:59.000000000 +0100 ++++ gtk+2.0-2.14.7/config.h.in 2009-01-08 08:03:47.000000000 +0100 +@@ -210,6 +210,10 @@ /* Define to 1 if you have the `_NSGetEnviron' function. */ #undef HAVE__NSGETENVIRON --/* Define to the sub-directory in which libtool stores uninstalled libraries. -- */ --#undef LT_OBJDIR -- ++/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++#undef LT_OBJDIR ++ /* Define if <X11/extensions/XIproto.h> needed for xReply */ #undef NEED_XIPROTO_H_FOR_XREPLY -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2.0-2.14.5/configure ---- gtk+2.0-2.14.5.old/configure 2008-11-24 07:41:48.000000000 +0100 -+++ gtk+2.0-2.14.5/configure 2008-11-25 11:09:43.000000000 +0100 -@@ -1,11 +1,11 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.63 for gtk+ 2.14.5. -+# Generated by GNU Autoconf 2.61 for gtk+ 2.14.5. - # - # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>. - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## -@@ -17,7 +17,7 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # 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 -@@ -39,45 +39,17 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --as_nl=' --' --export as_nl --# Printing a long string crashes Solaris 7 /usr/bin/printf. --as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='printf %s\n' -- as_echo_n='printf %s' --else -- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -- as_echo_n='/usr/ucb/echo -n' -- else -- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -- as_echo_n_body='eval -- arg=$1; -- case $arg in -- *"$as_nl"*) -- expr "X$arg" : "X\\(.*\\)$as_nl"; -- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -- esac; -- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -- ' -- export as_echo_n_body -- as_echo_n='sh -c $as_echo_n_body as_echo' -- fi -- export as_echo_body -- as_echo='sh -c $as_echo_body as_echo' --fi -- - # The user is always right. - if test "${PATH_SEPARATOR+set}" != set; then -- PATH_SEPARATOR=: -- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -- PATH_SEPARATOR=';' -- } -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh - fi - - # Support unset when possible. -@@ -93,6 +65,8 @@ - # there to prevent editors from complaining about space-tab. - # (If _AS_PATH_WALK were called with IFS unset, it would disable word - # splitting by setting IFS to empty value.) -+as_nl=' -+' - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -@@ -115,7 +89,7 @@ - as_myself=$0 - fi - if test ! -f "$as_myself"; then -- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } - fi - -@@ -128,10 +102,17 @@ - PS4='+ ' - - # NLS nuisances. --LC_ALL=C --export LC_ALL --LANGUAGE=C --export LANGUAGE -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ fi -+done - - # Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -153,7 +134,7 @@ - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X/"$0" | -+echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q -@@ -179,7 +160,7 @@ - as_have_required=no - fi - -- if test $as_have_required = yes && (eval ": -+ if test $as_have_required = yes && (eval ": - (as_func_return () { - (exit \$1) - } -@@ -261,7 +242,7 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # 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 -@@ -282,7 +263,7 @@ - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -+ # 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 -@@ -362,10 +343,10 @@ - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV -- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- done -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} - fi - - -@@ -434,10 +415,9 @@ - - test \$exitcode = 0") || { - echo No shell found that supports shell functions. -- echo Please tell bug-autoconf@gnu.org about your system, -- echo including any error possibly output before this message. -- echo This can help us improve future autoconf versions. -- echo Configuration will now proceed without shell functions. -+ echo Please tell autoconf@gnu.org about your system, -+ echo including any error possibly output before this -+ echo message - } - - -@@ -473,7 +453,7 @@ - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems -@@ -501,6 +481,7 @@ - *) - ECHO_N='-n';; - esac -+ - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -513,22 +494,19 @@ - rm -f conf$$.dir/conf$$.file - else - rm -f conf$$.dir -- mkdir conf$$.dir 2>/dev/null -+ mkdir conf$$.dir - fi --if (echo >conf$$.file) 2>/dev/null; then -- if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -- elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -- else -+echo >conf$$.file -+if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -- fi -+elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln - else - as_ln_s='cp -p' - fi -@@ -553,10 +531,10 @@ - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then -- test -d "$1/."; -+ test -d "$1/."; - else - case $1 in -- -*)set "./$1";; -+ -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi -@@ -577,22 +555,22 @@ +diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure +--- gtk+2.0-2.14.7.old/configure 2009-01-07 22:52:17.000000000 +0100 ++++ gtk+2.0-2.14.7/configure 2009-01-08 08:03:46.000000000 +0100 +@@ -577,22 +577,22 @@ # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} --case X$lt_ECHO in -+case X$ECHO in +-case X$ECHO in ++case X$lt_ECHO in X*--fallback-echo) # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` -+ ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` +- ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` ++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` ;; esac --ECHO=${lt_ECHO-echo} -+echo=${ECHO-echo} +-echo=${ECHO-echo} ++ECHO=${lt_ECHO-echo} if test "X$1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. shift elif test "X$1" = X--fallback-echo; then # Avoid inline document here, it may be left over : --elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then -- # Yippee, $ECHO works! -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $echo works! +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then +- # Yippee, $echo works! ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $ECHO works! : else # Restart under the correct shell. -@@ -602,9 +580,9 @@ +@@ -602,9 +602,9 @@ if test "X$1" = X--fallback-echo; then # used as fallback echo shift -- cat <<_LT_EOF -+ cat <<EOF +- cat <<EOF ++ cat <<_LT_EOF $* --_LT_EOF -+EOF +-EOF ++_LT_EOF exit 0 fi -@@ -612,116 +590,121 @@ +@@ -612,121 +612,116 @@ # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH --if test -z "$lt_ECHO"; then -- if test "X${echo_test_string+set}" != Xset; then -- # find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if { echo_test_string=`eval $cmd`; } 2>/dev/null && -- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null -- then -- break -- fi -- done -- fi -+if test -z "$ECHO"; then -+if test "X${echo_test_string+set}" != Xset; then -+# find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && -+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -+ then -+ break -+ fi -+ done -+fi +-if test -z "$ECHO"; then +-if test "X${echo_test_string+set}" != Xset; then +-# find a string as large as possible, as long as the shell can cope with it +- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do +- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... +- if (echo_test_string=`eval $cmd`) 2>/dev/null && +- echo_test_string=`eval $cmd` && +- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null +- then +- break +- fi +- done +-fi ++if test -z "$lt_ECHO"; then ++ if test "X${echo_test_string+set}" != Xset; then ++ # find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++ then ++ break ++ fi ++ done ++ fi -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : -- else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. +-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- : +-else +- # The Solaris, AIX, and Digital Unix default echo programs unquote +- # backslashes. This makes it impossible to quote backslashes using +- # echo "$something" | sed 's/\\/\\\\/g' +- # +- # So, first we look for a working echo in the user's PATH. ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++ else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -- IFS="$lt_save_ifs" -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$dir/echo" -- break -- fi -- done -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do +- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for dir in $PATH /usr/ucb; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$dir/echo" ++ break ++ fi ++ done IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$dir/echo" -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" +- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && +- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$dir/echo" +- break +- fi +- done +- IFS="$lt_save_ifs" -- if test "X$ECHO" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- ECHO='print -r' -- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} -- else -- # Try using printf. -- ECHO='printf %s\n' -- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -+ if test "X$echo" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ echo='print -r' -+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} -+ else -+ # Try using printf. -+ echo='printf %s\n' -+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- ECHO="$CONFIG_SHELL $0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- ECHO="$CONFIG_SHELL $0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -- -- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do -- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ echo="$CONFIG_SHELL $0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ echo="$CONFIG_SHELL $0 --fallback-echo" +- if test "X$echo" = Xecho; then +- # We didn't find a better echo, so look for alternatives. +- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # This shell has a builtin print -r that does the trick. +- echo='print -r' +- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && +- test "X$CONFIG_SHELL" != X/bin/ksh; then +- # If we have ksh, try running configure again with it. +- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} +- export ORIGINAL_CONFIG_SHELL +- CONFIG_SHELL=/bin/ksh +- export CONFIG_SHELL +- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} +- else +- # Try using printf. +- echo='printf %s\n' +- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && +- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- # Cool, printf works +- : +- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && +- test "X$echo_testing_string" = "X$echo_test_string"; then +- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL +- export CONFIG_SHELL +- SHELL="$CONFIG_SHELL" +- export SHELL +- echo="$CONFIG_SHELL $0 --fallback-echo" +- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && +- test "X$echo_testing_string" = 'X\t' && +- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ if test "X$ECHO" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ ECHO='print -r' ++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else -+ # maybe with a smaller string... -+ prev=: ++ # Try using printf. ++ ECHO='printf %s\n' ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then +- echo="$CONFIG_SHELL $0 --fallback-echo" +- else +- # maybe with a smaller string... +- prev=: ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ ECHO="$CONFIG_SHELL $0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$CONFIG_SHELL $0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: -- if test "$prev" != 'sed 50q "$0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} -- else -- # Oops. We lost completely, so just stick with echo. -- ECHO=echo -+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do -+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -+ then -+ break - fi -- fi -+ prev="$cmd" -+ done -+ -+ if test "$prev" != 'sed 50q "$0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ echo=echo -+ fi +- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do +- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null +- then +- break +- fi +- prev="$cmd" +- done ++ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do ++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done + +- if test "$prev" != 'sed 50q "$0"'; then +- echo_test_string=`eval $prev` +- export echo_test_string +- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} +- else +- # Oops. We lost completely, so just stick with echo. +- echo=echo +- fi ++ if test "$prev" != 'sed 50q "$0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ ECHO=echo ++ fi ++ fi fi fi fi fi -+fi +-fi # Copy echo and quote the copy suitably for passing to libtool from # the Makefile, instead of quoting the original, which is used later. --lt_ECHO=$ECHO --if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then -- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -+ECHO=$echo -+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then -+ ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +-ECHO=$echo +-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then +- ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" ++lt_ECHO=$ECHO ++if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ++ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi -+tagnames=${tagnames+${tagnames},}CXX -+ -+tagnames=${tagnames+${tagnames},}F77 -+ +-tagnames=${tagnames+${tagnames},}CXX +- +-tagnames=${tagnames+${tagnames},}F77 +- exec 7<&0 </dev/null 6>&1 # Name of the host. -@@ -786,399 +769,372 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='LTLIBOBJS --LIBOBJS --ENABLE_MAN_FALSE --ENABLE_MAN_TRUE --XMLCATALOG --XML_CATALOG_FILE --XSLTPROC --HAVE_DOCBOOK_FALSE --HAVE_DOCBOOK_TRUE --DB2HTML --GTK_DOC_USE_LIBTOOL_FALSE --GTK_DOC_USE_LIBTOOL_TRUE --ENABLE_GTK_DOC_FALSE --ENABLE_GTK_DOC_TRUE --GTKDOC_CHECK --HTML_DIR --TEST_PRINT_BACKEND_FALSE --TEST_PRINT_BACKEND_TRUE --HAVE_HTTP_AUTHSTRING --HAVE_CUPS_FALSE --HAVE_CUPS_TRUE --CUPS_LIBS --CUPS_CFLAGS --CUPS_API_MINOR --CUPS_API_MAJOR --CUPS_CONFIG --GAIL_INET_LIBS --GTK_XIM_FLAGS --GTK_DEBUG_FLAGS --CAIRO_PREFIX --PANGO_PREFIX --ATK_PREFIX --GLIB_PREFIX --GTK_DEP_CFLAGS --GTK_DEP_LIBS --GTK_EXTRA_CFLAGS --GTK_EXTRA_LIBS --GTK_PACKAGES --GDK_PIXBUF_DEP_CFLAGS --GDK_PIXBUF_DEP_LIBS --GDK_PIXBUF_EXTRA_CFLAGS --GDK_PIXBUF_EXTRA_LIBS --GDK_PIXBUF_PACKAGES --GDK_DEP_CFLAGS --GDK_DEP_LIBS --GDK_EXTRA_CFLAGS --GDK_EXTRA_LIBS --GDK_PACKAGES --USE_DIRECTFB_FALSE --USE_DIRECTFB_TRUE --GDK_PIXBUF_XLIB_DEP_CFLAGS --GDK_PIXBUF_XLIB_DEP_LIBS --GDK_PIXBUF_XLIB_EXTRA_CFLAGS --GDK_PIXBUF_XLIB_EXTRA_LIBS --GDK_PIXBUF_XLIB_PACKAGES --USE_QUARTZ_FALSE --USE_QUARTZ_TRUE --USE_WIN32_FALSE --USE_WIN32_TRUE --USE_X11_FALSE --USE_X11_TRUE --XINPUT_XFREE_FALSE --XINPUT_XFREE_TRUE --HAVE_X11R6_FALSE --HAVE_X11R6_TRUE --X_EXTRA_LIBS --X_LIBS --X_PRE_LIBS --X_CFLAGS --XMKMF --REBUILD_PNGS --GTK_UPDATE_ICON_CACHE --GDK_PIXBUF_CSOURCE --CROSS_COMPILING_FALSE --CROSS_COMPILING_TRUE --USE_MMX_FALSE --USE_MMX_TRUE --USE_MEDIALIB25_FALSE --USE_MEDIALIB25_TRUE --USE_MEDIALIB_FALSE --USE_MEDIALIB_TRUE --HAVE_JASPER_FALSE --HAVE_JASPER_TRUE --HAVE_JPEG_FALSE --HAVE_JPEG_TRUE --HAVE_PNG_FALSE --HAVE_PNG_TRUE --HAVE_TIFF_FALSE --HAVE_TIFF_TRUE --INCLUDE_IM_XIM_FALSE --INCLUDE_IM_XIM_TRUE --INCLUDE_IM_VIQR_FALSE --INCLUDE_IM_VIQR_TRUE --INCLUDE_IM_TI_ET_FALSE --INCLUDE_IM_TI_ET_TRUE --INCLUDE_IM_TI_ER_FALSE --INCLUDE_IM_TI_ER_TRUE --INCLUDE_IM_THAI_FALSE --INCLUDE_IM_THAI_TRUE --INCLUDE_IM_MULTIPRESS_FALSE --INCLUDE_IM_MULTIPRESS_TRUE --INCLUDE_IM_IPA_FALSE --INCLUDE_IM_IPA_TRUE --INCLUDE_IM_INUKTITUT_FALSE --INCLUDE_IM_INUKTITUT_TRUE --INCLUDE_IM_IME_FALSE --INCLUDE_IM_IME_TRUE --INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE --INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE --INCLUDE_IM_CEDILLA_FALSE --INCLUDE_IM_CEDILLA_TRUE --INCLUDE_IM_AM_ET_FALSE --INCLUDE_IM_AM_ET_TRUE --INCLUDED_IMMODULE_DEFINE --INCLUDED_IMMODULE_OBJ --HAVE_INCLUDED_IMMMODULES_FALSE --HAVE_INCLUDED_IMMMODULES_TRUE --INCLUDE_GDIPLUS_FALSE --INCLUDE_GDIPLUS_TRUE --INCLUDE_JASPER_FALSE --INCLUDE_JASPER_TRUE --INCLUDE_ICNS_FALSE --INCLUDE_ICNS_TRUE --INCLUDE_PCX_FALSE --INCLUDE_PCX_TRUE --INCLUDE_TGA_FALSE --INCLUDE_TGA_TRUE --INCLUDE_XBM_FALSE --INCLUDE_XBM_TRUE --INCLUDE_XPM_FALSE --INCLUDE_XPM_TRUE --INCLUDE_TIFF_FALSE --INCLUDE_TIFF_TRUE --INCLUDE_RAS_FALSE --INCLUDE_RAS_TRUE --INCLUDE_PNM_FALSE --INCLUDE_PNM_TRUE --INCLUDE_JPEG_FALSE --INCLUDE_JPEG_TRUE --INCLUDE_ANI_FALSE --INCLUDE_ANI_TRUE --INCLUDE_ICO_FALSE --INCLUDE_ICO_TRUE --INCLUDE_GIF_FALSE --INCLUDE_GIF_TRUE --INCLUDE_WBMP_FALSE --INCLUDE_WBMP_TRUE --INCLUDE_BMP_FALSE --INCLUDE_BMP_TRUE --INCLUDE_PNG_FALSE --INCLUDE_PNG_TRUE --INCLUDED_LOADER_DEFINE --INCLUDED_LOADER_OBJ --BUILD_DYNAMIC_MODULES_FALSE --BUILD_DYNAMIC_MODULES_TRUE --LIBJASPER --LIBPNG --LIBJPEG --LIBTIFF --BUILD_GDIPLUS_LOADERS_FALSE --BUILD_GDIPLUS_LOADERS_TRUE --GDK_WLIBS --GLIB_MKENUMS --GOBJECT_QUERY --GLIB_GENMARSHAL --GLIB_LIBS --GLIB_CFLAGS --MKINSTALLDIRS --POSUB --POFILES --PO_IN_DATADIR_FALSE --PO_IN_DATADIR_TRUE --INTLLIBS --INSTOBJEXT --GMOFILES --DATADIRNAME --CATOBJEXT --CATALOGS --XGETTEXT --GMSGFMT --MSGFMT_OPTS --MSGFMT --USE_NLS --REBUILD --INDENT --PERL --DISABLE_EXPLICIT_DEPS_FALSE --DISABLE_EXPLICIT_DEPS_TRUE --LIBTOOL_EXPORT_OPTIONS --BASE_DEPENDENCIES_LIBS --BASE_DEPENDENCIES_CFLAGS --PKG_CONFIG --gtktargetlib --gdktargetlib --gdktarget --MS_LIB_AVAILABLE_FALSE --MS_LIB_AVAILABLE_TRUE --ms_librarian --WINDRES --OS_LINUX_FALSE --OS_LINUX_TRUE --OS_UNIX_FALSE --OS_UNIX_TRUE --OS_WIN32_FALSE --OS_WIN32_TRUE --PLATFORM_WIN32_FALSE --PLATFORM_WIN32_TRUE --MAINT --MAINTAINER_MODE_FALSE --MAINTAINER_MODE_TRUE --CCASFLAGS --CCAS --CXXCPP --CPP --OTOOL64 --OTOOL --LIPO --NMEDIT --DSYMUTIL --lt_ECHO --RANLIB --AR --LN_S +@@ -838,6 +833,7 @@ + GDK_DEP_LIBS + GDK_EXTRA_CFLAGS + GDK_EXTRA_LIBS ++GDK_PRIVATE_PACKAGES + GDK_PACKAGES + USE_DIRECTFB_FALSE + USE_DIRECTFB_TRUE +@@ -1001,27 +997,34 @@ + MAINT + MAINTAINER_MODE_FALSE + MAINTAINER_MODE_TRUE -NM --ac_ct_DUMPBIN --DUMPBIN --LD --FGREP --EGREP --GREP --SED ++am__fastdepCCAS_FALSE ++am__fastdepCCAS_TRUE ++CCASDEPMODE + CCASFLAGS + CCAS -LIBTOOL +-ac_ct_F77 +-FFLAGS +-F77 + CXXCPP + CPP -OBJDUMP --DLLTOOL -AS --HAVE_OBJC_FALSE --HAVE_OBJC_TRUE --HAVE_CXX_FALSE --HAVE_CXX_TRUE --am__fastdepCXX_FALSE --am__fastdepCXX_TRUE --CXXDEPMODE --CXXFLAGS --ac_ct_CXX --CXX --am__fastdepCC_FALSE --am__fastdepCC_TRUE --CCDEPMODE --AMDEPBACKSLASH --AMDEP_FALSE --AMDEP_TRUE --am__quote --am__include --DEPDIR --OBJEXT --EXEEXT --ac_ct_CC --CPPFLAGS --LDFLAGS --CFLAGS --CC --LIB_EXE_MACHINE_FLAG --host_os --host_vendor --host_cpu --host --build_os --build_vendor --build_cpu --build --GETTEXT_PACKAGE --GDK_PIXBUF_VERSION --GDK_PIXBUF_MICRO --GDK_PIXBUF_MINOR --GDK_PIXBUF_MAJOR --GAIL_LT_CURRENT_MINUS_AGE --GAIL_LT_VERSION_INFO --LT_CURRENT_MINUS_AGE --LT_VERSION_INFO --GTK_BINARY_VERSION --GTK_VERSION --GTK_API_VERSION --GTK_BINARY_AGE --GTK_INTERFACE_AGE --GTK_MICRO_VERSION --GTK_MINOR_VERSION --GTK_MAJOR_VERSION --am__leading_dot --SET_MAKE --AWK --INSTALL_STRIP_PROGRAM --STRIP --install_sh --AMTAR --MAKEINFO --AUTOHEADER --AUTOMAKE --AUTOCONF --ACLOCAL --VERSION --PACKAGE --CYGPATH_W --INSTALL_DATA --INSTALL_SCRIPT --INSTALL_PROGRAM --target_alias --host_alias --build_alias --LIBS --ECHO_T --ECHO_N --ECHO_C --DEFS --mandir --localedir --libdir --psdir --pdfdir --dvidir --htmldir --infodir --docdir --oldincludedir --includedir --localstatedir --sharedstatedir --sysconfdir --datadir --datarootdir --libexecdir --sbindir --bindir --program_transform_name --prefix --exec_prefix --PACKAGE_BUGREPORT --PACKAGE_STRING --PACKAGE_VERSION --PACKAGE_TARNAME --PACKAGE_NAME -+ac_subst_vars='SHELL - PATH_SEPARATOR --SHELL' --ac_subst_files='' --ac_user_opts=' --enable_option_checking --enable_dependency_tracking --enable_static --enable_shared --with_pic --enable_fast_install --with_gnu_ld --enable_libtool_lock --enable_largefile --enable_maintainer_mode --enable_debug --enable_shm --enable_xkb --enable_xinerama --enable_rebuilds --enable_visibility --with_xinput --with_gdktarget --enable_explicit_deps --enable_glibtest --enable_modules --with_libpng --with_libjpeg --with_libtiff --with_libjasper --enable_gdiplus --with_included_loaders --with_included_immodules --with_x --enable_cups --enable_test_print_backend --with_html_dir --enable_gtk_doc --enable_man --with_xml_catalog --' -- ac_precious_vars='build_alias -+PACKAGE_NAME -+PACKAGE_TARNAME -+PACKAGE_VERSION -+PACKAGE_STRING -+PACKAGE_BUGREPORT -+exec_prefix -+prefix -+program_transform_name -+bindir -+sbindir -+libexecdir -+datarootdir -+datadir -+sysconfdir -+sharedstatedir -+localstatedir -+includedir -+oldincludedir -+docdir -+infodir -+htmldir -+dvidir -+pdfdir -+psdir -+libdir -+localedir -+mandir -+DEFS -+ECHO_C -+ECHO_N -+ECHO_T -+LIBS -+build_alias - host_alias - target_alias -+INSTALL_PROGRAM -+INSTALL_SCRIPT -+INSTALL_DATA -+am__isrc -+CYGPATH_W -+PACKAGE -+VERSION -+ACLOCAL -+AUTOCONF -+AUTOMAKE -+AUTOHEADER -+MAKEINFO -+install_sh -+STRIP -+INSTALL_STRIP_PROGRAM -+mkdir_p -+AWK -+SET_MAKE -+am__leading_dot -+AMTAR -+am__tar -+am__untar -+GTK_MAJOR_VERSION -+GTK_MINOR_VERSION -+GTK_MICRO_VERSION -+GTK_INTERFACE_AGE -+GTK_BINARY_AGE -+GTK_API_VERSION -+GTK_VERSION -+GTK_BINARY_VERSION -+LT_VERSION_INFO -+LT_CURRENT_MINUS_AGE -+GAIL_LT_VERSION_INFO -+GAIL_LT_CURRENT_MINUS_AGE -+GDK_PIXBUF_MAJOR -+GDK_PIXBUF_MINOR -+GDK_PIXBUF_MICRO -+GDK_PIXBUF_VERSION -+GETTEXT_PACKAGE -+build -+build_cpu -+build_vendor -+build_os -+host -+host_cpu -+host_vendor -+host_os -+LIB_EXE_MACHINE_FLAG - CC - CFLAGS - LDFLAGS --LIBS - CPPFLAGS -+ac_ct_CC -+EXEEXT -+OBJEXT -+DEPDIR -+am__include -+am__quote -+AMDEP_TRUE -+AMDEP_FALSE -+AMDEPBACKSLASH -+CCDEPMODE -+am__fastdepCC_TRUE -+am__fastdepCC_FALSE -+ENABLE_STATIC_TRUE -+ENABLE_STATIC_FALSE - CXX -+ac_ct_CXX - CXXFLAGS --CCC -+CXXDEPMODE -+am__fastdepCXX_TRUE -+am__fastdepCXX_FALSE -+HAVE_CXX_TRUE -+HAVE_CXX_FALSE -+HAVE_OBJC_TRUE -+HAVE_OBJC_FALSE -+SED -+GREP -+EGREP -+LN_S -+ECHO -+AR -+RANLIB -+DSYMUTIL -+NMEDIT +-DLLTOOL ++OTOOL64 ++OTOOL ++LIPO + NMEDIT + DSYMUTIL ++lt_ECHO + RANLIB + AR +-ECHO + LN_S ++NM ++ac_ct_DUMPBIN ++DUMPBIN ++LD ++FGREP + EGREP + GREP + SED ++LIBTOOL ++OBJDUMP +DLLTOOL +AS -+OBJDUMP + HAVE_OBJC_FALSE + HAVE_OBJC_TRUE + HAVE_CXX_FALSE +@@ -1032,6 +1035,8 @@ + CXXFLAGS + ac_ct_CXX + CXX ++ENABLE_STATIC_FALSE ++ENABLE_STATIC_TRUE + am__fastdepCC_FALSE + am__fastdepCC_TRUE + CCDEPMODE +@@ -1074,13 +1079,17 @@ + GTK_MICRO_VERSION + GTK_MINOR_VERSION + GTK_MAJOR_VERSION ++am__untar ++am__tar ++AMTAR + am__leading_dot + SET_MAKE + AWK ++mkdir_p ++MKDIR_P + INSTALL_STRIP_PROGRAM + STRIP + install_sh +-AMTAR + MAKEINFO + AUTOHEADER + AUTOMAKE +@@ -1089,6 +1098,7 @@ + VERSION + PACKAGE + CYGPATH_W ++am__isrc + INSTALL_DATA + INSTALL_SCRIPT + INSTALL_PROGRAM +@@ -1135,11 +1145,10 @@ + enable_dependency_tracking + enable_static + enable_shared ++with_pic + enable_fast_install + with_gnu_ld + enable_libtool_lock +-with_pic +-with_tags + enable_largefile + enable_maintainer_mode + enable_debug +@@ -1181,8 +1190,8 @@ + CCC CPP CXXCPP -+F77 -+FFLAGS -+ac_ct_F77 -+LIBTOOL -+CCAS -+CCASFLAGS -+CCASDEPMODE -+am__fastdepCCAS_TRUE -+am__fastdepCCAS_FALSE -+NM -+MAINTAINER_MODE_TRUE -+MAINTAINER_MODE_FALSE -+MAINT -+PLATFORM_WIN32_TRUE -+PLATFORM_WIN32_FALSE -+OS_WIN32_TRUE -+OS_WIN32_FALSE -+OS_UNIX_TRUE -+OS_UNIX_FALSE -+OS_LINUX_TRUE -+OS_LINUX_FALSE -+WINDRES -+ms_librarian -+MS_LIB_AVAILABLE_TRUE -+MS_LIB_AVAILABLE_FALSE -+gdktarget -+gdktargetlib -+gtktargetlib -+PKG_CONFIG -+BASE_DEPENDENCIES_CFLAGS -+BASE_DEPENDENCIES_LIBS -+LIBTOOL_EXPORT_OPTIONS -+DISABLE_EXPLICIT_DEPS_TRUE -+DISABLE_EXPLICIT_DEPS_FALSE -+PERL -+INDENT -+REBUILD -+USE_NLS -+MSGFMT -+MSGFMT_OPTS -+GMSGFMT -+XGETTEXT -+CATALOGS -+CATOBJEXT -+DATADIRNAME -+GMOFILES -+INSTOBJEXT -+INTLLIBS -+PO_IN_DATADIR_TRUE -+PO_IN_DATADIR_FALSE -+POFILES -+POSUB -+MKINSTALLDIRS -+GLIB_CFLAGS -+GLIB_LIBS -+GLIB_GENMARSHAL -+GOBJECT_QUERY -+GLIB_MKENUMS -+GDK_WLIBS -+BUILD_GDIPLUS_LOADERS_TRUE -+BUILD_GDIPLUS_LOADERS_FALSE -+LIBTIFF -+LIBJPEG -+LIBPNG -+LIBJASPER -+BUILD_DYNAMIC_MODULES_TRUE -+BUILD_DYNAMIC_MODULES_FALSE -+INCLUDED_LOADER_OBJ -+INCLUDED_LOADER_DEFINE -+INCLUDE_PNG_TRUE -+INCLUDE_PNG_FALSE -+INCLUDE_BMP_TRUE -+INCLUDE_BMP_FALSE -+INCLUDE_WBMP_TRUE -+INCLUDE_WBMP_FALSE -+INCLUDE_GIF_TRUE -+INCLUDE_GIF_FALSE -+INCLUDE_ICO_TRUE -+INCLUDE_ICO_FALSE -+INCLUDE_ANI_TRUE -+INCLUDE_ANI_FALSE -+INCLUDE_JPEG_TRUE -+INCLUDE_JPEG_FALSE -+INCLUDE_PNM_TRUE -+INCLUDE_PNM_FALSE -+INCLUDE_RAS_TRUE -+INCLUDE_RAS_FALSE -+INCLUDE_TIFF_TRUE -+INCLUDE_TIFF_FALSE -+INCLUDE_XPM_TRUE -+INCLUDE_XPM_FALSE -+INCLUDE_XBM_TRUE -+INCLUDE_XBM_FALSE -+INCLUDE_TGA_TRUE -+INCLUDE_TGA_FALSE -+INCLUDE_PCX_TRUE -+INCLUDE_PCX_FALSE -+INCLUDE_ICNS_TRUE -+INCLUDE_ICNS_FALSE -+INCLUDE_JASPER_TRUE -+INCLUDE_JASPER_FALSE -+INCLUDE_GDIPLUS_TRUE -+INCLUDE_GDIPLUS_FALSE -+HAVE_INCLUDED_IMMMODULES_TRUE -+HAVE_INCLUDED_IMMMODULES_FALSE -+INCLUDED_IMMODULE_OBJ -+INCLUDED_IMMODULE_DEFINE -+INCLUDE_IM_AM_ET_TRUE -+INCLUDE_IM_AM_ET_FALSE -+INCLUDE_IM_CEDILLA_TRUE -+INCLUDE_IM_CEDILLA_FALSE -+INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE -+INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE -+INCLUDE_IM_IME_TRUE -+INCLUDE_IM_IME_FALSE -+INCLUDE_IM_INUKTITUT_TRUE -+INCLUDE_IM_INUKTITUT_FALSE -+INCLUDE_IM_IPA_TRUE -+INCLUDE_IM_IPA_FALSE -+INCLUDE_IM_MULTIPRESS_TRUE -+INCLUDE_IM_MULTIPRESS_FALSE -+INCLUDE_IM_THAI_TRUE -+INCLUDE_IM_THAI_FALSE -+INCLUDE_IM_TI_ER_TRUE -+INCLUDE_IM_TI_ER_FALSE -+INCLUDE_IM_TI_ET_TRUE -+INCLUDE_IM_TI_ET_FALSE -+INCLUDE_IM_VIQR_TRUE -+INCLUDE_IM_VIQR_FALSE -+INCLUDE_IM_XIM_TRUE -+INCLUDE_IM_XIM_FALSE -+HAVE_TIFF_TRUE -+HAVE_TIFF_FALSE -+HAVE_PNG_TRUE -+HAVE_PNG_FALSE -+HAVE_JPEG_TRUE -+HAVE_JPEG_FALSE -+HAVE_JASPER_TRUE -+HAVE_JASPER_FALSE -+USE_MEDIALIB_TRUE -+USE_MEDIALIB_FALSE -+USE_MEDIALIB25_TRUE -+USE_MEDIALIB25_FALSE -+USE_MMX_TRUE -+USE_MMX_FALSE -+CROSS_COMPILING_TRUE -+CROSS_COMPILING_FALSE -+GDK_PIXBUF_CSOURCE -+GTK_UPDATE_ICON_CACHE -+REBUILD_PNGS -+XMKMF -+X_CFLAGS -+X_PRE_LIBS -+X_LIBS -+X_EXTRA_LIBS -+HAVE_X11R6_TRUE -+HAVE_X11R6_FALSE -+XINPUT_XFREE_TRUE -+XINPUT_XFREE_FALSE -+USE_X11_TRUE -+USE_X11_FALSE -+USE_WIN32_TRUE -+USE_WIN32_FALSE -+USE_QUARTZ_TRUE -+USE_QUARTZ_FALSE -+GDK_PIXBUF_XLIB_PACKAGES -+GDK_PIXBUF_XLIB_EXTRA_LIBS -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS -+GDK_PIXBUF_XLIB_DEP_LIBS -+GDK_PIXBUF_XLIB_DEP_CFLAGS -+USE_DIRECTFB_TRUE -+USE_DIRECTFB_FALSE -+GDK_PACKAGES -+GDK_PRIVATE_PACKAGES -+GDK_EXTRA_LIBS -+GDK_EXTRA_CFLAGS -+GDK_DEP_LIBS -+GDK_DEP_CFLAGS -+GDK_PIXBUF_PACKAGES -+GDK_PIXBUF_EXTRA_LIBS -+GDK_PIXBUF_EXTRA_CFLAGS -+GDK_PIXBUF_DEP_LIBS -+GDK_PIXBUF_DEP_CFLAGS -+GTK_PACKAGES -+GTK_EXTRA_LIBS -+GTK_EXTRA_CFLAGS -+GTK_DEP_LIBS -+GTK_DEP_CFLAGS -+GLIB_PREFIX -+ATK_PREFIX -+PANGO_PREFIX -+CAIRO_PREFIX -+GTK_DEBUG_FLAGS -+GTK_XIM_FLAGS -+GAIL_INET_LIBS -+CUPS_CONFIG -+CUPS_API_MAJOR -+CUPS_API_MINOR -+CUPS_CFLAGS -+CUPS_LIBS -+HAVE_CUPS_TRUE -+HAVE_CUPS_FALSE -+HAVE_HTTP_AUTHSTRING -+TEST_PRINT_BACKEND_TRUE -+TEST_PRINT_BACKEND_FALSE -+HTML_DIR -+GTKDOC_CHECK -+ENABLE_GTK_DOC_TRUE -+ENABLE_GTK_DOC_FALSE -+GTK_DOC_USE_LIBTOOL_TRUE -+GTK_DOC_USE_LIBTOOL_FALSE -+DB2HTML -+HAVE_DOCBOOK_TRUE -+HAVE_DOCBOOK_FALSE -+XSLTPROC -+XML_CATALOG_FILE -+XMLCATALOG -+ENABLE_MAN_TRUE -+ENABLE_MAN_FALSE -+LIBOBJS -+LTLIBOBJS' -+ac_subst_files='' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CXX -+CXXFLAGS -+CCC -+CPP -+CXXCPP -+F77 -+FFLAGS +-F77 +-FFLAGS +CCAS +CCASFLAGS PKG_CONFIG BASE_DEPENDENCIES_CFLAGS BASE_DEPENDENCIES_LIBS -@@ -1188,8 +1144,6 @@ - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false --ac_unrecognized_opts= --ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -1288,21 +1242,13 @@ - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) -- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_useropt_orig=$ac_useropt -- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -- case $ac_user_opts in -- *" --"enable_$ac_useropt" --"*) ;; -- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -- ac_unrecognized_sep=', ';; -- esac -- eval enable_$ac_useropt=no ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; -@@ -1315,21 +1261,13 @@ - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_useropt_orig=$ac_useropt -- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -- case $ac_user_opts in -- *" --"enable_$ac_useropt" --"*) ;; -- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -- ac_unrecognized_sep=', ';; -- esac -- eval enable_$ac_useropt=\$ac_optarg ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -1520,38 +1458,22 @@ - ac_init_version=: ;; - - -with-* | --with-*) -- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_useropt_orig=$ac_useropt -- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -- case $ac_user_opts in -- *" --"with_$ac_useropt" --"*) ;; -- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -- ac_unrecognized_sep=', ';; -- esac -- eval with_$ac_useropt=\$ac_optarg ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) -- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_useropt_orig=$ac_useropt -- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -- case $ac_user_opts in -- *" --"with_$ac_useropt" --"*) ;; -- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -- ac_unrecognized_sep=', ';; -- esac -- eval with_$ac_useropt=no ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. -@@ -1571,7 +1493,7 @@ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -+ -*) { echo "$as_me: error: unrecognized option: $ac_option - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; -@@ -1580,16 +1502,16 @@ - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - -@@ -1598,38 +1520,22 @@ - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 -+ { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } - fi - --if test -n "$ac_unrecognized_opts"; then -- case $enable_option_checking in -- no) ;; -- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 -- { (exit 1); exit 1; }; } ;; -- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; -- esac --fi -- --# Check all directory arguments for consistency. -+# Be sure to have absolute directory names. - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir - do - eval ac_val=\$$ac_var -- # Remove trailing slashes. -- case $ac_val in -- */ ) -- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -- eval $ac_var=\$ac_val;; -- esac -- # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } - done - -@@ -1644,7 +1550,7 @@ - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes -@@ -1660,10 +1566,10 @@ - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- { $as_echo "$as_me: error: working directory cannot be determined" >&2 -+ { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -@@ -1671,12 +1577,12 @@ - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. -- ac_confdir=`$as_dirname -- "$as_myself" || --$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_myself" : 'X\(//\)[^/]' \| \ -- X"$as_myself" : 'X\(//\)$' \| \ -- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_myself" | -+ ac_confdir=`$as_dirname -- "$0" || -+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$0" : 'X\(//\)[^/]' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -1703,12 +1609,12 @@ - fi - if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi - ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" - ac_abs_confdir=`( -- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 -+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` - # When building in place, set srcdir=. -@@ -1757,9 +1663,9 @@ - - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -1769,25 +1675,25 @@ - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -- --infodir=DIR info documentation [DATAROOTDIR/info] -- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -- --mandir=DIR man documentation [DATAROOTDIR/man] -- --docdir=DIR documentation root [DATAROOTDIR/doc/gtk+] -- --htmldir=DIR html documentation [DOCDIR] -- --dvidir=DIR dvi documentation [DOCDIR] -- --pdfdir=DIR pdf documentation [DOCDIR] -- --psdir=DIR ps documentation [DOCDIR] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/gtk+] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -1814,19 +1720,18 @@ - cat <<\_ACEOF - - Optional Features: -- --disable-option-checking ignore unrecognized --enable/--with options +@@ -1821,16 +1830,16 @@ + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking Speeds up one-time builds @@ -19859,273 +15576,30 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. --enable-debug=[no/minimum/yes] turn on debugging [default=minimum] --enable-shm support shared memory if available [default=yes] -@@ -1852,9 +1757,10 @@ +@@ -1856,10 +1865,9 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] -- --with-gnu-ld assume the C compiler uses GNU ld [default=no] -+ --with-tags[=TAGS] include additional configurations [automatic] +- --with-tags[=TAGS] include additional configurations [automatic] ++ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-xinput=[no/yes] support XInput --with-gdktarget=[x11/win32/quartz/directfb] select non-default GDK target --without-libpng disable PNG loader for gdk-pixbuf -@@ -1882,6 +1788,10 @@ +@@ -1887,8 +1895,8 @@ CXXFLAGS C++ compiler flags CPP C preprocessor CXXCPP C++ preprocessor -+ F77 Fortran 77 compiler command -+ FFLAGS Fortran 77 compiler flags +- F77 Fortran 77 compiler command +- FFLAGS Fortran 77 compiler flags + CCAS assembler compiler command (defaults to CC) + CCASFLAGS assembler compiler flags (defaults to CFLAGS) PKG_CONFIG path to pkg-config utility BASE_DEPENDENCIES_CFLAGS C compiler flags for BASE_DEPENDENCIES, overriding pkg-config -@@ -1900,17 +1810,15 @@ - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d "$ac_dir" || -- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -- continue -+ test -d "$ac_dir" || continue - ac_builddir=. - - case "$ac_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -1946,7 +1854,7 @@ - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else -- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -@@ -1956,10 +1864,10 @@ - if $ac_init_version; then - cat <<\_ACEOF - gtk+ configure 2.14.5 --generated by GNU Autoconf 2.63 -+generated by GNU Autoconf 2.61 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1970,7 +1878,7 @@ - running configure, to aid debugging if configure makes a mistake. - - It was created by gtk+ $as_me 2.14.5, which was --generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -@@ -2006,7 +1914,7 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- $as_echo "PATH: $as_dir" -+ echo "PATH: $as_dir" - done - IFS=$as_save_IFS - -@@ -2041,7 +1949,7 @@ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) -- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -@@ -2093,12 +2001,11 @@ - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 --$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac -@@ -2128,9 +2035,9 @@ - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- $as_echo "$ac_var='\''$ac_val'\''" -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - -@@ -2145,9 +2052,9 @@ - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- $as_echo "$ac_var='\''$ac_val'\''" -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -2163,8 +2070,8 @@ - echo - fi - test "$ac_signal" != 0 && -- $as_echo "$as_me: caught signal $ac_signal" -- $as_echo "$as_me: exit $exit_status" -+ echo "$as_me: caught signal $ac_signal" -+ echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -@@ -2206,24 +2113,21 @@ - - - # Let the site file select an alternate cache file if it wants to. --# Prefer an explicitly selected file to automatically selected ones. --ac_site_file1=NONE --ac_site_file2=NONE -+# Prefer explicitly selected file to automatically selected ones. - if test -n "$CONFIG_SITE"; then -- ac_site_file1=$CONFIG_SITE -+ set x "$CONFIG_SITE" - elif test "x$prefix" != xNONE; then -- ac_site_file1=$prefix/share/config.site -- ac_site_file2=$prefix/etc/config.site -+ set x "$prefix/share/config.site" "$prefix/etc/config.site" - else -- ac_site_file1=$ac_default_prefix/share/config.site -- ac_site_file2=$ac_default_prefix/etc/config.site -+ set x "$ac_default_prefix/share/config.site" \ -+ "$ac_default_prefix/etc/config.site" - fi --for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+shift -+for ac_site_file - do -- test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then -- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --$as_echo "$as_me: loading site script $ac_site_file" >&6;} -+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -+echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -@@ -2233,16 +2137,16 @@ - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then -- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 --$as_echo "$as_me: loading cache $cache_file" >&6;} -+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi - else -- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 --$as_echo "$as_me: creating cache $cache_file" >&6;} -+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - -@@ -2256,38 +2160,29 @@ - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- # differences in whitespace do not lead to failure. -- ac_old_val_w=`echo x $ac_old_val` -- ac_new_val_w=`echo x $ac_new_val` -- if test "$ac_old_val_w" != "$ac_new_val_w"; then -- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- ac_cache_corrupted=: -- else -- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 --$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -- eval $ac_var=\$ac_old_val -- fi -- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 --$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 --$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} -+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -+echo "$as_me: former value: $ac_old_val" >&2;} -+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -+echo "$as_me: current value: $ac_new_val" >&2;} -+ ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in -@@ -2297,12 +2192,10 @@ - fi - done - if $ac_cache_corrupted; then -- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -2343,7 +2236,8 @@ +@@ -2350,7 +2358,8 @@ # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} @@ -20135,157 +15609,23 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then -@@ -2361,8 +2255,8 @@ - fi - done - if test -z "$ac_aux_dir"; then -- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 --$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } - fi +@@ -2530,7 +2539,6 @@ + ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' + program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -@@ -2388,12 +2282,11 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --# Reject install programs that cannot install multiple files. --{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --$as_echo_n "checking for a BSD-compatible install... " >&6; } -+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -2422,29 +2315,17 @@ - # program-specific install script used by HP pwplus--don't use. - : - else -- rm -rf conftest.one conftest.two conftest.dir -- echo one > conftest.one -- echo two > conftest.two -- mkdir conftest.dir -- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -- test -s conftest.one && test -s conftest.two && -- test -s conftest.dir/conftest.one && -- test -s conftest.dir/conftest.two -- then -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 - fi - fi - done - done - ;; - esac - - done - IFS=$as_save_IFS - --rm -rf conftest.one conftest.two conftest.dir - - fi - if test "${ac_cv_path_install+set}" = set; then -@@ -2457,8 +2338,8 @@ - INSTALL=$ac_install_sh - fi - fi --{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 --$as_echo "$INSTALL" >&6; } -+{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -2468,8 +2349,8 @@ - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 --$as_echo_n "checking whether build environment is sane... " >&6; } -+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } - # Just in case - sleep 1 - echo timestamp > conftest.file -@@ -2492,9 +2373,9 @@ - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". -- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&5 --$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken - alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -2505,24 +2386,26 @@ - # Ok. - : - else -- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! - Check your system clock" >&5 --$as_echo "$as_me: error: newly created file is older than distributed files! -+echo "$as_me: error: newly created file is older than distributed files! - Check your system clock" >&2;} - { (exit 1); exit 1; }; } - fi --{ $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" --# Double any \ or $. -+# Double any \ or $. echo might interpret backslashes. - # By default was `s,x,x', remove it if useless. --ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' --program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -- -+cat <<\_ACEOF >conftest.sed -+s/[\\$]/&&/g;s/;s,x,x,$// -+_ACEOF -+program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -+rm -f conftest.sed - # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -@@ -2533,18 +2416,66 @@ - am_missing_run="$MISSING --run " - else - am_missing_run= -- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 --$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + +@@ -2544,6 +2552,54 @@ + $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi --for ac_prog in gawk mawk nawk awk --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AWK+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin @@ -20320,8 +15660,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + MKDIR_P="$ac_install_sh -d" + fi +fi -+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -+echo "${ECHO_T}$MKDIR_P" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++$as_echo "$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in @@ -20329,76 +15669,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + -+for ac_prog in gawk mawk nawk awk -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_AWK+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -@@ -2557,7 +2488,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2568,23 +2499,22 @@ - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 --$as_echo "$AWK" >&6; } -+ { echo "$as_me:$LINENO: result: $AWK" >&5 -+echo "${ECHO_T}$AWK" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - - test -n "$AWK" && break - done - --{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } --set x ${MAKE-make} --ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` - if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.make <<\_ACEOF - SHELL = /bin/sh -@@ -2601,12 +2531,12 @@ - rm -f conftest.make - fi - if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - SET_MAKE= - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -2619,12 +2549,16 @@ + for ac_prog in gawk mawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -2626,12 +2682,16 @@ fi rmdir .tst 2>/dev/null @@ -20406,21 +15680,20 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 --$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then -+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} ++ { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 + $as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi fi # test whether we have cygpath -@@ -2658,10 +2592,7 @@ +@@ -2665,10 +2725,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} @@ -20432,100 +15705,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right -@@ -2671,10 +2602,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_STRIP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -@@ -2687,7 +2618,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2698,11 +2629,11 @@ - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 --$as_echo "$STRIP" >&6; } -+ { echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -2711,10 +2642,10 @@ - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -@@ -2727,7 +2658,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2738,11 +2669,11 @@ - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --$as_echo "$ac_ct_STRIP" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_STRIP" = x; then -@@ -2750,8 +2681,12 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - STRIP=$ac_ct_STRIP -@@ -2761,10 +2696,17 @@ +@@ -2768,10 +2825,17 @@ fi fi @@ -20544,925 +15724,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -@@ -2848,34 +2790,34 @@ - - # Make sure we can run config.sub. - $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 --$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - --{ $as_echo "$as_me:$LINENO: checking build system type" >&5 --$as_echo_n "checking build system type... " >&6; } -+{ echo "$as_me:$LINENO: checking build system type" >&5 -+echo $ECHO_N "checking build system type... $ECHO_C" >&6; } - if test "${ac_cv_build+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_build_alias=$build_alias - test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` - test "x$ac_build_alias" = x && -- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -+echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } - ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 --$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --$as_echo "$ac_cv_build" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+echo "${ECHO_T}$ac_cv_build" >&6; } - case $ac_cv_build in - *-*-*) ;; --*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 --$as_echo "$as_me: error: invalid value of canonical build" >&2;} -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -+echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; - esac - build=$ac_cv_build -@@ -2892,27 +2834,27 @@ - case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --{ $as_echo "$as_me:$LINENO: checking host system type" >&5 --$as_echo_n "checking host system type... " >&6; } -+{ echo "$as_me:$LINENO: checking host system type" >&5 -+echo $ECHO_N "checking host system type... $ECHO_C" >&6; } - if test "${ac_cv_host+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build - else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 --$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --$as_echo "$ac_cv_host" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+echo "${ECHO_T}$ac_cv_host" >&6; } - case $ac_cv_host in - *-*-*) ;; --*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 --$as_echo "$as_me: error: invalid value of canonical host" >&2;} -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -+echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; - esac - host=$ac_cv_host -@@ -2931,8 +2873,8 @@ - - - MATH_LIB=-lm --{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5 --$as_echo_n "checking for native Win32... " >&6; } -+{ echo "$as_me:$LINENO: checking for native Win32" >&5 -+echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } - LIB_EXE_MACHINE_FLAG=X86 - case "$host" in - *-*-mingw*) -@@ -2949,8 +2891,8 @@ - os_win32=no - ;; - esac --{ $as_echo "$as_me:$LINENO: result: $os_win32" >&5 --$as_echo "$os_win32" >&6; } -+{ echo "$as_me:$LINENO: result: $os_win32" >&5 -+echo "${ECHO_T}$os_win32" >&6; } - - - -@@ -2968,10 +2910,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2984,7 +2926,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -2995,11 +2937,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 --$as_echo "$CC" >&6; } -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -3008,10 +2950,10 @@ - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3024,7 +2966,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3035,11 +2977,11 @@ - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --$as_echo "$ac_ct_CC" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test "x$ac_ct_CC" = x; then -@@ -3047,8 +2989,12 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - CC=$ac_ct_CC -@@ -3061,10 +3007,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3077,7 +3023,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3088,11 +3034,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 --$as_echo "$CC" >&6; } -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -3101,10 +3047,10 @@ - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3122,7 +3068,7 @@ - continue - fi - ac_cv_prog_CC="cc" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3145,11 +3091,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 --$as_echo "$CC" >&6; } -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -3160,10 +3106,10 @@ - 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 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -3176,7 +3122,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3187,11 +3133,11 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { $as_echo "$as_me:$LINENO: result: $CC" >&5 --$as_echo "$CC" >&6; } -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -3204,10 +3150,10 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -3220,7 +3166,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -3231,11 +3177,11 @@ - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --$as_echo "$ac_ct_CC" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -3247,8 +3193,12 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - CC=$ac_ct_CC -@@ -3258,50 +3208,44 @@ - fi - - --test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -+echo "$as_me: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 --set X $ac_compile --ac_compiler=$2 -+echo "$as_me:$LINENO: checking for C compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` - { (ac_try="$ac_compiler --version >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -v >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -V >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF -@@ -3320,22 +3264,27 @@ - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --$as_echo_n "checking for C compiler default output file name... " >&6; } --ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -- --# The possible output files: --ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -- -+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+# -+# List of possible output files, starting from the most likely. -+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -+# only as a last resort. b.out is created by i960 compilers. -+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -+# -+# The IRIX 6 linker writes into existing files which may not be -+# executable, retaining their permissions. Remove them first so a -+# subsequent execution test works. - ac_rmfiles= - for ac_file in $ac_files - do - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac - done -@@ -3346,11 +3295,10 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. - # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -@@ -3361,7 +3309,7 @@ - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most -@@ -3388,27 +3336,25 @@ - ac_file='' - fi - --{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 --$as_echo "$ac_file" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_file" >&5 -+echo "${ECHO_T}$ac_file" >&6; } - if test -z "$ac_file"; then -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: C compiler cannot create executables -+echo "$as_me: error: C compiler cannot create executables - See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; }; } -+ { (exit 77); exit 77; }; } - fi - - ac_exeext=$ac_cv_exeext - - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --$as_echo_n "checking whether the C compiler works... " >&6; } -+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } - # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then -@@ -3417,53 +3363,49 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run C compiled programs. -+echo "$as_me: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - fi - fi - fi --{ $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -+rm -f a.out a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --$as_echo_n "checking whether we are cross compiling... " >&6; } --{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 --$as_echo "$cross_compiling" >&6; } -+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+echo "${ECHO_T}$cross_compiling" >&6; } - --{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 --$as_echo_n "checking for suffix of executables... " >&6; } -+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -@@ -3472,33 +3414,31 @@ - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac - done - else -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - fi - - rm -f conftest$ac_cv_exeext --{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --$as_echo "$ac_cv_exeext" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+echo "${ECHO_T}$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 --$as_echo_n "checking for suffix of object files... " >&6; } -+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } - if test "${ac_cv_objext+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3521,43 +3461,40 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -+echo "$as_me: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+ { (exit 1); exit 1; }; } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --$as_echo "$ac_cv_objext" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+echo "${ECHO_T}$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } - if test "${ac_cv_c_compiler_gnu+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3583,21 +3520,20 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -3607,19 +3543,15 @@ - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --$as_echo "$ac_cv_c_compiler_gnu" >&6; } --if test $ac_compiler_gnu = yes; then -- GCC=yes --else -- GCC= --fi -+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -+GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --$as_echo_n "checking whether $CC accepts -g... " >&6; } -+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cc_g+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes -@@ -3646,21 +3578,20 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" -@@ -3685,21 +3616,20 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag -@@ -3725,21 +3655,20 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -3754,8 +3683,8 @@ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --$as_echo "$ac_cv_prog_cc_g" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -3771,10 +3700,10 @@ - CFLAGS= - fi - fi --{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 --$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } - if test "${ac_cv_prog_cc_c89+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_prog_cc_c89=no - ac_save_CC=$CC -@@ -3845,21 +3774,20 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -3875,15 +3803,15 @@ - # AC_CACHE_VAL - case "x$ac_cv_prog_cc_c89" in - x) -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } ;; -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; - xno) -- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 --$as_echo "unsupported" >&6; } ;; -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" -- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 --$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; - esac - - -@@ -3904,8 +3832,8 @@ - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 --$as_echo_n "checking for style of include used by $am_make... " >&6; } -+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } - am__include="#" - am__quote= - _am_result=none -@@ -3932,8 +3860,8 @@ - fi - - --{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 --$as_echo "$_am_result" >&6; } -+{ echo "$as_me:$LINENO: result: $_am_result" >&5 -+echo "${ECHO_T}$_am_result" >&6; } - rm -f confinc confmf - - # Check whether --enable-dependency-tracking was given. -@@ -3945,9 +3873,7 @@ +@@ -3952,9 +4016,7 @@ am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi @@ -21473,24 +15735,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. AMDEP_TRUE= AMDEP_FALSE='#' else -@@ -3957,13 +3883,12 @@ +@@ -3964,7 +4026,6 @@ - depcc="$CC" am_compiler_list= --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --$as_echo_n "checking dependency style of $depcc... " >&6; } -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up -@@ -3999,7 +3924,9 @@ + { $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +@@ -4006,7 +4067,9 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c @@ -21501,7 +15754,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -@@ -4023,13 +3950,19 @@ +@@ -4030,13 +4093,19 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && @@ -21524,14 +15777,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. am_cv_CC_dependencies_compiler_type=$depmode break fi -@@ -4043,13 +3976,11 @@ - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 --$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +@@ -4054,9 +4123,7 @@ + $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - @@ -21541,15 +15788,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= -@@ -4085,11 +4016,13 @@ +@@ -4093,6 +4160,20 @@ -- -- -- -- -- ++ ++ ++ ++ ++ + if test "$enable_static" = yes; then + ENABLE_STATIC_TRUE= + ENABLE_STATIC_FALSE='#' @@ -21557,406 +15804,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + ENABLE_STATIC_TRUE='#' + ENABLE_STATIC_FALSE= +fi - - ++ ++ if test -n "$ac_tool_prefix"; then -@@ -4097,10 +4030,10 @@ + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl 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 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -4113,7 +4046,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4124,11 +4057,11 @@ - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 --$as_echo "$CXX" >&6; } -+ { echo "$as_me:$LINENO: result: $CXX" >&5 -+echo "${ECHO_T}$CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -4141,10 +4074,10 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -4157,7 +4090,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4168,11 +4101,11 @@ - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --$as_echo "$ac_ct_CXX" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -+echo "${ECHO_T}$ac_ct_CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -4184,8 +4117,12 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - CXX=$ac_ct_CXX -@@ -4214,10 +4151,10 @@ - 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 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -@@ -4230,7 +4167,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4241,11 +4178,11 @@ - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 --$as_echo "$CXX" >&6; } -+ { echo "$as_me:$LINENO: result: $CXX" >&5 -+echo "${ECHO_T}$CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -4258,10 +4195,10 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -@@ -4274,7 +4211,7 @@ - for ac_exec_ext in '' $ac_executable_extensions; do - 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -4285,11 +4222,11 @@ - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --$as_echo "$ac_ct_CXX" >&6; } -+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -+echo "${ECHO_T}$ac_ct_CXX" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -4301,8 +4238,12 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac - CXX=$ac_ct_CXX -@@ -4312,47 +4253,43 @@ - fi - fi - # Provide some information about the compiler. --$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 --set X $ac_compile --ac_compiler=$2 -+echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` - { (ac_try="$ac_compiler --version >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -v >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -V >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - --{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } - if test "${ac_cv_cxx_compiler_gnu+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -4378,21 +4315,20 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -4402,19 +4338,15 @@ - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } --if test $ac_compiler_gnu = yes; then -- GXX=yes --else -- GXX= --fi -+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -+GXX=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS --{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --$as_echo_n "checking whether $CXX accepts -g... " >&6; } -+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cxx_g+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes -@@ -4441,21 +4373,20 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CXXFLAGS="" -@@ -4480,21 +4411,20 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -@@ -4520,21 +4450,20 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -4549,8 +4478,8 @@ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --$as_echo "$ac_cv_prog_cxx_g" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS - elif test $ac_cv_prog_cxx_g = yes; then -@@ -4574,10 +4503,10 @@ - - depcc="$CXX" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --$as_echo_n "checking dependency style of $depcc... " >&6; } -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up -@@ -4613,7 +4542,9 @@ +@@ -4614,7 +4695,9 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c @@ -21967,7 +15820,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -@@ -4637,13 +4568,19 @@ +@@ -4638,13 +4721,19 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && @@ -21990,14 +15843,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. am_cv_CXX_dependencies_compiler_type=$depmode break fi -@@ -4657,13 +4594,11 @@ - fi - - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 --$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } +@@ -4662,9 +4751,7 @@ + $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - @@ -22007,31 +15854,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then am__fastdepCXX_TRUE= -@@ -4696,30 +4631,27 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CXX= +@@ -4718,9 +4805,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -22042,31 +15865,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. HAVE_CXX_TRUE= HAVE_CXX_FALSE='#' else -@@ -4751,30 +4683,27 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - OBJC=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - OBJC=no +@@ -4773,9 +4858,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -22077,269 +15876,430 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. HAVE_OBJC_TRUE= HAVE_OBJC_FALSE='#' else -@@ -4792,389 +4721,251 @@ - - if test "$os_win32" = "yes"; then - if test x$enable_static = xyes -o x$enable_static = x; then -- { $as_echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 --$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} -+ { echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 -+echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} - enable_static=no - fi - if test x$enable_shared = xno; then -- { $as_echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 --$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} -+ { echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 -+echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} - fi +@@ -4804,114 +4887,417 @@ enable_shared=yes fi --enable_win32_dll=yes ++enable_win32_dll=yes ++ ++case $host in ++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. ++set dummy ${ac_tool_prefix}as; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_AS+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$AS"; then ++ ac_cv_prog_AS="$AS" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_AS="${ac_tool_prefix}as" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++AS=$ac_cv_prog_AS ++if test -n "$AS"; then ++ { $as_echo "$as_me:$LINENO: result: $AS" >&5 ++$as_echo "$AS" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ --case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. --set dummy ${ac_tool_prefix}as; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AS+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$AS"; then -- ac_cv_prog_AS="$AS" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_AS="${ac_tool_prefix}as" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS ++fi ++if test -z "$ac_cv_prog_AS"; then ++ ac_ct_AS=$AS ++ # Extract the first word of "as", so it can be a program name with args. ++set dummy as; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_AS"; then ++ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_AS="as" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS --fi --fi --AS=$ac_cv_prog_AS --if test -n "$AS"; then -- { $as_echo "$as_me:$LINENO: result: $AS" >&5 --$as_echo "$AS" >&6; } -+# Check whether --enable-shared was given. -+if test "${enable_shared+set}" = set; then -+ enableval=$enable_shared; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac +-# Check whether --enable-shared was given. +-if test "${enable_shared+set}" = set; then +- enableval=$enable_shared; p=${PACKAGE-default} +- case $enableval in +- yes) enable_shared=yes ;; +- no) enable_shared=no ;; +- *) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac ++fi ++fi ++ac_ct_AS=$ac_cv_prog_ac_ct_AS ++if test -n "$ac_ct_AS"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 ++$as_echo "$ac_ct_AS" >&6; } else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ enable_shared=yes +- enable_shared=yes ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } fi ++ if test "x$ac_ct_AS" = x; then ++ AS="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ AS=$ac_ct_AS ++ fi ++else ++ AS="$ac_cv_prog_AS" ++fi --fi --if test -z "$ac_cv_prog_AS"; then -- ac_ct_AS=$AS -- # Extract the first word of "as", so it can be a program name with args. --set dummy as; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_AS+set}" = set; then -- $as_echo_n "(cached) " >&6 -+# Check whether --enable-fast-install was given. -+if test "${enable_fast_install+set}" = set; then -+ enableval=$enable_fast_install; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac +-# Check whether --enable-fast-install was given. +-if test "${enable_fast_install+set}" = set; then +- enableval=$enable_fast_install; p=${PACKAGE-default} +- case $enableval in +- yes) enable_fast_install=yes ;; +- no) enable_fast_install=no ;; +- *) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for pkg in $enableval; do +- IFS="$lt_save_ifs" +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$lt_save_ifs" +- ;; +- esac ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DLLTOOL+set}" = set; then ++ $as_echo_n "(cached) " >&6 else -- if test -n "$ac_ct_AS"; then -- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -+ enable_fast_install=yes +- enable_fast_install=yes ++ if test -n "$DLLTOOL"; then ++ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++DLLTOOL=$ac_cv_prog_DLLTOOL ++if test -n "$DLLTOOL"; then ++ { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 ++$as_echo "$DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } +fi + + -+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } -+if test "${lt_cv_path_SED+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++if test -z "$ac_cv_prog_DLLTOOL"; then ++ ac_ct_DLLTOOL=$DLLTOOL ++ # Extract the first word of "dlltool", so it can be a program name with args. ++set dummy dlltool; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DLLTOOL"; then ++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DLLTOOL="dlltool" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL ++if test -n "$ac_ct_DLLTOOL"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 ++$as_echo "$ac_ct_DLLTOOL" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DLLTOOL" = x; then ++ DLLTOOL="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DLLTOOL=$ac_ct_DLLTOOL ++ fi ++else ++ DLLTOOL="$ac_cv_prog_DLLTOOL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. ++set dummy ${ac_tool_prefix}objdump; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OBJDUMP"; then ++ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++OBJDUMP=$ac_cv_prog_OBJDUMP ++if test -n "$OBJDUMP"; then ++ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++$as_echo "$OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OBJDUMP"; then ++ ac_ct_OBJDUMP=$OBJDUMP ++ # Extract the first word of "objdump", so it can be a program name with args. ++set dummy objdump; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OBJDUMP"; then ++ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_OBJDUMP="objdump" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP ++if test -n "$ac_ct_OBJDUMP"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++$as_echo "$ac_ct_OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OBJDUMP" = x; then ++ OBJDUMP="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OBJDUMP=$ac_ct_OBJDUMP ++ fi ++else ++ OBJDUMP="$ac_cv_prog_OBJDUMP" + fi + ++ ;; ++esac ++ ++test -z "$AS" && AS=as ++ ++ ++ ++ ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++ ++ ++ ++ ++ ++test -z "$OBJDUMP" && OBJDUMP=objdump ++ ++ ++ ++ ++ ++ ++ ++case `pwd` in ++ *\ * | *\ *) ++ { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; ++esac ++ ++ ++ ++macro_version='2.2.6' ++macro_revision='1.3012' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ltmain="$ac_aux_dir/ltmain.sh" + + { $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 + $as_echo_n "checking for a sed that does not truncate output... " >&6; } +-if test "${lt_cv_path_SED+set}" = set; then ++if test "${ac_cv_path_SED+set}" = set; then + $as_echo_n "(cached) " >&6 else -+ # Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +- # Loop through the user's path and test for sed and gsed. +-# Then use that list of sed's as ones to test for truncation. +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ ++ for ac_i in 1 2 3 4 5 6 7; do ++ ac_script="$ac_script$as_nl$ac_script" ++ done ++ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed ++ $as_unset ac_script || ac_script= ++ if test -z "$SED"; then ++ ac_path_SED_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_AS="as" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break -+ fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done - - fi --fi --ac_ct_AS=$ac_cv_prog_ac_ct_AS --if test -n "$ac_ct_AS"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 --$as_echo "$ac_ct_AS" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi - -- if test "x$ac_ct_AS" = x; then -- AS="false" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- AS=$ac_ct_AS -- fi --else -- AS="$ac_cv_prog_AS" --fi -+SED=$lt_cv_path_SED - -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. --set dummy ${ac_tool_prefix}dlltool; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DLLTOOL+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: result: $SED" >&5 -+echo "${ECHO_T}$SED" >&6; } -+ -+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$DLLTOOL"; then -- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+ # Extract the first word of "grep ggrep" to use in msg output -+if test -z "$GREP"; then -+set dummy grep ggrep; ac_prog_name=$2 -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -+ ac_path_GREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do -- 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { 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 +- for lt_ac_prog in sed gsed; do ++ for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do +- 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 ++ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue ++# Check for GNU ac_path_SED and select it if it is found. ++ # Check for GNU $ac_path_SED ++case `"$ac_path_SED" --version 2>&1` in +*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" -+ echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ $as_echo '' >> "conftest.nl" ++ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count ++ ac_cv_path_SED="$ac_path_SED" ++ ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break @@ -22347,1420 +16307,201 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + -+ -+ $ac_path_GREP_found && break 3 -+ done - done -+ - done - IFS=$as_save_IFS - -+ - fi -+ -+GREP="$ac_cv_path_GREP" -+if test -z "$GREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } - fi --DLLTOOL=$ac_cv_prog_DLLTOOL --if test -n "$DLLTOOL"; then -- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 --$as_echo "$DLLTOOL" >&6; } -+ - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ ac_cv_path_GREP=$GREP - fi - - - fi --if test -z "$ac_cv_prog_DLLTOOL"; then -- ac_ct_DLLTOOL=$DLLTOOL -- # Extract the first word of "dlltool", so it can be a program name with args. --set dummy dlltool; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -+echo "${ECHO_T}$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ echo "$as_me:$LINENO: checking for egrep" >&5 -+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$ac_ct_DLLTOOL"; then -- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ # Extract the first word of "egrep" to use in msg output -+if test -z "$EGREP"; then -+set dummy egrep; ac_prog_name=$2 -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -+ ac_path_EGREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do -- 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" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- --fi --fi --ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL --if test -n "$ac_ct_DLLTOOL"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 --$as_echo "$ac_ct_DLLTOOL" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- if test "x$ac_ct_DLLTOOL" = x; then -- DLLTOOL="false" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- DLLTOOL=$ac_ct_DLLTOOL -- fi --else -- DLLTOOL="$ac_cv_prog_DLLTOOL" --fi -- -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. --set dummy ${ac_tool_prefix}objdump; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OBJDUMP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$OBJDUMP"; then -- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- --fi --fi --OBJDUMP=$ac_cv_prog_OBJDUMP --if test -n "$OBJDUMP"; then -- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 --$as_echo "$OBJDUMP" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- --fi --if test -z "$ac_cv_prog_OBJDUMP"; then -- ac_ct_OBJDUMP=$OBJDUMP -- # Extract the first word of "objdump", so it can be a program name with args. --set dummy objdump; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_OBJDUMP"; then -- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_OBJDUMP="objdump" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- --fi --fi --ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP --if test -n "$ac_ct_OBJDUMP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 --$as_echo "$ac_ct_OBJDUMP" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- if test "x$ac_ct_OBJDUMP" = x; then -- OBJDUMP="false" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- OBJDUMP=$ac_ct_OBJDUMP -- fi --else -- OBJDUMP="$ac_cv_prog_OBJDUMP" --fi -- -- ;; --esac -- --test -z "$AS" && AS=as -- -- -- -- -- --test -z "$DLLTOOL" && DLLTOOL=dlltool -- -- -- -- -- --test -z "$OBJDUMP" && OBJDUMP=objdump -- -- -- -- -- -- -- --case `pwd` in -- *\ * | *\ *) -- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 --$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; --esac -- -- -- --macro_version='2.2.6' --macro_revision='1.3012' -- -- -- -- -- -- -- -- -- -- -- -- -- --ltmain="$ac_aux_dir/ltmain.sh" -- --{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 --$as_echo_n "checking for a sed that does not truncate output... " >&6; } --if test "${ac_cv_path_SED+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -- for ac_i in 1 2 3 4 5 6 7; do -- ac_script="$ac_script$as_nl$ac_script" -- done -- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed -- $as_unset ac_script || ac_script= -- if test -z "$SED"; then -- ac_path_SED_found=false -- # Loop through the user's path and test for each of PROGNAME-LIST -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_prog in sed gsed; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue --# Check for GNU ac_path_SED and select it if it is found. -- # Check for GNU $ac_path_SED --case `"$ac_path_SED" --version 2>&1` in -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { 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 - *GNU*) -- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; - *) - ac_count=0 -- $as_echo_n 0123456789 >"conftest.in" -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" -- $as_echo '' >> "conftest.nl" -- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` -- if test $ac_count -gt ${ac_path_SED_max-0}; then -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one -- ac_cv_path_SED="$ac_path_SED" -- ac_path_SED_max=$ac_count -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break -@@ -5182,310 +4973,85 @@ - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; - esac - -- $ac_path_SED_found && break 3 -- done -+ -+ $ac_path_EGREP_found && break 3 ++ $ac_path_SED_found && break 3 + done done done --IFS=$as_save_IFS -- if test -z "$ac_cv_path_SED"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 --$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} -- { (exit 1); exit 1; }; } -- fi --else -- ac_cv_path_SED=$SED --fi -- --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 --$as_echo "$ac_cv_path_SED" >&6; } -- SED="$ac_cv_path_SED" -- rm -f conftest.sed -- --test -z "$SED" && SED=sed --Xsed="$SED -e 1s/^X//" -- -- - -+done -+IFS=$as_save_IFS - - -+fi - -+EGREP="$ac_cv_path_EGREP" -+if test -z "$EGREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + IFS=$as_save_IFS +-lt_ac_max=0 +-lt_ac_count=0 +-# Add /usr/xpg4/bin/sed as it is typically found on Solaris +-# along with /bin/sed that truncates output. +-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do +- test ! -f $lt_ac_sed && continue +- cat /dev/null > conftest.in +- lt_ac_count=0 +- echo $ECHO_N "0123456789$ECHO_C" >conftest.in +- # Check for GNU sed and select it if it is found. +- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then +- lt_cv_path_SED=$lt_ac_sed +- break ++ if test -z "$ac_cv_path_SED"; then ++ { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 ++$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} + { (exit 1); exit 1; }; } -+fi - + fi +- while true; do +- cat conftest.in conftest.in >conftest.tmp +- mv conftest.tmp conftest.in +- cp conftest.in conftest.nl +- echo >>conftest.nl +- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break +- cmp -s conftest.out conftest.nl || break +- # 10000 chars as input seems more than enough +- test $lt_ac_count -gt 10 && break +- lt_ac_count=`expr $lt_ac_count + 1` +- if test $lt_ac_count -gt $lt_ac_max; then +- lt_ac_max=$lt_ac_count +- lt_cv_path_SED=$lt_ac_sed +- fi +- done +-done +else -+ ac_cv_path_EGREP=$EGREP ++ ac_cv_path_SED=$SED +fi - -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" - - --{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 --$as_echo_n "checking for grep that handles long lines and -e... " >&6; } --if test "${ac_cv_path_GREP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -z "$GREP"; then -- ac_path_GREP_found=false -- # Loop through the user's path and test for each of PROGNAME-LIST -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- 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_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 --*GNU*) -- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; --*) -- ac_count=0 -- $as_echo_n 0123456789 >"conftest.in" -- while : -- do -- cat "conftest.in" "conftest.in" >"conftest.tmp" -- mv "conftest.tmp" "conftest.in" -- cp "conftest.in" "conftest.nl" -- $as_echo 'GREP' >> "conftest.nl" -- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- ac_count=`expr $ac_count + 1` -- if test $ac_count -gt ${ac_path_GREP_max-0}; then -- # Best one so far, save it but keep looking for a better one -- ac_cv_path_GREP="$ac_path_GREP" -- ac_path_GREP_max=$ac_count -- fi -- # 10*(2^10) chars as input seems more than enough -- test $ac_count -gt 10 && break -- done -- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; --esac - -- $ac_path_GREP_found && break 3 -- done -- done --done --IFS=$as_save_IFS -- if test -z "$ac_cv_path_GREP"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -- { (exit 1); exit 1; }; } -- fi -+# Check whether --with-gnu-ld was given. -+if test "${with_gnu_ld+set}" = set; then -+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes - else -- ac_cv_path_GREP=$GREP -+ with_gnu_ld=no fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 ++$as_echo "$ac_cv_path_SED" >&6; } ++ SED="$ac_cv_path_SED" ++ rm -f conftest.sed ++ ++test -z "$SED" && SED=sed ++Xsed="$SED -e 1s/^X//" ++ ++ ++ ++ ++ ++ ++ ++ + +-SED=$lt_cv_path_SED + +-{ $as_echo "$as_me:$LINENO: result: $SED" >&5 +-$as_echo "$SED" >&6; } + + { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 + $as_echo_n "checking for grep that handles long lines and -e... " >&6; } +@@ -5047,12 +5433,100 @@ + EGREP="$ac_cv_path_EGREP" + -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [\\/]* | ?:[\\/]*) -+ re_direlt='/[^/][^/]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ { echo "$as_me:$LINENO: checking for GNU ld" >&5 -+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -+else -+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 --$as_echo "$ac_cv_path_GREP" >&6; } -- GREP="$ac_cv_path_GREP" -- -- --{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 --$as_echo_n "checking for egrep... " >&6; } --if test "${ac_cv_path_EGREP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -- then ac_cv_path_EGREP="$GREP -E" -- else -- if test -z "$EGREP"; then -- ac_path_EGREP_found=false -- # Loop through the user's path and test for each of PROGNAME-LIST -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- 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_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 --*GNU*) -- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; --*) -- ac_count=0 -- $as_echo_n 0123456789 >"conftest.in" -- while : -- do -- cat "conftest.in" "conftest.in" >"conftest.tmp" -- mv "conftest.tmp" "conftest.in" -- cp "conftest.in" "conftest.nl" -- $as_echo 'EGREP' >> "conftest.nl" -- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- ac_count=`expr $ac_count + 1` -- if test $ac_count -gt ${ac_path_EGREP_max-0}; then -- # Best one so far, save it but keep looking for a better one -- ac_cv_path_EGREP="$ac_path_EGREP" -- ac_path_EGREP_max=$ac_count -- fi -- # 10*(2^10) chars as input seems more than enough -- test $ac_count -gt 10 && break -- done -- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; --esac -- -- $ac_path_EGREP_found && break 3 -- done -- done --done --IFS=$as_save_IFS -- if test -z "$ac_cv_path_EGREP"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -- { (exit 1); exit 1; }; } -- fi --else -- ac_cv_path_EGREP=$EGREP --fi -- -- fi --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 --$as_echo "$ac_cv_path_EGREP" >&6; } -- EGREP="$ac_cv_path_EGREP" -- -- --{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 --$as_echo_n "checking for fgrep... " >&6; } --if test "${ac_cv_path_FGREP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -- then ac_cv_path_FGREP="$GREP -F" -- else -- if test -z "$FGREP"; then -- ac_path_FGREP_found=false -- # Loop through the user's path and test for each of PROGNAME-LIST -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_prog in fgrep; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" -- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue --# Check for GNU ac_path_FGREP and select it if it is found. -- # Check for GNU $ac_path_FGREP --case `"$ac_path_FGREP" --version 2>&1` in --*GNU*) -- ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; --*) -- ac_count=0 -- $as_echo_n 0123456789 >"conftest.in" -- while : -- do -- cat "conftest.in" "conftest.in" >"conftest.tmp" -- mv "conftest.tmp" "conftest.in" -- cp "conftest.in" "conftest.nl" -- $as_echo 'FGREP' >> "conftest.nl" -- "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break -- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -- ac_count=`expr $ac_count + 1` -- if test $ac_count -gt ${ac_path_FGREP_max-0}; then -- # Best one so far, save it but keep looking for a better one -- ac_cv_path_FGREP="$ac_path_FGREP" -- ac_path_FGREP_max=$ac_count -- fi -- # 10*(2^10) chars as input seems more than enough -- test $ac_count -gt 10 && break -- done -- rm -f conftest.in conftest.tmp conftest.nl conftest.out;; --esac -- -- $ac_path_FGREP_found && break 3 -- done -- done --done --IFS=$as_save_IFS -- if test -z "$ac_cv_path_FGREP"; then -- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 --$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -- { (exit 1); exit 1; }; } -- fi --else -- ac_cv_path_FGREP=$FGREP --fi -- -- fi --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 --$as_echo "$ac_cv_path_FGREP" >&6; } -- FGREP="$ac_cv_path_FGREP" -- -- --test -z "$GREP" && GREP=grep -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes --else ++{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 ++$as_echo_n "checking for fgrep... " >&6; } ++if test "${ac_cv_path_FGREP+set}" = set; then ++ $as_echo_n "(cached) " >&6 + else - with_gnu_ld=no --fi -- --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 --$as_echo_n "checking for ld used by $CC... " >&6; } -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [\\/]* | ?:[\\/]*) -- re_direlt='/[^/][^/]*/\.\./' -- # Canonicalize the pathname of ld -- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` -- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac --elif test "$with_gnu_ld" = yes; then -- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 --$as_echo_n "checking for GNU ld... " >&6; } --else -- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 --$as_echo_n "checking for non-GNU ld... " >&6; } --fi --if test "${lt_cv_path_LD+set}" = set; then -- $as_echo_n "(cached) " >&6 -+if test "${lt_cv_path_LD+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -@@ -5515,19 +5081,19 @@ ++ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 ++ then ac_cv_path_FGREP="$GREP -F" ++ else ++ if test -z "$FGREP"; then ++ ac_path_FGREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in fgrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue ++# Check for GNU ac_path_FGREP and select it if it is found. ++ # Check for GNU $ac_path_FGREP ++case `"$ac_path_FGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'FGREP' >> "conftest.nl" ++ "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_FGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_FGREP="$ac_path_FGREP" ++ ac_path_FGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_FGREP_found && break 3 ++ done ++ done ++done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_FGREP"; then ++ { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++else ++ ac_cv_path_FGREP=$FGREP ++fi ++ ++ fi ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 ++$as_echo "$ac_cv_path_FGREP" >&6; } ++ FGREP="$ac_cv_path_FGREP" ++ ++ ++test -z "$GREP" && GREP=grep ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# Check whether --with-gnu-ld was given. ++if test "${with_gnu_ld+set}" = set; then ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes ++else ++ with_gnu_ld=no + fi - LD="$lt_cv_path_LD" - if test -n "$LD"; then -- { $as_echo "$as_me:$LINENO: result: $LD" >&5 --$as_echo "$LD" >&6; } -+ { echo "$as_me:$LINENO: result: $LD" >&5 -+echo "${ECHO_T}$LD" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 --$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } --{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 --$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } - if test "${lt_cv_prog_gnu_ld+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. - case `$LD -v 2>&1 </dev/null` in -@@ -5539,22 +5105,40 @@ - ;; - esac - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 --$as_echo "$lt_cv_prog_gnu_ld" >&6; } -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } + ac_prog=ld +@@ -5072,9 +5546,9 @@ + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; +@@ -5154,33 +5628,15 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } -+if test "${lt_cv_ld_reload_flag+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_ld_reload_flag='-r' -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } -+reload_flag=$lt_cv_ld_reload_flag -+case $reload_flag in -+"" | " "*) ;; -+*) reload_flag=" $reload_flag" ;; -+esac -+reload_cmds='$LD$reload_flag -o $output$reload_objs' -+case $host_os in -+ darwin*) -+ if test "$GCC" = yes; then -+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -+ else -+ reload_cmds='$LD$reload_flag -o $output$reload_objs' -+ fi -+ ;; -+esac - -- -- -- -- -- -- --{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 --$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } - if test "${lt_cv_path_NM+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$NM"; then - # Let the user override the test. -@@ -5597,397 +5181,455 @@ - done - IFS="$lt_save_ifs" - done -- : ${lt_cv_path_NM=no} -+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm - fi - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 --$as_echo "$lt_cv_path_NM" >&6; } --if test "$lt_cv_path_NM" != "no"; then -- NM="$lt_cv_path_NM" --else -- # Didn't find any BSD compatible name lister, look for dumpbin. -- if test -n "$ac_tool_prefix"; then -- for ac_prog in "dumpbin -symbols" "link -dump -symbols" -- 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 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DUMPBIN+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$DUMPBIN"; then -- ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -+echo "${ECHO_T}$lt_cv_path_NM" >&6; } -+NM="$lt_cv_path_NM" - --fi --fi --DUMPBIN=$ac_cv_prog_DUMPBIN --if test -n "$DUMPBIN"; then -- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 --$as_echo "$DUMPBIN" >&6; } -+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -+LN_S=$as_ln_s -+if test "$LN_S" = "ln -s"; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- test -n "$DUMPBIN" && break -- done -+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -+echo "${ECHO_T}no, using $LN_S" >&6; } - fi --if test -z "$DUMPBIN"; then -- ac_ct_DUMPBIN=$DUMPBIN -- for ac_prog in "dumpbin -symbols" "link -dump -symbols" --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_DUMPBIN"; then -- ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS - --fi --fi --ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN --if test -n "$ac_ct_DUMPBIN"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 --$as_echo "$ac_ct_DUMPBIN" >&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 -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+ lt_cv_file_magic_cmd='$MAGIC_CMD' -+lt_cv_file_magic_test_file= -+lt_cv_deplibs_check_method='unknown' -+# Need to set the preceding variable on all platforms that support -+# interlibrary dependencies. -+# 'none' -- dependencies not supported. -+# `unknown' -- same as none, but documents that we really don't know. -+# 'pass_all' -- all dependencies passed with no checks. -+# 'test_compile' -- check by making test program. -+# 'file_magic [[regex]]' -- check by looking for files in library path -+# which responds to the $file_magic_cmd with a given extended regex. -+# If you have `file' or equivalent on your system and you're not sure -+# whether `pass_all' will *always* work, you probably want this one. - -+case $host_os in -+aix[4-9]*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- test -n "$ac_ct_DUMPBIN" && break --done -+beos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- if test "x$ac_ct_DUMPBIN" = x; then -- DUMPBIN=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- DUMPBIN=$ac_ct_DUMPBIN -- fi --fi -+bsdi[45]*) -+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' -+ lt_cv_file_magic_cmd='/usr/bin/file -L' -+ lt_cv_file_magic_test_file=/shlib/libc.so -+ ;; - -+cygwin*) -+ # func_win32_libid is a shell function defined in ltmain.sh -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ ;; - -- if test "$DUMPBIN" != ":"; then -- NM="$DUMPBIN" -+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', -+ # 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 --fi --test -z "$NM" && NM=nm -+ ;; -+ -+darwin* | rhapsody*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+freebsd* | dragonfly*) -+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ case $host_cpu in -+ i*86 ) -+ # Not sure whether the presence of OpenBSD here was a mistake. -+ # Let's accept both of them until this is cleared up. -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ ;; -+ esac -+ else -+ lt_cv_deplibs_check_method=pass_all -+ fi -+ ;; - -+gnu*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -+hpux10.20* | hpux11*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ case $host_cpu in -+ ia64*) -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' -+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ ;; -+ hppa*64*) -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' -+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -+ ;; -+ *) -+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' -+ lt_cv_file_magic_test_file=/usr/lib/libc.sl -+ ;; -+ esac -+ ;; - -+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)$' -+ ;; - -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; -+ esac -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - --{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 --$as_echo_n "checking the name lister ($NM) interface... " >&6; } --if test "${lt_cv_nm_interface+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_nm_interface="BSD nm" -- echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:5728: $ac_compile\"" >&5) -- (eval "$ac_compile" 2>conftest.err) -- cat conftest.err >&5 -- (eval echo "\"\$as_me:5731: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) -- cat conftest.err >&5 -- (eval echo "\"\$as_me:5734: output\"" >&5) -- cat conftest.out >&5 -- if $GREP 'External.*some_variable' conftest.out > /dev/null; then -- lt_cv_nm_interface="MS dumpbin" -+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 -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi -- rm -f conftest* --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 --$as_echo "$lt_cv_nm_interface" >&6; } -+ ;; - --{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 --$as_echo_n "checking whether ln -s works... " >&6; } --LN_S=$as_ln_s --if test "$LN_S" = "ln -s"; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 --$as_echo "no, using $LN_S" >&6; } --fi -+newos6*) -+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=/usr/lib/libnls.so -+ ;; - --# find the maximum length of command line arguments --{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 --$as_echo_n "checking the maximum length of command line arguments... " >&6; } --if test "${lt_cv_sys_max_cmd_len+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- i=0 -- teststring="ABCD" -+nto-qnx*) -+ lt_cv_deplibs_check_method=unknown -+ ;; - -- case $build_os in -- msdosdjgpp*) -- # On DJGPP, this test can blow up pretty badly due to problems in libc -- # (any single argument exceeding 2000 bytes causes a buffer overrun -- # during glob expansion). Even if it were fixed, the result of this -- # check would be larger than it should be. -- lt_cv_sys_max_cmd_len=12288; # 12K is about right -- ;; -+openbsd*) -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -+ fi -+ ;; - -- gnu*) -- # Under GNU Hurd, this test is not required because there is -- # no limit to the length of command line arguments. -- # Libtool will interpret -1 as no limit whatsoever -- lt_cv_sys_max_cmd_len=-1; -- ;; -+osf3* | osf4* | osf5*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- cygwin* | mingw* | cegcc*) -- # On Win9x/ME, this test blows up -- it succeeds, but takes -- # about 5 minutes as the teststring grows exponentially. -- # Worse, since 9x/ME are not pre-emptively multitasking, -- # you end up with a "frozen" computer, even though with patience -- # the test eventually succeeds (with a max line length of 256k). -- # Instead, let's just punt: use the minimum linelength reported by -- # all of the supported platforms: 8192 (on NT/2K/XP). -- lt_cv_sys_max_cmd_len=8192; -- ;; -+rdos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- amigaos*) -- # On AmigaOS with pdksh, this test takes hours, literally. -- # So we just punt and use a minimum line length of 8192. -- lt_cv_sys_max_cmd_len=8192; -- ;; -+solaris*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - -- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -- # This has been around since 386BSD, at least. Likely further. -- if test -x /sbin/sysctl; then -- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -- elif test -x /usr/sbin/sysctl; then -- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -- else -- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -- fi -- # And add a safety zone -- 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` -+sysv4 | sysv4.3*) -+ case $host_vendor in -+ motorola) -+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; -- -- interix*) -- # We know the value 262144 and hardcode it with a safety zone (like BSD) -- lt_cv_sys_max_cmd_len=196608 -+ ncr) -+ lt_cv_deplibs_check_method=pass_all - ;; -- -- osf*) -- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -- # nice to cause kernel panics so lets avoid the loop below. -- # First set a reasonable default. -- lt_cv_sys_max_cmd_len=16384 -- # -- if test -x /sbin/sysconfig; then -- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -- *1*) lt_cv_sys_max_cmd_len=-1 ;; -- esac -- fi -+ sequent) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; -- sco3.2v5*) -- lt_cv_sys_max_cmd_len=102400 -+ sni) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" -+ lt_cv_file_magic_test_file=/lib/libc.so - ;; -- sysv5* | sco5v6* | sysv4.2uw2*) -- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -- if test -n "$kargmax"; then -- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` -- else -- lt_cv_sys_max_cmd_len=32768 -- fi -+ siemens) -+ lt_cv_deplibs_check_method=pass_all - ;; -- *) -- 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 -- # Make teststring a little bigger before we do anything with it. -- # a 1K string should be a reasonable start. -- for i in 1 2 3 4 5 6 7 8 ; do -- teststring=$teststring$teststring -- done -- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -- # 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. -- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ -- = "XX$teststring$teststring"; } >/dev/null 2>&1 && -- test $i != 17 # 1/2 MB should be enough -- do -- i=`expr $i + 1` -- teststring=$teststring$teststring -- done -- # Only check the string length outside the loop. -- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` -- 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 -+ pc) -+ lt_cv_deplibs_check_method=pass_all - ;; - esac -+ ;; - --fi -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+esac - --if test -n $lt_cv_sys_max_cmd_len ; then -- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 --$as_echo "$lt_cv_sys_max_cmd_len" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: none" >&5 --$as_echo "none" >&6; } - fi --max_cmd_len=$lt_cv_sys_max_cmd_len -+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } -+file_magic_cmd=$lt_cv_file_magic_cmd -+deplibs_check_method=$lt_cv_deplibs_check_method -+test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - --: ${CP="cp -f"} --: ${MV="mv -f"} --: ${RM="rm -f"} -- --{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 --$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } --# Try some XSI features --xsi_shell=no --( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,, \ -- && eval 'test $(( 1 + 1 )) -eq 2 \ -- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ -- && xsi_shell=yes --{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 --$as_echo "$xsi_shell" >&6; } -- -- --{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 --$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } --lt_shell_append=no --( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ -- >/dev/null 2>&1 \ -- && lt_shell_append=yes --{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 --$as_echo "$lt_shell_append" >&6; } -+# Allow CC to be a program name with arguments. -+compiler=$CC - - --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- lt_unset=unset --else -- lt_unset=false -+# Check whether --enable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; - fi - -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -- -- -- --# test EBCDIC or ASCII --case `echo X|tr X '\101'` in -- A) # ASCII based system -- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr -- lt_SP2NL='tr \040 \012' -- lt_NL2SP='tr \015\012 \040\040' -- ;; -- *) # EBCDIC based system -- lt_SP2NL='tr \100 \n' -- lt_NL2SP='tr \r\n \100\100' -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > 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 -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '#line 5438 "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 -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* - ;; --esac -- -- -- -- -- -- -- - -+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 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; 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" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *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" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; - -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then - $as_echo_n "(cached) " >&6 -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } -+if test "${lt_cv_cc_needs_belf+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else +-else - lt_cv_ld_reload_flag='-r' -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 @@ -23780,1926 +16521,47 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi - ;; -esac -- -- -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 +-{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +-$as_echo_n "checking for BSD-compatible nm... " >&6; } ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 ++$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } + if test "${lt_cv_path_NM+set}" = set; then + $as_echo_n "(cached) " >&6 + else +@@ -5225,12 +5681,149 @@ + done + IFS="$lt_save_ifs" + done +- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm ++ : ${lt_cv_path_NM=no} + fi + fi + { $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 + $as_echo "$lt_cv_path_NM" >&6; } +-NM="$lt_cv_path_NM" ++if test "$lt_cv_path_NM" != "no"; then ++ NM="$lt_cv_path_NM" +else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ lt_cv_cc_needs_belf=no -+fi - -+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' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > 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.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. --set dummy ${ac_tool_prefix}objdump; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OBJDUMP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+*-*-cygwin* | *-*-mingw* | *-*-pw32*) ++ # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$OBJDUMP"; then -- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5996,8 +5638,8 @@ - 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -6006,28 +5648,28 @@ - - fi - fi --OBJDUMP=$ac_cv_prog_OBJDUMP --if test -n "$OBJDUMP"; then -- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 --$as_echo "$OBJDUMP" >&6; } -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -+echo "${ECHO_T}$DLLTOOL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - - fi --if test -z "$ac_cv_prog_OBJDUMP"; then -- ac_ct_OBJDUMP=$OBJDUMP -- # Extract the first word of "objdump", so it can be a program name with args. --set dummy objdump; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then -- $as_echo_n "(cached) " >&6 -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$ac_ct_OBJDUMP"; then -- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -6036,8 +5678,8 @@ - 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_OBJDUMP="objdump" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -6046,260 +5688,140 @@ - - fi - fi --ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP --if test -n "$ac_ct_OBJDUMP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 --$as_echo "$ac_ct_OBJDUMP" >&6; } -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- if test "x$ac_ct_OBJDUMP" = x; then -- OBJDUMP="false" -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac -- OBJDUMP=$ac_ct_OBJDUMP -+ DLLTOOL=$ac_ct_DLLTOOL - fi - else -- OBJDUMP="$ac_cv_prog_OBJDUMP" -+ DLLTOOL="$ac_cv_prog_DLLTOOL" - fi - --test -z "$OBJDUMP" && OBJDUMP=objdump -- -- -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -+set dummy ${ac_tool_prefix}as; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_AS+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$AS"; then -+ ac_cv_prog_AS="$AS" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - -+fi -+fi -+AS=$ac_cv_prog_AS -+if test -n "$AS"; then -+ { echo "$as_me:$LINENO: result: $AS" >&5 -+echo "${ECHO_T}$AS" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - - -+fi -+if test -z "$ac_cv_prog_AS"; then -+ ac_ct_AS=$AS -+ # Extract the first word of "as", so it can be a program name with args. -+set dummy as; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_AS"; then -+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - --{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 --$as_echo_n "checking how to recognize dependent libraries... " >&6; } --if test "${lt_cv_deplibs_check_method+set}" = set; then -- $as_echo_n "(cached) " >&6 -+fi -+fi -+ac_ct_AS=$ac_cv_prog_ac_ct_AS -+if test -n "$ac_ct_AS"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -+echo "${ECHO_T}$ac_ct_AS" >&6; } - else -- lt_cv_file_magic_cmd='$MAGIC_CMD' --lt_cv_file_magic_test_file= --lt_cv_deplibs_check_method='unknown' --# Need to set the preceding variable on all platforms that support --# interlibrary dependencies. --# 'none' -- dependencies not supported. --# `unknown' -- same as none, but documents that we really don't know. --# 'pass_all' -- all dependencies passed with no checks. --# 'test_compile' -- check by making test program. --# 'file_magic [[regex]]' -- check by looking for files in library path --# which responds to the $file_magic_cmd with a given extended regex. --# If you have `file' or equivalent on your system and you're not sure --# whether `pass_all' will *always* work, you probably want this one. -- --case $host_os in --aix[4-9]*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --beos*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --bsdi[45]*) -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- lt_cv_file_magic_test_file=/shlib/libc.so -- ;; -- --cygwin*) -- # func_win32_libid is a shell function defined in ltmain.sh -- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -- lt_cv_file_magic_cmd='func_win32_libid' -- ;; -- --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', -- # 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 -- ;; -- --cegcc) -- # use the weaker test based on 'objdump'. See mingw*. -- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' -- lt_cv_file_magic_cmd='$OBJDUMP -f' -- ;; -- --darwin* | rhapsody*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --freebsd* | dragonfly*) -- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then -- case $host_cpu in -- i*86 ) -- # Not sure whether the presence of OpenBSD here was a mistake. -- # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -- ;; -- esac -- else -- lt_cv_deplibs_check_method=pass_all -- fi -- ;; -- --gnu*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --hpux10.20* | hpux11*) -- lt_cv_file_magic_cmd=/usr/bin/file -- case $host_cpu in -- ia64*) -- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' -- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -- ;; -- hppa*64*) -- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' -- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -- ;; -- *) -- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' -- lt_cv_file_magic_test_file=/usr/lib/libc.sl -- ;; -- esac -- ;; -- --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)$' -- ;; -- --irix5* | irix6* | nonstopux*) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- lt_cv_deplibs_check_method=pass_all -- ;; -- --# This must be Linux ELF. --linux* | k*bsd*-gnu) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --netbsd*) -- 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 -- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' -- fi -- ;; -- --newos6*) -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=/usr/lib/libnls.so -- ;; -- --*nto* | *qnx*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - --openbsd*) -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' -+ if test "x$ac_ct_AS" = x; then -+ AS="false" - else -- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -- fi -- ;; -- --osf3* | osf4* | osf5*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --rdos*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --solaris*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- --sysv4 | sysv4.3*) -- case $host_vendor in -- motorola) -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -- ;; -- ncr) -- lt_cv_deplibs_check_method=pass_all -- ;; -- sequent) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' -- ;; -- sni) -- lt_cv_file_magic_cmd='/bin/file' -- lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" -- lt_cv_file_magic_test_file=/lib/libc.so -- ;; -- siemens) -- lt_cv_deplibs_check_method=pass_all -- ;; -- pc) -- lt_cv_deplibs_check_method=pass_all -- ;; -- esac -- ;; -- --tpf*) -- lt_cv_deplibs_check_method=pass_all -- ;; -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; - esac -- -+ AS=$ac_ct_AS -+ fi -+else -+ AS="$ac_cv_prog_AS" - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 --$as_echo "$lt_cv_deplibs_check_method" >&6; } --file_magic_cmd=$lt_cv_file_magic_cmd --deplibs_check_method=$lt_cv_deplibs_check_method --test -z "$deplibs_check_method" && deplibs_check_method=unknown -- -- -- -- - -- -- -- -- -- -- -- --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AR+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -+set dummy ${ac_tool_prefix}objdump; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_OBJDUMP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$AR"; then -- ac_cv_prog_AR="$AR" # Let the user override the test. -+ if test -n "$OBJDUMP"; then -+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -6308,8 +5830,8 @@ - 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_AR="${ac_tool_prefix}ar" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -6318,28 +5840,28 @@ - - fi - fi --AR=$ac_cv_prog_AR --if test -n "$AR"; then -- { $as_echo "$as_me:$LINENO: result: $AR" >&5 --$as_echo "$AR" >&6; } -+OBJDUMP=$ac_cv_prog_OBJDUMP -+if test -n "$OBJDUMP"; then -+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -+echo "${ECHO_T}$OBJDUMP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - - fi --if test -z "$ac_cv_prog_AR"; then -- ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -- $as_echo_n "(cached) " >&6 -+if test -z "$ac_cv_prog_OBJDUMP"; then -+ ac_ct_OBJDUMP=$OBJDUMP -+ # Extract the first word of "objdump", so it can be a program name with args. -+set dummy objdump; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$ac_ct_AR"; then -- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -+ if test -n "$ac_ct_OBJDUMP"; then -+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -6348,8 +5870,8 @@ - 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_AR="ar" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ ac_cv_prog_ac_ct_OBJDUMP="objdump" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -6358,266 +5880,447 @@ - - fi - fi --ac_ct_AR=$ac_cv_prog_ac_ct_AR --if test -n "$ac_ct_AR"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 --$as_echo "$ac_ct_AR" >&6; } -+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -+if test -n "$ac_ct_OBJDUMP"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- if test "x$ac_ct_AR" = x; then -- AR="false" -+ if test "x$ac_ct_OBJDUMP" = x; then -+ OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac -- AR=$ac_ct_AR -+ OBJDUMP=$ac_ct_OBJDUMP - fi - else -- AR="$ac_cv_prog_AR" -+ OBJDUMP="$ac_cv_prog_OBJDUMP" - fi - --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru -- -- -- -- -- -- -+ ;; - -+esac - -+need_locks="$enable_libtool_lock" - - -- --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. --set dummy ${ac_tool_prefix}strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_STRIP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$STRIP"; then -- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+ if test "${ac_cv_prog_CPP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH -+ # Double quotes because CPP needs to be expanded -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes - do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_STRIP="${ac_tool_prefix}strip" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ Syntax error -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ # Broken: fails on valid input. -+continue - fi --fi --STRIP=$ac_cv_prog_STRIP --if test -n "$STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 --$as_echo "$STRIP" >&6; } -+ -+rm -f conftest.err conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Passes both tests. -+ac_preproc_ok=: -+break - fi - -+rm -f conftest.err conftest.$ac_ext - --fi --if test -z "$ac_cv_prog_STRIP"; then -- ac_ct_STRIP=$STRIP -- # Extract the first word of "strip", so it can be a program name with args. --set dummy strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_STRIP"; then -- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_STRIP="strip" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi - done --done --IFS=$as_save_IFS -- -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ break - fi -+ -+ done -+ ac_cv_prog_CPP=$CPP -+ - fi --ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP --if test -n "$ac_ct_STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --$as_echo "$ac_ct_STRIP" >&6; } -+ CPP=$ac_cv_prog_CPP - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ ac_cv_prog_CPP=$CPP - fi -- -- if test "x$ac_ct_STRIP" = x; then -- STRIP=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; -+{ echo "$as_me:$LINENO: result: $CPP" >&5 -+echo "${ECHO_T}$CPP" >&6; } -+ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ Syntax error -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -- STRIP=$ac_ct_STRIP -- fi -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ : - else -- STRIP="$ac_cv_prog_STRIP" -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Broken: fails on valid input. -+continue - fi - --test -z "$STRIP" && STRIP=: -+rm -f conftest.err conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi - -+rm -f conftest.err conftest.$ac_ext - -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ : -+else -+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+fi - -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. --set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_RANLIB+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$RANLIB"; then -- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdlib.h> -+#include <stdarg.h> -+#include <string.h> -+#include <float.h> - --fi --fi --RANLIB=$ac_cv_prog_RANLIB --if test -n "$RANLIB"; then -- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 --$as_echo "$RANLIB" >&6; } -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_header_stdc=no - fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - --fi --if test -z "$ac_cv_prog_RANLIB"; then -- ac_ct_RANLIB=$RANLIB -- # Extract the first word of "ranlib", so it can be a program name with args. --set dummy ranlib; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_RANLIB"; then -- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_RANLIB="ranlib" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <string.h> - --fi --fi --ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB --if test -n "$ac_ct_RANLIB"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --$as_echo "$ac_ct_RANLIB" >&6; } -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "memchr" >/dev/null 2>&1; then -+ : - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ ac_cv_header_stdc=no - fi -+rm -f conftest* - -- if test "x$ac_ct_RANLIB" = x; then -- RANLIB=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- RANLIB=$ac_ct_RANLIB -- fi --else -- RANLIB="$ac_cv_prog_RANLIB" - fi - --test -z "$RANLIB" && RANLIB=: -- -- -- -- -- -- --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdlib.h> - --if test -n "$RANLIB"; then -- case $host_os in -- openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -- ;; -- *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -- ;; -- esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "free" >/dev/null 2>&1; then -+ : -+else -+ ac_cv_header_stdc=no - fi -+rm -f conftest* - -+fi - -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ctype.h> -+#include <stdlib.h> -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#else -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+#endif - -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+int -+main () -+{ -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ return 2; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./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 -+ : -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+( exit $ac_status ) -+ac_cv_header_stdc=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi - - -+fi -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -+if test $ac_cv_header_stdc = yes; then - -+cat >>confdefs.h <<\_ACEOF -+#define STDC_HEADERS 1 -+_ACEOF - -+fi - -+# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - -@@ -6627,1691 +6330,1689 @@ - - - -+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -+ inttypes.h stdint.h unistd.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default - -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ eval "$as_ac_Header=no" -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - -+fi - -+done - - - -+for ac_header in dlfcn.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - -+# Is the header present? -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no -+fi - -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - -- -- --# If no C compiler was specified, use CC. --LTCC=${LTCC-"$CC"} -- --# If no C compiler flags were specified, use CFLAGS. --LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -- --# Allow CC to be a program name with arguments. --compiler=$CC -- -- --# Check for command to grab the raw symbol name followed by C symbol from nm. --{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 --$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } --if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then -- $as_echo_n "(cached) " >&6 -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - --# Character class describing NM global symbol codes. --symcode='[BCDEGRST]' -+fi - --# Regexp to match symbols that can be accessed directly from C. --sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -+done - --# Define system-specific variables. --case $host_os in --aix*) -- symcode='[BCDT]' -- ;; --cygwin* | mingw* | pw32* | cegcc*) -- symcode='[ABCDGISTW]' -- ;; --hpux*) -- if test "$host_cpu" = ia64; then -- symcode='[ABCDEGRST]' -- fi -- ;; --irix* | nonstopux*) -- symcode='[BCDEGRST]' -- ;; --osf*) -- symcode='[BCDEGQRST]' -- ;; --solaris*) -- symcode='[BDRT]' -- ;; --sco3.2v5*) -- symcode='[DT]' -- ;; --sysv4.2uw2*) -- symcode='[DT]' -- ;; --sysv5* | sco5v6* | unixware* | OpenUNIX*) -- symcode='[ABDT]' -- ;; --sysv4) -- symcode='[DFNSTU]' -- ;; --esac - --# If we're using GNU nm, then use its standard symbol codes. --case `$NM -V 2>&1` in --*GNU* | *'with BFD'*) -- symcode='[ABCDGIRSTW]' ;; -+ -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } -+if test -z "$CXXCPP"; then -+ if test "${ac_cv_prog_CXXCPP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # Double quotes because CXXCPP needs to be expanded -+ for CXXCPP in "$CXX -E" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ Syntax error -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Transform an extracted symbol line into a proper C declaration. --# Some systems (esp. on ia64) link data and code symbols differently, --# so use this general approach. --lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ # Broken: fails on valid input. -+continue -+fi - --# Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+rm -f conftest.err conftest.$ac_ext - --# Handle CRLF in mingw tool chain --opt_cr= --case $build_os in --mingw*) -- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp -- ;; -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Try without a prefix underscore, then with it. --for ac_symprfx in "" "_"; do -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi - -- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -- symxfrm="\\1 $ac_symprfx\\2 \\2" -+rm -f conftest.err conftest.$ac_ext - -- # Write the raw and C identifiers. -- if test "$lt_cv_nm_interface" = "MS dumpbin"; then -- # Fake it for dumpbin and say T for any non-static function -- # and D for any global variable. -- # Also find C++ and __fastcall symbols from MSVC++, -- # which start with @ or ?. -- lt_cv_sys_global_symbol_pipe="$AWK '"\ --" {last_section=section; section=\$ 3};"\ --" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ --" \$ 0!~/External *\|/{next};"\ --" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ --" {if(hide[section]) next};"\ --" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ --" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ --" s[1]~/^[@?]/{print s[1], s[1]; next};"\ --" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ --" ' prfx=^$ac_symprfx" -- else -- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -- fi -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ break -+fi - -- # Check to see that the pipe works correctly. -- pipe_works=no -+ done -+ ac_cv_prog_CXXCPP=$CXXCPP - -- rm -f conftest* -- cat > conftest.$ac_ext <<_LT_EOF --#ifdef __cplusplus --extern "C" { --#endif --char nm_test_var; --void nm_test_func(void); --void nm_test_func(void){} --#ifdef __cplusplus --} -+fi -+ CXXCPP=$ac_cv_prog_CXXCPP -+else -+ ac_cv_prog_CXXCPP=$CXXCPP -+fi -+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -+echo "${ECHO_T}$CXXCPP" >&6; } -+ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> - #endif --int main(){nm_test_var='a';nm_test_func();return(0);} --_LT_EOF -- -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Now try to grab the symbols. -- nlist=conftest.nm -- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 -- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 -+ Syntax error -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s "$nlist"; then -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- # Make sure that we snagged all the symbols we need. -- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then -- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then -- cat <<_LT_EOF > conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -+ # Broken: fails on valid input. -+continue -+fi - --_LT_EOF -- # Now generate the symbol file. -- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' -+rm -f conftest.err conftest.$ac_ext - -- cat <<_LT_EOF >> conftest.$ac_ext -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- void *address; --} --lt__PROGRAM__LTX_preloaded_symbols[] = --{ -- { "@PROGRAM@", (void *) 0 }, --_LT_EOF -- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext -- cat <<\_LT_EOF >> conftest.$ac_ext -- {0, (void *) 0} --}; -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi - --/* This works around a problem in FreeBSD linker */ --#ifdef FREEBSD_WORKAROUND --static const void *lt_preloaded_setup() { -- return lt__PROGRAM__LTX_preloaded_symbols; --} --#endif -+rm -f conftest.err conftest.$ac_ext - --#ifdef __cplusplus --} --#endif --_LT_EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext}; then -- pipe_works=yes -- fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -- else -- echo "cannot find nm_test_func in $nlist" >&5 -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&5 -- fi -- else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 -- fi -- else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- fi -- rm -rf conftest* conftst* -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ : -+else -+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+fi - -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+fi -+ -+ac_ext=f -+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -+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 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn ++ for ac_prog in "dumpbin -symbols" "link -dump -symbols" + 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then ++ $as_echo_n "(cached) " >&6 +else -+ if test -n "$F77"; then -+ ac_cv_prog_F77="$F77" # Let the user override the test. ++ if test -n "$DUMPBIN"; then ++ ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH @@ -25708,50 +16570,42 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + 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_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 ++ ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 - fi - done ++ fi ++done +done +IFS=$as_save_IFS - - fi -- --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- lt_cv_sys_global_symbol_to_cdecl= - fi --if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -- { $as_echo "$as_me:$LINENO: result: failed" >&5 --$as_echo "failed" >&6; } -+F77=$ac_cv_prog_F77 -+if test -n "$F77"; then -+ { echo "$as_me:$LINENO: result: $F77" >&5 -+echo "${ECHO_T}$F77" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: ok" >&5 --$as_echo "ok" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -+ test -n "$F77" && break ++ ++fi ++fi ++DUMPBIN=$ac_cv_prog_DUMPBIN ++if test -n "$DUMPBIN"; then ++ { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 ++$as_echo "$DUMPBIN" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$DUMPBIN" && break + done +fi -+if test -z "$F77"; then -+ ac_ct_F77=$F77 -+ 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 ++if test -z "$DUMPBIN"; then ++ ac_ct_DUMPBIN=$DUMPBIN ++ for ac_prog in "dumpbin -symbols" "link -dump -symbols" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then ++ $as_echo_n "(cached) " >&6 +else -+ if test -n "$ac_ct_F77"; then -+ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. ++ if test -n "$ac_ct_DUMPBIN"; then ++ ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH @@ -25760,539 +16614,92 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + 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_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 ++ ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - ++ +fi +fi -+ac_ct_F77=$ac_cv_prog_ac_ct_F77 -+if test -n "$ac_ct_F77"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -+echo "${ECHO_T}$ac_ct_F77" >&6; } ++ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN ++if test -n "$ac_ct_DUMPBIN"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 ++$as_echo "$ac_ct_DUMPBIN" >&6; } +else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } +fi - - -+ test -n "$ac_ct_F77" && break ++ ++ ++ test -n "$ac_ct_DUMPBIN" && break +done - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --# Check whether --enable-libtool-lock was given. --if test "${enable_libtool_lock+set}" = set; then -- enableval=$enable_libtool_lock; -+ if test "x$ac_ct_F77" = x; then -+ F77="" ++ ++ if test "x$ac_ct_DUMPBIN" = x; then ++ DUMPBIN=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac -+ F77=$ac_ct_F77 ++ DUMPBIN=$ac_ct_DUMPBIN + fi - fi - --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --ia64-*-hpux*) -- # Find out which ABI we are using. -- echo 'int i;' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+# Provide some information about the compiler. -+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *ELF-32*) -- HPUX_IA64_MODE="32" -- ;; -- *ELF-64*) -- HPUX_IA64_MODE="64" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; --*-*-irix6*) -- # Find out which ABI we are using. -- echo '#line 6937 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- if test "$lt_cv_prog_gnu_ld" = yes; then -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -melf32bsmip" -- ;; -- *N32*) -- LD="${LD-ld} -melf32bmipn32" -- ;; -- *64-bit*) -- LD="${LD-ld} -melf64bmip" -- ;; -- esac -- else -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -32" -- ;; -- *N32*) -- LD="${LD-ld} -n32" -- ;; -- *64-bit*) -- LD="${LD-ld} -64" -- ;; -- esac -- fi -- fi -- rm -rf conftest* -- ;; -- --x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ --s390*-*linux*|s390*-*tpf*|sparc*-*linux*) -- # Find out which ABI we are using. -- echo 'int i;' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; 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" -- ;; -- ppc64-*linux*|powerpc64-*linux*) -- LD="${LD-ld} -m elf32ppclinux" -- ;; -- s390x-*linux*) -- LD="${LD-ld} -m elf_s390" -- ;; -- sparc64-*linux*) -- LD="${LD-ld} -m elf32_sparc" -- ;; -- esac -- ;; -- *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" -- ;; -- ppc*-*linux*|powerpc*-*linux*) -- LD="${LD-ld} -m elf64ppc" -- ;; -- s390*-*linux*|s390*-*tpf*) -- LD="${LD-ld} -m elf64_s390" -- ;; -- sparc*-*linux*) -- LD="${LD-ld} -m elf64_sparc" -- ;; -- esac -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+rm -f a.out - --*-*-sco3.2v5*) -- # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -belf" -- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 --$as_echo_n "checking whether the C compiler needs -belf... " >&6; } --if test "${lt_cv_cc_needs_belf+set}" = set; then -- $as_echo_n "(cached) " >&6 -+# If we don't use `.F' as extension, the preprocessor is not run on the -+# input file. (Note that this only needs to work for GNU compilers.) -+ac_save_ext=$ac_ext -+ac_ext=F -+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } -+if test "${ac_cv_f77_compiler_gnu+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -+ cat >conftest.$ac_ext <<_ACEOF -+ program main -+#ifndef __GNUC__ -+ choke me -+#endif - -- ; -- return 0; --} -+ end - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -+ test -z "$ac_f77_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- lt_cv_cc_needs_belf=yes -+ } && test -s conftest.$ac_objext; then -+ ac_compiler_gnu=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- lt_cv_cc_needs_belf=no -+ ac_compiler_gnu=no - fi - --rm -rf conftest.dSYM --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' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_f77_compiler_gnu=$ac_compiler_gnu - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 --$as_echo "$lt_cv_cc_needs_belf" >&6; } -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -- fi -- ;; --sparc*-*solaris*) -- # Find out which ABI we are using. -- echo 'int i;' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.o` in -- *64-bit*) -- case $lt_cv_prog_gnu_ld in -- yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) -- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -- LD="${LD-ld} -64" -- fi -- ;; -- esac -- ;; -- esac -- fi -- rm -rf conftest* -- ;; --esac -- --need_locks="$enable_libtool_lock" -- -- -- case $host_os in -- rhapsody* | darwin*) -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. --set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DSYMUTIL+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } -+ac_ext=$ac_save_ext -+ac_test_FFLAGS=${FFLAGS+set} -+ac_save_FFLAGS=$FFLAGS -+FFLAGS= -+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } -+if test "${ac_cv_prog_f77_g+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$DSYMUTIL"; then -- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+ FFLAGS=-g -+cat >conftest.$ac_ext <<_ACEOF -+ program main - --fi --fi --DSYMUTIL=$ac_cv_prog_DSYMUTIL --if test -n "$DSYMUTIL"; then -- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 --$as_echo "$DSYMUTIL" >&6; } -+ end -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 ++fi ++ ++ ++ if test "$DUMPBIN" != ":"; then ++ NM="$DUMPBIN" ++ fi ++fi ++test -z "$NM" && NM=nm ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 ++$as_echo_n "checking the name lister ($NM) interface... " >&6; } ++if test "${lt_cv_nm_interface+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_nm_interface="BSD nm" ++ echo "int some_variable = 0;" > conftest.$ac_ext ++ (eval echo "\"\$as_me:5812: $ac_compile\"" >&5) ++ (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_prog_f77_g=no ++ (eval echo "\"\$as_me:5815: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++ cat conftest.err >&5 ++ (eval echo "\"\$as_me:5818: output\"" >&5) ++ cat conftest.out >&5 ++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++ lt_cv_nm_interface="MS dumpbin" ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 ++$as_echo "$lt_cv_nm_interface" >&6; } + + { $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 + $as_echo_n "checking whether ln -s works... " >&6; } +@@ -5243,6 +5836,331 @@ + $as_echo "no, using $LN_S" >&6; } fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - fi --if test -z "$ac_cv_prog_DSYMUTIL"; then -- ac_ct_DSYMUTIL=$DSYMUTIL -- # Extract the first word of "dsymutil", so it can be a program name with args. --set dummy dsymutil; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_DSYMUTIL"; then -- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } -+if test "$ac_test_FFLAGS" = set; then -+ FFLAGS=$ac_save_FFLAGS -+elif test $ac_cv_prog_f77_g = yes; then -+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then -+ FFLAGS="-g -O2" -+ else -+ FFLAGS="-g" - fi --done --done --IFS=$as_save_IFS -- --fi --fi --ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL --if test -n "$ac_ct_DSYMUTIL"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 --$as_echo "$ac_ct_DSYMUTIL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- if test "x$ac_ct_DSYMUTIL" = x; then -- DSYMUTIL=":" -+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then -+ FFLAGS="-O2" - else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- DSYMUTIL=$ac_ct_DSYMUTIL -+ FFLAGS= - fi --else -- DSYMUTIL="$ac_cv_prog_DSYMUTIL" - fi - -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. --set dummy ${ac_tool_prefix}nmedit; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_NMEDIT+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$NMEDIT"; then -- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. -+G77=`test $ac_compiler_gnu = yes && echo yes` -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ -+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +# find the maximum length of command line arguments -+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if test "${lt_cv_sys_max_cmd_len+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- --fi --fi --NMEDIT=$ac_cv_prog_NMEDIT --if test -n "$NMEDIT"; then -- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 --$as_echo "$NMEDIT" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi ++ $as_echo_n "(cached) " >&6 ++else + i=0 + teststring="ABCD" - ++ + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc @@ -26301,52 +16708,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; - --fi --if test -z "$ac_cv_prog_NMEDIT"; then -- ac_ct_NMEDIT=$NMEDIT -- # Extract the first word of "nmedit", so it can be a program name with args. --set dummy nmedit; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_NMEDIT"; then -- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_NMEDIT="nmedit" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS ++ + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; - --fi --fi --ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT --if test -n "$ac_ct_NMEDIT"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 --$as_echo "$ac_ct_NMEDIT" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+ cygwin* | mingw*) ++ ++ cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, @@ -26356,52 +16726,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; - -- if test "x$ac_ct_NMEDIT" = x; then -- NMEDIT=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- NMEDIT=$ac_ct_NMEDIT -- fi --else -- NMEDIT="$ac_cv_prog_NMEDIT" --fi ++ + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; - -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. --set dummy ${ac_tool_prefix}lipo; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_LIPO+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$LIPO"; then -- ac_cv_prog_LIPO="$LIPO" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_LIPO="${ac_tool_prefix}lipo" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS ++ + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then @@ -26415,22 +16746,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + 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` + ;; - --fi --fi --LIPO=$ac_cv_prog_LIPO --if test -n "$LIPO"; then -- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 --$as_echo "$LIPO" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi ++ + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; - ++ + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -26450,7 +16771,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi @@ -26461,568 +16782,151 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + 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 ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done + 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 && ++ # 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. ++ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++ = "XX$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + 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. ++ # 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 - - fi --if test -z "$ac_cv_prog_LIPO"; then -- ac_ct_LIPO=$LIPO -- # Extract the first word of "lipo", so it can be a program name with args. --set dummy lipo; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_LIPO"; then -- ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_LIPO="lipo" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS - --fi --fi --ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO --if test -n "$ac_ct_LIPO"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 --$as_echo "$ac_ct_LIPO" >&6; } -+if test -n $lt_cv_sys_max_cmd_len ; then -+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: none" >&5 -+echo "${ECHO_T}none" >&6; } - fi - -- if test "x$ac_ct_LIPO" = x; then -- LIPO=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- LIPO=$ac_ct_LIPO -- fi --else -- LIPO="$ac_cv_prog_LIPO" --fi - -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. --set dummy ${ac_tool_prefix}otool; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OTOOL+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$OTOOL"; then -- ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_OTOOL="${ac_tool_prefix}otool" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS - --fi --fi --OTOOL=$ac_cv_prog_OTOOL --if test -n "$OTOOL"; then -- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 --$as_echo "$OTOOL" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi - - --fi --if test -z "$ac_cv_prog_OTOOL"; then -- ac_ct_OTOOL=$OTOOL -- # Extract the first word of "otool", so it can be a program name with args. --set dummy otool; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_OTOOL"; then -- ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. -+# 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; } -+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_OTOOL="otool" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS - --fi --fi --ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL --if test -n "$ac_ct_OTOOL"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 --$as_echo "$ac_ct_OTOOL" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -- if test "x$ac_ct_OTOOL" = x; then -- OTOOL=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- OTOOL=$ac_ct_OTOOL -- fi --else -- OTOOL="$ac_cv_prog_OTOOL" --fi -+# Character class describing NM global symbol codes. -+symcode='[BCDEGRST]' - -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. --set dummy ${ac_tool_prefix}otool64; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OTOOL64+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$OTOOL64"; then -- ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - --fi --fi --OTOOL64=$ac_cv_prog_OTOOL64 --if test -n "$OTOOL64"; then -- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 --$as_echo "$OTOOL64" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+# Transform an extracted symbol line into a proper C declaration -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -+# Transform an extracted symbol line into symbol name and symbol address -+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'" - --fi --if test -z "$ac_cv_prog_OTOOL64"; then -- ac_ct_OTOOL64=$OTOOL64 -- # Extract the first word of "otool64", so it can be a program name with args. --set dummy otool64; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_OTOOL64"; then -- ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_OTOOL64="otool64" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[BCDT]' -+ ;; -+cygwin* | mingw* | pw32*) -+ symcode='[ABCDGISTW]' -+ ;; -+hpux*) # Its linker distinguishes data from code symbols -+ if test "$host_cpu" = ia64; then -+ symcode='[ABCDEGRST]' - fi --done --done --IFS=$as_save_IFS -+ 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* | 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'" -+ 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'" -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[BCDEGRST]' -+ ;; -+osf*) -+ symcode='[BCDEGQRST]' -+ ;; -+solaris*) -+ symcode='[BDRT]' -+ ;; -+sco3.2v5*) -+ symcode='[DT]' -+ ;; -+sysv4.2uw2*) -+ symcode='[DT]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[ABDT]' -+ ;; -+sysv4) -+ symcode='[DFNSTU]' -+ ;; -+esac - --fi --fi --ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 --if test -n "$ac_ct_OTOOL64"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 --$as_echo "$ac_ct_OTOOL64" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac - -- if test "x$ac_ct_OTOOL64" = x; then -- OTOOL64=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[ABCDGIRSTW]' ;; - esac -- OTOOL64=$ac_ct_OTOOL64 -- fi --else -- OTOOL64="$ac_cv_prog_OTOOL64" --fi - -+# Try without a prefix undercore, then with it. -+for ac_symprfx in "" "_"; do + -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" - -+ # Write the raw and C identifiers. -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - -+ # Check to see that the pipe works correctly. -+ pipe_works=no - -+ rm -f conftest* -+ cat > conftest.$ac_ext <<EOF -+#ifdef __cplusplus -+extern "C" { -+#endif -+char nm_test_var; -+void nm_test_func(){} -+#ifdef __cplusplus -+} -+#endif -+int main(){nm_test_var='a';nm_test_func();return(0);} -+EOF - -+ 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 -+ # Now try to grab the symbols. -+ nlist=conftest.nm -+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 -+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi - -+ # Make sure that we snagged all the symbols we need. -+ if grep ' nm_test_var$' "$nlist" >/dev/null; then -+ if grep ' nm_test_func$' "$nlist" >/dev/null; then -+ cat <<EOF > conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif - -+EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - -+ cat <<EOF >> conftest.$ac_ext -+#if defined (__STDC__) && __STDC__ -+# define lt_ptr_t void * -+#else -+# define lt_ptr_t char * -+# define const -+#endif - -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ lt_ptr_t address; -+} -+lt_preloaded_symbols[] = -+{ -+EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -+ cat <<\EOF >> conftest.$ac_ext -+ {0, (lt_ptr_t) 0} -+}; - -+#ifdef __cplusplus -+} -+#endif -+EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext}; then -+ pipe_works=yes -+ fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" -+ else -+ echo "cannot find nm_test_func in $nlist" >&5 -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&5 -+ fi -+ else -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 -+ fi -+ else -+ echo "$progname: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -rf conftest* conftst* - -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done - +fi - -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ { echo "$as_me:$LINENO: result: failed" >&5 -+echo "${ECHO_T}failed" >&6; } ++ ++if test -n $lt_cv_sys_max_cmd_len ; then ++ { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else -+ { echo "$as_me:$LINENO: result: ok" >&5 -+echo "${ECHO_T}ok" >&6; } ++ { $as_echo "$as_me:$LINENO: result: none" >&5 ++$as_echo "none" >&6; } +fi - -+{ echo "$as_me:$LINENO: checking for objdir" >&5 -+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } -+if test "${lt_cv_objdir+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++max_cmd_len=$lt_cv_sys_max_cmd_len ++ ++ ++ ++ ++ ++ ++: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++ ++{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 ++$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } ++# Try some XSI features ++xsi_shell=no ++( _lt_dummy="a/b/c" ++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,, \ ++ && eval 'test $(( 1 + 1 )) -eq 2 \ ++ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ ++ && xsi_shell=yes ++{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 ++$as_echo "$xsi_shell" >&6; } ++ ++ ++{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 ++$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } ++lt_shell_append=no ++( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ ++ >/dev/null 2>&1 \ ++ && lt_shell_append=yes ++{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 ++$as_echo "$lt_shell_append" >&6; } ++ ++ ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ lt_unset=unset +else -+ rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs ++ lt_unset=false +fi -+rmdir .libs 2>/dev/null -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -+echo "${ECHO_T}$lt_cv_objdir" >&6; } -+objdir=$lt_cv_objdir - - - - - -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi ++ ++ ++ ++ ++ ++# test EBCDIC or ASCII ++case `echo X|tr X '\101'` in ++ A) # ASCII based system ++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++ lt_SP2NL='tr \040 \012' ++ lt_NL2SP='tr \015\012 \040\040' ++ ;; ++ *) # EBCDIC based system ++ lt_SP2NL='tr \100 \n' ++ lt_NL2SP='tr \r\n \100\100' + ;; +esac - -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='sed -e 1s/^X//' -+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' - -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' - -+# Constants: -+rm="rm -f" - -+# Global variables: -+default_ofile=libtool -+can_build_shared=yes - -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ltmain="$ac_aux_dir/ltmain.sh" -+ofile="$default_ofile" -+with_gnu_ld="$lt_cv_prog_gnu_ld" - -- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 --$as_echo_n "checking for -single_module linker flag... " >&6; } --if test "${lt_cv_apple_cc_single_mod+set}" = set; then -- $as_echo_n "(cached) " >&6 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++$as_echo_n "checking for $LD option to reload object files... " >&6; } ++if test "${lt_cv_ld_reload_flag+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ld_reload_flag='-r' ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++$as_echo "$lt_cv_ld_reload_flag" >&6; } ++reload_flag=$lt_cv_ld_reload_flag ++case $reload_flag in ++"" | " "*) ;; ++*) reload_flag=" $reload_flag" ;; ++esac ++reload_cmds='$LD$reload_flag -o $output$reload_objs' ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ else ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' ++ fi ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ +if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ar; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_AR+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- lt_cv_apple_cc_single_mod=no -- if test -z "${LT_MULTI_MODULE}"; then -- # By default we will add the -single_module flag. You can override -- # by either setting the environment variable LT_MULTI_MODULE -- # non-empty at configure time, or by adding -multi_module to the -- # link flags. -- rm -rf libconftest.dylib* -- echo "int foo(void){return 1;}" > conftest.c -- echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ---dynamiclib -Wl,-single_module conftest.c" >&5 -- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -- -dynamiclib -Wl,-single_module conftest.c 2>conftest.err -- _lt_result=$? -- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then -- lt_cv_apple_cc_single_mod=yes -- else -- cat conftest.err >&5 -- fi -- rm -rf libconftest.dylib* -- rm -f conftest.* -- fi -+ if test -n "$AR"; then -+ ac_cv_prog_AR="$AR" # Let the user override the test. ++ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. ++set dummy ${ac_tool_prefix}objdump; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OBJDUMP"; then ++ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH @@ -27031,45 +16935,317 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + 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_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 ++ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 --$as_echo "$lt_cv_apple_cc_single_mod" >&6; } -- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 --$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } --if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -- $as_echo_n "(cached) " >&6 +fi -+AR=$ac_cv_prog_AR -+if test -n "$AR"; then -+ { echo "$as_me:$LINENO: result: $AR" >&5 -+echo "${ECHO_T}$AR" >&6; } - else -- lt_cv_ld_exported_symbols_list=no -- save_LDFLAGS=$LDFLAGS -- echo "_main" > conftest.sym -- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -- cat >conftest.$ac_ext <<_ACEOF ++fi ++OBJDUMP=$ac_cv_prog_OBJDUMP ++if test -n "$OBJDUMP"; then ++ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++$as_echo "$OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OBJDUMP"; then ++ ac_ct_OBJDUMP=$OBJDUMP ++ # Extract the first word of "objdump", so it can be a program name with args. ++set dummy objdump; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OBJDUMP"; then ++ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_OBJDUMP="objdump" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP ++if test -n "$ac_ct_OBJDUMP"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++$as_echo "$ac_ct_OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OBJDUMP" = x; then ++ OBJDUMP="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OBJDUMP=$ac_ct_OBJDUMP ++ fi ++else ++ OBJDUMP="$ac_cv_prog_OBJDUMP" ++fi ++ ++test -z "$OBJDUMP" && OBJDUMP=objdump ++ ++ ++ ++ ++ ++ + { $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 + $as_echo_n "checking how to recognize dependent libraries... " >&6; } + if test "${lt_cv_deplibs_check_method+set}" = set; then +@@ -5296,12 +6214,18 @@ + fi + ;; + ++cegcc) ++ # use the weaker test based on 'objdump'. See mingw*. ++ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ ;; ++ + darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + + freebsd* | dragonfly*) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. +@@ -5358,8 +6282,8 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then ++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 + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' +@@ -5372,12 +6296,12 @@ + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +-nto-qnx*) +- lt_cv_deplibs_check_method=unknown ++*nto* | *qnx*) ++ lt_cv_deplibs_check_method=pass_all + ;; + + openbsd*) +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' +@@ -5396,6 +6320,10 @@ + lt_cv_deplibs_check_method=pass_all + ;; + ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ + sysv4 | sysv4.3*) + case $host_vendor in + motorola) +@@ -5423,7 +6351,7 @@ + esac + ;; + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++tpf*) + lt_cv_deplibs_check_method=pass_all + ;; + esac +@@ -5438,247 +6366,24 @@ + + + +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} + +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +-# Allow CC to be a program name with arguments. +-compiler=$CC + + +-# Check whether --enable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then +- enableval=$enable_libtool_lock; +-fi + +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case $host in +-ia64-*-hpux*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.$ac_objext` in +- *ELF-32*) +- HPUX_IA64_MODE="32" +- ;; +- *ELF-64*) +- HPUX_IA64_MODE="64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '#line 5482 "configure"' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- if test "$lt_cv_prog_gnu_ld" = yes; then +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -melf32bsmip" +- ;; +- *N32*) +- LD="${LD-ld} -melf32bmipn32" +- ;; +- *64-bit*) +- LD="${LD-ld} -melf64bmip" +- ;; +- esac +- else +- case `/usr/bin/file conftest.$ac_objext` in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- fi +- rm -rf conftest* +- ;; +- +-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 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; 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" +- ;; +- ppc64-*linux*|powerpc64-*linux*) +- LD="${LD-ld} -m elf32ppclinux" +- ;; +- s390x-*linux*) +- LD="${LD-ld} -m elf_s390" +- ;; +- sparc64-*linux*) +- LD="${LD-ld} -m elf32_sparc" +- ;; +- esac +- ;; +- *64-bit*) +- libsuff=64 +- 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" +- ;; +- ppc*-*linux*|powerpc*-*linux*) +- LD="${LD-ld} -m elf64ppc" +- ;; +- s390*-*linux*) +- LD="${LD-ld} -m elf64_s390" +- ;; +- sparc*-*linux*) +- LD="${LD-ld} -m elf64_sparc" +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +-$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +-if test "${lt_cv_cc_needs_belf+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - +- -int -main () -{ - +- - ; - return 0; -} @@ -27095,83 +17271,423 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- lt_cv_ld_exported_symbols_list=yes +- lt_cv_cc_needs_belf=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -- lt_cv_ld_exported_symbols_list=no - fi -- +- lt_cv_cc_needs_belf=no +-fi + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +-$as_echo "$lt_cv_cc_needs_belf" >&6; } +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +-sparc*-*solaris*) +- # Find out which ABI we are using. +- echo 'int i;' > conftest.$ac_ext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- case `/usr/bin/file conftest.o` in +- *64-bit*) +- case $lt_cv_prog_gnu_ld in +- yes*) LD="${LD-ld} -m elf64_sparc" ;; +- *) +- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then +- LD="${LD-ld} -64" +- fi +- ;; +- esac +- ;; +- esac +- fi +- rm -rf conftest* +- ;; + +-*-*-cygwin* | *-*-mingw* | *-*-pw32*) +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +-set dummy ${ac_tool_prefix}dlltool; ac_word=$2 ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. ++set dummy ${ac_tool_prefix}ar; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DLLTOOL+set}" = set; then ++if test "${ac_cv_prog_AR+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$DLLTOOL"; then +- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. ++ if test -n "$AR"; then ++ ac_cv_prog_AR="$AR" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -5687,7 +6392,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" ++ ac_cv_prog_AR="${ac_tool_prefix}ar" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5697,10 +6402,10 @@ + + fi + fi +-DLLTOOL=$ac_cv_prog_DLLTOOL +-if test -n "$DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +-$as_echo "$DLLTOOL" >&6; } ++AR=$ac_cv_prog_AR ++if test -n "$AR"; then ++ { $as_echo "$as_me:$LINENO: result: $AR" >&5 ++$as_echo "$AR" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } +@@ -5708,17 +6413,17 @@ + + + fi +-if test -z "$ac_cv_prog_DLLTOOL"; then +- ac_ct_DLLTOOL=$DLLTOOL +- # Extract the first word of "dlltool", so it can be a program name with args. +-set dummy dlltool; ac_word=$2 +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_DLLTOOL"; then +- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -5727,7 +6432,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_DLLTOOL="dlltool" + ac_cv_prog_ac_ct_AR="ar" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5737,17 +6442,17 @@ fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 --$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } -- case $host_os in -- rhapsody* | darwin1.[012]) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -- darwin1.*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- darwin*) # darwin 5.x on -- # if running on 10.5 or later, the deployment target defaults -- # to the OS version, if on x86, and 10.4, the deployment -- # target defaults to 10.4. Don't you love it? -- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -- 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- 10.[012]*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- 10.*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- esac -- ;; -- esac -- if test "$lt_cv_apple_cc_single_mod" = "yes"; then -- _lt_dar_single_mod='$single_module' -- fi -- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -- else -- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- if test "$DSYMUTIL" != ":"; then -- _lt_dsymutil='~$DSYMUTIL $lib || :' -- else -- _lt_dsymutil= -- fi -- ;; -- esac -- + fi +-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +-if test -n "$ac_ct_DLLTOOL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +-$as_echo "$ac_ct_DLLTOOL" >&6; } ++ac_ct_AR=$ac_cv_prog_ac_ct_AR ++if test -n "$ac_ct_AR"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++$as_echo "$ac_ct_AR" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi + +- if test "x$ac_ct_DLLTOOL" = x; then +- DLLTOOL="false" ++ if test "x$ac_ct_AR" = x; then ++ AR="false" + else + case $cross_compiling:$ac_tool_warned in + yes:) +@@ -5755,22 +6460,35 @@ + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +- DLLTOOL=$ac_ct_DLLTOOL ++ AR=$ac_ct_AR + fi + else +- DLLTOOL="$ac_cv_prog_DLLTOOL" ++ AR="$ac_cv_prog_AR" + fi + +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +-set dummy ${ac_tool_prefix}as; ac_word=$2 ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ++set dummy ${ac_tool_prefix}strip; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AS+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$AS"; then +- ac_cv_prog_AS="$AS" # Let the user override the test. ++ if test -n "$STRIP"; then ++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -5779,7 +6497,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_AS="${ac_tool_prefix}as" ++ ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5789,10 +6507,10 @@ + + fi + fi +-AS=$ac_cv_prog_AS +-if test -n "$AS"; then +- { $as_echo "$as_me:$LINENO: result: $AS" >&5 +-$as_echo "$AS" >&6; } ++STRIP=$ac_cv_prog_STRIP ++if test -n "$STRIP"; then ++ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } +@@ -5800,17 +6518,17 @@ + + + fi +-if test -z "$ac_cv_prog_AS"; then +- ac_ct_AS=$AS +- # Extract the first word of "as", so it can be a program name with args. +-set dummy as; ac_word=$2 ++if test -z "$ac_cv_prog_STRIP"; then ++ ac_ct_STRIP=$STRIP ++ # Extract the first word of "strip", so it can be a program name with args. ++set dummy strip; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_AS"; then +- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. ++ if test -n "$ac_ct_STRIP"; then ++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -5819,7 +6537,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_AS="as" ++ ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5829,17 +6547,17 @@ + + fi + fi +-ac_ct_AS=$ac_cv_prog_ac_ct_AS +-if test -n "$ac_ct_AS"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +-$as_echo "$ac_ct_AS" >&6; } ++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP ++if test -n "$ac_ct_STRIP"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi + +- if test "x$ac_ct_AS" = x; then +- AS="false" ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" + else + case $cross_compiling:$ac_tool_warned in + yes:) +@@ -5847,22 +6565,29 @@ + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +- AS=$ac_ct_AS ++ STRIP=$ac_ct_STRIP + fi + else +- AS="$ac_cv_prog_AS" ++ STRIP="$ac_cv_prog_STRIP" + fi + +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +-set dummy ${ac_tool_prefix}objdump; ac_word=$2 ++test -z "$STRIP" && STRIP=: ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. ++set dummy ${ac_tool_prefix}ranlib; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$OBJDUMP"; then +- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. ++ if test -n "$RANLIB"; then ++ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -5871,7 +6596,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" ++ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5881,10 +6606,10 @@ + + fi + fi +-OBJDUMP=$ac_cv_prog_OBJDUMP +-if test -n "$OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +-$as_echo "$OBJDUMP" >&6; } ++RANLIB=$ac_cv_prog_RANLIB ++if test -n "$RANLIB"; then ++ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 ++$as_echo "$RANLIB" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } +@@ -5892,17 +6617,17 @@ + + + fi +-if test -z "$ac_cv_prog_OBJDUMP"; then +- ac_ct_OBJDUMP=$OBJDUMP +- # Extract the first word of "objdump", so it can be a program name with args. +-set dummy objdump; ac_word=$2 ++if test -z "$ac_cv_prog_RANLIB"; then ++ ac_ct_RANLIB=$RANLIB ++ # Extract the first word of "ranlib", so it can be a program name with args. ++set dummy ranlib; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_OBJDUMP"; then +- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. ++ if test -n "$ac_ct_RANLIB"; then ++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -5911,7 +6636,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_OBJDUMP="objdump" ++ ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -5921,17 +6646,17 @@ + + fi + fi +-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +-if test -n "$ac_ct_OBJDUMP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +-$as_echo "$ac_ct_OBJDUMP" >&6; } ++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB ++if test -n "$ac_ct_RANLIB"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++$as_echo "$ac_ct_RANLIB" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi + +- if test "x$ac_ct_OBJDUMP" = x; then +- OBJDUMP="false" ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in + yes:) +@@ -5939,435 +6664,309 @@ + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +- OBJDUMP=$ac_ct_OBJDUMP ++ RANLIB=$ac_ct_RANLIB + fi + else +- OBJDUMP="$ac_cv_prog_OBJDUMP" ++ RANLIB="$ac_cv_prog_RANLIB" + fi + +- ;; ++test -z "$RANLIB" && RANLIB=: + +-esac + +-need_locks="$enable_libtool_lock" + + -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -27182,15 +17698,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi +-fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - $as_echo_n "(cached) " >&6 -+ac_ct_AR=$ac_cv_prog_ac_ct_AR -+if test -n "$ac_ct_AR"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -+echo "${ECHO_T}$ac_ct_AR" >&6; } - else +-else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do @@ -27220,23 +17732,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_AR" = x; then -+ AR="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; - esac +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 @@ -27250,19 +17746,32 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - test ! -s conftest.err - }; then - : -+ AR=$ac_ct_AR -+ fi - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - # Broken: fails on valid input. -continue -+ AR="$ac_cv_prog_AR" ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -rm -f conftest.err conftest.$ac_ext -- + - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF @@ -27292,47 +17801,14 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - }; then - # Broken: success on invalid input. -continue -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_RANLIB+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - # Passes both tests. -ac_preproc_ok=: -break -+fi -+fi -+RANLIB=$ac_cv_prog_RANLIB -+if test -n "$RANLIB"; then -+ { echo "$as_me:$LINENO: result: $RANLIB" >&5 -+echo "${ECHO_T}$RANLIB" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi +-fi -rm -f conftest.err conftest.$ac_ext @@ -27341,49 +17817,16 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break - fi -- +-fi + - done - ac_cv_prog_CPP=$CPP -+if test -z "$ac_cv_prog_RANLIB"; then -+ ac_ct_RANLIB=$RANLIB -+ # Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_RANLIB"; then -+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - fi +-fi - CPP=$ac_cv_prog_CPP -+fi -+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -+if test -n "$ac_ct_RANLIB"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+echo "${ECHO_T}$ac_ct_RANLIB" >&6; } - else +-else - ac_cv_prog_CPP=$CPP -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false @@ -27412,20 +17855,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -+ -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; - esac +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 @@ -27439,19 +17869,16 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - test ! -s conftest.err - }; then - : -+ RANLIB=$ac_ct_RANLIB -+ fi - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - # Broken: fails on valid input. -continue -+ RANLIB="$ac_cv_prog_RANLIB" - fi +-fi -rm -f conftest.err conftest.$ac_ext -- + - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF @@ -27481,52 +17908,23 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - }; then - # Broken: success on invalid input. -continue -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -+set dummy ${ac_tool_prefix}strip; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - # Passes both tests. -ac_preproc_ok=: -break - fi -- +-fi + -rm -f conftest.err conftest.$ac_ext -- + -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -+fi -+STRIP=$ac_cv_prog_STRIP -+if test -n "$STRIP"; then -+ { echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6; } - else +-else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check @@ -27534,30 +17932,51 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi +-fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -- + -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then -- $as_echo_n "(cached) " >&6 -+fi -+if test -z "$ac_cv_prog_STRIP"; then -+ ac_ct_STRIP=$STRIP -+ # Extract the first word of "strip", so it can be a program name with args. -+set dummy strip; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++# Check for command to grab the raw symbol name followed by C symbol from nm. ++{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 ++$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ @@ -27569,37 +17988,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -#include <stdarg.h> -#include <string.h> -#include <float.h> -+ if test -n "$ac_ct_STRIP"; then -+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -int -main () -{ -+fi -+fi -+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -+if test -n "$ac_ct_STRIP"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi ++# These are sane defaults that work on at least a few old systems. ++# [They come from Ultrix. What could be older than Ultrix?!! ;)] - ; - return 0; @@ -27610,18 +18004,46 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; ++# Character class describing NM global symbol codes. ++symcode='[BCDEGRST]' ++ ++# Regexp to match symbols that can be accessed directly from C. ++sympat='\([_A-Za-z][_A-Za-z0-9]*\)' ++ ++# Define system-specific variables. ++case $host_os in ++aix*) ++ symcode='[BCDT]' ++ ;; ++cygwin* | mingw* | pw32* | cegcc*) ++ symcode='[ABCDGISTW]' ++ ;; ++hpux*) ++ if test "$host_cpu" = ia64; then ++ symcode='[ABCDEGRST]' ++ fi ++ ;; ++irix* | nonstopux*) ++ symcode='[BCDEGRST]' ++ ;; ++osf*) ++ symcode='[BCDEGQRST]' ++ ;; ++solaris*) ++ symcode='[BDRT]' ++ ;; ++sco3.2v5*) ++ symcode='[DT]' ++ ;; ++sysv4.2uw2*) ++ symcode='[DT]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[ABDT]' ++ ;; ++sysv4) ++ symcode='[DFNSTU]' ++ ;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 @@ -27636,18 +18058,24 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -+ STRIP=$ac_ct_STRIP -+ fi - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_cv_header_stdc=no -+ STRIP="$ac_cv_prog_STRIP" - fi +-fi ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[ABCDGIRSTW]' ;; ++esac -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ++# Transform an extracted symbol line into a proper C declaration. ++# Some systems (esp. on ia64) link data and code symbols differently, ++# so use this general approach. ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF @@ -27657,6 +18085,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <string.h> ++# Transform an extracted symbol line into symbol name and symbol address ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -27666,27 +18097,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - ac_cv_header_stdc=no -fi -rm -f conftest* -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac -fi -+# Set sane defaults for various variables -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+test -z "$AS" && AS=as -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+test -z "$LD" && LD=ld -+test -z "$LN_S" && LN_S="ln -s" -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+test -z "$NM" && NM=nm -+test -z "$SED" && SED=sed -+test -z "$OBJDUMP" && OBJDUMP=objdump -+test -z "$RANLIB" && RANLIB=: -+test -z "$STRIP" && STRIP=: -+test -z "$ac_objext" && ac_objext=o ++# Try without a prefix underscore, then with it. ++for ac_symprfx in "" "_"; do -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -27697,10 +18118,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <stdlib.h> -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -27708,44 +18127,38 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - : -else - ac_cv_header_stdc=no -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" - fi +-fi -rm -f conftest* ++ # Write the raw and C identifiers. ++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ # Fake it for dumpbin and say T for any non-static function ++ # and D for any global variable. ++ # Also find C++ and __fastcall symbols from MSVC++, ++ # which start with @ or ?. ++ lt_cv_sys_global_symbol_pipe="$AWK '"\ ++" {last_section=section; section=\$ 3};"\ ++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++" \$ 0!~/External *\|/{next};"\ ++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ ++" {if(hide[section]) next};"\ ++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ ++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ ++" s[1]~/^[@?]/{print s[1], s[1]; next};"\ ++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++" ' prfx=^$ac_symprfx" ++ else ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ fi -fi -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ # Check to see that the pipe works correctly. ++ pipe_works=no -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -+ -+# Only perform the check for file, if the check method requires it -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -27763,31 +18176,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) --#endif -+ case $MAGIC_CMD in -+[\\/*] | ?:[\\/]*) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/${ac_tool_prefix}file; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <<EOF 1>&2 - ++ rm -f conftest* ++ cat > conftest.$ac_ext <<_LT_EOF ++#ifdef __cplusplus ++extern "C" { + #endif +- -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () @@ -27798,7 +18192,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - || toupper (i) != TOUPPER (i)) - return 2; - return 0; --} ++char nm_test_var; ++void nm_test_func(void); ++void nm_test_func(void){} ++#ifdef __cplusplus + } -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" @@ -27809,8 +18207,14 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++#endif ++int main(){nm_test_var='a';nm_test_func();return(0);} ++_LT_EOF ++ ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -27819,171 +18223,138 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # Now try to grab the symbols. ++ nlist=conftest.nm ++ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 ++ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org ++ (exit $ac_status); } && test -s "$nlist"; then ++ # Try sorting and uniquifying the output. ++ if sort "$nlist" | uniq > "$nlist"T; then ++ mv -f "$nlist"T "$nlist" ++ else ++ rm -f "$nlist"T ++ fi -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac - fi - -- -fi -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+echo "${ECHO_T}$MAGIC_CMD" >&6; } ++ # Make sure that we snagged all the symbols we need. ++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then ++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then ++ cat <<_LT_EOF > conftest.$ac_ext ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++_LT_EOF ++ # Now generate the symbol file. ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' ++ ++ cat <<_LT_EOF >> conftest.$ac_ext ++ ++/* The mapping between symbol names and symbols. */ ++const struct { ++ const char *name; ++ void *address; ++} ++lt__PROGRAM__LTX_preloaded_symbols[] = ++{ ++ { "@PROGRAM@", (void *) 0 }, ++_LT_EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++ cat <<\_LT_EOF >> conftest.$ac_ext ++ {0, (void *) 0} ++}; ++ ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt__PROGRAM__LTX_preloaded_symbols; ++} ++#endif + ++#ifdef __cplusplus ++} ++#endif ++_LT_EOF ++ # Now try linking the two files. ++ mv conftest.$ac_objext conftstm.$ac_objext ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" ++ LIBS="conftstm.$ac_objext" ++ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" ++ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && test -s conftest${ac_exeext}; then ++ pipe_works=yes ++ fi ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" ++ else ++ echo "cannot find nm_test_func in $nlist" >&5 ++ fi ++ else ++ echo "cannot find nm_test_var in $nlist" >&5 ++ fi ++ else ++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 ++ fi ++ else ++ echo "$progname: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ fi ++ rm -rf conftest* conftst* ++ ++ # Do not use the global_symbol_pipe unless it works. ++ if test "$pipe_works" = yes; then ++ break ++ else ++ lt_cv_sys_global_symbol_pipe= ++ fi ++done + + fi ++ ++if test -z "$lt_cv_sys_global_symbol_pipe"; then ++ lt_cv_sys_global_symbol_to_cdecl= ++fi ++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++ { $as_echo "$as_me:$LINENO: result: failed" >&5 ++$as_echo "failed" >&6; } +else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } ++ { $as_echo "$as_me:$LINENO: result: ok" >&5 ++$as_echo "ok" >&6; } fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -- + -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF -fi -+if test -z "$lt_cv_path_MAGIC_CMD"; then -+ if test -n "$ac_tool_prefix"; then -+ { echo "$as_me:$LINENO: checking for file" >&5 -+echo $ECHO_N "checking for file... $ECHO_C" >&6; } -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $MAGIC_CMD in -+[\\/*] | ?:[\\/]*) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/file; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/file" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <<EOF 1>&2 -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org - -+EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac -+fi - -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+echo "${ECHO_T}$MAGIC_CMD" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - -+ else -+ MAGIC_CMD=: -+ fi -+fi - -+ fi -+ ;; -+esac -+ case $host_os in -+ rhapsody* | darwin*) -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$DSYMUTIL"; then -+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+fi -+fi -+DSYMUTIL=$ac_cv_prog_DSYMUTIL -+if test -n "$DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -+echo "${ECHO_T}$DSYMUTIL" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi +@@ -6377,34 +6976,175 @@ + -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ @@ -27993,25 +18364,294 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# Check whether --enable-libtool-lock was given. ++if test "${enable_libtool_lock+set}" = set; then ++ enableval=$enable_libtool_lock; +fi -+if test -z "$ac_cv_prog_DSYMUTIL"; then -+ ac_ct_DSYMUTIL=$DSYMUTIL -+ # Extract the first word of "dsymutil", so it can be a program name with args. -+set dummy dsymutil; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '#line 7021 "configure"' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; 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" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *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" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*|s390*-*tpf*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++$as_echo_n "checking whether the C compiler needs -belf... " >&6; } ++if test "${lt_cv_cc_needs_belf+set}" = set; then + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF ++ ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-$ac_includes_default + +-#include <$ac_header> ++int ++main () ++{ ++ ++ ; ++ return 0; ++} + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" + $as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -6413,439 +7153,167 @@ + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- eval "$as_ac_Header=yes" ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ lt_cv_cc_needs_belf=yes + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_Header=no" ++ lt_cv_cc_needs_belf=no + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF ++rm -rf conftest.dSYM ++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' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++$as_echo "$lt_cv_cc_needs_belf" >&6; } ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++esac + +-done +- ++need_locks="$enable_libtool_lock" + + +-for ac_header in dlfcn.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ case $host_os in ++ rhapsody* | darwin*) ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. ++set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then + $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -- -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext @@ -28032,9 +18672,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- eval "$as_ac_Header=yes" -+ if test -n "$ac_ct_DSYMUTIL"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +- ac_header_compiler=yes ++ if test -n "$DSYMUTIL"; then ++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 @@ -28045,824 +18685,123 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS -- eval "$as_ac_Header=no" +- ac_header_compiler=no fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } +- +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ -_ACEOF -+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -+if test -n "$ac_ct_DSYMUTIL"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - -+ if test "x$ac_ct_DSYMUTIL" = x; then -+ DSYMUTIL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ DSYMUTIL=$ac_ct_DSYMUTIL -+ fi -+else -+ DSYMUTIL="$ac_cv_prog_DSYMUTIL" +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (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 +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no fi - --done - +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } - -- --for ac_header in dlfcn.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## --------------------------------------------------------------------- ## +-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +-## --------------------------------------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_Header=no" --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi ++DSYMUTIL=$ac_cv_prog_DSYMUTIL ++if test -n "$DSYMUTIL"; then ++ { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++$as_echo "$DSYMUTIL" >&6; } + else +- eval "$as_ac_Header=\$ac_header_preproc" ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + +-fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -- --fi + + fi - -done - - - --ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test -z "$CXX"; then -- if test -n "$CCC"; then -- CXX=$CCC -- else - if test -n "$ac_tool_prefix"; then -- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -- 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 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -+set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$CXX"; then -- ac_cv_prog_CXX="$CXX" # Let the user override the test. -+ if test -n "$NMEDIT"; then -+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -8320,8 +8021,8 @@ - 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8330,32 +8031,28 @@ - - fi - fi --CXX=$ac_cv_prog_CXX --if test -n "$CXX"; then -- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 --$as_echo "$CXX" >&6; } -+NMEDIT=$ac_cv_prog_NMEDIT -+if test -n "$NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -+echo "${ECHO_T}$NMEDIT" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -- test -n "$CXX" && break -- done - fi --if test -z "$CXX"; then -- ac_ct_CXX=$CXX -- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 -+if test -z "$ac_cv_prog_NMEDIT"; then -+ ac_ct_NMEDIT=$NMEDIT -+ # Extract the first word of "nmedit", so it can be a program name with args. -+set dummy nmedit; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test -n "$ac_ct_CXX"; then -- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -+ if test -n "$ac_ct_NMEDIT"; then -+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -8364,8 +8061,8 @@ - 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_CXX="$ac_prog" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ ac_cv_prog_ac_ct_NMEDIT="nmedit" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -8374,78 +8071,68 @@ - - fi - fi --ac_ct_CXX=$ac_cv_prog_ac_ct_CXX --if test -n "$ac_ct_CXX"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --$as_echo "$ac_ct_CXX" >&6; } -+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -+if test -n "$ac_ct_NMEDIT"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- -- test -n "$ac_ct_CXX" && break --done -- -- if test "x$ac_ct_CXX" = x; then -- CXX="g++" -+ if test "x$ac_ct_NMEDIT" = x; then -+ NMEDIT=":" - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac -- CXX=$ac_ct_CXX -+ NMEDIT=$ac_ct_NMEDIT - fi -+else -+ NMEDIT="$ac_cv_prog_NMEDIT" - fi - -- fi --fi --# Provide some information about the compiler. --$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 --set X $ac_compile --ac_compiler=$2 --{ (ac_try="$ac_compiler --version >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler --version >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -v >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -v >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -V >&5" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -V >&5") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } - --{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } --if test "${ac_cv_cxx_compiler_gnu+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_apple_cc_single_mod+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ echo "int foo(void){return 1;}" > conftest.c -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib ${wl}-single_module conftest.c -+ if test -f libconftest.dylib; then -+ lt_cv_apple_cc_single_mod=yes -+ rm -rf libconftest.dylib* -+ fi -+ rm conftest.c -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } -+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -8455,4674 +8142,6806 @@ - int - main () - { --#ifndef __GNUC__ -- choke me --#endif - - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -+ test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_compiler_gnu=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ lt_cv_ld_exported_symbols_list=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_compiler_gnu=no -+ lt_cv_ld_exported_symbols_list=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$save_LDFLAGS" - - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } --if test $ac_compiler_gnu = yes; then -- GXX=yes --else -- GXX= -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } -+ case $host_os in -+ rhapsody* | darwin1.[0123]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[012]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+ -+ -+enable_dlopen=no -+enable_win32_dll=yes -+ -+# Check whether --enable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; - fi --ac_test_CXXFLAGS=${CXXFLAGS+set} --ac_save_CXXFLAGS=$CXXFLAGS --{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --$as_echo_n "checking whether $CXX accepts -g... " >&6; } --if test "${ac_cv_prog_cxx_g+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_save_cxx_werror_flag=$ac_cxx_werror_flag -- ac_cxx_werror_flag=yes -- ac_cv_prog_cxx_g=no -- CXXFLAGS="-g" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -+ -+# Check whether --with-pic was given. -+if test "${with_pic+set}" = set; then -+ withval=$with_pic; pic_mode="$withval" - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ pic_mode=default -+fi - -- CXXFLAGS="" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+test -z "$pic_mode" && pic_mode=default - --int --main () --{ -+# Use C for the default configuration in the libtool script -+tagname= -+lt_save_CC="$CC" -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cxx_werror_flag=$ac_save_cxx_werror_flag -- CXXFLAGS="-g" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+# Source file extension for C test sources. -+ac_ext=c - --int --main () --{ -+# Object file extension for compiled C test sources. -+objext=o -+objext=$objext - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+# Code to be used in simple compile tests -+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);}' - --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ac_cxx_werror_flag=$ac_save_cxx_werror_flag --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --$as_echo "$ac_cv_prog_cxx_g" >&6; } --if test "$ac_test_CXXFLAGS" = set; then -- CXXFLAGS=$ac_save_CXXFLAGS --elif test $ac_cv_prog_cxx_g = yes; then -- if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -- else -- CXXFLAGS="-g" -- fi --else -- if test "$GXX" = yes; then -- CXXFLAGS="-O2" -- else -- CXXFLAGS= -- fi --fi --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+# Allow CC to be a program name with arguments. -+compiler=$CC - --depcc="$CXX" am_compiler_list= - --{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --$as_echo_n "checking dependency style of $depcc... " >&6; } --if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub -+# save warnings/boilerplate of simple test code -+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* - -- am_cv_CXX_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -- fi -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- : > sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+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 -r conftest* - -- case $depmode in -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -- fi -- ;; -- none) break ;; -- esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. -- if depmode=$depmode \ -- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -- am_cv_CXX_dependencies_compiler_type=$depmode -- break -- fi -- fi -- done - -- cd .. -- rm -rf conftest.dir -+ -+lt_prog_compiler_no_builtin_flag= -+ -+if test "$GCC" = yes; then -+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' -+ -+ -+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- am_cv_CXX_dependencies_compiler_type=none -+ lt_cv_prog_compiler_rtti_exceptions=no -+ ac_outfile=conftest.$ac_objext -+ 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. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:8312: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:8316: \$? = $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. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_rtti_exceptions=yes -+ fi -+ fi -+ $rm conftest* -+ - fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } - -+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -+else -+ : - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 --$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } --CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -+fi - -+lt_prog_compiler_wl= -+lt_prog_compiler_pic= -+lt_prog_compiler_static= - --if -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then -- am__fastdepCXX_TRUE= -- am__fastdepCXX_FALSE='#' --else -- am__fastdepCXX_TRUE='#' -- am__fastdepCXX_FALSE= --fi -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - -+ if test "$GCC" = yes; then -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_static='-static' - -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then @@ -28875,8 +18814,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++if test -z "$ac_cv_prog_DSYMUTIL"; then ++ ac_ct_DSYMUTIL=$DSYMUTIL ++ # Extract the first word of "dsymutil", so it can be a program name with args. ++set dummy dsymutil; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then + $as_echo_n "(cached) " >&6 + else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do @@ -28927,23 +18873,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # Broken: fails on valid input. -continue -fi -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static='-Bstatic' -+ fi -+ ;; - +- -rm -f conftest.err conftest.$ac_ext -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' -+ ;; - +- - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF @@ -28973,57 +18905,47 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - }; then - # Broken: success on invalid input. -continue --else ++ if test -n "$ac_ct_DSYMUTIL"; then ++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; - +- - # Passes both tests. -ac_preproc_ok=: -break -fi -+ 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' -+ ;; - +- -rm -f conftest.err conftest.$ac_ext -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic='-fno-common' -+ ;; - --done +- ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi + done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; - +- - done - ac_cv_prog_CXXCPP=$CXXCPP -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared=no -+ enable_shared=no -+ ;; ++done ++IFS=$as_save_IFS --fi + fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP --fi + fi -{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } -ac_preproc_ok=false @@ -29066,59 +18988,22 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - test ! -s conftest.err - }; then - : --else ++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL ++if test -n "$ac_ct_DSYMUTIL"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++$as_echo "$ac_ct_DSYMUTIL" >&6; } + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic=-Kconform_pic -+ fi -+ ;; - +- - # Broken: fails on valid input. -continue --fi -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic='-fPIC' -+ ;; -+ esac -+ ;; ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi -rm -f conftest.err conftest.$ac_ext -+ *) -+ lt_prog_compiler_pic='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ lt_prog_compiler_wl='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static='-Bstatic' -+ else -+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic='-qnocommon' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ esac -+ ;; - +- - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF @@ -29133,7 +19018,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; --esac ++ if test "x$ac_ct_DSYMUTIL" = x; then ++ DSYMUTIL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 @@ -29151,32 +19044,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ 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' -+ ;; - +- - # Passes both tests. -ac_preproc_ok=: -break -fi -+ hpux9* | hpux10* | hpux11*) -+ lt_prog_compiler_wl='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ lt_prog_compiler_static='${wl}-a ${wl}archive' -+ ;; - +- -rm -f conftest.err conftest.$ac_ext - -done @@ -29184,843 +19057,1444 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : --else ++ DSYMUTIL=$ac_ct_DSYMUTIL ++ fi + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --_lt_caught_CXX_error=yes; } --fi -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl='-Wl,' -+ # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static='-non_shared' -+ ;; - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ newsos6) -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - --else -- _lt_caught_CXX_error=yes --fi -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-fpic' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl='-Wl,' -+ # 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 -+ ;; - -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static='-non_shared' -+ ;; - -+ rdos*) -+ lt_prog_compiler_static='-non_shared' -+ ;; - -+ solaris*) -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl='-Wl,';; -+ esac -+ ;; - --# Set options -+ sunos4*) -+ lt_prog_compiler_wl='-Qoption ld ' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ lt_prog_compiler_pic='-Kconform_pic' -+ lt_prog_compiler_static='-Bstatic' -+ fi -+ ;; - -- enable_dlopen=no -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - -+ unicos*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_can_build_shared=no -+ ;; - -+ uts4*) -+ lt_prog_compiler_pic='-pic' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - -- # Check whether --enable-shared was given. --if test "${enable_shared+set}" = set; then -- enableval=$enable_shared; p=${PACKAGE-default} -- case $enableval in -- yes) enable_shared=yes ;; -- no) enable_shared=no ;; - *) -- enable_shared=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$lt_save_ifs" -+ lt_prog_compiler_can_build_shared=no - ;; - esac --else -- enable_shared=yes +-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } -fi - +-ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -+ fi ++ DSYMUTIL="$ac_cv_prog_DSYMUTIL" + fi -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } - -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic"; then - -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_pic_works=no -+ ac_outfile=conftest.$ac_objext -+ 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. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:8602: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:8606: \$? = $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. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_pic_works=yes -+ fi -+ fi -+ $rm conftest* - -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } - -+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -+ case $lt_prog_compiler_pic in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -+ esac -+else -+ lt_prog_compiler_pic= -+ lt_prog_compiler_can_build_shared=no -+fi - -+fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic= -+ ;; -+ *) -+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" -+ ;; -+esac - -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_static_works+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ 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 -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_static_works=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" - -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } - --# Check whether --with-pic was given. --if test "${with_pic+set}" = set; then -- withval=$with_pic; pic_mode="$withval" -+if test x"$lt_cv_prog_compiler_static_works" = xyes; then -+ : +-ac_ext=f +-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +-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 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 ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. ++set dummy ${ac_tool_prefix}nmedit; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_F77+set}" = set; then ++if test "${ac_cv_prog_NMEDIT+set}" = set; then + $as_echo_n "(cached) " >&6 else -- pic_mode=default -+ lt_prog_compiler_static= +- if test -n "$F77"; then +- ac_cv_prog_F77="$F77" # Let the user override the test. ++ if test -n "$NMEDIT"; then ++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -6854,7 +7322,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_F77="$ac_tool_prefix$ac_prog" ++ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -6864,32 +7332,28 @@ + + fi + fi +-F77=$ac_cv_prog_F77 +-if test -n "$F77"; then +- { $as_echo "$as_me:$LINENO: result: $F77" >&5 +-$as_echo "$F77" >&6; } ++NMEDIT=$ac_cv_prog_NMEDIT ++if test -n "$NMEDIT"; then ++ { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++$as_echo "$NMEDIT" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } fi --test -z "$pic_mode" && pic_mode=default -- -- -- -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_c_o=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ 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 -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:8706: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:8710: \$? = $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 -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* - -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } - - -- # Check whether --enable-fast-install was given. --if test "${enable_fast_install+set}" = set; then -- enableval=$enable_fast_install; p=${PACKAGE-default} -- case $enableval in -- yes) enable_fast_install=yes ;; -- no) enable_fast_install=no ;; -- *) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } -+ if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi - else -- enable_fast_install=yes -+ need_locks=no +- test -n "$F77" && break +- done fi +-if test -z "$F77"; then +- ac_ct_F77=$F77 +- 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 ++if test -z "$ac_cv_prog_NMEDIT"; then ++ ac_ct_NMEDIT=$NMEDIT ++ # Extract the first word of "nmedit", so it can be a program name with args. ++set dummy nmedit; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_F77"; then +- ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. ++ if test -n "$ac_ct_NMEDIT"; then ++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -6898,7 +7362,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_F77="$ac_prog" ++ ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -6908,21 +7372,109 @@ -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - -+ runpath_var= -+ allow_undefined_flag= -+ enable_shared_with_static_runtimes=no -+ archive_cmds= -+ archive_expsym_cmds= -+ old_archive_From_new_cmds= -+ old_archive_from_expsyms_cmds= -+ export_dynamic_flag_spec= -+ whole_archive_flag_spec= -+ thread_safe_flag_spec= -+ hardcode_libdir_flag_spec= -+ hardcode_libdir_flag_spec_ld= -+ hardcode_libdir_separator= -+ hardcode_direct=no -+ hardcode_minus_L=no -+ hardcode_shlibpath_var=unsupported -+ link_all_deplibs=unknown -+ hardcode_automatic=no -+ module_cmds= -+ module_expsym_cmds= -+ always_export_symbols=no -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ include_expsyms= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac - -+ ld_shlibs=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac - -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix[3-9]*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs=no -+ cat <<EOF 1>&2 - -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. - -+EOF -+ fi -+ ;; - -+ amigaos*) -+ archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes - -+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ ld_shlibs=no -+ ;; - --# This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ltmain" -- --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -- -- -- -- -- -- -- -- -- -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag=unsupported -+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; - -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec='-L$libdir' -+ 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/'\'' -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' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; - -+ interix[3-9]*) -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ 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' -+ ;; - -+ 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 -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ 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 '"$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* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; - -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs=no -+ cat <<EOF 1>&2 - -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; - -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs=no -+ cat <<_LT_EOF 1>&2 - -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac -+ ;; - -+ sunos4*) -+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; - -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac - -+ if test "$ld_shlibs" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec= -+ export_dynamic_flag_spec= -+ whole_archive_flag_spec= -+ fi + fi + fi +-ac_ct_F77=$ac_cv_prog_ac_ct_F77 +-if test -n "$ac_ct_F77"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +-$as_echo "$ac_ct_F77" >&6; } ++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT ++if test -n "$ac_ct_NMEDIT"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++$as_echo "$ac_ct_NMEDIT" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_NMEDIT" = x; then ++ NMEDIT=":" + else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct=unsupported -+ fi -+ ;; ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ NMEDIT=$ac_ct_NMEDIT ++ fi ++else ++ NMEDIT="$ac_cv_prog_NMEDIT" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. ++set dummy ${ac_tool_prefix}lipo; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_LIPO+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$LIPO"; then ++ ac_cv_prog_LIPO="$LIPO" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_LIPO="${ac_tool_prefix}lipo" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++LIPO=$ac_cv_prog_LIPO ++if test -n "$LIPO"; then ++ { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 ++$as_echo "$LIPO" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi --test -z "$LN_S" && LN_S="ln -s" -- -- -- -- -- -+ aix[4-9]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + +- test -n "$ac_ct_F77" && break ++fi ++if test -z "$ac_cv_prog_LIPO"; then ++ ac_ct_LIPO=$LIPO ++ # Extract the first word of "lipo", so it can be a program name with args. ++set dummy lipo; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_LIPO"; then ++ ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_LIPO="lipo" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi + done ++done ++IFS=$as_save_IFS + +- if test "x$ac_ct_F77" = x; then +- F77="" ++fi ++fi ++ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO ++if test -n "$ac_ct_LIPO"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 ++$as_echo "$ac_ct_LIPO" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_LIPO" = x; then ++ LIPO=":" + else + case $cross_compiling:$ac_tool_warned in + yes:) +@@ -6930,166 +7482,577 @@ + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +- F77=$ac_ct_F77 ++ LIPO=$ac_ct_LIPO + fi ++else ++ LIPO="$ac_cv_prog_LIPO" + fi + ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}otool; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OTOOL+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OTOOL"; then ++ ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_OTOOL="${ac_tool_prefix}otool" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS + +-# Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 +-{ (ac_try="$ac_compiler --version >&5" ++fi ++fi ++OTOOL=$ac_cv_prog_OTOOL ++if test -n "$OTOOL"; then ++ { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 ++$as_echo "$OTOOL" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OTOOL"; then ++ ac_ct_OTOOL=$OTOOL ++ # Extract the first word of "otool", so it can be a program name with args. ++set dummy otool; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OTOOL"; then ++ ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_OTOOL="otool" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL ++if test -n "$ac_ct_OTOOL"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 ++$as_echo "$ac_ct_OTOOL" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OTOOL" = x; then ++ OTOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OTOOL=$ac_ct_OTOOL ++ fi ++else ++ OTOOL="$ac_cv_prog_OTOOL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. ++set dummy ${ac_tool_prefix}otool64; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OTOOL64+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OTOOL64"; then ++ ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++OTOOL64=$ac_cv_prog_OTOOL64 ++if test -n "$OTOOL64"; then ++ { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 ++$as_echo "$OTOOL64" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OTOOL64"; then ++ ac_ct_OTOOL64=$OTOOL64 ++ # Extract the first word of "otool64", so it can be a program name with args. ++set dummy otool64; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OTOOL64"; then ++ ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_OTOOL64="otool64" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 ++if test -n "$ac_ct_OTOOL64"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 ++$as_echo "$ac_ct_OTOOL64" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OTOOL64" = x; then ++ OTOOL64=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OTOOL64=$ac_ct_OTOOL64 ++ fi ++else ++ OTOOL64="$ac_cv_prog_OTOOL64" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++$as_echo_n "checking for -single_module linker flag... " >&6; } ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ rm -rf libconftest.dylib* ++ echo "int foo(void){return 1;}" > conftest.c ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++-dynamiclib -Wl,-single_module conftest.c" >&5 ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++ _lt_result=$? ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ lt_cv_apple_cc_single_mod=yes + else -+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ cat conftest.err >&5 + fi -+ aix_use_runtimelinking=no - -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac - -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' ++ rm -rf libconftest.dylib* ++ rm -f conftest.* + fi - -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - -+ archive_cmds='' -+ hardcode_direct=yes -+ hardcode_libdir_separator=':' -+ link_all_deplibs=yes - -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ hardcode_direct=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L=yes -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_libdir_separator= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi - -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++$as_echo "$lt_cv_apple_cc_single_mod" >&6; } ++ { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - ++ +int +main () +{ - ++ + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" + $as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler --version >&5") 2>&5 ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -v >&5" ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ lt_cv_ld_exported_symbols_list=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ lt_cv_ld_exported_symbols_list=no ++fi ++ ++rm -rf conftest.dSYM ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } ++ case $host_os in ++ rhapsody* | darwin1.[012]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) # darwin 5.x on ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[012]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil='~$DSYMUTIL $lib || :' ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++$as_echo_n "checking how to run the C preprocessor... " >&6; } ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++ if test "${ac_cv_prog_CPP+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ # Double quotes because CPP needs to be expanded ++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" + $as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -v >&5") 2>&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-{ (ac_try="$ac_compiler -V >&5" ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ : ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" + $as_echo "$ac_try_echo") >&5 +- (eval "$ac_compiler -V >&5") 2>&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } +-rm -f a.out ++ (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 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# If we don't use `.F' as extension, the preprocessor is not run on the +-# input file. (Note that this only needs to work for GNU compilers.) +-ac_save_ext=$ac_ext +-ac_ext=F +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +-$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } +-if test "${ac_cv_f77_compiler_gnu+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ break ++fi ++ ++ done ++ ac_cv_prog_CPP=$CPP ++ ++fi ++ CPP=$ac_cv_prog_CPP + else ++ ac_cv_prog_CPP=$CPP ++fi ++{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 ++$as_echo "$CPP" >&6; } ++ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +- program main +-#ifndef __GNUC__ +- choke me ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> + #endif +- +- end ++ Syntax error + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" ++if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" + $as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_f77_werror_flag" || ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_compiler_gnu=yes ++ }; then ++ : + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_compiler_gnu=no ++ # Broken: fails on valid input. ++continue + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-ac_cv_f77_compiler_gnu=$ac_compiler_gnu +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +-$as_echo "$ac_cv_f77_compiler_gnu" >&6; } +-ac_ext=$ac_save_ext +-ac_test_FFLAGS=${FFLAGS+set} +-ac_save_FFLAGS=$FFLAGS +-FFLAGS= +-{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +-$as_echo_n "checking whether $F77 accepts -g... " >&6; } +-if test "${ac_cv_prog_f77_g+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- FFLAGS=-g +-cat >conftest.$ac_ext <<_ACEOF +- program main ++rm -f conftest.err conftest.$ac_ext + +- end ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ + _ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" + $as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_f77_werror_flag" || ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- ac_cv_prog_f77_g=yes ++ }; then ++ # Broken: success on invalid input. ++continue + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_prog_f77_g=no ++ # Passes both tests. ++ac_preproc_ok=: ++break + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_ext + +-fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +-$as_echo "$ac_cv_prog_f77_g" >&6; } +-if test "$ac_test_FFLAGS" = set; then +- FFLAGS=$ac_save_FFLAGS +-elif test $ac_cv_prog_f77_g = yes; then +- if test "x$ac_cv_f77_compiler_gnu" = xyes; then +- FFLAGS="-g -O2" +- else +- FFLAGS="-g" +- fi +-else +- if test "x$ac_cv_f77_compiler_gnu" = xyes; then +- FFLAGS="-O2" +- else +- FFLAGS= +- fi +-fi +- +-if test $ac_compiler_gnu = yes; then +- G77=yes ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ : + else +- G77= ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&5 ++$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; }; } + fi ++ + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -7097,419 +8060,342 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +- +-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +-# find the maximum length of command line arguments +-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +-$as_echo_n "checking the maximum length of command line arguments... " >&6; } +-if test "${lt_cv_sys_max_cmd_len+set}" = set; then ++{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- i=0 +- teststring="ABCD" +- +- case $build_os in +- msdosdjgpp*) +- # On DJGPP, this test can blow up pretty badly due to problems in libc +- # (any single argument exceeding 2000 bytes causes a buffer overrun +- # during glob expansion). Even if it were fixed, the result of this +- # check would be larger than it should be. +- lt_cv_sys_max_cmd_len=12288; # 12K is about right +- ;; +- +- gnu*) +- # Under GNU Hurd, this test is not required because there is +- # no limit to the length of command line arguments. +- # Libtool will interpret -1 as no limit whatsoever +- lt_cv_sys_max_cmd_len=-1; +- ;; +- +- cygwin* | mingw*) +- # On Win9x/ME, this test blows up -- it succeeds, but takes +- # about 5 minutes as the teststring grows exponentially. +- # Worse, since 9x/ME are not pre-emptively multitasking, +- # you end up with a "frozen" computer, even though with patience +- # the test eventually succeeds (with a max line length of 256k). +- # Instead, let's just punt: use the minimum linelength reported by +- # all of the supported platforms: 8192 (on NT/2K/XP). +- lt_cv_sys_max_cmd_len=8192; +- ;; ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> + +- amigaos*) +- # On AmigaOS with pdksh, this test takes hours, literally. +- # So we just punt and use a minimum line length of 8192. +- lt_cv_sys_max_cmd_len=8192; +- ;; ++int ++main () ++{ + +- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) +- # This has been around since 386BSD, at least. Likely further. +- if test -x /sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` +- elif test -x /usr/sbin/sysctl; then +- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` +- else +- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs +- fi +- # And add a safety zone +- 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` +- ;; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 ++ } && test -s conftest.$ac_objext; then ++ ac_cv_header_stdc=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 --if test -n "${ZSH_VERSION+set}" ; then -- setopt NO_GLOB_SUBST -+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 "$lt_aix_libpath_sed"` +- interix*) +- # We know the value 262144 and hardcode it with a safety zone (like BSD) +- lt_cv_sys_max_cmd_len=196608 +- ;; ++ ac_cv_header_stdc=no ++fi + +- osf*) +- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure +- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not +- # nice to cause kernel panics so lets avoid the loop below. +- # First set a reasonable default. +- lt_cv_sys_max_cmd_len=16384 +- # +- if test -x /sbin/sysconfig; then +- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in +- *1*) lt_cv_sys_max_cmd_len=-1 ;; +- esac +- fi +- ;; +- sco3.2v5*) +- lt_cv_sys_max_cmd_len=102400 +- ;; +- sysv5* | sco5v6* | sysv4.2uw2*) +- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` +- if test -n "$kargmax"; then +- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` +- else +- lt_cv_sys_max_cmd_len=32768 +- fi +- ;; +- *) +- 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` +- fi +- ;; +- esac ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-fi ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <string.h> + +-if test -n $lt_cv_sys_max_cmd_len ; then +- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +-$as_echo "$lt_cv_sys_max_cmd_len" >&6; } ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then ++ : + else +- { $as_echo "$as_me:$LINENO: result: none" >&5 +-$as_echo "none" >&6; } ++ ac_cv_header_stdc=no fi ++rm -f conftest* + ++fi + ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdlib.h> + - +- +-# Check for command to grab the raw symbol name followed by C symbol from nm. +-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then +- $as_echo_n "(cached) " >&6 ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then ++ : + else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* + +-# These are sane defaults that work on at least a few old systems. +-# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++fi + +-# Character class describing NM global symbol codes. +-symcode='[BCDEGRST]' ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then ++ : ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ctype.h> ++#include <stdlib.h> ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif + +-# Regexp to match symbols that can be accessed directly from C. +-sympat='\([_A-Za-z][_A-Za-z0-9]*\)' ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ $as_echo "$as_me: program exited with status $ac_status" >&5 ++$as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Transform an extracted symbol line into a proper C declaration +-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" ++( exit $ac_status ) ++ac_cv_header_stdc=no ++fi ++rm -rf conftest.dSYM ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi + +-# Transform an extracted symbol line into symbol name and symbol address +-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'" + +-# Define system-specific variables. +-case $host_os in +-aix*) +- symcode='[BCDT]' +- ;; +-cygwin* | mingw* | pw32*) +- symcode='[ABCDGISTW]' +- ;; +-hpux*) # Its linker distinguishes data from code symbols +- if test "$host_cpu" = ia64; then +- symcode='[ABCDEGRST]' +- fi +- 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* | 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'" +- 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'" +- fi +- ;; +-irix* | nonstopux*) +- symcode='[BCDEGRST]' +- ;; +-osf*) +- symcode='[BCDEGQRST]' +- ;; +-solaris*) +- symcode='[BDRT]' +- ;; +-sco3.2v5*) +- symcode='[DT]' +- ;; +-sysv4.2uw2*) +- symcode='[DT]' +- ;; +-sysv5* | sco5v6* | unixware* | OpenUNIX*) +- symcode='[ABDT]' +- ;; +-sysv4) +- symcode='[DFNSTU]' +- ;; +-esac ++fi ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then + +-# Handle CRLF in mingw tool chain +-opt_cr= +-case $build_os in +-mingw*) +- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp +- ;; +-esac ++cat >>confdefs.h <<\_ACEOF ++#define STDC_HEADERS 1 ++_ACEOF + +-# If we're using GNU nm, then use its standard symbol codes. +-case `$NM -V 2>&1` in +-*GNU* | *'with BFD'*) +- symcode='[ABCDGIRSTW]' ;; +-esac ++fi + +-# Try without a prefix undercore, then with it. +-for ac_symprfx in "" "_"; do ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. + +- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. +- symxfrm="\\1 $ac_symprfx\\2 \\2" + +- # Write the raw and C identifiers. +- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + +- # Check to see that the pipe works correctly. +- pipe_works=no + +- rm -f conftest* +- cat > conftest.$ac_ext <<EOF +-#ifdef __cplusplus +-extern "C" { +-#endif +-char nm_test_var; +-void nm_test_func(){} +-#ifdef __cplusplus +-} +-#endif +-int main(){nm_test_var='a';nm_test_func();return(0);} +-EOF + +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- # Now try to grab the symbols. +- nlist=conftest.nm +- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 +- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s "$nlist"; then +- # Try sorting and uniquifying the output. +- if sort "$nlist" | uniq > "$nlist"T; then +- mv -f "$nlist"T "$nlist" +- else +- rm -f "$nlist"T +- fi + +- # Make sure that we snagged all the symbols we need. +- if grep ' nm_test_var$' "$nlist" >/dev/null; then +- if grep ' nm_test_func$' "$nlist" >/dev/null; then +- cat <<EOF > conftest.$ac_ext +-#ifdef __cplusplus +-extern "C" { +-#endif + +-EOF +- # Now generate the symbol file. +- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + +- cat <<EOF >> conftest.$ac_ext +-#if defined (__STDC__) && __STDC__ +-# define lt_ptr_t void * +-#else +-# define lt_ptr_t char * +-# define const +-#endif + +-/* The mapping between symbol names and symbols. */ +-const struct { +- const char *name; +- lt_ptr_t address; +-} +-lt_preloaded_symbols[] = +-{ +-EOF +- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext +- cat <<\EOF >> conftest.$ac_ext +- {0, (lt_ptr_t) 0} +-}; ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do ++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++$as_echo_n "checking for $ac_header... " >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ $as_echo_n "(cached) " >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default + +-#ifdef __cplusplus +-} +-#endif +-EOF +- # Now try linking the two files. +- mv conftest.$ac_objext conftstm.$ac_objext +- lt_save_LIBS="$LIBS" +- lt_save_CFLAGS="$CFLAGS" +- LIBS="conftstm.$ac_objext" +- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 + ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && test -s conftest${ac_exeext}; then +- pipe_works=yes +- fi +- LIBS="$lt_save_LIBS" +- CFLAGS="$lt_save_CFLAGS" +- else +- echo "cannot find nm_test_func in $nlist" >&5 +- fi +- else +- echo "cannot find nm_test_var in $nlist" >&5 +- fi +- else +- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 +- fi +- else +- echo "$progname: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- fi +- rm -rf conftest* conftst* +- +- # Do not use the global_symbol_pipe unless it works. +- if test "$pipe_works" = yes; then +- break +- else +- lt_cv_sys_global_symbol_pipe= +- fi +-done ++ (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 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ eval "$as_ac_Header=no" + fi + +-if test -z "$lt_cv_sys_global_symbol_pipe"; then +- lt_cv_sys_global_symbol_to_cdecl= +-fi +-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then +- { $as_echo "$as_me:$LINENO: result: failed" >&5 +-$as_echo "failed" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: ok" >&5 +-$as_echo "ok" >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++ac_res=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++as_val=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ if test "x$as_val" = x""yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then @@ -30030,226 +20504,35 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs - else +-else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null --fi + fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir -- -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 + ++done -+fi -+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 - --cat >>confdefs.h <<_ACEOF --#define LT_OBJDIR "$lt_cv_objdir/" -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag="-z nodefs" -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF ++for ac_header in dlfcn.h ++do ++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++$as_echo_n "checking for $ac_header... " >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ $as_echo_n "(cached) " >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ - _ACEOF ++_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - - -+fi - -+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 - -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ no_undefined_flag=' ${wl}-bernotok' -+ allow_undefined_flag=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec='$convenience' -+ archive_cmds_need_lc=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - -+ amigaos*) -+ archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs=no -+ ;; - -+ bsdi[45]*) -+ export_dynamic_flag_spec=-rdynamic -+ ;; - -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # 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' -+ fix_srcfile_path='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes=yes -+ ;; - -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc=no -+ hardcode_direct=no -+ hardcode_automatic=yes -+ hardcode_shlibpath_var=unsupported -+ whole_archive_flag_spec='' -+ link_all_deplibs=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ 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` $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 $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}' -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+ fi -+ ;; - -+ dgux*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no -+ ;; - -+ freebsd1*) -+ ld_shlibs=no -+ ;; - -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; - -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ hardcode_shlibpath_var=no -+ ;; - -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; ++$ac_includes_default -case $host_os in -aix3*) @@ -30261,67 +20544,603 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - export COLLECT_NAMES - fi - ;; --esac -- ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; + esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. --sed_quote_subst='s/\(["`$\\]\)/\\\1/g' +-Xsed='sed -e 1s/^X//' +-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. --double_quote_subst='s/\(["`\\]\)/\\\1/g' -- +-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' ++ eval "$as_ac_Header=no" ++fi + -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -- --# Sed substitution to delay expansion of an escaped single quote. --delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ac_res=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++as_val=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ if test "x$as_val" = x""yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -- ++fi + +-# Constants: +-rm="rm -f" ++done + -# Global variables: --ofile=libtool +-default_ofile=libtool -can_build_shared=yes -- + -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -- +-ltmain="$ac_aux_dir/ltmain.sh" +-ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" -+ hpux9*) -+ if test "$GCC" = yes; then -+ archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=yes + +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ar; ac_word=$2 ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++if test -z "$CXX"; then ++ if test -n "$CCC"; then ++ CXX=$CCC ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++ 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 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_AR+set}" = set; then ++if test "${ac_cv_prog_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$AR"; then +- ac_cv_prog_AR="$AR" # Let the user override the test. ++ if test -n "$CXX"; then ++ ac_cv_prog_CXX="$CXX" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -7518,7 +8404,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_AR="${ac_tool_prefix}ar" ++ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -7528,28 +8414,32 @@ + + fi + fi +-AR=$ac_cv_prog_AR +-if test -n "$AR"; then +- { $as_echo "$as_me:$LINENO: result: $AR" >&5 +-$as_echo "$AR" >&6; } ++CXX=$ac_cv_prog_CXX ++if test -n "$CXX"; then ++ { $as_echo "$as_me:$LINENO: result: $CXX" >&5 ++$as_echo "$CXX" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi + + ++ test -n "$CXX" && break ++ done + fi +-if test -z "$ac_cv_prog_AR"; then +- ac_ct_AR=$AR +- # Extract the first word of "ar", so it can be a program name with args. +-set dummy ar; ac_word=$2 ++if test -z "$CXX"; then ++ ac_ct_CXX=$CXX ++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then ++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_AR"; then +- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. ++ if test -n "$ac_ct_CXX"; then ++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -7558,7 +8448,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_AR="ar" ++ ac_cv_prog_ac_ct_CXX="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -7568,17 +8458,21 @@ + + fi + fi +-ac_ct_AR=$ac_cv_prog_ac_ct_AR +-if test -n "$ac_ct_AR"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +-$as_echo "$ac_ct_AR" >&6; } ++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX ++if test -n "$ac_ct_CXX"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++$as_echo "$ac_ct_CXX" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi + +- if test "x$ac_ct_AR" = x; then +- AR="false" ++ ++ test -n "$ac_ct_CXX" && break ++done ++ ++ if test "x$ac_ct_CXX" = x; then ++ CXX="g++" + else + case $cross_compiling:$ac_tool_warned in + yes:) +@@ -7586,7866 +8480,1568 @@ + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +- AR=$ac_ct_AR ++ CXX=$ac_ct_CXX + fi +-else +- AR="$ac_cv_prog_AR" + fi + +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +-set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_RANLIB+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$RANLIB"; then +- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 + fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-RANLIB=$ac_cv_prog_RANLIB +-if test -n "$RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +-$as_echo "$RANLIB" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + fi ++# Provide some information about the compiler. ++$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } + +- +-fi +-if test -z "$ac_cv_prog_RANLIB"; then +- ac_ct_RANLIB=$RANLIB +- # Extract the first word of "ranlib", so it can be a program name with args. +-set dummy ranlib; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then ++{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } ++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_RANLIB"; then +- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_RANLIB="ranlib" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-fi +-fi +-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +-if test -n "$ac_ct_RANLIB"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +-$as_echo "$ac_ct_RANLIB" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif + +- if test "x$ac_ct_RANLIB" = x; then +- RANLIB=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; + esac +- RANLIB=$ac_ct_RANLIB +- fi ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_compiler_gnu=yes + else +- RANLIB="$ac_cv_prog_RANLIB" ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_compiler_gnu=no + fi + +-if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +-set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$STRIP"; then +- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-fi +-STRIP=$ac_cv_prog_STRIP +-if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 ++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GXX=yes + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- ++ GXX= + fi +-if test -z "$ac_cv_prog_STRIP"; then +- ac_ct_STRIP=$STRIP +- # Extract the first word of "strip", so it can be a program name with args. +-set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++ac_test_CXXFLAGS=${CXXFLAGS+set} ++ac_save_CXXFLAGS=$CXXFLAGS ++{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 ++$as_echo_n "checking whether $CXX accepts -g... " >&6; } ++if test "${ac_cv_prog_cxx_g+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_STRIP"; then +- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS ++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag ++ ac_cxx_werror_flag=yes ++ ac_cv_prog_cxx_g=no ++ CXXFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-fi +-fi +-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +-if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-$as_echo "$ac_ct_STRIP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi ++int ++main () ++{ + +- if test "x$ac_ct_STRIP" = x; then +- STRIP=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; + esac +- STRIP=$ac_ct_STRIP +- fi ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 +- STRIP="$ac_cv_prog_STRIP" +-fi ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ CXXFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ -old_CC="$CC" -old_CFLAGS="$CFLAGS" -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ export_dynamic_flag_spec='${wl}-E' -+ ;; ++int ++main () ++{ -# Set sane defaults for various variables +-test -z "$AR" && AR=ar +-test -z "$AR_FLAGS" && AR_FLAGS=cru +-test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +-test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld +-test -z "$LN_S" && LN_S="ln -s" +-test -z "$MAGIC_CMD" && MAGIC_CMD=file +-test -z "$NM" && NM=nm +-test -z "$SED" && SED=sed +-test -z "$OBJDUMP" && OBJDUMP=objdump +-test -z "$RANLIB" && RANLIB=: +-test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ : ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Determine commands to create old-style static archives. +-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +-old_postinstall_cmds='chmod 644 $oldlib' +-old_postuninstall_cmds= ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++ CXXFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-if test -n "$RANLIB"; then +- case $host_os in +- openbsd*) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" +- ;; +- *) +- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" +- ;; +- esac +- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +-fi ++int ++main () ++{ -for cc_temp in $compiler""; do - case $cc_temp in @@ -30331,18 +21150,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - *) break;; - esac -done --cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ hardcode_direct=yes -+ export_dynamic_flag_spec='${wl}-E' - -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ fi -+ ;; - +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +- +- -# Only perform the check for file, if the check method requires it --test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -30350,7 +21161,30 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 --else ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -30373,36 +21207,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - $EGREP "$file_magic_regex" > /dev/null; then - : - else -- cat <<_LT_EOF 1>&2 -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: +- cat <<EOF 1>&2 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. @@ -30412,24 +21219,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_libdir_flag_spec_ld='+b $libdir' -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ ;; -+ *) -+ hardcode_direct=yes -+ export_dynamic_flag_spec='${wl}-E' --_LT_EOF +-EOF - fi ;; -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ ;; - esac - fi +- esac +- fi - break - fi - done @@ -30437,8 +21231,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac --fi -+ ;; + fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then @@ -30447,71 +21240,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } --fi -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_ld='-rpath $libdir' -+ fi -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ link_all_deplibs=yes -+ ;; - -+ 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 -+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; - -+ newsos6) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_shlibpath_var=no -+ ;; - -+ openbsd*) -+ 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 -+ ld_shlibs=no -+ fi -+ ;; - -+ os2*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ allow_undefined_flag=unsupported -+ archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then @@ -30542,7 +21272,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - $EGREP "$file_magic_regex" > /dev/null; then - : - else -- cat <<_LT_EOF 1>&2 +- cat <<EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. @@ -30553,17 +21283,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - --_LT_EOF +-EOF - fi ;; - esac -+ osf3*) -+ if test "$GCC" = yes; then -+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ allow_undefined_flag=' -expect_unresolved \*' -+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi +- fi - break - fi - done @@ -30571,10 +21294,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac --fi -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ ;; ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then @@ -30583,307 +21304,731 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } --fi -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ else -+ allow_undefined_flag=' -expect_unresolved \*' -+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - -+ # Both c and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec='-rpath $libdir' -+ fi -+ hardcode_libdir_separator=: -+ ;; - -- else ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag + fi +- ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 ++$as_echo "$ac_cv_prog_cxx_g" >&6; } ++if test "$ac_test_CXXFLAGS" = set; then ++ CXXFLAGS=$ac_save_CXXFLAGS ++elif test $ac_cv_prog_cxx_g = yes; then ++ if test "$GXX" = yes; then ++ CXXFLAGS="-g -O2" + else - MAGIC_CMD=: - fi -fi -+ solaris*) -+ no_undefined_flag=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_shlibpath_var=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # 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?) -+ 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 -+ ;; - -- fi +- ++ CXXFLAGS="-g" + fi - ;; -esac -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- +- +- case $host_os in +- rhapsody* | darwin*) +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then +- $as_echo_n "(cached) " >&6 + else +- if test -n "$DSYMUTIL"; then +- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 ++ if test "$GXX" = yes; then ++ CXXFLAGS="-O2" ++ else ++ CXXFLAGS= + fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-DSYMUTIL=$ac_cv_prog_DSYMUTIL +-if test -n "$DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +-$as_echo "$DSYMUTIL" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } + fi ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + ++depcc="$CXX" am_compiler_list= + +-fi +-if test -z "$ac_cv_prog_DSYMUTIL"; then +- ac_ct_DSYMUTIL=$DSYMUTIL +- # Extract the first word of "dsymutil", so it can be a program name with args. +-set dummy dsymutil; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then ++{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- if test -n "$ac_ct_DSYMUTIL"; then +- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +-if test -n "$ac_ct_DSYMUTIL"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +-$as_echo "$ac_ct_DSYMUTIL" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub + +- if test "x$ac_ct_DSYMUTIL" = x; then +- DSYMUTIL=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- DSYMUTIL=$ac_ct_DSYMUTIL ++ am_cv_CXX_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi +-else +- DSYMUTIL="$ac_cv_prog_DSYMUTIL" +-fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +-set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_NMEDIT+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$NMEDIT"; then +- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue + else -+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ break + fi -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ hardcode_shlibpath_var=no + ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CXX_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + +-fi +-fi +-NMEDIT=$ac_cv_prog_NMEDIT +-if test -n "$NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 +-$as_echo "$NMEDIT" >&6; } ++ cd .. ++ rm -rf conftest.dir + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- ++ am_cv_CXX_dependencies_compiler_type=none + fi +-if test -z "$ac_cv_prog_NMEDIT"; then +- ac_ct_NMEDIT=$NMEDIT +- # Extract the first word of "nmedit", so it can be a program name with args. +-set dummy nmedit; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_NMEDIT"; then +- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_NMEDIT="nmedit" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS + + fi +-fi +-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +-if test -n "$ac_ct_NMEDIT"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +-$as_echo "$ac_ct_NMEDIT" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi ++{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } ++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + +- if test "x$ac_ct_NMEDIT" = x; then +- NMEDIT=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- NMEDIT=$ac_ct_NMEDIT +- fi ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then ++ am__fastdepCXX_TRUE= ++ am__fastdepCXX_FALSE='#' + else +- NMEDIT="$ac_cv_prog_NMEDIT" ++ am__fastdepCXX_TRUE='#' ++ am__fastdepCXX_FALSE= + fi + + +- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +-$as_echo_n "checking for -single_module linker flag... " >&6; } +-if test "${lt_cv_apple_cc_single_mod+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_apple_cc_single_mod=no +- if test -z "${LT_MULTI_MODULE}"; then +- # By default we will add the -single_module flag. You can override +- # by either setting the environment variable LT_MULTI_MODULE +- # non-empty at configure time, or by adding -multi_module to the +- # link flags. +- echo "int foo(void){return 1;}" > conftest.c +- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +- -dynamiclib ${wl}-single_module conftest.c +- if test -f libconftest.dylib; then +- lt_cv_apple_cc_single_mod=yes +- rm -rf libconftest.dylib* +- fi +- rm conftest.c +- fi +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +-$as_echo "$lt_cv_apple_cc_single_mod" >&6; } +- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 ++$as_echo_n "checking how to run the C++ preprocessor... " >&6; } ++if test -z "$CXXCPP"; then ++ if test "${ac_cv_prog_CXXCPP+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- lt_cv_ld_exported_symbols_list=no +- save_LDFLAGS=$LDFLAGS +- echo "_main" > conftest.sym +- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" +- cat >conftest.$ac_ext <<_ACEOF ++ # Double quotes because CXXCPP needs to be expanded ++ for CXXCPP in "$CXX -E" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" ++if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" + $as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>conftest.er1 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext + }; then +- lt_cv_ld_exported_symbols_list=yes ++ : + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- lt_cv_ld_exported_symbols_list=no ++ # Broken: fails on valid input. ++continue + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- LDFLAGS="$save_LDFLAGS" ++rm -f conftest.err conftest.$ac_ext + +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } +- case $host_os in +- rhapsody* | darwin1.[0123]) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +- darwin1.*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- darwin*) +- # if running on 10.5 or later, the deployment target defaults +- # to the OS version, if on x86, and 10.4, the deployment +- # target defaults to 10.4. Don't you love it? +- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in +- 10.0,*86*-darwin8*|10.0,*-darwin[91]*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- 10.[012]*) +- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; +- 10.*) +- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; +- esac +- ;; +- esac +- if test "$lt_cv_apple_cc_single_mod" = "yes"; then +- _lt_dar_single_mod='$single_module' +- fi +- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then +- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' +- else +- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" +- fi +- if test "$DSYMUTIL" != ":"; then +- _lt_dsymutil="~$DSYMUTIL \$lib || :" +- else +- _lt_dsymutil= +- fi +- ;; +- esac ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi + +-enable_dlopen=no +-enable_win32_dll=yes ++rm -f conftest.err conftest.$ac_ext + +-# Check whether --enable-libtool-lock was given. +-if test "${enable_libtool_lock+set}" = set; then +- enableval=$enable_libtool_lock; ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ break + fi + +-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ done ++ ac_cv_prog_CXXCPP=$CXXCPP ++ ++fi ++ CXXCPP=$ac_cv_prog_CXXCPP ++else ++ ac_cv_prog_CXXCPP=$CXXCPP ++fi ++{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 ++$as_echo "$CXXCPP" >&6; } ++ac_preproc_ok=false ++for ac_cxx_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ : ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ # Broken: fails on valid input. ++continue ++fi + +-# Check whether --with-pic was given. +-if test "${with_pic+set}" = set; then +- withval=$with_pic; pic_mode="$withval" ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 +- pic_mode=default ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break + fi + +-test -z "$pic_mode" && pic_mode=default ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ : ++else ++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++_lt_caught_CXX_error=yes; } ++fi -# Use C for the default configuration in the libtool script -+ sysv4) -+ case $host_vendor in -+ sni) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ reload_cmds='$CC -r -o $output$reload_objs' -+ hardcode_direct=no -+ ;; -+ motorola) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var=no -+ ;; - +-tagname= -lt_save_CC="$CC" --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ sysv4.3*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var=no -+ export_dynamic_flag_spec='-Bexport' -+ ;; + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ld_shlibs=yes -+ fi -+ ;; ++else ++ _lt_caught_CXX_error=yes ++fi -# Source file extension for C test sources. -ac_ext=c -+ 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 -+ runpath_var='LD_RUN_PATH' -# Object file extension for compiled C test sources. -objext=o -objext=$objext -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ no_undefined_flag='${wl}-z,text' -+ allow_undefined_flag='${wl}-z,nodefs' -+ archive_cmds_need_lc=no -+ hardcode_shlibpath_var=no -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator=':' -+ link_all_deplibs=yes -+ export_dynamic_flag_spec='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; ++# Set options -+ uts4*) -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no -+ ;; - -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+ fi - -+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -+echo "${ECHO_T}$ld_shlibs" >&6; } -+test "$ld_shlibs" = no && can_build_shared=no - -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc=yes - -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ { 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* -+ echo "$lt_simple_compile_test_code" > 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); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl -+ pic_flag=$lt_prog_compiler_pic -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag -+ allow_undefined_flag= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc=no -+ else -+ archive_cmds_need_lc=yes -+ fi -+ allow_undefined_flag=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc" >&6; } -+ ;; -+ esac -+ fi -+ ;; -+esac -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} -- + -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -- ++ enable_dlopen=no + -# Allow CC to be a program name with arguments. -compiler=$CC -- --# Save the default compiler, since it gets overwritten when the other --# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. --compiler_DEFAULT=$CC -- + + -# save warnings/boilerplate of simple test code -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* -- +-$rm conftest* ++ # Check whether --enable-shared was given. ++if test "${enable_shared+set}" = set; then ++ enableval=$enable_shared; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_shared=yes ++fi + -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 -r conftest* -- -- --if test -n "$compiler"; then -- --lt_prog_compiler_no_builtin_flag= -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" +-$rm -r conftest* - if test "$GCC" = yes; then + + +-lt_prog_compiler_no_builtin_flag= + +-if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' -- -- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no -- ac_outfile=conftest.$ac_objext +- ac_outfile=conftest.$ac_objext - 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 @@ -30895,309 +22040,111 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - -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:9470: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8365: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9474: \$? = $ac_status" >&5 +- echo "$as_me:8369: \$? = $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. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi -- $RM conftest* -- +- $rm conftest* + -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -- + -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -+ 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. -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ 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` ++ ++ ++# Check whether --with-pic was given. ++if test "${with_pic+set}" = set; then ++ withval=$with_pic; pic_mode="$withval" else - : -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++ pic_mode=default fi -+need_lib_prefix=unknown -+hardcode_into_libs=no -fi -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH - -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; - -+aix[4-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[01] | aix4.[01].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so -+ # instead of lib<name>.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; - -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; - -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; - -- lt_prog_compiler_wl= +-lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= -+bsdi[45]*) -+ version_type=linux -+ 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' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; ++test -z "$pic_mode" && pic_mode=default -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes - case $host_os in +- case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; -- +- ;; + - amigaos*) -- case $host_cpu in -- powerpc) -- # see comment about AmigaOS4 .so support -- lt_prog_compiler_pic='-fPIC' -- ;; -- m68k) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' -- ;; -- esac -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ 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 ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ 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 - ;; -- +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' +- ;; + - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; -+ esac -+ ;; +- ;; -- mingw* | cygwin* | pw32* | os2* | cegcc*) +- 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' - ;; -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' -- ;; -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - -- hpux*) -- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -- # sets the default TLS model and affects inlining. -- case $host_cpu in -- hppa*64*) -- # +Z the default -- ;; -- *) -- lt_prog_compiler_pic='-fPIC' -- ;; -- esac -- ;; -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; ++ # Check whether --enable-fast-install was given. ++if test "${enable_fast_install+set}" = set; then ++ enableval=$enable_fast_install; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" + ;; ++ esac ++else ++ enable_fast_install=yes ++fi - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; -+dgux*) -+ 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 -+ ;; - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries @@ -31205,161 +22152,30 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; -+freebsd1*) -+ dynamic_linker=no -+ ;; -- *nto* | *qnx*) -- # QNX uses GNU C++, but need to define -shared option too, otherwise -- # it will coredump. -- lt_prog_compiler_pic='-fPIC -shared' -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no - ;; -- - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes - ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+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 -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+interix[3-9]*) -+ 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' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; +- ;; -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; - *) +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic='-fPIC' +- ;; +- esac +- ;; + +- *) - lt_prog_compiler_pic='-fPIC' - ;; -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; - esac +- esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in @@ -31372,24 +22188,22 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- lt_prog_compiler_pic='-qnocommon' +- lt_prog_compiler_wl='-Wl,' +- ;; +- esac +- ;; -- mingw* | cygwin* | pw32* | os2* | cegcc*) +- 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' - ;; -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' @@ -31406,53 +22220,25 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; -+# This must be Linux ELF. -+linux* | k*bsd*-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' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; -+ # 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>/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 + +- newsos6) +- lt_prog_compiler_pic='-KPIC' +- lt_prog_compiler_static='-Bstatic' +- ;; - linux* | k*bsd*-gnu) - case $cc_basename in -- # old Intel for x86_64 which still supported -KPIC. -- ecc*) +- icc* | ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; -- # icc used to be incompatible with GCC. -- # ICC 10 doesn't accept -KPIC any more. -- icc* | ifort*) -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_pic='-fPIC' -- lt_prog_compiler_static='-static' -- ;; -- # Lahey Fortran 8.1. -- lf95*) -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_pic='--shared' -- lt_prog_compiler_static='--static' -- ;; - pgcc* | pgf77* | pgf90* | pgf95*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) @@ -31465,14 +22251,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; -- xl*) -- # IBM XL C 8.0/Fortran 10.1 on PPC -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_pic='-qpic' -- lt_prog_compiler_static='-qstaticlink' -- ;; - *) -- case `$CC -V 2>&1 | sed 5q` in +- case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' @@ -31489,78 +22269,20 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - ;; - esac - ;; -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; - -- newsos6) -- lt_prog_compiler_pic='-KPIC' -- lt_prog_compiler_static='-Bstatic' -- ;; -+netbsdelf*-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='NetBSD ld.elf_so' -+ ;; - -- *nto* | *qnx*) -- # QNX uses GNU C++, but need to define -shared option too, otherwise -- # it will coredump. -- lt_prog_compiler_pic='-fPIC -shared' -- ;; -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ltmain" - rdos*) - lt_prog_compiler_static='-non_shared' - ;; -+nto-qnx*) -+ 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=yes -+ ;; ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' - solaris*) - lt_prog_compiler_pic='-KPIC' @@ -31568,63 +22290,22 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - case $cc_basename in - f77* | f90* | f95*) - lt_prog_compiler_wl='-Qoption ld ';; -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; - *) +- *) - lt_prog_compiler_wl='-Wl,';; -+ shlibpath_overrides_runpath=yes -+ ;; - esac +- esac - ;; -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; - sysv4*MP*) - if test -d /usr/nec ;then @@ -31632,149 +22313,44 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - lt_prog_compiler_static='-Bstatic' - fi - ;; -+rdos*) -+ dynamic_linker=no -+ ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; -+solaris*) -+ 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=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' -+sysv4 | sysv4.3*) -+ version_type=linux -+ 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 -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH - ;; -- +- ;; + - *) - lt_prog_compiler_can_build_shared=no -+ siemens) -+ need_lib_prefix=no - ;; +- ;; - esac - fi -- --case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -- *djgpp*) -- lt_prog_compiler_pic= -- ;; -- *) -- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" -- ;; --esac + -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } -- -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; - -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; - -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; - -+uts4*) -+ version_type=linux -+ 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 -+ ;; - -+*) -+ dynamic_linker=no -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } -+test "$dynamic_linker" = no && can_build_shared=no -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then -- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + +-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - $as_echo_n "(cached) " >&6 -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else +-else - lt_cv_prog_compiler_pic_works=no -- ac_outfile=conftest.$ac_objext +- ac_outfile=conftest.$ac_objext - 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 @@ -31786,24 +22362,23 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - -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:9809: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8655: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9813: \$? = $ac_status" >&5 +- echo "$as_me:8659: \$? = $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. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi -- $RM conftest* -- -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" - fi +- $rm conftest* + +-fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } @@ -31812,33 +22387,22 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else +-else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi -- -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" - fi -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +-fi +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic= +- ;; +- *) +- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" +- ;; +-esac -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi - -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action= -+if test -n "$hardcode_libdir_flag_spec" || \ -+ test -n "$runpath_var" || \ -+ test "X$hardcode_automatic" = "Xyes" ; then - -- -- -# -# Check to make sure the static flag actually works. -# @@ -31847,20 +22411,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then - $as_echo_n "(cached) " >&6 -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && -+ test "$hardcode_minus_L" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action=immediate -+ fi - else +-else - lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -31871,7 +22422,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 -- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes @@ -31880,242 +22431,31 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - lt_cv_prog_compiler_static_works=yes - fi - fi -- $RM -r conftest* +- $rm -r conftest* - LDFLAGS="$save_LDFLAGS" -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action=unsupported -+fi -+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -+echo "${ECHO_T}$hardcode_action" >&6; } -+if test "$hardcode_action" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then - : -+striplib= -+old_striplib= -+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } -+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else +-else - lt_prog_compiler_static= -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ 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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ ;; -+ *) -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ ;; -+ esac - fi +-fi -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; - -+ mingw* | pw32*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; - -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; - -+ darwin*) -+ # if libdl is installed we need to link against it -+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- -- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o+set}" = set; then -- $as_echo_n "(cached) " >&6 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -- lt_cv_prog_compiler_c_o=no -- $RM -r conftest 2>/dev/null -- mkdir conftest -- cd conftest -- mkdir out -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- lt_compiler_flag="-o out/conftest2.$ac_objext" -- # Insert the option either (1) after the last *FLAGS variable, or -- # (2) before a word containing "conftest.", or (3) at the end. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- lt_compile=`echo "$ac_compile" | $SED \ -- -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:9914: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>out/conftest.err) -- ac_status=$? -- cat out/conftest.err >&5 -- echo "$as_me:9918: \$? = $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 -- # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_c_o=yes -- fi -- fi -- chmod u+w . 2>&5 -- $RM conftest* -- # SGI C++ compiler will create directory out/ii_files/ for -- # template instantiation -- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -- $RM out/* && rmdir out -- cd .. -- $RM -r conftest -- $RM conftest* -+ ac_cv_lib_dl_dlopen=no -+fi - -+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 --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 --$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -+if test $ac_cv_lib_dl_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else - -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes - -+fi - -+ ;; - -+ *) -+ { echo "$as_me:$LINENO: checking for shl_load" >&5 -+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -+if test "${ac_cv_func_shl_load+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define shl_load innocuous_shl_load - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char shl_load (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ - -- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no -- $RM -r conftest 2>/dev/null +- $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or @@ -32126,83 +22466,35 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - -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:9969: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:8759: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9973: \$? = $ac_status" >&5 +- echo "$as_me:8763: \$? = $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 - # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 -- $RM conftest* +- $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation -- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -- $RM out/* && rmdir out +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out - cd .. -- $RM -r conftest -- $RM conftest* -- +- rmdir conftest +- $rm conftest* + -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -+#undef shl_load -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shl_load (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_shl_load || defined __stub___shl_load -+choke me -+#endif - -+int -+main () -+{ -+return shl_load (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_func_shl_load=no -+fi -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then @@ -32210,7 +22502,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes -- $RM conftest* +- $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no @@ -32224,133 +22516,33 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi -else - need_locks=no -+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 -+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -+if test $ac_cv_func_shl_load = yes; then -+ lt_cv_dlopen="shl_load" -+else -+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -+if test "${ac_cv_lib_dld_shl_load+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ +-fi -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shl_load (); -+int -+main () -+{ -+return shl_load (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_lib_dld_shl_load=no -+fi - -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -+if test $ac_cv_lib_dld_shl_load = yes; then -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -+else -+ { echo "$as_me:$LINENO: checking for dlopen" >&5 -+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -+if test "${ac_cv_func_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define dlopen innocuous_dlopen - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char dlopen (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ - -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif - -- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -+#undef dlopen - runpath_var= - allow_undefined_flag= -- always_export_symbols=no +- enable_shared_with_static_runtimes=no - archive_cmds= - archive_expsym_cmds= -- compiler_needs_object=no -- enable_shared_with_static_runtimes=no +- old_archive_From_new_cmds= +- old_archive_from_expsyms_cmds= - export_dynamic_flag_spec= -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- hardcode_automatic=no -- hardcode_direct=no -- hardcode_direct_absolute=no +- whole_archive_flag_spec= +- thread_safe_flag_spec= - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= +- hardcode_direct=no - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported -- inherit_rpath=no - link_all_deplibs=unknown +- hardcode_automatic=no - module_cmds= - module_expsym_cmds= -- old_archive_from_new_cmds= -- old_archive_from_expsyms_cmds= -- thread_safe_flag_spec= -- whole_archive_flag_spec= +- always_export_symbols=no +- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= @@ -32366,22 +22558,20 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_dlopen || defined __stub___dlopen -+choke me -+#endif +- # Just being paranoid about ensuring that cc_basename is set. +- for cc_temp in $compiler""; do +- case $cc_temp in +- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; +- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++test -z "$LN_S" && LN_S="ln -s" - case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) +- cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. @@ -32397,85 +22587,32 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - with_gnu_ld=no - ;; - esac -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - ld_shlibs=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' -+ ac_cv_func_dlopen=no -+fi - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec= +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec= - fi - supports_anon_versioning=no -- case `$LD -v 2>&1` in +- case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac -+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 -+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -+if test $ac_cv_func_dlopen = yes; then -+ lt_cv_dlopen="dlopen" -+else -+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - # See if GNU ld supports shared libraries. - case $host_os in @@ -32483,133 +22620,34 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no -- cat <<_LT_EOF 1>&2 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 +- cat <<EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. -+ ac_cv_lib_dl_dlopen=no -+fi --_LT_EOF +-EOF - fi - ;; -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -+if test $ac_cv_lib_dl_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -+if test "${ac_cv_lib_svld_dlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsvld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - amigaos*) -- case $host_cpu in -- powerpc) -- # see comment about AmigaOS4 .so support -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='' -- ;; -- m68k) -- archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- ;; -- esac +- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_minus_L=yes + +- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- ld_shlibs=no - ;; -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - beos*) -- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc - # support --undefined. This deserves some investigation. FIXME @@ -32618,41 +22656,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - ld_shlibs=no - fi - ;; -+ ac_cv_lib_svld_dlopen=no -+fi -- cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - 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' -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -+if test $ac_cv_lib_svld_dlopen = yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -+else -+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -+if test "${ac_cv_lib_dld_dld_link+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ +- 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 +- 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' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... @@ -32667,43 +22681,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - ld_shlibs=no - fi - ;; -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dld_link (); -+int -+main () -+{ -+return dld_link (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - interix[3-9]*) - hardcode_direct=no @@ -32719,91 +22696,52 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - 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' - ;; -+ ac_cv_lib_dld_dld_link=no -+fi -- gnu* | linux* | tpf* | k*bsd*-gnu) -- tmp_diet=no -- if test "$host_os" = linux-dietlibc; then -- case $cc_basename in -- diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) -- esac -- fi -- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ -- && test "$tmp_diet" = no -- then +- gnu* | linux* | k*bsd*-gnu) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_addflag= -- tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in -- pgcc*) # Portland Group C compiler -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' +- pgcc*) # Portland Group C compiler +- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' +- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; -- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; -- lf95*) # Lahey Fortran 8.1 -- whole_archive_flag_spec= -- tmp_sharedflag='--shared' ;; -- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) -- tmp_sharedflag='-qmkshrobj' -- tmp_addflag= ;; - esac - 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' -- compiler_needs_object=yes +- 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' -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -+if test $ac_cv_lib_dld_dld_link = yes; then -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -+fi -- if test "x$supports_anon_versioning" = xyes; 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- fi - -- case $cc_basename in -- xlf*) -- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself -- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' -- hardcode_libdir_flag_spec= -- hardcode_libdir_flag_spec_ld='-rpath $libdir' -- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -- if test "x$supports_anon_versioning" = xyes; 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~ -- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -- fi -- ;; -- esac +- 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi - else -- ld_shlibs=no +- ld_shlibs=no - fi - ;; ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST +fi - netbsd*) -- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else @@ -32811,12 +22749,29 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; ++{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 ++$as_echo_n "checking for objdir... " >&6; } ++if test "${lt_cv_objdir+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++$as_echo "$lt_cv_objdir" >&6; } ++objdir=$lt_cv_objdir - solaris*) -- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no -- cat <<_LT_EOF 1>&2 -+fi +- cat <<EOF 1>&2 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool @@ -32825,15 +22780,14 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. --_LT_EOF -- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; -+fi - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in @@ -32847,19 +22801,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. -+fi ++cat >>confdefs.h <<_ACEOF ++#define LT_OBJDIR "$lt_cv_objdir/" ++_ACEOF -_LT_EOF - ;; - *) -- # For security reasons, it is highly recommended that you always -- # use absolute paths for naming shared libraries, and exclude the -- # DT_RUNPATH tag from executables and libraries. But doing so -- # requires that you compile everything twice, which is a pain. -- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' - else - ld_shlibs=no - fi @@ -32873,10 +22825,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; -+fi - *) -- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else @@ -32884,8 +22835,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi - ;; - esac -+ ;; -+ esac - if test "$ld_shlibs" = no; then - runpath_var= @@ -32893,9 +22842,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - export_dynamic_flag_spec= - whole_archive_flag_spec= - fi -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes - else +- else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) @@ -32911,8 +22858,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - hardcode_direct=unsupported - fi - ;; -+ enable_dlopen=no -+ fi - aix[4-9]*) - if test "$host_cpu" = ia64; then @@ -32924,86 +22869,60 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else -- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi - done - ;; - esac -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } -+if test "${lt_cv_dlopen_self+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext <<EOF -+#line 11083 "configure" -+#include "confdefs.h" - archive_cmds='' - hardcode_direct=yes -- hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes -- file_list_spec='${wl}-f,' -+#if HAVE_DLFCN_H -+#include <dlfcn.h> -+#endif - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && -- strings "$collect2name" | $GREP resolve_lib_name >/dev/null +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null - then -- # We have reworked collect2 -- : +- # We have reworked collect2 +- : - else -- # We have old collect2 -- hardcode_direct=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L=yes -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_libdir_separator= +- # We have old collect2 +- hardcode_direct=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- hardcode_minus_L=yes +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_libdir_separator= - fi - ;; - esac @@ -33014,8 +22933,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - else - # not using gcc - if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then @@ -33025,9 +22944,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi - fi - fi -+#include <stdio.h> -- export_dynamic_flag_spec='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes @@ -33035,685 +22952,21 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' -- # Determine the default libpath from the value encoded in an -- # empty executable. -- cat >conftest.$ac_ext <<_ACEOF +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -int -main () -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif -+ -+void fnord() { int i=42;} -+int main () - { -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; +-{ - ; - return 0; -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ exit (status); - } --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 - ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&5 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self=no -+ fi -+fi -+rm -fr conftest* -+ - --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 "$lt_aix_libpath_sed"` - fi -+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } -+if test "${lt_cv_dlopen_self_static+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self_static=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext <<EOF -+#line 11183 "configure" -+#include "confdefs.h" - -+#if HAVE_DLFCN_H -+#include <dlfcn.h> -+#endif - --fi -+#include <stdio.h> - --rm -rf conftest.dSYM --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 -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif - -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -- allow_undefined_flag="-z nodefs" -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an -- # empty executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif - --int --main () -+#ifdef __cplusplus -+extern "C" void exit (int); -+#endif -+ -+void fnord() { int i=42;} -+int main () - { -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; - -- ; -- return 0; -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ exit (status); - } --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 - ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $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 "$lt_aix_libpath_sed"` -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&5 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self_static=no -+ fi - fi --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+rm -fr conftest* - - - fi -+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } -+ fi - --rm -rf conftest.dSYM --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 -- -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- no_undefined_flag=' ${wl}-bernotok' -- allow_undefined_flag=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- whole_archive_flag_spec='$convenience' -- archive_cmds_need_lc=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -- fi -- fi -- ;; -- -- amigaos*) -- case $host_cpu in -- powerpc) -- # see comment about AmigaOS4 .so support -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='' -- ;; -- m68k) -- archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- ;; -- esac -- ;; -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac - -- bsdi[45]*) -- export_dynamic_flag_spec=-rdynamic -- ;; -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac - -- cygwin* | mingw* | pw32* | cegcc*) -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # 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' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -- ;; -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi - -- darwin* | rhapsody*) - -+# Report which library types will actually be built -+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6; } -+ -+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } -+test "$can_build_shared" = "no" && enable_shared=no - -- archive_cmds_need_lc=no -- hardcode_direct=no -- hardcode_automatic=yes -- hardcode_shlibpath_var=unsupported -- whole_archive_flag_spec='' -- link_all_deplibs=yes -- allow_undefined_flag="$_lt_dar_allow_undefined" -- case $cc_basename in -- ifort*) _lt_dar_can_shared=yes ;; -- *) _lt_dar_can_shared=$GCC ;; -- esac -- if test "$_lt_dar_can_shared" = "yes"; then -- output_verbose_link_cmd=echo -- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case $host_os in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; - -- else -- ld_shlibs=no -+aix[4-9]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no - fi -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6; } - -+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+{ echo "$as_me:$LINENO: result: $enable_static" >&5 -+echo "${ECHO_T}$enable_static" >&6; } -+ -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # 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 -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler \ -+ CC \ -+ LD \ -+ lt_prog_compiler_wl \ -+ lt_prog_compiler_pic \ -+ lt_prog_compiler_static \ -+ lt_prog_compiler_no_builtin_flag \ -+ export_dynamic_flag_spec \ -+ thread_safe_flag_spec \ -+ whole_archive_flag_spec \ -+ enable_shared_with_static_runtimes \ -+ old_archive_cmds \ -+ old_archive_from_new_cmds \ -+ predep_objects \ -+ postdep_objects \ -+ predeps \ -+ postdeps \ -+ compiler_lib_search_path \ -+ compiler_lib_search_dirs \ -+ archive_cmds \ -+ archive_expsym_cmds \ -+ postinstall_cmds \ -+ postuninstall_cmds \ -+ old_archive_from_expsyms_cmds \ -+ allow_undefined_flag \ -+ no_undefined_flag \ -+ export_symbols_cmds \ -+ hardcode_libdir_flag_spec \ -+ hardcode_libdir_flag_spec_ld \ -+ hardcode_libdir_separator \ -+ hardcode_automatic \ -+ module_cmds \ -+ module_expsym_cmds \ -+ lt_cv_prog_compiler_c_o \ -+ fix_srcfile_path \ -+ exclude_expsyms \ -+ include_expsyms; do -+ -+ case $var in -+ old_archive_cmds | \ -+ old_archive_from_new_cmds | \ -+ archive_cmds | \ -+ archive_expsym_cmds | \ -+ module_cmds | \ -+ module_expsym_cmds | \ -+ old_archive_from_expsyms_cmds | \ -+ export_symbols_cmds | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; -- -- dgux*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; -+ esac -+ done - -- freebsd1*) -- ld_shlibs=no -- ;; -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac - -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+cfgfile="${ofile}T" -+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -+ $rm -f "$cfgfile" -+ { echo "$as_me:$LINENO: creating $ofile" >&5 -+echo "$as_me: creating $ofile" >&6;} - -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -+ cat <<__EOF__ >> "$cfgfile" -+#! $SHELL - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; -+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. -+# -+# This file is part of GNU Libtool: -+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program 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 -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. - -- hpux9*) -- if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- else -- archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- fi -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_direct=yes -+# A sed program that does not truncate output. -+SED=$lt_SED - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- hardcode_minus_L=yes -- export_dynamic_flag_spec='${wl}-E' -- ;; -+# Sed that helps us avoid accidentally triggering echo(1) options like -n. -+Xsed="$SED -e 1s/^X//" - -- hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -- fi -- if test "$with_gnu_ld" = no; then -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_flag_spec_ld='+b $libdir' -- hardcode_libdir_separator=: -- hardcode_direct=yes -- hardcode_direct_absolute=yes -- export_dynamic_flag_spec='${wl}-E' -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- hardcode_minus_L=yes -- fi -- ;; -+# 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 - -- hpux11*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case $host_cpu in -- hppa*64*) -- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- else -- case $host_cpu in -- hppa*64*) -- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- fi -- if test "$with_gnu_ld" = no; then -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -+# The names of the tagged configurations supported by this script. -+available_tags= - -- case $host_cpu in -- hppa*64*|ia64*) -- hardcode_direct=no -- hardcode_shlibpath_var=no -- ;; -- *) -- hardcode_direct=yes -- hardcode_direct_absolute=yes -- export_dynamic_flag_spec='${wl}-E' -+# ### BEGIN LIBTOOL CONFIG - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- hardcode_minus_L=yes -- ;; -- esac -- fi -- ;; -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -- irix5* | irix6* | nonstopux*) -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- # Try to use the -exported_symbol ld option, if it does not -- # work, assume that -exports_file does not work either and -- # implicitly export all symbols. -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -- cat >conftest.$ac_ext <<_ACEOF --int foo(void) {} +-} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" @@ -33736,42 +22989,790 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL +-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 "$lt_aix_libpath_sed"` +-fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -fi -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" +-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi ++ ;; ++esac + +- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' +- allow_undefined_flag="-z nodefs" +- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +-int +-main () +-{ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\(["`\\]\)/\\\1/g' + +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ ++# Global variables: ++ofile=libtool ++can_build_shared=yes ++ ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ ++with_gnu_ld="$lt_cv_prog_gnu_ld" ++ ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" ++ ++# Set sane defaults for various variables ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$LD" && LD=ld ++test -z "$ac_objext" && ac_objext=o ++ ++for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ ++# Only perform the check for file, if the check method requires it ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ case $MAGIC_CMD in ++[\\/*] | ?:[\\/]*) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/${ac_tool_prefix}file; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++_LT_EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++fi + +-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 "$lt_aix_libpath_sed"` ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi ++ ++ ++ ++ ++ ++if test -z "$lt_cv_path_MAGIC_CMD"; then ++ if test -n "$ac_tool_prefix"; then ++ { $as_echo "$as_me:$LINENO: checking for file" >&5 ++$as_echo_n "checking for file... " >&6; } ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++ $as_echo_n "(cached) " >&6 + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ case $MAGIC_CMD in ++[\\/*] | ?:[\\/]*) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/file; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/file" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++_LT_EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac ++fi ++ ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi + + ++ else ++ MAGIC_CMD=: ++ fi + fi + +-rm -rf conftest.dSYM +-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 ++ fi ++ ;; ++esac + +- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- no_undefined_flag=' ${wl}-bernotok' +- allow_undefined_flag=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec='$convenience' +- archive_cmds_need_lc=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi ++# Use C for the default configuration in the libtool script ++ ++lt_save_CC="$CC" ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++# Source file extension for C test sources. ++ac_ext=c ++ ++# Object file extension for compiled C test sources. ++objext=o ++objext=$objext ++ ++# Code to be used in simple compile tests ++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);}' ++ ++ ++ ++ ++ ++ ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++# Save the default compiler, since it gets overwritten when the other ++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. ++compiler_DEFAULT=$CC ++ ++# save warnings/boilerplate of simple test code ++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* ++ ++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 -r conftest* ++ ++ ++if test -n "$compiler"; then ++ ++lt_prog_compiler_no_builtin_flag= ++ ++if test "$GCC" = yes; then ++ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ++ ++ { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_rtti_exceptions=no ++ ac_outfile=conftest.$ac_objext ++ 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. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:9560: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:9564: \$? = $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. ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_rtti_exceptions=yes ++ fi ++ fi ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++ ++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then ++ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" ++else ++ : ++fi ++ ++fi ++ ++ ++ ++ ++ ++ ++ lt_prog_compiler_wl= ++lt_prog_compiler_pic= ++lt_prog_compiler_static= ++ ++{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++ ++ if test "$GCC" = yes; then ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_static='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static='-Bstatic' + fi + ;; + + amigaos*) +- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_minus_L=yes +- # see comment about different semantics on the GNU ld section +- ld_shlibs=no ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac + ;; + +- bsdi[45]*) +- export_dynamic_flag_spec=-rdynamic ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. + ;; + +- cygwin* | mingw* | pw32*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- hardcode_libdir_flag_spec=' ' +- allow_undefined_flag=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # 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' +- fix_srcfile_path='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes=yes ++ mingw* | cygwin* | pw32* | os2* | cegcc*) ++ # 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' + ;; + + darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- archive_cmds_need_lc=no +- hardcode_direct=no +- hardcode_automatic=yes +- hardcode_shlibpath_var=unsupported +- whole_archive_flag_spec='' +- link_all_deplibs=yes +- if test "$GCC" = yes ; then +- output_verbose_link_cmd='echo' +- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- else +- 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` $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 $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}' +- ;; +- *) +- ld_shlibs=no +- ;; +- esac +- fi ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic='-fno-common' + ;; + +- dgux*) +- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec='-L$libdir' +- hardcode_shlibpath_var=no ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac + ;; + +- freebsd1*) +- ld_shlibs=no ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. + ;; + +- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +- # support. Future versions do this automatically, but an explicit c++rt0.o +- # does not break anything, and helps significantly (at the cost of a little +- # extra space). +- freebsd2.2*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- hardcode_libdir_flag_spec='-R$libdir' +- hardcode_direct=yes +- hardcode_shlibpath_var=no ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ lt_prog_compiler_can_build_shared=no ++ enable_shared=no + ;; + +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct=yes +- hardcode_minus_L=yes +- hardcode_shlibpath_var=no ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic='-fPIC -shared' + ;; + +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | dragonfly*) +- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec='-R$libdir' +- hardcode_direct=yes +- hardcode_shlibpath_var=no ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic=-Kconform_pic ++ fi + ;; + +- hpux9*) +- if test "$GCC" = yes; then +- archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ lt_prog_compiler_wl='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static='-Bstatic' + else +- archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator=: +- hardcode_direct=yes +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes +- export_dynamic_flag_spec='${wl}-E' + ;; + +- hpux10*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' +- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +- fi +- if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator=: ++ mingw* | cygwin* | pw32* | os2* | cegcc*) ++ # 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' ++ ;; + +- hardcode_direct=yes +- export_dynamic_flag_spec='${wl}-E' ++ hpux9* | hpux10* | hpux11*) ++ lt_prog_compiler_wl='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ lt_prog_compiler_static='${wl}-a ${wl}archive' ++ ;; + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes +- fi ++ irix5* | irix6* | nonstopux*) ++ lt_prog_compiler_wl='-Wl,' ++ # PIC (with -KPIC) is the default. ++ lt_prog_compiler_static='-non_shared' + ;; + +- hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case $host_cpu in +- hppa*64*) +- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- case $host_cpu in +- hppa*64*) +- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator=: +- +- case $host_cpu in +- hppa*64*|ia64*) +- hardcode_libdir_flag_spec_ld='+b $libdir' +- hardcode_direct=no +- hardcode_shlibpath_var=no ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ # old Intel for x86_64 which still supported -KPIC. ++ ecc*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='--shared' ++ lt_prog_compiler_static='--static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fpic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ccc*) ++ lt_prog_compiler_wl='-Wl,' ++ # All Alpha code is PIC. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ xl*) ++ # IBM XL C 8.0/Fortran 10.1 on PPC ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-qpic' ++ lt_prog_compiler_static='-qstaticlink' ++ ;; ++ *) ++ 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,' + ;; +- *) +- hardcode_direct=yes +- export_dynamic_flag_spec='${wl}-E' +- +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L=yes ++ *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 +- fi +- ;; +- +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_ld='-rpath $libdir' - fi -- archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: -- inherit_rpath=yes - link_all_deplibs=yes - ;; -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes - +- - netbsd*) -- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF @@ -33779,35 +23780,23 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -- ;; -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install ++ ;; ++ esac + ;; -- newsos6) + newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os - -- *nto* | *qnx*) -- ;; -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - +- - openbsd*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no -- hardcode_direct_absolute=yes -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- 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' @@ -33823,107 +23812,100 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac -- fi +- fi - else - ld_shlibs=no - fi -- ;; -+# An echo program that does not interpret backslashes. -+echo=$lt_echo ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' + ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported -- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -- ;; -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS +- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic='-fPIC -shared' + ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi -- archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: -- ;; -+# A C compiler. -+LTCC=$lt_LTCC ++ osf3* | osf4* | osf5*) ++ lt_prog_compiler_wl='-Wl,' ++ # All OSF/1 code is PIC. ++ lt_prog_compiler_static='-non_shared' + ;; - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS - +- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' +- - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi -- archive_cmds_need_lc='no' - hardcode_libdir_separator=: -- ;; -+# A language-specific compiler. -+CC=$lt_compiler ++ rdos*) ++ lt_prog_compiler_static='-non_shared' + ;; -- solaris*) -- no_undefined_flag=' -z defs' + solaris*) +- no_undefined_flag=' -z text' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' +- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else -- case `$CC -V 2>&1` in -- *"Compilers 5.0"*) -- wlarc='' -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' -- ;; -- *) -- wlarc='${wl}' -- archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -- ;; -- esac +- wlarc='' +- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ lt_prog_compiler_wl='-Qoption ld ';; + *) - # 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?) +- # Supported since Solaris 2.6 (maybe 2.5.1?) - 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 ++ lt_prog_compiler_wl='-Wl,';; + esac - link_all_deplibs=yes -- ;; -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC + ;; -- sunos4*) + sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. @@ -33957,38 +23939,40 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no -- ;; -+# An ERE matcher. -+EGREP=$lt_EGREP ++ lt_prog_compiler_wl='-Qoption ld ' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' + ;; - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' -- ;; -+# The linker used to build libraries. -+LD=$lt_LD ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' + ;; -- sysv4*MP*) + sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes -- fi -- ;; -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S ++ if test -d /usr/nec ;then ++ lt_prog_compiler_pic='-Kconform_pic' ++ lt_prog_compiler_static='-Bstatic' + fi + ;; - 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 - runpath_var='LD_RUN_PATH' -+# A BSD-compatible nm program. -+NM=$lt_NM - +- - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -33996,9 +23980,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi -- ;; -+# A symbol stripping program -+STRIP=$lt_STRIP ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' + ;; - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not @@ -34011,104 +23997,53 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - allow_undefined_flag='${wl}-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no -- hardcode_libdir_flag_spec='${wl}-R,$libdir' +- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' - hardcode_libdir_separator=':' - link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD - +- - if test "$GCC" = yes; then -- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - else -- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' - fi -- ;; -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" ++ unicos*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_can_build_shared=no + ;; -- uts4*) + uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no -- ;; -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" ++ lt_prog_compiler_pic='-pic' ++ lt_prog_compiler_static='-Bstatic' + ;; -- *) + *) - ld_shlibs=no -- ;; -- esac -+# Used on cygwin: assembler. -+AS="$AS" - -- if test x$host_vendor = xsni; then -- case $host in -- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- export_dynamic_flag_spec='${wl}-Blargedynsym' -- ;; -- esac -- fi -- fi -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir ++ lt_prog_compiler_can_build_shared=no + ;; + esac + fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds - --with_gnu_ld=$with_gnu_ld -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl - -+# Object file suffix (normally "o"). -+objext="$ac_objext" - -+# Old archive suffix (normally "a"). -+libext="$libext" - -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' - -+# Executable file suffix (normally ""). -+exeext="$exeext" - -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic -+pic_mode=$pic_mode - -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o - -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks - -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix - -+# Do we need a version for libraries? -+need_version=$need_version - -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen - -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self - -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static - -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic= ++ ;; ++ *) ++ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ++ ;; ++esac ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++$as_echo "$lt_prog_compiler_pic" >&6; } -# -# Do we need to explicitly link libc? @@ -34117,7 +24052,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes -- + - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) @@ -34129,9 +24064,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -- $RM conftest* +- $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext -- + - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? @@ -34150,8 +24085,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= -- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 -- (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 +- (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } @@ -34164,7 +24099,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - else - cat conftest.err 1>&5 - fi -- $RM conftest* +- $rm conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -$as_echo "$archive_cmds_need_lc" >&6; } - ;; @@ -34172,1393 +24107,22 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi - ;; -esac -- -- -- -- -- -- -- -- -- -- -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec - -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec - -+# Library versioning type. -+version_type=$version_type - -+# Format of library name prefix. -+libname_spec=$lt_libname_spec - -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec - -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec - -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds - -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds -+archive_expsym_cmds=$lt_archive_expsym_cmds -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds - -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds -+module_expsym_cmds=$lt_module_expsym_cmds - -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib - -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects - -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects - -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps - -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path - -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method - -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd - -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag - -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag - -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds - -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval - -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var - -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var - -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action - -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs - -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator - -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct - -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L - -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var - -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic - -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" - -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs - -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path - -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols - -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds - -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds - -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms - -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms - -+# ### END LIBTOOL CONFIG - -+__EOF__ - - -+ case $host_os in -+ aix3*) -+ cat <<\EOF >> "$cfgfile" - -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+EOF -+ ;; -+ esac - -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - -+ mv -f "$cfgfile" "$ofile" || \ -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" - -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi -+fi - - -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - -+CC="$lt_save_CC" - - -+# Check whether --with-tags was given. -+if test "${with_tags+set}" = set; then -+ withval=$with_tags; tagnames="$withval" -+fi - - -+if test -f "$ltmain" && test -n "$tagnames"; then -+ if test ! -f "${ofile}"; then -+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} -+ fi - -+ if test -z "$LTCC"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -+ if test -z "$LTCC"; then -+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} -+ else -+ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} -+ fi -+ fi -+ if test -z "$LTCFLAGS"; then -+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -+ fi - -+ # Extract list of available tagged configurations in $ofile. -+ # Note that this assumes the entire list is on one line. -+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for tagname in $tagnames; do -+ IFS="$lt_save_ifs" -+ # Check whether tagname contains only valid characters -+ case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in -+ "") ;; -+ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -+echo "$as_me: error: invalid tag name: $tagname" >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+ esac - -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -+ then -+ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} -+ { (exit 1); exit 1; }; } -+ fi - -+ # Update the list of available tags. -+ if test -n "$tagname"; then -+ echo appending configuration tag \"$tagname\" to $ofile -+ -+ case $tagname in -+ CXX) -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - - -+archive_cmds_need_lc_CXX=no -+allow_undefined_flag_CXX= -+always_export_symbols_CXX=no -+archive_expsym_cmds_CXX= -+export_dynamic_flag_spec_CXX= -+hardcode_direct_CXX=no -+hardcode_libdir_flag_spec_CXX= -+hardcode_libdir_flag_spec_ld_CXX= -+hardcode_libdir_separator_CXX= -+hardcode_minus_L_CXX=no -+hardcode_shlibpath_var_CXX=unsupported -+hardcode_automatic_CXX=no -+module_cmds_CXX= -+module_expsym_cmds_CXX= -+link_all_deplibs_CXX=unknown -+old_archive_cmds_CXX=$old_archive_cmds -+no_undefined_flag_CXX= -+whole_archive_flag_spec_CXX= -+enable_shared_with_static_runtimes_CXX=no - -+# Dependencies to place before and after the object being linked: -+predep_objects_CXX= -+postdep_objects_CXX= -+predeps_CXX= -+postdeps_CXX= -+compiler_lib_search_path_CXX= -+compiler_lib_search_dirs_CXX= - -+# Source file extension for C++ test sources. -+ac_ext=cpp - -+# Object file extension for compiled C++ test sources. -+objext=o -+objext_CXX=$objext - -+# Code to be used in simple compile tests -+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); }' - -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. - -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -+# Allow CC to be a program name with arguments. -+compiler=$CC - - -+# save warnings/boilerplate of simple test code -+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* - -+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 -r conftest* - - -+# Allow CC to be a program name with arguments. -+lt_save_CC=$CC -+lt_save_LD=$LD -+lt_save_GCC=$GCC -+GCC=$GXX -+lt_save_with_gnu_ld=$with_gnu_ld -+lt_save_path_LD=$lt_cv_path_LD -+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+else -+ $as_unset lt_cv_prog_gnu_ld -+fi -+if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+else -+ $as_unset lt_cv_path_LD -+fi -+test -z "${LDCXX+set}" || LD=$LDCXX -+CC=${CXX-"c++"} -+compiler=$CC -+compiler_CXX=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -+# We don't want -fno-exception wen compiling C++ code, so set the -+# no_builtin_flag separately -+if test "$GXX" = yes; then -+ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -+else -+ lt_prog_compiler_no_builtin_flag_CXX= -+fi - -+if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration - - -+# Check whether --with-gnu-ld was given. -+if test "${with_gnu_ld+set}" = set; then -+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -+else -+ with_gnu_ld=no -+fi - -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [\\/]* | ?:[\\/]*) -+ re_direlt='/[^/][^/]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ { echo "$as_me:$LINENO: checking for GNU ld" >&5 -+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } -+else -+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } -+fi -+if test "${lt_cv_path_LD+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in -+ *GNU* | *'with BFD'*) -+ test "$with_gnu_ld" != no && break -+ ;; -+ *) -+ test "$with_gnu_ld" != yes && break -+ ;; -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+else -+ lt_cv_path_LD="$LD" # Let the user override the test with a path. -+fi -+fi - -+LD="$lt_cv_path_LD" -+if test -n "$LD"; then -+ { echo "$as_me:$LINENO: result: $LD" >&5 -+echo "${ECHO_T}$LD" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+ { (exit 1); exit 1; }; } -+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -+if test "${lt_cv_prog_gnu_ld+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # I'd rather use --version here, but apparently some GNU lds only accept -v. -+case `$LD -v 2>&1 </dev/null` in -+*GNU* | *'with BFD'*) -+ lt_cv_prog_gnu_ld=yes -+ ;; -+*) -+ lt_cv_prog_gnu_ld=no -+ ;; -+esac -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } -+with_gnu_ld=$lt_cv_prog_gnu_ld - - - -+ # Check if GNU C++ uses GNU ld as the underlying linker, since the -+ # archiving commands below assume that GNU ld is being used. -+ if test "$with_gnu_ld" = yes; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' - -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -+ grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_CXX= -+ fi -+ else -+ with_gnu_ld=no -+ wlarc= - -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi - -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -+else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= -+fi - -+# PORTME: fill in a description of your system's C++ link characteristics -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -+ld_shlibs_CXX=yes -+case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aix[4-9]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no - -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac - -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ archive_cmds_CXX='' -+ hardcode_direct_CXX=yes -+ hardcode_libdir_separator_CXX=':' -+ link_all_deplibs_CXX=yes - -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ hardcode_direct_CXX=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L_CXX=yes -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ hardcode_libdir_separator_CXX= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi - -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_CXX=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag_CXX='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - - -+fi - -+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 - -+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - -+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_CXX="-z nodefs" -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -+int -+main () -+{ - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - - -+fi - -+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 - -+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ no_undefined_flag_CXX=' ${wl}-bernotok' -+ allow_undefined_flag_CXX=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_CXX='$convenience' -+ archive_cmds_need_lc_CXX=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_CXX=unsupported -+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; - -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; - -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ archive_cmds_need_lc_CXX=no -+ hardcode_direct_CXX=no -+ hardcode_automatic_CXX=yes -+ hardcode_shlibpath_var_CXX=unsupported -+ whole_archive_flag_spec_CXX='' -+ link_all_deplibs_CXX=yes -+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" -+ if test "$GXX" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi -+ else -+ 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` $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 $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}' -+ ;; -+ *) -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ fi -+ ;; - -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ freebsd[12]*) -+ # C++ shared libraries reported to be fairly broken before switch to ELF -+ ld_shlibs_CXX=no -+ ;; -+ freebsd-elf*) -+ archive_cmds_need_lc_CXX=no -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ ld_shlibs_CXX=yes -+ ;; -+ gnu*) -+ ;; -+ hpux9*) -+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ hardcode_direct_CXX=yes -+ hardcode_minus_L_CXX=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aCC*) -+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: - -+ case $host_cpu in -+ hppa*64*|ia64*) ;; -+ *) -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ ;; -+ *) -+ hardcode_direct_CXX=yes -+ hardcode_minus_L_CXX=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac - -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ interix[3-9]*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds_CXX='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' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # SGI C++ -+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ fi -+ fi -+ link_all_deplibs_CXX=yes -+ ;; -+ esac -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc*) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ archive_cmds_need_lc_CXX=no -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_CXX='-rpath $libdir' -+ hardcode_libdir_separator_CXX=: - -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # 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*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ m88k*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ 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= -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ ld_shlibs_CXX=no -+ ;; -+ openbsd*) -+ 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 -+ ;; -+ osf3*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ hardcode_libdir_separator_CXX=: - -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ cxx*) -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: - -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ hardcode_libdir_separator_CXX=: - -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ cxx*) -+ allow_undefined_flag_CXX=' -expect_unresolved \*' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $rm $lib.exp' -+ -+ hardcode_libdir_flag_spec_CXX='-rpath $libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: - -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ psos*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ lcc*) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ archive_cmds_need_lc_CXX=yes -+ 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='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ hardcode_shlibpath_var_CXX=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # 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='-z allextract$convenience -z defaultextract' -+ ;; -+ esac -+ link_all_deplibs_CXX=yes - -- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } -+ output_verbose_link_cmd='echo' +-library_names_spec= +-libname_spec='lib$name' +-soname_spec= +-shrext_cmds=".so" +-postinstall_cmds= +-postuninstall_cmds= +-finish_cmds= +-finish_eval= +-shlibpath_var= +-shlibpath_overrides_runpath=unknown +-version_type=none +-dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - case $host_os in @@ -35566,14 +24130,14 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - *) 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 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. -- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` +- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else -- lt_search_path_spec=`$ECHO "$lt_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. @@ -35587,7 +24151,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - 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 ' +- lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; @@ -35607,74 +24171,76 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - 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=`echo $lt_search_path_spec` ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$lt_prog_compiler_pic"; then ++ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then ++ $as_echo_n "(cached) " >&6 + else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" --fi --library_names_spec= --libname_spec='lib$name' --soname_spec= --shrext_cmds=".so" --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" ++ lt_cv_prog_compiler_pic_works=no ++ ac_outfile=conftest.$ac_objext ++ 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. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:9899: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:9903: \$? = $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. ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works=yes ++ fi ++ fi ++ $RM conftest* ++ + fi -need_lib_prefix=unknown -hardcode_into_libs=no -+ # 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' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown -+ # The C++ compiler must be used to create the archive. -+ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ no_undefined_flag_CXX=' ${wl}-z ${wl}defs' -+ if $CC --version | grep -v '^2\.7' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then ++ case $lt_prog_compiler_pic in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; ++ esac ++else ++ lt_prog_compiler_pic= ++ lt_prog_compiler_can_build_shared=no ++fi -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' ++fi - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -+ fi -aix[4-9]*) - version_type=linux @@ -35695,22 +24261,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' -- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - 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 +- esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. @@ -35728,38 +24285,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - shlibpath_var=LIBPATH - fi - ;; -- + -amigaos*) -- case $host_cpu in -- powerpc) -- # Since July 2007 AmigaOS4 officially supports .so libraries. -- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; -- m68k) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_CXX='${wl}-z,text' -+ archive_cmds_need_lc_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac - ;; -- esac +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; -- + -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" @@ -35780,28 +24312,25 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # libtool to hard-code these into programs - ;; - --cygwin* | mingw* | pw32* | cegcc*) +-cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) +- yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ -- chmod a+x \$dldir/$dlname~ -- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -- fi' +- chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ -- $RM \$dlpath' +- $rm \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in @@ -35810,86 +24339,32 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; -- mingw* | cegcc*) +- mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- 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 ';[c-zC-Z]:/' >/dev/null; 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 ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- 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"` +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ # So that behaviour is only enabled if SCOABSPATH is set to a -+ # non-empty value in the environment. Most likely only useful for -+ # creating official distributions of packages. -+ # This is a hack until libtool officially supports absolute path -+ # names for shared libraries. -+ no_undefined_flag_CXX='${wl}-z,text' -+ allow_undefined_flag_CXX='${wl}-z,nodefs' -+ archive_cmds_need_lc_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_CXX=':' -+ link_all_deplibs_CXX=yes -+ export_dynamic_flag_spec_CXX='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; - esac - ;; +- esac +- ;; - -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; - *) +- *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no - ;; +- ;; - esac - dynamic_linker='Win32 ld.exe' - # FIXME: first we should search . and the directory the executable is in @@ -35901,22 +24376,16 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - version_type=darwin - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+esac -+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -+test "$ld_shlibs_CXX" = no && can_build_shared=no - +- - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; -+GCC_CXX="$GXX" -+LD_CXX="$LD" - +- -dgux*) - version_type=linux - need_lib_prefix=no @@ -35925,99 +24394,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; -+cat > conftest.$ac_ext <<EOF -+class Foo -+{ -+public: -+ Foo (void) { a = 0; } -+private: -+ int a; -+}; -+EOF - +- -freebsd1*) - dynamic_linker=no - ;; -+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 -+ # Parse the compiler output and extract the necessary -+ # objects, libraries and library flags. -+ -+ # Sentinel used to keep track of whether or not we are before -+ # the conftest object file. -+ pre_test_object_deps_done=no -+ -+ # The `*' in the case matches for architectures that use `case' in -+ # $output_verbose_cmd can trigger glob expansion during the loop -+ # eval without this substitution. -+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` -+ -+ for p in `eval $output_verbose_link_cmd`; do -+ case $p in -+ -+ -L* | -R* | -l*) -+ # Some compilers place space between "-{L,R}" and the path. -+ # Remove the space. -+ if test $p = "-L" \ -+ || test $p = "-R"; then -+ prev=$p -+ continue -+ else -+ prev= -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ case $p in -+ -L* | -R*) -+ # Internal compiler library paths should come after those -+ # provided the user. The postdeps already come after the -+ # user supplied libs so there is no need to process them. -+ if test -z "$compiler_lib_search_path_CXX"; then -+ compiler_lib_search_path_CXX="${prev}${p}" -+ else -+ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" -+ fi -+ ;; -+ # The "-l" case would never come before the object being -+ # linked, so don't bother handling this case. -+ esac -+ else -+ if test -z "$postdeps_CXX"; then -+ postdeps_CXX="${prev}${p}" -+ else -+ postdeps_CXX="${postdeps_CXX} ${prev}${p}" -+ fi -+ fi -+ ;; -+ -+ *.$objext) -+ # This assumes that the test object file only shows up -+ # once in the compiler output. -+ if test "$p" = "conftest.$objext"; then -+ pre_test_object_deps_done=yes -+ continue -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ if test -z "$predep_objects_CXX"; then -+ predep_objects_CXX="$p" -+ else -+ predep_objects_CXX="$predep_objects_CXX $p" -+ fi -+ else -+ if test -z "$postdep_objects_CXX"; then -+ postdep_objects_CXX="$p" -+ else -+ postdep_objects_CXX="$postdep_objects_CXX $p" -+ fi -+ fi -+ ;; -+ -+ *) ;; # Ignore the rest. - +- -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. @@ -36027,7 +24408,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - case $host_os in - freebsd[123]*) objformat=aout ;; - *) objformat=elf ;; - esac +- esac - fi - version_type=freebsd-$objformat - case $version_type in @@ -36039,44 +24420,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes -+ done -+ -+ # Clean up. -+ rm -f a.out a.exe -+else -+ echo "libtool.m4: error: problem compiling CXX test program" -+fi -+ -+$rm -f confest.$objext -+ -+compiler_lib_search_dirs_CXX= -+if test -n "$compiler_lib_search_path_CXX"; then -+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+ -+# PORTME: override above test on systems where it is broken -+case $host_os in -+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= -+ postdep_objects_CXX= -+ 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 - shlibpath_var=LD_LIBRARY_PATH - case $host_os in @@ -36095,14 +24439,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi - ;; - esac - ;; - +- ;; +- esac +- ;; +- -gnu*) - version_type=linux - need_lib_prefix=no @@ -36112,19 +24452,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -+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 - +- -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. @@ -36144,39 +24472,33 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ # 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. -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' - fi +- fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; -- hppa*64*) -- shrext_cmds='.sl' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- *) +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac +- ;; +- esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; -+esac - +- ;; +- -interix[3-9]*) - version_type=linux - need_lib_prefix=no @@ -36188,10 +24510,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -+case " $postdeps_CXX " in -+*" -lc "*) archive_cmds_need_lc_CXX=no ;; -+esac - +- -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; @@ -36244,73 +24563,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -- # Some binutils ld are patched to set DT_RUNPATH -- save_LDFLAGS=$LDFLAGS -- save_libdir=$libdir -- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ -- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then -- shlibpath_overrides_runpath=yes --fi -- --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- LDFLAGS=$save_LDFLAGS -- libdir=$save_libdir -- - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - - # 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>/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" +- 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -36326,7 +24589,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - version_type=sunos - need_lib_prefix=no - need_version=no -- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' @@ -36339,103 +24602,45 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -+lt_prog_compiler_wl_CXX= -+lt_prog_compiler_pic_CXX= -+lt_prog_compiler_static_CXX= - +- -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - --*nto* | *qnx*) -- version_type=qnx +- +-nto-qnx*) +- 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='ldqnx.so' +- shlibpath_overrides_runpath=yes - ;; -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='-static' - +- -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_CXX='-Bstatic' -+ fi -+ ;; -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ 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*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic_CXX='-fno-common' -+ ;; -+ *djgpp*) -+ # DJGPP does not support shared libraries at all -+ lt_prog_compiler_pic_CXX= -+ ;; -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic_CXX=-Kconform_pic -+ fi -+ ;; -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) - ;; - *) +- ;; +- *) - shlibpath_overrides_runpath=yes -+ lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac +- ;; +- esac - else - shlibpath_overrides_runpath=yes - fi @@ -36499,19 +24704,18 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no - ;; +- ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ *) -+ lt_prog_compiler_pic_CXX='-fPIC' - ;; +- ;; - esac - ;; - @@ -36531,259 +24735,29 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ esac - else +- shlibpath_overrides_runpath=no +- else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in +- shlibpath_overrides_runpath=yes +- case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ aix[4-9]*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_CXX='-Bstatic' -+ else -+ lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ cxch68*) -+ # Green Hills C++ Compiler -+ # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -+ ;; -+ esac -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_CXX='-qnocommon' -+ lt_prog_compiler_wl_CXX='-Wl,' -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ lt_prog_compiler_pic_CXX='-KPIC' -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' -+ if test "$host_cpu" != ia64; then -+ lt_prog_compiler_pic_CXX='+Z' -+ fi -+ ;; -+ aCC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # KAI C++ Compiler -+ lt_prog_compiler_wl_CXX='--backend -Wl,' -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ icpc* | ecpc*) -+ # Intel C++ -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-static' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler. -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-fpic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ cxx*) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ lt_prog_compiler_pic_CXX= -+ 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 -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ lt_prog_compiler_pic_CXX='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd* | netbsdelf*-gnu) -+ ;; -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ lt_prog_compiler_wl_CXX='--backend -Wl,' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ cxx*) -+ # Digital/Compaq C++ -+ lt_prog_compiler_wl_CXX='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_static_CXX='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ psos*) -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ lt_prog_compiler_wl_CXX='-Qoption ld ' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ lt_prog_compiler_pic_CXX='-PIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ lt_prog_compiler_pic_CXX='-pic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ lcc*) -+ # Lucid -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ lt_prog_compiler_pic_CXX='-KPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ esac -+ ;; -+ vxworks*) -+ ;; -+ *) -+ lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi +- ;; +- esac +- fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - --tpf*) -- # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -- 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}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } - +- -uts4*) - version_type=linux - 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 - ;; -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic_CXX"; then - +- -*) - dynamic_linker=no - ;; @@ -36791,555 +24765,47 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_pic_works_CXX=no -+ ac_outfile=conftest.$ac_objext -+ 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. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:13584: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:13588: \$? = $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. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_pic_works_CXX=yes -+ fi -+ fi -+ $rm conftest* - +- +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +-fi +- +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +-fi +- +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +- -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } - --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi --if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then -+ case $lt_prog_compiler_pic_CXX in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -+ esac -+else -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_can_build_shared_CXX=no - fi - -+fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic_CXX= -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" -+ ;; -+esac - -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works_CXX=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ 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 -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_static_works_CXX=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works_CXX=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" - -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } - -+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then -+ : -+else -+ lt_prog_compiler_static_CXX= -+fi - - -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_c_o_CXX=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ 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 -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:13688: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:13692: \$? = $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 -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_CXX=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* - -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } - - -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } -+ if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi - -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ case $host_os in -+ aix[4-9]*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ 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' -+ ;; -+ 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' -+ ;; -+ esac -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - -+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -+test "$ld_shlibs_CXX" = no && can_build_shared=no - -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc_CXX" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc_CXX=yes - -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds_CXX in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ { 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* -+ echo "$lt_simple_compile_test_code" > 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); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_CXX -+ pic_flag=$lt_prog_compiler_pic_CXX -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX -+ allow_undefined_flag_CXX= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc_CXX=no -+ else -+ archive_cmds_need_lc_CXX=yes -+ fi -+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } -+ ;; -+ esac -+ fi -+ ;; -+esac - -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" - -+need_lib_prefix=unknown -+hardcode_into_libs=no - -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown - -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH - -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; - -+aix[4-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[01] | aix4.[01].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so -+ # instead of lib<name>.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; - -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; - -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; - -+bsdi[45]*) -+ version_type=linux -+ 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' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; - -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no - -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes - -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ 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 ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ 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 -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; - -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; - -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; - -+dgux*) -+ 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 -+ ;; - -+freebsd1*) -+ dynamic_linker=no -+ ;; - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action= --if test -n "$hardcode_libdir_flag_spec" || -- test -n "$runpath_var" || +-if test -n "$hardcode_libdir_flag_spec" || \ +- test -n "$runpath_var" || \ - test "X$hardcode_automatic" = "Xyes" ; then - -- # We can hardcode non-existent directories. +- # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` - else +- else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac - fi +- fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. @@ -37348,8 +24814,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } - --if test "$hardcode_action" = relink || -- test "$inherit_rpath" = yes; then +-if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || @@ -37358,12 +24823,37 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - enable_fast_install=needless -fi - +-striplib= +-old_striplib= +-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-$as_echo_n "checking whether stripping libraries is possible... " >&6; } +-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then +- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" +- test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +-else +-# FIXME - insert some real tests, host_os isn't really good enough +- case $host_os in +- darwin*) +- if test -n "$STRIP" ; then +- striplib="$STRIP -x" +- old_striplib="$STRIP -S" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- ;; +- *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- ;; +- esac +-fi - -- -- -- -- -- if test "x$enable_dlopen" != xyes; then +-if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown @@ -37371,51 +24861,23 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - lt_cv_dlopen=no - lt_cv_dlopen_libs= - -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH - case $host_os in +- case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -+ freebsd2*) -+ shlibpath_overrides_runpath=yes - ;; +- ;; - -- mingw* | pw32* | cegcc*) +- mingw* | pw32*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes - ;; +- ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes - ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; - +- ;; +- - darwin*) - # if libdl is installed we need to link against it - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 @@ -37486,98 +24948,16 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else -+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 -+ hardcode_into_libs=yes -+ ;; - +- - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; - --fi -+interix[3-9]*) -+ 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' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; - -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= - ;; - - *) +-fi +- +- ;; +- +- *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then @@ -37592,60 +24972,20 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define shl_load innocuous_shl_load -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; - +- -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -+# This must be Linux ELF. -+linux* | k*bsd*-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' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes - +- -#undef shl_load -+ # 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>/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 - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -37659,15 +24999,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; - +- -int -main () -{ @@ -37701,38 +25033,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+netbsdelf*-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='NetBSD ld.elf_so' -+ ;; - +- - ac_cv_func_shl_load=no -fi -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -37755,13 +25059,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -37802,44 +25100,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+nto-qnx*) -+ 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=yes -+ ;; - +- - ac_cv_lib_dld_shl_load=no -fi -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; - +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -37864,53 +25128,20 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define dlopen innocuous_dlopen -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; - +- -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -+rdos*) -+ dynamic_linker=no -+ ;; - +- -#undef dlopen -+solaris*) -+ 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=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -37924,18 +25155,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; - +- -int -main () -{ @@ -37949,73 +25169,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -+sysv4 | sysv4.3*) -+ version_type=linux -+ 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 -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ 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 -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; - esac +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 @@ -38032,18 +25186,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } -+test "$dynamic_linker" = no && can_build_shared=no -+ -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi - +- - ac_cv_func_dlopen=no -fi - @@ -38060,10 +25206,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - $as_echo_n "(cached) " >&6 -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else +-else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF @@ -38072,9 +25215,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -38115,14 +25256,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - +- - ac_cv_lib_dl_dlopen=no -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -38146,13 +25283,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action_CXX= -+if test -n "$hardcode_libdir_flag_spec_CXX" || \ -+ test -n "$runpath_var_CXX" || \ -+ test "X$hardcode_automatic_CXX" = "Xyes" ; then - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -38190,43 +25321,18 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_svld_dlopen=yes -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct_CXX" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && -+ test "$hardcode_minus_L_CXX" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action_CXX=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_CXX=immediate -+ fi - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_CXX=unsupported - fi -+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -+echo "${ECHO_T}$hardcode_action_CXX" >&6; } - +-fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+if test "$hardcode_action_CXX" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then @@ -38245,7 +25351,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -38286,91 +25392,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_cv_lib_dld_dld_link=no -fi -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # 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 -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_CXX \ -+ CC_CXX \ -+ LD_CXX \ -+ lt_prog_compiler_wl_CXX \ -+ lt_prog_compiler_pic_CXX \ -+ lt_prog_compiler_static_CXX \ -+ lt_prog_compiler_no_builtin_flag_CXX \ -+ export_dynamic_flag_spec_CXX \ -+ thread_safe_flag_spec_CXX \ -+ whole_archive_flag_spec_CXX \ -+ enable_shared_with_static_runtimes_CXX \ -+ old_archive_cmds_CXX \ -+ old_archive_from_new_cmds_CXX \ -+ predep_objects_CXX \ -+ postdep_objects_CXX \ -+ predeps_CXX \ -+ postdeps_CXX \ -+ compiler_lib_search_path_CXX \ -+ compiler_lib_search_dirs_CXX \ -+ archive_cmds_CXX \ -+ archive_expsym_cmds_CXX \ -+ postinstall_cmds_CXX \ -+ postuninstall_cmds_CXX \ -+ old_archive_from_expsyms_cmds_CXX \ -+ allow_undefined_flag_CXX \ -+ no_undefined_flag_CXX \ -+ export_symbols_cmds_CXX \ -+ hardcode_libdir_flag_spec_CXX \ -+ hardcode_libdir_flag_spec_ld_CXX \ -+ hardcode_libdir_separator_CXX \ -+ hardcode_automatic_CXX \ -+ 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 -+ -+ case $var in -+ old_archive_cmds_CXX | \ -+ old_archive_from_new_cmds_CXX | \ -+ archive_cmds_CXX | \ -+ archive_expsym_cmds_CXX | \ -+ module_cmds_CXX | \ -+ module_expsym_cmds_CXX | \ -+ old_archive_from_expsyms_cmds_CXX | \ -+ export_symbols_cmds_CXX | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done - +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -38381,80 +25406,42 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -fi -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac - -+cfgfile="$ofile" - +- +- -fi -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - +- +- -fi -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL - -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared - +- +- -fi -+# Whether or not to build static libraries. -+build_old_libs=$enable_static - -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_CXX - +- +- -fi -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install - +- +- -fi -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os - +- - ;; - esac -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - +- - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi -+# An echo program that does not interpret backslashes. -+echo=$lt_echo - +- - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS - +- - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+# A C compiler. -+LTCC=$lt_LTCC - +- - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS - +- - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then @@ -38465,22 +25452,16 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<_LT_EOF --#line 12769 "configure" +- cat > conftest.$ac_ext <<EOF +-#line 11161 "configure" -#include "confdefs.h" -+# A language-specific compiler. -+CC=$lt_compiler_CXX - +- -#if HAVE_DLFCN_H -#include <dlfcn.h> -#endif -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_CXX - +- -#include <stdio.h> -+# An ERE matcher. -+EGREP=$lt_EGREP - +- -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else @@ -38490,9 +25471,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -# define LT_DLGLOBAL 0 -# endif -#endif -+# The linker used to build libraries. -+LD=$lt_LD_CXX - +- -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW @@ -38514,17 +25493,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -# endif -# endif -#endif -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S - +- +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; -+# A BSD-compatible nm program. -+NM=$lt_NM - +- - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; @@ -38533,12 +25512,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - } - else - puts (dlerror ()); -+# A symbol stripping program -+STRIP=$lt_STRIP - -- return status; +- +- exit (status); -} --_LT_EOF +-EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? @@ -38557,18 +25534,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi -fi -rm -fr conftest* -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD - -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" - +- +- -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" - +- - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 @@ -38581,23 +25552,16 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<_LT_EOF --#line 12865 "configure" +- cat > conftest.$ac_ext <<EOF +-#line 11261 "configure" -#include "confdefs.h" -+# Used on cygwin: assembler. -+AS="$AS" - +- -#if HAVE_DLFCN_H -#include <dlfcn.h> -#endif -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir - +- -#include <stdio.h> -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds - +- -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else @@ -38607,9 +25571,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -# define LT_DLGLOBAL 0 -# endif -#endif -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX - +- -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW @@ -38631,17 +25593,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -# endif -# endif -#endif -+# Object file suffix (normally "o"). -+objext="$ac_objext" - +- +-#ifdef __cplusplus +-extern "C" void exit (int); +-#endif +- -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; -+# Old archive suffix (normally "a"). -+libext="$libext" - +- - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; @@ -38650,12 +25612,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - } - else - puts (dlerror ()); -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' - -- return status; +- +- exit (status); -} --_LT_EOF +-EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? @@ -38674,357 +25634,643 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi -fi -rm -fr conftest* -+# Executable file suffix (normally ""). -+exeext="$exeext" - -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_CXX -+pic_mode=$pic_mode - +- +- -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - +- - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - +- - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks - +- - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix - -+# Do we need a version for libraries? -+need_version=$need_version - -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen - -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self - -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static - -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_CXX - -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX - -+# Library versioning type. -+version_type=$version_type - -+# Format of library name prefix. -+libname_spec=$lt_libname_spec - -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec - -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec - -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_CXX -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds - -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - --striplib= --old_striplib= --{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 --$as_echo_n "checking whether stripping libraries is possible... " >&6; } --if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -- test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } --else --# FIXME - insert some real tests, host_os isn't really good enough -- case $host_os in -- darwin*) -- if test -n "$STRIP" ; then -- striplib="$STRIP -x" -- old_striplib="$STRIP -S" -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- fi +- +- +-# Report which library types will actually be built +-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-$as_echo_n "checking if libtool supports shared libraries... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-$as_echo "$can_build_shared" >&6; } +- +-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-$as_echo_n "checking whether to build shared libraries... " >&6; } +-test "$can_build_shared" = "no" && enable_shared=no +- +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case $host_os in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +- +-aix[4-9]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi - ;; -- *) -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } +-esac +-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 +-$as_echo "$enable_shared" >&6; } +- +-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-$as_echo_n "checking whether to build static libraries... " >&6; } +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 +-$as_echo "$enable_static" >&6; } +- +-# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # 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 +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- compiler \ +- CC \ +- LD \ +- lt_prog_compiler_wl \ +- lt_prog_compiler_pic \ +- lt_prog_compiler_static \ +- lt_prog_compiler_no_builtin_flag \ +- export_dynamic_flag_spec \ +- thread_safe_flag_spec \ +- whole_archive_flag_spec \ +- enable_shared_with_static_runtimes \ +- old_archive_cmds \ +- old_archive_from_new_cmds \ +- predep_objects \ +- postdep_objects \ +- predeps \ +- postdeps \ +- compiler_lib_search_path \ +- compiler_lib_search_dirs \ +- archive_cmds \ +- archive_expsym_cmds \ +- postinstall_cmds \ +- postuninstall_cmds \ +- old_archive_from_expsyms_cmds \ +- allow_undefined_flag \ +- no_undefined_flag \ +- export_symbols_cmds \ +- hardcode_libdir_flag_spec \ +- hardcode_libdir_flag_spec_ld \ +- hardcode_libdir_separator \ +- hardcode_automatic \ +- module_cmds \ +- module_expsym_cmds \ +- lt_cv_prog_compiler_c_o \ +- fix_srcfile_path \ +- exclude_expsyms \ +- include_expsyms; do +- +- case $var in +- old_archive_cmds | \ +- old_archive_from_new_cmds | \ +- archive_cmds | \ +- archive_expsym_cmds | \ +- module_cmds | \ +- module_expsym_cmds | \ +- old_archive_from_expsyms_cmds | \ +- export_symbols_cmds | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done +- +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac --fi -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_CXX -+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds - -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_CXX -+module_expsym_cmds=$lt_module_expsym_cmds_CXX - -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib - -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_CXX - -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_CXX - -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_CXX - -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_CXX - -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method - -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd - -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_CXX - -- # Report which library types will actually be built -- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 --$as_echo_n "checking if libtool supports shared libraries... " >&6; } -- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 --$as_echo "$can_build_shared" >&6; } -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_CXX - -- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 --$as_echo_n "checking whether to build shared libraries... " >&6; } -- test "$can_build_shared" = "no" && enable_shared=no -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds - -- # On AIX, shared libraries and static libraries use the same namespace, and -- # are all built from PIC. +- +-cfgfile="${ofile}T" +- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 +- $rm -f "$cfgfile" +- { $as_echo "$as_me:$LINENO: creating $ofile" >&5 +-$as_echo "$as_me: creating $ofile" >&6;} +- +- cat <<__EOF__ >> "$cfgfile" +-#! $SHELL +- +-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is part of GNU Libtool: +-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 +-# +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program 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 +-# General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +-# +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# A sed program that does not truncate output. +-SED=$lt_SED +- +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="$SED -e 1s/^X//" +- +-# 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 +- +-# The names of the tagged configurations supported by this script. +-available_tags= +- +-# ### BEGIN LIBTOOL CONFIG +- +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os +- +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os +- +-# An echo program that does not interpret backslashes. +-echo=$lt_echo +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# LTCC compiler flags. +-LTCFLAGS=$lt_LTCFLAGS +- +-# A language-specific compiler. +-CC=$lt_compiler +- +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_LD +- +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +- +-# A BSD-compatible nm program. +-NM=$lt_NM +- +-# A symbol stripping program +-STRIP=$lt_STRIP +- +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS="$AS" +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o +- +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds +-archive_expsym_cmds=$lt_archive_expsym_cmds +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds +-module_expsym_cmds=$lt_module_expsym_cmds +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps +- +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms +- +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms +- +-# ### END LIBTOOL CONFIG +- +-__EOF__ +- +- - case $host_os in - aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval - -- aix[4-9]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi +- cat <<\EOF >> "$cfgfile" +- +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-EOF - ;; - esac -- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 --$as_echo "$enable_shared" >&6; } -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_CXX -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -+ -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct_CXX -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L_CXX -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_CXX -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_CXX -+ -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 --$as_echo_n "checking whether to build static libraries... " >&6; } -- # Make sure either enable_shared or enable_static is yes. -- test "$enable_shared" = yes || enable_static=yes -- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 --$as_echo "$enable_static" >&6; } -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path -+ -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols_CXX -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_CXX -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_CXX -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_CXX - -+# ### END LIBTOOL TAG CONFIG: $tagname - -+__EOF__ - - -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi -+ -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - +- +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) +- +- mv -f "$cfgfile" "$ofile" || \ +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +- +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +- +- +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- -CC="$lt_save_CC" -+CC=$lt_save_CC -+LDCXX=$LD -+LD=$lt_save_LD -+GCC=$lt_save_GCC -+with_gnu_ldcxx=$with_gnu_ld -+with_gnu_ld=$lt_save_with_gnu_ld -+lt_cv_path_LDCXX=$lt_cv_path_LD -+lt_cv_path_LD=$lt_save_path_LD -+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld - -+ else -+ tagname="" -+ fi -+ ;; - --ac_ext=cpp +- +- +-# Check whether --with-tags was given. +-if test "${with_tags+set}" = set; then +- withval=$with_tags; tagnames="$withval" +-fi +- +- +-if test -f "$ltmain" && test -n "$tagnames"; then +- if test ! -f "${ofile}"; then +- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 +-$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} +- fi +- +- if test -z "$LTCC"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" +- if test -z "$LTCC"; then +- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 +-$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} +- else +- { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 +-$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} +- fi +- fi +- if test -z "$LTCFLAGS"; then +- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" +- fi +- +- # Extract list of available tagged configurations in $ofile. +- # Note that this assumes the entire list is on one line. +- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` +- +- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," +- for tagname in $tagnames; do +- IFS="$lt_save_ifs" +- # Check whether tagname contains only valid characters +- case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in +- "") ;; +- *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 +-$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} +- { (exit 1); exit 1; }; } +- ;; +- esac +- +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null +- then +- { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 +-$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- # Update the list of available tags. +- if test -n "$tagname"; then +- echo appending configuration tag \"$tagname\" to $ofile +- +- case $tagname in +- CXX) +- if test -n "$CXX" && ( test "X$CXX" != "Xno" && +- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || +- (test "X$CXX" != "Xg++"))) ; then +- ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ F77) -+ if test -n "$F77" && test "X$F77" != "Xno"; then - +- +- +- +- -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= --compiler_needs_object_CXX=no -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no --hardcode_direct_absolute_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_shlibpath_var_CXX=unsupported -hardcode_automatic_CXX=no --inherit_rpath_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown @@ -39032,154 +26278,98 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no -+ac_ext=f -+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_f77_compiler_gnu -+ -+ -+archive_cmds_need_lc_F77=no -+allow_undefined_flag_F77= -+always_export_symbols_F77=no -+archive_expsym_cmds_F77= -+export_dynamic_flag_spec_F77= -+hardcode_direct_F77=no -+hardcode_libdir_flag_spec_F77= -+hardcode_libdir_flag_spec_ld_F77= -+hardcode_libdir_separator_F77= -+hardcode_minus_L_F77=no -+hardcode_automatic_F77=no -+module_cmds_F77= -+module_expsym_cmds_F77= -+link_all_deplibs_F77=unknown -+old_archive_cmds_F77=$old_archive_cmds -+no_undefined_flag_F77= -+whole_archive_flag_spec_F77= -+enable_shared_with_static_runtimes_F77=no - +- +-# Dependencies to place before and after the object being linked: +-predep_objects_CXX= +-postdep_objects_CXX= +-predeps_CXX= +-postdeps_CXX= +-compiler_lib_search_path_CXX= +-compiler_lib_search_dirs_CXX= +- -# Source file extension for C++ test sources. -ac_ext=cpp -+# Source file extension for f77 test sources. -+ac_ext=f - +- -# Object file extension for compiled C++ test sources. -+# Object file extension for compiled f77 test sources. - objext=o +-objext=o -objext_CXX=$objext - --# No sense in running all these tests if we already determined that --# the CXX compiler isn't working. Some variables (like enable_shared) --# are currently assumed to apply to all compilers on this platform, --# and will be corrupted by setting them based on a non-working compiler. --if test "$_lt_caught_CXX_error" != yes; then -- # Code to be used in simple compile tests -- lt_simple_compile_test_code="int some_variable = 0;" +-# Code to be used in simple compile tests +-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); }' +-# Code to be used in simple link tests +-lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - -- # ltmain only uses $CC for tagged configurations so make sure $CC is set. +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +- +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC - - -+objext_F77=$objext - -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" - -+# Code to be used in simple link tests -+lt_simple_link_test_code="\ -+ program t -+ end -+" - -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. - - # If no C compiler was specified, use CC. - LTCC=${LTCC-"$CC"} -@@ -13134,42 +14953,26 @@ - compiler=$CC - - -- # save warnings/boilerplate of simple test code -- ac_outfile=conftest.$ac_objext -+# save warnings/boilerplate of simple test code -+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* -+$rm conftest* - -- ac_outfile=conftest.$ac_objext -+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 -r conftest* -+$rm -r conftest* - - -- # Allow CC to be a program name with arguments. -- lt_save_CC=$CC -- lt_save_LD=$LD -- lt_save_GCC=$GCC -- GCC=$GXX -- lt_save_with_gnu_ld=$with_gnu_ld -- lt_save_path_LD=$lt_cv_path_LD -- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -- else -- $as_unset lt_cv_prog_gnu_ld -- fi -- if test -n "${lt_cv_path_LDCXX+set}"; then -- lt_cv_path_LD=$lt_cv_path_LDCXX -- else -- $as_unset lt_cv_path_LD -- fi -- test -z "${LDCXX+set}" || LD=$LDCXX -- CC=${CXX-"c++"} -- compiler=$CC -- compiler_CXX=$CC -- for cc_temp in $compiler""; do -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${F77-"f77"} -+compiler=$CC -+compiler_F77=$CC -+for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -@@ -13177,5338 +14980,5852 @@ - *) break;; - esac - done --cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-# save warnings/boilerplate of simple test code +-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* +- +-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 -r conftest* - - -- if test -n "$compiler"; then -- # We don't want -fno-exception when compiling C++ code, so set the -- # no_builtin_flag separately -- if test "$GXX" = yes; then -- lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -- else -- lt_prog_compiler_no_builtin_flag_CXX= -- fi +-# Allow CC to be a program name with arguments. +-lt_save_CC=$CC +-lt_save_LD=$LD +-lt_save_GCC=$GCC +-GCC=$GXX +-lt_save_with_gnu_ld=$with_gnu_ld +-lt_save_path_LD=$lt_cv_path_LD +-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then +- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +-else +- $as_unset lt_cv_prog_gnu_ld +-fi +-if test -n "${lt_cv_path_LDCXX+set}"; then +- lt_cv_path_LD=$lt_cv_path_LDCXX +-else +- $as_unset lt_cv_path_LD +-fi +-test -z "${LDCXX+set}" || LD=$LDCXX +-CC=${CXX-"c++"} +-compiler=$CC +-compiler_CXX=$CC +-for cc_temp in $compiler""; do +- case $cc_temp in +- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; +- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +- +- +-# We don't want -fno-exception wen compiling C++ code, so set the +-# no_builtin_flag separately +-if test "$GXX" = yes; then +- lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' +-else +- lt_prog_compiler_no_builtin_flag_CXX= +-fi +- +-if test "$GXX" = yes; then +- # Set up default GNU C++ configuration +- - -- if test "$GXX" = yes; then -- # Set up default GNU C++ configuration -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6; } - -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes @@ -39204,9 +26394,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld -- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` -- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` +- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; @@ -39254,10 +26444,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi -fi -+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } -+test "$can_build_shared" = "no" && enable_shared=no - +- -LD="$lt_cv_path_LD" -if test -n "$LD"; then - { $as_echo "$as_me:$LINENO: result: $LD" >&5 @@ -39278,1779 +26465,1025 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -case `$LD -v 2>&1 </dev/null` in -*GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes -+# On AIX, shared libraries and static libraries use the same namespace, and -+# are all built from PIC. -+case $host_os in -+aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi - ;; +- ;; -*) - lt_cv_prog_gnu_ld=no -+aix[4-9]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi - ;; - esac +- ;; +-esac -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld -+{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6; } - -+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } -+# Make sure either enable_shared or enable_static is yes. -+test "$enable_shared" = yes || enable_static=yes -+{ echo "$as_me:$LINENO: result: $enable_static" >&5 -+echo "${ECHO_T}$enable_static" >&6; } -+ -+GCC_F77="$G77" -+LD_F77="$LD" -+ -+lt_prog_compiler_wl_F77= -+lt_prog_compiler_pic_F77= -+lt_prog_compiler_static_F77= - -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - -+ if test "$GCC" = yes; then -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_static_F77='-static' - -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_F77='-Bstatic' -+ fi -+ ;; - -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' -+ ;; - -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; - -- # Check if GNU C++ uses GNU ld as the underlying linker, since the -- # archiving commands below assume that GNU ld is being used. -- if test "$with_gnu_ld" = yes; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - -- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - -- # If archive_cmds runs LD, not CC, wlarc should be empty -- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -- # investigate it a little bit more. (MM) -- wlarc='${wl}' - -- # ancient GNU ld didn't support --whole-archive et. al. -- if eval "`$CC -print-prog-name=ld` --help 2>&1" | -- $GREP 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec_CXX= -- fi -- else -- with_gnu_ld=no -- wlarc= -+ 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' -+ ;; - -- # A generic and very simple default shared library creation -- # command for GNU C++ for the case where it uses the native -- # linker, instead of GNU ld. If possible, this setting should -- # overridden to take advantage of the native linker features on -- # the platform it is being used on. -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- # Check if GNU C++ uses GNU ld as the underlying linker, since the +- # archiving commands below assume that GNU ld is being used. +- if test "$with_gnu_ld" = yes; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- +- # If archive_cmds runs LD, not CC, wlarc should be empty +- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to +- # investigate it a little bit more. (MM) +- wlarc='${wl}' +- +- # ancient GNU ld didn't support --whole-archive et. al. +- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ +- grep 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec_CXX= +- fi +- else +- with_gnu_ld=no +- wlarc= +- +- # A generic and very simple default shared library creation +- # command for GNU C++ for the case where it uses the native +- # linker, instead of GNU ld. If possible, this setting should +- # overridden to take advantage of the native linker features on +- # the platform it is being used on. +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' +- fi +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +-else +- GXX=no +- with_gnu_ld=no +- wlarc= +-fi +- +-# PORTME: fill in a description of your system's C++ link characteristics +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } +-ld_shlibs_CXX=yes +-case $host_os in +- aix3*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- aix[4-9]*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- aix_use_runtimelinking=no +- +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) +- for ld_flag in $LDFLAGS; do +- case $ld_flag in +- *-brtl*) +- aix_use_runtimelinking=yes +- break +- ;; +- esac +- done +- ;; +- esac +- +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' +- fi +- +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- +- archive_cmds_CXX='' +- hardcode_direct_CXX=yes +- hardcode_libdir_separator_CXX=':' +- link_all_deplibs_CXX=yes +- +- if test "$GXX" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ +- collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null +- then +- # We have reworked collect2 +- : +- else +- # We have old collect2 +- hardcode_direct_CXX=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- hardcode_minus_L_CXX=yes +- hardcode_libdir_flag_spec_CXX='-L$libdir' +- hardcode_libdir_separator_CXX= +- fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' - fi -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic_F77='-fno-common' -+ ;; - +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' +- fi +- fi +- fi +- +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- always_export_symbols_CXX=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- allow_undefined_flag_CXX='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $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 "$lt_aix_libpath_sed"` +-fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -rf conftest.dSYM +-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 +- +- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" +- +- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' +- allow_undefined_flag_CXX="-z nodefs" +- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $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 "$lt_aix_libpath_sed"` +-fi +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +- +-rm -rf conftest.dSYM +-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 +- +- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- no_undefined_flag_CXX=' ${wl}-bernotok' +- allow_undefined_flag_CXX=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_CXX='$convenience' +- archive_cmds_need_lc_CXX=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi +- fi +- ;; +- +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- allow_undefined_flag_CXX=unsupported +- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- ld_shlibs_CXX=no +- fi +- ;; +- +- chorus*) +- case $cc_basename in +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, +- # as there is no search path for DLLs. +- hardcode_libdir_flag_spec_CXX='-L$libdir' +- allow_undefined_flag_CXX=unsupported +- always_export_symbols_CXX=no +- enable_shared_with_static_runtimes_CXX=yes +- +- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- ld_shlibs_CXX=no +- fi +- ;; +- darwin* | rhapsody*) +- archive_cmds_need_lc_CXX=no +- hardcode_direct_CXX=no +- hardcode_automatic_CXX=yes +- hardcode_shlibpath_var_CXX=unsupported +- whole_archive_flag_spec_CXX='' +- link_all_deplibs_CXX=yes +- allow_undefined_flag_CXX="$_lt_dar_allow_undefined" +- if test "$GXX" = yes ; then +- output_verbose_link_cmd='echo' +- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- if test "$lt_cv_apple_cc_single_mod" != "yes"; then +- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" +- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +- fi +- else +- 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` $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 $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}' +- ;; +- *) +- ld_shlibs_CXX=no +- ;; +- esac +- fi +- ;; +- +- dgux*) +- case $cc_basename in +- ec++*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- ghcx*) +- # Green Hills C++ Compiler +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- freebsd[12]*) +- # C++ shared libraries reported to be fairly broken before switch to ELF +- ld_shlibs_CXX=no +- ;; +- freebsd-elf*) +- archive_cmds_need_lc_CXX=no +- ;; +- freebsd* | dragonfly*) +- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF +- # conventions +- ld_shlibs_CXX=yes +- ;; +- gnu*) +- ;; +- hpux9*) +- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- export_dynamic_flag_spec_CXX='${wl}-E' +- hardcode_direct_CXX=yes +- hardcode_minus_L_CXX=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- aCC*) +- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; - -- else -- GXX=no -- with_gnu_ld=no -- wlarc= -- fi -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared_F77=no -+ enable_shared=no -+ ;; - -- # PORTME: fill in a description of your system's C++ link characteristics -- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -- ld_shlibs_CXX=yes -- case $host_os in -- aix3*) +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -- ;; -- aix[4-9]*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- aix_use_runtimelinking=no -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic_F77=-Kconform_pic -+ fi -+ ;; - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -- for ld_flag in $LDFLAGS; do -- case $ld_flag in -- *-brtl*) -- aix_use_runtimelinking=yes -- break -- ;; -- esac -- done -- ;; -- esac -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_F77='-fPIC' -+ ;; -+ esac -+ ;; - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -+ *) -+ lt_prog_compiler_pic_F77='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_F77='-Bstatic' -+ else -+ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_F77='-qnocommon' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ esac -+ ;; - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +- fi +- ;; +- esac +- ;; +- hpux10*|hpux11*) +- if test $with_gnu_ld = no; then +- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_CXX=: - -- archive_cmds_CXX='' -- hardcode_direct_CXX=yes -- hardcode_direct_absolute_CXX=yes -- hardcode_libdir_separator_CXX=':' -- link_all_deplibs_CXX=yes -- file_list_spec_CXX='${wl}-f,' -- -- if test "$GXX" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -- # We only want to do this on AIX 4.2 and lower, the check -- # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && -- strings "$collect2name" | $GREP resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- : -- else -- # We have old collect2 -- hardcode_direct_CXX=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L_CXX=yes -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- hardcode_libdir_separator_CXX= -- fi -- esac -- shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -- fi -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -+ 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' -+ ;; - -- export_dynamic_flag_spec_CXX='${wl}-bexpall' -- # It seems that -bexpall does not export symbols beginning with -- # underscore (_), so it is better to generate a list of symbols to -- # export. -- always_export_symbols_CXX=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag_CXX='-berok' -- # Determine the default libpath from the value encoded in an empty -- # executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ hpux9* | hpux10* | hpux11*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_F77='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ lt_prog_compiler_static_F77='${wl}-a ${wl}archive' -+ ;; - --int --main () --{ -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ newsos6) -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; - --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 "$lt_aix_libpath_sed"` --fi --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-fpic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # 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 -+ ;; - -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; - --fi -+ rdos*) -+ lt_prog_compiler_static_F77='-non_shared' -+ ;; - --rm -rf conftest.dSYM --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 -+ solaris*) -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_F77='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_F77='-Wl,';; -+ esac -+ ;; - -- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -+ sunos4*) -+ lt_prog_compiler_wl_F77='-Qoption ld ' -+ lt_prog_compiler_pic_F77='-PIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; - -- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' -- allow_undefined_flag_CXX="-z nodefs" -- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an -- # empty executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; - --int --main () --{ -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ lt_prog_compiler_pic_F77='-Kconform_pic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ fi -+ ;; - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; - --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 "$lt_aix_libpath_sed"` --fi --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ unicos*) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_can_build_shared_F77=no -+ ;; - -+ uts4*) -+ lt_prog_compiler_pic_F77='-pic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; - --fi -+ *) -+ lt_prog_compiler_can_build_shared_F77=no -+ ;; -+ esac -+ fi - --rm -rf conftest.dSYM --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 -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } - -- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- no_undefined_flag_CXX=' ${wl}-bernotok' -- allow_undefined_flag_CXX=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- whole_archive_flag_spec_CXX='$convenience' -- archive_cmds_need_lc_CXX=yes -- # This is similar to how AIX traditionally builds its shared -- # libraries. -- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -- fi -- fi +- case $host_cpu in +- hppa*64*|ia64*) ;; +- *) +- export_dynamic_flag_spec_CXX='${wl}-E' - ;; -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic_F77"; then - -- beos*) -- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- allow_undefined_flag_CXX=unsupported -- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- ld_shlibs_CXX=no -- fi +- esac +- fi +- case $host_cpu in +- hppa*64*|ia64*) +- hardcode_direct_CXX=no +- hardcode_shlibpath_var_CXX=no +- ;; +- *) +- hardcode_direct_CXX=yes +- hardcode_minus_L_CXX=yes # Not in the search PATH, +- # but as the default +- # location of the library. +- ;; +- esac +- +- case $cc_basename in +- CC*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no - ;; -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_pic_works_F77=no -+ ac_outfile=conftest.$ac_objext -+ 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. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:15286: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:15290: \$? = $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. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_pic_works_F77=yes -+ fi -+ fi -+ $rm conftest* - -- chorus*) -- case $cc_basename in -- *) +- aCC*) +- case $host_cpu in +- hppa*64*) +- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- ;; +- *) +- if test "$GXX" = yes; then +- if test $with_gnu_ld = no; then +- case $host_cpu in +- hppa*64*) +- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- ia64*) +- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- *) +- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- ;; +- esac +- fi +- else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -- ;; -- esac -- ;; -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } - -- cygwin* | mingw* | pw32* | cegcc*) -- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- allow_undefined_flag_CXX=unsupported -- always_export_symbols_CXX=no -- enable_shared_with_static_runtimes_CXX=yes -- -- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs_CXX=no -- fi -- ;; -- darwin* | rhapsody*) -- -- -- archive_cmds_need_lc_CXX=no -- hardcode_direct_CXX=no -- hardcode_automatic_CXX=yes -- hardcode_shlibpath_var_CXX=unsupported -- whole_archive_flag_spec_CXX='' -- link_all_deplibs_CXX=yes -- allow_undefined_flag_CXX="$_lt_dar_allow_undefined" -- case $cc_basename in -- ifort*) _lt_dar_can_shared=yes ;; -- *) _lt_dar_can_shared=$GCC ;; -- esac -- if test "$_lt_dar_can_shared" = "yes"; then -- output_verbose_link_cmd=echo -- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -- if test "$lt_cv_apple_cc_single_mod" != "yes"; then -- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -- fi -+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then -+ case $lt_prog_compiler_pic_F77 in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; -+ esac -+else -+ lt_prog_compiler_pic_F77= -+ lt_prog_compiler_can_build_shared_F77=no -+fi - -- else -- ld_shlibs_CXX=no -- fi -+fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic_F77= -+ ;; -+ *) -+ lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" -+ ;; -+esac - -- ;; -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_static_works_F77=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ 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 -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_static_works_F77=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works_F77=yes -+ fi -+ fi -+ $rm -r conftest* -+ LDFLAGS="$save_LDFLAGS" - -- dgux*) -- case $cc_basename in -- ec++*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- ghcx*) -- # Green Hills C++ Compiler -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- esac -- ;; -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } - -- freebsd[12]*) -- # C++ shared libraries reported to be fairly broken before -- # switch to ELF -- ld_shlibs_CXX=no -- ;; -+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then -+ : -+else -+ lt_prog_compiler_static_F77= -+fi - -- freebsd-elf*) -- archive_cmds_need_lc_CXX=no -- ;; - -- freebsd* | dragonfly*) -- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -- # conventions -- ld_shlibs_CXX=yes -- ;; -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_c_o_F77=no -+ $rm -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - -- gnu*) -- ;; -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:15390: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:15394: \$? = $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 -+ # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_F77=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out -+ cd .. -+ rmdir conftest -+ $rm conftest* - -- hpux9*) -- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator_CXX=: -- export_dynamic_flag_spec_CXX='${wl}-E' -- hardcode_direct_CXX=yes -- hardcode_minus_L_CXX=yes # Not in the search PATH, -- # but as the default -- # location of the library. -- -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- aCC*) -- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -- ;; -- *) -- if test "$GXX" = yes; then -- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- else -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- fi -- ;; -- esac -- ;; -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } - -- hpux10*|hpux11*) -- if test $with_gnu_ld = no; then -- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator_CXX=: - -- case $host_cpu in -- hppa*64*|ia64*) -- ;; -- *) -- export_dynamic_flag_spec_CXX='${wl}-E' -- ;; -- esac -- fi -- case $host_cpu in -- hppa*64*|ia64*) -- hardcode_direct_CXX=no -- hardcode_shlibpath_var_CXX=no -- ;; -- *) -- hardcode_direct_CXX=yes -- hardcode_direct_absolute_CXX=yes -- hardcode_minus_L_CXX=yes # Not in the search PATH, -- # but as the default -- # location of the library. -- ;; -- esac -- -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- aCC*) -- case $host_cpu in -- hppa*64*) -- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- ia64*) -- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- *) -- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- esac -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -- ;; -- *) -- if test "$GXX" = yes; then -- if test $with_gnu_ld = no; then -- case $host_cpu in -- hppa*64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- ia64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- *) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- esac -- fi -- else -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- fi -- ;; -- esac -- ;; -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } -+ hard_links=yes -+ $rm conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } -+ if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi - -- interix[3-9]*) -- hardcode_direct_CXX=no -- hardcode_shlibpath_var_CXX=no -- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_CXX='${wl}-E' -- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -- # Instead, shared libraries are loaded at an image base (0x10000000 by -- # default) and relocated if they conflict, which is a slow very memory -- # consuming and fragmenting process. To avoid this, we pick a random, -- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -- # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- archive_expsym_cmds_CXX='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' -- ;; -- irix5* | irix6*) -- case $cc_basename in -- CC*) -- # SGI C++ -- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- -- # Archives containing C++ object files must be created using -- # "CC -ar", where "CC" is the IRIX C++ compiler. This is -- # necessary to make sure instantiated templates are included -- # in the archive. -- old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' -- ;; -- *) -- if test "$GXX" = yes; then -- if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' -- fi -- fi -- link_all_deplibs_CXX=yes -- ;; -- esac -- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_CXX=: -- inherit_rpath_CXX=yes -- ;; -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - -- linux* | k*bsd*-gnu) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -- -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -- -- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -- -- # Archives containing C++ object files must be created using -- # "CC -Bstatic", where "CC" is the KAI C++ compiler. -- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' -- ;; -- icpc* | ecpc* ) -- # Intel C++ -- with_gnu_ld=yes -- # version 8.0 and above of icpc choke on multiply defined symbols -- # if we add $predep_objects and $postdep_objects, however 7.1 and -- # earlier do not add the objects themselves. -- case `$CC -V 2>&1` in -- *"Version 7."*) -- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- ;; -- *) # Version 8.0 or newer -- tmp_idyn= -- case $host_cpu in -- ia64*) tmp_idyn=' -i_dynamic';; -- esac -- archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- ;; -- esac -- archive_cmds_need_lc_CXX=no -- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -- ;; -- pgCC* | pgcpp*) -- # Portland Group C++ compiler -- case `$CC -V` in -- *pgCC\ [1-5]* | *pgcpp\ [1-5]*) -- prelink_cmds_CXX='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -- old_archive_cmds_CXX='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -- $RANLIB $oldlib' -- archive_cmds_CXX='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -- archive_expsym_cmds_CXX='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -- ;; -- *) # Version 6 will use weak symbols -- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -- ;; -- esac -+ runpath_var= -+ allow_undefined_flag_F77= -+ enable_shared_with_static_runtimes_F77=no -+ archive_cmds_F77= -+ archive_expsym_cmds_F77= -+ old_archive_From_new_cmds_F77= -+ old_archive_from_expsyms_cmds_F77= -+ export_dynamic_flag_spec_F77= -+ whole_archive_flag_spec_F77= -+ thread_safe_flag_spec_F77= -+ hardcode_libdir_flag_spec_F77= -+ hardcode_libdir_flag_spec_ld_F77= -+ hardcode_libdir_separator_F77= -+ hardcode_direct_F77=no -+ hardcode_minus_L_F77=no -+ hardcode_shlibpath_var_F77=unsupported -+ link_all_deplibs_F77=unknown -+ hardcode_automatic_F77=no -+ module_cmds_F77= -+ module_expsym_cmds_F77= -+ always_export_symbols_F77=no -+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ include_expsyms_F77= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - -- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -- ;; -- cxx*) -- # Compaq C++ -- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac - -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec_CXX='-rpath $libdir' -- hardcode_libdir_separator_CXX=: -+ ld_shlibs_F77=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' -- ;; -- xl*) -- # IBM XL 8.0 on PPC, with GNU ld -- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -- archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- if test "x$supports_anon_versioning" = xyes; then -- archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ -- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -- echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- fi -- ;; -- *) -- 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' -- compiler_needs_object_CXX=yes -- -- # 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 -- ;; -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_F77='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_F77= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac - -- lynxos*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix[3-9]*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs_F77=no -+ cat <<EOF 1>&2 - -- m88k*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. - -- mvs*) -- case $cc_basename in -- cxx*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- esac -- ;; -+EOF -+ fi -+ ;; - -- netbsd*) -- 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= -- hardcode_libdir_flag_spec_CXX='-R$libdir' -- hardcode_direct_CXX=yes -- hardcode_shlibpath_var_CXX=no - fi -- # Workaround some broken pre-1.5 toolchains -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; -+ amigaos*) -+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_minus_L_F77=yes -+ -+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ ld_shlibs_F77=no -+ ;; - -- *nto* | *qnx*) -- ld_shlibs_CXX=yes +- esac +- ;; +- interix[3-9]*) +- hardcode_direct_CXX=no +- hardcode_shlibpath_var_CXX=no +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_CXX='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- archive_expsym_cmds_CXX='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' +- ;; +- irix5* | irix6*) +- case $cc_basename in +- CC*) +- # SGI C++ +- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- +- # Archives containing C++ object files must be created using +- # "CC -ar", where "CC" is the IRIX C++ compiler. This is +- # necessary to make sure instantiated templates are included +- # in the archive. +- old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_F77=unsupported -+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; - -- openbsd2*) -- # C++ shared libraries are fairly broken +- *) +- if test "$GXX" = yes; then +- if test "$with_gnu_ld" = no; then +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' +- fi +- fi +- link_all_deplibs_CXX=yes +- ;; +- esac +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- ;; +- linux* | k*bsd*-gnu) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +- +- hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' +- ;; +- icpc*) +- # Intel C++ +- with_gnu_ld=yes +- # version 8.0 and above of icpc choke on multiply defined symbols +- # if we add $predep_objects and $postdep_objects, however 7.1 and +- # earlier do not add the objects themselves. +- case `$CC -V 2>&1` in +- *"Version 7."*) +- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- *) # Version 8.0 or newer +- tmp_idyn= +- case $host_cpu in +- ia64*) tmp_idyn=' -i_dynamic';; +- esac +- archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- ;; +- esac +- archive_cmds_need_lc_CXX=no +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +- ;; +- pgCC* | pgcpp*) +- # Portland Group C++ compiler +- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' +- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' +- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- ;; +- cxx*) +- # Compaq C++ +- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' +- +- runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec_CXX='-rpath $libdir' +- hardcode_libdir_separator_CXX=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # 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*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- m88k*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- mvs*) +- case $cc_basename in +- cxx*) +- # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ 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/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - -- openbsd*) -- if test -f /usr/libexec/ld.so; then -- hardcode_direct_CXX=yes -- hardcode_shlibpath_var_CXX=no -- hardcode_direct_absolute_CXX=yes -- 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 -+ 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' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; - else +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- netbsd*) +- 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= +- hardcode_libdir_flag_spec_CXX='-R$libdir' +- hardcode_direct_CXX=yes +- hardcode_shlibpath_var_CXX=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' +- ;; +- openbsd2*) +- # C++ shared libraries are fairly broken +- ld_shlibs_CXX=no +- ;; +- openbsd*) +- 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 +- ;; +- osf3*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler +- +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- hardcode_libdir_separator_CXX=: +- +- # Archives containing C++ object files must be created using +- # "CC -Bstatic", where "CC" is the KAI C++ compiler. +- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' +- +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- cxx*) +- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; +- esac +- ;; +- osf4* | osf5*) +- case $cc_basename in +- KCC*) +- # Kuck and Associates, Inc. (KAI) C++ Compiler - -- osf3* | osf4* | osf5*) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler +- # KCC will only create a shared library if the output file +- # ends with ".so" (or ".sl" for HP-UX), so rename the library +- # to its proper name (with version) after linking. +- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' +- hardcode_libdir_separator_CXX=: - -- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -- hardcode_libdir_separator_CXX=: +- # Archives containing C++ object files must be created using +- # the KAI C++ compiler. +- old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' +- ;; +- RCC*) +- # Rational C++ 2.4.1 +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- cxx*) +- allow_undefined_flag_CXX=' -expect_unresolved \*' +- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ +- echo "-hidden">> $lib.exp~ +- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ +- $rm $lib.exp' - -- # Archives containing C++ object files must be created using -- # the KAI C++ compiler. -- case $host in -- osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; -- *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; -- esac +- hardcode_libdir_flag_spec_CXX='-rpath $libdir' +- hardcode_libdir_separator_CXX=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- # +- # There doesn't appear to be a way to prevent this compiler from +- # explicitly linking system object files so we need to strip them +- # from the output so that they don't get included in the library +- # dependencies. +- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' +- ;; +- *) +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- +- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_CXX=: +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' +- +- else +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- fi +- ;; +- esac +- ;; +- psos*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- sunos4*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.x +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- lcc*) +- # Lucid +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- solaris*) +- case $cc_basename in +- CC*) +- # Sun C++ 4.2, 5.x and Centerline C++ +- archive_cmds_need_lc_CXX=yes +- 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='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- hardcode_libdir_flag_spec_CXX='-R$libdir' +- hardcode_shlibpath_var_CXX=no +- case $host_os in +- solaris2.[0-5] | solaris2.[0-5].*) ;; +- *) +- # 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='-z allextract$convenience -z defaultextract' - ;; -- RCC*) -- # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- cxx*) -- case $host in -- osf3*) -- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -- ;; -- *) -- allow_undefined_flag_CXX=' -expect_unresolved \*' -- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -- echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ -- $RM $lib.exp' -- hardcode_libdir_flag_spec_CXX='-rpath $libdir' -- ;; -- esac -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; - -- hardcode_libdir_separator_CXX=: -+ interix[3-9]*) -+ hardcode_direct_F77=no -+ hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ 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' -+ ;; - +- esac +- link_all_deplibs_CXX=yes +- +- 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' +- ;; +- gcx*) +- # Green Hills C++ Compiler +- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- +- # The C++ compiler must be used to create the archive. +- old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +- ;; +- *) +- # GNU C++ compiler with Solaris linker +- if test "$GXX" = yes && test "$with_gnu_ld" = no; then +- no_undefined_flag_CXX=' ${wl}-z ${wl}defs' +- if $CC --version | grep -v '^2\.7' > /dev/null; then +- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' -- ;; +- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- else +- # g++ 2.7 appears to require `-G' NOT `-shared' on this +- # platform. +- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- +- # Commands to make compiler produce verbose output that lists +- # what "hidden" libraries, object files and flags are used when +- # linking a shared library. +- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" +- fi +- +- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' +- case $host_os in +- solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- case $host in -- osf3*) -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- ;; -- *) -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- ;; -- esac -- -- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_CXX=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -- -- else -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- fi +- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; -- esac -- ;; -+ 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 -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ 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' - -- psos*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -+ 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 '"$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 -+ ;; - -- sunos4*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.x -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- lcc*) -- # Lucid -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- esac -- ;; -+ 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= -+ else -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; - -- solaris*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.2, 5.x and Centerline C++ -- archive_cmds_need_lc_CXX=yes -- 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='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -- -- hardcode_libdir_flag_spec_CXX='-R$libdir' -- hardcode_shlibpath_var_CXX=no -- case $host_os in -- solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) -- # 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='-z allextract$convenience -z defaultextract' -- ;; -- esac -- link_all_deplibs_CXX=yes -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs_F77=no -+ cat <<EOF 1>&2 - -- output_verbose_link_cmd='echo' -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - -- # 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' -- ;; -- gcx*) -- # Green Hills C++ Compiler -- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; - -- # The C++ compiler must be used to create the archive. -- old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -- ;; -- *) -- # GNU C++ compiler with Solaris linker -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- no_undefined_flag_CXX=' ${wl}-z ${wl}defs' -- if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -- else -- # g++ 2.7 appears to require `-G' NOT `-shared' on this -- # platform. -- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -- 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 -- ;; -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs_F77=no -+ cat <<_LT_EOF 1>&2 - -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -- no_undefined_flag_CXX='${wl}-z,text' -- archive_cmds_need_lc_CXX=no -- hardcode_shlibpath_var_CXX=no -- runpath_var='LD_RUN_PATH' -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - -- case $cc_basename in -- CC*) -- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -+_LT_EOF -+ ;; - *) -- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi -+ ;; - esac - ;; - -- sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -- # link with -lc, and that would cause any symbols used from libc to -- # always be unresolved, which means just about no library would -- # ever link correctly. If we're not using GNU ld we use -z text -- # though, which does catch some bad symbols but isn't as heavy-handed -- # as -z defs. -- no_undefined_flag_CXX='${wl}-z,text' -- allow_undefined_flag_CXX='${wl}-z,nodefs' -- archive_cmds_need_lc_CXX=no -- hardcode_shlibpath_var_CXX=no -- hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' -- hardcode_libdir_separator_CXX=':' -- link_all_deplibs_CXX=yes -- export_dynamic_flag_spec_CXX='${wl}-Bexport' -- runpath_var='LD_RUN_PATH' -+ sunos4*) -+ archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; - -- case $cc_basename in -- CC*) -- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_F77=no -+ fi - ;; -+ esac - -- tandem*) -- case $cc_basename in -- NCC*) -- # NonStop-UX NCC 3.20 -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- esac -- ;; -+ if test "$ld_shlibs_F77" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_F77= -+ export_dynamic_flag_spec_F77= -+ whole_archive_flag_spec_F77= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ allow_undefined_flag_F77=unsupported -+ always_export_symbols_F77=yes -+ archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L_F77=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct_F77=unsupported -+ fi -+ ;; - -- vxworks*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -+ aix[4-9]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no - -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; +- esac +- fi +- ;; - esac -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac - -- { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +- ;; +- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) +- no_undefined_flag_CXX='${wl}-z,text' +- archive_cmds_need_lc_CXX=no +- hardcode_shlibpath_var_CXX=no +- runpath_var='LD_RUN_PATH' +- +- case $cc_basename in +- CC*) +- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- ;; +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- # For security reasons, it is highly recommended that you always +- # use absolute paths for naming shared libraries, and exclude the +- # DT_RUNPATH tag from executables and libraries. But doing so +- # requires that you compile everything twice, which is a pain. +- # So that behaviour is only enabled if SCOABSPATH is set to a +- # non-empty value in the environment. Most likely only useful for +- # creating official distributions of packages. +- # This is a hack until libtool officially supports absolute path +- # names for shared libraries. +- no_undefined_flag_CXX='${wl}-z,text' +- allow_undefined_flag_CXX='${wl}-z,nodefs' +- archive_cmds_need_lc_CXX=no +- hardcode_shlibpath_var_CXX=no +- hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- hardcode_libdir_separator_CXX=':' +- link_all_deplibs_CXX=yes +- export_dynamic_flag_spec_CXX='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' +- +- case $cc_basename in +- CC*) +- archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- ;; +- tandem*) +- case $cc_basename in +- NCC*) +- # NonStop-UX NCC 3.20 +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- esac +- ;; +- vxworks*) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +- *) +- # FIXME: insert proper C++ library support +- ld_shlibs_CXX=no +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } -- test "$ld_shlibs_CXX" = no && can_build_shared=no +-test "$ld_shlibs_CXX" = no && can_build_shared=no - -- GCC_CXX="$GXX" -- LD_CXX="$LD" +-GCC_CXX="$GXX" +-LD_CXX="$LD" - -- ## CAVEAT EMPTOR: -- ## There is no encapsulation within the following macros, do not change -- ## the running order or otherwise move them around unless you know exactly -- ## what you are doing... -- # Dependencies to place before and after the object being linked: --predep_objects_CXX= --postdep_objects_CXX= --predeps_CXX= --postdeps_CXX= --compiler_lib_search_path_CXX= -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - --cat > conftest.$ac_ext <<_LT_EOF +-cat > conftest.$ac_ext <<EOF -class Foo -{ -public: @@ -41058,13 +27491,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -private: - int a; -}; --_LT_EOF -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - +-EOF +- -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? @@ -41072,99 +27500,30 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - (exit $ac_status); }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. -+ archive_cmds_F77='' -+ hardcode_direct_F77=yes -+ hardcode_libdir_separator_F77=':' -+ link_all_deplibs_F77=yes - +- - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ hardcode_direct_F77=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L_F77=yes -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_libdir_separator_F77= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi - -- for p in `eval "$output_verbose_link_cmd"`; do +- +- # The `*' in the case matches for architectures that use `case' in +- # $output_verbose_cmd can trigger glob expansion during the loop +- # eval without this substitution. +- output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` +- +- for p in `eval $output_verbose_link_cmd`; do - case $p in -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_F77=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag_F77='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+ program main - +- - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. -- if test $p = "-L" || -- test $p = "-R"; then +- if test $p = "-L" \ +- || test $p = "-R"; then - prev=$p - continue - else - prev= - fi -+ end -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - +- - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) @@ -41188,22 +27547,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi - fi - ;; -+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 "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - +- - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. @@ -41211,7 +27555,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - pre_test_object_deps_done=yes - continue - fi - +- - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" @@ -41226,70 +27570,25 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi - fi - ;; -+fi - +- - *) ;; # Ignore the rest. -+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 - +- - esac - done -+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_F77="-z nodefs" -+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+ program main - +- - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -+ end -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 "$lt_aix_libpath_sed"` - fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --$RM -f confest.$objext - +-fi +- +-$rm -f confest.$objext +- +-compiler_lib_search_dirs_CXX= +-if test -n "$compiler_lib_search_path_CXX"; then +- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +-fi +- -# PORTME: override above test on systems where it is broken -case $host_os in -interix[3-9]*) @@ -41299,16 +27598,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - postdep_objects_CXX= - postdeps_CXX= - ;; -+fi - +- -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 -+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 - +- # - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as @@ -41316,35 +27611,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes -+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ no_undefined_flag_F77=' ${wl}-bernotok' -+ allow_undefined_flag_F77=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_F77='$convenience' -+ archive_cmds_need_lc_F77=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi - ;; +- ;; - esac - - if test "$solaris_use_stlport4" != yes; then - postdeps_CXX='-library=Cstd -library=Crun' - fi - ;; - esac - ;; -+ amigaos*) -+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_minus_L_F77=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs_F77=no -+ ;; - +- -solaris*) - case $cc_basename in - CC*) @@ -41355,9 +27630,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes -+ bsdi[45]*) -+ export_dynamic_flag_spec_F77=-rdynamic - ;; +- ;; - esac - - # Adding this requires a known-good setup of shared libraries for @@ -41371,406 +27644,40 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - ;; -esac - -- -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac -- compiler_lib_search_dirs_CXX= --if test -n "${compiler_lib_search_path_CXX}"; then -- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` --fi - -- -- -- -- -- -- -- -- - -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_F77=' ' -+ allow_undefined_flag_F77=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # 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' -+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes_F77=yes -+ ;; - -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_F77=no -+ hardcode_direct_F77=no -+ hardcode_automatic_F77=yes -+ hardcode_shlibpath_var_F77=unsupported -+ whole_archive_flag_spec_F77='' -+ link_all_deplibs_F77=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ 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` $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 $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}' -+ ;; -+ *) -+ ld_shlibs_F77=no -+ ;; -+ esac -+ fi -+ ;; - -+ dgux*) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; - -+ freebsd1*) -+ ld_shlibs_F77=no -+ ;; - -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; - -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=yes -+ hardcode_minus_L_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; - -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; - -+ hpux9*) -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ hardcode_direct_F77=yes - -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-E' -+ ;; - -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: - -+ hardcode_direct_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-E' - -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_F77=yes -+ fi -+ ;; - -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_F77=: - -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_libdir_flag_spec_ld_F77='+b $libdir' -+ hardcode_direct_F77=no -+ hardcode_shlibpath_var_F77=no -+ ;; -+ *) -+ hardcode_direct_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-E' - -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_F77=yes -+ ;; -+ esac -+ fi -+ ;; - -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' -+ fi -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ link_all_deplibs_F77=yes -+ ;; - -+ 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 -+ archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; - -+ newsos6) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=yes -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ hardcode_shlibpath_var_F77=no -+ ;; - -+ openbsd*) -+ 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 -+ ld_shlibs_F77=no -+ fi -+ ;; - -+ os2*) -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_minus_L_F77=yes -+ allow_undefined_flag_F77=unsupported -+ archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; - -+ osf3*) -+ if test "$GCC" = yes; then -+ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ allow_undefined_flag_F77=' -expect_unresolved \*' -+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_F77=: -+ ;; - -- lt_prog_compiler_wl_CXX= +-lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ else -+ allow_undefined_flag_F77=' -expect_unresolved \*' -+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - +- -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+ # Both c and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec_F77='-rpath $libdir' -+ fi -+ hardcode_libdir_separator_F77=: -+ ;; - +- - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' -+ solaris*) -+ no_undefined_flag_F77=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_shlibpath_var_F77=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # 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?) -+ 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 -+ ;; - +- - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_direct_F77=yes -+ hardcode_minus_L_F77=yes -+ hardcode_shlibpath_var_F77=no - ;; - +- fi +- ;; - amigaos*) -- case $host_cpu in -- powerpc) -- # see comment about AmigaOS4 .so support -- lt_prog_compiler_pic_CXX='-fPIC' -- ;; -- m68k) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' -+ sysv4) -+ case $host_vendor in -+ sni) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ reload_cmds_F77='$CC -r -o $output$reload_objs' -+ hardcode_direct_F77=no - ;; -+ motorola) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie -+ ;; - esac -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var_F77=no - ;; - +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' +- ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) +- 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 @@ -41789,208 +27696,29 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. -+ sysv4.3*) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_F77=no -+ export_dynamic_flag_spec_F77='-Bexport' - ;; -+ - sysv4*MP*) - if test -d /usr/nec; then +- ;; +- sysv4*MP*) +- if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_F77=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ld_shlibs_F77=yes - fi - ;; +- fi +- ;; - hpux*) -- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -- # sets the default TLS model and affects inlining. +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. - case $host_cpu in -- hppa*64*) +- hppa*64*|ia64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac -+ -+ 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 -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ no_undefined_flag_F77='${wl}-z,text' -+ allow_undefined_flag_F77='${wl}-z,nodefs' -+ archive_cmds_need_lc_F77=no -+ hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_F77=':' -+ link_all_deplibs_F77=yes -+ export_dynamic_flag_spec_F77='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi - ;; -- *qnx* | *nto*) -- # QNX uses GNU C++, but need to define -shared option too, otherwise -- # it will coredump. -- lt_prog_compiler_pic_CXX='-fPIC -shared' -+ -+ uts4*) -+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-L$libdir' -+ hardcode_shlibpath_var_F77=no - ;; -+ - *) +- ;; +- *) - lt_prog_compiler_pic_CXX='-fPIC' -+ ld_shlibs_F77=no -+ ;; -+ esac -+ fi -+ -+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -+echo "${ECHO_T}$ld_shlibs_F77" >&6; } -+test "$ld_shlibs_F77" = no && can_build_shared=no -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc_F77" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc_F77=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds_F77 in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ { 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* -+ echo "$lt_simple_compile_test_code" > 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); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_F77 -+ pic_flag=$lt_prog_compiler_pic_F77 -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag_F77 -+ allow_undefined_flag_F77= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc_F77=no -+ else -+ archive_cmds_need_lc_F77=yes -+ fi -+ allow_undefined_flag_F77=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } - ;; - esac -+ fi -+ ;; -+esac -+ -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+ -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix[4-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH - else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. - case $host_os in +- ;; +- esac +- else +- case $host_os in - aix[4-9]*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then @@ -42004,10 +27732,20 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - case $cc_basename in - cxch68*) - # Green Hills C++ Compiler -- # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" +- # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- lt_prog_compiler_pic_CXX='-qnocommon' +- lt_prog_compiler_wl_CXX='-Wl,' +- ;; +- esac +- ;; - dgux*) - case $cc_basename in - ec++*) @@ -42071,21 +27809,14 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; -- ecpc* ) -- # old Intel C++ for x86_64 which still supported -KPIC. +- icpc* | ecpc*) +- # Intel C++ - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; -- icpc* ) -- # Intel C++, used to be incompatible with GCC. -- # ICC 10 doesn't accept -KPIC any more. -- lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_pic_CXX='-fPIC' -- lt_prog_compiler_static_CXX='-static' -- ;; - pgCC* | pgcpp*) -- # Portland Group C++ compiler +- # Portland Group C++ compiler. - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-fpic' - lt_prog_compiler_static_CXX='-Bstatic' @@ -42097,12 +27828,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; -- xlc* | xlC*) -- # IBM XL 8.0 on PPC -- lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_pic_CXX='-qpic' -- lt_prog_compiler_static_CXX='-qstaticlink' -- ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) @@ -42130,11 +27855,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - ;; - netbsd*) - ;; -- *qnx* | *nto*) -- # QNX uses GNU C++, but need to define -shared option too, otherwise -- # it will coredump. -- lt_prog_compiler_pic_CXX='-fPIC -shared' -- ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC*) @@ -42189,15 +27909,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - ;; - esac - ;; -- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -- case $cc_basename in -- CC*) -- lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_pic_CXX='-KPIC' -- lt_prog_compiler_static_CXX='-Bstatic' -- ;; -- esac -- ;; - tandem*) - case $cc_basename in - NCC*) @@ -42208,87 +27919,38 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - ;; - esac - ;; +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- case $cc_basename in +- CC*) +- lt_prog_compiler_wl_CXX='-Wl,' +- lt_prog_compiler_pic_CXX='-KPIC' +- lt_prog_compiler_static_CXX='-Bstatic' +- ;; +- esac +- ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; -+ aix4 | aix4.[01] | aix4.[01].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; - esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so -+ # instead of lib<name>.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH - fi -+ ;; - --case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -- *djgpp*) -- lt_prog_compiler_pic_CXX= -- ;; -- *) -- lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" -- ;; --esac +- esac +- fi +- -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; - -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; - -+bsdi[45]*) -+ version_type=linux -+ 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' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; - +- -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then -- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +- +-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic_works_CXX=no -- ac_outfile=conftest.$ac_objext +- ac_outfile=conftest.$ac_objext - 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 @@ -42300,31 +27962,26 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - -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:14885: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:13670: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14889: \$? = $ac_status" >&5 +- echo "$as_me:13674: \$? = $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. -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works_CXX=yes - fi - fi -- $RM conftest* +- $rm conftest* - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no - +- -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; @@ -42334,71 +27991,18 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes - +- -fi -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ 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 ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ 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 -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; - -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; - -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic_CXX= +- ;; +- *) +- lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" +- ;; +-esac +- -# -# Check to make sure the static flag actually works. -# @@ -42418,7 +28022,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 -- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works_CXX=yes @@ -42427,155 +28031,32 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - lt_cv_prog_compiler_static_works_CXX=yes - fi - fi -- $RM -r conftest* +- $rm -r conftest* - LDFLAGS="$save_LDFLAGS" -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; - +- -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -+dgux*) -+ 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 -+ ;; - +- -if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then - : -else - lt_prog_compiler_static_CXX= -fi -+freebsd1*) -+ dynamic_linker=no -+ ;; - -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; - -+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 -+ hardcode_into_libs=yes -+ ;; - -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; - -- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +- +- +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o_CXX=no -- $RM -r conftest 2>/dev/null +- $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+interix[3-9]*) -+ 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' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; - +- - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. @@ -42585,175 +28066,43 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - -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:14984: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:13774: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14988: \$? = $ac_status" >&5 +- echo "$as_me:13778: \$? = $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 - # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . 2>&5 -- $RM conftest* +- $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation -- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -- $RM out/* && rmdir out +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out - cd .. -- $RM -r conftest -- $RM conftest* +- rmdir conftest +- $rm conftest* - -fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - - -- -- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_c_o_CXX=no -- $RM -r conftest 2>/dev/null -- mkdir conftest -- cd conftest -- mkdir out -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; - -- lt_compiler_flag="-o out/conftest2.$ac_objext" -- # Insert the option either (1) after the last *FLAGS variable, or -- # (2) before a word containing "conftest.", or (3) at the end. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- lt_compile=`echo "$ac_compile" | $SED \ -- -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:15036: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>out/conftest.err) -- ac_status=$? -- cat out/conftest.err >&5 -- echo "$as_me:15040: \$? = $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 -- # So say no if there are warnings -- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_c_o_CXX=yes -- fi -- fi -- chmod u+w . 2>&5 -- $RM conftest* -- # SGI C++ compiler will create directory out/ii_files/ for -- # template instantiation -- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -- $RM out/* && rmdir out -- cd .. -- $RM -r conftest -- $RM conftest* -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; - --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 --$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -+# This must be Linux ELF. -+linux* | k*bsd*-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' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes - -+ # 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>/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 -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; - -+netbsdelf*-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='NetBSD ld.elf_so' -+ ;; - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes -- $RM conftest* +- $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no @@ -42764,137 +28113,41 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' - fi +- fi -else - need_locks=no -fi - -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; - -- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -+nto-qnx*) -+ 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=yes -+ ;; - +- - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in +- case $host_os in - aix[4-9]*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else -- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' +- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; -- cygwin* | mingw* | cegcc*) -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' +- cygwin* | mingw*) +- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; - esac +- esac - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } -test "$ld_shlibs_CXX" = no && can_build_shared=no - --with_gnu_ld_CXX=$with_gnu_ld -- -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; - -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; - -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; - -+rdos*) -+ dynamic_linker=no -+ ;; - -+solaris*) -+ 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=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; - -# -# Do we need to explicitly link libc? -# @@ -42902,18 +28155,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; - +- - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) @@ -42925,7 +28167,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -- $RM conftest* +- $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -42946,8 +28188,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= -- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 -- (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 +- (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } @@ -42960,399 +28202,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - else - cat conftest.err 1>&5 - fi -- $RM conftest* +- $rm conftest* - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -$as_echo "$archive_cmds_need_lc_CXX" >&6; } -+sysv4 | sysv4.3*) -+ version_type=linux -+ 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 -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' - ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; - esac - fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+uts4*) -+ version_type=linux -+ 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 -+ ;; -+ -+*) -+ dynamic_linker=no - ;; - esac -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } -+test "$dynamic_linker" = no && can_build_shared=no - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi - -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi - -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi - -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action_F77= -+if test -n "$hardcode_libdir_flag_spec_F77" || \ -+ test -n "$runpath_var_F77" || \ -+ test "X$hardcode_automatic_F77" = "Xyes" ; then - -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct_F77" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && -+ test "$hardcode_minus_L_F77" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action_F77=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_F77=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_F77=unsupported -+fi -+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -+echo "${ECHO_T}$hardcode_action_F77" >&6; } - -+if test "$hardcode_action_F77" = relink; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi - - -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # 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 -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_F77 \ -+ CC_F77 \ -+ LD_F77 \ -+ lt_prog_compiler_wl_F77 \ -+ lt_prog_compiler_pic_F77 \ -+ lt_prog_compiler_static_F77 \ -+ lt_prog_compiler_no_builtin_flag_F77 \ -+ export_dynamic_flag_spec_F77 \ -+ thread_safe_flag_spec_F77 \ -+ whole_archive_flag_spec_F77 \ -+ enable_shared_with_static_runtimes_F77 \ -+ old_archive_cmds_F77 \ -+ old_archive_from_new_cmds_F77 \ -+ predep_objects_F77 \ -+ postdep_objects_F77 \ -+ predeps_F77 \ -+ postdeps_F77 \ -+ compiler_lib_search_path_F77 \ -+ compiler_lib_search_dirs_F77 \ -+ archive_cmds_F77 \ -+ archive_expsym_cmds_F77 \ -+ postinstall_cmds_F77 \ -+ postuninstall_cmds_F77 \ -+ old_archive_from_expsyms_cmds_F77 \ -+ allow_undefined_flag_F77 \ -+ no_undefined_flag_F77 \ -+ export_symbols_cmds_F77 \ -+ hardcode_libdir_flag_spec_F77 \ -+ hardcode_libdir_flag_spec_ld_F77 \ -+ hardcode_libdir_separator_F77 \ -+ hardcode_automatic_F77 \ -+ 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 -+ -+ case $var in -+ old_archive_cmds_F77 | \ -+ old_archive_from_new_cmds_F77 | \ -+ archive_cmds_F77 | \ -+ archive_expsym_cmds_F77 | \ -+ module_cmds_F77 | \ -+ module_expsym_cmds_F77 | \ -+ old_archive_from_expsyms_cmds_F77 | \ -+ export_symbols_cmds_F77 | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done - -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac - -+cfgfile="$ofile" - -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL - -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared - -+# Whether or not to build static libraries. -+build_old_libs=$enable_static - -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_F77 - -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 - -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install - -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os - -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - -+# An echo program that does not interpret backslashes. -+echo=$lt_echo - -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS - -+# A C compiler. -+LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS - -+# A language-specific compiler. -+CC=$lt_compiler_F77 - -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_F77 - -+# An ERE matcher. -+EGREP=$lt_EGREP - -+# The linker used to build libraries. -+LD=$lt_LD_F77 - -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S - -+# A BSD-compatible nm program. -+NM=$lt_NM - -+# A symbol stripping program -+STRIP=$lt_STRIP - -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD - -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" - -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" - -+# Used on cygwin: assembler. -+AS="$AS" - -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir - -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_F77 - -+# Object file suffix (normally "o"). -+objext="$ac_objext" - -+# Old archive suffix (normally "a"). -+libext="$libext" - -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' - -+# Executable file suffix (normally ""). -+exeext="$exeext" - -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_F77 -+pic_mode=$pic_mode - -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 - -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks - -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix - -+# Do we need a version for libraries? -+need_version=$need_version - -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen - -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self - -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static - -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_F77 - -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 - -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 - -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 - -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 - -+# Library versioning type. -+version_type=$version_type - -+# Format of library name prefix. -+libname_spec=$lt_libname_spec - -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec - -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec - -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_F77 -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds - -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 - -- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +- ;; +- esac +- fi +- ;; +-esac +- +-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 - -library_names_spec= -libname_spec='lib$name' -soname_spec= @@ -43366,53 +28226,24 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" +- -need_lib_prefix=unknown -hardcode_into_libs=no -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_F77 -+archive_expsym_cmds=$lt_archive_expsym_cmds_F77 -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds - +- -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_F77 -+module_expsym_cmds=$lt_module_expsym_cmds_F77 - +- -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib - +- - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_F77 -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_F77 -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_F77 -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_F77 -+ -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 - +- -aix[4-9]*) - version_type=linux - need_lib_prefix=no @@ -43432,7 +28263,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' -- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no @@ -43456,35 +28287,19 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - shlibpath_var=LIBPATH - fi - ;; -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_F77 - +- -amigaos*) -- case $host_cpu in -- powerpc) -- # Since July 2007 AmigaOS4 officially supports .so libraries. -- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- ;; -- m68k) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -- ;; -- esac +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method - +- -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd - +- -bsdi[45]*) - version_type=linux - need_version=no @@ -43498,57 +28313,48 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs - ;; -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_F77 - --cygwin* | mingw* | pw32* | cegcc*) +- +-cygwin* | mingw* | pw32*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_F77 - +- - case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) +- yes,cygwin* | yes,mingw* | yes,pw32*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ -- chmod a+x \$dldir/$dlname~ -- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -- fi' +- chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ -- $RM \$dlpath' +- $rm \$dlpath' - shlibpath_overrides_runpath=yes -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds - +- - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; -- mingw* | cegcc*) +- mingw*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- 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 ';[c-zC-Z]:/' >/dev/null; 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 ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` +- 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"` +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) @@ -43557,9 +28363,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - ;; - esac - ;; -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval - +- - *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - ;; @@ -43568,27 +28372,21 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - +- -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - +- - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - +- -dgux*) - version_type=linux - need_lib_prefix=no @@ -43597,15 +28395,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var - +- -freebsd1*) - dynamic_linker=no - ;; -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var - +- -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. @@ -43649,9 +28443,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - ;; - esac - ;; -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath - +- -gnu*) - version_type=linux - need_lib_prefix=no @@ -43661,9 +28453,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_F77 - +- -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. @@ -43686,18 +28476,18 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; -- hppa*64*) -- shrext_cmds='.sl' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- *) +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH @@ -43709,9 +28499,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs - +- -interix[3-9]*) - version_type=linux - need_lib_prefix=no @@ -43723,10 +28511,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 - +- -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; @@ -43763,38 +28548,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct_F77 -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L_F77 -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_F77 - +- -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" - +- -# This must be Linux ELF. -linux* | k*bsd*-gnu) - version_type=linux @@ -43805,93 +28564,19 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -- # Some binutils ld are patched to set DT_RUNPATH -- save_LDFLAGS=$LDFLAGS -- save_libdir=$libdir -- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ -- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_F77 - --int --main () --{ -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then -- shlibpath_overrides_runpath=yes --fi -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path - -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols_F77 - --fi -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_F77 - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- LDFLAGS=$save_LDFLAGS -- libdir=$save_libdir -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds - - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_F77 - +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" +- - # 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>/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" +- 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="$sys_lib_dlsearch_path_spec $lt_ld_extra" - fi -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_F77 - +- - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, @@ -43900,13 +28585,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; -+# ### END LIBTOOL TAG CONFIG: $tagname - +- -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no -- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' @@ -43914,78 +28598,55 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' -+__EOF__ -+ -+ -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" - fi +- fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -+fi - +- -newsos6) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - --*nto* | *qnx*) -- version_type=qnx +- +-nto-qnx*) +- 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='ldqnx.so' +- shlibpath_overrides_runpath=yes - ;; -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - +- -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes -+CC="$lt_save_CC" -+ -+ else -+ tagname="" -+ fi - ;; +- ;; - esac - else - shlibpath_overrides_runpath=yes - fi - ;; - +- -os2*) - libname_spec='$name' - shrext_cmds=".dll" @@ -43994,9 +28655,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; -+ GCJ) -+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - +- -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no @@ -44007,7 +28666,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - +- -rdos*) - dynamic_linker=no - ;; @@ -44046,6 +28705,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) @@ -44076,12 +28736,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" @@ -44091,17 +28752,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - --tpf*) -- # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -- 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}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- -uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -44117,226 +28767,43 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -$as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no - +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +-fi +- +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" +-fi +- +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +- -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi - --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" --fi --if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" --fi -+# Source file extension for Java test sources. -+ac_ext=java - -+# Object file extension for compiled Java test sources. -+objext=o -+objext_GCJ=$objext - -+# Code to be used in simple compile tests -+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) {}; }' - -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. - -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -+# Allow CC to be a program name with arguments. -+compiler=$CC - - -+# save warnings/boilerplate of simple test code -+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* - -+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 -r conftest* - - -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${GCJ-"gcj"} -+compiler=$CC -+compiler_GCJ=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+archive_cmds_need_lc_GCJ=no - -+old_archive_cmds_GCJ=$old_archive_cmds - - -+lt_prog_compiler_no_builtin_flag_GCJ= - -+if test "$GCC" = yes; then -+ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - - -+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_rtti_exceptions=no -+ ac_outfile=conftest.$ac_objext -+ 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. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:17610: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:17614: \$? = $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. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_rtti_exceptions=yes -+ fi -+ fi -+ $rm conftest* - -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } - -+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -+ lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -+else -+ : -+fi - -+fi - -+lt_prog_compiler_wl_GCJ= -+lt_prog_compiler_pic_GCJ= -+lt_prog_compiler_static_GCJ= - -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - -+ if test "$GCC" = yes; then -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_static_GCJ='-static' - -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ fi -+ ;; - -+ amigaos*) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' -+ ;; - -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; - -+ 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 - -+ ;; - -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic_GCJ='-fno-common' -+ ;; - -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; - -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared_GCJ=no -+ enable_shared=no -+ ;; - -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic_GCJ=-Kconform_pic -+ fi -+ ;; - -- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action_CXX= --if test -n "$hardcode_libdir_flag_spec_CXX" || -- test -n "$runpath_var_CXX" || +-if test -n "$hardcode_libdir_flag_spec_CXX" || \ +- test -n "$runpath_var_CXX" || \ - test "X$hardcode_automatic_CXX" = "Xyes" ; then -+ hpux*) -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_GCJ='-fPIC' -+ ;; -+ esac -+ ;; - -- # We can hardcode non-existent directories. +- +- # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink -+ *) -+ lt_prog_compiler_pic_GCJ='-fPIC' -+ ;; -+ esac - else +- else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi @@ -44347,30 +28814,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ else -+ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_GCJ='-qnocommon' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ esac -+ ;; - --if test "$hardcode_action_CXX" = relink || -- test "$inherit_rpath_CXX" = yes; then +- +-if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || @@ -44378,269 +28823,782 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - # Fast installation is not necessary - enable_fast_install=needless -fi -+ 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). - -+ ;; - -+ hpux9* | hpux10* | hpux11*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_GCJ='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' -+ ;; - -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; - -+ newsos6) -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; - -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ icc* | ecc*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-fpic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # 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 -+ ;; - -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; - -- fi # test -n "$compiler" -+ rdos*) -+ lt_prog_compiler_static_GCJ='-non_shared' -+ ;; - -- CC=$lt_save_CC -- LDCXX=$LD -- LD=$lt_save_LD -- GCC=$lt_save_GCC -- with_gnu_ld=$lt_save_with_gnu_ld -- lt_cv_path_LDCXX=$lt_cv_path_LD -- lt_cv_path_LD=$lt_save_path_LD -- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld --fi # test "$_lt_caught_CXX_error" != yes -+ solaris*) -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_GCJ='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_GCJ='-Wl,';; -+ esac -+ ;; - +- +- +-# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # 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 +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- compiler_CXX \ +- CC_CXX \ +- LD_CXX \ +- lt_prog_compiler_wl_CXX \ +- lt_prog_compiler_pic_CXX \ +- lt_prog_compiler_static_CXX \ +- lt_prog_compiler_no_builtin_flag_CXX \ +- export_dynamic_flag_spec_CXX \ +- thread_safe_flag_spec_CXX \ +- whole_archive_flag_spec_CXX \ +- enable_shared_with_static_runtimes_CXX \ +- old_archive_cmds_CXX \ +- old_archive_from_new_cmds_CXX \ +- predep_objects_CXX \ +- postdep_objects_CXX \ +- predeps_CXX \ +- postdeps_CXX \ +- compiler_lib_search_path_CXX \ +- compiler_lib_search_dirs_CXX \ +- archive_cmds_CXX \ +- archive_expsym_cmds_CXX \ +- postinstall_cmds_CXX \ +- postuninstall_cmds_CXX \ +- old_archive_from_expsyms_cmds_CXX \ +- allow_undefined_flag_CXX \ +- no_undefined_flag_CXX \ +- export_symbols_cmds_CXX \ +- hardcode_libdir_flag_spec_CXX \ +- hardcode_libdir_flag_spec_ld_CXX \ +- hardcode_libdir_separator_CXX \ +- hardcode_automatic_CXX \ +- 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 +- +- case $var in +- old_archive_cmds_CXX | \ +- old_archive_from_new_cmds_CXX | \ +- archive_cmds_CXX | \ +- archive_expsym_cmds_CXX | \ +- module_cmds_CXX | \ +- module_expsym_cmds_CXX | \ +- old_archive_from_expsyms_cmds_CXX | \ +- export_symbols_cmds_CXX | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done +- +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` +- ;; +- esac +- +-cfgfile="$ofile" +- +- cat <<__EOF__ >> "$cfgfile" +-# ### BEGIN LIBTOOL TAG CONFIG: $tagname +- +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_CXX +- +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os +- +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os +- +-# An echo program that does not interpret backslashes. +-echo=$lt_echo +- +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS +- +-# A C compiler. +-LTCC=$lt_LTCC +- +-# LTCC compiler flags. +-LTCFLAGS=$lt_LTCFLAGS +- +-# A language-specific compiler. +-CC=$lt_compiler_CXX +- +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC_CXX +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# The linker used to build libraries. +-LD=$lt_LD_CXX +- +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S +- +-# A BSD-compatible nm program. +-NM=$lt_NM +- +-# A symbol stripping program +-STRIP=$lt_STRIP +- +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD +- +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" +- +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" +- +-# Used on cygwin: assembler. +-AS="$AS" +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_CXX +- +-# Object file suffix (normally "o"). +-objext="$ac_objext" +- +-# Old archive suffix (normally "a"). +-libext="$libext" +- +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' +- +-# Executable file suffix (normally ""). +-exeext="$exeext" +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_CXX +-pic_mode=$pic_mode +- +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX +- +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks +- +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_CXX +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX +- +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX +- +-# Library versioning type. +-version_type=$version_type +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds_CXX +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX +- +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds_CXX +-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds_CXX +-module_expsym_cmds=$lt_module_expsym_cmds_CXX +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects_CXX +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects_CXX +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps_CXX +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps_CXX +- +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_CXX +- +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_CXX +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var +- +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_CXX +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX +- +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct_CXX +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L_CXX +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic_CXX +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_CXX +- +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path +- +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols_CXX +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_CXX +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_CXX +- +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_CXX +- +-# ### END LIBTOOL TAG CONFIG: $tagname +- +-__EOF__ +- +- +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi +- +- -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ sunos4*) -+ lt_prog_compiler_wl_GCJ='-Qoption ld ' -+ lt_prog_compiler_pic_GCJ='-PIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; - -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; - -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ lt_prog_compiler_pic_GCJ='-Kconform_pic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ fi -+ ;; - -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; - -+ unicos*) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_can_build_shared_GCJ=no -+ ;; - -+ uts4*) -+ lt_prog_compiler_pic_GCJ='-pic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; - -+ *) -+ lt_prog_compiler_can_build_shared_GCJ=no -+ ;; -+ esac -+ fi - -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } - -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic_GCJ"; then - -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_prog_compiler_pic_works_GCJ=no -+ ac_outfile=conftest.$ac_objext -+ 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. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:17900: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:17904: \$? = $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. -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_pic_works_GCJ=yes -+ fi -+ fi -+ $rm conftest* - -+fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } - -+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then -+ case $lt_prog_compiler_pic_GCJ in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; -+ esac -+else -+ lt_prog_compiler_pic_GCJ= -+ lt_prog_compiler_can_build_shared_GCJ=no -+fi - -+fi -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic_GCJ= -+ ;; -+ *) -+ lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" -+ ;; -+esac - -- ac_config_commands="$ac_config_commands libtool" +- +-CC=$lt_save_CC +-LDCXX=$LD +-LD=$lt_save_LD +-GCC=$lt_save_GCC +-with_gnu_ldcxx=$with_gnu_ld +-with_gnu_ld=$lt_save_with_gnu_ld +-lt_cv_path_LDCXX=$lt_cv_path_LD +-lt_cv_path_LD=$lt_save_path_LD +-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +- +- else +- tagname="" +- fi +- ;; +- +- F77) +- if test -n "$F77" && test "X$F77" != "Xno"; then +- +-ac_ext=f +-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_f77_compiler_gnu - - +-archive_cmds_need_lc_F77=no +-allow_undefined_flag_F77= +-always_export_symbols_F77=no +-archive_expsym_cmds_F77= +-export_dynamic_flag_spec_F77= +-hardcode_direct_F77=no +-hardcode_libdir_flag_spec_F77= +-hardcode_libdir_flag_spec_ld_F77= +-hardcode_libdir_separator_F77= +-hardcode_minus_L_F77=no +-hardcode_automatic_F77=no +-module_cmds_F77= +-module_expsym_cmds_F77= +-link_all_deplibs_F77=unknown +-old_archive_cmds_F77=$old_archive_cmds +-no_undefined_flag_F77= +-whole_archive_flag_spec_F77= +-enable_shared_with_static_runtimes_F77=no +- +-# Source file extension for f77 test sources. +-ac_ext=f +- +-# Object file extension for compiled f77 test sources. +-objext=o +-objext_F77=$objext +- +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="\ +- subroutine t +- return +- end +-" +- +-# Code to be used in simple link tests +-lt_simple_link_test_code="\ +- program t +- end +-" +- +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. +- +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} +- +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} +- +-# Allow CC to be a program name with arguments. +-compiler=$CC - - --# Only expand once: +-# save warnings/boilerplate of simple test code +-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* +- +-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 -r conftest* - - --: ${CONFIG_LT=./config.lt} --{ $as_echo "$as_me:$LINENO: creating $CONFIG_LT" >&5 --$as_echo "$as_me: creating $CONFIG_LT" >&6;} --cat >"$CONFIG_LT" <<_LTEOF --#! $SHELL --# Generated by $as_me. --# Run this file to recreate a libtool stub with the current configuration. +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${F77-"f77"} +-compiler=$CC +-compiler_F77=$CC +-for cc_temp in $compiler""; do +- case $cc_temp in +- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; +- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - --lt_cl_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_LTEOF - --cat >>"$CONFIG_LT" <<\_LTEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## +-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-$as_echo_n "checking if libtool supports shared libraries... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-$as_echo "$can_build_shared" >&6; } - --# 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=: -- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -- # is contrary to our usage. Disable this feature. -- alias -g '${1+"$@"}'='"$@"' -- setopt NO_GLOB_SUBST +-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-$as_echo_n "checking whether to build shared libraries... " >&6; } +-test "$can_build_shared" = "no" && enable_shared=no +- +-# On AIX, shared libraries and static libraries use the same namespace, and +-# are all built from PIC. +-case $host_os in +-aix3*) +- test "$enable_shared" = yes && enable_static=no +- if test -n "$RANLIB"; then +- archive_cmds="$archive_cmds~\$RANLIB \$lib" +- postinstall_cmds='$RANLIB $lib' +- fi +- ;; +-aix[4-9]*) +- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then +- test "$enable_shared" = yes && enable_static=no +- fi +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 +-$as_echo "$enable_shared" >&6; } +- +-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-$as_echo_n "checking whether to build static libraries... " >&6; } +-# Make sure either enable_shared or enable_static is yes. +-test "$enable_shared" = yes || enable_static=yes +-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 +-$as_echo "$enable_static" >&6; } +- +-GCC_F77="$G77" +-LD_F77="$LD" +- +-lt_prog_compiler_wl_F77= +-lt_prog_compiler_pic_F77= +-lt_prog_compiler_static_F77= +- +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +- +- if test "$GCC" = yes; then +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_static_F77='-static' +- +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_F77='-Bstatic' +- fi +- ;; +- +- amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' +- ;; +- +- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; +- +- 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' +- ;; +- +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- lt_prog_compiler_pic_F77='-fno-common' +- ;; + +- interix[3-9]*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. +- ;; +- +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- lt_prog_compiler_can_build_shared_F77=no +- enable_shared=no +- ;; +- +- sysv4*MP*) +- if test -d /usr/nec; then +- lt_prog_compiler_pic_F77=-Kconform_pic +- fi +- ;; +- +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic_F77='-fPIC' +- ;; +- esac +- ;; +- +- *) +- lt_prog_compiler_pic_F77='-fPIC' +- ;; +- esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- lt_prog_compiler_wl_F77='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_F77='-Bstatic' +- else +- lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- lt_prog_compiler_pic_F77='-qnocommon' +- lt_prog_compiler_wl_F77='-Wl,' +- ;; +- esac +- ;; +- +- 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' +- ;; +- +- hpux9* | hpux10* | hpux11*) +- lt_prog_compiler_wl_F77='-Wl,' +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic_F77='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- lt_prog_compiler_static_F77='${wl}-a ${wl}archive' +- ;; +- +- irix5* | irix6* | nonstopux*) +- lt_prog_compiler_wl_F77='-Wl,' +- # PIC (with -KPIC) is the default. +- lt_prog_compiler_static_F77='-non_shared' +- ;; +- +- newsos6) +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; +- +- linux* | k*bsd*-gnu) +- case $cc_basename in +- icc* | ecc*) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-static' +- ;; +- pgcc* | pgf77* | pgf90* | pgf95*) +- # Portland Group compilers (*not* the Pentium gcc compiler, +- # which looks to be a dead project) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_pic_F77='-fpic' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; +- ccc*) +- lt_prog_compiler_wl_F77='-Wl,' +- # 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 +- ;; +- +- osf3* | osf4* | osf5*) +- lt_prog_compiler_wl_F77='-Wl,' +- # All OSF/1 code is PIC. +- 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' +- case $cc_basename in +- f77* | f90* | f95*) +- lt_prog_compiler_wl_F77='-Qoption ld ';; +- *) +- lt_prog_compiler_wl_F77='-Wl,';; +- esac +- ;; + +- sunos4*) +- lt_prog_compiler_wl_F77='-Qoption ld ' +- lt_prog_compiler_pic_F77='-PIC' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; +# +# Check to make sure the static flag actually works. +# -+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- case `(set -o) 2>/dev/null` in -- *posix*) set -o posix ;; --esac -+ lt_cv_prog_compiler_static_works_GCJ=no ++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" ++{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext @@ -44650,48 +29608,6631 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 -+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_static_works_GCJ=yes ++ lt_cv_prog_compiler_static_works=yes + fi + else -+ lt_cv_prog_compiler_static_works_GCJ=yes ++ lt_cv_prog_compiler_static_works=yes + fi + fi -+ $rm -r conftest* ++ $RM -r conftest* + LDFLAGS="$save_LDFLAGS" - fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } +- sysv4 | sysv4.2uw2* | sysv4.3*) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++$as_echo "$lt_cv_prog_compiler_static_works" >&6; } -+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then +- sysv4*MP*) +- if test -d /usr/nec ;then +- lt_prog_compiler_pic_F77='-Kconform_pic' +- lt_prog_compiler_static_F77='-Bstatic' +- fi +- ;; ++if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : +else -+ lt_prog_compiler_static_GCJ= ++ lt_prog_compiler_static= ++fi + +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_pic_F77='-KPIC' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; + +- unicos*) +- lt_prog_compiler_wl_F77='-Wl,' +- lt_prog_compiler_can_build_shared_F77=no +- ;; + +- uts4*) +- lt_prog_compiler_pic_F77='-pic' +- lt_prog_compiler_static_F77='-Bstatic' +- ;; + +- *) +- lt_prog_compiler_can_build_shared_F77=no +- ;; +- esac +- fi + +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +-$as_echo "$lt_prog_compiler_pic_F77" >&6; } + +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$lt_prog_compiler_pic_F77"; then + +-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then ++ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- lt_cv_prog_compiler_pic_works_F77=no +- ac_outfile=conftest.$ac_objext ++ lt_cv_prog_compiler_c_o=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext +- lt_compiler_flag="$lt_prog_compiler_pic_F77" ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:15359: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>conftest.err) ++ (eval echo "\"\$as_me:10004: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:15363: \$? = $ac_status" >&5 +- if (exit $ac_status) && test -s "$ac_outfile"; then ++ cat out/conftest.err >&5 ++ echo "$as_me:10008: \$? = $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 +- # So say no if there are warnings other than the usual output. +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_pic_works_F77=yes ++ # So say no if there are warnings ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o=yes + fi + fi +- $rm conftest* +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } ++ chmod u+w . 2>&5 ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* + +-if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then +- case $lt_prog_compiler_pic_F77 in +- "" | " "*) ;; +- *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; +- esac +-else +- lt_prog_compiler_pic_F77= +- lt_prog_compiler_can_build_shared_F77=no + fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + +-fi +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic_F77= +- ;; +- *) +- lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" +- ;; +-esac + +-# +-# Check to make sure the static flag actually works. +-# +-wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_static_works_F77=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- 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 +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&5 +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_static_works_F77=yes +- fi +- else +- lt_cv_prog_compiler_static_works_F77=yes +- fi +- fi +- $rm -r conftest* +- LDFLAGS="$save_LDFLAGS" + +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } + +-if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then +- : +-else +- lt_prog_compiler_static_F77= +-fi + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 + $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- lt_cv_prog_compiler_c_o_F77=no +- $rm -r conftest 2>/dev/null ++ lt_cv_prog_compiler_c_o=no ++ $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out +@@ -15460,43 +10056,45 @@ + -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:15463: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10059: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15467: \$? = $ac_status" >&5 ++ echo "$as_me:10063: \$? = $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 + # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_c_o_F77=yes ++ lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 +- $rm conftest* ++ $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out + cd .. +- rmdir conftest +- $rm conftest* ++ $RM -r conftest ++ $RM conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o" >&6; } ++ ++ + + + hard_links="nottested" +-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then ++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 + $as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes +- $rm conftest* ++ $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no +@@ -15512,39 +10110,47 @@ + need_locks=no + fi + +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= +- allow_undefined_flag_F77= +- enable_shared_with_static_runtimes_F77=no +- archive_cmds_F77= +- archive_expsym_cmds_F77= +- old_archive_From_new_cmds_F77= +- old_archive_from_expsyms_cmds_F77= +- export_dynamic_flag_spec_F77= +- whole_archive_flag_spec_F77= +- thread_safe_flag_spec_F77= +- hardcode_libdir_flag_spec_F77= +- hardcode_libdir_flag_spec_ld_F77= +- hardcode_libdir_separator_F77= +- hardcode_direct_F77=no +- hardcode_minus_L_F77=no +- hardcode_shlibpath_var_F77=unsupported +- link_all_deplibs_F77=unknown +- hardcode_automatic_F77=no +- module_cmds_F77= +- module_expsym_cmds_F77= +- always_export_symbols_F77=no +- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ allow_undefined_flag= ++ always_export_symbols=no ++ archive_cmds= ++ archive_expsym_cmds= ++ compiler_needs_object=no ++ enable_shared_with_static_runtimes=no ++ export_dynamic_flag_spec= ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ hardcode_automatic=no ++ hardcode_direct=no ++ hardcode_direct_absolute=no ++ hardcode_libdir_flag_spec= ++ hardcode_libdir_flag_spec_ld= ++ hardcode_libdir_separator= ++ hardcode_minus_L=no ++ hardcode_shlibpath_var=unsupported ++ inherit_rpath=no ++ link_all_deplibs=unknown ++ module_cmds= ++ module_expsym_cmds= ++ old_archive_from_new_cmds= ++ old_archive_from_expsyms_cmds= ++ thread_safe_flag_spec= ++ whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list +- include_expsyms_F77= ++ include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. +- exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot +@@ -15552,19 +10158,9 @@ + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= +- # Just being paranoid about ensuring that cc_basename is set. +- for cc_temp in $compiler""; do +- case $cc_temp in +- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; +- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + case $host_os in +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -15581,7 +10177,7 @@ + ;; + esac + +- ld_shlibs_F77=yes ++ ld_shlibs=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' +@@ -15590,16 +10186,16 @@ + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' +- export_dynamic_flag_spec_F77='${wl}--export-dynamic' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec_F77= ++ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec= + fi + supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in ++ case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -15612,8 +10208,8 @@ + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then +- ld_shlibs_F77=no +- cat <<EOF 1>&2 ++ ld_shlibs=no ++ cat <<_LT_EOF 1>&2 + + *** Warning: the GNU linker, at least up to release 2.9.1, is reported + *** to be unable to reliably create shared libraries on AIX. +@@ -15621,49 +10217,50 @@ + *** really care for shared libraries, you may want to modify your PATH + *** so that a non-GNU linker is found, and then restart. + +-EOF ++_LT_EOF + fi + ;; + + amigaos*) +- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_minus_L_F77=yes +- +- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- ld_shlibs_F77=no ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='' ++ ;; ++ m68k) ++ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ ;; ++ esac + ;; + + beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- allow_undefined_flag_F77=unsupported ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag=unsupported + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else +- ld_shlibs_F77=no ++ ld_shlibs=no + fi + ;; + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. +- hardcode_libdir_flag_spec_F77='-L$libdir' +- 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/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ hardcode_libdir_flag_spec='-L$libdir' ++ 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' + +- 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' ++ 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' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; +@@ -15671,79 +10268,109 @@ + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else +- ld_shlibs_F77=no ++ ld_shlibs=no + fi + ;; + + interix[3-9]*) +- hardcode_direct_F77=no +- hardcode_shlibpath_var_F77=no +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_F77='${wl}-E' ++ hardcode_direct=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- 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' ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ 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' + ;; + +- gnu* | linux* | k*bsd*-gnu) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then ++ gnu* | linux* | tpf* | k*bsd*-gnu) ++ tmp_diet=no ++ if test "$host_os" = linux-dietlibc; then ++ case $cc_basename in ++ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) ++ esac ++ fi ++ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ ++ && test "$tmp_diet" = no ++ then + tmp_addflag= ++ tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in +- pgcc*) # Portland Group C compiler +- whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ pgcc*) # Portland Group C compiler ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; ++ lf95*) # Lahey Fortran 8.1 ++ whole_archive_flag_spec= ++ tmp_sharedflag='--shared' ;; ++ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++ tmp_sharedflag='-qmkshrobj' ++ tmp_addflag= ;; + esac + 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' ++ 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' ++ compiler_needs_object=yes + 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' ++ 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_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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi ++ if test "x$supports_anon_versioning" = xyes; 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ++ case $cc_basename in ++ xlf*) ++ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself ++ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' ++ hardcode_libdir_flag_spec= ++ hardcode_libdir_flag_spec_ld='-rpath $libdir' ++ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; 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~ ++ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ esac + else +- ld_shlibs_F77=no ++ ld_shlibs=no + fi + ;; + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ netbsd* | netbsdelf*-gnu) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- ld_shlibs_F77=no +- cat <<EOF 1>&2 ++ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ++ ld_shlibs=no ++ cat <<_LT_EOF 1>&2 + + *** Warning: The releases 2.8.* of the GNU linker cannot reliably + *** create shared libraries on Solaris systems. Therefore, libtool +@@ -15752,19 +10379,19 @@ + *** your PATH or compiler configuration so that the native linker is + *** used, and then restart. + +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++_LT_EOF ++ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else +- ld_shlibs_F77=no ++ ld_shlibs=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) +- ld_shlibs_F77=no ++ ld_shlibs=no + cat <<_LT_EOF 1>&2 + + *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +@@ -15777,54 +10404,58 @@ + _LT_EOF + ;; + *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' +- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else +- ld_shlibs_F77=no ++ ld_shlibs=no + fi + ;; + esac + ;; + + sunos4*) +- archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no + ;; + + *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else +- ld_shlibs_F77=no ++ ld_shlibs=no + fi + ;; + esac + +- if test "$ld_shlibs_F77" = no; then ++ if test "$ld_shlibs" = no; then + runpath_var= +- hardcode_libdir_flag_spec_F77= +- export_dynamic_flag_spec_F77= +- whole_archive_flag_spec_F77= ++ hardcode_libdir_flag_spec= ++ export_dynamic_flag_spec= ++ whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) +- allow_undefined_flag_F77=unsupported +- always_export_symbols_F77=yes +- archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. +- hardcode_minus_L_F77=yes ++ hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. +- hardcode_direct_F77=unsupported ++ hardcode_direct=unsupported + fi + ;; + +@@ -15838,10 +10469,10 @@ + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else +- export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' ++ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + +@@ -15850,10 +10481,10 @@ + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi + done + ;; + esac +@@ -15868,30 +10499,32 @@ + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + +- archive_cmds_F77='' +- hardcode_direct_F77=yes +- hardcode_libdir_separator_F77=':' +- link_all_deplibs_F77=yes ++ archive_cmds='' ++ hardcode_direct=yes ++ hardcode_direct_absolute=yes ++ hardcode_libdir_separator=':' ++ link_all_deplibs=yes ++ file_list_spec='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then +- # We have reworked collect2 +- : ++ # We have reworked collect2 ++ : + else +- # We have old collect2 +- hardcode_direct_F77=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- hardcode_minus_L_F77=yes +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_libdir_separator_F77= ++ # We have old collect2 ++ hardcode_direct=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L=yes ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_libdir_separator= + fi + ;; + esac +@@ -15899,11 +10532,12 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then +@@ -15914,18 +10548,30 @@ + fi + fi + ++ export_dynamic_flag_spec='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. +- always_export_symbols_F77=yes ++ always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. +- allow_undefined_flag_F77='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF +- program main ++ allow_undefined_flag='-berok' ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ + +- end ++ ; ++ return 0; ++} + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (ac_try="$ac_link" +@@ -15942,7 +10588,7 @@ + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { +- test -z "$ac_f77_werror_flag" || ++ test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || +@@ -15973,19 +10619,30 @@ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else ++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" ++ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else + if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' +- allow_undefined_flag_F77="-z nodefs" +- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag="-z nodefs" ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else +- # Determine the default libpath from the value encoded in an empty executable. ++ # Determine the default libpath from the value encoded in an ++ # empty executable. + cat >conftest.$ac_ext <<_ACEOF +- program main ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ + +- end ++ ; ++ return 0; ++} + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (ac_try="$ac_link" +@@ -16002,7 +10659,7 @@ + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { +- test -z "$ac_f77_werror_flag" || ++ test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || +@@ -16033,110 +10690,95 @@ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" ++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. +- no_undefined_flag_F77=' ${wl}-bernotok' +- allow_undefined_flag_F77=' ${wl}-berok' ++ no_undefined_flag=' ${wl}-bernotok' ++ allow_undefined_flag=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_F77='$convenience' +- archive_cmds_need_lc_F77=yes ++ whole_archive_flag_spec='$convenience' ++ archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. +- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) +- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_minus_L_F77=yes +- # see comment about different semantics on the GNU ld section +- ld_shlibs_F77=no ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='' ++ ;; ++ m68k) ++ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ ;; ++ esac + ;; + + bsdi[45]*) +- export_dynamic_flag_spec_F77=-rdynamic ++ export_dynamic_flag_spec=-rdynamic + ;; + +- cygwin* | mingw* | pw32*) ++ cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. +- hardcode_libdir_flag_spec_F77=' ' +- allow_undefined_flag_F77=unsupported ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. +- archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. +- old_archive_From_new_cmds_F77='true' ++ old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. +- old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' +- fix_srcfile_path_F77='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes_F77=yes ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ fix_srcfile_path='`cygpath -w "$srcfile"`' ++ enable_shared_with_static_runtimes=yes + ;; + + darwin* | rhapsody*) +- case $host_os in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- archive_cmds_need_lc_F77=no +- hardcode_direct_F77=no +- hardcode_automatic_F77=yes +- hardcode_shlibpath_var_F77=unsupported +- whole_archive_flag_spec_F77='' +- link_all_deplibs_F77=yes +- if test "$GCC" = yes ; then +- output_verbose_link_cmd='echo' +- archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- else +- 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` $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 $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}' +- ;; +- *) +- ld_shlibs_F77=no +- ;; +- esac +- fi ++ ++ ++ archive_cmds_need_lc=no ++ hardcode_direct=no ++ hardcode_automatic=yes ++ hardcode_shlibpath_var=unsupported ++ whole_archive_flag_spec='' ++ link_all_deplibs=yes ++ allow_undefined_flag="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=echo ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ ++ else ++ ld_shlibs=no ++ fi ++ + ;; + + dgux*) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_shlibpath_var_F77=no ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_shlibpath_var=no + ;; + + freebsd1*) +- ld_shlibs_F77=no ++ ld_shlibs=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +@@ -16144,60 +10786,60 @@ + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=yes +- hardcode_minus_L_F77=yes +- hardcode_shlibpath_var_F77=no ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes ++ hardcode_minus_L=yes ++ hardcode_shlibpath_var=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) +- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no ++ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no + ;; + + hpux9*) + if test "$GCC" = yes; then +- archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else +- archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- hardcode_direct_F77=yes ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. +- hardcode_minus_L_F77=yes +- export_dynamic_flag_spec_F77='${wl}-E' ++ hardcode_minus_L=yes ++ export_dynamic_flag_spec='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else +- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- +- hardcode_direct_F77=yes +- export_dynamic_flag_spec_F77='${wl}-E' +- ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_flag_spec_ld='+b $libdir' ++ hardcode_libdir_separator=: ++ hardcode_direct=yes ++ hardcode_direct_absolute=yes ++ export_dynamic_flag_spec='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. +- hardcode_minus_L_F77=yes ++ hardcode_minus_L=yes + fi + ;; + +@@ -16205,240 +10847,300 @@ + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) +- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) +- archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) +- archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) +- archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_F77=: ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_direct=no ++ hardcode_shlibpath_var=no ++ ;; ++ *) ++ hardcode_direct=yes ++ hardcode_direct_absolute=yes ++ export_dynamic_flag_spec='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ ;; ++ esac ++ fi ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ # Try to use the -exported_symbol ld option, if it does not ++ # work, assume that -exports_file does not work either and ++ # implicitly export all symbols. ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat >conftest.$ac_ext <<_ACEOF ++int foo(void) {} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$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 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- case $host_cpu in +- hppa*64*|ia64*) +- hardcode_libdir_flag_spec_ld_F77='+b $libdir' +- hardcode_direct_F77=no +- hardcode_shlibpath_var_F77=no +- ;; +- *) +- hardcode_direct_F77=yes +- export_dynamic_flag_spec_F77='${wl}-E' + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_F77=yes +- ;; +- esac +- fi +- ;; ++fi + +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++rm -rf conftest.dSYM ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" + else +- archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- link_all_deplibs_F77=yes ++ archive_cmds_need_lc='no' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ inherit_rpath=yes ++ link_all_deplibs=yes + ;; + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++ 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 +- archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_direct_F77=yes +- hardcode_shlibpath_var_F77=no ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no + ;; + + newsos6) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=yes +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_F77=: +- hardcode_shlibpath_var_F77=no ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ hardcode_shlibpath_var=no ++ ;; ++ ++ *nto* | *qnx*) + ;; + + openbsd*) + 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' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ hardcode_direct_absolute=yes ++ 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_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_F77='-R$libdir' ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-R$libdir' + ;; + *) +- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac +- fi ++ fi + else +- ld_shlibs_F77=no ++ ld_shlibs=no + fi + ;; + + os2*) +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_minus_L_F77=yes +- allow_undefined_flag_F77=unsupported +- archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ allow_undefined_flag=unsupported ++ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then +- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else +- allow_undefined_flag_F77=' -expect_unresolved \*' +- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' ++ allow_undefined_flag=' -expect_unresolved \*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + fi +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_F77=: ++ archive_cmds_need_lc='no' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then +- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' ++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else +- allow_undefined_flag_F77=' -expect_unresolved \*' +- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++ allow_undefined_flag=' -expect_unresolved \*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ ++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly +- hardcode_libdir_flag_spec_F77='-rpath $libdir' ++ hardcode_libdir_flag_spec='-rpath $libdir' + fi +- hardcode_libdir_separator_F77=: ++ archive_cmds_need_lc='no' ++ hardcode_libdir_separator=: + ;; + + solaris*) +- no_undefined_flag_F77=' -z text' ++ no_undefined_flag=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' +- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' ++ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else +- wlarc='' +- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' ++ case `$CC -V 2>&1` in ++ *"Compilers 5.0"*) ++ wlarc='' ++ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++ ;; ++ *) ++ wlarc='${wl}' ++ archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ ;; ++ esac + fi +- hardcode_libdir_flag_spec_F77='-R$libdir' +- hardcode_shlibpath_var_F77=no ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # 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?) ++ # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then +- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else +- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac +- link_all_deplibs_F77=yes ++ link_all_deplibs=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. +- archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else +- archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_direct_F77=yes +- hardcode_minus_L_F77=yes +- hardcode_shlibpath_var_F77=no ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_direct=yes ++ hardcode_minus_L=yes ++ hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=yes # is this really true??? ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. +- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- reload_cmds_F77='$CC -r -o $output$reload_objs' +- hardcode_direct_F77=no ++ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ reload_cmds='$CC -r -o $output$reload_objs' ++ hardcode_direct=no + ;; + motorola) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var_F77=no ++ hardcode_shlibpath_var=no + ;; + + sysv4.3*) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_F77=no +- export_dynamic_flag_spec_F77='-Bexport' ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var=no ++ export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_F77=no ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes +- ld_shlibs_F77=yes ++ ld_shlibs=yes + fi + ;; + + 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 ++ no_undefined_flag='${wl}-z,text' ++ archive_cmds_need_lc=no ++ hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then +- archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + +@@ -16449,51 +11151,75 @@ + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. +- no_undefined_flag_F77='${wl}-z,text' +- allow_undefined_flag_F77='${wl}-z,nodefs' +- archive_cmds_need_lc_F77=no +- hardcode_shlibpath_var_F77=no +- hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- hardcode_libdir_separator_F77=':' +- link_all_deplibs_F77=yes +- export_dynamic_flag_spec_F77='${wl}-Bexport' ++ no_undefined_flag='${wl}-z,text' ++ allow_undefined_flag='${wl}-z,nodefs' ++ archive_cmds_need_lc=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='${wl}-R,$libdir' ++ hardcode_libdir_separator=':' ++ link_all_deplibs=yes ++ export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then +- archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else +- archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) +- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_F77='-L$libdir' +- hardcode_shlibpath_var_F77=no ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_shlibpath_var=no + ;; + + *) +- ld_shlibs_F77=no ++ ld_shlibs=no + ;; + esac ++ ++ if test x$host_vendor = xsni; then ++ case $host in ++ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ ;; ++ esac ++ fi + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +-$as_echo "$ld_shlibs_F77" >&6; } +-test "$ld_shlibs_F77" = no && can_build_shared=no ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++$as_echo "$ld_shlibs" >&6; } ++test "$ld_shlibs" = no && can_build_shared=no ++ ++with_gnu_ld=$with_gnu_ld ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + # + # Do we need to explicitly link libc? + # +-case "x$archive_cmds_need_lc_F77" in ++case "x$archive_cmds_need_lc" in + x|xyes) + # Assume -lc should be added +- archive_cmds_need_lc_F77=yes ++ archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $archive_cmds_F77 in ++ case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; +@@ -16503,7 +11229,7 @@ + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +- $rm conftest* ++ $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -16515,40 +11241,248 @@ + lib=conftest + libobjs=conftest.$ac_objext + deplibs= +- wl=$lt_prog_compiler_wl_F77 +- pic_flag=$lt_prog_compiler_pic_F77 ++ wl=$lt_prog_compiler_wl ++ pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest +- lt_save_allow_undefined_flag=$allow_undefined_flag_F77 +- allow_undefined_flag_F77= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 +- (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ lt_save_allow_undefined_flag=$allow_undefined_flag ++ allow_undefined_flag= ++ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then +- archive_cmds_need_lc_F77=no ++ archive_cmds_need_lc=no + else +- archive_cmds_need_lc_F77=yes ++ archive_cmds_need_lc=yes + fi +- allow_undefined_flag_F77=$lt_save_allow_undefined_flag ++ allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi +- $rm conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +-$as_echo "$archive_cmds_need_lc_F77" >&6; } ++ $RM conftest* ++ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++$as_echo "$archive_cmds_need_lc" >&6; } + ;; + esac + fi + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } ++ ++if test "$GCC" = yes; 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. ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ 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 + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -16562,7 +11496,6 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" +- + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -16599,7 +11532,7 @@ + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no +@@ -16625,9 +11558,18 @@ + ;; + + amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac + ;; + + beos*) +@@ -16650,25 +11592,28 @@ + # libtool to hard-code these into programs + ;; + +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname' ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ +- $rm \$dlpath' ++ $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in +@@ -16677,20 +11622,20 @@ + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- mingw*) ++ mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- 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 ';[c-zC-Z]:/' >/dev/null; 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 ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ 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"` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) +@@ -16714,12 +11659,13 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +@@ -16812,18 +11758,18 @@ + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH +@@ -16900,17 +11846,73 @@ + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no ++ # Some binutils ld are patched to set DT_RUNPATH ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ ++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$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 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then ++ shlibpath_overrides_runpath=yes ++fi ++ ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -rf conftest.dSYM ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # 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>/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="$sys_lib_dlsearch_path_spec $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 +@@ -16922,11 +11924,23 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-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='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' +@@ -16947,14 +11961,16 @@ + shlibpath_overrides_runpath=yes + ;; + +-nto-qnx*) +- version_type=linux ++*nto* | *qnx*) ++ version_type=qnx + 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=yes ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' + ;; + + openbsd*) +@@ -16963,13 +11979,13 @@ + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no +@@ -17041,7 +12057,6 @@ + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) +@@ -17072,13 +12087,12 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +@@ -17088,6 +12102,17 @@ + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ 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}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ + uts4*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +@@ -17103,1437 +12128,1433 @@ + $as_echo "$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi + if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + fi + +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi + +-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +-hardcode_action_F77= +-if test -n "$hardcode_libdir_flag_spec_F77" || \ +- test -n "$runpath_var_F77" || \ +- test "X$hardcode_automatic_F77" = "Xyes" ; then + +- # We can hardcode non-existant directories. +- if test "$hardcode_direct_F77" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && +- test "$hardcode_minus_L_F77" != no; then +- # Linking always hardcodes the temporary library directory. +- hardcode_action_F77=relink +- else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- hardcode_action_F77=immediate +- fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- hardcode_action_F77=unsupported +-fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +-$as_echo "$hardcode_action_F77" >&6; } + +-if test "$hardcode_action_F77" = relink; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless +-fi + + +-# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # 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 +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- compiler_F77 \ +- CC_F77 \ +- LD_F77 \ +- lt_prog_compiler_wl_F77 \ +- lt_prog_compiler_pic_F77 \ +- lt_prog_compiler_static_F77 \ +- lt_prog_compiler_no_builtin_flag_F77 \ +- export_dynamic_flag_spec_F77 \ +- thread_safe_flag_spec_F77 \ +- whole_archive_flag_spec_F77 \ +- enable_shared_with_static_runtimes_F77 \ +- old_archive_cmds_F77 \ +- old_archive_from_new_cmds_F77 \ +- predep_objects_F77 \ +- postdep_objects_F77 \ +- predeps_F77 \ +- postdeps_F77 \ +- compiler_lib_search_path_F77 \ +- compiler_lib_search_dirs_F77 \ +- archive_cmds_F77 \ +- archive_expsym_cmds_F77 \ +- postinstall_cmds_F77 \ +- postuninstall_cmds_F77 \ +- old_archive_from_expsyms_cmds_F77 \ +- allow_undefined_flag_F77 \ +- no_undefined_flag_F77 \ +- export_symbols_cmds_F77 \ +- hardcode_libdir_flag_spec_F77 \ +- hardcode_libdir_flag_spec_ld_F77 \ +- hardcode_libdir_separator_F77 \ +- hardcode_automatic_F77 \ +- 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 +- +- case $var in +- old_archive_cmds_F77 | \ +- old_archive_from_new_cmds_F77 | \ +- archive_cmds_F77 | \ +- archive_expsym_cmds_F77 | \ +- module_cmds_F77 | \ +- module_expsym_cmds_F77 | \ +- old_archive_from_expsyms_cmds_F77 | \ +- export_symbols_cmds_F77 | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done + +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` +- ;; +- esac + +-cfgfile="$ofile" + +- cat <<__EOF__ >> "$cfgfile" +-# ### BEGIN LIBTOOL TAG CONFIG: $tagname + +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL + +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared + +-# Whether or not to build static libraries. +-build_old_libs=$enable_static + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_F77 + +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 + +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install + +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os + +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os + +-# An echo program that does not interpret backslashes. +-echo=$lt_echo + +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS + +-# A C compiler. +-LTCC=$lt_LTCC + +-# LTCC compiler flags. +-LTCFLAGS=$lt_LTCFLAGS + +-# A language-specific compiler. +-CC=$lt_compiler_F77 + +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC_F77 + +-# An ERE matcher. +-EGREP=$lt_EGREP + +-# The linker used to build libraries. +-LD=$lt_LD_F77 + +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S + +-# A BSD-compatible nm program. +-NM=$lt_NM + +-# A symbol stripping program +-STRIP=$lt_STRIP + +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD + +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" + +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" + +-# Used on cygwin: assembler. +-AS="$AS" + +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir + +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds + +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_F77 + +-# Object file suffix (normally "o"). +-objext="$ac_objext" + +-# Old archive suffix (normally "a"). +-libext="$libext" + +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' + +-# Executable file suffix (normally ""). +-exeext="$exeext" + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_F77 +-pic_mode=$pic_mode + +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len + +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 + +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks + +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix + +-# Do we need a version for libraries? +-need_version=$need_version + +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen + +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self + +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static + +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_F77 + +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 + +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 + +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 + +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 + +-# Library versioning type. +-version_type=$version_type + +-# Format of library name prefix. +-libname_spec=$lt_libname_spec + +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec + +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec + +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds_F77 +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds + +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 + +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 + +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds_F77 +-archive_expsym_cmds=$lt_archive_expsym_cmds_F77 +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds + +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds_F77 +-module_expsym_cmds=$lt_module_expsym_cmds_F77 + +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib + +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects_F77 +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects_F77 +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps_F77 +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps_F77 +- +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 + +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_F77 + +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method + +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd + +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_F77 + +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_F77 + +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds + +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval + +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var + +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var + +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_F77 + +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs + +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 + +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct_F77 +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L_F77 +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic_F77 + +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" + +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_F77 + +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++hardcode_action= ++if test -n "$hardcode_libdir_flag_spec" || ++ test -n "$runpath_var" || ++ test "X$hardcode_automatic" = "Xyes" ; then ++ ++ # We can hardcode non-existent directories. ++ if test "$hardcode_direct" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && ++ test "$hardcode_minus_L" != no; then ++ # Linking always hardcodes the temporary library directory. ++ hardcode_action=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ hardcode_action=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ hardcode_action=unsupported ++fi ++{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++$as_echo "$hardcode_action" >&6; } ++ ++if test "$hardcode_action" = relink || ++ test "$inherit_rpath" = yes; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++ ++ ++ ++ ++ ++ ++ if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= ++ ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; ++ ++ mingw* | pw32* | cegcc*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ darwin*) ++ # if libdl is installed we need to link against it ++ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$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 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_lib_dl_dlopen=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_dl_dlopen=no ++fi ++ ++rm -rf conftest.dSYM ++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 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++else ++ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ++fi ++ ++ ;; ++ ++ *) ++ { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 ++$as_echo_n "checking for shl_load... " >&6; } ++if test "${ac_cv_func_shl_load+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define shl_load innocuous_shl_load ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char shl_load (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef shl_load ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char shl_load (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_shl_load || defined __stub___shl_load ++choke me ++#endif ++ ++int ++main () ++{ ++return shl_load (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$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 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_func_shl_load=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path ++ ac_cv_func_shl_load=no ++fi + +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols_F77 ++rm -rf conftest.dSYM ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 ++$as_echo "$ac_cv_func_shl_load" >&6; } ++if test "x$ac_cv_func_shl_load" = x""yes; then ++ lt_cv_dlopen="shl_load" ++else ++ { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 ++$as_echo_n "checking for shl_load in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_F77 ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char shl_load (); ++int ++main () ++{ ++return shl_load (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$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 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_lib_dld_shl_load=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ac_cv_lib_dld_shl_load=no ++fi + +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_F77 ++rm -rf conftest.dSYM ++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 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 ++$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++else ++ { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 ++$as_echo_n "checking for dlopen... " >&6; } ++if test "${ac_cv_func_dlopen+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define dlopen innocuous_dlopen + +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_F77 ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char dlopen (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ + +-# ### END LIBTOOL TAG CONFIG: $tagname ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + +-__EOF__ ++#undef dlopen + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_dlopen || defined __stub___dlopen ++choke me ++#endif + ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$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 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_func_dlopen=yes + else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_cv_func_dlopen=no ++fi + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu ++rm -rf conftest.dSYM ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 ++$as_echo "$ac_cv_func_dlopen" >&6; } ++if test "x$ac_cv_func_dlopen" = x""yes; then ++ lt_cv_dlopen="dlopen" ++else ++ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-CC="$lt_save_CC" ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$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 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_lib_dl_dlopen=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- else +- tagname="" +- fi +- ;; ++ ac_cv_lib_dl_dlopen=no ++fi + +- GCJ) +- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then ++rm -rf conftest.dSYM ++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 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++else ++ { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 ++$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsvld $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$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 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_lib_svld_dlopen=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Source file extension for Java test sources. +-ac_ext=java ++ ac_cv_lib_svld_dlopen=no ++fi + +-# Object file extension for compiled Java test sources. +-objext=o +-objext_GCJ=$objext ++rm -rf conftest.dSYM ++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 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++$as_echo "$ac_cv_lib_svld_dlopen" >&6; } ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" ++else ++ { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++$as_echo_n "checking for dld_link in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code="class foo {}" ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dld_link (); ++int ++main () ++{ ++return dld_link (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$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 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_lib_dld_dld_link=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Code to be used in simple link tests +-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' ++ ac_cv_lib_dld_dld_link=no ++fi + +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++rm -rf conftest.dSYM ++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 ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++$as_echo "$ac_cv_lib_dld_dld_link" >&6; } ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then ++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" ++fi + +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} + +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++fi + +-# Allow CC to be a program name with arguments. +-compiler=$CC + ++fi + +-# save warnings/boilerplate of simple test code +-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* + +-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 -r conftest* +fi -+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -+if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${GCJ-"gcj"} +-compiler=$CC +-compiler_GCJ=$CC +-for cc_temp in $compiler""; do +- case $cc_temp in +- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; +- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++fi + + +-# GCJ did not exist at the time GCC didn't implicitly link libc in. +-archive_cmds_need_lc_GCJ=no ++fi + +-old_archive_cmds_GCJ=$old_archive_cmds ++ ;; ++ esac + ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi + +-lt_prog_compiler_no_builtin_flag_GCJ= ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + +-if test "$GCC" = yes; then +- lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++ { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++$as_echo_n "checking whether a program can dlopen itself... " >&6; } ++if test "${lt_cv_dlopen_self+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- lt_cv_prog_compiler_rtti_exceptions=no +- ac_outfile=conftest.$ac_objext +- 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. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:17680: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:17684: \$? = $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. +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_rtti_exceptions=yes +- fi +- fi +- $rm conftest* ++ if test "$cross_compiling" = yes; then : ++ lt_cv_dlopen_self=cross +else -+ lt_cv_prog_compiler_c_o_GCJ=no -+ $rm -r conftest 2>/dev/null ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <<_LT_EOF ++#line 12872 "configure" ++#include "confdefs.h" + +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++#if HAVE_DLFCN_H ++#include <dlfcn.h> ++#endif + +-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +- lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +-else +- : +-fi ++#include <stdio.h> + +-fi ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif + +-lt_prog_compiler_wl_GCJ= +-lt_prog_compiler_pic_GCJ= +-lt_prog_compiler_static_GCJ= ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; + +- if test "$GCC" = yes; then +- lt_prog_compiler_wl_GCJ='-Wl,' +- lt_prog_compiler_static_GCJ='-static' ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); + +- case $host_os in +- aix*) +- # All AIX code is PIC. +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_GCJ='-Bstatic' +- fi +- ;; ++ return status; ++} ++_LT_EOF ++ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&5 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; ++ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; ++ esac ++ else : ++ # compilation failed ++ lt_cv_dlopen_self=no ++ fi ++fi ++rm -fr conftest* + +- amigaos*) +- # FIXME: we need at least 68020 code to build shared libraries, but +- # adding the `-m68020' flag to GCC prevents building anything better, +- # like `-m68040'. +- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' +- ;; + +- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) +- # PIC is the default for these OSes. +- ;; ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++$as_echo "$lt_cv_dlopen_self" >&6; } + +- 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 ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } ++if test "${lt_cv_dlopen_self_static+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ lt_cv_dlopen_self_static=cross ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <<_LT_EOF ++#line 12968 "configure" ++#include "confdefs.h" + +- ;; ++#if HAVE_DLFCN_H ++#include <dlfcn.h> ++#endif + +- darwin* | rhapsody*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- lt_prog_compiler_pic_GCJ='-fno-common' +- ;; ++#include <stdio.h> + +- interix[3-9]*) +- # Interix 3.x gcc -fpic/-fPIC options generate broken code. +- # Instead, we relocate shared libraries at runtime. +- ;; ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif + +- msdosdjgpp*) +- # Just because we use GCC doesn't mean we suddenly get shared libraries +- # on systems that don't support them. +- lt_prog_compiler_can_build_shared_GCJ=no +- enable_shared=no +- ;; ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif + +- sysv4*MP*) +- if test -d /usr/nec; then +- lt_prog_compiler_pic_GCJ=-Kconform_pic +- fi +- ;; ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; + +- hpux*) +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic_GCJ='-fPIC' +- ;; +- esac +- ;; ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); + +- *) +- lt_prog_compiler_pic_GCJ='-fPIC' +- ;; ++ return status; ++} ++_LT_EOF ++ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&5 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; ++ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac +- else +- # PORTME Check for flag to pass linker flags through the system compiler. +- case $host_os in +- aix*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- if test "$host_cpu" = ia64; then +- # AIX 5 now supports IA64 processor +- lt_prog_compiler_static_GCJ='-Bstatic' +- else +- lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' +- fi +- ;; +- darwin*) +- # PIC is the default on this platform +- # Common symbols not allowed in MH_DYLIB files +- case $cc_basename in +- xlc*) +- lt_prog_compiler_pic_GCJ='-qnocommon' +- lt_prog_compiler_wl_GCJ='-Wl,' +- ;; +- esac +- ;; ++ else : ++ # compilation failed ++ lt_cv_dlopen_self_static=no ++ fi ++fi ++rm -fr conftest* + +- 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). + +- ;; ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++$as_echo "$lt_cv_dlopen_self_static" >&6; } ++ fi + +- hpux9* | hpux10* | hpux11*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but +- # not for PA HP-UX. +- case $host_cpu in +- hppa*64*|ia64*) +- # +Z the default +- ;; +- *) +- lt_prog_compiler_pic_GCJ='+Z' +- ;; +- esac +- # Is there a better lt_prog_compiler_static that works with the bundled CC? +- lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' +- ;; ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac + +- irix5* | irix6* | nonstopux*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- # PIC (with -KPIC) is the default. +- lt_prog_compiler_static_GCJ='-non_shared' +- ;; ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac ++ ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi + +- newsos6) +- lt_prog_compiler_pic_GCJ='-KPIC' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; + +- linux* | k*bsd*-gnu) +- case $cc_basename in +- icc* | ecc*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- lt_prog_compiler_pic_GCJ='-KPIC' +- lt_prog_compiler_static_GCJ='-static' +- ;; +- pgcc* | pgf77* | pgf90* | pgf95*) +- # Portland Group compilers (*not* the Pentium gcc compiler, +- # which looks to be a dead project) +- lt_prog_compiler_wl_GCJ='-Wl,' +- lt_prog_compiler_pic_GCJ='-fpic' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; +- ccc*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- # 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 +- ;; + +- osf3* | osf4* | osf5*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- # All OSF/1 code is PIC. +- 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' +- case $cc_basename in +- f77* | f90* | f95*) +- lt_prog_compiler_wl_GCJ='-Qoption ld ';; +- *) +- lt_prog_compiler_wl_GCJ='-Wl,';; +- esac +- ;; + +- sunos4*) +- lt_prog_compiler_wl_GCJ='-Qoption ld ' +- lt_prog_compiler_pic_GCJ='-PIC' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; + +- sysv4 | sysv4.2uw2* | sysv4.3*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- lt_prog_compiler_pic_GCJ='-KPIC' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; + +- sysv4*MP*) +- if test -d /usr/nec ;then +- lt_prog_compiler_pic_GCJ='-Kconform_pic' +- lt_prog_compiler_static_GCJ='-Bstatic' +- fi +- ;; + +- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- lt_prog_compiler_pic_GCJ='-KPIC' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; + +- unicos*) +- lt_prog_compiler_wl_GCJ='-Wl,' +- lt_prog_compiler_can_build_shared_GCJ=no +- ;; + +- uts4*) +- lt_prog_compiler_pic_GCJ='-pic' +- lt_prog_compiler_static_GCJ='-Bstatic' +- ;; + +- *) +- lt_prog_compiler_can_build_shared_GCJ=no +- ;; +- esac +- fi + +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } + +-# +-# Check to make sure the PIC flag actually works. +-# +-if test -n "$lt_prog_compiler_pic_GCJ"; then + +-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } +-if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_pic_works_GCJ=no +- ac_outfile=conftest.$ac_objext +- 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. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- # The option is referenced via a variable to avoid confusing sed. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:17970: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>conftest.err) +- ac_status=$? +- cat conftest.err >&5 +- echo "$as_me:17974: \$? = $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. +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_pic_works_GCJ=yes +- fi +- fi +- $rm conftest* + +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; } + +-if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then +- case $lt_prog_compiler_pic_GCJ in +- "" | " "*) ;; +- *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; +- esac ++striplib= ++old_striplib= ++{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++$as_echo_n "checking whether stripping libraries is possible... " >&6; } ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + else +- lt_prog_compiler_pic_GCJ= +- lt_prog_compiler_can_build_shared_GCJ=no +-fi +- +-fi +-case $host_os in +- # For platforms which do not support PIC, -DPIC is meaningless: +- *djgpp*) +- lt_prog_compiler_pic_GCJ= ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ fi + ;; + *) +- lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + ;; +-esac ++ esac ++fi + +-# +-# Check to make sure the static flag actually works. +-# +-wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +-if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_static_works_GCJ=no +- save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS $lt_tmp_static_flag" +- 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 +- if test -s conftest.err; then +- # Append any errors to the config.log. +- cat conftest.err 1>&5 +- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp +- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 +- if diff conftest.exp conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_static_works_GCJ=yes +- fi +- else +- lt_cv_prog_compiler_static_works_GCJ=yes +- fi +- fi +- $rm -r conftest* +- LDFLAGS="$save_LDFLAGS" + +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; } + +-if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then +- : +-else +- lt_prog_compiler_static_GCJ= +-fi + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_prog_compiler_c_o_GCJ=no +- $rm -r conftest 2>/dev/null +- mkdir conftest +- cd conftest +- mkdir out +- 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 +- # (2) before a word containing "conftest.", or (3) at the end. +- # Note that $ac_compile itself does not contain backslashes and begins +- # with a dollar sign (not a hyphen), so the echo should work correctly. +- lt_compile=`echo "$ac_compile" | $SED \ +- -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:18074: $lt_compile\"" >&5) +- (eval "$lt_compile" 2>out/conftest.err) +- ac_status=$? +- cat out/conftest.err >&5 +- echo "$as_me:18078: \$? = $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 +- # So say no if there are warnings +- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp +- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 +- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then +- lt_cv_prog_compiler_c_o_GCJ=yes +- fi +- fi +- chmod u+w . 2>&5 +- $rm conftest* +- # SGI C++ compiler will create directory out/ii_files/ for +- # template instantiation +- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files +- $rm out/* && rmdir out +- cd .. +- rmdir conftest +- $rm conftest* + +-fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } + + +-hard_links="nottested" +-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then +- # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-$as_echo_n "checking if we can lock with hard links... " >&6; } +- hard_links=yes +- $rm conftest* +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- touch conftest.a +- ln conftest.a conftest.b 2>&5 || hard_links=no +- ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +-$as_echo "$hard_links" >&6; } +- if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} +- need_locks=warn +- fi +-else +- need_locks=no +-fi + +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + +- runpath_var= +- allow_undefined_flag_GCJ= +- enable_shared_with_static_runtimes_GCJ=no +- archive_cmds_GCJ= +- archive_expsym_cmds_GCJ= +- old_archive_From_new_cmds_GCJ= +- old_archive_from_expsyms_cmds_GCJ= +- export_dynamic_flag_spec_GCJ= +- whole_archive_flag_spec_GCJ= +- thread_safe_flag_spec_GCJ= +- hardcode_libdir_flag_spec_GCJ= +- hardcode_libdir_flag_spec_ld_GCJ= +- hardcode_libdir_separator_GCJ= +- hardcode_direct_GCJ=no +- hardcode_minus_L_GCJ=no +- hardcode_shlibpath_var_GCJ=unsupported +- link_all_deplibs_GCJ=unknown +- hardcode_automatic_GCJ=no +- module_cmds_GCJ= +- module_expsym_cmds_GCJ= +- always_export_symbols_GCJ=no +- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' +- # include_expsyms should be a list of space-separated symbols to be *always* +- # included in the symbol list +- include_expsyms_GCJ= +- # exclude_expsyms can be an extended regexp of symbols to exclude +- # it will be wrapped by ` (' and `)$', so one must not match beginning or +- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', +- # as well as any symbol that contains `d'. +- exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' +- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out +- # platforms (ab)use it in PIC code, but their linkers get confused if +- # the symbol is explicitly referenced. Since portable code cannot +- # rely on this symbol name, it's probably fine to never include it in +- # preloaded symbol tables. +- # Exclude shared library initialization/finalization symbols. +- extract_expsyms_cmds= +- # Just being paranoid about ensuring that cc_basename is set. +- for cc_temp in $compiler""; do +- case $cc_temp in +- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; +- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + ++ # Report which library types will actually be built ++ { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++$as_echo_n "checking if libtool supports shared libraries... " >&6; } ++ { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++$as_echo "$can_build_shared" >&6; } ++ ++ { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++$as_echo_n "checking whether to build shared libraries... " >&6; } ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. + case $host_os in +- cygwin* | mingw* | pw32*) +- # FIXME: the MSVC++ port hasn't been tested in a loooong time +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- if test "$GCC" != yes; then +- with_gnu_ld=no ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' + fi + ;; +- interix*) +- # we just hope/assume this is gcc and not c89 (= MSVC++) +- with_gnu_ld=yes +- ;; +- openbsd*) +- with_gnu_ld=no ++ ++ aix[4-9]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi + ;; + esac ++ { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 ++$as_echo "$enable_shared" >&6; } + +- ld_shlibs_GCJ=yes +- if test "$with_gnu_ld" = yes; then +- # If archive_cmds runs LD, not CC, wlarc should be empty +- wlarc='${wl}' ++ { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++$as_echo_n "checking whether to build static libraries... " >&6; } ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 ++$as_echo "$enable_static" >&6; } + +- # Set some defaults for GNU ld with shared library support. These +- # are reset later if shared libraries are not supported. Putting them +- # here allows them to be overridden if necessary. +- runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' +- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' +- # ancient GNU ld didn't support --whole-archive et. al. +- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' +- else +- whole_archive_flag_spec_GCJ= +- fi +- supports_anon_versioning=no +- case `$LD -v 2>/dev/null` in +- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 +- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... +- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +- *\ 2.11.*) ;; # other 2.11 versions +- *) supports_anon_versioning=yes ;; +- esac + +- # See if GNU ld supports shared libraries. +- case $host_os in +- aix[3-9]*) +- # On AIX/PPC, the GNU linker is very broken +- if test "$host_cpu" != ia64; then +- ld_shlibs_GCJ=no +- cat <<EOF 1>&2 + +-*** Warning: the GNU linker, at least up to release 2.9.1, is reported +-*** to be unable to reliably create shared libraries on AIX. +-*** Therefore, libtool is disabling shared libraries support. If you +-*** really care for shared libraries, you may want to modify your PATH +-*** so that a non-GNU linker is found, and then restart. + +-EOF +- fi +- ;; ++fi ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + +- amigaos*) +- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_minus_L_GCJ=yes +- +- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports +- # that the semantics of dynamic libraries on AmigaOS, at least up +- # to version 4, is to share data among multiple programs linked +- # with the same dynamic library. Since this doesn't match the +- # behavior of shared libraries on other platforms, we can't use +- # them. +- ld_shlibs_GCJ=no +- ;; ++CC="$lt_save_CC" + +- beos*) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- allow_undefined_flag_GCJ=unsupported +- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc +- # support --undefined. This deserves some investigation. FIXME +- archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- else +- ld_shlibs_GCJ=no +- fi +- ;; + +- cygwin* | mingw* | pw32*) +- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, +- # as there is no search path for DLLs. +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- 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/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- 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' +- # If the export-symbols file already is a .def file (1st line +- # is EXPORTS), use it as is; otherwise, prepend... +- archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then +- cp $export_symbols $output_objdir/$soname.def; +- else +- echo EXPORTS > $output_objdir/$soname.def; +- cat $export_symbols >> $output_objdir/$soname.def; +- fi~ +- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' +- else +- ld_shlibs_GCJ=no +- fi +- ;; ++archive_cmds_need_lc_CXX=no ++allow_undefined_flag_CXX= ++always_export_symbols_CXX=no ++archive_expsym_cmds_CXX= ++compiler_needs_object_CXX=no ++export_dynamic_flag_spec_CXX= ++hardcode_direct_CXX=no ++hardcode_direct_absolute_CXX=no ++hardcode_libdir_flag_spec_CXX= ++hardcode_libdir_flag_spec_ld_CXX= ++hardcode_libdir_separator_CXX= ++hardcode_minus_L_CXX=no ++hardcode_shlibpath_var_CXX=unsupported ++hardcode_automatic_CXX=no ++inherit_rpath_CXX=no ++module_cmds_CXX= ++module_expsym_cmds_CXX= ++link_all_deplibs_CXX=unknown ++old_archive_cmds_CXX=$old_archive_cmds ++no_undefined_flag_CXX= ++whole_archive_flag_spec_CXX= ++enable_shared_with_static_runtimes_CXX=no + +- interix[3-9]*) +- hardcode_direct_GCJ=no +- hardcode_shlibpath_var_GCJ=no +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' +- export_dynamic_flag_spec_GCJ='${wl}-E' +- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. +- # Instead, shared libraries are loaded at an image base (0x10000000 by +- # default) and relocated if they conflict, which is a slow very memory +- # consuming and fragmenting process. To avoid this, we pick a random, +- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link +- # time. Moving up from 0x10000000 also allows more sbrk(2) space. +- archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' +- 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' +- ;; ++# Source file extension for C++ test sources. ++ac_ext=cpp + +- 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 +- pgcc*) # Portland Group C compiler +- whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag' +- ;; +- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers +- whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' +- tmp_addflag=' $pic_flag -Mnomain' ;; +- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 +- tmp_addflag=' -i_dynamic' ;; +- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 +- tmp_addflag=' -i_dynamic -nofor_main' ;; +- ifc* | ifort*) # Intel Fortran compiler +- tmp_addflag=' -nofor_main' ;; +- esac +- 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' ++# Object file extension for compiled C++ test sources. ++objext=o ++objext_CXX=$objext + +- 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' +- fi +- else +- ld_shlibs_GCJ=no +- fi +- ;; ++# No sense in running all these tests if we already determined that ++# the CXX compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_caught_CXX_error" != yes; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="int some_variable = 0;" + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' +- wlarc= +- else +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- fi +- ;; ++ # Code to be used in simple link tests ++ lt_simple_link_test_code='int main(int, char *[]) { return(0); }' + +- solaris*) +- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then +- ld_shlibs_GCJ=no +- cat <<EOF 1>&2 ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. + +-*** Warning: The releases 2.8.* of the GNU linker cannot reliably +-*** create shared libraries on Solaris systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.9.1 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. + +-EOF +- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- ld_shlibs_GCJ=no +- fi +- ;; + +- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) +- case `$LD -v 2>&1` in +- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) +- ld_shlibs_GCJ=no +- cat <<_LT_EOF 1>&2 + +-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +-*** reliably create shared libraries on SCO systems. Therefore, libtool +-*** is disabling shared libraries support. We urge you to upgrade GNU +-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +-*** your PATH or compiler configuration so that the native linker is +-*** used, and then restart. + +-_LT_EOF ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++ # save warnings/boilerplate of simple test code ++ 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* ++ ++ 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 -r conftest* ++ ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC=$CC ++ lt_save_LD=$LD ++ lt_save_GCC=$GCC ++ GCC=$GXX ++ lt_save_with_gnu_ld=$with_gnu_ld ++ lt_save_path_LD=$lt_cv_path_LD ++ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++ else ++ $as_unset lt_cv_prog_gnu_ld ++ fi ++ if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++ else ++ $as_unset lt_cv_path_LD ++ fi ++ test -z "${LDCXX+set}" || LD=$LDCXX ++ CC=${CXX-"c++"} ++ compiler=$CC ++ compiler_CXX=$CC ++ for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++ ++ ++ if test -n "$compiler"; then ++ # We don't want -fno-exception when compiling C++ code, so set the ++ # no_builtin_flag separately ++ if test "$GXX" = yes; then ++ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' ++ else ++ lt_prog_compiler_no_builtin_flag_CXX= ++ fi ++ ++ if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration ++ ++ ++ ++# Check whether --with-gnu-ld was given. ++if test "${with_gnu_ld+set}" = set; then ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes ++else ++ with_gnu_ld=no ++fi ++ ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++$as_echo_n "checking for ld used by $CC... " >&6; } ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [\\/]* | ?:[\\/]*) ++ re_direlt='/[^/][^/]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } ++else ++ { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++$as_echo_n "checking for non-GNU ld... " >&6; } ++fi ++if test "${lt_cv_path_LD+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in ++ *GNU* | *'with BFD'*) ++ test "$with_gnu_ld" != no && break + ;; +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' +- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' +- else +- ld_shlibs_GCJ=no +- fi ++ *) ++ test "$with_gnu_ld" != yes && break + ;; + esac +- ;; ++ fi ++ done ++ IFS="$lt_save_ifs" ++else ++ lt_cv_path_LD="$LD" # Let the user override the test with a path. ++fi ++fi ++ ++LD="$lt_cv_path_LD" ++if test -n "$LD"; then ++ { $as_echo "$as_me:$LINENO: result: $LD" >&5 ++$as_echo "$LD" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 ++$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ++ { (exit 1); exit 1; }; } ++{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++if test "${lt_cv_prog_gnu_ld+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. ++case `$LD -v 2>&1 </dev/null` in ++*GNU* | *'with BFD'*) ++ lt_cv_prog_gnu_ld=yes ++ ;; ++*) ++ lt_cv_prog_gnu_ld=no ++ ;; ++esac ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++$as_echo "$lt_cv_prog_gnu_ld" >&6; } ++with_gnu_ld=$lt_cv_prog_gnu_ld + +- sunos4*) +- archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- wlarc= +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; + +- *) +- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' +- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- else +- ld_shlibs_GCJ=no +- fi +- ;; +- esac + +- if test "$ld_shlibs_GCJ" = no; then +- runpath_var= +- hardcode_libdir_flag_spec_GCJ= +- export_dynamic_flag_spec_GCJ= +- whole_archive_flag_spec_GCJ= +- fi +- else +- # PORTME fill in a description of your system's linker (not GNU ld) +- case $host_os in +- aix3*) +- allow_undefined_flag_GCJ=unsupported +- always_export_symbols_GCJ=yes +- archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' +- # Note: this linker hardcodes the directories in LIBPATH if there +- # are no directories specified by -L. +- hardcode_minus_L_GCJ=yes +- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then +- # Neither direct hardcoding nor static linking is supported with a +- # broken collect2. +- hardcode_direct_GCJ=unsupported +- fi +- ;; + +- aix[4-9]*) +- if test "$host_cpu" = ia64; then +- # On IA64, the linker does run time linking by default, so we don't +- # have to do anything special. +- aix_use_runtimelinking=no +- exp_sym_flag='-Bexport' +- no_entry_flag="" +- else +- # If we're using GNU nm, then we don't want the "-C" option. +- # -C means demangle to AIX nm, but means don't demangle with GNU nm +- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then +- export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' +- else +- export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' +- fi +- aix_use_runtimelinking=no + +- # Test if we are trying to use run time linking or normal +- # AIX style linking. If -brtl is somewhere in LDFLAGS, we +- # need to do runtime linking. +- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) +- for ld_flag in $LDFLAGS; do +- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then +- aix_use_runtimelinking=yes +- break +- fi +- done +- ;; +- esac + +- exp_sym_flag='-bexport' +- no_entry_flag='-bnoentry' ++ ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test "$with_gnu_ld" = yes; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' ++ ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | ++ $GREP 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec_CXX= ++ fi ++ else ++ with_gnu_ld=no ++ wlarc= ++ ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + +- # When large executables or shared objects are built, AIX ld can +- # have problems creating the table of contents. If linking a library +- # or program results in "error TOC overflow" add -mminimal-toc to +- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not +- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' + +- archive_cmds_GCJ='' +- hardcode_direct_GCJ=yes +- hardcode_libdir_separator_GCJ=':' +- link_all_deplibs_GCJ=yes ++ else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++ fi + +- if test "$GCC" = yes; then +- case $host_os in aix4.[012]|aix4.[012].*) +- # We only want to do this on AIX 4.2 and lower, the check +- # below for broken collect2 doesn't work under 4.3+ ++ # PORTME: fill in a description of your system's C++ link characteristics ++ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++ ld_shlibs_CXX=yes ++ case $host_os in ++ aix3*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aix[4-9]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ archive_cmds_CXX='' ++ hardcode_direct_CXX=yes ++ hardcode_direct_absolute_CXX=yes ++ hardcode_libdir_separator_CXX=':' ++ link_all_deplibs_CXX=yes ++ file_list_spec_CXX='${wl}-f,' ++ ++ if test "$GXX" = yes; then ++ case $host_os in aix4.[012]|aix4.[012].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` +- if test -f "$collect2name" && \ +- strings "$collect2name" | grep resolve_lib_name >/dev/null ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then +- # We have reworked collect2 +- : ++ # We have reworked collect2 ++ : + else +- # We have old collect2 +- hardcode_direct_GCJ=unsupported +- # It fails to find uninstalled libraries when the uninstalled +- # path is not listed in the libpath. Setting hardcode_minus_L +- # to unsupported forces relinking +- hardcode_minus_L_GCJ=yes +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_libdir_separator_GCJ= ++ # We have old collect2 ++ hardcode_direct_CXX=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L_CXX=yes ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ hardcode_libdir_separator_CXX= + fi +- ;; +- esac +- shared_flag='-shared' +- if test "$aix_use_runtimelinking" = yes; then +- shared_flag="$shared_flag "'${wl}-G' +- fi +- else +- # not using gcc +- if test "$host_cpu" = ia64; then +- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release +- # chokes on -Wl,-G. The following line is correct: +- shared_flag='-G' +- else ++ esac ++ shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then +- shared_flag='${wl}-G' +- else +- shared_flag='${wl}-bM:SRE' ++ shared_flag="$shared_flag "'${wl}-G' + fi +- fi +- fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi + +- # It seems that -bexpall does not export symbols beginning with +- # underscore (_), so it is better to generate a list of symbols to export. +- always_export_symbols_GCJ=yes +- if test "$aix_use_runtimelinking" = yes; then +- # Warning - without using the other runtime loading flags (-brtl), +- # -berok will link without error, but may produce a broken library. +- allow_undefined_flag_GCJ='-berok' +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF ++ export_dynamic_flag_spec_CXX='${wl}-bexpall' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to ++ # export. ++ always_export_symbols_CXX=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ allow_undefined_flag_CXX='-berok' ++ # Determine the default libpath from the value encoded in an empty ++ # executable. ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -18563,7 +13584,7 @@ + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || ++ test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || +@@ -18594,16 +13615,18 @@ + conftest$ac_exeext conftest.$ac_ext + if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + +- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" +- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- else +- if test "$host_cpu" = ia64; then +- hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' +- allow_undefined_flag_GCJ="-z nodefs" +- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" +- else +- # Determine the default libpath from the value encoded in an empty executable. +- cat >conftest.$ac_ext <<_ACEOF ++ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" ++ ++ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag_CXX="-z nodefs" ++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext +@@ -18633,7 +13656,7 @@ + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || ++ test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || +@@ -18657,474 +13680,1568 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + +-fi ++fi ++ ++rm -rf conftest.dSYM ++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 ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ no_undefined_flag_CXX=' ${wl}-bernotok' ++ allow_undefined_flag_CXX=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec_CXX='$convenience' ++ archive_cmds_need_lc_CXX=yes ++ # This is similar to how AIX traditionally builds its shared ++ # libraries. ++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag_CXX=unsupported ++ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec_CXX='-L$libdir' ++ allow_undefined_flag_CXX=unsupported ++ always_export_symbols_CXX=no ++ enable_shared_with_static_runtimes_CXX=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ darwin* | rhapsody*) ++ ++ ++ archive_cmds_need_lc_CXX=no ++ hardcode_direct_CXX=no ++ hardcode_automatic_CXX=yes ++ hardcode_shlibpath_var_CXX=unsupported ++ whole_archive_flag_spec_CXX='' ++ link_all_deplibs_CXX=yes ++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=echo ++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi ++ ++ else ++ ld_shlibs_CXX=no ++ fi ++ ++ ;; ++ ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ freebsd[12]*) ++ # C++ shared libraries reported to be fairly broken before ++ # switch to ELF ++ ld_shlibs_CXX=no ++ ;; ++ ++ freebsd-elf*) ++ archive_cmds_need_lc_CXX=no ++ ;; ++ ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ ld_shlibs_CXX=yes ++ ;; ++ ++ gnu*) ++ ;; ++ ++ hpux9*) ++ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ hardcode_direct_CXX=yes ++ hardcode_minus_L_CXX=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aCC*) ++ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ ;; ++ *) ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_direct_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ ;; ++ *) ++ hardcode_direct_CXX=yes ++ hardcode_direct_absolute_CXX=yes ++ hardcode_minus_L_CXX=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ interix[3-9]*) ++ hardcode_direct_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ archive_expsym_cmds_CXX='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' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' ++ fi ++ fi ++ link_all_deplibs_CXX=yes ++ ;; ++ esac ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ inherit_rpath_CXX=yes ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc* | ecpc* ) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ archive_cmds_need_lc_CXX=no ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ case `$CC -V` in ++ *pgCC\ [1-5]* | *pgcpp\ [1-5]*) ++ prelink_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ ++ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ old_archive_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $RANLIB $oldlib' ++ archive_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ archive_expsym_cmds_CXX='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ;; ++ *) # Version 6 will use weak symbols ++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ;; ++ esac ++ ++ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ ++ runpath_var=LD_RUN_PATH ++ hardcode_libdir_flag_spec_CXX='-rpath $libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' ++ ;; ++ xl*) ++ # IBM XL 8.0 on PPC, with GNU ld ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' ++ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ *) ++ 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' ++ compiler_needs_object_CXX=yes ++ ++ # 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*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ m88k*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ netbsd*) ++ 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= ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ hardcode_direct_CXX=yes ++ hardcode_shlibpath_var_CXX=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ ++ *nto* | *qnx*) ++ ld_shlibs_CXX=yes ++ ;; ++ ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ ld_shlibs_CXX=no ++ ;; ++ ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct_CXX=yes ++ hardcode_shlibpath_var_CXX=no ++ hardcode_direct_absolute_CXX=yes ++ 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 ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ case $host in ++ osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; ++ *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; ++ esac ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ cxx*) ++ case $host in ++ osf3*) ++ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ ;; ++ *) ++ allow_undefined_flag_CXX=' -expect_unresolved \*' ++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $RM $lib.exp' ++ hardcode_libdir_flag_spec_CXX='-rpath $libdir' ++ ;; ++ esac ++ ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' ++ case $host in ++ osf3*) ++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ;; ++ esac ++ ++ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator_CXX=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ ++ else ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ psos*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ archive_cmds_need_lc_CXX=yes ++ 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='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ hardcode_libdir_flag_spec_CXX='-R$libdir' ++ hardcode_shlibpath_var_CXX=no ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ # 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='-z allextract$convenience -z defaultextract' ++ ;; ++ esac ++ link_all_deplibs_CXX=yes ++ ++ 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' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ ++ # The C++ compiler must be used to create the archive. ++ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ no_undefined_flag_CXX=' ${wl}-z ${wl}defs' ++ if $CC --version | $GREP -v '^2\.7' > /dev/null; then ++ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ 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 ++ ;; ++ ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ++ no_undefined_flag_CXX='${wl}-z,text' ++ archive_cmds_need_lc_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ no_undefined_flag_CXX='${wl}-z,text' ++ allow_undefined_flag_CXX='${wl}-z,nodefs' ++ archive_cmds_need_lc_CXX=no ++ hardcode_shlibpath_var_CXX=no ++ hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' ++ hardcode_libdir_separator_CXX=':' ++ link_all_deplibs_CXX=yes ++ export_dynamic_flag_spec_CXX='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ;; ++ ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ ++ *) ++ # FIXME: insert proper C++ library support ++ ld_shlibs_CXX=no ++ ;; ++ esac ++ ++ { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++$as_echo "$ld_shlibs_CXX" >&6; } ++ test "$ld_shlibs_CXX" = no && can_build_shared=no ++ ++ GCC_CXX="$GXX" ++ LD_CXX="$LD" ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ # Dependencies to place before and after the object being linked: ++predep_objects_CXX= ++postdep_objects_CXX= ++predeps_CXX= ++postdeps_CXX= ++compiler_lib_search_path_CXX= ++ ++cat > conftest.$ac_ext <<_LT_EOF ++class Foo ++{ ++public: ++ Foo (void) { a = 0; } ++private: ++ int a; ++}; ++_LT_EOF ++ ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # Parse the compiler output and extract the necessary ++ # objects, libraries and library flags. ++ ++ # Sentinel used to keep track of whether or not we are before ++ # the conftest object file. ++ pre_test_object_deps_done=no ++ ++ for p in `eval "$output_verbose_link_cmd"`; do ++ case $p in ++ ++ -L* | -R* | -l*) ++ # Some compilers place space between "-{L,R}" and the path. ++ # Remove the space. ++ if test $p = "-L" || ++ test $p = "-R"; then ++ prev=$p ++ continue ++ else ++ prev= ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ case $p in ++ -L* | -R*) ++ # Internal compiler library paths should come after those ++ # provided the user. The postdeps already come after the ++ # user supplied libs so there is no need to process them. ++ if test -z "$compiler_lib_search_path_CXX"; then ++ compiler_lib_search_path_CXX="${prev}${p}" ++ else ++ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" ++ fi ++ ;; ++ # The "-l" case would never come before the object being ++ # linked, so don't bother handling this case. ++ esac ++ else ++ if test -z "$postdeps_CXX"; then ++ postdeps_CXX="${prev}${p}" ++ else ++ postdeps_CXX="${postdeps_CXX} ${prev}${p}" ++ fi ++ fi ++ ;; ++ ++ *.$objext) ++ # This assumes that the test object file only shows up ++ # once in the compiler output. ++ if test "$p" = "conftest.$objext"; then ++ pre_test_object_deps_done=yes ++ continue ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ if test -z "$predep_objects_CXX"; then ++ predep_objects_CXX="$p" ++ else ++ predep_objects_CXX="$predep_objects_CXX $p" ++ fi ++ else ++ if test -z "$postdep_objects_CXX"; then ++ postdep_objects_CXX="$p" ++ else ++ postdep_objects_CXX="$postdep_objects_CXX $p" ++ fi ++ fi ++ ;; ++ ++ *) ;; # Ignore the rest. ++ ++ esac ++ done ++ ++ # Clean up. ++ rm -f a.out a.exe ++else ++ echo "libtool.m4: error: problem compiling CXX test program" ++fi ++ ++$RM -f confest.$objext ++ ++# PORTME: override above test on systems where it is broken ++case $host_os in ++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= ++ postdep_objects_CXX= ++ 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. ++ if test "$solaris_use_stlport4" != yes; then ++ postdeps_CXX='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++esac ++ ++ ++case " $postdeps_CXX " in ++*" -lc "*) archive_cmds_need_lc_CXX=no ;; ++esac ++ compiler_lib_search_dirs_CXX= ++if test -n "${compiler_lib_search_path_CXX}"; then ++ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +-rm -rf conftest.dSYM +-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 + +- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" +- # Warning - without using the other run time loading flags, +- # -berok will link without error, but may produce a broken library. +- no_undefined_flag_GCJ=' ${wl}-bernotok' +- allow_undefined_flag_GCJ=' ${wl}-berok' +- # Exported symbols can be pulled into shared objects from archives +- whole_archive_flag_spec_GCJ='$convenience' +- archive_cmds_need_lc_GCJ=yes +- # This is similar to how AIX traditionally builds its shared libraries. +- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- fi ++ ++ ++ ++ ++ ++ ++ ++ ++ lt_prog_compiler_wl_CXX= ++lt_prog_compiler_pic_CXX= ++lt_prog_compiler_static_CXX= ++ ++{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++ ++ # C++ specific cases for pic, static, wl, etc. ++ if test "$GXX" = yes; then ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_CXX='-Bstatic' + fi + ;; + + amigaos*) +- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_minus_L_GCJ=yes +- # see comment about different semantics on the GNU ld section +- ld_shlibs_GCJ=no ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac + ;; + +- bsdi[45]*) +- export_dynamic_flag_spec_GCJ=-rdynamic ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. + ;; +- +- cygwin* | mingw* | pw32*) +- # When not using gcc, we currently assume that we are using +- # Microsoft Visual C++. +- # hardcode_libdir_flag_spec is actually meaningless, as there is +- # no search path for DLLs. +- hardcode_libdir_flag_spec_GCJ=' ' +- allow_undefined_flag_GCJ=unsupported +- # Tell ltmain to make .lib files, not .a files. +- libext=lib +- # Tell ltmain to make .dll files, not .so files. +- shrext_cmds=".dll" +- # FIXME: Setting linknames here is a bad hack. +- archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- # 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' +- fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' +- enable_shared_with_static_runtimes_GCJ=yes ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # 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*) +- case $host_os in +- rhapsody* | darwin1.[012]) +- allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' +- ;; +- *) # Darwin 1.3 on +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' +- ;; +- 10.*) +- allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' +- ;; +- esac +- fi +- ;; +- esac +- archive_cmds_need_lc_GCJ=no +- hardcode_direct_GCJ=no +- hardcode_automatic_GCJ=yes +- hardcode_shlibpath_var_GCJ=unsupported +- whole_archive_flag_spec_GCJ='' +- link_all_deplibs_GCJ=yes +- if test "$GCC" = yes ; then +- output_verbose_link_cmd='echo' +- archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" +- module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" +- archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" +- module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" +- else +- 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` $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 $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}' +- ;; +- *) +- ld_shlibs_GCJ=no +- ;; ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic_CXX='-fno-common' ++ ;; ++ *djgpp*) ++ # DJGPP does not support shared libraries at all ++ lt_prog_compiler_pic_CXX= ++ ;; ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic_CXX=-Kconform_pic ++ fi ++ ;; ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; + esac +- fi + ;; +- +- dgux*) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_shlibpath_var_GCJ=no ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic_CXX='-fPIC -shared' + ;; +- +- freebsd1*) +- ld_shlibs_GCJ=no ++ *) ++ lt_prog_compiler_pic_CXX='-fPIC' + ;; ++ esac ++ else ++ case $host_os in ++ aix[4-9]*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static_CXX='-Bstatic' ++ else ++ lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ chorus*) ++ case $cc_basename in ++ cxch68*) ++ # Green Hills C++ Compiler ++ # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ ;; ++ esac ++ ;; ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ lt_prog_compiler_pic_CXX='-KPIC' ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ freebsd* | dragonfly*) ++ # FreeBSD uses GNU C++ ++ ;; ++ hpux9* | hpux10* | hpux11*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' ++ if test "$host_cpu" != ia64; then ++ lt_prog_compiler_pic_CXX='+Z' ++ fi ++ ;; ++ aCC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX='+Z' ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; ++ irix5* | irix6* | nonstopux*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_static_CXX='-non_shared' ++ # CC pic flag -KPIC is the default. ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # KAI C++ Compiler ++ lt_prog_compiler_wl_CXX='--backend -Wl,' ++ lt_prog_compiler_pic_CXX='-fPIC' ++ ;; ++ ecpc* ) ++ # old Intel C++ for x86_64 which still supported -KPIC. ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-static' ++ ;; ++ icpc* ) ++ # Intel C++, used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-fPIC' ++ lt_prog_compiler_static_CXX='-static' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-fpic' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ cxx*) ++ # Compaq C++ ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_static_CXX='-non_shared' ++ ;; ++ xlc* | xlC*) ++ # IBM XL 8.0 on PPC ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-qpic' ++ lt_prog_compiler_static_CXX='-qstaticlink' ++ ;; ++ *) ++ 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 ++ ;; ++ lynxos*) ++ ;; ++ m88k*) ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ lt_prog_compiler_pic_CXX='-W c,exportall' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ netbsd* | netbsdelf*-gnu) ++ ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic_CXX='-fPIC -shared' ++ ;; ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ lt_prog_compiler_wl_CXX='--backend -Wl,' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ cxx*) ++ # Digital/Compaq C++ ++ lt_prog_compiler_wl_CXX='-Wl,' ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_static_CXX='-non_shared' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ psos*) ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ lt_prog_compiler_wl_CXX='-Qoption ld ' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ lt_prog_compiler_pic_CXX='-PIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ lt_prog_compiler_pic_CXX='-pic' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ lcc*) ++ # Lucid ++ lt_prog_compiler_pic_CXX='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ lt_prog_compiler_wl_CXX='-Wl,' ++ lt_prog_compiler_pic_CXX='-KPIC' ++ lt_prog_compiler_static_CXX='-Bstatic' ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ lt_prog_compiler_pic_CXX='-KPIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ vxworks*) ++ ;; ++ *) ++ lt_prog_compiler_can_build_shared_CXX=no ++ ;; ++ esac ++ fi + +- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor +- # support. Future versions do this automatically, but an explicit c++rt0.o +- # does not break anything, and helps significantly (at the cost of a little +- # extra space). +- freebsd2.2*) +- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic_CXX= ++ ;; ++ *) ++ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" ++ ;; ++esac ++{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 ++$as_echo "$lt_prog_compiler_pic_CXX" >&6; } + +- # Unfortunately, older versions of FreeBSD 2 do not have this feature. +- freebsd2*) +- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_GCJ=yes +- hardcode_minus_L_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; + +- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. +- freebsd* | dragonfly*) +- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; + +- hpux9*) +- if test "$GCC" = yes; then +- archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- else +- archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' +- fi +- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: +- hardcode_direct_GCJ=yes ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$lt_prog_compiler_pic_CXX"; then ++ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } ++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic_works_CXX=no ++ ac_outfile=conftest.$ac_objext ++ 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. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:14988: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:14992: \$? = $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. ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works_CXX=yes ++ fi ++ fi ++ $RM conftest* + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_GCJ=yes +- export_dynamic_flag_spec_GCJ='${wl}-E' +- ;; ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } + +- hpux10*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +- fi +- if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: ++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then ++ case $lt_prog_compiler_pic_CXX in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; ++ esac ++else ++ lt_prog_compiler_pic_CXX= ++ lt_prog_compiler_can_build_shared_CXX=no ++fi + +- hardcode_direct_GCJ=yes +- export_dynamic_flag_spec_GCJ='${wl}-E' ++fi + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_GCJ=yes +- fi +- ;; + +- hpux11*) +- if test "$GCC" = yes -a "$with_gnu_ld" = no; then +- case $host_cpu in +- hppa*64*) +- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- else +- case $host_cpu in +- hppa*64*) +- archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- ia64*) +- archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- *) +- archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- ;; +- esac +- fi +- if test "$with_gnu_ld" = no; then +- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: + +- case $host_cpu in +- hppa*64*|ia64*) +- hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' +- hardcode_direct_GCJ=no +- hardcode_shlibpath_var_GCJ=no +- ;; +- *) +- hardcode_direct_GCJ=yes +- export_dynamic_flag_spec_GCJ='${wl}-E' ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" ++{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_static_works_CXX=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ 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 ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works_CXX=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works_CXX=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" + +- # hardcode_minus_L: Not really in the search PATH, +- # but as the default location of the library. +- hardcode_minus_L_GCJ=yes +- ;; +- esac +- fi +- ;; ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } + +- irix5* | irix6* | nonstopux*) +- if test "$GCC" = yes; then +- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' +- fi +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: +- link_all_deplibs_GCJ=yes +- ;; ++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then ++ : ++else ++ lt_prog_compiler_static_CXX= ++fi + +- netbsd*) +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out +- else +- archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF +- fi +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- hardcode_direct_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; + +- newsos6) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_GCJ=yes +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: +- hardcode_shlibpath_var_GCJ=no +- ;; + +- openbsd*) +- 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 +- ld_shlibs_GCJ=no +- fi +- ;; + +- os2*) +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_minus_L_GCJ=yes +- allow_undefined_flag_GCJ=unsupported +- archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' +- old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' +- ;; ++ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_c_o_CXX=no ++ $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - --# PATH needs CR --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits ++ + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. @@ -44701,2178 +36242,572 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + -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:18004: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15087: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 -+ echo "$as_me:18008: \$? = $ac_status" >&5 ++ echo "$as_me:15091: \$? = $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 + # So say no if there are warnings -+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_GCJ=yes ++ lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 -+ $rm conftest* ++ $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out + cd .. -+ rmdir conftest -+ $rm conftest* ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } ++ ++ ++ ++ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_c_o_CXX=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext --as_nl=' --' --export as_nl --# Printing a long string crashes Solaris 7 /usr/bin/printf. --as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='printf %s\n' -- as_echo_n='printf %s' --else -- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -- as_echo_n='/usr/ucb/echo -n' -- else -- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -- as_echo_n_body='eval -- arg=$1; -- case $arg in -- *"$as_nl"*) -- expr "X$arg" : "X\\(.*\\)$as_nl"; -- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -- esac; -- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -- ' -- export as_echo_n_body -- as_echo_n='sh -c $as_echo_n_body as_echo' -- fi -- export as_echo_body -- as_echo='sh -c $as_echo_body as_echo' - fi -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } +- osf3*) +- if test "$GCC" = yes; then +- allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- else +- allow_undefined_flag_GCJ=' -expect_unresolved \*' +- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- fi +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' +- hardcode_libdir_separator_GCJ=: +- ;; ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -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:15139: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:15143: \$? = $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 ++ # So say no if there are warnings ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o_CXX=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- PATH_SEPARATOR=: -- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -- PATH_SEPARATOR=';' -- } --fi +- osf4* | osf5*) # as osf3* with the addition of -msym flag +- if test "$GCC" = yes; then +- allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' +- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' +- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' +- else +- allow_undefined_flag_GCJ=' -expect_unresolved \*' +- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +- archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ +- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' ++fi ++{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset +- # Both c and cxx compiler support -rpath directly +- hardcode_libdir_flag_spec_GCJ='-rpath $libdir' +- fi +- hardcode_libdir_separator_GCJ=: +- ;; + +- solaris*) +- no_undefined_flag_GCJ=' -z text' +- if test "$GCC" = yes; then +- wlarc='${wl}' +- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' +- else +- wlarc='' +- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' +- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' +- fi +- hardcode_libdir_flag_spec_GCJ='-R$libdir' +- hardcode_shlibpath_var_GCJ=no +- case $host_os in +- solaris2.[0-5] | solaris2.[0-5].*) ;; +- *) +- # 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?) +- 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 +- ;; + +- sunos4*) +- if test "x$host_vendor" = xsequent; then +- # Use $CC to link under sequent, because it throws in some extra .o +- # files that make .init and .fini sections work. +- archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' +- fi +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_direct_GCJ=yes +- hardcode_minus_L_GCJ=yes +- hardcode_shlibpath_var_GCJ=no +- ;; + +- sysv4) +- case $host_vendor in +- sni) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_GCJ=yes # is this really true??? +- ;; +- siemens) +- ## LD is ld it makes a PLAMLIB +- ## CC just makes a GrossModule. +- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' +- reload_cmds_GCJ='$CC -r -o $output$reload_objs' +- hardcode_direct_GCJ=no +- ;; +- motorola) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie +- ;; +- esac +- runpath_var='LD_RUN_PATH' +- hardcode_shlibpath_var_GCJ=no +- ;; +hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then ++if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } ++ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes -+ $rm conftest* ++ $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } ++ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } + if test "$hard_links" = no; then -+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi - else -- as_unset=false ++else + need_locks=no - fi ++fi -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - --# IFS --# We need space, tab and new line, in precisely that order. Quoting is --# there to prevent editors from complaining about space-tab. --# (If _AS_PATH_WALK were called with IFS unset, it would disable word --# splitting by setting IFS to empty value.) --IFS=" "" $as_nl" -- --# Find who we are. Look in the path if we contain no directory separator. --case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ runpath_var= -+ allow_undefined_flag_GCJ= -+ enable_shared_with_static_runtimes_GCJ=no -+ archive_cmds_GCJ= -+ archive_expsym_cmds_GCJ= -+ old_archive_From_new_cmds_GCJ= -+ old_archive_from_expsyms_cmds_GCJ= -+ export_dynamic_flag_spec_GCJ= -+ whole_archive_flag_spec_GCJ= -+ thread_safe_flag_spec_GCJ= -+ hardcode_libdir_flag_spec_GCJ= -+ hardcode_libdir_flag_spec_ld_GCJ= -+ hardcode_libdir_separator_GCJ= -+ hardcode_direct_GCJ=no -+ hardcode_minus_L_GCJ=no -+ hardcode_shlibpath_var_GCJ=unsupported -+ link_all_deplibs_GCJ=unknown -+ hardcode_automatic_GCJ=no -+ module_cmds_GCJ= -+ module_expsym_cmds_GCJ= -+ always_export_symbols_GCJ=no -+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ include_expsyms_GCJ= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. -+ extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac - done --IFS=$as_save_IFS -- -- ;; --esac --# We did not find ourselves, most probably we were run as `sh COMMAND' --# in which case we are not to be found in the path. --if test "x$as_myself" = x; then -- as_myself=$0 --fi --if test ! -f "$as_myself"; then -- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -- { (exit 1); exit 1; } --fi -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - --# Work around bugs in pre-3.0 UWIN ksh. --for as_var in ENV MAIL MAILPATH --do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var --done --PS1='$ ' --PS2='> ' --PS4='+ ' -+ case $host_os in -+ cygwin* | mingw* | pw32*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac - --# NLS nuisances. --LC_ALL=C --export LC_ALL --LANGUAGE=C --export LANGUAGE -+ ld_shlibs_GCJ=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1 && -- test "X`expr 00001 : '.*\(...\)'`" = X001; then -- as_expr=expr --else -- as_expr=false --fi -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_GCJ= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac - --if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix[3-9]*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs_GCJ=no -+ cat <<EOF 1>&2 - -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. - --# Name of the executable. --as_me=`$as_basename -- "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ -- s//\1/ -- q -- } -- /^X\/\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\/\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- --# CDPATH. --$as_unset CDPATH -- -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line after each line using $LINENO; the second 'sed' -- # does the real work. The second script uses 'N' to pair each -- # line-number line with the line containing $LINENO, and appends -- # trailing '-' during substitution so that $LINENO is not a special -- # case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # scripts with optimization help from Paolo Bonzini. Blame Lee -- # E. McMahon (1931-1989) for sed's syntax. :-) -- sed -n ' -- p -- /[$]LINENO/= -- ' <$as_myself | -- sed ' -- s/[$]LINENO.*/&-/ -- t lineno -- b -- :lineno -- N -- :loop -- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -- t loop -- s/-\n.*// -- ' >$as_me.lineno && -- chmod +x "$as_me.lineno" || -- { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensitive to this). -- . "./$as_me.lineno" -- # Exit status is that of the last command. -- exit --} -- -- --if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -- as_dirname=dirname --else -- as_dirname=false --fi -- --ECHO_C= ECHO_N= ECHO_T= --case `echo -n x` in ---n*) -- case `echo 'x\c'` in -- *c*) ECHO_T=' ';; # ECHO_T is single tab character. -- *) ECHO_C='\c';; -- esac;; --*) -- ECHO_N='-n';; --esac --if expr a : '\(a\)' >/dev/null 2>&1 && -- test "X`expr 00001 : '.*\(...\)'`" = X001; then -- as_expr=expr --else -- as_expr=false --fi -- --rm -f conf$$ conf$$.exe conf$$.file --if test -d conf$$.dir; then -- rm -f conf$$.dir/conf$$.file --else -- rm -f conf$$.dir -- mkdir conf$$.dir 2>/dev/null --fi --if (echo >conf$$.file) 2>/dev/null; then -- if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -- elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -- else -- as_ln_s='cp -p' -- fi --else -- as_ln_s='cp -p' --fi --rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file --rmdir conf$$.dir 2>/dev/null -+EOF -+ fi -+ ;; - --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- test -d ./-p && rmdir ./-p -- as_mkdir_p=false --fi -+ amigaos*) -+ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_minus_L_GCJ=yes -+ -+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we can't use -+ # them. -+ ld_shlibs_GCJ=no -+ ;; - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- 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/."; -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_GCJ=unsupported -+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - 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 --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'" -+ ld_shlibs_GCJ=no -+ fi -+ ;; - --# Sed expression to map a string onto a valid variable name. --as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ cygwin* | mingw* | pw32*) -+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ 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/'\'' -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' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; - -+ interix[3-9]*) -+ hardcode_direct_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ 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' -+ ;; - --exec 6>&1 --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 -+ 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 -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ 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' - --lt_cl_help="\ --\`$as_me' creates a local libtool stub from the current configuration, --for use in further configure time tests before the real libtool is --generated. -- --Usage: $0 [OPTIONS] -- -- -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -- -d, --debug don't remove temporary files -- --Report bugs to <bug-libtool@gnu.org>." -- --lt_cl_version="\ --gtk+ config.lt 2.14.5 --configured by $0, generated by GNU Autoconf 2.63. -- --Copyright (C) 2008 Free Software Foundation, Inc. --This config.lt script is free software; the Free Software Foundation --gives unlimited permision to copy, distribute and modify it." -+ 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 '"$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 -+ ;; - --while test $# != 0 --do -- case $1 in -- --version | --v* | -V ) -- echo "$lt_cl_version"; exit 0 ;; -- --help | --h* | -h ) -- echo "$lt_cl_help"; exit 0 ;; -- --debug | --d* | -d ) -- debug=: ;; -- --quiet | --q* | --silent | --s* | -q ) -- lt_cl_silent=: ;; -- -- -*) { { $as_echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --$as_echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ 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= -+ else -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; - -- *) { { $as_echo "$as_me:$LINENO: error: unrecognized argument: $1 --Try \`$0 --help' for more information." >&5 --$as_echo "$as_me: error: unrecognized argument: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -- esac -- shift --done -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs_GCJ=no -+ cat <<EOF 1>&2 - --if $lt_cl_silent; then -- exec 6>/dev/null --fi --_LTEOF -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - --cat >>"$CONFIG_LT" <<_LTEOF -+EOF -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; - -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs_GCJ=no -+ cat <<_LT_EOF 1>&2 - --# 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 -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - --sed_quote_subst='$sed_quote_subst' --double_quote_subst='$double_quote_subst' --delay_variable_subst='$delay_variable_subst' --enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' --AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' --DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' --OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' --macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' --macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' --pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' --enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' --host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' --host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' --host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' --build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' --build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' --build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' --SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' --Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' --GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' --EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' --FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' --LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' --NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' --LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' --max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' --ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' --exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' --lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' --lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' --lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' --reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' --reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' --deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' --file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' --AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' --AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' --STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' --RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' --old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' --CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' --CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' --compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' --GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' --objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' --SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' --ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' --MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' --need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' --DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' --NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' --LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' --OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' --OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' --libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' --shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' --extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' --export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' --module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' --module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' --with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' --allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' --no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' --inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' --link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' --always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' --export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' --exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' --include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' --prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' --file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' --variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' --need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' --need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' --version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' --runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' --shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' --shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' --libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' --library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' --soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' --postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' --finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' --sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' --sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' --old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' --striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' --predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' --postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' --predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' --postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' --LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' --GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' --export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' --allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' --no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' --inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' --link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' --fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' --always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' --export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' --include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' --prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' --predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' --postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' --predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' --postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -- --LTCC='$LTCC' --LTCFLAGS='$LTCFLAGS' --compiler='$compiler_DEFAULT' -- --# Quote evaled strings. --for var in SED \ --GREP \ --EGREP \ --FGREP \ --LD \ --NM \ --LN_S \ --lt_SP2NL \ --lt_NL2SP \ --reload_flag \ --deplibs_check_method \ --file_magic_cmd \ --AR \ --AR_FLAGS \ --STRIP \ --RANLIB \ --CC \ --CFLAGS \ --compiler \ --lt_cv_sys_global_symbol_pipe \ --lt_cv_sys_global_symbol_to_cdecl \ --lt_cv_sys_global_symbol_to_c_name_address \ --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ --SHELL \ --ECHO \ --lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ --lt_prog_compiler_pic \ --lt_prog_compiler_static \ --lt_cv_prog_compiler_c_o \ --need_locks \ --DSYMUTIL \ --NMEDIT \ --LIPO \ --OTOOL \ --OTOOL64 \ --shrext_cmds \ --export_dynamic_flag_spec \ --whole_archive_flag_spec \ --compiler_needs_object \ --with_gnu_ld \ --allow_undefined_flag \ --no_undefined_flag \ --hardcode_libdir_flag_spec \ --hardcode_libdir_flag_spec_ld \ --hardcode_libdir_separator \ --fix_srcfile_path \ --exclude_expsyms \ --include_expsyms \ --file_list_spec \ --variables_saved_for_relink \ --libname_spec \ --library_names_spec \ --soname_spec \ --finish_eval \ --old_striplib \ --striplib \ --compiler_lib_search_dirs \ --predep_objects \ --postdep_objects \ --predeps \ --postdeps \ --compiler_lib_search_path \ --LD_CXX \ --compiler_CXX \ --lt_prog_compiler_no_builtin_flag_CXX \ --lt_prog_compiler_wl_CXX \ --lt_prog_compiler_pic_CXX \ --lt_prog_compiler_static_CXX \ --lt_cv_prog_compiler_c_o_CXX \ --export_dynamic_flag_spec_CXX \ --whole_archive_flag_spec_CXX \ --compiler_needs_object_CXX \ --with_gnu_ld_CXX \ --allow_undefined_flag_CXX \ --no_undefined_flag_CXX \ --hardcode_libdir_flag_spec_CXX \ --hardcode_libdir_flag_spec_ld_CXX \ --hardcode_libdir_separator_CXX \ --fix_srcfile_path_CXX \ --exclude_expsyms_CXX \ --include_expsyms_CXX \ --file_list_spec_CXX \ --compiler_lib_search_dirs_CXX \ --predep_objects_CXX \ --postdep_objects_CXX \ --predeps_CXX \ --postdeps_CXX \ --compiler_lib_search_path_CXX; do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -- *[\\\\\\\`\\"\\\$]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" +- sysv4.3*) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_GCJ=no +- export_dynamic_flag_spec_GCJ='-Bexport' - ;; -- *) -- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+_LT_EOF -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ esac - ;; -- esac --done --# Double-quote double-evaled strings. --for var in reload_cmds \ --old_postinstall_cmds \ --old_postuninstall_cmds \ --old_archive_cmds \ --extract_expsyms_cmds \ --old_archive_from_new_cmds \ --old_archive_from_expsyms_cmds \ --archive_cmds \ --archive_expsym_cmds \ --module_cmds \ --module_expsym_cmds \ --export_symbols_cmds \ --prelink_cmds \ --postinstall_cmds \ --postuninstall_cmds \ --finish_cmds \ --sys_lib_search_path_spec \ --sys_lib_dlsearch_path_spec \ --old_archive_cmds_CXX \ --old_archive_from_new_cmds_CXX \ --old_archive_from_expsyms_cmds_CXX \ --archive_cmds_CXX \ --archive_expsym_cmds_CXX \ --module_cmds_CXX \ --module_expsym_cmds_CXX \ --export_symbols_cmds_CXX \ --prelink_cmds_CXX; do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -- *[\\\\\\\`\\"\\\$]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ sunos4*) -+ archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no - ;; +- sysv4*MP*) +- if test -d /usr/nec; then +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_shlibpath_var_GCJ=no +- runpath_var=LD_RUN_PATH +- hardcode_runpath_var=yes +- ld_shlibs_GCJ=yes +- fi +- ;; + +- 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 +- runpath_var='LD_RUN_PATH' ++ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + +- if test "$GCC" = yes; then +- archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; ++ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ case $host_os in ++ aix[4-9]*) ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ else ++ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ fi ++ ;; ++ pw32*) ++ export_symbols_cmds_CXX="$ltdll_cmds" ++ ;; ++ cygwin* | mingw* | cegcc*) ++ 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' ++ ;; ++ esac ++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + - *) -- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ ld_shlibs_GCJ=no -+ fi ++{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++$as_echo "$ld_shlibs_CXX" >&6; } ++test "$ld_shlibs_CXX" = no && can_build_shared=no ++ ++with_gnu_ld_CXX=$with_gnu_ld + +- sysv5* | sco3.2v5* | sco5v6*) +- # Note: We can NOT use -z defs as we might desire, because we do not +- # link with -lc, and that would cause any symbols used from libc to +- # always be unresolved, which means just about no library would +- # ever link correctly. If we're not using GNU ld we use -z text +- # though, which does catch some bad symbols but isn't as heavy-handed +- # as -z defs. +- no_undefined_flag_GCJ='${wl}-z,text' +- allow_undefined_flag_GCJ='${wl}-z,nodefs' +- archive_cmds_need_lc_GCJ=no +- hardcode_shlibpath_var_GCJ=no +- hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' +- hardcode_libdir_separator_GCJ=':' +- link_all_deplibs_GCJ=yes +- export_dynamic_flag_spec_GCJ='${wl}-Bexport' +- runpath_var='LD_RUN_PATH' + +- if test "$GCC" = yes; then +- archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- else +- archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' +- fi +- ;; + +- uts4*) +- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' +- hardcode_libdir_flag_spec_GCJ='-L$libdir' +- hardcode_shlibpath_var_GCJ=no +- ;; + +- *) +- ld_shlibs_GCJ=no +- ;; +- esac +- fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +-$as_echo "$ld_shlibs_GCJ" >&6; } +-test "$ld_shlibs_GCJ" = no && can_build_shared=no + + # + # Do we need to explicitly link libc? + # +-case "x$archive_cmds_need_lc_GCJ" in ++case "x$archive_cmds_need_lc_CXX" in + x|xyes) + # Assume -lc should be added +- archive_cmds_need_lc_GCJ=yes ++ archive_cmds_need_lc_CXX=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then +- case $archive_cmds_GCJ in ++ case $archive_cmds_CXX in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; +@@ -19134,7 +15251,7 @@ + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 + $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +- $rm conftest* ++ $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -19146,40 +15263,104 @@ + lib=conftest + libobjs=conftest.$ac_objext + deplibs= +- wl=$lt_prog_compiler_wl_GCJ +- pic_flag=$lt_prog_compiler_pic_GCJ ++ wl=$lt_prog_compiler_wl_CXX ++ pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest +- lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ +- allow_undefined_flag_GCJ= +- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 +- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX ++ allow_undefined_flag_CXX= ++ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 ++ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then +- archive_cmds_need_lc_GCJ=no ++ archive_cmds_need_lc_CXX=no + else +- archive_cmds_need_lc_GCJ=yes ++ archive_cmds_need_lc_CXX=yes + fi +- allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag ++ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi +- $rm conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +-$as_echo "$archive_cmds_need_lc_GCJ" >&6; } ++ $RM conftest* ++ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 ++$as_echo "$archive_cmds_need_lc_CXX" >&6; } ;; esac --done + fi + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 + $as_echo_n "checking dynamic linker characteristics... " >&6; } ++ + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -19193,7 +15374,6 @@ + version_type=none + dynamic_linker="$host_os ld.so" + sys_lib_dlsearch_path_spec="/lib /usr/lib" - --# Fix-up fallback echo if it was mangled by the above quoting rules. --case \$lt_ECHO in --*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` -- ;; --esac -- --ac_aux_dir='$ac_aux_dir' --xsi_shell='$xsi_shell' --lt_shell_append='$lt_shell_append' -- --# See if we are running on zsh, and set the options which allow our --# commands through without removal of \ escapes INIT. --if test -n "\${ZSH_VERSION+set}" ; then -- setopt NO_GLOB_SUBST --fi -- -- -- PACKAGE='$PACKAGE' -- VERSION='$VERSION' -- TIMESTAMP='$TIMESTAMP' -- RM='$RM' -- ofile='$ofile' -- - -+ if test "$ld_shlibs_GCJ" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_GCJ= -+ export_dynamic_flag_spec_GCJ= -+ whole_archive_flag_spec_GCJ= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ allow_undefined_flag_GCJ=unsupported -+ always_export_symbols_GCJ=yes -+ archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L_GCJ=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct_GCJ=unsupported -+ fi -+ ;; - -+ aix[4-9]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -+ export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no - -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac - --_LTEOF -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - --cat >>"$CONFIG_LT" <<\_LTEOF --{ $as_echo "$as_me:$LINENO: creating $ofile" >&5 --$as_echo "$as_me: creating $ofile" >&6;} -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - -+ archive_cmds_GCJ='' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_separator_GCJ=':' -+ link_all_deplibs_GCJ=yes - -- # 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 -- setopt NO_GLOB_SUBST -- fi -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ hardcode_direct_GCJ=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_libdir_separator_GCJ= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi - -- cfgfile="${ofile}T" -- trap "$RM \"$cfgfile\"; exit 1" 1 2 15 -- $RM "$cfgfile" -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_GCJ=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag_GCJ='-berok' -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -- cat <<_LT_EOF >> "$cfgfile" --#! $SHELL -+int -+main () -+{ - --# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: --# NOTE: Changes made to this file will be lost: look at ltmain.sh. --# --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008 Free Software Foundation, Inc. --# Written by Gordon Matzigkeit, 1996 --# --# This file is part of GNU Libtool. --# --# GNU Libtool is free software; you can redistribute it and/or --# modify it under the terms of the GNU General Public License as --# published by the Free Software Foundation; either version 2 of --# the License, or (at your option) any later version. --# --# As a special exception to the GNU General Public License, --# if you distribute this file as part of a program or library that --# is built using GNU Libtool, you may include this file under the --# same distribution terms that you use for the rest of that program. --# --# GNU Libtool 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 General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with GNU Libtool; see the file COPYING. If not, a copy --# can be downloaded from http://www.gnu.org/licenses/gpl.html, or --# obtained by writing to the Free Software Foundation, Inc., --# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# The names of the tagged configurations supported by this script. --available_tags="CXX " - --# ### BEGIN LIBTOOL CONFIG -+fi - --# Whether or not to build static libraries. --build_old_libs=$enable_static -+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 - --# Assembler program. --AS=$AS -+ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_GCJ="-z nodefs" -+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --# DLL creation program. --DLLTOOL=$DLLTOOL -+int -+main () -+{ - --# Object dumper program. --OBJDUMP=$OBJDUMP -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - --# Which release of libtool.m4 was used? --macro_version=$macro_version --macro_revision=$macro_revision -+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 "$lt_aix_libpath_sed"` -+fi -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared - --# What type of objects to build. --pic_mode=$pic_mode -+fi - --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install -+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 - --# The host system. --host_alias=$host_alias --host=$host --host_os=$host_os -+ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ no_undefined_flag_GCJ=' ${wl}-bernotok' -+ allow_undefined_flag_GCJ=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_GCJ='$convenience' -+ archive_cmds_need_lc_GCJ=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - --# The build system. --build_alias=$build_alias --build=$build --build_os=$build_os -+ amigaos*) -+ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_minus_L_GCJ=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs_GCJ=no -+ ;; - --# A sed program that does not truncate output. --SED=$lt_SED -+ bsdi[45]*) -+ export_dynamic_flag_spec_GCJ=-rdynamic -+ ;; - --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="\$SED -e 1s/^X//" -+ cygwin* | mingw* | pw32*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec_GCJ=' ' -+ allow_undefined_flag_GCJ=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # 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' -+ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes_GCJ=yes -+ ;; - --# A grep program that handles long lines. --GREP=$lt_GREP -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_GCJ=no -+ hardcode_direct_GCJ=no -+ hardcode_automatic_GCJ=yes -+ hardcode_shlibpath_var_GCJ=unsupported -+ whole_archive_flag_spec_GCJ='' -+ link_all_deplibs_GCJ=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ else -+ 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` $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 $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}' -+ ;; -+ *) -+ ld_shlibs_GCJ=no -+ ;; -+ esac -+ fi -+ ;; - --# An ERE matcher. --EGREP=$lt_EGREP -+ dgux*) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; - --# A literal string matcher. --FGREP=$lt_FGREP -+ freebsd1*) -+ ld_shlibs_GCJ=no -+ ;; - --# A BSD- or MS-compatible name lister. --NM=$lt_NM -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; - --# Whether we need soft or hard links. --LN_S=$lt_LN_S -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=yes -+ hardcode_minus_L_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; - --# What is the maximum length of a command? --max_cmd_len=$max_cmd_len -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; - --# Object file suffix (normally "o"). --objext=$ac_objext -+ hpux9*) -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ hardcode_direct_GCJ=yes - --# Executable file suffix (normally ""). --exeext=$exeext -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ ;; - --# whether the shell understands "unset". --lt_unset=$lt_unset -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: - --# turn spaces into newlines. --SP2NL=$lt_lt_SP2NL -+ hardcode_direct_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-E' - --# turn newlines into spaces. --NL2SP=$lt_lt_NL2SP -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_GCJ=yes -+ fi -+ ;; - --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: - --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' -+ hardcode_direct_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ *) -+ hardcode_direct_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-E' - --# Command to use when deplibs_check_method == "file_magic". --file_magic_cmd=$lt_file_magic_cmd -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L_GCJ=yes -+ ;; -+ esac -+ fi -+ ;; - --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' -+ fi -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ link_all_deplibs_GCJ=yes -+ ;; - --# A symbol stripping program. --STRIP=$lt_STRIP -+ 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 -+ archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; - --# Commands used to install an old-style archive. --RANLIB=$lt_RANLIB --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ newsos6) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ hardcode_shlibpath_var_GCJ=no -+ ;; - --# A C compiler. --LTCC=$lt_CC -+ openbsd*) -+ 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 -+ ld_shlibs_GCJ=no -+ fi -+ ;; - --# LTCC compiler flags. --LTCFLAGS=$lt_CFLAGS -+ os2*) -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_minus_L_GCJ=yes -+ allow_undefined_flag_GCJ=unsupported -+ archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; - --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ osf3*) -+ if test "$GCC" = yes; then -+ allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ allow_undefined_flag_GCJ=' -expect_unresolved \*' -+ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ ;; - --# Transform the output of nm in a proper C declaration. --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -+ else -+ allow_undefined_flag_GCJ=' -expect_unresolved \*' -+ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - --# Transform the output of nm in a C name address pair. --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ # Both c and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec_GCJ='-rpath $libdir' -+ fi -+ hardcode_libdir_separator_GCJ=: -+ ;; - --# Transform the output of nm in a C name address pair when lib prefix is needed. --global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -+ solaris*) -+ no_undefined_flag_GCJ=' -z text' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ else -+ wlarc='' -+ archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ fi -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # 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?) -+ 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 -+ ;; - --# The name of the directory that contains temporary libtool files. --objdir=$objdir -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_minus_L_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; - --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -+ sysv4) -+ case $host_vendor in -+ sni) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ reload_cmds_GCJ='$CC -r -o $output$reload_objs' -+ hardcode_direct_GCJ=no -+ ;; -+ motorola) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ hardcode_shlibpath_var_GCJ=no -+ ;; - --# An echo program that does not interpret backslashes. --ECHO=$lt_ECHO -+ sysv4.3*) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_GCJ=no -+ export_dynamic_flag_spec_GCJ='-Bexport' -+ ;; - --# Used to examine libraries when file_magic_cmd begins with "file". --MAGIC_CMD=$MAGIC_CMD -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var_GCJ=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ ld_shlibs_GCJ=yes -+ fi -+ ;; - --# Must we lock files when doing compilation? --need_locks=$lt_need_locks -+ 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 -+ runpath_var='LD_RUN_PATH' - --# Tool to manipulate archived DWARF debug symbol files on Mac OS X. --DSYMUTIL=$lt_DSYMUTIL -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; - --# Tool to change global to local symbols on Mac OS X. --NMEDIT=$lt_NMEDIT -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ no_undefined_flag_GCJ='${wl}-z,text' -+ allow_undefined_flag_GCJ='${wl}-z,nodefs' -+ archive_cmds_need_lc_GCJ=no -+ hardcode_shlibpath_var_GCJ=no -+ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator_GCJ=':' -+ link_all_deplibs_GCJ=yes -+ export_dynamic_flag_spec_GCJ='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' - --# Tool to manipulate fat objects and archives on Mac OS X. --LIPO=$lt_LIPO -+ if test "$GCC" = yes; then -+ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; - --# ldd/readelf like tool for Mach-O binaries on Mac OS X. --OTOOL=$lt_OTOOL -+ uts4*) -+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; - --# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. --OTOOL64=$lt_OTOOL64 -+ *) -+ ld_shlibs_GCJ=no -+ ;; -+ esac -+ fi - --# Old archive suffix (normally "a"). --libext=$libext -+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } -+test "$ld_shlibs_GCJ" = no && can_build_shared=no - --# Shared library suffix (normally ".so"). --shrext_cmds=$lt_shrext_cmds -+# -+# Do we need to explicitly link libc? -+# -+case "x$archive_cmds_need_lc_GCJ" in -+x|xyes) -+ # Assume -lc should be added -+ archive_cmds_need_lc_GCJ=yes - --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $archive_cmds_GCJ in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ { 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* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - --# Variables whose values should be saved in libtool wrapper scripts and --# restored at link time. --variables_saved_for_relink=$lt_variables_saved_for_relink -+ 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); } 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$lt_prog_compiler_wl_GCJ -+ pic_flag=$lt_prog_compiler_pic_GCJ -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ -+ allow_undefined_flag_GCJ= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ then -+ archive_cmds_need_lc_GCJ=no -+ else -+ archive_cmds_need_lc_GCJ=yes -+ fi -+ allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $rm conftest* -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } -+ ;; -+ esac -+ fi -+ ;; -+esac - --# Do we need the "lib" prefix for modules? --need_lib_prefix=$need_lib_prefix -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" - --# Do we need a version for libraries? --need_version=$need_version -+need_lib_prefix=unknown -+hardcode_into_libs=no - --# Library versioning type. --version_type=$version_type -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown - --# Shared library runtime path variable. --runpath_var=$runpath_var -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH - --# Shared library path variable. --shlibpath_var=$shlibpath_var -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; - --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+aix[4-9]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[01] | aix4.[01].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so -+ # instead of lib<name>.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; - --# Format of library name prefix. --libname_spec=$lt_libname_spec -+amigaos*) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; - --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME --library_names_spec=$lt_library_names_spec -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; - --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec -+bsdi[45]*) -+ version_type=linux -+ 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' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; - --# Command to use after installation of a shared archive. --postinstall_cmds=$lt_postinstall_cmds -+cygwin* | mingw* | pw32*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no - --# Command to use after uninstallation of a shared archive. --postuninstall_cmds=$lt_postuninstall_cmds -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $rm \$dlpath' -+ shlibpath_overrides_runpath=yes - --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ 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 ';[c-zC-Z]:/' >/dev/null; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ 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 -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -19230,7 +15410,7 @@ + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' +- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no +@@ -19256,9 +15436,18 @@ + ;; + + amigaos*) +- library_names_spec='$libname.ixlibrary $libname.a' +- # Create ${libname}_ixlibrary.a entries in /sys/libs. +- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; - --# As "finish_cmds", except a single script fragment to be evaled but --# not shown. --finish_eval=$lt_finish_eval -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; + ;; --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + beos*) +@@ -19281,25 +15470,28 @@ + # libtool to hard-code these into programs + ;; --# Compile-time system search path for libraries. --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; +-cygwin* | mingw* | pw32*) ++cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no --# Run-time system search path for libraries. --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+dgux*) -+ 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 -+ ;; + case $GCC,$host_os in +- yes,cygwin* | yes,mingw* | yes,pw32*) ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ +- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ +- chmod a+x \$dldir/$dlname' ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ +- $rm \$dlpath' ++ $RM \$dlpath' + shlibpath_overrides_runpath=yes --# Whether dlopen is supported. --dlopen_support=$enable_dlopen -+freebsd1*) -+ dynamic_linker=no -+ ;; - --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[01]* | freebsdelf3.[01]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes + case $host_os in +@@ -19308,20 +15500,20 @@ + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; +- mingw*) ++ mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' +- 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 ';[c-zC-Z]:/' >/dev/null; 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 ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. +- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ 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"` ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) +@@ -19345,7 +15537,7 @@ + version_type=darwin + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +@@ -19406,501 +15598,1348 @@ + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; +- esac + hardcode_into_libs=yes + ;; + esac + ;; - --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static ++ +gnu*) + version_type=linux + need_lib_prefix=no @@ -46882,10 +36817,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; - --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib ++ +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. @@ -46908,18 +36840,18 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH @@ -46931,7 +36863,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; - ++ +interix[3-9]*) + version_type=linux + need_lib_prefix=no @@ -46943,12 +36875,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; - --# The linker used to build libraries. --LD=$lt_LD -- --# Commands used to build an old-style archive. --old_archive_cmds=$lt_old_archive_cmds ++ +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; @@ -46985,16 +36912,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; - --# A language specific compiler. --CC=$lt_compiler ++ +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; - --# Is the compiler the GNU compiler? --with_gcc=$GCC ++ +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux @@ -47005,21 +36928,75 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no ++ # Some binutils ld are patched to set DT_RUNPATH ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ ++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$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 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then ++ shlibpath_overrides_runpath=yes ++fi ++ ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -rf conftest.dSYM ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes - --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag ++ + # 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>/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' ' '` ++ 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 - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl ++ + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, @@ -47028,9 +37005,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; - --# Additional compiler flags for building library objects. --pic_flag=$lt_lt_prog_compiler_pic ++ +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no @@ -47042,14 +37017,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; - --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_lt_prog_compiler_static ++ +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no -+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' @@ -47062,43 +37035,39 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_lt_cv_prog_compiler_c_o ++ +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; - --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$archive_cmds_need_lc -+nto-qnx*) -+ version_type=linux ++ ++*nto* | *qnx*) ++ version_type=qnx + 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=yes ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' + ;; - --# Whether or not to disallow shared libs when runtime libs are static. --allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes ++ +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no @@ -47110,10 +37079,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + else + shlibpath_overrides_runpath=yes + fi -+ ;; + ;; --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec +-gnu*) +- version_type=linux +os2*) + libname_spec='$name' + shrext_cmds=".dll" @@ -47122,43 +37091,94 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; - --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec ++ +osf3* | osf4* | osf5*) + version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' + 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' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH + shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; + ;; --# Whether the compiler copes with passing no objects directly. --compiler_needs_object=$lt_compiler_needs_object +-hpux9* | hpux10* | hpux11*) +- # Give a soname corresponding to the major version so that dld.sl refuses to +- # link against other versions. +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- case $host_cpu in +- ia64*) +- shrext_cmds='.so' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.so" +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- if test "X$HPUX_IA64_MODE" = X32; then +- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" +- else +- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" +- fi +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- hppa*64*) +- shrext_cmds='.sl' +- hardcode_into_libs=yes +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" +- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec +- ;; +- *) +- shrext_cmds='.sl' +- dynamic_linker="$host_os dld.sl" +- shlibpath_var=SHLIB_PATH +- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- ;; +- esac +- # HP-UX runs *really* slowly unless shared libraries are mode 555. +- postinstall_cmds='chmod 555 $lib' +rdos*) + dynamic_linker=no -+ ;; + ;; --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds +-interix[3-9]*) +solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no + 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}' + 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 + soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=no + shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' -+ ;; + ;; --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +-irix5* | irix6* | nonstopux*) +- case $host_os in +- nonstopux*) version_type=nonstopux ;; +- *) +- if test "$lt_cv_prog_gnu_ld" = yes; then +- version_type=linux +- else +- version_type=irix +- fi ;; +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' @@ -47170,10 +37190,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + fi + need_version=yes + ;; - --# Commands used to build a shared archive. --archive_cmds=$lt_archive_cmds --archive_expsym_cmds=$lt_archive_expsym_cmds ++ +sysv4 | sysv4.3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -47183,7 +37200,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no -+ export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) @@ -47195,13 +37211,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; -+ esac + esac + ;; - --# Commands used to build a loadable module if different from building --# a shared archive. --module_cmds=$lt_module_cmds --module_expsym_cmds=$lt_module_expsym_cmds ++ +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux @@ -47210,23 +37222,41 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + shlibpath_var=LD_LIBRARY_PATH + fi + ;; - --# Whether we are building with GNU ld or not. --with_gnu_ld=$lt_with_gnu_ld ++ +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' +- case $host_os in +- irix5* | nonstopux*) +- libsuff= shlibsuff= +- ;; +- *) +- case $LD in # libtool.m4 will add one of these switches to LD +- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") +- libsuff= shlibsuff= libmagic=32-bit;; +- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") +- libsuff=32 shlibsuff=N32 libmagic=N32;; +- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") +- libsuff=64 shlibsuff=64 libmagic=64-bit;; +- *) libsuff= shlibsuff= libmagic=never-match;; +- esac +- ;; +- esac +- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes ++ shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" @@ -47234,98 +37264,125 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; + ;; --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag +-# No shared lib support for Linux oldld, aout, or coff. +-linux*oldld* | linux*aout* | linux*coff*) +- dynamic_linker=no +- ;; +- +-# This must be Linux ELF. +-linux* | k*bsd*-gnu) ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + 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' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +- # This implies no fast_install, which is unacceptable. +- # Some rework will be needed to allow for fast_install +- # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ ;; ++ +uts4*) + version_type=linux + 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 + ;; - --# Flag that enforces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag ++ +*) + dynamic_linker=no + ;; +esac -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no - --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+fi - --# If ld is used when linking, flag to hardcode \$libdir into a binary --# during linking. This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+fi - --# Whether we need a single "-rpath" flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator -+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - --# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes --# DIR into the resulting binary. --hardcode_direct=$hardcode_direct ++ +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi - --# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes --# DIR into the resulting binary and the resulting library dependency is --# "absolute",i.e impossible to change by setting \${shlibpath_var} if the --# library is relocated. --hardcode_direct_absolute=$hardcode_direct_absolute -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action_GCJ= -+if test -n "$hardcode_libdir_flag_spec_GCJ" || \ -+ test -n "$runpath_var_GCJ" || \ -+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then - --# Set to "yes" if using the -LDIR flag during linking hardcodes DIR --# into the resulting binary. --hardcode_minus_L=$hardcode_minus_L -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct_GCJ" != no && ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++hardcode_action_CXX= ++if test -n "$hardcode_libdir_flag_spec_CXX" || ++ test -n "$runpath_var_CXX" || ++ test "X$hardcode_automatic_CXX" = "Xyes" ; then ++ ++ # We can hardcode non-existent directories. ++ if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && -+ test "$hardcode_minus_L_GCJ" != no; then ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && ++ test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. -+ hardcode_action_GCJ=relink ++ hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_GCJ=immediate ++ hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. -+ hardcode_action_GCJ=unsupported ++ hardcode_action_CXX=unsupported +fi -+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -+echo "${ECHO_T}$hardcode_action_GCJ" >&6; } - --# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR --# into the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var -+if test "$hardcode_action_GCJ" = relink; then ++{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 ++$as_echo "$hardcode_action_CXX" >&6; } ++ ++if test "$hardcode_action_CXX" = relink || ++ test "$inherit_rpath_CXX" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || @@ -47333,812 +37390,3361 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + # Fast installation is not necessary + enable_fast_install=needless +fi - --# Set to "yes" if building a shared library automatically hardcodes DIR --# into the library and all subsequent libraries and executables linked --# against it. --hardcode_automatic=$hardcode_automatic - --# Set to yes if linker adds runtime paths of dependent libraries --# to runtime path list. --inherit_rpath=$inherit_rpath -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # 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 -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_GCJ \ -+ CC_GCJ \ -+ LD_GCJ \ -+ lt_prog_compiler_wl_GCJ \ -+ lt_prog_compiler_pic_GCJ \ -+ lt_prog_compiler_static_GCJ \ -+ lt_prog_compiler_no_builtin_flag_GCJ \ -+ export_dynamic_flag_spec_GCJ \ -+ thread_safe_flag_spec_GCJ \ -+ whole_archive_flag_spec_GCJ \ -+ enable_shared_with_static_runtimes_GCJ \ -+ old_archive_cmds_GCJ \ -+ old_archive_from_new_cmds_GCJ \ -+ predep_objects_GCJ \ -+ postdep_objects_GCJ \ -+ predeps_GCJ \ -+ postdeps_GCJ \ -+ compiler_lib_search_path_GCJ \ -+ compiler_lib_search_dirs_GCJ \ -+ archive_cmds_GCJ \ -+ archive_expsym_cmds_GCJ \ -+ postinstall_cmds_GCJ \ -+ postuninstall_cmds_GCJ \ -+ old_archive_from_expsyms_cmds_GCJ \ -+ allow_undefined_flag_GCJ \ -+ no_undefined_flag_GCJ \ -+ export_symbols_cmds_GCJ \ -+ hardcode_libdir_flag_spec_GCJ \ -+ hardcode_libdir_flag_spec_ld_GCJ \ -+ hardcode_libdir_separator_GCJ \ -+ hardcode_automatic_GCJ \ -+ 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 + -+ case $var in -+ old_archive_cmds_GCJ | \ -+ old_archive_from_new_cmds_GCJ | \ -+ archive_cmds_GCJ | \ -+ archive_expsym_cmds_GCJ | \ -+ module_cmds_GCJ | \ -+ module_expsym_cmds_GCJ | \ -+ old_archive_from_expsyms_cmds_GCJ | \ -+ export_symbols_cmds_GCJ | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done - --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -+cfgfile="$ofile" - --# Set to "yes" if exported symbols are required. --always_export_symbols=$always_export_symbols -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname - --# The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL - --# Symbols that must always be exported. --include_expsyms=$lt_include_expsyms -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared - --# Commands necessary for linking programs (against libraries) with templates. --prelink_cmds=$lt_prelink_cmds -+# Whether or not to build static libraries. -+build_old_libs=$enable_static - --# Specify filename containing input files. --file_list_spec=$lt_file_list_spec -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_GCJ - --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ - --# The directories searched by this compiler when creating a shared library. --compiler_lib_search_dirs=$lt_compiler_lib_search_dirs -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install - --# Dependencies to place before and after the objects being linked to --# create a shared library. --predep_objects=$lt_predep_objects --postdep_objects=$lt_postdep_objects --predeps=$lt_predeps --postdeps=$lt_postdeps -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os - --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_compiler_lib_search_path -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - --# ### END LIBTOOL CONFIG -+# An echo program that does not interpret backslashes. -+echo=$lt_echo - --_LT_EOF -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS - -- case $host_os in -- aix3*) -- cat <<\_LT_EOF >> "$cfgfile" --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES --fi --_LT_EOF -- ;; -- esac -+# A C compiler. -+LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS - --ltmain="$ac_aux_dir/ltmain.sh" -+# A language-specific compiler. -+CC=$lt_compiler_GCJ - -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_GCJ - -- # We use sed instead of cat because bash on DJGPP gets confused if -- # if finds mixed CR/LF and LF-only lines. Since sed operates in -- # text mode, it properly converts lines to CR/LF. This bash problem -- # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+# An ERE matcher. -+EGREP=$lt_EGREP - -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -+# The linker used to build libraries. -+LD=$lt_LD_GCJ - --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S - --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -+# A BSD-compatible nm program. -+NM=$lt_NM - --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -+# A symbol stripping program -+STRIP=$lt_STRIP - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" - --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -+# Used on cygwin: assembler. -+AS="$AS" - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds - --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_GCJ - --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} -+# Object file suffix (normally "o"). -+objext="$ac_objext" - --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` --} -+# Old archive suffix (normally "a"). -+libext="$libext" - -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -- esac --} -+# Executable file suffix (normally ""). -+exeext="$exeext" - --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_GCJ -+pic_mode=$pic_mode - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` --} -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` --} -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` --} -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "$@"` --} -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -+# Do we need a version for libraries? -+need_version=$need_version - --_LT_EOF --esac -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen - --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self - --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "$1=\$$1\$2" --} -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static - --_LT_EOF -- ;; -- esac -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_GCJ - -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ - -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ - -- mv -f "$cfgfile" "$ofile" || -- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -- chmod +x "$ofile" -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ - -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ - -- cat <<_LT_EOF >> "$ofile" -+# Library versioning type. -+version_type=$version_type - --# ### BEGIN LIBTOOL TAG CONFIG: CXX -+# Format of library name prefix. -+libname_spec=$lt_libname_spec - --# The linker used to build libraries. --LD=$lt_LD_CXX -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec - --# Commands used to build an old-style archive. --old_archive_cmds=$lt_old_archive_cmds_CXX -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec - --# A language specific compiler. --CC=$lt_compiler_CXX -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_GCJ -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds - --# Is the compiler the GNU compiler? --with_gcc=$GCC_CXX -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ - --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_CXX -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_GCJ -+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds - --# Additional compiler flags for building library objects. --pic_flag=$lt_lt_prog_compiler_pic_CXX -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_GCJ -+module_expsym_cmds=$lt_module_expsym_cmds_GCJ - --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_lt_prog_compiler_static_CXX -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_GCJ + -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_GCJ + -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_GCJ + -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_GCJ + -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ - --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$archive_cmds_need_lc_CXX -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ - --# Whether or not to disallow shared libs when runtime libs are static. --allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method - --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd - --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX -- --# Whether the compiler copes with passing no objects directly. --compiler_needs_object=$lt_compiler_needs_object_CXX -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_GCJ - --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_GCJ - --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds - --# Commands used to build a shared archive. --archive_cmds=$lt_archive_cmds_CXX --archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval - --# Commands used to build a loadable module if different from building --# a shared archive. --module_cmds=$lt_module_cmds_CXX --module_expsym_cmds=$lt_module_expsym_cmds_CXX -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - --# Whether we are building with GNU ld or not. --with_gnu_ld=$lt_with_gnu_ld_CXX -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag_CXX -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - --# Flag that enforces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag_CXX -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var - --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var - --# If ld is used when linking, flag to hardcode \$libdir into a binary --# during linking. This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath - --# Whether we need a single "-rpath" flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_GCJ - --# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes --# DIR into the resulting binary. --hardcode_direct=$hardcode_direct_CXX -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs - --# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes --# DIR into the resulting binary and the resulting library dependency is --# "absolute",i.e impossible to change by setting \${shlibpath_var} if the --# library is relocated. --hardcode_direct_absolute=$hardcode_direct_absolute_CXX -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ - --# Set to "yes" if using the -LDIR flag during linking hardcodes DIR --# into the resulting binary. --hardcode_minus_L=$hardcode_minus_L_CXX -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ + -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ + -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct_GCJ ++ fi # test -n "$compiler" + -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L_GCJ ++ CC=$lt_save_CC ++ LDCXX=$LD ++ LD=$lt_save_LD ++ GCC=$lt_save_GCC ++ with_gnu_ld=$lt_save_with_gnu_ld ++ lt_cv_path_LDCXX=$lt_cv_path_LD ++ lt_cv_path_LD=$lt_save_path_LD ++ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++fi # test "$_lt_caught_CXX_error" != yes + -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_GCJ - --# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR --# into the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" - --# Set to "yes" if building a shared library automatically hardcodes DIR --# into the library and all subsequent libraries and executables linked --# against it. --hardcode_automatic=$hardcode_automatic_CXX -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_GCJ - --# Set to yes if linker adds runtime paths of dependent libraries --# to runtime path list. --inherit_rpath=$inherit_rpath_CXX -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs_CXX -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_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 -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols_GCJ - - # The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds_CXX -+export_symbols_cmds=$lt_export_symbols_cmds_GCJ -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds - - # Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms_CXX -+exclude_expsyms=$lt_exclude_expsyms_GCJ - - # Symbols that must always be exported. --include_expsyms=$lt_include_expsyms_CXX -+include_expsyms=$lt_include_expsyms_GCJ - --# Commands necessary for linking programs (against libraries) with templates. --prelink_cmds=$lt_prelink_cmds_CXX -+# ### END LIBTOOL TAG CONFIG: $tagname - --# Specify filename containing input files. --file_list_spec=$lt_file_list_spec_CXX -+__EOF__ - --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action_CXX - --# The directories searched by this compiler when creating a shared library. --compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX -+else -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi -+fi - --# Dependencies to place before and after the objects being linked to --# create a shared library. --predep_objects=$lt_predep_objects_CXX --postdep_objects=$lt_postdep_objects_CXX --predeps=$lt_predeps_CXX --postdeps=$lt_postdeps_CXX - --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ac_config_commands="$ac_config_commands libtool" ++ ++ ++ ++ ++# Only expand once: ++ ++ ++: ${CONFIG_LT=./config.lt} ++{ $as_echo "$as_me:$LINENO: creating $CONFIG_LT" >&5 ++$as_echo "$as_me: creating $CONFIG_LT" >&6;} ++cat >"$CONFIG_LT" <<_LTEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate a libtool stub with the current configuration. ++ ++lt_cl_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# 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=: ++ # Pre-4.2 versions of Zsh do 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 ++ ++ ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++as_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' ++ else ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' ++ fi ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } ++fi ++ ++# Support unset when possible. ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# CDPATH. ++$as_unset CDPATH ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | ++ sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno ++ N ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ ++ t loop ++ s/-\n.*// ++ ' >$as_me.lineno && ++ chmod +x "$as_me.lineno" || ++ { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 ++$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi --# ### END LIBTOOL TAG CONFIG: CXX --_LT_EOF -+CC="$lt_save_CC" +- # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir 2>/dev/null ++fi ++if (echo >conf$$.file) 2>/dev/null; then ++ if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++ elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++ else ++ as_ln_s='cp -p' + fi ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null -+ else -+ tagname="" -+ fi -+ ;; +- # We used to test for /lib/ld.so.1 and disable shared libraries on +- # powerpc, because MkLinux only supported shared libraries with the +- # GNU dynamic linker. Since this was broken with cross compilers, +- # most powerpc-linux boxes support dynamic linking these days and +- # people can always --disable-shared, the test was removed, and we +- # assume the GNU/Linux dynamic linker is in use. +- dynamic_linker='GNU/Linux ld.so' +- ;; ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false ++fi --{ (exit 0); exit 0; } --_LTEOF --chmod +x "$CONFIG_LT" -+ RC) +-netbsd*) +- version_type=sunos +- need_lib_prefix=no +- need_version=no +- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- dynamic_linker='NetBSD (a.out) ld.so' ++if test -x / >/dev/null 2>&1; then ++ as_test_x='test -x' ++else ++ if ls -dL / >/dev/null 2>&1; then ++ as_ls_L_option=L + else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- dynamic_linker='NetBSD ld.elf_so' ++ as_ls_L_option= + fi +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- hardcode_into_libs=yes +- ;; ++ 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 ++as_executable_p=$as_test_x --# configure is writing to config.log, but config.lt does its own redirection, --# appending to config.log, which fails on DOS, as config.log is still kept --# open by configure. Here we exec the FD to /dev/null, effectively closing --# config.log, so it can be properly (re)opened and appended to by config.lt. --if test "$no_create" != yes; then -- lt_cl_success=: -- test "$silent" = yes && -- lt_config_lt_args="$lt_config_lt_args --quiet" -- exec 5>/dev/null -- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -- exec 5>>config.log -- $lt_cl_success || { (exit 1); exit 1; } +-newsos6) +- version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- ;; ++# 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'" + +-nto-qnx*) +- 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=yes +- ;; ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + +-openbsd*) +- version_type=sunos +- sys_lib_dlsearch_path_spec="/usr/lib" +- need_lib_prefix=no +- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. +- case $host_os in +- openbsd3.3 | openbsd3.3.*) need_version=yes ;; +- *) need_version=no ;; +- esac +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +- case $host_os in +- openbsd2.[89] | openbsd2.[89].*) +- shlibpath_overrides_runpath=no +- ;; +- *) +- shlibpath_overrides_runpath=yes +- ;; +- esac +- else +- shlibpath_overrides_runpath=yes +- fi +- ;; + +-os2*) +- libname_spec='$name' +- shrext_cmds=".dll" +- need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' +- dynamic_linker='OS/2 ld.exe' +- shlibpath_var=LIBPATH +- ;; + +-osf3* | osf4* | osf5*) +- version_type=osf +- need_lib_prefix=no +- need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- shlibpath_var=LD_LIBRARY_PATH +- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" +- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +- ;; ++exec 6>&1 ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## ++_ASBOX ++} >&5 + +-rdos*) +- dynamic_linker=no +- ;; ++lt_cl_help="\ ++\`$as_me' creates a local libtool stub from the current configuration, ++for use in further configure time tests before the real libtool is ++generated. ++ ++Usage: $0 [OPTIONS] ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ ++Report bugs to <bug-libtool@gnu.org>." ++ ++lt_cl_version="\ ++gtk+ config.lt 2.14.7 ++configured by $0, generated by GNU Autoconf 2.63. + +-solaris*) +- 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=yes +- hardcode_into_libs=yes +- # ldd complains unless libraries are executable +- postinstall_cmds='chmod +x $lib' +- ;; ++Copyright (C) 2008 Free Software Foundation, Inc. ++This config.lt script is free software; the Free Software Foundation ++gives unlimited permision to copy, distribute and modify it." + +-sunos4*) +- version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' +- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' +- shlibpath_var=LD_LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- if test "$with_gnu_ld" = yes; then +- need_lib_prefix=no +- fi +- need_version=yes +- ;; ++while test $# != 0 ++do ++ case $1 in ++ --version | --v* | -V ) ++ echo "$lt_cl_version"; exit 0 ;; ++ --help | --h* | -h ) ++ echo "$lt_cl_help"; exit 0 ;; ++ --debug | --d* | -d ) ++ debug=: ;; ++ --quiet | --q* | --silent | --s* | -q ) ++ lt_cl_silent=: ;; ++ ++ -*) { { $as_echo "$as_me:$LINENO: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&5 ++$as_echo "$as_me: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&2;} ++ { (exit 1); exit 1; }; } ;; + +-sysv4 | sysv4.3*) +- version_type=linux +- 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 +- case $host_vendor in +- sni) +- shlibpath_overrides_runpath=no +- need_lib_prefix=no +- export_dynamic_flag_spec='${wl}-Blargedynsym' +- runpath_var=LD_RUN_PATH +- ;; +- siemens) +- need_lib_prefix=no +- ;; +- motorola) +- need_lib_prefix=no +- need_version=no +- shlibpath_overrides_runpath=no +- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' +- ;; ++ *) { { $as_echo "$as_me:$LINENO: error: unrecognized argument: $1 ++Try \`$0 --help' for more information." >&5 ++$as_echo "$as_me: error: unrecognized argument: $1 ++Try \`$0 --help' for more information." >&2;} ++ { (exit 1); exit 1; }; } ;; + esac +- ;; ++ shift ++done + +-sysv4*MP*) +- if test -d /usr/nec ;then +- version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' +- shlibpath_var=LD_LIBRARY_PATH +- fi +- ;; ++if $lt_cl_silent; then ++ exec 6>/dev/null ++fi ++_LTEOF + +-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +- version_type=freebsd-elf +- need_lib_prefix=no +- need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' +- shlibpath_var=LD_LIBRARY_PATH +- hardcode_into_libs=yes +- if test "$with_gnu_ld" = yes; then +- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' +- shlibpath_overrides_runpath=no +- else +- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' +- shlibpath_overrides_runpath=yes +- case $host_os in +- sco3.2v5*) +- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" +- ;; ++cat >>"$CONFIG_LT" <<_LTEOF ++ ++ ++# 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 ++ ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' ++AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' ++OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' ++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' ++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' ++pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' ++enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' ++host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' ++host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' ++host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' ++build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' ++build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' ++build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' ++SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' ++Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' ++GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' ++EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' ++FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' ++LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' ++NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' ++LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' ++max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' ++ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' ++exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' ++lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' ++lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' ++lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' ++reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' ++reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' ++file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' ++AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' ++AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' ++STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' ++RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' ++old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' ++CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' ++compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' ++GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' ++objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' ++SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' ++ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' ++MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' ++need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' ++DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' ++NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' ++LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' ++OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' ++OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' ++libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' ++shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' ++export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' ++allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' ++no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' ++inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' ++link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' ++fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' ++always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' ++export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' ++include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' ++prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' ++variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' ++need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' ++need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' ++version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' ++runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' ++libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' ++library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' ++soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' ++postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' ++sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' ++sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' ++old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' ++striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' ++predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' ++postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' ++predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' ++postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' ++LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++ ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# Quote evaled strings. ++for var in SED \ ++GREP \ ++EGREP \ ++FGREP \ ++LD \ ++NM \ ++LN_S \ ++lt_SP2NL \ ++lt_NL2SP \ ++reload_flag \ ++deplibs_check_method \ ++file_magic_cmd \ ++AR \ ++AR_FLAGS \ ++STRIP \ ++RANLIB \ ++CC \ ++CFLAGS \ ++compiler \ ++lt_cv_sys_global_symbol_pipe \ ++lt_cv_sys_global_symbol_to_cdecl \ ++lt_cv_sys_global_symbol_to_c_name_address \ ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ ++SHELL \ ++ECHO \ ++lt_prog_compiler_no_builtin_flag \ ++lt_prog_compiler_wl \ ++lt_prog_compiler_pic \ ++lt_prog_compiler_static \ ++lt_cv_prog_compiler_c_o \ ++need_locks \ ++DSYMUTIL \ ++NMEDIT \ ++LIPO \ ++OTOOL \ ++OTOOL64 \ ++shrext_cmds \ ++export_dynamic_flag_spec \ ++whole_archive_flag_spec \ ++compiler_needs_object \ ++with_gnu_ld \ ++allow_undefined_flag \ ++no_undefined_flag \ ++hardcode_libdir_flag_spec \ ++hardcode_libdir_flag_spec_ld \ ++hardcode_libdir_separator \ ++fix_srcfile_path \ ++exclude_expsyms \ ++include_expsyms \ ++file_list_spec \ ++variables_saved_for_relink \ ++libname_spec \ ++library_names_spec \ ++soname_spec \ ++finish_eval \ ++old_striplib \ ++striplib \ ++compiler_lib_search_dirs \ ++predep_objects \ ++postdep_objects \ ++predeps \ ++postdeps \ ++compiler_lib_search_path \ ++LD_CXX \ ++compiler_CXX \ ++lt_prog_compiler_no_builtin_flag_CXX \ ++lt_prog_compiler_wl_CXX \ ++lt_prog_compiler_pic_CXX \ ++lt_prog_compiler_static_CXX \ ++lt_cv_prog_compiler_c_o_CXX \ ++export_dynamic_flag_spec_CXX \ ++whole_archive_flag_spec_CXX \ ++compiler_needs_object_CXX \ ++with_gnu_ld_CXX \ ++allow_undefined_flag_CXX \ ++no_undefined_flag_CXX \ ++hardcode_libdir_flag_spec_CXX \ ++hardcode_libdir_flag_spec_ld_CXX \ ++hardcode_libdir_separator_CXX \ ++fix_srcfile_path_CXX \ ++exclude_expsyms_CXX \ ++include_expsyms_CXX \ ++file_list_spec_CXX \ ++compiler_lib_search_dirs_CXX \ ++predep_objects_CXX \ ++postdep_objects_CXX \ ++predeps_CXX \ ++postdeps_CXX \ ++compiler_lib_search_path_CXX; do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[\\\\\\\`\\"\\\$]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; + esac +- fi +- sys_lib_dlsearch_path_spec='/usr/lib' +- ;; ++done + +-uts4*) +- version_type=linux +- 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 +- ;; ++# Double-quote double-evaled strings. ++for var in reload_cmds \ ++old_postinstall_cmds \ ++old_postuninstall_cmds \ ++old_archive_cmds \ ++extract_expsyms_cmds \ ++old_archive_from_new_cmds \ ++old_archive_from_expsyms_cmds \ ++archive_cmds \ ++archive_expsym_cmds \ ++module_cmds \ ++module_expsym_cmds \ ++export_symbols_cmds \ ++prelink_cmds \ ++postinstall_cmds \ ++postuninstall_cmds \ ++finish_cmds \ ++sys_lib_search_path_spec \ ++sys_lib_dlsearch_path_spec \ ++old_archive_cmds_CXX \ ++old_archive_from_new_cmds_CXX \ ++old_archive_from_expsyms_cmds_CXX \ ++archive_cmds_CXX \ ++archive_expsym_cmds_CXX \ ++module_cmds_CXX \ ++module_expsym_cmds_CXX \ ++export_symbols_cmds_CXX \ ++prelink_cmds_CXX; do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[\\\\\\\`\\"\\\$]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done + +-*) +- dynamic_linker=no ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-$as_echo "$dynamic_linker" >&6; } +-test "$dynamic_linker" = no && can_build_shared=no + +-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" +-fi ++ac_aux_dir='$ac_aux_dir' ++xsi_shell='$xsi_shell' ++lt_shell_append='$lt_shell_append' + +-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST + fi + +-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +-variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +-if test "$GCC" = yes; then +- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +-fi ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile' + +-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +-hardcode_action_GCJ= +-if test -n "$hardcode_libdir_flag_spec_GCJ" || \ +- test -n "$runpath_var_GCJ" || \ +- test "X$hardcode_automatic_GCJ" = "Xyes" ; then + +- # We can hardcode non-existant directories. +- if test "$hardcode_direct_GCJ" != no && +- # If the only mechanism to avoid hardcoding is shlibpath_var, we +- # have to relink, otherwise we might link with an installed library +- # when we should be linking with a yet-to-be-installed one +- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && +- test "$hardcode_minus_L_GCJ" != no; then +- # Linking always hardcodes the temporary library directory. +- hardcode_action_GCJ=relink +- else +- # We can link without hardcoding, and we can hardcode nonexisting dirs. +- hardcode_action_GCJ=immediate +- fi +-else +- # We cannot hardcode anything, or else we can only hardcode existing +- # directories. +- hardcode_action_GCJ=unsupported +-fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +-$as_echo "$hardcode_action_GCJ" >&6; } + +-if test "$hardcode_action_GCJ" = relink; then +- # Fast installation is not supported +- enable_fast_install=no +-elif test "$shlibpath_overrides_runpath" = yes || +- test "$enable_shared" = no; then +- # Fast installation is not necessary +- enable_fast_install=needless -fi -+# Source file extension for RC test sources. -+ac_ext=rc -+# Object file extension for compiled RC test sources. -+objext=o -+objext_RC=$objext +-# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # 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 +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- compiler_GCJ \ +- CC_GCJ \ +- LD_GCJ \ +- lt_prog_compiler_wl_GCJ \ +- lt_prog_compiler_pic_GCJ \ +- lt_prog_compiler_static_GCJ \ +- lt_prog_compiler_no_builtin_flag_GCJ \ +- export_dynamic_flag_spec_GCJ \ +- thread_safe_flag_spec_GCJ \ +- whole_archive_flag_spec_GCJ \ +- enable_shared_with_static_runtimes_GCJ \ +- old_archive_cmds_GCJ \ +- old_archive_from_new_cmds_GCJ \ +- predep_objects_GCJ \ +- postdep_objects_GCJ \ +- predeps_GCJ \ +- postdeps_GCJ \ +- compiler_lib_search_path_GCJ \ +- compiler_lib_search_dirs_GCJ \ +- archive_cmds_GCJ \ +- archive_expsym_cmds_GCJ \ +- postinstall_cmds_GCJ \ +- postuninstall_cmds_GCJ \ +- old_archive_from_expsyms_cmds_GCJ \ +- allow_undefined_flag_GCJ \ +- no_undefined_flag_GCJ \ +- export_symbols_cmds_GCJ \ +- hardcode_libdir_flag_spec_GCJ \ +- hardcode_libdir_flag_spec_ld_GCJ \ +- hardcode_libdir_separator_GCJ \ +- hardcode_automatic_GCJ \ +- 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 +- +- case $var in +- old_archive_cmds_GCJ | \ +- old_archive_from_new_cmds_GCJ | \ +- archive_cmds_GCJ | \ +- archive_expsym_cmds_GCJ | \ +- module_cmds_GCJ | \ +- module_expsym_cmds_GCJ | \ +- old_archive_from_expsyms_cmds_GCJ | \ +- export_symbols_cmds_GCJ | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++{ $as_echo "$as_me:$LINENO: creating $ofile" >&5 ++$as_echo "$as_me: creating $ofile" >&6;} + +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` +- ;; +- esac + +-cfgfile="$ofile" ++ # 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 ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" + +- cat <<__EOF__ >> "$cfgfile" +-# ### BEGIN LIBTOOL TAG CONFIG: $tagname ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL + ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION + # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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 General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL + +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared ++# The names of the tagged configurations supported by this script. ++available_tags="CXX " ++ ++# ### BEGIN LIBTOOL CONFIG + + # Whether or not to build static libraries. + build_old_libs=$enable_static + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_GCJ ++# Assembler program. ++AS=$AS ++ ++# DLL creation program. ++DLLTOOL=$DLLTOOL ++ ++# Object dumper program. ++OBJDUMP=$OBJDUMP ++ ++# Which release of libtool.m4 was used? ++macro_version=$macro_version ++macro_revision=$macro_revision ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared + +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ ++# What type of objects to build. ++pic_mode=$pic_mode + + # Whether or not to optimize for fast installation. + fast_install=$enable_fast_install +@@ -19915,1173 +16954,1671 @@ + build=$build + build_os=$build_os + +-# An echo program that does not interpret backslashes. +-echo=$lt_echo ++# A sed program that does not truncate output. ++SED=$lt_SED ++ ++# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++Xsed="\$SED -e 1s/^X//" ++ ++# A grep program that handles long lines. ++GREP=$lt_GREP ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# A literal string matcher. ++FGREP=$lt_FGREP ++ ++# A BSD- or MS-compatible name lister. ++NM=$lt_NM ++ ++# Whether we need soft or hard links. ++LN_S=$lt_LN_S ++ ++# What is the maximum length of a command? ++max_cmd_len=$max_cmd_len ++ ++# Object file suffix (normally "o"). ++objext=$ac_objext ++ ++# Executable file suffix (normally ""). ++exeext=$exeext ++ ++# whether the shell understands "unset". ++lt_unset=$lt_unset ++ ++# turn spaces into newlines. ++SP2NL=$lt_lt_SP2NL ++ ++# turn newlines into spaces. ++NL2SP=$lt_lt_NL2SP ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == "file_magic". ++file_magic_cmd=$lt_file_magic_cmd + + # The archiver. + AR=$lt_AR + AR_FLAGS=$lt_AR_FLAGS + ++# A symbol stripping program. ++STRIP=$lt_STRIP ++ ++# Commands used to install an old-style archive. ++RANLIB=$lt_RANLIB ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ + # A C compiler. +-LTCC=$lt_LTCC ++LTCC=$lt_CC + + # LTCC compiler flags. +-LTCFLAGS=$lt_LTCFLAGS ++LTCFLAGS=$lt_CFLAGS + +-# A language-specific compiler. +-CC=$lt_compiler_GCJ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC_GCJ ++# Transform the output of nm in a proper C declaration. ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +-# An ERE matcher. +-EGREP=$lt_EGREP ++# Transform the output of nm in a C name address pair. ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +-# The linker used to build libraries. +-LD=$lt_LD_GCJ ++# Transform the output of nm in a C name address pair when lib prefix is needed. ++global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir + +-# A BSD-compatible nm program. +-NM=$lt_NM ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL + +-# A symbol stripping program +-STRIP=$lt_STRIP ++# An echo program that does not interpret backslashes. ++ECHO=$lt_ECHO + +-# Used to examine libraries when file_magic_cmd begins "file" ++# Used to examine libraries when file_magic_cmd begins with "file". + MAGIC_CMD=$MAGIC_CMD + +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Tool to manipulate archived DWARF debug symbol files on Mac OS X. ++DSYMUTIL=$lt_DSYMUTIL + +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" ++# Tool to change global to local symbols on Mac OS X. ++NMEDIT=$lt_NMEDIT + +-# Used on cygwin: assembler. +-AS="$AS" ++# Tool to manipulate fat objects and archives on Mac OS X. ++LIPO=$lt_LIPO + +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir ++# ldd/readelf like tool for Mach-O binaries on Mac OS X. ++OTOOL=$lt_OTOOL + +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds ++# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. ++OTOOL64=$lt_OTOOL64 ++ ++# Old archive suffix (normally "a"). ++libext=$libext ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds=$lt_shrext_cmds ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at link time. ++variables_saved_for_relink=$lt_variables_saved_for_relink ++ ++# Do we need the "lib" prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# Shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Command to use after installation of a shared archive. ++postinstall_cmds=$lt_postinstall_cmds ++ ++# Command to use after uninstallation of a shared archive. ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# As "finish_cmds", except a single script fragment to be evaled but ++# not shown. ++finish_eval=$lt_finish_eval ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Compile-time system search path for libraries. ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries. ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++ ++# The linker used to build libraries. ++LD=$lt_LD ++ ++# Commands used to build an old-style archive. ++old_archive_cmds=$lt_old_archive_cmds ++ ++# A language specific compiler. ++CC=$lt_compiler ++ ++# Is the compiler the GNU compiler? ++with_gcc=$GCC ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + + # How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_GCJ ++wl=$lt_lt_prog_compiler_wl ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc ++ ++# Whether or not to disallow shared libs when runtime libs are static. ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec ++ ++# Whether the compiler copes with passing no objects directly. ++compiler_needs_object=$lt_compiler_needs_object ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds ++ ++# Commands used to build a shared archive. ++archive_cmds=$lt_archive_cmds ++archive_expsym_cmds=$lt_archive_expsym_cmds ++ ++# Commands used to build a loadable module if different from building ++# a shared archive. ++module_cmds=$lt_module_cmds ++module_expsym_cmds=$lt_module_expsym_cmds ++ ++# Whether we are building with GNU ld or not. ++with_gnu_ld=$lt_with_gnu_ld ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag + +-# Object file suffix (normally "o"). +-objext="$ac_objext" ++# Flag that enforces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag + +-# Old archive suffix (normally "a"). +-libext="$libext" ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' ++# If ld is used when linking, flag to hardcode \$libdir into a binary ++# during linking. This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld + +-# Executable file suffix (normally ""). +-exeext="$exeext" ++# Whether we need a single "-rpath" flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_GCJ +-pic_mode=$pic_mode ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary. ++hardcode_direct=$hardcode_direct + +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary and the resulting library dependency is ++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the ++# library is relocated. ++hardcode_direct_absolute=$hardcode_direct_absolute + +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ ++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++# into the resulting binary. ++hardcode_minus_L=$hardcode_minus_L + +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks ++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++# into the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var + +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix ++# Set to "yes" if building a shared library automatically hardcodes DIR ++# into the library and all subsequent libraries and executables linked ++# against it. ++hardcode_automatic=$hardcode_automatic + +-# Do we need a version for libraries? +-need_version=$need_version ++# Set to yes if linker adds runtime paths of dependent libraries ++# to runtime path list. ++inherit_rpath=$inherit_rpath + +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs + +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path + +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static ++# Set to "yes" if exported symbols are required. ++always_export_symbols=$always_export_symbols + +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_GCJ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds + +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms + +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms + +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ ++# Commands necessary for linking programs (against libraries) with templates. ++prelink_cmds=$lt_prelink_cmds + +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ ++# Specify filename containing input files. ++file_list_spec=$lt_file_list_spec + +-# Library versioning type. +-version_type=$version_type ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action + +-# Format of library name prefix. +-libname_spec=$lt_libname_spec ++# The directories searched by this compiler when creating a shared library. ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs + +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec ++# Dependencies to place before and after the objects being linked to ++# create a shared library. ++predep_objects=$lt_predep_objects ++postdep_objects=$lt_postdep_objects ++predeps=$lt_predeps ++postdeps=$lt_postdeps + +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path + +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds_GCJ +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds ++# ### END LIBTOOL CONFIG + +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ ++_LT_EOF + +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac + +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds_GCJ +-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds + +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds_GCJ +-module_expsym_cmds=$lt_module_expsym_cmds_GCJ ++ltmain="$ac_aux_dir/ltmain.sh" + +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib + +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects_GCJ +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects_GCJ +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps_GCJ +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps_GCJ +- +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ ++ case $xsi_shell in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" + +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++} + +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd ++# func_basename file ++func_basename () ++{ ++ func_basename_result="${1##*/}" ++} + +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_GCJ ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}" ++} + +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_GCJ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++func_stripname () ++{ ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"} ++} + +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=${1%%=*} ++ func_opt_split_arg=${1#*=} ++} + +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval ++# func_lo2o object ++func_lo2o () ++{ ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac ++} + +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=${1%.*}.lo ++} + +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=$(( $* )) ++} + +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=${#1} ++} + +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var ++_LT_EOF ++ ;; ++ *) # Bourne compatible functions. ++ cat << \_LT_EOF >> "$cfgfile" + +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} + +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++} + +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_GCJ + +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; ++ esac ++} + +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ ++# sed scripts: ++my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' ++my_sed_long_arg='1s/^-[^=]*=//' + +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct_GCJ +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L_GCJ +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic_GCJ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` ++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` ++} + +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` ++} + +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_GCJ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` ++} + +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "$@"` ++} + +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` ++} + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path ++_LT_EOF ++esac + +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols_GCJ ++case $lt_shell_append in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1+=\$2" ++} ++_LT_EOF ++ ;; ++ *) ++ cat << \_LT_EOF >> "$cfgfile" + +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_GCJ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1=\$$1\$2" ++} + +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds ++_LT_EOF ++ ;; ++ esac + +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_GCJ + +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_GCJ ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) + +-# ### END LIBTOOL TAG CONFIG: $tagname ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" + +-__EOF__ + ++ cat <<_LT_EOF >> "$ofile" + +-else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi +-fi ++# ### BEGIN LIBTOOL TAG CONFIG: CXX + ++# The linker used to build libraries. ++LD=$lt_LD_CXX + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu ++# Commands used to build an old-style archive. ++old_archive_cmds=$lt_old_archive_cmds_CXX + +-CC="$lt_save_CC" ++# A language specific compiler. ++CC=$lt_compiler_CXX + +- else +- tagname="" +- fi +- ;; ++# Is the compiler the GNU compiler? ++with_gcc=$GCC_CXX + +- RC) ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_CXX + +-# Source file extension for RC test sources. +-ac_ext=rc ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic_CXX + +-# Object file extension for compiled RC test sources. +-objext=o +-objext_RC=$objext ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static_CXX + +-# Code to be used in simple compile tests +-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX + +-# Code to be used in simple link tests +-lt_simple_link_test_code="$lt_simple_compile_test_code" ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc_CXX + +-# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++# Whether or not to disallow shared libs when runtime libs are static. ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX + +-# If no C compiler was specified, use CC. +-LTCC=${LTCC-"$CC"} ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX + +-# If no C compiler flags were specified, use CFLAGS. +-LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX + +-# Allow CC to be a program name with arguments. +-compiler=$CC ++# Whether the compiler copes with passing no objects directly. ++compiler_needs_object=$lt_compiler_needs_object_CXX + ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX + +-# save warnings/boilerplate of simple test code +-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* ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX + +-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 -r conftest* ++# Commands used to build a shared archive. ++archive_cmds=$lt_archive_cmds_CXX ++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX + ++# Commands used to build a loadable module if different from building ++# a shared archive. ++module_cmds=$lt_module_cmds_CXX ++module_expsym_cmds=$lt_module_expsym_cmds_CXX + +-# Allow CC to be a program name with arguments. +-lt_save_CC="$CC" +-CC=${RC-"windres"} +-compiler=$CC +-compiler_RC=$CC +-for cc_temp in $compiler""; do +- case $cc_temp in +- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; +- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; +- \-*) ;; +- *) break;; +- esac +-done +-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++# Whether we are building with GNU ld or not. ++with_gnu_ld=$lt_with_gnu_ld_CXX + +-lt_cv_prog_compiler_c_o_RC=yes ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag_CXX + +-# The else clause should only fire when bootstrapping the +-# libtool distribution, otherwise you forgot to ship ltmain.sh +-# with your package, and you will get complaints that there are +-# no rules to generate ltmain.sh. +-if test -f "$ltmain"; then +- # 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 +- setopt NO_GLOB_SUBST +- fi +- # Now quote all the things that may contain metacharacters while being +- # careful not to overquote the AC_SUBSTed values. We take copies of the +- # variables and quote the copies for generation of the libtool script. +- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ +- SED SHELL STRIP \ +- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ +- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ +- deplibs_check_method reload_flag reload_cmds need_locks \ +- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ +- lt_cv_sys_global_symbol_to_c_name_address \ +- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ +- old_postinstall_cmds old_postuninstall_cmds \ +- compiler_RC \ +- CC_RC \ +- LD_RC \ +- lt_prog_compiler_wl_RC \ +- lt_prog_compiler_pic_RC \ +- lt_prog_compiler_static_RC \ +- lt_prog_compiler_no_builtin_flag_RC \ +- export_dynamic_flag_spec_RC \ +- thread_safe_flag_spec_RC \ +- whole_archive_flag_spec_RC \ +- enable_shared_with_static_runtimes_RC \ +- old_archive_cmds_RC \ +- old_archive_from_new_cmds_RC \ +- predep_objects_RC \ +- postdep_objects_RC \ +- predeps_RC \ +- postdeps_RC \ +- compiler_lib_search_path_RC \ +- compiler_lib_search_dirs_RC \ +- archive_cmds_RC \ +- archive_expsym_cmds_RC \ +- postinstall_cmds_RC \ +- postuninstall_cmds_RC \ +- old_archive_from_expsyms_cmds_RC \ +- allow_undefined_flag_RC \ +- no_undefined_flag_RC \ +- export_symbols_cmds_RC \ +- hardcode_libdir_flag_spec_RC \ +- hardcode_libdir_flag_spec_ld_RC \ +- hardcode_libdir_separator_RC \ +- hardcode_automatic_RC \ +- 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 +- +- case $var in +- old_archive_cmds_RC | \ +- old_archive_from_new_cmds_RC | \ +- archive_cmds_RC | \ +- archive_expsym_cmds_RC | \ +- module_cmds_RC | \ +- module_expsym_cmds_RC | \ +- old_archive_from_expsyms_cmds_RC | \ +- export_symbols_cmds_RC | \ +- extract_expsyms_cmds | reload_cmds | finish_cmds | \ +- postinstall_cmds | postuninstall_cmds | \ +- old_postinstall_cmds | old_postuninstall_cmds | \ +- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) +- # Double-quote double-evaled strings. +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" +- ;; +- *) +- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" +- ;; +- esac +- done ++# Flag that enforces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag_CXX + +- case $lt_echo in +- *'\$0 --fallback-echo"') +- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` +- ;; +- esac ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX + +-cfgfile="$ofile" ++# If ld is used when linking, flag to hardcode \$libdir into a binary ++# during linking. This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX + +- cat <<__EOF__ >> "$cfgfile" +-# ### BEGIN LIBTOOL TAG CONFIG: $tagname ++# Whether we need a single "-rpath" flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX + +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary. ++hardcode_direct=$hardcode_direct_CXX + +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary and the resulting library dependency is ++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the ++# library is relocated. ++hardcode_direct_absolute=$hardcode_direct_absolute_CXX + +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared ++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++# into the resulting binary. ++hardcode_minus_L=$hardcode_minus_L_CXX + +-# Whether or not to build static libraries. +-build_old_libs=$enable_static ++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++# into the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX + +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_RC ++# Set to "yes" if building a shared library automatically hardcodes DIR ++# into the library and all subsequent libraries and executables linked ++# against it. ++hardcode_automatic=$hardcode_automatic_CXX + +-# Whether or not to disallow shared libs when runtime libs are static +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC ++# Set to yes if linker adds runtime paths of dependent libraries ++# to runtime path list. ++inherit_rpath=$inherit_rpath_CXX + +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs_CXX + +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path_CXX + +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os ++# Set to "yes" if exported symbols are required. ++always_export_symbols=$always_export_symbols_CXX + +-# An echo program that does not interpret backslashes. +-echo=$lt_echo ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds_CXX + +-# The archiver. +-AR=$lt_AR +-AR_FLAGS=$lt_AR_FLAGS ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms_CXX + +-# A C compiler. +-LTCC=$lt_LTCC ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms_CXX + +-# LTCC compiler flags. +-LTCFLAGS=$lt_LTCFLAGS ++# Commands necessary for linking programs (against libraries) with templates. ++prelink_cmds=$lt_prelink_cmds_CXX + +-# A language-specific compiler. +-CC=$lt_compiler_RC ++# Specify filename containing input files. ++file_list_spec=$lt_file_list_spec_CXX + +-# Is the compiler the GNU C compiler? +-with_gcc=$GCC_RC ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action_CXX + +-# An ERE matcher. +-EGREP=$lt_EGREP ++# The directories searched by this compiler when creating a shared library. ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX + +-# The linker used to build libraries. +-LD=$lt_LD_RC ++# Dependencies to place before and after the objects being linked to ++# create a shared library. ++predep_objects=$lt_predep_objects_CXX ++postdep_objects=$lt_postdep_objects_CXX ++predeps=$lt_predeps_CXX ++postdeps=$lt_postdeps_CXX + +-# Whether we need hard or soft links. +-LN_S=$lt_LN_S ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX + +-# A BSD-compatible nm program. +-NM=$lt_NM ++# ### END LIBTOOL TAG CONFIG: CXX ++_LT_EOF + +-# A symbol stripping program +-STRIP=$lt_STRIP + +-# Used to examine libraries when file_magic_cmd begins "file" +-MAGIC_CMD=$MAGIC_CMD ++{ (exit 0); exit 0; } ++_LTEOF ++chmod +x "$CONFIG_LT" + +-# Used on cygwin: DLL creation program. +-DLLTOOL="$DLLTOOL" ++# configure is writing to config.log, but config.lt does its own redirection, ++# appending to config.log, which fails on DOS, as config.log is still kept ++# open by configure. Here we exec the FD to /dev/null, effectively closing ++# config.log, so it can be properly (re)opened and appended to by config.lt. ++if test "$no_create" != yes; then ++ lt_cl_success=: ++ test "$silent" = yes && ++ lt_config_lt_args="$lt_config_lt_args --quiet" ++ exec 5>/dev/null ++ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++ exec 5>>config.log ++ $lt_cl_success || { (exit 1); exit 1; } ++fi + +-# Used on cygwin: object dumper. +-OBJDUMP="$OBJDUMP" + +-# Used on cygwin: assembler. +-AS="$AS" + +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir ++# Make sure we use 64-bit versions of various file stuff. ++# Check whether --enable-largefile was given. ++if test "${enable_largefile+set}" = set; then ++ enableval=$enable_largefile; ++fi + +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds ++if test "$enable_largefile" != no; then + +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_RC ++ { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 ++$as_echo_n "checking for special C compiler options needed for large files... " >&6; } ++if test "${ac_cv_sys_largefile_CC+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_cv_sys_largefile_CC=no ++ if test "$GCC" != yes; then ++ ac_save_CC=$CC ++ while :; do ++ # IRIX 6.2 and later do not support large files by default, ++ # so use the C compiler's -n32 option if that helps. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ + +-# Object file suffix (normally "o"). +-objext="$ac_objext" ++ ; ++ return 0; ++} ++_ACEOF ++ rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ break ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Old archive suffix (normally "a"). +-libext="$libext" + +-# Shared library suffix (normally ".so"). +-shrext_cmds='$shrext_cmds' ++fi + +-# Executable file suffix (normally ""). +-exeext="$exeext" ++rm -f core conftest.err conftest.$ac_objext ++ CC="$CC -n32" ++ rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_RC +-pic_mode=$pic_mode + +-# What is the maximum length of a command? +-max_cmd_len=$lt_cv_sys_max_cmd_len ++fi + +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC ++rm -f core conftest.err conftest.$ac_objext ++ break ++ done ++ CC=$ac_save_CC ++ rm -f conftest.$ac_ext ++ fi ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 ++$as_echo "$ac_cv_sys_largefile_CC" >&6; } ++ if test "$ac_cv_sys_largefile_CC" != no; then ++ CC=$CC$ac_cv_sys_largefile_CC ++ fi + +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks ++ { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } ++if test "${ac_cv_sys_file_offset_bits+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ + +-# Do we need the lib prefix for modules? +-need_lib_prefix=$need_lib_prefix ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Do we need a version for libraries? +-need_version=$need_version + +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen ++fi + +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#define _FILE_OFFSET_BITS 64 ++#include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ + +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_RC + +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC ++fi + +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cv_sys_file_offset_bits=unknown ++ break ++done ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 ++$as_echo "$ac_cv_sys_file_offset_bits" >&6; } ++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 ++;; ++esac ++rm -rf conftest* ++ if test $ac_cv_sys_file_offset_bits = unknown; then ++ { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 ++$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } ++if test "${ac_cv_sys_large_files+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ while :; do ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ + +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Compiler flag to generate thread-safe objects. +-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC + +-# Library versioning type. +-version_type=$version_type ++fi + +-# Format of library name prefix. +-libname_spec=$lt_libname_spec ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#define _LARGE_FILES 1 ++#include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ + +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME. +-library_names_spec=$lt_library_names_spec ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec + +-# Commands used to build and install an old-style archive. +-RANLIB=$lt_RANLIB +-old_archive_cmds=$lt_old_archive_cmds_RC +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds ++fi + +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_cv_sys_large_files=unknown ++ break ++done ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 ++$as_echo "$ac_cv_sys_large_files" >&6; } ++case $ac_cv_sys_large_files in #( ++ no | unknown) ;; ++ *) ++cat >>confdefs.h <<_ACEOF ++#define _LARGE_FILES $ac_cv_sys_large_files ++_ACEOF ++;; ++esac ++rm -rf conftest* ++ fi ++fi + +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC + +-# Commands used to build and install a shared archive. +-archive_cmds=$lt_archive_cmds_RC +-archive_expsym_cmds=$lt_archive_expsym_cmds_RC +-postinstall_cmds=$lt_postinstall_cmds +-postuninstall_cmds=$lt_postuninstall_cmds ++# By default we simply use the C compiler to build assembly code. + +-# Commands used to build a loadable module (assumed same as above if empty) +-module_cmds=$lt_module_cmds_RC +-module_expsym_cmds=$lt_module_expsym_cmds_RC ++test "${CCAS+set}" = set || CCAS=$CC ++test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS + +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib + +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predep_objects=$lt_predep_objects_RC +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdep_objects=$lt_postdep_objects_RC +- +-# Dependencies to place before the objects being linked to create a +-# shared library. +-predeps=$lt_predeps_RC +- +-# Dependencies to place after the objects being linked to create a +-# shared library. +-postdeps=$lt_postdeps_RC +- +-# The directories searched by this compiler when creating a shared +-# library +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC + +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_RC ++depcc="$CCAS" am_compiler_list= + +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method ++{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub + +-# Command to use when deplibs_check_method == file_magic. +-file_magic_cmd=$lt_file_magic_cmd ++ am_cv_CCAS_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_RC ++ case $depmode in ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ none) break ;; ++ esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. ++ if depmode=$depmode \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CCAS_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + +-# Flag that forces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_RC ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CCAS_dependencies_compiler_type=none ++fi + +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds ++fi ++{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } ++CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type + +-# Same as above, but a single script fragment to be evaled but not shown. +-finish_eval=$lt_finish_eval ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then ++ am__fastdepCCAS_TRUE= ++ am__fastdepCCAS_FALSE='#' ++else ++ am__fastdepCCAS_TRUE='#' ++ am__fastdepCCAS_FALSE= ++fi + +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +-# Transform the output of nm in a proper C declaration +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++# Extract the first word of "nm", so it can be a program name with args. ++set dummy nm; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_NM+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ case $NM in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_NM="$NM" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS + +-# Transform the output of nm in a C name address pair +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" ++ ;; ++esac ++fi ++NM=$ac_cv_path_NM ++if test -n "$NM"; then ++ { $as_echo "$as_me:$LINENO: result: $NM" >&5 ++$as_echo "$NM" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi + +-# This is the shared library runtime path variable. +-runpath_var=$runpath_var + +-# This is the shared library path variable. +-shlibpath_var=$shlibpath_var + +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } ++ # Check whether --enable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi + +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_RC ++ { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++$as_echo "$USE_MAINTAINER_MODE" >&6; } ++ if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi + +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs ++ MAINT=$MAINTAINER_MODE_TRUE + +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist. +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC + +-# If ld is used when linking, flag to hardcode \$libdir into +-# a binary during linking. This must work even if \$libdir does +-# not exist. +-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC +- +-# Whether we need a single -rpath flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC +- +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +-# resulting binary. +-hardcode_direct=$hardcode_direct_RC +- +-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +-# resulting binary. +-hardcode_minus_L=$hardcode_minus_L_RC +- +-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +-# the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC +- +-# Set to yes if building a shared library automatically hardcodes DIR into the library +-# and all subsequent libraries and executables linked against it. +-hardcode_automatic=$hardcode_automatic_RC + +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at relink time. +-variables_saved_for_relink="$variables_saved_for_relink" ++{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 ++$as_echo_n "checking for some Win32 platform... " >&6; } ++case "$host" in ++ *-*-mingw*|*-*-cygwin*) ++ platform_win32=yes ++ ;; ++ *) ++ platform_win32=no ++ ;; ++esac ++{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 ++$as_echo "$platform_win32" >&6; } ++ if test "$platform_win32" = "yes"; then ++ PLATFORM_WIN32_TRUE= ++ PLATFORM_WIN32_FALSE='#' ++else ++ PLATFORM_WIN32_TRUE='#' ++ PLATFORM_WIN32_FALSE= ++fi + +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_RC + +-# Compile-time system search path for libraries +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ if test "$os_win32" = "yes"; then ++ OS_WIN32_TRUE= ++ OS_WIN32_FALSE='#' ++else ++ OS_WIN32_TRUE='#' ++ OS_WIN32_FALSE= ++fi + +-# Run-time system search path for libraries +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ if test "$os_win32" != "yes"; then ++ OS_UNIX_TRUE= ++ OS_UNIX_FALSE='#' ++else ++ OS_UNIX_TRUE='#' ++ OS_UNIX_FALSE= ++fi + +-# Fix the shell variable \$srcfile for the compiler. +-fix_srcfile_path=$lt_fix_srcfile_path ++ if test "$os_linux" = "yes"; then ++ OS_LINUX_TRUE= ++ OS_LINUX_FALSE='#' ++else ++ OS_LINUX_TRUE='#' ++ OS_LINUX_FALSE= ++fi + +-# Set to yes if exported symbols are required. +-always_export_symbols=$always_export_symbols_RC + +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_RC ++if test "$os_win32" = "yes"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. ++set dummy ${ac_tool_prefix}windres; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_WINDRES+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$WINDRES"; then ++ ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_WINDRES="${ac_tool_prefix}windres" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS + +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds ++fi ++fi ++WINDRES=$ac_cv_prog_WINDRES ++if test -n "$WINDRES"; then ++ { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 ++$as_echo "$WINDRES" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi + +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_RC + +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_RC ++fi ++if test -z "$ac_cv_prog_WINDRES"; then ++ ac_ct_WINDRES=$WINDRES ++ # Extract the first word of "windres", so it can be a program name with args. ++set dummy windres; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_WINDRES"; then ++ ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_WINDRES="windres" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS + +-# ### END LIBTOOL TAG CONFIG: $tagname ++fi ++fi ++ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES ++if test -n "$ac_ct_WINDRES"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 ++$as_echo "$ac_ct_WINDRES" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi + +-__EOF__ ++ if test "x$ac_ct_WINDRES" = x; then ++ WINDRES="no" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ WINDRES=$ac_ct_WINDRES ++ fi ++else ++ WINDRES="$ac_cv_prog_WINDRES" ++fi + ++ if test "$WINDRES" = no; then ++ { { $as_echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 ++$as_echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ # Extract the first word of "lib.exe", so it can be a program name with args. ++set dummy lib.exe; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ms_librarian+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ms_librarian"; then ++ ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ms_librarian="yes" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS + ++ test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" ++fi ++fi ++ms_librarian=$ac_cv_prog_ms_librarian ++if test -n "$ms_librarian"; then ++ { $as_echo "$as_me:$LINENO: result: $ms_librarian" >&5 ++$as_echo "$ms_librarian" >&6; } + else +- # If there is no Makefile yet, we rely on a make rule to execute +- # `config.status --recheck' to rerun these tests and create the +- # libtool script then. +- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` +- if test -f "$ltmain_in"; then +- test -f Makefile && make "$ltmain" +- fi ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +-CC="$lt_save_CC" +- +- ;; +- +- *) +- { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 +-$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} +- { (exit 1); exit 1; }; } +- ;; +- esac +- +- # Append the new tag name to the list of available tags. +- if test -n "$tagname" ; then +- available_tags="$available_tags $tagname" +- fi +- fi +- done +- IFS="$lt_save_ifs" +- +- # Now substitute the updated list of available tags. +- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then +- mv "${ofile}T" "$ofile" +- chmod +x "$ofile" +- else +- rm -f "${ofile}T" +- { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 +-$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} +- { (exit 1); exit 1; }; } +- fi + fi +- +- +- +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +- +-# Prevent multiple expansion +- +- ++ if test x$ms_librarian = xyes; then ++ MS_LIB_AVAILABLE_TRUE= ++ MS_LIB_AVAILABLE_FALSE='#' ++else ++ MS_LIB_AVAILABLE_TRUE='#' ++ MS_LIB_AVAILABLE_FALSE= ++fi + + + + ++# Check whether --enable-debug was given. ++if test "${enable_debug+set}" = set; then ++ enableval=$enable_debug; ++else ++ enable_debug=minimum ++fi + ++# Check whether --enable-shm was given. ++if test "${enable_shm+set}" = set; then ++ enableval=$enable_shm; ++else ++ enable_shm="yes" ++fi + ++# Check whether --enable-xkb was given. ++if test "${enable_xkb+set}" = set; then ++ enableval=$enable_xkb; ++else ++ enable_xkb="maybe" ++fi + ++# Check whether --enable-xinerama was given. ++if test "${enable_xinerama+set}" = set; then ++ enableval=$enable_xinerama; ++else ++ enable_xinerama="yes" ++fi + ++# Check whether --enable-rebuilds was given. ++if test "${enable_rebuilds+set}" = set; then ++ enableval=$enable_rebuilds; ++else ++ enable_rebuilds=yes ++fi + ++# Check whether --enable-visibility was given. ++if test "${enable_visibility+set}" = set; then ++ enableval=$enable_visibility; ++else ++ enable_visibility=yes ++fi + + + ++# Check whether --with-xinput was given. ++if test "${with_xinput+set}" = set; then ++ withval=$with_xinput; ++fi + + ++if test "$platform_win32" = yes; then ++ gdktarget=win32 ++else ++ gdktarget=x11 ++fi + + ++# Check whether --with-gdktarget was given. ++if test "${with_gdktarget+set}" = set; then ++ withval=$with_gdktarget; gdktarget=$with_gdktarget ++fi + + + ++case $gdktarget in ++ x11|win32|quartz|directfb) ;; ++ *) { { $as_echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 ++$as_echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} ++ { (exit 1); exit 1; }; };; ++esac + ++gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la ++gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la -# Make sure we use 64-bit versions of various file stuff. -# Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then - enableval=$enable_largefile; -fi -+# Code to be used in simple compile tests -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' -if test "$enable_largefile" != no; then -+# Code to be used in simple link tests -+lt_simple_link_test_code="$lt_simple_compile_test_code" - { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } @@ -48169,7 +40775,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -int -main () -{ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. - ; - return 0; @@ -48194,18 +40799,20 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - break --else ++if test "x$enable_debug" = "xyes"; then ++ test "$cflags_set" = set || CFLAGS="$CFLAGS -g" ++ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} - -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - --fi -+# Allow CC to be a program name with arguments. -+compiler=$CC +- +- ++ if test "x$enable_debug" = "xno"; then ++ GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" ++ else ++ GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS" ++ fi + fi -rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" @@ -48231,20 +40838,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +- -+# save warnings/boilerplate of simple test code -+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* - --fi -+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 -r conftest* ++if test "x$enable_visibility" = "xno"; then ++ GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY" + fi -rm -f core conftest.err conftest.$ac_objext - break @@ -48283,25 +40881,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -int -main () -{ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+CC=${RC-"windres"} -+compiler=$CC -+compiler_RC=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - ; - return 0; -} --_ACEOF ++cat >>confdefs.h <<_ACEOF ++#define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}" + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -48324,96 +40910,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+lt_cv_prog_compiler_c_o_RC=yes - -+# The else clause should only fire when bootstrapping the -+# libtool distribution, otherwise you forgot to ship ltmain.sh -+# with your package, and you will get complaints that there are -+# no rules to generate ltmain.sh. -+if test -f "$ltmain"; then -+ # 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 -+ setopt NO_GLOB_SUBST -+ fi -+ # Now quote all the things that may contain metacharacters while being -+ # careful not to overquote the AC_SUBSTed values. We take copies of the -+ # variables and quote the copies for generation of the libtool script. -+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -+ SED SHELL STRIP \ -+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -+ deplibs_check_method reload_flag reload_cmds need_locks \ -+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -+ lt_cv_sys_global_symbol_to_c_name_address \ -+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -+ old_postinstall_cmds old_postuninstall_cmds \ -+ compiler_RC \ -+ CC_RC \ -+ LD_RC \ -+ lt_prog_compiler_wl_RC \ -+ lt_prog_compiler_pic_RC \ -+ lt_prog_compiler_static_RC \ -+ lt_prog_compiler_no_builtin_flag_RC \ -+ export_dynamic_flag_spec_RC \ -+ thread_safe_flag_spec_RC \ -+ whole_archive_flag_spec_RC \ -+ enable_shared_with_static_runtimes_RC \ -+ old_archive_cmds_RC \ -+ old_archive_from_new_cmds_RC \ -+ predep_objects_RC \ -+ postdep_objects_RC \ -+ predeps_RC \ -+ postdeps_RC \ -+ compiler_lib_search_path_RC \ -+ compiler_lib_search_dirs_RC \ -+ archive_cmds_RC \ -+ archive_expsym_cmds_RC \ -+ postinstall_cmds_RC \ -+ postuninstall_cmds_RC \ -+ old_archive_from_expsyms_cmds_RC \ -+ allow_undefined_flag_RC \ -+ no_undefined_flag_RC \ -+ export_symbols_cmds_RC \ -+ hardcode_libdir_flag_spec_RC \ -+ hardcode_libdir_flag_spec_ld_RC \ -+ hardcode_libdir_separator_RC \ -+ hardcode_automatic_RC \ -+ 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 -+ -+ case $var in -+ old_archive_cmds_RC | \ -+ old_archive_from_new_cmds_RC | \ -+ archive_cmds_RC | \ -+ archive_expsym_cmds_RC | \ -+ module_cmds_RC | \ -+ module_expsym_cmds_RC | \ -+ old_archive_from_expsyms_cmds_RC | \ -+ export_symbols_cmds_RC | \ -+ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -+ postinstall_cmds | postuninstall_cmds | \ -+ old_postinstall_cmds | old_postuninstall_cmds | \ -+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -+ # Double-quote double-evaled strings. -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ ;; -+ *) -+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ ;; -+ esac -+ done +- -fi -+ case $lt_echo in -+ *'\$0 --fallback-echo"') -+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -+ ;; -+ esac -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF @@ -48435,7 +40934,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -int -main () -{ -+cfgfile="$ofile" - ; - return 0; @@ -48463,14 +40961,52 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname ++# Build time sanity check... ++{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++$as_echo_n "checking whether build environment is sane... " >&6; } ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ++ if test "$*" = "X"; then ++ # -L didn't work. ++ set X `ls -t $srcdir/configure conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$*" != "X $srcdir/configure conftest.file" \ ++ && test "$*" != "X conftest.file $srcdir/configure"; then -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken ++alias in your environment" >&5 ++$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken ++alias in your environment" >&2;} ++ { (exit 1); exit 1; }; } ++ fi --fi -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL ++ test "$2" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! ++Check your system clock" >&5 ++$as_echo "$as_me: error: newly created file is older than distributed files! ++Check your system clock" >&2;} ++ { (exit 1); exit 1; }; } + fi ++{ $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown @@ -48492,15 +41028,21 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++# Checks for programs. ++{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++$as_echo_n "checking for library containing strerror... " >&6; } ++if test "${ac_cv_search_strerror+set}" = set; then + $as_echo_n "(cached) " >&6 + else - while :; do - cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_func_search_save_LIBS=$LIBS ++cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ -#include <sys/types.h> - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, @@ -48513,9 +41055,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -int -main () -{ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared - +- - ; - return 0; -} @@ -48542,15 +41082,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+# Whether or not to build static libraries. -+build_old_libs=$enable_static - -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_RC - +- +- -fi -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF @@ -48569,57 +41103,76 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; --int --main () --{ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install - -- ; -- return 0; --} --_ACEOF ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char strerror (); + int + main () + { +- ++return strerror (); + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 ++for ac_lib in '' cposix; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" + $as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err ++ (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 +@@ -21090,8 +18627,11 @@ + (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_search_strerror=$ac_res + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -21099,53 +18639,53 @@ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - --fi -+# An echo program that does not interpret backslashes. -+echo=$lt_echo + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_large_files=unknown -- break --done --fi ++rm -rf conftest.dSYM ++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 ++fi + done ++if test "${ac_cv_search_strerror+set}" = set; then ++ : ++else ++ ac_cv_search_strerror=no + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( @@ -48632,77 +41185,85 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -esac -rm -rf conftest* - fi --fi -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS + fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++$as_echo "$ac_cv_search_strerror" >&6; } ++ac_res=$ac_cv_search_strerror ++if test "$ac_res" != no; then ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+# A C compiler. -+LTCC=$lt_LTCC ++fi -# By default we simply use the C compiler to build assembly code. -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS - +- -: ${CCAS='$(CC)'} -# Set ASFLAGS if not already set. -: ${CCASFLAGS='$(CFLAGS)'} -+# A language-specific compiler. -+CC=$lt_compiler_RC - -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_RC - +- +- -# Extract the first word of "nm", so it can be a program name with args. -set dummy nm; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_NM+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 + else - case $NM in - [\\/]* | ?:[\\/]*) - ac_cv_path_NM="$NM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+# An ERE matcher. -+EGREP=$lt_EGREP ++ ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -21153,111 +18693,83 @@ + done + IFS=$as_save_IFS - test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" - ;; -esac --fi + fi -NM=$ac_cv_path_NM -if test -n "$NM"; then - { $as_echo "$as_me:$LINENO: result: $NM" >&5 -$as_echo "$NM" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+# The linker used to build libraries. -+LD=$lt_LD_RC ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S - -+# A BSD-compatible nm program. -+NM=$lt_NM +- -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. @@ -48710,39 +41271,32 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no --fi -+# A symbol stripping program -+STRIP=$lt_STRIP - + fi +- - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD - -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" - +- +- -if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' --else ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ $as_echo_n "(cached) " >&6 + else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi -+# Used on cygwin: object dumper. -+OBJDUMP="$OBJDUMP" - +- - MAINT=$MAINTAINER_MODE_TRUE -+# Used on cygwin: assembler. -+AS="$AS" - -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir - -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds - +- +- +- -{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -$as_echo_n "checking for some Win32 platform... " >&6; } -case "$host" in @@ -48755,31 +41309,34 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -esac -{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 -$as_echo "$platform_win32" >&6; } -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_RC - -+# Object file suffix (normally "o"). -+objext="$ac_objext" - +- +- -if test "$platform_win32" = "yes"; then - PLATFORM_WIN32_TRUE= - PLATFORM_WIN32_FALSE='#' --else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + else - PLATFORM_WIN32_TRUE='#' - PLATFORM_WIN32_FALSE= -fi -+# Old archive suffix (normally "a"). -+libext="$libext" - -+# Shared library suffix (normally ".so"). -+shrext_cmds='$shrext_cmds' - -+# Executable file suffix (normally ""). -+exeext="$exeext" - -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_RC -+pic_mode=$pic_mode +- +- +- ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="gcc" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS -if test "$os_win32" = "yes"; then - OS_WIN32_TRUE= @@ -48787,130 +41344,163 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - OS_WIN32_TRUE='#' - OS_WIN32_FALSE= --fi + fi +- +- - -+# What is the maximum length of a command? -+max_cmd_len=$lt_cv_sys_max_cmd_len - -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC - -if test "$os_win32" != "yes"; then - OS_UNIX_TRUE= - OS_UNIX_FALSE='#' --else ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else - OS_UNIX_TRUE='#' - OS_UNIX_FALSE= --fi -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks - -+# Do we need the lib prefix for modules? -+need_lib_prefix=$need_lib_prefix - -+# Do we need a version for libraries? -+need_version=$need_version ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi +- +- -if test "$os_linux" = "yes"; then - OS_LINUX_TRUE= - OS_LINUX_FALSE='#' --else ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + else - OS_LINUX_TRUE='#' - OS_LINUX_FALSE= --fi -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen - -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self ++ CC="$ac_cv_prog_CC" + fi +- -if test "$os_win32" = "yes"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -set dummy ${ac_tool_prefix}windres; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 + else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -21266,7 +18778,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static ++ ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -21276,29 +18788,30 @@ --fi --fi + fi + fi -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 -$as_echo "$WINDRES" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_RC ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC --fi ++ fi + fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 + else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. + else ++ ac_prog_rejected=no + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do +@@ -21306,7 +18819,11 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_WINDRES="windres" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -21314,46 +18831,44 @@ + done + IFS=$as_save_IFS --fi --fi ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $# != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi + fi + fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -$as_echo "$ac_ct_WINDRES" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi - if test "x$ac_ct_WINDRES" = x; then - WINDRES="no" @@ -48926,8 +41516,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -else - WINDRES="$ac_cv_prog_WINDRES" -fi -+# Compiler flag to generate thread-safe objects. -+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC - if test "$WINDRES" = no; then - { { $as_echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 @@ -48936,59 +41524,61 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi - # Extract the first word of "lib.exe", so it can be a program name with args. -set dummy lib.exe; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ 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 + { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ms_librarian+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 + else - if test -n "$ms_librarian"; then - ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -21362,7 +18877,7 @@ + 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ms_librarian="yes" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+# Library versioning type. -+version_type=$version_type ++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -21370,226 +18885,301 @@ + done + IFS=$as_save_IFS - test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" --fi --fi + fi + fi -ms_librarian=$ac_cv_prog_ms_librarian -if test -n "$ms_librarian"; then - { $as_echo "$as_me:$LINENO: result: $ms_librarian" >&5 -$as_echo "$ms_librarian" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+# Format of library name prefix. -+libname_spec=$lt_libname_spec ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:$LINENO: result: $CC" >&5 ++$as_echo "$CC" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } + fi -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME. -+library_names_spec=$lt_library_names_spec - --fi -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec - -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_RC -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ test -n "$CC" && break ++ done + fi +- +- -if test x$ms_librarian = xyes; then - MS_LIB_AVAILABLE_TRUE= - MS_LIB_AVAILABLE_FALSE='#' @@ -48996,221 +41586,307 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - MS_LIB_AVAILABLE_TRUE='#' - MS_LIB_AVAILABLE_FALSE= -fi -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC - -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC - -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_RC -+archive_expsym_cmds=$lt_archive_expsym_cmds_RC -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds - -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_RC -+module_expsym_cmds=$lt_module_expsym_cmds_RC - +- +- +- +- -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then - enableval=$enable_debug; -else - enable_debug=minimum -fi -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib - +- -# Check whether --enable-shm was given. -if test "${enable_shm+set}" = set; then - enableval=$enable_shm; --else ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ $as_echo_n "(cached) " >&6 + else - enable_shm="yes" -fi -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predep_objects=$lt_predep_objects_RC -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_RC -+ -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_RC -+ -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdeps=$lt_postdeps_RC -+ -+# The directories searched by this compiler when creating a shared -+# library -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC - +- -# Check whether --enable-xkb was given. -if test "${enable_xkb+set}" = set; then - enableval=$enable_xkb; --else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + else - enable_xkb="maybe" -fi -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_RC ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="$ac_prog" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS -# Check whether --enable-xinerama was given. -if test "${enable_xinerama+set}" = set; then - enableval=$enable_xinerama; -else - enable_xinerama="yes" --fi -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method - + fi +- -# Check whether --enable-rebuilds was given. -if test "${enable_rebuilds+set}" = set; then - enableval=$enable_rebuilds; -else - enable_rebuilds=yes --fi -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd - + fi +- -# Check whether --enable-visibility was given. -if test "${enable_visibility+set}" = set; then - enableval=$enable_visibility; --else ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } + else - enable_visibility=yes --fi -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_RC ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + fi -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_RC -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds ++ test -n "$ac_ct_CC" && break ++done -# Check whether --with-xinput was given. -if test "${with_xinput+set}" = set; then - withval=$with_xinput; -fi -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval - -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - +- +- -if test "$platform_win32" = yes; then - gdktarget=win32 -else - gdktarget=x11 --fi -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + fi +- -# Check whether --with-gdktarget was given. -if test "${with_gdktarget+set}" = set; then - withval=$with_gdktarget; gdktarget=$with_gdktarget --fi -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var + fi -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&5 ++$as_echo "$as_me: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; }; } -case $gdktarget in - x11|win32|quartz|directfb) ;; - *) { { $as_echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 -$as_echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} - { (exit 1); exit 1; }; };; --esac -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_RC ++# Provide some information about the compiler. ++$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; + esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } -gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la -gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs +- +- ++{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC - -+# If ld is used when linking, flag to hardcode \$libdir into -+# a binary during linking. This must work even if \$libdir does -+# not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC -+ -+# Whether we need a single -rpath flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC -+ -+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# resulting binary. -+hardcode_direct=$hardcode_direct_RC -+ -+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -+# resulting binary. -+hardcode_minus_L=$hardcode_minus_L_RC -+ -+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -+# the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC -+ -+# Set to yes if building a shared library automatically hardcodes DIR into the library -+# and all subsequent libraries and executables linked against it. -+hardcode_automatic=$hardcode_automatic_RC - -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at relink time. -+variables_saved_for_relink="$variables_saved_for_relink" ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif -if test "x$enable_debug" = "xyes"; then - test "$cflags_set" = set || CFLAGS="$CFLAGS -g" - GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" --else ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_compiler_gnu=yes + else - if test "x$enable_debug" = "xno"; then - GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" - else - GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS" - fi --fi -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_RC ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_compiler_gnu=no + fi -+# Compile-time system search path for libraries -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu -if test "x$enable_visibility" = "xno"; then - GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY" --fi -+# Run-time system search path for libraries -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path ++int ++main () ++{ -+# Set to yes if exported symbols are required. -+always_export_symbols=$always_export_symbols_RC ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (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 ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<_ACEOF -#define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}" --_ACEOF -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_RC ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ + _ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds - -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_RC ++int ++main () ++{ +- -# Build time sanity check... -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } @@ -49231,13 +41907,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_RC -+ -+# ### END LIBTOOL TAG CONFIG: $tagname -+ -+__EOF__ - +- - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually @@ -49248,131 +41918,64 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - +- - test "$2" = conftest.file - ) -then - # Ok. - : ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} -+ # If there is no Makefile yet, we rely on a make rule to execute -+ # `config.status --recheck' to rerun these tests and create the -+ # libtool script then. -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi -+fi -+ -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+CC="$lt_save_CC" -+ -+ ;; -+ -+ *) -+ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -+echo "$as_me: error: Unsupported tag name: $tagname" >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+ esac -+ -+ # Append the new tag name to the list of available tags. -+ if test -n "$tagname" ; then -+ available_tags="$available_tags $tagname" -+ fi -+ fi -+ done -+ IFS="$lt_save_ifs" -+ -+ # Now substitute the updated list of available tags. -+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -+ mv "${ofile}T" "$ofile" -+ chmod +x "$ofile" -+ else -+ rm -f "${ofile}T" -+ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -+echo "$as_me: error: unable to update list of available tagged configurations." >&2;} - { (exit 1); exit 1; }; } -+ fi - fi +- { (exit 1); exit 1; }; } +-fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 -# Checks for programs. -{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 -$as_echo_n "checking for library containing strerror... " >&6; } -if test "${ac_cv_search_strerror+set}" = set; then - $as_echo_n "(cached) " >&6 -+ -+ -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+ -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+ -+# Prevent multiple expansion -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+# Make sure we use 64-bit versions of various file stuff. -+# Check whether --enable-largefile was given. -+if test "${enable_largefile+set}" = set; then -+ enableval=$enable_largefile; -+fi -+ -+if test "$enable_largefile" != no; then -+ -+ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } -+if test "${ac_cv_sys_largefile_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else +-else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -+ ac_cv_sys_largefile_CC=no -+ if test "$GCC" != yes; then -+ ac_save_CC=$CC -+ while :; do -+ # IRIX 6.2 and later do not support large files by default, -+ # so use the C compiler's -n32 option if that helps. ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -- + -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -49380,15 +41983,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -extern "C" -#endif -char strerror (); -+#include <sys/types.h> -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; int main () { @@ -49407,23 +42001,20 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -+ rm -f conftest.$ac_objext ++rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 + eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" + $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -21598,11 +19188,8 @@ (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err @@ -49433,12 +42024,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - }; then - ac_cv_search_strerror=$ac_res + } && test -s conftest.$ac_objext; then -+ break ++ ac_cv_prog_cc_g=yes else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - +@@ -21610,50 +19197,40 @@ fi @@ -49451,63 +42041,53 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -done -if test "${ac_cv_search_strerror+set}" = set; then - : -+rm -f core conftest.err conftest.$ac_objext -+ CC="$CC -n32" -+ rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 +-else - ac_cv_search_strerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS --fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -$as_echo "$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + +- +- - --fi -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - - -+fi - -+rm -f core conftest.err conftest.$ac_objext -+ break -+ done -+ CC=$ac_save_CC -+ rm -f conftest.$ac_ext -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } -+ if test "$ac_cv_sys_largefile_CC" != no; then -+ CC=$CC$ac_cv_sys_largefile_CC -+ fi - -{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 -$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; } -if test "${am_cv_prog_cc_stdc+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then + $as_echo_n "(cached) " >&6 + else - am_cv_prog_cc_stdc=no -ac_save_CC="$CC" -# Don't try gcc -ansi; that turns off useful extensions and @@ -49520,2610 +42100,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" -+ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } -+if test "${ac_cv_sys_file_offset_bits+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ while :; do - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <stdarg.h> --#include <stdio.h> - #include <sys/types.h> --#include <sys/stat.h> --/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ --struct buf { int x; }; --FILE * (*rcsopen) (struct buf *, struct stat *, int); --static char *e (p, i) -- char **p; -- int i; --{ -- return p[i]; --} --static char *f (char * (*g) (char **, int), char **p, ...) --{ -- char *s; -- va_list v; -- va_start (v,p); -- s = g (p, va_arg (v,int)); -- va_end (v); -- return s; --} --int test (int i, double x); --struct s1 {int (*f) (int a);}; --struct s2 {int (*f) (double a);}; --int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); --int argc; --char **argv; -- -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; - int - main () - { - --return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -- - ; - return 0; - } -@@ -18519,252 +20836,341 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -+ ac_cv_sys_file_offset_bits=no; break - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --done --CC="$ac_save_CC" -- --fi -- --if test -z "$am_cv_prog_cc_stdc"; then -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 --$as_echo "$am_cv_prog_cc_stdc" >&6; } --fi --case "x$am_cv_prog_cc_stdc" in -- x|xno) ;; -- *) CC="$CC $am_cv_prog_cc_stdc" ;; --esac -- --# Find a good install program. We prefer a C program (faster), --# so one script is as good as another. But avoid the broken or --# incompatible versions: --# SysV /etc/install, /usr/sbin/install --# SunOS /usr/etc/install --# IRIX /sbin/install --# AIX /bin/install --# AmigaOS /C/install, which installs bootblocks on floppy discs --# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag --# AFS /usr/afsws/bin/install, which mishandles nonexistent args --# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" --# OS/2's system install, which has a completely different semantic --# ./install, which can be erroneously created by make from ./install.sh. --# Reject install programs that cannot install multiple files. --{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --$as_echo_n "checking for a BSD-compatible install... " >&6; } --if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#define _FILE_OFFSET_BITS 64 -+#include <sys/types.h> -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -- /usr/ucb/* ) ;; -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+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; } -+case $ac_cv_sys_file_offset_bits in #( -+ no | unknown) ;; - *) -- # OSF1 and SCO ODT 3.0 have their own names for install. -- # Don't use installbsd from OSF since it installs stuff as root -- # 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_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. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- rm -rf conftest.one conftest.two conftest.dir -- echo one > conftest.one -- echo two > conftest.two -- mkdir conftest.dir -- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -- test -s conftest.one && test -s conftest.two && -- test -s conftest.dir/conftest.one && -- test -s conftest.dir/conftest.two -- then -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -- fi -- done -- done -- ;; -+cat >>confdefs.h <<_ACEOF -+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -+_ACEOF -+;; - esac -+rm -f conftest* -+ 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 -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/types.h> -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ - --done --IFS=$as_save_IFS -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 - --rm -rf conftest.one conftest.two conftest.dir - - fi -- if test "${ac_cv_path_install+set}" = set; then -- INSTALL=$ac_cv_path_install -- else -- # As a last resort, use the slow shell script. Don't cache a -- # value for INSTALL within a source directory, because that will -- # break other packages using the cache if that directory is -- # removed, or if the value is a relative name. -- INSTALL=$ac_install_sh -- fi --fi --{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 --$as_echo "$INSTALL" >&6; } - --# Use test -z because SunOS4 sh mishandles braces in ${var-val}. --# It thinks the first close brace ends the variable substitution. --test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#define _LARGE_FILES 1 -+#include <sys/types.h> -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ - --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } --set x ${MAKE-make} --ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` --if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.make <<\_ACEOF --SHELL = /bin/sh --all: -- @echo '@@@%%%=$(MAKE)=@@@%%%' --_ACEOF --# GNU make sometimes prints "make[1]: Entering...", which would confuse us. --case `${MAKE-make} -f conftest.make 2>/dev/null` in -- *@@@%%%=?*=@@@%%%*) -- eval ac_cv_prog_make_${ac_make}_set=yes;; -+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; } -+case $ac_cv_sys_large_files in #( -+ no | unknown) ;; - *) -- eval ac_cv_prog_make_${ac_make}_set=no;; -+cat >>confdefs.h <<_ACEOF -+#define _LARGE_FILES $ac_cv_sys_large_files -+_ACEOF -+;; - esac --rm -f conftest.make --fi --if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- SET_MAKE= --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- SET_MAKE="MAKE=${MAKE-make}" -+rm -f conftest* -+ fi - fi - - --if test "x$GCC" = "xyes"; then -- case " $CFLAGS " in -- *[\ \ ]-Wall[\ \ ]*) ;; -- *) CFLAGS="$CFLAGS -Wall" ;; -- esac -+# By default we simply use the C compiler to build assembly code. - -- if test "x$enable_ansi" = "xyes"; then -- case " $CFLAGS " in -- *[\ \ ]-ansi[\ \ ]*) ;; -- *) CFLAGS="$CFLAGS -ansi" ;; -- esac -+test "${CCAS+set}" = set || CCAS=$CC -+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS - -- case " $CFLAGS " in -- *[\ \ ]-pedantic[\ \ ]*) ;; -- *) CFLAGS="$CFLAGS -pedantic" ;; -- esac -- fi --fi - --CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" - --# Ensure MSVC-compatible struct packing convention is used when --# compiling for Win32 with gcc. --# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while --# gcc2 uses "-fnative-struct". --if test x"$os_win32" = xyes; then -- if test x"$GCC" = xyes; then -- msnative_struct='' -- { $as_echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 --$as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; } -- if test -z "$ac_cv_prog_CC"; then -- our_gcc="$CC" -- else -- our_gcc="$ac_cv_prog_CC" -- fi -- case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in -- 2.) -- if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then -- msnative_struct='-fnative-struct' -- fi -- ;; -- *) -- if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then -- msnative_struct='-mms-bitfields' -- fi -- ;; -+depcc="$CCAS" am_compiler_list= -+ -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -+if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub -+ -+ am_cv_CCAS_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` -+ fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -+ -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; - esac -- if test x"$msnative_struct" = x ; then -- { $as_echo "$as_me:$LINENO: result: no way" >&5 --$as_echo "no way" >&6; } -- { $as_echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 --$as_echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} -- else -- CFLAGS="$CFLAGS $msnative_struct" -- { $as_echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 --$as_echo "${msnative_struct}" >&6; } -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CCAS_dependencies_compiler_type=$depmode -+ break -+ fi - fi -- fi -+ done -+ -+ cd .. -+ rm -rf conftest.dir -+else -+ am_cv_CCAS_dependencies_compiler_type=none - fi - --# Honor aclocal flags --ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -+fi -+{ echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CCAS_dependencies_compiler_type" >&6; } -+CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type - --## Initial sanity check, done here so that users get told they --## have the wrong dependencies as early in the process as possible. --## Later on we actually use the cflags/libs from separate pkg-config --## calls. Oh, also the later pkg-config calls don't include --## the version requirements since those make the module lists --## annoying to construct -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then -+ am__fastdepCCAS_TRUE= -+ am__fastdepCCAS_FALSE='#' -+else -+ am__fastdepCCAS_TRUE='#' -+ am__fastdepCCAS_FALSE= -+fi - - --if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. --set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -- $as_echo_n "(cached) " >&6 -+# Extract the first word of "nm", so it can be a program name with args. -+set dummy nm; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_NM+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- case $PKG_CONFIG in -+ case $NM in - [\\/]* | ?:[\\/]*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ac_cv_path_NM="$NM" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -18774,492 +21180,411 @@ - 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ 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 - fi - done - done - IFS=$as_save_IFS - -+ test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" - ;; - esac - fi --PKG_CONFIG=$ac_cv_path_PKG_CONFIG --if test -n "$PKG_CONFIG"; then -- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 --$as_echo "$PKG_CONFIG" >&6; } -+NM=$ac_cv_path_NM -+if test -n "$NM"; then -+ { echo "$as_me:$LINENO: result: $NM" >&5 -+echo "${ECHO_T}$NM" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -+ -+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } -+ # Check whether --enable-maintainer-mode was given. -+if test "${enable_maintainer_mode+set}" = set; then -+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -+else -+ USE_MAINTAINER_MODE=no - fi --if test -z "$ac_cv_path_PKG_CONFIG"; then -- ac_pt_PKG_CONFIG=$PKG_CONFIG -- # Extract the first word of "pkg-config", so it can be a program name with args. --set dummy pkg-config; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ -+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } -+ if test $USE_MAINTAINER_MODE = yes; then -+ MAINTAINER_MODE_TRUE= -+ MAINTAINER_MODE_FALSE='#' - else -- case $ac_pt_PKG_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -- ;; -+ MAINTAINER_MODE_TRUE='#' -+ MAINTAINER_MODE_FALSE= -+fi -+ -+ MAINT=$MAINTAINER_MODE_TRUE -+ -+ -+ -+{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -+echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } -+case "$host" in -+ *-*-mingw*|*-*-cygwin*) -+ platform_win32=yes -+ ;; - *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ platform_win32=no -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $platform_win32" >&5 -+echo "${ECHO_T}$platform_win32" >&6; } -+ if test "$platform_win32" = "yes"; then -+ PLATFORM_WIN32_TRUE= -+ PLATFORM_WIN32_FALSE='#' -+else -+ PLATFORM_WIN32_TRUE='#' -+ PLATFORM_WIN32_FALSE= -+fi -+ -+ -+ if test "$os_win32" = "yes"; then -+ OS_WIN32_TRUE= -+ OS_WIN32_FALSE='#' -+else -+ OS_WIN32_TRUE='#' -+ OS_WIN32_FALSE= -+fi -+ -+ if test "$os_win32" != "yes"; then -+ OS_UNIX_TRUE= -+ OS_UNIX_FALSE='#' -+else -+ OS_UNIX_TRUE='#' -+ OS_UNIX_FALSE= -+fi -+ -+ if test "$os_linux" = "yes"; then -+ OS_LINUX_TRUE= -+ OS_LINUX_FALSE='#' -+else -+ OS_LINUX_TRUE='#' -+ OS_LINUX_FALSE= -+fi -+ -+ -+if test "$os_win32" = "yes"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -+set dummy ${ac_tool_prefix}windres; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_WINDRES+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$WINDRES"; then -+ ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ ac_cv_prog_WINDRES="${ac_tool_prefix}windres" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done - IFS=$as_save_IFS - -- ;; --esac - fi --ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG --if test -n "$ac_pt_PKG_CONFIG"; then -- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 --$as_echo "$ac_pt_PKG_CONFIG" >&6; } -+fi -+WINDRES=$ac_cv_prog_WINDRES -+if test -n "$WINDRES"; then -+ { echo "$as_me:$LINENO: result: $WINDRES" >&5 -+echo "${ECHO_T}$WINDRES" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- if test "x$ac_pt_PKG_CONFIG" = x; then -- PKG_CONFIG="" -+ -+fi -+if test -z "$ac_cv_prog_WINDRES"; then -+ ac_ct_WINDRES=$WINDRES -+ # Extract the first word of "windres", so it can be a program name with args. -+set dummy windres; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_WINDRES"; then -+ ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -+if test -n "$ac_ct_WINDRES"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -+echo "${ECHO_T}$ac_ct_WINDRES" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_ct_WINDRES" = x; then -+ WINDRES="no" - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} - ac_tool_warned=yes ;; - esac -- PKG_CONFIG=$ac_pt_PKG_CONFIG -+ WINDRES=$ac_ct_WINDRES - fi - else -- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" --fi -- --fi --if test -n "$PKG_CONFIG"; then -- _pkg_min_version=0.9.0 -- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 --$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } -- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- PKG_CONFIG="" -- fi -- -+ WINDRES="$ac_cv_prog_WINDRES" - fi - --pkg_failed=no --{ $as_echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 --$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; } -- --if test -n "$BASE_DEPENDENCIES_CFLAGS"; then -- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` -+ if test "$WINDRES" = no; then -+ { { echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 -+echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ # Extract the first word of "lib.exe", so it can be a program name with args. -+set dummy lib.exe; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ms_librarian+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- pkg_failed=yes -+ if test -n "$ms_librarian"; then -+ ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" - fi -- else -- pkg_failed=untried - fi --if test -n "$BASE_DEPENDENCIES_LIBS"; then -- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` -+ms_librarian=$ac_cv_prog_ms_librarian -+if test -n "$ms_librarian"; then -+ { echo "$as_me:$LINENO: result: $ms_librarian" >&5 -+echo "${ECHO_T}$ms_librarian" >&6; } - else -- pkg_failed=yes -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi -- else -- pkg_failed=untried --fi -- -- - --if test $pkg_failed = yes; then - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes -+fi -+ if test x$ms_librarian = xyes; then -+ MS_LIB_AVAILABLE_TRUE= -+ MS_LIB_AVAILABLE_FALSE='#' - else -- _pkg_short_errors_supported=no -+ MS_LIB_AVAILABLE_TRUE='#' -+ MS_LIB_AVAILABLE_FALSE= - fi -- if test $_pkg_short_errors_supported = yes; then -- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` -- else -- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 -- -- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: -- --$BASE_DEPENDENCIES_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. - --Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS --and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" >&5 --$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: -- --$BASE_DEPENDENCIES_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS --and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. --" >&2;} -- { (exit 1); exit 1; }; } --elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: 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 --path to pkg-config. - --Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS --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://pkg-config.freedesktop.org/>. --See \`config.log' for more details." >&5 --$as_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 --path to pkg-config. - --Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS --and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -+# Check whether --enable-debug was given. -+if test "${enable_debug+set}" = set; then -+ enableval=$enable_debug; -+else -+ enable_debug=minimum -+fi - --To get pkg-config, see <http://pkg-config.freedesktop.org/>. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+# Check whether --enable-shm was given. -+if test "${enable_shm+set}" = set; then -+ enableval=$enable_shm; - else -- BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS -- BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- : -+ enable_shm="yes" - fi - --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 "^[^_].*"' -+# Check whether --enable-xkb was given. -+if test "${enable_xkb+set}" = set; then -+ enableval=$enable_xkb; - else -- # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk) -- LIBTOOL_EXPORT_OPTIONS= -+ enable_xkb="maybe" - fi - -+# Check whether --enable-xinerama was given. -+if test "${enable_xinerama+set}" = set; then -+ enableval=$enable_xinerama; -+else -+ enable_xinerama="yes" -+fi - -+# Check whether --enable-rebuilds was given. -+if test "${enable_rebuilds+set}" = set; then -+ enableval=$enable_rebuilds; -+else -+ enable_rebuilds=yes -+fi - --# Check whether --enable-explicit-deps was given. --if test "${enable_explicit_deps+set}" = set; then -- enableval=$enable_explicit_deps; -+# Check whether --enable-visibility was given. -+if test "${enable_visibility+set}" = set; then -+ enableval=$enable_visibility; - else -- enable_explicit_deps=auto -+ enable_visibility=yes - fi - - --{ $as_echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 --$as_echo_n "checking Whether to write dependencies into .pc files... " >&6; } --case $enable_explicit_deps in -- auto) -- export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` -- if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then -- enable_explicit_deps=yes -- else -- enable_explicit_deps=no -- fi -- ;; -- yes|no) -- ;; -- *) { { $as_echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 --$as_echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} -- { (exit 1); exit 1; }; } -- ;; --esac --{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 --$as_echo "$enable_explicit_deps" >&6; } - -+# Check whether --with-xinput was given. -+if test "${with_xinput+set}" = set; then -+ withval=$with_xinput; -+fi - - --if test $enable_explicit_deps = no; then -- DISABLE_EXPLICIT_DEPS_TRUE= -- DISABLE_EXPLICIT_DEPS_FALSE='#' -+if test "$platform_win32" = yes; then -+ gdktarget=win32 - else -- DISABLE_EXPLICIT_DEPS_TRUE='#' -- DISABLE_EXPLICIT_DEPS_FALSE= -+ gdktarget=x11 - fi - - --# define a MAINT-like variable REBUILD which is set if Perl --# and awk are found, so autogenerated sources can be rebuilt -+# Check whether --with-gdktarget was given. -+if test "${with_gdktarget+set}" = set; then -+ withval=$with_gdktarget; gdktarget=$with_gdktarget -+fi - --for ac_prog in perl5 perl --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PERL+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- case $PERL in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PERL="$PERL" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS - -- ;; -+ -+case $gdktarget in -+ x11|win32|quartz|directfb) ;; -+ *) { { echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 -+echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} -+ { (exit 1); exit 1; }; };; - esac --fi --PERL=$ac_cv_path_PERL --if test -n "$PERL"; then -- { $as_echo "$as_me:$LINENO: result: $PERL" >&5 --$as_echo "$PERL" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi - -+gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la -+gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la - -- test -n "$PERL" && break --done - - --# We would like indent, but don't require it. --# Extract the first word of "indent", so it can be a program name with args. --set dummy indent; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_INDENT+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$INDENT"; then -- ac_cv_prog_INDENT="$INDENT" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_INDENT="indent" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS - --fi --fi --INDENT=$ac_cv_prog_INDENT --if test -n "$INDENT"; then -- { $as_echo "$as_me:$LINENO: result: $INDENT" >&5 --$as_echo "$INDENT" >&6; } -+if test "x$enable_debug" = "xyes"; then -+ test "$cflags_set" = set || CFLAGS="$CFLAGS -g" -+ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ if test "x$enable_debug" = "xno"; then -+ GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" -+ else -+ GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS" -+ fi - fi - - -- --REBUILD=\# --if test "x$enable_rebuilds" = "xyes" && \ -- test -n "$PERL" && \ -- $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then -- REBUILD= -+if test "x$enable_visibility" = "xno"; then -+ GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY" - fi - - - -+cat >>confdefs.h <<_ACEOF -+#define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}" -+_ACEOF - - - --for ac_func in lstat mkstemp flockfile getc_unlocked --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef $ac_func -+# Build time sanity check... -+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } -+# Just in case -+sleep 1 -+echo timestamp > conftest.file -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ if test "$*" = "X"; then -+ # -L didn't work. -+ set X `ls -t $srcdir/configure conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$*" != "X $srcdir/configure conftest.file" \ -+ && test "$*" != "X conftest.file $srcdir/configure"; then - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -+alias in your environment" >&5 -+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -+alias in your environment" >&2;} -+ { (exit 1); exit 1; }; } -+ fi - --int --main () --{ --return $ac_func (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+ test "$2" = conftest.file -+ ) -+then -+ # Ok. -+ : - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- -+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -+Check your system clock" >&5 -+echo "$as_me: error: newly created file is older than distributed files! -+Check your system clock" >&2;} -+ { (exit 1); exit 1; }; } - fi --done -- -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - --for ac_func in localtime_r --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+# Checks for programs. -+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 -+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } -+if test "${ac_cv_search_strerror+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef $ac_func - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -19267,414 +21592,496 @@ - #ifdef __cplusplus - extern "C" - #endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -- -+char strerror (); - int - main () - { --return $ac_func (); -+return strerror (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext -+for ac_lib in '' cposix; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_search_strerror=$ac_res - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- eval "$as_ac_var=no" --fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF - -+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 - fi - done -+if test "${ac_cv_search_strerror+set}" = set; then -+ : -+else -+ ac_cv_search_strerror=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -+echo "${ECHO_T}$ac_cv_search_strerror" >&6; } -+ac_res=$ac_cv_search_strerror -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -+fi - --# _NL_TIME_FIRST_WEEKDAY is an enum and not a define --{ $as_echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 --$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <langinfo.h> --int --main () --{ -- --char c; --c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY)); -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- gtk_ok=yes -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}gcc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - -- gtk_ok=no -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } --if test "$gtk_ok" = "yes"; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE__NL_TIME_FIRST_WEEKDAY 1 --_ACEOF - - fi -+if test -z "$ac_cv_prog_CC"; then -+ ac_ct_CC=$CC -+ # Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - --# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define --{ $as_echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 --$as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <langinfo.h> --int --main () --{ -- --char c; --c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT)); -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- gtk_ok=yes -+ CC=$ac_ct_CC -+ fi - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- gtk_ok=no -+ CC="$ac_cv_prog_CC" - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } --if test "$gtk_ok" = "yes"; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE__NL_MEASUREMENT_MEASUREMENT 1 --_ACEOF -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}cc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - - fi -- --# _NL_PAPER_HEIGHT is an enum and not a define --{ $as_echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 --$as_echo_n "checking for _NL_PAPER_HEIGHT... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <langinfo.h> --int --main () --{ -- --char c; --c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT)); -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- gtk_ok=yes -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- gtk_ok=no -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } --if test "$gtk_ok" = "yes"; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE__NL_PAPER_HEIGHT 1 --_ACEOF - -+ fi - fi -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ ac_prog_rejected=no -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+ ac_cv_prog_CC="cc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --# _NL_PAPER_WIDTH is an enum and not a define --{ $as_echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 --$as_echo_n "checking for _NL_PAPER_WIDTH... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <langinfo.h> --int --main () --{ -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# != 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -+ fi -+fi -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - --char c; --c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH)); - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- gtk_ok=yes -+fi -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in cl.exe -+ 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 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - -- gtk_ok=no -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } --if test "$gtk_ok" = "yes"; then - --cat >>confdefs.h <<\_ACEOF --#define HAVE__NL_PAPER_WIDTH 1 --_ACEOF -+ test -n "$CC" && break -+ done -+fi -+if test -z "$CC"; then -+ ac_ct_CC=$CC -+ for ac_prog in cl.exe -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_CC" && break -+done -+ -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi -+fi - - fi - --# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable --{ $as_echo "$as_me:$LINENO: checking for sigsetjmp" >&5 --$as_echo_n "checking for sigsetjmp... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ -+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&5 -+echo "$as_me: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+ -+# Provide some information about the compiler. -+echo "$as_me:$LINENO: checking for C compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -+if test "${ac_cv_c_compiler_gnu+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <setjmp.h> -+ - int - main () - { -- --sigjmp_buf env; --sigsetjmp(env, 0); -+#ifndef __GNUC__ -+ choke me -+#endif - - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- gtk_ok=yes -+ } && test -s conftest.$ac_objext; then -+ ac_compiler_gnu=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- gtk_ok=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 --$as_echo "$gtk_ok" >&6; } --if test "$gtk_ok" = "yes"; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_SIGSETJMP 1 --_ACEOF -- -+ ac_compiler_gnu=no - fi - --# i18n stuff --ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_c_compiler_gnu=$ac_compiler_gnu - --for ac_header in locale.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -+GCC=`test $ac_compiler_gnu = yes && echo yes` -+ac_test_CFLAGS=${CFLAGS+set} -+ac_save_CFLAGS=$CFLAGS -+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_g+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -19682,1106 +22089,929 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ ac_cv_prog_cc_g=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <$ac_header> -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- }; then -- ac_header_preproc=yes -+ } && test -s conftest.$ac_objext; then -+ : - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no --fi -- --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- if test $ac_cv_header_locale_h = yes; then -- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 --$as_echo_n "checking for LC_MESSAGES... " >&6; } --if test "${am_cv_val_LC_MESSAGES+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <locale.h> -+ - int - main () - { --return LC_MESSAGES -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- am_cv_val_LC_MESSAGES=yes -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_g=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- am_cv_val_LC_MESSAGES=no -+ - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 --$as_echo "$am_cv_val_LC_MESSAGES" >&6; } -- if test $am_cv_val_LC_MESSAGES = yes; then - --cat >>confdefs.h <<\_ACEOF --#define HAVE_LC_MESSAGES 1 --_ACEOF -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi - -- fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS=$ac_save_CFLAGS -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" - fi -- USE_NLS=yes -- -- -- gt_cv_have_gettext=no -- -- CATOBJEXT=NONE -- XGETTEXT=: -- INTLLIBS= -- -- if test "${ac_cv_header_libintl_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 --$as_echo_n "checking for libintl.h... " >&6; } --if test "${ac_cv_header_libintl_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --$as_echo "$ac_cv_header_libintl_h" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 --$as_echo_n "checking libintl.h usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <libintl.h> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 --$as_echo_n "checking libintl.h presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <libintl.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi -- --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 --$as_echo_n "checking for libintl.h... " >&6; } --if test "${ac_cv_header_libintl_h+set}" = set; then -- $as_echo_n "(cached) " >&6 - else -- ac_cv_header_libintl_h=$ac_header_preproc --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --$as_echo "$ac_cv_header_libintl_h" >&6; } -- -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi - fi --if test "x$ac_cv_header_libintl_h" = x""yes; then -- gt_cv_func_dgettext_libintl="no" -- libintl_extra_libs="" -- -- # -- # First check in libc -- # -- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 --$as_echo_n "checking for ngettext in libc... " >&6; } --if test "${gt_cv_func_ngettext_libc+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF + ac_cv_prog_cc_c89=no +ac_save_CC=$CC @@ -52131,88 +42107,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --#include <libintl.h> -- --int --main () -+#include <stdarg.h> -+#include <stdio.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -+struct buf { int x; }; -+FILE * (*rcsopen) (struct buf *, struct stat *, int); -+static char *e (p, i) -+ char **p; -+ int i; - { --return !ngettext ("","", 1) -- ; -- return 0; -+ return p[i]; -+} -+static char *f (char * (*g) (char **, int), char **p, ...) -+{ -+ char *s; -+ va_list v; -+ va_start (v,p); -+ s = g (p, va_arg (v,int)); -+ va_end (v); -+ return s; +@@ -21681,24 +19258,40 @@ + va_end (v); + return s; } --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- gt_cv_func_ngettext_libc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- gt_cv_func_ngettext_libc=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- --fi --{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 --$as_echo "$gt_cv_func_ngettext_libc" >&6; } - -- if test "$gt_cv_func_ngettext_libc" = "yes" ; then -- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 --$as_echo_n "checking for dgettext in libc... " >&6; } --if test "${gt_cv_func_dgettext_libc+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated @@ -52221,137 +42120,90 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - --#include <libintl.h> ++ +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -+int test (int i, double x); -+struct s1 {int (*f) (int a);}; -+struct s2 {int (*f) (double a);}; -+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -+int argc; -+char **argv; ++ + int test (int i, double x); + struct s1 {int (*f) (int a);}; + struct s2 {int (*f) (double a);}; + int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); + int argc; + char **argv; +- int main () { --return !dgettext ("","") -+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +- + return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +- ; return 0; } _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" +-rm -f conftest.$ac_objext +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" + if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { +@@ -21716,7 +19309,7 @@ test -z "$ac_c_werror_flag" || test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- gt_cv_func_dgettext_libc=yes -+ } && test -s conftest.$ac_objext; then + } && test -s conftest.$ac_objext; then +- am_cv_prog_cc_stdc="$ac_arg"; break + ac_cv_prog_cc_c89=$ac_arg else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +@@ -21724,23 +19317,144 @@ -- gt_cv_func_dgettext_libc=no -+ fi --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break -+done + done +-CC="$ac_save_CC" +rm -f conftest.$ac_ext +CC=$ac_save_CC fi --{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 --$as_echo "$gt_cv_func_dgettext_libc" >&6; } -- fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; ++ { $as_echo "$as_me:$LINENO: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; + xno) -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&6; } ;; ++ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac -- if test "$gt_cv_func_ngettext_libc" = "yes" ; then - --for ac_func in bind_textdomain_codeset --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func +-if test -z "$am_cv_prog_cc_stdc"; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ++ +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ ++ +depcc="$CC" am_compiler_list= - --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } ++ ++{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up @@ -52371,8 +42223,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub - --#undef $ac_func ++ + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` @@ -52393,20 +42244,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif ++ + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll @@ -52445,23320 +42283,1271 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + fi + fi + done - --int --main () --{ --return $ac_func (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" ++ + cd .. + rm -rf conftest.dir - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" ++else + am_cv_CC_dependencies_compiler_type=none - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } ++fi ++ ++fi ++{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - ++ + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' -+else + else +- { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 +-$as_echo "$am_cv_prog_cc_stdc" >&6; } + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= fi --done - -- fi - -- # -- # If we don't have everything we want, check in libintl -- # -- if test "$gt_cv_func_dgettext_libc" != "yes" \ -- || test "$gt_cv_func_ngettext_libc" != "yes" \ -- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - -- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 --$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } --if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ +-case "x$am_cv_prog_cc_stdc" in +- x|xno) ;; +- *) CC="$CC $am_cv_prog_cc_stdc" ;; +-esac ++ ++ ++ +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char bindtextdomain (); --int --main () --{ --return bindtextdomain (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_intl_bindtextdomain=yes -+# Find a good install program. We prefer a C program (faster), -+# so one script is as good as another. But avoid the broken or -+# incompatible versions: -+# SysV /etc/install, /usr/sbin/install -+# SunOS /usr/etc/install -+# IRIX /sbin/install -+# AIX /bin/install -+# AmigaOS /C/install, which installs bootblocks on floppy discs -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -+# AFS /usr/afsws/bin/install, which mishandles nonexistent args -+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic -+# ./install, which can be erroneously created by make from ./install.sh. -+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -+if test -z "$INSTALL"; then -+if test "${ac_cv_path_install+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in -+ ./ | .// | /cC/* | \ -+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ /usr/ucb/* ) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # 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_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. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi -+ done -+ done -+ ;; -+esac -+done -+IFS=$as_save_IFS + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -22057,10 +19771,11 @@ + { $as_echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 + $as_echo_n "checking for BASE_DEPENDENCIES... " >&6; } -- ac_cv_lib_intl_bindtextdomain=no --fi - --rm -rf conftest.dSYM --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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 --$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } --if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 --$as_echo_n "checking for ngettext in -lintl... " >&6; } --if test "${ac_cv_lib_intl_ngettext+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ if test "${ac_cv_path_install+set}" = set; then -+ INSTALL=$ac_cv_path_install -+ else -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ INSTALL=$ac_install_sh -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6; } - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char ngettext (); --int --main () --{ --return ngettext (); -- ; -- return 0; --} -+# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -+# It thinks the first close brace ends the variable substitution. -+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -+ -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ -+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -+ -+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh -+all: -+ @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_intl_ngettext=yes -+rm -f conftest.make -+fi -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ SET_MAKE= - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ SET_MAKE="MAKE=${MAKE-make}" -+fi - -- ac_cv_lib_intl_ngettext=no -+ -+if test "x$GCC" = "xyes"; then -+ case " $CFLAGS " in -+ *[\ \ ]-Wall[\ \ ]*) ;; -+ *) CFLAGS="$CFLAGS -Wall" ;; -+ esac -+ -+ if test "x$enable_ansi" = "xyes"; then -+ case " $CFLAGS " in -+ *[\ \ ]-ansi[\ \ ]*) ;; -+ *) CFLAGS="$CFLAGS -ansi" ;; -+ esac -+ -+ case " $CFLAGS " in -+ *[\ \ ]-pedantic[\ \ ]*) ;; -+ *) CFLAGS="$CFLAGS -pedantic" ;; -+ esac -+ fi - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES" -+ -+# Ensure MSVC-compatible struct packing convention is used when -+# compiling for Win32 with gcc. -+# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while -+# gcc2 uses "-fnative-struct". -+if test x"$os_win32" = xyes; then -+ if test x"$GCC" = xyes; then -+ msnative_struct='' -+ { echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 -+echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6; } -+ if test -z "$ac_cv_prog_CC"; then -+ our_gcc="$CC" -+ else -+ our_gcc="$ac_cv_prog_CC" -+ fi -+ case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in -+ 2.) -+ if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then -+ msnative_struct='-fnative-struct' -+ fi -+ ;; -+ *) -+ if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then -+ msnative_struct='-mms-bitfields' -+ fi -+ ;; -+ esac -+ if test x"$msnative_struct" = x ; then -+ { echo "$as_me:$LINENO: result: no way" >&5 -+echo "${ECHO_T}no way" >&6; } -+ { echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 -+echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} -+ else -+ CFLAGS="$CFLAGS $msnative_struct" -+ { echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 -+echo "${ECHO_T}${msnative_struct}" >&6; } -+ fi -+ fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 --$as_echo "$ac_cv_lib_intl_ngettext" >&6; } --if test "x$ac_cv_lib_intl_ngettext" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 --$as_echo_n "checking for dgettext in -lintl... " >&6; } --if test "${ac_cv_lib_intl_dgettext+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ -+# Honor aclocal flags -+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -+ -+## Initial sanity check, done here so that users get told they -+## have the wrong dependencies as early in the process as possible. -+## Later on we actually use the cflags/libs from separate pkg-config -+## calls. Oh, also the later pkg-config calls don't include -+## the version requirements since those make the module lists -+## annoying to construct -+ -+ -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dgettext (); --int --main () --{ --return dgettext (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+ ;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_intl_dgettext=yes -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+echo "${ECHO_T}$PKG_CONFIG" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ - -- ac_cv_lib_intl_dgettext=no - fi -+if test -z "$ac_cv_path_PKG_CONFIG"; then -+ ac_pt_PKG_CONFIG=$PKG_CONFIG -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $ac_pt_PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ ;; -+esac - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 --$as_echo "$ac_cv_lib_intl_dgettext" >&6; } --if test "x$ac_cv_lib_intl_dgettext" = x""yes; then -- gt_cv_func_dgettext_libintl=yes -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ if test "x$ac_pt_PKG_CONFIG" = x; then -+ PKG_CONFIG="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" - fi - - fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ PKG_CONFIG="" -+ fi - -+fi - -- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 --$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } -- { $as_echo "$as_me:$LINENO: result: " >&5 --$as_echo "" >&6; } -- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 --$as_echo_n "checking for ngettext in -lintl... " >&6; } --if test "${ac_cv_lib_intl_ngettext+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl -liconv $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+pkg_failed=no -+{ echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 -+echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; } - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char ngettext (); --int --main () --{ --return ngettext (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 +-if test -n "$BASE_DEPENDENCIES_CFLAGS"; then +- pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$BASE_DEPENDENCIES_CFLAGS"; then + pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_intl_ngettext=yes -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` +@@ -22070,13 +19785,15 @@ else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_intl_ngettext=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ pkg_failed=yes + pkg_failed=yes fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 --$as_echo "$ac_cv_lib_intl_ngettext" >&6; } --if test "x$ac_cv_lib_intl_ngettext" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 --$as_echo_n "checking for dcgettext in -lintl... " >&6; } --if test "${ac_cv_lib_intl_dcgettext+set}" = set; then -- $as_echo_n "(cached) " >&6 +- else +- pkg_failed=untried + fi - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lintl -liconv $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dcgettext (); --int --main () --{ --return dcgettext (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 ++else + pkg_failed=untried -+fi + fi +-if test -n "$BASE_DEPENDENCIES_LIBS"; then +- pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$BASE_DEPENDENCIES_LIBS"; then + pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" + else + if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_intl_dcgettext=yes -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` +@@ -22086,8 +19803,9 @@ else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_intl_dcgettext=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ pkg_failed=yes + pkg_failed=yes fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 --$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } --if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then -- gt_cv_func_dgettext_libintl=yes -- libintl_extra_libs=-liconv +- else +- pkg_failed=untried + fi - else -- : ++else + pkg_failed=untried fi -+ -+ -+if test $pkg_failed = yes; then -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes - else -- : -+ _pkg_short_errors_supported=no + +@@ -22100,9 +19818,9 @@ + _pkg_short_errors_supported=no fi -- -+ if test $_pkg_short_errors_supported = yes; then + if test $_pkg_short_errors_supported = yes; then +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` + BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` -+ else + else +- BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>&1` + BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6"` fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 + # Put the nasty error message in config.log where it belongs + echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 +@@ -22203,9 +19921,7 @@ + { $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 + $as_echo "$enable_explicit_deps" >&6; } -- # -- # If we found libintl, then check in it for bind_textdomain_codeset(); -- # we'll prefer libc if neither have bind_textdomain_codeset(), -- # and both have dgettext and ngettext -- # -- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -- glib_save_LIBS="$LIBS" -- LIBS="$LIBS -lintl $libintl_extra_libs" -- unset ac_cv_func_bind_textdomain_codeset -+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: - --for ac_func in bind_textdomain_codeset --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -+$BASE_DEPENDENCIES_PKG_ERRORS - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -+Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS -+and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&5 -+echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: - --#undef $ac_func -+$BASE_DEPENDENCIES_PKG_ERRORS - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. - --int --main () --{ --return $ac_func (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS -+and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+" >&2;} -+ { (exit 1); exit 1; }; } -+elif test $pkg_failed = untried; then -+ { { echo "$as_me:$LINENO: 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 -+path to pkg-config. - -- eval "$as_ac_var=no" --fi -+Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS -+and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -+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 -+path to pkg-config. -+ -+Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS -+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://pkg-config.freedesktop.org/>. -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+else -+ BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS -+ BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ : - fi --done - -- LIBS="$glib_save_LIBS" -+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 "^[^_].*"' -+else -+ # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk) -+ LIBTOOL_EXPORT_OPTIONS= -+fi - -- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -- gt_cv_func_dgettext_libc=no -- else -- if test "$gt_cv_func_dgettext_libc" = "yes" \ -- && test "$gt_cv_func_ngettext_libc" = "yes"; then -- gt_cv_func_dgettext_libintl=no -- fi -- fi -- fi -- fi - -- if test "$gt_cv_func_dgettext_libc" = "yes" \ -- || test "$gt_cv_func_dgettext_libintl" = "yes"; then -- gt_cv_have_gettext=yes -- fi - -- if test "$gt_cv_func_dgettext_libintl" = "yes"; then -- INTLLIBS="-lintl $libintl_extra_libs" -- fi -+# Check whether --enable-explicit-deps was given. -+if test "${enable_explicit_deps+set}" = set; then -+ enableval=$enable_explicit_deps; -+else -+ enable_explicit_deps=auto -+fi - -- if test "$gt_cv_have_gettext" = "yes"; then - --cat >>confdefs.h <<\_ACEOF --#define HAVE_GETTEXT 1 --_ACEOF -+{ echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 -+echo $ECHO_N "checking Whether to write dependencies into .pc files... $ECHO_C" >&6; } -+case $enable_explicit_deps in -+ auto) -+ export SED -+ deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` -+ if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then -+ enable_explicit_deps=yes -+ else -+ enable_explicit_deps=no -+ fi -+ ;; -+ yes|no) -+ ;; -+ *) { { echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 -+echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} -+ { (exit 1); exit 1; }; } -+ ;; -+esac -+{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 -+echo "${ECHO_T}$enable_explicit_deps" >&6; } - -- # Extract the first word of "msgfmt", so it can be a program name with args. --set dummy msgfmt; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_MSGFMT+set}" = set; then -- $as_echo_n "(cached) " >&6 +- +- +-if test $enable_explicit_deps = no; then + if test $enable_explicit_deps = no; then -+ DISABLE_EXPLICIT_DEPS_TRUE= -+ DISABLE_EXPLICIT_DEPS_FALSE='#' + DISABLE_EXPLICIT_DEPS_TRUE= + DISABLE_EXPLICIT_DEPS_FALSE='#' else -- case "$MSGFMT" in -- /*) -- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. -+ DISABLE_EXPLICIT_DEPS_TRUE='#' -+ DISABLE_EXPLICIT_DEPS_FALSE= -+fi -+ -+ -+# define a MAINT-like variable REBUILD which is set if Perl -+# and awk are found, so autogenerated sources can be rebuilt -+ -+for ac_prog in perl5 perl -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_PERL+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $PERL in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then -- ac_cv_path_MSGFMT="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ - ;; - esac +@@ -27766,9 +25482,7 @@ fi --MSGFMT="$ac_cv_path_MSGFMT" --if test "$MSGFMT" != "no"; then -- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 --$as_echo "$MSGFMT" >&6; } -+PERL=$ac_cv_path_PERL -+if test -n "$PERL"; then -+ { echo "$as_me:$LINENO: result: $PERL" >&5 -+echo "${ECHO_T}$PERL" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi -- if test "$MSGFMT" != "no"; then -- glib_save_LIBS="$LIBS" -- LIBS="$LIBS $INTLLIBS" - --for ac_func in dcgettext -+ -+ test -n "$PERL" && break -+done -+ -+ -+# We would like indent, but don't require it. -+# Extract the first word of "indent", so it can be a program name with args. -+set dummy indent; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_INDENT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$INDENT"; then -+ ac_cv_prog_INDENT="$INDENT" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+INDENT=$ac_cv_prog_INDENT -+if test -n "$INDENT"; then -+ { echo "$as_me:$LINENO: result: $INDENT" >&5 -+echo "${ECHO_T}$INDENT" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ -+REBUILD=\# -+if test "x$enable_rebuilds" = "xyes" && \ -+ test -n "$PERL" && \ -+ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then -+ REBUILD= -+fi -+ -+ -+ -+ -+ -+ -+for ac_func in lstat mkstemp flockfile getc_unlocked - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -20834,165 +23064,90 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - -- MSGFMT_OPTS= -- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 --$as_echo_n "checking if msgfmt accepts -c... " >&6; } -- cat >conftest.foo <<_ACEOF -- --msgid "" --msgstr "" --"Content-Type: text/plain; charset=UTF-8\n" --"Project-Id-Version: test 1.0\n" --"PO-Revision-Date: 2007-02-15 12:01+0100\n" --"Last-Translator: test <foo@bar.xx>\n" --"Language-Team: C <LL@li.org>\n" --"MIME-Version: 1.0\n" --"Content-Transfer-Encoding: 8bit\n" -- --_ACEOF --if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 -- ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } --else { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --echo "$as_me: failed input was:" >&5 --sed 's/^/| /' conftest.foo >&5 --fi - -- # Extract the first word of "gmsgfmt", so it can be a program name with args. --set dummy gmsgfmt; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_GMSGFMT+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- case $GMSGFMT in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH -+for ac_func in localtime_r - do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -- ;; --esac --fi --GMSGFMT=$ac_cv_path_GMSGFMT --if test -n "$GMSGFMT"; then -- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 --$as_echo "$GMSGFMT" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- # Extract the first word of "xgettext", so it can be a program name with args. --set dummy xgettext; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_XGETTEXT+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- case "$XGETTEXT" in -- /*) -- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then -- ac_cv_path_XGETTEXT="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" -- ;; --esac --fi --XGETTEXT="$ac_cv_path_XGETTEXT" --if test "$XGETTEXT" != ":"; then -- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 --$as_echo "$XGETTEXT" >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif - - int - main () - { --extern int _nl_msg_cat_cntr; -- return _nl_msg_cat_cntr -+return $ac_func (); - ; - return 0; - } -@@ -21003,75 +23158,58 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- CATOBJEXT=.gmo -- DATADIRNAME=share -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- case $host in -- *-*-solaris*) -- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 --$as_echo_n "checking for bind_textdomain_codeset... " >&6; } --if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define bind_textdomain_codeset innocuous_bind_textdomain_codeset -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char bind_textdomain_codeset (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -+ eval "$as_ac_var=no" -+fi - --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -+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'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - --#undef bind_textdomain_codeset -+fi -+done - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char bind_textdomain_codeset (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset --choke me --#endif - -+# _NL_TIME_FIRST_WEEKDAY is an enum and not a define -+{ echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 -+echo $ECHO_N "checking for _NL_TIME_FIRST_WEEKDAY... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <langinfo.h> - int - main () - { --return bind_textdomain_codeset (); -+ -+char c; -+c = *((unsigned char *) nl_langinfo(_NL_TIME_FIRST_WEEKDAY)); -+ - ; - return 0; - } -@@ -21082,393 +23220,511 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_bind_textdomain_codeset=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ gtk_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_bind_textdomain_codeset=no -+ gtk_ok=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 --$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } --if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then -- CATOBJEXT=.gmo -- DATADIRNAME=share --else -- CATOBJEXT=.mo -- DATADIRNAME=lib --fi -+{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 -+echo "${ECHO_T}$gtk_ok" >&6; } -+if test "$gtk_ok" = "yes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE__NL_TIME_FIRST_WEEKDAY 1 -+_ACEOF - -- ;; -- *) -- CATOBJEXT=.mo -- DATADIRNAME=lib -- ;; -- esac - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- LIBS="$glib_save_LIBS" -- INSTOBJEXT=.mo -- else -- gt_cv_have_gettext=no -- fi -- fi -+# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define -+{ echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 -+echo $ECHO_N "checking for _NL_MEASUREMENT_MEASUREMENT... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <langinfo.h> -+int -+main () -+{ - --fi -+char c; -+c = *((unsigned char *) nl_langinfo(_NL_MEASUREMENT_MEASUREMENT)); - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ gtk_ok=no -+fi - -- if test "$gt_cv_have_gettext" = "yes" ; then -+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; } -+if test "$gtk_ok" = "yes"; then - - cat >>confdefs.h <<\_ACEOF --#define ENABLE_NLS 1 -+#define HAVE__NL_MEASUREMENT_MEASUREMENT 1 - _ACEOF - -- fi -- -- if test "$XGETTEXT" != ":"; then -- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -- : ; -- else -- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 --$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } -- XGETTEXT=":" -- fi -- fi -+fi - -- # We need to process the po/ directory. -- POSUB=po -+# _NL_PAPER_HEIGHT is an enum and not a define -+{ echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 -+echo $ECHO_N "checking for _NL_PAPER_HEIGHT... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <langinfo.h> -+int -+main () -+{ - -- ac_config_commands="$ac_config_commands default-1" -+char c; -+c = *((unsigned char *) nl_langinfo(_NL_PAPER_HEIGHT)); - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- for lang in $ALL_LINGUAS; do -- GMOFILES="$GMOFILES $lang.gmo" -- POFILES="$POFILES $lang.po" -- done -+ gtk_ok=no -+fi - -+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; } -+if test "$gtk_ok" = "yes"; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE__NL_PAPER_HEIGHT 1 -+_ACEOF - -+fi - -+# _NL_PAPER_WIDTH is an enum and not a define -+{ echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 -+echo $ECHO_N "checking for _NL_PAPER_WIDTH... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <langinfo.h> -+int -+main () -+{ - -+char c; -+c = *((unsigned char *) nl_langinfo(_NL_PAPER_WIDTH)); - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ gtk_ok=no -+fi - -+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; } -+if test "$gtk_ok" = "yes"; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE__NL_PAPER_WIDTH 1 -+_ACEOF - -+fi - -+# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable -+{ echo "$as_me:$LINENO: checking for sigsetjmp" >&5 -+echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <setjmp.h> -+int -+main () -+{ - -+sigjmp_buf env; -+sigsetjmp(env, 0); - -- if test "$gt_cv_have_gettext" = "yes"; then -- if test "x$ALL_LINGUAS" = "x"; then -- LINGUAS= -- else -- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 --$as_echo_n "checking for catalogs to be installed... " >&6; } -- NEW_LINGUAS= -- for presentlang in $ALL_LINGUAS; do -- useit=no -- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -- desiredlanguages="$LINGUAS" -- else -- desiredlanguages="$ALL_LINGUAS" -- fi -- for desiredlang in $desiredlanguages; do -- # Use the presentlang catalog if desiredlang is -- # a. equal to presentlang, or -- # b. a variant of presentlang (because in this case, -- # presentlang can be used as a fallback for messages -- # which are not translated in the desiredlang catalog). -- case "$desiredlang" in -- "$presentlang"*) useit=yes;; -- esac -- done -- if test $useit = yes; then -- NEW_LINGUAS="$NEW_LINGUAS $presentlang" -- fi -- done -- LINGUAS=$NEW_LINGUAS -- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 --$as_echo "$LINGUAS" >&6; } -- fi -- -- if test -n "$LINGUAS"; then -- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -- fi -- fi -- -- MKINSTALLDIRS= -- if test -n "$ac_aux_dir"; then -- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -- fi -- if test -z "$MKINSTALLDIRS"; then -- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -- fi -- -- -- test -d po || mkdir po -- if test "x$srcdir" != "x."; then -- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -- posrcprefix="$srcdir/" -- else -- posrcprefix="../$srcdir/" -- fi -- else -- posrcprefix="../" -- fi -- rm -f po/POTFILES -- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -- < $srcdir/po/POTFILES.in > po/POTFILES -- --LIBS="$LIBS $INTLLIBS" --ac_config_commands="$ac_config_commands default-2" -- -- --glib_save_prefix="$prefix" --glib_save_exec_prefix="$exec_prefix" --glib_save_datarootdir="$datarootdir" --test "x$prefix" = xNONE && prefix=$ac_default_prefix --test "x$exec_prefix" = xNONE && exec_prefix=$prefix --datarootdir=`eval echo "${datarootdir}"` --if test "x$CATOBJEXT" = "x.mo" ; then -- localedir=`eval echo "${libdir}/locale"` -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -- localedir=`eval echo "${datadir}/locale"` -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ gtk_ok=no - fi --prefix="$glib_save_prefix" --exec_prefix="$glib_save_exec_prefix" --datarootdir="$glib_save_datarootdir" - --cat >>confdefs.h <<_ACEOF --#define GTK_LOCALEDIR "$localedir" --_ACEOF -+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; } -+if test "$gtk_ok" = "yes"; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_SIGSETJMP 1 -+_ACEOF - -+fi - --{ $as_echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 --$as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; } -+# i18n stuff -+ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`" - --gtk_save_LIBS=$LIBS --LIBS="$LIBS -lm" --if test "$cross_compiling" = yes; then -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } - -+for ac_header in locale.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else -- cat >conftest.$ac_ext <<_ACEOF -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <math.h> -- int main (void) { return (log(1) != log(1.)); } -+$ac_includes_default -+#include <$ac_header> - _ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --gtk_save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -std1" -- if test "$cross_compiling" = yes; then -- true -+ ac_header_compiler=no -+fi - --else -- cat >conftest.$ac_ext <<_ACEOF -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <math.h> -- int main (void) { return (log(1) != log(1.)); } -+#include <$ac_header> - _ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" -+if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- { $as_echo "$as_me:$LINENO: result: -std1" >&5 --$as_echo "-std1" >&6; } -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --{ $as_echo "$as_me:$LINENO: result: " >&5 --$as_echo "" >&6; } -- CFLAGS="$gtk_save_CFLAGS" -- { $as_echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 --$as_echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ ac_header_preproc=no - fi - -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" - fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - --LIBS=$gtk_save_LIBS -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - --{ $as_echo "$as_me:$LINENO: checking for the BeOS" >&5 --$as_echo_n "checking for the BeOS... " >&6; } --case $host in -- *-*-beos*) -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- MATH_LIB= -- ;; -- *) -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- ;; --esac -+fi - --# --# see bug 162979 --# --{ $as_echo "$as_me:$LINENO: checking for HP-UX" >&5 --$as_echo_n "checking for HP-UX... " >&6; } --case $host_os in -- hpux9* | hpux10* | hpux11*) -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- CFLAGS="$CFLAGS -DHPPEX -DSHMLINK" -- ;; -- *) -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- ;; --esac -+done - --{ $as_echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 --$as_echo_n "checking for extra flags for POSIX compliance... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ if test $ac_cv_header_locale_h = yes; then -+ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } -+if test "${am_cv_val_LC_MESSAGES+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <dirent.h> -+#include <locale.h> - int - main () - { --DIR *dir; -+return LC_MESSAGES - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ am_cv_val_LC_MESSAGES=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- gtk_save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -posix" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+ am_cv_val_LC_MESSAGES=no -+fi -+ -+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 -+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_LC_MESSAGES 1 - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <dirent.h> --int --main () --{ --DIR *dir; -- ; -- return 0; --} -+ -+ fi -+ fi -+ USE_NLS=yes -+ -+ -+ gt_cv_have_gettext=no -+ -+ CATOBJEXT=NONE -+ XGETTEXT=: -+ INTLLIBS= -+ -+ if test "${ac_cv_header_libintl_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for libintl.h" >&5 -+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_libintl_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 -+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <libintl.h> - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -21476,235 +23732,120 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- { $as_echo "$as_me:$LINENO: result: -posix" >&5 --$as_echo "-posix" >&6; } -+ ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { $as_echo "$as_me:$LINENO: result: " >&5 --$as_echo "" >&6; } -- CFLAGS="$gtk_save_CFLAGS" -- { $as_echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 --$as_echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - --# --# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working --# -- --GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0" -- --# Check whether --enable-glibtest was given. --if test "${enable_glibtest+set}" = set; then -- enableval=$enable_glibtest; --else -- enable_glibtest=yes --fi -- -- -- pkg_config_args=glib-2.0 -- for module in . gobject gmodule-no-export gthread -- do -- case "$module" in -- gmodule) -- pkg_config_args="$pkg_config_args gmodule-2.0" -- ;; -- gmodule-no-export) -- pkg_config_args="$pkg_config_args gmodule-no-export-2.0" -- ;; -- gobject) -- pkg_config_args="$pkg_config_args gobject-2.0" -- ;; -- gthread) -- pkg_config_args="$pkg_config_args gthread-2.0" -- ;; -- gio*) -- pkg_config_args="$pkg_config_args $module-2.0" -- ;; -- esac -- done -- -- -- --if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. --set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- case $PKG_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- ;; -+# Is the header present? -+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 -+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <libintl.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac --fi --PKG_CONFIG=$ac_cv_path_PKG_CONFIG --if test -n "$PKG_CONFIG"; then -- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 --$as_echo "$PKG_CONFIG" >&6; } -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no - fi --if test -z "$ac_cv_path_PKG_CONFIG"; then -- ac_pt_PKG_CONFIG=$PKG_CONFIG -- # Extract the first word of "pkg-config", so it can be a program name with args. --set dummy pkg-config; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- case $ac_pt_PKG_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS - -- ;; --esac --fi --ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG --if test -n "$ac_pt_PKG_CONFIG"; then -- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 --$as_echo "$ac_pt_PKG_CONFIG" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - -- if test "x$ac_pt_PKG_CONFIG" = x; then -- PKG_CONFIG="" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac -- PKG_CONFIG=$ac_pt_PKG_CONFIG -- fi -+{ echo "$as_me:$LINENO: checking for libintl.h" >&5 -+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_libintl_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" --fi -- -+ ac_cv_header_libintl_h=$ac_header_preproc - fi --if test -n "$PKG_CONFIG"; then -- _pkg_min_version=0.16 -- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 --$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } -- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- PKG_CONFIG="" -- fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } - - fi -+if test $ac_cv_header_libintl_h = yes; then -+ gt_cv_func_dgettext_libintl="no" -+ libintl_extra_libs="" - -- no_glib="" -- -- if test "x$PKG_CONFIG" = x ; then -- no_glib=yes -- PKG_CONFIG=no -- fi -- -- min_glib_version=2.17.6 -- { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 --$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } -- -- if test x$PKG_CONFIG != xno ; then -- ## don't try to run the test against uninstalled libtool libs -- if $PKG_CONFIG --uninstalled $pkg_config_args; then -- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" -- enable_glibtest=no -- fi -- -- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then -- : -- else -- no_glib=yes -- fi -- fi -- -- if test x"$no_glib" = x ; then -- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` -- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -- -- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -- if test "x$enable_glibtest" = "xyes" ; then -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $GLIB_CFLAGS" -- LIBS="$GLIB_LIBS $LIBS" -- rm -f conf.glibtest -- if test "$cross_compiling" = yes; then -- echo $ac_n "cross compiling; assumed OK... $ac_c" -+ # -+ # First check in libc -+ # -+ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 -+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } -+if test "${gt_cv_func_ngettext_libc+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -21713,151 +23854,68 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --#include <glib.h> --#include <stdio.h> --#include <stdlib.h> -+#include <libintl.h> - - int - main () - { -- int major, minor, micro; -- char *tmp_version; -- -- system ("touch conf.glibtest"); -- -- /* HP/UX 9 (%@#!) writes to sscanf strings */ -- tmp_version = g_strdup("$min_glib_version"); -- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", "$min_glib_version"); -- exit(1); -- } -- -- if ((glib_major_version != $glib_config_major_version) || -- (glib_minor_version != $glib_config_minor_version) || -- (glib_micro_version != $glib_config_micro_version)) -- { -- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -- glib_major_version, glib_minor_version, glib_micro_version); -- printf ("*** was found! If pkg-config was correct, then it is best\n"); -- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); -- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -- printf("*** required on your system.\n"); -- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -- printf("*** to point to the correct configuration files\n"); -- } -- else if ((glib_major_version != GLIB_MAJOR_VERSION) || -- (glib_minor_version != GLIB_MINOR_VERSION) || -- (glib_micro_version != GLIB_MICRO_VERSION)) -- { -- printf("*** GLIB header files (version %d.%d.%d) do not match\n", -- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -- printf("*** library (version %d.%d.%d)\n", -- glib_major_version, glib_minor_version, glib_micro_version); -- } -- else -- { -- if ((glib_major_version > major) || -- ((glib_major_version == major) && (glib_minor_version > minor)) || -- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -- { -- return 0; -- } -- else -- { -- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -- glib_major_version, glib_minor_version, glib_micro_version); -- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -- major, minor, micro); -- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -- printf("***\n"); -- printf("*** If you have already installed a sufficiently new version, this error\n"); -- printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -- printf("*** being found. The easiest way to fix this is to remove the old version\n"); -- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); -- printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -- printf("*** so that the correct libraries are found at run-time))\n"); -- } -- } -- return 1; -+return !ngettext ("","", 1) -+ ; -+ return 0; - } -- - _ACEOF --rm -f conftest$ac_exeext -+rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --no_glib=yes --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ gt_cv_func_ngettext_libc=no - fi - -+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" -- fi -- fi -- if test "x$no_glib" = x ; then -- { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 --$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } -- : -- else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- if test "$PKG_CONFIG" = "no" ; then -- echo "*** A new enough version of pkg-config was not found." -- echo "*** See http://www.freedesktop.org/software/pkgconfig/" -- else -- if test -f conf.glibtest ; then -- : -- else -- echo "*** Could not run GLIB test program, checking why..." -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $GLIB_CFLAGS" -- LIBS="$LIBS $GLIB_LIBS" -- cat >conftest.$ac_ext <<_ACEOF -+fi -+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 -+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } -+ -+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then -+ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 -+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } -+if test "${gt_cv_func_dgettext_libc+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --#include <glib.h> --#include <stdio.h> -+#include <libintl.h> - - int - main () - { -- return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); -+return !dgettext ("","") - ; - return 0; - } -@@ -21868,86 +23926,43 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $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" -- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -- echo "*** to the installed location Also, make sure you have run ldconfig if that" -- echo "*** is required on your system" -- echo "***" -- echo "*** If you have an old version installed, it is best to remove it, although" -- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ gt_cv_func_dgettext_libc=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occured. This usually means GLIB is incorrectly installed." -+ gt_cv_func_dgettext_libc=no - fi - --rm -rf conftest.dSYM - 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" -- fi -- fi -- GLIB_CFLAGS="" -- GLIB_LIBS="" -- GLIB_GENMARSHAL="" -- GOBJECT_QUERY="" -- GLIB_MKENUMS="" -- { { $as_echo "$as_me:$LINENO: error: --*** GLIB 2.17.6 or better is required. The latest version of --*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5 --$as_echo "$as_me: error: --*** GLIB 2.17.6 or better is required. The latest version of --*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- -- - -- -- rm -f conf.glibtest -- -- --# See if it's safe to turn G_DISABLE_DEPRECATED on. --GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` --GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.17.6 | sed "s/\.[^.]*\$//"` --if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then -- CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" - fi -+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } -+ fi - --CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS" -- -- --gtk_save_LIBS=$LIBS --LIBS="$LIBS $GLIB_LIBS" -+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then - - for ac_func in bind_textdomain_codeset - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -22000,1027 +24015,1041 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - --LIBS=$gtk_save_LIBS -+ fi - -+ # -+ # If we don't have everything we want, check in libintl -+ # -+ if test "$gt_cv_func_dgettext_libc" != "yes" \ -+ || test "$gt_cv_func_ngettext_libc" != "yes" \ -+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - --for ac_header in pwd.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } -+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char bindtextdomain (); -+int -+main () -+{ -+return bindtextdomain (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_intl_bindtextdomain=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+ ac_cv_lib_intl_bindtextdomain=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } -+if test $ac_cv_lib_intl_bindtextdomain = yes; then -+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } -+if test "${ac_cv_lib_intl_ngettext+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <$ac_header> -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char ngettext (); -+int -+main () -+{ -+return ngettext (); -+ ; -+ return 0; -+} - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- }; then -- ac_header_preproc=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_intl_ngettext=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no -+ ac_cv_lib_intl_ngettext=no - fi - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_PWD_H 1 --_ACEOF -- --fi -- --done -- -- --for ac_header in sys/time.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+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 --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -+if test $ac_cv_lib_intl_ngettext = yes; then -+ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } -+if test "${ac_cv_lib_intl_dgettext+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dgettext (); -+int -+main () -+{ -+return dgettext (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_intl_dgettext=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+ ac_cv_lib_intl_dgettext=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no -+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 -- --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } -+if test $ac_cv_lib_intl_dgettext = yes; then -+ gt_cv_func_dgettext_libintl=yes - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_SYS_TIME_H 1 --_ACEOF - - fi - --done -- - --for ac_header in unistd.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then -+ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 -+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: result: " >&5 -+echo "${ECHO_T}" >&6; } -+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } -+if test "${ac_cv_lib_intl_ngettext+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl -liconv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char ngettext (); -+int -+main () -+{ -+return ngettext (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_intl_ngettext=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+ ac_cv_lib_intl_ngettext=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -+if test $ac_cv_lib_intl_ngettext = yes; then -+ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } -+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl -liconv $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <$ac_header> -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dcgettext (); -+int -+main () -+{ -+return dcgettext (); -+ ; -+ return 0; -+} - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- }; then -- ac_header_preproc=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_intl_dcgettext=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no -+ ac_cv_lib_intl_dcgettext=no - fi - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" -+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 --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } -+if test $ac_cv_lib_intl_dcgettext = yes; then -+ gt_cv_func_dgettext_libintl=yes -+ libintl_extra_libs=-liconv -+else -+ : - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_UNISTD_H 1 --_ACEOF - -+else -+ : - fi - --done -+ fi - -+ # -+ # If we found libintl, then check in it for bind_textdomain_codeset(); -+ # we'll prefer libc if neither have bind_textdomain_codeset(), -+ # and both have dgettext and ngettext -+ # -+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS -lintl $libintl_extra_libs" -+ unset ac_cv_func_bind_textdomain_codeset - --for ac_header in ftw.h -+for ac_func in bind_textdomain_codeset - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+ eval "$as_ac_var=no" - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> -+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'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no - fi -+done - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+ LIBS="$glib_save_LIBS" - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then -+ gt_cv_func_dgettext_libc=no -+ else -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ && test "$gt_cv_func_ngettext_libc" = "yes"; then -+ gt_cv_func_dgettext_libintl=no -+ fi -+ fi -+ fi -+ fi - --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -+ if test "$gt_cv_func_dgettext_libc" = "yes" \ -+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ gt_cv_have_gettext=yes -+ fi -+ -+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then -+ INTLLIBS="-lintl $libintl_extra_libs" -+ fi -+ -+ if test "$gt_cv_have_gettext" = "yes"; then - - cat >>confdefs.h <<\_ACEOF --#define HAVE_FTW_H 1 -+#define HAVE_GETTEXT 1 - _ACEOF - -+ # Extract the first word of "msgfmt", so it can be a program name with args. -+set dummy msgfmt; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_MSGFMT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case "$MSGFMT" in -+ /*) -+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then -+ ac_cv_path_MSGFMT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" -+ ;; -+esac - fi -+MSGFMT="$ac_cv_path_MSGFMT" -+if test "$MSGFMT" != "no"; then -+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -+echo "${ECHO_T}$MSGFMT" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ if test "$MSGFMT" != "no"; then -+ glib_save_LIBS="$LIBS" -+ LIBS="$LIBS $INTLLIBS" - --done -- -- --{ $as_echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 --$as_echo_n "checking for GNU ftw extensions... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+for ac_func in dcgettext -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#define _XOPEN_SOURCE 500 --#define _GNU_SOURCE --#include <ftw.h> -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ - int - main () - { --int flags = FTW_ACTIONRETVAL; -+return $ac_func (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- gtk_ok=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- gtk_ok=no -+ eval "$as_ac_var=no" - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --if test $gtk_ok = yes; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_GNU_FTW 1 -+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'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } - fi -+done - --saved_cflags="$CFLAGS" --saved_ldflags="$LDFLAGS" -+ MSGFMT_OPTS= -+ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 -+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } -+ cat >conftest.foo <<_ACEOF - -+msgid "" -+msgstr "" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Project-Id-Version: test 1.0\n" -+"PO-Revision-Date: 2007-02-15 12:01+0100\n" -+"Last-Translator: test <foo@bar.xx>\n" -+"Language-Team: C <LL@li.org>\n" -+"MIME-Version: 1.0\n" -+"Content-Transfer-Encoding: 8bit\n" - --# Checks for header files. --{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --$as_echo_n "checking for ANSI C header files... " >&6; } --if test "${ac_cv_header_stdc+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> --#include <stdarg.h> --#include <string.h> --#include <float.h> -- -+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 -+ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+else { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+echo "$as_me: failed input was:" >&5 -+sed 's/^/| /' conftest.foo >&5 -+fi -+ -+ # Extract the first word of "gmsgfmt", so it can be a program name with args. -+set dummy gmsgfmt; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_GMSGFMT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $GMSGFMT in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -+ ;; -+esac -+fi -+GMSGFMT=$ac_cv_path_GMSGFMT -+if test -n "$GMSGFMT"; then -+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -+echo "${ECHO_T}$GMSGFMT" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ -+ # Extract the first word of "xgettext", so it can be a program name with args. -+set dummy xgettext; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_XGETTEXT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case "$XGETTEXT" in -+ /*) -+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then -+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" -+ ;; -+esac -+fi -+XGETTEXT="$ac_cv_path_XGETTEXT" -+if test "$XGETTEXT" != ":"; then -+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -+echo "${ECHO_T}$XGETTEXT" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ - int - main () - { -- -+extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_header_stdc=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ CATOBJEXT=.gmo -+ DATADIRNAME=share - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_header_stdc=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <string.h> -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : -+ case $host in -+ *-*-solaris*) -+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } -+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_header_stdc=no --fi --rm -f conftest* -- --fi -- --if test $ac_cv_header_stdc = yes; then -- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <stdlib.h> -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi --rm -f conftest* -+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - --fi -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char bind_textdomain_codeset (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ - --if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -- : --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ctype.h> --#include <stdlib.h> --#if ((' ' & 0x0FF) == 0x020) --# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#ifdef __STDC__ -+# include <limits.h> - #else --# define ISLOWER(c) \ -- (('a' <= (c) && (c) <= 'i') \ -- || ('j' <= (c) && (c) <= 'r') \ -- || ('s' <= (c) && (c) <= 'z')) --# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+# include <assert.h> -+#endif -+ -+#undef bind_textdomain_codeset -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char bind_textdomain_codeset (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -+choke me - #endif - --#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) - int - main () - { -- int i; -- for (i = 0; i < 256; i++) -- if (XOR (islower (i), ISLOWER (i)) -- || toupper (i) != TOUPPER (i)) -- return 2; -+return bind_textdomain_codeset (); -+ ; - return 0; - } - _ACEOF --rm -f conftest$ac_exeext -+rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --ac_cv_header_stdc=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ ac_cv_func_bind_textdomain_codeset=no - fi - -- -+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 -+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -+if test $ac_cv_func_bind_textdomain_codeset = yes; then -+ CATOBJEXT=.gmo -+ DATADIRNAME=share -+else -+ CATOBJEXT=.mo -+ DATADIRNAME=lib - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --$as_echo "$ac_cv_header_stdc" >&6; } --if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -+ ;; -+ *) -+ CATOBJEXT=.mo -+ DATADIRNAME=lib -+ ;; -+ esac -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$glib_save_LIBS" -+ INSTOBJEXT=.mo -+ else -+ gt_cv_have_gettext=no -+ fi -+ fi - - fi - - --# Checks for typedefs, structures, and compiler characteristics. --{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 --$as_echo_n "checking for an ANSI C-conforming const... " >&6; } --if test "${ac_cv_c_const+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+ -+ if test "$gt_cv_have_gettext" = "yes" ; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define ENABLE_NLS 1 - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ --/* FIXME: Include the comments suggested by Paul. */ --#ifndef __cplusplus -- /* Ultrix mips cc rejects this. */ -- typedef int charset[2]; -- const charset cs; -- /* SunOS 4.1.1 cc rejects this. */ -- 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}; -- /* AIX XL C 1.02.0.0 rejects this. -- It does not let you subtract one const X* pointer from another in -- an arm of an if-expression whose if-part is not a constant -- expression */ -- const char *g = "string"; -- pcpcc = &g + (g ? g-g : 0); -- /* HPUX 7.0 cc rejects these. */ -- ++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; -+ fi - -- *t++ = 0; -- if (s) return 0; -- } -- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ -- int x[] = {25, 17}; -- const int *foo = &x[0]; -- ++foo; -- } -- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ -- typedef const int *iptr; -- iptr p = 0; -- ++p; -- } -- { /* AIX XL C 1.02.0.0 rejects this saying -- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -- struct s { int j; const int *ap[3]; }; -- struct s *b; b->j = 5; -- } -- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -- const int foo = 10; -- if (!foo) return 0; -- } -- return !cs[0] && !zero.x; --#endif -+ if test "$XGETTEXT" != ":"; then -+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -+ : ; -+ else -+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } -+ XGETTEXT=":" -+ fi -+ fi - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ # We need to process the po/ directory. -+ POSUB=po - -- ac_cv_c_const=no --fi -+ ac_config_commands="$ac_config_commands default-1" - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ for lang in $ALL_LINGUAS; do -+ GMOFILES="$GMOFILES $lang.gmo" -+ POFILES="$POFILES $lang.po" -+ done -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ if test "$gt_cv_have_gettext" = "yes"; then -+ if test "x$ALL_LINGUAS" = "x"; then -+ LINGUAS= -+ else -+ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } -+ NEW_LINGUAS= -+ for presentlang in $ALL_LINGUAS; do -+ useit=no -+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then -+ desiredlanguages="$LINGUAS" -+ else -+ desiredlanguages="$ALL_LINGUAS" -+ fi -+ for desiredlang in $desiredlanguages; do -+ # Use the presentlang catalog if desiredlang is -+ # a. equal to presentlang, or -+ # b. a variant of presentlang (because in this case, -+ # presentlang can be used as a fallback for messages -+ # which are not translated in the desiredlang catalog). -+ case "$desiredlang" in -+ "$presentlang"*) useit=yes;; -+ esac -+ done -+ if test $useit = yes; then -+ NEW_LINGUAS="$NEW_LINGUAS $presentlang" -+ fi -+ done -+ LINGUAS=$NEW_LINGUAS -+ { echo "$as_me:$LINENO: result: $LINGUAS" >&5 -+echo "${ECHO_T}$LINGUAS" >&6; } -+ fi -+ -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi -+ fi -+ -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" -+ fi -+ -+ -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES -+ -+LIBS="$LIBS $INTLLIBS" -+ac_config_commands="$ac_config_commands default-2" -+ -+ -+glib_save_prefix="$prefix" -+glib_save_exec_prefix="$exec_prefix" -+glib_save_datarootdir="$datarootdir" -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+test "x$exec_prefix" = xNONE && exec_prefix=$prefix -+datarootdir=`eval echo "${datarootdir}"` -+if test "x$CATOBJEXT" = "x.mo" ; then -+ localedir=`eval echo "${libdir}/locale"` -+else -+ localedir=`eval echo "${datadir}/locale"` - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 --$as_echo "$ac_cv_c_const" >&6; } --if test $ac_cv_c_const = no; then -+prefix="$glib_save_prefix" -+exec_prefix="$glib_save_exec_prefix" -+datarootdir="$glib_save_datarootdir" - --cat >>confdefs.h <<\_ACEOF --#define const /**/ -+cat >>confdefs.h <<_ACEOF -+#define GTK_LOCALEDIR "$localedir" - _ACEOF - --fi - - --# Checks for library functions. --{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 --$as_echo_n "checking return type of signal handlers... " >&6; } --if test "${ac_cv_type_signal+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 -+echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6; } -+ -+gtk_save_LIBS=$LIBS -+LIBS="$LIBS -lm" -+if test "$cross_compiling" = yes; then -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } -+ - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23028,504 +25057,423 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <sys/types.h> --#include <signal.h> -- --int --main () --{ --return *(signal (0, 0)) (0) == 1; -- ; -- return 0; --} -+#include <math.h> -+ int main (void) { return (log(1) != log(1.)); } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_type_signal=int -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./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 -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_type_signal=void --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 --$as_echo "$ac_cv_type_signal" >&6; } -- --cat >>confdefs.h <<_ACEOF --#define RETSIGTYPE $ac_cv_type_signal --_ACEOF -- -- -- -+( exit $ac_status ) -+gtk_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -std1" -+ if test "$cross_compiling" = yes; then -+ true - --for ac_header in stdlib.h unistd.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> -+#include <math.h> -+ int main (void) { return (log(1) != log(1.)); } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./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 -+ { echo "$as_me:$LINENO: result: -std1" >&5 -+echo "${ECHO_T}-std1" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+( exit $ac_status ) -+{ echo "$as_me:$LINENO: result: " >&5 -+echo "${ECHO_T}" >&6; } -+ CFLAGS="$gtk_save_CFLAGS" -+ { echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 -+echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ -+LIBS=$gtk_save_LIBS -+ -+{ echo "$as_me:$LINENO: checking for the BeOS" >&5 -+echo $ECHO_N "checking for the BeOS... $ECHO_C" >&6; } -+case $host in -+ *-*-beos*) -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ MATH_LIB= -+ ;; -+ *) -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ ;; -+esac -+ -+# -+# see bug 162979 -+# -+{ echo "$as_me:$LINENO: checking for HP-UX" >&5 -+echo $ECHO_N "checking for HP-UX... $ECHO_C" >&6; } -+case $host_os in -+ hpux9* | hpux10* | hpux11*) -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ CFLAGS="$CFLAGS -DHPPEX -DSHMLINK" -+ ;; -+ *) -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ ;; -+esac -+ -+{ echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 -+echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <$ac_header> -+#include <dirent.h> -+int -+main () -+{ -+DIR *dir; -+ ; -+ return 0; -+} - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- }; then -- ac_header_preproc=yes -+ } && test -s conftest.$ac_objext; then -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no --fi -- --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- --for ac_func in getpagesize --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -+ gtk_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -posix" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef $ac_func -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -- -+#include <dirent.h> - int - main () - { --return $ac_func (); -+DIR *dir; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+ } && test -s conftest.$ac_objext; then -+ { echo "$as_me:$LINENO: result: -posix" >&5 -+echo "${ECHO_T}-posix" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- eval "$as_ac_var=no" -+ { echo "$as_me:$LINENO: result: " >&5 -+echo "${ECHO_T}" >&6; } -+ CFLAGS="$gtk_save_CFLAGS" -+ { echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 -+echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF - --fi --done -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - --{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 --$as_echo_n "checking for working mmap... " >&6; } --if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then -- ac_cv_func_mmap_fixed_mapped=no --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --/* malloc might have been renamed as rpl_malloc. */ --#undef malloc -+# -+# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working -+# - --/* Thanks to Mike Haertel and Jim Avera for this test. -- Here is a matrix of mmap possibilities: -- mmap private not fixed -- mmap private fixed at somewhere currently unmapped -- mmap private fixed at somewhere already mapped -- mmap shared not fixed -- mmap shared fixed at somewhere currently unmapped -- mmap shared fixed at somewhere already mapped -- For private mappings, we should verify that changes cannot be read() -- back from the file, nor mmap's back from the file at a different -- address. (There have been systems where private was not correctly -- implemented like the infamous i386 svr4.0, and systems where the -- VM page cache was not coherent with the file system buffer cache -- like early versions of FreeBSD and possibly contemporary NetBSD.) -- For shared mappings, we should conversely verify that changes get -- propagated back to all the places they're supposed to be. -+GLIB_PACKAGES="gobject-2.0 gmodule-no-export-2.0" - -- Grep wants private fixed already mapped. -- The main things grep needs to know about mmap are: -- * does it exist and is it safe to write into the mmap'd area -- * how to use it (BSD variants) */ -+# Check whether --enable-glibtest was given. -+if test "${enable_glibtest+set}" = set; then -+ enableval=$enable_glibtest; -+else -+ enable_glibtest=yes -+fi - --#include <fcntl.h> --#include <sys/mman.h> - --#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H --char *malloc (); --#endif -+ pkg_config_args=glib-2.0 -+ for module in . gobject gmodule-no-export gthread -+ do -+ case "$module" in -+ gmodule) -+ pkg_config_args="$pkg_config_args gmodule-2.0" -+ ;; -+ gmodule-no-export) -+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" -+ ;; -+ gobject) -+ pkg_config_args="$pkg_config_args gobject-2.0" -+ ;; -+ gthread) -+ pkg_config_args="$pkg_config_args gthread-2.0" -+ ;; -+ gio*) -+ pkg_config_args="$pkg_config_args $module-2.0" -+ ;; -+ esac -+ done - --/* This mess was copied from the GNU getpagesize.h. */ --#ifndef HAVE_GETPAGESIZE --/* Assume that all systems that can run configure 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 */ --# ifdef HAVE_SYS_PARAM_H --# include <sys/param.h> --# ifdef EXEC_PAGESIZE --# define getpagesize() EXEC_PAGESIZE --# else /* no EXEC_PAGESIZE */ --# ifdef NBPG --# define getpagesize() NBPG * CLSIZE --# ifndef CLSIZE --# define CLSIZE 1 --# endif /* no CLSIZE */ --# else /* no NBPG */ --# ifdef NBPC --# define getpagesize() NBPC --# else /* no NBPC */ --# ifdef PAGESIZE --# define getpagesize() PAGESIZE --# endif /* PAGESIZE */ --# endif /* no NBPC */ --# endif /* no NBPG */ --# endif /* no EXEC_PAGESIZE */ --# else /* no HAVE_SYS_PARAM_H */ --# define getpagesize() 8192 /* punt totally */ --# endif /* no HAVE_SYS_PARAM_H */ --# endif /* no _SC_PAGESIZE */ - --#endif /* no HAVE_GETPAGESIZE */ -- --int --main () --{ -- char *data, *data2, *data3; -- int i, pagesize; -- int fd; -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - -- pagesize = getpagesize (); -+ ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+echo "${ECHO_T}$PKG_CONFIG" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - -- /* First, make a file with some known garbage in it. */ -- data = (char *) malloc (pagesize); -- if (!data) -- return 1; -- for (i = 0; i < pagesize; ++i) -- *(data + i) = rand (); -- umask (0); -- fd = creat ("conftest.mmap", 0600); -- if (fd < 0) -- return 1; -- if (write (fd, data, pagesize) != pagesize) -- return 1; -- close (fd); - -- /* Next, try to mmap the file at a fixed address which already has -- something else allocated at it. If we can, also make sure that -- we see the same garbage. */ -- fd = open ("conftest.mmap", O_RDWR); -- if (fd < 0) -- return 1; -- data2 = (char *) malloc (2 * pagesize); -- if (!data2) -- return 1; -- data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); -- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, -- MAP_PRIVATE | MAP_FIXED, fd, 0L)) -- return 1; -- for (i = 0; i < pagesize; ++i) -- if (*(data + i) != *(data2 + i)) -- return 1; -+fi -+if test -z "$ac_cv_path_PKG_CONFIG"; then -+ ac_pt_PKG_CONFIG=$PKG_CONFIG -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $ac_pt_PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - -- /* Finally, make sure that changes to the mapped area do not -- percolate back to the file as seen by read(). (This is a bug on -- some variants of i386 svr4.0.) */ -- for (i = 0; i < pagesize; ++i) -- *(data2 + i) = *(data2 + i) + 1; -- data3 = (char *) malloc (pagesize); -- if (!data3) -- return 1; -- if (read (fd, data3, pagesize) != pagesize) -- return 1; -- for (i = 0; i < pagesize; ++i) -- if (*(data + i) != *(data3 + i)) -- return 1; -- close (fd); -- return 0; --} --_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+ ;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ if test "x$ac_pt_PKG_CONFIG" = x; then -+ PKG_CONFIG="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_mmap_fixed_mapped=yes -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi - --( exit $ac_status ) --ac_cv_func_mmap_fixed_mapped=no - fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.16 -+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ PKG_CONFIG="" -+ fi -+ - fi - -+ no_glib="" - --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 --$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } --if test $ac_cv_func_mmap_fixed_mapped = yes; then -+ if test "x$PKG_CONFIG" = x ; then -+ no_glib=yes -+ PKG_CONFIG=no -+ fi - --cat >>confdefs.h <<\_ACEOF --#define HAVE_MMAP 1 --_ACEOF -+ min_glib_version=2.17.6 -+ { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 -+echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; } - --fi --rm -f conftest.mmap -+ if test x$PKG_CONFIG != xno ; then -+ ## don't try to run the test against uninstalled libtool libs -+ if $PKG_CONFIG --uninstalled $pkg_config_args; then -+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" -+ enable_glibtest=no -+ fi - -+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then -+ : -+ else -+ no_glib=yes -+ fi -+ fi - -+ if test x"$no_glib" = x ; then -+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` -+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - --for ac_func in mallinfo --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` -+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` -+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test "x$enable_glibtest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$GLIB_LIBS $LIBS" -+ rm -f conf.glibtest -+ if test "$cross_compiling" = yes; then -+ echo $ac_n "cross compiling; assumed OK... $ac_c" - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23533,100 +25481,235 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif - --#undef $ac_func -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -+#include <glib.h> -+#include <stdio.h> -+#include <stdlib.h> - - int - main () - { --return $ac_func (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.glibtest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_glib_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_glib_version"); -+ exit(1); -+ } -+ -+ if ((glib_major_version != $glib_config_major_version) || -+ (glib_minor_version != $glib_config_minor_version) || -+ (glib_micro_version != $glib_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -+ printf("*** to point to the correct configuration files\n"); -+ } -+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || -+ (glib_minor_version != GLIB_MINOR_VERSION) || -+ (glib_micro_version != GLIB_MICRO_VERSION)) -+ { -+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", -+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ } -+ else -+ { -+ if ((glib_major_version > major) || -+ ((glib_major_version == major) && (glib_minor_version > minor)) || -+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./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 -+ : -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+no_glib=yes -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+ -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_glib" = x ; then -+ { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 -+echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } -+ : -+ else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig/" -+ else -+ if test -f conf.glibtest ; then -+ : -+ else -+ echo "*** Could not run GLIB test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$LIBS $GLIB_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <glib.h> -+#include <stdio.h> -+ -+int -+main () -+{ -+ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+ } && 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" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- eval "$as_ac_var=no" -+ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed." - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GLIB_CFLAGS="" -+ GLIB_LIBS="" -+ GLIB_GENMARSHAL="" -+ GOBJECT_QUERY="" -+ GLIB_MKENUMS="" -+ { { echo "$as_me:$LINENO: error: -+*** GLIB 2.17.6 or better is required. The latest version of -+*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5 -+echo "$as_me: error: -+*** GLIB 2.17.6 or better is required. The latest version of -+*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ -+ -+ -+ -+ -+ rm -f conf.glibtest - -+ -+# See if it's safe to turn G_DISABLE_DEPRECATED on. -+GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"` -+GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.17.6 | sed "s/\.[^.]*\$//"` -+if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then -+ CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS" - fi --done -+ -+CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS" - - --for ac_func in getresuid -+gtk_save_LIBS=$LIBS -+LIBS="$LIBS $GLIB_LIBS" -+ -+for ac_func in bind_textdomain_codeset - do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -23679,103 +25762,67 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - --{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 --$as_echo_n "checking for uid_t in sys/types.h... " >&6; } --if test "${ac_cv_type_uid_t+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/types.h> -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "uid_t" >/dev/null 2>&1; then -- ac_cv_type_uid_t=yes --else -- ac_cv_type_uid_t=no --fi --rm -f conftest* -- --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 --$as_echo "$ac_cv_type_uid_t" >&6; } --if test $ac_cv_type_uid_t = no; then -- --cat >>confdefs.h <<\_ACEOF --#define uid_t int --_ACEOF -- -+LIBS=$gtk_save_LIBS - --cat >>confdefs.h <<\_ACEOF --#define gid_t int --_ACEOF - -+for ac_header in pwd.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi -- -- --# Check if <sys/select.h> needs to be included for fd_set --{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5 --$as_echo_n "checking for fd_set... " >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <sys/types.h> --int --main () --{ --fd_set readMask, writeMask; -- ; -- return 0; --} -+$ac_includes_default -+#include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -23783,466 +25830,438 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- gtk_ok=yes -+ ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- gtk_ok=no -+ ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --if test $gtk_ok = yes; then -- { $as_echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 --$as_echo "yes, found in sys/types.h" >&6; } --else -- cat >conftest.$ac_ext <<_ACEOF -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <sys/select.h> -- -+#include <$ac_header> - _ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "fd_mask" >/dev/null 2>&1; then -- gtk_ok=yes -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi --rm -f conftest* - -- if test $gtk_ok = yes; then -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - --cat >>confdefs.h <<\_ACEOF --#define HAVE_SYS_SELECT_H 1 --_ACEOF -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - -- { $as_echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 --$as_echo "yes, found in sys/select.h" >&6; } -- else -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - - cat >>confdefs.h <<\_ACEOF --#define NO_FD_SET 1 -+#define HAVE_PWD_H 1 - _ACEOF - -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- fi - fi - --# `widechar' tests for gdki18n.h --{ $as_echo "$as_me:$LINENO: checking for wchar.h" >&5 --$as_echo_n "checking for wchar.h... " >&6; } -+done -+ -+ -+for ac_header in sys/time.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <wchar.h> -+$ac_includes_default -+#include <$ac_header> - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- }; then -- gdk_wchar_h=yes -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- gdk_wchar_h=no -+ ac_header_compiler=no - fi - --rm -f conftest.err conftest.$ac_ext --if test $gdk_wchar_h = yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_WCHAR_H 1 --_ACEOF -- --fi --{ $as_echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 --$as_echo "$gdk_wchar_h" >&6; } -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - --# Check for wctype.h (for iswalnum) --{ $as_echo "$as_me:$LINENO: checking for wctype.h" >&5 --$as_echo_n "checking for wctype.h... " >&6; } -+# Is the header present? -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <wctype.h> -+#include <$ac_header> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -+ ac_header_preproc=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- gdk_wctype_h=no -+ ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --if test $gdk_wctype_h = yes; then -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+ -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - - cat >>confdefs.h <<\_ACEOF --#define HAVE_WCTYPE_H 1 -+#define HAVE_SYS_TIME_H 1 - _ACEOF - - fi --{ $as_echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 --$as_echo "$gdk_wctype_h" >&6; } - --# in Solaris 2.5, `iswalnum' is in -lw --GDK_WLIBS= --{ $as_echo "$as_me:$LINENO: checking for iswalnum" >&5 --$as_echo_n "checking for iswalnum... " >&6; } --if test "${ac_cv_func_iswalnum+set}" = set; then -- $as_echo_n "(cached) " >&6 -+done -+ -+ -+for ac_header in unistd.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else -- cat >conftest.$ac_ext <<_ACEOF -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define iswalnum to an innocuous variant, in case <limits.h> declares iswalnum. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define iswalnum innocuous_iswalnum -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char iswalnum (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef iswalnum -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char iswalnum (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_iswalnum || defined __stub___iswalnum --choke me --#endif -- --int --main () --{ --return iswalnum (); -- ; -- return 0; --} -+$ac_includes_default -+#include <$ac_header> - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_iswalnum=yes -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_iswalnum=no -+ ac_header_compiler=no - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 --$as_echo "$ac_cv_func_iswalnum" >&6; } --if test "x$ac_cv_func_iswalnum" = x""yes; then -- : --else -- { $as_echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 --$as_echo_n "checking for iswalnum in -lw... " >&6; } --if test "${ac_cv_lib_w_iswalnum+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lw $LIBS" -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char iswalnum (); --int --main () --{ --return iswalnum (); -- ; -- return 0; --} -+#include <$ac_header> - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_w_iswalnum=yes -+ ac_header_preproc=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_w_iswalnum=no -+ ac_header_preproc=no - fi - --rm -rf conftest.dSYM --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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 --$as_echo "$ac_cv_lib_w_iswalnum" >&6; } --if test "x$ac_cv_lib_w_iswalnum" = x""yes; then -- GDK_WLIBS=-lw --fi -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" - fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - -- --oLIBS="$LIBS" --LIBS="$LIBS $GDK_WLIBS" --# The following is necessary for Linux libc-5.4.38 --{ $as_echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5 --$as_echo_n "checking if iswalnum() and friends are properly defined... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> --int --main () --{ -- --#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) --# ifdef HAVE_WCTYPE_H --# include <wctype.h> --# else --# ifdef HAVE_WCHAR_H --# include <wchar.h> --# endif --# endif --#else --# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) --#endif --iswalnum((wchar_t) 0); -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- gdk_working_wctype=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- gdk_working_wctype=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS="$oLIBS" -- --if test $gdk_working_wctype = no; then -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - - cat >>confdefs.h <<\_ACEOF --#define HAVE_BROKEN_WCTYPE 1 --_ACEOF -- -- GDK_WLIBS= --fi --{ $as_echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 --$as_echo "$gdk_working_wctype" >&6; } -- -- --# Check for uxtheme.h (for MS-Windows Engine) --{ $as_echo "$as_me:$LINENO: checking for uxtheme.h" >&5 --$as_echo_n "checking for uxtheme.h... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <uxtheme.h> -+#define HAVE_UNISTD_H 1 - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- gtk_uxtheme_h=no - fi - --rm -f conftest.err conftest.$ac_ext --if test $gtk_uxtheme_h = yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_UXTHEME_H 1 --_ACEOF -- --fi --{ $as_echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 --$as_echo "$gtk_uxtheme_h" >&6; } -+done - --# Checks for gdkspawn - --for ac_header in crt_externs.h -+for ac_header in ftw.h - do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24258,33 +26277,32 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24298,52 +26316,51 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -24352,24 +26369,25 @@ - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_FTW_H 1 - _ACEOF - - fi -@@ -24377,309 +26395,374 @@ - done - - --for ac_func in _NSGetEnviron --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF -+{ echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 -+echo $ECHO_N "checking for GNU ftw extensions... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef $ac_func -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -- -+#define _XOPEN_SOURCE 500 -+#define _GNU_SOURCE -+#include <ftw.h> - int - main () - { --return $ac_func (); -+int flags = FTW_ACTIONRETVAL; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+ } && test -s conftest.$ac_objext; then -+ gtk_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- eval "$as_ac_var=no" -+ gtk_ok=no - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+if test $gtk_ok = yes; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_GNU_FTW 1 - _ACEOF - -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --done - -+saved_cflags="$CFLAGS" -+saved_ldflags="$LDFLAGS" - - --################################################## --# Checks for gdk-pixbuf --################################################## -+# Checks for header files. -+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdlib.h> -+#include <stdarg.h> -+#include <string.h> -+#include <float.h> - -+int -+main () -+{ - --use_la_modules=false --case $host in -- *-aix*) use_la_modules=true -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --if $use_la_modules ; then -+ ac_cv_header_stdc=no -+fi - --cat >>confdefs.h <<\_ACEOF --#define USE_LA_MODULES 1 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <string.h> - -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "memchr" >/dev/null 2>&1; then -+ : -+else -+ ac_cv_header_stdc=no - fi -+rm -f conftest* - -- --{ $as_echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 --$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; } -- --# Check whether --enable-modules was given. --if test "${enable_modules+set}" = set; then -- enableval=$enable_modules; - fi - -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdlib.h> - --dynworks=false --deps= --if test x$enable_modules = xno; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- { $as_echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 --$as_echo_n "checking whether dynamic modules work... " >&6; } -- ## for loop is to strip newline -- tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` -- for I in $tmp; do -- dynworks=$I -- done -- -- if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -- pixbuf_deplibs_check=`$pixbuf_libtool_config | \ -- grep '^[a-z_]*check[a-z_]*_method=['\''"]' | \ -- sed 's/.*['\''"]\(.*\)['\''"]$/\1/'` -- if test "x$pixbuf_deplibs_check" = "xnone" || \ -- test "x$pixbuf_deplibs_check" = "xunknown" || \ -- test "x$pixbuf_deplibs_check" = "x"; then -- dynworks=false -- fi -- fi -- -- if $dynworks; then -- --cat >>confdefs.h <<\_ACEOF --#define USE_GMODULE 1 - _ACEOF -- -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- fi -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "free" >/dev/null 2>&1; then -+ : -+else -+ ac_cv_header_stdc=no - fi -+rm -f conftest* - -- -- --# Check whether --with-libpng was given. --if test "${with_libpng+set}" = set; then -- withval=$with_libpng; - fi - -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ctype.h> -+#include <stdlib.h> -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#else -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+#endif - --# Check whether --with-libjpeg was given. --if test "${with_libjpeg+set}" = set; then -- withval=$with_libjpeg; --fi -- -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+int -+main () -+{ -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ return 2; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./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 -+ : -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Check whether --with-libtiff was given. --if test "${with_libtiff+set}" = set; then -- withval=$with_libtiff; -+( exit $ac_status ) -+ac_cv_header_stdc=no - fi -- -- --# Check whether --with-libjasper was given. --if test "${with_libjasper+set}" = set; then -- withval=$with_libjasper; -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - --# Check whether --enable-gdiplus was given. --if test "${enable_gdiplus+set}" = set; then -- enableval=$enable_gdiplus; - fi -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -+if test $ac_cv_header_stdc = yes; then -+cat >>confdefs.h <<\_ACEOF -+#define STDC_HEADERS 1 -+_ACEOF - - -if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then -- BUILD_GDIPLUS_LOADERS_TRUE= -- BUILD_GDIPLUS_LOADERS_FALSE='#' --else -- BUILD_GDIPLUS_LOADERS_TRUE='#' -- BUILD_GDIPLUS_LOADERS_FALSE= - fi - - --if test x$os_win32 = xno || test x$enable_gdiplus = xno; then -- if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -- { $as_echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 --$as_echo_n "checking for TIFFReadRGBAImageOriented in -ltiff... " >&6; } --if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then -- $as_echo_n "(cached) " >&6 -+# Checks for typedefs, structures, and compiler characteristics. -+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } -+if test "${ac_cv_c_const+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then + BUILD_GDIPLUS_LOADERS_TRUE= + BUILD_GDIPLUS_LOADERS_FALSE='#' else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ltiff -lm $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ +@@ -29022,9 +26736,7 @@ --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char TIFFReadRGBAImageOriented (); - int - main () - { --return TIFFReadRGBAImageOriented (); -+/* FIXME: Include the comments suggested by Paul. */ -+#ifndef __cplusplus -+ /* Ultrix mips cc rejects this. */ -+ typedef int charset[2]; -+ const charset cs; -+ /* SunOS 4.1.1 cc rejects this. */ -+ 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}; -+ /* AIX XL C 1.02.0.0 rejects this. -+ It does not let you subtract one const X* pointer from another in -+ an arm of an if-expression whose if-part is not a constant -+ expression */ -+ const char *g = "string"; -+ pcpcc = &g + (g ? g-g : 0); -+ /* HPUX 7.0 cc rejects these. */ -+ ++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; -+ -+ *t++ = 0; -+ if (s) return 0; -+ } -+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ -+ int x[] = {25, 17}; -+ const int *foo = &x[0]; -+ ++foo; -+ } -+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ -+ typedef const int *iptr; -+ iptr p = 0; -+ ++p; -+ } -+ { /* AIX XL C 1.02.0.0 rejects this saying -+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -+ struct s { int j; const int *ap[3]; }; -+ struct s *b; b->j = 5; -+ } -+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -+ const int foo = 10; -+ if (!foo) return 0; -+ } -+ return !cs[0] && !zero.x; -+#endif -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes -+ } && test -s conftest.$ac_objext; then -+ ac_cv_c_const=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -- ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no -+ ac_cv_c_const=no - fi --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 --$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } --if test "x$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" = x""yes; then -- if test "${ac_cv_header_tiffio_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } --if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -+echo "${ECHO_T}$ac_cv_c_const" >&6; } -+if test $ac_cv_c_const = no; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define const -+_ACEOF -+ - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } -+ -+ -+# Checks for library functions. -+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } -+if test "${ac_cv_type_signal+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 --$as_echo_n "checking tiffio.h usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <tiffio.h> -+#include <sys/types.h> -+#include <signal.h> -+ -+int -+main () -+{ -+return *(signal (0, 0)) (0) == 1; -+ ; -+ return 0; -+} - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -24687,206 +26770,61 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ ac_cv_type_signal=int - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+ ac_cv_type_signal=void - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -+echo "${ECHO_T}$ac_cv_type_signal" >&6; } - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 --$as_echo_n "checking tiffio.h presence... " >&6; } -+cat >>confdefs.h <<_ACEOF -+#define RETSIGTYPE $ac_cv_type_signal -+_ACEOF -+ -+ -+ -+ -+for ac_header in stdlib.h unistd.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <tiffio.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi -- --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } --if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_header_tiffio_h=$ac_header_preproc --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } -- --fi --if test "x$ac_cv_header_tiffio_h" = x""yes; then -- TIFF='tiff'; LIBTIFF='-ltiff' --else -- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 --$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} --fi - - --else -- { $as_echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 --$as_echo_n "checking for TIFFWriteScanline in -ltiff... " >&6; } --if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ltiff -ljpeg -lz -lm $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char TIFFWriteScanline (); --int --main () --{ --return TIFFWriteScanline (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_tiff_TIFFWriteScanline=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_tiff_TIFFWriteScanline=no --fi -- --rm -rf conftest.dSYM --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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 --$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } --if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then -- if test "${ac_cv_header_tiffio_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } --if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 --$as_echo_n "checking tiffio.h usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <tiffio.h> -+$ac_includes_default -+#include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -24894,92 +26832,90 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 --$as_echo_n "checking tiffio.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <tiffio.h> -+#include <$ac_header> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -24988,39 +26924,58 @@ - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } --if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_header_tiffio_h=$ac_header_preproc -+ eval "$as_ac_Header=\$ac_header_preproc" - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi --if test "x$ac_cv_header_tiffio_h" = x""yes; then -- TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' --else -- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 --$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ - fi - -+done - -+ -+for ac_func in getpagesize -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- { $as_echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 --$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; } --if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -25028,11 +26983,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char TIFFFlushData (); -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ - int - main () - { --return TIFFFlushData (); -+return $ac_func (); - ; - return 0; - } -@@ -25043,216 +27005,258 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_tiff34_TIFFFlushData=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_tiff34_TIFFFlushData=no -+ eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 --$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; } --if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then -- if test "${ac_cv_header_tiffio_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } --if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 --$as_echo_n "checking tiffio.h usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <tiffio.h> -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no - fi -+done - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 --$as_echo_n "checking tiffio.h presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+{ echo "$as_me:$LINENO: checking for working mmap" >&5 -+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } -+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_func_mmap_fixed_mapped=no -+else -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <tiffio.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi -+$ac_includes_default -+/* malloc might have been renamed as rpl_malloc. */ -+#undef malloc - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+/* Thanks to Mike Haertel and Jim Avera for this test. -+ Here is a matrix of mmap possibilities: -+ mmap private not fixed -+ mmap private fixed at somewhere currently unmapped -+ mmap private fixed at somewhere already mapped -+ mmap shared not fixed -+ mmap shared fixed at somewhere currently unmapped -+ mmap shared fixed at somewhere already mapped -+ For private mappings, we should verify that changes cannot be read() -+ back from the file, nor mmap's back from the file at a different -+ address. (There have been systems where private was not correctly -+ implemented like the infamous i386 svr4.0, and systems where the -+ VM page cache was not coherent with the file system buffer cache -+ like early versions of FreeBSD and possibly contemporary NetBSD.) -+ For shared mappings, we should conversely verify that changes get -+ propagated back to all the places they're supposed to be. - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; -+ Grep wants private fixed already mapped. -+ The main things grep needs to know about mmap are: -+ * does it exist and is it safe to write into the mmap'd area -+ * how to use it (BSD variants) */ -+ -+#include <fcntl.h> -+#include <sys/mman.h> -+ -+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H -+char *malloc (); -+#endif -+ -+/* This mess was copied from the GNU getpagesize.h. */ -+#ifndef HAVE_GETPAGESIZE -+/* Assume that all systems that can run configure 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 */ -+# ifdef HAVE_SYS_PARAM_H -+# include <sys/param.h> -+# ifdef EXEC_PAGESIZE -+# define getpagesize() EXEC_PAGESIZE -+# else /* no EXEC_PAGESIZE */ -+# ifdef NBPG -+# define getpagesize() NBPG * CLSIZE -+# ifndef CLSIZE -+# define CLSIZE 1 -+# endif /* no CLSIZE */ -+# else /* no NBPG */ -+# ifdef NBPC -+# define getpagesize() NBPC -+# else /* no NBPC */ -+# ifdef PAGESIZE -+# define getpagesize() PAGESIZE -+# endif /* PAGESIZE */ -+# endif /* no NBPC */ -+# endif /* no NBPG */ -+# endif /* no EXEC_PAGESIZE */ -+# else /* no HAVE_SYS_PARAM_H */ -+# define getpagesize() 8192 /* punt totally */ -+# endif /* no HAVE_SYS_PARAM_H */ -+# endif /* no _SC_PAGESIZE */ -+ -+#endif /* no HAVE_GETPAGESIZE */ -+ -+int -+main () -+{ -+ char *data, *data2, *data3; -+ int i, pagesize; -+ int fd; -+ -+ pagesize = getpagesize (); -+ -+ /* First, make a file with some known garbage in it. */ -+ data = (char *) malloc (pagesize); -+ if (!data) -+ return 1; -+ for (i = 0; i < pagesize; ++i) -+ *(data + i) = rand (); -+ umask (0); -+ fd = creat ("conftest.mmap", 0600); -+ if (fd < 0) -+ return 1; -+ if (write (fd, data, pagesize) != pagesize) -+ return 1; -+ close (fd); -+ -+ /* Next, try to mmap the file at a fixed address which already has -+ something else allocated at it. If we can, also make sure that -+ we see the same garbage. */ -+ fd = open ("conftest.mmap", O_RDWR); -+ if (fd < 0) -+ return 1; -+ data2 = (char *) malloc (2 * pagesize); -+ if (!data2) -+ return 1; -+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); -+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, -+ MAP_PRIVATE | MAP_FIXED, fd, 0L)) -+ return 1; -+ for (i = 0; i < pagesize; ++i) -+ if (*(data + i) != *(data2 + i)) -+ return 1; -+ -+ /* Finally, make sure that changes to the mapped area do not -+ percolate back to the file as seen by read(). (This is a bug on -+ some variants of i386 svr4.0.) */ -+ for (i = 0; i < pagesize; ++i) -+ *(data2 + i) = *(data2 + i) + 1; -+ data3 = (char *) malloc (pagesize); -+ if (!data3) -+ return 1; -+ if (read (fd, data3, pagesize) != pagesize) -+ return 1; -+ for (i = 0; i < pagesize; ++i) -+ if (*(data + i) != *(data3 + i)) -+ return 1; -+ close (fd); -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac --{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 --$as_echo_n "checking for tiffio.h... " >&6; } --if test "${ac_cv_header_tiffio_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./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_cv_func_mmap_fixed_mapped=yes - else -- ac_cv_header_tiffio_h=$ac_header_preproc --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 --$as_echo "$ac_cv_header_tiffio_h" >&6; } -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+( exit $ac_status ) -+ac_cv_func_mmap_fixed_mapped=no - fi --if test "x$ac_cv_header_tiffio_h" = x""yes; then -- TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' --else -- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 --$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - - --else -- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 --$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } -+if test $ac_cv_func_mmap_fixed_mapped = yes; then - --fi -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_MMAP 1 -+_ACEOF - - fi -+rm -f conftest.mmap - -- fi - -- if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -- { { $as_echo "$as_me:$LINENO: error: --*** Checks for TIFF loader failed. You can build without it by passing --*** --without-libtiff to configure but some programs using GTK+ may --*** not work properly" >&5 --$as_echo "$as_me: error: --*** Checks for TIFF loader failed. You can build without it by passing --*** --without-libtiff to configure but some programs using GTK+ may --*** not work properly" >&2;} -- { (exit 1); exit 1; }; } -- fi --fi - --if test x$os_win32 = xno || test x$enable_gdiplus = xno; then -- if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then -- { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 --$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; } --if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then -- $as_echo_n "(cached) " >&6 -+for ac_func in mallinfo -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ljpeg $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -25260,11 +27264,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char jpeg_destroy_decompress (); -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ - int - main () - { --return jpeg_destroy_decompress (); -+return $ac_func (); - ; - return 0; - } -@@ -25275,114 +27286,90 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_jpeg_jpeg_destroy_decompress=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_jpeg_jpeg_destroy_decompress=no -+ eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 --$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } --if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then -- jpeg_ok=yes --else -- jpeg_ok=no -- { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 --$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} - fi -- -- if test "$jpeg_ok" = yes; then -- { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 --$as_echo_n "checking for jpeglib.h... " >&6; } -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdio.h> --#undef PACKAGE --#undef VERSION --#undef HAVE_STDLIB_H --#include <jpeglib.h> -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- jpeg_ok=no - fi -+done - --rm -f conftest.err conftest.$ac_ext -- { $as_echo "$as_me:$LINENO: result: $jpeg_ok" >&5 --$as_echo "$jpeg_ok" >&6; } -- if test "$jpeg_ok" = yes; then -- LIBJPEG='-ljpeg' -- { $as_echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 --$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; } --if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ -+for ac_func in getresuid -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ljpeg $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --char jpeg_simple_progression (); -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ - int - main () - { --return jpeg_simple_progression (); -+return $ac_func (); - ; - return 0; - } -@@ -25393,371 +27380,346 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_jpeg_jpeg_simple_progression=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_jpeg_jpeg_simple_progression=no -+ eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 --$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } --if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - --cat >>confdefs.h <<\_ACEOF --#define HAVE_PROGRESSIVE_JPEG 1 -+fi -+done -+ -+{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } -+if test "${ac_cv_type_uid_t+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/types.h> - -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "uid_t" >/dev/null 2>&1; then -+ ac_cv_type_uid_t=yes - else -- { $as_echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 --$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} -+ ac_cv_type_uid_t=no - fi -+rm -f conftest* - -- else -- { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 --$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} -- fi -- fi -- fi -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -+echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } -+if test $ac_cv_type_uid_t = no; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define uid_t int -+_ACEOF -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define gid_t int -+_ACEOF - -- if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then -- { { $as_echo "$as_me:$LINENO: error: --*** Checks for JPEG loader failed. You can build without it by passing --*** --without-libjpeg to configure but some programs using GTK+ may --*** not work properly" >&5 --$as_echo "$as_me: error: --*** Checks for JPEG loader failed. You can build without it by passing --*** --without-libjpeg to configure but some programs using GTK+ may --*** not work properly" >&2;} -- { (exit 1); exit 1; }; } -- fi - fi - -- if test x$with_libpng != xno && test -z "$LIBPNG"; then -- { $as_echo "$as_me:$LINENO: checking for libpng12" >&5 --$as_echo_n "checking for libpng12... " >&6; } -- if $PKG_CONFIG --exists libpng12 ; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- PNG='png' -- PNG_DEP_CFLAGS_PACKAGES=libpng12 -- LIBPNG=`$PKG_CONFIG --libs libpng12` -- else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- { $as_echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 --$as_echo_n "checking for png_read_info in -lpng... " >&6; } --if test "${ac_cv_lib_png_png_read_info+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lpng -lz -lm $LIBS" -+ -+# Check if <sys/select.h> needs to be included for fd_set -+{ echo "$as_me:$LINENO: checking for fd_set" >&5 -+echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char png_read_info (); -+#include <sys/types.h> - int - main () - { --return png_read_info (); -+fd_set readMask, writeMask; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_png_png_read_info=yes -+ } && test -s conftest.$ac_objext; then -+ gtk_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_png_png_read_info=no -+ gtk_ok=no - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+if test $gtk_ok = yes; then -+ { echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 -+echo "${ECHO_T}yes, found in sys/types.h" >&6; } -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/select.h> -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "fd_mask" >/dev/null 2>&1; then -+ gtk_ok=yes - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 --$as_echo "$ac_cv_lib_png_png_read_info" >&6; } --if test "x$ac_cv_lib_png_png_read_info" = x""yes; then -- if test "${ac_cv_header_png_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for png.h" >&5 --$as_echo_n "checking for png.h... " >&6; } --if test "${ac_cv_header_png_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+rm -f conftest* -+ -+ if test $gtk_ok = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_SYS_SELECT_H 1 -+_ACEOF -+ -+ { echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 -+echo "${ECHO_T}yes, found in sys/select.h" >&6; } -+ else -+ -+cat >>confdefs.h <<\_ACEOF -+#define NO_FD_SET 1 -+_ACEOF -+ -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 --$as_echo "$ac_cv_header_png_h" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5 --$as_echo_n "checking png.h usability... " >&6; } -+ -+# `widechar' tests for gdki18n.h -+{ echo "$as_me:$LINENO: checking for wchar.h" >&5 -+echo $ECHO_N "checking for wchar.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <png.h> -+#include <wchar.h> - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ }; then -+ gdk_wchar_h=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+ gdk_wchar_h=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+rm -f conftest.err conftest.$ac_ext -+if test $gdk_wchar_h = yes; then - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5 --$as_echo_n "checking png.h presence... " >&6; } -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_WCHAR_H 1 -+_ACEOF -+ -+fi -+{ echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 -+echo "${ECHO_T}$gdk_wchar_h" >&6; } -+ -+# Check for wctype.h (for iswalnum) -+{ echo "$as_me:$LINENO: checking for wctype.h" >&5 -+echo $ECHO_N "checking for wctype.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <png.h> -+#include <wctype.h> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -+ gdk_wctype_h=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no -+ gdk_wctype_h=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+if test $gdk_wctype_h = yes; then - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for png.h" >&5 --$as_echo_n "checking for png.h... " >&6; } --if test "${ac_cv_header_png_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_header_png_h=$ac_header_preproc --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 --$as_echo "$ac_cv_header_png_h" >&6; } -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_WCTYPE_H 1 -+_ACEOF - - fi --if test "x$ac_cv_header_png_h" = x""yes; then -- png_ok=yes --else -- png_ok=no --fi -- -+{ echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 -+echo "${ECHO_T}$gdk_wctype_h" >&6; } - -+# in Solaris 2.5, `iswalnum' is in -lw -+GDK_WLIBS= -+{ echo "$as_me:$LINENO: checking for iswalnum" >&5 -+echo $ECHO_N "checking for iswalnum... $ECHO_C" >&6; } -+if test "${ac_cv_func_iswalnum+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 --$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} --fi -- -- if test "$png_ok" = yes; then -- { $as_echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 --$as_echo_n "checking for png_structp in png.h... " >&6; } -- cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <png.h> -+/* Define iswalnum to an innocuous variant, in case <limits.h> declares iswalnum. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define iswalnum innocuous_iswalnum -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char iswalnum (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef iswalnum -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char iswalnum (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_iswalnum || defined __stub___iswalnum -+choke me -+#endif -+ - int - main () - { --png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct; -+return iswalnum (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- png_ok=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_iswalnum=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- png_ok=no -+ ac_cv_func_iswalnum=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- { $as_echo "$as_me:$LINENO: result: $png_ok" >&5 --$as_echo "$png_ok" >&6; } -- if test "$png_ok" = yes; then -- PNG='png'; LIBPNG='-lpng -lz' -- else -- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 --$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} -- fi -- else -- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 --$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} -- fi -- fi -- fi -- -- if test x$with_libpng != xno && test -z "$LIBPNG"; then -- { { $as_echo "$as_me:$LINENO: error: --*** Checks for PNG loader failed. You can build without it by passing --*** --without-libpng to configure but many programs using GTK+ will --*** not work properly. The PNG loader is also needed if you are compiling --*** from CVS." >&5 --$as_echo "$as_me: error: --*** Checks for PNG loader failed. You can build without it by passing --*** --without-libpng to configure but many programs using GTK+ will --*** not work properly. The PNG loader is also needed if you are compiling --*** from CVS." >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- if test x$with_libjasper != xno && test -z "$LIBJASPER"; then -- { $as_echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 --$as_echo_n "checking for jas_init in -ljasper... " >&6; } --if test "${ac_cv_lib_jasper_jas_init+set}" = set; then -- $as_echo_n "(cached) " >&6 -+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 -+echo "${ECHO_T}$ac_cv_func_iswalnum" >&6; } -+if test $ac_cv_func_iswalnum = yes; then -+ : -+else -+ { echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 -+echo $ECHO_N "checking for iswalnum in -lw... $ECHO_C" >&6; } -+if test "${ac_cv_lib_w_iswalnum+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ljasper -ljpeg $LIBS" -+LIBS="-lw $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25771,11 +27733,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char jas_init (); -+char iswalnum (); - int - main () - { --return jas_init (); -+return iswalnum (); - ; - return 0; - } -@@ -25786,709 +27748,798 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_jasper_jas_init=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_w_iswalnum=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_jasper_jas_init=no -+ ac_cv_lib_w_iswalnum=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 --$as_echo "$ac_cv_lib_jasper_jas_init" >&6; } --if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then -- LIBJASPER=-ljasper -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 -+echo "${ECHO_T}$ac_cv_lib_w_iswalnum" >&6; } -+if test $ac_cv_lib_w_iswalnum = yes; then -+ GDK_WLIBS=-lw - fi - -- fi -+fi - -- if test x$with_libjasper != xno && test -z "$LIBJASPER"; then -- { { $as_echo "$as_me:$LINENO: error: --*** Checks for JPEG2000 loader failed. You can build without it by passing --*** --without-libjasper to configure" >&5 --$as_echo "$as_me: error: --*** Checks for JPEG2000 loader failed. You can build without it by passing --*** --without-libjasper to configure" >&2;} -- { (exit 1); exit 1; }; } -- fi - -+oLIBS="$LIBS" -+LIBS="$LIBS $GDK_WLIBS" -+# The following is necessary for Linux libc-5.4.38 -+{ echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5 -+echo $ECHO_N "checking if iswalnum() and friends are properly defined... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdlib.h> -+int -+main () -+{ - -+#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) -+# ifdef HAVE_WCTYPE_H -+# include <wctype.h> -+# else -+# ifdef HAVE_WCHAR_H -+# include <wchar.h> -+# endif -+# endif -+#else -+# define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) -+#endif -+iswalnum((wchar_t) 0); - -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ gdk_working_wctype=no -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS="$oLIBS" - -+if test $gdk_working_wctype = no; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_BROKEN_WCTYPE 1 -+_ACEOF - -if $dynworks; then -- BUILD_DYNAMIC_MODULES_TRUE= -- BUILD_DYNAMIC_MODULES_FALSE='#' --else -- BUILD_DYNAMIC_MODULES_TRUE='#' -- BUILD_DYNAMIC_MODULES_FALSE= -+ GDK_WLIBS= - fi -+{ echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 -+echo "${ECHO_T}$gdk_working_wctype" >&6; } - - --# --# Allow building some or all gdk-pixbuf loaders included --# --{ $as_echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 --$as_echo_n "checking pixbuf loaders to build... " >&6; } -- -+# Check for uxtheme.h (for MS-Windows Engine) -+{ echo "$as_me:$LINENO: checking for uxtheme.h" >&5 -+echo $ECHO_N "checking for uxtheme.h... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <uxtheme.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Check whether --with-included_loaders was given. --if test "${with_included_loaders+set}" = set; then -- withval=$with_included_loaders; -+ gtk_uxtheme_h=no - fi - -+rm -f conftest.err conftest.$ac_ext -+if test $gtk_uxtheme_h = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_UXTHEME_H 1 -+_ACEOF - --if $dynworks; then -- : --else -- ## if the option was specified, leave it; otherwise disable included loaders -- if test x$with_included_loaders = xno; then -- with_included_loaders=yes -- fi - fi -+{ echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 -+echo "${ECHO_T}$gtk_uxtheme_h" >&6; } - --# Use the traditional png loader instead of the GDI+ one on Windows, --# because some important apps like GIMP need to read and write --# arbitrary tEXt chunks which doesn't seem to be possible through GDI+ -+# Checks for gdkspawn - --all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm" --if test x$with_libjasper != xno; then -- all_loaders="$all_loaders,jasper" -+for ac_header in crt_externs.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then -- # Skip PNG, see comment above -- gdip_formats="bmp emf gif ico jpeg tiff wmf" -- for f in $gdip_formats; do -- all_loaders="$all_loaders,gdip-$f" -- done -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } ++ if $dynworks; then + BUILD_DYNAMIC_MODULES_TRUE= + BUILD_DYNAMIC_MODULES_FALSE='#' else -- all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff" --fi --included_loaders="" --# If no loaders specified, include all --if test "x$with_included_loaders" = xyes ; then -- included_loaders="$all_loaders" -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- included_loaders="$with_included_loaders" --fi -- --{ $as_echo "$as_me:$LINENO: result: $included_loaders" >&5 --$as_echo "$included_loaders" >&6; } -- --INCLUDED_LOADER_OBJ= --INCLUDED_LOADER_DEFINE= -- --IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," --for loader in $included_loaders; do -- if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then -- : -- else -- { { $as_echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 --$as_echo "$as_me: error: the specified loader $loader does not exist" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- loader_underscores=`echo $loader | sed -e 's/-/_/g'` -- INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la" -- -- # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader -- case $loader in -- gdip-*) ;; -- *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";; -- esac -- eval INCLUDE_$loader_underscores=yes --done -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 +@@ -29117,9 +26829,7 @@ + --# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders --# (except gdip-png, which isn't built at all) --if test x"$INCLUDE_gdip_ico" = xyes; then -- INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus" -+ ac_header_compiler=no - fi --IFS="$gtk_save_ifs" - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - -+# Is the header present? -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no -+fi - -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - +- -if test x"$INCLUDE_png" = xyes; then -- INCLUDE_PNG_TRUE= -- INCLUDE_PNG_FALSE='#' -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ if test x"$INCLUDE_png" = xyes; then + INCLUDE_PNG_TRUE= + INCLUDE_PNG_FALSE='#' else -- INCLUDE_PNG_TRUE='#' -- INCLUDE_PNG_FALSE= -+ eval "$as_ac_Header=\$ac_header_preproc" +@@ -29127,9 +26837,7 @@ + INCLUDE_PNG_FALSE= fi -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF +- - -if test x"$INCLUDE_bmp" = xyes; then -- INCLUDE_BMP_TRUE= -- INCLUDE_BMP_FALSE='#' --else -- INCLUDE_BMP_TRUE='#' -- INCLUDE_BMP_FALSE= ++ if test x"$INCLUDE_bmp" = xyes; then + INCLUDE_BMP_TRUE= + INCLUDE_BMP_FALSE='#' + else +@@ -29137,9 +26845,7 @@ + INCLUDE_BMP_FALSE= fi -+done - - +- +- -if test x"$INCLUDE_wbmp" = xyes; then -- INCLUDE_WBMP_TRUE= -- INCLUDE_WBMP_FALSE='#' -+for ac_func in _NSGetEnviron -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ if test x"$INCLUDE_wbmp" = xyes; then + INCLUDE_WBMP_TRUE= + INCLUDE_WBMP_FALSE='#' else -- INCLUDE_WBMP_TRUE='#' -- INCLUDE_WBMP_FALSE= --fi -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ - -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif - -+#undef $ac_func +@@ -29147,9 +26853,7 @@ + INCLUDE_WBMP_FALSE= + fi +- +- -if test x"$INCLUDE_gif" = xyes; then -- INCLUDE_GIF_TRUE= -- INCLUDE_GIF_FALSE='#' -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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" ++ if test x"$INCLUDE_gif" = xyes; then + INCLUDE_GIF_TRUE= + INCLUDE_GIF_FALSE='#' else -- INCLUDE_GIF_TRUE='#' -- INCLUDE_GIF_FALSE= --fi -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ eval "$as_ac_var=no" -+fi - -+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'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF +@@ -29157,9 +26861,7 @@ + INCLUDE_GIF_FALSE= + fi +- +- -if test x"$INCLUDE_ico" = xyes; then -- INCLUDE_ICO_TRUE= -- INCLUDE_ICO_FALSE='#' --else -- INCLUDE_ICO_TRUE='#' -- INCLUDE_ICO_FALSE= ++ if test x"$INCLUDE_ico" = xyes; then + INCLUDE_ICO_TRUE= + INCLUDE_ICO_FALSE='#' + else +@@ -29167,9 +26869,7 @@ + INCLUDE_ICO_FALSE= fi -+done - - +- +- -if test x"$INCLUDE_ani" = xyes; then -- INCLUDE_ANI_TRUE= -- INCLUDE_ANI_FALSE='#' --else -- INCLUDE_ANI_TRUE='#' -- INCLUDE_ANI_FALSE= --fi -+################################################## -+# Checks for gdk-pixbuf -+################################################## - - -+use_la_modules=false -+case $host in -+ *-aix*) use_la_modules=true -+esac -+ -+if $use_la_modules ; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define USE_LA_MODULES 1 -+_ACEOF ++ if test x"$INCLUDE_ani" = xyes; then + INCLUDE_ANI_TRUE= + INCLUDE_ANI_FALSE='#' + else +@@ -29177,9 +26877,7 @@ + INCLUDE_ANI_FALSE= + fi +- +- -if test x"$INCLUDE_jpeg" = xyes; then -- INCLUDE_JPEG_TRUE= -- INCLUDE_JPEG_FALSE='#' --else -- INCLUDE_JPEG_TRUE='#' -- INCLUDE_JPEG_FALSE= ++ if test x"$INCLUDE_jpeg" = xyes; then + INCLUDE_JPEG_TRUE= + INCLUDE_JPEG_FALSE='#' + else +@@ -29187,9 +26885,7 @@ + INCLUDE_JPEG_FALSE= fi - -+{ echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 -+echo $ECHO_N "checking whether to build gmodulized gdk-pixbuf... $ECHO_C" >&6; } - +- +- -if test x"$INCLUDE_pnm" = xyes; then -- INCLUDE_PNM_TRUE= -- INCLUDE_PNM_FALSE='#' --else -- INCLUDE_PNM_TRUE='#' -- INCLUDE_PNM_FALSE= -+# Check whether --enable-modules was given. -+if test "${enable_modules+set}" = set; then -+ enableval=$enable_modules; ++ if test x"$INCLUDE_pnm" = xyes; then + INCLUDE_PNM_TRUE= + INCLUDE_PNM_FALSE='#' + else +@@ -29197,9 +26893,7 @@ + INCLUDE_PNM_FALSE= fi - +- - -if test x"$INCLUDE_ras" = xyes; then -- INCLUDE_RAS_TRUE= -- INCLUDE_RAS_FALSE='#' -+dynworks=false -+deps= -+if test x$enable_modules = xno; then -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } ++ if test x"$INCLUDE_ras" = xyes; then + INCLUDE_RAS_TRUE= + INCLUDE_RAS_FALSE='#' else -- INCLUDE_RAS_TRUE='#' -- INCLUDE_RAS_FALSE= --fi -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ { echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 -+echo $ECHO_N "checking whether dynamic modules work... $ECHO_C" >&6; } -+ ## for loop is to strip newline -+ tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` -+ for I in $tmp; do -+ dynworks=$I -+ done -+ -+ if $dynworks; then -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_deplibs_check=`$pixbuf_libtool_config | \ -+ grep '^[a-z_]*check[a-z_]*_method=['\''"]' | \ -+ sed 's/.*['\''"]\(.*\)['\''"]$/\1/'` -+ if test "x$pixbuf_deplibs_check" = "xnone" || \ -+ test "x$pixbuf_deplibs_check" = "xunknown" || \ -+ test "x$pixbuf_deplibs_check" = "x"; then -+ dynworks=false -+ fi -+ fi - -+ if $dynworks; then - -+cat >>confdefs.h <<\_ACEOF -+#define USE_GMODULE 1 -+_ACEOF +@@ -29207,9 +26901,7 @@ + INCLUDE_RAS_FALSE= + fi +- +- -if test x"$INCLUDE_tiff" = xyes; then -- INCLUDE_TIFF_TRUE= -- INCLUDE_TIFF_FALSE='#' --else -- INCLUDE_TIFF_TRUE='#' -- INCLUDE_TIFF_FALSE= -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ fi ++ if test x"$INCLUDE_tiff" = xyes; then + INCLUDE_TIFF_TRUE= + INCLUDE_TIFF_FALSE='#' + else +@@ -29217,9 +26909,7 @@ + INCLUDE_TIFF_FALSE= fi - - +- +- -if test x"$INCLUDE_xpm" = xyes; then -- INCLUDE_XPM_TRUE= -- INCLUDE_XPM_FALSE='#' --else -- INCLUDE_XPM_TRUE='#' -- INCLUDE_XPM_FALSE= -+# Check whether --with-libpng was given. -+if test "${with_libpng+set}" = set; then -+ withval=$with_libpng; ++ if test x"$INCLUDE_xpm" = xyes; then + INCLUDE_XPM_TRUE= + INCLUDE_XPM_FALSE='#' + else +@@ -29227,9 +26917,7 @@ + INCLUDE_XPM_FALSE= fi - +- - -if test x"$INCLUDE_xbm" = xyes; then -- INCLUDE_XBM_TRUE= -- INCLUDE_XBM_FALSE='#' --else -- INCLUDE_XBM_TRUE='#' -- INCLUDE_XBM_FALSE= -+# Check whether --with-libjpeg was given. -+if test "${with_libjpeg+set}" = set; then -+ withval=$with_libjpeg; - fi - - -+# Check whether --with-libtiff was given. -+if test "${with_libtiff+set}" = set; then -+ withval=$with_libtiff; -+fi -+ - --if test x"$INCLUDE_tga" = xyes; then -- INCLUDE_TGA_TRUE= -- INCLUDE_TGA_FALSE='#' --else -- INCLUDE_TGA_TRUE='#' -- INCLUDE_TGA_FALSE= -+# Check whether --with-libjasper was given. -+if test "${with_libjasper+set}" = set; then -+ withval=$with_libjasper; - fi - - -+# Check whether --enable-gdiplus was given. -+if test "${enable_gdiplus+set}" = set; then -+ enableval=$enable_gdiplus; -+fi - --if test x"$INCLUDE_pcx" = xyes; then -- INCLUDE_PCX_TRUE= -- INCLUDE_PCX_FALSE='#' -+ -+ if test x$os_win32 = xyes && test x$enable_gdiplus != xno ; then -+ BUILD_GDIPLUS_LOADERS_TRUE= -+ BUILD_GDIPLUS_LOADERS_FALSE='#' ++ if test x"$INCLUDE_xbm" = xyes; then + INCLUDE_XBM_TRUE= + INCLUDE_XBM_FALSE='#' else -- INCLUDE_PCX_TRUE='#' -- INCLUDE_PCX_FALSE= -+ BUILD_GDIPLUS_LOADERS_TRUE='#' -+ BUILD_GDIPLUS_LOADERS_FALSE= +@@ -29237,9 +26925,7 @@ + INCLUDE_XBM_FALSE= fi +- +- +-if test x"$INCLUDE_tga" = xyes; then ++ if test x"$INCLUDE_tga" = xyes; then + INCLUDE_TGA_TRUE= + INCLUDE_TGA_FALSE='#' + else +@@ -29247,9 +26933,7 @@ + INCLUDE_TGA_FALSE= + fi +- +- +-if test x"$INCLUDE_pcx" = xyes; then ++ if test x"$INCLUDE_pcx" = xyes; then + INCLUDE_PCX_TRUE= + INCLUDE_PCX_FALSE='#' + else +@@ -29257,9 +26941,7 @@ + INCLUDE_PCX_FALSE= + fi + +- - -if test x"$INCLUDE_icns" = xyes; then -- INCLUDE_ICNS_TRUE= -- INCLUDE_ICNS_FALSE='#' --else -- INCLUDE_ICNS_TRUE='#' -- INCLUDE_ICNS_FALSE= --fi -- ++ if test x"$INCLUDE_icns" = xyes; then + INCLUDE_ICNS_TRUE= + INCLUDE_ICNS_FALSE='#' + else +@@ -29267,9 +26949,7 @@ + INCLUDE_ICNS_FALSE= + fi + - - -if test x"$INCLUDE_jasper" = xyes; then -- INCLUDE_JASPER_TRUE= -- INCLUDE_JASPER_FALSE='#' --else -- INCLUDE_JASPER_TRUE='#' -- INCLUDE_JASPER_FALSE= --fi -- --# As all GDI+ loaders are either built-in or not, arbitrarily just --# check one of the variables here ++ if test x"$INCLUDE_jasper" = xyes; then + INCLUDE_JASPER_TRUE= + INCLUDE_JASPER_FALSE='#' + else +@@ -29279,9 +26959,7 @@ + + # As all GDI+ loaders are either built-in or not, arbitrarily just + # check one of the variables here - - -if test x"$INCLUDE_gdip_ico" = xyes; then -- INCLUDE_GDIPLUS_TRUE= -- INCLUDE_GDIPLUS_FALSE='#' --else -- INCLUDE_GDIPLUS_TRUE='#' -- INCLUDE_GDIPLUS_FALSE= --fi -- -- --if test x$gio_can_sniff = x; then -- { $as_echo "$as_me:$LINENO: checking if gio can sniff png" >&5 --$as_echo_n "checking if gio can sniff png... " >&6; } -- gtk_save_LIBS="$LIBS" -- gtk_save_CFLAGS="$CFLAGS" -- LIBS="`$PKG_CONFIG --libs gio-2.0`" -- CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" -- if test "$cross_compiling" = yes; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --$as_echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; }; } -+if test x$os_win32 = xno || test x$enable_gdiplus = xno; then -+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -+ { echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 -+echo $ECHO_N "checking for TIFFReadRGBAImageOriented in -ltiff... $ECHO_C" >&6; } -+if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++ if test x"$INCLUDE_gdip_ico" = xyes; then + INCLUDE_GDIPLUS_TRUE= + INCLUDE_GDIPLUS_FALSE='#' else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltiff -lm $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ +@@ -29430,9 +27108,7 @@ -- #include <gio/gio.h> -- static const gsize data_size = 159; -- static const guint8 data[] = -- { -- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -- 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, -- 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, -- 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, -- 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, -- 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, -- 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, -- 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, -- 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, -- 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, -- 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, -- 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, -- 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, -- 0x42, 0x60, 0x82 -- }; -- int -- main (int argc, char **argv) -- { -- char *content_type; -- char *image_png; -- content_type = g_content_type_guess (NULL, data, data_size, NULL); -- image_png = g_content_type_from_mime_type ("image/png"); -- return !!strcmp (content_type, image_png); -- } -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char TIFFReadRGBAImageOriented (); -+int -+main () -+{ -+return TIFFReadRGBAImageOriented (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest$ac_exeext -+rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no -+fi -+ -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 -+echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } -+if test $ac_cv_lib_tiff_TIFFReadRGBAImageOriented = yes; then -+ if test "${ac_cv_header_tiffio_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_tiffio_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -+echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <tiffio.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- gio_can_sniff=yes + { $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 + $as_echo "$included_immodules" >&6; } - --cat >>confdefs.h <<\_ACEOF --#define GDK_PIXBUF_USE_GIO_MIME 1 --_ACEOF -- -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) --gio_can_sniff=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -- -- { $as_echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 --$as_echo "$gio_can_sniff" >&6; } -- LIBS="$gtk_save_LIBS" -- CFLAGS="$gtk_save_CFLAGS" -+ ac_header_compiler=no - fi - --# --# Allow building some or all immodules included --# --{ $as_echo "$as_me:$LINENO: checking immodules to build" >&5 --$as_echo_n "checking immodules to build... " >&6; } -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - -+# Is the header present? -+{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -+echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <tiffio.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Check whether --with-included_immodules was given. --if test "${with_included_immodules+set}" = set; then -- withval=$with_included_immodules; -+ ac_header_preproc=no - fi - -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - --if $dynworks; then -- : -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_tiffio_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ## if the option was specified, leave it; otherwise disable included immodules -- if test x$with_included_immodules = xno; then -- with_included_immodules=yes -- fi -+ ac_cv_header_tiffio_h=$ac_header_preproc - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - --all_immodules="am-et,cedilla,cyrillic-translit" --if test "$gdktarget" = "win32"; then -- all_immodules="${all_immodules},ime" --fi --all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr" --if test "$gdktarget" = "x11"; then -- all_immodules="${all_immodules},xim" - fi -- --included_immodules="" --# If the switch specified without listing any specific ones, include all --if test "x$with_included_immodules" = xyes ; then -- included_immodules="$all_immodules" -+if test $ac_cv_header_tiffio_h = yes; then -+ TIFF='tiff'; LIBTIFF='-ltiff' - else -- included_immodules="$with_included_immodules" -+ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -+echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} - fi - --{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 --$as_echo "$included_immodules" >&6; } - - -if test "x$included_immodules" != x; then -- HAVE_INCLUDED_IMMMODULES_TRUE= -- HAVE_INCLUDED_IMMMODULES_FALSE='#' ++ if test "x$included_immodules" != x; then + HAVE_INCLUDED_IMMMODULES_TRUE= + HAVE_INCLUDED_IMMMODULES_FALSE='#' else -- HAVE_INCLUDED_IMMMODULES_TRUE='#' -- HAVE_INCLUDED_IMMMODULES_FALSE= --fi -- -- --INCLUDED_IMMODULE_OBJ= --INCLUDED_IMMODULE_DEFINE= -- --IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," --for immodule in $included_immodules; do -- immodule_underscores=`echo $immodule | sed -e 's/-/_/g'` -- if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then -- : -- else -- { { $as_echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 --$as_echo "$as_me: error: the specified input method $immodule does not exist" >&2;} -- { (exit 1); exit 1; }; } -- fi -+ { echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 -+echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6; } -+if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltiff -ljpeg -lz -lm $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ +@@ -29463,9 +27139,7 @@ + + -- INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la" -- INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores" -- eval INCLUDE_$immodule_underscores=yes --done --IFS="$gtk_save_ifs" -- -- -- - - -if test x"$INCLUDE_am_et" = xyes; then -- INCLUDE_IM_AM_ET_TRUE= -- INCLUDE_IM_AM_ET_FALSE='#' --else -- INCLUDE_IM_AM_ET_TRUE='#' -- INCLUDE_IM_AM_ET_FALSE= --fi -- ++ if test x"$INCLUDE_am_et" = xyes; then + INCLUDE_IM_AM_ET_TRUE= + INCLUDE_IM_AM_ET_FALSE='#' + else +@@ -29473,9 +27147,7 @@ + INCLUDE_IM_AM_ET_FALSE= + fi + - - -if test x"$INCLUDE_cedilla" = xyes; then -- INCLUDE_IM_CEDILLA_TRUE= -- INCLUDE_IM_CEDILLA_FALSE='#' --else -- INCLUDE_IM_CEDILLA_TRUE='#' -- INCLUDE_IM_CEDILLA_FALSE= --fi -- ++ if test x"$INCLUDE_cedilla" = xyes; then + INCLUDE_IM_CEDILLA_TRUE= + INCLUDE_IM_CEDILLA_FALSE='#' + else +@@ -29483,9 +27155,7 @@ + INCLUDE_IM_CEDILLA_FALSE= + fi + - - -if test x"$INCLUDE_cyrillic_translit" = xyes; then -- INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= -- INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' --else -- INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#' -- INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= --fi -- ++ if test x"$INCLUDE_cyrillic_translit" = xyes; then + INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= + INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' + else +@@ -29493,9 +27163,7 @@ + INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= + fi + - - -if test x"$INCLUDE_ime" = xyes; then -- INCLUDE_IM_IME_TRUE= -- INCLUDE_IM_IME_FALSE='#' --else -- INCLUDE_IM_IME_TRUE='#' -- INCLUDE_IM_IME_FALSE= --fi -- ++ if test x"$INCLUDE_ime" = xyes; then + INCLUDE_IM_IME_TRUE= + INCLUDE_IM_IME_FALSE='#' + else +@@ -29503,9 +27171,7 @@ + INCLUDE_IM_IME_FALSE= + fi + - - -if test x"$INCLUDE_inuktitut" = xyes; then -- INCLUDE_IM_INUKTITUT_TRUE= -- INCLUDE_IM_INUKTITUT_FALSE='#' --else -- INCLUDE_IM_INUKTITUT_TRUE='#' -- INCLUDE_IM_INUKTITUT_FALSE= --fi -- ++ if test x"$INCLUDE_inuktitut" = xyes; then + INCLUDE_IM_INUKTITUT_TRUE= + INCLUDE_IM_INUKTITUT_FALSE='#' + else +@@ -29513,9 +27179,7 @@ + INCLUDE_IM_INUKTITUT_FALSE= + fi + - - -if test x"$INCLUDE_ipa" = xyes; then -- INCLUDE_IM_IPA_TRUE= -- INCLUDE_IM_IPA_FALSE='#' --else -- INCLUDE_IM_IPA_TRUE='#' -- INCLUDE_IM_IPA_FALSE= --fi -- ++ if test x"$INCLUDE_ipa" = xyes; then + INCLUDE_IM_IPA_TRUE= + INCLUDE_IM_IPA_FALSE='#' + else +@@ -29523,9 +27187,7 @@ + INCLUDE_IM_IPA_FALSE= + fi + - - -if test x"$INCLUDE_multipress" = xyes; then -- INCLUDE_IM_MULTIPRESS_TRUE= -- INCLUDE_IM_MULTIPRESS_FALSE='#' --else -- INCLUDE_IM_MULTIPRESS_TRUE='#' -- INCLUDE_IM_MULTIPRESS_FALSE= --fi -- ++ if test x"$INCLUDE_multipress" = xyes; then + INCLUDE_IM_MULTIPRESS_TRUE= + INCLUDE_IM_MULTIPRESS_FALSE='#' + else +@@ -29533,9 +27195,7 @@ + INCLUDE_IM_MULTIPRESS_FALSE= + fi + - - -if test x"$INCLUDE_thai" = xyes; then -- INCLUDE_IM_THAI_TRUE= -- INCLUDE_IM_THAI_FALSE='#' --else -- INCLUDE_IM_THAI_TRUE='#' -- INCLUDE_IM_THAI_FALSE= --fi -- ++ if test x"$INCLUDE_thai" = xyes; then + INCLUDE_IM_THAI_TRUE= + INCLUDE_IM_THAI_FALSE='#' + else +@@ -29543,9 +27203,7 @@ + INCLUDE_IM_THAI_FALSE= + fi + - - -if test x"$INCLUDE_ti_er" = xyes; then -- INCLUDE_IM_TI_ER_TRUE= -- INCLUDE_IM_TI_ER_FALSE='#' --else -- INCLUDE_IM_TI_ER_TRUE='#' -- INCLUDE_IM_TI_ER_FALSE= --fi -- ++ if test x"$INCLUDE_ti_er" = xyes; then + INCLUDE_IM_TI_ER_TRUE= + INCLUDE_IM_TI_ER_FALSE='#' + else +@@ -29553,9 +27211,7 @@ + INCLUDE_IM_TI_ER_FALSE= + fi + - - -if test x"$INCLUDE_ti_et" = xyes; then -- INCLUDE_IM_TI_ET_TRUE= -- INCLUDE_IM_TI_ET_FALSE='#' --else -- INCLUDE_IM_TI_ET_TRUE='#' -- INCLUDE_IM_TI_ET_FALSE= --fi -- ++ if test x"$INCLUDE_ti_et" = xyes; then + INCLUDE_IM_TI_ET_TRUE= + INCLUDE_IM_TI_ET_FALSE='#' + else +@@ -29563,9 +27219,7 @@ + INCLUDE_IM_TI_ET_FALSE= + fi + - - -if test x"$INCLUDE_viqr" = xyes; then -- INCLUDE_IM_VIQR_TRUE= -- INCLUDE_IM_VIQR_FALSE='#' --else -- INCLUDE_IM_VIQR_TRUE='#' -- INCLUDE_IM_VIQR_FALSE= --fi -- ++ if test x"$INCLUDE_viqr" = xyes; then + INCLUDE_IM_VIQR_TRUE= + INCLUDE_IM_VIQR_FALSE='#' + else +@@ -29573,9 +27227,7 @@ + INCLUDE_IM_VIQR_FALSE= + fi + - - -if test x"$INCLUDE_xim" = xyes; then -- INCLUDE_IM_XIM_TRUE= -- INCLUDE_IM_XIM_FALSE='#' --else -- INCLUDE_IM_XIM_TRUE='#' -- INCLUDE_IM_XIM_FALSE= --fi -- -- --{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 --$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } --if test "${ac_cv_header_sys_wait_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/types.h> --#include <sys/wait.h> --#ifndef WEXITSTATUS --# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) --#endif --#ifndef WIFEXITED --# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" - #endif -- -+char TIFFWriteScanline (); - int - main () - { -- int s; -- wait (&s); -- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; -+return TIFFWriteScanline (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_tiff_TIFFWriteScanline=yes ++ if test x"$INCLUDE_xim" = xyes; then + INCLUDE_IM_XIM_TRUE= + INCLUDE_IM_XIM_FALSE='#' else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 +@@ -29712,9 +27364,7 @@ -- ac_cv_header_sys_wait_h=no -+ ac_cv_lib_tiff_TIFFWriteScanline=no - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 --$as_echo "$ac_cv_header_sys_wait_h" >&6; } --if test $ac_cv_header_sys_wait_h = yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_SYS_WAIT_H 1 --_ACEOF -- -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 -+echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } -+if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then -+ if test "${ac_cv_header_tiffio_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_tiffio_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi -- -- --{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 --$as_echo_n "checking return type of signal handlers... " >&6; } --if test "${ac_cv_type_signal+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - else -- cat >conftest.$ac_ext <<_ACEOF -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -+echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <sys/types.h> --#include <signal.h> -- --int --main () --{ --return *(signal (0, 0)) (0) == 1; -- ; -- return 0; --} -+$ac_includes_default -+#include <tiffio.h> - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -26496,108 +28547,192 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- ac_cv_type_signal=int -+ ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -- ac_cv_type_signal=void -+ ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 --$as_echo "$ac_cv_type_signal" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - --cat >>confdefs.h <<_ACEOF --#define RETSIGTYPE $ac_cv_type_signal -+# Is the header present? -+{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -+echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF -- -- -- - - -if test "x$LIBTIFF" != x; then -- HAVE_TIFF_TRUE= -- HAVE_TIFF_FALSE='#' -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <tiffio.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes ++ if test "x$LIBTIFF" != x; then + HAVE_TIFF_TRUE= + HAVE_TIFF_FALSE='#' else -- HAVE_TIFF_TRUE='#' -- HAVE_TIFF_FALSE= --fi -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no -+fi - -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - --if test "x$LIBPNG" != x; then -- HAVE_PNG_TRUE= -- HAVE_PNG_FALSE='#' -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_tiffio_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- HAVE_PNG_TRUE='#' -- HAVE_PNG_FALSE= -+ ac_cv_header_tiffio_h=$ac_header_preproc +@@ -29722,9 +27372,7 @@ + HAVE_TIFF_FALSE= + fi + +- +- +-if test "x$LIBPNG" != x; then ++ if test "x$LIBPNG" != x; then + HAVE_PNG_TRUE= + HAVE_PNG_FALSE='#' + else +@@ -29732,9 +27380,7 @@ + HAVE_PNG_FALSE= fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - - -if test "x$LIBJPEG" != x; then -- HAVE_JPEG_TRUE= -- HAVE_JPEG_FALSE='#' -+fi -+if test $ac_cv_header_tiffio_h = yes; then -+ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' ++ if test "x$LIBJPEG" != x; then + HAVE_JPEG_TRUE= + HAVE_JPEG_FALSE='#' else -- HAVE_JPEG_TRUE='#' -- HAVE_JPEG_FALSE= -+ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -+echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} +@@ -29742,9 +27388,7 @@ + HAVE_JPEG_FALSE= fi - +- - -if test "x$LIBJASPER" != x; then -- HAVE_JASPER_TRUE= -- HAVE_JASPER_FALSE='#' ++ if test "x$LIBJASPER" != x; then + HAVE_JASPER_TRUE= + HAVE_JASPER_FALSE='#' else -- HAVE_JASPER_TRUE='#' -- HAVE_JASPER_FALSE= --fi -- -+ { echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 -+echo $ECHO_N "checking for TIFFFlushData in -ltiff34... $ECHO_C" >&6; } -+if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ +@@ -30221,9 +27865,7 @@ --if $dynworks ; then -- STATIC_LIB_DEPS= -- if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then -- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF" -- fi -- if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then -- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG" -- fi -- if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then -- STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" -- fi -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char TIFFFlushData (); -+int -+main () -+{ -+return TIFFFlushData (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -- STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG" -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_tiff34_TIFFFlushData=no - fi - --# Checks to see whether we should include mediaLib --# support. --# --if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 --$as_echo_n "checking for sys/systeminfo.h... " >&6; } --if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 -+echo "${ECHO_T}$ac_cv_lib_tiff34_TIFFFlushData" >&6; } -+if test $ac_cv_lib_tiff34_TIFFFlushData = yes; then -+ if test "${ac_cv_header_tiffio_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_tiffio_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 --$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 --$as_echo_n "checking sys/systeminfo.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -+echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26605,7 +28740,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --#include <sys/systeminfo.h> -+#include <tiffio.h> - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -26613,92 +28748,90 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h presence" >&5 --$as_echo_n "checking sys/systeminfo.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -+echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <sys/systeminfo.h> -+#include <tiffio.h> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -26707,180 +28840,171 @@ - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 --$as_echo_n "checking for sys/systeminfo.h... " >&6; } --if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 -+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_tiffio_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_header_sys_systeminfo_h=$ac_header_preproc -+ ac_cv_header_tiffio_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 --$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - - fi --if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then -+if test $ac_cv_header_tiffio_h = yes; then -+ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' -+else -+ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 -+echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} -+fi - --cat >>confdefs.h <<\_ACEOF --#define HAVE_SYS_SYSTEMINFO_H 1 --_ACEOF -+ -+else -+ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 -+echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} -+fi - - fi - -+fi - --if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 --$as_echo_n "checking for sys/sysinfo.h... " >&6; } --if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ fi -+ -+ if test x$with_libtiff != xno && test -z "$LIBTIFF"; then -+ { { echo "$as_me:$LINENO: error: -+*** Checks for TIFF loader failed. You can build without it by passing -+*** --without-libtiff to configure but some programs using GTK+ may -+*** not work properly" >&5 -+echo "$as_me: error: -+*** Checks for TIFF loader failed. You can build without it by passing -+*** --without-libtiff to configure but some programs using GTK+ may -+*** not work properly" >&2;} -+ { (exit 1); exit 1; }; } -+ fi - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 --$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } -+ -+if test x$os_win32 = xno || test x$enable_gdiplus = xno; then -+ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then -+ { echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 -+echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; } -+if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 --$as_echo_n "checking sys/sysinfo.h usability... " >&6; } -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ljpeg $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <sys/sysinfo.h> -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char jpeg_destroy_decompress (); -+int -+main () -+{ -+return jpeg_destroy_decompress (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_jpeg_jpeg_destroy_decompress=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+ ac_cv_lib_jpeg_jpeg_destroy_decompress=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 -+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } -+if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then -+ jpeg_ok=yes -+else -+ jpeg_ok=no -+ { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 -+echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} -+fi - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 --$as_echo_n "checking sys/sysinfo.h presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ if test "$jpeg_ok" = yes; then -+ { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <sys/sysinfo.h> -+#include <stdio.h> -+#undef PACKAGE -+#undef VERSION -+#undef HAVE_STDLIB_H -+#include <jpeglib.h> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -+ jpeg_ok=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no -+ jpeg_ok=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 --$as_echo_n "checking for sys/sysinfo.h... " >&6; } --if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_header_sys_sysinfo_h=$ac_header_preproc --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 --$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } -- --fi --if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_SYS_SYSINFO_H 1 --_ACEOF -- --fi -- -- -- --{ $as_echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 --$as_echo_n "checking for mediaLib 2.3... " >&6; } --use_mlib25=no --# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib --# patch requires. --{ $as_echo "$as_me:$LINENO: checking for mlib_ImageSetStruct in -lmlib" >&5 --$as_echo_n "checking for mlib_ImageSetStruct in -lmlib... " >&6; } --if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ { echo "$as_me:$LINENO: result: $jpeg_ok" >&5 -+echo "${ECHO_T}$jpeg_ok" >&6; } -+ if test "$jpeg_ok" = yes; then -+ LIBJPEG='-ljpeg' -+ { echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 -+echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6; } -+if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmlib $LIBS" -+LIBS="-ljpeg $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26894,11 +29018,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char mlib_ImageSetStruct (); -+char jpeg_simple_progression (); - int - main () - { --return mlib_ImageSetStruct (); -+return jpeg_simple_progression (); - ; - return 0; - } -@@ -26909,61 +29033,82 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_mlib_mlib_ImageSetStruct=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_jpeg_jpeg_simple_progression=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_mlib_mlib_ImageSetStruct=no -+ ac_cv_lib_jpeg_jpeg_simple_progression=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 --$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } --if test "x$ac_cv_lib_mlib_mlib_ImageSetStruct" = x""yes; then -- use_mlib=yes --else -- use_mlib=no --fi -- --if test $use_mlib = yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 -+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } -+if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then - - cat >>confdefs.h <<\_ACEOF --#define USE_MEDIALIB 1 -+#define HAVE_PROGRESSIVE_JPEG 1 - _ACEOF - -- MEDIA_LIB=-lmlib -+else -+ { echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 -+echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} -+fi - -- { $as_echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 --$as_echo_n "checking for mediaLib 2.5... " >&6; } -- # Check for a mediaLib 2.5 function since that is what is needed for -- # gdk_rgb_convert integration. -- { $as_echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 --$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; } --if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ else -+ { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 -+echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} -+ fi -+ fi -+ fi -+ -+ if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then -+ { { echo "$as_me:$LINENO: error: -+*** Checks for JPEG loader failed. You can build without it by passing -+*** --without-libjpeg to configure but some programs using GTK+ may -+*** not work properly" >&5 -+echo "$as_me: error: -+*** Checks for JPEG loader failed. You can build without it by passing -+*** --without-libjpeg to configure but some programs using GTK+ may -+*** not work properly" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+fi -+ -+ if test x$with_libpng != xno && test -z "$LIBPNG"; then -+ { echo "$as_me:$LINENO: checking for libpng12" >&5 -+echo $ECHO_N "checking for libpng12... $ECHO_C" >&6; } -+ if $PKG_CONFIG --exists libpng12 ; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ PNG='png' -+ PNG_DEP_CFLAGS_PACKAGES=libpng12 -+ LIBPNG=`$PKG_CONFIG --libs libpng12` -+ else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 -+echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; } -+if test "${ac_cv_lib_png_png_read_info+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmlib $LIBS" -+LIBS="-lpng -lz -lm $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26977,11 +29122,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char mlib_VideoColorRGBint_to_BGRAint (); -+char png_read_info (); - int - main () - { --return mlib_VideoColorRGBint_to_BGRAint (); -+return png_read_info (); - ; - return 0; - } -@@ -26992,817 +29137,1294 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_png_png_read_info=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no -+ ac_cv_lib_png_png_read_info=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 --$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } --if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then -- use_mlib25=yes -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 -+echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; } -+if test $ac_cv_lib_png_png_read_info = yes; then -+ if test "${ac_cv_header_png_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for png.h" >&5 -+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_png_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -+echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - else -- use_mlib25=no -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking png.h usability" >&5 -+echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <png.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no - fi - -- if test $use_mlib25 = yes; then -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - --cat >>confdefs.h <<\_ACEOF --#define USE_MEDIALIB25 1 -+# Is the header present? -+{ echo "$as_me:$LINENO: checking png.h presence" >&5 -+echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <png.h> - _ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- fi -+ ac_header_preproc=no - fi - -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - --if test $use_mlib = yes; then -- USE_MEDIALIB_TRUE= -- USE_MEDIALIB_FALSE='#' -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for png.h" >&5 -+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_png_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- USE_MEDIALIB_TRUE='#' -- USE_MEDIALIB_FALSE= -+ ac_cv_header_png_h=$ac_header_preproc - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -+echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - -+fi -+if test $ac_cv_header_png_h = yes; then -+ png_ok=yes -+else -+ png_ok=no -+fi - - --if test $use_mlib25 = yes; then -- USE_MEDIALIB25_TRUE= -- USE_MEDIALIB25_FALSE='#' - else -- USE_MEDIALIB25_TRUE='#' -- USE_MEDIALIB25_FALSE= -+ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 -+echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} - fi - -- --# Checks to see if we should compile in MMX support (there will be --# a runtime test when the code is actually run to see if it should --# be used - this just checks if we can compile it.) --# --# This code is partially taken from Mesa --# --{ $as_echo "$as_me:$LINENO: checking for x86 platform" >&5 --$as_echo_n "checking for x86 platform... " >&6; } --case $host_cpu in -- i386|i486|i586|i686|i786|k6|k7) -- use_x86_asm=yes -- ;; -- *) -- use_x86_asm=no -+ if test "$png_ok" = yes; then -+ { echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 -+echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6; } -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <png.h> -+int -+main () -+{ -+png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac --{ $as_echo "$as_me:$LINENO: result: $use_x86_asm" >&5 --$as_echo "$use_x86_asm" >&6; } -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --use_mmx_asm=no --if test $use_x86_asm = yes; then -- save_ac_ext=$ac_ext -- ac_ext=S -+ png_ok=no -+fi - -- { $as_echo "$as_me:$LINENO: checking compiler support for MMX" >&5 --$as_echo_n "checking compiler support for MMX... " >&6; } -- cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- use_mmx_asm=yes -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ { echo "$as_me:$LINENO: result: $png_ok" >&5 -+echo "${ECHO_T}$png_ok" >&6; } -+ if test "$png_ok" = yes; then -+ PNG='png'; LIBPNG='-lpng -lz' -+ else -+ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 -+echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} -+ fi -+ else -+ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 -+echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} -+ fi fi -+ fi + fi +- +- +-if test $use_mlib = yes; then ++ if test $use_mlib = yes; then + USE_MEDIALIB_TRUE= + USE_MEDIALIB_FALSE='#' + else +@@ -30231,9 +27873,7 @@ + USE_MEDIALIB_FALSE= + fi -- rm -rf conftest* -+ if test x$with_libpng != xno && test -z "$LIBPNG"; then -+ { { echo "$as_me:$LINENO: error: -+*** Checks for PNG loader failed. You can build without it by passing -+*** --without-libpng to configure but many programs using GTK+ will -+*** not work properly. The PNG loader is also needed if you are compiling -+*** from CVS." >&5 -+echo "$as_me: error: -+*** Checks for PNG loader failed. You can build without it by passing -+*** --without-libpng to configure but many programs using GTK+ will -+*** not work properly. The PNG loader is also needed if you are compiling -+*** from CVS." >&2;} -+ { (exit 1); exit 1; }; } -+ fi - -- ac_ext=$save_ac_ext -- if test $use_mmx_asm = yes; then -+ if test x$with_libjasper != xno && test -z "$LIBJASPER"; then -+ { echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 -+echo $ECHO_N "checking for jas_init in -ljasper... $ECHO_C" >&6; } -+if test "${ac_cv_lib_jasper_jas_init+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ljasper -ljpeg $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --cat >>confdefs.h <<\_ACEOF --#define USE_MMX 1 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char jas_init (); -+int -+main () -+{ -+return jas_init (); -+ ; -+ return 0; -+} - _ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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_jasper_jas_init=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- fi -+ ac_cv_lib_jasper_jas_init=no +- +- +-if test $use_mlib25 = yes; then ++ if test $use_mlib25 = yes; then + USE_MEDIALIB25_TRUE= + USE_MEDIALIB25_FALSE='#' + else +@@ -30293,9 +27933,7 @@ + fi fi - - -if test x$use_mmx_asm = xyes; then -- USE_MMX_TRUE= -- USE_MMX_FALSE='#' --else -- USE_MMX_TRUE='#' -- USE_MMX_FALSE= -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 -+echo "${ECHO_T}$ac_cv_lib_jasper_jas_init" >&6; } -+if test $ac_cv_lib_jasper_jas_init = yes; then -+ LIBJASPER=-ljasper - fi - -+ fi - --REBUILD_PNGS= --if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then -- REBUILD_PNGS=# --fi -+ if test x$with_libjasper != xno && test -z "$LIBJASPER"; then -+ { { echo "$as_me:$LINENO: error: -+*** Checks for JPEG2000 loader failed. You can build without it by passing -+*** --without-libjasper to configure" >&5 -+echo "$as_me: error: -+*** Checks for JPEG2000 loader failed. You can build without it by passing -+*** --without-libjasper to configure" >&2;} -+ { (exit 1); exit 1; }; } -+ fi - - - - --if test $cross_compiling = yes; then -- CROSS_COMPILING_TRUE= -- CROSS_COMPILING_FALSE='#' --else -- CROSS_COMPILING_TRUE='#' -- CROSS_COMPILING_FALSE= --fi - - --if test $cross_compiling = yes; then -- # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. --set dummy gdk-pixbuf-csource; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ if $dynworks; then -+ BUILD_DYNAMIC_MODULES_TRUE= -+ BUILD_DYNAMIC_MODULES_FALSE='#' - else -- case $GDK_PIXBUF_CSOURCE in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+ BUILD_DYNAMIC_MODULES_TRUE='#' -+ BUILD_DYNAMIC_MODULES_FALSE= -+fi - -- test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" -- ;; --esac -+ -+# -+# Allow building some or all gdk-pixbuf loaders included -+# -+{ echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 -+echo $ECHO_N "checking pixbuf loaders to build... $ECHO_C" >&6; } -+ -+ -+# Check whether --with-included_loaders was given. -+if test "${with_included_loaders+set}" = set; then -+ withval=$with_included_loaders; - fi --GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE --if test -n "$GDK_PIXBUF_CSOURCE"; then -- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 --$as_echo "$GDK_PIXBUF_CSOURCE" >&6; } -+ -+ -+if $dynworks; then -+ : - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ ## if the option was specified, leave it; otherwise disable included loaders -+ if test x$with_included_loaders = xno; then -+ with_included_loaders=yes -+ fi - fi - -+# Use the traditional png loader instead of the GDI+ one on Windows, -+# because some important apps like GIMP need to read and write -+# arbitrary tEXt chunks which doesn't seem to be possible through GDI+ - -- # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. --set dummy gtk-update-icon-cache; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE+set}" = set; then -- $as_echo_n "(cached) " >&6 -+all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm" -+if test x$with_libjasper != xno; then -+ all_loaders="$all_loaders,jasper" -+fi -+if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then -+ # Skip PNG, see comment above -+ gdip_formats="bmp emf gif ico jpeg tiff wmf" -+ for f in $gdip_formats; do -+ all_loaders="$all_loaders,gdip-$f" -+ done - else -- case $GTK_UPDATE_ICON_CACHE in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_GTK_UPDATE_ICON_CACHE="$GTK_UPDATE_ICON_CACHE" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no" -- ;; --esac -+ all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff" - fi --GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE --if test -n "$GTK_UPDATE_ICON_CACHE"; then -- { $as_echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 --$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; } -+included_loaders="" -+# If no loaders specified, include all -+if test "x$with_included_loaders" = xyes ; then -+ included_loaders="$all_loaders" - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ included_loaders="$with_included_loaders" - fi - -+{ echo "$as_me:$LINENO: result: $included_loaders" >&5 -+echo "${ECHO_T}$included_loaders" >&6; } - -- if test x$GTK_UPDATE_ICON_CACHE = xno; then -- REBUILD_PNGS=# -- fi --fi -+INCLUDED_LOADER_OBJ= -+INCLUDED_LOADER_DEFINE= - --if test ! -f $srcdir/gtk/gtkbuiltincache.h && -- test "x$REBUILD_PNGS" = "x#" ; then -- { { $as_echo "$as_me:$LINENO: error: --*** gtkbuiltincache.h is not in the tree, and cannot be built --*** because you don't have libpng, or (when cross-compiling) you --*** don't have a prebuilt gtk-update-icon-cache on the build system." >&5 --$as_echo "$as_me: error: --*** gtkbuiltincache.h is not in the tree, and cannot be built --*** because you don't have libpng, or (when cross-compiling) you --*** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} -+IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," -+for loader in $included_loaders; do -+ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then -+ : -+ else -+ { { echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 -+echo "$as_me: error: the specified loader $loader does not exist" >&2;} - { (exit 1); exit 1; }; } --fi -+ fi - -+ loader_underscores=`echo $loader | sed -e 's/-/_/g'` -+ INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la" - -+ # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader -+ case $loader in -+ gdip-*) ;; -+ *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";; -+ esac -+ eval INCLUDE_$loader_underscores=yes -+done - --GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" --GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" --GDK_PIXBUF_EXTRA_CFLAGS= --GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" --GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" -+# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders -+# (except gdip-png, which isn't built at all) -+if test x"$INCLUDE_gdip_ico" = xyes; then -+ INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus" -+fi - --######################################## --# Windowing system checks --######################################## -+IFS="$gtk_save_ifs" - --GDK_PIXBUF_XLIB_PACKAGES= --GDK_PIXBUF_XLIB_EXTRA_CFLAGS= --GDK_PIXBUF_XLIB_EXTRA_LIBS= - --X_PACKAGES=fontconfig --GDK_EXTRA_LIBS="$GDK_WLIBS" --GDK_EXTRA_CFLAGS= - --# GTK+ uses some X calls, so needs to link against X directly --GTK_DEP_PACKAGES_FOR_X= --GTK_DEP_LIBS_FOR_X= -+ if test x"$INCLUDE_png" = xyes; then -+ INCLUDE_PNG_TRUE= -+ INCLUDE_PNG_FALSE='#' -+else -+ INCLUDE_PNG_TRUE='#' -+ INCLUDE_PNG_FALSE= -+fi - --if test "x$gdktarget" = "xx11"; then -- # -- # We use fontconfig very peripherally when decoding the default -- # settings. -- # -- if $PKG_CONFIG --exists fontconfig; then : ; else -- { { $as_echo "$as_me:$LINENO: error: --*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&5 --$as_echo "$as_me: error: --*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} -- { (exit 1); exit 1; }; } -- fi -+ if test x"$INCLUDE_bmp" = xyes; then -+ INCLUDE_BMP_TRUE= -+ INCLUDE_BMP_FALSE='#' -+else -+ INCLUDE_BMP_TRUE='#' -+ INCLUDE_BMP_FALSE= -+fi - -- # -- # Check for basic X packages; we use pkg-config if available -- # -- if $PKG_CONFIG --exists x11 xext xrender; then -- have_base_x_pc=true -- X_PACKAGES="$X_PACKAGES x11 xext xrender" -- x_libs="`$PKG_CONFIG --libs x11 xext xrender`" -- X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" -+ if test x"$INCLUDE_wbmp" = xyes; then -+ INCLUDE_WBMP_TRUE= -+ INCLUDE_WBMP_FALSE='#' -+else -+ INCLUDE_WBMP_TRUE='#' -+ INCLUDE_WBMP_FALSE= -+fi - -- # Strip out any .la files that pkg-config might give us (this happens -- # with -uninstalled.pc files) -- x_libs_for_checks= -- for I in $x_libs ; do -- case $I in -- *.la) ;; -- *) x_libs_for_checks="$x_libs_for_checks $I" ;; -- esac -- done -+ if test x"$INCLUDE_gif" = xyes; then -+ INCLUDE_GIF_TRUE= -+ INCLUDE_GIF_FALSE='#' -+else -+ INCLUDE_GIF_TRUE='#' -+ INCLUDE_GIF_FALSE= -+fi - -- GDK_PIXBUF_XLIB_PACKAGES="x11" -- GTK_PACKAGES_FOR_X="x11" -- else -- have_base_x_pc=false -- { $as_echo "$as_me:$LINENO: checking for X" >&5 --$as_echo_n "checking for X... " >&6; } -+ if test x"$INCLUDE_ico" = xyes; then -+ INCLUDE_ICO_TRUE= -+ INCLUDE_ICO_FALSE='#' -+else -+ INCLUDE_ICO_TRUE='#' -+ INCLUDE_ICO_FALSE= -+fi - -+ if test x"$INCLUDE_ani" = xyes; then -+ INCLUDE_ANI_TRUE= -+ INCLUDE_ANI_FALSE='#' -+else -+ INCLUDE_ANI_TRUE='#' -+ INCLUDE_ANI_FALSE= -+fi - --# Check whether --with-x was given. --if test "${with_x+set}" = set; then -- withval=$with_x; -+ if test x"$INCLUDE_jpeg" = xyes; then -+ INCLUDE_JPEG_TRUE= -+ INCLUDE_JPEG_FALSE='#' -+else -+ INCLUDE_JPEG_TRUE='#' -+ INCLUDE_JPEG_FALSE= - fi - --# $have_x is `yes', `no', `disabled', or empty when we do not yet know. --if test "x$with_x" = xno; then -- # The user explicitly disabled X. -- have_x=disabled -+ if test x"$INCLUDE_pnm" = xyes; then -+ INCLUDE_PNM_TRUE= -+ INCLUDE_PNM_FALSE='#' - else -- case $x_includes,$x_libraries in #( -- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 --$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} -- { (exit 1); exit 1; }; };; #( -- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ INCLUDE_PNM_TRUE='#' -+ INCLUDE_PNM_FALSE= -+fi -+ -+ if test x"$INCLUDE_ras" = xyes; then -+ INCLUDE_RAS_TRUE= -+ INCLUDE_RAS_FALSE='#' - else -- # One or both of the vars are not set, and there is no cached value. --ac_x_includes=no ac_x_libraries=no --rm -f -r conftest.dir --if mkdir conftest.dir; then -- cd conftest.dir -- cat >Imakefile <<'_ACEOF' --incroot: -- @echo incroot='${INCROOT}' --usrlibdir: -- @echo usrlibdir='${USRLIBDIR}' --libdir: -- @echo libdir='${LIBDIR}' --_ACEOF -- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then -- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -- for ac_var in incroot usrlibdir libdir; do -- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" -- done -- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -- for ac_extension in a so sl dylib la dll; do -- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && -- test -f "$ac_im_libdir/libX11.$ac_extension"; then -- ac_im_usrlibdir=$ac_im_libdir; break -- fi -- done -- # Screen out bogus values from the imake configuration. They are -- # bogus both because they are the default anyway, and because -- # using them would break gcc on systems where it needs fixed includes. -- case $ac_im_incroot in -- /usr/include) ac_x_includes= ;; -- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; -- esac -- case $ac_im_usrlibdir in -- /usr/lib | /usr/lib64 | /lib | /lib64) ;; -- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; -- esac -- fi -- cd .. -- rm -f -r conftest.dir -+ INCLUDE_RAS_TRUE='#' -+ INCLUDE_RAS_FALSE= - fi - --# Standard set of common directories for X headers. --# Check X11 before X11Rn because it is often a symlink to the current release. --ac_x_header_dirs=' --/usr/X11/include --/usr/X11R6/include --/usr/X11R5/include --/usr/X11R4/include -- --/usr/include/X11 --/usr/include/X11R6 --/usr/include/X11R5 --/usr/include/X11R4 -+ if test x"$INCLUDE_tiff" = xyes; then -+ INCLUDE_TIFF_TRUE= -+ INCLUDE_TIFF_FALSE='#' -+else -+ INCLUDE_TIFF_TRUE='#' -+ INCLUDE_TIFF_FALSE= -+fi - --/usr/local/X11/include --/usr/local/X11R6/include --/usr/local/X11R5/include --/usr/local/X11R4/include -+ if test x"$INCLUDE_xpm" = xyes; then -+ INCLUDE_XPM_TRUE= -+ INCLUDE_XPM_FALSE='#' -+else -+ INCLUDE_XPM_TRUE='#' -+ INCLUDE_XPM_FALSE= -+fi - --/usr/local/include/X11 --/usr/local/include/X11R6 --/usr/local/include/X11R5 --/usr/local/include/X11R4 -+ if test x"$INCLUDE_xbm" = xyes; then -+ INCLUDE_XBM_TRUE= -+ INCLUDE_XBM_FALSE='#' -+else -+ INCLUDE_XBM_TRUE='#' -+ INCLUDE_XBM_FALSE= -+fi - --/usr/X386/include --/usr/x386/include --/usr/XFree86/include/X11 -+ if test x"$INCLUDE_tga" = xyes; then -+ INCLUDE_TGA_TRUE= -+ INCLUDE_TGA_FALSE='#' -+else -+ INCLUDE_TGA_TRUE='#' -+ INCLUDE_TGA_FALSE= -+fi - --/usr/include --/usr/local/include --/usr/unsupported/include --/usr/athena/include --/usr/local/x11r5/include --/usr/lpp/Xamples/include -+ if test x"$INCLUDE_pcx" = xyes; then -+ INCLUDE_PCX_TRUE= -+ INCLUDE_PCX_FALSE='#' -+else -+ INCLUDE_PCX_TRUE='#' -+ INCLUDE_PCX_FALSE= -+fi - --/usr/openwin/include --/usr/openwin/share/include' -+ if test x"$INCLUDE_icns" = xyes; then -+ INCLUDE_ICNS_TRUE= -+ INCLUDE_ICNS_FALSE='#' -+else -+ INCLUDE_ICNS_TRUE='#' -+ INCLUDE_ICNS_FALSE= -+fi - --if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Xlib.h. -- # First, try using that file with no special directory specified. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <X11/Xlib.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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= -+ if test x"$INCLUDE_jasper" = xyes; then -+ INCLUDE_JASPER_TRUE= -+ INCLUDE_JASPER_FALSE='#' - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ INCLUDE_JASPER_TRUE='#' -+ INCLUDE_JASPER_FALSE= -+fi - -- for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Xlib.h"; then -- ac_x_includes=$ac_dir -- break -- fi --done -+# As all GDI+ loaders are either built-in or not, arbitrarily just -+# check one of the variables here -+ if test x"$INCLUDE_gdip_ico" = xyes; then -+ INCLUDE_GDIPLUS_TRUE= -+ INCLUDE_GDIPLUS_FALSE='#' -+else -+ INCLUDE_GDIPLUS_TRUE='#' -+ INCLUDE_GDIPLUS_FALSE= - fi - --rm -f conftest.err conftest.$ac_ext --fi # $ac_x_includes = no - --if test "$ac_x_libraries" = no; then -- # Check for the libraries. -- # See if we find them without any special options. -- # Don't add to $LIBS permanently. -- ac_save_LIBS=$LIBS -- LIBS="-lX11 $LIBS" -+if test x$gio_can_sniff = x; then -+ { echo "$as_me:$LINENO: checking if gio can sniff png" >&5 -+echo $ECHO_N "checking if gio can sniff png... $ECHO_C" >&6; } -+ gtk_save_LIBS="$LIBS" -+ gtk_save_CFLAGS="$CFLAGS" -+ LIBS="`$PKG_CONFIG --libs gio-2.0`" -+ CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" -+ if test "$cross_compiling" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot run test program while cross compiling -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <X11/Xlib.h> --int --main () --{ --XrmInitialize () -- ; -- return 0; --} -+ -+ #include <gio/gio.h> -+ static const gsize data_size = 159; -+ static const guint8 data[] = -+ { -+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, -+ 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, -+ 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00, -+ 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00, -+ 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, -+ 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, -+ 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8, -+ 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, -+ 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, -+ 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, -+ 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08, -+ 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc, -+ 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, -+ 0x42, 0x60, 0x82 -+ }; -+ int -+ main (int argc, char **argv) -+ { -+ char *content_type; -+ char *image_png; -+ content_type = g_content_type_guess (NULL, data, data_size, NULL); -+ image_png = g_content_type_from_mime_type ("image/png"); -+ return !!strcmp (content_type, image_png); -+ } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext -+rm -f conftest$ac_exeext - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- LIBS=$ac_save_LIBS --# We can link X programs with no special library path. --ac_x_libraries= -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./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 -+ gio_can_sniff=yes -+ -+cat >>confdefs.h <<\_ACEOF -+#define GDK_PIXBUF_USE_GIO_MIME 1 -+_ACEOF -+ - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- LIBS=$ac_save_LIBS --for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` --do -- # Don't even attempt the hair of trying to link an X program! -- for ac_extension in a so sl dylib la dll; do -- if test -r "$ac_dir/libX11.$ac_extension"; then -- ac_x_libraries=$ac_dir -- break 2 -- fi -- done --done -+( exit $ac_status ) -+gio_can_sniff=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi # $ac_x_libraries = no - --case $ac_x_includes,$ac_x_libraries in #( -- no,* | *,no | *\'*) -- # Didn't find X, or a directory has "'" in its name. -- ac_cv_have_x="have_x=no";; #( -- *) -- # Record where we found X for the cache. -- ac_cv_have_x="have_x=yes\ -- ac_x_includes='$ac_x_includes'\ -- ac_x_libraries='$ac_x_libraries'" --esac -+ { echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 -+echo "${ECHO_T}$gio_can_sniff" >&6; } -+ LIBS="$gtk_save_LIBS" -+ CFLAGS="$gtk_save_CFLAGS" - fi --;; #( -- *) have_x=yes;; -- esac -- eval "$ac_cv_have_x" --fi # $with_x != no - --if test "$have_x" != yes; then -- { $as_echo "$as_me:$LINENO: result: $have_x" >&5 --$as_echo "$have_x" >&6; } -- no_x=yes --else -- # If each of the values was on the command line, it overrides each guess. -- test "x$x_includes" = xNONE && x_includes=$ac_x_includes -- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries -- # Update the cache value to reflect the command line values. -- ac_cv_have_x="have_x=yes\ -- ac_x_includes='$x_includes'\ -- ac_x_libraries='$x_libraries'" -- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 --$as_echo "libraries $x_libraries, headers $x_includes" >&6; } -+# -+# Allow building some or all immodules included -+# -+{ echo "$as_me:$LINENO: checking immodules to build" >&5 -+echo $ECHO_N "checking immodules to build... $ECHO_C" >&6; } -+ -+ -+# Check whether --with-included_immodules was given. -+if test "${with_included_immodules+set}" = set; then -+ withval=$with_included_immodules; - fi - --if test "$no_x" = yes; then -- # Not all programs may use this symbol, but it does not hurt to define it. - --cat >>confdefs.h <<\_ACEOF --#define X_DISPLAY_MISSING 1 --_ACEOF -+if $dynworks; then -+ : -+else -+ ## if the option was specified, leave it; otherwise disable included immodules -+ if test x$with_included_immodules = xno; then -+ with_included_immodules=yes -+ fi -+fi - -- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -+all_immodules="am-et,cedilla,cyrillic-translit" -+if test "$gdktarget" = "win32"; then -+ all_immodules="${all_immodules},ime" -+fi -+all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr" -+if test "$gdktarget" = "x11"; then -+ all_immodules="${all_immodules},xim" -+fi -+ -+included_immodules="" -+# If the switch specified without listing any specific ones, include all -+if test "x$with_included_immodules" = xyes ; then -+ included_immodules="$all_immodules" - else -- if test -n "$x_includes"; then -- X_CFLAGS="$X_CFLAGS -I$x_includes" -- fi -+ included_immodules="$with_included_immodules" -+fi - -- # It would also be nice to do this for all -L options, not just this one. -- if test -n "$x_libraries"; then -- 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 . . . . -- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 --$as_echo_n "checking whether -R must be followed by a space... " >&6; } -- 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 -+{ echo "$as_me:$LINENO: result: $included_immodules" >&5 -+echo "${ECHO_T}$included_immodules" >&6; } -+ if test "x$included_immodules" != x; then -+ HAVE_INCLUDED_IMMMODULES_TRUE= -+ HAVE_INCLUDED_IMMMODULES_FALSE='#' -+else -+ HAVE_INCLUDED_IMMMODULES_TRUE='#' -+ HAVE_INCLUDED_IMMMODULES_FALSE= -+fi -+ -+ -+INCLUDED_IMMODULE_OBJ= -+INCLUDED_IMMODULE_DEFINE= -+ -+IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," -+for immodule in $included_immodules; do -+ immodule_underscores=`echo $immodule | sed -e 's/-/_/g'` -+ if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then -+ : -+ else -+ { { echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 -+echo "$as_me: error: the specified input method $immodule does not exist" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ -+ INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la" -+ INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores" -+ eval INCLUDE_$immodule_underscores=yes -+done -+IFS="$gtk_save_ifs" -+ -+ -+ -+ if test x"$INCLUDE_am_et" = xyes; then -+ INCLUDE_IM_AM_ET_TRUE= -+ INCLUDE_IM_AM_ET_FALSE='#' -+else -+ INCLUDE_IM_AM_ET_TRUE='#' -+ INCLUDE_IM_AM_ET_FALSE= -+fi -+ -+ if test x"$INCLUDE_cedilla" = xyes; then -+ INCLUDE_IM_CEDILLA_TRUE= -+ INCLUDE_IM_CEDILLA_FALSE='#' -+else -+ INCLUDE_IM_CEDILLA_TRUE='#' -+ INCLUDE_IM_CEDILLA_FALSE= -+fi -+ -+ if test x"$INCLUDE_cyrillic_translit" = xyes; then -+ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= -+ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' -+else -+ INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE='#' -+ INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= -+fi -+ -+ if test x"$INCLUDE_ime" = xyes; then -+ INCLUDE_IM_IME_TRUE= -+ INCLUDE_IM_IME_FALSE='#' -+else -+ INCLUDE_IM_IME_TRUE='#' -+ INCLUDE_IM_IME_FALSE= -+fi -+ -+ if test x"$INCLUDE_inuktitut" = xyes; then -+ INCLUDE_IM_INUKTITUT_TRUE= -+ INCLUDE_IM_INUKTITUT_FALSE='#' -+else -+ INCLUDE_IM_INUKTITUT_TRUE='#' -+ INCLUDE_IM_INUKTITUT_FALSE= -+fi -+ -+ if test x"$INCLUDE_ipa" = xyes; then -+ INCLUDE_IM_IPA_TRUE= -+ INCLUDE_IM_IPA_FALSE='#' -+else -+ INCLUDE_IM_IPA_TRUE='#' -+ INCLUDE_IM_IPA_FALSE= -+fi -+ -+ if test x"$INCLUDE_multipress" = xyes; then -+ INCLUDE_IM_MULTIPRESS_TRUE= -+ INCLUDE_IM_MULTIPRESS_FALSE='#' -+else -+ INCLUDE_IM_MULTIPRESS_TRUE='#' -+ INCLUDE_IM_MULTIPRESS_FALSE= -+fi -+ -+ if test x"$INCLUDE_thai" = xyes; then -+ INCLUDE_IM_THAI_TRUE= -+ INCLUDE_IM_THAI_FALSE='#' -+else -+ INCLUDE_IM_THAI_TRUE='#' -+ INCLUDE_IM_THAI_FALSE= -+fi -+ -+ if test x"$INCLUDE_ti_er" = xyes; then -+ INCLUDE_IM_TI_ER_TRUE= -+ INCLUDE_IM_TI_ER_FALSE='#' -+else -+ INCLUDE_IM_TI_ER_TRUE='#' -+ INCLUDE_IM_TI_ER_FALSE= -+fi -+ -+ if test x"$INCLUDE_ti_et" = xyes; then -+ INCLUDE_IM_TI_ET_TRUE= -+ INCLUDE_IM_TI_ET_FALSE='#' -+else -+ INCLUDE_IM_TI_ET_TRUE='#' -+ INCLUDE_IM_TI_ET_FALSE= -+fi -+ -+ if test x"$INCLUDE_viqr" = xyes; then -+ INCLUDE_IM_VIQR_TRUE= -+ INCLUDE_IM_VIQR_FALSE='#' -+else -+ INCLUDE_IM_VIQR_TRUE='#' -+ INCLUDE_IM_VIQR_FALSE= -+fi -+ -+ if test x"$INCLUDE_xim" = xyes; then -+ INCLUDE_IM_XIM_TRUE= -+ INCLUDE_IM_XIM_FALSE='#' -+else -+ INCLUDE_IM_XIM_TRUE='#' -+ INCLUDE_IM_XIM_FALSE= -+fi -+ -+ -+{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_wait_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/types.h> -+#include <sys/wait.h> -+#ifndef WEXITSTATUS -+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) -+#endif -+#ifndef WIFEXITED -+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -+#endif - - int - main () - { -- -+ int s; -+ wait (&s); -+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- X_LIBS="$X_LIBS -R$x_libraries" -+ } && test -s conftest.$ac_objext; then -+ ac_cv_header_sys_wait_h=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- LIBS="$ac_xsave_LIBS -R $x_libraries" -- cat >conftest.$ac_ext <<_ACEOF -+ ac_cv_header_sys_wait_h=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } -+if test $ac_cv_header_sys_wait_h = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_SYS_WAIT_H 1 -+_ACEOF -+ -+fi -+ -+ -+{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } -+if test "${ac_cv_type_signal+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <sys/types.h> -+#include <signal.h> - - int - main () - { -- -+return *(signal (0, 0)) (0) == 1; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- X_LIBS="$X_LIBS -R $x_libraries" -+ } && test -s conftest.$ac_objext; then -+ ac_cv_type_signal=int - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { $as_echo "$as_me:$LINENO: result: neither works" >&5 --$as_echo "neither works" >&6; } -+ ac_cv_type_signal=void - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -+echo "${ECHO_T}$ac_cv_type_signal" >&6; } - --rm -rf conftest.dSYM --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 -+cat >>confdefs.h <<_ACEOF -+#define RETSIGTYPE $ac_cv_type_signal -+_ACEOF - -- # Check for system-dependent libraries X programs must link with. -- # Do this before checking for the system-independent R6 libraries -- # (-lICE), since we may need -lsocket or whatever for X linking. - -- if test "$ISC" = yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" -- else -- # Martyn Johnson says this is needed for Ultrix, if the X -- # libraries were built with DECnet support. And Karl Berry says -- # the Alpha needs dnet_stub (dnet does not exist). -- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char XOpenDisplay (); --int --main () --{ --return XOpenDisplay (); -- ; -- return 0; --} -+ if test "x$LIBTIFF" != x; then -+ HAVE_TIFF_TRUE= -+ HAVE_TIFF_FALSE='#' -+else -+ HAVE_TIFF_TRUE='#' -+ HAVE_TIFF_FALSE= -+fi -+ -+ if test "x$LIBPNG" != x; then -+ HAVE_PNG_TRUE= -+ HAVE_PNG_FALSE='#' -+else -+ HAVE_PNG_TRUE='#' -+ HAVE_PNG_FALSE= -+fi -+ -+ if test "x$LIBJPEG" != x; then -+ HAVE_JPEG_TRUE= -+ HAVE_JPEG_FALSE='#' -+else -+ HAVE_JPEG_TRUE='#' -+ HAVE_JPEG_FALSE= -+fi -+ -+ if test "x$LIBJASPER" != x; then -+ HAVE_JASPER_TRUE= -+ HAVE_JASPER_FALSE='#' -+else -+ HAVE_JASPER_TRUE='#' -+ HAVE_JASPER_FALSE= -+fi -+ -+ -+if $dynworks ; then -+ STATIC_LIB_DEPS= -+ if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then -+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF" -+ fi -+ if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then -+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG" -+ fi -+ if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then -+ STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" -+ fi -+else -+ STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG" -+fi -+ -+# Checks to see whether we should include mediaLib -+# support. -+# -+if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 -+echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 -+echo $ECHO_N "checking sys/systeminfo.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <sys/systeminfo.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking sys/systeminfo.h presence" >&5 -+echo $ECHO_N "checking sys/systeminfo.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/systeminfo.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err - }; then -- : -+ ac_header_preproc=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 --$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } --if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 -+echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldnet $LIBS" -+ ac_cv_header_sys_systeminfo_h=$ac_header_preproc -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } -+ -+fi -+if test $ac_cv_header_sys_systeminfo_h = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_SYS_SYSTEMINFO_H 1 -+_ACEOF -+ -+fi -+ -+ -+if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 -+echo $ECHO_N "checking for sys/sysinfo.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 -+echo $ECHO_N "checking sys/sysinfo.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dnet_ntoa (); --int --main () --{ --return dnet_ntoa (); -- ; -- return 0; --} -+$ac_includes_default -+#include <sys/sysinfo.h> - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 -+echo $ECHO_N "checking sys/sysinfo.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/sysinfo.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err - }; then -- ac_cv_lib_dnet_dnet_ntoa=yes -+ ac_header_preproc=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_dnet_dnet_ntoa=no -+ ac_header_preproc=no - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 -+echo $ECHO_N "checking for sys/sysinfo.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_header_sys_sysinfo_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 --$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } --if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } -+ - fi -+if test $ac_cv_header_sys_sysinfo_h = yes; then - -- if test $ac_cv_lib_dnet_dnet_ntoa = no; then -- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 --$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } --if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then -- $as_echo_n "(cached) " >&6 -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_SYS_SYSINFO_H 1 -+_ACEOF -+ -+fi -+ -+ -+ -+{ echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 -+echo $ECHO_N "checking for mediaLib 2.3... $ECHO_C" >&6; } -+use_mlib25=no -+# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib -+# patch requires. -+{ echo "$as_me:$LINENO: checking for mlib_ImageSetStruct in -lmlib" >&5 -+echo $ECHO_N "checking for mlib_ImageSetStruct in -lmlib... $ECHO_C" >&6; } -+if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldnet_stub $LIBS" -+LIBS="-lmlib $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27816,11 +30438,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char dnet_ntoa (); -+char mlib_ImageSetStruct (); - int - main () - { --return dnet_ntoa (); -+return mlib_ImageSetStruct (); - ; - return 0; - } -@@ -27831,150 +30453,57 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_dnet_stub_dnet_ntoa=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_mlib_mlib_ImageSetStruct=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_dnet_stub_dnet_ntoa=no -+ ac_cv_lib_mlib_mlib_ImageSetStruct=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 --$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } --if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" --fi -- -- fi --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- LIBS="$ac_xsave_LIBS" -- -- # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, -- # to get the SysV transport functions. -- # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) -- # needs -lnsl. -- # The nsl library prevents programs from opening the X display -- # on Irix 5.2, according to T.E. Dickey. -- # The functions gethostbyname, getservbyname, and inet_addr are -- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. -- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 --$as_echo_n "checking for gethostbyname... " >&6; } --if test "${ac_cv_func_gethostbyname+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 -+echo "${ECHO_T}$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } -+if test $ac_cv_lib_mlib_mlib_ImageSetStruct = yes; then -+ use_mlib=yes - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define gethostbyname innocuous_gethostbyname -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char gethostbyname (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef gethostbyname -+ use_mlib=no -+fi - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char gethostbyname (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_gethostbyname || defined __stub___gethostbyname --choke me --#endif -+if test $use_mlib = yes; then - --int --main () --{ --return gethostbyname (); -- ; -- return 0; --} -+cat >>confdefs.h <<\_ACEOF -+#define USE_MEDIALIB 1 - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_gethostbyname=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_func_gethostbyname=no --fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 --$as_echo "$ac_cv_func_gethostbyname" >&6; } -+ MEDIA_LIB=-lmlib - -- if test $ac_cv_func_gethostbyname = no; then -- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 --$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } --if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ { echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 -+echo $ECHO_N "checking for mediaLib 2.5... $ECHO_C" >&6; } -+ # Check for a mediaLib 2.5 function since that is what is needed for -+ # gdk_rgb_convert integration. -+ { echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 -+echo $ECHO_N "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... $ECHO_C" >&6; } -+if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lnsl $LIBS" -+LIBS="-lmlib $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27988,11 +30517,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char gethostbyname (); -+char mlib_VideoColorRGBint_to_BGRAint (); - int - main () - { --return gethostbyname (); -+return mlib_VideoColorRGBint_to_BGRAint (); - ; - return 0; - } -@@ -28003,550 +30532,459 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_nsl_gethostbyname=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_nsl_gethostbyname=no -+ ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 --$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } --if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 -+echo "${ECHO_T}$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } -+if test $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint = yes; then -+ use_mlib25=yes -+else -+ use_mlib25=no - fi - -- if test $ac_cv_lib_nsl_gethostbyname = no; then -- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 --$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } --if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lbsd $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ if test $use_mlib25 = yes; then - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char gethostbyname (); --int --main () --{ --return gethostbyname (); -- ; -- return 0; --} -+cat >>confdefs.h <<\_ACEOF -+#define USE_MEDIALIB25 1 - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_bsd_gethostbyname=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_bsd_gethostbyname=no -+ fi - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ if test $use_mlib = yes; then -+ USE_MEDIALIB_TRUE= -+ USE_MEDIALIB_FALSE='#' -+else -+ USE_MEDIALIB_TRUE='#' -+ USE_MEDIALIB_FALSE= - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 --$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } --if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -+ -+ if test $use_mlib25 = yes; then -+ USE_MEDIALIB25_TRUE= -+ USE_MEDIALIB25_FALSE='#' -+else -+ USE_MEDIALIB25_TRUE='#' -+ USE_MEDIALIB25_FALSE= - fi - -- fi -+ -+# Checks to see if we should compile in MMX support (there will be -+# a runtime test when the code is actually run to see if it should -+# be used - this just checks if we can compile it.) -+# -+# This code is partially taken from Mesa -+# -+{ echo "$as_me:$LINENO: checking for x86 platform" >&5 -+echo $ECHO_N "checking for x86 platform... $ECHO_C" >&6; } -+case $host_cpu in -+ i386|i486|i586|i686|i786|k6|k7) -+ use_x86_asm=yes -+ ;; -+ *) -+ use_x86_asm=no -+esac -+{ echo "$as_me:$LINENO: result: $use_x86_asm" >&5 -+echo "${ECHO_T}$use_x86_asm" >&6; } -+ -+use_mmx_asm=no -+if test $use_x86_asm = yes; then -+ save_ac_ext=$ac_ext -+ ac_ext=S -+ -+ { echo "$as_me:$LINENO: checking compiler support for MMX" >&5 -+echo $ECHO_N "checking compiler support for MMX... $ECHO_C" >&6; } -+ cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S -+ 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 -+ use_mmx_asm=yes - fi - -- # lieder@skyler.mavd.honeywell.com says without -lsocket, -- # socket/setsockopt and other routines are undefined under SCO ODT -- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary -- # on later versions), says Simon Leinen: it contains gethostby* -- # variants that don't use the name server (or something). -lsocket -- # must be given before -lnsl if both are needed. We assume that -- # if connect needs -lnsl, so does gethostbyname. -- { $as_echo "$as_me:$LINENO: checking for connect" >&5 --$as_echo_n "checking for connect... " >&6; } --if test "${ac_cv_func_connect+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+ rm -rf conftest* -+ -+ ac_ext=$save_ac_ext -+ if test $use_mmx_asm = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define USE_MMX 1 - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define connect to an innocuous variant, in case <limits.h> declares connect. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define connect innocuous_connect - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char connect (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ fi -+fi - --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif + if test x$use_mmx_asm = xyes; then -+ USE_MMX_TRUE= -+ USE_MMX_FALSE='#' -+else -+ USE_MMX_TRUE='#' -+ USE_MMX_FALSE= -+fi + USE_MMX_TRUE= + USE_MMX_FALSE='#' + else +@@ -30310,9 +27948,7 @@ + fi --#undef connect --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char connect (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_connect || defined __stub___connect --choke me --#endif -+REBUILD_PNGS= -+if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then -+ REBUILD_PNGS=# -+fi - --int --main () --{ --return connect (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_connect=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_connect=no +- +- +-if test $cross_compiling = yes; then + if test $cross_compiling = yes; then -+ CROSS_COMPILING_TRUE= -+ CROSS_COMPILING_FALSE='#' -+else -+ CROSS_COMPILING_TRUE='#' -+ CROSS_COMPILING_FALSE= - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 --$as_echo "$ac_cv_func_connect" >&6; } - -- if test $ac_cv_func_connect = no; then -- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 --$as_echo_n "checking for connect in -lsocket... " >&6; } --if test "${ac_cv_lib_socket_connect+set}" = set; then -- $as_echo_n "(cached) " >&6 -+if test $cross_compiling = yes; then -+ # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. -+set dummy gdk-pixbuf-csource; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 + CROSS_COMPILING_TRUE= + CROSS_COMPILING_FALSE='#' else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lsocket $X_EXTRA_LIBS $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ case $GDK_PIXBUF_CSOURCE in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GDK_PIXBUF_CSOURCE="$GDK_PIXBUF_CSOURCE" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char connect (); --int --main () --{ --return connect (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+ test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" -+ ;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_socket_connect=yes -+fi -+GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE -+if test -n "$GDK_PIXBUF_CSOURCE"; then -+ { echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 -+echo "${ECHO_T}$GDK_PIXBUF_CSOURCE" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_socket_connect=no -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --rm -rf conftest.dSYM --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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 --$as_echo "$ac_cv_lib_socket_connect" >&6; } --if test "x$ac_cv_lib_socket_connect" = x""yes; then -- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" --fi - -- fi -+ # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. -+set dummy gtk-update-icon-cache; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $GTK_UPDATE_ICON_CACHE in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GTK_UPDATE_ICON_CACHE="$GTK_UPDATE_ICON_CACHE" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS - -- # Guillermo Gomez says -lposix is necessary on A/UX. -- { $as_echo "$as_me:$LINENO: checking for remove" >&5 --$as_echo_n "checking for remove... " >&6; } --if test "${ac_cv_func_remove+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" && ac_cv_path_GTK_UPDATE_ICON_CACHE="no" -+ ;; -+esac -+fi -+GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE -+if test -n "$GTK_UPDATE_ICON_CACHE"; then -+ { echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 -+echo "${ECHO_T}$GTK_UPDATE_ICON_CACHE" >&6; } - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define remove to an innocuous variant, in case <limits.h> declares remove. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define remove innocuous_remove -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char remove (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ - --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -+ if test x$GTK_UPDATE_ICON_CACHE = xno; then -+ REBUILD_PNGS=# -+ fi -+fi - --#undef remove -+if test ! -f $srcdir/gtk/gtkbuiltincache.h && -+ test "x$REBUILD_PNGS" = "x#" ; then -+ { { echo "$as_me:$LINENO: error: -+*** gtkbuiltincache.h is not in the tree, and cannot be built -+*** because you don't have libpng, or (when cross-compiling) you -+*** don't have a prebuilt gtk-update-icon-cache on the build system." >&5 -+echo "$as_me: error: -+*** gtkbuiltincache.h is not in the tree, and cannot be built -+*** because you don't have libpng, or (when cross-compiling) you -+*** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} -+ { (exit 1); exit 1; }; } -+fi - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char remove (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_remove || defined __stub___remove --choke me --#endif - --int --main () --{ --return remove (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_remove=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_remove=no --fi -+GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" -+GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" -+GDK_PIXBUF_EXTRA_CFLAGS= -+GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -+GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 --$as_echo "$ac_cv_func_remove" >&6; } -+######################################## -+# Windowing system checks -+######################################## - -- if test $ac_cv_func_remove = no; then -- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 --$as_echo_n "checking for remove in -lposix... " >&6; } --if test "${ac_cv_lib_posix_remove+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lposix $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+GDK_PIXBUF_XLIB_PACKAGES= -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS= -+GDK_PIXBUF_XLIB_EXTRA_LIBS= - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char remove (); --int --main () --{ --return remove (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_posix_remove=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+X_PACKAGES=fontconfig -+GDK_EXTRA_LIBS="$GDK_WLIBS" -+GDK_EXTRA_CFLAGS= - -- ac_cv_lib_posix_remove=no --fi -+# GTK+ uses some X calls, so needs to link against X directly -+GTK_DEP_PACKAGES_FOR_X= -+GTK_DEP_LIBS_FOR_X= - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+if test "x$gdktarget" = "xx11"; then -+ # -+ # We use fontconfig very peripherally when decoding the default -+ # settings. -+ # -+ if $PKG_CONFIG --exists fontconfig; then : ; else -+ { { echo "$as_me:$LINENO: error: -+*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&5 -+echo "$as_me: error: -+*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ -+ # -+ # Check for basic X packages; we use pkg-config if available -+ # -+ if $PKG_CONFIG --exists x11 xext xrender; then -+ have_base_x_pc=true -+ X_PACKAGES="$X_PACKAGES x11 xext xrender" -+ x_libs="`$PKG_CONFIG --libs x11 xext xrender`" -+ X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`" -+ -+ # Strip out any .la files that pkg-config might give us (this happens -+ # with -uninstalled.pc files) -+ x_libs_for_checks= -+ for I in $x_libs ; do -+ case $I in -+ *.la) ;; -+ *) x_libs_for_checks="$x_libs_for_checks $I" ;; -+ esac -+ done -+ -+ GDK_PIXBUF_XLIB_PACKAGES="x11" -+ GTK_PACKAGES_FOR_X="x11" -+ else -+ have_base_x_pc=false -+ { echo "$as_me:$LINENO: checking for X" >&5 -+echo $ECHO_N "checking for X... $ECHO_C" >&6; } -+ -+ -+# Check whether --with-x was given. -+if test "${with_x+set}" = set; then -+ withval=$with_x; - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 --$as_echo "$ac_cv_lib_posix_remove" >&6; } --if test "x$ac_cv_lib_posix_remove" = x""yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -+ -+# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -+if test "x$with_x" = xno; then -+ # The user explicitly disabled X. -+ have_x=disabled -+else -+ case $x_includes,$x_libraries in #( -+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 -+echo "$as_me: error: Cannot use X directory names containing '" >&2;} -+ { (exit 1); exit 1; }; };; #( -+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # One or both of the vars are not set, and there is no cached value. -+ac_x_includes=no ac_x_libraries=no -+rm -f -r conftest.dir -+if mkdir conftest.dir; then -+ cd conftest.dir -+ cat >Imakefile <<'_ACEOF' -+incroot: -+ @echo incroot='${INCROOT}' -+usrlibdir: -+ @echo usrlibdir='${USRLIBDIR}' -+libdir: -+ @echo libdir='${LIBDIR}' -+_ACEOF -+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then -+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+ for ac_var in incroot usrlibdir libdir; do -+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" -+ done -+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -+ for ac_extension in a so sl; do -+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && -+ test -f "$ac_im_libdir/libX11.$ac_extension"; then -+ ac_im_usrlibdir=$ac_im_libdir; break -+ fi -+ done -+ # Screen out bogus values from the imake configuration. They are -+ # bogus both because they are the default anyway, and because -+ # using them would break gcc on systems where it needs fixed includes. -+ case $ac_im_incroot in -+ /usr/include) ac_x_includes= ;; -+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; -+ esac -+ case $ac_im_usrlibdir in -+ /usr/lib | /lib) ;; -+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; -+ esac -+ fi -+ cd .. -+ rm -f -r conftest.dir - fi - -- fi -+# Standard set of common directories for X headers. -+# Check X11 before X11Rn because it is often a symlink to the current release. -+ac_x_header_dirs=' -+/usr/X11/include -+/usr/X11R6/include -+/usr/X11R5/include -+/usr/X11R4/include - -- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -- { $as_echo "$as_me:$LINENO: checking for shmat" >&5 --$as_echo_n "checking for shmat... " >&6; } --if test "${ac_cv_func_shmat+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -+/usr/include/X11 -+/usr/include/X11R6 -+/usr/include/X11R5 -+/usr/include/X11R4 -+ -+/usr/local/X11/include -+/usr/local/X11R6/include -+/usr/local/X11R5/include -+/usr/local/X11R4/include -+ -+/usr/local/include/X11 -+/usr/local/include/X11R6 -+/usr/local/include/X11R5 -+/usr/local/include/X11R4 -+ -+/usr/X386/include -+/usr/x386/include -+/usr/XFree86/include/X11 -+ -+/usr/include -+/usr/local/include -+/usr/unsupported/include -+/usr/athena/include -+/usr/local/x11r5/include -+/usr/lpp/Xamples/include -+ -+/usr/openwin/include -+/usr/openwin/share/include' -+ -+if test "$ac_x_includes" = no; then -+ # Guess where to find include files, by looking for Xlib.h. -+ # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ +@@ -32475,9 +30111,7 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define shmat to an innocuous variant, in case <limits.h> declares shmat. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define shmat innocuous_shmat -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char shmat (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef shmat -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char shmat (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_shmat || defined __stub___shmat --choke me --#endif -- --int --main () --{ --return shmat (); -- ; -- return 0; --} -+#include <X11/Xlib.h> - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext - }; then -- ac_cv_func_shmat=yes -+ # We can compile using X headers with no special include directory. -+ac_x_includes= - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -- ac_cv_func_shmat=no -+ for ac_dir in $ac_x_header_dirs; do -+ if test -r "$ac_dir/X11/Xlib.h"; then -+ ac_x_includes=$ac_dir -+ break -+ fi -+done - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 --$as_echo "$ac_cv_func_shmat" >&6; } -+rm -f conftest.err conftest.$ac_ext -+fi # $ac_x_includes = no - -- if test $ac_cv_func_shmat = no; then -- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 --$as_echo_n "checking for shmat in -lipc... " >&6; } --if test "${ac_cv_lib_ipc_shmat+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lipc $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+if test "$ac_x_libraries" = no; then -+ # Check for the libraries. -+ # See if we find them without any special options. -+ # Don't add to $LIBS permanently. -+ ac_save_LIBS=$LIBS -+ LIBS="-lX11 $LIBS" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char shmat (); -+#include <X11/Xlib.h> - int - main () - { --return shmat (); -+XrmInitialize () - ; - return 0; - } -@@ -28557,77 +30995,150 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_ipc_shmat=yes -+ } && 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= - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_ipc_shmat=no -+ LIBS=$ac_save_LIBS -+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -+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/libX11.$ac_extension"; then -+ ac_x_libraries=$ac_dir -+ break 2 -+ fi -+ done -+done - fi - --rm -rf conftest.dSYM - 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 # $ac_x_libraries = no -+ -+case $ac_x_includes,$ac_x_libraries in #( -+ no,* | *,no | *\'*) -+ # Didn't find X, or a directory has "'" in its name. -+ ac_cv_have_x="have_x=no";; #( -+ *) -+ # Record where we found X for the cache. -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$ac_x_includes'\ -+ ac_x_libraries='$ac_x_libraries'" -+esac - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 --$as_echo "$ac_cv_lib_ipc_shmat" >&6; } --if test "x$ac_cv_lib_ipc_shmat" = x""yes; then -- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -+;; #( -+ *) have_x=yes;; -+ esac -+ eval "$ac_cv_have_x" -+fi # $with_x != no -+ -+if test "$have_x" != yes; then -+ { echo "$as_me:$LINENO: result: $have_x" >&5 -+echo "${ECHO_T}$have_x" >&6; } -+ no_x=yes -+else -+ # If each of the values was on the command line, it overrides each guess. -+ test "x$x_includes" = xNONE && x_includes=$ac_x_includes -+ test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries -+ # Update the cache value to reflect the command line values. -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$x_includes'\ -+ ac_x_libraries='$x_libraries'" -+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } - fi - -- fi -+if test "$no_x" = yes; then -+ # Not all programs may use this symbol, but it does not hurt to define it. -+ -+cat >>confdefs.h <<\_ACEOF -+#define X_DISPLAY_MISSING 1 -+_ACEOF -+ -+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -+else -+ if test -n "$x_includes"; then -+ X_CFLAGS="$X_CFLAGS -I$x_includes" fi - -- # Check for libraries that X11R6 Xt/Xaw programs need. -- ac_save_LDFLAGS=$LDFLAGS -- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" -- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -- # check for ICE first), but we must link in the order -lSM -lICE or -- # we get undefined symbols. So assume we have SM if we have ICE. -- # These have to be linked with before -lX11, unlike the other -- # libraries we check for below, so use a different variable. -- # John Interrante, Karl Berry -- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 --$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } --if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ # It would also be nice to do this for all -L options, not just this one. -+ if test -n "$x_libraries"; then -+ 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 . . . . -+ { 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" -+ 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 -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lICE $X_EXTRA_LIBS $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ LIBS="$ac_xsave_LIBS -R $x_libraries" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char IceConnectionNumber (); - int - main () - { --return IceConnectionNumber (); -+ - ; - return 0; - } -@@ -28638,97 +31149,56 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_ICE_IceConnectionNumber=yes -+ } && 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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_ICE_IceConnectionNumber=no -+ { echo "$as_me:$LINENO: result: neither works" >&5 -+echo "${ECHO_T}neither works" >&6; } - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 --$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } --if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then -- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" - fi - -- LDFLAGS=$ac_save_LDFLAGS -- --fi -- -- if test x$no_x = xyes ; then -- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5 --$as_echo "$as_me: error: X development libraries not found" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- x_cflags="$X_CFLAGS" -- x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS" -- -- GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags" -- GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" -- GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS" -+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 - -- # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. -- x_extra_libs= -- -- gtk_save_cppflags="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $X_CFLAGS" -- -- gtk_save_LIBS=$LIBS -- LIBS="$x_libs_for_checks $LIBS" -+ # Check for system-dependent libraries X programs must link with. -+ # Do this before checking for the system-independent R6 libraries -+ # (-lICE), since we may need -lsocket or whatever for X linking. - -- # Sanity check for the X11 and Xext libraries. While everything we need from -- # Xext is optional, the chances a system has *none* of these things is so -- # small that we just unconditionally require it. -- { $as_echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 --$as_echo_n "checking for XOpenDisplay... " >&6; } --if test "${ac_cv_func_XOpenDisplay+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF -+ if test "$ISC" = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" -+ else -+ # Martyn Johnson says this is needed for Ultrix, if the X -+ # libraries were built with DECnet support. And Karl Berry says -+ # the Alpha needs dnet_stub (dnet does not exist). -+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define XOpenDisplay to an innocuous variant, in case <limits.h> declares XOpenDisplay. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define XOpenDisplay innocuous_XOpenDisplay -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char XOpenDisplay (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef XOpenDisplay - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -28737,13 +31207,6 @@ - extern "C" - #endif - char XOpenDisplay (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_XOpenDisplay || defined __stub___XOpenDisplay --choke me --#endif -- - int - main () - { -@@ -28758,70 +31221,36 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_XOpenDisplay=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_func_XOpenDisplay=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 --$as_echo "$ac_cv_func_XOpenDisplay" >&6; } --if test "x$ac_cv_func_XOpenDisplay" = x""yes; then -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - : - else -- { { $as_echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 --$as_echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- { $as_echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 --$as_echo_n "checking for XextFindDisplay... " >&6; } --if test "${ac_cv_func_XextFindDisplay+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } -+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldnet $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define XextFindDisplay to an innocuous variant, in case <limits.h> declares XextFindDisplay. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define XextFindDisplay innocuous_XextFindDisplay -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char XextFindDisplay (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef XextFindDisplay - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -28829,18 +31258,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char XextFindDisplay (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_XextFindDisplay || defined __stub___XextFindDisplay --choke me --#endif -- -+char dnet_ntoa (); - int - main () - { --return XextFindDisplay (); -+return dnet_ntoa (); - ; - return 0; - } -@@ -28851,60 +31273,134 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_XextFindDisplay=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_dnet_dnet_ntoa=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_XextFindDisplay=no -+ ac_cv_lib_dnet_dnet_ntoa=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5 --$as_echo "$ac_cv_func_XextFindDisplay" >&6; } --if test "x$ac_cv_func_XextFindDisplay" = x""yes; then -- : --else -- { { $as_echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 --$as_echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } -+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" - fi - -- { $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 --$as_echo_n "checking for XRenderQueryExtension... " >&6; } --if test "${ac_cv_func_XRenderQueryExtension+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then -+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } -+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldnet_stub $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define XRenderQueryExtension to an innocuous variant, in case <limits.h> declares XRenderQueryExtension. -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dnet_ntoa (); -+int -+main () -+{ -+return dnet_ntoa (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dnet_stub_dnet_ntoa=no -+fi -+ -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -+if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -+fi -+ -+ fi -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$ac_xsave_LIBS" -+ -+ # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, -+ # to get the SysV transport functions. -+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) -+ # needs -lnsl. -+ # The nsl library prevents programs from opening the X display -+ # on Irix 5.2, according to T.E. Dickey. -+ # The functions gethostbyname, getservbyname, and inet_addr are -+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. -+ { echo "$as_me:$LINENO: checking for gethostbyname" >&5 -+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } -+if test "${ac_cv_func_gethostbyname+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define XRenderQueryExtension innocuous_XRenderQueryExtension -+#define gethostbyname innocuous_gethostbyname - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char XRenderQueryExtension (); below. -+ which can conflict with char gethostbyname (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -@@ -28914,7 +31410,7 @@ - # include <assert.h> - #endif - --#undef XRenderQueryExtension -+#undef gethostbyname - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -28922,18 +31418,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char XRenderQueryExtension (); -+char gethostbyname (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined __stub_XRenderQueryExtension || defined __stub___XRenderQueryExtension -+#if defined __stub_gethostbyname || defined __stub___gethostbyname - choke me - #endif - - int - main () - { --return XRenderQueryExtension (); -+return gethostbyname (); - ; - return 0; - } -@@ -28944,155 +31440,178 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_XRenderQueryExtension=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_gethostbyname=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_XRenderQueryExtension=no -+ ac_cv_func_gethostbyname=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 --$as_echo "$ac_cv_func_XRenderQueryExtension" >&6; } --if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then -- : --else -- { { $as_echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 --$as_echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -- -- -- # Check for xReply -+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } - -- { $as_echo "$as_me:$LINENO: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5 --$as_echo_n "checking if <X11/extensions/XIproto.h> is needed for xReply... " >&6; } -- cat >conftest.$ac_ext <<_ACEOF -+ if test $ac_cv_func_gethostbyname = no; then -+ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } -+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnsl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <X11/Xlibint.h> -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (); - int - main () - { --xReply *rep; -+return gethostbyname (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_nsl_gethostbyname=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- cat >conftest.$ac_ext <<_ACEOF -+ ac_cv_lib_nsl_gethostbyname=no -+fi -+ -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } -+if test $ac_cv_lib_nsl_gethostbyname = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -+fi -+ -+ if test $ac_cv_lib_nsl_gethostbyname = no; then -+ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } -+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lbsd $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <X11/extensions/XIproto.h> --#include <X11/Xlibint.h> -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostbyname (); - int - main () - { --xReply *rep; -+return gethostbyname (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- --cat >>confdefs.h <<\_ACEOF --#define NEED_XIPROTO_H_FOR_XREPLY 1 --_ACEOF -- -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_bsd_gethostbyname=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { $as_echo "$as_me:$LINENO: result: unknown" >&5 --$as_echo "unknown" >&6; } -- { { $as_echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 --$as_echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} -- { (exit 1); exit 1; }; } -+ ac_cv_lib_bsd_gethostbyname=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } -+if test $ac_cv_lib_bsd_gethostbyname = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- -- # Check for XConvertCase, XInternAtoms (X11R6 specific) -- -- -+ fi -+ fi - --for ac_func in XConvertCase XInternAtoms --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ # lieder@skyler.mavd.honeywell.com says without -lsocket, -+ # socket/setsockopt and other routines are undefined under SCO ODT -+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary -+ # on later versions), says Simon Leinen: it contains gethostby* -+ # variants that don't use the name server (or something). -lsocket -+ # must be given before -lnsl if both are needed. We assume that -+ # if connect needs -lnsl, so does gethostbyname. -+ { echo "$as_me:$LINENO: checking for connect" >&5 -+echo $ECHO_N "checking for connect... $ECHO_C" >&6; } -+if test "${ac_cv_func_connect+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -29100,12 +31619,12 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+/* Define connect to an innocuous variant, in case <limits.h> declares connect. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -+#define connect innocuous_connect - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -+ which can conflict with char connect (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -@@ -29115,7 +31634,7 @@ - # include <assert.h> - #endif - --#undef $ac_func -+#undef connect - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -29123,18 +31642,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char $ac_func (); -+char connect (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func -+#if defined __stub_connect || defined __stub___connect - choke me - #endif - - int - main () - { --return $ac_func (); -+return connect (); - ; - return 0; - } -@@ -29145,81 +31664,46 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_connect=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- eval "$as_ac_var=no" -+ ac_cv_func_connect=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- --fi --done -- -+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -+echo "${ECHO_T}$ac_cv_func_connect" >&6; } - -- # Generic X11R6 check needed for XIM support; we could -- # probably use this to replace the above, but we'll -- # leave the separate checks for XConvertCase and XInternAtoms -- # for clarity -- -- have_x11r6=false -- { $as_echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 --$as_echo_n "checking for XAddConnectionWatch... " >&6; } --if test "${ac_cv_func_XAddConnectionWatch+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ if test $ac_cv_func_connect = no; then -+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } -+if test "${ac_cv_lib_socket_connect+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define XAddConnectionWatch to an innocuous variant, in case <limits.h> declares XAddConnectionWatch. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define XAddConnectionWatch innocuous_XAddConnectionWatch -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char XAddConnectionWatch (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef XAddConnectionWatch - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -29227,18 +31711,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char XAddConnectionWatch (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_XAddConnectionWatch || defined __stub___XAddConnectionWatch --choke me --#endif -- -+char connect (); - int - main () - { --return XAddConnectionWatch (); -+return connect (); - ; - return 0; - } -@@ -29249,73 +31726,43 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_XAddConnectionWatch=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_socket_connect=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_XAddConnectionWatch=no -+ ac_cv_lib_socket_connect=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 --$as_echo "$ac_cv_func_XAddConnectionWatch" >&6; } --if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then -- have_x11r6=true --fi -- -- -- if $have_x11r6; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_X11R6 1 --_ACEOF -- -- fi - - -if $have_x11r6; then -- HAVE_X11R6_TRUE= -- HAVE_X11R6_FALSE='#' --else -- HAVE_X11R6_TRUE='#' -- HAVE_X11R6_FALSE= -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } -+if test $ac_cv_lib_socket_connect = yes; then -+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" - fi - -+ fi - -- # Check for XKB support. -- -- if test "x$enable_xkb" = "xyes"; then -- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 --$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_XKB 1 --_ACEOF -- -- elif test "x$enable_xkb" = "xmaybe"; then -- { $as_echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 --$as_echo_n "checking for XkbQueryExtension... " >&6; } --if test "${ac_cv_func_XkbQueryExtension+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ # Guillermo Gomez says -lposix is necessary on A/UX. -+ { echo "$as_me:$LINENO: checking for remove" >&5 -+echo $ECHO_N "checking for remove... $ECHO_C" >&6; } -+if test "${ac_cv_func_remove+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -29323,12 +31770,12 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define XkbQueryExtension to an innocuous variant, in case <limits.h> declares XkbQueryExtension. -+/* Define remove to an innocuous variant, in case <limits.h> declares remove. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define XkbQueryExtension innocuous_XkbQueryExtension -+#define remove innocuous_remove - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char XkbQueryExtension (); below. -+ which can conflict with char remove (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -@@ -29338,7 +31785,7 @@ - # include <assert.h> - #endif - --#undef XkbQueryExtension -+#undef remove - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -29346,18 +31793,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char XkbQueryExtension (); -+char remove (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined __stub_XkbQueryExtension || defined __stub___XkbQueryExtension -+#if defined __stub_remove || defined __stub___remove - choke me - #endif - - int - main () - { --return XkbQueryExtension (); -+return remove (); - ; - return 0; - } -@@ -29368,77 +31815,46 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_XkbQueryExtension=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_remove=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_XkbQueryExtension=no -+ ac_cv_func_remove=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5 --$as_echo "$ac_cv_func_XkbQueryExtension" >&6; } --if test "x$ac_cv_func_XkbQueryExtension" = x""yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_XKB 1 --_ACEOF -- --fi -- -- else -- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 --$as_echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} -- fi -- -- # Check for shaped window extension -+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -+echo "${ECHO_T}$ac_cv_func_remove" >&6; } - -- { $as_echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 --$as_echo_n "checking for XShapeCombineMask... " >&6; } --if test "${ac_cv_func_XShapeCombineMask+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ if test $ac_cv_func_remove = no; then -+ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } -+if test "${ac_cv_lib_posix_remove+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lposix $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define XShapeCombineMask to an innocuous variant, in case <limits.h> declares XShapeCombineMask. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define XShapeCombineMask innocuous_XShapeCombineMask -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char XShapeCombineMask (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef XShapeCombineMask - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -29446,18 +31862,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char XShapeCombineMask (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_XShapeCombineMask || defined __stub___XShapeCombineMask --choke me --#endif -- -+char remove (); - int - main () - { --return XShapeCombineMask (); -+return remove (); - ; - return 0; - } -@@ -29468,52 +31877,43 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_XShapeCombineMask=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_posix_remove=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_XShapeCombineMask=no -+ ac_cv_lib_posix_remove=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 --$as_echo "$ac_cv_func_XShapeCombineMask" >&6; } --if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_SHAPE_EXT 1 --_ACEOF -- -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } -+if test $ac_cv_lib_posix_remove = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" - fi - -+ fi - -- # X SYNC check -- gtk_save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $x_cflags" -- -- { $as_echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 --$as_echo_n "checking for XSyncQueryExtension... " >&6; } --if test "${ac_cv_func_XSyncQueryExtension+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -+ { echo "$as_me:$LINENO: checking for shmat" >&5 -+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } -+if test "${ac_cv_func_shmat+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -29521,12 +31921,12 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define XSyncQueryExtension to an innocuous variant, in case <limits.h> declares XSyncQueryExtension. -+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define XSyncQueryExtension innocuous_XSyncQueryExtension -+#define shmat innocuous_shmat - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char XSyncQueryExtension (); below. -+ which can conflict with char shmat (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -@@ -29536,7 +31936,7 @@ - # include <assert.h> - #endif - --#undef XSyncQueryExtension -+#undef shmat - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -29544,18 +31944,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char XSyncQueryExtension (); -+char shmat (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined __stub_XSyncQueryExtension || defined __stub___XSyncQueryExtension -+#if defined __stub_shmat || defined __stub___shmat - choke me - #endif - - int - main () - { --return XSyncQueryExtension (); -+return shmat (); - ; - return 0; - } -@@ -29566,128 +31966,123 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_XSyncQueryExtension=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_shmat=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_XSyncQueryExtension=no -+ ac_cv_func_shmat=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 --$as_echo "$ac_cv_func_XSyncQueryExtension" >&6; } --if test "x$ac_cv_func_XSyncQueryExtension" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 --$as_echo_n "checking for X11/extensions/sync.h... " >&6; } --if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -+echo "${ECHO_T}$ac_cv_func_shmat" >&6; } -+ -+ if test $ac_cv_func_shmat = no; then -+ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } -+if test "${ac_cv_lib_ipc_shmat+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lipc $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <X11/Xlib.h> - --#include <X11/extensions/sync.h> -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shmat (); -+int -+main () -+{ -+return shmat (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_ipc_shmat=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_header_X11_extensions_sync_h=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cv_lib_ipc_shmat=no - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 --$as_echo "$ac_cv_header_X11_extensions_sync_h" >&6; } --if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_XSYNC 1 --_ACEOF - --else -- : -+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 -- -- -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } -+if test $ac_cv_lib_ipc_shmat = yes; then -+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" - fi - -+ fi -+ fi - -- CFLAGS="$gtk_save_CFLAGS" -- -- # Xshm checks -- -- if test "x$enable_shm" = "xyes"; then -- # Check for the XShm extension, normally in Xext -- { $as_echo "$as_me:$LINENO: checking for XShmAttach" >&5 --$as_echo_n "checking for XShmAttach... " >&6; } --if test "${ac_cv_func_XShmAttach+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ # Check for libraries that X11R6 Xt/Xaw programs need. -+ ac_save_LDFLAGS=$LDFLAGS -+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" -+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to -+ # check for ICE first), but we must link in the order -lSM -lICE or -+ # we get undefined symbols. So assume we have SM if we have ICE. -+ # These have to be linked with before -lX11, unlike the other -+ # libraries we check for below, so use a different variable. -+ # John Interrante, Karl Berry -+ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } -+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lICE $X_EXTRA_LIBS $LIBS" -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define XShmAttach to an innocuous variant, in case <limits.h> declares XShmAttach. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define XShmAttach innocuous_XShmAttach -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char XShmAttach (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef XShmAttach - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -29695,18 +32090,11 @@ - #ifdef __cplusplus - extern "C" - #endif --char XShmAttach (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_XShmAttach || defined __stub___XShmAttach --choke me --#endif -- -+char IceConnectionNumber (); - int - main () - { --return XShmAttach (); -+return IceConnectionNumber (); - ; - return 0; - } -@@ -29717,52 +32105,93 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_XShmAttach=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_ICE_IceConnectionNumber=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_XShmAttach=no -+ ac_cv_lib_ICE_IceConnectionNumber=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 --$as_echo "$ac_cv_func_XShmAttach" >&6; } --if test "x$ac_cv_func_XShmAttach" = x""yes; then -- : --else -- # On AIX, it is in XextSam instead -- { $as_echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 --$as_echo_n "checking for XShmAttach in -lXextSam... " >&6; } --if test "${ac_cv_lib_XextSam_XShmAttach+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lXextSam $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then -+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -+fi -+ -+ LDFLAGS=$ac_save_LDFLAGS -+ -+fi -+ -+ if test x$no_x = xyes ; then -+ { { echo "$as_me:$LINENO: error: X development libraries not found" >&5 -+echo "$as_me: error: X development libraries not found" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ -+ x_cflags="$X_CFLAGS" -+ x_libs_for_checks="$X_LIBS -lXext -lXrender -lX11 $X_EXTRA_LIBS" -+ -+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS="$x_cflags" -+ GDK_PIXBUF_XLIB_EXTRA_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" -+ GTK_DEP_LIBS_FOR_X="$X_LIBS -lXrender -lX11 $X_EXTRA_LIBS" -+ fi -+ -+ # Extra libraries found during checks (-lXinerama, etc), not from pkg-config. -+ x_extra_libs= -+ -+ gtk_save_cppflags="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $X_CFLAGS" -+ -+ gtk_save_LIBS=$LIBS -+ LIBS="$x_libs_for_checks $LIBS" -+ -+ # Sanity check for the X11 and Xext libraries. While everything we need from -+ # Xext is optional, the chances a system has *none* of these things is so -+ # small that we just unconditionally require it. -+ { echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 -+echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6; } -+if test "${ac_cv_func_XOpenDisplay+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define XOpenDisplay to an innocuous variant, in case <limits.h> declares XOpenDisplay. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define XOpenDisplay innocuous_XOpenDisplay -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char XOpenDisplay (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef XOpenDisplay - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -29770,11 +32199,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char XShmAttach (); -+char XOpenDisplay (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_XOpenDisplay || defined __stub___XOpenDisplay -+choke me -+#endif -+ - int - main () - { --return XShmAttach (); -+return XOpenDisplay (); - ; - return 0; - } -@@ -29785,213 +32221,236 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_XextSam_XShmAttach=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_XOpenDisplay=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_XextSam_XShmAttach=no -+ ac_cv_func_XOpenDisplay=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 --$as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } --if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then -- case "$x_extra_libs " in -- *-lXextSam[\ \ ]*) ;; -- *) x_extra_libs="-lXextSam $x_extra_libs" ;; -- esac -- - fi -- -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 -+echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6; } -+if test $ac_cv_func_XOpenDisplay = yes; then -+ : -+else -+ { { echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 -+echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } - fi - -- fi -- -- if test "x$enable_shm" = "xyes"; then -- # Check for shared memory -- if test "${ac_cv_header_sys_ipc_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 --$as_echo_n "checking for sys/ipc.h... " >&6; } --if test "${ac_cv_header_sys_ipc_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 --$as_echo "$ac_cv_header_sys_ipc_h" >&6; } -+ { echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 -+echo $ECHO_N "checking for XextFindDisplay... $ECHO_C" >&6; } -+if test "${ac_cv_func_XextFindDisplay+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 --$as_echo_n "checking sys/ipc.h usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <sys/ipc.h> -+/* Define XextFindDisplay to an innocuous variant, in case <limits.h> declares XextFindDisplay. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define XextFindDisplay innocuous_XextFindDisplay -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char XextFindDisplay (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef XextFindDisplay -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XextFindDisplay (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_XextFindDisplay || defined __stub___XextFindDisplay -+choke me -+#endif -+ -+int -+main () -+{ -+return XextFindDisplay (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_XextFindDisplay=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+ ac_cv_func_XextFindDisplay=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+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 -+echo "${ECHO_T}$ac_cv_func_XextFindDisplay" >&6; } -+if test $ac_cv_func_XextFindDisplay = yes; then -+ : -+else -+ { { echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 -+echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+fi - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 --$as_echo_n "checking sys/ipc.h presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ { echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 -+echo $ECHO_N "checking for XRenderQueryExtension... $ECHO_C" >&6; } -+if test "${ac_cv_func_XRenderQueryExtension+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <sys/ipc.h> -+/* Define XRenderQueryExtension to an innocuous variant, in case <limits.h> declares XRenderQueryExtension. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define XRenderQueryExtension innocuous_XRenderQueryExtension -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char XRenderQueryExtension (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef XRenderQueryExtension -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XRenderQueryExtension (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_XRenderQueryExtension || defined __stub___XRenderQueryExtension -+choke me -+#endif -+ -+int -+main () -+{ -+return XRenderQueryExtension (); -+ ; -+ return 0; -+} - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- }; then -- ac_header_preproc=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_XRenderQueryExtension=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no --fi -- --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 --$as_echo_n "checking for sys/ipc.h... " >&6; } --if test "${ac_cv_header_sys_ipc_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_header_sys_ipc_h=$ac_header_preproc -+ ac_cv_func_XRenderQueryExtension=no - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 --$as_echo "$ac_cv_header_sys_ipc_h" >&6; } - -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi --if test "x$ac_cv_header_sys_ipc_h" = x""yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_IPC_H 1 --_ACEOF -- -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_func_XRenderQueryExtension" >&6; } -+if test $ac_cv_func_XRenderQueryExtension = yes; then -+ : - else -- no_sys_ipc=yes -+ { { echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 -+echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } - fi - - -- if test "${ac_cv_header_sys_shm_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 --$as_echo_n "checking for sys/shm.h... " >&6; } --if test "${ac_cv_header_sys_shm_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 --$as_echo "$ac_cv_header_sys_shm_h" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 --$as_echo_n "checking sys/shm.h usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ # Check for xReply -+ -+ { echo "$as_me:$LINENO: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5 -+echo $ECHO_N "checking if <X11/extensions/XIproto.h> is needed for xReply... $ECHO_C" >&6; } -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <sys/shm.h> -+#include <X11/Xlibint.h> -+int -+main () -+{ -+xReply *rep; -+ ; -+ return 0; -+} - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -29999,151 +32458,35 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 --$as_echo_n "checking sys/shm.h presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/shm.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no --fi -- --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 --$as_echo_n "checking for sys/shm.h... " >&6; } --if test "${ac_cv_header_sys_shm_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_header_sys_shm_h=$ac_header_preproc --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 --$as_echo "$ac_cv_header_sys_shm_h" >&6; } -- --fi --if test "x$ac_cv_header_sys_shm_h" = x""yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_SHM_H 1 --_ACEOF -- --else -- no_sys_shm=yes --fi -- -- -- -- # Check for the X shared memory extension header file -- have_xshm=no -- { $as_echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 --$as_echo_n "checking X11/extensions/XShm.h... " >&6; } -- if test "x$no_xext_lib" = "xyes"; then -- : -- else -- gtk_save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $x_cflags" -- cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --#include <stdlib.h> --#include <sys/types.h> --#include <sys/ipc.h> --#include <sys/shm.h> --#include <X11/Xlib.h> --#include <X11/Xutil.h> --#include <X11/extensions/XShm.h> -- -+#include <X11/extensions/XIproto.h> -+#include <X11/Xlibint.h> - int - main () - { --XShmSegmentInfo *x_shm_info; -+xReply *rep; - ; - return 0; - } -@@ -30154,56 +32497,51 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- have_xshm=yes -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ -+cat >>confdefs.h <<\_ACEOF -+#define NEED_XIPROTO_H_FOR_XREPLY 1 -+_ACEOF -+ - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- -+ { echo "$as_me:$LINENO: result: unknown" >&5 -+echo "${ECHO_T}unknown" >&6; } -+ { { echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 -+echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} -+ { (exit 1); exit 1; }; } - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$gtk_save_CFLAGS" -- fi -- { $as_echo "$as_me:$LINENO: result: $have_xshm" >&5 --$as_echo "$have_xshm" >&6; } -- if test $have_xshm = yes ; then -+fi - --cat >>confdefs.h <<\_ACEOF --#define HAVE_XSHM_H 1 --_ACEOF -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -- fi -- fi -+ # Check for XConvertCase, XInternAtoms (X11R6 specific) - -- if test "x$enable_xinerama" = "xyes"; then -- # Check for Xinerama extension (Solaris impl or Xfree impl) -- gtk_save_cppflags="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $x_cflags" - -- case "$host" in -- *-*-solaris*) -- # Check for solaris -- { $as_echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 --$as_echo_n "checking for Xinerama support on Solaris... " >&6; } - -- have_solaris_xinerama=false -- { $as_echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 --$as_echo_n "checking for XineramaGetInfo... " >&6; } --if test "${ac_cv_func_XineramaGetInfo+set}" = set; then -- $as_echo_n "(cached) " >&6 -+for ac_func in XConvertCase XInternAtoms -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -30211,12 +32549,12 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define XineramaGetInfo to an innocuous variant, in case <limits.h> declares XineramaGetInfo. -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define XineramaGetInfo innocuous_XineramaGetInfo -+#define $ac_func innocuous_$ac_func - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char XineramaGetInfo (); below. -+ which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -@@ -30226,7 +32564,7 @@ - # include <assert.h> - #endif - --#undef XineramaGetInfo -+#undef $ac_func - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -30234,18 +32572,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char XineramaGetInfo (); -+char $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined __stub_XineramaGetInfo || defined __stub___XineramaGetInfo -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me - #endif - - int - main () - { --return XineramaGetInfo (); -+return $ac_func (); - ; - return 0; - } -@@ -30256,132 +32594,74 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_XineramaGetInfo=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_func_XineramaGetInfo=no -+ eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 --$as_echo "$ac_cv_func_XineramaGetInfo" >&6; } --if test "x$ac_cv_func_XineramaGetInfo" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 --$as_echo_n "checking for X11/extensions/xinerama.h... " >&6; } --if test "${ac_cv_header_X11_extensions_xinerama_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <X11/Xlib.h> -- --#include <X11/extensions/xinerama.h> -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_header_X11_extensions_xinerama_h=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 --$as_echo "$ac_cv_header_X11_extensions_xinerama_h" >&6; } --if test "x$ac_cv_header_X11_extensions_xinerama_h" = x""yes; then -- have_solaris_xinerama=true --else -- : --fi -- - - fi -+done - - -- if $have_solaris_xinerama ; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_SOLARIS_XINERAMA 1 --_ACEOF -- -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_XINERAMA 1 --_ACEOF -- -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- fi -- ;; -- *) -- # Check for XFree -- { $as_echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 --$as_echo_n "checking for Xinerama support on XFree86... " >&6; } -+ # Generic X11R6 check needed for XIM support; we could -+ # probably use this to replace the above, but we'll -+ # leave the separate checks for XConvertCase and XInternAtoms -+ # for clarity - -- have_xfree_xinerama=false -- if $PKG_CONFIG --exists xinerama ; then -- have_xfree_xinerama=true -- X_PACKAGES="$X_PACKAGES xinerama" -- else -- { $as_echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 --$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } --if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ have_x11r6=false -+ { echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 -+echo $ECHO_N "checking for XAddConnectionWatch... $ECHO_C" >&6; } -+if test "${ac_cv_func_XAddConnectionWatch+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lXinerama $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define XAddConnectionWatch to an innocuous variant, in case <limits.h> declares XAddConnectionWatch. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define XAddConnectionWatch innocuous_XAddConnectionWatch -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char XAddConnectionWatch (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef XAddConnectionWatch - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -30389,11 +32669,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char XineramaQueryExtension (); -+char XAddConnectionWatch (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_XAddConnectionWatch || defined __stub___XAddConnectionWatch -+choke me -+#endif -+ - int - main () - { --return XineramaQueryExtension (); -+return XAddConnectionWatch (); - ; - return 0; - } -@@ -30404,418 +32691,280 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_Xinerama_XineramaQueryExtension=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_XAddConnectionWatch=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_Xinerama_XineramaQueryExtension=no -+ ac_cv_func_XAddConnectionWatch=no - fi - --rm -rf conftest.dSYM - 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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 --$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } --if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then -- { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 --$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } --if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <X11/Xlib.h> -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 -+echo "${ECHO_T}$ac_cv_func_XAddConnectionWatch" >&6; } -+if test $ac_cv_func_XAddConnectionWatch = yes; then -+ have_x11r6=true -+fi - --#include <X11/extensions/Xinerama.h> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_header_X11_extensions_Xinerama_h=no --fi -+ if $have_x11r6; then - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 --$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } --if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then -- case "$x_extra_libs " in -- *-lXinerama[\ \ ]*) ;; -- *) x_extra_libs="-lXinerama $x_extra_libs" ;; -- esac -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_X11R6 1 -+_ACEOF - -- have_xfree_xinerama=true -+ fi + if $have_x11r6; then -+ HAVE_X11R6_TRUE= -+ HAVE_X11R6_FALSE='#' + HAVE_X11R6_TRUE= + HAVE_X11R6_FALSE='#' else -- : -+ HAVE_X11R6_TRUE='#' -+ HAVE_X11R6_FALSE= - fi +@@ -33728,9 +31362,7 @@ + fi --fi -- -- fi -+ # Check for XKB support. - -- if $have_xfree_xinerama ; then -+ if test "x$enable_xkb" = "xyes"; then -+ { echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 -+echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} - - cat >>confdefs.h <<\_ACEOF --#define HAVE_XFREE_XINERAMA 1 -+#define HAVE_XKB 1 - _ACEOF - -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_XINERAMA 1 -+ elif test "x$enable_xkb" = "xmaybe"; then -+ { echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 -+echo $ECHO_N "checking for XkbQueryExtension... $ECHO_C" >&6; } -+if test "${ac_cv_func_XkbQueryExtension+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define XkbQueryExtension to an innocuous variant, in case <limits.h> declares XkbQueryExtension. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define XkbQueryExtension innocuous_XkbQueryExtension - -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- fi -- ;; -- esac -- fi -- -- # set up things for XInput -- -- if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then -- --cat >>confdefs.h <<\_ACEOF --#define XINPUT_XFREE 1 --_ACEOF -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char XkbQueryExtension (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ - -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif - -- if $PKG_CONFIG --exists xi ; then -- X_PACKAGES="$X_PACKAGES xi" -- else -- case "$x_extra_libs " in -- *-lXi[\ \ ]*) ;; -- *) x_extra_libs="-lXi $x_extra_libs" ;; -- esac -+#undef XkbQueryExtension - -- fi -- else -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XkbQueryExtension (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_XkbQueryExtension || defined __stub___XkbQueryExtension -+choke me -+#endif - --cat >>confdefs.h <<\_ACEOF --#define XINPUT_NONE 1 -+int -+main () -+{ -+return XkbQueryExtension (); -+ ; -+ return 0; -+} - _ACEOF -- -- fi -- - - -if test x$with_xinput = xxfree || test x$with_xinput = xyes; then -- XINPUT_XFREE_TRUE= -- XINPUT_XFREE_FALSE='#' -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 ++ if test x$with_xinput = xxfree || test x$with_xinput = xyes; then + XINPUT_XFREE_TRUE= + XINPUT_XFREE_FALSE='#' else -- XINPUT_XFREE_TRUE='#' -- XINPUT_XFREE_FALSE= --fi -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 +@@ -33810,9 +31442,7 @@ + CPPFLAGS="$gtk_save_cppflags" + LIBS="$gtk_save_libs" -+ ac_cv_func_XkbQueryExtension=no -+fi +- +- +-if true; then ++ if true; then + USE_X11_TRUE= + USE_X11_FALSE='#' + else +@@ -33821,9 +31451,7 @@ + fi -- # Check for the RANDR extension -- if $PKG_CONFIG --exists "xrandr >= 1.2" ; then -+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 -+echo "${ECHO_T}$ac_cv_func_XkbQueryExtension" >&6; } -+if test $ac_cv_func_XkbQueryExtension = yes; then + else +- +- +-if false; then ++ if false; then + XINPUT_XFREE_TRUE= + XINPUT_XFREE_FALSE='#' + else +@@ -33831,9 +31459,7 @@ + XINPUT_XFREE_FALSE= + fi - cat >>confdefs.h <<\_ACEOF --#define HAVE_RANDR 1 -+#define HAVE_XKB 1 - _ACEOF +- +- +-if false; then ++ if false; then + USE_X11_TRUE= + USE_X11_FALSE='#' + else +@@ -33841,9 +31467,7 @@ + USE_X11_FALSE= + fi -+fi +- +- +-if false; then ++ if false; then + HAVE_X11R6_TRUE= + HAVE_X11R6_FALSE='#' + else +@@ -33855,9 +31479,7 @@ -- X_PACKAGES="$X_PACKAGES xrandr" -+ else -+ { echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 -+echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} + if test "x$gdktarget" = "xwin32"; then + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" +- +- +-if true; then ++ if true; then + USE_WIN32_TRUE= + USE_WIN32_FALSE='#' + else +@@ -33866,9 +31488,7 @@ + fi + + else +- +- +-if false; then ++ if false; then + USE_WIN32_TRUE= + USE_WIN32_FALSE='#' + else +@@ -33880,9 +31500,7 @@ + + if test "x$gdktarget" = "xquartz"; then + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" +- +- +-if true; then ++ if true; then + USE_QUARTZ_TRUE= + USE_QUARTZ_FALSE='#' + else +@@ -33891,9 +31509,7 @@ + fi + + else +- +- +-if false; then ++ if false; then + USE_QUARTZ_TRUE= + USE_QUARTZ_FALSE='#' + else +@@ -33913,7 +31529,7 @@ + + + if test "x$gdktarget" = "xdirectfb"; then +- DIRECTFB_REQUIRED_VERSION=0.9.24 ++ DIRECTFB_REQUIRED_VERSION=0.9.26 + { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 + $as_echo_n "checking for DirectFB... " >&6; } + +@@ -33936,9 +31552,7 @@ + { (exit 1); exit 1; }; } fi -- # Checks for Xcursor library -- -- if $PKG_CONFIG --exists xcursor ; then -+ # Check for shaped window extension - --cat >>confdefs.h <<\_ACEOF --#define HAVE_XCURSOR 1 -+ { echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 -+echo $ECHO_N "checking for XShapeCombineMask... $ECHO_C" >&6; } -+if test "${ac_cv_func_XShapeCombineMask+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define XShapeCombineMask to an innocuous variant, in case <limits.h> declares XShapeCombineMask. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define XShapeCombineMask innocuous_XShapeCombineMask - -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char XShapeCombineMask (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ - -- X_PACKAGES="$X_PACKAGES xcursor" -- fi -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif - -- # Checks for XFixes extension -+#undef XShapeCombineMask - -- if $PKG_CONFIG --exists xfixes ; then -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XShapeCombineMask (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_XShapeCombineMask || defined __stub___XShapeCombineMask -+choke me -+#endif - --cat >>confdefs.h <<\_ACEOF --#define HAVE_XFIXES 1 -+int -+main () -+{ -+return XShapeCombineMask (); -+ ; -+ return 0; -+} - _ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_cv_func_XShapeCombineMask=no -+fi - -- X_PACKAGES="$X_PACKAGES xfixes" -- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" -- fi -- -- # Checks for Xcomposite extension -- -- if $PKG_CONFIG --exists xcomposite ; then -+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 -+echo "${ECHO_T}$ac_cv_func_XShapeCombineMask" >&6; } -+if test $ac_cv_func_XShapeCombineMask = yes; then - - cat >>confdefs.h <<\_ACEOF --#define HAVE_XCOMPOSITE 1 -+#define HAVE_SHAPE_EXT 1 - _ACEOF - -+fi - -- X_PACKAGES="$X_PACKAGES xcomposite" -- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite" -- fi -- -- # Checks for Xdamage extension - -- if $PKG_CONFIG --exists xdamage ; then -+ # X SYNC check -+ gtk_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $x_cflags" - --cat >>confdefs.h <<\_ACEOF --#define HAVE_XDAMAGE 1 --_ACEOF -- -- -- X_PACKAGES="$X_PACKAGES xdamage" -- GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" -- fi -- -- if $have_base_x_pc ; then -- GDK_EXTRA_LIBS="$x_extra_libs" -- else -- GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" -- fi -- -- CPPFLAGS="$gtk_save_cppflags" -- LIBS="$gtk_save_libs" -- -- -- --if true; then -- USE_X11_TRUE= -- USE_X11_FALSE='#' --else -- USE_X11_TRUE='#' -- USE_X11_FALSE= --fi -- --else -- -- --if false; then -- XINPUT_XFREE_TRUE= -- XINPUT_XFREE_FALSE='#' --else -- XINPUT_XFREE_TRUE='#' -- XINPUT_XFREE_FALSE= --fi -- -- -- --if false; then -- USE_X11_TRUE= -- USE_X11_FALSE='#' --else -- USE_X11_TRUE='#' -- USE_X11_FALSE= --fi -- -- -- --if false; then -- HAVE_X11R6_TRUE= -- HAVE_X11R6_FALSE='#' --else -- HAVE_X11R6_TRUE='#' -- HAVE_X11R6_FALSE= --fi -- --fi -- --if test "x$gdktarget" = "xwin32"; then -- GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" - - -if true; then -- USE_WIN32_TRUE= -- USE_WIN32_FALSE='#' --else -- USE_WIN32_TRUE='#' -- USE_WIN32_FALSE= --fi -- --else -- -- --if false; then -- USE_WIN32_TRUE= -- USE_WIN32_FALSE='#' --else -- USE_WIN32_TRUE='#' -- USE_WIN32_FALSE= --fi -- --fi -- --if test "x$gdktarget" = "xquartz"; then -- GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" -- -- --if true; then -- USE_QUARTZ_TRUE= -- USE_QUARTZ_FALSE='#' --else -- USE_QUARTZ_TRUE='#' -- USE_QUARTZ_FALSE= --fi -- --else -- -- --if false; then -- USE_QUARTZ_TRUE= -- USE_QUARTZ_FALSE='#' --else -- USE_QUARTZ_TRUE='#' -- USE_QUARTZ_FALSE= --fi -- --fi -- --GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" --GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" -- -- -- -- -- -- -- --if test "x$gdktarget" = "xdirectfb"; then -- DIRECTFB_REQUIRED_VERSION=0.9.24 -- { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 --$as_echo_n "checking for DirectFB... " >&6; } -- -- if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then -- { $as_echo "$as_me:$LINENO: result: found" >&5 --$as_echo "found" >&6; } -- GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS" -- GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS" -- else -- { { $as_echo "$as_me:$LINENO: error: --*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend --*** are required. The latest version of DirectFB is always available --*** from http://www.directfb.org/. -- " >&5 --$as_echo "$as_me: error: --*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend --*** are required. The latest version of DirectFB is always available --*** from http://www.directfb.org/. -- " >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- -- --if true; then -- USE_DIRECTFB_TRUE= -- USE_DIRECTFB_FALSE='#' --else -- USE_DIRECTFB_TRUE='#' -- USE_DIRECTFB_FALSE= --fi -- --else -- -- --if false; then -- USE_DIRECTFB_TRUE= -- USE_DIRECTFB_FALSE='#' --else -- USE_DIRECTFB_TRUE='#' -- USE_DIRECTFB_FALSE= --fi -- --fi -- -- --# Check for Pango flags -- --if test "x$gdktarget" = "xwin32"; then -- PANGO_PACKAGES="pangowin32 pangocairo" --else -- PANGO_PACKAGES="pango pangocairo" --fi -- --{ $as_echo "$as_me:$LINENO: checking Pango flags" >&5 --$as_echo_n "checking Pango flags... " >&6; } --if $PKG_CONFIG --exists $PANGO_PACKAGES ; then -- PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` -- PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` -- -- { $as_echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 --$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; } --else -- { { $as_echo "$as_me:$LINENO: error: --*** Pango not found. Pango built with Cairo support is required --*** to build GTK+. See http://www.pango.org for Pango information. --" >&5 --$as_echo "$as_me: error: --*** Pango not found. Pango built with Cairo support is required --*** to build GTK+. See http://www.pango.org for Pango information. --" >&2;} -- { (exit 1); exit 1; }; } --fi -- --CFLAGS="$CFLAGS $PANGO_CFLAGS" -- --if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then -- : --else -- gtk_save_LIBS="$LIBS" -- LIBS="$PANGO_LIBS $LIBS" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+ { echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 -+echo $ECHO_N "checking for XSyncQueryExtension... $ECHO_C" >&6; } -+if test "${ac_cv_func_XSyncQueryExtension+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define XSyncQueryExtension to an innocuous variant, in case <limits.h> declares XSyncQueryExtension. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define XSyncQueryExtension innocuous_XSyncQueryExtension -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char XSyncQueryExtension (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef XSyncQueryExtension - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -30823,11 +32972,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char pango_context_new (); -+char XSyncQueryExtension (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_XSyncQueryExtension || defined __stub___XSyncQueryExtension -+choke me -+#endif -+ - int - main () - { --return pango_context_new (); -+return XSyncQueryExtension (); - ; - return 0; - } -@@ -30838,103 +32994,123 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- : -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_XSyncQueryExtension=yes ++ if true; then + USE_DIRECTFB_TRUE= + USE_DIRECTFB_FALSE='#' else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { { $as_echo "$as_me:$LINENO: error: --*** Can't link to Pango. Pango is required to build --*** GTK+. For more information see http://www.pango.org" >&5 --$as_echo "$as_me: error: --*** Can't link to Pango. Pango is required to build --*** GTK+. For more information see http://www.pango.org" >&2;} -- { (exit 1); exit 1; }; } -+ ac_cv_func_XSyncQueryExtension=no +@@ -33947,9 +31561,7 @@ fi --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -- LIBS="$gtk_save_LIBS" - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_func_XSyncQueryExtension" >&6; } -+if test $ac_cv_func_XSyncQueryExtension = yes; then -+ { echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 -+echo $ECHO_N "checking for X11/extensions/sync.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <X11/Xlib.h> + else +- +- +-if false; then ++ if false; then + USE_DIRECTFB_TRUE= + USE_DIRECTFB_FALSE='#' + else +@@ -34063,18 +31675,19 @@ --CFLAGS="$saved_cflags" --LDFLAGS="$saved_ldflags" -+#include <X11/extensions/sync.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" --if test "x$gdktarget" = "xx11"; then + GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" + if test "x$gdktarget" = "xx11"; then - GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" -+ ac_cv_header_X11_extensions_sync_h=no ++ GDK_PRIVATE_PACKAGES="$X_PACKAGES" fi -GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" - --# --# If we aren't writing explicit dependencies, then don't put the extra libraries we need --# into the pkg-config files --# --if test $enable_explicit_deps != yes ; then -- GDK_PACKAGES="$PANGO_PACKAGES" -- GDK_EXTRA_LIBS= -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_sync_h" >&6; } -+if test $ac_cv_header_X11_extensions_sync_h = yes; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_XSYNC 1 -+_ACEOF - -+else -+ : -+fi - - -+fi - - -+ CFLAGS="$gtk_save_CFLAGS" - -+ # Xshm checks - --######################################## --# Check for Accessibility Toolkit flags --######################################## -- --ATK_PACKAGES=atk --{ $as_echo "$as_me:$LINENO: checking ATK flags" >&5 --$as_echo_n "checking ATK flags... " >&6; } --if $PKG_CONFIG --exists $ATK_PACKAGES ; then -- ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` -- ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` -- -- { $as_echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 --$as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; } --else -- { { $as_echo "$as_me:$LINENO: error: --*** Accessibility Toolkit not found. Accessibility Toolkit is required --*** to build GTK+. --" >&5 --$as_echo "$as_me: error: --*** Accessibility Toolkit not found. Accessibility Toolkit is required --*** to build GTK+. --" >&2;} -- { (exit 1); exit 1; }; } --fi -- --if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then -- : -+ if test "x$enable_shm" = "xyes"; then -+ # Check for the XShm extension, normally in Xext -+ { echo "$as_me:$LINENO: checking for XShmAttach" >&5 -+echo $ECHO_N "checking for XShmAttach... $ECHO_C" >&6; } -+if test "${ac_cv_func_XShmAttach+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- gtk_save_LIBS="$LIBS" -- LIBS="$ATK_LIBS $LIBS" -- cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+/* Define XShmAttach to an innocuous variant, in case <limits.h> declares XShmAttach. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define XShmAttach innocuous_XShmAttach -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char XShmAttach (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef XShmAttach - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -30942,11 +33118,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char atk_object_get_type (); -+char XShmAttach (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_XShmAttach || defined __stub___XShmAttach -+choke me -+#endif -+ - int - main () - { --return atk_object_get_type (); -+return XShmAttach (); - ; - return 0; - } -@@ -30957,94 +33140,42 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- : -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_XShmAttach=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- { { $as_echo "$as_me:$LINENO: error: -- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required -- *** to build GTK+" >&5 --$as_echo "$as_me: error: -- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required -- *** to build GTK+" >&2;} -- { (exit 1); exit 1; }; } -+ ac_cv_func_XShmAttach=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -- LIBS="$gtk_save_LIBS" --fi -- --GTK_PACKAGES="atk cairo gio-2.0" --if test "x$gdktarget" = "xx11"; then -- GTK_PACKAGES="$GTK_PACKAGES pangoft2" --fi --GTK_EXTRA_LIBS= --GTK_EXTRA_CFLAGS= --GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" --GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" -- --if test x"$os_win32" = xyes; then -- GTK_EXTRA_CFLAGS="$msnative_struct" --fi -- --GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" --ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" --PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" --CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" -- --if test $enable_explicit_deps != yes ; then -- GDK_PIXBUF_EXTRA_LIBS= - fi -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --######################## --# Checks needed for gail --######################## -- --old_LIBS="$LIBS" --{ $as_echo "$as_me:$LINENO: checking for library containing gethostent" >&5 --$as_echo_n "checking for library containing gethostent... " >&6; } --if test "${ac_cv_search_gethostent+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 -+echo "${ECHO_T}$ac_cv_func_XShmAttach" >&6; } -+if test $ac_cv_func_XShmAttach = yes; then -+ : - else -- ac_func_search_save_LIBS=$LIBS -+ # On AIX, it is in XextSam instead -+ { echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 -+echo $ECHO_N "checking for XShmAttach in -lXextSam... $ECHO_C" >&6; } -+if test "${ac_cv_lib_XextSam_XShmAttach+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lXextSam $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -31058,462 +33189,214 @@ - #ifdef __cplusplus - extern "C" - #endif --char gethostent (); -+char XShmAttach (); - int - main () - { --return gethostent (); -+return XShmAttach (); - ; - return 0; - } - _ACEOF --for ac_lib in '' nsl; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- fi -- rm -f conftest.$ac_objext conftest$ac_exeext -+rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_search_gethostent=$ac_res -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_XextSam_XShmAttach=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- -+ ac_cv_lib_XextSam_XShmAttach=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext -- if test "${ac_cv_search_gethostent+set}" = set; then -- break --fi --done --if test "${ac_cv_search_gethostent+set}" = set; then -- : --else -- ac_cv_search_gethostent=no -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 -+echo "${ECHO_T}$ac_cv_lib_XextSam_XShmAttach" >&6; } -+if test $ac_cv_lib_XextSam_XShmAttach = yes; then -+ case "$x_extra_libs " in -+ *-lXextSam[\ \ ]*) ;; -+ *) x_extra_libs="-lXextSam $x_extra_libs" ;; -+ esac -+ - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 --$as_echo "$ac_cv_search_gethostent" >&6; } --ac_res=$ac_cv_search_gethostent --if test "$ac_res" != no; then -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - fi - --{ $as_echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 --$as_echo_n "checking for library containing setsockopt... " >&6; } --if test "${ac_cv_search_setsockopt+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ fi -+ -+ if test "x$enable_shm" = "xyes"; then -+ # Check for shared memory -+ if test "${ac_cv_header_sys_ipc_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 -+echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_ipc_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } - else -- ac_func_search_save_LIBS=$LIBS -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 -+echo $ECHO_N "checking sys/ipc.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char setsockopt (); --int --main () --{ --return setsockopt (); -- ; -- return 0; --} -+$ac_includes_default -+#include <sys/ipc.h> - _ACEOF --for ac_lib in '' socket; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- fi -- rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_search_setsockopt=$ac_res -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext -- if test "${ac_cv_search_setsockopt+set}" = set; then -- break --fi --done --if test "${ac_cv_search_setsockopt+set}" = set; then -- : --else -- ac_cv_search_setsockopt=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS -+ ac_header_compiler=no - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 --$as_echo "$ac_cv_search_setsockopt" >&6; } --ac_res=$ac_cv_search_setsockopt --if test "$ac_res" != no; then -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - --fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - --{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 --$as_echo_n "checking for library containing connect... " >&6; } --if test "${ac_cv_search_connect+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_func_search_save_LIBS=$LIBS -+# Is the header present? -+{ echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 -+echo $ECHO_N "checking sys/ipc.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char connect (); --int --main () --{ --return connect (); -- ; -- return 0; --} -+#include <sys/ipc.h> - _ACEOF --for ac_lib in '' inet; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- fi -- rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext - }; then -- ac_cv_search_connect=$ac_res -+ ac_header_preproc=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext -- if test "${ac_cv_search_connect+set}" = set; then -- break --fi --done --if test "${ac_cv_search_connect+set}" = set; then -- : --else -- ac_cv_search_connect=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 --$as_echo "$ac_cv_search_connect" >&6; } --ac_res=$ac_cv_search_connect --if test "$ac_res" != no; then -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -- -+ ac_header_preproc=no - fi - -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - --{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 --$as_echo_n "checking for struct sockaddr_un.sun_len... " >&6; } --if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/types.h> -- #include <sys/un.h> -- -- --int --main () --{ --static struct sockaddr_un ac_aggr; --if (ac_aggr.sun_len) --return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_member_struct_sockaddr_un_sun_len=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/types.h> -- #include <sys/un.h> -- -- --int --main () --{ --static struct sockaddr_un ac_aggr; --if (sizeof ac_aggr.sun_len) --return 0; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_member_struct_sockaddr_un_sun_len=yes -+{ echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 -+echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_ipc_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_member_struct_sockaddr_un_sun_len=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cv_header_sys_ipc_h=$ac_header_preproc - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 --$as_echo "$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } --if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then -- struct_sockaddr_un_sun_len=true --else -- struct_sockaddr_un_suin_len=false - fi -+if test $ac_cv_header_sys_ipc_h = yes; then - --case $struct_sockaddr_un_sun_len in -- true) -- --cat >>confdefs.h <<_ACEOF --#define HAVE_SOCKADDR_UN_SUN_LEN 1 -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_IPC_H 1 - _ACEOF - -- ;; -- *) -- ;; --esac -- --GAIL_INET_LIBS="$LIBS" -- -- --LIBS="$old_LIBS" -- --################################################################ --# Printing system checks --################################################################ -- --# Check whether --enable-cups was given. --if test "${enable_cups+set}" = set; then -- enableval=$enable_cups; --else -- enable_cups=auto --fi -- -- --if test "x$enable_cups" = "xauto" --then -- # Extract the first word of "cups-config", so it can be a program name with args. --set dummy cups-config; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- case $CUPS_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no" -- ;; --esac --fi --CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG --if test -n "$CUPS_CONFIG"; then -- { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 --$as_echo "$CUPS_CONFIG" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ no_sys_ipc=yes - fi - - -- if test "x$CUPS_CONFIG" != "xno"; then -- CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'` -- CUPS_LIBS=`$CUPS_CONFIG --libs` -- -- CUPS_API_VERSION=`$CUPS_CONFIG --api-version` -- CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` -- CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` -- -- if test $CUPS_API_MAJOR -gt 1 -o \ -- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_CUPS_API_1_2 1 --_ACEOF -- -- fi -- -- -- -- -- -- -- if test "${ac_cv_header_cups_cups_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 --$as_echo_n "checking for cups/cups.h... " >&6; } --if test "${ac_cv_header_cups_cups_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ if test "${ac_cv_header_sys_shm_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for sys/shm.h" >&5 -+echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_shm_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 --$as_echo "$ac_cv_header_cups_cups_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 --$as_echo_n "checking cups/cups.h usability... " >&6; } -+{ echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 -+echo $ECHO_N "checking sys/shm.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -31521,7 +33404,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --#include <cups/cups.h> -+#include <sys/shm.h> - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -31529,92 +33412,90 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 --$as_echo_n "checking cups/cups.h presence... " >&6; } -+{ echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 -+echo $ECHO_N "checking sys/shm.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <cups/cups.h> -+#include <sys/shm.h> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (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 -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no - fi - - rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX - ## --------------------------------------------------------------------- ## - ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -@@ -31623,51 +33504,57 @@ - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 --$as_echo_n "checking for cups/cups.h... " >&6; } --if test "${ac_cv_header_cups_cups_h+set}" = set; then -- $as_echo_n "(cached) " >&6 -+{ echo "$as_me:$LINENO: checking for sys/shm.h" >&5 -+echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_sys_shm_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_header_cups_cups_h=$ac_header_preproc -+ ac_cv_header_sys_shm_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 --$as_echo "$ac_cv_header_cups_cups_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 -+echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } - - fi --if test "x$ac_cv_header_cups_cups_h" = x""yes; then -- : --else -- { { $as_echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 --$as_echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} -- { (exit 1); exit 1; }; } --fi -- -- -- fi -+if test $ac_cv_header_sys_shm_h = yes; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_SHM_H 1 -+_ACEOF - --if test "x$CUPS_CONFIG" != "xno"; then -- HAVE_CUPS_TRUE= -- HAVE_CUPS_FALSE='#' - else -- HAVE_CUPS_TRUE='#' -- HAVE_CUPS_FALSE= -+ no_sys_shm=yes - fi - - -- gtk_save_cflags="$CFLAGS" -- CFLAGS="$CUPS_CFLAGS" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+ -+ # Check for the X shared memory extension header file -+ have_xshm=no -+ { echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 -+echo $ECHO_N "checking X11/extensions/XShm.h... $ECHO_C" >&6; } -+ if test "x$no_xext_lib" = "xyes"; then -+ : -+ else -+ gtk_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $x_cflags" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <cups/http.h> -+ -+#include <stdlib.h> -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+#include <X11/Xlib.h> -+#include <X11/Xutil.h> -+#include <X11/extensions/XShm.h> -+ - int - main () - { --http_t http; char *s = http.authstring; -+XShmSegmentInfo *x_shm_info; - ; - return 0; - } -@@ -31678,45 +33565,55 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_HTTP_AUTHSTRING /**/ --_ACEOF -- -+ have_xshm=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$gtk_save_cflags" -+ CFLAGS="$gtk_save_CFLAGS" -+ fi -+ { echo "$as_me:$LINENO: result: $have_xshm" >&5 -+echo "${ECHO_T}$have_xshm" >&6; } -+ if test $have_xshm = yes ; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_XSHM_H 1 -+_ACEOF - -+ fi -+ fi - -+ if test "x$enable_xinerama" = "xyes"; then -+ # Check for Xinerama extension (Solaris impl or Xfree impl) -+ gtk_save_cppflags="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $x_cflags" - -- gtk_save_libs="$LIBS" -- LIBS="$CUPS_LIBS" -+ case "$host" in -+ *-*-solaris*) -+ # Check for solaris -+ { echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 -+echo $ECHO_N "checking for Xinerama support on Solaris... $ECHO_C" >&6; } - --for ac_func in httpGetAuthString --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+ have_solaris_xinerama=false -+ { echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 -+echo $ECHO_N "checking for XineramaGetInfo... $ECHO_C" >&6; } -+if test "${ac_cv_func_XineramaGetInfo+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -31724,12 +33621,12 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+/* Define XineramaGetInfo to an innocuous variant, in case <limits.h> declares XineramaGetInfo. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -+#define XineramaGetInfo innocuous_XineramaGetInfo - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -+ which can conflict with char XineramaGetInfo (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -@@ -31739,7 +33636,7 @@ - # include <assert.h> - #endif - --#undef $ac_func -+#undef XineramaGetInfo - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -31747,18 +33644,18 @@ - #ifdef __cplusplus - extern "C" - #endif --char $ac_func (); -+char XineramaGetInfo (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func -+#if defined __stub_XineramaGetInfo || defined __stub___XineramaGetInfo - choke me - #endif - - int - main () - { --return $ac_func (); -+return XineramaGetInfo (); - ; - return 0; - } -@@ -31769,85 +33666,46 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_func_XineramaGetInfo=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- eval "$as_ac_var=no" -+ ac_cv_func_XineramaGetInfo=no - fi - --rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- --fi --done -- -- LIBS="$gtk_save_libs" -- --else -- -- --if false; then -- HAVE_CUPS_TRUE= -- HAVE_CUPS_FALSE='#' --else -- HAVE_CUPS_TRUE='#' -- HAVE_CUPS_FALSE= --fi -- --fi -- --gtk_save_cppflags="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" -- --if test "${ac_cv_header_cairo_pdf_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 --$as_echo_n "checking for cairo-pdf.h... " >&6; } --if test "${ac_cv_header_cairo_pdf_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 --$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 -+echo "${ECHO_T}$ac_cv_func_XineramaGetInfo" >&6; } -+if test $ac_cv_func_XineramaGetInfo = yes; then -+ { echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 -+echo $ECHO_N "checking for X11/extensions/xinerama.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_X11_extensions_xinerama_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking cairo-pdf.h usability" >&5 --$as_echo_n "checking cairo-pdf.h usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <cairo-pdf.h> -+#include <X11/Xlib.h> -+ -+#include <X11/extensions/xinerama.h> - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -31855,3819 +33713,4428 @@ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ ac_cv_header_X11_extensions_xinerama_h=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+ ac_cv_header_X11_extensions_xinerama_h=no - fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 --$as_echo_n "checking cairo-pdf.h presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <cairo-pdf.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_xinerama_h" >&6; } -+if test $ac_cv_header_X11_extensions_xinerama_h = yes; then -+ have_solaris_xinerama=true - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no -+ : - fi - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 --$as_echo_n "checking for cairo-pdf.h... " >&6; } --if test "${ac_cv_header_cairo_pdf_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_header_cairo_pdf_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 --$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } - --fi --if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then -- : --else -- { { $as_echo "$as_me:$LINENO: error: --*** Can't find cairo-pdf.h. You must build Cairo with the pdf --*** backend enabled." >&5 --$as_echo "$as_me: error: --*** Can't find cairo-pdf.h. You must build Cairo with the pdf --*** backend enabled." >&2;} -- { (exit 1); exit 1; }; } --fi - -+ if $have_solaris_xinerama ; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_SOLARIS_XINERAMA 1 -+_ACEOF - - --if test "$os_win32" != "yes"; then -- if test "${ac_cv_header_cairo_ps_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 --$as_echo_n "checking for cairo-ps.h... " >&6; } --if test "${ac_cv_header_cairo_ps_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 --$as_echo "$ac_cv_header_cairo_ps_h" >&6; } -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_XINERAMA 1 -+_ACEOF -+ -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ fi -+ ;; -+ *) -+ # Check for XFree -+ { echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 -+echo $ECHO_N "checking for Xinerama support on XFree86... $ECHO_C" >&6; } -+ -+ have_xfree_xinerama=false -+ if $PKG_CONFIG --exists xinerama ; then -+ have_xfree_xinerama=true -+ X_PACKAGES="$X_PACKAGES xinerama" -+ else -+ { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 -+echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; } -+if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 --$as_echo_n "checking cairo-ps.h usability... " >&6; } -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lXinerama $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default --#include <cairo-ps.h> -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char XineramaQueryExtension (); -+int -+main () -+{ -+return XineramaQueryExtension (); -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_Xinerama_XineramaQueryExtension=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no -+ ac_cv_lib_Xinerama_XineramaQueryExtension=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 --$as_echo_n "checking cairo-ps.h presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF -+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 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 -+echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } -+if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then -+ { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 -+echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <cairo-ps.h> -+#include <X11/Xlib.h> -+ -+#include <X11/extensions/Xinerama.h> - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- }; then -- ac_header_preproc=yes -+ } && test -s conftest.$ac_objext; then -+ ac_cv_header_X11_extensions_Xinerama_h=yes - else -- $as_echo "$as_me: failed program was:" >&5 -+ echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no -+ ac_cv_header_X11_extensions_Xinerama_h=no - fi - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 --$as_echo_n "checking for cairo-ps.h... " >&6; } --if test "${ac_cv_header_cairo_ps_h+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_header_cairo_ps_h=$ac_header_preproc -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 --$as_echo "$ac_cv_header_cairo_ps_h" >&6; } -+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 -+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } -+if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then -+ case "$x_extra_libs " in -+ *-lXinerama[\ \ ]*) ;; -+ *) x_extra_libs="-lXinerama $x_extra_libs" ;; -+ esac - --fi --if test "x$ac_cv_header_cairo_ps_h" = x""yes; then -- : -+ have_xfree_xinerama=true - else -- { { $as_echo "$as_me:$LINENO: error: --*** Can't find cairo-ps.h. You must build Cairo with the --*** postscript backend enabled." >&5 --$as_echo "$as_me: error: --*** Can't find cairo-ps.h. You must build Cairo with the --*** postscript backend enabled." >&2;} -- { (exit 1); exit 1; }; } -+ : - fi - - - fi - --CPPFLAGS="$gtk_save_cppflags" -+ fi - -+ if $have_xfree_xinerama ; then - --# Check whether --enable-test-print-backend was given. --if test "${enable_test_print_backend+set}" = set; then -- enableval=$enable_test_print_backend; --else -- enable_test_print_backend=no --fi -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_XFREE_XINERAMA 1 -+_ACEOF - - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_XINERAMA 1 -+_ACEOF - --if test "x$enable_test_print_backend" != "xno"; then -- TEST_PRINT_BACKEND_TRUE= -- TEST_PRINT_BACKEND_FALSE='#' --else -- TEST_PRINT_BACKEND_TRUE='#' -- TEST_PRINT_BACKEND_FALSE= --fi -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+ else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+ fi -+ ;; -+ esac -+ fi - -+ # set up things for XInput - -+ if test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then - --################################################################ --# Strip -export-dynamic from the link lines of various libraries --################################################################ -+cat >>confdefs.h <<\_ACEOF -+#define XINPUT_XFREE 1 -+_ACEOF - --# --# pkg-config --libs gmodule includes the "export_dynamic" flag, --# but this flag is only meaningful for executables. For libraries --# the effect is undefined; what it causes on Linux is that the --# export list from -export-symbols-regex is ignored and everything --# is exported --# --# We are using gmodule-no-export now, but I'm leaving the stripping --# code in place for now, since pango and atk still require gmodule. --export SED --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` --if test -n "$export_dynamic"; then -- GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` -- GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` -- GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` -- GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` --fi - -+ if $PKG_CONFIG --exists xi ; then -+ X_PACKAGES="$X_PACKAGES xi" -+ else -+ case "$x_extra_libs " in -+ *-lXi[\ \ ]*) ;; -+ *) x_extra_libs="-lXi $x_extra_libs" ;; -+ esac - --################################################## --# Checks for gtk-doc and docbook-tools --################################################## -+ fi -+ else - -+cat >>confdefs.h <<\_ACEOF -+#define XINPUT_NONE 1 -+_ACEOF - -+ fi - --# Check whether --with-html-dir was given. --if test "${with_html_dir+set}" = set; then -- withval=$with_html_dir; -+ if test x$with_xinput = xxfree || test x$with_xinput = xyes; then -+ XINPUT_XFREE_TRUE= -+ XINPUT_XFREE_FALSE='#' - else -- with_html_dir='${datadir}/gtk-doc/html' -+ XINPUT_XFREE_TRUE='#' -+ XINPUT_XFREE_FALSE= - fi - -- HTML_DIR="$with_html_dir" - -+ # Check for the RANDR extension -+ if $PKG_CONFIG --exists "xrandr >= 1.2" ; then - -- # Check whether --enable-gtk-doc was given. --if test "${enable_gtk_doc+set}" = set; then -- enableval=$enable_gtk_doc; --else -- enable_gtk_doc=no --fi -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_RANDR 1 -+_ACEOF - - -- if test x$enable_gtk_doc = xyes; then -- if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 -- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.8") 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- : --else -- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 --$as_echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} -- { (exit 1); exit 1; }; } --fi -+ X_PACKAGES="$X_PACKAGES xrandr" - fi - -- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 --$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } -- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 --$as_echo "$enable_gtk_doc" >&6; } -+ # Checks for Xcursor library - -- for ac_prog in gtkdoc-check --do -- # Extract the first word of "$ac_prog", so it can be a program name with args. --set dummy $ac_prog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- case $GTKDOC_CHECK in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+ if $PKG_CONFIG --exists xcursor ; then - -- ;; --esac --fi --GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK --if test -n "$GTKDOC_CHECK"; then -- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 --$as_echo "$GTKDOC_CHECK" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_XCURSOR 1 -+_ACEOF - - -- test -n "$GTKDOC_CHECK" && break --done -+ X_PACKAGES="$X_PACKAGES xcursor" -+ fi - -+ # Checks for XFixes extension - -+ if $PKG_CONFIG --exists xfixes ; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_XFIXES 1 -+_ACEOF - --if test x$enable_gtk_doc = xyes; then -- ENABLE_GTK_DOC_TRUE= -- ENABLE_GTK_DOC_FALSE='#' --else -- ENABLE_GTK_DOC_TRUE='#' -- ENABLE_GTK_DOC_FALSE= --fi - -+ X_PACKAGES="$X_PACKAGES xfixes" -+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes" -+ fi - -+ # Checks for Xcomposite extension - --if test -n "$LIBTOOL"; then -- GTK_DOC_USE_LIBTOOL_TRUE= -- GTK_DOC_USE_LIBTOOL_FALSE='#' --else -- GTK_DOC_USE_LIBTOOL_TRUE='#' -- GTK_DOC_USE_LIBTOOL_FALSE= --fi -+ if $PKG_CONFIG --exists xcomposite ; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_XCOMPOSITE 1 -+_ACEOF - - --# Extract the first word of "db2html", so it can be a program name with args. --set dummy db2html; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DB2HTML+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -n "$DB2HTML"; then -- ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_DB2HTML="true" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -+ X_PACKAGES="$X_PACKAGES xcomposite" -+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite" - fi --done --done --IFS=$as_save_IFS - -- test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false" --fi --fi --DB2HTML=$ac_cv_prog_DB2HTML --if test -n "$DB2HTML"; then -- { $as_echo "$as_me:$LINENO: result: $DB2HTML" >&5 --$as_echo "$DB2HTML" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -+ # Checks for Xdamage extension -+ -+ if $PKG_CONFIG --exists xdamage ; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_XDAMAGE 1 -+_ACEOF - - -+ X_PACKAGES="$X_PACKAGES xdamage" -+ GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" -+ fi - --if $DB2HTML; then -- HAVE_DOCBOOK_TRUE= -- HAVE_DOCBOOK_FALSE='#' --else -- HAVE_DOCBOOK_TRUE='#' -- HAVE_DOCBOOK_FALSE= --fi -+ if $have_base_x_pc ; then -+ GDK_EXTRA_LIBS="$x_extra_libs" -+ else -+ GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS" -+ fi - -+ CPPFLAGS="$gtk_save_cppflags" -+ LIBS="$gtk_save_libs" - --# Check whether --enable-man was given. --if test "${enable_man+set}" = set; then -- enableval=$enable_man; enable_man=yes -+ if true; then -+ USE_X11_TRUE= -+ USE_X11_FALSE='#' - else -- enable_man=no -+ USE_X11_TRUE='#' -+ USE_X11_FALSE= - fi - -- --if test "${enable_man}" != no; then -- # Extract the first word of "xsltproc", so it can be a program name with args. --set dummy xsltproc; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_XSLTPROC+set}" = set; then -- $as_echo_n "(cached) " >&6 - else -- case $XSLTPROC in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+ if false; then -+ XINPUT_XFREE_TRUE= -+ XINPUT_XFREE_FALSE='#' -+else -+ XINPUT_XFREE_TRUE='#' -+ XINPUT_XFREE_FALSE= -+fi - -- ;; --esac -+ if false; then -+ USE_X11_TRUE= -+ USE_X11_FALSE='#' -+else -+ USE_X11_TRUE='#' -+ USE_X11_FALSE= - fi --XSLTPROC=$ac_cv_path_XSLTPROC --if test -n "$XSLTPROC"; then -- { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 --$as_echo "$XSLTPROC" >&6; } -+ -+ if false; then -+ HAVE_X11R6_TRUE= -+ HAVE_X11R6_FALSE='#' - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ HAVE_X11R6_TRUE='#' -+ HAVE_X11R6_FALSE= - fi - -+fi - -- if test -z "$XSLTPROC"; then -- enable_man=no -- fi -+if test "x$gdktarget" = "xwin32"; then -+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" -+ if true; then -+ USE_WIN32_TRUE= -+ USE_WIN32_FALSE='#' -+else -+ USE_WIN32_TRUE='#' -+ USE_WIN32_FALSE= -+fi - -+else -+ if false; then -+ USE_WIN32_TRUE= -+ USE_WIN32_FALSE='#' -+else -+ USE_WIN32_TRUE='#' -+ USE_WIN32_FALSE= -+fi - -- # check for the presence of the XML catalog -+fi - --# Check whether --with-xml-catalog was given. --if test "${with_xml_catalog+set}" = set; then -- withval=$with_xml_catalog; -+if test "x$gdktarget" = "xquartz"; then -+ GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" -+ if true; then -+ USE_QUARTZ_TRUE= -+ USE_QUARTZ_FALSE='#' - else -- with_xml_catalog=/etc/xml/catalog -+ USE_QUARTZ_TRUE='#' -+ USE_QUARTZ_FALSE= - fi - -- jh_found_xmlcatalog=true -- XML_CATALOG_FILE="$with_xml_catalog" -+else -+ if false; then -+ USE_QUARTZ_TRUE= -+ USE_QUARTZ_FALSE='#' -+else -+ USE_QUARTZ_TRUE='#' -+ USE_QUARTZ_FALSE= -+fi - -- { $as_echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 --$as_echo_n "checking for XML catalog ($XML_CATALOG_FILE)... " >&6; } -- if test -f "$XML_CATALOG_FILE"; then -- { $as_echo "$as_me:$LINENO: result: found" >&5 --$as_echo "found" >&6; } -+fi -+ -+GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" -+GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" -+ -+ -+ -+ -+ -+ -+ -+if test "x$gdktarget" = "xdirectfb"; then -+ DIRECTFB_REQUIRED_VERSION=0.9.26 -+ { echo "$as_me:$LINENO: checking for DirectFB" >&5 -+echo $ECHO_N "checking for DirectFB... $ECHO_C" >&6; } -+ -+ 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" - else -- jh_found_xmlcatalog=false -- { $as_echo "$as_me:$LINENO: result: not found" >&5 --$as_echo "not found" >&6; } -+ { { echo "$as_me:$LINENO: error: -+*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend -+*** are required. The latest version of DirectFB is always available -+*** from http://www.directfb.org/. -+ " >&5 -+echo "$as_me: error: -+*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend -+*** are required. The latest version of DirectFB is always available -+*** from http://www.directfb.org/. -+ " >&2;} -+ { (exit 1); exit 1; }; } - fi - -- # check for the xmlcatalog program -- # Extract the first word of "xmlcatalog", so it can be a program name with args. --set dummy xmlcatalog; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_XMLCATALOG+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ if true; then -+ USE_DIRECTFB_TRUE= -+ USE_DIRECTFB_FALSE='#' - else -- case $XMLCATALOG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_XMLCATALOG="$XMLCATALOG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" -- ;; --esac -+ USE_DIRECTFB_TRUE='#' -+ USE_DIRECTFB_FALSE= - fi --XMLCATALOG=$ac_cv_path_XMLCATALOG --if test -n "$XMLCATALOG"; then -- { $as_echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 --$as_echo "$XMLCATALOG" >&6; } -+ -+else -+ if false; then -+ USE_DIRECTFB_TRUE= -+ USE_DIRECTFB_FALSE='#' - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -+ USE_DIRECTFB_TRUE='#' -+ USE_DIRECTFB_FALSE= - fi - -+fi - -- if test "x$XMLCATALOG" = xno; then -- jh_found_xmlcatalog=false -- fi - -- if $jh_found_xmlcatalog; then -- : -- else -- : -- fi -+# Check for Pango flags - -+if test "x$gdktarget" = "xwin32"; then -+ PANGO_PACKAGES="pangowin32 pangocairo" -+else -+ PANGO_PACKAGES="pango pangocairo" -+fi - -- { $as_echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 --$as_echo_n "checking for DocBook XML DTD V4.1.2 in XML catalog... " >&6; } -- if $jh_found_xmlcatalog && \ -- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 -- ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.1.2//EN" >&2) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- { $as_echo "$as_me:$LINENO: result: found" >&5 --$as_echo "found" >&6; } -- else -- { $as_echo "$as_me:$LINENO: result: not found" >&5 --$as_echo "not found" >&6; } -- enable_man=no -- fi -+{ echo "$as_me:$LINENO: checking Pango flags" >&5 -+echo $ECHO_N "checking Pango flags... $ECHO_C" >&6; } -+if $PKG_CONFIG --exists $PANGO_PACKAGES ; then -+ PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` -+ PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` -+ -+ { echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 -+echo "${ECHO_T}$PANGO_CFLAGS $PANGO_LIBS" >&6; } -+else -+ { { echo "$as_me:$LINENO: error: -+*** Pango not found. Pango built with Cairo support is required -+*** to build GTK+. See http://www.pango.org for Pango information. -+" >&5 -+echo "$as_me: error: -+*** Pango not found. Pango built with Cairo support is required -+*** to build GTK+. See http://www.pango.org for Pango information. -+" >&2;} -+ { (exit 1); exit 1; }; } -+fi - -+CFLAGS="$CFLAGS $PANGO_CFLAGS" - -- { $as_echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 --$as_echo_n "checking for DocBook XSL Stylesheets in XML catalog... " >&6; } -- if $jh_found_xmlcatalog && \ -- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 -- ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" >&2) 2>&5 -+if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then -+ : -+else -+ gtk_save_LIBS="$LIBS" -+ LIBS="$PANGO_LIBS $LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char pango_context_new (); -+int -+main () -+{ -+return pango_context_new (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- { $as_echo "$as_me:$LINENO: result: found" >&5 --$as_echo "found" >&6; } -- else -- { $as_echo "$as_me:$LINENO: result: not found" >&5 --$as_echo "not found" >&6; } -- enable_man=no -- fi -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ { { echo "$as_me:$LINENO: error: -+*** Can't link to Pango. Pango is required to build -+*** GTK+. For more information see http://www.pango.org" >&5 -+echo "$as_me: error: -+*** Can't link to Pango. Pango is required to build -+*** GTK+. For more information see http://www.pango.org" >&2;} -+ { (exit 1); exit 1; }; } - fi - -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$gtk_save_LIBS" -+fi - -+CFLAGS="$saved_cflags" -+LDFLAGS="$saved_ldflags" - --if test x$enable_man != xno; then -- ENABLE_MAN_TRUE= -- ENABLE_MAN_FALSE='#' -+GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" -+if test "x$gdktarget" = "xx11"; then -+ GDK_PRIVATE_PACKAGES="$X_PACKAGES" -+fi +GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" +GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" -+ -+# -+# If we aren't writing explicit dependencies, then don't put the extra libraries we need -+# into the pkg-config files -+# -+if test $enable_explicit_deps != yes ; then -+ GDK_EXTRA_LIBS= - else -- ENABLE_MAN_TRUE='#' -- ENABLE_MAN_FALSE= + + # + # If we aren't writing explicit dependencies, then don't put the extra libraries we need + # into the pkg-config files + # + if test $enable_explicit_deps != yes ; then +- GDK_PACKAGES="$PANGO_PACKAGES" + GDK_EXTRA_LIBS= ++else + GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES" fi - --################################################## --# Output commands --################################################## - --ac_config_commands="$ac_config_commands gdk/gdkconfig.h" +@@ -34084,6 +31697,7 @@ --ac_config_files="$ac_config_files config.h.win32 gtk-zip.sh Makefile gdk-pixbuf-2.0.pc gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc gdk-pixbuf-2.0-uninstalled.pc gdk-2.0-uninstalled.pc gtk+-2.0-uninstalled.pc gail-uninstalled.pc m4macros/Makefile po/Makefile.in po-properties/Makefile.in demos/Makefile demos/gtk-demo/Makefile demos/gtk-demo/geninclude.pl tests/Makefile docs/Makefile docs/reference/Makefile docs/reference/gdk-pixbuf/Makefile docs/reference/gdk-pixbuf/version.xml docs/reference/gdk/Makefile docs/reference/gdk/version.xml docs/reference/gtk/Makefile docs/reference/gtk/version.xml docs/reference/libgail-util/Makefile docs/faq/Makefile docs/tools/Makefile docs/tutorial/Makefile gdk-pixbuf/Makefile gdk-pixbuf/gdk_pixbuf.rc gdk-pixbuf/gdk-pixbuf-features.h gdk-pixbuf/pixops/Makefile gdk/Makefile gdk/x11/Makefile gdk/win32/Makefile gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc gdk/quartz/Makefile gdk/directfb/Makefile gdk/tests/Makefile gtk/Makefile gtk/makefile.msc gtk/gtkversion.h gtk/gtk-win32.rc gtk/theme-bits/Makefile gtk/tests/Makefile modules/Makefile modules/other/Makefile modules/other/gail/Makefile modules/other/gail/libgail-util/Makefile modules/other/gail/tests/Makefile modules/engines/Makefile modules/engines/pixbuf/Makefile modules/engines/ms-windows/Makefile modules/engines/ms-windows/Theme/Makefile modules/engines/ms-windows/Theme/gtk-2.0/Makefile modules/input/Makefile modules/printbackends/Makefile modules/printbackends/cups/Makefile modules/printbackends/lpr/Makefile modules/printbackends/file/Makefile modules/printbackends/test/Makefile perf/Makefile contrib/Makefile contrib/gdk-pixbuf-xlib/Makefile contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" - --cat >confcache <<\_ACEOF --# This file is a shell script that caches the results of configure --# tests run on this system so they can be shared between configure --# scripts and configure runs, see configure's option --config-cache. --# It is not useful on other systems. If it contains results you don't --# want to keep, you may remove or edit it. --# --# config.status only pays attention to the cache file if you give it --# the --recheck option to rerun configure. --# --# `ac_cv_env_foo' variables (set or unset) will be overridden when --# loading this file, other *unset* `ac_cv_foo' will be assigned the --# following values. - --_ACEOF -+######################################## -+# Check for Accessibility Toolkit flags -+######################################## - --# The following way of writing the cache mishandles newlines in values, --# but we know of no workaround that is simple, portable, and efficient. --# So, we kill variables containing newlines. --# Ultrix sh set writes to stderr and can't be redirected directly, --# and sets the high bit in the cache file unless we assign to the vars. --( -- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -- eval ac_val=\$$ac_var -- case $ac_val in #( -- *${as_nl}*) -- case $ac_var in #( -- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 --$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -- esac -- case $ac_var in #( -- _ | IFS | as_nl) ;; #( -- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -- *) $as_unset $ac_var ;; -- esac ;; -- esac -- done -+ATK_PACKAGES=atk -+{ echo "$as_me:$LINENO: checking ATK flags" >&5 -+echo $ECHO_N "checking ATK flags... $ECHO_C" >&6; } -+if $PKG_CONFIG --exists $ATK_PACKAGES ; then -+ ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` -+ ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` - -- (set) 2>&1 | -- case $as_nl`(ac_space=' '; set) 2>&1` in #( -- *${as_nl}ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -- sed -n \ -- "s/'/'\\\\''/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; #( -- *) -- # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -- ;; -- esac | -- sort --) | -- sed ' -- /^ac_cv_env_/b end -- t clear -- :clear -- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -- t end -- s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- :end' >>confcache --if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -- if test -w "$cache_file"; then -- test "x$cache_file" != "x/dev/null" && -- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 --$as_echo "$as_me: updating cache $cache_file" >&6;} -- cat confcache >$cache_file -- else -- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 --$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} -- fi -+ { echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 -+echo "${ECHO_T}$ATK_CFLAGS $ATK_LIBS" >&6; } -+else -+ { { echo "$as_me:$LINENO: error: -+*** Accessibility Toolkit not found. Accessibility Toolkit is required -+*** to build GTK+. -+" >&5 -+echo "$as_me: error: -+*** Accessibility Toolkit not found. Accessibility Toolkit is required -+*** to build GTK+. -+" >&2;} -+ { (exit 1); exit 1; }; } - fi --rm -f confcache -- --test "x$prefix" = xNONE && prefix=$ac_default_prefix --# Let make expand exec_prefix. --test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -- --DEFS=-DHAVE_CONFIG_H -- --ac_libobjs= --ac_ltlibobjs= --for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue -- # 1. Remove the extension, and $U if already installed. -- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -- ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -- # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -- # will be set to the directory where LIBOBJS objects are built. -- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' --done --LIBOBJS=$ac_libobjs - --LTLIBOBJS=$ac_ltlibobjs -+if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then -+ : -+else -+ gtk_save_LIBS="$LIBS" -+ LIBS="$ATK_LIBS $LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char atk_object_get_type (); -+int -+main () -+{ -+return atk_object_get_type (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"am__fastdepCC\" 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 -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_OBJC\" 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 -- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"OS_UNIX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"OS_LINUX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${BUILD_GDIPLUS_LOADERS_TRUE}" && test -z "${BUILD_GDIPLUS_LOADERS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${BUILD_DYNAMIC_MODULES_TRUE}" && test -z "${BUILD_DYNAMIC_MODULES_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -+ { { echo "$as_me:$LINENO: error: -+ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required -+ *** to build GTK+" >&5 -+echo "$as_me: error: -+ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required -+ *** to build GTK+" >&2;} - { (exit 1); exit 1; }; } - fi --if test -z "${INCLUDE_PNG_TRUE}" && test -z "${INCLUDE_PNG_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNG\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_PNG\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } + -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$gtk_save_LIBS" - fi --if test -z "${INCLUDE_BMP_TRUE}" && test -z "${INCLUDE_BMP_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_BMP\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_BMP\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ -+GTK_PACKAGES="atk cairo gio-2.0" -+if test "x$gdktarget" = "xx11"; then -+ GTK_PACKAGES="$GTK_PACKAGES pangoft2" - fi --if test -z "${INCLUDE_WBMP_TRUE}" && test -z "${INCLUDE_WBMP_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_WBMP\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_WBMP\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+GTK_EXTRA_LIBS= -+GTK_EXTRA_CFLAGS= -+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" -+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" -+ -+if test x"$os_win32" = xyes; then -+ GTK_EXTRA_CFLAGS="$msnative_struct" - fi --if test -z "${INCLUDE_GIF_TRUE}" && test -z "${INCLUDE_GIF_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GIF\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_GIF\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ -+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" -+ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" -+PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" -+CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" -+ -+if test $enable_explicit_deps != yes ; then + ######################################## + # Check for Accessibility Toolkit flags + ######################################## +@@ -34196,7 +31810,7 @@ + CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" + + if test $enable_explicit_deps != yes ; then +- GDK_PIXBUF_EXTRA_LIBS= + GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB" fi --if test -z "${INCLUDE_ICO_TRUE}" && test -z "${INCLUDE_ICO_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICO\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_ICO\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_ANI_TRUE}" && test -z "${INCLUDE_ANI_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ANI\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_ANI\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_JPEG_TRUE}" && test -z "${INCLUDE_JPEG_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JPEG\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_JPEG\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_PNM_TRUE}" && test -z "${INCLUDE_PNM_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNM\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_PNM\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_RAS_TRUE}" && test -z "${INCLUDE_RAS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_RAS\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_RAS\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_TIFF_TRUE}" && test -z "${INCLUDE_TIFF_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIFF\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_TIFF\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_XPM_TRUE}" && test -z "${INCLUDE_XPM_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_XPM\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_XPM\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_XBM_TRUE}" && test -z "${INCLUDE_XBM_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_XBM\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_XBM\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_TGA_TRUE}" && test -z "${INCLUDE_TGA_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TGA\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_TGA\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_PCX_TRUE}" && test -z "${INCLUDE_PCX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PCX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_ICNS_TRUE}" && test -z "${INCLUDE_ICNS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_JASPER_TRUE}" && test -z "${INCLUDE_JASPER_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+######################## -+# Checks needed for gail -+######################## -+ -+old_LIBS="$LIBS" -+{ echo "$as_me:$LINENO: checking for library containing gethostent" >&5 -+echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6; } -+if test "${ac_cv_search_gethostent+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char gethostent (); -+int -+main () -+{ -+return gethostent (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' nsl; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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_gethostent=$ac_res -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi --if test -z "${INCLUDE_GDIPLUS_TRUE}" && test -z "${INCLUDE_GDIPLUS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_gethostent+set}" = set; then -+ break - fi --if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+done -+if test "${ac_cv_search_gethostent+set}" = set; then -+ : -+else -+ ac_cv_search_gethostent=no - fi --if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS - fi --if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 -+echo "${ECHO_T}$ac_cv_search_gethostent" >&6; } -+ac_res=$ac_cv_search_gethostent -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ - fi --if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ -+{ echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 -+echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } -+if test "${ac_cv_search_setsockopt+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char setsockopt (); -+int -+main () -+{ -+return setsockopt (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' socket; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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_setsockopt=$ac_res -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ - fi --if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_setsockopt+set}" = set; then -+ break - fi --if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+done -+if test "${ac_cv_search_setsockopt+set}" = set; then -+ : -+else -+ ac_cv_search_setsockopt=no - fi --if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS - fi --if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_TIFF_TRUE}" && test -z "${HAVE_TIFF_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_TIFF\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_JPEG_TRUE}" && test -z "${HAVE_JPEG_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JPEG\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_JASPER_TRUE}" && test -z "${HAVE_JASPER_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_MEDIALIB_TRUE}" && test -z "${USE_MEDIALIB_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_MEDIALIB\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_MEDIALIB25_TRUE}" && test -z "${USE_MEDIALIB25_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB25\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_MEDIALIB25\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_MMX_TRUE}" && test -z "${USE_MMX_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_MMX\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_X11\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_X11\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_WIN32\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_WIN32\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${TEST_PRINT_BACKEND_TRUE}" && test -z "${TEST_PRINT_BACKEND_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"TEST_PRINT_BACKEND\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"TEST_PRINT_BACKEND\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } --fi --if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then -- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined. --Usually this means the macro was only invoked conditionally." >&5 --$as_echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined. --Usually this means the macro was only invoked conditionally." >&2;} -- { (exit 1); exit 1; }; } -+{ echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 -+echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } -+ac_res=$ac_cv_search_setsockopt -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ - fi - --: ${CONFIG_STATUS=./config.status} --ac_write_fail=0 --ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --#! $SHELL --# Generated by $as_me. --# Run this file to recreate the current configuration. --# Compiler output produced by configure, useful for debugging --# configure, is in config.log if it exists. -- --debug=false --ac_cs_recheck=false --ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} -+{ echo "$as_me:$LINENO: checking for library containing connect" >&5 -+echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; } -+if test "${ac_cv_search_connect+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -- --# 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=: -- # Pre-4.2 versions of Zsh do 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 ;; -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char connect (); -+int -+main () -+{ -+return connect (); -+ ; -+ return 0; -+} -+_ACEOF -+for ac_lib in '' inet; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -+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); } && { -+ 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_connect=$ac_res -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ - - fi - -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_connect+set}" = set; then -+ break -+fi -+done -+if test "${ac_cv_search_connect+set}" = set; then -+ : -+else -+ ac_cv_search_connect=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 -+echo "${ECHO_T}$ac_cv_search_connect" >&6; } -+ac_res=$ac_cv_search_connect -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -+fi --# PATH needs CR --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -+{ echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 -+echo $ECHO_N "checking for struct sockaddr_un.sun_len... $ECHO_C" >&6; } -+if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/types.h> -+ #include <sys/un.h> - --as_nl=' --' --export as_nl --# Printing a long string crashes Solaris 7 /usr/bin/printf. --as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo --as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo --if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -- as_echo='printf %s\n' -- as_echo_n='printf %s' --else -- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -- as_echo_n='/usr/ucb/echo -n' -- else -- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -- as_echo_n_body='eval -- arg=$1; -- case $arg in -- *"$as_nl"*) -- expr "X$arg" : "X\\(.*\\)$as_nl"; -- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -- esac; -- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -- ' -- export as_echo_n_body -- as_echo_n='sh -c $as_echo_n_body as_echo' -- fi -- export as_echo_body -- as_echo='sh -c $as_echo_body as_echo' -+ -+int -+main () -+{ -+static struct sockaddr_un ac_aggr; -+if (ac_aggr.sun_len) -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_member_struct_sockaddr_un_sun_len=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/types.h> -+ #include <sys/un.h> -+ -+ -+int -+main () -+{ -+static struct sockaddr_un ac_aggr; -+if (sizeof ac_aggr.sun_len) -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_member_struct_sockaddr_un_sun_len=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_member_struct_sockaddr_un_sun_len=no - fi - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- PATH_SEPARATOR=: -- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -- PATH_SEPARATOR=';' -- } -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 -+echo "${ECHO_T}$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } -+if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then -+ struct_sockaddr_un_sun_len=true - else -- as_unset=false -+ struct_sockaddr_un_suin_len=false - fi - -+case $struct_sockaddr_un_sun_len in -+ true) - --# IFS --# We need space, tab and new line, in precisely that order. Quoting is --# there to prevent editors from complaining about space-tab. --# (If _AS_PATH_WALK were called with IFS unset, it would disable word --# splitting by setting IFS to empty value.) --IFS=" "" $as_nl" -+cat >>confdefs.h <<_ACEOF -+#define HAVE_SOCKADDR_UN_SUN_LEN 1 -+_ACEOF - --# Find who we are. Look in the path if we contain no directory separator. --case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ ;; -+ *) -+ ;; -+esac -+ -+GAIL_INET_LIBS="$LIBS" -+ -+ -+LIBS="$old_LIBS" -+ -+################################################################ -+# Printing system checks -+################################################################ -+ -+# Check whether --enable-cups was given. -+if test "${enable_cups+set}" = set; then -+ enableval=$enable_cups; -+else -+ enable_cups=auto -+fi -+ -+ -+if test "x$enable_cups" = "xauto" -+then -+ # Extract the first word of "cups-config", so it can be a program name with args. -+set dummy cups-config; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $CUPS_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ 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 -+ fi -+done - done - IFS=$as_save_IFS - -- ;; -+ test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="no" -+ ;; - esac --# We did not find ourselves, most probably we were run as `sh COMMAND' --# in which case we are not to be found in the path. --if test "x$as_myself" = x; then -- as_myself=$0 - fi --if test ! -f "$as_myself"; then -- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -- { (exit 1); exit 1; } -+CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG -+if test -n "$CUPS_CONFIG"; then -+ { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 -+echo "${ECHO_T}$CUPS_CONFIG" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - --# Work around bugs in pre-3.0 UWIN ksh. --for as_var in ENV MAIL MAILPATH --do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var --done --PS1='$ ' --PS2='> ' --PS4='+ ' - --# NLS nuisances. --LC_ALL=C --export LC_ALL --LANGUAGE=C --export LANGUAGE -+ if test "x$CUPS_CONFIG" != "xno"; then -+ CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O0-9*//' | sed 's/-m^\t*//g'` -+ CUPS_LIBS=`$CUPS_CONFIG --libs` - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1 && -- test "X`expr 00001 : '.*\(...\)'`" = X001; then -- as_expr=expr --else -- as_expr=false --fi -+ CUPS_API_VERSION=`$CUPS_CONFIG --api-version` -+ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'` -+ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'` - --if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -- as_basename=basename --else -- as_basename=false --fi -+ if test $CUPS_API_MAJOR -gt 1 -o \ -+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then - -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_CUPS_API_1_2 1 -+_ACEOF - --# Name of the executable. --as_me=`$as_basename -- "$0" || --$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ -- s//\1/ -- q -- } -- /^X\/\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\/\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -+ fi - --# CDPATH. --$as_unset CDPATH +@@ -34829,9 +32443,7 @@ - -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line after each line using $LINENO; the second 'sed' -- # does the real work. The second script uses 'N' to pair each -- # line-number line with the line containing $LINENO, and appends -- # trailing '-' during substitution so that $LINENO is not a special -- # case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # scripts with optimization help from Paolo Bonzini. Blame Lee -- # E. McMahon (1931-1989) for sed's syntax. :-) -- sed -n ' -- p -- /[$]LINENO/= -- ' <$as_myself | -- sed ' -- s/[$]LINENO.*/&-/ -- t lineno -- b -- :lineno -- N -- :loop -- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -- t loop -- s/-\n.*// -- ' >$as_me.lineno && -- chmod +x "$as_me.lineno" || -- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } - -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensitive to this). -- . "./$as_me.lineno" -- # Exit status is that of the last command. -- exit --} -+ if test "${ac_cv_header_cups_cups_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -+echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_cups_cups_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 -+echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <cups/cups.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no -+fi - --if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -- as_dirname=dirname -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 -+echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <cups/cups.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes - else -- as_dirname=false -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no - fi - --ECHO_C= ECHO_N= ECHO_T= --case `echo -n x` in ---n*) -- case `echo 'x\c'` in -- *c*) ECHO_T=' ';; # ECHO_T is single tab character. -- *) ECHO_C='\c';; -- esac;; --*) -- ECHO_N='-n';; -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; - esac --if expr a : '\(a\)' >/dev/null 2>&1 && -- test "X`expr 00001 : '.*\(...\)'`" = X001; then -- as_expr=expr -+{ echo "$as_me:$LINENO: checking for cups/cups.h" >&5 -+echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_cups_cups_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- as_expr=false -+ ac_cv_header_cups_cups_h=$ac_header_preproc - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } - --rm -f conf$$ conf$$.exe conf$$.file --if test -d conf$$.dir; then -- rm -f conf$$.dir/conf$$.file --else -- rm -f conf$$.dir -- mkdir conf$$.dir 2>/dev/null - fi --if (echo >conf$$.file) 2>/dev/null; then -- if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -p' -- elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -- else -- as_ln_s='cp -p' -- fi -+if test $ac_cv_header_cups_cups_h = yes; then -+ : - else -- as_ln_s='cp -p' -+ { { echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 -+echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} -+ { (exit 1); exit 1; }; } - fi --rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file --rmdir conf$$.dir 2>/dev/null - --if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: --else -- test -d ./-p && rmdir ./-p -- as_mkdir_p=false --fi - --if test -x / >/dev/null 2>&1; then -- as_test_x='test -x' --else -- 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 -- ' +- +- +-if test "x$CUPS_CONFIG" != "xno"; then + if test "x$CUPS_CONFIG" != "xno"; then -+ HAVE_CUPS_TRUE= -+ HAVE_CUPS_FALSE='#' -+else -+ HAVE_CUPS_TRUE='#' -+ HAVE_CUPS_FALSE= - fi --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'" -- --# Sed expression to map a string onto a valid variable name. --as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + HAVE_CUPS_TRUE= + HAVE_CUPS_FALSE='#' + else +@@ -34998,9 +32610,7 @@ + LIBS="$gtk_save_libs" + + else - - --exec 6>&1 -- --# Save the log message, to keep $[0] and so on meaningful, and to --# report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. --ac_log=" --This file was extended by gtk+ $as_me 2.14.5, which was --generated by GNU Autoconf 2.63. Invocation command line was -- -- CONFIG_FILES = $CONFIG_FILES -- CONFIG_HEADERS = $CONFIG_HEADERS -- CONFIG_LINKS = $CONFIG_LINKS -- CONFIG_COMMANDS = $CONFIG_COMMANDS -- $ $0 $@ - --on `(hostname || uname -n) 2>/dev/null | sed 1q` --" - -+ gtk_save_cflags="$CFLAGS" -+ CFLAGS="$CUPS_CFLAGS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF -- --case $ac_config_files in *" --"*) set x $ac_config_files; shift; ac_config_files=$*;; --esac -- --case $ac_config_headers in *" --"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <cups/http.h> -+int -+main () -+{ -+http_t http; char *s = http.authstring; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - -- --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --# Files that config.status was made for. --config_files="$ac_config_files" --config_headers="$ac_config_headers" --config_commands="$ac_config_commands" -- -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_HTTP_AUTHSTRING - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --Usage: $0 [OPTION]... [FILE]... - -- -h, --help print this help, then exit -- -V, --version print version number and configuration settings, then exit -- -q, --quiet, --silent -- do not print progress messages -- -d, --debug don't remove temporary files -- --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -- --header=FILE[:TEMPLATE] -- instantiate the configuration header FILE -+fi - --Configuration files: --$config_files -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS="$gtk_save_cflags" - --Configuration headers: --$config_headers - --Configuration commands: --$config_commands - --Report bugs to <bug-autoconf@gnu.org>." -+ gtk_save_libs="$LIBS" -+ LIBS="$CUPS_LIBS" - -+for ac_func in httpGetAuthString -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --ac_cs_version="\\ --gtk+ config.status 2.14.5 --configured by $0, generated by GNU Autoconf 2.63, -- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func - --Copyright (C) 2008 Free Software Foundation, Inc. --This config.status script is free software; the Free Software Foundation --gives unlimited permission to copy, distribute and modify it." -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ - --ac_pwd='$ac_pwd' --srcdir='$srcdir' --INSTALL='$INSTALL' --AWK='$AWK' --test -n "\$AWK" || AWK=awk --_ACEOF -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --# The default lists apply if the user does not specify any file. --ac_need_defaults=: --while test $# != 0 --do -- case $1 in -- --*=*) -- ac_option=`expr "X$1" : 'X\([^=]*\)='` -- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` -- ac_shift=: -- ;; -- *) -- ac_option=$1 -- ac_optarg=$2 -- ac_shift=shift -- ;; -- esac -- -- case $ac_option in -- # Handling of the options. -- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -- ac_cs_recheck=: ;; -- --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -- $as_echo "$ac_cs_version"; exit ;; -- --debug | --debu | --deb | --de | --d | -d ) -- debug=: ;; -- --file | --fil | --fi | --f ) -- $ac_shift -- case $ac_optarg in -- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" -- ac_need_defaults=false;; -- --header | --heade | --head | --hea ) -- $ac_shift -- case $ac_optarg in -- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -- esac -- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" -- ac_need_defaults=false;; -- --he | --h) -- # Conflict between --help and --header -- { $as_echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- $as_echo "$ac_cs_usage"; exit ;; -- -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -- | -silent | --silent | --silen | --sile | --sil | --si | --s) -- ac_cs_silent=: ;; -- -- # This is an error. -- -*) { $as_echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } ;; -- -- *) ac_config_targets="$ac_config_targets $1" -- ac_need_defaults=false ;; -+#undef $ac_func - -- esac -- shift --done -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif - --ac_configure_extra_args= -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+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); } && { -+ 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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --if $ac_cs_silent; then -- exec 6>/dev/null -- ac_configure_extra_args="$ac_configure_extra_args --silent" -+ eval "$as_ac_var=no" +-if false; then ++ if false; then + HAVE_CUPS_TRUE= + HAVE_CUPS_FALSE='#' + else +@@ -35317,9 +32927,7 @@ + enable_test_print_backend=no fi --_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --if \$ac_cs_recheck; then -- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -- shift -- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -- CONFIG_SHELL='$SHELL' -- export CONFIG_SHELL -- exec "\$@" -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext - fi -- --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX -- $as_echo "$ac_log" --} >&5 -- -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --# --# INIT-COMMANDS --# --AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - --# 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 -- --sed_quote_subst='$sed_quote_subst' --double_quote_subst='$double_quote_subst' --delay_variable_subst='$delay_variable_subst' --enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' --AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' --DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' --OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' --macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' --macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' --pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' --enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' --host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' --host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' --host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' --build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' --build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' --build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' --SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' --Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' --GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' --EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' --FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' --LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' --NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' --LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' --max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' --ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' --exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' --lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' --lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' --lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' --reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' --reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' --deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' --file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' --AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' --AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' --STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' --RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' --old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' --CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' --CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' --compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' --GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' --objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' --SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' --ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' --MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' --need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' --DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' --NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' --LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' --OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' --OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' --libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' --shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' --extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' --export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' --archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' --module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' --module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' --with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' --allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' --no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' --inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' --link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' --fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' --always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' --export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' --exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' --include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' --prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' --file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' --variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' --need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' --need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' --version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' --runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' --shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' --shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' --libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' --library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' --soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' --postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' --finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' --finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' --sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' --sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' --enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' --old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' --striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' --predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' --postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' --predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' --postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' --LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' --GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' --lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' --enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' --export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' --allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' --no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' --inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' --link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' --fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' --always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' --export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' --include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' --prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' --file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' --hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' --predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' --postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' --predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' --postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' --compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -- --LTCC='$LTCC' --LTCFLAGS='$LTCFLAGS' --compiler='$compiler_DEFAULT' -- --# Quote evaled strings. --for var in SED \ --GREP \ --EGREP \ --FGREP \ --LD \ --NM \ --LN_S \ --lt_SP2NL \ --lt_NL2SP \ --reload_flag \ --deplibs_check_method \ --file_magic_cmd \ --AR \ --AR_FLAGS \ --STRIP \ --RANLIB \ --CC \ --CFLAGS \ --compiler \ --lt_cv_sys_global_symbol_pipe \ --lt_cv_sys_global_symbol_to_cdecl \ --lt_cv_sys_global_symbol_to_c_name_address \ --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ --SHELL \ --ECHO \ --lt_prog_compiler_no_builtin_flag \ --lt_prog_compiler_wl \ --lt_prog_compiler_pic \ --lt_prog_compiler_static \ --lt_cv_prog_compiler_c_o \ --need_locks \ --DSYMUTIL \ --NMEDIT \ --LIPO \ --OTOOL \ --OTOOL64 \ --shrext_cmds \ --export_dynamic_flag_spec \ --whole_archive_flag_spec \ --compiler_needs_object \ --with_gnu_ld \ --allow_undefined_flag \ --no_undefined_flag \ --hardcode_libdir_flag_spec \ --hardcode_libdir_flag_spec_ld \ --hardcode_libdir_separator \ --fix_srcfile_path \ --exclude_expsyms \ --include_expsyms \ --file_list_spec \ --variables_saved_for_relink \ --libname_spec \ --library_names_spec \ --soname_spec \ --finish_eval \ --old_striplib \ --striplib \ --compiler_lib_search_dirs \ --predep_objects \ --postdep_objects \ --predeps \ --postdeps \ --compiler_lib_search_path \ --LD_CXX \ --compiler_CXX \ --lt_prog_compiler_no_builtin_flag_CXX \ --lt_prog_compiler_wl_CXX \ --lt_prog_compiler_pic_CXX \ --lt_prog_compiler_static_CXX \ --lt_cv_prog_compiler_c_o_CXX \ --export_dynamic_flag_spec_CXX \ --whole_archive_flag_spec_CXX \ --compiler_needs_object_CXX \ --with_gnu_ld_CXX \ --allow_undefined_flag_CXX \ --no_undefined_flag_CXX \ --hardcode_libdir_flag_spec_CXX \ --hardcode_libdir_flag_spec_ld_CXX \ --hardcode_libdir_separator_CXX \ --fix_srcfile_path_CXX \ --exclude_expsyms_CXX \ --include_expsyms_CXX \ --file_list_spec_CXX \ --compiler_lib_search_dirs_CXX \ --predep_objects_CXX \ --postdep_objects_CXX \ --predeps_CXX \ --postdeps_CXX \ --compiler_lib_search_path_CXX; do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -- *[\\\\\\\`\\"\\\$]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -- ;; -- *) -- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -- ;; -- esac --done - --# Double-quote double-evaled strings. --for var in reload_cmds \ --old_postinstall_cmds \ --old_postuninstall_cmds \ --old_archive_cmds \ --extract_expsyms_cmds \ --old_archive_from_new_cmds \ --old_archive_from_expsyms_cmds \ --archive_cmds \ --archive_expsym_cmds \ --module_cmds \ --module_expsym_cmds \ --export_symbols_cmds \ --prelink_cmds \ --postinstall_cmds \ --postuninstall_cmds \ --finish_cmds \ --sys_lib_search_path_spec \ --sys_lib_dlsearch_path_spec \ --old_archive_cmds_CXX \ --old_archive_from_new_cmds_CXX \ --old_archive_from_expsyms_cmds_CXX \ --archive_cmds_CXX \ --archive_expsym_cmds_CXX \ --module_cmds_CXX \ --module_expsym_cmds_CXX \ --export_symbols_cmds_CXX \ --prelink_cmds_CXX; do -- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -- *[\\\\\\\`\\"\\\$]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -- ;; -- *) -- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -- ;; -- esac -+fi +-if test "x$enable_test_print_backend" != "xno"; then ++ if test "x$enable_test_print_backend" != "xno"; then + TEST_PRINT_BACKEND_TRUE= + TEST_PRINT_BACKEND_FALSE='#' + else +@@ -35442,9 +33050,7 @@ done --# Fix-up fallback echo if it was mangled by the above quoting rules. --case \$lt_ECHO in --*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` -- ;; --esac -- --ac_aux_dir='$ac_aux_dir' --xsi_shell='$xsi_shell' --lt_shell_append='$lt_shell_append' -+ LIBS="$gtk_save_libs" --# See if we are running on zsh, and set the options which allow our --# commands through without removal of \ escapes INIT. --if test -n "\${ZSH_VERSION+set}" ; then -- setopt NO_GLOB_SUBST -+else -+ if false; then -+ HAVE_CUPS_TRUE= -+ HAVE_CUPS_FALSE='#' -+else -+ HAVE_CUPS_TRUE='#' -+ HAVE_CUPS_FALSE= - fi - -+fi - -- PACKAGE='$PACKAGE' -- VERSION='$VERSION' -- TIMESTAMP='$TIMESTAMP' -- RM='$RM' -- ofile='$ofile' - - -+gtk_save_cppflags="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" - --ac_aux_dir='$ac_aux_dir' -+if test "${ac_cv_header_cairo_pdf_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 -+echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_cairo_pdf_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking cairo-pdf.h usability" >&5 -+echo $ECHO_N "checking cairo-pdf.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <cairo-pdf.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_compiler=no -+fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - -+# Is the header present? -+{ echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 -+echo $ECHO_N "checking cairo-pdf.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <cairo-pdf.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_header_preproc=no -+fi - --if test "x$gdktarget" = "xx11" ; then -- gdk_windowing=' --#define GDK_WINDOWING_X11' --elif test "x$gdktarget" = "xwin32" ; then -- gdk_windowing=' --#define GDK_NATIVE_WINDOW_POINTER -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - --#define GDK_WINDOWING_WIN32' --elif test "x$gdktarget" = "xquartz" ; then -- gdk_windowing=' --#define GDK_WINDOWING_QUARTZ' --elif test "x$gdktarget" = "xdirectfb" ; then -- gdk_windowing=' --#define GDK_WINDOWING_DIRECTFB' -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 -+echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_cairo_pdf_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_header_cairo_pdf_h=$ac_header_preproc - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } - --if test x$gdk_wchar_h = xyes; then -- gdk_wc=' --#define GDK_HAVE_WCHAR_H 1' --fi --if test x$gdk_wctype_h = xyes; then -- gdk_wc="\$gdk_wc --#define GDK_HAVE_WCTYPE_H 1" - fi --if test x$gdk_working_wctype = xno; then -- gdk_wc="\$gdk_wc --#define GDK_HAVE_BROKEN_WCTYPE 1" -+if test $ac_cv_header_cairo_pdf_h = yes; then -+ : -+else -+ { { echo "$as_me:$LINENO: error: -+*** Can't find cairo-pdf.h. You must build Cairo with the pdf -+*** backend enabled." >&5 -+echo "$as_me: error: -+*** Can't find cairo-pdf.h. You must build Cairo with the pdf -+*** backend enabled." >&2;} -+ { (exit 1); exit 1; }; } - fi - - - -+if test "$os_win32" != "yes"; then -+ if test "${ac_cv_header_cairo_ps_h+set}" = set; then -+ { echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 -+echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_cairo_ps_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } -+else -+ # Is the header compilable? -+{ echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 -+echo $ECHO_N "checking cairo-ps.h usability... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <cairo-ps.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --_ACEOF -- --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -- --# Handling of arguments. --for ac_config_target in $ac_config_targets --do -- case $ac_config_target in -- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; -- "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; -- "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; -- "gdk/gdkconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gdk/gdkconfig.h" ;; -- "config.h.win32") CONFIG_FILES="$CONFIG_FILES config.h.win32" ;; -- "gtk-zip.sh") CONFIG_FILES="$CONFIG_FILES gtk-zip.sh" ;; -- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- "gdk-pixbuf-2.0.pc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf-2.0.pc" ;; -- "gdk-2.0.pc") CONFIG_FILES="$CONFIG_FILES gdk-2.0.pc" ;; -- "gtk+-2.0.pc") CONFIG_FILES="$CONFIG_FILES gtk+-2.0.pc" ;; -- "gtk+-unix-print-2.0.pc") CONFIG_FILES="$CONFIG_FILES gtk+-unix-print-2.0.pc" ;; -- "gail.pc") CONFIG_FILES="$CONFIG_FILES gail.pc" ;; -- "gdk-pixbuf-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf-2.0-uninstalled.pc" ;; -- "gdk-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gdk-2.0-uninstalled.pc" ;; -- "gtk+-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gtk+-2.0-uninstalled.pc" ;; -- "gail-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gail-uninstalled.pc" ;; -- "m4macros/Makefile") CONFIG_FILES="$CONFIG_FILES m4macros/Makefile" ;; -- "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; -- "po-properties/Makefile.in") CONFIG_FILES="$CONFIG_FILES po-properties/Makefile.in" ;; -- "demos/Makefile") CONFIG_FILES="$CONFIG_FILES demos/Makefile" ;; -- "demos/gtk-demo/Makefile") CONFIG_FILES="$CONFIG_FILES demos/gtk-demo/Makefile" ;; -- "demos/gtk-demo/geninclude.pl") CONFIG_FILES="$CONFIG_FILES demos/gtk-demo/geninclude.pl" ;; -- "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; -- "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; -- "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; -- "docs/reference/gdk-pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk-pixbuf/Makefile" ;; -- "docs/reference/gdk-pixbuf/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk-pixbuf/version.xml" ;; -- "docs/reference/gdk/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk/Makefile" ;; -- "docs/reference/gdk/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk/version.xml" ;; -- "docs/reference/gtk/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gtk/Makefile" ;; -- "docs/reference/gtk/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gtk/version.xml" ;; -- "docs/reference/libgail-util/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/libgail-util/Makefile" ;; -- "docs/faq/Makefile") CONFIG_FILES="$CONFIG_FILES docs/faq/Makefile" ;; -- "docs/tools/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tools/Makefile" ;; -- "docs/tutorial/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tutorial/Makefile" ;; -- "gdk-pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/Makefile" ;; -- "gdk-pixbuf/gdk_pixbuf.rc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/gdk_pixbuf.rc" ;; -- "gdk-pixbuf/gdk-pixbuf-features.h") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/gdk-pixbuf-features.h" ;; -- "gdk-pixbuf/pixops/Makefile") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/pixops/Makefile" ;; -- "gdk/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/Makefile" ;; -- "gdk/x11/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/x11/Makefile" ;; -- "gdk/win32/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/win32/Makefile" ;; -- "gdk/win32/rc/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/win32/rc/Makefile" ;; -- "gdk/win32/rc/gdk.rc") CONFIG_FILES="$CONFIG_FILES gdk/win32/rc/gdk.rc" ;; -- "gdk/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/quartz/Makefile" ;; -- "gdk/directfb/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/directfb/Makefile" ;; -- "gdk/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/tests/Makefile" ;; -- "gtk/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/Makefile" ;; -- "gtk/makefile.msc") CONFIG_FILES="$CONFIG_FILES gtk/makefile.msc" ;; -- "gtk/gtkversion.h") CONFIG_FILES="$CONFIG_FILES gtk/gtkversion.h" ;; -- "gtk/gtk-win32.rc") CONFIG_FILES="$CONFIG_FILES gtk/gtk-win32.rc" ;; -- "gtk/theme-bits/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/theme-bits/Makefile" ;; -- "gtk/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/tests/Makefile" ;; -- "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; -- "modules/other/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/Makefile" ;; -- "modules/other/gail/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/Makefile" ;; -- "modules/other/gail/libgail-util/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/libgail-util/Makefile" ;; -- "modules/other/gail/tests/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/tests/Makefile" ;; -- "modules/engines/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/Makefile" ;; -- "modules/engines/pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/pixbuf/Makefile" ;; -- "modules/engines/ms-windows/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Makefile" ;; -- "modules/engines/ms-windows/Theme/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Theme/Makefile" ;; -- "modules/engines/ms-windows/Theme/gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Theme/gtk-2.0/Makefile" ;; -- "modules/input/Makefile") CONFIG_FILES="$CONFIG_FILES modules/input/Makefile" ;; -- "modules/printbackends/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/Makefile" ;; -- "modules/printbackends/cups/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/cups/Makefile" ;; -- "modules/printbackends/lpr/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/lpr/Makefile" ;; -- "modules/printbackends/file/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/file/Makefile" ;; -- "modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;; -- "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;; -- "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; -- "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; -- "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; -- -- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -- esac --done -- -- --# If the user did not use the arguments to specify the items to instantiate, --# then the envvar interface is used. Set only those that are not. --# We use the long form for the default assignment because of an extremely --# bizarre bug on SunOS 4.1.3. --if $ac_need_defaults; then -- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers -- test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -+ ac_header_compiler=no - fi - --# Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason against having it here, and in addition, --# creating and moving files from /tmp can sometimes cause problems. --# Hook for its removal unless debugging. --# Note that there is a small window in which the directory will not be cleaned: --# after its creation but before its name has been assigned to `$tmp'. --$debug || --{ -- tmp= -- trap 'exit_status=$? -- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status --' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 --} --# Create a (secure) tmp directory for tmp files. -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - --{ -- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" --} || --{ -- tmp=./conf$$-$RANDOM -- (umask 077 && mkdir "$tmp") --} || --{ -- $as_echo "$as_me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } --} -+# Is the header present? -+{ echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 -+echo $ECHO_N "checking cairo-ps.h presence... $ECHO_C" >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <cairo-ps.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 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); } >/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 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Set up the scripts for CONFIG_FILES section. --# No need to generate them if there are no CONFIG_FILES. --# This happens for instance with `./config.status config.h'. --if test -n "$CONFIG_FILES"; then -+ ac_header_preproc=no -+fi - -+rm -f conftest.err conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - --ac_cr=' ' --ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` --if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -- ac_cs_awk_cr='\\r' -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: cairo-ps.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: cairo-ps.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: cairo-ps.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## --------------------------------------------------------------------- ## -+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## -+## --------------------------------------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 -+echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } -+if test "${ac_cv_header_cairo_ps_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cs_awk_cr=$ac_cr -+ ac_cv_header_cairo_ps_h=$ac_header_preproc - fi -+{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 -+echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } - --echo 'BEGIN {' >"$tmp/subs1.awk" && --_ACEOF -- -- --{ -- echo "cat >conf$$subs.awk <<_ACEOF" && -- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -- echo "_ACEOF" --} >conf$$subs.sh || -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } --ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` --ac_delim='%!_!# ' --for ac_last_try in false false false false false :; do -- . ./conf$$subs.sh || -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+fi -+if test $ac_cv_header_cairo_ps_h = yes; then -+ : -+else -+ { { echo "$as_me:$LINENO: error: -+*** Can't find cairo-ps.h. You must build Cairo with the -+*** postscript backend enabled." >&5 -+echo "$as_me: error: -+*** Can't find cairo-ps.h. You must build Cairo with the -+*** postscript backend enabled." >&2;} - { (exit 1); exit 1; }; } -+fi - -- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -- if test $ac_delim_n = $ac_delim_num; then -- break -- elif $ac_last_try; then -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --$as_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 --rm -f conf$$subs.sh - --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --cat >>"\$tmp/subs1.awk" <<\\_ACAWK && --_ACEOF --sed -n ' --h --s/^/S["/; s/!.*/"]=/ --p --g --s/^[^!]*!// --:repl --t repl --s/'"$ac_delim"'$// --t delim --:nl --h --s/\(.\{148\}\).*/\1/ --t more1 --s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ --p --n --b repl --:more1 --s/["\\]/\\&/g; s/^/"/; s/$/"\\/ --p --g --s/.\{148\}// --t nl --:delim --h --s/\(.\{148\}\).*/\1/ --t more2 --s/["\\]/\\&/g; s/^/"/; s/$/"/ --p --b --:more2 --s/["\\]/\\&/g; s/^/"/; s/$/"\\/ --p --g --s/.\{148\}// --t delim --' <conf$$subs.awk | sed ' --/^[^""]/{ -- N -- s/\n// --} --' >>$CONFIG_STATUS || ac_write_fail=1 --rm -f conf$$subs.awk --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --_ACAWK --cat >>"\$tmp/subs1.awk" <<_ACAWK && -- for (key in S) S_is_set[key] = 1 -- FS = "" -+fi - --} --{ -- line = $ 0 -- nfields = split(line, field, "@") -- substed = 0 -- len = length(field[1]) -- for (i = 2; i < nfields; i++) { -- key = field[i] -- keylen = length(key) -- if (S_is_set[key]) { -- value = S[key] -- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -- len += length(value) + length(field[++i]) -- substed = 1 -- } else -- len += 1 + keylen -- } -+CPPFLAGS="$gtk_save_cppflags" - -- print line --} - --_ACAWK --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+# Check whether --enable-test-print-backend was given. -+if test "${enable_test_print_backend+set}" = set; then -+ enableval=$enable_test_print_backend; - else -- cat --fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 --$as_echo "$as_me: error: could not setup config files machinery" >&2;} -- { (exit 1); exit 1; }; } --_ACEOF -+ enable_test_print_backend=no -+fi - --# 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 --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/ --s/:*\${srcdir}:*/:/ --s/:*@srcdir@:*/:/ --s/^\([^=]*=[ ]*\):*/\1/ --s/:*$// --s/^[^=]*=[ ]*$// --}' -+ if test "x$enable_test_print_backend" != "xno"; then -+ TEST_PRINT_BACKEND_TRUE= -+ TEST_PRINT_BACKEND_FALSE='#' -+else -+ TEST_PRINT_BACKEND_TRUE='#' -+ TEST_PRINT_BACKEND_FALSE= - fi - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --fi # test -n "$CONFIG_FILES" - --# Set up the scripts for CONFIG_HEADERS section. --# No need to generate them if there are no CONFIG_HEADERS. --# This happens for instance with `./config.status Makefile'. --if test -n "$CONFIG_HEADERS"; then --cat >"$tmp/defines.awk" <<\_ACAWK || --BEGIN { --_ACEOF - --# Transform confdefs.h into an awk script `defines.awk', embedded as --# here-document in config.status, that substitutes the proper values into --# config.h.in to produce config.h. -+################################################################ -+# Strip -export-dynamic from the link lines of various libraries -+################################################################ - --# Create a delimiter string that does not exist in confdefs.h, to ease --# handling of long lines. --ac_delim='%!_!# ' --for ac_last_try in false false :; do -- ac_t=`sed -n "/$ac_delim/p" confdefs.h` -- if test -z "$ac_t"; then -- break -- elif $ac_last_try; then -- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 --$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} -- { (exit 1); exit 1; }; } -- else -- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -- fi --done -+# -+# pkg-config --libs gmodule includes the "export_dynamic" flag, -+# but this flag is only meaningful for executables. For libraries -+# the effect is undefined; what it causes on Linux is that the -+# export list from -export-symbols-regex is ignored and everything -+# is exported -+# -+# We are using gmodule-no-export now, but I'm leaving the stripping -+# code in place for now, since pango and atk still require gmodule. -+export SED -+export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+if test -n "$export_dynamic"; then -+ GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` -+ GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` -+ GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` -+ GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` -+fi - --# For the awk script, D is an array of macro values keyed by name, --# likewise P contains macro parameters if any. Preserve backslash --# newline sequences. - --ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* --sed -n ' --s/.\{148\}/&'"$ac_delim"'/g --t rset --:rset --s/^[ ]*#[ ]*define[ ][ ]*/ / --t def --d --:def --s/\\$// --t bsnl --s/["\\]/\\&/g --s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ --D["\1"]=" \3"/p --s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p --d --:bsnl --s/["\\]/\\&/g --s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ --D["\1"]=" \3\\\\\\n"\\/p --t cont --s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p --t cont --d --:cont --n --s/.\{148\}/&'"$ac_delim"'/g --t clear --:clear --s/\\$// --t bsnlc --s/["\\]/\\&/g; s/^/"/; s/$/"/p --d --:bsnlc --s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p --b cont --' <confdefs.h | sed ' --s/'"$ac_delim"'/"\\\ --"/g' >>$CONFIG_STATUS || ac_write_fail=1 -- --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -- for (key in D) D_is_set[key] = 1 -- FS = "" --} --/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { -- line = \$ 0 -- split(line, arg, " ") -- if (arg[1] == "#") { -- defundef = arg[2] -- mac1 = arg[3] -- } else { -- defundef = substr(arg[1], 2) -- mac1 = arg[2] -- } -- split(mac1, mac2, "(") #) -- macro = mac2[1] -- prefix = substr(line, 1, index(line, defundef) - 1) -- if (D_is_set[macro]) { -- # Preserve the white space surrounding the "#". -- print prefix "define", macro P[macro] D[macro] -- next -- } else { -- # Replace #undef with comments. This is necessary, for example, -- # in the case of _POSIX_SOURCE, which is predefined and required -- # on some systems where configure will not decide to define it. -- if (defundef == "undef") { -- print "/*", prefix defundef, macro, "*/" -- next -- } -- } --} --{ print } --_ACAWK --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 --$as_echo "$as_me: error: could not setup config headers machinery" >&2;} -- { (exit 1); exit 1; }; } --fi # test -n "$CONFIG_HEADERS" -+################################################## -+# Checks for gtk-doc and docbook-tools -+################################################## - - --eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" --shift --for ac_tag --do -- case $ac_tag in -- :[FHLC]) ac_mode=$ac_tag; continue;; -- esac -- case $ac_mode$ac_tag in -- :[FHL]*:*);; -- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 --$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} -- { (exit 1); exit 1; }; };; -- :[FH]-) ac_tag=-:-;; -- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -- esac -- ac_save_IFS=$IFS -- IFS=: -- set x $ac_tag -- IFS=$ac_save_IFS -- shift -- ac_file=$1 -- shift - -- case $ac_mode in -- :L) ac_source=$1;; -- :[FH]) -- ac_file_inputs= -- for ac_f -- do -- case $ac_f in -- -) ac_f="$tmp/stdin";; -- *) # Look for the file first in the build tree, then in the source tree -- # (if the path is not absolute). The absolute path cannot be DOS-style, -- # because $ac_f cannot contain `:'. -- test -f "$ac_f" || -- case $ac_f in -- [\\/$]*) false;; -- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -- esac || -- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 --$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} -- { (exit 1); exit 1; }; };; -- esac -- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -- ac_file_inputs="$ac_file_inputs '$ac_f'" -- done -+# Check whether --with-html-dir was given. -+if test "${with_html_dir+set}" = set; then -+ withval=$with_html_dir; -+else -+ with_html_dir='${datadir}/gtk-doc/html' -+fi - -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- configure_input='Generated from '` -- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -- `' by configure.' -- if test x"$ac_file" != x-; then -- configure_input="$ac_file. $configure_input" -- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 --$as_echo "$as_me: creating $ac_file" >&6;} -- fi -- # Neutralize special characters interpreted by sed in replacement strings. -- case $configure_input in #( -- *\&* | *\|* | *\\* ) -- ac_sed_conf_input=`$as_echo "$configure_input" | -- sed 's/[\\\\&|]/\\\\&/g'`;; #( -- *) ac_sed_conf_input=$configure_input;; -- esac -+ HTML_DIR="$with_html_dir" - -- case $ac_tag in -- *:-:* | *:-) cat >"$tmp/stdin" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } ;; -- esac -- ;; -- esac - -- ac_dir=`$as_dirname -- "$ac_file" || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- { as_dir="$ac_dir" -- case $as_dir in #( -- -*) as_dir=./$as_dir;; -- esac -- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -- as_dirs= -- while :; do -- case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -- *) as_qdir=$as_dir;; -- esac -- as_dirs="'$as_qdir' $as_dirs" -- as_dir=`$as_dirname -- "$as_dir" || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- test -d "$as_dir" && break -- done -- test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -- { (exit 1); exit 1; }; }; } -- ac_builddir=. -+ # Check whether --enable-gtk-doc was given. -+if test "${enable_gtk_doc+set}" = set; then -+ enableval=$enable_gtk_doc; -+else -+ enable_gtk_doc=no -+fi - --case "$ac_dir" in --.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; --*) -- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -- # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -- case $ac_top_builddir_sub in -- "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -- esac ;; --esac --ac_abs_top_builddir=$ac_pwd --ac_abs_builddir=$ac_pwd$ac_dir_suffix --# for backward compatibility: --ac_top_builddir=$ac_top_build_prefix - --case $srcdir in -- .) # We are building in place. -- ac_srcdir=. -- ac_top_srcdir=$ac_top_builddir_sub -- ac_abs_top_srcdir=$ac_pwd ;; -- [\\/]* | ?:[\\/]* ) # Absolute name. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir -- ac_abs_top_srcdir=$srcdir ;; -- *) # Relative name. -- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_build_prefix$srcdir -- ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+ if test x$enable_gtk_doc = xyes; then -+ if test -n "$PKG_CONFIG" && \ -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.8") 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ : -+else -+ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 -+echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ fi -+ -+ { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 -+echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 -+echo "${ECHO_T}$enable_gtk_doc" >&6; } -+ -+ for ac_prog in gtkdoc-check -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $GTKDOC_CHECK in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ ;; - esac --ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -+fi -+GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -+if test -n "$GTKDOC_CHECK"; then -+ { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 -+echo "${ECHO_T}$GTKDOC_CHECK" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - - -- case $ac_mode in -- :F) -- # -- # CONFIG_FILE -- # -+ test -n "$GTKDOC_CHECK" && break -+done - -- case $INSTALL in -- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; -- esac --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --# If the template does not know about datarootdir, expand it. --# FIXME: This hack should be removed a few years after 2.60. --ac_datarootdir_hack=; ac_datarootdir_seen= +-if test x$enable_gtk_doc = xyes; then + if test x$enable_gtk_doc = xyes; then -+ ENABLE_GTK_DOC_TRUE= -+ ENABLE_GTK_DOC_FALSE='#' -+else -+ ENABLE_GTK_DOC_TRUE='#' -+ ENABLE_GTK_DOC_FALSE= -+fi + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' + else +@@ -35452,9 +33058,7 @@ + ENABLE_GTK_DOC_FALSE= + fi --ac_sed_dataroot=' --/datarootdir/ { -- p -- q --} --/@datadir@/p --/@docdir@/p --/@infodir@/p --/@localedir@/p --/@mandir@/p --' --case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in --*datarootdir*) ac_datarootdir_seen=yes;; --*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 --$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} --_ACEOF --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -- ac_datarootdir_hack=' -- s&@datadir@&$datadir&g -- s&@docdir@&$docdir&g -- s&@infodir@&$infodir&g -- s&@localedir@&$localedir&g -- s&@mandir@&$mandir&g -- s&\\\${datarootdir}&$datarootdir&g' ;; +- +- +-if test -n "$LIBTOOL"; then + if test -n "$LIBTOOL"; then -+ GTK_DOC_USE_LIBTOOL_TRUE= -+ GTK_DOC_USE_LIBTOOL_FALSE='#' -+else -+ GTK_DOC_USE_LIBTOOL_TRUE='#' -+ GTK_DOC_USE_LIBTOOL_FALSE= -+fi -+ -+ -+ -+# Extract the first word of "db2html", so it can be a program name with args. -+set dummy db2html; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_prog_DB2HTML+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$DB2HTML"; then -+ ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+ test -z "$ac_cv_prog_DB2HTML" && ac_cv_prog_DB2HTML="false" -+fi -+fi -+DB2HTML=$ac_cv_prog_DB2HTML -+if test -n "$DB2HTML"; then -+ { echo "$as_me:$LINENO: result: $DB2HTML" >&5 -+echo "${ECHO_T}$DB2HTML" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi -+ -+ + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' + else +@@ -35502,9 +33106,7 @@ + fi + + +- +- +-if $DB2HTML; then + if $DB2HTML; then -+ HAVE_DOCBOOK_TRUE= -+ HAVE_DOCBOOK_FALSE='#' -+else -+ HAVE_DOCBOOK_TRUE='#' -+ HAVE_DOCBOOK_FALSE= + HAVE_DOCBOOK_TRUE= + HAVE_DOCBOOK_FALSE='#' + else +@@ -35678,9 +33280,7 @@ + + fi + +- +- +-if test x$enable_man != xno; then ++ if test x$enable_man != xno; then + ENABLE_MAN_TRUE= + ENABLE_MAN_FALSE='#' + else +@@ -35811,6 +33411,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 ++ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_STATIC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++$as_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 -+ -+ -+# Check whether --enable-man was given. -+if test "${enable_man+set}" = set; then -+ enableval=$enable_man; enable_man=yes -+else -+ enable_man=no + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -35832,6 +33439,20 @@ + 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 ++ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } +fi ++if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then ++ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -35874,6 +33495,13 @@ + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -36690,6 +34318,7 @@ + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' ++MKDIR_P='$MKDIR_P' + AWK='$AWK' + test -n "\$AWK" || AWK=awk + _ACEOF +@@ -36794,6 +34423,359 @@ + AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + + ++# 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 + ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' ++AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' ++DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' ++OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' ++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' ++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' ++pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' ++enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' ++host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' ++host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' ++host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' ++build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' ++build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' ++build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' ++SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' ++Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' ++GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' ++EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' ++FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' ++LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' ++NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' ++LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' ++max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' ++ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' ++exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' ++lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' ++lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' ++lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' ++reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' ++reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' ++file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' ++AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' ++AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' ++STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' ++RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' ++old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' ++CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' ++compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' ++GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' ++objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' ++SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' ++ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' ++MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' ++need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' ++DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' ++NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' ++LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' ++OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' ++OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' ++libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' ++shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' ++export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' ++allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' ++no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' ++inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' ++link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' ++fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' ++always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' ++export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' ++include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' ++prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' ++variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' ++need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' ++need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' ++version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' ++runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' ++shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' ++libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' ++library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' ++soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' ++postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' ++finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' ++sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' ++sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' ++enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' ++old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' ++striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' ++predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' ++postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' ++predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' ++postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' ++LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' + -+if test "${enable_man}" != no; then -+ # Extract the first word of "xsltproc", so it can be a program name with args. -+set dummy xsltproc; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_XSLTPROC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $XSLTPROC in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 -+ fi ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# Quote evaled strings. ++for var in SED \ ++GREP \ ++EGREP \ ++FGREP \ ++LD \ ++NM \ ++LN_S \ ++lt_SP2NL \ ++lt_NL2SP \ ++reload_flag \ ++deplibs_check_method \ ++file_magic_cmd \ ++AR \ ++AR_FLAGS \ ++STRIP \ ++RANLIB \ ++CC \ ++CFLAGS \ ++compiler \ ++lt_cv_sys_global_symbol_pipe \ ++lt_cv_sys_global_symbol_to_cdecl \ ++lt_cv_sys_global_symbol_to_c_name_address \ ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ ++SHELL \ ++ECHO \ ++lt_prog_compiler_no_builtin_flag \ ++lt_prog_compiler_wl \ ++lt_prog_compiler_pic \ ++lt_prog_compiler_static \ ++lt_cv_prog_compiler_c_o \ ++need_locks \ ++DSYMUTIL \ ++NMEDIT \ ++LIPO \ ++OTOOL \ ++OTOOL64 \ ++shrext_cmds \ ++export_dynamic_flag_spec \ ++whole_archive_flag_spec \ ++compiler_needs_object \ ++with_gnu_ld \ ++allow_undefined_flag \ ++no_undefined_flag \ ++hardcode_libdir_flag_spec \ ++hardcode_libdir_flag_spec_ld \ ++hardcode_libdir_separator \ ++fix_srcfile_path \ ++exclude_expsyms \ ++include_expsyms \ ++file_list_spec \ ++variables_saved_for_relink \ ++libname_spec \ ++library_names_spec \ ++soname_spec \ ++finish_eval \ ++old_striplib \ ++striplib \ ++compiler_lib_search_dirs \ ++predep_objects \ ++postdep_objects \ ++predeps \ ++postdeps \ ++compiler_lib_search_path \ ++LD_CXX \ ++compiler_CXX \ ++lt_prog_compiler_no_builtin_flag_CXX \ ++lt_prog_compiler_wl_CXX \ ++lt_prog_compiler_pic_CXX \ ++lt_prog_compiler_static_CXX \ ++lt_cv_prog_compiler_c_o_CXX \ ++export_dynamic_flag_spec_CXX \ ++whole_archive_flag_spec_CXX \ ++compiler_needs_object_CXX \ ++with_gnu_ld_CXX \ ++allow_undefined_flag_CXX \ ++no_undefined_flag_CXX \ ++hardcode_libdir_flag_spec_CXX \ ++hardcode_libdir_flag_spec_ld_CXX \ ++hardcode_libdir_separator_CXX \ ++fix_srcfile_path_CXX \ ++exclude_expsyms_CXX \ ++include_expsyms_CXX \ ++file_list_spec_CXX \ ++compiler_lib_search_dirs_CXX \ ++predep_objects_CXX \ ++postdep_objects_CXX \ ++predeps_CXX \ ++postdeps_CXX \ ++compiler_lib_search_path_CXX; do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[\\\\\\\`\\"\\\$]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac +done ++ ++# Double-quote double-evaled strings. ++for var in reload_cmds \ ++old_postinstall_cmds \ ++old_postuninstall_cmds \ ++old_archive_cmds \ ++extract_expsyms_cmds \ ++old_archive_from_new_cmds \ ++old_archive_from_expsyms_cmds \ ++archive_cmds \ ++archive_expsym_cmds \ ++module_cmds \ ++module_expsym_cmds \ ++export_symbols_cmds \ ++prelink_cmds \ ++postinstall_cmds \ ++postuninstall_cmds \ ++finish_cmds \ ++sys_lib_search_path_spec \ ++sys_lib_dlsearch_path_spec \ ++old_archive_cmds_CXX \ ++old_archive_from_new_cmds_CXX \ ++old_archive_from_expsyms_cmds_CXX \ ++archive_cmds_CXX \ ++archive_expsym_cmds_CXX \ ++module_cmds_CXX \ ++module_expsym_cmds_CXX \ ++export_symbols_cmds_CXX \ ++prelink_cmds_CXX; do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[\\\\\\\`\\"\\\$]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac +done -+IFS=$as_save_IFS + ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` + ;; - esac --_ACEOF -+fi -+XSLTPROC=$ac_cv_path_XSLTPROC -+if test -n "$XSLTPROC"; then -+ { echo "$as_me:$LINENO: result: $XSLTPROC" >&5 -+echo "${ECHO_T}$XSLTPROC" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - --# Neutralize VPATH when `$srcdir' = `.'. --# Shell code in configure.ac might set extrasub. --# FIXME: do we really want to maintain this feature? --cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 --ac_sed_extra="$ac_vpsub --$extrasub --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 --:t --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s|@configure_input@|$ac_sed_conf_input|;t t --s&@top_builddir@&$ac_top_builddir_sub&;t t --s&@top_build_prefix@&$ac_top_build_prefix&;t t --s&@srcdir@&$ac_srcdir&;t t --s&@abs_srcdir@&$ac_abs_srcdir&;t t --s&@top_srcdir@&$ac_top_srcdir&;t t --s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t --s&@builddir@&$ac_builddir&;t t --s&@abs_builddir@&$ac_abs_builddir&;t t --s&@abs_top_builddir@&$ac_abs_top_builddir&;t t --s&@INSTALL@&$ac_INSTALL&;t t --$ac_datarootdir_hack --" --eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } - --test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' --which seems to be undefined. Please make sure it is defined." >&5 --$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' --which seems to be undefined. Please make sure it is defined." >&2;} -+ if test -z "$XSLTPROC"; then -+ enable_man=no -+ fi - -- rm -f "$tmp/stdin" -- case $ac_file in -- -) cat "$tmp/out" && rm -f "$tmp/out";; -- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -- esac \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- :H) -- # -- # CONFIG_HEADER -- # -- if test x"$ac_file" != x-; then -- { -- $as_echo "/* $configure_input */" \ -- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" -- } >"$tmp/config.h" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then -- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 --$as_echo "$as_me: $ac_file is unchanged" >&6;} -- else -- rm -f "$ac_file" -- mv "$tmp/config.h" "$ac_file" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 --$as_echo "$as_me: error: could not create $ac_file" >&2;} -- { (exit 1); exit 1; }; } -- fi ++esac + -+ # check for the presence of the XML catalog ++ac_aux_dir='$ac_aux_dir' ++xsi_shell='$xsi_shell' ++lt_shell_append='$lt_shell_append' + -+# Check whether --with-xml-catalog was given. -+if test "${with_xml_catalog+set}" = set; then -+ withval=$with_xml_catalog; -+else -+ with_xml_catalog=/etc/xml/catalog ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST +fi + -+ jh_found_xmlcatalog=true -+ XML_CATALOG_FILE="$with_xml_catalog" + -+ { echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 -+echo $ECHO_N "checking for XML catalog ($XML_CATALOG_FILE)... $ECHO_C" >&6; } -+ if test -f "$XML_CATALOG_FILE"; then -+ { echo "$as_me:$LINENO: result: found" >&5 -+echo "${ECHO_T}found" >&6; } - else -- $as_echo "/* $configure_input */" \ -- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ -- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 --$as_echo "$as_me: error: could not create -" >&2;} -- { (exit 1); exit 1; }; } -+ jh_found_xmlcatalog=false -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } -+ fi ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile' + -+ # check for the xmlcatalog program -+ # Extract the first word of "xmlcatalog", so it can be a program name with args. -+set dummy xmlcatalog; ac_word=$2 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+if test "${ac_cv_path_XMLCATALOG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $XMLCATALOG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_XMLCATALOG="$XMLCATALOG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 ++ ++ ++ac_aux_dir='$ac_aux_dir' ++ ++ ++ ++ + + if test "x$gdktarget" = "xx11" ; then + gdk_windowing=' +@@ -36837,6 +34819,7 @@ + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ++ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; + "gdk/gdkconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gdk/gdkconfig.h" ;; +@@ -37405,6 +35388,11 @@ + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++ ac_MKDIR_P=$MKDIR_P ++ case $MKDIR_P in ++ [\\/$]* | ?:[\\/]* ) ;; ++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; ++ esac + _ACEOF + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +@@ -37461,6 +35449,7 @@ + s&@abs_builddir@&$ac_abs_builddir&;t t + s&@abs_top_builddir@&$ac_abs_top_builddir&;t t + s&@INSTALL@&$ac_INSTALL&;t t ++s&@MKDIR_P@&$ac_MKDIR_P&;t t + $ac_datarootdir_hack + " + eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +@@ -37515,21 +35504,22 @@ + { (exit 1); exit 1; }; } fi --# Compute "$ac_file"'s index in $config_headers. --_am_stamp_count=1 --for _am_header in $config_headers :; do -- case $_am_header in + # Compute "$ac_file"'s index in $config_headers. ++_am_arg="$ac_file" + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in - "$ac_file" | "$ac_file":* ) -- break ;; -- * ) -- _am_stamp_count=`expr $_am_stamp_count + 1` ;; -- esac ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac done -echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -75766,90 +43555,43 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'`/stamp-h$_am_stamp_count -- ;; -+done -+IFS=$as_save_IFS - -- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 --$as_echo "$as_me: executing $ac_file commands" >&6;} -- ;; -- esac -+ test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" -+ ;; -+esac -+fi -+XMLCATALOG=$ac_cv_path_XMLCATALOG -+if test -n "$XMLCATALOG"; then -+ { echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 -+echo "${ECHO_T}$XMLCATALOG" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } -+fi - - -- case $ac_file$ac_mode in -- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do -- # Strip MF so we end up with the name of the file. -- mf=`echo "$mf" | sed -e 's/:.*$//'` -- # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named `Makefile.in', but -- # some people rename them; so instead we look at the file content. -- # Grep'ing the first line is not enough: some people post-process -- # each Makefile.in and add a new line on top of each file to say so. ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37564,8 +35554,9 @@ + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -- dirpart=`$as_dirname -- "$mf" || --$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$mf" : 'X\(//\)[^/]' \| \ -- X"$mf" : 'X\(//\)$' \| \ -- X"$mf" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$mf" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- else -- continue -+ if test "x$XMLCATALOG" = xno; then -+ jh_found_xmlcatalog=false ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ +@@ -37592,27 +35583,21 @@ + else + continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -- test -z "$DEPDIR" && continue -- # When using ansi2knr, U may be empty or an underscore; expand it ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to @@ -75865,3017 +43607,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`$as_dirname -- "$file" || --$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$file" : 'X\(//\)[^/]' \| \ -- X"$file" : 'X\(//\)$' \| \ -- X"$file" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- { as_dir=$dirpart/$fdir -- case $as_dir in #( -- -*) as_dir=./$as_dir;; -- esac -- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -- as_dirs= -- while :; do -- case $as_dir in #( -- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -- *) as_qdir=$as_dir;; -+ -+ if $jh_found_xmlcatalog; then -+ : -+ else -+ : -+ fi -+ -+ -+ { echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 -+echo $ECHO_N "checking for DocBook XML DTD V4.1.2 in XML catalog... $ECHO_C" >&6; } -+ if $jh_found_xmlcatalog && \ -+ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 -+ ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.1.2//EN" >&2) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ { echo "$as_me:$LINENO: result: found" >&5 -+echo "${ECHO_T}found" >&6; } -+ else -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } -+ enable_man=no -+ fi -+ -+ -+ { echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 -+echo $ECHO_N "checking for DocBook XSL Stylesheets in XML catalog... $ECHO_C" >&6; } -+ if $jh_found_xmlcatalog && \ -+ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 -+ ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" >&2) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ { echo "$as_me:$LINENO: result: found" >&5 -+echo "${ECHO_T}found" >&6; } -+ else -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } -+ enable_man=no -+ fi -+ -+fi -+ -+ if test x$enable_man != xno; then -+ ENABLE_MAN_TRUE= -+ ENABLE_MAN_FALSE='#' -+else -+ ENABLE_MAN_TRUE='#' -+ ENABLE_MAN_FALSE= -+fi -+ -+ -+ -+################################################## -+# Output commands -+################################################## -+ -+ac_config_commands="$ac_config_commands gdk/gdkconfig.h" -+ -+ -+ac_config_files="$ac_config_files config.h.win32 gtk-zip.sh Makefile gdk-pixbuf-2.0.pc gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc gdk-pixbuf-2.0-uninstalled.pc gdk-2.0-uninstalled.pc gtk+-2.0-uninstalled.pc gail-uninstalled.pc m4macros/Makefile po/Makefile.in po-properties/Makefile.in demos/Makefile demos/gtk-demo/Makefile demos/gtk-demo/geninclude.pl tests/Makefile docs/Makefile docs/reference/Makefile docs/reference/gdk-pixbuf/Makefile docs/reference/gdk-pixbuf/version.xml docs/reference/gdk/Makefile docs/reference/gdk/version.xml docs/reference/gtk/Makefile docs/reference/gtk/version.xml docs/reference/libgail-util/Makefile docs/faq/Makefile docs/tools/Makefile docs/tutorial/Makefile gdk-pixbuf/Makefile gdk-pixbuf/gdk_pixbuf.rc gdk-pixbuf/gdk-pixbuf-features.h gdk-pixbuf/pixops/Makefile gdk/Makefile gdk/x11/Makefile gdk/win32/Makefile gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc gdk/quartz/Makefile gdk/directfb/Makefile gdk/tests/Makefile gtk/Makefile gtk/makefile.msc gtk/gtkversion.h gtk/gtk-win32.rc gtk/theme-bits/Makefile gtk/tests/Makefile modules/Makefile modules/other/Makefile modules/other/gail/Makefile modules/other/gail/libgail-util/Makefile modules/other/gail/tests/Makefile modules/engines/Makefile modules/engines/pixbuf/Makefile modules/engines/ms-windows/Makefile modules/engines/ms-windows/Theme/Makefile modules/engines/ms-windows/Theme/gtk-2.0/Makefile modules/input/Makefile modules/printbackends/Makefile modules/printbackends/cups/Makefile modules/printbackends/lpr/Makefile modules/printbackends/file/Makefile modules/printbackends/test/Makefile perf/Makefile contrib/Makefile contrib/gdk-pixbuf-xlib/Makefile contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" -+ -+ -+cat >confcache <<\_ACEOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs, see configure's option --config-cache. -+# It is not useful on other systems. If it contains results you don't -+# want to keep, you may remove or edit it. -+# -+# config.status only pays attention to the cache file if you give it -+# the --recheck option to rerun configure. -+# -+# `ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* `ac_cv_foo' will be assigned the -+# following values. -+ -+_ACEOF -+ -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, we kill variables containing newlines. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac -- as_dirs="'$as_qdir' $as_dirs" -- as_dir=`$as_dirname -- "$as_dir" || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --$as_echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)[^/].*/{ -- s//\1/ -- q -- } -- /^X\(\/\/\)$/{ -- s//\1/ -- q -- } -- /^X\(\/\).*/{ -- s//\1/ -- q -- } -- s/.*/./; q'` -- test -d "$as_dir" && break -- done -- test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} -- { (exit 1); exit 1; }; }; } -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac - done -+ -+ (set) 2>&1 | -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; #( -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) | -+ sed ' -+ /^ac_cv_env_/b end -+ t clear -+ :clear -+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -+ t end -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+echo "$as_me: updating cache $cache_file" >&6;} -+ cat confcache >$cache_file -+ else -+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+echo "$as_me: not updating unwritable cache $cache_file" >&6;} -+ fi -+fi -+rm -f confcache -+ -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+# Let make expand exec_prefix. -+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -+ -+DEFS=-DHAVE_CONFIG_H -+ -+ac_libobjs= -+ac_ltlibobjs= -+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue -+ # 1. Remove the extension, and $U if already installed. -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' - done -- ;; -- "libtool":C) -+LIBOBJS=$ac_libobjs - -- # 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 -- setopt NO_GLOB_SUBST -- fi -+LTLIBOBJS=$ac_ltlibobjs - -- cfgfile="${ofile}T" -- trap "$RM \"$cfgfile\"; exit 1" 1 2 15 -- $RM "$cfgfile" - -- cat <<_LT_EOF >> "$cfgfile" -+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"AMDEP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+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 -+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"OS_WIN32\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"OS_UNIX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"OS_LINUX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${BUILD_GDIPLUS_LOADERS_TRUE}" && test -z "${BUILD_GDIPLUS_LOADERS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${BUILD_DYNAMIC_MODULES_TRUE}" && test -z "${BUILD_DYNAMIC_MODULES_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_PNG_TRUE}" && test -z "${INCLUDE_PNG_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_PNG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_BMP_TRUE}" && test -z "${INCLUDE_BMP_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_BMP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_BMP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_WBMP_TRUE}" && test -z "${INCLUDE_WBMP_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_WBMP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_WBMP\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_GIF_TRUE}" && test -z "${INCLUDE_GIF_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GIF\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_GIF\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_ICO_TRUE}" && test -z "${INCLUDE_ICO_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_ICO\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_ANI_TRUE}" && test -z "${INCLUDE_ANI_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ANI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_ANI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_JPEG_TRUE}" && test -z "${INCLUDE_JPEG_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JPEG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_JPEG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_PNM_TRUE}" && test -z "${INCLUDE_PNM_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_PNM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_RAS_TRUE}" && test -z "${INCLUDE_RAS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_RAS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_RAS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_TIFF_TRUE}" && test -z "${INCLUDE_TIFF_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIFF\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_TIFF\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_XPM_TRUE}" && test -z "${INCLUDE_XPM_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_XPM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_XPM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_XBM_TRUE}" && test -z "${INCLUDE_XBM_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_XBM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_XBM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_TGA_TRUE}" && test -z "${INCLUDE_TGA_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TGA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_TGA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_PCX_TRUE}" && test -z "${INCLUDE_PCX_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PCX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_ICNS_TRUE}" && test -z "${INCLUDE_ICNS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_JASPER_TRUE}" && test -z "${INCLUDE_JASPER_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_GDIPLUS_TRUE}" && test -z "${INCLUDE_GDIPLUS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_TIFF_TRUE}" && test -z "${HAVE_TIFF_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_TIFF\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_JPEG_TRUE}" && test -z "${HAVE_JPEG_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JPEG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_JASPER_TRUE}" && test -z "${HAVE_JASPER_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_MEDIALIB_TRUE}" && test -z "${USE_MEDIALIB_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_MEDIALIB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_MEDIALIB25_TRUE}" && test -z "${USE_MEDIALIB25_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB25\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_MEDIALIB25\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_MMX_TRUE}" && test -z "${USE_MMX_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_MMX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_X11\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_X11\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_WIN32\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_WIN32\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${TEST_PRINT_BACKEND_TRUE}" && test -z "${TEST_PRINT_BACKEND_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"TEST_PRINT_BACKEND\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"TEST_PRINT_BACKEND\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+: ${CONFIG_STATUS=./config.status} -+ac_clean_files_save=$ac_clean_files -+ac_clean_files="$ac_clean_files $CONFIG_STATUS" -+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -+echo "$as_me: creating $CONFIG_STATUS" >&6;} -+cat >$CONFIG_STATUS <<_ACEOF - #! $SHELL -+# Generated by $as_me. -+# Run this file to recreate the current configuration. -+# Compiler output produced by configure, useful for debugging -+# configure, is in config.log if it exists. - --# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: --# NOTE: Changes made to this file will be lost: look at ltmain.sh. --# --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008 Free Software Foundation, Inc. --# Written by Gordon Matzigkeit, 1996 --# --# This file is part of GNU Libtool. --# --# GNU Libtool is free software; you can redistribute it and/or --# modify it under the terms of the GNU General Public License as --# published by the Free Software Foundation; either version 2 of --# the License, or (at your option) any later version. --# --# As a special exception to the GNU General Public License, --# if you distribute this file as part of a program or library that --# is built using GNU Libtool, you may include this file under the --# same distribution terms that you use for the rest of that program. --# --# GNU Libtool 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 General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with GNU Libtool; see the file COPYING. If not, a copy --# can be downloaded from http://www.gnu.org/licenses/gpl.html, or --# obtained by writing to the Free Software Foundation, Inc., --# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- -- --# The names of the tagged configurations supported by this script. --available_tags="CXX " -- --# ### BEGIN LIBTOOL CONFIG -- --# Whether or not to build static libraries. --build_old_libs=$enable_static -- --# Assembler program. --AS=$AS -- --# DLL creation program. --DLLTOOL=$DLLTOOL -- --# Object dumper program. --OBJDUMP=$OBJDUMP -- --# Which release of libtool.m4 was used? --macro_version=$macro_version --macro_revision=$macro_revision -- --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared -- --# What type of objects to build. --pic_mode=$pic_mode -- --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install -- --# The host system. --host_alias=$host_alias --host=$host --host_os=$host_os -- --# The build system. --build_alias=$build_alias --build=$build --build_os=$build_os -- --# A sed program that does not truncate output. --SED=$lt_SED -- --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="\$SED -e 1s/^X//" -- --# A grep program that handles long lines. --GREP=$lt_GREP -- --# An ERE matcher. --EGREP=$lt_EGREP -- --# A literal string matcher. --FGREP=$lt_FGREP -- --# A BSD- or MS-compatible name lister. --NM=$lt_NM -- --# Whether we need soft or hard links. --LN_S=$lt_LN_S -- --# What is the maximum length of a command? --max_cmd_len=$max_cmd_len -- --# Object file suffix (normally "o"). --objext=$ac_objext -- --# Executable file suffix (normally ""). --exeext=$exeext -- --# whether the shell understands "unset". --lt_unset=$lt_unset -- --# turn spaces into newlines. --SP2NL=$lt_lt_SP2NL -- --# turn newlines into spaces. --NL2SP=$lt_lt_NL2SP -- --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -- --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -- --# Command to use when deplibs_check_method == "file_magic". --file_magic_cmd=$lt_file_magic_cmd -- --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS -- --# A symbol stripping program. --STRIP=$lt_STRIP -- --# Commands used to install an old-style archive. --RANLIB=$lt_RANLIB --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -- --# A C compiler. --LTCC=$lt_CC -- --# LTCC compiler flags. --LTCFLAGS=$lt_CFLAGS -- --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -- --# Transform the output of nm in a proper C declaration. --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -- --# Transform the output of nm in a C name address pair. --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -- --# Transform the output of nm in a C name address pair when lib prefix is needed. --global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -- --# The name of the directory that contains temporary libtool files. --objdir=$objdir -- --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -- --# An echo program that does not interpret backslashes. --ECHO=$lt_ECHO -- --# Used to examine libraries when file_magic_cmd begins with "file". --MAGIC_CMD=$MAGIC_CMD -- --# Must we lock files when doing compilation? --need_locks=$lt_need_locks -- --# Tool to manipulate archived DWARF debug symbol files on Mac OS X. --DSYMUTIL=$lt_DSYMUTIL -- --# Tool to change global to local symbols on Mac OS X. --NMEDIT=$lt_NMEDIT -- --# Tool to manipulate fat objects and archives on Mac OS X. --LIPO=$lt_LIPO -- --# ldd/readelf like tool for Mach-O binaries on Mac OS X. --OTOOL=$lt_OTOOL -- --# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. --OTOOL64=$lt_OTOOL64 -- --# Old archive suffix (normally "a"). --libext=$libext -- --# Shared library suffix (normally ".so"). --shrext_cmds=$lt_shrext_cmds -- --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -- --# Variables whose values should be saved in libtool wrapper scripts and --# restored at link time. --variables_saved_for_relink=$lt_variables_saved_for_relink -- --# Do we need the "lib" prefix for modules? --need_lib_prefix=$need_lib_prefix -- --# Do we need a version for libraries? --need_version=$need_version -- --# Library versioning type. --version_type=$version_type -- --# Shared library runtime path variable. --runpath_var=$runpath_var -- --# Shared library path variable. --shlibpath_var=$shlibpath_var -- --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -- --# Format of library name prefix. --libname_spec=$lt_libname_spec -- --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME --library_names_spec=$lt_library_names_spec -- --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec -- --# Command to use after installation of a shared archive. --postinstall_cmds=$lt_postinstall_cmds -- --# Command to use after uninstallation of a shared archive. --postuninstall_cmds=$lt_postuninstall_cmds -- --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds -- --# As "finish_cmds", except a single script fragment to be evaled but --# not shown. --finish_eval=$lt_finish_eval -+debug=false -+ac_cs_recheck=false -+ac_cs_silent=false -+SHELL=\${CONFIG_SHELL-$SHELL} -+_ACEOF - --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -+cat >>$CONFIG_STATUS <<\_ACEOF -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## - --# Compile-time system search path for libraries. --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+# 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=: -+ # 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 - --# Run-time system search path for libraries. --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+fi - --# Whether dlopen is supported. --dlopen_support=$enable_dlopen - --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self - --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static - --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits - -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh -+fi - --# The linker used to build libraries. --LD=$lt_LD -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi - --# Commands used to build an old-style archive. --old_archive_cmds=$lt_old_archive_cmds - --# A language specific compiler. --CC=$lt_compiler -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" - --# Is the compiler the GNU compiler? --with_gcc=$GCC -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS - --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' - --# Additional compiler flags for building library objects. --pic_flag=$lt_lt_prog_compiler_pic -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ fi -+done - --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_lt_prog_compiler_static -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_lt_cv_prog_compiler_c_o -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi - --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$archive_cmds_need_lc - --# Whether or not to disallow shared libs when runtime libs are static. --allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -+# Name of the executable. -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -+# CDPATH. -+$as_unset CDPATH - --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec - --# Whether the compiler copes with passing no objects directly. --compiler_needs_object=$lt_compiler_needs_object - --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } - --# Commands used to build a shared archive. --archive_cmds=$lt_archive_cmds --archive_expsym_cmds=$lt_archive_expsym_cmds -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} - --# Commands used to build a loadable module if different from building --# a shared archive. --module_cmds=$lt_module_cmds --module_expsym_cmds=$lt_module_expsym_cmds - --# Whether we are building with GNU ld or not. --with_gnu_ld=$lt_with_gnu_ld -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac - --# Flag that enforces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi - --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi -+echo >conf$$.file -+if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+else -+ as_ln_s='cp -p' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - --# If ld is used when linking, flag to hardcode \$libdir into a binary --# during linking. This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi - --# Whether we need a single "-rpath" flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ 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 -+as_executable_p=$as_test_x - --# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes --# DIR into the resulting binary. --hardcode_direct=$hardcode_direct -+# 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'" - --# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes --# DIR into the resulting binary and the resulting library dependency is --# "absolute",i.e impossible to change by setting \${shlibpath_var} if the --# library is relocated. --hardcode_direct_absolute=$hardcode_direct_absolute -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - --# Set to "yes" if using the -LDIR flag during linking hardcodes DIR --# into the resulting binary. --hardcode_minus_L=$hardcode_minus_L - --# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR --# into the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var -+exec 6>&1 - --# Set to "yes" if building a shared library automatically hardcodes DIR --# into the library and all subsequent libraries and executables linked --# against it. --hardcode_automatic=$hardcode_automatic -+# Save the log message, to keep $[0] and so on meaningful, and to -+# report actual input values of CONFIG_FILES etc. instead of their -+# values after options handling. -+ac_log=" -+This file was extended by gtk+ $as_me 2.14.5, which was -+generated by GNU Autoconf 2.61. Invocation command line was - --# Set to yes if linker adds runtime paths of dependent libraries --# to runtime path list. --inherit_rpath=$inherit_rpath -+ CONFIG_FILES = $CONFIG_FILES -+ CONFIG_HEADERS = $CONFIG_HEADERS -+ CONFIG_LINKS = $CONFIG_LINKS -+ CONFIG_COMMANDS = $CONFIG_COMMANDS -+ $ $0 $@ - --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -+_ACEOF - --# Set to "yes" if exported symbols are required. --always_export_symbols=$always_export_symbols -+cat >>$CONFIG_STATUS <<_ACEOF -+# Files that config.status was made for. -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" - --# The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds -+_ACEOF - --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms -+cat >>$CONFIG_STATUS <<\_ACEOF -+ac_cs_usage="\ -+\`$as_me' instantiates files from templates according to the -+current configuration. - --# Symbols that must always be exported. --include_expsyms=$lt_include_expsyms -+Usage: $0 [OPTIONS] [FILE]... - --# Commands necessary for linking programs (against libraries) with templates. --prelink_cmds=$lt_prelink_cmds -+ -h, --help print this help, 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 -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE -+ --header=FILE[:TEMPLATE] -+ instantiate the configuration header FILE - --# Specify filename containing input files. --file_list_spec=$lt_file_list_spec -+Configuration files: -+$config_files - --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action -+Configuration headers: -+$config_headers - --# The directories searched by this compiler when creating a shared library. --compiler_lib_search_dirs=$lt_compiler_lib_search_dirs -+Configuration commands: -+$config_commands - --# Dependencies to place before and after the objects being linked to --# create a shared library. --predep_objects=$lt_predep_objects --postdep_objects=$lt_postdep_objects --predeps=$lt_predeps --postdeps=$lt_postdeps -+Report bugs to <bug-autoconf@gnu.org>." - --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_compiler_lib_search_path -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+ac_cs_version="\\ -+gtk+ config.status 2.14.5 -+configured by $0, generated by GNU Autoconf 2.61, -+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --# ### END LIBTOOL CONFIG -+Copyright (C) 2006 Free Software Foundation, Inc. -+This config.status script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it." - --_LT_EOF -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' -+MKDIR_P='$MKDIR_P' -+_ACEOF - -- case $host_os in -- aix3*) -- cat <<\_LT_EOF >> "$cfgfile" --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES --fi --_LT_EOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+# If no file are specified by the user, then we need to provide default -+# value. By we need to know if files were specified by the user. -+ac_need_defaults=: -+while test $# != 0 -+do -+ case $1 in -+ --*=*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` -+ ac_shift=: -+ ;; -+ *) -+ ac_option=$1 -+ ac_optarg=$2 -+ ac_shift=shift - ;; - esac - -+ case $ac_option in -+ # Handling of the options. -+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ ac_cs_recheck=: ;; -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) -+ debug=: ;; -+ --file | --fil | --fi | --f ) -+ $ac_shift -+ CONFIG_FILES="$CONFIG_FILES $ac_optarg" -+ ac_need_defaults=false;; -+ --header | --heade | --head | --hea ) -+ $ac_shift -+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ { echo "$as_me: error: ambiguous option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; };; -+ --help | --hel | -h ) -+ echo "$ac_cs_usage"; exit ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil | --si | --s) -+ ac_cs_silent=: ;; - --ltmain="$ac_aux_dir/ltmain.sh" -+ # This is an error. -+ -*) { echo "$as_me: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; } ;; - -+ *) ac_config_targets="$ac_config_targets $1" -+ ac_need_defaults=false ;; - -- # We use sed instead of cat because bash on DJGPP gets confused if -- # if finds mixed CR/LF and LF-only lines. Since sed operates in -- # text mode, it properly converts lines to CR/LF. This bash problem -- # is reportedly fixed, but why not run on old versions too? -- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -+ esac -+ shift -+done - -- case $xsi_shell in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -+ac_configure_extra_args= - --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac --} -+if $ac_cs_silent; then -+ exec 6>/dev/null -+ ac_configure_extra_args="$ac_configure_extra_args --silent" -+fi - --# func_basename file --func_basename () --{ -- func_basename_result="${1##*/}" --} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+if \$ac_cs_recheck; then -+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -+ CONFIG_SHELL=$SHELL -+ export CONFIG_SHELL -+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+fi - --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+exec 5>>config.log - { -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}" --} -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ echo "$ac_log" -+} >&5 - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --func_stripname () --{ -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"} --} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+# -+# INIT-COMMANDS -+# -+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=${1%%=*} -- func_opt_split_arg=${1#*=} --} - --# func_lo2o object --func_lo2o () --{ -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac --} - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=${1%.*}.lo --} -+if test "x$gdktarget" = "xx11" ; then -+ gdk_windowing=' -+#define GDK_WINDOWING_X11' -+elif test "x$gdktarget" = "xwin32" ; then -+ gdk_windowing=' -+#define GDK_NATIVE_WINDOW_POINTER - --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=$(( $* )) --} -+#define GDK_WINDOWING_WIN32' -+elif test "x$gdktarget" = "xquartz" ; then -+ gdk_windowing=' -+#define GDK_WINDOWING_QUARTZ' -+elif test "x$gdktarget" = "xdirectfb" ; then -+ gdk_windowing=' -+#define GDK_WINDOWING_DIRECTFB' -+fi - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=${#1} --} -+if test x$gdk_wchar_h = xyes; then -+ gdk_wc=' -+#define GDK_HAVE_WCHAR_H 1' -+fi -+if test x$gdk_wctype_h = xyes; then -+ gdk_wc="\$gdk_wc -+#define GDK_HAVE_WCTYPE_H 1" -+fi -+if test x$gdk_working_wctype = xno; then -+ gdk_wc="\$gdk_wc -+#define GDK_HAVE_BROKEN_WCTYPE 1" -+fi - --_LT_EOF -- ;; -- *) # Bourne compatible functions. -- cat << \_LT_EOF >> "$cfgfile" - --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} - --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` --} - -+_ACEOF - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "X${3}" \ -- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -- esac --} -+cat >>$CONFIG_STATUS <<\_ACEOF - --# sed scripts: --my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' --my_sed_long_arg='1s/^-[^=]*=//' -+# Handling of arguments. -+for ac_config_target in $ac_config_targets -+do -+ case $ac_config_target in -+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; -+ "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; -+ "gdk/gdkconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gdk/gdkconfig.h" ;; -+ "config.h.win32") CONFIG_FILES="$CONFIG_FILES config.h.win32" ;; -+ "gtk-zip.sh") CONFIG_FILES="$CONFIG_FILES gtk-zip.sh" ;; -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "gdk-pixbuf-2.0.pc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf-2.0.pc" ;; -+ "gdk-2.0.pc") CONFIG_FILES="$CONFIG_FILES gdk-2.0.pc" ;; -+ "gtk+-2.0.pc") CONFIG_FILES="$CONFIG_FILES gtk+-2.0.pc" ;; -+ "gtk+-unix-print-2.0.pc") CONFIG_FILES="$CONFIG_FILES gtk+-unix-print-2.0.pc" ;; -+ "gail.pc") CONFIG_FILES="$CONFIG_FILES gail.pc" ;; -+ "gdk-pixbuf-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf-2.0-uninstalled.pc" ;; -+ "gdk-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gdk-2.0-uninstalled.pc" ;; -+ "gtk+-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gtk+-2.0-uninstalled.pc" ;; -+ "gail-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gail-uninstalled.pc" ;; -+ "m4macros/Makefile") CONFIG_FILES="$CONFIG_FILES m4macros/Makefile" ;; -+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; -+ "po-properties/Makefile.in") CONFIG_FILES="$CONFIG_FILES po-properties/Makefile.in" ;; -+ "demos/Makefile") CONFIG_FILES="$CONFIG_FILES demos/Makefile" ;; -+ "demos/gtk-demo/Makefile") CONFIG_FILES="$CONFIG_FILES demos/gtk-demo/Makefile" ;; -+ "demos/gtk-demo/geninclude.pl") CONFIG_FILES="$CONFIG_FILES demos/gtk-demo/geninclude.pl" ;; -+ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; -+ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; -+ "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; -+ "docs/reference/gdk-pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk-pixbuf/Makefile" ;; -+ "docs/reference/gdk-pixbuf/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk-pixbuf/version.xml" ;; -+ "docs/reference/gdk/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk/Makefile" ;; -+ "docs/reference/gdk/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gdk/version.xml" ;; -+ "docs/reference/gtk/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gtk/Makefile" ;; -+ "docs/reference/gtk/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gtk/version.xml" ;; -+ "docs/reference/libgail-util/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/libgail-util/Makefile" ;; -+ "docs/faq/Makefile") CONFIG_FILES="$CONFIG_FILES docs/faq/Makefile" ;; -+ "docs/tools/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tools/Makefile" ;; -+ "docs/tutorial/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tutorial/Makefile" ;; -+ "gdk-pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/Makefile" ;; -+ "gdk-pixbuf/gdk_pixbuf.rc") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/gdk_pixbuf.rc" ;; -+ "gdk-pixbuf/gdk-pixbuf-features.h") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/gdk-pixbuf-features.h" ;; -+ "gdk-pixbuf/pixops/Makefile") CONFIG_FILES="$CONFIG_FILES gdk-pixbuf/pixops/Makefile" ;; -+ "gdk/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/Makefile" ;; -+ "gdk/x11/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/x11/Makefile" ;; -+ "gdk/win32/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/win32/Makefile" ;; -+ "gdk/win32/rc/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/win32/rc/Makefile" ;; -+ "gdk/win32/rc/gdk.rc") CONFIG_FILES="$CONFIG_FILES gdk/win32/rc/gdk.rc" ;; -+ "gdk/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/quartz/Makefile" ;; -+ "gdk/directfb/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/directfb/Makefile" ;; -+ "gdk/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/tests/Makefile" ;; -+ "gtk/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/Makefile" ;; -+ "gtk/makefile.msc") CONFIG_FILES="$CONFIG_FILES gtk/makefile.msc" ;; -+ "gtk/gtkversion.h") CONFIG_FILES="$CONFIG_FILES gtk/gtkversion.h" ;; -+ "gtk/gtk-win32.rc") CONFIG_FILES="$CONFIG_FILES gtk/gtk-win32.rc" ;; -+ "gtk/theme-bits/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/theme-bits/Makefile" ;; -+ "gtk/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/tests/Makefile" ;; -+ "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; -+ "modules/other/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/Makefile" ;; -+ "modules/other/gail/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/Makefile" ;; -+ "modules/other/gail/libgail-util/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/libgail-util/Makefile" ;; -+ "modules/other/gail/tests/Makefile") CONFIG_FILES="$CONFIG_FILES modules/other/gail/tests/Makefile" ;; -+ "modules/engines/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/Makefile" ;; -+ "modules/engines/pixbuf/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/pixbuf/Makefile" ;; -+ "modules/engines/ms-windows/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Makefile" ;; -+ "modules/engines/ms-windows/Theme/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Theme/Makefile" ;; -+ "modules/engines/ms-windows/Theme/gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES modules/engines/ms-windows/Theme/gtk-2.0/Makefile" ;; -+ "modules/input/Makefile") CONFIG_FILES="$CONFIG_FILES modules/input/Makefile" ;; -+ "modules/printbackends/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/Makefile" ;; -+ "modules/printbackends/cups/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/cups/Makefile" ;; -+ "modules/printbackends/lpr/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/lpr/Makefile" ;; -+ "modules/printbackends/file/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/file/Makefile" ;; -+ "modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;; -+ "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;; -+ "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; -+ "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; -+ "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; - --# func_opt_split --func_opt_split () --{ -- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` --} -+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -+echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+done - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` --} - --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` --} -+# If the user did not use the arguments to specify the items to instantiate, -+# then the envvar interface is used. Set only those that are not. -+# We use the long form for the default assignment because of an extremely -+# bizarre bug on SunOS 4.1.3. -+if $ac_need_defaults; then -+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers -+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -+fi - --# func_arith arithmetic-term... --func_arith () -+# Have a temporary directory for convenience. Make it in the build tree -+# simply because there is no reason against having it here, and in addition, -+# creating and moving files from /tmp can sometimes cause problems. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. -+$debug || - { -- func_arith_result=`expr "$@"` -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+' 0 -+ trap '{ (exit 1); exit 1; }' 1 2 13 15 - } -+# Create a (secure) tmp directory for tmp files. - --# func_len string --# STRING may not start with a hyphen. --func_len () - { -- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` --} -- --_LT_EOF --esac -- --case $lt_shell_append in -- yes) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -n "$tmp" && test -d "$tmp" -+} || - { -- eval "$1+=\$2" --} --_LT_EOF -- ;; -- *) -- cat << \_LT_EOF >> "$cfgfile" -- --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || - { -- eval "$1=\$$1\$2" -+ echo "$me: cannot create a temporary directory in ." >&2 -+ { (exit 1); exit 1; } - } - --_LT_EOF -- ;; -- esac -- -- -- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -- || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || -- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -- chmod +x "$ofile" -+# -+# Set up the sed scripts for CONFIG_FILES section. -+# - -+# No need to generate the scripts if there are no CONFIG_FILES. -+# This happens for instance when ./config.status config.h -+if test -n "$CONFIG_FILES"; then - -- cat <<_LT_EOF >> "$ofile" -+_ACEOF - --# ### BEGIN LIBTOOL TAG CONFIG: CXX - --# The linker used to build libraries. --LD=$lt_LD_CXX - --# Commands used to build an old-style archive. --old_archive_cmds=$lt_old_archive_cmds_CXX -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+SHELL!$SHELL$ac_delim -+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -+PACKAGE_NAME!$PACKAGE_NAME$ac_delim -+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -+PACKAGE_STRING!$PACKAGE_STRING$ac_delim -+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -+exec_prefix!$exec_prefix$ac_delim -+prefix!$prefix$ac_delim -+program_transform_name!$program_transform_name$ac_delim -+bindir!$bindir$ac_delim -+sbindir!$sbindir$ac_delim -+libexecdir!$libexecdir$ac_delim -+datarootdir!$datarootdir$ac_delim -+datadir!$datadir$ac_delim -+sysconfdir!$sysconfdir$ac_delim -+sharedstatedir!$sharedstatedir$ac_delim -+localstatedir!$localstatedir$ac_delim -+includedir!$includedir$ac_delim -+oldincludedir!$oldincludedir$ac_delim -+docdir!$docdir$ac_delim -+infodir!$infodir$ac_delim -+htmldir!$htmldir$ac_delim -+dvidir!$dvidir$ac_delim -+pdfdir!$pdfdir$ac_delim -+psdir!$psdir$ac_delim -+libdir!$libdir$ac_delim -+localedir!$localedir$ac_delim -+mandir!$mandir$ac_delim -+DEFS!$DEFS$ac_delim -+ECHO_C!$ECHO_C$ac_delim -+ECHO_N!$ECHO_N$ac_delim -+ECHO_T!$ECHO_T$ac_delim -+LIBS!$LIBS$ac_delim -+build_alias!$build_alias$ac_delim -+host_alias!$host_alias$ac_delim -+target_alias!$target_alias$ac_delim -+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -+INSTALL_DATA!$INSTALL_DATA$ac_delim -+am__isrc!$am__isrc$ac_delim -+CYGPATH_W!$CYGPATH_W$ac_delim -+PACKAGE!$PACKAGE$ac_delim -+VERSION!$VERSION$ac_delim -+ACLOCAL!$ACLOCAL$ac_delim -+AUTOCONF!$AUTOCONF$ac_delim -+AUTOMAKE!$AUTOMAKE$ac_delim -+AUTOHEADER!$AUTOHEADER$ac_delim -+MAKEINFO!$MAKEINFO$ac_delim -+install_sh!$install_sh$ac_delim -+STRIP!$STRIP$ac_delim -+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -+mkdir_p!$mkdir_p$ac_delim -+AWK!$AWK$ac_delim -+SET_MAKE!$SET_MAKE$ac_delim -+am__leading_dot!$am__leading_dot$ac_delim -+AMTAR!$AMTAR$ac_delim -+am__tar!$am__tar$ac_delim -+am__untar!$am__untar$ac_delim -+GTK_MAJOR_VERSION!$GTK_MAJOR_VERSION$ac_delim -+GTK_MINOR_VERSION!$GTK_MINOR_VERSION$ac_delim -+GTK_MICRO_VERSION!$GTK_MICRO_VERSION$ac_delim -+GTK_INTERFACE_AGE!$GTK_INTERFACE_AGE$ac_delim -+GTK_BINARY_AGE!$GTK_BINARY_AGE$ac_delim -+GTK_API_VERSION!$GTK_API_VERSION$ac_delim -+GTK_VERSION!$GTK_VERSION$ac_delim -+GTK_BINARY_VERSION!$GTK_BINARY_VERSION$ac_delim -+LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim -+LT_CURRENT_MINUS_AGE!$LT_CURRENT_MINUS_AGE$ac_delim -+GAIL_LT_VERSION_INFO!$GAIL_LT_VERSION_INFO$ac_delim -+GAIL_LT_CURRENT_MINUS_AGE!$GAIL_LT_CURRENT_MINUS_AGE$ac_delim -+GDK_PIXBUF_MAJOR!$GDK_PIXBUF_MAJOR$ac_delim -+GDK_PIXBUF_MINOR!$GDK_PIXBUF_MINOR$ac_delim -+GDK_PIXBUF_MICRO!$GDK_PIXBUF_MICRO$ac_delim -+GDK_PIXBUF_VERSION!$GDK_PIXBUF_VERSION$ac_delim -+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim -+build!$build$ac_delim -+build_cpu!$build_cpu$ac_delim -+build_vendor!$build_vendor$ac_delim -+build_os!$build_os$ac_delim -+host!$host$ac_delim -+host_cpu!$host_cpu$ac_delim -+host_vendor!$host_vendor$ac_delim -+host_os!$host_os$ac_delim -+LIB_EXE_MACHINE_FLAG!$LIB_EXE_MACHINE_FLAG$ac_delim -+CC!$CC$ac_delim -+CFLAGS!$CFLAGS$ac_delim -+LDFLAGS!$LDFLAGS$ac_delim -+CPPFLAGS!$CPPFLAGS$ac_delim -+ac_ct_CC!$ac_ct_CC$ac_delim -+EXEEXT!$EXEEXT$ac_delim -+OBJEXT!$OBJEXT$ac_delim -+DEPDIR!$DEPDIR$ac_delim -+am__include!$am__include$ac_delim -+am__quote!$am__quote$ac_delim -+AMDEP_TRUE!$AMDEP_TRUE$ac_delim -+AMDEP_FALSE!$AMDEP_FALSE$ac_delim -+_ACEOF - --# A language specific compiler. --CC=$lt_compiler_CXX -+ 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 -+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 - --# Is the compiler the GNU compiler? --with_gcc=$GCC_CXX -+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 - --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+_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 -+CEOF$ac_eof -+_ACEOF - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_CXX - --# Additional compiler flags for building library objects. --pic_flag=$lt_lt_prog_compiler_pic_CXX -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -+CCDEPMODE!$CCDEPMODE$ac_delim -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -+ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim -+ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim -+CXX!$CXX$ac_delim -+ac_ct_CXX!$ac_ct_CXX$ac_delim -+CXXFLAGS!$CXXFLAGS$ac_delim -+CXXDEPMODE!$CXXDEPMODE$ac_delim -+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -+HAVE_CXX_TRUE!$HAVE_CXX_TRUE$ac_delim -+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 -+ECHO!$ECHO$ac_delim -+AR!$AR$ac_delim -+RANLIB!$RANLIB$ac_delim -+DSYMUTIL!$DSYMUTIL$ac_delim -+NMEDIT!$NMEDIT$ac_delim -+DLLTOOL!$DLLTOOL$ac_delim -+AS!$AS$ac_delim -+OBJDUMP!$OBJDUMP$ac_delim -+CPP!$CPP$ac_delim -+CXXCPP!$CXXCPP$ac_delim -+F77!$F77$ac_delim -+FFLAGS!$FFLAGS$ac_delim -+ac_ct_F77!$ac_ct_F77$ac_delim -+LIBTOOL!$LIBTOOL$ac_delim -+CCAS!$CCAS$ac_delim -+CCASFLAGS!$CCASFLAGS$ac_delim -+CCASDEPMODE!$CCASDEPMODE$ac_delim -+am__fastdepCCAS_TRUE!$am__fastdepCCAS_TRUE$ac_delim -+am__fastdepCCAS_FALSE!$am__fastdepCCAS_FALSE$ac_delim -+NM!$NM$ac_delim -+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim -+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim -+MAINT!$MAINT$ac_delim -+PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim -+PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim -+OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim -+OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim -+OS_UNIX_TRUE!$OS_UNIX_TRUE$ac_delim -+OS_UNIX_FALSE!$OS_UNIX_FALSE$ac_delim -+OS_LINUX_TRUE!$OS_LINUX_TRUE$ac_delim -+OS_LINUX_FALSE!$OS_LINUX_FALSE$ac_delim -+WINDRES!$WINDRES$ac_delim -+ms_librarian!$ms_librarian$ac_delim -+MS_LIB_AVAILABLE_TRUE!$MS_LIB_AVAILABLE_TRUE$ac_delim -+MS_LIB_AVAILABLE_FALSE!$MS_LIB_AVAILABLE_FALSE$ac_delim -+gdktarget!$gdktarget$ac_delim -+gdktargetlib!$gdktargetlib$ac_delim -+gtktargetlib!$gtktargetlib$ac_delim -+PKG_CONFIG!$PKG_CONFIG$ac_delim -+BASE_DEPENDENCIES_CFLAGS!$BASE_DEPENDENCIES_CFLAGS$ac_delim -+BASE_DEPENDENCIES_LIBS!$BASE_DEPENDENCIES_LIBS$ac_delim -+LIBTOOL_EXPORT_OPTIONS!$LIBTOOL_EXPORT_OPTIONS$ac_delim -+DISABLE_EXPLICIT_DEPS_TRUE!$DISABLE_EXPLICIT_DEPS_TRUE$ac_delim -+DISABLE_EXPLICIT_DEPS_FALSE!$DISABLE_EXPLICIT_DEPS_FALSE$ac_delim -+PERL!$PERL$ac_delim -+INDENT!$INDENT$ac_delim -+REBUILD!$REBUILD$ac_delim -+USE_NLS!$USE_NLS$ac_delim -+MSGFMT!$MSGFMT$ac_delim -+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim -+GMSGFMT!$GMSGFMT$ac_delim -+XGETTEXT!$XGETTEXT$ac_delim -+CATALOGS!$CATALOGS$ac_delim -+CATOBJEXT!$CATOBJEXT$ac_delim -+DATADIRNAME!$DATADIRNAME$ac_delim -+GMOFILES!$GMOFILES$ac_delim -+INSTOBJEXT!$INSTOBJEXT$ac_delim -+INTLLIBS!$INTLLIBS$ac_delim -+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim -+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim -+POFILES!$POFILES$ac_delim -+POSUB!$POSUB$ac_delim -+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim -+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim -+GLIB_LIBS!$GLIB_LIBS$ac_delim -+GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim -+GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim -+GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim -+GDK_WLIBS!$GDK_WLIBS$ac_delim -+BUILD_GDIPLUS_LOADERS_TRUE!$BUILD_GDIPLUS_LOADERS_TRUE$ac_delim -+BUILD_GDIPLUS_LOADERS_FALSE!$BUILD_GDIPLUS_LOADERS_FALSE$ac_delim -+LIBTIFF!$LIBTIFF$ac_delim -+LIBJPEG!$LIBJPEG$ac_delim -+LIBPNG!$LIBPNG$ac_delim -+LIBJASPER!$LIBJASPER$ac_delim -+BUILD_DYNAMIC_MODULES_TRUE!$BUILD_DYNAMIC_MODULES_TRUE$ac_delim -+BUILD_DYNAMIC_MODULES_FALSE!$BUILD_DYNAMIC_MODULES_FALSE$ac_delim -+_ACEOF - --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_lt_prog_compiler_static_CXX -+ 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 -+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 - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -+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 - --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$archive_cmds_need_lc_CXX -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+_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 -+CEOF$ac_eof -+_ACEOF - --# Whether or not to disallow shared libs when runtime libs are static. --allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim -+INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim -+INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim -+INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim -+INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim -+INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim -+INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim -+INCLUDE_WBMP_FALSE!$INCLUDE_WBMP_FALSE$ac_delim -+INCLUDE_GIF_TRUE!$INCLUDE_GIF_TRUE$ac_delim -+INCLUDE_GIF_FALSE!$INCLUDE_GIF_FALSE$ac_delim -+INCLUDE_ICO_TRUE!$INCLUDE_ICO_TRUE$ac_delim -+INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_delim -+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 -+INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim -+INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim -+INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim -+INCLUDE_TIFF_FALSE!$INCLUDE_TIFF_FALSE$ac_delim -+INCLUDE_XPM_TRUE!$INCLUDE_XPM_TRUE$ac_delim -+INCLUDE_XPM_FALSE!$INCLUDE_XPM_FALSE$ac_delim -+INCLUDE_XBM_TRUE!$INCLUDE_XBM_TRUE$ac_delim -+INCLUDE_XBM_FALSE!$INCLUDE_XBM_FALSE$ac_delim -+INCLUDE_TGA_TRUE!$INCLUDE_TGA_TRUE$ac_delim -+INCLUDE_TGA_FALSE!$INCLUDE_TGA_FALSE$ac_delim -+INCLUDE_PCX_TRUE!$INCLUDE_PCX_TRUE$ac_delim -+INCLUDE_PCX_FALSE!$INCLUDE_PCX_FALSE$ac_delim -+INCLUDE_ICNS_TRUE!$INCLUDE_ICNS_TRUE$ac_delim -+INCLUDE_ICNS_FALSE!$INCLUDE_ICNS_FALSE$ac_delim -+INCLUDE_JASPER_TRUE!$INCLUDE_JASPER_TRUE$ac_delim -+INCLUDE_JASPER_FALSE!$INCLUDE_JASPER_FALSE$ac_delim -+INCLUDE_GDIPLUS_TRUE!$INCLUDE_GDIPLUS_TRUE$ac_delim -+INCLUDE_GDIPLUS_FALSE!$INCLUDE_GDIPLUS_FALSE$ac_delim -+HAVE_INCLUDED_IMMMODULES_TRUE!$HAVE_INCLUDED_IMMMODULES_TRUE$ac_delim -+HAVE_INCLUDED_IMMMODULES_FALSE!$HAVE_INCLUDED_IMMMODULES_FALSE$ac_delim -+INCLUDED_IMMODULE_OBJ!$INCLUDED_IMMODULE_OBJ$ac_delim -+INCLUDED_IMMODULE_DEFINE!$INCLUDED_IMMODULE_DEFINE$ac_delim -+INCLUDE_IM_AM_ET_TRUE!$INCLUDE_IM_AM_ET_TRUE$ac_delim -+INCLUDE_IM_AM_ET_FALSE!$INCLUDE_IM_AM_ET_FALSE$ac_delim -+INCLUDE_IM_CEDILLA_TRUE!$INCLUDE_IM_CEDILLA_TRUE$ac_delim -+INCLUDE_IM_CEDILLA_FALSE!$INCLUDE_IM_CEDILLA_FALSE$ac_delim -+INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE!$INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE$ac_delim -+INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE!$INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE$ac_delim -+INCLUDE_IM_IME_TRUE!$INCLUDE_IM_IME_TRUE$ac_delim -+INCLUDE_IM_IME_FALSE!$INCLUDE_IM_IME_FALSE$ac_delim -+INCLUDE_IM_INUKTITUT_TRUE!$INCLUDE_IM_INUKTITUT_TRUE$ac_delim -+INCLUDE_IM_INUKTITUT_FALSE!$INCLUDE_IM_INUKTITUT_FALSE$ac_delim -+INCLUDE_IM_IPA_TRUE!$INCLUDE_IM_IPA_TRUE$ac_delim -+INCLUDE_IM_IPA_FALSE!$INCLUDE_IM_IPA_FALSE$ac_delim -+INCLUDE_IM_MULTIPRESS_TRUE!$INCLUDE_IM_MULTIPRESS_TRUE$ac_delim -+INCLUDE_IM_MULTIPRESS_FALSE!$INCLUDE_IM_MULTIPRESS_FALSE$ac_delim -+INCLUDE_IM_THAI_TRUE!$INCLUDE_IM_THAI_TRUE$ac_delim -+INCLUDE_IM_THAI_FALSE!$INCLUDE_IM_THAI_FALSE$ac_delim -+INCLUDE_IM_TI_ER_TRUE!$INCLUDE_IM_TI_ER_TRUE$ac_delim -+INCLUDE_IM_TI_ER_FALSE!$INCLUDE_IM_TI_ER_FALSE$ac_delim -+INCLUDE_IM_TI_ET_TRUE!$INCLUDE_IM_TI_ET_TRUE$ac_delim -+INCLUDE_IM_TI_ET_FALSE!$INCLUDE_IM_TI_ET_FALSE$ac_delim -+INCLUDE_IM_VIQR_TRUE!$INCLUDE_IM_VIQR_TRUE$ac_delim -+INCLUDE_IM_VIQR_FALSE!$INCLUDE_IM_VIQR_FALSE$ac_delim -+INCLUDE_IM_XIM_TRUE!$INCLUDE_IM_XIM_TRUE$ac_delim -+INCLUDE_IM_XIM_FALSE!$INCLUDE_IM_XIM_FALSE$ac_delim -+HAVE_TIFF_TRUE!$HAVE_TIFF_TRUE$ac_delim -+HAVE_TIFF_FALSE!$HAVE_TIFF_FALSE$ac_delim -+HAVE_PNG_TRUE!$HAVE_PNG_TRUE$ac_delim -+HAVE_PNG_FALSE!$HAVE_PNG_FALSE$ac_delim -+HAVE_JPEG_TRUE!$HAVE_JPEG_TRUE$ac_delim -+HAVE_JPEG_FALSE!$HAVE_JPEG_FALSE$ac_delim -+HAVE_JASPER_TRUE!$HAVE_JASPER_TRUE$ac_delim -+HAVE_JASPER_FALSE!$HAVE_JASPER_FALSE$ac_delim -+USE_MEDIALIB_TRUE!$USE_MEDIALIB_TRUE$ac_delim -+USE_MEDIALIB_FALSE!$USE_MEDIALIB_FALSE$ac_delim -+USE_MEDIALIB25_TRUE!$USE_MEDIALIB25_TRUE$ac_delim -+USE_MEDIALIB25_FALSE!$USE_MEDIALIB25_FALSE$ac_delim -+USE_MMX_TRUE!$USE_MMX_TRUE$ac_delim -+USE_MMX_FALSE!$USE_MMX_FALSE$ac_delim -+CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim -+CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim -+GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim -+GTK_UPDATE_ICON_CACHE!$GTK_UPDATE_ICON_CACHE$ac_delim -+REBUILD_PNGS!$REBUILD_PNGS$ac_delim -+XMKMF!$XMKMF$ac_delim -+X_CFLAGS!$X_CFLAGS$ac_delim -+X_PRE_LIBS!$X_PRE_LIBS$ac_delim -+X_LIBS!$X_LIBS$ac_delim -+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim -+HAVE_X11R6_TRUE!$HAVE_X11R6_TRUE$ac_delim -+HAVE_X11R6_FALSE!$HAVE_X11R6_FALSE$ac_delim -+XINPUT_XFREE_TRUE!$XINPUT_XFREE_TRUE$ac_delim -+XINPUT_XFREE_FALSE!$XINPUT_XFREE_FALSE$ac_delim -+USE_X11_TRUE!$USE_X11_TRUE$ac_delim -+USE_X11_FALSE!$USE_X11_FALSE$ac_delim -+USE_WIN32_TRUE!$USE_WIN32_TRUE$ac_delim -+USE_WIN32_FALSE!$USE_WIN32_FALSE$ac_delim -+USE_QUARTZ_TRUE!$USE_QUARTZ_TRUE$ac_delim -+_ACEOF - --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX -+ 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 -+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 - --# Whether the compiler copes with passing no objects directly. --compiler_needs_object=$lt_compiler_needs_object_CXX -+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 - --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+_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 -+CEOF$ac_eof -+_ACEOF - --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - --# Commands used to build a shared archive. --archive_cmds=$lt_archive_cmds_CXX --archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim -+GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim -+GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim -+GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim -+GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim -+USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim -+USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim -+GDK_PACKAGES!$GDK_PACKAGES$ac_delim -+GDK_PRIVATE_PACKAGES!$GDK_PRIVATE_PACKAGES$ac_delim -+GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim -+GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim -+GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim -+GDK_DEP_CFLAGS!$GDK_DEP_CFLAGS$ac_delim -+GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim -+GDK_PIXBUF_EXTRA_LIBS!$GDK_PIXBUF_EXTRA_LIBS$ac_delim -+GDK_PIXBUF_EXTRA_CFLAGS!$GDK_PIXBUF_EXTRA_CFLAGS$ac_delim -+GDK_PIXBUF_DEP_LIBS!$GDK_PIXBUF_DEP_LIBS$ac_delim -+GDK_PIXBUF_DEP_CFLAGS!$GDK_PIXBUF_DEP_CFLAGS$ac_delim -+GTK_PACKAGES!$GTK_PACKAGES$ac_delim -+GTK_EXTRA_LIBS!$GTK_EXTRA_LIBS$ac_delim -+GTK_EXTRA_CFLAGS!$GTK_EXTRA_CFLAGS$ac_delim -+GTK_DEP_LIBS!$GTK_DEP_LIBS$ac_delim -+GTK_DEP_CFLAGS!$GTK_DEP_CFLAGS$ac_delim -+GLIB_PREFIX!$GLIB_PREFIX$ac_delim -+ATK_PREFIX!$ATK_PREFIX$ac_delim -+PANGO_PREFIX!$PANGO_PREFIX$ac_delim -+CAIRO_PREFIX!$CAIRO_PREFIX$ac_delim -+GTK_DEBUG_FLAGS!$GTK_DEBUG_FLAGS$ac_delim -+GTK_XIM_FLAGS!$GTK_XIM_FLAGS$ac_delim -+GAIL_INET_LIBS!$GAIL_INET_LIBS$ac_delim -+CUPS_CONFIG!$CUPS_CONFIG$ac_delim -+CUPS_API_MAJOR!$CUPS_API_MAJOR$ac_delim -+CUPS_API_MINOR!$CUPS_API_MINOR$ac_delim -+CUPS_CFLAGS!$CUPS_CFLAGS$ac_delim -+CUPS_LIBS!$CUPS_LIBS$ac_delim -+HAVE_CUPS_TRUE!$HAVE_CUPS_TRUE$ac_delim -+HAVE_CUPS_FALSE!$HAVE_CUPS_FALSE$ac_delim -+HAVE_HTTP_AUTHSTRING!$HAVE_HTTP_AUTHSTRING$ac_delim -+TEST_PRINT_BACKEND_TRUE!$TEST_PRINT_BACKEND_TRUE$ac_delim -+TEST_PRINT_BACKEND_FALSE!$TEST_PRINT_BACKEND_FALSE$ac_delim -+HTML_DIR!$HTML_DIR$ac_delim -+GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim -+ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim -+ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim -+GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim -+GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim -+DB2HTML!$DB2HTML$ac_delim -+HAVE_DOCBOOK_TRUE!$HAVE_DOCBOOK_TRUE$ac_delim -+HAVE_DOCBOOK_FALSE!$HAVE_DOCBOOK_FALSE$ac_delim -+XSLTPROC!$XSLTPROC$ac_delim -+XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim -+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 - --# Commands used to build a loadable module if different from building --# a shared archive. --module_cmds=$lt_module_cmds_CXX --module_expsym_cmds=$lt_module_expsym_cmds_CXX -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; 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 - --# Whether we are building with GNU ld or not. --with_gnu_ld=$lt_with_gnu_ld_CXX -+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 - --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag_CXX - --# Flag that enforces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag_CXX -+# 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 -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+s/:*\$(srcdir):*/:/ -+s/:*\${srcdir}:*/:/ -+s/:*@srcdir@:*/:/ -+s/^\([^=]*=[ ]*\):*/\1/ -+s/:*$// -+s/^[^=]*=[ ]*$// -+}' -+fi - --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -+cat >>$CONFIG_STATUS <<\_ACEOF -+fi # test -n "$CONFIG_FILES" - --# If ld is used when linking, flag to hardcode \$libdir into a binary --# during linking. This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - --# Whether we need a single "-rpath" flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -+echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ { (exit 1); exit 1; }; };; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift - --# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes --# DIR into the resulting binary. --hardcode_direct=$hardcode_direct_CXX -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+ ac_file_inputs="$ac_file_inputs $ac_f" -+ done - --# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes --# DIR into the resulting binary and the resulting library dependency is --# "absolute",i.e impossible to change by setting \${shlibpath_var} if the --# library is relocated. --hardcode_direct_absolute=$hardcode_direct_absolute_CXX -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input="Generated from "`IFS=: -+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ fi - --# Set to "yes" if using the -LDIR flag during linking hardcodes DIR --# into the resulting binary. --hardcode_minus_L=$hardcode_minus_L_CXX -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin";; -+ esac -+ ;; -+ esac - --# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR --# into the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX -+ ac_dir=`$as_dirname -- "$ac_file" || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir="$ac_dir" -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ { (exit 1); exit 1; }; }; } -+ ac_builddir=. - --# Set to "yes" if building a shared library automatically hardcodes DIR --# into the library and all subsequent libraries and executables linked --# against it. --hardcode_automatic=$hardcode_automatic_CXX -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - --# Set to yes if linker adds runtime paths of dependent libraries --# to runtime path list. --inherit_rpath=$inherit_rpath_CXX -+case $srcdir in -+ .) # We are building in place. -+ ac_srcdir=. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -+esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs_CXX - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path_CXX -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - --# Set to "yes" if exported symbols are required. --always_export_symbols=$always_export_symbols_CXX -+ case $INSTALL in -+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; -+ esac -+ ac_MKDIR_P=$MKDIR_P -+ case $MKDIR_P in -+ [\\/$]* | ?:[\\/]* ) ;; -+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; -+ esac -+_ACEOF - --# The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds_CXX -+cat >>$CONFIG_STATUS <<\_ACEOF -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= - --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms_CXX -+case `sed -n '/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p -+' $ac_file_inputs` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac -+_ACEOF - --# Symbols that must always be exported. --include_expsyms=$lt_include_expsyms_CXX -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF -+ sed "$ac_vpsub -+$extrasub -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+:t -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+s&@configure_input@&$configure_input&;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+s&@MKDIR_P@&$ac_MKDIR_P&;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 -f "$tmp/subs-4.sed" >$tmp/out - --# Commands necessary for linking programs (against libraries) with templates. --prelink_cmds=$lt_prelink_cmds_CXX -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&2;} - --# Specify filename containing input files. --file_list_spec=$lt_file_list_spec_CXX -+ rm -f "$tmp/stdin" -+ case $ac_file in -+ -) cat "$tmp/out"; rm -f "$tmp/out";; -+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; -+ esac -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # -+_ACEOF - --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action_CXX -+# Transform confdefs.h into a sed script `conftest.defines', that -+# substitutes the proper values into config.h.in to produce config.h. -+rm -f conftest.defines conftest.tail -+# First, append a space to every undef/define line, to ease matching. -+echo 's/$/ /' >conftest.defines -+# Then, protect against being on the right side of a sed subst, or in -+# an unquoted here document, in config.status. If some macros were -+# called several times there might be several #defines for the same -+# symbol, which is useless. But do not sort them, since the last -+# AC_DEFINE must be honored. -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -+# NAME is the cpp macro being defined, VALUE is the value it is being given. -+# PARAMS is the parameter list in the macro definition--in most cases, it's -+# just an empty string. -+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -+ac_dB='\\)[ (].*,\\1define\\2' -+ac_dC=' ' -+ac_dD=' ,' - --# The directories searched by this compiler when creating a shared library. --compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX -+uniq confdefs.h | -+ sed -n ' -+ t rset -+ :rset -+ s/^[ ]*#[ ]*define[ ][ ]*// -+ t ok -+ d -+ :ok -+ s/[\\&,]/\\&/g -+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p -+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p -+ ' >>conftest.defines -+ -+# Remove the space that was appended to ease matching. -+# Then replace #undef with comments. This is necessary, for -+# example, in the case of _POSIX_SOURCE, which is predefined and required -+# on some systems where configure will not decide to define it. -+# (The regexp can be short, since the line contains either #define or #undef.) -+echo 's/ $// -+s,^[ #]*u.*,/* & */,' >>conftest.defines -+ -+# Break up conftest.defines: -+ac_max_sed_lines=50 -+ -+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -+# et cetera. -+ac_in='$ac_file_inputs' -+ac_out='"$tmp/out1"' -+ac_nxt='"$tmp/out2"' -+ -+while : -+do -+ # Write a here document: -+ cat >>$CONFIG_STATUS <<_ACEOF -+ # First, check the format of the line: -+ cat >"\$tmp/defines.sed" <<\\CEOF -+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -+b -+:def -+_ACEOF -+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS -+ echo 'CEOF -+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS -+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in -+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail -+ grep . conftest.tail >/dev/null || break -+ rm -f conftest.defines -+ mv conftest.tail conftest.defines -+done -+rm -f conftest.defines conftest.tail - --# Dependencies to place before and after the objects being linked to --# create a shared library. --predep_objects=$lt_predep_objects_CXX --postdep_objects=$lt_postdep_objects_CXX --predeps=$lt_predeps_CXX --postdeps=$lt_postdeps_CXX -+echo "ac_result=$ac_in" >>$CONFIG_STATUS -+cat >>$CONFIG_STATUS <<\_ACEOF -+ if test x"$ac_file" != x-; then -+ echo "/* $configure_input */" >"$tmp/config.h" -+ cat "$ac_result" >>"$tmp/config.h" -+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then -+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -+echo "$as_me: $ac_file is unchanged" >&6;} -+ else -+ rm -f $ac_file -+ mv "$tmp/config.h" $ac_file -+ fi -+ else -+ echo "/* $configure_input */" -+ cat "$ac_result" -+ fi -+ rm -f "$tmp/out12" -+# Compute $ac_file's index in $config_headers. -+_am_arg=$ac_file -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $_am_arg | $_am_arg:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; -+ esac -+done -+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$_am_arg" : 'X\(//\)[^/]' \| \ -+ X"$_am_arg" : 'X\(//\)$' \| \ -+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$_am_arg" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'`/stamp-h$_am_stamp_count -+ ;; - --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -+echo "$as_me: executing $ac_file commands" >&6;} -+ ;; -+ esac - --# ### END LIBTOOL TAG CONFIG: CXX --_LT_EOF - -+ case $ac_file$ac_mode in -+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do -+ # Strip MF so we end up with the name of the file. -+ mf=`echo "$mf" | sed -e 's/:.*$//'` -+ # Check whether this is an Automake generated Makefile or not. -+ # We used to match only the files named `Makefile.in', but -+ # some people rename them; so instead we look at the file content. -+ # Grep'ing the first line is not enough: some people post-process -+ # each Makefile.in and add a new line on top of each file to say so. -+ # Grep'ing the whole file is not good either: AIX grep has a line -+ # limit of 2048, but all sed's we know have understand at least 4000. -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then -+ dirpart=`$as_dirname -- "$mf" || -+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$mf" : 'X\(//\)[^/]' \| \ -+ X"$mf" : 'X\(//\)$' \| \ -+ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$mf" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ else -+ continue -+ fi -+ # Extract the definition of DEPDIR, am__include, and am__quote -+ # from the Makefile without running `make'. -+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` -+ test -z "$DEPDIR" && continue -+ am__include=`sed -n 's/^am__include = //p' < "$mf"` -+ test -z "am__include" && continue -+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` -+ # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -78883,117 +43614,827 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/configure gtk+2. + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ -+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -+ # Make sure the directory exists. -+ test -f "$dirpart/$file" && continue -+ fdir=`$as_dirname -- "$file" || -+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$file" : 'X\(//\)[^/]' \| \ -+ X"$file" : 'X\(//\)$' \| \ -+ X"$file" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir=$dirpart/$fdir -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ { (exit 1); exit 1; }; }; } -+ # echo "creating $dirpart/$file" -+ echo '# dummy' > "$dirpart/$file" -+ done -+done + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue +@@ -37685,6 +35670,814 @@ + done + done ;; ++ "libtool":C) ++ ++ # 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 ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" ++ ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL ++ ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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 General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ ++ ++# The names of the tagged configurations supported by this script. ++available_tags="CXX " ++ ++# ### BEGIN LIBTOOL CONFIG ++ ++# Whether or not to build static libraries. ++build_old_libs=$enable_static ++ ++# Assembler program. ++AS=$AS ++ ++# DLL creation program. ++DLLTOOL=$DLLTOOL ++ ++# Object dumper program. ++OBJDUMP=$OBJDUMP ++ ++# Which release of libtool.m4 was used? ++macro_version=$macro_version ++macro_revision=$macro_revision ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared ++ ++# What type of objects to build. ++pic_mode=$pic_mode ++ ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install ++ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os ++ ++# A sed program that does not truncate output. ++SED=$lt_SED ++ ++# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++Xsed="\$SED -e 1s/^X//" ++ ++# A grep program that handles long lines. ++GREP=$lt_GREP ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# A literal string matcher. ++FGREP=$lt_FGREP ++ ++# A BSD- or MS-compatible name lister. ++NM=$lt_NM ++ ++# Whether we need soft or hard links. ++LN_S=$lt_LN_S ++ ++# What is the maximum length of a command? ++max_cmd_len=$max_cmd_len ++ ++# Object file suffix (normally "o"). ++objext=$ac_objext ++ ++# Executable file suffix (normally ""). ++exeext=$exeext ++ ++# whether the shell understands "unset". ++lt_unset=$lt_unset ++ ++# turn spaces into newlines. ++SP2NL=$lt_lt_SP2NL ++ ++# turn newlines into spaces. ++NL2SP=$lt_lt_NL2SP ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == "file_magic". ++file_magic_cmd=$lt_file_magic_cmd ++ ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS ++ ++# A symbol stripping program. ++STRIP=$lt_STRIP ++ ++# Commands used to install an old-style archive. ++RANLIB=$lt_RANLIB ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ ++# A C compiler. ++LTCC=$lt_CC ++ ++# LTCC compiler flags. ++LTCFLAGS=$lt_CFLAGS ++ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ ++# Transform the output of nm in a proper C declaration. ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ ++# Transform the output of nm in a C name address pair. ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ ++# Transform the output of nm in a C name address pair when lib prefix is needed. ++global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix ++ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir ++ ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# An echo program that does not interpret backslashes. ++ECHO=$lt_ECHO ++ ++# Used to examine libraries when file_magic_cmd begins with "file". ++MAGIC_CMD=$MAGIC_CMD ++ ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Tool to manipulate archived DWARF debug symbol files on Mac OS X. ++DSYMUTIL=$lt_DSYMUTIL ++ ++# Tool to change global to local symbols on Mac OS X. ++NMEDIT=$lt_NMEDIT ++ ++# Tool to manipulate fat objects and archives on Mac OS X. ++LIPO=$lt_LIPO ++ ++# ldd/readelf like tool for Mach-O binaries on Mac OS X. ++OTOOL=$lt_OTOOL ++ ++# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. ++OTOOL64=$lt_OTOOL64 ++ ++# Old archive suffix (normally "a"). ++libext=$libext ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds=$lt_shrext_cmds ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at link time. ++variables_saved_for_relink=$lt_variables_saved_for_relink ++ ++# Do we need the "lib" prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# Shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Command to use after installation of a shared archive. ++postinstall_cmds=$lt_postinstall_cmds ++ ++# Command to use after uninstallation of a shared archive. ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# As "finish_cmds", except a single script fragment to be evaled but ++# not shown. ++finish_eval=$lt_finish_eval ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Compile-time system search path for libraries. ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries. ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++ ++# The linker used to build libraries. ++LD=$lt_LD ++ ++# Commands used to build an old-style archive. ++old_archive_cmds=$lt_old_archive_cmds ++ ++# A language specific compiler. ++CC=$lt_compiler ++ ++# Is the compiler the GNU compiler? ++with_gcc=$GCC ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc ++ ++# Whether or not to disallow shared libs when runtime libs are static. ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec ++ ++# Whether the compiler copes with passing no objects directly. ++compiler_needs_object=$lt_compiler_needs_object ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds ++ ++# Commands used to build a shared archive. ++archive_cmds=$lt_archive_cmds ++archive_expsym_cmds=$lt_archive_expsym_cmds ++ ++# Commands used to build a loadable module if different from building ++# a shared archive. ++module_cmds=$lt_module_cmds ++module_expsym_cmds=$lt_module_expsym_cmds ++ ++# Whether we are building with GNU ld or not. ++with_gnu_ld=$lt_with_gnu_ld ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag ++ ++# Flag that enforces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec ++ ++# If ld is used when linking, flag to hardcode \$libdir into a binary ++# during linking. This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld ++ ++# Whether we need a single "-rpath" flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary. ++hardcode_direct=$hardcode_direct ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary and the resulting library dependency is ++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the ++# library is relocated. ++hardcode_direct_absolute=$hardcode_direct_absolute ++ ++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++# into the resulting binary. ++hardcode_minus_L=$hardcode_minus_L ++ ++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++# into the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var ++ ++# Set to "yes" if building a shared library automatically hardcodes DIR ++# into the library and all subsequent libraries and executables linked ++# against it. ++hardcode_automatic=$hardcode_automatic ++ ++# Set to yes if linker adds runtime paths of dependent libraries ++# to runtime path list. ++inherit_rpath=$inherit_rpath ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path ++ ++# Set to "yes" if exported symbols are required. ++always_export_symbols=$always_export_symbols ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms ++ ++# Commands necessary for linking programs (against libraries) with templates. ++prelink_cmds=$lt_prelink_cmds ++ ++# Specify filename containing input files. ++file_list_spec=$lt_file_list_spec ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action ++ ++# The directories searched by this compiler when creating a shared library. ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs ++ ++# Dependencies to place before and after the objects being linked to ++# create a shared library. ++predep_objects=$lt_predep_objects ++postdep_objects=$lt_postdep_objects ++predeps=$lt_predeps ++postdeps=$lt_postdeps ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path ++ ++# ### END LIBTOOL CONFIG ++ ++_LT_EOF ++ ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac ++ ++ ++ltmain="$ac_aux_dir/ltmain.sh" ++ ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ case $xsi_shell in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result="${1##*/}" ++} ++ ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}" ++} ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++func_stripname () ++{ ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"} ++} ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=${1%%=*} ++ func_opt_split_arg=${1#*=} ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=${1%.*}.lo ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=$(( $* )) ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=${#1} ++} ++ ++_LT_EOF ++ ;; ++ *) # Bourne compatible functions. ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++} ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; ++ esac ++} ++ ++# sed scripts: ++my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' ++my_sed_long_arg='1s/^-[^=]*=//' ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` ++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "$@"` ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` ++} ++ ++_LT_EOF ++esac ++ ++case $lt_shell_append in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1+=\$2" ++} ++_LT_EOF ++ ;; ++ *) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1=\$$1\$2" ++} ++ ++_LT_EOF ++ ;; ++ esac ++ ++ ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++ ++ ++ cat <<_LT_EOF >> "$ofile" ++ ++# ### BEGIN LIBTOOL TAG CONFIG: CXX ++ ++# The linker used to build libraries. ++LD=$lt_LD_CXX ++ ++# Commands used to build an old-style archive. ++old_archive_cmds=$lt_old_archive_cmds_CXX ++ ++# A language specific compiler. ++CC=$lt_compiler_CXX ++ ++# Is the compiler the GNU compiler? ++with_gcc=$GCC_CXX ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl_CXX ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic_CXX ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static_CXX ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc_CXX ++ ++# Whether or not to disallow shared libs when runtime libs are static. ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX ++ ++# Whether the compiler copes with passing no objects directly. ++compiler_needs_object=$lt_compiler_needs_object_CXX ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX ++ ++# Commands used to build a shared archive. ++archive_cmds=$lt_archive_cmds_CXX ++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX ++ ++# Commands used to build a loadable module if different from building ++# a shared archive. ++module_cmds=$lt_module_cmds_CXX ++module_expsym_cmds=$lt_module_expsym_cmds_CXX ++ ++# Whether we are building with GNU ld or not. ++with_gnu_ld=$lt_with_gnu_ld_CXX ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag_CXX ++ ++# Flag that enforces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag_CXX ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX ++ ++# If ld is used when linking, flag to hardcode \$libdir into a binary ++# during linking. This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX ++ ++# Whether we need a single "-rpath" flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary. ++hardcode_direct=$hardcode_direct_CXX ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary and the resulting library dependency is ++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the ++# library is relocated. ++hardcode_direct_absolute=$hardcode_direct_absolute_CXX ++ ++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++# into the resulting binary. ++hardcode_minus_L=$hardcode_minus_L_CXX ++ ++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++# into the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX ++ ++# Set to "yes" if building a shared library automatically hardcodes DIR ++# into the library and all subsequent libraries and executables linked ++# against it. ++hardcode_automatic=$hardcode_automatic_CXX ++ ++# Set to yes if linker adds runtime paths of dependent libraries ++# to runtime path list. ++inherit_rpath=$inherit_rpath_CXX ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs_CXX ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path_CXX ++ ++# Set to "yes" if exported symbols are required. ++always_export_symbols=$always_export_symbols_CXX ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds_CXX ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms_CXX ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms_CXX ++ ++# Commands necessary for linking programs (against libraries) with templates. ++prelink_cmds=$lt_prelink_cmds_CXX ++ ++# Specify filename containing input files. ++file_list_spec=$lt_file_list_spec_CXX ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action_CXX ++ ++# The directories searched by this compiler when creating a shared library. ++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX ++ ++# Dependencies to place before and after the objects being linked to ++# create a shared library. ++predep_objects=$lt_predep_objects_CXX ++postdep_objects=$lt_postdep_objects_CXX ++predeps=$lt_predeps_CXX ++postdeps=$lt_postdeps_CXX ++ ++# The library search path used internally by the compiler when linking ++# a shared library. ++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX ++ ++# ### END LIBTOOL TAG CONFIG: CXX ++_LT_EOF ++ ++ ;; "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -@@ -35717,8 +38184,8 @@ - - - if cmp -s $outfile gdk/gdkconfig.h; then -- { $as_echo "$as_me:$LINENO: gdk/gdkconfig.h is unchanged" >&5 --$as_echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} -+ { echo "$as_me:$LINENO: gdk/gdkconfig.h is unchanged" >&5 -+echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} - rm -f $outfile - else - mv $outfile gdk/gdkconfig.h -@@ -35734,11 +38201,6 @@ - chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - --test $ac_write_fail = 0 || -- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 --$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} -- { (exit 1); exit 1; }; } -- - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -35760,10 +38222,6 @@ - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } - fi --if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 --$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} --fi - - - echo "configuration: -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.5/contrib/gdk-pixbuf-xlib/Makefile.in ---- gtk+2.0-2.14.5.old/contrib/gdk-pixbuf-xlib/Makefile.in 2008-11-24 07:41:38.000000000 +0100 -+++ gtk+2.0-2.14.5/contrib/gdk-pixbuf-xlib/Makefile.in 2008-11-25 11:09:45.000000000 +0100 + esac ;; +diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7/contrib/gdk-pixbuf-xlib/Makefile.in +--- gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-01-07 22:52:01.000000000 +0100 ++++ gtk+2.0-2.14.7/contrib/gdk-pixbuf-xlib/Makefile.in 2009-01-08 08:03:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -79117,7 +44558,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +128,16 @@ +@@ -81,22 +128,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -79125,8 +44566,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -79136,13 +44577,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +161,7 @@ +@@ -120,6 +160,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -79150,7 +44591,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +180,6 @@ +@@ -138,8 +179,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -79159,7 +44600,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +190,20 @@ +@@ -150,97 +189,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -79255,15 +44696,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +214,20 @@ +@@ -251,29 +214,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -79288,12 +44729,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +238,6 @@ +@@ -284,8 +241,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -79302,7 +44743,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +249,10 @@ +@@ -297,28 +252,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -79331,7 +44772,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +261,25 @@ +@@ -327,22 +264,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -79341,12 +44782,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -79362,17 +44803,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +301,8 @@ +@@ -364,7 +304,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +311,11 @@ +@@ -373,9 +315,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -79380,12 +44821,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,29 +346,23 @@ +@@ -406,29 +351,23 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -79415,7 +44857,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb libgdk_pixbuf_xlib_2_0_la_SOURCES = \ gdk-pixbuf-xlib-private.h \ gdk-pixbuf-xlib.c \ -@@ -440,99 +370,80 @@ +@@ -436,99 +375,80 @@ gdk-pixbuf-xlib-drawable.c \ gdk-pixbuf-xlibrgb.c @@ -79553,7 +44995,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb distclean-compile: -rm -f *.tab.c -@@ -543,100 +454,75 @@ +@@ -539,100 +459,75 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdk-pixbuf-xlibrgb.Plo@am__quote@ .c.o: @@ -79683,7 +45125,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -646,23 +532,23 @@ +@@ -642,23 +537,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -79716,7 +45158,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -674,29 +560,23 @@ +@@ -670,29 +565,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -79759,7 +45201,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -711,9 +591,10 @@ +@@ -707,9 +596,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) @@ -79772,7 +45214,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -733,7 +614,7 @@ +@@ -729,7 +619,7 @@ clean-generic: distclean-generic: @@ -79781,7 +45223,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -747,12 +628,14 @@ +@@ -743,12 +633,14 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -79797,7 +45239,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb info: info-am info-am: -@@ -760,12 +643,20 @@ +@@ -756,12 +648,20 @@ install-data-am: install-libgdk_pixbuf_xlibincludeHEADERS \ install-pkgconfigDATA @@ -79818,7 +45260,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb installcheck-am: maintainer-clean: maintainer-clean-am -@@ -786,23 +677,27 @@ +@@ -782,23 +682,27 @@ ps-am: @@ -79858,9 +45300,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/gdk-pixb uninstall-libgdk_pixbuf_xlibincludeHEADERS \ uninstall-pkgconfigDATA -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile.in gtk+2.0-2.14.5/contrib/Makefile.in ---- gtk+2.0-2.14.5.old/contrib/Makefile.in 2008-11-24 07:41:38.000000000 +0100 -+++ gtk+2.0-2.14.5/contrib/Makefile.in 2008-11-25 11:09:45.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefile.in +--- gtk+2.0-2.14.7.old/contrib/Makefile.in 2009-01-07 22:52:01.000000000 +0100 ++++ gtk+2.0-2.14.7/contrib/Makefile.in 2009-01-08 08:03:47.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -79954,7 +45396,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,21 +96,16 @@ +@@ -82,22 +96,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -79962,8 +45404,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -79973,13 +45415,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +129,7 @@ +@@ -121,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -79987,7 +45429,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +148,6 @@ +@@ -139,8 +147,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -79996,7 +45438,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,98 +158,20 @@ +@@ -151,97 +157,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -80092,15 +45534,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -252,32 +182,20 @@ +@@ -252,29 +182,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -80125,12 +45567,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -288,8 +206,6 @@ +@@ -285,8 +209,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -80139,7 +45581,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -301,28 +217,10 @@ +@@ -298,28 +220,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -80168,7 +45610,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -331,22 +229,25 @@ +@@ -328,22 +232,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -80178,12 +45620,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -80199,17 +45641,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -368,8 +269,8 @@ +@@ -365,7 +272,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -378,9 +279,11 @@ +@@ -374,9 +283,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -80217,12 +45659,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -411,31 +314,39 @@ +@@ -407,31 +319,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -80281,7 +45724,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile mostlyclean-libtool: -rm -f *.lo -@@ -443,10 +354,6 @@ +@@ -439,10 +359,6 @@ clean-libtool: -rm -rf .libs _libs @@ -80292,7 +45735,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -454,7 +361,13 @@ +@@ -450,7 +366,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -80307,7 +45750,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -466,15 +379,20 @@ +@@ -462,15 +384,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -80332,7 +45775,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -495,7 +413,7 @@ +@@ -491,7 +418,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -80341,7 +45784,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -506,35 +424,30 @@ +@@ -502,35 +429,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -80384,7 +45827,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -542,23 +455,23 @@ +@@ -538,23 +460,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -80417,7 +45860,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -570,29 +483,23 @@ +@@ -566,29 +488,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -80460,7 +45903,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -605,13 +512,17 @@ +@@ -601,13 +517,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -80482,7 +45925,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile distdir) \ || exit 1; \ fi; \ -@@ -622,7 +533,6 @@ +@@ -618,7 +538,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -80490,7 +45933,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -642,7 +552,7 @@ +@@ -638,7 +557,7 @@ clean-generic: distclean-generic: @@ -80499,7 +45942,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -653,25 +563,34 @@ +@@ -649,25 +568,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -80536,7 +45979,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -690,26 +609,24 @@ +@@ -686,26 +614,24 @@ ps-am: @@ -80579,9 +46022,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/contrib/Makefile # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.5/demos/gtk-demo/Makefile.in ---- gtk+2.0-2.14.5.old/demos/gtk-demo/Makefile.in 2008-11-24 07:41:38.000000000 +0100 -+++ gtk+2.0-2.14.5/demos/gtk-demo/Makefile.in 2008-11-25 11:09:45.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gtk-demo/Makefile.in +--- gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in 2009-01-07 22:52:02.000000000 +0100 ++++ gtk+2.0-2.14.7/demos/gtk-demo/Makefile.in 2009-01-08 08:03:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -80704,7 +46147,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +127,16 @@ +@@ -81,22 +127,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -80712,8 +46155,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -80723,13 +46166,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +160,7 @@ +@@ -120,6 +159,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -80737,7 +46180,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +179,6 @@ +@@ -138,8 +178,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -80746,7 +46189,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +189,20 @@ +@@ -150,97 +188,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -80842,15 +46285,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +213,20 @@ +@@ -251,29 +213,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -80875,12 +46318,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +237,6 @@ +@@ -284,8 +240,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -80889,7 +46332,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +248,10 @@ +@@ -297,28 +251,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -80918,7 +46361,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +260,25 @@ +@@ -327,22 +263,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -80928,12 +46371,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -80949,17 +46392,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +300,8 @@ +@@ -364,7 +303,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,17 +310,16 @@ +@@ -373,17 +314,17 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -80967,6 +46410,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -80981,7 +46425,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M TEST_PROGS = ### testing rules -@@ -413,9 +345,7 @@ +@@ -409,9 +350,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -80991,7 +46435,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M demos = \ appwindow.c \ assistant.c \ -@@ -448,7 +378,6 @@ +@@ -444,7 +383,6 @@ tree_store.c \ ui_manager.c @@ -80999,7 +46443,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M INCLUDES = \ -DDEMOCODEDIR="\"$(democodedir)\"" \ -I$(top_srcdir) \ -@@ -458,34 +387,26 @@ +@@ -454,34 +392,26 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -81034,7 +46478,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M IMAGEFILES = alphatest.png \ apple-red.png \ background.jpg \ -@@ -501,93 +422,55 @@ +@@ -497,93 +427,55 @@ gnu-keys.png \ gtk-logo-rgb.gif @@ -81159,7 +46603,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M else :; fi; \ done -@@ -595,8 +478,8 @@ +@@ -591,8 +483,8 @@ @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -81170,7 +46614,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M done clean-binPROGRAMS: -@@ -607,10 +490,10 @@ +@@ -603,10 +495,10 @@ done gtk-demo$(EXEEXT): $(gtk_demo_OBJECTS) $(gtk_demo_DEPENDENCIES) @rm -f gtk-demo$(EXEEXT) @@ -81183,7 +46627,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M distclean-compile: -rm -f *.tab.c -@@ -648,82 +531,58 @@ +@@ -644,82 +536,58 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_manager.Po@am__quote@ .c.o: @@ -81288,7 +46732,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -733,23 +592,23 @@ +@@ -729,23 +597,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -81321,7 +46765,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -761,29 +620,23 @@ +@@ -757,29 +625,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -81364,7 +46808,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -799,9 +652,10 @@ +@@ -795,9 +657,10 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) $(DATA) @@ -81377,7 +46821,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am -@@ -822,7 +676,7 @@ +@@ -818,7 +681,7 @@ clean-generic: distclean-generic: @@ -81386,7 +46830,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -837,24 +691,34 @@ +@@ -833,24 +696,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -81422,7 +46866,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M installcheck-am: maintainer-clean: maintainer-clean-am -@@ -875,21 +739,24 @@ +@@ -871,21 +744,24 @@ ps-am: @@ -81458,9 +46902,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/gtk-demo/M # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.in gtk+2.0-2.14.5/demos/Makefile.in ---- gtk+2.0-2.14.5.old/demos/Makefile.in 2008-11-24 07:41:38.000000000 +0100 -+++ gtk+2.0-2.14.5/demos/Makefile.in 2008-11-25 11:09:45.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in +--- gtk+2.0-2.14.7.old/demos/Makefile.in 2009-01-07 22:52:01.000000000 +0100 ++++ gtk+2.0-2.14.7/demos/Makefile.in 2009-01-08 08:03:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -81591,7 +47035,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,21 +135,16 @@ +@@ -82,22 +135,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -81599,8 +47043,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -81610,13 +47054,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +168,7 @@ +@@ -121,6 +167,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -81624,7 +47068,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +187,6 @@ +@@ -139,8 +186,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -81633,7 +47077,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,98 +197,20 @@ +@@ -151,97 +196,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -81729,15 +47173,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -252,32 +221,20 @@ +@@ -252,29 +221,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -81762,12 +47206,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -288,8 +245,6 @@ +@@ -285,8 +248,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -81776,7 +47220,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -301,28 +256,10 @@ +@@ -298,28 +259,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -81805,7 +47249,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -331,22 +268,25 @@ +@@ -328,22 +271,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -81815,12 +47259,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -81836,17 +47280,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -368,8 +308,8 @@ +@@ -365,7 +311,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -378,24 +318,18 @@ +@@ -374,24 +322,19 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -81854,6 +47298,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -81877,7 +47322,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i TEST_PROGS = ### testing rules -@@ -421,9 +355,7 @@ +@@ -417,9 +360,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -81887,7 +47332,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -432,131 +364,74 @@ +@@ -428,131 +369,74 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -82048,7 +47493,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -566,25 +441,25 @@ +@@ -562,25 +446,25 @@ done pixbuf-demo$(EXEEXT): $(pixbuf_demo_OBJECTS) $(pixbuf_demo_DEPENDENCIES) @rm -f pixbuf-demo$(EXEEXT) @@ -82081,7 +47526,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i distclean-compile: -rm -f *.tab.c -@@ -598,37 +473,25 @@ +@@ -594,37 +478,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpixbuf.Po@am__quote@ .c.o: @@ -82131,7 +47576,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i mostlyclean-libtool: -rm -f *.lo -@@ -636,10 +499,6 @@ +@@ -632,10 +504,6 @@ clean-libtool: -rm -rf .libs _libs @@ -82142,7 +47587,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -647,7 +506,13 @@ +@@ -643,7 +511,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -82157,7 +47602,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -659,15 +524,20 @@ +@@ -655,15 +529,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -82182,7 +47627,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -688,7 +558,7 @@ +@@ -684,7 +563,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -82191,7 +47636,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -699,35 +569,30 @@ +@@ -695,35 +574,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -82234,7 +47679,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -735,23 +600,23 @@ +@@ -731,23 +605,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -82267,7 +47712,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -763,29 +628,23 @@ +@@ -759,29 +633,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -82310,7 +47755,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -796,15 +655,19 @@ +@@ -792,15 +660,19 @@ || exit 1; \ fi; \ done @@ -82335,7 +47780,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i distdir) \ || exit 1; \ fi; \ -@@ -816,7 +679,6 @@ +@@ -812,7 +684,6 @@ all-am: Makefile $(PROGRAMS) installdirs: installdirs-recursive installdirs-am: @@ -82343,7 +47788,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -837,7 +699,7 @@ +@@ -833,7 +704,7 @@ clean-generic: distclean-generic: @@ -82352,7 +47797,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -853,24 +715,34 @@ +@@ -849,24 +720,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -82388,7 +47833,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -891,27 +763,25 @@ +@@ -887,27 +768,25 @@ ps-am: @@ -82433,9 +47878,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/demos/Makefile.i # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/depcomp gtk+2.0-2.14.5/depcomp ---- gtk+2.0-2.14.5.old/depcomp 2007-09-18 16:10:46.000000000 +0200 -+++ gtk+2.0-2.14.5/depcomp 2008-11-25 11:09:53.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/depcomp gtk+2.0-2.14.7/depcomp +--- gtk+2.0-2.14.7.old/depcomp 2007-09-18 16:10:46.000000000 +0200 ++++ gtk+2.0-2.14.7/depcomp 2009-01-08 08:03:56.000000000 +0100 @@ -1,7 +1,10 @@ #! /bin/sh - @@ -82715,9 +48160,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/depcomp gtk+2.0- +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefile.in gtk+2.0-2.14.5/docs/faq/Makefile.in ---- gtk+2.0-2.14.5.old/docs/faq/Makefile.in 2008-11-24 07:41:39.000000000 +0100 -+++ gtk+2.0-2.14.5/docs/faq/Makefile.in 2008-11-25 11:09:46.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makefile.in +--- gtk+2.0-2.14.7.old/docs/faq/Makefile.in 2009-01-07 22:52:02.000000000 +0100 ++++ gtk+2.0-2.14.7/docs/faq/Makefile.in 2009-01-08 08:03:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -82798,7 +48243,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +83,16 @@ +@@ -81,22 +83,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -82806,8 +48251,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -82817,13 +48262,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +116,7 @@ +@@ -120,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -82831,7 +48276,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +135,6 @@ +@@ -138,8 +134,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -82840,7 +48285,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +145,20 @@ +@@ -150,97 +144,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -82936,15 +48381,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +169,20 @@ +@@ -251,29 +169,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -82969,12 +48414,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +193,6 @@ +@@ -284,8 +196,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -82983,7 +48428,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +204,10 @@ +@@ -297,28 +207,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -83012,7 +48457,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +216,25 @@ +@@ -327,22 +219,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -83022,12 +48467,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -83043,17 +48488,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +256,8 @@ +@@ -364,7 +259,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,16 +266,16 @@ +@@ -373,16 +270,17 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -83061,6 +48506,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -83074,7 +48520,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil TEST_PROGS = ### testing rules -@@ -412,61 +301,67 @@ +@@ -408,61 +306,67 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -83176,7 +48622,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -484,7 +379,6 @@ +@@ -480,7 +384,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile @@ -83184,7 +48630,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil installdirs: install: install-am install-exec: install-exec-am -@@ -505,7 +399,7 @@ +@@ -501,7 +404,7 @@ clean-generic: distclean-generic: @@ -83193,7 +48639,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -516,7 +410,7 @@ +@@ -512,7 +415,7 @@ distclean: distclean-am -rm -f Makefile @@ -83202,7 +48648,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil dvi: dvi-am -@@ -528,12 +422,20 @@ +@@ -524,12 +427,20 @@ install-data-am: @@ -83223,7 +48669,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil installcheck-am: maintainer-clean: maintainer-clean-am -@@ -544,25 +446,27 @@ +@@ -540,25 +451,27 @@ mostlyclean-am: mostlyclean-generic mostlyclean-libtool @@ -83262,9 +48708,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/faq/Makefil # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in gtk+2.0-2.14.5/docs/Makefile.in ---- gtk+2.0-2.14.5.old/docs/Makefile.in 2008-11-24 07:41:39.000000000 +0100 -+++ gtk+2.0-2.14.5/docs/Makefile.in 2008-11-25 11:09:46.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in +--- gtk+2.0-2.14.7.old/docs/Makefile.in 2009-01-07 22:52:02.000000000 +0100 ++++ gtk+2.0-2.14.7/docs/Makefile.in 2009-01-08 08:03:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -83357,7 +48803,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +95,16 @@ +@@ -81,22 +95,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -83365,8 +48811,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -83376,13 +48822,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +128,7 @@ +@@ -120,6 +127,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -83390,7 +48836,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +147,6 @@ +@@ -138,8 +146,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -83399,7 +48845,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +157,20 @@ +@@ -150,97 +156,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -83495,15 +48941,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +181,20 @@ +@@ -251,29 +181,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -83528,12 +48974,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +205,6 @@ +@@ -284,8 +208,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -83542,7 +48988,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +216,10 @@ +@@ -297,28 +219,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -83571,7 +49017,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +228,25 @@ +@@ -327,22 +231,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -83581,12 +49027,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -83602,17 +49048,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +268,8 @@ +@@ -364,7 +271,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,30 +278,20 @@ +@@ -373,30 +282,21 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -83620,6 +49066,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -83651,7 +49098,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in TEST_PROGS = ### testing rules -@@ -426,31 +317,39 @@ +@@ -422,31 +322,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -83710,7 +49157,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -458,10 +357,6 @@ +@@ -454,10 +362,6 @@ clean-libtool: -rm -rf .libs _libs @@ -83721,7 +49168,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -469,7 +364,13 @@ +@@ -465,7 +369,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -83736,7 +49183,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -481,15 +382,20 @@ +@@ -477,15 +387,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -83761,7 +49208,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -510,7 +416,7 @@ +@@ -506,7 +421,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -83770,7 +49217,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -521,35 +427,30 @@ +@@ -517,35 +432,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -83813,7 +49260,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -557,23 +458,23 @@ +@@ -553,23 +463,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -83846,7 +49293,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -585,29 +486,23 @@ +@@ -581,29 +491,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -83889,7 +49336,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -618,15 +513,19 @@ +@@ -614,15 +518,19 @@ || exit 1; \ fi; \ done @@ -83914,7 +49361,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -637,7 +536,6 @@ +@@ -633,7 +541,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -83922,7 +49369,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -657,7 +555,7 @@ +@@ -653,7 +560,7 @@ clean-generic: distclean-generic: @@ -83931,7 +49378,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -668,25 +566,34 @@ +@@ -664,25 +571,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -83968,7 +49415,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -705,26 +612,24 @@ +@@ -701,26 +617,24 @@ ps-am: @@ -84011,9 +49458,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/Makefile.in # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.5/docs/reference/gdk/Makefile.in ---- gtk+2.0-2.14.5.old/docs/reference/gdk/Makefile.in 2008-11-24 07:41:39.000000000 +0100 -+++ gtk+2.0-2.14.5/docs/reference/gdk/Makefile.in 2008-11-25 11:09:46.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs/reference/gdk/Makefile.in +--- gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in 2009-01-07 22:52:03.000000000 +0100 ++++ gtk+2.0-2.14.7/docs/reference/gdk/Makefile.in 2009-01-08 08:03:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -84095,7 +49542,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,21 +90,16 @@ +@@ -87,22 +90,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -84103,8 +49550,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -84114,13 +49561,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -125,6 +123,7 @@ +@@ -126,6 +122,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -84128,7 +49575,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -143,8 +142,6 @@ +@@ -144,8 +141,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -84137,7 +49584,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -155,98 +152,20 @@ +@@ -156,97 +151,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -84233,15 +49680,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -257,32 +176,20 @@ +@@ -257,29 +176,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -84266,12 +49713,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,8 +200,6 @@ +@@ -290,8 +203,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -84280,7 +49727,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -306,28 +211,10 @@ +@@ -303,28 +214,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -84309,7 +49756,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -336,22 +223,25 @@ +@@ -333,22 +226,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -84319,12 +49766,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -84340,17 +49787,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -373,8 +263,8 @@ +@@ -370,7 +266,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -383,22 +273,18 @@ +@@ -379,22 +277,19 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -84358,6 +49805,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -84379,7 +49827,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g TEST_PROGS = ### testing rules -@@ -424,7 +310,6 @@ +@@ -420,7 +315,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -84387,7 +49835,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g AUTOMAKE_OPTIONS = 1.6 # The name of the module. -@@ -474,7 +359,6 @@ +@@ -470,7 +364,6 @@ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -84395,7 +49843,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib) # Extra options to supply to gtkdoc-mkdb -@@ -576,12 +460,9 @@ +@@ -572,7 +465,6 @@ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -84403,12 +49851,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c --@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute - - # We set GPATH here; this gives us semantics for GNU make - # which are more like other make's VPATH, when it comes to -@@ -589,13 +470,10 @@ +@@ -585,13 +477,10 @@ # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -84422,7 +49865,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -603,31 +481,45 @@ +@@ -599,31 +488,45 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -84482,7 +49925,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -635,39 +527,29 @@ +@@ -631,39 +534,29 @@ clean-libtool: -rm -rf .libs _libs @@ -84535,7 +49978,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -685,7 +567,6 @@ +@@ -681,7 +574,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile all-local @@ -84543,7 +49986,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g installdirs: install: install-am install-exec: install-exec-am -@@ -707,7 +588,7 @@ +@@ -703,7 +595,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -84552,7 +49995,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -718,25 +599,34 @@ +@@ -714,25 +606,34 @@ distclean: distclean-am -rm -f Makefile @@ -84589,7 +50032,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g installcheck-am: maintainer-clean: maintainer-clean-am -@@ -756,18 +646,23 @@ +@@ -752,18 +653,23 @@ ps-am: @@ -84623,97 +50066,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g # call as: $(XVFB_START) && someprogram -@@ -828,8 +723,6 @@ - - docs: html-build.stamp - --$(REPORT_FILES): sgml-build.stamp -- - #### scan #### - - scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@@ -838,7 +731,7 @@ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ -- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ -+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ -@@ -883,12 +776,7 @@ - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html -- mkhtml_options=""; \ -- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -- if test "$(?)" = "0"; then \ -- mkhtml_options=--path="$(srcdir)"; \ -- fi -- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@@ -909,37 +797,23 @@ - cd $(srcdir) && rm -rf xml html - - install-data-local: -- installfiles=`echo $(srcdir)/html/*`; \ -+ -installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -- else \ -- installdir="$(DESTDIR)$(TARGET_DIR)"; \ -- fi; \ -- $(mkinstalldirs) $${installdir} ; \ -+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ -- $(INSTALL_DATA) $$i $${installdir}; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -- mv -f $${installdir}/$(DOC_MODULE).devhelp \ -- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ -- fi; \ -- ! which gtkdoc-rebase >/dev/null 2>&1 || \ -- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ -+ echo '-- Installing $(srcdir)/html/index.sgml' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ -+ which gtkdoc-rebase >/dev/null && \ -+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi - - uninstall-local: -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -- else \ -- installdir="$(DESTDIR)$(TARGET_DIR)"; \ -- fi; \ -- rm -rf $${installdir} -+ rm -f $(DESTDIR)$(TARGET_DIR)/* - - # - # Require gtk-doc when making dist -@@ -959,8 +833,7 @@ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) -- ! which gtkdoc-rebase >/dev/null 2>&1 || \ -- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html -+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - - .PHONY : dist-hook-local docs - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14.5/docs/reference/gdk-pixbuf/Makefile.in ---- gtk+2.0-2.14.5.old/docs/reference/gdk-pixbuf/Makefile.in 2008-11-24 07:41:39.000000000 +0100 -+++ gtk+2.0-2.14.5/docs/reference/gdk-pixbuf/Makefile.in 2008-11-25 11:09:46.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/docs/reference/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in 2009-01-07 22:52:02.000000000 +0100 ++++ gtk+2.0-2.14.7/docs/reference/gdk-pixbuf/Makefile.in 2009-01-08 08:03:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -84799,7 +50154,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,21 +94,16 @@ +@@ -87,22 +94,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -84807,8 +50162,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -84818,13 +50173,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -125,6 +127,7 @@ +@@ -126,6 +126,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -84832,7 +50187,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -143,8 +146,6 @@ +@@ -144,8 +145,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -84841,7 +50196,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -155,98 +156,20 @@ +@@ -156,97 +155,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -84937,15 +50292,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -257,32 +180,20 @@ +@@ -257,29 +180,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -84970,12 +50325,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,8 +204,6 @@ +@@ -290,8 +207,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -84984,7 +50339,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -306,28 +215,10 @@ +@@ -303,28 +218,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -85013,7 +50368,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -336,22 +227,25 @@ +@@ -333,22 +230,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -85023,12 +50378,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -85044,17 +50399,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -373,8 +267,8 @@ +@@ -370,7 +270,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -383,28 +277,19 @@ +@@ -379,28 +281,20 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -85062,6 +50417,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -85090,7 +50446,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g TEST_PROGS = ### testing rules -@@ -430,7 +315,6 @@ +@@ -426,7 +320,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -85098,7 +50454,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g AUTOMAKE_OPTIONS = 1.6 # The name of the module. -@@ -462,7 +346,6 @@ +@@ -458,7 +351,6 @@ xpm-color-table.h \ test-images.h @@ -85106,7 +50462,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -@@ -470,7 +353,6 @@ +@@ -466,7 +358,6 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -85114,7 +50470,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g GTKDOC_LIBS = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -500,12 +382,9 @@ +@@ -496,7 +387,6 @@ --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -85122,12 +50478,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c --@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute - - # We set GPATH here; this gives us semantics for GNU make - # which are more like other make's VPATH, when it comes to -@@ -513,13 +392,10 @@ +@@ -509,13 +399,10 @@ # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -85141,7 +50492,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -527,40 +403,49 @@ +@@ -523,40 +410,49 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -85210,7 +50561,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -568,15 +453,9 @@ +@@ -564,15 +460,9 @@ clean-libtool: -rm -rf .libs _libs @@ -85227,7 +50578,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ -@@ -595,8 +474,8 @@ +@@ -591,8 +481,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -85238,7 +50589,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g done uninstall-man1: @$(NORMAL_UNINSTALL) -@@ -616,8 +495,8 @@ +@@ -612,8 +502,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -85249,7 +50600,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g done tags: TAGS TAGS: -@@ -625,29 +504,23 @@ +@@ -621,29 +511,23 @@ ctags: CTAGS CTAGS: @@ -85292,7 +50643,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -665,9 +538,10 @@ +@@ -661,9 +545,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(MANS) all-local @@ -85305,7 +50656,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -688,7 +562,7 @@ +@@ -684,7 +569,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -85314,7 +50665,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -699,25 +573,34 @@ +@@ -695,25 +580,34 @@ distclean: distclean-am -rm -f Makefile @@ -85351,7 +50702,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g installcheck-am: maintainer-clean: maintainer-clean-am -@@ -737,21 +620,25 @@ +@@ -733,21 +627,25 @@ ps-am: @@ -85386,97 +50737,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g # call as: $(XVFB_START) && someprogram -@@ -812,8 +699,6 @@ - - docs: html-build.stamp - --$(REPORT_FILES): sgml-build.stamp -- - #### scan #### - - scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@@ -822,7 +707,7 @@ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ -- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ -+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ -@@ -867,12 +752,7 @@ - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html -- mkhtml_options=""; \ -- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -- if test "$(?)" = "0"; then \ -- mkhtml_options=--path="$(srcdir)"; \ -- fi -- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@@ -893,37 +773,23 @@ - cd $(srcdir) && rm -rf xml html - - install-data-local: -- installfiles=`echo $(srcdir)/html/*`; \ -+ -installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -- else \ -- installdir="$(DESTDIR)$(TARGET_DIR)"; \ -- fi; \ -- $(mkinstalldirs) $${installdir} ; \ -+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ -- $(INSTALL_DATA) $$i $${installdir}; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -- mv -f $${installdir}/$(DOC_MODULE).devhelp \ -- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ -- fi; \ -- ! which gtkdoc-rebase >/dev/null 2>&1 || \ -- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ -+ echo '-- Installing $(srcdir)/html/index.sgml' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ -+ which gtkdoc-rebase >/dev/null && \ -+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi - - uninstall-local: -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -- else \ -- installdir="$(DESTDIR)$(TARGET_DIR)"; \ -- fi; \ -- rm -rf $${installdir} -+ rm -f $(DESTDIR)$(TARGET_DIR)/* - - # - # Require gtk-doc when making dist -@@ -943,8 +809,7 @@ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) -- ! which gtkdoc-rebase >/dev/null 2>&1 || \ -- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html -+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - - .PHONY : dist-hook-local docs - -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.5/docs/reference/gtk/Makefile.in ---- gtk+2.0-2.14.5.old/docs/reference/gtk/Makefile.in 2008-11-24 07:41:39.000000000 +0100 -+++ gtk+2.0-2.14.5/docs/reference/gtk/Makefile.in 2008-11-25 11:09:46.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs/reference/gtk/Makefile.in +--- gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in 2009-01-07 22:52:04.000000000 +0100 ++++ gtk+2.0-2.14.7/docs/reference/gtk/Makefile.in 2009-01-08 08:03:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -85566,7 +50829,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -90,21 +94,16 @@ +@@ -90,22 +94,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -85574,8 +50837,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -85585,13 +50848,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -128,6 +127,7 @@ +@@ -129,6 +126,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -85599,7 +50862,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -146,8 +146,6 @@ +@@ -147,8 +145,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -85608,7 +50871,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -158,98 +156,20 @@ +@@ -159,97 +155,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -85704,15 +50967,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -260,32 +180,20 @@ +@@ -260,29 +180,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -85737,12 +51000,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -296,8 +204,6 @@ +@@ -293,8 +207,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -85751,7 +51014,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -309,28 +215,10 @@ +@@ -306,28 +218,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -85780,7 +51043,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -339,22 +227,25 @@ +@@ -336,22 +230,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -85790,12 +51053,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -85811,17 +51074,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -376,8 +267,8 @@ +@@ -373,7 +270,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -386,22 +277,18 @@ +@@ -382,22 +281,19 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -85829,6 +51092,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -85850,7 +51114,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g TEST_PROGS = ### testing rules -@@ -427,7 +314,6 @@ +@@ -423,7 +319,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -85858,7 +51122,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g AUTOMAKE_OPTIONS = 1.6 # The name of the module. -@@ -535,7 +421,6 @@ +@@ -531,7 +426,6 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -85866,7 +51130,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g GTKDOC_LIBS = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -580,7 +465,6 @@ +@@ -576,7 +470,6 @@ gtk-builder-convert.xml \ visual_index.xml @@ -85874,7 +51138,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g expand_content_files = \ glossary.xml \ migrating-checklist.sgml \ -@@ -770,12 +654,9 @@ +@@ -766,7 +659,6 @@ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -85882,12 +51146,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c --@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute - - # We set GPATH here; this gives us semantics for GNU make - # which are more like other make's VPATH, when it comes to -@@ -783,13 +664,10 @@ +@@ -779,13 +671,10 @@ # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -85901,7 +51160,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -797,40 +675,49 @@ +@@ -793,40 +682,49 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -85970,7 +51229,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -838,15 +725,9 @@ +@@ -834,15 +732,9 @@ clean-libtool: -rm -rf .libs _libs @@ -85987,7 +51246,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ -@@ -865,8 +746,8 @@ +@@ -861,8 +753,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -85998,7 +51257,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g done uninstall-man1: @$(NORMAL_UNINSTALL) -@@ -886,8 +767,8 @@ +@@ -882,8 +774,8 @@ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -86009,7 +51268,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g done tags: TAGS TAGS: -@@ -895,29 +776,23 @@ +@@ -891,29 +783,23 @@ ctags: CTAGS CTAGS: @@ -86052,7 +51311,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -935,9 +810,10 @@ +@@ -931,9 +817,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(MANS) all-local @@ -86065,7 +51324,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -958,7 +834,7 @@ +@@ -954,7 +841,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -86074,7 +51333,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -969,25 +845,34 @@ +@@ -965,25 +852,34 @@ distclean: distclean-am -rm -f Makefile @@ -86111,7 +51370,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1007,21 +892,25 @@ +@@ -1003,21 +899,25 @@ ps-am: @@ -86146,97 +51405,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/g # call as: $(XVFB_START) && someprogram -@@ -1082,8 +971,6 @@ - - docs: html-build.stamp - --$(REPORT_FILES): sgml-build.stamp -- - #### scan #### - - scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@@ -1092,7 +979,7 @@ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ -- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ -+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ -@@ -1137,12 +1024,7 @@ - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html -- mkhtml_options=""; \ -- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -- if test "$(?)" = "0"; then \ -- mkhtml_options=--path="$(srcdir)"; \ -- fi -- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@@ -1163,37 +1045,23 @@ - cd $(srcdir) && rm -rf xml html - - install-data-local: -- installfiles=`echo $(srcdir)/html/*`; \ -+ -installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -- else \ -- installdir="$(DESTDIR)$(TARGET_DIR)"; \ -- fi; \ -- $(mkinstalldirs) $${installdir} ; \ -+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ -- $(INSTALL_DATA) $$i $${installdir}; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -- mv -f $${installdir}/$(DOC_MODULE).devhelp \ -- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ -- fi; \ -- ! which gtkdoc-rebase >/dev/null 2>&1 || \ -- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ -+ echo '-- Installing $(srcdir)/html/index.sgml' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ -+ which gtkdoc-rebase >/dev/null && \ -+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi - - uninstall-local: -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -- else \ -- installdir="$(DESTDIR)$(TARGET_DIR)"; \ -- fi; \ -- rm -rf $${installdir} -+ rm -f $(DESTDIR)$(TARGET_DIR)/* - - # - # Require gtk-doc when making dist -@@ -1213,8 +1081,7 @@ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) -- ! which gtkdoc-rebase >/dev/null 2>&1 || \ -- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html -+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - - .PHONY : dist-hook-local docs - -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.14.5/docs/reference/libgail-util/Makefile.in ---- gtk+2.0-2.14.5.old/docs/reference/libgail-util/Makefile.in 2008-11-24 07:41:39.000000000 +0100 -+++ gtk+2.0-2.14.5/docs/reference/libgail-util/Makefile.in 2008-11-25 11:09:46.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.14.7/docs/reference/libgail-util/Makefile.in +--- gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in 2009-01-07 22:52:04.000000000 +0100 ++++ gtk+2.0-2.14.7/docs/reference/libgail-util/Makefile.in 2009-01-08 08:03:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -86317,7 +51488,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,21 +89,16 @@ +@@ -87,22 +89,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -86325,8 +51496,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -86336,13 +51507,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -125,6 +122,7 @@ +@@ -126,6 +121,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -86350,7 +51521,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -143,8 +141,6 @@ +@@ -144,8 +140,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -86359,7 +51530,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -155,98 +151,20 @@ +@@ -156,97 +150,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -86455,15 +51626,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -257,32 +175,20 @@ +@@ -257,29 +175,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -86488,12 +51659,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,8 +199,6 @@ +@@ -290,8 +202,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -86502,7 +51673,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -306,28 +210,10 @@ +@@ -303,28 +213,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -86531,7 +51702,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -336,22 +222,25 @@ +@@ -333,22 +225,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -86541,12 +51712,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -86562,17 +51733,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -373,8 +262,8 @@ +@@ -370,7 +265,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -383,13 +272,13 @@ +@@ -379,13 +276,14 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -86580,6 +51751,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -86589,7 +51761,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l EXTRA_DIST = \ $(content_files) \ $(HTML_IMAGES) \ -@@ -422,7 +311,6 @@ +@@ -418,7 +316,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -86597,7 +51769,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l AUTOMAKE_OPTIONS = 1.7 # The name of the module. -@@ -445,21 +333,16 @@ +@@ -441,16 +338,13 @@ -I$(top_builddir) \ $(DEP_CFLAGS) @@ -86614,12 +51786,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c --@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute - - # We set GPATH here; this gives us semantics for GNU make - # which are more like other make's VPATH, when it comes to -@@ -467,13 +350,10 @@ +@@ -463,13 +357,10 @@ # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -86633,7 +51800,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -481,69 +361,73 @@ +@@ -477,69 +368,73 @@ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -86743,7 +51910,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -561,7 +445,6 @@ +@@ -557,7 +452,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile all-local @@ -86751,7 +51918,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l installdirs: install: install-am install-exec: install-exec-am -@@ -583,7 +466,7 @@ +@@ -579,7 +473,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -86760,7 +51927,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -594,25 +477,34 @@ +@@ -590,25 +484,34 @@ distclean: distclean-am -rm -f Makefile @@ -86797,7 +51964,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l installcheck-am: maintainer-clean: maintainer-clean-am -@@ -632,18 +524,23 @@ +@@ -628,18 +531,23 @@ ps-am: @@ -86831,97 +51998,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/l # call as: $(XVFB_START) && someprogram -@@ -704,8 +601,6 @@ - - docs: html-build.stamp - --$(REPORT_FILES): sgml-build.stamp -- - #### scan #### - - scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@@ -714,7 +609,7 @@ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ -- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ -+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ -@@ -759,12 +654,7 @@ - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html -- mkhtml_options=""; \ -- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -- if test "$(?)" = "0"; then \ -- mkhtml_options=--path="$(srcdir)"; \ -- fi -- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@@ -785,37 +675,23 @@ - cd $(srcdir) && rm -rf xml html - - install-data-local: -- installfiles=`echo $(srcdir)/html/*`; \ -+ -installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -- else \ -- installdir="$(DESTDIR)$(TARGET_DIR)"; \ -- fi; \ -- $(mkinstalldirs) $${installdir} ; \ -+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ -- $(INSTALL_DATA) $$i $${installdir}; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -- mv -f $${installdir}/$(DOC_MODULE).devhelp \ -- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ -- fi; \ -- ! which gtkdoc-rebase >/dev/null 2>&1 || \ -- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ -+ echo '-- Installing $(srcdir)/html/index.sgml' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ -+ which gtkdoc-rebase >/dev/null && \ -+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi - - uninstall-local: -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -- else \ -- installdir="$(DESTDIR)$(TARGET_DIR)"; \ -- fi; \ -- rm -rf $${installdir} -+ rm -f $(DESTDIR)$(TARGET_DIR)/* - - # - # Require gtk-doc when making dist -@@ -835,8 +711,7 @@ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) -- ! which gtkdoc-rebase >/dev/null 2>&1 || \ -- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html -+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - - .PHONY : dist-hook-local docs - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/Makefile.in gtk+2.0-2.14.5/docs/reference/Makefile.in ---- gtk+2.0-2.14.5.old/docs/reference/Makefile.in 2008-11-24 07:41:39.000000000 +0100 -+++ gtk+2.0-2.14.5/docs/reference/Makefile.in 2008-11-25 11:09:46.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/reference/Makefile.in +--- gtk+2.0-2.14.7.old/docs/reference/Makefile.in 2009-01-07 22:52:02.000000000 +0100 ++++ gtk+2.0-2.14.7/docs/reference/Makefile.in 2009-01-08 08:03:48.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -87014,7 +52093,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +95,16 @@ +@@ -81,22 +95,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -87022,8 +52101,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -87033,13 +52112,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +128,7 @@ +@@ -120,6 +127,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -87047,7 +52126,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +147,6 @@ +@@ -138,8 +146,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -87056,7 +52135,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +157,20 @@ +@@ -150,97 +156,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -87152,15 +52231,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +181,20 @@ +@@ -251,29 +181,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -87185,12 +52264,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +205,6 @@ +@@ -284,8 +208,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -87199,7 +52278,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +216,10 @@ +@@ -297,28 +219,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -87228,7 +52307,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +228,25 @@ +@@ -327,22 +231,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -87238,12 +52317,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -87259,17 +52338,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +268,8 @@ +@@ -364,7 +271,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +278,11 @@ +@@ -373,9 +282,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -87277,12 +52356,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,31 +313,39 @@ +@@ -406,31 +318,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -87341,7 +52421,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M mostlyclean-libtool: -rm -f *.lo -@@ -442,10 +353,6 @@ +@@ -438,10 +358,6 @@ clean-libtool: -rm -rf .libs _libs @@ -87352,7 +52432,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -453,7 +360,13 @@ +@@ -449,7 +365,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -87367,7 +52447,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -465,15 +378,20 @@ +@@ -461,15 +383,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -87392,7 +52472,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -494,7 +412,7 @@ +@@ -490,7 +417,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -87401,7 +52481,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -505,35 +423,30 @@ +@@ -501,35 +428,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -87444,7 +52524,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -541,23 +454,23 @@ +@@ -537,23 +459,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -87477,7 +52557,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -569,29 +482,23 @@ +@@ -565,29 +487,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -87520,7 +52600,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -602,15 +509,19 @@ +@@ -598,15 +514,19 @@ || exit 1; \ fi; \ done @@ -87545,7 +52625,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M distdir) \ || exit 1; \ fi; \ -@@ -621,7 +532,6 @@ +@@ -617,7 +537,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -87553,7 +52633,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -641,7 +551,7 @@ +@@ -637,7 +556,7 @@ clean-generic: distclean-generic: @@ -87562,7 +52642,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -652,25 +562,34 @@ +@@ -648,25 +567,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -87599,7 +52679,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -689,26 +608,24 @@ +@@ -685,26 +613,24 @@ ps-am: @@ -87642,9 +52722,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/reference/M # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makefile.in gtk+2.0-2.14.5/docs/tools/Makefile.in ---- gtk+2.0-2.14.5.old/docs/tools/Makefile.in 2008-11-24 07:41:39.000000000 +0100 -+++ gtk+2.0-2.14.5/docs/tools/Makefile.in 2008-11-25 11:09:46.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/Makefile.in +--- gtk+2.0-2.14.7.old/docs/tools/Makefile.in 2009-01-07 22:52:04.000000000 +0100 ++++ gtk+2.0-2.14.7/docs/tools/Makefile.in 2009-01-08 08:03:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -87747,7 +52827,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +107,16 @@ +@@ -81,22 +107,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -87755,8 +52835,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -87766,13 +52846,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +140,7 @@ +@@ -120,6 +139,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -87780,7 +52860,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +159,6 @@ +@@ -138,8 +158,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -87789,7 +52869,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +169,20 @@ +@@ -150,97 +168,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -87885,15 +52965,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +193,20 @@ +@@ -251,29 +193,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -87918,12 +52998,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +217,6 @@ +@@ -284,8 +220,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -87932,7 +53012,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +228,10 @@ +@@ -297,28 +231,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -87961,7 +53041,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +240,25 @@ +@@ -327,22 +243,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -87971,12 +53051,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -87992,17 +53072,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +280,8 @@ +@@ -364,7 +283,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +290,11 @@ +@@ -373,9 +294,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -88010,12 +53090,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,7 +325,6 @@ +@@ -406,7 +330,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -88023,7 +53104,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -419,24 +333,17 @@ +@@ -415,24 +338,17 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -88048,7 +53129,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef doc_shooter_DEPENDENCIES = $(DEPS) doc_shooter_LDADD = $(LDADDS) doc_shooter_SOURCES = \ -@@ -446,46 +353,39 @@ +@@ -442,46 +358,39 @@ widgets.c \ widgets.h @@ -88122,7 +53203,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -495,10 +395,10 @@ +@@ -491,10 +400,10 @@ done doc-shooter$(EXEEXT): $(doc_shooter_OBJECTS) $(doc_shooter_DEPENDENCIES) @rm -f doc-shooter$(EXEEXT) @@ -88135,7 +53216,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef distclean-compile: -rm -f *.tab.c -@@ -508,37 +408,25 @@ +@@ -504,37 +413,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widgets.Po@am__quote@ .c.o: @@ -88185,7 +53266,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef mostlyclean-libtool: -rm -f *.lo -@@ -546,26 +434,15 @@ +@@ -542,26 +439,15 @@ clean-libtool: -rm -rf .libs _libs @@ -88215,7 +53296,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -575,23 +452,23 @@ +@@ -571,23 +457,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -88248,7 +53329,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -603,29 +480,23 @@ +@@ -599,29 +485,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -88291,7 +53372,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -640,7 +511,6 @@ +@@ -636,7 +516,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -88299,7 +53380,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef installdirs: install: install-am install-exec: install-exec-am -@@ -661,7 +531,7 @@ +@@ -657,7 +536,7 @@ clean-generic: distclean-generic: @@ -88308,7 +53389,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -675,24 +545,34 @@ +@@ -671,24 +550,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -88344,7 +53425,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef installcheck-am: maintainer-clean: maintainer-clean-am -@@ -713,19 +593,23 @@ +@@ -709,19 +598,23 @@ ps-am: @@ -88377,9 +53458,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tools/Makef # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Makefile.in gtk+2.0-2.14.5/docs/tutorial/Makefile.in ---- gtk+2.0-2.14.5.old/docs/tutorial/Makefile.in 2008-11-24 07:41:40.000000000 +0100 -+++ gtk+2.0-2.14.5/docs/tutorial/Makefile.in 2008-11-25 11:09:47.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tutorial/Makefile.in +--- gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in 2009-01-07 22:52:04.000000000 +0100 ++++ gtk+2.0-2.14.7/docs/tutorial/Makefile.in 2009-01-08 08:03:49.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -88460,7 +53541,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +83,16 @@ +@@ -81,22 +83,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -88468,8 +53549,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -88479,13 +53560,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +116,7 @@ +@@ -120,6 +115,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -88493,7 +53574,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +135,6 @@ +@@ -138,8 +134,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -88502,7 +53583,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +145,20 @@ +@@ -150,97 +144,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -88598,15 +53679,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +169,20 @@ +@@ -251,29 +169,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -88631,12 +53712,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +193,6 @@ +@@ -284,8 +196,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -88645,7 +53726,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +204,10 @@ +@@ -297,28 +207,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -88674,7 +53755,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +216,25 @@ +@@ -327,22 +219,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -88684,12 +53765,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -88705,17 +53786,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +256,8 @@ +@@ -364,7 +259,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,47 +266,27 @@ +@@ -373,47 +270,28 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -88723,6 +53804,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -88777,7 +53859,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma TEST_PROGS = ### testing rules -@@ -443,61 +312,67 @@ +@@ -439,61 +317,67 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -88879,7 +53961,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -515,7 +390,6 @@ +@@ -511,7 +395,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile @@ -88887,7 +53969,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma installdirs: install: install-am install-exec: install-exec-am -@@ -536,7 +410,7 @@ +@@ -532,7 +415,7 @@ clean-generic: distclean-generic: @@ -88896,7 +53978,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -547,7 +421,7 @@ +@@ -543,7 +426,7 @@ distclean: distclean-am -rm -f Makefile @@ -88905,7 +53987,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma dvi: dvi-am -@@ -559,12 +433,20 @@ +@@ -555,12 +438,20 @@ install-data-am: @@ -88926,7 +54008,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma installcheck-am: maintainer-clean: maintainer-clean-am -@@ -575,25 +457,27 @@ +@@ -571,25 +462,27 @@ mostlyclean-am: mostlyclean-generic mostlyclean-libtool @@ -88965,9 +54047,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/docs/tutorial/Ma # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Makefile.in gtk+2.0-2.14.5/gdk/directfb/Makefile.in ---- gtk+2.0-2.14.5.old/gdk/directfb/Makefile.in 2008-11-24 07:41:41.000000000 +0100 -+++ gtk+2.0-2.14.5/gdk/directfb/Makefile.in 2008-11-25 11:09:48.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/directfb/Makefile.in +--- gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in 2009-01-07 22:52:06.000000000 +0100 ++++ gtk+2.0-2.14.7/gdk/directfb/Makefile.in 2009-01-08 08:03:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -89085,7 +54167,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +122,16 @@ +@@ -81,22 +122,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -89093,8 +54175,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -89104,13 +54186,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +155,7 @@ +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -89118,7 +54200,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +174,6 @@ +@@ -138,8 +173,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -89127,7 +54209,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +184,20 @@ +@@ -150,97 +183,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -89223,15 +54305,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +208,20 @@ +@@ -251,29 +208,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -89256,12 +54338,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +232,6 @@ +@@ -284,8 +235,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -89270,7 +54352,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +243,10 @@ +@@ -297,28 +246,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -89299,7 +54381,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +255,25 @@ +@@ -327,22 +258,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -89309,12 +54391,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -89330,17 +54412,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +295,8 @@ +@@ -364,7 +298,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,14 +305,16 @@ +@@ -373,14 +309,17 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -89348,6 +54430,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -89359,7 +54442,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak TEST_PROGS = ### testing rules -@@ -410,9 +340,7 @@ +@@ -406,9 +345,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -89369,7 +54452,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \ -DGDK_COMPILATION \ -@@ -423,13 +351,10 @@ +@@ -419,13 +356,10 @@ @GTK_DEBUG_FLAGS@ \ @GDK_DEP_CFLAGS@ @@ -89383,7 +54466,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak libgdk_directfb_la_SOURCES = \ gdkapplaunchcontext-directfb.c \ gdkcolor-directfb.c \ -@@ -462,98 +387,57 @@ +@@ -458,98 +392,57 @@ gdkwindowid.c \ x-cursors.xbm @@ -89512,7 +54595,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak distclean-compile: -rm -f *.tab.c -@@ -585,82 +469,58 @@ +@@ -581,82 +474,58 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowid.Plo@am__quote@ .c.o: @@ -89617,7 +54700,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -670,23 +530,23 @@ +@@ -666,23 +535,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -89650,7 +54733,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -698,29 +558,23 @@ +@@ -694,29 +563,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -89693,7 +54776,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -735,9 +589,10 @@ +@@ -731,9 +594,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -89706,7 +54789,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -757,7 +612,7 @@ +@@ -753,7 +617,7 @@ clean-generic: distclean-generic: @@ -89715,7 +54798,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -771,24 +626,34 @@ +@@ -767,24 +631,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -89751,7 +54834,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak installcheck-am: maintainer-clean: maintainer-clean-am -@@ -809,19 +674,23 @@ +@@ -805,19 +679,23 @@ ps-am: @@ -89785,9 +54868,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/directfb/Mak uninstall-libgdkincludeHEADERS # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in gtk+2.0-2.14.5/gdk/Makefile.in ---- gtk+2.0-2.14.5.old/gdk/Makefile.in 2008-11-24 07:41:41.000000000 +0100 -+++ gtk+2.0-2.14.5/gdk/Makefile.in 2008-11-25 11:09:47.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in +--- gtk+2.0-2.14.7.old/gdk/Makefile.in 2009-01-07 22:52:06.000000000 +0100 ++++ gtk+2.0-2.14.7/gdk/Makefile.in 2009-01-08 08:03:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -89989,7 +55072,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +206,16 @@ +@@ -81,22 +206,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -89997,8 +55080,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -90008,13 +55091,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +239,7 @@ +@@ -120,6 +238,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -90022,7 +55105,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +258,6 @@ +@@ -138,8 +257,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -90031,7 +55114,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +268,20 @@ +@@ -150,97 +267,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -90127,15 +55210,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +292,20 @@ +@@ -251,29 +292,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -90160,12 +55243,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +316,6 @@ +@@ -284,8 +319,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -90174,7 +55257,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +327,10 @@ +@@ -297,28 +330,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -90203,7 +55286,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +339,25 @@ +@@ -327,22 +342,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -90213,12 +55296,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -90234,17 +55317,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +379,8 @@ +@@ -364,7 +382,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,31 +389,21 @@ +@@ -373,31 +393,22 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -90252,6 +55335,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -90285,7 +55369,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in TEST_PROGS = ### testing rules -@@ -427,10 +429,8 @@ +@@ -423,10 +434,8 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -90296,7 +55380,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -440,9 +440,7 @@ +@@ -436,9 +445,7 @@ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -90306,7 +55390,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined # libtool stuff: set version and export symbols for resolving -@@ -456,7 +454,6 @@ +@@ -452,7 +459,6 @@ $(LIBTOOL_EXPORT_OPTIONS) @USE_MEDIALIB_FALSE@medialib_sources = @@ -90314,7 +55398,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in @USE_MEDIALIB_TRUE@medialib_sources = \ @USE_MEDIALIB_TRUE@ gdkmedialib.c -@@ -500,17 +497,14 @@ +@@ -496,17 +502,14 @@ gdkvisual.h \ gdkwindow.h @@ -90332,7 +55416,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in gdk_c_sources = \ $(medialib_sources) \ gdk.c \ -@@ -547,7 +541,6 @@ +@@ -543,7 +546,6 @@ gdkwindow.c \ gdkwindowimpl.c @@ -90340,7 +55424,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in gdk_built_sources = \ gdkaliasdef.c \ gdkenumtypes.c \ -@@ -557,7 +550,6 @@ +@@ -553,7 +555,6 @@ $(gdk_built_private_headers) @@ -90348,7 +55432,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in # # setup GDK sources and their dependencies # -@@ -570,40 +562,31 @@ +@@ -566,40 +567,31 @@ gdkenumtypes.c \ gdkmarshalers.h @@ -90389,7 +55473,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h EXTRA_HEADERS = -@@ -617,183 +600,79 @@ +@@ -613,183 +605,79 @@ $(gdk_built_sources) \ gdkconfig.h @@ -90613,7 +55697,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -832,64 +711,47 @@ +@@ -828,64 +716,47 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowimpl.Plo@am__quote@ .c.o: @@ -90697,7 +55781,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -899,7 +761,13 @@ +@@ -895,7 +766,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -90712,7 +55796,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -911,15 +779,20 @@ +@@ -907,15 +784,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -90737,7 +55821,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -940,7 +813,7 @@ +@@ -936,7 +818,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -90746,7 +55830,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -951,35 +824,30 @@ +@@ -947,35 +829,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -90789,7 +55873,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -987,23 +855,23 @@ +@@ -983,23 +860,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -90822,7 +55906,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1017,9 +885,9 @@ +@@ -1013,9 +890,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -90834,7 +55918,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1028,25 +896,25 @@ +@@ -1024,25 +901,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -90870,7 +55954,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in ;; \ esac; \ else \ -@@ -1071,46 +939,40 @@ +@@ -1067,46 +944,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -90934,7 +56018,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1123,13 +985,17 @@ +@@ -1119,13 +990,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -90956,7 +56040,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -1141,8 +1007,9 @@ +@@ -1137,8 +1012,9 @@ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -90968,7 +56052,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -1163,14 +1030,14 @@ +@@ -1159,14 +1035,14 @@ clean-generic: distclean-generic: @@ -90985,7 +56069,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ -@@ -1180,26 +1047,36 @@ +@@ -1176,26 +1052,36 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -91023,7 +56107,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -1220,32 +1097,30 @@ +@@ -1216,32 +1102,30 @@ ps-am: @@ -91078,9 +56162,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/Makefile.in # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makefile.in gtk+2.0-2.14.5/gdk/quartz/Makefile.in ---- gtk+2.0-2.14.5.old/gdk/quartz/Makefile.in 2008-11-24 07:41:41.000000000 +0100 -+++ gtk+2.0-2.14.5/gdk/quartz/Makefile.in 2008-11-25 11:09:48.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/Makefile.in +--- gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in 2009-01-07 22:52:06.000000000 +0100 ++++ gtk+2.0-2.14.7/gdk/quartz/Makefile.in 2009-01-08 08:03:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -91197,7 +56281,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +121,16 @@ +@@ -81,22 +121,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -91205,8 +56289,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -91216,13 +56300,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +154,7 @@ +@@ -120,6 +153,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -91230,7 +56314,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +173,6 @@ +@@ -138,8 +172,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -91239,7 +56323,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +183,20 @@ +@@ -150,97 +182,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -91335,15 +56419,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +207,20 @@ +@@ -251,29 +207,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -91368,12 +56452,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +231,6 @@ +@@ -284,8 +234,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -91382,7 +56466,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +242,10 @@ +@@ -297,28 +245,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -91411,7 +56495,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +254,25 @@ +@@ -327,22 +257,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -91421,12 +56505,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -91442,17 +56526,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +294,8 @@ +@@ -364,7 +297,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +304,11 @@ +@@ -373,9 +308,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -91460,12 +56544,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,9 +339,7 @@ +@@ -406,9 +344,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -91475,7 +56560,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -423,11 +350,8 @@ +@@ -419,11 +355,8 @@ $(GDK_DEP_CFLAGS) \ "-xobjective-c" @@ -91487,7 +56572,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef libgdk_quartz_la_SOURCES = \ GdkQuartzView.c \ GdkQuartzView.h \ -@@ -466,98 +390,56 @@ +@@ -462,98 +395,56 @@ gdkwindow-quartz.h \ xcursors.h @@ -91616,7 +56701,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef distclean-compile: -rm -f *.tab.c -@@ -591,82 +473,58 @@ +@@ -587,82 +478,58 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-quartz.Plo@am__quote@ .c.o: @@ -91721,7 +56806,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -676,23 +534,23 @@ +@@ -672,23 +539,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -91754,7 +56839,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -704,29 +562,23 @@ +@@ -700,29 +567,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -91797,7 +56882,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -741,9 +593,10 @@ +@@ -737,9 +598,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -91810,7 +56895,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -763,7 +616,7 @@ +@@ -759,7 +621,7 @@ clean-generic: distclean-generic: @@ -91819,7 +56904,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -777,24 +630,34 @@ +@@ -773,24 +635,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -91855,7 +56940,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef installcheck-am: maintainer-clean: maintainer-clean-am -@@ -815,19 +678,23 @@ +@@ -811,19 +683,23 @@ ps-am: @@ -91889,9 +56974,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/quartz/Makef uninstall-libgdkincludeHEADERS # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefile.in gtk+2.0-2.14.5/gdk/tests/Makefile.in ---- gtk+2.0-2.14.5.old/gdk/tests/Makefile.in 2008-11-24 07:41:41.000000000 +0100 -+++ gtk+2.0-2.14.5/gdk/tests/Makefile.in 2008-11-25 11:09:48.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Makefile.in +--- gtk+2.0-2.14.7.old/gdk/tests/Makefile.in 2009-01-07 22:52:07.000000000 +0100 ++++ gtk+2.0-2.14.7/gdk/tests/Makefile.in 2009-01-08 08:03:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -91996,7 +57081,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +107,16 @@ +@@ -81,22 +107,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -92004,8 +57089,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -92015,13 +57100,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +140,7 @@ +@@ -120,6 +139,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -92029,7 +57114,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +159,6 @@ +@@ -138,8 +158,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -92038,7 +57123,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +169,20 @@ +@@ -150,97 +168,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -92134,15 +57219,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +193,20 @@ +@@ -251,29 +193,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -92167,12 +57252,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +217,6 @@ +@@ -284,8 +220,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -92181,7 +57266,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +228,10 @@ +@@ -297,28 +231,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -92210,7 +57295,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +240,25 @@ +@@ -327,22 +243,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -92220,12 +57305,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -92241,17 +57326,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +280,8 @@ +@@ -364,7 +283,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +290,11 @@ +@@ -373,9 +294,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -92259,12 +57344,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,20 +325,15 @@ +@@ -406,20 +330,15 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -92285,7 +57371,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi check_gdk_cairo_SOURCES = \ check-gdk-cairo.c \ $(NULL) -@@ -434,50 +344,43 @@ +@@ -430,50 +349,43 @@ $(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la \ $(NULL) @@ -92363,7 +57449,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; for p in $$list; do \ -@@ -487,10 +390,10 @@ +@@ -483,10 +395,10 @@ done check-gdk-cairo$(EXEEXT): $(check_gdk_cairo_OBJECTS) $(check_gdk_cairo_DEPENDENCIES) @rm -f check-gdk-cairo$(EXEEXT) @@ -92376,7 +57462,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi distclean-compile: -rm -f *.tab.c -@@ -498,37 +401,25 @@ +@@ -494,37 +406,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gdk-cairo.Po@am__quote@ .c.o: @@ -92426,7 +57512,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi mostlyclean-libtool: -rm -f *.lo -@@ -536,26 +427,15 @@ +@@ -532,26 +432,15 @@ clean-libtool: -rm -rf .libs _libs @@ -92456,7 +57542,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -565,23 +445,23 @@ +@@ -561,23 +450,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -92489,7 +57575,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -595,9 +475,9 @@ +@@ -591,9 +480,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -92501,7 +57587,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -606,25 +486,25 @@ +@@ -602,25 +491,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -92537,7 +57623,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi ;; \ esac; \ else \ -@@ -649,46 +529,40 @@ +@@ -645,46 +534,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -92601,7 +57687,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -704,7 +578,6 @@ +@@ -700,7 +583,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile @@ -92609,7 +57695,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi installdirs: install: install-am install-exec: install-exec-am -@@ -726,37 +599,48 @@ +@@ -722,37 +604,48 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -92661,7 +57747,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi installcheck-am: maintainer-clean: maintainer-clean-am -@@ -777,18 +661,23 @@ +@@ -773,18 +666,23 @@ ps-am: @@ -92694,9 +57780,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/tests/Makefi # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefile.in gtk+2.0-2.14.5/gdk/win32/Makefile.in ---- gtk+2.0-2.14.5.old/gdk/win32/Makefile.in 2008-11-24 07:41:41.000000000 +0100 -+++ gtk+2.0-2.14.5/gdk/win32/Makefile.in 2008-11-25 11:09:48.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Makefile.in +--- gtk+2.0-2.14.7.old/gdk/win32/Makefile.in 2009-01-07 22:52:07.000000000 +0100 ++++ gtk+2.0-2.14.7/gdk/win32/Makefile.in 2009-01-08 08:03:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -92823,7 +57909,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +131,16 @@ +@@ -81,22 +131,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -92831,8 +57917,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -92842,13 +57928,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +164,7 @@ +@@ -120,6 +163,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -92856,7 +57942,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +183,6 @@ +@@ -138,8 +182,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -92865,7 +57951,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +193,20 @@ +@@ -150,97 +192,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -92961,15 +58047,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +217,20 @@ +@@ -251,29 +217,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -92994,12 +58080,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +241,6 @@ +@@ -284,8 +244,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -93008,7 +58094,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +252,10 @@ +@@ -297,28 +255,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -93037,7 +58123,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +264,25 @@ +@@ -327,22 +267,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -93047,12 +58133,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -93068,17 +58154,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +304,8 @@ +@@ -364,7 +307,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,17 +314,16 @@ +@@ -373,17 +318,17 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -93086,6 +58172,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -93100,7 +58187,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi TEST_PROGS = ### testing rules -@@ -413,9 +349,7 @@ +@@ -409,9 +354,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -93110,7 +58197,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DINSIDE_GDK_WIN32 \ -@@ -427,13 +361,9 @@ +@@ -423,13 +366,9 @@ $(GDK_WIN32_EXTRA_CFLAGS)\ -DGDK_COMPILATION @@ -93124,7 +58211,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi libgdk_win32_la_SOURCES = \ xcursors.h \ gdkapplaunchcontext-win32.c \ -@@ -471,103 +401,56 @@ +@@ -467,103 +406,56 @@ wintab.h \ pktdef.h @@ -93258,7 +58345,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi distclean-compile: -rm -f *.tab.c -@@ -600,64 +483,47 @@ +@@ -596,64 +488,47 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-win32.Plo@am__quote@ .c.o: @@ -93342,7 +58429,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi done # This directory's subdirectories are mostly independent; you can cd -@@ -667,7 +533,13 @@ +@@ -663,7 +538,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -93357,7 +58444,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -679,15 +551,20 @@ +@@ -675,15 +556,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -93382,7 +58469,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -708,7 +585,7 @@ +@@ -704,7 +590,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -93391,7 +58478,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -719,35 +596,30 @@ +@@ -715,35 +601,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -93434,7 +58521,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -755,23 +627,23 @@ +@@ -751,23 +632,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -93467,7 +58554,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -783,29 +655,23 @@ +@@ -779,29 +660,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -93510,7 +58597,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -816,15 +682,19 @@ +@@ -812,15 +687,19 @@ || exit 1; \ fi; \ done @@ -93535,7 +58622,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi distdir) \ || exit 1; \ fi; \ -@@ -835,8 +705,9 @@ +@@ -831,8 +710,9 @@ all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -93547,7 +58634,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -856,7 +727,7 @@ +@@ -852,7 +732,7 @@ clean-generic: distclean-generic: @@ -93556,7 +58643,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -870,24 +741,34 @@ +@@ -866,24 +746,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -93592,7 +58679,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -908,28 +789,26 @@ +@@ -904,28 +794,26 @@ ps-am: @@ -93638,9 +58725,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/Makefi # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.5/gdk/win32/rc/Makefile.in ---- gtk+2.0-2.14.5.old/gdk/win32/rc/Makefile.in 2008-11-24 07:41:41.000000000 +0100 -+++ gtk+2.0-2.14.5/gdk/win32/rc/Makefile.in 2008-11-25 11:09:48.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/rc/Makefile.in +--- gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in 2009-01-07 22:52:07.000000000 +0100 ++++ gtk+2.0-2.14.7/gdk/win32/rc/Makefile.in 2009-01-08 08:03:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -93721,7 +58808,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +85,16 @@ +@@ -81,22 +85,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -93729,8 +58816,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -93740,13 +58827,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +118,7 @@ +@@ -120,6 +117,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -93754,7 +58841,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +137,6 @@ +@@ -138,8 +136,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -93763,7 +58850,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +147,20 @@ +@@ -150,97 +146,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -93859,15 +58946,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +171,20 @@ +@@ -251,29 +171,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -93892,12 +58979,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +195,6 @@ +@@ -284,8 +198,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -93906,7 +58993,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +206,10 @@ +@@ -297,28 +209,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -93935,7 +59022,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +218,25 @@ +@@ -327,22 +221,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -93945,12 +59032,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -93966,17 +59053,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +258,8 @@ +@@ -364,7 +261,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,18 +268,16 @@ +@@ -373,18 +272,17 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -93984,6 +59071,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -93999,7 +59087,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak TEST_PROGS = ### testing rules -@@ -414,27 +303,40 @@ +@@ -410,27 +308,40 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -94055,7 +59143,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -442,39 +344,29 @@ +@@ -438,39 +349,29 @@ clean-libtool: -rm -rf .libs _libs @@ -94108,7 +59196,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -489,7 +381,6 @@ +@@ -485,7 +386,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) @@ -94116,7 +59204,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak installdirs: install: install-am install-exec: install-exec-am -@@ -510,7 +401,7 @@ +@@ -506,7 +406,7 @@ clean-generic: distclean-generic: @@ -94125,7 +59213,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -521,24 +412,34 @@ +@@ -517,24 +417,34 @@ distclean: distclean-am -rm -f Makefile @@ -94161,7 +59249,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak installcheck-am: maintainer-clean: maintainer-clean-am -@@ -557,17 +458,21 @@ +@@ -553,17 +463,21 @@ ps-am: @@ -94191,9 +59279,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/win32/rc/Mak # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile.in gtk+2.0-2.14.5/gdk/x11/Makefile.in ---- gtk+2.0-2.14.5.old/gdk/x11/Makefile.in 2008-11-24 07:41:42.000000000 +0100 -+++ gtk+2.0-2.14.5/gdk/x11/Makefile.in 2008-11-25 11:09:48.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefile.in +--- gtk+2.0-2.14.7.old/gdk/x11/Makefile.in 2009-01-07 22:52:07.000000000 +0100 ++++ gtk+2.0-2.14.7/gdk/x11/Makefile.in 2009-01-08 08:03:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -94338,7 +59426,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,21 +149,16 @@ +@@ -83,22 +149,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -94346,8 +59434,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -94357,13 +59445,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -121,6 +182,7 @@ +@@ -122,6 +181,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -94371,7 +59459,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +201,6 @@ +@@ -140,8 +200,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -94380,7 +59468,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,98 +211,20 @@ +@@ -152,97 +210,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -94476,15 +59564,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -253,32 +235,20 @@ +@@ -253,29 +235,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -94509,12 +59597,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -289,8 +259,6 @@ +@@ -286,8 +262,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -94523,7 +59611,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -302,28 +270,10 @@ +@@ -299,28 +273,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -94552,7 +59640,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -332,22 +282,25 @@ +@@ -329,22 +285,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -94562,12 +59650,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -94583,17 +59671,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -369,8 +322,8 @@ +@@ -366,7 +325,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -379,9 +332,11 @@ +@@ -375,9 +336,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -94601,12 +59689,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -389,12 +344,8 @@ +@@ -385,12 +349,8 @@ # We need to include all these C files here since the conditionals # don't seem to be correctly expanded for the dist files. @@ -94620,7 +59709,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile TEST_PROGS = ### testing rules -@@ -420,9 +371,7 @@ +@@ -416,9 +376,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -94630,7 +59719,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -432,178 +381,69 @@ +@@ -428,178 +386,69 @@ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -94851,7 +59940,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -613,10 +453,10 @@ +@@ -609,10 +458,10 @@ done checksettings$(EXEEXT): $(checksettings_OBJECTS) $(checksettings_DEPENDENCIES) @rm -f checksettings$(EXEEXT) @@ -94864,7 +59953,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile distclean-compile: -rm -f *.tab.c -@@ -656,82 +496,58 @@ +@@ -652,82 +501,58 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsettings-common.Plo@am__quote@ .c.o: @@ -94969,7 +60058,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -741,23 +557,23 @@ +@@ -737,23 +562,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -95002,7 +60091,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -771,9 +587,9 @@ +@@ -767,9 +592,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -95014,7 +60103,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -782,25 +598,25 @@ +@@ -778,25 +603,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -95050,7 +60139,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile ;; \ esac; \ else \ -@@ -825,46 +641,40 @@ +@@ -821,46 +646,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -95114,7 +60203,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -879,9 +689,10 @@ +@@ -875,9 +694,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) @@ -95127,7 +60216,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -901,7 +712,7 @@ +@@ -897,7 +717,7 @@ clean-generic: distclean-generic: @@ -95136,7 +60225,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -915,24 +726,34 @@ +@@ -911,24 +731,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -95172,7 +60261,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile installcheck-am: maintainer-clean: maintainer-clean-am -@@ -953,20 +774,24 @@ +@@ -949,20 +779,24 @@ ps-am: @@ -95206,9 +60295,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk/x11/Makefile # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.5/gdk-pixbuf/Makefile.in ---- gtk+2.0-2.14.5.old/gdk-pixbuf/Makefile.in 2008-11-24 07:41:40.000000000 +0100 -+++ gtk+2.0-2.14.5/gdk-pixbuf/Makefile.in 2008-11-25 11:09:47.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/Makefile.in +--- gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in 2009-01-07 22:52:05.000000000 +0100 ++++ gtk+2.0-2.14.7/gdk-pixbuf/Makefile.in 2009-01-08 08:03:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -95241,7 +60330,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,1444 +35,1367 @@ +@@ -37,1440 +35,1372 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -95294,7 +60383,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ +-ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ @@ -95304,7 +60393,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ -EXEEXT = @EXEEXT@ --FGREP = @FGREP@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ -GAIL_INET_LIBS = @GAIL_INET_LIBS@ -GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ -GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ @@ -95449,7 +60539,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ --LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBJASPER = @LIBJASPER@ -LIBJPEG = @LIBJPEG@ @@ -95460,7 +60549,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef -LIBTOOL = @LIBTOOL@ -LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ -LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -95484,8 +60572,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ @@ -95541,7 +60627,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -95576,7 +60662,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -ms_librarian = @ms_librarian@ -oldincludedir = @oldincludedir@ @@ -95613,7 +60698,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef -### testing rules - -# Xvfb based test rules --XVFB = Xvfb -screen 0 800x600x16 +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 -XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ - 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ - 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ @@ -96553,14 +61638,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ -+ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ +GAIL_INET_LIBS = @GAIL_INET_LIBS@ +GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ +GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ @@ -96627,6 +61711,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ ++LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBJASPER = @LIBJASPER@ +LIBJPEG = @LIBJPEG@ @@ -96637,6 +61722,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef +LIBTOOL = @LIBTOOL@ +LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ +LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ ++LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -96651,6 +61737,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ @@ -96690,7 +61778,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ @@ -96724,6 +61812,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ms_librarian = @ms_librarian@ @@ -96737,6 +61826,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +GTESTER = gtester # in $PATH for non-GLIB packages @@ -96759,7 +61849,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef -@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_TRUE@STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la -@BUILD_GDIPLUS_LOADERS_FALSE@@HAVE_TIFF_TRUE@@INCLUDE_TIFF_FALSE@TIFF_LIB = libpixbufloader-tiff.la +# Xvfb based test rules -+XVFB = Xvfb -screen 0 800x600x16 ++XVFB = Xvfb -ac -noreset -screen 0 800x600x16 +XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ @@ -97953,7 +63043,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -@@ -1483,116 +1404,115 @@ +@@ -1479,116 +1409,115 @@ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ @@ -98121,7 +63211,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef else :; fi; \ done -@@ -1600,8 +1520,8 @@ +@@ -1596,8 +1525,8 @@ @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -98132,7 +63222,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef done clean-binPROGRAMS: -@@ -1619,16 +1539,16 @@ +@@ -1615,16 +1544,16 @@ done gdk-pixbuf-csource$(EXEEXT): $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_DEPENDENCIES) @rm -f gdk-pixbuf-csource$(EXEEXT) @@ -98153,7 +63243,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef distclean-compile: -rm -f *.tab.c -@@ -1676,64 +1596,47 @@ +@@ -1672,64 +1601,47 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gdk-pixbuf.Po@am__quote@ .c.o: @@ -98237,7 +63327,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef done # This directory's subdirectories are mostly independent; you can cd -@@ -1743,7 +1646,13 @@ +@@ -1739,7 +1651,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -98252,7 +63342,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1755,15 +1664,20 @@ +@@ -1751,15 +1669,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -98277,7 +63367,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -1784,7 +1698,7 @@ +@@ -1780,7 +1703,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -98286,7 +63376,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1795,35 +1709,30 @@ +@@ -1791,35 +1714,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -98329,7 +63419,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -1831,23 +1740,23 @@ +@@ -1827,23 +1745,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -98362,7 +63452,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1861,9 +1770,9 @@ +@@ -1857,9 +1775,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -98374,7 +63464,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1872,25 +1781,25 @@ +@@ -1868,25 +1786,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -98410,7 +63500,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef ;; \ esac; \ else \ -@@ -1915,46 +1824,40 @@ +@@ -1911,46 +1829,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -98474,7 +63564,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1965,15 +1868,19 @@ +@@ -1961,15 +1873,19 @@ || exit 1; \ fi; \ done @@ -98499,7 +63589,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef distdir) \ || exit 1; \ fi; \ -@@ -1982,13 +1889,16 @@ +@@ -1978,13 +1894,16 @@ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive @@ -98519,7 +63609,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -2010,13 +1920,13 @@ +@@ -2006,13 +1925,13 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -98535,7 +63625,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -@@ -2027,12 +1937,14 @@ +@@ -2023,12 +1942,14 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -98551,7 +63641,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef info: info-recursive info-am: -@@ -2042,12 +1954,20 @@ +@@ -2038,12 +1959,20 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -98572,7 +63662,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -2068,35 +1988,34 @@ +@@ -2064,35 +1993,34 @@ ps-am: @@ -98633,9 +63723,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/Makef # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.5/gdk-pixbuf/pixops/Makefile.in ---- gtk+2.0-2.14.5.old/gdk-pixbuf/pixops/Makefile.in 2008-11-24 07:41:40.000000000 +0100 -+++ gtk+2.0-2.14.5/gdk-pixbuf/pixops/Makefile.in 2008-11-25 11:09:47.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/pixops/Makefile.in +--- gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in 2009-01-07 22:52:05.000000000 +0100 ++++ gtk+2.0-2.14.7/gdk-pixbuf/pixops/Makefile.in 2009-01-08 08:03:50.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -98752,7 +63842,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +121,16 @@ +@@ -81,22 +121,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -98760,8 +63850,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -98771,13 +63861,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +154,7 @@ +@@ -120,6 +153,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -98785,7 +63875,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +173,6 @@ +@@ -138,8 +172,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -98794,7 +63884,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +183,20 @@ +@@ -150,97 +182,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -98890,15 +63980,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +207,20 @@ +@@ -251,29 +207,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -98923,12 +64013,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +231,6 @@ +@@ -284,8 +234,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -98937,7 +64027,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +242,10 @@ +@@ -297,28 +245,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -98966,7 +64056,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +254,25 @@ +@@ -327,22 +257,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -98976,12 +64066,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -98997,17 +64087,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +294,8 @@ +@@ -364,7 +297,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,18 +304,16 @@ +@@ -373,18 +308,17 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -99015,6 +64105,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -99030,7 +64121,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop TEST_PROGS = ### testing rules -@@ -414,97 +339,70 @@ +@@ -410,97 +344,70 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -99157,7 +64248,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -514,58 +412,62 @@ +@@ -510,58 +417,62 @@ done timescale$(EXEEXT): $(timescale_OBJECTS) $(timescale_DEPENDENCIES) @rm -f timescale$(EXEEXT) @@ -99249,7 +64340,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop mostlyclean-libtool: -rm -f *.lo -@@ -573,26 +475,15 @@ +@@ -569,26 +480,15 @@ clean-libtool: -rm -rf .libs _libs @@ -99279,7 +64370,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -602,23 +493,23 @@ +@@ -598,23 +498,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -99312,7 +64403,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -630,29 +521,23 @@ +@@ -626,29 +526,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -99355,7 +64446,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -667,7 +552,6 @@ +@@ -663,7 +557,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) @@ -99363,7 +64454,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop installdirs: install: install-am install-exec: install-exec-am -@@ -688,7 +572,7 @@ +@@ -684,7 +577,7 @@ clean-generic: distclean-generic: @@ -99372,7 +64463,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -702,24 +586,34 @@ +@@ -698,24 +591,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -99408,7 +64499,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop installcheck-am: maintainer-clean: maintainer-clean-am -@@ -740,19 +634,23 @@ +@@ -736,19 +639,23 @@ ps-am: @@ -99438,9 +64529,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gdk-pixbuf/pixop # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in gtk+2.0-2.14.5/gtk/Makefile.in ---- gtk+2.0-2.14.5.old/gtk/Makefile.in 2008-11-24 07:41:42.000000000 +0100 -+++ gtk+2.0-2.14.5/gtk/Makefile.in 2008-11-25 11:09:49.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in +--- gtk+2.0-2.14.7.old/gtk/Makefile.in 2009-01-07 22:52:08.000000000 +0100 ++++ gtk+2.0-2.14.7/gtk/Makefile.in 2009-01-08 08:03:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -99488,7 +64579,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in @OS_LINUX_TRUE@am__append_1 = abicheck.sh pltcheck.sh @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_2 = $(INCLUDED_IMMODULE_OBJ) @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_3 = $(INCLUDED_IMMODULE_OBJ) -@@ -61,1760 +66,945 @@ +@@ -61,1756 +66,950 @@ @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_12 = gtksearchenginequartz.h @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_quartz_c_sources) @USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_14 = $(gtk_use_stub_c_sources) @@ -99539,7 +64630,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ +-ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ @@ -99549,7 +64640,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ -EXEEXT = @EXEEXT@ --FGREP = @FGREP@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ -GAIL_INET_LIBS = @GAIL_INET_LIBS@ -GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ -GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ @@ -99694,7 +64786,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ --LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBJASPER = @LIBJASPER@ -LIBJPEG = @LIBJPEG@ @@ -99705,7 +64796,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in -LIBTOOL = @LIBTOOL@ -LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ -LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -99729,8 +64819,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ @@ -99786,7 +64874,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in -X_PRE_LIBS = @X_PRE_LIBS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -99821,7 +64909,6 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -ms_librarian = @ms_librarian@ -oldincludedir = @oldincludedir@ @@ -99874,7 +64961,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in -### testing rules - -# Xvfb based test rules --XVFB = Xvfb -screen 0 800x600x16 +-XVFB = Xvfb -ac -noreset -screen 0 800x600x16 -XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ - 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ - 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ @@ -101415,14 +66502,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ -+ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ +GAIL_INET_LIBS = @GAIL_INET_LIBS@ +GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ +GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ @@ -101489,6 +66575,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ ++LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBJASPER = @LIBJASPER@ +LIBJPEG = @LIBJPEG@ @@ -101499,6 +66586,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in +LIBTOOL = @LIBTOOL@ +LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ +LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ ++LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -101513,6 +66601,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ @@ -101552,7 +66642,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ @@ -101586,6 +66676,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ ++lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ms_librarian = @ms_librarian@ @@ -101599,6 +66690,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +GTESTER = gtester # in $PATH for non-GLIB packages @@ -101652,7 +66744,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in +### testing rules + +# Xvfb based test rules -+XVFB = Xvfb -screen 0 800x600x16 ++XVFB = Xvfb -ac -noreset -screen 0 800x600x16 +XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ @@ -102182,7 +67274,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -@@ -1834,25 +1024,26 @@ +@@ -1830,25 +1029,26 @@ gtkfilechooserdialog.c gtkfilechooserembed.c \ gtkfilechooserentry.c gtkfilechoosersettings.c \ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ @@ -102228,7 +67320,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -@@ -1860,8 +1051,8 @@ +@@ -1856,8 +1056,8 @@ gtkscrolledwindow.c gtkselection.c gtkseparator.c \ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ @@ -102239,7 +67331,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in gtktextbuffer.c gtktextbufferrichtext.c \ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -@@ -1876,370 +1067,501 @@ +@@ -1872,370 +1072,501 @@ gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ @@ -103057,7 +68149,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in else :; fi; \ done -@@ -2247,8 +1569,8 @@ +@@ -2243,8 +1574,8 @@ @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -103068,7 +68160,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in done clean-binPROGRAMS: -@@ -2259,20 +1581,19 @@ +@@ -2255,20 +1586,19 @@ done gtk-query-immodules-2.0$(EXEEXT): $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_DEPENDENCIES) @rm -f gtk-query-immodules-2.0$(EXEEXT) @@ -103094,7 +68186,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in else :; fi; \ done -@@ -2280,12 +1601,12 @@ +@@ -2276,12 +1606,12 @@ @$(NORMAL_UNINSTALL) @list='$(bin_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ @@ -103110,7 +68202,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -2551,82 +1872,64 @@ +@@ -2547,82 +1877,64 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updateiconcache.Po@am__quote@ .c.o: @@ -103219,7 +68311,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -2636,7 +1939,13 @@ +@@ -2632,7 +1944,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -103234,7 +68326,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2648,15 +1957,20 @@ +@@ -2644,15 +1962,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -103259,7 +68351,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -2677,7 +1991,7 @@ +@@ -2673,7 +1996,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -103268,7 +68360,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2688,35 +2002,30 @@ +@@ -2684,35 +2007,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -103311,7 +68403,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -2724,23 +2033,23 @@ +@@ -2720,23 +2038,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -103344,7 +68436,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -2754,9 +2063,9 @@ +@@ -2750,9 +2068,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -103356,7 +68448,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -2765,25 +2074,25 @@ +@@ -2761,25 +2079,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -103392,7 +68484,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in ;; \ esac; \ else \ -@@ -2808,46 +2117,40 @@ +@@ -2804,46 +2122,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -103456,7 +68548,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -2860,13 +2163,17 @@ +@@ -2856,13 +2168,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -103478,7 +68570,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -2881,8 +2188,9 @@ +@@ -2877,8 +2193,9 @@ installdirs: installdirs-recursive installdirs-am: @@ -103490,7 +68582,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -2904,13 +2212,13 @@ +@@ -2900,13 +2217,13 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -103506,7 +68598,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -@@ -2920,12 +2228,14 @@ +@@ -2916,12 +2233,14 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -103522,7 +68614,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in info: info-recursive info-am: -@@ -2933,15 +2243,23 @@ +@@ -2929,15 +2248,23 @@ install-data-am: install-data-local install-gtkincludeHEADERS \ install-gtkunixprintincludeHEADERS @@ -103546,7 +68638,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -2964,35 +2282,34 @@ +@@ -2960,35 +2287,34 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-gtkincludeHEADERS \ @@ -103605,9 +68697,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/Makefile.in # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefile.in gtk+2.0-2.14.5/gtk/tests/Makefile.in ---- gtk+2.0-2.14.5.old/gtk/tests/Makefile.in 2008-11-24 07:41:42.000000000 +0100 -+++ gtk+2.0-2.14.5/gtk/tests/Makefile.in 2008-11-25 11:09:49.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Makefile.in +--- gtk+2.0-2.14.7.old/gtk/tests/Makefile.in 2009-01-07 22:52:09.000000000 +0100 ++++ gtk+2.0-2.14.7/gtk/tests/Makefile.in 2009-01-08 08:03:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -103750,7 +68842,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,21 +147,16 @@ +@@ -82,22 +147,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -103758,8 +68850,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -103769,13 +68861,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +180,7 @@ +@@ -121,6 +179,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -103783,7 +68875,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +199,6 @@ +@@ -139,8 +198,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -103792,7 +68884,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,98 +209,20 @@ +@@ -151,97 +208,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -103888,15 +68980,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -252,32 +233,20 @@ +@@ -252,29 +233,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -103921,12 +69013,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -288,8 +257,6 @@ +@@ -285,8 +260,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -103935,7 +69027,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -301,28 +268,10 @@ +@@ -298,28 +271,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -103964,7 +69056,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -331,22 +280,25 @@ +@@ -328,22 +283,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -103974,12 +69066,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -103995,17 +69087,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -368,8 +320,8 @@ +@@ -365,7 +323,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -378,16 +330,19 @@ +@@ -374,16 +334,20 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -104013,6 +69105,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -104028,7 +69121,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi ### testing rules -@@ -412,7 +367,6 @@ +@@ -408,7 +372,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -104036,7 +69129,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -422,20 +376,16 @@ +@@ -418,20 +381,16 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -104057,7 +69150,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi testing_SOURCES = testing.c testing_LDADD = $(progs_ldadd) liststore_SOURCES = liststore.c -@@ -470,128 +420,39 @@ +@@ -466,128 +425,39 @@ defaultvalue_LDADD = $(progs_ldadd) textbuffer_SOURCES = textbuffer.c pixbuf-init.c textbuffer_LDADD = $(progs_ldadd) @@ -104213,7 +69306,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -601,37 +462,37 @@ +@@ -597,37 +467,37 @@ done builder$(EXEEXT): $(builder_OBJECTS) $(builder_DEPENDENCIES) @rm -f builder$(EXEEXT) @@ -104262,7 +69355,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi distclean-compile: -rm -f *.tab.c -@@ -649,37 +510,25 @@ +@@ -645,37 +515,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview-scrolling.Po@am__quote@ .c.o: @@ -104312,7 +69405,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi mostlyclean-libtool: -rm -f *.lo -@@ -687,26 +536,15 @@ +@@ -683,26 +541,15 @@ clean-libtool: -rm -rf .libs _libs @@ -104342,7 +69435,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -716,23 +554,23 @@ +@@ -712,23 +559,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -104375,7 +69468,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -744,29 +582,23 @@ +@@ -740,29 +587,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -104418,7 +69511,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -781,7 +613,6 @@ +@@ -777,7 +618,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -104426,7 +69519,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi installdirs: install: install-am install-exec: install-exec-am -@@ -802,7 +633,7 @@ +@@ -798,7 +638,7 @@ clean-generic: distclean-generic: @@ -104435,7 +69528,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -816,24 +647,34 @@ +@@ -812,24 +652,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -104471,7 +69564,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi installcheck-am: maintainer-clean: maintainer-clean-am -@@ -854,18 +695,23 @@ +@@ -850,18 +700,23 @@ ps-am: @@ -104504,9 +69597,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/tests/Makefi # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.5/gtk/theme-bits/Makefile.in ---- gtk+2.0-2.14.5.old/gtk/theme-bits/Makefile.in 2008-11-24 07:41:43.000000000 +0100 -+++ gtk+2.0-2.14.5/gtk/theme-bits/Makefile.in 2008-11-25 11:09:49.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/theme-bits/Makefile.in +--- gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in 2009-01-07 22:52:09.000000000 +0100 ++++ gtk+2.0-2.14.7/gtk/theme-bits/Makefile.in 2009-01-08 08:03:51.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -104605,7 +69698,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +103,16 @@ +@@ -81,22 +103,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -104613,8 +69706,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -104624,13 +69717,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +136,7 @@ +@@ -120,6 +135,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -104638,7 +69731,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +155,6 @@ +@@ -138,8 +154,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -104647,7 +69740,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +165,20 @@ +@@ -150,97 +164,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -104743,15 +69836,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +189,20 @@ +@@ -251,29 +189,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -104776,12 +69869,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +213,6 @@ +@@ -284,8 +216,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -104790,7 +69883,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +224,10 @@ +@@ -297,28 +227,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -104819,7 +69912,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +236,25 @@ +@@ -327,22 +239,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -104829,12 +69922,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -104850,17 +69943,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +276,8 @@ +@@ -364,7 +279,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,14 +286,17 @@ +@@ -373,14 +290,18 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -104868,6 +69961,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -104880,7 +69974,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M TEST_PROGS = ### testing rules -@@ -410,56 +322,46 @@ +@@ -406,56 +327,46 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -104964,7 +70058,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -469,10 +371,10 @@ +@@ -465,10 +376,10 @@ done decompose-bits$(EXEEXT): $(decompose_bits_OBJECTS) $(decompose_bits_DEPENDENCIES) @rm -f decompose-bits$(EXEEXT) @@ -104977,7 +70071,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M distclean-compile: -rm -f *.tab.c -@@ -480,37 +382,25 @@ +@@ -476,37 +387,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decompose-bits.Po@am__quote@ .c.o: @@ -105027,7 +70121,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M mostlyclean-libtool: -rm -f *.lo -@@ -518,26 +408,15 @@ +@@ -514,26 +413,15 @@ clean-libtool: -rm -rf .libs _libs @@ -105057,7 +70151,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -547,23 +426,23 @@ +@@ -543,23 +431,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -105090,7 +70184,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -575,29 +454,23 @@ +@@ -571,29 +459,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -105133,7 +70227,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -612,7 +485,6 @@ +@@ -608,7 +490,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -105141,7 +70235,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M installdirs: install: install-am install-exec: install-exec-am -@@ -633,7 +505,7 @@ +@@ -629,7 +510,7 @@ clean-generic: distclean-generic: @@ -105150,7 +70244,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -647,24 +519,34 @@ +@@ -643,24 +524,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -105186,7 +70280,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M installcheck-am: maintainer-clean: maintainer-clean-am -@@ -685,18 +567,23 @@ +@@ -681,18 +572,23 @@ ps-am: @@ -105219,112 +70313,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk/theme-bits/M # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/gtk-doc.make gtk+2.0-2.14.5/gtk-doc.make ---- gtk+2.0-2.14.5.old/gtk-doc.make 2008-11-21 07:57:58.000000000 +0100 -+++ gtk+2.0-2.14.5/gtk-doc.make 2008-11-25 11:09:32.000000000 +0100 -@@ -7,11 +7,9 @@ - if GTK_DOC_USE_LIBTOOL - GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --GTKDOC_RUN = $(LIBTOOL) --mode=execute - else - GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) --GTKDOC_RUN = sh -c - endif - - # We set GPATH here; this gives us semantics for GNU make -@@ -55,8 +53,6 @@ - - docs: html-build.stamp - --$(REPORT_FILES): sgml-build.stamp -- - #### scan #### - - scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@@ -65,7 +61,7 @@ - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ -- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ -+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ -@@ -111,12 +107,7 @@ - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html -- mkhtml_options=""; \ -- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -- if test "$(?)" = "0"; then \ -- mkhtml_options=--path="$(srcdir)"; \ -- fi -- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -+ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@@ -137,37 +128,24 @@ - cd $(srcdir) && rm -rf xml html - - install-data-local: -- installfiles=`echo $(srcdir)/html/*`; \ -+ -installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -- else \ -- installdir="$(DESTDIR)$(TARGET_DIR)"; \ -- fi; \ -- $(mkinstalldirs) $${installdir} ; \ -+ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ -- $(INSTALL_DATA) $$i $${installdir}; \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -- mv -f $${installdir}/$(DOC_MODULE).devhelp \ -- $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ -- fi; \ -- ! which gtkdoc-rebase >/dev/null 2>&1 || \ -- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ -+ echo '-- Installing $(srcdir)/html/index.sgml' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ -+ which gtkdoc-rebase >/dev/null && \ -+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi -+ - - uninstall-local: -- if test -n "$(DOC_MODULE_VERSION)"; then \ -- installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -- else \ -- installdir="$(DESTDIR)$(TARGET_DIR)"; \ -- fi; \ -- rm -rf $${installdir} -+ rm -f $(DESTDIR)$(TARGET_DIR)/* - - # - # Require gtk-doc when making dist -@@ -190,7 +168,6 @@ - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) -- ! which gtkdoc-rebase >/dev/null 2>&1 || \ -- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html -+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - - .PHONY : dist-hook-local docs -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/install-sh gtk+2.0-2.14.5/install-sh ---- gtk+2.0-2.14.5.old/install-sh 2007-09-18 16:10:46.000000000 +0200 -+++ gtk+2.0-2.14.5/install-sh 2008-11-25 11:09:45.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/install-sh gtk+2.0-2.14.7/install-sh +--- gtk+2.0-2.14.7.old/install-sh 2007-09-18 16:10:46.000000000 +0200 ++++ gtk+2.0-2.14.7/install-sh 2009-01-08 08:03:47.000000000 +0100 @@ -1,7 +1,8 @@ #!/bin/sh -# @@ -106030,267 +71021,53 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/install-sh gtk+2 +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2.0-2.14.5/ltmain.sh ---- gtk+2.0-2.14.5.old/ltmain.sh 2008-11-13 14:17:20.000000000 +0100 -+++ gtk+2.0-2.14.5/ltmain.sh 2008-04-29 22:21:21.000000000 +0200 -@@ -1,83 +1,52 @@ --# Generated from ltmain.m4sh. -- --# ltmain.sh (GNU libtool) 2.2.6 --# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -- --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 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. -- --# GNU Libtool is free software; you can redistribute it and/or modify -+# 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, 2006, -+# 2007, 2008 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 +diff -Naur gtk+2.0-2.14.7.old/ltmain.sh gtk+2.0-2.14.7/ltmain.sh +--- gtk+2.0-2.14.7.old/ltmain.sh 2008-08-30 00:27:25.000000000 +0200 ++++ gtk+2.0-2.14.7/ltmain.sh 2009-01-08 08:03:30.000000000 +0100 +@@ -1,52 +1,83 @@ +-# 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, 2006, +-# 2007, 2008 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 ++# Generated from ltmain.m4sh. ++ ++# ltmain.sh (GNU libtool) 2.2.6 ++# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 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. ++ ++# GNU Libtool is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # --# As a special exception to the GNU General Public License, --# if you distribute this file as part of a program or library that --# is built using GNU Libtool, you may include this file under the --# same distribution terms that you use for the rest of that program. --# --# GNU Libtool is distributed in the hope that it will be useful, but -+# This program is distributed in the hope that it will be useful, but +-# This program is distributed in the hope that it will be useful, but ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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 # General Public License for more details. # # You should have received a copy of the GNU General Public License --# along with GNU Libtool; see the file COPYING. If not, a copy --# can be downloaded from http://www.gnu.org/licenses/gpl.html, --# or obtained by writing to the Free Software Foundation, Inc., --# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- --# Usage: $progname [OPTION]... [MODE-ARG]... +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# --# Provide generalized library-building support services. -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # --# --config show all configuration variables --# --debug enable verbose shell tracing --# -n, --dry-run display commands without modifying any files --# --features display basic configuration information and exit --# --mode=MODE use operation mode MODE --# --preserve-dup-deps don't remove duplicate dependency libraries --# --quiet, --silent don't print informational messages --# --tag=TAG use configuration variables from tag TAG --# -v, --verbose print informational messages (default) --# --version print version information --# -h, --help print short or long help message --# --# MODE must be one of the following: --# --# clean remove files from the build directory --# compile compile a source file into a libtool object --# execute automatically set library path, then run a program --# finish complete the installation of libtool libraries --# install install libraries or executables --# link create a library or an executable --# uninstall remove libraries from an installed directory --# --# MODE-ARGS vary depending on the MODE. --# Try `$progname --help --mode=MODE' for a more detailed description of MODE. --# --# When reporting a bug, please describe a test case to reproduce it and --# include the following information: --# --# host-triplet: $host --# shell: $SHELL --# compiler: $LTCC --# compiler flags: $LTCFLAGS --# linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.2.6 --# automake: $automake_version --# autoconf: $autoconf_version --# --# Report bugs to <bug-libtool@gnu.org>. -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+basename="s,^.*/,,g" -+ -+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -+# is ksh but when the shell is invoked as "sh" and the current value of -+# the _XPG environment variable is not equal to 1 (one), the special -+# positional parameter $0, within a function call, is the name of the -+# function. -+progpath="$0" -+ -+# The name of this program: -+progname=`echo "$progpath" | $SED $basename` -+modename="$progname" -+ -+# Global variables: -+EXIT_SUCCESS=0 -+EXIT_FAILURE=1 - - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION=2.2.6 --TIMESTAMP="" --package_revision=1.3012 -+VERSION="1.5.26 Debian 1.5.26-4" -+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" - --# Be Bourne compatible -+# 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=: -@@ -91,261 +60,104 @@ - BIN_SH=xpg4; export BIN_SH # for Tru64 - DUALCASE=1; export DUALCASE # for MKS sh - --# NLS nuisances: We save the old values to restore during execute mode. -+# Check that we have a working $echo. -+if test "X$1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X$1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -+ # Yippee, $echo works! -+ : -+else -+ # Restart under the correct shell, and then maybe $echo will work. -+ exec $SHELL "$progpath" --no-reexec ${1+"$@"} -+fi -+ -+if test "X$1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat <<EOF -+$* -+EOF -+ exit $EXIT_SUCCESS -+fi -+ -+default_mode= -+help="Try \`$progname --help' for more information." -+magic="%%%MAGIC variable%%%" -+mkdir="mkdir" -+mv="mv -f" -+rm="rm -f" -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed="${SED}"' -e 1s/^X//' -+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' -+# test EBCDIC or ASCII -+case `echo X|tr X '\101'` in -+ A) # ASCII based system -+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr -+ SP2NL='tr \040 \012' -+ NL2SP='tr \015\012 \040\040' -+ ;; -+ *) # EBCDIC based system -+ SP2NL='tr \100 \n' -+ NL2SP='tr \r\n \100\100' -+ ;; -+esac -+ -+# NLS nuisances. - # Only set LANG and LC_ALL to C if already set. - # These must not be set unconditionally because not all systems understand - # e.g. LANG=C (notably SCO). --lt_user_locale= --lt_safe_locale= -+# We save the old values to restore during execute mode. -+lt_env= - for lt_var in LANG LANGUAGE 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 -+ save_$lt_var=\$$lt_var -+ lt_env=\"$lt_var=\$$lt_var \$lt_env\" -+ $lt_var=C - export $lt_var -- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" -- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done - --$lt_unset CDPATH +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. - -- -- -- -- --: ${CP="cp -f"} --: ${ECHO="echo"} --: ${EGREP="/bin/grep -E"} --: ${FGREP="/bin/grep -F"} --: ${GREP="/bin/grep"} --: ${LN_S="ln -s"} --: ${MAKE="make"} --: ${MKDIR="mkdir"} --: ${MV="mv -f"} --: ${RM="rm -f"} --: ${SED="/bin/sed"} --: ${SHELL="${CONFIG_SHELL-/bin/sh}"} --: ${Xsed="$SED -e 1s/^X//"} -- --# Global variables: --EXIT_SUCCESS=0 --EXIT_FAILURE=1 --EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. --EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -- --exit_status=$EXIT_SUCCESS -+if test -n "$lt_env"; then -+ lt_env="env $lt_env" -+fi - - # Make sure IFS has a sensible default - lt_nl=' - ' - IFS=" $lt_nl" - --dirname="s,/[^/]*$,," --basename="s,^.*/,," -- --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` --} -- --# Generated shell functions inserted here. +-basename="s,^.*/,,g" - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of @@ -106300,3888 +71077,456 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. -progpath="$0" - -# The name of this program: --# In the unlikely event $progname began with a '-', it would play havoc with --# func_echo (imagine progname=-n), so we prepend ./ in that case: --func_dirname_and_basename "$progpath" --progname=$func_basename_result --case $progname in -- -*) progname=./$progname ;; --esac -- --# Make sure we have an absolute path for reexecution: --case $progpath in -- [\\/]*|[A-Za-z]:\\*) ;; -- *[\\/]*) -- progdir=$func_dirname_result -- progdir=`cd "$progdir" && pwd` -- progpath="$progdir/$progname" -- ;; -- *) -- save_IFS="$IFS" -- IFS=: -- for progdir in $PATH; do -- IFS="$save_IFS" -- test -x "$progdir/$progname" && break -- done -- IFS="$save_IFS" -- test -n "$progdir" || progdir=`pwd` -- progpath="$progdir/$progname" -- ;; --esac -- --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed="${SED}"' -e 1s/^X//' --sed_quote_subst='s/\([`"$\\]\)/\\\1/g' -- --# Same as above, but do not quote variable references. --double_quote_subst='s/\(["`\\]\)/\\\1/g' -- --# Re-`\' parameter expansions in output of double_quote_subst that were --# `\'-ed in input to the same. If an odd number of `\' preceded a '$' --# in input to double_quote_subst, that '$' was protected from expansion. --# Since each input `\' is now two `\'s, look for any number of runs of --# four `\'s followed by two `\'s and then a '$'. `\' that '$'. --bs='\\' --bs2='\\\\' --bs4='\\\\\\\\' --dollar='\$' --sed_double_backslash="\ -- s/$bs4/&\\ --/g -- s/^$bs2$dollar/$bs&/ -- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g -- s/\n//g" -- --# Standard options: --opt_dry_run=false --opt_help=false --opt_quiet=false --opt_verbose=false --opt_warning=: -- --# func_echo arg... --# Echo program name prefixed message, along with the current mode --# name if it has been set yet. --func_echo () --{ -- $ECHO "$progname${mode+: }$mode: $*" --} -- --# func_verbose arg... --# Echo program name prefixed message in verbose mode only. --func_verbose () --{ -- $opt_verbose && func_echo ${1+"$@"} -- -- # A bug in bash halts the script if the last line of a function -- # fails when set -e is in force, so we need another command to -- # work around that: -- : --} -- --# func_error arg... --# Echo program name prefixed message to standard error. --func_error () --{ -- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 --} -- --# func_warning arg... --# Echo program name prefixed warning message to standard error. --func_warning () --{ -- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -- -- # bash bug again: -- : --} -- --# func_fatal_error arg... --# Echo program name prefixed message to standard error, and exit. --func_fatal_error () --{ -- func_error ${1+"$@"} -- exit $EXIT_FAILURE --} -- --# func_fatal_help arg... --# Echo program name prefixed message to standard error, followed by --# a help hint, and exit. --func_fatal_help () --{ -- func_error ${1+"$@"} -- func_fatal_error "$help" --} --help="Try \`$progname --help' for more information." ## default -- -- --# func_grep expression filename --# Check whether EXPRESSION matches any line of FILENAME, without output. --func_grep () --{ -- $GREP "$1" "$2" >/dev/null 2>&1 --} -- -- --# func_mkdir_p directory-path --# Make sure the entire path to DIRECTORY-PATH is available. --func_mkdir_p () --{ -- my_directory_path="$1" -- my_dir_list= -- -- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then -- -- # Protect directory names starting with `-' -- case $my_directory_path in -- -*) my_directory_path="./$my_directory_path" ;; -- esac -- -- # While some portion of DIR does not yet exist... -- while test ! -d "$my_directory_path"; do -- # ...make a list in topmost first order. Use a colon delimited -- # list incase some portion of path contains whitespace. -- my_dir_list="$my_directory_path:$my_dir_list" -- -- # If the last portion added has no slash in it, the list is done -- case $my_directory_path in */*) ;; *) break ;; esac -- -- # ...otherwise throw away the child directory and loop -- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` -- done -- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` -- -- save_mkdir_p_IFS="$IFS"; IFS=':' -- for my_dir in $my_dir_list; do -- IFS="$save_mkdir_p_IFS" -- # mkdir can fail with a `File exist' error if two processes -- # try to create one of the directories concurrently. Don't -- # stop in that case! -- $MKDIR "$my_dir" 2>/dev/null || : -- done -- IFS="$save_mkdir_p_IFS" -+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ $echo "$modename: not configured to build any kind of library" 1>&2 -+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit $EXIT_FAILURE -+fi +-progname=`echo "$progpath" | $SED $basename` +-modename="$progname" ++# along with GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, ++# or obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- # Bail out if we (or some other process) failed to create a directory. -- test -d "$my_directory_path" || \ -- func_fatal_error "Failed to create \`$1'" -- fi --} -+# Global variables. -+mode=$default_mode -+nonopt= -+prev= -+prevopt= -+run= -+show="$echo" -+show_help= -+execute_dlfiles= -+duplicate_deps=no -+preserve_args= -+lo2o="s/\\.lo\$/.${objext}/" -+o2lo="s/\\.${objext}\$/.lo/" -+extracted_archives= -+extracted_serial=0 - -+##################################### -+# Shell function definitions: -+# This seems to be the best place for them - - # func_mktempdir [string] - # Make a temporary directory that won't clash with other running -@@ -355,7 +167,7 @@ - { - my_template="${TMPDIR-/tmp}/${1-$progname}" - -- if test "$opt_dry_run" = ":"; then -+ if test "$run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else -@@ -364,784 +176,523 @@ - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then -- # Failing that, at least try and use $RANDOM to avoid a race -- my_tmpdir="${my_template}-${RANDOM-0}$$" -+ # Failing that, at least try and use $RANDOM to avoid a race -+ my_tmpdir="${my_template}-${RANDOM-0}$$" - -- save_mktempdir_umask=`umask` -- umask 0077 -- $MKDIR "$my_tmpdir" -- umask $save_mktempdir_umask -+ save_mktempdir_umask=`umask` -+ umask 0077 -+ $mkdir "$my_tmpdir" -+ umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure -- test -d "$my_tmpdir" || \ -- func_fatal_error "cannot create temporary directory \`$my_tmpdir'" -+ test -d "$my_tmpdir" || { -+ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 -+ exit $EXIT_FAILURE -+ } - fi - -- $ECHO "X$my_tmpdir" | $Xsed -+ $echo "X$my_tmpdir" | $Xsed - } - - --# func_quote_for_eval arg --# Aesthetically quote ARG to be evaled later. --# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT --# is double-quoted, suitable for a subsequent eval, whereas --# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters --# which are still active within double quotes backslashified. --func_quote_for_eval () -+# func_win32_libid arg -+# return the library type of file 'arg' +-# Global variables: +-EXIT_SUCCESS=0 +-EXIT_FAILURE=1 ++# Usage: $progname [OPTION]... [MODE-ARG]... +# -+# Need a lot of goo to handle *both* DLLs and import libs -+# Has to be a shell function in order to 'eat' the argument -+# that is supplied when $file_magic_command is called. -+func_win32_libid () - { -- case $1 in -- *[\\\`\"\$]*) -- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; -- *) -- func_quote_for_eval_unquoted_result="$1" ;; -- esac -- -- case $func_quote_for_eval_unquoted_result in -- # Double-quote args containing shell metacharacters to delay -- # word splitting, command substitution and and variable -- # expansion for a subsequent eval. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" -- ;; -- *) -- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" -+ win32_libid_type="unknown" -+ win32_fileres=`file -L $1 2>/dev/null` -+ case $win32_fileres in -+ *ar\ archive\ import\ library*) # definitely import -+ win32_libid_type="x86 archive import" -+ ;; -+ *ar\ archive*) # could be an import, or static -+ 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 -+ } -+ }'` -+ case $win32_nmres in -+ import*) win32_libid_type="x86 archive import";; -+ *) win32_libid_type="x86 archive static";; -+ esac -+ fi -+ ;; -+ *DLL*) -+ win32_libid_type="x86 DLL" -+ ;; -+ *executable*) # but shell scripts are "executable" too... -+ case $win32_fileres in -+ *MS\ Windows\ PE\ Intel*) -+ win32_libid_type="x86 DLL" -+ ;; - esac -+ ;; -+ esac -+ $echo $win32_libid_type - } ++# Provide generalized library-building support services. ++# ++# --config show all configuration variables ++# --debug enable verbose shell tracing ++# -n, --dry-run display commands without modifying any files ++# --features display basic configuration information and exit ++# --mode=MODE use operation mode MODE ++# --preserve-dup-deps don't remove duplicate dependency libraries ++# --quiet, --silent don't print informational messages ++# --tag=TAG use configuration variables from tag TAG ++# -v, --verbose print informational messages (default) ++# --version print version information ++# -h, --help print short or long help message ++# ++# MODE must be one of the following: ++# ++# clean remove files from the build directory ++# compile compile a source file into a libtool object ++# execute automatically set library path, then run a program ++# finish complete the installation of libtool libraries ++# install install libraries or executables ++# link create a library or an executable ++# uninstall remove libraries from an installed directory ++# ++# MODE-ARGS vary depending on the MODE. ++# Try `$progname --help --mode=MODE' for a more detailed description of MODE. ++# ++# When reporting a bug, please describe a test case to reproduce it and ++# include the following information: ++# ++# host-triplet: $host ++# shell: $SHELL ++# compiler: $LTCC ++# compiler flags: $LTCFLAGS ++# linker: $LD (gnu? $with_gnu_ld) ++# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1 ++# automake: $automake_version ++# autoconf: $autoconf_version ++# ++# Report bugs to <bug-libtool@gnu.org>. + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=1.5.26 +-TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" ++VERSION="2.2.6 Debian-2.2.6a-1" ++TIMESTAMP="" ++package_revision=1.3012 --# func_quote_for_expand arg --# Aesthetically quote ARG to be evaled later; same as above, --# but do not quote variable references. --func_quote_for_expand () -+# func_infer_tag arg -+# Infer tagged configuration to use if any are available and -+# if one wasn't chosen via the "--tag" command line option. -+# Only attempt this if the compiler in the base compile -+# command doesn't match the default compiler. -+# arg is usually of the form 'gcc ...' -+func_infer_tag () - { -- case $1 in -- *[\\\`\"]*) -- my_arg=`$ECHO "X$1" | $Xsed \ -- -e "$double_quote_subst" -e "$sed_double_backslash"` ;; -+ if test -n "$available_tags" && test -z "$tagname"; then -+ CC_quoted= -+ for arg in $CC; do -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ CC_quoted="$CC_quoted $arg" -+ done -+ case $@ in -+ # Blanks in the command may have been stripped by the calling shell, -+ # but not from the CC environment variable when configure was run. -+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; -+ # Blanks at the start of $base_compile will cause this to fail -+ # if we don't check for them as well. - *) -- my_arg="$1" ;; -- esac -- -- case $my_arg in -- # Double-quote args containing shell metacharacters to delay -- # word splitting and command substitution for a subsequent eval. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- my_arg="\"$my_arg\"" -- ;; -- esac -- -- func_quote_for_expand_result="$my_arg" -+ for z in $available_tags; do -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then -+ # Evaluate the configuration. -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ CC_quoted= -+ for arg in $CC; do -+ # Double-quote args containing other shell metacharacters. -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ CC_quoted="$CC_quoted $arg" -+ done -+ case "$@ " in -+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) -+ # The compiler in the base compile command matches -+ # the one in the tagged configuration. -+ # Assume this is the tagged configuration we want. -+ tagname=$z -+ break -+ ;; -+ esac -+ fi -+ done -+ # If $tagname still isn't set, then no tagged configuration -+ # was found and let the user know that the "--tag" command -+ # line option must be used. -+ if test -z "$tagname"; then -+ $echo "$modename: unable to infer tagged configuration" -+ $echo "$modename: specify a tag with \`--tag'" 1>&2 -+ exit $EXIT_FAILURE -+# else -+# $echo "$modename: using $tagname tagged configuration" -+ fi -+ ;; -+ esac -+ fi - } +-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). ++# Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +@@ -60,104 +91,261 @@ + BIN_SH=xpg4; export BIN_SH # for Tru64 + DUALCASE=1; export DUALCASE # for MKS sh - --# func_show_eval cmd [fail_exp] --# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is --# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP --# is given, then evaluate it. --func_show_eval () -+# func_extract_an_archive dir oldlib -+func_extract_an_archive () - { -- my_cmd="$1" -- my_fail_exp="${2-:}" -- -- ${opt_silent-false} || { -- func_quote_for_expand "$my_cmd" -- eval "func_echo $func_quote_for_expand_result" -- } -+ f_ex_an_ar_dir="$1"; shift -+ f_ex_an_ar_oldlib="$1" - -- if ${opt_dry_run-false}; then :; else -- eval "$my_cmd" -- my_status=$? -- if test "$my_status" -eq 0; then :; else -- eval "(exit $my_status); $my_fail_exp" -- fi -+ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" -+ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? -+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 -+ exit $EXIT_FAILURE - fi - } - -- --# func_show_eval_locale cmd [fail_exp] --# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is --# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP --# is given, then evaluate it. Use the saved locale for evaluation. --func_show_eval_locale () -+# func_extract_archives gentop oldlib ... -+func_extract_archives () - { -- my_cmd="$1" -- my_fail_exp="${2-:}" -- -- ${opt_silent-false} || { -- func_quote_for_expand "$my_cmd" -- eval "func_echo $func_quote_for_expand_result" -- } -+ my_gentop="$1"; shift -+ my_oldlibs=${1+"$@"} -+ my_oldobjs="" -+ my_xlib="" -+ my_xabs="" -+ my_xdir="" -+ my_status="" - -- if ${opt_dry_run-false}; then :; else -- eval "$lt_user_locale -- $my_cmd" -- my_status=$? -- eval "$lt_safe_locale" -- if test "$my_status" -eq 0; then :; else -- eval "(exit $my_status); $my_fail_exp" -- fi -+ $show "${rm}r $my_gentop" -+ $run ${rm}r "$my_gentop" -+ $show "$mkdir $my_gentop" -+ $run $mkdir "$my_gentop" -+ my_status=$? -+ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then -+ exit $my_status - fi --} -- -- - -+ for my_xlib in $my_oldlibs; do -+ # Extract the objects. -+ case $my_xlib in -+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; -+ *) my_xabs=`pwd`"/$my_xlib" ;; -+ esac -+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` -+ 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" - -- --# func_version --# Echo version message to standard output and exit. --func_version () --{ -- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { -- s/^# // -- s/^# *$// -- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ -- p -- }' < "$progpath" -- exit $? --} -- --# func_usage --# Echo short help message to standard output and exit. --func_usage () --{ -- $SED -n '/^# Usage:/,/# -h/ { -- s/^# // -- s/^# *$// -- s/\$progname/'$progname'/ -- p -- }' < "$progpath" -- $ECHO -- $ECHO "run \`$progname --help | more' for full usage" -- exit $? --} -- --# func_help --# Echo long help message to standard output and exit. --func_help () --{ -- $SED -n '/^# Usage:/,/# Report bugs to/ { -- s/^# // -- s/^# *$// -- s*\$progname*'$progname'* -- s*\$host*'"$host"'* -- s*\$SHELL*'"$SHELL"'* -- s*\$LTCC*'"$LTCC"'* -- s*\$LTCFLAGS*'"$LTCFLAGS"'* -- s*\$LD*'"$LD"'* -- s/\$with_gnu_ld/'"$with_gnu_ld"'/ -- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ -- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ -- p -- }' < "$progpath" -- exit $? --} -- --# func_missing_arg argname --# Echo program name prefixed message to standard error and set global --# exit_cmd. --func_missing_arg () --{ -- func_error "missing argument for $1" -- exit_cmd=exit -+ $show "${rm}r $my_xdir" -+ $run ${rm}r "$my_xdir" -+ $show "$mkdir $my_xdir" -+ $run $mkdir "$my_xdir" -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then -+ exit $exit_status -+ fi -+ case $host in -+ *-darwin*) -+ $show "Extracting $my_xabs" -+ # Do not bother doing anything if just a dry run -+ if test -z "$run"; then -+ darwin_orig_dir=`pwd` -+ cd $my_xdir || exit $? -+ darwin_archive=$my_xabs -+ darwin_curdir=`pwd` -+ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` -+ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` -+ if test -n "$darwin_arches"; then -+ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` -+ darwin_arch= -+ $show "$darwin_base_archive has multiple architectures $darwin_arches" -+ for darwin_arch in $darwin_arches ; do -+ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" -+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ func_extract_an_archive "`pwd`" "${darwin_base_archive}" -+ cd "$darwin_curdir" -+ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" -+ done # $darwin_arches -+ ## Okay now we have a bunch of thin objects, gotta fatten them up :) -+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` -+ darwin_file= -+ darwin_files= -+ for darwin_file in $darwin_filelist; do -+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ lipo -create -output "$darwin_file" $darwin_files -+ done # $darwin_filelist -+ ${rm}r unfat-$$ -+ cd "$darwin_orig_dir" -+ else -+ cd "$darwin_orig_dir" -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ fi # $darwin_arches -+ fi # $run -+ ;; -+ *) -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ ;; -+ esac -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ done -+ func_extract_archives_result="$my_oldobjs" - } -+# End of Shell function definitions -+##################################### - --exit_cmd=: -- -- -- -+# Darwin sucks -+eval std_shrext=\"$shrext_cmds\" - -+disable_libs=no - --# Check that we have a working $ECHO. +-# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : --elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then -- # Yippee, $ECHO works! +-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then +- # Yippee, $echo works! - : -else -- # Restart under the correct shell, and then maybe $ECHO will work. +- # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo -+# Parse our command line options once, thoroughly. -+while test "$#" -gt 0 -+do -+ arg="$1" - shift +- shift - cat <<EOF -$* -EOF - exit $EXIT_SUCCESS -fi - +-default_mode= +-help="Try \`$progname --help' for more information." -magic="%%%MAGIC variable%%%" --magic_exe="%%%MAGIC EXE variable%%%" +-mkdir="mkdir" +-mv="mv -f" +-rm="rm -f" - +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed="${SED}"' -e 1s/^X//' +-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' +-# test EBCDIC or ASCII +-case `echo X|tr X '\101'` in +- A) # ASCII based system +- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr +- SP2NL='tr \040 \012' +- NL2SP='tr \015\012 \040\040' +- ;; +- *) # EBCDIC based system +- SP2NL='tr \100 \n' +- NL2SP='tr \r\n \100\100' +- ;; +-esac +- +-# NLS nuisances. ++# NLS nuisances: We save the old values to restore during execute mode. + # Only set LANG and LC_ALL to C if already set. + # 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. +-lt_env= ++lt_user_locale= ++lt_safe_locale= + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${$lt_var+set}\" = set; then +- save_$lt_var=\$$lt_var +- lt_env=\"$lt_var=\$$lt_var \$lt_env\" +- $lt_var=C ++ save_$lt_var=\$$lt_var ++ $lt_var=C + export $lt_var ++ lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" ++ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + fi" + done + +-if test -n "$lt_env"; then +- lt_env="env $lt_env" +-fi ++$lt_unset CDPATH ++ ++ ++ ++ ++ ++: ${CP="cp -f"} ++: ${ECHO="echo"} ++: ${EGREP="/bin/grep -E"} ++: ${FGREP="/bin/grep -F"} ++: ${GREP="/bin/grep"} ++: ${LN_S="ln -s"} ++: ${MAKE="make"} ++: ${MKDIR="mkdir"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++: ${SED="/bin/sed"} ++: ${SHELL="${CONFIG_SHELL-/bin/sh}"} ++: ${Xsed="$SED -e 1s/^X//"} ++ ++# Global variables: ++EXIT_SUCCESS=0 ++EXIT_FAILURE=1 ++EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. ++EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. ++ ++exit_status=$EXIT_SUCCESS + + # Make sure IFS has a sensible default + lt_nl=' + ' + IFS=" $lt_nl" + +-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then +- $echo "$modename: not configured to build any kind of library" 1>&2 +- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 +- exit $EXIT_FAILURE +-fi ++dirname="s,/[^/]*$,," ++basename="s,^.*/,," + -# Global variables. --# $mode is unset +-mode=$default_mode -nonopt= +-prev= +-prevopt= +-run= +-show="$echo" +-show_help= -execute_dlfiles= +-duplicate_deps=no -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 - --opt_dry_run=false --opt_duplicate_deps=false --opt_silent=false --opt_debug=: -+ case $arg in -+ -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) optarg= ;; -+ esac - --# If this variable is set in any of the actions, the command in it --# will be execed at the end. This prevents here-documents from being --# left over by shells. --exec_cmd= -+ # If the previous option needs an argument, assign it. -+ if test -n "$prev"; then -+ case $prev in -+ execute_dlfiles) -+ execute_dlfiles="$execute_dlfiles $arg" -+ ;; -+ tag) -+ tagname="$arg" -+ preserve_args="${preserve_args}=$arg" -+ -+ # Check whether tagname contains only valid characters -+ case $tagname in -+ *[!-_A-Za-z0-9,/]*) -+ $echo "$progname: invalid tag name: $tagname" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac - --# func_fatal_configuration arg... --# Echo program name prefixed message to standard error, followed by --# a configuration failure hint, and exit. --func_fatal_configuration () --{ -- func_error ${1+"$@"} -- func_error "See the $PACKAGE documentation for more information." -- func_fatal_error "Fatal configuration error." --} -+ case $tagname in -+ CC) -+ # Don't test for the "default" C tag, as we know, it's there, but -+ # not specially marked. -+ ;; -+ *) -+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then -+ taglist="$taglist $tagname" -+ # Evaluate the configuration. -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" -+ else -+ $echo "$progname: ignoring unknown tag $tagname" 1>&2 -+ fi -+ ;; -+ esac -+ ;; -+ *) -+ eval "$prev=\$arg" -+ ;; -+ esac - -+ prev= -+ prevopt= -+ continue ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" + fi - --# func_config --# Display the configuration for all the tags in this script. --func_config () --{ -- re_begincf='^# ### BEGIN LIBTOOL' -- re_endcf='^# ### END LIBTOOL' -+ # Have we seen a non-optional argument yet? -+ case $arg in -+ --help) -+ show_help=yes -+ ;; - -- # Default configuration. -- $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" -+ --version) -+ echo "\ -+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP ++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++} + -+Copyright (C) 2008 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 $? -+ ;; - -+ --config) -+ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath - # Now print the configurations for the tags. - for tagname in $taglist; do -- $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" -+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" - done -- - exit $? --} -+ ;; - --# func_features --# Display the features supported by this script. --func_features () --{ -- $ECHO "host: $host" -+ --debug) -+ $echo "$progname: enabling shell trace mode" -+ set -x -+ preserve_args="$preserve_args $arg" -+ ;; ++# Generated shell functions inserted here. + -+ --dry-run | -n) -+ run=: -+ ;; ++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh ++# is ksh but when the shell is invoked as "sh" and the current value of ++# the _XPG environment variable is not equal to 1 (one), the special ++# positional parameter $0, within a function call, is the name of the ++# function. ++progpath="$0" + -+ --features) -+ $echo "host: $host" - if test "$build_libtool_libs" = yes; then -- $ECHO "enable shared libraries" -+ $echo "enable shared libraries" - else -- $ECHO "disable shared libraries" -+ $echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then -- $ECHO "enable static libraries" -+ $echo "enable static libraries" - else -- $ECHO "disable static libraries" -+ $echo "disable static libraries" - fi -- - exit $? --} -- --# func_enable_tag tagname --# Verify that TAGNAME is valid, and either flag an error and exit, or --# enable the TAGNAME tag. We also add TAGNAME to the global $taglist --# variable here. --func_enable_tag () --{ -- # Global variable: -- tagname="$1" -- -- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" -- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" -- sed_extractcf="/$re_begincf/,/$re_endcf/p" -- -- # Validate tagname. -- case $tagname in -- *[!-_A-Za-z0-9,/]*) -- func_fatal_error "invalid tag name: $tagname" -- ;; -- esac -+ ;; - -- # Don't test for the "default" C tag, as we know it's -- # there but not specially marked. -- case $tagname in -- CC) ;; -- *) -- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then -- taglist="$taglist $tagname" -+ --finish) mode="finish" ;; - -- # Evaluate the configuration. Be careful to quote the path -- # and the sed script, to avoid splitting on whitespace, but -- # also don't use non-portable quotes within backquotes within -- # quotes we have to do it in 2 steps: -- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` -- eval "$extractedcf" -- else -- func_error "ignoring unknown tag $tagname" -- fi -- ;; -- esac --} -+ --mode) prevopt="--mode" prev=mode ;; -+ --mode=*) mode="$optarg" ;; - --# Parse options once, thoroughly. This comes as soon as possible in --# the script to make things like `libtool --version' happen quickly. --{ -+ --preserve-dup-deps) duplicate_deps="yes" ;; - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -+ --quiet | --silent) -+ show=: -+ preserve_args="$preserve_args $arg" - ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -+ -+ --tag) -+ prevopt="--tag" -+ prev=tag -+ preserve_args="$preserve_args --tag" - ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -+ --tag=*) -+ set tag "$optarg" ${1+"$@"} -+ shift -+ prev=tag -+ preserve_args="$preserve_args --tag" - ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -+ -+ -dlopen) -+ prevopt="-dlopen" -+ prev=execute_dlfiles - ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -+ -+ -*) -+ $echo "$modename: unrecognized option \`$arg'" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE - ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -+ -+ *) -+ nonopt="$arg" -+ break - ;; - esac -+done - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do -- opt="$1" -- shift -- -- case $opt in -- --config) func_config ;; -- -- --debug) preserve_args="$preserve_args $opt" -- func_echo "enabling shell trace mode" -- opt_debug='set -x' -- $opt_debug -- ;; -- -- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -- execute_dlfiles="$execute_dlfiles $1" -- shift -- ;; -- -- --dry-run | -n) opt_dry_run=: ;; -- --features) func_features ;; -- --finish) mode="finish" ;; -- -- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -- case $1 in -- # Valid mode arguments: -- clean) ;; -- compile) ;; -- execute) ;; -- finish) ;; -- install) ;; -- link) ;; -- relink) ;; -- uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; -- esac -- -- mode="$1" -- shift -- ;; -- -- --preserve-dup-deps) -- opt_duplicate_deps=: ;; -- -- --quiet|--silent) preserve_args="$preserve_args $opt" -- opt_silent=: -- ;; -- -- --verbose| -v) preserve_args="$preserve_args $opt" -- opt_silent=false -- ;; -- -- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -- preserve_args="$preserve_args $opt $1" -- func_enable_tag "$1" # tagname is set here -- shift -- ;; -- -- # Separate optargs to long options: -- -dlopen=*|--mode=*|--tag=*) -- func_opt_split "$opt" -- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -- shift -- ;; -- -- -\?|-h) func_usage ;; -- --help) opt_help=: ;; -- --version) func_version ;; -+if test -n "$prevopt"; then -+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+fi - -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -+case $disable_libs in -+no) -+ ;; -+shared) -+ build_libtool_libs=no -+ build_old_libs=yes -+ ;; -+static) -+ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -+ ;; ++# The name of this program: ++# In the unlikely event $progname began with a '-', it would play havoc with ++# func_echo (imagine progname=-n), so we prepend ./ in that case: ++func_dirname_and_basename "$progpath" ++progname=$func_basename_result ++case $progname in ++ -*) progname=./$progname ;; +esac - -- *) nonopt="$opt" -- break -- ;; -- esac -- done -+# If this variable is set in any of the actions, the command in it -+# will be execed at the end. This prevents here-documents from being -+# left over by shells. -+exec_cmd= - -+if test -z "$show_help"; then - -- case $host in -- *cygwin* | *mingw* | *pw32* | *cegcc*) -- # don't eliminate duplications in $postdeps and $predeps -- opt_duplicate_compiler_generated_deps=: -+ # Infer the operation mode. -+ if test -z "$mode"; then -+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 -+ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 -+ case $nonopt in -+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) -+ mode=link -+ for arg -+ do -+ case $arg in -+ -c) -+ mode=compile -+ break -+ ;; -+ esac ++ ++# Make sure we have an absolute path for reexecution: ++case $progpath in ++ [\\/]*|[A-Za-z]:\\*) ;; ++ *[\\/]*) ++ progdir=$func_dirname_result ++ progdir=`cd "$progdir" && pwd` ++ progpath="$progdir/$progname" ++ ;; ++ *) ++ save_IFS="$IFS" ++ IFS=: ++ for progdir in $PATH; do ++ IFS="$save_IFS" ++ test -x "$progdir/$progname" && break ++ done ++ IFS="$save_IFS" ++ test -n "$progdir" || progdir=`pwd` ++ progpath="$progdir/$progname" ++ ;; ++esac ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed="${SED}"' -e 1s/^X//' ++sed_quote_subst='s/\([`"$\\]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\(["`\\]\)/\\\1/g' ++ ++# Re-`\' parameter expansions in output of double_quote_subst that were ++# `\'-ed in input to the same. If an odd number of `\' preceded a '$' ++# in input to double_quote_subst, that '$' was protected from expansion. ++# Since each input `\' is now two `\'s, look for any number of runs of ++# four `\'s followed by two `\'s and then a '$'. `\' that '$'. ++bs='\\' ++bs2='\\\\' ++bs4='\\\\\\\\' ++dollar='\$' ++sed_double_backslash="\ ++ s/$bs4/&\\ ++/g ++ s/^$bs2$dollar/$bs&/ ++ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g ++ s/\n//g" ++ ++# Standard options: ++opt_dry_run=false ++opt_help=false ++opt_quiet=false ++opt_verbose=false ++opt_warning=: ++ ++# func_echo arg... ++# Echo program name prefixed message, along with the current mode ++# name if it has been set yet. ++func_echo () ++{ ++ $ECHO "$progname${mode+: }$mode: $*" ++} ++ ++# func_verbose arg... ++# Echo program name prefixed message in verbose mode only. ++func_verbose () ++{ ++ $opt_verbose && func_echo ${1+"$@"} ++ ++ # A bug in bash halts the script if the last line of a function ++ # fails when set -e is in force, so we need another command to ++ # work around that: ++ : ++} ++ ++# func_error arg... ++# Echo program name prefixed message to standard error. ++func_error () ++{ ++ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 ++} ++ ++# func_warning arg... ++# Echo program name prefixed warning message to standard error. ++func_warning () ++{ ++ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 ++ ++ # bash bug again: ++ : ++} ++ ++# func_fatal_error arg... ++# Echo program name prefixed message to standard error, and exit. ++func_fatal_error () ++{ ++ func_error ${1+"$@"} ++ exit $EXIT_FAILURE ++} ++ ++# func_fatal_help arg... ++# Echo program name prefixed message to standard error, followed by ++# a help hint, and exit. ++func_fatal_help () ++{ ++ func_error ${1+"$@"} ++ func_fatal_error "$help" ++} ++help="Try \`$progname --help' for more information." ## default ++ ++ ++# func_grep expression filename ++# Check whether EXPRESSION matches any line of FILENAME, without output. ++func_grep () ++{ ++ $GREP "$1" "$2" >/dev/null 2>&1 ++} ++ ++ ++# func_mkdir_p directory-path ++# Make sure the entire path to DIRECTORY-PATH is available. ++func_mkdir_p () ++{ ++ my_directory_path="$1" ++ my_dir_list= ++ ++ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then ++ ++ # Protect directory names starting with `-' ++ case $my_directory_path in ++ -*) my_directory_path="./$my_directory_path" ;; ++ esac ++ ++ # While some portion of DIR does not yet exist... ++ while test ! -d "$my_directory_path"; do ++ # ...make a list in topmost first order. Use a colon delimited ++ # list incase some portion of path contains whitespace. ++ my_dir_list="$my_directory_path:$my_dir_list" ++ ++ # If the last portion added has no slash in it, the list is done ++ case $my_directory_path in */*) ;; *) break ;; esac ++ ++ # ...otherwise throw away the child directory and loop ++ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` + done - ;; -- *) -- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ *db | *dbx | *strace | *truss) -+ mode=execute - ;; -- esac -- -- # Having warned about all mis-specified options, bail out if -- # anything was wrong. -- $exit_cmd $EXIT_FAILURE --} -+ *install*|cp|mv) -+ mode=install -+ ;; -+ *rm) -+ mode=uninstall -+ ;; -+ *) -+ # If we have no mode, but dlfiles were specified, then do execute mode. -+ test -n "$execute_dlfiles" && mode=execute ++ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` ++ ++ save_mkdir_p_IFS="$IFS"; IFS=':' ++ for my_dir in $my_dir_list; do ++ IFS="$save_mkdir_p_IFS" ++ # mkdir can fail with a `File exist' error if two processes ++ # try to create one of the directories concurrently. Don't ++ # stop in that case! ++ $MKDIR "$my_dir" 2>/dev/null || : ++ done ++ IFS="$save_mkdir_p_IFS" ++ ++ # Bail out if we (or some other process) failed to create a directory. ++ test -d "$my_directory_path" || \ ++ func_fatal_error "Failed to create \`$1'" ++ fi ++} --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () --{ -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -+ # Just use the default operation mode. -+ if test -z "$mode"; then -+ if test -n "$nonopt"; then -+ $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 -+ else -+ $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 -+ fi +-##################################### +-# Shell function definitions: +-# This seems to be the best place for them + + # func_mktempdir [string] + # Make a temporary directory that won't clash with other running +@@ -167,7 +355,7 @@ + { + my_template="${TMPDIR-/tmp}/${1-$progname}" + +- if test "$run" = ":"; then ++ if test "$opt_dry_run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else +@@ -176,526 +364,787 @@ + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then +- # Failing that, at least try and use $RANDOM to avoid a race +- my_tmpdir="${my_template}-${RANDOM-0}$$" ++ # Failing that, at least try and use $RANDOM to avoid a race ++ my_tmpdir="${my_template}-${RANDOM-0}$$" + +- save_mktempdir_umask=`umask` +- umask 0077 +- $mkdir "$my_tmpdir" +- umask $save_mktempdir_umask ++ save_mktempdir_umask=`umask` ++ umask 0077 ++ $MKDIR "$my_tmpdir" ++ umask $save_mktempdir_umask fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -- fi -- -- exit $EXIT_MISMATCH -- fi --} -- -- --## ----------- ## --## Main. ## --## ----------- ## -- --$opt_help || { -- # Sanity checks first: -- func_check_version_match -- -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -+ ;; -+ esac - fi -- test -z "$mode" && func_fatal_error "error: you must specify a MODE." -- -- -- # Darwin sucks -- eval std_shrext=\"$shrext_cmds\" -- -- - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2 -+ $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" -- help="Try \`$progname --help --mode=$mode' for more information." --} -+ help="Try \`$modename --help --mode=$mode' for more information." - -+ # These modes are in order of execution frequency so that they run quickly. -+ case $mode in -+ # libtool compile mode -+ compile) -+ modename="$modename: compile" -+ # Get the compilation command and the source file. -+ base_compile= -+ srcfile="$nonopt" # always keep a non-empty value in "srcfile" -+ suppress_opt=yes -+ suppress_output= -+ arg_mode=normal -+ libobj= -+ later= - --# func_lalib_p file --# True iff FILE is a libtool `.la' library or `.lo' object file. --# This function is only a basic sanity check; it will hardly flush out --# determined imposters. --func_lalib_p () --{ -- test -f "$1" && -- $SED -e 4q "$1" 2>/dev/null \ -- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 --} -+ for arg -+ do -+ case $arg_mode in -+ arg ) -+ # do not "continue". Instead, add this to base_compile -+ lastarg="$arg" -+ arg_mode=normal -+ ;; - --# func_lalib_unsafe_p file --# True iff FILE is a libtool `.la' library or `.lo' object file. --# This function implements the same check as func_lalib_p without --# resorting to external programs. To this end, it redirects stdin and --# closes it afterwards, without saving the original file descriptor. --# As a safety measure, use it only where a negative result would be --# fatal anyway. Works if `file' does not exist. --func_lalib_unsafe_p () --{ -- lalib_p=no -- if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then -- for lalib_p_l in 1 2 3 4 -- do -- read lalib_p_line -- case "$lalib_p_line" in -- \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; -- esac -- done -- exec 0<&5 5<&- -- fi -- test "$lalib_p" = yes --} -+ target ) -+ libobj="$arg" -+ arg_mode=normal -+ continue -+ ;; - --# func_ltwrapper_script_p file --# True iff FILE is a libtool wrapper script --# This function is only a basic sanity check; it will hardly flush out --# determined imposters. --func_ltwrapper_script_p () --{ -- func_lalib_p "$1" --} -+ normal ) -+ # Accept any command-line options. -+ case $arg in -+ -o) -+ if test -n "$libobj" ; then -+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ arg_mode=target -+ continue -+ ;; - --# func_ltwrapper_executable_p file --# True iff FILE is a libtool wrapper executable --# This function is only a basic sanity check; it will hardly flush out --# determined imposters. --func_ltwrapper_executable_p () --{ -- func_ltwrapper_exec_suffix= -- case $1 in -- *.exe) ;; -- *) func_ltwrapper_exec_suffix=.exe ;; -- esac -- $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 --} -- --# func_ltwrapper_scriptname file --# Assumes file is an ltwrapper_executable --# uses $file to determine the appropriate filename for a --# temporary ltwrapper_script. --func_ltwrapper_scriptname () --{ -- func_ltwrapper_scriptname_result="" -- if func_ltwrapper_executable_p "$1"; then -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -- fi --} -- --# func_ltwrapper_p file --# True iff FILE is a libtool wrapper script or wrapper executable --# This function is only a basic sanity check; it will hardly flush out --# determined imposters. --func_ltwrapper_p () --{ -- func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" --} -- -- --# func_execute_cmds commands fail_cmd --# Execute tilde-delimited COMMANDS. --# If FAIL_CMD is given, eval that upon failure. --# FAIL_CMD may read-access the current command in variable CMD! --func_execute_cmds () --{ -- $opt_debug -- save_ifs=$IFS; IFS='~' -- for cmd in $1; do -- IFS=$save_ifs -- eval cmd=\"$cmd\" -- func_show_eval "$cmd" "${2-:}" -- done -- IFS=$save_ifs --} -- -- --# func_source file --# Source FILE, adding directory component if necessary. --# Note that it is not necessary on cygwin/mingw to append a dot to --# FILE even if both FILE and FILE.exe exist: automatic-append-.exe --# behavior happens only for exec(3), not for open(2)! Also, sourcing --# `FILE.' does not work on cygwin managed mounts. --func_source () --{ -- $opt_debug -- case $1 in -- */* | *\\*) . "$1" ;; -- *) . "./$1" ;; -- esac --} -- -- --# func_infer_tag arg --# Infer tagged configuration to use if any are available and --# if one wasn't chosen via the "--tag" command line option. --# Only attempt this if the compiler in the base compile --# command doesn't match the default compiler. --# arg is usually of the form 'gcc ...' --func_infer_tag () --{ -- $opt_debug -- if test -n "$available_tags" && test -z "$tagname"; then -- CC_quoted= -- for arg in $CC; do -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -- done -- case $@ in -- # Blanks in the command may have been stripped by the calling shell, -- # but not from the CC environment variable when configure was run. -- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; -- # Blanks at the start of $base_compile will cause this to fail -- # if we don't check for them as well. -- *) -- for z in $available_tags; do -- if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then -- # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -- CC_quoted= -- for arg in $CC; do -- # Double-quote args containing other shell metacharacters. -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -- done -- case "$@ " in -- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) -- # The compiler in the base compile command matches -- # the one in the tagged configuration. -- # Assume this is the tagged configuration we want. -- tagname=$z -- break -- ;; -- esac -- fi -- done -- # If $tagname still isn't set, then no tagged configuration -- # was found and let the user know that the "--tag" command -- # line option must be used. -- if test -z "$tagname"; then -- func_echo "unable to infer tagged configuration" -- func_fatal_error "specify a tag with \`--tag'" --# else --# func_verbose "using $tagname tagged configuration" -- fi -- ;; -- esac -- fi --} -- -- -- --# func_write_libtool_object output_name pic_name nonpic_name --# Create a libtool object file (analogous to a ".la" file), --# but don't create it if we're doing a dry run. --func_write_libtool_object () --{ -- write_libobj=${1} -- if test "$build_libtool_libs" = yes; then -- write_lobj=\'${2}\' -- else -- write_lobj=none -- fi -- -- if test "$build_old_libs" = yes; then -- write_oldobj=\'${3}\' -- else -- write_oldobj=none -- fi -- -- $opt_dry_run || { -- cat >${write_libobj}T <<EOF --# $write_libobj - a libtool object file --# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION --# --# Please DO NOT delete this file! --# It is necessary for linking the library. -- --# Name of the PIC object. --pic_object=$write_lobj -- --# Name of the non-PIC object --non_pic_object=$write_oldobj -- --EOF -- $MV "${write_libobj}T" "${write_libobj}" -- } --} -- --# func_mode_compile arg... --func_mode_compile () --{ -- $opt_debug -- # Get the compilation command and the source file. -- base_compile= -- srcfile="$nonopt" # always keep a non-empty value in "srcfile" -- suppress_opt=yes -- suppress_output= -- arg_mode=normal -- libobj= -- later= -- pie_flag= -- -- for arg -- do -- case $arg_mode in -- arg ) -- # do not "continue". Instead, add this to base_compile -- lastarg="$arg" -- arg_mode=normal -- ;; -- -- target ) -- libobj="$arg" -- arg_mode=normal -- continue -- ;; -- -- normal ) -- # Accept any command-line options. -- case $arg in -- -o) -- test -n "$libobj" && \ -- func_fatal_error "you cannot specify \`-o' more than once" -- arg_mode=target -- continue -- ;; -- -- -pie | -fpie | -fPIE) -- pie_flag="$pie_flag $arg" -- continue -- ;; -- -- -shared | -static | -prefer-pic | -prefer-non-pic) -+ -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" - continue - ;; -@@ -1157,25 +708,31 @@ - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) -- func_stripname '-Wc,' '' "$arg" -- args=$func_stripname_result -+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' -- for arg in $args; do -+ for arg in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$arg" -- lastarg="$lastarg $func_quote_for_eval_result" -+ -+ # Double-quote args containing other shell metacharacters. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, so we specify it separately. -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ lastarg="$lastarg $arg" - done - IFS="$save_ifs" -- func_stripname ' ' '' "$lastarg" -- lastarg=$func_stripname_result -+ lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - - # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" - continue - ;; - -- *) -+ * ) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # -@@ -1187,42 +744,66 @@ - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_quote_for_eval "$lastarg" -- base_compile="$base_compile $func_quote_for_eval_result" -+ lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` -+ -+ case $lastarg in -+ # Double-quote args containing other shell metacharacters. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, and some SunOS ksh mistreat backslash-escaping -+ # in scan sets (worked around with variable expansion), -+ # and furthermore cannot handle '|' '&' '(' ')' in scan sets -+ # at all, so we specify them separately. -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ lastarg="\"$lastarg\"" -+ ;; -+ esac -+ -+ base_compile="$base_compile $lastarg" - done # for arg - - case $arg_mode in - arg) -- func_fatal_error "you must specify an argument for -Xcompile" -+ $echo "$modename: you must specify an argument for -Xcompile" -+ exit $EXIT_FAILURE - ;; - target) -- func_fatal_error "you must specify a target with \`-o'" -+ $echo "$modename: you must specify a target with \`-o'" 1>&2 -+ exit $EXIT_FAILURE - ;; - *) - # Get the name of the library object. -- test -z "$libobj" && { -- func_basename "$srcfile" -- libobj="$func_basename_result" + # If we're not in dry-run mode, bomb out on failure +- test -d "$my_tmpdir" || { +- $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 +- exit $EXIT_FAILURE - } -+ [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo -+ xform='[cCFSifmso]' - case $libobj in -- *.[cCFSifmso] | \ -- *.ada | *.adb | *.ads | *.asm | \ -- *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ -- *.[fF][09]? | *.for | *.java | *.obj | *.sx) -- func_xform "$libobj" -- libobj=$func_xform_result -- ;; -+ *.ada) xform=ada ;; -+ *.adb) xform=adb ;; -+ *.ads) xform=ads ;; -+ *.asm) xform=asm ;; -+ *.c++) xform=c++ ;; -+ *.cc) xform=cc ;; -+ *.ii) xform=ii ;; -+ *.class) xform=class ;; -+ *.cpp) xform=cpp ;; -+ *.cxx) xform=cxx ;; -+ *.[fF][09]?) xform=[fF][09]. ;; -+ *.for) xform=for ;; -+ *.java) xform=java ;; -+ *.obj) xform=obj ;; -+ *.sx) xform=sx ;; - esac - -+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` -+ - case $libobj in -- *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; -+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) -- func_fatal_error "cannot determine name of library object from \`$libobj'" -+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 -+ exit $EXIT_FAILURE - ;; - esac - -@@ -1230,15 +811,7 @@ - - for arg in $later; do - case $arg in -- -shared) -- test "$build_libtool_libs" != yes && \ -- func_fatal_configuration "can not build a shared library" -- build_old_libs=no -- continue -- ;; -- - -static) -- build_libtool_libs=no - build_old_libs=yes - continue - ;; -@@ -1255,17 +828,28 @@ - esac - done - -- func_quote_for_eval "$libobj" -- test "X$libobj" != "X$func_quote_for_eval_result" \ -- && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ -- && func_warning "libobj name \`$libobj' may not contain shell special characters." -- func_dirname_and_basename "$obj" "/" "" -- objname="$func_basename_result" -- xdir="$func_dirname_result" -+ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` -+ case $qlibobj in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ qlibobj="\"$qlibobj\"" ;; -+ esac -+ test "X$libobj" != "X$qlibobj" \ -+ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ -+ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." -+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$obj"; then -+ xdir= -+ else -+ xdir=$xdir/ -+ fi - lobj=${xdir}$objdir/$objname - -- test -z "$base_compile" && \ -- func_fatal_help "you must specify a compilation command" -+ if test -z "$base_compile"; then -+ $echo "$modename: you must specify a compilation command" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then -@@ -1274,9 +858,12 @@ - removelist="$lobj $libobj ${libobj}T" ++ test -d "$my_tmpdir" || \ ++ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi -+ $run $rm $removelist -+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 -+ - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in -- cygwin* | mingw* | pw32* | os2* | cegcc*) -+ cygwin* | mingw* | pw32* | os2*) - pic_mode=default - ;; - esac -@@ -1288,8 +875,10 @@ - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then -- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} -+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" -+ removelist="$removelist $output_obj $lockfile" -+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else - output_obj= - need_locks=no -@@ -1299,13 +888,13 @@ - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then -- until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do -- func_echo "Waiting for $lockfile to be removed" -+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do -+ $show "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then -- $ECHO "\ -+ $echo "\ - *** ERROR, $lockfile exists and contains: - `cat $lockfile 2>/dev/null` +- $echo "X$my_tmpdir" | $Xsed ++ $ECHO "X$my_tmpdir" | $Xsed + } -@@ -1316,22 +905,34 @@ - avoid parallel builds (make -j) in this platform, or get a better - compiler." -- $opt_dry_run || $RM $removelist -+ $run $rm $removelist - exit $EXIT_FAILURE - fi -- removelist="$removelist $output_obj" -- $ECHO "$srcfile" > "$lockfile" -+ $echo "$srcfile" > "$lockfile" - fi - -- $opt_dry_run || $RM $removelist -- removelist="$removelist $lockfile" -- trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 -- - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi -- func_quote_for_eval "$srcfile" -- qsrcfile=$func_quote_for_eval_result -+ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` -+ case $qsrcfile in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ qsrcfile="\"$qsrcfile\"" ;; -+ esac -+ -+ $run $rm "$libobj" "${libobj}T" -+ -+ # Create a libtool object file (analogous to a ".la" file), -+ # but don't create it if we're doing a dry run. -+ test -z "$run" && cat > ${libobj}T <<EOF -+# $libobj - a libtool object file -+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -+# -+# Please DO NOT delete this file! -+# It is necessary for linking the library. -+ -+# Name of the PIC object. -+EOF - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then -@@ -1345,19 +946,32 @@ - command="$base_compile $qsrcfile" - fi - -- func_mkdir_p "$xdir$objdir" -+ if test ! -d "${xdir}$objdir"; then -+ $show "$mkdir ${xdir}$objdir" -+ $run $mkdir ${xdir}$objdir -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then -+ exit $exit_status -+ fi -+ fi - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - command="$command -o $lobj" - fi - -- func_show_eval_locale "$command" \ -- 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' -+ $run $rm "$lobj" "$output_obj" -+ -+ $show "$command" -+ if $run eval $lt_env "$command"; then : -+ else -+ test -n "$output_obj" && $run $rm $removelist -+ exit $EXIT_FAILURE -+ fi - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then -- $ECHO "\ -+ $echo "\ - *** ERROR, $lockfile contains: - `cat $lockfile 2>/dev/null` - -@@ -1371,27 +985,45 @@ - avoid parallel builds (make -j) in this platform, or get a better - compiler." - -- $opt_dry_run || $RM $removelist -+ $run $rm $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then -- func_show_eval '$MV "$output_obj" "$lobj"' \ -- 'error=$?; $opt_dry_run || $RM $removelist; exit $error' -+ $show "$mv $output_obj $lobj" -+ if $run $mv $output_obj $lobj; then : -+ else -+ error=$? -+ $run $rm $removelist -+ exit $error -+ fi - fi - -+ # Append the name of the PIC object to the libtool object file. -+ test -z "$run" && cat >> ${libobj}T <<EOF -+pic_object='$objdir/$objname' -+ -+EOF -+ - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then -- suppress_output=' >/dev/null 2>&1' -+ suppress_output=' >/dev/null 2>&1' - fi -+ else -+ # No PIC object so indicate it doesn't exist in the libtool -+ # object file. -+ test -z "$run" && cat >> ${libobj}T <<EOF -+pic_object=none -+ -+EOF - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code -- command="$base_compile $qsrcfile$pie_flag" -+ command="$base_compile $qsrcfile" - else - command="$base_compile $qsrcfile $pic_flag" - fi -@@ -1401,12 +1033,17 @@ - - # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" -- func_show_eval_locale "$command" \ -- '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' -+ $run $rm "$obj" "$output_obj" -+ $show "$command" -+ if $run eval $lt_env "$command"; then : -+ else -+ $run $rm $removelist -+ exit $EXIT_FAILURE -+ fi - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then -- $ECHO "\ -+ $echo "\ - *** ERROR, $lockfile contains: - `cat $lockfile 2>/dev/null` - -@@ -1420,6777 +1057,5485 @@ - avoid parallel builds (make -j) in this platform, or get a better - compiler." - -- $opt_dry_run || $RM $removelist -+ $run $rm $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then -- func_show_eval '$MV "$output_obj" "$obj"' \ -- 'error=$?; $opt_dry_run || $RM $removelist; exit $error' -+ $show "$mv $output_obj $obj" -+ if $run $mv $output_obj $obj; then : -+ else -+ error=$? -+ $run $rm $removelist -+ exit $error -+ fi - fi -+ -+ # Append the name of the non-PIC object the libtool object file. -+ # Only append if the libtool object file exists. -+ test -z "$run" && cat >> ${libobj}T <<EOF -+# Name of the non-PIC object. -+non_pic_object='$objname' -+ -+EOF -+ else -+ # Append the name of the non-PIC object the libtool object file. -+ # Only append if the libtool object file exists. -+ test -z "$run" && cat >> ${libobj}T <<EOF -+# Name of the non-PIC object. -+non_pic_object=none -+ -+EOF - fi - -- $opt_dry_run || { -- func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" -+ $run $mv "${libobj}T" "${libobj}" - -- # Unlock the critical section if it was locked -- if test "$need_locks" != no; then -- removelist=$lockfile -- $RM "$lockfile" -- fi -- } -+ # Unlock the critical section if it was locked -+ if test "$need_locks" != no; then -+ $run $rm "$lockfile" -+ fi - - exit $EXIT_SUCCESS --} -+ ;; - --$opt_help || { --test "$mode" = compile && func_mode_compile ${1+"$@"} --} -+ # libtool link mode -+ link | relink) -+ modename="$modename: link" -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ # It is impossible to link a dll without this setting, and -+ # we shouldn't force the makefile maintainer to figure out -+ # which system we are compiling for in order to pass an extra -+ # flag for every libtool invocation. -+ # allow_undefined=no - --func_mode_help () --{ -- # We need to display help for each of the modes. -- case $mode in -- "") -- # Generic help is extracted from the usage comments -- # at the start of this file. -- func_help -- ;; -+ # FIXME: Unfortunately, there are problems with the above when trying -+ # to make a dll which has undefined symbols, in which case not -+ # even a static library is built. For now, we need to specify -+ # -no-undefined on the libtool link line when we can be certain -+ # that all symbols are satisfied, otherwise we get a static library. -+ allow_undefined=yes -+ ;; -+ *) -+ allow_undefined=yes -+ ;; -+ esac -+ libtool_args="$nonopt" -+ base_compile="$nonopt $@" -+ compile_command="$nonopt" -+ finalize_command="$nonopt" - -- clean) -- $ECHO \ --"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... -+ compile_rpath= -+ finalize_rpath= -+ compile_shlibpath= -+ finalize_shlibpath= -+ convenience= -+ old_convenience= -+ deplibs= -+ old_deplibs= -+ compiler_flags= -+ linker_flags= -+ dllsearchpath= -+ lib_search_path=`pwd` -+ inst_prefix_dir= - --Remove files from the build directory. -+ avoid_version=no -+ dlfiles= -+ dlprefiles= -+ dlself=no -+ export_dynamic=no -+ export_symbols= -+ export_symbols_regex= -+ generated= -+ libobjs= -+ ltlibs= -+ module=no -+ no_install=no -+ objs= -+ non_pic_objects= -+ notinst_path= # paths that contain not-installed libtool libraries -+ precious_files_regex= -+ prefer_static_libs=no -+ preload=no -+ prev= -+ prevarg= -+ release= -+ rpath= -+ xrpath= -+ perm_rpath= -+ temp_rpath= -+ thread_safe=no -+ vinfo= -+ vinfo_number=no -+ single_module="${wl}-single_module" - --RM is the name of the program to use to delete files associated with each FILE --(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed --to RM. -+ func_infer_tag $base_compile - --If FILE is a libtool library, object or program, all the files associated --with it are deleted. Otherwise, only FILE itself is deleted using RM." -- ;; -- -- compile) -- $ECHO \ --"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE -- --Compile a source file into a libtool library object. -- --This mode accepts the following additional options: -- -- -o OUTPUT-FILE set the output file name to OUTPUT-FILE -- -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -- -shared do not build a \`.o' file suitable for static linking -- -static only build a \`.o' file suitable for static linking -- --COMPILE-COMMAND is a command to be used in creating a \`standard' object file --from the given SOURCEFILE. -- --The output file name is determined by removing the directory component from --SOURCEFILE, then substituting the C source code suffix \`.c' with the --library object suffix, \`.lo'." -- ;; -- -- execute) -- $ECHO \ --"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... -- --Automatically set library path, then run a program. -- --This mode accepts the following additional options: -- -- -dlopen FILE add the directory containing FILE to the library path -- --This mode sets the library path environment variable according to \`-dlopen' --flags. -- --If any of the ARGS are libtool executable wrappers, then they are translated --into their corresponding uninstalled binary, and any of their required library --directories are added to the library path. -- --Then, COMMAND is executed, with ARGS as arguments." -- ;; -- -- finish) -- $ECHO \ --"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... -+ # We need to know -static, to get the right output filenames. -+ for arg -+ do -+ case $arg in -+ -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 -+ if test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ prefer_static_libs=yes -+ ;; -+ -static) -+ if test -z "$pic_flag" && test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ prefer_static_libs=built -+ ;; -+ -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 -+ ;; -+ esac -+ done - --Complete the installation of libtool libraries. -+ # See if our shared archives depend on static archives. -+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes - --Each LIBDIR is a directory that contains libtool libraries. -+ # Go through the arguments, transforming them on the way. -+ while test "$#" -gt 0; do -+ arg="$1" -+ shift -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test -+ ;; -+ *) qarg=$arg ;; -+ esac -+ libtool_args="$libtool_args $qarg" - --The commands that this mode executes may require superuser privileges. Use --the \`--dry-run' option if you just want to see what would be executed." -- ;; -+ # If the previous option needs an argument, assign it. -+ if test -n "$prev"; then -+ case $prev in -+ output) -+ compile_command="$compile_command @OUTPUT@" -+ finalize_command="$finalize_command @OUTPUT@" -+ ;; -+ esac - -- install) -- $ECHO \ --"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... -+ case $prev in -+ dlfiles|dlprefiles) -+ if test "$preload" = no; then -+ # Add the symbol object into the linking commands. -+ compile_command="$compile_command @SYMFILE@" -+ finalize_command="$finalize_command @SYMFILE@" -+ preload=yes -+ fi -+ case $arg in -+ *.la | *.lo) ;; # We handle these cases below. -+ force) -+ if test "$dlself" = no; then -+ dlself=needless -+ export_dynamic=yes -+ fi -+ prev= -+ continue -+ ;; -+ self) -+ if test "$prev" = dlprefiles; then -+ dlself=yes -+ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then -+ dlself=yes -+ else -+ dlself=needless -+ export_dynamic=yes -+ fi -+ prev= -+ continue -+ ;; -+ *) -+ if test "$prev" = dlfiles; then -+ dlfiles="$dlfiles $arg" -+ else -+ dlprefiles="$dlprefiles $arg" -+ fi -+ prev= -+ continue -+ ;; -+ esac -+ ;; -+ expsyms) -+ export_symbols="$arg" -+ if test ! -f "$arg"; then -+ $echo "$modename: symbol file \`$arg' does not exist" -+ exit $EXIT_FAILURE -+ fi -+ prev= -+ continue -+ ;; -+ expsyms_regex) -+ export_symbols_regex="$arg" -+ prev= -+ continue -+ ;; -+ inst_prefix) -+ inst_prefix_dir="$arg" -+ prev= -+ continue -+ ;; -+ precious_regex) -+ precious_files_regex="$arg" -+ prev= -+ continue -+ ;; -+ release) -+ release="-$arg" -+ prev= -+ continue -+ ;; -+ objectlist) -+ if test -f "$arg"; then -+ save_arg=$arg -+ moreargs= -+ for fil in `cat $save_arg` -+ do -+# moreargs="$moreargs $fil" -+ arg=$fil -+ # A libtool-controlled object. - --Install executables or libraries. -+ # Check to see that this really is a libtool object. -+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ pic_object= -+ non_pic_object= - --INSTALL-COMMAND is the installation command. The first component should be --either the \`install' or \`cp' program. -+ # Read the .lo file -+ # If there is no directory component, then add one. -+ case $arg in -+ */* | *\\*) . $arg ;; -+ *) . ./$arg ;; -+ esac - --The following components of INSTALL-COMMAND are treated specially: -+ if test -z "$pic_object" || \ -+ test -z "$non_pic_object" || -+ test "$pic_object" = none && \ -+ test "$non_pic_object" = none; then -+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi - --The rest of the components are interpreted as arguments to that command (only --BSD-compatible install options are recognized)." -- ;; -+ if test "$pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ pic_object="$xdir$pic_object" - -- link) -- $ECHO \ --"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... -+ if test "$prev" = dlfiles; then -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ dlfiles="$dlfiles $pic_object" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi - --Link object files or libraries together to form another library, or to --create an executable program. -+ # CHECK ME: I think I busted this. -Ossama -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ dlprefiles="$dlprefiles $pic_object" -+ prev= -+ fi - --LINK-COMMAND is a command using the C compiler that you would use to create --a program from several object files. -+ # A PIC object. -+ libobjs="$libobjs $pic_object" -+ arg="$pic_object" -+ fi - --The following components of LINK-COMMAND are treated specially: -+ # Non-PIC object. -+ if test "$non_pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ non_pic_object="$xdir$non_pic_object" - -- -all-static do not do any dynamic linking at all -- -avoid-version do not add a version suffix if possible -- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -- -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 -- -export-symbols-regex 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 -- -no-fast-install disable the fast-install mode -- -no-install link a not-installable executable -- -no-undefined declare that a library does not refer to external symbols -- -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -- -objectlist FILE Use a list of object files found in FILE to specify objects -- -precious-files-regex REGEX -- don't remove output files matching REGEX -- -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 -- -shared only do dynamic linking of libtool libraries -- -shrext SUFFIX override the standard shared library file extension -- -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] -- -weak LIBNAME declare that the target provides the LIBNAME interface -+ # A standard non-PIC object -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ if test -z "$pic_object" || test "$pic_object" = none ; then -+ arg="$non_pic_object" -+ fi -+ else -+ # If the PIC object exists, use it instead. -+ # $xdir was prepended to $pic_object above. -+ non_pic_object="$pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ fi -+ else -+ # Only an error if not doing a dry-run. -+ if test -z "$run"; then -+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 -+ exit $EXIT_FAILURE -+ else -+ # Dry-run case. - --All other options (arguments beginning with \`-') are ignored. -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi - --Every other argument is treated as a filename. Files ending in \`.la' are --treated as uninstalled libtool libraries, other files are standard or library --object files. -- --If the OUTPUT-FILE ends in \`.la', then a libtool library is created, --only library objects (\`.lo' files) may be specified, and \`-rpath' is --required, except when creating a convenience library. -- --If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created --using \`ar' and \`ranlib', or on Windows using \`lib'. -- --If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file --is created, otherwise an executable program is created." -- ;; -- -- uninstall) -- $ECHO \ --"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... -+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` -+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` -+ libobjs="$libobjs $pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ fi -+ fi -+ done -+ else -+ $echo "$modename: link input file \`$save_arg' does not exist" -+ exit $EXIT_FAILURE -+ fi -+ arg=$save_arg -+ prev= -+ continue -+ ;; -+ rpath | xrpath) -+ # We need an absolute path. -+ case $arg in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ $echo "$modename: only absolute run-paths are allowed" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac -+ if test "$prev" = rpath; then -+ case "$rpath " in -+ *" $arg "*) ;; -+ *) rpath="$rpath $arg" ;; -+ esac -+ else -+ case "$xrpath " in -+ *" $arg "*) ;; -+ *) xrpath="$xrpath $arg" ;; -+ esac -+ fi -+ prev= -+ continue -+ ;; -+ xcompiler) -+ compiler_flags="$compiler_flags $qarg" -+ prev= -+ compile_command="$compile_command $qarg" -+ finalize_command="$finalize_command $qarg" -+ continue -+ ;; -+ xlinker) -+ linker_flags="$linker_flags $qarg" -+ compiler_flags="$compiler_flags $wl$qarg" -+ prev= -+ compile_command="$compile_command $wl$qarg" -+ finalize_command="$finalize_command $wl$qarg" -+ continue -+ ;; -+ xcclinker) -+ linker_flags="$linker_flags $qarg" -+ compiler_flags="$compiler_flags $qarg" -+ prev= -+ compile_command="$compile_command $qarg" -+ finalize_command="$finalize_command $qarg" -+ continue -+ ;; -+ shrext) -+ shrext_cmds="$arg" -+ prev= -+ continue -+ ;; -+ darwin_framework|darwin_framework_skip) -+ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ prev= -+ continue -+ ;; -+ *) -+ eval "$prev=\"\$arg\"" -+ prev= -+ continue -+ ;; -+ esac -+ fi # test -n "$prev" - --Remove libraries from an installation directory. -+ prevarg="$arg" - --RM is the name of the program to use to delete files associated with each FILE --(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed --to RM. -+ case $arg in -+ -all-static) -+ if test -n "$link_static_flag"; then -+ compile_command="$compile_command $link_static_flag" -+ finalize_command="$finalize_command $link_static_flag" -+ fi -+ continue -+ ;; - --If FILE is a libtool library, all the files associated with it are deleted. --Otherwise, only FILE itself is deleted using RM." -- ;; -+ -allow-undefined) -+ # FIXME: remove this flag sometime in the future. -+ $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 -+ continue -+ ;; - -- *) -- func_fatal_help "invalid operation mode \`$mode'" -- ;; -- esac -+ -avoid-version) -+ avoid_version=yes -+ continue -+ ;; - -- $ECHO -- $ECHO "Try \`$progname --help' for more information about other modes." -+ -dlopen) -+ prev=dlfiles -+ continue -+ ;; - -- exit $? --} -+ -dlpreopen) -+ prev=dlprefiles -+ continue -+ ;; - -- # Now that we've collected a possible --mode arg, show help if necessary -- $opt_help && func_mode_help -+ -export-dynamic) -+ export_dynamic=yes -+ continue -+ ;; - -+ -export-symbols | -export-symbols-regex) -+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then -+ $echo "$modename: more than one -exported-symbols argument is not allowed" -+ exit $EXIT_FAILURE -+ fi -+ if test "X$arg" = "X-export-symbols"; then -+ prev=expsyms -+ else -+ prev=expsyms_regex -+ fi -+ continue -+ ;; - --# func_mode_execute arg... --func_mode_execute () --{ -- $opt_debug -- # The first argument is the command name. -- cmd="$nonopt" -- test -z "$cmd" && \ -- func_fatal_help "you must specify a COMMAND" -+ -framework|-arch|-isysroot) -+ case " $CC " in -+ *" ${arg} ${1} "* | *" ${arg} ${1} "*) -+ prev=darwin_framework_skip ;; -+ *) compiler_flags="$compiler_flags $arg" -+ prev=darwin_framework ;; -+ esac -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ continue -+ ;; - -- # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -- test -f "$file" \ -- || func_fatal_help "\`$file' is not a file" -+ -inst-prefix-dir) -+ prev=inst_prefix -+ continue -+ ;; - -- dir= -- case $file in -- *.la) -- # Check to see that this really is a libtool archive. -- func_lalib_unsafe_p "$file" \ -- || func_fatal_help "\`$lib' is not a valid libtool archive" -+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* -+ # so, if we see these flags be careful not to treat them like -L -+ -L[A-Z][A-Z]*:*) -+ case $with_gcc/$host in -+ no/*-*-irix* | /*-*-irix*) -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ ;; -+ esac -+ continue -+ ;; - -- # Read the libtool library. -- dlname= -- library_names= -- func_source "$file" -+ -L*) -+ dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ absdir=`cd "$dir" && pwd` -+ if test -z "$absdir"; then -+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 -+ absdir="$dir" -+ notinst_path="$notinst_path $dir" -+ fi -+ dir="$absdir" -+ ;; -+ esac -+ case "$deplibs " in -+ *" -L$dir "*) ;; -+ *) -+ deplibs="$deplibs -L$dir" -+ lib_search_path="$lib_search_path $dir" -+ ;; -+ esac -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` -+ case :$dllsearchpath: in -+ *":$dir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$dir";; -+ esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; -+ esac -+ ;; -+ esac -+ continue -+ ;; - -- # Skip this library if it cannot be dlopened. -- if test -z "$dlname"; then -- # Warn if it was a shared library. -- test -n "$library_names" && \ -- func_warning "\`$file' was not linked with \`-export-dynamic'" -- continue -+ -l*) -+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) -+ # These systems don't actually have a C or math library (as such) -+ continue -+ ;; -+ *-*-os2*) -+ # These systems don't actually have a C library (as such) -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc due to us having libc/libc_r. -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C and math libraries are in the System framework -+ deplibs="$deplibs -framework System" -+ continue -+ ;; -+ *-*-sco3.2v5* | *-*-sco5v6*) -+ # Causes problems with __ctype -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -+ # Compiler inserts libc in the correct place for threads to work -+ test "X$arg" = "X-lc" && continue -+ ;; -+ esac -+ elif test "X$arg" = "X-lc_r"; then -+ case $host in -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; -+ esac - fi -+ deplibs="$deplibs $arg" -+ continue -+ ;; - -- func_dirname "$file" "" "." -- dir="$func_dirname_result" -- -- if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -- else -- if test ! -f "$dir/$dlname"; then -- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -- fi -- fi -+ # Tru64 UNIX uses -model [arg] to determine the layout of C++ -+ # classes, name mangling, and exception handling. -+ -model) -+ compile_command="$compile_command $arg" -+ compiler_flags="$compiler_flags $arg" -+ finalize_command="$finalize_command $arg" -+ prev=xcompiler -+ continue - ;; - -- *.lo) -- # Just add the directory containing the .lo file. -- func_dirname "$file" "" "." -- dir="$func_dirname_result" -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ compiler_flags="$compiler_flags $arg" -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ continue - ;; - -- *) -- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" -+ -multi_module) -+ single_module="${wl}-multi_module" - continue - ;; -- esac - -- # Get the absolute pathname. -- absdir=`cd "$dir" && pwd` -- test -n "$absdir" && dir="$absdir" -+ -module) -+ module=yes -+ continue -+ ;; - -- # Now add the directory to shlibpath_var. -- if eval "test -z \"\$$shlibpath_var\""; then -- eval "$shlibpath_var=\"\$dir\"" -- else -- eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" -- fi -- done -+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -+ # -r[0-9][0-9]* specifies the processor on the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -+ # +DA*, +DD* enable 64-bit mode on the HP compiler -+ # -q* pass through compiler args for the IBM compiler -+ # -m* pass through architecture-specific compiler args for GCC -+ # -m*, -t[45]*, -txscale* pass through architecture-specific -+ # compiler args 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*| \ -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) - -- # This variable tells wrapper scripts just to set shlibpath_var -- # rather than running their programs. -- libtool_execute_magic="$magic" -+ # Unknown arguments in both finalize_command and compile_command need -+ # to be aesthetically quoted because they are evaled later. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ compiler_flags="$compiler_flags $arg" -+ continue -+ ;; - -- # Check if any of the arguments is a wrapper script. -- args= -- for file -- do -- case $file in -- -*) ;; -- *) -- # Do a test to see if this is really a libtool program. -- if func_ltwrapper_script_p "$file"; then -- func_source "$file" -- # Transform arg to wrapped name. -- file="$progdir/$program" -- elif func_ltwrapper_executable_p "$file"; then -- func_ltwrapper_scriptname "$file" -- func_source "$func_ltwrapper_scriptname_result" -- # Transform arg to wrapped name. -- file="$progdir/$program" -- fi -+ -shrext) -+ prev=shrext -+ continue - ;; -- esac -- # Quote arguments (to preserve shell metacharacters). -- func_quote_for_eval "$file" -- args="$args $func_quote_for_eval_result" -- done -- -- if test "X$opt_dry_run" = Xfalse; then -- if test -n "$shlibpath_var"; then -- # Export the shlibpath_var. -- eval "export $shlibpath_var" -- fi -- -- # Restore saved environment variables -- for lt_var in LANG LANGUAGE 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 -- else -- $lt_unset $lt_var -- fi" -- done -- -- # Now prepare to actually exec the command. -- exec_cmd="\$cmd$args" -- else -- # Display what would be done. -- if test -n "$shlibpath_var"; then -- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" -- $ECHO "export $shlibpath_var" -- fi -- $ECHO "$cmd$args" -- exit $EXIT_SUCCESS -- fi --} -- --test "$mode" = execute && func_mode_execute ${1+"$@"} -- -- --# func_mode_finish arg... --func_mode_finish () --{ -- $opt_debug -- libdirs="$nonopt" -- admincmds= -- -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -- -- for libdir in $libdirs; do -- if test -n "$finish_cmds"; then -- # Do each command in the finish commands. -- func_execute_cmds "$finish_cmds" 'admincmds="$admincmds --'"$cmd"'"' -- fi -- if test -n "$finish_eval"; then -- # Do the single finish_eval. -- eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || admincmds="$admincmds -- $cmds" -- fi -- done -- fi - -- # Exit here if they wanted silent mode. -- $opt_silent && exit $EXIT_SUCCESS -+ -no-fast-install) -+ fast_install=no -+ continue -+ ;; - -- $ECHO "X----------------------------------------------------------------------" | $Xsed -- $ECHO "Libraries have been installed in:" -- for libdir in $libdirs; do -- $ECHO " $libdir" -- done -- $ECHO -- $ECHO "If you ever happen to want to link against installed libraries" -- $ECHO "in a given directory, LIBDIR, you must either use libtool, and" -- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" -- $ECHO "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" -- $ECHO " during execution" -- fi -- if test -n "$runpath_var"; then -- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" -- $ECHO " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -+ -no-install) -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) -+ # The PATH hackery in wrapper scripts is required on Windows -+ # 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 -+ ;; -+ *) no_install=yes ;; -+ esac -+ continue -+ ;; - -- $ECHO " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $ECHO " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- $ECHO -+ -no-undefined) -+ allow_undefined=no -+ continue -+ ;; - -- $ECHO "See any operating system documentation about shared libraries for" -- case $host in -- solaris2.[6789]|solaris2.1[0-9]) -- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- $ECHO "pages." -+ -objectlist) -+ prev=objectlist -+ continue - ;; -- *) -- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." -- ;; -- esac -- $ECHO "X----------------------------------------------------------------------" | $Xsed -- exit $EXIT_SUCCESS --} - --test "$mode" = finish && func_mode_finish ${1+"$@"} -+ -o) prev=output ;; - -+ -precious-files-regex) -+ prev=precious_regex -+ continue -+ ;; - --# func_mode_install arg... --func_mode_install () --{ -- $opt_debug -- # There may be an optional sh(1) argument at the beginning of -- # install_prog (especially on Windows NT). -- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || -- # Allow the use of GNU shtool's install command. -- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then -- # Aesthetically quote it. -- func_quote_for_eval "$nonopt" -- install_prog="$func_quote_for_eval_result " -- arg=$1 -- shift -- else -- install_prog= -- arg=$nonopt -- fi -+ -release) -+ prev=release -+ continue -+ ;; - -- # The real first argument should be the name of the installation program. -- # Aesthetically quote it. -- func_quote_for_eval "$arg" -- install_prog="$install_prog$func_quote_for_eval_result" -+ -rpath) -+ prev=rpath -+ continue -+ ;; - -- # We need to accept at least all the BSD install flags. -- dest= -- files= -- opts= -- prev= -- install_type= -- isdir=no -- stripme= -- for arg -- do -- if test -n "$dest"; then -- files="$files $dest" -- dest=$arg -+ -R) -+ prev=xrpath - continue -- fi -+ ;; - -- case $arg in -- -d) isdir=yes ;; -- -f) -- case " $install_prog " in -- *[\\\ /]cp\ *) ;; -- *) prev=$arg ;; -+ -R*) -+ dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ $echo "$modename: only absolute run-paths are allowed" 1>&2 -+ exit $EXIT_FAILURE -+ ;; - esac -+ case "$xrpath " in -+ *" $dir "*) ;; -+ *) xrpath="$xrpath $dir" ;; -+ esac -+ continue - ;; -- -g | -m | -o) -- prev=$arg -+ -+ -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 -+ # would be equivalent was wrong. It would break on at least -+ # Digital Unix and AIX. -+ continue - ;; -- -s) -- stripme=" -s" -+ -+ -thread-safe) -+ thread_safe=yes - continue - ;; -- -*) -+ -+ -version-info) -+ prev=vinfo -+ continue - ;; -- *) -- # If the previous option needed an argument, then skip it. -- if test -n "$prev"; then -- prev= -- else -- dest=$arg -- continue -- fi -+ -version-number) -+ prev=vinfo -+ vinfo_number=yes -+ continue - ;; -- esac - -- # Aesthetically quote the argument. -- func_quote_for_eval "$arg" -- install_prog="$install_prog $func_quote_for_eval_result" -- done -+ -Wc,*) -+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` -+ arg= -+ save_ifs="$IFS"; IFS=',' -+ for flag in $args; do -+ IFS="$save_ifs" -+ case $flag in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ flag="\"$flag\"" -+ ;; -+ esac -+ arg="$arg $wl$flag" -+ compiler_flags="$compiler_flags $flag" -+ done -+ IFS="$save_ifs" -+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"` -+ ;; - -- test -z "$install_prog" && \ -- func_fatal_help "you must specify an install program" -+ -Wl,*) -+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` -+ arg= -+ save_ifs="$IFS"; IFS=',' -+ for flag in $args; do -+ IFS="$save_ifs" -+ case $flag in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ flag="\"$flag\"" -+ ;; -+ esac -+ arg="$arg $wl$flag" -+ compiler_flags="$compiler_flags $wl$flag" -+ linker_flags="$linker_flags $flag" -+ done -+ IFS="$save_ifs" -+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"` -+ ;; - -- test -n "$prev" && \ -- func_fatal_help "the \`$prev' option requires an argument" -+ -Xcompiler) -+ prev=xcompiler -+ continue -+ ;; - -- if test -z "$files"; then -- if test -z "$dest"; then -- func_fatal_help "no file or destination specified" -- else -- func_fatal_help "you must specify a destination" -- fi -- fi -+ -Xlinker) -+ prev=xlinker -+ continue -+ ;; - -- # Strip any trailing slash from the destination. -- func_stripname '' '/' "$dest" -- dest=$func_stripname_result -- -- # Check to see that the destination is a directory. -- test -d "$dest" && isdir=yes -- if test "$isdir" = yes; then -- destdir="$dest" -- destname= -- else -- func_dirname_and_basename "$dest" "" "." -- destdir="$func_dirname_result" -- destname="$func_basename_result" -+ -XCClinker) -+ prev=xcclinker -+ continue -+ ;; - -- # Not a directory, so check to see that there is only one file specified. -- set dummy $files; shift -- test "$#" -gt 1 && \ -- func_fatal_help "\`$dest' is not a directory" -- fi -- case $destdir in -- [\\/]* | [A-Za-z]:[\\/]*) ;; -- *) -- for file in $files; do -- case $file in -- *.lo) ;; -- *) -- func_fatal_help "\`$destdir' must be an absolute directory name" -+ # Some other compiler flag. -+ -* | +*) -+ # Unknown arguments in both finalize_command and compile_command need -+ # to be aesthetically quoted because they are evaled later. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" - ;; - esac -- done -- ;; -- esac -- -- # This variable tells wrapper scripts just to set variables rather -- # than running their programs. -- libtool_install_magic="$magic" -- -- staticlibs= -- future_libdirs= -- current_libdirs= -- for file in $files; do -+ ;; - -- # Do each installation. -- case $file in -- *.$libext) -- # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ *.$objext) -+ # A standard object. -+ objs="$objs $arg" - ;; - -- *.la) -- # Check to see that this really is a libtool archive. -- func_lalib_unsafe_p "$file" \ -- || func_fatal_help "\`$file' is not a valid libtool archive" -+ *.lo) -+ # A libtool-controlled object. - -- library_names= -- old_library= -- relink_command= -- func_source "$file" -+ # Check to see that this really is a libtool object. -+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ pic_object= -+ non_pic_object= - -- # Add the libdir to current_libdirs if it is the destination. -- if test "X$destdir" = "X$libdir"; then -- case "$current_libdirs " in -- *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -- esac -- else -- # Note the libdir as a future libdir. -- case "$future_libdirs " in -- *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ # Read the .lo file -+ # If there is no directory component, then add one. -+ case $arg in -+ */* | *\\*) . $arg ;; -+ *) . ./$arg ;; - esac -- fi -- -- func_dirname "$file" "/" "" -- dir="$func_dirname_result" -- dir="$dir$objdir" -- -- if test -n "$relink_command"; then -- # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` - -- # Don't allow the user to place us outside of our expected -- # location b/c this prevents finding dependent libraries that -- # are installed to the same prefix. -- # At present, this check doesn't affect windows .dll's that -- # are installed into $libdir/../bin (currently, that works fine) -- # but it's something to keep an eye on. -- test "$inst_prefix_dir" = "$destdir" && \ -- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" -+ if test -z "$pic_object" || \ -+ test -z "$non_pic_object" || -+ test "$pic_object" = none && \ -+ test "$non_pic_object" = none; then -+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- if test -n "$inst_prefix_dir"; then -- # Stick the inst_prefix_dir data into the link command. -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` -- else -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" - fi - -- func_warning "relinking \`$file'" -- func_show_eval "$relink_command" \ -- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' -- fi -+ if test "$pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ pic_object="$xdir$pic_object" - -- # See the names of the shared library. -- set dummy $library_names; shift -- if test -n "$1"; then -- realname="$1" -- shift -+ if test "$prev" = dlfiles; then -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ dlfiles="$dlfiles $pic_object" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi - -- srcname="$realname" -- test -n "$relink_command" && srcname="$realname"T -+ # CHECK ME: I think I busted this. -Ossama -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ dlprefiles="$dlprefiles $pic_object" -+ prev= -+ fi - -- # Install the shared library and build the symlinks. -- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ -- 'exit $?' -- tstripme="$stripme" -- case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -- case $realname in -- *.dll.a) -- tstripme="" -- ;; -- esac -- ;; -- esac -- if test -n "$tstripme" && test -n "$striplib"; then -- func_show_eval "$striplib $destdir/$realname" 'exit $?' -+ # A PIC object. -+ libobjs="$libobjs $pic_object" -+ arg="$pic_object" - fi - -- if test "$#" -gt 0; then -- # Delete the old symlinks, and create new ones. -- # Try `ln -sf' first, because the `ln' binary might depend on -- # the symlink we replace! Solaris /bin/ln does not understand -f, -- # so we also need to try rm && ln -s. -- for linkname -- do -- test "$linkname" != "$realname" \ -- && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" -- done -+ # Non-PIC object. -+ if test "$non_pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ non_pic_object="$xdir$non_pic_object" -+ -+ # A standard non-PIC object -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ if test -z "$pic_object" || test "$pic_object" = none ; then -+ arg="$non_pic_object" -+ fi -+ else -+ # If the PIC object exists, use it instead. -+ # $xdir was prepended to $pic_object above. -+ non_pic_object="$pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" - fi -+ else -+ # Only an error if not doing a dry-run. -+ if test -z "$run"; then -+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 -+ exit $EXIT_FAILURE -+ else -+ # Dry-run case. - -- # Do each command in the postinstall commands. -- lib="$destdir/$realname" -- func_execute_cmds "$postinstall_cmds" 'exit $?' -- fi -+ # Extract subdirectory from the argument. -+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$xdir" = "X$arg"; then -+ xdir= -+ else -+ xdir="$xdir/" -+ fi - -- # Install the pseudo-library for information purposes. -- func_basename "$file" -- name="$func_basename_result" -- instname="$dir/$name"i -- func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' -+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` -+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` -+ libobjs="$libobjs $pic_object" -+ non_pic_objects="$non_pic_objects $non_pic_object" -+ fi -+ fi -+ ;; - -- # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ *.$libext) -+ # An archive. -+ deplibs="$deplibs $arg" -+ old_deplibs="$old_deplibs $arg" -+ continue - ;; - -- *.lo) -- # Install (i.e. copy) a libtool object. -+ *.la) -+ # A libtool-controlled library. - -- # Figure out destination file name, if it wasn't already specified. -- if test -n "$destname"; then -- destfile="$destdir/$destname" -+ if test "$prev" = dlfiles; then -+ # This library was specified with -dlopen. -+ dlfiles="$dlfiles $arg" -+ prev= -+ elif test "$prev" = dlprefiles; then -+ # The library was specified with -dlpreopen. -+ dlprefiles="$dlprefiles $arg" -+ prev= - else -- func_basename "$file" -- destfile="$func_basename_result" -- destfile="$destdir/$destfile" -+ deplibs="$deplibs $arg" - fi -+ continue -+ ;; - -- # Deduce the name of the destination old-style object file. -- case $destfile in -- *.lo) -- func_lo2o "$destfile" -- staticdest=$func_lo2o_result -- ;; -- *.$objext) -- staticdest="$destfile" -- destfile= -- ;; -- *) -- func_fatal_help "cannot copy a libtool object to \`$destfile'" -+ # Some other compiler argument. -+ *) -+ # Unknown arguments in both finalize_command and compile_command need -+ # to be aesthetically quoted because they are evaled later. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" - ;; - esac -- -- # Install the libtool object if requested. -- test -n "$destfile" && \ -- func_show_eval "$install_prog $file $destfile" 'exit $?' -- -- # Install the old object if enabled. -- if test "$build_old_libs" = yes; then -- # Deduce the name of the old-style object file. -- func_lo2o "$file" -- staticobj=$func_lo2o_result -- func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' -- fi -- exit $EXIT_SUCCESS - ;; -+ esac # arg - -- *) -- # Figure out destination file name, if it wasn't already specified. -- if test -n "$destname"; then -- destfile="$destdir/$destname" -- else -- func_basename "$file" -- destfile="$func_basename_result" -- destfile="$destdir/$destfile" -- fi -+ # Now actually substitute the argument into the commands. -+ if test -n "$arg"; then -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ fi -+ done # argument parsing loop - -- # If the file is missing, and there is a .exe on the end, strip it -- # because it is most likely a libtool script we actually want to -- # install -- stripped_ext="" -- case $file in -- *.exe) -- if test ! -f "$file"; then -- func_stripname '' '.exe' "$file" -- file=$func_stripname_result -- stripped_ext=".exe" -- fi -- ;; -- esac -+ if test -n "$prev"; then -+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- # Do a test to see if this is really a libtool program. -- case $host in -- *cygwin* | *mingw*) -- if func_ltwrapper_executable_p "$file"; then -- func_ltwrapper_scriptname "$file" -- wrapper=$func_ltwrapper_scriptname_result -- else -- func_stripname '' '.exe' "$file" -- wrapper=$func_stripname_result -- fi -- ;; -- *) -- wrapper=$file -- ;; -- esac -- if func_ltwrapper_script_p "$wrapper"; then -- notinst_deplibs= -- relink_command= -+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -+ eval arg=\"$export_dynamic_flag_spec\" -+ compile_command="$compile_command $arg" -+ finalize_command="$finalize_command $arg" -+ fi - -- func_source "$wrapper" -+ oldlibs= -+ # calculate the name of the file, without its directory -+ outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` -+ libobjs_save="$libobjs" - -- # Check the variables that should have been set. -- test -z "$generated_by_libtool_version" && \ -- func_fatal_error "invalid libtool wrapper script \`$wrapper'" -+ if test -n "$shlibpath_var"; then -+ # get the directories listed in $shlibpath_var -+ eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` -+ else -+ shlib_search_path= -+ fi -+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - -- finalize=yes -- for lib in $notinst_deplibs; do -- # Check to see that each library is installed. -- libdir= -- if test -f "$lib"; then -- func_source "$lib" -- fi -- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test -- if test -n "$libdir" && test ! -f "$libfile"; then -- func_warning "\`$lib' has not been installed in \`$libdir'" -- finalize=no -- fi -- done -- -- relink_command= -- func_source "$wrapper" -- -- outputname= -- if test "$fast_install" = no && test -n "$relink_command"; then -- $opt_dry_run || { -- if test "$finalize" = yes; then -- tmpdir=`func_mktempdir` -- func_basename "$file$stripped_ext" -- file="$func_basename_result" -- outputname="$tmpdir/$file" -- # Replace the output file specification. -- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -- -- $opt_silent || { -- func_quote_for_expand "$relink_command" -- eval "func_echo $func_quote_for_expand_result" -- } -- if eval "$relink_command"; then : -- else -- func_error "error: relink \`$file' with the above command before installing it" -- $opt_dry_run || ${RM}r "$tmpdir" -- continue -- fi -- file="$outputname" -- else -- func_warning "cannot relink \`$file'" -- fi -- } -- else -- # Install the binary that we compiled earlier. -- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` -- fi -- fi -- -- # remove .exe since cygwin /usr/bin/install will append another -- # one anyway -- case $install_prog,$host in -- */usr/bin/install*,*cygwin*) -- case $file:$destfile in -- *.exe:*.exe) -- # this is ok -- ;; -- *.exe:*) -- destfile=$destfile.exe -- ;; -- *:*.exe) -- func_stripname '' '.exe' "$destfile" -- destfile=$func_stripname_result -- ;; -- esac -- ;; -- esac -- func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' -- $opt_dry_run || if test -n "$outputname"; then -- ${RM}r "$tmpdir" -- fi -- ;; -- esac -- done -- -- for file in $staticlibs; do -- func_basename "$file" -- name="$func_basename_result" -- -- # Set up the ranlib parameters. -- oldlib="$destdir/$name" -- -- func_show_eval "$install_prog \$file \$oldlib" 'exit $?' -- -- if test -n "$stripme" && test -n "$old_striplib"; then -- func_show_eval "$old_striplib $oldlib" 'exit $?' -- fi -- -- # Do each command in the postinstall commands. -- func_execute_cmds "$old_postinstall_cmds" 'exit $?' -- done -- -- test -n "$future_libdirs" && \ -- func_warning "remember to run \`$progname --finish$future_libdirs'" -- -- if test -n "$current_libdirs"; then -- # Maybe just do a dry run. -- $opt_dry_run && current_libdirs=" -n$current_libdirs" -- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -+ output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$output_objdir" = "X$output"; then -+ output_objdir="$objdir" - else -- exit $EXIT_SUCCESS -+ output_objdir="$output_objdir/$objdir" - fi --} -- --test "$mode" = install && func_mode_install ${1+"$@"} -- -- --# func_generate_dlsyms outputname originator pic_p --# Extract symbols from dlprefiles and create ${outputname}S.o with --# a dlpreopen symbol table. --func_generate_dlsyms () --{ -- $opt_debug -- my_outputname="$1" -- my_originator="$2" -- my_pic_p="${3-no}" -- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` -- my_dlsyms= -- -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- if test -n "$NM" && test -n "$global_symbol_pipe"; then -- my_dlsyms="${my_outputname}S.c" -- else -- func_error "not configured to extract global symbols from dlpreopened files" -+ # Create the object directory. -+ if test ! -d "$output_objdir"; then -+ $show "$mkdir $output_objdir" -+ $run $mkdir $output_objdir -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then -+ exit $exit_status - fi - fi - -- if test -n "$my_dlsyms"; then -- case $my_dlsyms in -- "") ;; -- *.c) -- # Discover the nlist of each of the dlfiles. -- nlist="$output_objdir/${my_outputname}.nm" -- -- func_show_eval "$RM $nlist ${nlist}S ${nlist}T" -- -- # Parse the name list into a source file. -- func_verbose "creating $output_objdir/$my_dlsyms" -- -- $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ --/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ --/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ -- --#ifdef __cplusplus --extern \"C\" { --#endif -- --/* External symbol declarations for the compiler. */\ --" -- -- if test "$dlself" = yes; then -- func_verbose "generating symbol list for \`$output'" -- -- $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" -- -- # Add our own program objects to the symbol list. -- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- for progfile in $progfiles; do -- func_verbose "extracting global C symbols from \`$progfile'" -- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -- done -- -- if test -n "$exclude_expsyms"; then -- $opt_dry_run || { -- eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -- eval '$MV "$nlist"T "$nlist"' -- } -- fi -- -- if test -n "$export_symbols_regex"; then -- $opt_dry_run || { -- eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -- eval '$MV "$nlist"T "$nlist"' -- } -- fi -- -- # Prepare the list of exported symbols -- if test -z "$export_symbols"; then -- export_symbols="$output_objdir/$outputname.exp" -- $opt_dry_run || { -- $RM $export_symbols -- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -- eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' -- ;; -- esac -- } -- else -- $opt_dry_run || { -- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -- eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -- eval '$MV "$nlist"T "$nlist"' -- case $host in -- *cygwin | *mingw* | *cegcc* ) -- eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -- eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' -- ;; -- esac -- } -- fi -- fi -- -- for dlprefile in $dlprefiles; do -- func_verbose "extracting global C symbols from \`$dlprefile'" -- func_basename "$dlprefile" -- name="$func_basename_result" -- $opt_dry_run || { -- eval '$ECHO ": $name " >> "$nlist"' -- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -- done -- -- $opt_dry_run || { -- # Make sure we have at least an empty file. -- test -f "$nlist" || : > "$nlist" -- -- if test -n "$exclude_expsyms"; then -- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -- $MV "$nlist"T "$nlist" -- fi -- -- # Try sorting and uniquifying the output. -- if $GREP -v "^: " < "$nlist" | -- if sort -k 3 </dev/null >/dev/null 2>&1; then -- sort -k 3 -- else -- sort +2 -- fi | -- uniq > "$nlist"S; then -- : -- else -- $GREP -v "^: " < "$nlist" > "$nlist"S -- fi -- -- if test -f "$nlist"S; then -- eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' -- else -- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" -- fi -+ # Determine the type of output -+ case $output in -+ "") -+ $echo "$modename: you must specify an output file" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ *.$libext) linkmode=oldlib ;; -+ *.lo | *.$objext) linkmode=obj ;; -+ *.la) linkmode=lib ;; -+ *) linkmode=prog ;; # Anything else should be a program. -+ esac - -- $ECHO >> "$output_objdir/$my_dlsyms" "\ -+ case $host in -+ *cygwin* | *mingw* | *pw32*) -+ # don't eliminate duplications in $postdeps and $predeps -+ duplicate_compiler_generated_deps=yes -+ ;; -+ *) -+ duplicate_compiler_generated_deps=$duplicate_deps -+ ;; -+ esac -+ specialdeplibs= - --/* The mapping between symbol names and symbols. */ --typedef struct { -- const char *name; -- void *address; --} lt_dlsymlist; --" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- $ECHO >> "$output_objdir/$my_dlsyms" "\ --/* DATA imports from DLLs on WIN32 con't be const, because -- runtime relocations are performed -- see ld's documentation -- on pseudo-relocs. */" -- lt_dlsym_const= ;; -- *osf5*) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* This system does not cope well with relocations in const data */" -- lt_dlsym_const= ;; -- *) -- lt_dlsym_const=const ;; -- esac -+ libs= -+ # Find all interdependent deplibs by searching for libraries -+ # that are linked more than once (e.g. -la -lb -la) -+ for deplib in $deplibs; do -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ libs="$libs $deplib" -+ done - -- $ECHO >> "$output_objdir/$my_dlsyms" "\ --extern $lt_dlsym_const lt_dlsymlist --lt_${my_prefix}_LTX_preloaded_symbols[]; --$lt_dlsym_const lt_dlsymlist --lt_${my_prefix}_LTX_preloaded_symbols[] = --{\ -- { \"$my_originator\", (void *) 0 }," -+ if test "$linkmode" = lib; then -+ libs="$predeps $libs $compiler_lib_search_path $postdeps" - -- case $need_lib_prefix in -- no) -- eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" -- ;; -- *) -- eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" -- ;; -+ # Compute libraries that are listed more than once in $predeps -+ # $postdeps and mark them as special (i.e., whose duplicates are -+ # not to be eliminated). -+ pre_post_deps= -+ if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then -+ for pre_post_dep in $predeps $postdeps; do -+ case "$pre_post_deps " in -+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac -- $ECHO >> "$output_objdir/$my_dlsyms" "\ -- {0, (void *) 0} --}; -- --/* This works around a problem in FreeBSD linker */ --#ifdef FREEBSD_WORKAROUND --static const void *lt_preloaded_setup() { -- return lt_${my_prefix}_LTX_preloaded_symbols; --} --#endif -- --#ifdef __cplusplus --} --#endif\ --" -- } # !$opt_dry_run -+ pre_post_deps="$pre_post_deps $pre_post_dep" -+ done -+ fi -+ pre_post_deps= -+ fi - -- pic_flag_for_symtable= -- case "$compile_command " in -- *" -static "*) ;; -- *) -- case $host in -- # compiling the symbol table file with pic_flag works around -- # a FreeBSD bug that causes programs to crash when -lm is -- # linked before any other PIC object. But we must not use -- # pic_flag when linking with -static. The problem exists in -- # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -- pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; -- *-*-hpux*) -- pic_flag_for_symtable=" $pic_flag" ;; -+ deplibs= -+ newdependency_libs= -+ newlib_search_path= -+ need_relink=no # whether we're linking any uninstalled libtool libraries -+ notinst_deplibs= # not-installed libtool libraries -+ case $linkmode in -+ lib) -+ passes="conv link" -+ for file in $dlfiles $dlprefiles; do -+ case $file in -+ *.la) ;; - *) -- if test "X$my_pic_p" != Xno; then -- pic_flag_for_symtable=" $pic_flag" -- fi -+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 -+ exit $EXIT_FAILURE - ;; - esac -+ done -+ ;; -+ prog) -+ compile_deplibs= -+ finalize_deplibs= -+ alldeplibs=no -+ newdlfiles= -+ newdlprefiles= -+ passes="conv scan dlopen dlpreopen link" -+ ;; -+ *) passes="conv" -+ ;; -+ esac -+ for pass in $passes; do -+ if test "$linkmode,$pass" = "lib,link" || -+ test "$linkmode,$pass" = "prog,scan"; then -+ libs="$deplibs" -+ deplibs= -+ fi -+ if test "$linkmode" = prog; then -+ case $pass in -+ dlopen) libs="$dlfiles" ;; -+ dlpreopen) libs="$dlprefiles" ;; -+ link) -+ libs="$deplibs %DEPLIBS%" -+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac -- symtab_cflags= -- for arg in $LTCFLAGS; do -- case $arg in -- -pie | -fpie | -fPIE) ;; -- *) symtab_cflags="$symtab_cflags $arg" ;; -- esac -- done -- -- # Now compile the dynamic symbol file. -- func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' -- -- # Clean up the generated files. -- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' -- -- # Transform the symbol file into the correct name. -- symfileobj="$output_objdir/${my_outputname}S.$objext" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- if test -f "$output_objdir/$my_outputname.def"; then -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ fi -+ if test "$pass" = dlopen; then -+ # Collect dlpreopened libraries -+ save_deplibs="$deplibs" -+ deplibs= -+ fi -+ for deplib in $libs; do -+ lib= -+ found=no -+ case $deplib in -+ -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" - else -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ compiler_flags="$compiler_flags $deplib" - fi -+ continue - ;; -- *) -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -- ;; -- esac -- ;; -- *) -- func_fatal_error "unknown suffix for \`$my_dlsyms'" -- ;; -- esac -- else -- # We keep going just in case the user didn't refer to -- # lt_preloaded_symbols. The linker will fail if global_symbol_pipe -- # 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@%%"` -- fi --} -- -# func_win32_libid arg -# return the library type of file 'arg' -# @@ -110189,8 +71534,14 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -func_win32_libid () --{ -- $opt_debug ++# func_quote_for_eval arg ++# Aesthetically quote ARG to be evaled later. ++# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT ++# is double-quoted, suitable for a subsequent eval, whereas ++# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters ++# which are still active within double quotes backslashified. ++func_quote_for_eval () + { - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in @@ -110198,17 +71549,16 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then -- win32_nmres=`eval $NM -f posix -A $1 | -- $SED -n -e ' -- 1,100{ +- 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 -- } -- }'` +- s,.*,import, +- p +- q +- } +- }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; @@ -110223,246 +71573,194 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; -- esac ++ case $1 in ++ *[\\\`\"\$]*) ++ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; ++ *) ++ func_quote_for_eval_unquoted_result="$1" ;; ++ esac ++ ++ case $func_quote_for_eval_unquoted_result in ++ # Double-quote args containing shell metacharacters to delay ++ # word splitting, command substitution and and variable ++ # expansion for a subsequent eval. ++ # Many Bourne shells cannot handle close brackets correctly ++ # in scan sets, so we specify it separately. ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" ++ ;; ++ *) ++ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" + esac - ;; - esac -- $ECHO "$win32_libid_type" --} -- -+ -l*) -+ if test "$linkmode" != lib && test "$linkmode" != prog; then -+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 -+ continue -+ fi -+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` -+ if test "$linkmode" = lib; then -+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" -+ else -+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" -+ fi -+ for searchdir in $searchdirs; do -+ for search_ext in .la $std_shrext .so .a; do -+ # Search the libtool library -+ lib="$searchdir/lib${name}${search_ext}" -+ if test -f "$lib"; then -+ if test "$search_ext" = ".la"; then -+ found=yes -+ else -+ found=no -+ fi -+ break 2 -+ fi -+ done -+ done -+ if test "$found" != yes; then -+ # deplib doesn't seem to be a libtool library -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ fi -+ continue -+ else # deplib is a libtool library -+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, -+ # We need to do some special things here, and not later. -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $deplib "*) -+ if (${SED} -e '2q' $lib | -+ grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ library_names= -+ old_library= -+ case $lib in -+ */* | *\\*) . $lib ;; -+ *) . ./$lib ;; -+ esac -+ for l in $old_library $library_names; do -+ ll="$l" -+ done -+ if test "X$ll" = "X$old_library" ; then # only static version available -+ found=no -+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$ladir" = "X$lib" && ladir="." -+ lib=$ladir/$old_library -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ fi -+ continue -+ fi -+ fi -+ ;; -+ *) ;; -+ esac -+ fi -+ fi -+ ;; # -l -+ -L*) -+ case $linkmode in -+ lib) -+ deplibs="$deplib $deplibs" -+ test "$pass" = conv && continue -+ newdependency_libs="$deplib $newdependency_libs" -+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` -+ ;; -+ prog) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ if test "$pass" = scan; then -+ deplibs="$deplib $deplibs" -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` -+ ;; -+ *) -+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 -+ ;; -+ esac # linkmode -+ continue -+ ;; # -L -+ -R*) -+ if test "$pass" = link; then -+ dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` -+ # Make sure the xrpath contains only unique directories. -+ case "$xrpath " in -+ *" $dir "*) ;; -+ *) xrpath="$xrpath $dir" ;; -+ esac -+ fi -+ deplibs="$deplib $deplibs" -+ continue -+ ;; -+ *.la) lib="$deplib" ;; -+ *.$libext) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ case $linkmode in -+ lib) -+ valid_a_lib=no -+ case $deplibs_check_method in -+ match_pattern*) -+ set dummy $deplibs_check_method -+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -+ if eval $echo \"$deplib\" 2>/dev/null \ -+ | $SED 10q \ -+ | $EGREP "$match_pattern_regex" > /dev/null; then -+ valid_a_lib=yes -+ fi -+ ;; -+ pass_all) -+ valid_a_lib=yes -+ ;; -+ esac -+ if test "$valid_a_lib" != yes; then -+ $echo -+ $echo "*** Warning: Trying to link with static lib archive $deplib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because the file extensions .$libext of this argument makes me believe" -+ $echo "*** that it is just a static archive that I should not used here." -+ else -+ $echo -+ $echo "*** Warning: Linking the shared library $output against the" -+ $echo "*** static library $deplib is not portable!" -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; -+ prog) -+ if test "$pass" != link; then -+ deplibs="$deplib $deplibs" -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ continue -+ ;; -+ esac # linkmode -+ ;; # *.$libext -+ *.lo | *.$objext) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ elif test "$linkmode" = prog; then -+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ # If there is no dlopen support or we're linking statically, -+ # we need to preload. -+ newdlprefiles="$newdlprefiles $deplib" -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ newdlfiles="$newdlfiles $deplib" -+ fi -+ fi -+ continue -+ ;; -+ %DEPLIBS%) -+ alldeplibs=yes -+ continue -+ ;; -+ esac # case $deplib -+ if test "$found" = yes || test -f "$lib"; then : -+ else -+ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 -+ exit $EXIT_FAILURE -+ fi +- $echo $win32_libid_type + } + + +-# func_infer_tag arg +-# Infer tagged configuration to use if any are available and +-# if one wasn't chosen via the "--tag" command line option. +-# Only attempt this if the compiler in the base compile +-# command doesn't match the default compiler. +-# arg is usually of the form 'gcc ...' +-func_infer_tag () ++# func_quote_for_expand arg ++# Aesthetically quote ARG to be evaled later; same as above, ++# but do not quote variable references. ++func_quote_for_expand () + { +- if test -n "$available_tags" && test -z "$tagname"; then +- CC_quoted= +- for arg in $CC; do +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac +- CC_quoted="$CC_quoted $arg" +- done +- case $@ in +- # Blanks in the command may have been stripped by the calling shell, +- # but not from the CC environment variable when configure was run. +- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; +- # Blanks at the start of $base_compile will cause this to fail +- # if we don't check for them as well. ++ case $1 in ++ *[\\\`\"]*) ++ my_arg=`$ECHO "X$1" | $Xsed \ ++ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; + *) +- for z in $available_tags; do +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" +- CC_quoted= +- for arg in $CC; do +- # Double-quote args containing other shell metacharacters. +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac +- CC_quoted="$CC_quoted $arg" +- done +- case "$@ " in +- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) +- # The compiler in the base compile command matches +- # the one in the tagged configuration. +- # Assume this is the tagged configuration we want. +- tagname=$z +- break +- ;; +- esac +- fi +- done +- # If $tagname still isn't set, then no tagged configuration +- # was found and let the user know that the "--tag" command +- # line option must be used. +- if test -z "$tagname"; then +- $echo "$modename: unable to infer tagged configuration" +- $echo "$modename: specify a tag with \`--tag'" 1>&2 +- exit $EXIT_FAILURE +-# else +-# $echo "$modename: using $tagname tagged configuration" +- fi +- ;; +- esac +- fi ++ my_arg="$1" ;; ++ esac ++ ++ case $my_arg in ++ # Double-quote args containing shell metacharacters to delay ++ # word splitting and command substitution for a subsequent eval. ++ # Many Bourne shells cannot handle close brackets correctly ++ # in scan sets, so we specify it separately. ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ my_arg="\"$my_arg\"" ++ ;; ++ esac ++ ++ func_quote_for_expand_result="$my_arg" + } -+ # Check to see that this really is a libtool archive. -+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ else -+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -+ exit $EXIT_FAILURE -+ fi -# func_extract_an_archive dir oldlib -func_extract_an_archive () --{ -- $opt_debug ++# func_show_eval cmd [fail_exp] ++# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is ++# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP ++# is given, then evaluate it. ++func_show_eval () + { - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" -- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' ++ my_cmd="$1" ++ my_fail_exp="${2-:}" + +- $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" +- $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else -- func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" -- fi --} -+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$ladir" = "X$lib" && ladir="." - -+ dlname= -+ dlopen= -+ dlpreopen= -+ libdir= -+ library_names= -+ old_library= -+ # If the library was installed with an old release of libtool, -+ # it will not redefine variables installed, or shouldnotlink -+ installed=yes -+ shouldnotlink=no -+ avoidtemprpath= +- $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 +- exit $EXIT_FAILURE ++ ${opt_silent-false} || { ++ func_quote_for_expand "$my_cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ ++ if ${opt_dry_run-false}; then :; else ++ eval "$my_cmd" ++ my_status=$? ++ if test "$my_status" -eq 0; then :; else ++ eval "(exit $my_status); $my_fail_exp" ++ fi + fi + } -# func_extract_archives gentop oldlib ... -func_extract_archives () --{ -- $opt_debug ++ ++# func_show_eval_locale cmd [fail_exp] ++# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is ++# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP ++# is given, then evaluate it. Use the saved locale for evaluation. ++func_show_eval_locale () + { - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" +- my_status="" ++ my_cmd="$1" ++ my_fail_exp="${2-:}" ++ ++ ${opt_silent-false} || { ++ func_quote_for_expand "$my_cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } + +- $show "${rm}r $my_gentop" +- $run ${rm}r "$my_gentop" +- $show "$mkdir $my_gentop" +- $run $mkdir "$my_gentop" +- my_status=$? +- if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then +- exit $my_status ++ if ${opt_dry_run-false}; then :; else ++ eval "$lt_user_locale ++ $my_cmd" ++ my_status=$? ++ eval "$lt_safe_locale" ++ if test "$my_status" -eq 0; then :; else ++ eval "(exit $my_status); $my_fail_exp" ++ fi + fi ++} - for my_xlib in $my_oldlibs; do - # Extract the objects. @@ -110470,3138 +71768,1398 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac -- func_basename "$my_xlib" -- my_xlib="$func_basename_result" +- my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) -- func_arith $extracted_serial + 1 -- extracted_serial=$func_arith_result +- extracted_serial=`expr $extracted_serial + 1` - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; -+ # Read the .la file -+ case $lib in -+ */* | *\\*) . $lib ;; -+ *) . ./$lib ;; - esac +- esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" -- func_mkdir_p "$my_xdir" -- +- $show "${rm}r $my_xdir" +- $run ${rm}r "$my_xdir" +- $show "$mkdir $my_xdir" +- $run $mkdir "$my_xdir" +- exit_status=$? +- if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then +- exit $exit_status +- fi - case $host in - *-darwin*) -- func_verbose "Extracting $my_xabs" +- $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run -- $opt_dry_run || { +- if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` -- darwin_base_archive=`basename "$darwin_archive"` -- darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` -- if test -n "$darwin_arches"; then -- darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` +- darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` +- darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` +- if test -n "$darwin_arches"; then +- darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= -- func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" +- $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do -- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" -- $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" +- mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" +- lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" -- $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" +- $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches -- ## Okay now we've a bunch of thin objects, gotta fatten them up :) -- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` +- ## Okay now we have a bunch of thin objects, gotta fatten them up :) +- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -- $LIPO -create -output "$darwin_file" $darwin_files +- lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist -- $RM -rf unfat-$$ +- ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else -- cd $darwin_orig_dir -- func_extract_an_archive "$my_xdir" "$my_xabs" +- cd "$darwin_orig_dir" +- func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches -- } # !$opt_dry_run +- fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" -- ;; +- ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done -- - func_extract_archives_result="$my_oldobjs" --} -+ if test "$linkmode,$pass" = "lib,link" || -+ test "$linkmode,$pass" = "prog,scan" || -+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then -+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ fi - -+ if test "$pass" = conv; then -+ # Only check for convenience libraries -+ deplibs="$lib $deplibs" -+ if test -z "$libdir"; then -+ if test -z "$old_library"; then -+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ # It is a libtool convenience library, so add in its objects. -+ convenience="$convenience $ladir/$objdir/$old_library" -+ old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ deplibs="$deplib $deplibs" -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done -+ elif test "$linkmode" != prog && test "$linkmode" != lib; then -+ $echo "$modename: \`$lib' is not a convenience library" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ continue -+ fi # $pass = conv - - --# func_emit_wrapper_part1 [arg=no] --# --# Emit the first part of a libtool wrapper script on stdout. --# For more information, see the description associated with --# func_emit_wrapper(), below. --func_emit_wrapper_part1 () --{ -- func_emit_wrapper_part1_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_part1_arg1=$1 -+ # Get the name of the library we link against. -+ linklib= -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ if test -z "$linklib"; then -+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -+ exit $EXIT_FAILURE - fi - -- $ECHO "\ --#! $SHELL -+ # This library was specified with -dlopen. -+ if test "$pass" = dlopen; then -+ if test -z "$libdir"; then -+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ if test -z "$dlname" || -+ test "$dlopen_support" != yes || -+ test "$build_libtool_libs" = no; then -+ # If there is no dlname, no dlopen support or we're linking -+ # statically, we need to preload. We also need to preload any -+ # dependent libraries so libltdl's deplib preloader doesn't -+ # bomb out in the load deplibs phase. -+ dlprefiles="$dlprefiles $lib $dependency_libs" -+ else -+ newdlfiles="$newdlfiles $lib" -+ fi -+ continue -+ fi # $pass = dlopen - --# $output - temporary wrapper script for $objdir/$outputname --# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION --# --# The $output program cannot be directly executed until all the libtool --# libraries that it depends on are installed. --# --# This wrapper script should never be moved out of the build directory. --# If it is, it will not operate correctly. -+ # We need an absolute path. -+ case $ladir in -+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; -+ *) -+ abs_ladir=`cd "$ladir" && pwd` -+ if test -z "$abs_ladir"; then -+ $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 -+ $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 -+ abs_ladir="$ladir" -+ fi -+ ;; -+ esac -+ laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='${SED} -e 1s/^X//' --sed_quote_subst='$sed_quote_subst' -+ # Find the relevant object directory and library name. -+ if test "X$installed" = Xyes; then -+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ $echo "$modename: warning: library \`$lib' was moved." 1>&2 -+ dir="$ladir" -+ absdir="$abs_ladir" -+ libdir="$abs_ladir" -+ else -+ dir="$libdir" -+ absdir="$libdir" -+ fi -+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes -+ else -+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ dir="$ladir" -+ absdir="$abs_ladir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ else -+ dir="$ladir/$objdir" -+ absdir="$abs_ladir/$objdir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ fi -+ fi # $installed = yes -+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - --# Be 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 -+ # This library was specified with -dlpreopen. -+ if test "$pass" = dlpreopen; then -+ if test -z "$libdir"; then -+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ newdlprefiles="$newdlprefiles $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ newdlprefiles="$newdlprefiles $dir/$dlname" -+ else -+ newdlprefiles="$newdlprefiles $dir/$linklib" -+ fi -+ fi # $pass = dlpreopen - --# 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 -+ if test -z "$libdir"; then -+ # Link the convenience library -+ if test "$linkmode" = lib; then -+ deplibs="$dir/$old_library $deplibs" -+ elif test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$dir/$old_library $compile_deplibs" -+ finalize_deplibs="$dir/$old_library $finalize_deplibs" -+ else -+ deplibs="$lib $deplibs" # used for prog,scan pass -+ fi -+ continue -+ fi - --relink_command=\"$relink_command\" - --# This environment variable determines our operation mode. --if test \"\$libtool_install_magic\" = \"$magic\"; then -- # install mode needs the following variables: -- generated_by_libtool_version='$macro_version' -- notinst_deplibs='$notinst_deplibs' --else -- # When we are sourced in execute mode, \$file and \$ECHO are already set. -- if test \"\$libtool_execute_magic\" != \"$magic\"; then -- ECHO=\"$qecho\" -- file=\"\$0\" -- # Make sure echo works. -- if test \"X\$1\" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift -- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then -- # Yippee, \$ECHO works! -- : -- else -- # Restart under the correct shell, and then maybe \$ECHO will work. -- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} -- fi -- fi\ --" -- $ECHO "\ -+ if test "$linkmode" = prog && test "$pass" != link; then -+ newlib_search_path="$newlib_search_path $ladir" -+ deplibs="$lib $deplibs" - -- # Find the directory that this script lives in. -- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` -- test \"x\$thisdir\" = \"x\$file\" && thisdir=. -+ linkalldeplibs=no -+ if test "$link_all_deplibs" != no || test -z "$library_names" || -+ test "$build_libtool_libs" = no; then -+ linkalldeplibs=yes -+ fi - -- # Follow symbolic links until we get to the real thisdir. -- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` -- while test -n \"\$file\"; do -- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ case $deplib in -+ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test -+ esac -+ # Need to link against all dependency_libs? -+ if test "$linkalldeplibs" = yes; then -+ deplibs="$deplib $deplibs" -+ else -+ # Need to hardcode shared library paths -+ # or/and link against static libraries -+ newdependency_libs="$deplib $newdependency_libs" -+ fi -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done # for deplib -+ continue -+ fi # $linkmode = prog... - -- # If there was a directory component, then change thisdir. -- if test \"x\$destdir\" != \"x\$file\"; then -- case \"\$destdir\" in -- [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; -- *) thisdir=\"\$thisdir/\$destdir\" ;; -- esac -- fi -+ if test "$linkmode,$pass" = "prog,link"; then -+ if test -n "$library_names" && -+ { { 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. -+ case "$temp_rpath " in -+ *" $dir "*) ;; -+ *" $absdir "*) ;; -+ *) temp_rpath="$temp_rpath $absdir" ;; -+ esac -+ fi - -- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` -- done --" --} --# end: func_emit_wrapper_part1 -+ # Hardcode the library path. -+ # Skip directories that are in the system default run-time -+ # search path. -+ case " $sys_lib_dlsearch_path " in -+ *" $absdir "*) ;; -+ *) -+ case "$compile_rpath " in -+ *" $absdir "*) ;; -+ *) compile_rpath="$compile_rpath $absdir" -+ esac -+ ;; -+ esac -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" -+ esac -+ ;; -+ esac -+ fi # $linkmode,$pass = prog,link... - --# func_emit_wrapper_part2 [arg=no] --# --# Emit the second part of a libtool wrapper script on stdout. --# For more information, see the description associated with --# func_emit_wrapper(), below. --func_emit_wrapper_part2 () --{ -- func_emit_wrapper_part2_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_part2_arg1=$1 -- fi -- -- $ECHO "\ -- -- # Usually 'no', except on cygwin/mingw when embedded into -- # the cwrapper. -- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 -- if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then -- # special case for '.' -- if test \"\$thisdir\" = \".\"; then -- thisdir=\`pwd\` -- fi -- # remove .libs from thisdir -- case \"\$thisdir\" in -- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; -- $objdir ) thisdir=. ;; -- esac -- fi -+ if test "$alldeplibs" = yes && -+ { test "$deplibs_check_method" = pass_all || -+ { test "$build_libtool_libs" = yes && -+ test -n "$library_names"; }; }; then -+ # We only need to search for static libraries -+ continue -+ fi -+ fi - -- # Try to get the absolute directory name. -- absdir=\`cd \"\$thisdir\" && pwd\` -- test -n \"\$absdir\" && thisdir=\"\$absdir\" --" -+ link_static=no # Whether the deplib will be linked statically -+ use_static_libs=$prefer_static_libs -+ if test "$use_static_libs" = built && test "$installed" = yes ; then -+ use_static_libs=no -+ fi -+ if test -n "$library_names" && -+ { test "$use_static_libs" = no || test -z "$old_library"; }; then -+ if test "$installed" = no; then -+ notinst_deplibs="$notinst_deplibs $lib" -+ need_relink=yes -+ fi -+ # This is a shared library - -- if test "$fast_install" = yes; then -- $ECHO "\ -- program=lt-'$outputname'$exeext -- progdir=\"\$thisdir/$objdir\" -- -- if test ! -f \"\$progdir/\$program\" || -- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ -- test \"X\$file\" != \"X\$progdir/\$program\"; }; then -- -- file=\"\$\$-\$program\" -+ # Warn about portability, can't link against -module's on -+ # some systems (darwin) -+ if test "$shouldnotlink" = yes && test "$pass" = link ; then -+ $echo -+ if test "$linkmode" = prog; then -+ $echo "*** Warning: Linking the executable $output against the loadable module" -+ else -+ $echo "*** Warning: Linking the shared library $output against the loadable module" -+ fi -+ $echo "*** $linklib is not portable!" -+ fi -+ if test "$linkmode" = lib && -+ test "$hardcode_into_libs" = yes; then -+ # Hardcode the library path. -+ # Skip directories that are in the system default run-time -+ # search path. -+ case " $sys_lib_dlsearch_path " in -+ *" $absdir "*) ;; -+ *) -+ case "$compile_rpath " in -+ *" $absdir "*) ;; -+ *) compile_rpath="$compile_rpath $absdir" -+ esac -+ ;; -+ esac -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" -+ esac -+ ;; -+ esac -+ fi - -- if test ! -d \"\$progdir\"; then -- $MKDIR \"\$progdir\" -- else -- $RM \"\$progdir/\$file\" -- fi" -+ if test -n "$old_archive_from_expsyms_cmds"; then -+ # figure out the soname -+ set dummy $library_names -+ realname="$2" -+ shift; shift -+ libname=`eval \\$echo \"$libname_spec\"` -+ # use dlname if we got it. it's perfectly good, no? -+ if test -n "$dlname"; then -+ soname="$dlname" -+ elif test -n "$soname_spec"; then -+ # bleh windows -+ case $host in -+ *cygwin* | mingw*) -+ major=`expr $current - $age` -+ versuffix="-$major" -+ ;; -+ esac -+ eval soname=\"$soname_spec\" -+ else -+ soname="$realname" -+ fi - -- $ECHO "\ -+ # Make a new name for the extract_expsyms_cmds to use -+ soroot="$soname" -+ soname=`$echo $soroot | ${SED} -e 's/^.*\///'` -+ newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - -- # relink executable if necessary -- if test -n \"\$relink_command\"; then -- if relink_command_output=\`eval \$relink_command 2>&1\`; then : -- else -- $ECHO \"\$relink_command_output\" >&2 -- $RM \"\$progdir/\$file\" -- exit 1 -- fi -- fi -+ # If the library has no export list, then create one now -+ if test -f "$output_objdir/$soname-def"; then : -+ else -+ $show "extracting exported symbol list from \`$soname'" -+ save_ifs="$IFS"; IFS='~' -+ cmds=$extract_expsyms_cmds -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ fi - -- $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || -- { $RM \"\$progdir/\$program\"; -- $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } -- $RM \"\$progdir/\$file\" -- fi" -- else -- $ECHO "\ -- program='$outputname' -- progdir=\"\$thisdir/$objdir\" --" -- fi -+ # Create $newlib -+ if test -f "$output_objdir/$newlib"; then :; else -+ $show "generating import library for \`$soname'" -+ save_ifs="$IFS"; IFS='~' -+ cmds=$old_archive_from_expsyms_cmds -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ fi -+ # make sure the library variables are pointing to the new library -+ dir=$output_objdir -+ linklib=$newlib -+ fi # test -n "$old_archive_from_expsyms_cmds" - -- $ECHO "\ -+ if test "$linkmode" = prog || test "$mode" != relink; then -+ add_shlibpath= -+ add_dir= -+ add= -+ lib_linked=yes -+ case $hardcode_action in -+ immediate | unsupported) -+ if test "$hardcode_direct" = no; then -+ add="$dir/$linklib" -+ case $host in -+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; -+ *-*-sysv4*uw2*) add_dir="-L$dir" ;; -+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ -+ *-*-unixware7*) add_dir="-L$dir" ;; -+ *-*-darwin* ) -+ # if the lib is a module then we can not link against -+ # it, someone is ignoring the new warnings I added -+ if /usr/bin/file -L $add 2> /dev/null | -+ $EGREP ": [^:]* bundle" >/dev/null ; then -+ $echo "** Warning, lib $linklib is a module, not a shared library" -+ if test -z "$old_library" ; then -+ $echo -+ $echo "** And there doesn't seem to be a static archive available" -+ $echo "** The link will probably fail, sorry" -+ else -+ add="$dir/$old_library" -+ fi -+ fi -+ esac -+ elif test "$hardcode_minus_L" = no; then -+ case $host in -+ *-*-sunos*) add_shlibpath="$dir" ;; -+ esac -+ add_dir="-L$dir" -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = no; then -+ add_shlibpath="$dir" -+ add="-l$name" -+ else -+ lib_linked=no -+ fi -+ ;; -+ relink) -+ if test "$hardcode_direct" = yes; then -+ add="$dir/$linklib" -+ elif test "$hardcode_minus_L" = yes; then -+ add_dir="-L$dir" -+ # Try looking first in the location we're being installed to. -+ if test -n "$inst_prefix_dir"; then -+ case $libdir in -+ [\\/]*) -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ ;; -+ esac -+ fi -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = yes; then -+ add_shlibpath="$dir" -+ add="-l$name" -+ else -+ lib_linked=no -+ fi -+ ;; -+ *) lib_linked=no ;; -+ esac - -- if test -f \"\$progdir/\$program\"; then" -+ if test "$lib_linked" != yes; then -+ $echo "$modename: configuration error: unsupported hardcode properties" -+ exit $EXIT_FAILURE -+ fi - -- # Export our shlibpath_var if we have one. -- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -- $ECHO "\ -- # Add our own library path to $shlibpath_var -- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" -+ if test -n "$add_shlibpath"; then -+ case :$compile_shlibpath: in -+ *":$add_shlibpath:"*) ;; -+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ esac -+ fi -+ if test "$linkmode" = prog; then -+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" -+ test -n "$add" && compile_deplibs="$add $compile_deplibs" -+ else -+ test -n "$add_dir" && deplibs="$add_dir $deplibs" -+ test -n "$add" && deplibs="$add $deplibs" -+ if test "$hardcode_direct" != yes && \ -+ test "$hardcode_minus_L" != yes && \ -+ test "$hardcode_shlibpath_var" = yes; then -+ case :$finalize_shlibpath: in -+ *":$libdir:"*) ;; -+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ esac -+ fi -+ fi -+ fi - -- # Some systems cannot cope with colon-terminated $shlibpath_var -- # The second colon is a workaround for a bug in BeOS R4 sed -- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` -+ if test "$linkmode" = prog || test "$mode" = relink; then -+ add_shlibpath= -+ add_dir= -+ add= -+ # Finalize command for both is simple: just hardcode it. -+ if test "$hardcode_direct" = yes; then -+ add="$libdir/$linklib" -+ elif test "$hardcode_minus_L" = yes; then -+ add_dir="-L$libdir" -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = yes; then -+ case :$finalize_shlibpath: in -+ *":$libdir:"*) ;; -+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ esac -+ add="-l$name" -+ elif test "$hardcode_automatic" = yes; then -+ if test -n "$inst_prefix_dir" && -+ test -f "$inst_prefix_dir$libdir/$linklib" ; then -+ add="$inst_prefix_dir$libdir/$linklib" -+ else -+ add="$libdir/$linklib" -+ fi -+ else -+ # We cannot seem to hardcode it, guess we'll fake it. -+ add_dir="-L$libdir" -+ # Try looking first in the location we're being installed to. -+ if test -n "$inst_prefix_dir"; then -+ case $libdir in -+ [\\/]*) -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ ;; -+ esac -+ fi -+ add="-l$name" -+ fi - -- export $shlibpath_var --" -- fi -+ if test "$linkmode" = prog; then -+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" -+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" -+ else -+ test -n "$add_dir" && deplibs="$add_dir $deplibs" -+ test -n "$add" && deplibs="$add $deplibs" -+ fi -+ fi -+ elif test "$linkmode" = prog; then -+ # Here we assume that one of hardcode_direct or hardcode_minus_L -+ # is not unsupported. This is valid on all known static and -+ # shared platforms. -+ if test "$hardcode_direct" != unsupported; then -+ test -n "$old_library" && linklib="$old_library" -+ compile_deplibs="$dir/$linklib $compile_deplibs" -+ finalize_deplibs="$dir/$linklib $finalize_deplibs" -+ else -+ compile_deplibs="-l$name -L$dir $compile_deplibs" -+ finalize_deplibs="-l$name -L$dir $finalize_deplibs" -+ fi -+ elif test "$build_libtool_libs" = yes; then -+ # Not a shared library -+ if test "$deplibs_check_method" != pass_all; then -+ # We're trying link a shared library against a static one -+ # but the system doesn't support it. - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $ECHO "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -+ # Just print a warning and add the library to dependency_libs so -+ # that the program can be linked against the static library. -+ $echo -+ $echo "*** Warning: This system can not link to static lib archive $lib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have." -+ if test "$module" = yes; then -+ $echo "*** But as you try to build a module library, libtool will still create " -+ $echo "*** a static module, that should work as long as the dlopening application" -+ $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." -+ if test -z "$global_symbol_pipe"; then -+ $echo -+ $echo "*** However, this would only work if libtool was able to extract symbol" -+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ $echo "*** not find such a program. So, this module is probably useless." -+ $echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ fi -+ if test "$build_old_libs" = no; then -+ build_libtool_libs=module -+ build_old_libs=yes -+ else -+ build_libtool_libs=no -+ fi -+ fi -+ else -+ deplibs="$dir/$old_library $deplibs" -+ link_static=yes -+ fi -+ fi # link shared/static library? - -- $ECHO "\ -- if test \"\$libtool_execute_magic\" != \"$magic\"; then -- # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -+ if test "$linkmode" = lib; then -+ if test -n "$dependency_libs" && -+ { test "$hardcode_into_libs" != yes || -+ test "$build_old_libs" = yes || -+ test "$link_static" = yes; }; then -+ # Extract -R from dependency_libs -+ temp_deplibs= -+ for libdir in $dependency_libs; do -+ case $libdir in -+ -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` -+ case " $xrpath " in -+ *" $temp_xrpath "*) ;; -+ *) xrpath="$xrpath $temp_xrpath";; -+ esac;; -+ *) temp_deplibs="$temp_deplibs $libdir";; -+ esac -+ done -+ dependency_libs="$temp_deplibs" -+ fi - -- *) -- $ECHO "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 -- fi -- else -- # The program doesn't exist. -- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 -- \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 -- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 -- exit 1 -- fi --fi\ --" --} --# end: func_emit_wrapper_part2 -+ newlib_search_path="$newlib_search_path $absdir" -+ # Link against this library -+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" -+ # ... and its dependency_libs -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ newdependency_libs="$deplib $newdependency_libs" -+ if test "X$duplicate_deps" = "Xyes" ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done - -+ if test "$link_all_deplibs" != no; then -+ # Add the search paths of all dependency libraries -+ for deplib in $dependency_libs; do -+ case $deplib in -+ -L*) path="$deplib" ;; -+ *.la) -+ dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$dir" = "X$deplib" && dir="." -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -+ *) -+ absdir=`cd "$dir" && pwd` -+ if test -z "$absdir"; then -+ $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 -+ absdir="$dir" -+ fi -+ ;; -+ esac -+ if grep "^installed=no" $deplib > /dev/null; then -+ path="$absdir/$objdir" -+ else -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ if test -z "$libdir"; then -+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ if test "$absdir" != "$libdir"; then -+ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -+ fi -+ path="$absdir" -+ fi -+ depdepl= -+ case $host in -+ *-*-darwin*) -+ # we do not want to link against static libs, -+ # but need to link against shared -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ if test -n "$deplibrary_names" ; then -+ for tmp in $deplibrary_names ; do -+ depdepl=$tmp -+ done -+ if test -f "$deplibdir/$depdepl" ; then -+ depdepl="$deplibdir/$depdepl" -+ elif test -f "$path/$depdepl" ; then -+ depdepl="$path/$depdepl" -+ else -+ # Can't find it, oh well... -+ depdepl= -+ fi -+ # do not add paths which are already there -+ case " $newlib_search_path " in -+ *" $path "*) ;; -+ *) newlib_search_path="$newlib_search_path $path";; -+ esac -+ fi -+ path="" -+ ;; -+ *) -+ path="-L$path" -+ ;; -+ esac -+ ;; -+ -l*) -+ case $host in -+ *-*-darwin*) -+ # Again, we only want to link against shared libraries -+ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` -+ for tmp in $newlib_search_path ; do -+ if test -f "$tmp/lib$tmp_libs.dylib" ; then -+ eval depdepl="$tmp/lib$tmp_libs.dylib" -+ break -+ fi -+ done -+ path="" -+ ;; -+ *) continue ;; -+ esac -+ ;; -+ *) continue ;; -+ esac -+ case " $deplibs " in -+ *" $path "*) ;; -+ *) deplibs="$path $deplibs" ;; -+ esac -+ case " $deplibs " in -+ *" $depdepl "*) ;; -+ *) deplibs="$depdepl $deplibs" ;; -+ esac -+ done -+ fi # link_all_deplibs != no -+ fi # linkmode = lib -+ done # for deplib in $libs -+ dependency_libs="$newdependency_libs" -+ if test "$pass" = dlpreopen; then -+ # Link the dlpreopened libraries before other libraries -+ for deplib in $save_deplibs; do -+ deplibs="$deplib $deplibs" -+ done -+ fi -+ if test "$pass" != dlopen; then -+ if test "$pass" != conv; then -+ # Make sure lib_search_path contains only unique directories. -+ lib_search_path= -+ for dir in $newlib_search_path; do -+ case "$lib_search_path " in -+ *" $dir "*) ;; -+ *) lib_search_path="$lib_search_path $dir" ;; -+ esac -+ done -+ newlib_search_path= -+ fi - --# func_emit_wrapper [arg=no] --# --# Emit a libtool wrapper script on stdout. --# Don't directly open a file because we may want to --# incorporate the script contents within a cygwin/mingw --# wrapper executable. Must ONLY be called from within --# func_mode_link because it depends on a number of variables --# set therein. --# --# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR --# variable will take. If 'yes', then the emitted script --# will assume that the directory in which it is stored is --# the $objdir directory. This is a cygwin/mingw-specific --# behavior. --func_emit_wrapper () --{ -- func_emit_wrapper_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_arg1=$1 -+ if test "$linkmode,$pass" != "prog,link"; then -+ vars="deplibs" -+ else -+ vars="compile_deplibs finalize_deplibs" - fi -+ for var in $vars dependency_libs; do -+ # Add libraries to $var in reverse order -+ eval tmp_libs=\"\$$var\" -+ new_libs= -+ for deplib in $tmp_libs; do -+ # FIXME: Pedantically, this is the right thing to do, so -+ # that some nasty dependency loop isn't accidentally -+ # broken: -+ #new_libs="$deplib $new_libs" -+ # Pragmatically, this seems to cause very few problems in -+ # practice: -+ case $deplib in -+ -L*) new_libs="$deplib $new_libs" ;; -+ -R*) ;; -+ *) -+ # And here is the reason: when a library appears more -+ # than once as an explicit dependence of a library, or -+ # is implicitly linked in more than once by the -+ # compiler, it is considered special, and multiple -+ # occurrences thereof are not removed. Compare this -+ # with having the same library being listed as a -+ # dependency of multiple other libraries: in this case, -+ # we know (pedantically, we assume) the library does not -+ # need to be listed more than once, so we keep only the -+ # last copy. This is not always right, but it is rare -+ # enough that we require users that really mean to play -+ # such unportable linking tricks to link the library -+ # using -Wl,-lname, so that libtool does not consider it -+ # for duplicate removal. -+ case " $specialdeplibs " in -+ *" $deplib "*) new_libs="$deplib $new_libs" ;; -+ *) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$deplib $new_libs" ;; -+ esac -+ ;; -+ esac -+ ;; -+ esac -+ done -+ tmp_libs= -+ for deplib in $new_libs; do -+ case $deplib in -+ -L*) -+ case " $tmp_libs " in -+ *" $deplib "*) ;; -+ *) tmp_libs="$tmp_libs $deplib" ;; -+ esac -+ ;; -+ *) tmp_libs="$tmp_libs $deplib" ;; -+ esac -+ done -+ eval $var=\"$tmp_libs\" -+ done # for var -+ fi -+ # Last step: remove runtime libs from dependency_libs -+ # (they stay in deplibs) -+ tmp_libs= -+ for i in $dependency_libs ; do -+ case " $predeps $postdeps $compiler_lib_search_path " in -+ *" $i "*) -+ i="" -+ ;; -+ esac -+ if test -n "$i" ; then -+ tmp_libs="$tmp_libs $i" -+ fi -+ done -+ dependency_libs=$tmp_libs -+ done # for pass -+ if test "$linkmode" = prog; then -+ dlfiles="$newdlfiles" -+ dlprefiles="$newdlprefiles" -+ fi - -- # split this up so that func_emit_cwrapperexe_src -- # can call each part independently. -- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" -- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" --} -+ case $linkmode in -+ oldlib) -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; -+ esac - -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 -+ fi - --# func_to_host_path arg --# --# Convert paths to host format when used with build tools. --# Intended for use with "native" mingw (where libtool itself --# is running under the msys shell), or in the following cross- --# build environments: --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# where wine is equipped with the `winepath' executable. --# In the native mingw case, the (msys) shell automatically --# converts paths for any non-msys applications it launches, --# but that facility isn't available from inside the cwrapper. --# Similar accommodations are necessary for $host mingw and --# $build cygwin. Calling this function does no harm for other --# $host/$build combinations not listed above. --# --# ARG is the path (on $build) that should be converted to --# the proper representation for $host. The result is stored --# in $func_to_host_path_result. --func_to_host_path () --{ -- func_to_host_path_result="$1" -- if test -n "$1" ; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- case $build in -- *mingw* ) # actually, msys -- # awkward: cmd appends spaces to result -- lt_sed_strip_trailing_spaces="s/[ ]*\$//" -- func_to_host_path_tmp1=`( cmd //c echo "$1" |\ -- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_path_tmp1=`cygpath -w "$1"` -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # Unfortunately, winepath does not exit with a non-zero -- # error code, so we are forced to check the contents of -- # stdout. On the other hand, if the command is not -- # found, the shell will set an exit code of 127 and print -- # *an error message* to stdout. So we must check for both -- # error code of zero AND non-empty stdout, which explains -- # the odd construction: -- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- else -- # Allow warning below. -- func_to_host_path_result="" -- fi -- ;; -- esac -- if test -z "$func_to_host_path_result" ; then -- func_error "Could not determine host path corresponding to" -- func_error " '$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback: -- func_to_host_path_result="$1" -- fi -- ;; -- esac -- fi --} --# end: func_to_host_path -+ if test -n "$rpath"; then -+ $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 -+ fi - --# func_to_host_pathlist arg --# --# Convert pathlists to host format when used with build tools. --# See func_to_host_path(), above. This function supports the --# following $build/$host combinations (but does no harm for --# combinations not listed here): --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# --# Path separators are also converted from $build format to --# $host format. If ARG begins or ends with a path separator --# character, it is preserved (but converted to $host format) --# on output. --# --# ARG is a pathlist (on $build) that should be converted to --# the proper representation on $host. The result is stored --# in $func_to_host_pathlist_result. --func_to_host_pathlist () --{ -- func_to_host_pathlist_result="$1" -- if test -n "$1" ; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- # Remove leading and trailing path separator characters from -- # ARG. msys behavior is inconsistent here, cygpath turns them -- # into '.;' and ';.', and winepath ignores them completely. -- func_to_host_pathlist_tmp2="$1" -- # Once set for this call, this variable should not be -- # reassigned. It is used in tha fallback case. -- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e 's|^:*||' -e 's|:*$||'` -- case $build in -- *mingw* ) # Actually, msys. -- # Awkward: cmd appends spaces to result. -- lt_sed_strip_trailing_spaces="s/[ ]*\$//" -- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # unfortunately, winepath doesn't convert pathlists -- func_to_host_pathlist_result="" -- func_to_host_pathlist_oldIFS=$IFS -- IFS=: -- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -- IFS=$func_to_host_pathlist_oldIFS -- if test -n "$func_to_host_pathlist_f" ; then -- func_to_host_path "$func_to_host_pathlist_f" -- if test -n "$func_to_host_path_result" ; then -- if test -z "$func_to_host_pathlist_result" ; then -- func_to_host_pathlist_result="$func_to_host_path_result" -- else -- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" -- fi -- fi -- fi -- IFS=: -- done -- IFS=$func_to_host_pathlist_oldIFS -- ;; -- esac -- if test -z "$func_to_host_pathlist_result" ; then -- func_error "Could not determine the host path(s) corresponding to" -- func_error " '$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback. This may break if $1 contains DOS-style drive -- # specifications. The fix is not to complicate the expression -- # below, but for the user to provide a working wine installation -- # with winepath so that path translation in the cross-to-mingw -- # case works properly. -- lt_replace_pathsep_nix_to_dos="s|:|;|g" -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_replace_pathsep_nix_to_dos"` -- fi -- # Now, add the leading and trailing path separators back -- case "$1" in -- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -- ;; -- esac -- case "$1" in -- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" -- ;; -- esac -- ;; -- esac -- fi --} --# end: func_to_host_pathlist -+ if test -n "$xrpath"; then -+ $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 -+ fi - --# func_emit_cwrapperexe_src --# emit the source code for a wrapper executable on stdout --# Must ONLY be called from within func_mode_link because --# it depends on a number of variable set therein. --func_emit_cwrapperexe_src () --{ -- cat <<EOF -+ if test -n "$vinfo"; then -+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 -+ fi - --/* $cwrappersource - temporary wrapper executable for $objdir/$outputname -- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -+ if test -n "$release"; then -+ $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 -+ fi - -- The $output program cannot be directly executed until all the libtool -- libraries that it depends on are installed. -+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then -+ $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 -+ fi - -- This wrapper executable should never be moved out of the build directory. -- If it is, it will not operate correctly. -- -- Currently, it simply execs the wrapper *script* "$SHELL $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. --*/ --EOF -- cat <<"EOF" --#include <stdio.h> --#include <stdlib.h> --#ifdef _MSC_VER --# include <direct.h> --# include <process.h> --# include <io.h> --# define setmode _setmode --#else --# include <unistd.h> --# include <stdint.h> --# ifdef __CYGWIN__ --# include <io.h> --# define HAVE_SETENV --# ifdef __STRICT_ANSI__ --char *realpath (const char *, char *); --int putenv (char *); --int setenv (const char *, const char *, int); --# endif --# endif --#endif --#include <malloc.h> --#include <stdarg.h> --#include <assert.h> --#include <string.h> --#include <ctype.h> --#include <errno.h> --#include <fcntl.h> --#include <sys/stat.h> -+ # Now set the variables for building old libraries. -+ build_libtool_libs=no -+ oldlibs="$output" -+ objs="$objs$old_deplibs" -+ ;; - --#if defined(PATH_MAX) --# define LT_PATHMAX PATH_MAX --#elif defined(MAXPATHLEN) --# define LT_PATHMAX MAXPATHLEN --#else --# define LT_PATHMAX 1024 --#endif -+ lib) -+ # Make sure we only generate libraries of the form `libNAME.la'. -+ case $outputname in -+ lib*) -+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" -+ ;; -+ *) -+ if test "$module" = no; then -+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ if test "$need_lib_prefix" != no; then -+ # Add the "lib" prefix for modules if required -+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" -+ else -+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -+ fi -+ ;; -+ esac - --#ifndef S_IXOTH --# define S_IXOTH 0 --#endif --#ifndef S_IXGRP --# define S_IXGRP 0 --#endif -+ if test -n "$objs"; then -+ if test "$deplibs_check_method" != pass_all; then -+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 -+ exit $EXIT_FAILURE -+ else -+ $echo -+ $echo "*** Warning: Linking the shared library $output against the non-libtool" -+ $echo "*** objects $objs is not portable!" -+ libobjs="$libobjs $objs" -+ fi -+ fi - --#ifdef _MSC_VER --# define S_IXUSR _S_IEXEC --# define stat _stat --# ifndef _INTPTR_T_DEFINED --# define intptr_t int --# endif --#endif -+ if test "$dlself" != no; then -+ $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 -+ fi - --#ifndef DIR_SEPARATOR --# define DIR_SEPARATOR '/' --# define PATH_SEPARATOR ':' --#endif -+ set dummy $rpath -+ if test "$#" -gt 2; then -+ $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 -+ fi -+ install_libdir="$2" - --#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ -- defined (__OS2__) --# define HAVE_DOS_BASED_FILE_SYSTEM --# define FOPEN_WB "wb" --# ifndef DIR_SEPARATOR_2 --# define DIR_SEPARATOR_2 '\\' --# endif --# ifndef PATH_SEPARATOR_2 --# define PATH_SEPARATOR_2 ';' --# endif --#endif -+ oldlibs= -+ if test -z "$rpath"; then -+ if test "$build_libtool_libs" = yes; then -+ # Building a libtool convenience library. -+ # Some compilers have problems with a `.al' extension so -+ # convenience libraries should have the same extension an -+ # archive normally would. -+ oldlibs="$output_objdir/$libname.$libext $oldlibs" -+ build_libtool_libs=convenience -+ build_old_libs=yes -+ fi - --#ifndef DIR_SEPARATOR_2 --# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) --#else /* DIR_SEPARATOR_2 */ --# define IS_DIR_SEPARATOR(ch) \ -- (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) --#endif /* DIR_SEPARATOR_2 */ -+ if test -n "$vinfo"; then -+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 -+ fi - --#ifndef PATH_SEPARATOR_2 --# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) --#else /* PATH_SEPARATOR_2 */ --# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) --#endif /* PATH_SEPARATOR_2 */ -+ if test -n "$release"; then -+ $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 -+ fi -+ else - --#ifdef __CYGWIN__ --# define FOPEN_WB "wb" --#endif -+ # Parse the version information argument. -+ save_ifs="$IFS"; IFS=':' -+ set dummy $vinfo 0 0 0 -+ IFS="$save_ifs" - --#ifndef FOPEN_WB --# define FOPEN_WB "w" --#endif --#ifndef _O_BINARY --# define _O_BINARY 0 --#endif -+ if test -n "$8"; then -+ $echo "$modename: too many parameters to \`-version-info'" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - --#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) --#define XFREE(stale) do { \ -- if (stale) { free ((void *) stale); stale = 0; } \ --} while (0) -+ # convert absolute version numbers to libtool ages -+ # this retains compatibility with .la files and attempts -+ # to make the code below a bit more comprehensible - --#undef LTWRAPPER_DEBUGPRINTF --#if defined DEBUGWRAPPER --# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args --static void --ltwrapper_debugprintf (const char *fmt, ...) --{ -- va_list args; -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); --} --#else --# define LTWRAPPER_DEBUGPRINTF(args) --#endif -+ case $vinfo_number in -+ yes) -+ number_major="$2" -+ number_minor="$3" -+ number_revision="$4" -+ # -+ # There are really only two kinds -- those that -+ # use the current revision as the major version -+ # and those that subtract age and use age as -+ # a minor version. But, then there is irix -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+ darwin|linux|osf|windows|none) -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+ freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+ ;; -+ irix|nonstopux) -+ 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 -+ ;; -+ no) -+ current="$2" -+ revision="$3" -+ age="$4" -+ ;; -+ esac - --const char *program_name = NULL; -+ # Check that each of the things are valid numbers. -+ case $current in -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -+ *) -+ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac - --void *xmalloc (size_t num); --char *xstrdup (const char *string); --const char *base_name (const char *name); --char *find_executable (const char *wrapper); --char *chase_symlinks (const char *pathspec); --int make_executable (const char *path); --int check_executable (const char *path); --char *strendzap (char *str, const char *pat); --void lt_fatal (const char *message, ...); --void lt_setenv (const char *name, const char *value); --char *lt_extend_str (const char *orig_value, const char *add, int to_end); --void lt_opt_process_env_set (const char *arg); --void lt_opt_process_env_prepend (const char *arg); --void lt_opt_process_env_append (const char *arg); --int lt_split_name_value (const char *arg, char** name, char** value); --void lt_update_exe_path (const char *name, const char *value); --void lt_update_lib_path (const char *name, const char *value); -+ case $revision in -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -+ *) -+ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac - --static const char *script_text_part1 = --EOF -+ case $age in -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -+ *) -+ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac - -- func_emit_wrapper_part1 yes | -- $SED -e 's/\([\\"]\)/\\\1/g' \ -- -e 's/^/ "/' -e 's/$/\\n"/' -- echo ";" -- cat <<EOF -+ if test "$age" -gt "$current"; then -+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit $EXIT_FAILURE -+ fi - --static const char *script_text_part2 = --EOF -- func_emit_wrapper_part2 yes | -- $SED -e 's/\([\\"]\)/\\\1/g' \ -- -e 's/^/ "/' -e 's/$/\\n"/' -- echo ";" -- -- cat <<EOF --const char * MAGIC_EXE = "$magic_exe"; --const char * LIB_PATH_VARNAME = "$shlibpath_var"; --EOF -+ # Calculate the version variables. -+ major= -+ versuffix= -+ verstring= -+ case $version_type in -+ none) ;; - -- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -- func_to_host_pathlist "$temp_rpath" -- cat <<EOF --const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; --EOF -- else -- cat <<"EOF" --const char * LIB_PATH_VALUE = ""; --EOF -- fi -+ darwin) -+ # Like Linux, but with the current version available in -+ # verstring for coding it into the library header -+ major=.`expr $current - $age` -+ versuffix="$major.$age.$revision" -+ # Darwin ld doesn't like 0 for these options... -+ minor_current=`expr $current + 1` -+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" -+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" -+ ;; - -- if test -n "$dllsearchpath"; then -- func_to_host_pathlist "$dllsearchpath:" -- cat <<EOF --const char * EXE_PATH_VARNAME = "PATH"; --const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; --EOF -- else -- cat <<"EOF" --const char * EXE_PATH_VARNAME = ""; --const char * EXE_PATH_VALUE = ""; --EOF -- fi -+ freebsd-aout) -+ major=".$current" -+ versuffix=".$current.$revision"; -+ ;; - -- if test "$fast_install" = yes; then -- cat <<EOF --const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */ --EOF -- else -- cat <<EOF --const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */ --EOF -- fi -+ freebsd-elf) -+ major=".$current" -+ versuffix=".$current"; -+ ;; - -+ irix | nonstopux) -+ 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 ;; -+ esac -+ verstring="$verstring_prefix$major.$revision" - -- cat <<"EOF" -+ # Add in all the interfaces that we are compatible with. -+ loop=$revision -+ while test "$loop" -ne 0; do -+ iface=`expr $revision - $loop` -+ loop=`expr $loop - 1` -+ verstring="$verstring_prefix$major.$iface:$verstring" -+ done - --#define LTWRAPPER_OPTION_PREFIX "--lt-" --#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 -+ # Before this point, $major must not contain `.'. -+ major=.$major -+ versuffix="$major.$revision" -+ ;; - --static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; --static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; -+ linux) -+ major=.`expr $current - $age` -+ versuffix="$major.$age.$revision" -+ ;; - --static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; -+ osf) -+ major=.`expr $current - $age` -+ versuffix=".$current.$age.$revision" -+ verstring="$current.$age.$revision" - --static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; --static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; -- /* argument is putenv-style "foo=bar", value of foo is set to bar */ -+ # Add in all the interfaces that we are compatible with. -+ loop=$age -+ while test "$loop" -ne 0; do -+ iface=`expr $current - $loop` -+ loop=`expr $loop - 1` -+ verstring="$verstring:${iface}.0" -+ done - --static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; --static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; -- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ -+ # Make executables depend on our current version. -+ verstring="$verstring:${current}.0" -+ ;; - --static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; --static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; -- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ -+ sunos) -+ major=".$current" -+ versuffix=".$current.$revision" -+ ;; - --int --main (int argc, char *argv[]) --{ -- char **newargz; -- int newargc; -- char *tmp_pathspec; -- char *actual_cwrapper_path; -- char *actual_cwrapper_name; -- char *target_name; -- char *lt_argv_zero; -- intptr_t rval = 127; -+ windows) -+ # Use '-' rather than '.', since we only want one -+ # extension on DOS 8.3 filesystems. -+ major=`expr $current - $age` -+ versuffix="-$major" -+ ;; - -- int i; -+ *) -+ $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 - -- program_name = (char *) xstrdup (base_name (argv[0])); -- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); -- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); -- -- /* very simple arg parsing; don't want to rely on getopt */ -- for (i = 1; i < argc; i++) -- { -- if (strcmp (argv[i], dumpscript_opt) == 0) -- { --EOF -- case "$host" in -- *mingw* | *cygwin* ) -- # make stdout use "unix" line endings -- echo " setmode(1,_O_BINARY);" -- ;; -- esac -- -- cat <<"EOF" -- printf ("%s", script_text_part1); -- printf ("%s", script_text_part2); -- return 0; -- } -- } -- -- newargz = XMALLOC (char *, argc + 1); -- tmp_pathspec = find_executable (argv[0]); -- if (tmp_pathspec == NULL) -- lt_fatal ("Couldn't find %s", argv[0]); -- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", -- tmp_pathspec)); -- -- actual_cwrapper_path = chase_symlinks (tmp_pathspec); -- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", -- actual_cwrapper_path)); -- XFREE (tmp_pathspec); -- -- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); -- strendzap (actual_cwrapper_path, actual_cwrapper_name); -- -- /* wrapper name transforms */ -- strendzap (actual_cwrapper_name, ".exe"); -- tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1); -- XFREE (actual_cwrapper_name); -- actual_cwrapper_name = tmp_pathspec; -- tmp_pathspec = 0; -- -- /* target_name transforms -- use actual target program name; might have lt- prefix */ -- target_name = xstrdup (base_name (TARGET_PROGRAM_NAME)); -- strendzap (target_name, ".exe"); -- tmp_pathspec = lt_extend_str (target_name, ".exe", 1); -- XFREE (target_name); -- target_name = tmp_pathspec; -- tmp_pathspec = 0; -- -- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", -- target_name)); --EOF -- -- cat <<EOF -- newargz[0] = -- XMALLOC (char, (strlen (actual_cwrapper_path) + -- strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1)); -- strcpy (newargz[0], actual_cwrapper_path); -- strcat (newargz[0], "$objdir"); -- strcat (newargz[0], "/"); --EOF -- -- cat <<"EOF" -- /* stop here, and copy so we don't have to do this twice */ -- tmp_pathspec = xstrdup (newargz[0]); -- -- /* do NOT want the lt- prefix here, so use actual_cwrapper_name */ -- strcat (newargz[0], actual_cwrapper_name); -- -- /* DO want the lt- prefix here if it exists, so use target_name */ -- lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1); -- XFREE (tmp_pathspec); -- tmp_pathspec = NULL; --EOF -- -- case $host_os in -- mingw*) -- cat <<"EOF" -- { -- char* p; -- while ((p = strchr (newargz[0], '\\')) != NULL) -- { -- *p = '/'; -- } -- while ((p = strchr (lt_argv_zero, '\\')) != NULL) -- { -- *p = '/'; -- } -- } --EOF -+ # Clear the version info if we defaulted, and they specified a release. -+ if test -z "$vinfo" && test -n "$release"; then -+ major= -+ case $version_type in -+ darwin) -+ # we can't check for "0.0" in archive_cmds due to quoting -+ # problems, so we reset it completely -+ verstring= - ;; -- esac -- -- cat <<"EOF" -- XFREE (target_name); -- XFREE (actual_cwrapper_path); -- XFREE (actual_cwrapper_name); -- -- lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ -- lt_setenv ("DUALCASE", "1"); /* for MSK sh */ -- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); -- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); -- -- newargc=0; -- for (i = 1; i < argc; i++) -- { -- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) -- { -- if (argv[i][env_set_opt_len] == '=') -- { -- const char *p = argv[i] + env_set_opt_len + 1; -- lt_opt_process_env_set (p); -- } -- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) -- { -- lt_opt_process_env_set (argv[++i]); /* don't copy */ -- } -- else -- lt_fatal ("%s missing required argument", env_set_opt); -- continue; -- } -- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) -- { -- if (argv[i][env_prepend_opt_len] == '=') -- { -- const char *p = argv[i] + env_prepend_opt_len + 1; -- lt_opt_process_env_prepend (p); -- } -- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) -- { -- lt_opt_process_env_prepend (argv[++i]); /* don't copy */ -- } -- else -- lt_fatal ("%s missing required argument", env_prepend_opt); -- continue; -- } -- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) -- { -- if (argv[i][env_append_opt_len] == '=') -- { -- const char *p = argv[i] + env_append_opt_len + 1; -- lt_opt_process_env_append (p); -- } -- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) -- { -- lt_opt_process_env_append (argv[++i]); /* don't copy */ -- } -- else -- lt_fatal ("%s missing required argument", env_append_opt); -- continue; -- } -- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) -- { -- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX -- namespace, but it is not one of the ones we know about and -- have already dealt with, above (inluding dump-script), then -- report an error. Otherwise, targets might begin to believe -- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX -- namespace. The first time any user complains about this, we'll -- need to make LTWRAPPER_OPTION_PREFIX a configure-time option -- or a configure.ac-settable value. -- */ -- lt_fatal ("Unrecognized option in %s namespace: '%s'", -- ltwrapper_option_prefix, argv[i]); -- } -- /* otherwise ... */ -- newargz[++newargc] = xstrdup (argv[i]); -- } -- newargz[++newargc] = NULL; -- -- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); -- for (i = 0; i < newargc; i++) -- { -- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); -- } -- --EOF -- -- case $host_os in -- mingw*) -- cat <<"EOF" -- /* execv doesn't actually work on mingw as expected on unix */ -- rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); -- if (rval == -1) -- { -- /* failed to start process */ -- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -- return 127; -- } -- return rval; --EOF -- ;; -- *) -- cat <<"EOF" -- execv (lt_argv_zero, newargz); -- return rval; /* =127, but avoids unused variable warning */ --EOF -- ;; -- esac -- -- cat <<"EOF" --} -- --void * --xmalloc (size_t num) --{ -- void *p = (void *) malloc (num); -- if (!p) -- lt_fatal ("Memory exhausted"); -- -- return p; --} -- --char * --xstrdup (const char *string) --{ -- return string ? strcpy ((char *) xmalloc (strlen (string) + 1), -- string) : NULL; --} -- --const char * --base_name (const char *name) --{ -- const char *base; -- --#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -- /* Skip over the disk name in MSDOS pathnames. */ -- if (isalpha ((unsigned char) name[0]) && name[1] == ':') -- name += 2; --#endif -- -- for (base = name; *name; name++) -- if (IS_DIR_SEPARATOR (*name)) -- base = name + 1; -- return base; --} -+ *) -+ verstring="0.0" -+ ;; -+ esac -+ if test "$need_version" = no; then -+ versuffix= -+ else -+ versuffix=".0.0" -+ fi -+ fi - --int --check_executable (const char *path) --{ -- struct stat st; -+ # Remove version info from name if versioning should be avoided -+ if test "$avoid_version" = yes && test "$need_version" = no; then -+ major= -+ versuffix= -+ verstring="" -+ fi - -- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -- if ((!path) || (!*path)) -- return 0; -+ # Check to see if the archive will have undefined symbols. -+ if test "$allow_undefined" = yes; then -+ if test "$allow_undefined_flag" = unsupported; then -+ $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 -+ build_libtool_libs=no -+ build_old_libs=yes -+ fi -+ else -+ # Don't allow undefined symbols. -+ allow_undefined_flag="$no_undefined_flag" -+ fi -+ fi - -- if ((stat (path, &st) >= 0) -- && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) -- return 1; -- else -- return 0; --} -+ if test "$mode" != relink; then -+ # Remove our outputs, but don't remove object files since they -+ # may have been created when compiling PIC objects. -+ removelist= -+ tempremovelist=`$echo "$output_objdir/*"` -+ for p in $tempremovelist; do -+ case $p in -+ *.$objext) -+ ;; -+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) -+ if test "X$precious_files_regex" != "X"; then -+ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 -+ then -+ continue -+ fi -+ fi -+ removelist="$removelist $p" -+ ;; -+ *) ;; -+ esac -+ done -+ if test -n "$removelist"; then -+ $show "${rm}r $removelist" -+ $run ${rm}r $removelist -+ fi -+ fi - --int --make_executable (const char *path) --{ -- int rval = 0; -- struct stat st; -+ # Now set the variables for building old libraries. -+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -+ oldlibs="$oldlibs $output_objdir/$libname.$libext" - -- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -- if ((!path) || (!*path)) -- return 0; -+ # Transform .lo files to .o files. -+ oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -+ fi - -- if (stat (path, &st) >= 0) -- { -- rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); -- } -- return rval; --} -+ # 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 - --/* Searches for the full path of the wrapper. Returns -- newly allocated full path name if found, NULL otherwise -- Does not chase symlinks, even on platforms that support them. --*/ --char * --find_executable (const char *wrapper) --{ -- int has_slash = 0; -- const char *p; -- const char *p_next; -- /* static buffer for getcwd */ -- char tmp[LT_PATHMAX + 1]; -- int tmp_len; -- char *concat_name; -+ if test -n "$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ temp_xrpath= -+ for libdir in $xrpath; do -+ temp_xrpath="$temp_xrpath -R$libdir" -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; -+ esac -+ done -+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -+ dependency_libs="$temp_xrpath $dependency_libs" -+ fi -+ fi - -- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); -+ # Make sure dlfiles contains only unique files that won't be dlpreopened -+ old_dlfiles="$dlfiles" -+ dlfiles= -+ for lib in $old_dlfiles; do -+ case " $dlprefiles $dlfiles " in -+ *" $lib "*) ;; -+ *) dlfiles="$dlfiles $lib" ;; -+ esac -+ done - -- if ((wrapper == NULL) || (*wrapper == '\0')) -- return NULL; -+ # Make sure dlprefiles contains only unique files -+ old_dlprefiles="$dlprefiles" -+ dlprefiles= -+ for lib in $old_dlprefiles; do -+ case "$dlprefiles " in -+ *" $lib "*) ;; -+ *) dlprefiles="$dlprefiles $lib" ;; -+ esac -+ done - -- /* Absolute path? */ --#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -- if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') -- { -- concat_name = xstrdup (wrapper); -- if (check_executable (concat_name)) -- return concat_name; -- XFREE (concat_name); -- } -- else -- { --#endif -- if (IS_DIR_SEPARATOR (wrapper[0])) -- { -- concat_name = xstrdup (wrapper); -- if (check_executable (concat_name)) -- return concat_name; -- XFREE (concat_name); -- } --#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -- } --#endif -+ if test "$build_libtool_libs" = yes; then -+ if test -n "$rpath"; then -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) -+ # these systems don't actually have a c library (as such)! -+ ;; -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C library is in the System framework -+ deplibs="$deplibs -framework System" -+ ;; -+ *-*-netbsd*) -+ # Don't link with libc until the a.out ld.so is fixed. -+ ;; -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc due to us having libc/libc_r. -+ ;; -+ *-*-sco3.2v5* | *-*-sco5v6*) -+ # Causes problems with __ctype -+ ;; -+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -+ # Compiler inserts libc in the correct place for threads to work -+ ;; -+ *) -+ # Add libc to deplibs on all other systems if necessary. -+ if test "$build_libtool_need_lc" = "yes"; then -+ deplibs="$deplibs -lc" -+ fi -+ ;; -+ esac -+ fi - -- for (p = wrapper; *p; p++) -- if (*p == '/') -- { -- has_slash = 1; -- break; -- } -- if (!has_slash) -- { -- /* no slashes; search PATH */ -- const char *path = getenv ("PATH"); -- if (path != NULL) -- { -- for (p = path; *p; p = p_next) -- { -- const char *q; -- size_t p_len; -- for (q = p; *q; q++) -- if (IS_PATH_SEPARATOR (*q)) -- break; -- p_len = q - p; -- p_next = (*q == '\0' ? q : q + 1); -- if (p_len == 0) -- { -- /* empty path: current directory */ -- if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -- tmp_len = strlen (tmp); -- concat_name = -- XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -- memcpy (concat_name, tmp, tmp_len); -- concat_name[tmp_len] = '/'; -- strcpy (concat_name + tmp_len + 1, wrapper); -- } -- else -- { -- concat_name = -- XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); -- memcpy (concat_name, p, p_len); -- concat_name[p_len] = '/'; -- strcpy (concat_name + p_len + 1, wrapper); -- } -- if (check_executable (concat_name)) -- return concat_name; -- XFREE (concat_name); -- } -- } -- /* not found in PATH; assume curdir */ -- } -- /* Relative path | not found in path: prepend cwd */ -- if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -- tmp_len = strlen (tmp); -- concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -- memcpy (concat_name, tmp, tmp_len); -- concat_name[tmp_len] = '/'; -- strcpy (concat_name + tmp_len + 1, wrapper); -- -- if (check_executable (concat_name)) -- return concat_name; -- XFREE (concat_name); -- return NULL; --} -- --char * --chase_symlinks (const char *pathspec) --{ --#ifndef S_ISLNK -- return xstrdup (pathspec); --#else -- char buf[LT_PATHMAX]; -- struct stat s; -- char *tmp_pathspec = xstrdup (pathspec); -- char *p; -- int has_symlinks = 0; -- while (strlen (tmp_pathspec) && !has_symlinks) -- { -- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -- tmp_pathspec)); -- if (lstat (tmp_pathspec, &s) == 0) -- { -- if (S_ISLNK (s.st_mode) != 0) -- { -- has_symlinks = 1; -- break; -- } -- -- /* search backwards for last DIR_SEPARATOR */ -- p = tmp_pathspec + strlen (tmp_pathspec) - 1; -- while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) -- p--; -- if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) -- { -- /* no more DIR_SEPARATORS left */ -- break; -- } -- *p = '\0'; -- } -- else -- { -- char *errstr = strerror (errno); -- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -- } -- } -- XFREE (tmp_pathspec); -- -- if (!has_symlinks) -- { -- return xstrdup (pathspec); -- } -- -- tmp_pathspec = realpath (pathspec, buf); -- if (tmp_pathspec == 0) -- { -- lt_fatal ("Could not follow symlinks for %s", pathspec); -- } -- return xstrdup (tmp_pathspec); --#endif --} -- --char * --strendzap (char *str, const char *pat) --{ -- size_t len, patlen; -- -- assert (str != NULL); -- assert (pat != NULL); -+ # Transform deplibs into only deplibs that can be linked in shared. -+ name_save=$name -+ libname_save=$libname -+ release_save=$release -+ versuffix_save=$versuffix -+ major_save=$major -+ # I'm not sure if I'm treating the release correctly. I think -+ # release should show up in the -l (ie -lgmp5) so we don't want to -+ # add it in twice. Is that correct? -+ release="" -+ versuffix="" -+ major="" -+ newdeplibs= -+ droppeddeps=no -+ case $deplibs_check_method in -+ pass_all) -+ # Don't check for shared/static. Everything works. -+ # This might be a little naive. We might want to check -+ # whether the library exists or not. But this is on -+ # osf3 & osf4 and I'm not really sure... Just -+ # implementing what was already the behavior. -+ newdeplibs=$deplibs -+ ;; -+ test_compile) -+ # This code stresses the "libraries are programs" paradigm to its -+ # limits. Maybe even breaks it. We compile a program, linking it -+ # against the deplibs as a proxy for the library. Then we can check -+ # whether they linked in statically or dynamically with ldd. -+ $rm conftest.c -+ cat > conftest.c <<EOF -+ int main() { return 0; } -+EOF -+ $rm conftest -+ 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" != "0"; then -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $i "*) -+ newdeplibs="$newdeplibs $i" -+ i="" -+ ;; -+ esac -+ fi -+ if test -n "$i" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ deplib_matches=`eval \\$echo \"$library_names_spec\"` -+ set dummy $deplib_matches -+ deplib_match=$2 -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ newdeplibs="$newdeplibs $i" -+ else -+ droppeddeps=yes -+ $echo -+ $echo "*** Warning: dynamic linker does not accept needed library $i." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which I believe you do not have" -+ $echo "*** because a test_compile did reveal that the linker did not use it for" -+ $echo "*** its dynamic dependency list that programs get resolved with at runtime." -+ fi -+ fi -+ else -+ newdeplibs="$newdeplibs $i" -+ fi -+ done -+ else -+ # Error occurred in the first compile. Let's try to salvage -+ # the situation: Compile a separate program for each library. -+ 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" != "0"; then -+ $rm conftest -+ 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 -+ *" $i "*) -+ newdeplibs="$newdeplibs $i" -+ i="" -+ ;; -+ esac -+ fi -+ if test -n "$i" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ deplib_matches=`eval \\$echo \"$library_names_spec\"` -+ set dummy $deplib_matches -+ deplib_match=$2 -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ newdeplibs="$newdeplibs $i" -+ else -+ droppeddeps=yes -+ $echo -+ $echo "*** Warning: dynamic linker does not accept needed library $i." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because a test_compile did reveal that the linker did not use this one" -+ $echo "*** as a dynamic dependency that programs can get resolved with at runtime." -+ fi -+ fi -+ else -+ 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 "*** library that it depends on before this library will be fully" -+ $echo "*** functional. Installing it before continuing would be even better." -+ fi -+ else -+ newdeplibs="$newdeplibs $i" -+ fi -+ done -+ fi -+ ;; -+ file_magic*) -+ set dummy $deplibs_check_method -+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -+ for a_deplib in $deplibs; do -+ name=`expr $a_deplib : '-l\(.*\)'` -+ # If $name is empty we are operating on a -L argument. -+ if test "$name" != "" && test "$name" != "0"; then -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $a_deplib "*) -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ ;; -+ esac -+ fi -+ if test -n "$a_deplib" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do -+ # Follow soft links. -+ if ls -lLd "$potent_lib" 2>/dev/null \ -+ | grep " -> " >/dev/null; then -+ continue -+ fi -+ # The statement above tries to avoid entering an -+ # endless loop below, in case of cyclic links. -+ # We might still enter an endless loop, since a link -+ # loop can be closed while we follow links, -+ # but so what? -+ potlib="$potent_lib" -+ while test -h "$potlib" 2>/dev/null; do -+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` -+ case $potliblink in -+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -+ *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; -+ esac -+ done -+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ -+ | ${SED} 10q \ -+ | $EGREP "$file_magic_regex" > /dev/null; then -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ break 2 -+ fi -+ done -+ done -+ fi -+ if test -n "$a_deplib" ; then -+ droppeddeps=yes -+ $echo -+ $echo "*** Warning: linker path does not have real file for library $a_deplib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ $echo "*** with $libname but no candidates were found. (...for file magic test)" -+ else -+ $echo "*** with $libname and none of the candidates passed a file format test" -+ $echo "*** using a file magic. Last file checked: $potlib" -+ fi -+ fi -+ else -+ # Add a -L argument. -+ newdeplibs="$newdeplibs $a_deplib" -+ fi -+ done # Gone through all deplibs. -+ ;; -+ match_pattern*) -+ set dummy $deplibs_check_method -+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -+ for a_deplib in $deplibs; do -+ name=`expr $a_deplib : '-l\(.*\)'` -+ # If $name is empty we are operating on a -L argument. -+ if test -n "$name" && test "$name" != "0"; then -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $a_deplib "*) -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ ;; -+ esac -+ fi -+ if test -n "$a_deplib" ; then -+ libname=`eval \\$echo \"$libname_spec\"` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do -+ potlib="$potent_lib" # see symlink-check above in file_magic test -+ if eval $echo \"$potent_lib\" 2>/dev/null \ -+ | ${SED} 10q \ -+ | $EGREP "$match_pattern_regex" > /dev/null; then -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ break 2 -+ fi -+ done -+ done -+ fi -+ if test -n "$a_deplib" ; then -+ droppeddeps=yes -+ $echo -+ $echo "*** Warning: linker path does not have real file for library $a_deplib." -+ $echo "*** I have the capability to make that library automatically link in when" -+ $echo "*** you link to this library. But I can only do this if you have a" -+ $echo "*** shared version of the library, which you do not appear to have" -+ $echo "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ $echo "*** with $libname but no candidates were found. (...for regex pattern test)" -+ else -+ $echo "*** with $libname and none of the candidates passed a file format test" -+ $echo "*** using a regex pattern. Last file checked: $potlib" -+ fi -+ fi -+ else -+ # Add a -L argument. -+ newdeplibs="$newdeplibs $a_deplib" -+ fi -+ done # Gone through all deplibs. -+ ;; -+ none | unknown | *) -+ newdeplibs="" -+ tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ -+ -e 's/ -[LR][^ ]*//g'` -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ for i in $predeps $postdeps ; do -+ # can't use Xsed below, because $i might contain '/' -+ tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` -+ done -+ fi -+ if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ -+ | grep . >/dev/null; then -+ $echo -+ if test "X$deplibs_check_method" = "Xnone"; then -+ $echo "*** Warning: inter-library dependencies are not supported in this platform." -+ else -+ $echo "*** Warning: inter-library dependencies are not known to be supported." -+ fi -+ $echo "*** All declared inter-library dependencies are being dropped." -+ droppeddeps=yes -+ fi -+ ;; -+ esac -+ versuffix=$versuffix_save -+ major=$major_save -+ release=$release_save -+ libname=$libname_save -+ name=$name_save - -- len = strlen (str); -- patlen = strlen (pat); -+ case $host in -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # On Rhapsody replace the C library is the System framework -+ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` -+ ;; -+ esac - -- if (patlen <= len) -- { -- str += len - patlen; -- if (strcmp (str, pat) == 0) -- *str = '\0'; -- } -- return str; --} -+ if test "$droppeddeps" = yes; then -+ if test "$module" = yes; then -+ $echo -+ $echo "*** Warning: libtool could not satisfy all declared inter-library" -+ $echo "*** dependencies of module $libname. Therefore, libtool will create" -+ $echo "*** a static module, that should work as long as the dlopening" -+ $echo "*** application is linked with the -dlopen flag." -+ if test -z "$global_symbol_pipe"; then -+ $echo -+ $echo "*** However, this would only work if libtool was able to extract symbol" -+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ $echo "*** not find such a program. So, this module is probably useless." -+ $echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ fi -+ if test "$build_old_libs" = no; then -+ oldlibs="$output_objdir/$libname.$libext" -+ build_libtool_libs=module -+ build_old_libs=yes -+ else -+ build_libtool_libs=no -+ fi -+ else -+ $echo "*** The inter-library dependencies that have been dropped here will be" -+ $echo "*** automatically added whenever a program is linked with this library" -+ $echo "*** or is declared to -dlopen it." - --static void --lt_error_core (int exit_status, const char *mode, -- const char *message, va_list ap) --{ -- fprintf (stderr, "%s: %s: ", program_name, mode); -- vfprintf (stderr, message, ap); -- fprintf (stderr, ".\n"); -+ if test "$allow_undefined" = no; then -+ $echo -+ $echo "*** Since this library must not contain undefined symbols," -+ $echo "*** because either the platform does not support them or" -+ $echo "*** it was explicitly requested with -no-undefined," -+ $echo "*** libtool will only create a static version of it." -+ if test "$build_old_libs" = no; then -+ oldlibs="$output_objdir/$libname.$libext" -+ build_libtool_libs=module -+ build_old_libs=yes -+ else -+ build_libtool_libs=no -+ fi -+ fi -+ fi -+ fi -+ # Done checking deplibs! -+ deplibs=$newdeplibs -+ fi - -- if (exit_status >= 0) -- exit (exit_status); --} - --void --lt_fatal (const char *message, ...) --{ -- va_list ap; -- va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -- va_end (ap); --} -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; -+ *) -+ case " $deplibs " in -+ *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; -+ esac -+ ;; -+ esac -+ done -+ for deplib in $deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ done -+ deplibs="$new_libs" - --void --lt_setenv (const char *name, const char *value) --{ -- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -- (name ? name : "<NULL>"), -- (value ? value : "<NULL>"))); -- { --#ifdef HAVE_SETENV -- /* always make a copy, for consistency with !HAVE_SETENV */ -- char *str = xstrdup (value); -- setenv (name, str, 1); --#else -- int len = strlen (name) + 1 + strlen (value) + 1; -- char *str = XMALLOC (char, len); -- sprintf (str, "%s=%s", name, value); -- if (putenv (str) != EXIT_SUCCESS) -- { -- XFREE (str); -- } --#endif -- } --} - --char * --lt_extend_str (const char *orig_value, const char *add, int to_end) --{ -- char *new_value; -- if (orig_value && *orig_value) -- { -- int orig_value_len = strlen (orig_value); -- int add_len = strlen (add); -- new_value = XMALLOC (char, add_len + orig_value_len + 1); -- if (to_end) -- { -- strcpy (new_value, orig_value); -- strcpy (new_value + orig_value_len, add); -- } -- else -- { -- strcpy (new_value, add); -- strcpy (new_value + add_len, orig_value); -- } -- } -- else -- { -- new_value = xstrdup (add); -- } -- return new_value; --} -+ # All the library-specific variables (install_libdir is set above). -+ library_names= -+ old_library= -+ dlname= - --int --lt_split_name_value (const char *arg, char** name, char** value) --{ -- const char *p; -- int len; -- if (!arg || !*arg) -- return 1; -+ # Test again, we may have decided not to build it any more -+ if test "$build_libtool_libs" = yes; then -+ if test "$hardcode_into_libs" = yes; then -+ # Hardcode the library paths -+ hardcode_libdirs= -+ dep_rpath= -+ rpath="$finalize_rpath" -+ test "$mode" != relink && rpath="$compile_rpath$rpath" -+ for libdir in $rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ dep_rpath="$dep_rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ if test -n "$hardcode_libdir_flag_spec_ld"; then -+ 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 -+ fi -+ if test -n "$runpath_var" && test -n "$perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $perm_rpath; do -+ rpath="$rpath$dir:" -+ done -+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" -+ fi -+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" -+ fi - -- p = strchr (arg, (int)'='); -+ shlibpath="$finalize_shlibpath" -+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ if test -n "$shlibpath"; then -+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" -+ fi - -- if (!p) -- return 1; -+ # Get the real and link names of the library. -+ eval shared_ext=\"$shrext_cmds\" -+ eval library_names=\"$library_names_spec\" -+ set dummy $library_names -+ realname="$2" -+ shift; shift - -- *value = xstrdup (++p); -+ if test -n "$soname_spec"; then -+ eval soname=\"$soname_spec\" -+ else -+ soname="$realname" -+ fi -+ if test -z "$dlname"; then -+ dlname=$soname -+ fi - -- len = strlen (arg) - strlen (*value); -- *name = XMALLOC (char, len); -- strncpy (*name, arg, len-1); -- (*name)[len - 1] = '\0'; -+ lib="$output_objdir/$realname" -+ linknames= -+ for link -+ do -+ linknames="$linknames $link" -+ done - -- return 0; --} -+ # Use standard objects if they are pic -+ test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - --void --lt_opt_process_env_set (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -+ # Prepare the list of exported symbols -+ if test -z "$export_symbols"; then -+ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then -+ $show "generating symbol list for \`$libname.la'" -+ export_symbols="$output_objdir/$libname.exp" -+ $run $rm $export_symbols -+ cmds=$export_symbols_cmds -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ if len=`expr "X$cmd" : ".*"` && -+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ skipped_export=false -+ else -+ # The command line is too long to execute in one step. -+ $show "using reloadable object file for export list..." -+ skipped_export=: -+ # Break out early, otherwise skipped_export may be -+ # set to false by a later but shorter cmd. -+ break -+ fi -+ done -+ IFS="$save_ifs" -+ if test -n "$export_symbols_regex"; then -+ $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" -+ $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -+ $show "$mv \"${export_symbols}T\" \"$export_symbols\"" -+ $run eval '$mv "${export_symbols}T" "$export_symbols"' -+ fi -+ fi -+ fi - -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); -- } -+ if test -n "$export_symbols" && test -n "$include_expsyms"; then -+ $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' -+ fi - -- lt_setenv (name, value); -- XFREE (name); -- XFREE (value); --} -+ tmp_deplibs= -+ for test_deplib in $deplibs; do -+ case " $convenience " in -+ *" $test_deplib "*) ;; -+ *) -+ tmp_deplibs="$tmp_deplibs $test_deplib" -+ ;; -+ esac -+ done -+ deplibs="$tmp_deplibs" - --void --lt_opt_process_env_prepend (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- char *new_value = NULL; -+ if test -n "$convenience"; then -+ if test -n "$whole_archive_flag_spec"; then -+ save_libobjs=$libobjs -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -+ else -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" - -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); -- } -+ func_extract_archives $gentop $convenience -+ libobjs="$libobjs $func_extract_archives_result" -+ fi -+ fi -+ -+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -+ eval flag=\"$thread_safe_flag_spec\" -+ linker_flags="$linker_flags $flag" -+ fi - -- new_value = lt_extend_str (getenv (name), value, 0); -- lt_setenv (name, new_value); -- XFREE (new_value); -- XFREE (name); -- XFREE (value); --} -+ # Make a backup of the uninstalled library when relinking -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? -+ fi - --void --lt_opt_process_env_append (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- char *new_value = NULL; -+ # Do each of the archive commands. -+ if test "$module" = yes && test -n "$module_cmds" ; then -+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -+ eval test_cmds=\"$module_expsym_cmds\" -+ cmds=$module_expsym_cmds -+ else -+ eval test_cmds=\"$module_cmds\" -+ cmds=$module_cmds -+ fi -+ else -+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -+ eval test_cmds=\"$archive_expsym_cmds\" -+ cmds=$archive_expsym_cmds -+ else -+ eval test_cmds=\"$archive_cmds\" -+ cmds=$archive_cmds -+ fi -+ fi - -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); -- } -+ if test "X$skipped_export" != "X:" && -+ len=`expr "X$test_cmds" : ".*" 2>/dev/null` && -+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ : -+ else -+ # The command line is too long to link in one step, link piecewise. -+ $echo "creating reloadable object files..." - -- new_value = lt_extend_str (getenv (name), value, 1); -- lt_setenv (name, new_value); -- XFREE (new_value); -- XFREE (name); -- XFREE (value); --} -+ # Save the value of $output and $libobjs because we want to -+ # use them later. If we have whole_archive_flag_spec, we -+ # want to use save_libobjs as it was before -+ # whole_archive_flag_spec was expanded, because we can't -+ # assume the linker understands whole_archive_flag_spec. -+ # This may have to be revisited, in case too many -+ # convenience libraries get linked in and end up exceeding -+ # the spec. -+ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then -+ save_libobjs=$libobjs -+ fi -+ save_output=$output -+ output_la=`$echo "X$output" | $Xsed -e "$basename"` - --void --lt_update_exe_path (const char *name, const char *value) --{ -- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- (name ? name : "<NULL>"), -- (value ? value : "<NULL>"))); -+ # Clear the reloadable object creation command queue and -+ # initialize k to one. -+ test_cmds= -+ concat_cmds= -+ objlist= -+ delfiles= -+ last_robj= -+ k=1 -+ output=$output_objdir/$output_la-${k}.$objext -+ # Loop over the list of objects to be linked. -+ for obj in $save_libobjs -+ do -+ eval test_cmds=\"$reload_cmds $objlist $last_robj\" -+ if test "X$objlist" = X || -+ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && -+ test "$len" -le "$max_cmd_len"; }; then -+ objlist="$objlist $obj" -+ else -+ # The command $test_cmds is almost too long, add a -+ # command to the queue. -+ if test "$k" -eq 1 ; then -+ # The first file doesn't have a previous command to add. -+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\" -+ else -+ # All subsequent reloadable object files will link in -+ # the last one created. -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" -+ fi -+ last_robj=$output_objdir/$output_la-${k}.$objext -+ k=`expr $k + 1` -+ output=$output_objdir/$output_la-${k}.$objext -+ objlist=$obj -+ len=1 -+ fi -+ done -+ # Handle the remaining objects by creating one last -+ # reloadable object file. All subsequent reloadable object -+ # files will link in the last one created. -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" - -- if (name && *name && value && *value) -- { -- char *new_value = lt_extend_str (getenv (name), value, 0); -- /* some systems can't cope with a ':'-terminated path #' */ -- int len = strlen (new_value); -- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) -- { -- new_value[len-1] = '\0'; -- } -- lt_setenv (name, new_value); -- XFREE (new_value); -- } --} -+ if ${skipped_export-false}; then -+ $show "generating symbol list for \`$libname.la'" -+ export_symbols="$output_objdir/$libname.exp" -+ $run $rm $export_symbols -+ libobjs=$output -+ # Append the command to create the export file. -+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" -+ fi + -+ # Set up a command to remove the reloadable object files -+ # after they are used. -+ i=0 -+ while test "$i" -lt "$k" -+ do -+ i=`expr $i + 1` -+ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" -+ done ++ ++ ++# func_version ++# Echo version message to standard output and exit. ++func_version () ++{ ++ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { ++ s/^# // ++ s/^# *$// ++ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ ++ p ++ }' < "$progpath" ++ exit $? ++} ++ ++# func_usage ++# Echo short help message to standard output and exit. ++func_usage () ++{ ++ $SED -n '/^# Usage:/,/# -h/ { ++ s/^# // ++ s/^# *$// ++ s/\$progname/'$progname'/ ++ p ++ }' < "$progpath" ++ $ECHO ++ $ECHO "run \`$progname --help | more' for full usage" ++ exit $? ++} ++ ++# func_help ++# Echo long help message to standard output and exit. ++func_help () ++{ ++ $SED -n '/^# Usage:/,/# Report bugs to/ { ++ s/^# // ++ s/^# *$// ++ s*\$progname*'$progname'* ++ s*\$host*'"$host"'* ++ s*\$SHELL*'"$SHELL"'* ++ s*\$LTCC*'"$LTCC"'* ++ s*\$LTCFLAGS*'"$LTCFLAGS"'* ++ s*\$LD*'"$LD"'* ++ s/\$with_gnu_ld/'"$with_gnu_ld"'/ ++ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ ++ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ ++ p ++ }' < "$progpath" ++ exit $? ++} ++ ++# func_missing_arg argname ++# Echo program name prefixed message to standard error and set global ++# exit_cmd. ++func_missing_arg () ++{ ++ func_error "missing argument for $1" ++ exit_cmd=exit + } +-# End of Shell function definitions +-##################################### --void --lt_update_lib_path (const char *name, const char *value) --{ -- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- (name ? name : "<NULL>"), -- (value ? value : "<NULL>"))); +-# Darwin sucks +-eval std_shrext=\"$shrext_cmds\" ++exit_cmd=: + +-disable_libs=no + +-# Parse our command line options once, thoroughly. +-while test "$#" -gt 0 +-do +- arg="$1" ++ ++ ++ ++# Check that we have a working $ECHO. ++if test "X$1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. + shift ++elif test "X$1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then ++ # Yippee, $ECHO works! ++ : ++else ++ # Restart under the correct shell, and then maybe $ECHO will work. ++ exec $SHELL "$progpath" --no-reexec ${1+"$@"} ++fi + +- case $arg in +- -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; +- *) optarg= ;; +- esac ++if test "X$1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat <<EOF ++$* ++EOF ++ exit $EXIT_SUCCESS ++fi + +- # If the previous option needs an argument, assign it. +- if test -n "$prev"; then +- case $prev in +- execute_dlfiles) +- execute_dlfiles="$execute_dlfiles $arg" +- ;; +- tag) +- tagname="$arg" +- preserve_args="${preserve_args}=$arg" - -- if (name && *name && value && *value) -- { -- char *new_value = lt_extend_str (getenv (name), value, 0); -- lt_setenv (name, new_value); -- XFREE (new_value); -- } --} -+ $echo "creating a temporary reloadable object file: $output" +- # Check whether tagname contains only valid characters +- case $tagname in +- *[!-_A-Za-z0-9,/]*) +- $echo "$progname: invalid tag name: $tagname" 1>&2 +- exit $EXIT_FAILURE +- ;; +- esac ++magic="%%%MAGIC variable%%%" ++magic_exe="%%%MAGIC EXE variable%%%" -+ # Loop through the commands generated above and execute them. -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $concat_cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" +- case $tagname in +- CC) +- # Don't test for the "default" C tag, as we know, it's there, but +- # not specially marked. +- ;; +- *) +- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then +- taglist="$taglist $tagname" +- # Evaluate the configuration. +- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" +- else +- $echo "$progname: ignoring unknown tag $tagname" 1>&2 +- fi +- ;; +- esac +- ;; +- *) +- eval "$prev=\$arg" +- ;; +- esac ++# Global variables. ++# $mode is unset ++nonopt= ++execute_dlfiles= ++preserve_args= ++lo2o="s/\\.lo\$/.${objext}/" ++o2lo="s/\\.${objext}\$/.lo/" ++extracted_archives= ++extracted_serial=0 +- prev= +- prevopt= +- continue +- fi ++opt_dry_run=false ++opt_duplicate_deps=false ++opt_silent=false ++opt_debug=: + +- # Have we seen a non-optional argument yet? +- case $arg in +- --help) +- show_help=yes +- ;; ++# If this variable is set in any of the actions, the command in it ++# will be execed at the end. This prevents here-documents from being ++# left over by shells. ++exec_cmd= + +- --version) +- echo "\ +-$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP +- +-Copyright (C) 2008 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 $? +- ;; ++# func_fatal_configuration arg... ++# Echo program name prefixed message to standard error, followed by ++# a configuration failure hint, and exit. ++func_fatal_configuration () ++{ ++ func_error ${1+"$@"} ++ func_error "See the $PACKAGE documentation for more information." ++ func_fatal_error "Fatal configuration error." ++} ++ ++ ++# func_config ++# Display the configuration for all the tags in this script. ++func_config () ++{ ++ re_begincf='^# ### BEGIN LIBTOOL' ++ re_endcf='^# ### END LIBTOOL' ++ ++ # Default configuration. ++ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" + +- --config) +- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath + # Now print the configurations for the tags. + for tagname in $taglist; do +- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" ++ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" + done +- exit $? +- ;; +- +- --debug) +- $echo "$progname: enabling shell trace mode" +- set -x +- preserve_args="$preserve_args $arg" +- ;; + +- --dry-run | -n) +- run=: +- ;; ++ exit $? ++} + +- --features) +- $echo "host: $host" ++# func_features ++# Display the features supported by this script. ++func_features () ++{ ++ $ECHO "host: $host" + if test "$build_libtool_libs" = yes; then +- $echo "enable shared libraries" ++ $ECHO "enable shared libraries" + else +- $echo "disable shared libraries" ++ $ECHO "disable shared libraries" + fi + if test "$build_old_libs" = yes; then +- $echo "enable static libraries" ++ $ECHO "enable static libraries" + else +- $echo "disable static libraries" ++ $ECHO "disable static libraries" + fi ++ + exit $? +- ;; ++} + +- --finish) mode="finish" ;; ++# func_enable_tag tagname ++# Verify that TAGNAME is valid, and either flag an error and exit, or ++# enable the TAGNAME tag. We also add TAGNAME to the global $taglist ++# variable here. ++func_enable_tag () ++{ ++ # Global variable: ++ tagname="$1" ++ ++ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" ++ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" ++ sed_extractcf="/$re_begincf/,/$re_endcf/p" ++ ++ # Validate tagname. ++ case $tagname in ++ *[!-_A-Za-z0-9,/]*) ++ func_fatal_error "invalid tag name: $tagname" ++ ;; ++ esac + +- --mode) prevopt="--mode" prev=mode ;; +- --mode=*) mode="$optarg" ;; ++ # Don't test for the "default" C tag, as we know it's ++ # there but not specially marked. ++ case $tagname in ++ CC) ;; ++ *) ++ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then ++ taglist="$taglist $tagname" + +- --preserve-dup-deps) duplicate_deps="yes" ;; ++ # Evaluate the configuration. Be careful to quote the path ++ # and the sed script, to avoid splitting on whitespace, but ++ # also don't use non-portable quotes within backquotes within ++ # quotes we have to do it in 2 steps: ++ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` ++ eval "$extractedcf" ++ else ++ func_error "ignoring unknown tag $tagname" ++ fi ++ ;; ++ esac ++} + +- --quiet | --silent) +- show=: +- preserve_args="$preserve_args $arg" +- ;; ++# Parse options once, thoroughly. This comes as soon as possible in ++# the script to make things like `libtool --version' happen quickly. ++{ + +- --tag) +- prevopt="--tag" +- prev=tag +- preserve_args="$preserve_args --tag" ++ # Shorthand for --mode=foo, only valid as the first argument ++ case $1 in ++ clean|clea|cle|cl) ++ shift; set dummy --mode clean ${1+"$@"}; shift + ;; +- --tag=*) +- set tag "$optarg" ${1+"$@"} +- shift +- prev=tag +- preserve_args="$preserve_args --tag" ++ compile|compil|compi|comp|com|co|c) ++ shift; set dummy --mode compile ${1+"$@"}; shift + ;; +- +- -dlopen) +- prevopt="-dlopen" +- prev=execute_dlfiles ++ execute|execut|execu|exec|exe|ex|e) ++ shift; set dummy --mode execute ${1+"$@"}; shift + ;; +- +- -*) +- $echo "$modename: unrecognized option \`$arg'" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE ++ finish|finis|fini|fin|fi|f) ++ shift; set dummy --mode finish ${1+"$@"}; shift + ;; +- +- *) +- nonopt="$arg" +- break ++ install|instal|insta|inst|ins|in|i) ++ shift; set dummy --mode install ${1+"$@"}; shift ++ ;; ++ link|lin|li|l) ++ shift; set dummy --mode link ${1+"$@"}; shift ++ ;; ++ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) ++ shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac +-done + +-if test -n "$prevopt"; then +- $echo "$modename: option \`$prevopt' requires an argument" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +-fi ++ # Parse non-mode specific arguments: ++ while test "$#" -gt 0; do ++ opt="$1" ++ shift + +-case $disable_libs in +-no) +- ;; +-shared) +- build_libtool_libs=no +- build_old_libs=yes +- ;; +-static) +- build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` +- ;; +-esac ++ case $opt in ++ --config) func_config ;; + +-# If this variable is set in any of the actions, the command in it +-# will be execed at the end. This prevents here-documents from being +-# left over by shells. +-exec_cmd= ++ --debug) preserve_args="$preserve_args $opt" ++ func_echo "enabling shell trace mode" ++ opt_debug='set -x' ++ $opt_debug ++ ;; + +-if test -z "$show_help"; then ++ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break ++ execute_dlfiles="$execute_dlfiles $1" ++ shift ++ ;; + +- # Infer the operation mode. +- if test -z "$mode"; then +- $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 +- $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 +- case $nonopt in +- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) +- mode=link +- for arg +- do +- case $arg in +- -c) +- mode=compile +- break +- ;; +- esac +- done +- ;; +- *db | *dbx | *strace | *truss) +- mode=execute +- ;; +- *install*|cp|mv) +- mode=install +- ;; +- *rm) +- mode=uninstall ++ --dry-run | -n) opt_dry_run=: ;; ++ --features) func_features ;; ++ --finish) mode="finish" ;; ++ ++ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break ++ case $1 in ++ # Valid mode arguments: ++ clean) ;; ++ compile) ;; ++ execute) ;; ++ finish) ;; ++ install) ;; ++ link) ;; ++ relink) ;; ++ uninstall) ;; ++ ++ # Catch anything else as an error ++ *) func_error "invalid argument for $opt" ++ exit_cmd=exit ++ break ++ ;; ++ esac ++ ++ mode="$1" ++ shift ++ ;; ++ ++ --preserve-dup-deps) ++ opt_duplicate_deps=: ;; ++ ++ --quiet|--silent) preserve_args="$preserve_args $opt" ++ opt_silent=: ++ ;; ++ ++ --verbose| -v) preserve_args="$preserve_args $opt" ++ opt_silent=false ++ ;; ++ ++ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break ++ preserve_args="$preserve_args $opt $1" ++ func_enable_tag "$1" # tagname is set here ++ shift ++ ;; ++ ++ # Separate optargs to long options: ++ -dlopen=*|--mode=*|--tag=*) ++ func_opt_split "$opt" ++ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} ++ shift ++ ;; ++ ++ -\?|-h) func_usage ;; ++ --help) opt_help=: ;; ++ --version) func_version ;; ++ ++ -*) func_fatal_help "unrecognized option \`$opt'" ;; ++ ++ *) nonopt="$opt" ++ break ++ ;; ++ esac ++ done ++ ++ ++ case $host in ++ *cygwin* | *mingw* | *pw32* | *cegcc*) ++ # don't eliminate duplications in $postdeps and $predeps ++ opt_duplicate_compiler_generated_deps=: + ;; + *) +- # If we have no mode, but dlfiles were specified, then do execute mode. +- test -n "$execute_dlfiles" && mode=execute ++ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ++ ;; ++ esac + +- # Just use the default operation mode. +- if test -z "$mode"; then +- if test -n "$nonopt"; then +- $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 +- else +- $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 +- fi ++ # Having warned about all mis-specified options, bail out if ++ # anything was wrong. ++ $exit_cmd $EXIT_FAILURE ++} ++ ++# func_check_version_match ++# Ensure that we are using m4 macros, and libtool script from the same ++# release of libtool. ++func_check_version_match () ++{ ++ if test "$package_revision" != "$macro_revision"; then ++ if test "$VERSION" != "$macro_version"; then ++ if test -z "$macro_version"; then ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from an older release. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, but the ++$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. ++$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION ++$progname: and run autoconf again. ++_LT_EOF + fi +- ;; +- esac ++ else ++ cat >&2 <<_LT_EOF ++$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, ++$progname: but the definition of this LT_INIT comes from revision $macro_revision. ++$progname: You should recreate aclocal.m4 with macros from revision $package_revision ++$progname: of $PACKAGE $VERSION and run autoconf again. ++_LT_EOF ++ fi ++ ++ exit $EXIT_MISMATCH ++ fi ++} ++ ++ ++## ----------- ## ++## Main. ## ++## ----------- ## ++ ++$opt_help || { ++ # Sanity checks first: ++ func_check_version_match ++ ++ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then ++ func_fatal_configuration "not configured to build any kind of library" + fi + ++ test -z "$mode" && func_fatal_error "error: you must specify a MODE." ++ ++ ++ # Darwin sucks ++ eval std_shrext=\"$shrext_cmds\" ++ ++ + # Only execute mode is allowed to have -dlopen flags. + if test -n "$execute_dlfiles" && test "$mode" != execute; then +- $echo "$modename: unrecognized option \`-dlopen'" 1>&2 +- $echo "$help" 1>&2 ++ func_error "unrecognized option \`-dlopen'" ++ $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help="$help" +- help="Try \`$modename --help --mode=$mode' for more information." ++ help="Try \`$progname --help --mode=$mode' for more information." ++} + +- # These modes are in order of execution frequency so that they run quickly. +- case $mode in +- # libtool compile mode +- compile) +- modename="$modename: compile" +- # Get the compilation command and the source file. +- base_compile= +- srcfile="$nonopt" # always keep a non-empty value in "srcfile" +- suppress_opt=yes +- suppress_output= +- arg_mode=normal +- libobj= +- later= + +- for arg +- do +- case $arg_mode in +- arg ) +- # do not "continue". Instead, add this to base_compile +- lastarg="$arg" +- arg_mode=normal +- ;; ++# func_lalib_p file ++# True iff FILE is a libtool `.la' library or `.lo' object file. ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_lalib_p () ++{ ++ test -f "$1" && ++ $SED -e 4q "$1" 2>/dev/null \ ++ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 ++} + +- target ) +- libobj="$arg" +- arg_mode=normal +- continue +- ;; ++# func_lalib_unsafe_p file ++# True iff FILE is a libtool `.la' library or `.lo' object file. ++# This function implements the same check as func_lalib_p without ++# resorting to external programs. To this end, it redirects stdin and ++# closes it afterwards, without saving the original file descriptor. ++# As a safety measure, use it only where a negative result would be ++# fatal anyway. Works if `file' does not exist. ++func_lalib_unsafe_p () ++{ ++ lalib_p=no ++ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then ++ for lalib_p_l in 1 2 3 4 ++ do ++ read lalib_p_line ++ case "$lalib_p_line" in ++ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; ++ esac ++ done ++ exec 0<&5 5<&- ++ fi ++ test "$lalib_p" = yes ++} + +- normal ) +- # Accept any command-line options. +- case $arg in +- -o) +- if test -n "$libobj" ; then +- $echo "$modename: you cannot specify \`-o' more than once" 1>&2 +- exit $EXIT_FAILURE +- fi +- arg_mode=target +- continue +- ;; ++# func_ltwrapper_script_p file ++# True iff FILE is a libtool wrapper script ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_ltwrapper_script_p () ++{ ++ func_lalib_p "$1" ++} + +- -static | -prefer-pic | -prefer-non-pic) +- later="$later $arg" +- continue +- ;; ++# func_ltwrapper_executable_p file ++# True iff FILE is a libtool wrapper executable ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_ltwrapper_executable_p () ++{ ++ func_ltwrapper_exec_suffix= ++ case $1 in ++ *.exe) ;; ++ *) func_ltwrapper_exec_suffix=.exe ;; ++ esac ++ $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 ++} ++ ++# func_ltwrapper_scriptname file ++# Assumes file is an ltwrapper_executable ++# uses $file to determine the appropriate filename for a ++# temporary ltwrapper_script. ++func_ltwrapper_scriptname () ++{ ++ func_ltwrapper_scriptname_result="" ++ if func_ltwrapper_executable_p "$1"; then ++ func_dirname_and_basename "$1" "" "." ++ func_stripname '' '.exe' "$func_basename_result" ++ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" ++ fi ++} ++ ++# func_ltwrapper_p file ++# True iff FILE is a libtool wrapper script or wrapper executable ++# This function is only a basic sanity check; it will hardly flush out ++# determined imposters. ++func_ltwrapper_p () ++{ ++ func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" ++} ++ ++ ++# func_execute_cmds commands fail_cmd ++# Execute tilde-delimited COMMANDS. ++# If FAIL_CMD is given, eval that upon failure. ++# FAIL_CMD may read-access the current command in variable CMD! ++func_execute_cmds () ++{ ++ $opt_debug ++ save_ifs=$IFS; IFS='~' ++ for cmd in $1; do ++ IFS=$save_ifs ++ eval cmd=\"$cmd\" ++ func_show_eval "$cmd" "${2-:}" ++ done ++ IFS=$save_ifs ++} ++ ++ ++# func_source file ++# Source FILE, adding directory component if necessary. ++# Note that it is not necessary on cygwin/mingw to append a dot to ++# FILE even if both FILE and FILE.exe exist: automatic-append-.exe ++# behavior happens only for exec(3), not for open(2)! Also, sourcing ++# `FILE.' does not work on cygwin managed mounts. ++func_source () ++{ ++ $opt_debug ++ case $1 in ++ */* | *\\*) . "$1" ;; ++ *) . "./$1" ;; ++ esac ++} ++ ++ ++# func_infer_tag arg ++# Infer tagged configuration to use if any are available and ++# if one wasn't chosen via the "--tag" command line option. ++# Only attempt this if the compiler in the base compile ++# command doesn't match the default compiler. ++# arg is usually of the form 'gcc ...' ++func_infer_tag () ++{ ++ $opt_debug ++ if test -n "$available_tags" && test -z "$tagname"; then ++ CC_quoted= ++ for arg in $CC; do ++ func_quote_for_eval "$arg" ++ CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ done ++ case $@ in ++ # Blanks in the command may have been stripped by the calling shell, ++ # but not from the CC environment variable when configure was run. ++ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; ++ # Blanks at the start of $base_compile will cause this to fail ++ # if we don't check for them as well. ++ *) ++ for z in $available_tags; do ++ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then ++ # Evaluate the configuration. ++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" ++ CC_quoted= ++ for arg in $CC; do ++ # Double-quote args containing other shell metacharacters. ++ func_quote_for_eval "$arg" ++ CC_quoted="$CC_quoted $func_quote_for_eval_result" ++ done ++ case "$@ " in ++ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ++ # The compiler in the base compile command matches ++ # the one in the tagged configuration. ++ # Assume this is the tagged configuration we want. ++ tagname=$z ++ break ++ ;; ++ esac ++ fi ++ done ++ # If $tagname still isn't set, then no tagged configuration ++ # was found and let the user know that the "--tag" command ++ # line option must be used. ++ if test -z "$tagname"; then ++ func_echo "unable to infer tagged configuration" ++ func_fatal_error "specify a tag with \`--tag'" ++# else ++# func_verbose "using $tagname tagged configuration" ++ fi ++ ;; ++ esac ++ fi ++} ++ ++ ++ ++# func_write_libtool_object output_name pic_name nonpic_name ++# Create a libtool object file (analogous to a ".la" file), ++# but don't create it if we're doing a dry run. ++func_write_libtool_object () ++{ ++ write_libobj=${1} ++ if test "$build_libtool_libs" = yes; then ++ write_lobj=\'${2}\' ++ else ++ write_lobj=none ++ fi ++ ++ if test "$build_old_libs" = yes; then ++ write_oldobj=\'${3}\' ++ else ++ write_oldobj=none ++ fi ++ ++ $opt_dry_run || { ++ cat >${write_libobj}T <<EOF ++# $write_libobj - a libtool object file ++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++# ++# Please DO NOT delete this file! ++# It is necessary for linking the library. ++ ++# Name of the PIC object. ++pic_object=$write_lobj ++ ++# Name of the non-PIC object ++non_pic_object=$write_oldobj ++ ++EOF ++ $MV "${write_libobj}T" "${write_libobj}" ++ } ++} ++ ++# func_mode_compile arg... ++func_mode_compile () ++{ ++ $opt_debug ++ # Get the compilation command and the source file. ++ base_compile= ++ srcfile="$nonopt" # always keep a non-empty value in "srcfile" ++ suppress_opt=yes ++ suppress_output= ++ arg_mode=normal ++ libobj= ++ later= ++ pie_flag= ++ ++ for arg ++ do ++ case $arg_mode in ++ arg ) ++ # do not "continue". Instead, add this to base_compile ++ lastarg="$arg" ++ arg_mode=normal ++ ;; ++ ++ target ) ++ libobj="$arg" ++ arg_mode=normal ++ continue ++ ;; ++ ++ normal ) ++ # Accept any command-line options. ++ case $arg in ++ -o) ++ test -n "$libobj" && \ ++ func_fatal_error "you cannot specify \`-o' more than once" ++ arg_mode=target ++ continue ++ ;; ++ ++ -pie | -fpie | -fPIE) ++ pie_flag="$pie_flag $arg" ++ continue ++ ;; ++ ++ -shared | -static | -prefer-pic | -prefer-non-pic) ++ later="$later $arg" ++ continue ++ ;; + + -no-suppress) + suppress_opt=no +@@ -708,31 +1157,25 @@ + ;; # replaced later. I would guess that would be a bug. + + -Wc,*) +- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` ++ func_stripname '-Wc,' '' "$arg" ++ args=$func_stripname_result + lastarg= + save_ifs="$IFS"; IFS=',' +- for arg in $args; do ++ for arg in $args; do + IFS="$save_ifs" +- +- # Double-quote args containing other shell metacharacters. +- # Many Bourne shells cannot handle close brackets correctly +- # in scan sets, so we specify it separately. +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac +- lastarg="$lastarg $arg" ++ func_quote_for_eval "$arg" ++ lastarg="$lastarg $func_quote_for_eval_result" + done + IFS="$save_ifs" +- lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` ++ func_stripname ' ' '' "$lastarg" ++ lastarg=$func_stripname_result + + # Add the arguments to base_compile. + base_compile="$base_compile $lastarg" + continue + ;; + +- * ) ++ *) + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # +@@ -744,66 +1187,42 @@ + esac # case $arg_mode + + # Aesthetically quote the previous argument. +- lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` +- +- case $lastarg in +- # Double-quote args containing other shell metacharacters. +- # Many Bourne shells cannot handle close brackets correctly +- # in scan sets, and some SunOS ksh mistreat backslash-escaping +- # in scan sets (worked around with variable expansion), +- # and furthermore cannot handle '|' '&' '(' ')' in scan sets +- # at all, so we specify them separately. +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- lastarg="\"$lastarg\"" +- ;; +- esac +- +- base_compile="$base_compile $lastarg" ++ func_quote_for_eval "$lastarg" ++ base_compile="$base_compile $func_quote_for_eval_result" + done # for arg + + case $arg_mode in + arg) +- $echo "$modename: you must specify an argument for -Xcompile" +- exit $EXIT_FAILURE ++ func_fatal_error "you must specify an argument for -Xcompile" + ;; + target) +- $echo "$modename: you must specify a target with \`-o'" 1>&2 +- exit $EXIT_FAILURE ++ func_fatal_error "you must specify a target with \`-o'" + ;; + *) + # Get the name of the library object. +- [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` ++ test -z "$libobj" && { ++ func_basename "$srcfile" ++ libobj="$func_basename_result" ++ } + ;; + esac + + # Recognize several different file suffixes. + # If the user specifies -o file.o, it is replaced with file.lo +- xform='[cCFSifmso]' + case $libobj in +- *.ada) xform=ada ;; +- *.adb) xform=adb ;; +- *.ads) xform=ads ;; +- *.asm) xform=asm ;; +- *.c++) xform=c++ ;; +- *.cc) xform=cc ;; +- *.ii) xform=ii ;; +- *.class) xform=class ;; +- *.cpp) xform=cpp ;; +- *.cxx) xform=cxx ;; +- *.[fF][09]?) xform=[fF][09]. ;; +- *.for) xform=for ;; +- *.java) xform=java ;; +- *.obj) xform=obj ;; +- *.sx) xform=sx ;; ++ *.[cCFSifmso] | \ ++ *.ada | *.adb | *.ads | *.asm | \ ++ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ ++ *.[fF][09]? | *.for | *.java | *.obj | *.sx) ++ func_xform "$libobj" ++ libobj=$func_xform_result ++ ;; + esac + +- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` +- + case $libobj in +- *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; ++ *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; + *) +- $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 +- exit $EXIT_FAILURE ++ func_fatal_error "cannot determine name of library object from \`$libobj'" + ;; + esac + +@@ -811,7 +1230,15 @@ + + for arg in $later; do + case $arg in ++ -shared) ++ test "$build_libtool_libs" != yes && \ ++ func_fatal_configuration "can not build a shared library" ++ build_old_libs=no ++ continue ++ ;; ++ + -static) ++ build_libtool_libs=no + build_old_libs=yes + continue + ;; +@@ -828,28 +1255,17 @@ + esac + done + +- qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` +- case $qlibobj in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- qlibobj="\"$qlibobj\"" ;; +- esac +- test "X$libobj" != "X$qlibobj" \ +- && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ +- && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." +- objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` +- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$xdir" = "X$obj"; then +- xdir= +- else +- xdir=$xdir/ +- fi ++ func_quote_for_eval "$libobj" ++ test "X$libobj" != "X$func_quote_for_eval_result" \ ++ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ ++ && func_warning "libobj name \`$libobj' may not contain shell special characters." ++ func_dirname_and_basename "$obj" "/" "" ++ objname="$func_basename_result" ++ xdir="$func_dirname_result" + lobj=${xdir}$objdir/$objname + +- if test -z "$base_compile"; then +- $echo "$modename: you must specify a compilation command" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- fi ++ test -z "$base_compile" && \ ++ func_fatal_help "you must specify a compilation command" + + # Delete any leftover library objects. + if test "$build_old_libs" = yes; then +@@ -858,12 +1274,9 @@ + removelist="$lobj $libobj ${libobj}T" + fi + +- $run $rm $removelist +- trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 +- + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in +- cygwin* | mingw* | pw32* | os2*) ++ cygwin* | mingw* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac +@@ -875,10 +1288,8 @@ + # Calculate the filename of the output object if compiler does + # not support -o with -c + if test "$compiler_c_o" = no; then +- output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} ++ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + lockfile="$output_obj.lock" +- removelist="$removelist $output_obj $lockfile" +- trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 + else + output_obj= + need_locks=no +@@ -888,13 +1299,13 @@ + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test "$need_locks" = yes; then +- until $run ln "$progpath" "$lockfile" 2>/dev/null; do +- $show "Waiting for $lockfile to be removed" ++ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do ++ func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + elif test "$need_locks" = warn; then + if test -f "$lockfile"; then +- $echo "\ ++ $ECHO "\ + *** ERROR, $lockfile exists and contains: + `cat $lockfile 2>/dev/null` + +@@ -905,34 +1316,22 @@ + avoid parallel builds (make -j) in this platform, or get a better + compiler." + +- $run $rm $removelist ++ $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi +- $echo "$srcfile" > "$lockfile" ++ removelist="$removelist $output_obj" ++ $ECHO "$srcfile" > "$lockfile" + fi + ++ $opt_dry_run || $RM $removelist ++ removelist="$removelist $lockfile" ++ trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 ++ + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" + fi +- qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` +- case $qsrcfile in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- qsrcfile="\"$qsrcfile\"" ;; +- esac +- +- $run $rm "$libobj" "${libobj}T" +- +- # Create a libtool object file (analogous to a ".la" file), +- # but don't create it if we're doing a dry run. +- test -z "$run" && cat > ${libobj}T <<EOF +-# $libobj - a libtool object file +-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP +-# +-# Please DO NOT delete this file! +-# It is necessary for linking the library. +- +-# Name of the PIC object. -EOF --} --# end: func_emit_cwrapperexe_src -+ libobjs=$output -+ # Restore the value of output. -+ output=$save_output ++ func_quote_for_eval "$srcfile" ++ qsrcfile=$func_quote_for_eval_result --# func_mode_link arg... --func_mode_link () --{ -- $opt_debug + # Only build a PIC object if we are building libtool libraries. + if test "$build_libtool_libs" = yes; then +@@ -946,32 +1345,19 @@ + command="$base_compile $qsrcfile" + fi + +- if test ! -d "${xdir}$objdir"; then +- $show "$mkdir ${xdir}$objdir" +- $run $mkdir ${xdir}$objdir +- exit_status=$? +- if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then +- exit $exit_status +- fi +- fi ++ func_mkdir_p "$xdir$objdir" + + if test -z "$output_obj"; then + # Place PIC objects in $objdir + command="$command -o $lobj" + fi + +- $run $rm "$lobj" "$output_obj" +- +- $show "$command" +- if $run eval $lt_env "$command"; then : +- else +- test -n "$output_obj" && $run $rm $removelist +- exit $EXIT_FAILURE +- fi ++ func_show_eval_locale "$command" \ ++ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' + + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then +- $echo "\ ++ $ECHO "\ + *** ERROR, $lockfile contains: + `cat $lockfile 2>/dev/null` + +@@ -985,45 +1371,27 @@ + avoid parallel builds (make -j) in this platform, or get a better + compiler." + +- $run $rm $removelist ++ $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then +- $show "$mv $output_obj $lobj" +- if $run $mv $output_obj $lobj; then : +- else +- error=$? +- $run $rm $removelist +- exit $error +- fi ++ func_show_eval '$MV "$output_obj" "$lobj"' \ ++ 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + +- # Append the name of the PIC object to the libtool object file. +- test -z "$run" && cat >> ${libobj}T <<EOF +-pic_object='$objdir/$objname' +- +-EOF +- + # Allow error messages only from the first compilation. + if test "$suppress_opt" = yes; then +- suppress_output=' >/dev/null 2>&1' ++ suppress_output=' >/dev/null 2>&1' + fi +- else +- # No PIC object so indicate it doesn't exist in the libtool +- # object file. +- test -z "$run" && cat >> ${libobj}T <<EOF +-pic_object=none +- +-EOF + fi + + # Only build a position-dependent object if we build old libraries. + if test "$build_old_libs" = yes; then + if test "$pic_mode" != yes; then + # Don't build PIC code +- command="$base_compile $qsrcfile" ++ command="$base_compile $qsrcfile$pie_flag" + else + command="$base_compile $qsrcfile $pic_flag" + fi +@@ -1033,17 +1401,12 @@ + + # Suppress compiler output if we already did a PIC compilation. + command="$command$suppress_output" +- $run $rm "$obj" "$output_obj" +- $show "$command" +- if $run eval $lt_env "$command"; then : +- else +- $run $rm $removelist +- exit $EXIT_FAILURE +- fi ++ func_show_eval_locale "$command" \ ++ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then +- $echo "\ ++ $ECHO "\ + *** ERROR, $lockfile contains: + `cat $lockfile 2>/dev/null` + +@@ -1057,5477 +1420,6783 @@ + avoid parallel builds (make -j) in this platform, or get a better + compiler." + +- $run $rm $removelist ++ $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed + if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then +- $show "$mv $output_obj $obj" +- if $run $mv $output_obj $obj; then : +- else +- error=$? +- $run $rm $removelist +- exit $error +- fi ++ func_show_eval '$MV "$output_obj" "$obj"' \ ++ 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi +- +- # Append the name of the non-PIC object the libtool object file. +- # Only append if the libtool object file exists. +- test -z "$run" && cat >> ${libobj}T <<EOF +-# Name of the non-PIC object. +-non_pic_object='$objname' +- +-EOF +- else +- # Append the name of the non-PIC object the libtool object file. +- # Only append if the libtool object file exists. +- test -z "$run" && cat >> ${libobj}T <<EOF +-# Name of the non-PIC object. +-non_pic_object=none +- +-EOF + fi + +- $run $mv "${libobj}T" "${libobj}" ++ $opt_dry_run || { ++ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" + +- # Unlock the critical section if it was locked +- if test "$need_locks" != no; then +- $run $rm "$lockfile" +- fi ++ # Unlock the critical section if it was locked ++ if test "$need_locks" != no; then ++ removelist=$lockfile ++ $RM "$lockfile" ++ fi ++ } + + exit $EXIT_SUCCESS +- ;; ++} + +- # libtool link mode +- link | relink) +- modename="$modename: link" - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra - # flag for every libtool invocation. - # allow_undefined=no -+ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -+ fi -+ # Expand the library linking commands again to reset the -+ # value of $libobjs for piecewise linking. ++$opt_help || { ++test "$mode" = compile && func_mode_compile ${1+"$@"} ++} - # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not @@ -113614,24 +73172,19 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - allow_undefined=yes - ;; - esac -- libtool_args=$nonopt +- libtool_args="$nonopt" - base_compile="$nonopt $@" -- compile_command=$nonopt -- finalize_command=$nonopt -+ # Do each of the archive commands. -+ if test "$module" = yes && test -n "$module_cmds" ; then -+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -+ cmds=$module_expsym_cmds -+ else -+ cmds=$module_cmds -+ fi -+ else -+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -+ cmds=$archive_expsym_cmds -+ else -+ cmds=$archive_cmds -+ fi -+ fi +- compile_command="$nonopt" +- finalize_command="$nonopt" ++func_mode_help () ++{ ++ # We need to display help for each of the modes. ++ case $mode in ++ "") ++ # Generic help is extracted from the usage comments ++ # at the start of this file. ++ func_help ++ ;; - compile_rpath= - finalize_rpath= @@ -113646,18 +73199,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - dllsearchpath= - lib_search_path=`pwd` - inst_prefix_dir= -- new_inherited_linker_flags= -+ # Append the command to remove the reloadable object files -+ # to the just-reset $cmds. -+ eval cmds=\"\$cmds~\$rm $delfiles\" -+ fi -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $show "$cmd" -+ $run eval "$cmd" || { -+ lt_exit=$? ++ clean) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - avoid_version=no - dlfiles= @@ -113673,6 +73217,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - no_install=no - objs= - non_pic_objects= +- notinst_path= # paths that contain not-installed libtool libraries - precious_files_regex= - prefer_static_libs=no - preload=no @@ -113686,29 +73231,23 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - thread_safe=no - vinfo= - vinfo_number=no -- weak_libs= - single_module="${wl}-single_module" ++Remove files from the build directory. + - func_infer_tag $base_compile -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' -+ fi ++RM is the name of the program to use to delete files associated with each FILE ++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed ++to RM. - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in -- -shared) -- test "$build_libtool_libs" != yes && \ -- func_fatal_configuration "can not build a shared library" -- build_old_libs=no -- break -- ;; - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then -- func_warning "complete static linking is impossible in this configuration" +- $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static @@ -113734,55 +73273,47 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - ;; - esac - done -+ exit $lt_exit -+ } -+ done -+ IFS="$save_ifs" ++If FILE is a libtool library, object or program, all the files associated ++with it are deleted. Otherwise, only FILE itself is deleted using RM." ++ ;; - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? ++ compile) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift -- func_quote_for_eval "$arg" -- qarg=$func_quote_for_eval_unquoted_result -- func_append libtool_args " $func_quote_for_eval_result" -+ if test -n "$convenience"; then -+ if test -z "$whole_archive_flag_spec"; then -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ fi -+ fi +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test +- ;; +- *) qarg=$arg ;; +- esac +- libtool_args="$libtool_args $qarg" ++Compile a source file into a libtool library object. - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) -- func_append compile_command " @OUTPUT@" -- func_append finalize_command " @OUTPUT@" +- compile_command="$compile_command @OUTPUT@" +- finalize_command="$finalize_command @OUTPUT@" - ;; - esac -+ exit $EXIT_SUCCESS -+ fi ++This mode accepts the following additional options: - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. -- func_append compile_command " @SYMFILE@" -- func_append finalize_command " @SYMFILE@" +- compile_command="$compile_command @SYMFILE@" +- finalize_command="$finalize_command @SYMFILE@" - preload=yes -+ # Create links to the real library. -+ for linkname in $linknames; do -+ if test "$realname" != "$linkname"; then -+ $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" -+ $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi +- fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) @@ -113818,8 +73349,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - ;; - expsyms) - export_symbols="$arg" -- test -f "$arg" \ -- || func_fatal_error "symbol file \`$arg' does not exist" +- if test ! -f "$arg"; then +- $echo "$modename: symbol file \`$arg' does not exist" +- exit $EXIT_FAILURE +- fi - prev= - continue - ;; @@ -113828,174 +73361,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - prev= - continue - ;; -- framework) -- case $host in -- *-*-darwin*) -- case "$deplibs " in -- *" $qarg.ltframework "*) ;; -- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -- ;; -- esac -- ;; -- esac -- prev= -- continue -- ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; -- objectlist) -- if test -f "$arg"; then -- save_arg=$arg -- moreargs= -- for fil in `cat "$save_arg"` -- do --# moreargs="$moreargs $fil" -- arg=$fil -- # A libtool-controlled object. -+ done - -- # Check to see that this really is a libtool object. -- if func_lalib_unsafe_p "$arg"; then -- pic_object= -- non_pic_object= -+ # If -module or -export-dynamic was specified, set the dlname. -+ if test "$module" = yes || test "$export_dynamic" = yes; then -+ # On all known operating systems, these are identical. -+ dlname="$soname" -+ fi -+ fi -+ ;; - -- # Read the .lo file -- func_source "$arg" -+ obj) -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; -+ esac - -- if test -z "$pic_object" || -- test -z "$non_pic_object" || -- test "$pic_object" = none && -- test "$non_pic_object" = none; then -- func_fatal_error "cannot find name of object for \`$arg'" -- fi -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 -+ fi - -- # Extract subdirectory from the argument. -- func_dirname "$arg" "/" "" -- xdir="$func_dirname_result" -+ if test -n "$rpath"; then -+ $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 -+ fi - -- if test "$pic_object" != none; then -- # Prepend the subdirectory the object is found in. -- pic_object="$xdir$pic_object" -+ if test -n "$xrpath"; then -+ $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 -+ fi - -- if test "$prev" = dlfiles; then -- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -- prev= -- continue -- else -- # If libtool objects are unsupported, then we need to preload. -- prev=dlprefiles -- fi -- fi -+ if test -n "$vinfo"; then -+ $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 -+ fi - -- # CHECK ME: I think I busted this. -Ossama -- if test "$prev" = dlprefiles; then -- # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -- prev= -- fi -+ if test -n "$release"; then -+ $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 -+ fi - -- # A PIC object. -- func_append libobjs " $pic_object" -- arg="$pic_object" -- fi -+ case $output in -+ *.lo) -+ if test -n "$objs$old_deplibs"; then -+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ libobj="$output" -+ obj=`$echo "X$output" | $Xsed -e "$lo2o"` -+ ;; -+ *) -+ libobj= -+ obj="$output" -+ ;; -+ esac - -- # Non-PIC object. -- if test "$non_pic_object" != none; then -- # Prepend the subdirectory the object is found in. -- non_pic_object="$xdir$non_pic_object" -+ # Delete the old objects. -+ $run $rm $obj $libobj - -- # A standard non-PIC object -- func_append non_pic_objects " $non_pic_object" -- if test -z "$pic_object" || test "$pic_object" = none ; then -- arg="$non_pic_object" -- fi -- else -- # If the PIC object exists, use it instead. -- # $xdir was prepended to $pic_object above. -- non_pic_object="$pic_object" -- func_append non_pic_objects " $non_pic_object" -- fi -- else -- # Only an error if not doing a dry-run. -- if $opt_dry_run; then -- # Extract subdirectory from the argument. -- func_dirname "$arg" "/" "" -- xdir="$func_dirname_result" -+ # Objects from convenience libraries. This assumes -+ # single-version convenience libraries. Whenever we create -+ # different ones for PIC/non-PIC, this we'll have to duplicate -+ # the extraction. -+ reload_conv_objs= -+ gentop= -+ # reload_cmds runs $LD directly, so let us get rid of -+ # -Wl from whole_archive_flag_spec and hope we can get by with -+ # turning comma into space.. -+ wl= - -- func_lo2o "$arg" -- pic_object=$xdir$objdir/$func_lo2o_result -- non_pic_object=$xdir$func_lo2o_result -- func_append libobjs " $pic_object" -- func_append non_pic_objects " $non_pic_object" -- else -- func_fatal_error "\`$arg' is not a valid libtool object" -- fi -- fi -- done -- else -- func_fatal_error "link input file \`$arg' does not exist" -- fi -- arg=$save_arg -- prev= -- continue -- ;; - precious_regex) - precious_files_regex="$arg" - prev= @@ -114006,12 +73376,154 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - prev= - continue - ;; +- objectlist) +- if test -f "$arg"; then +- save_arg=$arg +- moreargs= +- for fil in `cat $save_arg` +- do +-# moreargs="$moreargs $fil" +- arg=$fil +- # A libtool-controlled object. ++ -o OUTPUT-FILE set the output file name to OUTPUT-FILE ++ -no-suppress do not suppress compiler output for multiple passes ++ -prefer-pic try to building PIC objects only ++ -prefer-non-pic try to building non-PIC objects only ++ -shared do not build a \`.o' file suitable for static linking ++ -static only build a \`.o' file suitable for static linking + +- # Check to see that this really is a libtool object. +- if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then +- pic_object= +- non_pic_object= ++COMPILE-COMMAND is a command to be used in creating a \`standard' object file ++from the given SOURCEFILE. + +- # Read the .lo file +- # If there is no directory component, then add one. +- case $arg in +- */* | *\\*) . $arg ;; +- *) . ./$arg ;; +- esac ++The output file name is determined by removing the directory component from ++SOURCEFILE, then substituting the C source code suffix \`.c' with the ++library object suffix, \`.lo'." ++ ;; + +- if test -z "$pic_object" || \ +- test -z "$non_pic_object" || +- test "$pic_object" = none && \ +- test "$non_pic_object" = none; then +- $echo "$modename: cannot find name of object for \`$arg'" 1>&2 +- exit $EXIT_FAILURE +- fi ++ execute) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... + +- # Extract subdirectory from the argument. +- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$xdir" = "X$arg"; then +- xdir= +- else +- xdir="$xdir/" +- fi ++Automatically set library path, then run a program. + +- if test "$pic_object" != none; then +- # Prepend the subdirectory the object is found in. +- pic_object="$xdir$pic_object" ++This mode accepts the following additional options: + +- if test "$prev" = dlfiles; then +- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then +- dlfiles="$dlfiles $pic_object" +- prev= +- continue +- else +- # If libtool objects are unsupported, then we need to preload. +- prev=dlprefiles +- fi +- fi ++ -dlopen FILE add the directory containing FILE to the library path + +- # CHECK ME: I think I busted this. -Ossama +- if test "$prev" = dlprefiles; then +- # Preload the old-style object. +- dlprefiles="$dlprefiles $pic_object" +- prev= +- fi ++This mode sets the library path environment variable according to \`-dlopen' ++flags. + +- # A PIC object. +- libobjs="$libobjs $pic_object" +- arg="$pic_object" +- fi ++If any of the ARGS are libtool executable wrappers, then they are translated ++into their corresponding uninstalled binary, and any of their required library ++directories are added to the library path. + +- # Non-PIC object. +- if test "$non_pic_object" != none; then +- # Prepend the subdirectory the object is found in. +- non_pic_object="$xdir$non_pic_object" ++Then, COMMAND is executed, with ARGS as arguments." ++ ;; + +- # A standard non-PIC object +- non_pic_objects="$non_pic_objects $non_pic_object" +- if test -z "$pic_object" || test "$pic_object" = none ; then +- arg="$non_pic_object" +- fi +- else +- # If the PIC object exists, use it instead. +- # $xdir was prepended to $pic_object above. +- non_pic_object="$pic_object" +- non_pic_objects="$non_pic_objects $non_pic_object" +- fi +- else +- # Only an error if not doing a dry-run. +- if test -z "$run"; then +- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 +- exit $EXIT_FAILURE +- else +- # Dry-run case. ++ finish) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... + +- # Extract subdirectory from the argument. +- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$xdir" = "X$arg"; then +- xdir= +- else +- xdir="$xdir/" +- fi ++Complete the installation of libtool libraries. + +- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` +- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` +- libobjs="$libobjs $pic_object" +- non_pic_objects="$non_pic_objects $non_pic_object" +- fi +- fi +- done +- else +- $echo "$modename: link input file \`$save_arg' does not exist" +- exit $EXIT_FAILURE +- fi +- arg=$save_arg +- prev= +- continue +- ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) -- func_fatal_error "only absolute run-paths are allowed" +- $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then @@ -114028,37 +73540,39 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - prev= - continue - ;; -- shrext) -- shrext_cmds="$arg" -- prev= -- continue -- ;; -- weak) -- weak_libs="$weak_libs $arg" -- prev= -- continue -- ;; -- xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -- prev= -- func_append compile_command " $qarg" -- func_append finalize_command " $qarg" -- continue -- ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= -- func_append compile_command " $qarg" -- func_append finalize_command " $qarg" +- compile_command="$compile_command $qarg" +- finalize_command="$finalize_command $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= -- func_append compile_command " $wl$qarg" -- func_append finalize_command " $wl$qarg" +- compile_command="$compile_command $wl$qarg" +- finalize_command="$finalize_command $wl$qarg" +- continue +- ;; +- xcclinker) +- linker_flags="$linker_flags $qarg" +- compiler_flags="$compiler_flags $qarg" +- prev= +- compile_command="$compile_command $qarg" +- finalize_command="$finalize_command $qarg" +- continue +- ;; +- shrext) +- shrext_cmds="$arg" +- prev= +- continue +- ;; +- darwin_framework|darwin_framework_skip) +- test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" +- prev= - continue - ;; - *) @@ -114068,300 +73582,181 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - ;; - esac - fi # test -n "$prev" -+ if test -n "$convenience"; then -+ if test -n "$whole_archive_flag_spec"; then -+ 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" ++Each LIBDIR is a directory that contains libtool libraries. - prevarg="$arg" -+ func_extract_archives $gentop $convenience -+ reload_conv_objs="$reload_objs $func_extract_archives_result" -+ fi -+ fi ++The commands that this mode executes may require superuser privileges. Use ++the \`--dry-run' option if you just want to see what would be executed." ++ ;; - case $arg in - -all-static) - if test -n "$link_static_flag"; then -- # See comment for -static flag below, for more details. -- func_append compile_command " $link_static_flag" -- func_append finalize_command " $link_static_flag" -+ # Create the old-style object. -+ reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+ -+ output="$obj" -+ cmds=$reload_cmds -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ -+ # Exit if we aren't doing a library object file. -+ if test -z "$libobj"; then -+ if test -n "$gentop"; then -+ $show "${rm}r $gentop" -+ $run ${rm}r $gentop - fi +- compile_command="$compile_command $link_static_flag" +- finalize_command="$finalize_command $link_static_flag" +- fi - continue - ;; ++ install) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -allow-undefined) - # FIXME: remove this flag sometime in the future. -- func_fatal_error "\`-allow-undefined' must not be used because it is the default" +- $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 +- continue - ;; -+ exit $EXIT_SUCCESS -+ fi ++Install executables or libraries. - -avoid-version) - avoid_version=yes - continue - ;; -+ if test "$build_libtool_libs" != yes; then -+ if test -n "$gentop"; then -+ $show "${rm}r $gentop" -+ $run ${rm}r $gentop -+ fi ++INSTALL-COMMAND is the installation command. The first component should be ++either the \`install' or \`cp' program. - -dlopen) - prev=dlfiles - continue - ;; -+ # Create an invalid libtool object if no PIC, so that we don't -+ # accidentally link it into a program. -+ # $show "echo timestamp > $libobj" -+ # $run eval "echo timestamp > $libobj" || exit $? -+ exit $EXIT_SUCCESS -+ fi ++The following components of INSTALL-COMMAND are treated specially: - -dlpreopen) - prev=dlprefiles - continue - ;; -+ if test -n "$pic_flag" || test "$pic_mode" != default; then -+ # Only do commands if we really have different PIC objects. -+ reload_objs="$libobjs $reload_conv_objs" -+ output="$libobj" -+ cmds=$reload_cmds -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ fi ++ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -export-dynamic) - export_dynamic=yes - continue - ;; -+ if test -n "$gentop"; then -+ $show "${rm}r $gentop" -+ $run ${rm}r $gentop -+ fi ++The rest of the components are interpreted as arguments to that command (only ++BSD-compatible install options are recognized)." ++ ;; - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then -- func_fatal_error "more than one -exported-symbols argument is not allowed" +- $echo "$modename: more than one -exported-symbols argument is not allowed" +- exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex -+ exit $EXIT_SUCCESS -+ ;; -+ -+ prog) -+ case $host in -+ *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; -+ esac -+ if test -n "$vinfo"; then -+ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 -+ fi -+ -+ if test -n "$release"; then -+ $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 -+ fi -+ -+ if test "$preload" = yes; then -+ if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && -+ test "$dlopen_self_static" = unknown; then -+ $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." - fi +- fi - continue - ;; -+ fi ++ link) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... -- -framework) -- prev=framework +- -framework|-arch|-isysroot) +- case " $CC " in +- *" ${arg} ${1} "* | *" ${arg} ${1} "*) +- prev=darwin_framework_skip ;; +- *) compiler_flags="$compiler_flags $arg" +- prev=darwin_framework ;; +- esac +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" - continue -+ case $host in -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # On Rhapsody replace the C library is the System framework -+ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` -+ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; -+ esac +- ;; ++Link object files or libraries together to form another library, or to ++create an executable program. - -inst-prefix-dir) - prev=inst_prefix - continue - ;; -+ case $host in -+ *darwin*) -+ # Don't allow lazy linking, it breaks C++ global constructors -+ if test "$tagname" = CXX ; then -+ compile_command="$compile_command ${wl}-bind_at_load" -+ finalize_command="$finalize_command ${wl}-bind_at_load" -+ fi -+ ;; -+ esac ++LINK-COMMAND is a command using the C compiler that you would use to create ++a program from several object files. - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) -- func_append compile_command " $arg" -- func_append finalize_command " $arg" +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" - ;; - esac - continue - ;; ++The following components of LINK-COMMAND are treated specially: - -L*) -- func_stripname '-L' '' "$arg" -- dir=$func_stripname_result -- if test -z "$dir"; then -- if test "$#" -gt 0; then -- func_fatal_error "require no space between \`-L' and \`$1'" -- else -- func_fatal_error "need path for \`-L' option" -- fi -- fi +- dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; - *) +- *) - absdir=`cd "$dir" && pwd` -- test -z "$absdir" && \ -- func_fatal_error "cannot determine absolute directory name of \`$dir'" +- if test -z "$absdir"; then +- $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 +- absdir="$dir" +- notinst_path="$notinst_path $dir" +- fi - dir="$absdir" -+ case " $compile_deplibs " in -+ *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; -+ esac - ;; - esac +- ;; +- esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" -+ done -+ for deplib in $compile_deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac - ;; -+ *) new_libs="$new_libs $deplib" ;; - esac -+ done -+ compile_deplibs="$new_libs" -+ -+ -+ compile_command="$compile_command $compile_deplibs" -+ finalize_command="$finalize_command $finalize_deplibs" -+ -+ if test -n "$rpath$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ for libdir in $rpath $xrpath; do -+ # This is the magic to use -rpath. -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; -+ esac -+ done -+ fi -+ -+ # Now hardcode the library paths -+ rpath= -+ hardcode_libdirs= -+ for libdir in $compile_rpath $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; -+ esac -+ fi - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -+ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in +- ;; +- esac +- case $host in +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) +- testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` +- case :$dllsearchpath: in - *":$dir:"*) ;; -- ::) dllsearchpath=$dir;; - *) dllsearchpath="$dllsearchpath:$dir";; -+ *":$libdir:"*) ;; -+ *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; -- ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac +- esac +- case :$dllsearchpath: in +- *":$testbindir:"*) ;; +- *) dllsearchpath="$dllsearchpath:$testbindir";; +- esac +- ;; +- esac - continue - ;; -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ compile_rpath="$rpath" ++ -all-static do not do any dynamic linking at all ++ -avoid-version do not add a version suffix if possible ++ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime ++ -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 ++ -export-symbols-regex 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 ++ -no-fast-install disable the fast-install mode ++ -no-install link a not-installable executable ++ -no-undefined declare that a library does not refer to external symbols ++ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects ++ -objectlist FILE Use a list of object files found in FILE to specify objects ++ -precious-files-regex REGEX ++ don't remove output files matching REGEX ++ -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 ++ -shared only do dynamic linking of libtool libraries ++ -shrext SUFFIX override the standard shared library file extension ++ -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] ++ -weak LIBNAME declare that the target provides the LIBNAME interface - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; @@ -114375,7 +73770,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs System.ltframework" +- deplibs="$deplibs -framework System" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) @@ -114386,32 +73781,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; -+ rpath= -+ hardcode_libdirs= -+ for libdir in $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$finalize_perm_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; - esac +- esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) @@ -114419,185 +73789,192 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - continue - ;; - esac - fi +- fi - deplibs="$deplibs $arg" - continue - ;; -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ finalize_rpath="$rpath" - -- -module) -- module=yes -- continue -- ;; -+ if test -n "$libobjs" && test "$build_old_libs" = yes; then -+ # Transform all the library objects into standard objects. -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ fi ++All other options (arguments beginning with \`-') are ignored. - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. -- # Darwin uses the -arch flag to determine output architecture. -- -model|-arch|-isysroot) +- -model) +- compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" -- func_append compile_command " $arg" -- func_append finalize_command " $arg" +- finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; -+ dlsyms= -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ if test -n "$NM" && test -n "$global_symbol_pipe"; then -+ dlsyms="${outputname}S.c" -+ else -+ $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 -+ fi -+ fi ++Every other argument is treated as a filename. Files ending in \`.la' are ++treated as uninstalled libtool libraries, other files are standard or library ++object files. -- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" -- func_append compile_command " $arg" -- func_append finalize_command " $arg" -- case "$new_inherited_linker_flags " in -- *" $arg "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -- esac +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" - continue - ;; -+ if test -n "$dlsyms"; then -+ case $dlsyms in -+ "") ;; -+ *.c) -+ # Discover the nlist of each of the dlfiles. -+ nlist="$output_objdir/${outputname}.nm" ++If the OUTPUT-FILE ends in \`.la', then a libtool library is created, ++only library objects (\`.lo' files) may be specified, and \`-rpath' is ++required, except when creating a convenience library. - -multi_module) - single_module="${wl}-multi_module" - continue - ;; -+ $show "$rm $nlist ${nlist}S ${nlist}T" -+ $run $rm "$nlist" "${nlist}S" "${nlist}T" ++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created ++using \`ar' and \`ranlib', or on Windows using \`lib'. + +- -module) +- module=yes +- continue +- ;; ++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file ++is created, otherwise an executable program is created." ++ ;; + +- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler +- # -r[0-9][0-9]* specifies the processor on the SGI compiler +- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler +- # +DA*, +DD* enable 64-bit mode on the HP compiler +- # -q* pass through compiler args for the IBM compiler +- # -m* pass through architecture-specific compiler args for GCC +- # -m*, -t[45]*, -txscale* pass through architecture-specific +- # compiler args 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*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ uninstall) ++ $ECHO \ ++"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... + +- # Unknown arguments in both finalize_command and compile_command need +- # to be aesthetically quoted because they are evaled later. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" +- compiler_flags="$compiler_flags $arg" +- continue ++Remove libraries from an installation directory. ++ ++RM is the name of the program to use to delete files associated with each FILE ++(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed ++to RM. ++ ++If FILE is a libtool library, all the files associated with it are deleted. ++Otherwise, only FILE itself is deleted using RM." + ;; + +- -shrext) +- prev=shrext +- continue +- ;; ++ *) ++ func_fatal_help "invalid operation mode \`$mode'" ++ ;; ++ esac - -no-fast-install) - fast_install=no - continue - ;; -+ # Parse the name list into a source file. -+ $show "creating $output_objdir/$dlsyms" ++ $ECHO ++ $ECHO "Try \`$progname --help' for more information about other modes." - -no-install) - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. -- func_warning "\`-no-install' is ignored for $host" -- func_warning "assuming \`-no-fast-install' instead" +- $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 +- $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; -+ test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ ++ exit $? ++} - -no-undefined) - allow_undefined=no - continue - ;; -+#ifdef __cplusplus -+extern \"C\" { -+#endif ++ # Now that we've collected a possible --mode arg, show help if necessary ++ $opt_help && func_mode_help - -objectlist) - prev=objectlist - continue - ;; -+/* Prevent the only kind of declaration conflicts we can make. */ -+#define lt_preloaded_symbols some_other_symbol - -o) prev=output ;; -+/* External symbol declarations for the compiler. */\ -+" ++# func_mode_execute arg... ++func_mode_execute () ++{ ++ $opt_debug ++ # The first argument is the command name. ++ cmd="$nonopt" ++ test -z "$cmd" && \ ++ func_fatal_help "you must specify a COMMAND" - -precious-files-regex) - prev=precious_regex - continue - ;; -+ if test "$dlself" = yes; then -+ $show "generating symbol list for \`$output'" ++ # Handle -dlopen flags immediately. ++ for file in $execute_dlfiles; do ++ test -f "$file" \ ++ || func_fatal_help "\`$file' is not a file" - -release) - prev=release - continue - ;; -+ test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" ++ dir= ++ case $file in ++ *.la) ++ # Check to see that this really is a libtool archive. ++ func_lalib_unsafe_p "$file" \ ++ || func_fatal_help "\`$lib' is not a valid libtool archive" - -rpath) - prev=rpath - continue - ;; -+ # Add our own program objects to the symbol list. -+ progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ for arg in $progfiles; do -+ $show "extracting global C symbols from \`$arg'" -+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" -+ done ++ # Read the libtool library. ++ dlname= ++ library_names= ++ func_source "$file" - -R) - prev=xrpath - continue - ;; -+ if test -n "$exclude_expsyms"; then -+ $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ $run eval '$mv "$nlist"T "$nlist"' -+ fi -+ -+ if test -n "$export_symbols_regex"; then -+ $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ $run eval '$mv "$nlist"T "$nlist"' -+ fi -+ -+ # Prepare the list of exported symbols -+ if test -z "$export_symbols"; then -+ export_symbols="$output_objdir/$outputname.exp" -+ $run $rm $export_symbols -+ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ case $host in -+ *cygwin* | *mingw* ) -+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac -+ else -+ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -+ $run eval 'mv "$nlist"T "$nlist"' -+ case $host in -+ *cygwin* | *mingw* ) -+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac -+ fi -+ fi ++ # Skip this library if it cannot be dlopened. ++ if test -z "$dlname"; then ++ # Warn if it was a shared library. ++ test -n "$library_names" && \ ++ func_warning "\`$file' was not linked with \`-export-dynamic'" ++ continue ++ fi - -R*) -- func_stripname '-R' '' "$arg" -- dir=$func_stripname_result +- dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) -- func_fatal_error "only absolute run-paths are allowed" +- $echo "$modename: only absolute run-paths are allowed" 1>&2 +- exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in @@ -114606,42 +73983,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - esac - continue - ;; -+ for arg in $dlprefiles; do -+ $show "extracting global C symbols from \`$arg'" -+ name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` -+ $run eval '$echo ": $name " >> "$nlist"' -+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" -+ done - -- -shared) -- # The effects of -shared are defined in a previous loop. -- continue -- ;; -+ if test -z "$run"; then -+ # Make sure we have at least an empty file. -+ test -f "$nlist" || : > "$nlist" -+ -+ if test -n "$exclude_expsyms"; then -+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -+ $mv "$nlist"T "$nlist" -+ fi - -- -shrext) -- prev=shrext -- continue -- ;; -+ # Try sorting and uniquifying the output. -+ if grep -v "^: " < "$nlist" | -+ if sort -k 3 </dev/null >/dev/null 2>&1; then -+ sort -k 3 -+ else -+ sort +2 -+ fi | -+ uniq > "$nlist"S; then -+ : -+ else -+ grep -v "^: " < "$nlist" > "$nlist"S -+ fi ++ func_dirname "$file" "" "." ++ dir="$func_dirname_result" - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. @@ -114650,279 +73993,230 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue -- ;; -+ if test -f "$nlist"S; then -+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' -+ else -+ $echo '/* NONE */' >> "$output_objdir/$dlsyms" -+ fi ++ if test -f "$dir/$objdir/$dlname"; then ++ dir="$dir/$objdir" ++ else ++ if test ! -f "$dir/$dlname"; then ++ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" ++ fi ++ fi + ;; - -thread-safe) - thread_safe=yes - continue -- ;; -+ $echo >> "$output_objdir/$dlsyms" "\ ++ *.lo) ++ # Just add the directory containing the .lo file. ++ func_dirname "$file" "" "." ++ dir="$func_dirname_result" + ;; - -version-info) - prev=vinfo - continue - ;; -+#undef lt_preloaded_symbols - - -version-number) - prev=vinfo - vinfo_number=yes -- continue -- ;; -+#if defined (__STDC__) && __STDC__ -+# define lt_ptr void * -+#else -+# define lt_ptr char * -+# define const -+#endif - -- -weak) -- prev=weak -- continue -- ;; -+/* The mapping between symbol names and symbols. */ -+" ++ *) ++ func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + continue + ;; ++ esac - -Wc,*) -- func_stripname '-Wc,' '' "$arg" -- args=$func_stripname_result +- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $func_quote_for_eval_result" +- case $flag in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- flag="\"$flag\"" +- ;; +- esac +- arg="$arg $wl$flag" +- compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" -- func_stripname ' ' '' "$arg" -- arg=$func_stripname_result +- arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; -+ case $host in -+ *cygwin* | *mingw* ) -+ $echo >> "$output_objdir/$dlsyms" "\ -+/* DATA imports from DLLs on WIN32 can't be const, because -+ runtime relocations are performed -- see ld's documentation -+ on pseudo-relocs */ -+struct { -+" -+ ;; -+ * ) -+ $echo >> "$output_objdir/$dlsyms" "\ -+const struct { -+" -+ ;; -+ esac ++ # Get the absolute pathname. ++ absdir=`cd "$dir" && pwd` ++ test -n "$absdir" && dir="$absdir" - -Wl,*) -- func_stripname '-Wl,' '' "$arg" -- args=$func_stripname_result +- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -- linker_flags="$linker_flags $func_quote_for_eval_result" +- case $flag in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- flag="\"$flag\"" +- ;; +- esac +- arg="$arg $wl$flag" +- compiler_flags="$compiler_flags $wl$flag" +- linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" -- func_stripname ' ' '' "$arg" -- arg=$func_stripname_result +- arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; ++ # Now add the directory to shlibpath_var. ++ if eval "test -z \"\$$shlibpath_var\""; then ++ eval "$shlibpath_var=\"\$dir\"" ++ else ++ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" ++ fi ++ done - -Xcompiler) - prev=xcompiler - continue - ;; -+ $echo >> "$output_objdir/$dlsyms" "\ -+ const char *name; -+ lt_ptr address; -+} -+lt_preloaded_symbols[] = -+{\ -+" ++ # This variable tells wrapper scripts just to set shlibpath_var ++ # rather than running their programs. ++ libtool_execute_magic="$magic" - -Xlinker) - prev=xlinker - continue -- ;; -+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" ++ # Check if any of the arguments is a wrapper script. ++ args= ++ for file ++ do ++ case $file in ++ -*) ;; ++ *) ++ # Do a test to see if this is really a libtool program. ++ if func_ltwrapper_script_p "$file"; then ++ func_source "$file" ++ # Transform arg to wrapped name. ++ file="$progdir/$program" ++ elif func_ltwrapper_executable_p "$file"; then ++ func_ltwrapper_scriptname "$file" ++ func_source "$func_ltwrapper_scriptname_result" ++ # Transform arg to wrapped name. ++ file="$progdir/$program" ++ fi + ;; ++ esac ++ # Quote arguments (to preserve shell metacharacters). ++ func_quote_for_eval "$file" ++ args="$args $func_quote_for_eval_result" ++ done - -XCClinker) - prev=xcclinker - continue - ;; -+ $echo >> "$output_objdir/$dlsyms" "\ -+ {0, (lt_ptr) 0} -+}; - -- # -msg_* for osf cc -- -msg_*) -- func_quote_for_eval "$arg" -- arg="$func_quote_for_eval_result" -- ;; -+/* This works around a problem in FreeBSD linker */ -+#ifdef FREEBSD_WORKAROUND -+static const void *lt_preloaded_setup() { -+ return lt_preloaded_symbols; -+} -+#endif - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args for GCC -- # -F/path gives path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -- # @file GCC response files -- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -- func_quote_for_eval "$arg" -- arg="$func_quote_for_eval_result" -- func_append compile_command " $arg" -- func_append finalize_command " $arg" -- compiler_flags="$compiler_flags $arg" -- continue -- ;; -+#ifdef __cplusplus -+} -+#endif\ -+" -+ fi ++ if test "X$opt_dry_run" = Xfalse; then ++ if test -n "$shlibpath_var"; then ++ # Export the shlibpath_var. ++ eval "export $shlibpath_var" ++ fi - # Some other compiler flag. - -* | +*) -- func_quote_for_eval "$arg" -- arg="$func_quote_for_eval_result" +- # Unknown arguments in both finalize_command and compile_command need +- # to be aesthetically quoted because they are evaled later. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac - ;; -+ pic_flag_for_symtable= -+ case $host in -+ # compiling the symbol table file with pic_flag works around -+ # a FreeBSD bug that causes programs to crash when -lm is -+ # linked before any other PIC object. But we must not use -+ # pic_flag when linking with -static. The problem exists in -+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -+ case "$compile_command " in -+ *" -static "*) ;; -+ *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; -+ esac;; -+ *-*-hpux*) -+ case "$compile_command " in -+ *" -static "*) ;; -+ *) pic_flag_for_symtable=" $pic_flag";; -+ esac -+ esac ++ # Restore saved environment variables ++ for lt_var in LANG LANGUAGE 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 ++ else ++ $lt_unset $lt_var ++ fi" ++ done - *.$objext) - # A standard object. - objs="$objs $arg" - ;; -+ # Now compile the dynamic symbol file. -+ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -+ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? -+ -+ # Clean up the generated files. -+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" -+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" -+ -+ # Transform the symbol file into the correct name. -+ case $host in -+ *cygwin* | *mingw* ) -+ if test -f "$output_objdir/${outputname}.def" ; then -+ 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" | $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" | $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 -+ ;; -+ *) -+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac -+ else -+ # We keep going just in case the user didn't refer to -+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe -+ # really was required. ++ # Now prepare to actually exec the command. ++ exec_cmd="\$cmd$args" ++ else ++ # Display what would be done. ++ if test -n "$shlibpath_var"; then ++ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" ++ $ECHO "export $shlibpath_var" ++ fi ++ $ECHO "$cmd$args" ++ exit $EXIT_SUCCESS ++ fi ++} - *.lo) - # A libtool-controlled object. -+ # Nullify the symbol file. -+ 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 ++test "$mode" = execute && func_mode_execute ${1+"$@"} - # Check to see that this really is a libtool object. -- if func_lalib_unsafe_p "$arg"; then +- if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= -+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then -+ # Replace the output file specification. -+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` -+ link_command="$compile_command$compile_rpath" - # Read the .lo file -- func_source "$arg" -+ # We have no uninstalled library dependencies, so finalize right now. -+ $show "$link_command" -+ $run eval "$link_command" -+ exit_status=$? +- # If there is no directory component, then add one. +- case $arg in +- */* | *\\*) . $arg ;; +- *) . ./$arg ;; +- esac ++# func_mode_finish arg... ++func_mode_finish () ++{ ++ $opt_debug ++ libdirs="$nonopt" ++ admincmds= -- if test -z "$pic_object" || +- if test -z "$pic_object" || \ - test -z "$non_pic_object" || -- test "$pic_object" = none && +- test "$pic_object" = none && \ - test "$non_pic_object" = none; then -- func_fatal_error "cannot find name of object for \`$arg'" +- $echo "$modename: cannot find name of object for \`$arg'" 1>&2 +- exit $EXIT_FAILURE - fi -+ # Delete the generated files. -+ if test -n "$dlsyms"; then -+ $show "$rm $output_objdir/${outputname}S.${objext}" -+ $run $rm "$output_objdir/${outputname}S.${objext}" -+ fi ++ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then ++ for dir ++ do ++ libdirs="$libdirs $dir" ++ done - # Extract subdirectory from the argument. -- func_dirname "$arg" "/" "" -- xdir="$func_dirname_result" -+ exit $exit_status -+ fi +- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$xdir" = "X$arg"; then +- xdir= +- else +- xdir="$xdir/" +- fi ++ for libdir in $libdirs; do ++ if test -n "$finish_cmds"; then ++ # Do each command in the finish commands. ++ func_execute_cmds "$finish_cmds" 'admincmds="$admincmds ++'"$cmd"'"' ++ fi ++ if test -n "$finish_eval"; then ++ # Do the single finish_eval. ++ eval cmds=\"$finish_eval\" ++ $opt_dry_run || eval "$cmds" || admincmds="$admincmds ++ $cmds" ++ fi ++ done ++ fi - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" -+ if test -n "$shlibpath_var"; then -+ # We should set the shlibpath_var -+ rpath= -+ for dir in $temp_rpath; do -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) -+ # Absolute path. -+ rpath="$rpath$dir:" -+ ;; -+ *) -+ # Relative path: add a thisdir entry. -+ rpath="$rpath\$thisdir/$dir:" -+ ;; -+ esac -+ done -+ temp_rpath="$rpath" -+ fi ++ # Exit here if they wanted silent mode. ++ $opt_silent && exit $EXIT_SUCCESS - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then @@ -114934,12 +74228,27 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - prev=dlprefiles - fi - fi -+ if test -n "$compile_shlibpath$finalize_shlibpath"; then -+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" -+ fi -+ if test -n "$finalize_shlibpath"; then -+ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" -+ fi ++ $ECHO "X----------------------------------------------------------------------" | $Xsed ++ $ECHO "Libraries have been installed in:" ++ for libdir in $libdirs; do ++ $ECHO " $libdir" ++ done ++ $ECHO ++ $ECHO "If you ever happen to want to link against installed libraries" ++ $ECHO "in a given directory, LIBDIR, you must either use libtool, and" ++ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" ++ $ECHO "flag during linking and do at least one of the following:" ++ if test -n "$shlibpath_var"; then ++ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" ++ $ECHO " during execution" ++ fi ++ if test -n "$runpath_var"; then ++ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" ++ $ECHO " during linking" ++ fi ++ if test -n "$hardcode_libdir_flag_spec"; then ++ libdir=LIBDIR ++ eval flag=\"$hardcode_libdir_flag_spec\" - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then @@ -114947,107 +74256,120 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - dlprefiles="$dlprefiles $pic_object" - prev= - fi -+ compile_var= -+ finalize_var= -+ if test -n "$runpath_var"; then -+ if test -n "$perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $perm_rpath; do -+ rpath="$rpath$dir:" -+ done -+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" " -+ fi -+ if test -n "$finalize_perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $finalize_perm_rpath; do -+ rpath="$rpath$dir:" -+ done -+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " -+ fi -+ fi ++ $ECHO " - use the \`$flag' linker flag" ++ fi ++ if test -n "$admincmds"; then ++ $ECHO " - have your system administrator run these commands:$admincmds" ++ fi ++ if test -f /etc/ld.so.conf; then ++ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" ++ fi ++ $ECHO - # A PIC object. -- func_append libobjs " $pic_object" +- libobjs="$libobjs $pic_object" - arg="$pic_object" - fi -+ if test "$no_install" = yes; then -+ # We don't need to create a wrapper script. -+ link_command="$compile_var$compile_command$compile_rpath" -+ # Replace the output file specification. -+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ # Delete the old output file. -+ $run $rm $output -+ # Link the executable and exit -+ $show "$link_command" -+ $run eval "$link_command" || exit $? -+ exit $EXIT_SUCCESS -+ fi ++ $ECHO "See any operating system documentation about shared libraries for" ++ case $host in ++ solaris2.[6789]|solaris2.1[0-9]) ++ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" ++ $ECHO "pages." ++ ;; ++ *) ++ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." ++ ;; ++ esac ++ $ECHO "X----------------------------------------------------------------------" | $Xsed ++ exit $EXIT_SUCCESS ++} - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" -+ if test "$hardcode_action" = relink; then -+ # Fast installation is not supported -+ link_command="$compile_var$compile_command$compile_rpath" -+ relink_command="$finalize_var$finalize_command$finalize_rpath" ++test "$mode" = finish && func_mode_finish ${1+"$@"} - # A standard non-PIC object -- func_append non_pic_objects " $non_pic_object" +- non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi -+ $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 -+ $echo "$modename: \`$output' will be relinked during installation" 1>&2 -+ else -+ 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" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` - else +- else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" -- func_append non_pic_objects " $non_pic_object" -+ # fast_install is set to needless -+ relink_command= - fi - else -- # Only an error if not doing a dry-run. -- if $opt_dry_run; then -- # Extract subdirectory from the argument. -- func_dirname "$arg" "/" "" -- xdir="$func_dirname_result" -- -- func_lo2o "$arg" -- pic_object=$xdir$objdir/$func_lo2o_result -- non_pic_object=$xdir$func_lo2o_result -- func_append libobjs " $pic_object" -- func_append non_pic_objects " $non_pic_object" -- else -- func_fatal_error "\`$arg' is not a valid libtool object" +- non_pic_objects="$non_pic_objects $non_pic_object" - fi -+ link_command="$compile_var$compile_command$compile_rpath" -+ relink_command="$finalize_var$finalize_command$finalize_rpath" - fi +- else +- # Only an error if not doing a dry-run. +- if test -z "$run"; then +- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 +- exit $EXIT_FAILURE +- else +- # Dry-run case. + +- # Extract subdirectory from the argument. +- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$xdir" = "X$arg"; then +- xdir= +- else +- xdir="$xdir/" +- fi ++# func_mode_install arg... ++func_mode_install () ++{ ++ $opt_debug ++ # There may be an optional sh(1) argument at the beginning of ++ # install_prog (especially on Windows NT). ++ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || ++ # Allow the use of GNU shtool's install command. ++ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then ++ # Aesthetically quote it. ++ func_quote_for_eval "$nonopt" ++ install_prog="$func_quote_for_eval_result " ++ arg=$1 ++ shift ++ else ++ install_prog= ++ arg=$nonopt ++ fi + +- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` +- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` +- libobjs="$libobjs $pic_object" +- non_pic_objects="$non_pic_objects $non_pic_object" +- fi +- fi - ;; -+ fi ++ # The real first argument should be the name of the installation program. ++ # Aesthetically quote it. ++ func_quote_for_eval "$arg" ++ install_prog="$install_prog$func_quote_for_eval_result" - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" -- continue ++ # We need to accept at least all the BSD install flags. ++ dest= ++ files= ++ opts= ++ prev= ++ install_type= ++ isdir=no ++ stripme= ++ for arg ++ do ++ if test -n "$dest"; then ++ files="$files $dest" ++ dest=$arg + continue - ;; -+ # Replace the output file specification. -+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - +- - *.la) - # A libtool-controlled library. -+ # Delete the old output files. -+ $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname ++ fi - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. @@ -115056,219 +74378,292 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" -- prev= -- else ++ case $arg in ++ -d) isdir=yes ;; ++ -f) ++ case " $install_prog " in ++ *[\\\ /]cp\ *) ;; ++ *) prev=$arg ;; ++ esac ++ ;; ++ -g | -m | -o) ++ prev=$arg ++ ;; ++ -s) ++ stripme=" -s" ++ continue ++ ;; ++ -*) ++ ;; ++ *) ++ # If the previous option needed an argument, then skip it. ++ if test -n "$prev"; then + prev= + else - deplibs="$deplibs $arg" -- fi ++ dest=$arg ++ continue + fi - continue -- ;; -+ $show "$link_command" -+ $run eval "$link_command" || exit $? + ;; ++ esac - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. -- func_quote_for_eval "$arg" -- arg="$func_quote_for_eval_result" +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac - ;; - esac # arg -+ # Now create the wrapper script. -+ $show "creating $output" ++ # Aesthetically quote the argument. ++ func_quote_for_eval "$arg" ++ install_prog="$install_prog $func_quote_for_eval_result" ++ done - # Now actually substitute the argument into the commands. - if test -n "$arg"; then -- func_append compile_command " $arg" -- func_append finalize_command " $arg" +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" - fi - done # argument parsing loop -+ # Quote the relink command for shipping. -+ if test -n "$relink_command"; then -+ # Preserve any variables that may affect compiler behavior -+ for var in $variables_saved_for_relink; do -+ if eval test -z \"\${$var+set}\"; then -+ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" -+ elif eval var_value=\$$var; test -z "$var_value"; then -+ relink_command="$var=; export $var; $relink_command" -+ else -+ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` -+ relink_command="$var=\"$var_value\"; export $var; $relink_command" -+ fi -+ done -+ relink_command="(cd `pwd`; $relink_command)" -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` -+ fi ++ test -z "$install_prog" && \ ++ func_fatal_help "you must specify an install program" -- test -n "$prev" && \ -- func_fatal_help "the \`$prevarg' option requires an argument" -+ # Quote $echo for shipping. -+ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then -+ case $progpath in -+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; -+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; -+ esac -+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` -+ else -+ qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` -+ fi +- if test -n "$prev"; then +- $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- fi ++ test -n "$prev" && \ ++ func_fatal_help "the \`$prev' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" -- func_append compile_command " $arg" -- func_append finalize_command " $arg" -- fi -+ # Only actually do things if our run command is non-null. -+ if test -z "$run"; then -+ # win32 will think the script is a binary if it has -+ # a .exe suffix, so we strip it off here. -+ case $output in -+ *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; -+ esac -+ # test for cygwin because mv fails w/o .exe extensions -+ case $host in -+ *cygwin*) -+ exeext=.exe -+ outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; -+ *) exeext= ;; -+ esac -+ case $host in -+ *cygwin* | *mingw* ) -+ output_name=`basename $output` -+ output_path=`dirname $output` -+ cwrappersource="$output_path/$objdir/lt-$output_name.c" -+ cwrapper="$output_path/$output_name.exe" -+ $rm $cwrappersource $cwrapper -+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 +- compile_command="$compile_command $arg" +- finalize_command="$finalize_command $arg" ++ if test -z "$files"; then ++ if test -z "$dest"; then ++ func_fatal_help "no file or destination specified" ++ else ++ func_fatal_help "you must specify a destination" ++ fi + fi - oldlibs= - # calculate the name of the file, without its directory -- func_basename "$output" -- outputname="$func_basename_result" +- outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" -+ cat > $cwrappersource <<EOF ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$dest" ++ dest=$func_stripname_result - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var -- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` -- else +- eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` ++ # Check to see that the destination is a directory. ++ test -d "$dest" && isdir=yes ++ if test "$isdir" = yes; then ++ destdir="$dest" ++ destname= + else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" -+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname -+ Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP ++ func_dirname_and_basename "$dest" "" "." ++ destdir="$func_dirname_result" ++ destname="$func_basename_result" -- func_dirname "$output" "/" "" -- output_objdir="$func_dirname_result$objdir" +- output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$output_objdir" = "X$output"; then +- output_objdir="$objdir" +- else +- output_objdir="$output_objdir/$objdir" +- fi - # Create the object directory. -- func_mkdir_p "$output_objdir" -+ The $output program cannot be directly executed until all the libtool -+ libraries that it depends on are installed. - +- if test ! -d "$output_objdir"; then +- $show "$mkdir $output_objdir" +- $run $mkdir $output_objdir +- exit_status=$? +- if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then +- exit $exit_status +- fi ++ # Not a directory, so check to see that there is only one file specified. ++ set dummy $files; shift ++ test "$#" -gt 1 && \ ++ func_fatal_help "\`$dest' is not a directory" + fi +- - # Determine the type of output - case $output in - "") -- func_fatal_help "you must specify an output file" +- $echo "$modename: you must specify an output file" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac -+ This wrapper executable should never be moved out of the build directory. -+ If it is, it will not operate correctly. - +- +- case $host in +- *cygwin* | *mingw* | *pw32*) +- # don't eliminate duplications in $postdeps and $predeps +- duplicate_compiler_generated_deps=yes +- ;; ++ case $destdir in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; + *) +- duplicate_compiler_generated_deps=$duplicate_deps ++ for file in $files; do ++ case $file in ++ *.lo) ;; ++ *) ++ func_fatal_help "\`$destdir' must be an absolute directory name" ++ ;; ++ esac ++ done + ;; + esac - specialdeplibs= -+ Currently, it simply execs the wrapper *script* "/bin/sh $output", -+ but could eventually absorb all of the scripts functionality and -+ exec $objdir/$outputname directly. -+*/ -+EOF -+ cat >> $cwrappersource<<"EOF" -+#include <stdio.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <malloc.h> -+#include <stdarg.h> -+#include <assert.h> -+#include <string.h> -+#include <ctype.h> -+#include <sys/stat.h> - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_duplicate_deps ; then +- if test "X$duplicate_deps" = "Xyes" ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$libs $deplib" - done -+#if defined(PATH_MAX) -+# define LT_PATHMAX PATH_MAX -+#elif defined(MAXPATHLEN) -+# define LT_PATHMAX MAXPATHLEN -+#else -+# define LT_PATHMAX 1024 -+#endif ++ # This variable tells wrapper scripts just to set variables rather ++ # than running their programs. ++ libtool_install_magic="$magic" - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" -+#ifndef DIR_SEPARATOR -+# define DIR_SEPARATOR '/' -+# define PATH_SEPARATOR ':' -+#endif ++ staticlibs= ++ future_libdirs= ++ current_libdirs= ++ for file in $files; do - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= -- if $opt_duplicate_compiler_generated_deps; then +- if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -- esac ++ # Do each installation. ++ case $file in ++ *.$libext) ++ # Do the static libraries later. ++ staticlibs="$staticlibs $file" ++ ;; ++ ++ *.la) ++ # Check to see that this really is a libtool archive. ++ func_lalib_unsafe_p "$file" \ ++ || func_fatal_help "\`$file' is not a valid libtool archive" ++ ++ library_names= ++ old_library= ++ relink_command= ++ func_source "$file" ++ ++ # Add the libdir to current_libdirs if it is the destination. ++ if test "X$destdir" = "X$libdir"; then ++ case "$current_libdirs " in ++ *" $libdir "*) ;; ++ *) current_libdirs="$current_libdirs $libdir" ;; + esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi -+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ -+ defined (__OS2__) -+# define HAVE_DOS_BASED_FILE_SYSTEM -+# ifndef DIR_SEPARATOR_2 -+# define DIR_SEPARATOR_2 '\\' -+# endif -+# ifndef PATH_SEPARATOR_2 -+# define PATH_SEPARATOR_2 ';' -+# endif -+#endif ++ else ++ # Note the libdir as a future libdir. ++ case "$future_libdirs " in ++ *" $libdir "*) ;; ++ *) future_libdirs="$future_libdirs $libdir" ;; ++ esac ++ fi - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries -- notinst_path= # paths that contain not-installed libtool libraries -+#ifndef DIR_SEPARATOR_2 -+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -+#else /* DIR_SEPARATOR_2 */ -+# define IS_DIR_SEPARATOR(ch) \ -+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -+#endif /* DIR_SEPARATOR_2 */ - - case $linkmode in - lib) -- passes="conv dlpreopen link" +- passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) -- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" -- ;; -- esac +- $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 +- exit $EXIT_FAILURE ++ func_dirname "$file" "/" "" ++ dir="$func_dirname_result" ++ dir="$dir$objdir" ++ ++ if test -n "$relink_command"; then ++ # Determine the prefix the user has applied to our future dir. ++ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` ++ ++ # Don't allow the user to place us outside of our expected ++ # location b/c this prevents finding dependent libraries that ++ # are installed to the same prefix. ++ # At present, this check doesn't affect windows .dll's that ++ # are installed into $libdir/../bin (currently, that works fine) ++ # but it's something to keep an eye on. ++ test "$inst_prefix_dir" = "$destdir" && \ ++ func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" ++ ++ if test -n "$inst_prefix_dir"; then ++ # Stick the inst_prefix_dir data into the link command. ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` ++ else ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` ++ fi ++ ++ func_warning "relinking \`$file'" ++ func_show_eval "$relink_command" \ ++ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' ++ fi ++ ++ # See the names of the shared library. ++ set dummy $library_names; shift ++ if test -n "$1"; then ++ realname="$1" ++ shift ++ ++ srcname="$realname" ++ test -n "$relink_command" && srcname="$realname"T ++ ++ # Install the shared library and build the symlinks. ++ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ ++ 'exit $?' ++ tstripme="$stripme" ++ case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ case $realname in ++ *.dll.a) ++ tstripme="" ++ ;; ++ esac + ;; + esac - done - ;; - prog) @@ -115282,29 +74677,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - *) passes="conv" - ;; - esac -+#ifndef PATH_SEPARATOR_2 -+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -+#else /* PATH_SEPARATOR_2 */ -+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -+#endif /* PATH_SEPARATOR_2 */ - - for pass in $passes; do -- # The preopen pass in lib mode reverses $deplibs; put it back here -- # so that -L comes before libs that need it for instance... -- if test "$linkmode,$pass" = "lib,link"; then -- ## FIXME: Find the place where the list is rebuilt in the wrong -- ## order, and fix it there properly -- tmp_deplibs= -- for deplib in $deplibs; do -- tmp_deplibs="$deplib $tmp_deplibs" -- done -- deplibs="$tmp_deplibs" -- fi -+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -+#define XFREE(stale) do { \ -+ if (stale) { free ((void *) stale); stale = 0; } \ -+} while (0) - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" @@ -115317,41 +74690,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi -- if test "$linkmode,$pass" = "lib,dlpreopen"; then -- # Collect and forward deplibs of preopened libtool libs -- for lib in $dlprefiles; do -- # Ignore non-libtool-libs -- dependency_libs= -- case $lib in -- *.la) func_source "$lib" ;; -- esac -+/* -DDEBUG is fairly common in CFLAGS. */ -+#undef DEBUG -+#if defined DEBUGWRAPPER -+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -+#else -+# define DEBUG(format, ...) -+#endif - -- # Collect preopened libtool deplibs, except any this library -- # has declared as weak libs -- for deplib in $dependency_libs; do -- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` -- case " $weak_libs " in -- *" $deplib_base "*) ;; -- *) deplibs="$deplibs $deplib" ;; -- esac -- done -- done -- libs="$dlprefiles" -- fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi -+const char *program_name = NULL; - - for deplib in $libs; do - lib= - found=no @@ -115362,27 +74705,22 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" -- if test "$linkmode" = lib ; then -- case "$new_inherited_linker_flags " in -- *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -- esac -- fi - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then -- func_warning "\`-l' is ignored for archives/objects" +- $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue - fi -- func_stripname '-l' '' "$deplib" -- name=$func_stripname_result +- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - if test "$linkmode" = lib; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" -- fi ++ if test -n "$tstripme" && test -n "$striplib"; then ++ func_show_eval "$striplib $destdir/$realname" 'exit $?' + fi - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library @@ -115395,7 +74733,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - fi - break 2 - fi -- done ++ ++ if test "$#" -gt 0; then ++ # Delete the old symlinks, and create new ones. ++ # Try `ln -sf' first, because the `ln' binary might depend on ++ # the symlink we replace! Solaris /bin/ln does not understand -f, ++ # so we also need to try rm && ln -s. ++ for linkname ++ do ++ test "$linkname" != "$realname" \ ++ && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" + done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library @@ -115413,17 +74761,21 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) -- if func_lalib_p "$lib"; then +- if (${SED} -e '2q' $lib | +- grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - library_names= - old_library= -- func_source "$lib" +- case $lib in +- */* | *\\*) . $lib ;; +- *) . ./$lib ;; +- esac - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no -- func_dirname "$lib" "" "." -- ladir="$func_dirname_result" +- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` +- test "X$ladir" = "X$lib" && ladir="." - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" @@ -115435,35 +74787,19 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - continue - fi - fi -- ;; +- ;; - *) ;; - esac - fi - fi - ;; # -l -- *.ltframework) -- if test "$linkmode,$pass" = "prog,link"; then -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- else -- deplibs="$deplib $deplibs" -- if test "$linkmode" = lib ; then -- case "$new_inherited_linker_flags " in -- *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -- esac -- fi -- fi -- continue -- ;; - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" -- func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" +- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) - if test "$pass" = conv; then @@ -115476,19 +74812,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi -- func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" +- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) -- func_warning "\`-L' is ignored for archives/objects" +- $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then -- func_stripname '-R' '' "$deplib" -- dir=$func_stripname_result +- dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; @@ -115506,41 +74840,35 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - fi - case $linkmode in - lib) -- # Linking convenience modules into shared libraries is allowed, -- # but linking other static libraries is non-portable. -- case " $dlpreconveniencelibs " in -- *" $deplib "*) ;; -- *) -- valid_a_lib=no -- case $deplibs_check_method in -- match_pattern*) -- set dummy $deplibs_check_method; shift -- match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` -- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ +- valid_a_lib=no +- case $deplibs_check_method in +- match_pattern*) +- set dummy $deplibs_check_method +- match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` +- if eval $echo \"$deplib\" 2>/dev/null \ +- | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then -- valid_a_lib=yes -- fi -- ;; -- pass_all) - valid_a_lib=yes +- fi - ;; -- esac -- if test "$valid_a_lib" != yes; then -- $ECHO -- $ECHO "*** Warning: Trying to link with static lib archive $deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because the file extensions .$libext of this argument makes me believe" -- $ECHO "*** that it is just a static archive that I should not use here." -- else -- $ECHO -- $ECHO "*** Warning: Linking the shared library $output against the" -- $ECHO "*** static library $deplib is not portable!" -- deplibs="$deplib $deplibs" -- fi -- ;; -- esac +- pass_all) +- valid_a_lib=yes +- ;; +- esac +- if test "$valid_a_lib" != yes; then +- $echo +- $echo "*** Warning: Trying to link with static lib archive $deplib." +- $echo "*** I have the capability to make that library automatically link in when" +- $echo "*** you link to this library. But I can only do this if you have a" +- $echo "*** shared version of the library, which you do not appear to have" +- $echo "*** because the file extensions .$libext of this argument makes me believe" +- $echo "*** that it is just a static archive that I should not used here." +- else +- $echo +- $echo "*** Warning: Linking the shared library $output against the" +- $echo "*** static library $deplib is not portable!" +- deplibs="$deplib $deplibs" +- fi - continue - ;; - prog) @@ -115567,7 +74895,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - else - newdlfiles="$newdlfiles $deplib" - fi -- fi + fi - continue - ;; - %DEPLIBS%) @@ -115575,138 +74903,113 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - continue - ;; - esac # case $deplib -+void * xmalloc (size_t num); -+char * xstrdup (const char *string); -+const char * base_name (const char *name); -+char * find_executable(const char *wrapper); -+int check_executable(const char *path); -+char * strendzap(char *str, const char *pat); -+void lt_fatal (const char *message, ...); - - if test "$found" = yes || test -f "$lib"; then : - else -- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" +- $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 +- exit $EXIT_FAILURE - fi -+int -+main (int argc, char *argv[]) -+{ -+ char **newargz; -+ int i; - # Check to see that this really is a libtool archive. -- func_lalib_unsafe_p "$lib" \ -- || func_fatal_error "\`$lib' is not a valid libtool archive" -+ program_name = (char *) xstrdup (base_name (argv[0])); -+ DEBUG("(main) argv[0] : %s\n",argv[0]); -+ DEBUG("(main) program_name : %s\n",program_name); -+ newargz = XMALLOC(char *, argc+2); -+EOF - -- func_dirname "$lib" "" "." -- ladir="$func_dirname_result" -+ cat >> $cwrappersource <<EOF -+ newargz[0] = (char *) xstrdup("$SHELL"); -+EOF +- if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : +- else +- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit $EXIT_FAILURE ++ # Do each command in the postinstall commands. ++ lib="$destdir/$realname" ++ func_execute_cmds "$postinstall_cmds" 'exit $?' + fi +- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` +- test "X$ladir" = "X$lib" && ladir="." +- - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= -- inherited_linker_flags= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= -+ cat >> $cwrappersource <<"EOF" -+ newargz[1] = find_executable(argv[0]); -+ if (newargz[1] == NULL) -+ lt_fatal("Couldn't find %s", argv[0]); -+ DEBUG("(main) found exe at : %s\n",newargz[1]); -+ /* we know the script has the same name, without the .exe */ -+ /* so make sure newargz[1] doesn't end in .exe */ -+ strendzap(newargz[1],".exe"); -+ for (i = 1; i < argc; i++) -+ newargz[i+1] = xstrdup(argv[i]); -+ newargz[argc+1] = NULL; ++ # Install the pseudo-library for information purposes. ++ func_basename "$file" ++ name="$func_basename_result" ++ instname="$dir/$name"i ++ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' -+ for (i=0; i<argc+1; i++) -+ { -+ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); -+ ; -+ } ++ # Maybe install the static library, too. ++ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ ;; - # Read the .la file -- func_source "$lib" -+EOF +- case $lib in +- */* | *\\*) . $lib ;; +- *) . ./$lib ;; +- esac ++ *.lo) ++ # Install (i.e. copy) a libtool object. -- # Convert "-framework foo" to "foo.ltframework" -- if test -n "$inherited_linker_flags"; then -- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` -- for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do -- case " $new_inherited_linker_flags " in -- *" $tmp_inherited_linker_flag "*) ;; -- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -- esac -- done -- fi -- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -- fi -+ case $host_os in -+ mingw*) -+ cat >> $cwrappersource <<EOF -+ execv("$SHELL",(char const **)newargz); -+EOF -+ ;; -+ *) -+ cat >> $cwrappersource <<EOF -+ execv("$SHELL",newargz); -+EOF -+ ;; -+ esac ++ # Figure out destination file name, if it wasn't already specified. ++ if test -n "$destname"; then ++ destfile="$destdir/$destname" ++ else ++ func_basename "$file" ++ destfile="$func_basename_result" ++ destfile="$destdir/$destfile" + fi - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then -- func_fatal_error "cannot find name of link library for \`$lib'" +- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 +- exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" +- tmp_libs= +- for deplib in $dependency_libs; do +- deplibs="$deplib $deplibs" +- if test "X$duplicate_deps" = "Xyes" ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done - elif test "$linkmode" != prog && test "$linkmode" != lib; then -- func_fatal_error "\`$lib' is not a convenience library" +- $echo "$modename: \`$lib' is not a convenience library" 1>&2 +- exit $EXIT_FAILURE - fi -- tmp_libs= -- for deplib in $dependency_libs; do -- deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- fi -- tmp_libs="$tmp_libs $deplib" -- done - continue - fi # $pass = conv -+ cat >> $cwrappersource <<"EOF" -+ return 127; -+} ++ # Deduce the name of the destination old-style object file. ++ case $destfile in ++ *.lo) ++ func_lo2o "$destfile" ++ staticdest=$func_lo2o_result ++ ;; ++ *.$objext) ++ staticdest="$destfile" ++ destfile= ++ ;; ++ *) ++ func_fatal_help "cannot copy a libtool object to \`$destfile'" ++ ;; ++ esac -+void * -+xmalloc (size_t num) -+{ -+ void * p = (void *) malloc (num); -+ if (!p) -+ lt_fatal ("Memory exhausted"); ++ # Install the libtool object if requested. ++ test -n "$destfile" && \ ++ func_show_eval "$install_prog $file $destfile" 'exit $?' - # Get the name of the library we link against. - linklib= @@ -115714,15 +75017,23 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - linklib="$l" - done - if test -z "$linklib"; then -- func_fatal_error "cannot find name of link library for \`$lib'" -- fi -+ return p; -+} +- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 +- exit $EXIT_FAILURE ++ # Install the old object if enabled. ++ if test "$build_old_libs" = yes; then ++ # Deduce the name of the old-style object file. ++ func_lo2o "$file" ++ staticobj=$func_lo2o_result ++ func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' + fi ++ exit $EXIT_SUCCESS ++ ;; - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then -- func_fatal_error "cannot -dlopen a convenience library: \`$lib'" +- $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 +- exit $EXIT_FAILURE - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || @@ -115737,43 +75048,242 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - fi - continue - fi # $pass = dlopen -+char * -+xstrdup (const char *string) -+{ -+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -+; -+} ++ *) ++ # Figure out destination file name, if it wasn't already specified. ++ if test -n "$destname"; then ++ destfile="$destdir/$destname" ++ else ++ func_basename "$file" ++ destfile="$func_basename_result" ++ destfile="$destdir/$destfile" ++ fi - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; -- *) ++ # If the file is missing, and there is a .exe on the end, strip it ++ # because it is most likely a libtool script we actually want to ++ # install ++ stripped_ext="" ++ case $file in ++ *.exe) ++ if test ! -f "$file"; then ++ func_stripname '' '.exe' "$file" ++ file=$func_stripname_result ++ stripped_ext=".exe" ++ fi ++ ;; ++ esac ++ ++ # Do a test to see if this is really a libtool program. ++ case $host in ++ *cygwin* | *mingw*) ++ if func_ltwrapper_executable_p "$file"; then ++ func_ltwrapper_scriptname "$file" ++ wrapper=$func_ltwrapper_scriptname_result ++ else ++ func_stripname '' '.exe' "$file" ++ wrapper=$func_stripname_result ++ fi ++ ;; + *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then -- func_warning "cannot determine absolute directory name of \`$ladir'" -- func_warning "passing it literally to the linker, although it might fail" +- $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 +- $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" -- fi -- ;; -- esac -- func_basename "$lib" -- laname="$func_basename_result" -+const char * -+base_name (const char *name) -+{ -+ const char *base; ++ wrapper=$file ++ ;; ++ esac ++ if func_ltwrapper_script_p "$wrapper"; then ++ notinst_deplibs= ++ relink_command= ++ ++ func_source "$wrapper" ++ ++ # Check the variables that should have been set. ++ test -z "$generated_by_libtool_version" && \ ++ func_fatal_error "invalid libtool wrapper script \`$wrapper'" ++ ++ finalize=yes ++ for lib in $notinst_deplibs; do ++ # Check to see that each library is installed. ++ libdir= ++ if test -f "$lib"; then ++ func_source "$lib" ++ fi ++ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test ++ if test -n "$libdir" && test ! -f "$libfile"; then ++ func_warning "\`$lib' has not been installed in \`$libdir'" ++ finalize=no ++ fi ++ done ++ ++ relink_command= ++ func_source "$wrapper" ++ ++ outputname= ++ if test "$fast_install" = no && test -n "$relink_command"; then ++ $opt_dry_run || { ++ if test "$finalize" = yes; then ++ tmpdir=`func_mktempdir` ++ func_basename "$file$stripped_ext" ++ file="$func_basename_result" ++ outputname="$tmpdir/$file" ++ # Replace the output file specification. ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` ++ ++ $opt_silent || { ++ func_quote_for_expand "$relink_command" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ if eval "$relink_command"; then : ++ else ++ func_error "error: relink \`$file' with the above command before installing it" ++ $opt_dry_run || ${RM}r "$tmpdir" ++ continue ++ fi ++ file="$outputname" ++ else ++ func_warning "cannot relink \`$file'" ++ fi ++ } ++ else ++ # Install the binary that we compiled earlier. ++ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + fi ++ fi ++ ++ # remove .exe since cygwin /usr/bin/install will append another ++ # one anyway ++ case $install_prog,$host in ++ */usr/bin/install*,*cygwin*) ++ case $file:$destfile in ++ *.exe:*.exe) ++ # this is ok ++ ;; ++ *.exe:*) ++ destfile=$destfile.exe ++ ;; ++ *:*.exe) ++ func_stripname '' '.exe' "$destfile" ++ destfile=$func_stripname_result ++ ;; ++ esac + ;; + esac +- laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ++ func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' ++ $opt_dry_run || if test -n "$outputname"; then ++ ${RM}r "$tmpdir" ++ fi ++ ;; ++ esac ++ done - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -- func_warning "library \`$lib' was moved." +- $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" -- fi ++ for file in $staticlibs; do ++ func_basename "$file" ++ name="$func_basename_result" ++ ++ # Set up the ranlib parameters. ++ oldlib="$destdir/$name" ++ ++ func_show_eval "$install_prog \$file \$oldlib" 'exit $?' ++ ++ if test -n "$stripme" && test -n "$old_striplib"; then ++ func_show_eval "$old_striplib $oldlib" 'exit $?' ++ fi ++ ++ # Do each command in the postinstall commands. ++ func_execute_cmds "$old_postinstall_cmds" 'exit $?' ++ done ++ ++ test -n "$future_libdirs" && \ ++ func_warning "remember to run \`$progname --finish$future_libdirs'" ++ ++ if test -n "$current_libdirs"; then ++ # Maybe just do a dry run. ++ $opt_dry_run && current_libdirs=" -n$current_libdirs" ++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' ++ else ++ exit $EXIT_SUCCESS ++ fi ++} ++ ++test "$mode" = install && func_mode_install ${1+"$@"} ++ ++ ++# func_generate_dlsyms outputname originator pic_p ++# Extract symbols from dlprefiles and create ${outputname}S.o with ++# a dlpreopen symbol table. ++func_generate_dlsyms () ++{ ++ $opt_debug ++ my_outputname="$1" ++ my_originator="$2" ++ my_pic_p="${3-no}" ++ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` ++ my_dlsyms= ++ ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ if test -n "$NM" && test -n "$global_symbol_pipe"; then ++ my_dlsyms="${my_outputname}S.c" ++ else ++ func_error "not configured to extract global symbols from dlpreopened files" ++ fi ++ fi ++ ++ if test -n "$my_dlsyms"; then ++ case $my_dlsyms in ++ "") ;; ++ *.c) ++ # Discover the nlist of each of the dlfiles. ++ nlist="$output_objdir/${my_outputname}.nm" ++ ++ func_show_eval "$RM $nlist ${nlist}S ${nlist}T" ++ ++ # Parse the name list into a source file. ++ func_verbose "creating $output_objdir/$my_dlsyms" ++ ++ $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ ++/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ ++/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ ++ ++#ifdef __cplusplus ++extern \"C\" { ++#endif ++ ++/* External symbol declarations for the compiler. */\ ++" ++ ++ if test "$dlself" = yes; then ++ func_verbose "generating symbol list for \`$output'" ++ ++ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" ++ ++ # Add our own program objects to the symbol list. ++ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ for progfile in $progfiles; do ++ func_verbose "extracting global C symbols from \`$progfile'" ++ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" ++ done ++ ++ if test -n "$exclude_expsyms"; then ++ $opt_dry_run || { ++ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' ++ } + fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then @@ -115781,42 +75291,94 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" -- else ++ ++ if test -n "$export_symbols_regex"; then ++ $opt_dry_run || { ++ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' ++ } ++ fi ++ ++ # Prepare the list of exported symbols ++ if test -z "$export_symbols"; then ++ export_symbols="$output_objdir/$outputname.exp" ++ $opt_dry_run || { ++ $RM $export_symbols ++ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac ++ } + else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" -- fi ++ $opt_dry_run || { ++ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' ++ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' ++ eval '$MV "$nlist"T "$nlist"' ++ case $host in ++ *cygwin | *mingw* | *cegcc* ) ++ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' ++ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ++ ;; ++ esac ++ } + fi - fi # $installed = yes -- func_stripname 'lib' '.la' "$laname" -- name=$func_stripname_result -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ /* Skip over the disk name in MSDOS pathnames. */ -+ if (isalpha ((unsigned char)name[0]) && name[1] == ':') -+ name += 2; -+#endif +- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` ++ fi - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then -- if test -z "$libdir" && test "$linkmode" = prog; then -- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" -- fi +- if test -z "$libdir"; then +- $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 +- exit $EXIT_FAILURE ++ for dlprefile in $dlprefiles; do ++ func_verbose "extracting global C symbols from \`$dlprefile'" ++ func_basename "$dlprefile" ++ name="$func_basename_result" ++ $opt_dry_run || { ++ eval '$ECHO ": $name " >> "$nlist"' ++ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" ++ } ++ done ++ ++ $opt_dry_run || { ++ # Make sure we have at least an empty file. ++ test -f "$nlist" || : > "$nlist" ++ ++ if test -n "$exclude_expsyms"; then ++ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T ++ $MV "$nlist"T "$nlist" + fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" -- else ++ ++ # Try sorting and uniquifying the output. ++ if $GREP -v "^: " < "$nlist" | ++ if sort -k 3 </dev/null >/dev/null 2>&1; then ++ sort -k 3 ++ else ++ sort +2 ++ fi | ++ uniq > "$nlist"S; then ++ : + else - newdlprefiles="$newdlprefiles $dir/$linklib" -- fi ++ $GREP -v "^: " < "$nlist" > "$nlist"S + fi - fi # $pass = dlpreopen -- + - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then @@ -115824,29 +75386,58 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" -- else ++ if test -f "$nlist"S; then ++ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' + else - deplibs="$lib $deplibs" # used for prog,scan pass -- fi ++ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" + fi - continue - fi -- -- + ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ + - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" -- ++/* The mapping between symbol names and symbols. */ ++typedef struct { ++ const char *name; ++ void *address; ++} lt_dlsymlist; ++" ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++/* DATA imports from DLLs on WIN32 con't be const, because ++ runtime relocations are performed -- see ld's documentation ++ on pseudo-relocs. */" ++ lt_dlsym_const= ;; ++ *osf5*) ++ echo >> "$output_objdir/$my_dlsyms" "\ ++/* This system does not cope well with relocations in const data */" ++ lt_dlsym_const= ;; ++ *) ++ lt_dlsym_const=const ;; ++ esac + - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi -- ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++extern $lt_dlsym_const lt_dlsymlist ++lt_${my_prefix}_LTX_preloaded_symbols[]; ++$lt_dlsym_const lt_dlsymlist ++lt_${my_prefix}_LTX_preloaded_symbols[] = ++{\ ++ { \"$my_originator\", (void *) 0 }," + - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in -- -L*) func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -- ;; +- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then @@ -115856,7 +75447,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_duplicate_deps ; then +- if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac @@ -115865,21 +75456,39 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - done # for deplib - continue - fi # $linkmode = prog... -- ++ case $need_lib_prefix in ++ no) ++ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" ++ ;; ++ *) ++ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ++ ;; ++ esac ++ $ECHO >> "$output_objdir/$my_dlsyms" "\ ++ {0, (void *) 0} ++}; + - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || -- test "$prefer_static_libs,$installed" = "built,yes"; } || +- 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. -- case "$temp_rpath:" in -- *"$absdir:"*) ;; -- *) temp_rpath="$temp_rpath$absdir:" ;; +- case "$temp_rpath " in +- *" $dir "*) ;; +- *" $absdir "*) ;; +- *) temp_rpath="$temp_rpath $absdir" ;; - esac - fi -- ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt_${my_prefix}_LTX_preloaded_symbols; ++} ++#endif + - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. @@ -115902,7 +75511,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - ;; - esac - fi # $linkmode,$pass = prog,link... -- ++#ifdef __cplusplus ++} ++#endif\ ++" ++ } # !$opt_dry_run + - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && @@ -115911,46 +75525,61 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - continue - fi - fi -- ++ pic_flag_for_symtable= ++ case "$compile_command " in ++ *" -static "*) ;; ++ *) ++ case $host in ++ # compiling the symbol table file with pic_flag works around ++ # a FreeBSD bug that causes programs to crash when -lm is ++ # linked before any other PIC object. But we must not use ++ # pic_flag when linking with -static. The problem exists in ++ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. ++ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) ++ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; ++ *-*-hpux*) ++ pic_flag_for_symtable=" $pic_flag" ;; ++ *) ++ if test "X$my_pic_p" != Xno; then ++ pic_flag_for_symtable=" $pic_flag" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ symtab_cflags= ++ for arg in $LTCFLAGS; do ++ case $arg in ++ -pie | -fpie | -fPIE) ;; ++ *) symtab_cflags="$symtab_cflags $arg" ;; ++ esac ++ done + - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs -- if test "$use_static_libs" = built && test "$installed" = yes; then +- if test "$use_static_libs" = built && test "$installed" = yes ; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then -- case $host in -- *cygwin* | *mingw* | *cegcc*) -- # No point in relinking DLLs because paths are not encoded -- notinst_deplibs="$notinst_deplibs $lib" -- need_relink=no -- ;; -- *) -- if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -- need_relink=yes -- fi -- ;; -- esac +- if test "$installed" = no; then +- notinst_deplibs="$notinst_deplibs $lib" +- need_relink=yes +- fi - # This is a shared library -- -- # Warn about portability, can't link against -module's on some -- # systems (darwin). Don't bleat about dlopened modules though! -- dlopenmodule="" -- for dlpremoduletest in $dlprefiles; do -- if test "X$dlpremoduletest" = "X$lib"; then -- dlopenmodule="$dlpremoduletest" -- break -- fi -- done -- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then -- $ECHO ++ # Now compile the dynamic symbol file. ++ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' + +- # Warn about portability, can't link against -module's on +- # some systems (darwin) +- if test "$shouldnotlink" = yes && test "$pass" = link ; then +- $echo - if test "$linkmode" = prog; then -- $ECHO "*** Warning: Linking the executable $output against the loadable module" +- $echo "*** Warning: Linking the executable $output against the loadable module" - else -- $ECHO "*** Warning: Linking the shared library $output against the loadable module" +- $echo "*** Warning: Linking the shared library $output against the loadable module" - fi -- $ECHO "*** $linklib is not portable!" +- $echo "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then @@ -115975,24 +75604,56 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - esac - ;; - esac -- fi -- ++ # Clean up the generated files. ++ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' ++ ++ # Transform the symbol file into the correct name. ++ symfileobj="$output_objdir/${my_outputname}S.$objext" ++ case $host in ++ *cygwin* | *mingw* | *cegcc* ) ++ if test -f "$output_objdir/$my_outputname.def"; then ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` ++ else ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + fi ++ ;; ++ *) ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ++ ;; ++ esac ++ ;; ++ *) ++ func_fatal_error "unknown suffix for \`$my_dlsyms'" ++ ;; ++ esac ++ else ++ # We keep going just in case the user didn't refer to ++ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe ++ # 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@%%"` ++ fi ++} + - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names -- shift -- realname="$1" -- shift -- libname=`eval "\\$ECHO \"$libname_spec\""` +- realname="$2" +- shift; shift +- libname=`eval \\$echo \"$libname_spec\"` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in -- *cygwin* | mingw* | *cegcc*) -- func_arith $current - $age -- major=$func_arith_result +- *cygwin* | mingw*) +- major=`expr $current - $age` - versuffix="-$major" - ;; - esac @@ -116000,31 +75661,104 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - else - soname="$realname" - fi -- ++# func_win32_libid arg ++# return the library type of file 'arg' ++# ++# Need a lot of goo to handle *both* DLLs and import libs ++# Has to be a shell function in order to 'eat' the argument ++# that is supplied when $file_magic_command is called. ++func_win32_libid () ++{ ++ $opt_debug ++ win32_libid_type="unknown" ++ win32_fileres=`file -L $1 2>/dev/null` ++ case $win32_fileres in ++ *ar\ archive\ import\ library*) # definitely import ++ win32_libid_type="x86 archive import" ++ ;; ++ *ar\ archive*) # could be an import, or static ++ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | ++ $EGREP '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 ++ } ++ }'` ++ case $win32_nmres in ++ import*) win32_libid_type="x86 archive import";; ++ *) win32_libid_type="x86 archive static";; ++ esac ++ fi ++ ;; ++ *DLL*) ++ win32_libid_type="x86 DLL" ++ ;; ++ *executable*) # but shell scripts are "executable" too... ++ case $win32_fileres in ++ *MS\ Windows\ PE\ Intel*) ++ win32_libid_type="x86 DLL" ++ ;; ++ esac ++ ;; ++ esac ++ $ECHO "$win32_libid_type" ++} + - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" -- func_basename "$soroot" -- soname="$func_basename_result" -- func_stripname 'lib' '.dll' "$soname" -- newlib=libimp-$func_stripname_result.a -- +- soname=`$echo $soroot | ${SED} -e 's/^.*\///'` +- newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" + - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else -- func_verbose "extracting exported symbol list from \`$soname'" -- func_execute_cmds "$extract_expsyms_cmds" 'exit $?' +- $show "extracting exported symbol list from \`$soname'" +- save_ifs="$IFS"; IFS='~' +- cmds=$extract_expsyms_cmds +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" - fi -- + - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else -- func_verbose "generating import library for \`$soname'" -- func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' +- $show "generating import library for \`$soname'" +- save_ifs="$IFS"; IFS='~' +- cmds=$old_archive_from_expsyms_cmds +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" -- ++# func_extract_an_archive dir oldlib ++func_extract_an_archive () ++{ ++ $opt_debug ++ f_ex_an_ar_dir="$1"; shift ++ f_ex_an_ar_oldlib="$1" ++ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' ++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" ++ fi ++} + - if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= @@ -116040,21 +75774,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) -- # if the lib is a (non-dlopened) module then we can not -- # link against it, someone is ignoring the earlier warnings +- # if the lib is a module then we can not link against +- # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | -- $GREP ": [^:]* bundle" >/dev/null ; then -- if test "X$dlopenmodule" != "X$lib"; then -- $ECHO "*** Warning: lib $linklib is a module, not a shared library" -- if test -z "$old_library" ; then -- $ECHO -- $ECHO "*** And there doesn't seem to be a static archive available" -- $ECHO "*** The link will probably fail, sorry" -- else -- add="$dir/$old_library" -- fi -- elif test -n "$old_library"; then -- add="$dir/$old_library" +- $EGREP ": [^:]* bundle" >/dev/null ; then +- $echo "** Warning, lib $linklib is a module, not a shared library" +- if test -z "$old_library" ; then +- $echo +- $echo "** And there doesn't seem to be a static archive available" +- $echo "** The link will probably fail, sorry" +- else +- add="$dir/$old_library" - fi - fi - esac @@ -116072,8 +75802,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - fi - ;; - relink) -- if test "$hardcode_direct" = yes && -- test "$hardcode_direct_absolute" = no; then +- if test "$hardcode_direct" = yes; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" @@ -116095,11 +75824,22 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - ;; - *) lib_linked=no ;; - esac -- + - if test "$lib_linked" != yes; then -- func_fatal_configuration "unsupported hardcode properties" +- $echo "$modename: configuration error: unsupported hardcode properties" +- exit $EXIT_FAILURE - fi -- ++# func_extract_archives gentop oldlib ... ++func_extract_archives () ++{ ++ $opt_debug ++ my_gentop="$1"; shift ++ my_oldlibs=${1+"$@"} ++ my_oldobjs="" ++ my_xlib="" ++ my_xabs="" ++ my_xdir="" + - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; @@ -116112,8 +75852,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" -- if test "$hardcode_direct" != yes && -- test "$hardcode_minus_L" != yes && +- if test "$hardcode_direct" != yes && \ +- test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; @@ -116122,14 +75862,33 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - fi - fi - fi -- ++ for my_xlib in $my_oldlibs; do ++ # Extract the objects. ++ case $my_xlib in ++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; ++ *) my_xabs=`pwd`"/$my_xlib" ;; ++ esac ++ func_basename "$my_xlib" ++ my_xlib="$func_basename_result" ++ my_xlib_u=$my_xlib ++ while :; do ++ case " $extracted_archives " in ++ *" $my_xlib_u "*) ++ func_arith $extracted_serial + 1 ++ extracted_serial=$func_arith_result ++ 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" + - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. -- if test "$hardcode_direct" = yes && -- test "$hardcode_direct_absolute" = no; then +- if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" @@ -116143,9 +75902,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then -- add="$inst_prefix_dir$libdir/$linklib" +- add="$inst_prefix_dir$libdir/$linklib" - else -- add="$libdir/$linklib" +- add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. @@ -116160,7 +75919,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - fi - add="-l$name" - fi -- ++ func_mkdir_p "$my_xdir" + - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" @@ -116177,7 +75937,40 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" -- else ++ case $host in ++ *-darwin*) ++ func_verbose "Extracting $my_xabs" ++ # Do not bother doing anything if just a dry run ++ $opt_dry_run || { ++ darwin_orig_dir=`pwd` ++ cd $my_xdir || exit $? ++ darwin_archive=$my_xabs ++ darwin_curdir=`pwd` ++ darwin_base_archive=`basename "$darwin_archive"` ++ darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` ++ if test -n "$darwin_arches"; then ++ darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` ++ darwin_arch= ++ func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" ++ for darwin_arch in $darwin_arches ; do ++ func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" ++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" ++ func_extract_an_archive "`pwd`" "${darwin_base_archive}" ++ cd "$darwin_curdir" ++ $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" ++ done # $darwin_arches ++ ## Okay now we've a bunch of thin objects, gotta fatten them up :) ++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` ++ darwin_file= ++ darwin_files= ++ for darwin_file in $darwin_filelist; do ++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` ++ $LIPO -create -output "$darwin_file" $darwin_files ++ done # $darwin_filelist ++ $RM -rf unfat-$$ ++ cd "$darwin_orig_dir" + else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi @@ -116186,24 +75979,35 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. -- ++ cd $darwin_orig_dir ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ fi # $darwin_arches ++ } # !$opt_dry_run ++ ;; ++ *) ++ func_extract_an_archive "$my_xdir" "$my_xabs" ++ ;; ++ esac ++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` ++ done + - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. -- $ECHO -- $ECHO "*** Warning: This system can not link to static lib archive $lib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have." +- $echo +- $echo "*** Warning: This system can not link to static lib archive $lib." +- $echo "*** I have the capability to make that library automatically link in when" +- $echo "*** you link to this library. But I can only do this if you have a" +- $echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then -- $ECHO "*** But as you try to build a module library, libtool will still create " -- $ECHO "*** a static module, that should work as long as the dlopening application" -- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." +- $echo "*** But as you try to build a module library, libtool will still create " +- $echo "*** a static module, that should work as long as the dlopening application" +- $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then -- $ECHO -- $ECHO "*** However, this would only work if libtool was able to extract symbol" -- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -- $ECHO "*** not find such a program. So, this module is probably useless." -- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." +- $echo +- $echo "*** However, this would only work if libtool was able to extract symbol" +- $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" +- $echo "*** not find such a program. So, this module is probably useless." +- $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module @@ -116217,7 +76021,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - link_static=yes - fi - fi # link shared/static library? -- ++ func_extract_archives_result="$my_oldobjs" ++} + - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || @@ -116227,8 +76033,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in -- -R*) func_stripname '-R' '' "$libdir" -- temp_xrpath=$func_stripname_result +- -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; @@ -116238,7 +76043,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - done - dependency_libs="$temp_deplibs" - fi -- + - newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" @@ -116246,85 +76051,108 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- if $opt_duplicate_deps ; then +- if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done -- + - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) -- func_dirname "$deplib" "" "." -- dir="$func_dirname_result" +- dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` +- test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then -- func_warning "cannot determine absolute directory name of \`$dir'" +- $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac -- if $GREP "^installed=no" $deplib > /dev/null; then +- if grep "^installed=no" $deplib > /dev/null; then +- path="$absdir/$objdir" +- else +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` +- if test -z "$libdir"; then +- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 +- exit $EXIT_FAILURE +- fi +- if test "$absdir" != "$libdir"; then +- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 +- fi +- path="$absdir" +- fi +- depdepl= - case $host in - *-*-darwin*) -- depdepl= +- # we do not want to link against static libs, +- # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` +- eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done -- if test -f "$absdir/$objdir/$depdepl" ; then -- depdepl="$absdir/$objdir/$depdepl" -- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` -- if test -z "$darwin_install_name"; then -- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` -- fi -- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -- path= +- if test -f "$deplibdir/$depdepl" ; then +- depdepl="$deplibdir/$depdepl" +- elif test -f "$path/$depdepl" ; then +- depdepl="$path/$depdepl" +- else +- # Can't find it, oh well... +- depdepl= - fi +- # do not add paths which are already there +- case " $newlib_search_path " in +- *" $path "*) ;; +- *) newlib_search_path="$newlib_search_path $path";; +- esac - fi +- path="" - ;; - *) -- path="-L$absdir/$objdir" +- path="-L$path" - ;; - esac -- else -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -- test -z "$libdir" && \ -- func_fatal_error "\`$deplib' is not a valid libtool archive" -- test "$absdir" != "$libdir" && \ -- func_warning "\`$deplib' seems to be moved" -- -- path="-L$absdir" -- fi - ;; +- -l*) +- case $host in +- *-*-darwin*) +- # Again, we only want to link against shared libraries +- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` +- for tmp in $newlib_search_path ; do +- if test -f "$tmp/lib$tmp_libs.dylib" ; then +- eval depdepl="$tmp/lib$tmp_libs.dylib" +- break +- fi +- done +- path="" +- ;; +- *) continue ;; +- esac +- ;; +- *) continue ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac +- case " $deplibs " in +- *" $depdepl "*) ;; +- *) deplibs="$depdepl $deplibs" ;; +- esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs -- if test "$pass" = link; then -- if test "$linkmode" = "prog"; then -- compile_deplibs="$new_inherited_linker_flags $compile_deplibs" -- finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" -- else -- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- fi -- fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries @@ -116343,8 +76171,18 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - esac - done - newlib_search_path= -- fi -- ++# func_emit_wrapper_part1 [arg=no] ++# ++# Emit the first part of a libtool wrapper script on stdout. ++# For more information, see the description associated with ++# func_emit_wrapper(), below. ++func_emit_wrapper_part1 () ++{ ++ func_emit_wrapper_part1_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_part1_arg1=$1 + fi + - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else @@ -116423,90 +76261,241 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" -- fi -- if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" -- fi -- ++ $ECHO "\ ++#! $SHELL ++ ++# $output - temporary wrapper script for $objdir/$outputname ++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++# ++# The $output program cannot be directly executed until all the libtool ++# libraries that it depends on are installed. ++# ++# This wrapper script should never be moved out of the build directory. ++# If it is, it will not operate correctly. ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++Xsed='${SED} -e 1s/^X//' ++sed_quote_subst='$sed_quote_subst' ++ ++# Be 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 ++ ++relink_command=\"$relink_command\" ++ ++# This environment variable determines our operation mode. ++if test \"\$libtool_install_magic\" = \"$magic\"; then ++ # install mode needs the following variables: ++ generated_by_libtool_version='$macro_version' ++ notinst_deplibs='$notinst_deplibs' ++else ++ # When we are sourced in execute mode, \$file and \$ECHO are already set. ++ if test \"\$libtool_execute_magic\" != \"$magic\"; then ++ ECHO=\"$qecho\" ++ file=\"\$0\" ++ # Make sure echo works. ++ if test \"X\$1\" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then ++ # Yippee, \$ECHO works! ++ : ++ else ++ # Restart under the correct shell, and then maybe \$ECHO will work. ++ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} + fi ++ fi\ ++" ++ $ECHO "\ + - case $linkmode in - oldlib) -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- func_warning "\`-dlopen' is ignored for archives" -- fi -- - case " $deplibs" in - *\ -l* | *\ -L*) -- func_warning "\`-l' and \`-L' are ignored for archives" ;; -- esac -- -- test -n "$rpath" && \ -- func_warning "\`-rpath' is ignored for archives" -- -- test -n "$xrpath" && \ -- func_warning "\`-R' is ignored for archives" -- -- test -n "$vinfo" && \ -- func_warning "\`-version-info/-version-number' is ignored for archives" -- -- test -n "$release" && \ -- func_warning "\`-release' is ignored for archives" -- -- test -n "$export_symbols$export_symbols_regex" && \ -- func_warning "\`-export-symbols' is ignored for archives" -- +- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; ++ # Find the directory that this script lives in. ++ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` ++ test \"x\$thisdir\" = \"x\$file\" && thisdir=. ++ ++ # Follow symbolic links until we get to the real thisdir. ++ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` ++ while test -n \"\$file\"; do ++ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` ++ ++ # If there was a directory component, then change thisdir. ++ if test \"x\$destdir\" != \"x\$file\"; then ++ case \"\$destdir\" in ++ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; ++ *) thisdir=\"\$thisdir/\$destdir\" ;; + esac ++ fi + +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 +- fi ++ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` ++ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` ++ done ++" ++} ++# end: func_emit_wrapper_part1 + +- if test -n "$rpath"; then +- $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 +- fi ++# func_emit_wrapper_part2 [arg=no] ++# ++# Emit the second part of a libtool wrapper script on stdout. ++# For more information, see the description associated with ++# func_emit_wrapper(), below. ++func_emit_wrapper_part2 () ++{ ++ func_emit_wrapper_part2_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_part2_arg1=$1 ++ fi ++ ++ $ECHO "\ ++ ++ # Usually 'no', except on cygwin/mingw when embedded into ++ # the cwrapper. ++ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 ++ if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then ++ # special case for '.' ++ if test \"\$thisdir\" = \".\"; then ++ thisdir=\`pwd\` ++ fi ++ # remove .libs from thisdir ++ case \"\$thisdir\" in ++ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; ++ $objdir ) thisdir=. ;; ++ esac ++ fi + +- if test -n "$xrpath"; then +- $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 +- fi ++ # Try to get the absolute directory name. ++ absdir=\`cd \"\$thisdir\" && pwd\` ++ test -n \"\$absdir\" && thisdir=\"\$absdir\" ++" + +- if test -n "$vinfo"; then +- $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 +- fi ++ if test "$fast_install" = yes; then ++ $ECHO "\ ++ program=lt-'$outputname'$exeext ++ progdir=\"\$thisdir/$objdir\" + +- if test -n "$release"; then +- $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 +- fi ++ if test ! -f \"\$progdir/\$program\" || ++ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ ++ test \"X\$file\" != \"X\$progdir/\$program\"; }; then + +- if test -n "$export_symbols" || test -n "$export_symbols_regex"; then +- $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 +- fi ++ file=\"\$\$-\$program\" + - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; -- ++ if test ! -d \"\$progdir\"; then ++ $MKDIR \"\$progdir\" ++ else ++ $RM \"\$progdir/\$file\" ++ fi" + - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) -- func_stripname 'lib' '.la' "$outputname" -- name=$func_stripname_result +- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) -- test "$module" = no && \ -- func_fatal_help "libtool library \`$output' must begin with \`lib'" -- +- if test "$module" = no; then +- $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required -- func_stripname '' '.la' "$outputname" -- name=$func_stripname_result +- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else -- func_stripname '' '.la' "$outputname" -- libname=$func_stripname_result +- libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - fi - ;; - esac -- ++ $ECHO "\ + - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then -- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" -- else -- $ECHO -- $ECHO "*** Warning: Linking the shared library $output against the non-libtool" -- $ECHO "*** objects $objs is not portable!" +- $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 +- exit $EXIT_FAILURE ++ # relink executable if necessary ++ if test -n \"\$relink_command\"; then ++ if relink_command_output=\`eval \$relink_command 2>&1\`; then : ++ else ++ $ECHO \"\$relink_command_output\" >&2 ++ $RM \"\$progdir/\$file\" ++ exit 1 ++ fi ++ fi ++ ++ $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || ++ { $RM \"\$progdir/\$program\"; ++ $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } ++ $RM \"\$progdir/\$file\" ++ fi" + else +- $echo +- $echo "*** Warning: Linking the shared library $output against the non-libtool" +- $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" -- fi ++ $ECHO "\ ++ program='$outputname' ++ progdir=\"\$thisdir/$objdir\" ++" + fi - fi -- -- test "$dlself" != no && \ -- func_warning "\`-dlopen self' is ignored for libtool libraries" -- + +- if test "$dlself" != no; then +- $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 +- fi ++ $ECHO "\ + - set dummy $rpath -- shift -- test "$#" -gt 1 && \ -- func_warning "ignoring multiple \`-rpath's for a libtool library" -- -- install_libdir="$1" -- +- if test "$#" -gt 2; then +- $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 +- fi +- install_libdir="$2" ++ if test -f \"\$progdir/\$program\"; then" + - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then @@ -116518,32 +76507,111 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - build_libtool_libs=convenience - build_old_libs=yes - fi -- -- test -n "$vinfo" && \ -- func_warning "\`-version-info/-version-number' is ignored for convenience libraries" -- -- test -n "$release" && \ -- func_warning "\`-release' is ignored for convenience libraries" ++ # Export our shlibpath_var if we have one. ++ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then ++ $ECHO "\ ++ # Add our own library path to $shlibpath_var ++ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" ++ ++ # Some systems cannot cope with colon-terminated $shlibpath_var ++ # The second colon is a workaround for a bug in BeOS R4 sed ++ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + +- if test -n "$vinfo"; then +- $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 ++ export $shlibpath_var ++" + fi + +- if test -n "$release"; then +- $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 ++ # fixup the dll searchpath if we need to. ++ if test -n "$dllsearchpath"; then ++ $ECHO "\ ++ # Add the dll search path components to the executable PATH ++ PATH=$dllsearchpath:\$PATH ++" + fi - else -- + - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 -- shift - IFS="$save_ifs" -- -- test -n "$7" && \ -- func_fatal_help "too many parameters to \`-version-info'" -- ++ $ECHO "\ ++ if test \"\$libtool_execute_magic\" != \"$magic\"; then ++ # Run the actual program with our arguments. ++" ++ case $host in ++ # Backslashes separate directories on plain windows ++ *-*-mingw | *-*-os2* | *-cegcc*) ++ $ECHO "\ ++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} ++" ++ ;; ++ ++ *) ++ $ECHO "\ ++ exec \"\$progdir/\$program\" \${1+\"\$@\"} ++" ++ ;; ++ esac ++ $ECHO "\ ++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 ++ exit 1 ++ fi ++ else ++ # The program doesn't exist. ++ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 ++ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 ++ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 ++ exit 1 ++ fi ++fi\ ++" ++} ++# end: func_emit_wrapper_part2 + +- if test -n "$8"; then +- $echo "$modename: too many parameters to \`-version-info'" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE ++ ++# func_emit_wrapper [arg=no] ++# ++# Emit a libtool wrapper script on stdout. ++# Don't directly open a file because we may want to ++# incorporate the script contents within a cygwin/mingw ++# wrapper executable. Must ONLY be called from within ++# func_mode_link because it depends on a number of variables ++# set therein. ++# ++# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR ++# variable will take. If 'yes', then the emitted script ++# will assume that the directory in which it is stored is ++# the $objdir directory. This is a cygwin/mingw-specific ++# behavior. ++func_emit_wrapper () ++{ ++ func_emit_wrapper_arg1=no ++ if test -n "$1" ; then ++ func_emit_wrapper_arg1=$1 + fi + - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible -- ++ # split this up so that func_emit_cwrapperexe_src ++ # can call each part independently. ++ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" ++ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" ++} + - case $vinfo_number in - yes) -- number_major="$1" -- number_minor="$2" -- number_revision="$3" +- number_major="$2" +- number_minor="$3" +- number_revision="$4" - # - # There are really only two kinds -- those that - # use the current revision as the major version @@ -116553,8 +76621,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # - case $version_type in - darwin|linux|osf|windows|none) -- func_arith $number_major + $number_minor -- current=$func_arith_result +- current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; @@ -116564,8 +76631,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - age="0" - ;; - irix|nonstopux) -- func_arith $number_major + $number_minor -- current=$func_arith_result +- current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_minor" - lt_irix_increment=no @@ -116573,150 +76639,429 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - esac - ;; - no) -- current="$1" -- revision="$2" -- age="$3" +- current="$2" +- revision="$3" +- age="$4" - ;; - esac -- + - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- func_error "CURRENT \`$current' must be a nonnegative integer" -- func_fatal_error "\`$vinfo' is not valid version information" +- $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 +- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit $EXIT_FAILURE - ;; - esac -- ++# func_to_host_path arg ++# ++# Convert paths to host format when used with build tools. ++# Intended for use with "native" mingw (where libtool itself ++# is running under the msys shell), or in the following cross- ++# build environments: ++# $build $host ++# mingw (msys) mingw [e.g. native] ++# cygwin mingw ++# *nix + wine mingw ++# where wine is equipped with the `winepath' executable. ++# In the native mingw case, the (msys) shell automatically ++# converts paths for any non-msys applications it launches, ++# but that facility isn't available from inside the cwrapper. ++# Similar accommodations are necessary for $host mingw and ++# $build cygwin. Calling this function does no harm for other ++# $host/$build combinations not listed above. ++# ++# ARG is the path (on $build) that should be converted to ++# the proper representation for $host. The result is stored ++# in $func_to_host_path_result. ++func_to_host_path () ++{ ++ func_to_host_path_result="$1" ++ if test -n "$1" ; then ++ case $host in ++ *mingw* ) ++ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ case $build in ++ *mingw* ) # actually, msys ++ # awkward: cmd appends spaces to result ++ lt_sed_strip_trailing_spaces="s/[ ]*\$//" ++ func_to_host_path_tmp1=`( cmd //c echo "$1" |\ ++ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ *cygwin* ) ++ func_to_host_path_tmp1=`cygpath -w "$1"` ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ * ) ++ # Unfortunately, winepath does not exit with a non-zero ++ # error code, so we are forced to check the contents of ++ # stdout. On the other hand, if the command is not ++ # found, the shell will set an exit code of 127 and print ++ # *an error message* to stdout. So we must check for both ++ # error code of zero AND non-empty stdout, which explains ++ # the odd construction: ++ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` ++ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then ++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ else ++ # Allow warning below. ++ func_to_host_path_result="" ++ fi ++ ;; ++ esac ++ if test -z "$func_to_host_path_result" ; then ++ func_error "Could not determine host path corresponding to" ++ func_error " '$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback: ++ func_to_host_path_result="$1" ++ fi ++ ;; ++ esac ++ fi ++} ++# end: func_to_host_path + - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- func_error "REVISION \`$revision' must be a nonnegative integer" -- func_fatal_error "\`$vinfo' is not valid version information" +- $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 +- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit $EXIT_FAILURE - ;; - esac -- ++# func_to_host_pathlist arg ++# ++# Convert pathlists to host format when used with build tools. ++# See func_to_host_path(), above. This function supports the ++# following $build/$host combinations (but does no harm for ++# combinations not listed here): ++# $build $host ++# mingw (msys) mingw [e.g. native] ++# cygwin mingw ++# *nix + wine mingw ++# ++# Path separators are also converted from $build format to ++# $host format. If ARG begins or ends with a path separator ++# character, it is preserved (but converted to $host format) ++# on output. ++# ++# ARG is a pathlist (on $build) that should be converted to ++# the proper representation on $host. The result is stored ++# in $func_to_host_pathlist_result. ++func_to_host_pathlist () ++{ ++ func_to_host_pathlist_result="$1" ++ if test -n "$1" ; then ++ case $host in ++ *mingw* ) ++ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' ++ # Remove leading and trailing path separator characters from ++ # ARG. msys behavior is inconsistent here, cygpath turns them ++ # into '.;' and ';.', and winepath ignores them completely. ++ func_to_host_pathlist_tmp2="$1" ++ # Once set for this call, this variable should not be ++ # reassigned. It is used in tha fallback case. ++ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e 's|^:*||' -e 's|:*$||'` ++ case $build in ++ *mingw* ) # Actually, msys. ++ # Awkward: cmd appends spaces to result. ++ lt_sed_strip_trailing_spaces="s/[ ]*\$//" ++ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ ++ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ *cygwin* ) ++ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ ++ $SED -e "$lt_sed_naive_backslashify"` ++ ;; ++ * ) ++ # unfortunately, winepath doesn't convert pathlists ++ func_to_host_pathlist_result="" ++ func_to_host_pathlist_oldIFS=$IFS ++ IFS=: ++ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do ++ IFS=$func_to_host_pathlist_oldIFS ++ if test -n "$func_to_host_pathlist_f" ; then ++ func_to_host_path "$func_to_host_pathlist_f" ++ if test -n "$func_to_host_path_result" ; then ++ if test -z "$func_to_host_pathlist_result" ; then ++ func_to_host_pathlist_result="$func_to_host_path_result" ++ else ++ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" ++ fi ++ fi ++ fi ++ IFS=: ++ done ++ IFS=$func_to_host_pathlist_oldIFS ++ ;; ++ esac ++ if test -z "$func_to_host_pathlist_result" ; then ++ func_error "Could not determine the host path(s) corresponding to" ++ func_error " '$1'" ++ func_error "Continuing, but uninstalled executables may not work." ++ # Fallback. This may break if $1 contains DOS-style drive ++ # specifications. The fix is not to complicate the expression ++ # below, but for the user to provide a working wine installation ++ # with winepath so that path translation in the cross-to-mingw ++ # case works properly. ++ lt_replace_pathsep_nix_to_dos="s|:|;|g" ++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ ++ $SED -e "$lt_replace_pathsep_nix_to_dos"` ++ fi ++ # Now, add the leading and trailing path separators back ++ case "$1" in ++ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" ++ ;; ++ esac ++ case "$1" in ++ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++} ++# end: func_to_host_pathlist + - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- func_error "AGE \`$age' must be a nonnegative integer" -- func_fatal_error "\`$vinfo' is not valid version information" +- $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 +- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit $EXIT_FAILURE - ;; - esac -- ++# func_emit_cwrapperexe_src ++# emit the source code for a wrapper executable on stdout ++# Must ONLY be called from within func_mode_link because ++# it depends on a number of variable set therein. ++func_emit_cwrapperexe_src () ++{ ++ cat <<EOF + - if test "$age" -gt "$current"; then -- func_error "AGE \`$age' is greater than the current interface number \`$current'" -- func_fatal_error "\`$vinfo' is not valid version information" +- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 +- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 +- exit $EXIT_FAILURE - fi -- ++/* $cwrappersource - temporary wrapper executable for $objdir/$outputname ++ Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION + - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; -- ++ The $output program cannot be directly executed until all the libtool ++ libraries that it depends on are installed. + - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header -- func_arith $current - $age -- major=.$func_arith_result +- major=.`expr $current - $age` - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... -- func_arith $current + 1 -- minor_current=$func_arith_result +- minor_current=`expr $current + 1` - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; -- ++ This wrapper executable should never be moved out of the build directory. ++ If it is, it will not operate correctly. + - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; -- ++ Currently, it simply execs the wrapper *script* "$SHELL $output", ++ but could eventually absorb all of the scripts functionality and ++ exec $objdir/$outputname directly. ++*/ ++EOF ++ cat <<"EOF" ++#include <stdio.h> ++#include <stdlib.h> ++#ifdef _MSC_VER ++# include <direct.h> ++# include <process.h> ++# include <io.h> ++# define setmode _setmode ++#else ++# include <unistd.h> ++# include <stdint.h> ++# ifdef __CYGWIN__ ++# include <io.h> ++# define HAVE_SETENV ++# ifdef __STRICT_ANSI__ ++char *realpath (const char *, char *); ++int putenv (char *); ++int setenv (const char *, const char *, int); ++# endif ++# endif ++#endif ++#include <malloc.h> ++#include <stdarg.h> ++#include <assert.h> ++#include <string.h> ++#include <ctype.h> ++#include <errno.h> ++#include <fcntl.h> ++#include <sys/stat.h> + - freebsd-elf) - major=".$current" -- versuffix=".$current" +- versuffix=".$current"; - ;; -- ++#if defined(PATH_MAX) ++# define LT_PATHMAX PATH_MAX ++#elif defined(MAXPATHLEN) ++# define LT_PATHMAX MAXPATHLEN ++#else ++# define LT_PATHMAX 1024 ++#endif + - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then -- func_arith $current - $age +- major=`expr $current - $age` - else -- func_arith $current - $age + 1 +- major=`expr $current - $age + 1` - fi -- major=$func_arith_result -- - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" -- ++#ifndef S_IXOTH ++# define S_IXOTH 0 ++#endif ++#ifndef S_IXGRP ++# define S_IXGRP 0 ++#endif + - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do -- func_arith $revision - $loop -- iface=$func_arith_result -- func_arith $loop - 1 -- loop=$func_arith_result +- iface=`expr $revision - $loop` +- loop=`expr $loop - 1` - verstring="$verstring_prefix$major.$iface:$verstring" - done -- ++#ifdef _MSC_VER ++# define S_IXUSR _S_IEXEC ++# define stat _stat ++# ifndef _INTPTR_T_DEFINED ++# define intptr_t int ++# endif ++#endif + - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; -- ++#ifndef DIR_SEPARATOR ++# define DIR_SEPARATOR '/' ++# define PATH_SEPARATOR ':' ++#endif + - linux) -- func_arith $current - $age -- major=.$func_arith_result +- major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; -- ++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ ++ defined (__OS2__) ++# define HAVE_DOS_BASED_FILE_SYSTEM ++# define FOPEN_WB "wb" ++# ifndef DIR_SEPARATOR_2 ++# define DIR_SEPARATOR_2 '\\' ++# endif ++# ifndef PATH_SEPARATOR_2 ++# define PATH_SEPARATOR_2 ';' ++# endif ++#endif + - osf) -- func_arith $current - $age -- major=.$func_arith_result +- major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" -- ++#ifndef DIR_SEPARATOR_2 ++# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) ++#else /* DIR_SEPARATOR_2 */ ++# define IS_DIR_SEPARATOR(ch) \ ++ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) ++#endif /* DIR_SEPARATOR_2 */ + - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do -- func_arith $current - $loop -- iface=$func_arith_result -- func_arith $loop - 1 -- loop=$func_arith_result +- iface=`expr $current - $loop` +- loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done -- ++#ifndef PATH_SEPARATOR_2 ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) ++#else /* PATH_SEPARATOR_2 */ ++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) ++#endif /* PATH_SEPARATOR_2 */ + - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; -- -- qnx) -- major=".$current" -- versuffix=".$current" -- ;; -- ++#ifdef __CYGWIN__ ++# define FOPEN_WB "wb" ++#endif + - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; -- ++#ifndef FOPEN_WB ++# define FOPEN_WB "w" ++#endif ++#ifndef _O_BINARY ++# define _O_BINARY 0 ++#endif + - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. -- func_arith $current - $age -- major=$func_arith_result +- major=`expr $current - $age` - versuffix="-$major" - ;; -- ++#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) ++#define XFREE(stale) do { \ ++ if (stale) { free ((void *) stale); stale = 0; } \ ++} while (0) + - *) -- func_fatal_configuration "unknown library version type \`$version_type'" +- $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 -- ++#undef LTWRAPPER_DEBUGPRINTF ++#if defined DEBUGWRAPPER ++# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args ++static void ++ltwrapper_debugprintf (const char *fmt, ...) ++{ ++ va_list args; ++ va_start (args, fmt); ++ (void) vfprintf (stderr, fmt, args); ++ va_end (args); ++} ++#else ++# define LTWRAPPER_DEBUGPRINTF(args) ++#endif + - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= @@ -116736,18 +77081,36 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - versuffix=".0.0" - fi - fi -- ++const char *program_name = NULL; + - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi -- ++void *xmalloc (size_t num); ++char *xstrdup (const char *string); ++const char *base_name (const char *name); ++char *find_executable (const char *wrapper); ++char *chase_symlinks (const char *pathspec); ++int make_executable (const char *path); ++int check_executable (const char *path); ++char *strendzap (char *str, const char *pat); ++void lt_fatal (const char *message, ...); ++void lt_setenv (const char *name, const char *value); ++char *lt_extend_str (const char *orig_value, const char *add, int to_end); ++void lt_opt_process_env_set (const char *arg); ++void lt_opt_process_env_prepend (const char *arg); ++void lt_opt_process_env_append (const char *arg); ++int lt_split_name_value (const char *arg, char** name, char** value); ++void lt_update_exe_path (const char *name, const char *value); ++void lt_update_lib_path (const char *name, const char *value); + - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then -- func_warning "undefined symbols not allowed in $host shared libraries" +- $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi @@ -116755,26 +77118,23 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi -- - fi -- -- func_generate_dlsyms "$libname" "$libname" "yes" -- libobjs="$libobjs $symfileobj" -- test "X$libobjs" = "X " && libobjs= -- ++static const char *script_text_part1 = ++EOF + - if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -- tempremovelist=`$ECHO "$output_objdir/*"` +- tempremovelist=`$echo "$output_objdir/*"` - for p in $tempremovelist; do - case $p in -- *.$objext | *.gcno) +- *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then -- if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 -- then +- if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 +- then - continue - fi - fi @@ -116783,25 +77143,65 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - *) ;; - esac - done -- test -n "$removelist" && \ -- func_show_eval "${RM}r \$removelist" +- if test -n "$removelist"; then +- $show "${rm}r $removelist" +- $run ${rm}r $removelist +- fi - fi -- ++ func_emit_wrapper_part1 yes | ++ $SED -e 's/\([\\"]\)/\\\1/g' \ ++ -e 's/^/ "/' -e 's/$/\\n"/' ++ echo ";" ++ cat <<EOF + - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" -- ++static const char *script_text_part2 = ++EOF ++ func_emit_wrapper_part2 yes | ++ $SED -e 's/\([\\"]\)/\\\1/g' \ ++ -e 's/^/ "/' -e 's/$/\\n"/' ++ echo ";" ++ ++ cat <<EOF ++const char * MAGIC_EXE = "$magic_exe"; ++const char * LIB_PATH_VARNAME = "$shlibpath_var"; ++EOF + - # Transform .lo files to .o files. -- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` +- oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` - fi -- ++ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then ++ func_to_host_pathlist "$temp_rpath" ++ cat <<EOF ++const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; ++EOF ++ else ++ cat <<"EOF" ++const char * LIB_PATH_VALUE = ""; ++EOF ++ fi + - # Eliminate all temporary directories. - #for path in $notinst_path; do -- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` -- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` -- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` +- # 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 "$dllsearchpath"; then ++ func_to_host_pathlist "$dllsearchpath:" ++ cat <<EOF ++const char * EXE_PATH_VARNAME = "PATH"; ++const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; ++EOF ++ else ++ cat <<"EOF" ++const char * EXE_PATH_VARNAME = ""; ++const char * EXE_PATH_VALUE = ""; ++EOF ++ fi + - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= @@ -116816,7 +77216,16 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi -- ++ if test "$fast_install" = yes; then ++ cat <<EOF ++const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */ ++EOF ++ else ++ cat <<EOF ++const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */ ++EOF ++ fi + - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= @@ -116826,7 +77235,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - *) dlfiles="$dlfiles $lib" ;; - esac - done -- + - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= @@ -116836,16 +77245,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - *) dlprefiles="$dlprefiles $lib" ;; - esac - done -- ++ cat <<"EOF" + - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- deplibs="$deplibs System.ltframework" +- deplibs="$deplibs -framework System" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. @@ -116859,15 +77269,228 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; -- *) +- *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" - fi -- ;; ++#define LTWRAPPER_OPTION_PREFIX "--lt-" ++#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 ++ ++static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; ++static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; ++ ++static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; ++ ++static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; ++static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; ++ /* argument is putenv-style "foo=bar", value of foo is set to bar */ ++ ++static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; ++static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; ++ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ ++ ++static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; ++static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; ++ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ ++ ++int ++main (int argc, char *argv[]) ++{ ++ char **newargz; ++ int newargc; ++ char *tmp_pathspec; ++ char *actual_cwrapper_path; ++ char *actual_cwrapper_name; ++ char *target_name; ++ char *lt_argv_zero; ++ intptr_t rval = 127; ++ ++ int i; ++ ++ program_name = (char *) xstrdup (base_name (argv[0])); ++ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); ++ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); ++ ++ /* very simple arg parsing; don't want to rely on getopt */ ++ for (i = 1; i < argc; i++) ++ { ++ if (strcmp (argv[i], dumpscript_opt) == 0) ++ { ++EOF ++ case "$host" in ++ *mingw* | *cygwin* ) ++ # make stdout use "unix" line endings ++ echo " setmode(1,_O_BINARY);" ++ ;; ++ esac ++ ++ cat <<"EOF" ++ printf ("%s", script_text_part1); ++ printf ("%s", script_text_part2); ++ return 0; ++ } ++ } ++ ++ newargz = XMALLOC (char *, argc + 1); ++ tmp_pathspec = find_executable (argv[0]); ++ if (tmp_pathspec == NULL) ++ lt_fatal ("Couldn't find %s", argv[0]); ++ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", ++ tmp_pathspec)); ++ ++ actual_cwrapper_path = chase_symlinks (tmp_pathspec); ++ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", ++ actual_cwrapper_path)); ++ XFREE (tmp_pathspec); ++ ++ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); ++ strendzap (actual_cwrapper_path, actual_cwrapper_name); ++ ++ /* wrapper name transforms */ ++ strendzap (actual_cwrapper_name, ".exe"); ++ tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1); ++ XFREE (actual_cwrapper_name); ++ actual_cwrapper_name = tmp_pathspec; ++ tmp_pathspec = 0; ++ ++ /* target_name transforms -- use actual target program name; might have lt- prefix */ ++ target_name = xstrdup (base_name (TARGET_PROGRAM_NAME)); ++ strendzap (target_name, ".exe"); ++ tmp_pathspec = lt_extend_str (target_name, ".exe", 1); ++ XFREE (target_name); ++ target_name = tmp_pathspec; ++ tmp_pathspec = 0; ++ ++ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", ++ target_name)); ++EOF ++ ++ cat <<EOF ++ newargz[0] = ++ XMALLOC (char, (strlen (actual_cwrapper_path) + ++ strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1)); ++ strcpy (newargz[0], actual_cwrapper_path); ++ strcat (newargz[0], "$objdir"); ++ strcat (newargz[0], "/"); ++EOF ++ ++ cat <<"EOF" ++ /* stop here, and copy so we don't have to do this twice */ ++ tmp_pathspec = xstrdup (newargz[0]); ++ ++ /* do NOT want the lt- prefix here, so use actual_cwrapper_name */ ++ strcat (newargz[0], actual_cwrapper_name); ++ ++ /* DO want the lt- prefix here if it exists, so use target_name */ ++ lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1); ++ XFREE (tmp_pathspec); ++ tmp_pathspec = NULL; ++EOF ++ ++ case $host_os in ++ mingw*) ++ cat <<"EOF" ++ { ++ char* p; ++ while ((p = strchr (newargz[0], '\\')) != NULL) ++ { ++ *p = '/'; ++ } ++ while ((p = strchr (lt_argv_zero, '\\')) != NULL) ++ { ++ *p = '/'; ++ } ++ } ++EOF + ;; - esac - fi -- ++ esac ++ ++ cat <<"EOF" ++ XFREE (target_name); ++ XFREE (actual_cwrapper_path); ++ XFREE (actual_cwrapper_name); ++ ++ lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ ++ lt_setenv ("DUALCASE", "1"); /* for MSK sh */ ++ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); ++ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); ++ ++ newargc=0; ++ for (i = 1; i < argc; i++) ++ { ++ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) ++ { ++ if (argv[i][env_set_opt_len] == '=') ++ { ++ const char *p = argv[i] + env_set_opt_len + 1; ++ lt_opt_process_env_set (p); ++ } ++ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) ++ { ++ lt_opt_process_env_set (argv[++i]); /* don't copy */ ++ } ++ else ++ lt_fatal ("%s missing required argument", env_set_opt); ++ continue; ++ } ++ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) ++ { ++ if (argv[i][env_prepend_opt_len] == '=') ++ { ++ const char *p = argv[i] + env_prepend_opt_len + 1; ++ lt_opt_process_env_prepend (p); ++ } ++ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) ++ { ++ lt_opt_process_env_prepend (argv[++i]); /* don't copy */ ++ } ++ else ++ lt_fatal ("%s missing required argument", env_prepend_opt); ++ continue; ++ } ++ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) ++ { ++ if (argv[i][env_append_opt_len] == '=') ++ { ++ const char *p = argv[i] + env_append_opt_len + 1; ++ lt_opt_process_env_append (p); ++ } ++ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) ++ { ++ lt_opt_process_env_append (argv[++i]); /* don't copy */ ++ } ++ else ++ lt_fatal ("%s missing required argument", env_append_opt); ++ continue; ++ } ++ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) ++ { ++ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX ++ namespace, but it is not one of the ones we know about and ++ have already dealt with, above (inluding dump-script), then ++ report an error. Otherwise, targets might begin to believe ++ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX ++ namespace. The first time any user complains about this, we'll ++ need to make LTWRAPPER_OPTION_PREFIX a configure-time option ++ or a configure.ac-settable value. ++ */ ++ lt_fatal ("Unrecognized option in %s namespace: '%s'", ++ ltwrapper_option_prefix, argv[i]); ++ } ++ /* otherwise ... */ ++ newargz[++newargc] = xstrdup (argv[i]); ++ } ++ newargz[++newargc] = NULL; ++ ++ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); ++ for (i = 0; i < newargc; i++) ++ { ++ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); ++ } + - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname @@ -116896,18 +77519,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. -- $opt_dry_run || $RM conftest.c +- $rm conftest.c - cat > conftest.c <<EOF - int main() { return 0; } --EOF -- $opt_dry_run || $RM conftest + EOF +- $rm conftest - if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then - ldd_output=`ldd conftest` - for i in $deplibs; do -- case $i in -- -l*) -- func_stripname -l '' "$i" -- name=$func_stripname_result +- name=`expr $i : '-l\(.*\)'` +- # If $name is empty we are operating on a -L argument. +- if test "$name" != "" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) @@ -116915,40 +77537,37 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - i="" - ;; - esac -- fi +- fi - if test -n "$i" ; then -- libname=`eval "\\$ECHO \"$libname_spec\""` -- deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` -- set dummy $deplib_matches; shift -- deplib_match=$1 +- libname=`eval \\$echo \"$libname_spec\"` +- deplib_matches=`eval \\$echo \"$library_names_spec\"` +- set dummy $deplib_matches +- deplib_match=$2 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" - else - droppeddeps=yes -- $ECHO -- $ECHO "*** Warning: dynamic linker does not accept needed library $i." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which I believe you do not have" -- $ECHO "*** because a test_compile did reveal that the linker did not use it for" -- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." +- $echo +- $echo "*** Warning: dynamic linker does not accept needed library $i." +- $echo "*** I have the capability to make that library automatically link in when" +- $echo "*** you link to this library. But I can only do this if you have a" +- $echo "*** shared version of the library, which I believe you do not have" +- $echo "*** because a test_compile did reveal that the linker did not use it for" +- $echo "*** its dynamic dependency list that programs get resolved with at runtime." - fi - fi -- ;; -- *) +- else - newdeplibs="$newdeplibs $i" -- ;; -- esac +- fi - done - else - # Error occurred in the first compile. Let's try to salvage - # the situation: Compile a separate program for each library. - for i in $deplibs; do -- case $i in -- -l*) -- func_stripname -l '' "$i" -- name=$func_stripname_result -- $opt_dry_run || $RM conftest +- name=`expr $i : '-l\(.*\)'` +- # If $name is empty we are operating on a -L argument. +- if test "$name" != "" && test "$name" != "0"; then +- $rm conftest - if $LTCC $LTCFLAGS -o conftest conftest.c $i; then - ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -116960,47 +77579,44 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - esac - fi - if test -n "$i" ; then -- libname=`eval "\\$ECHO \"$libname_spec\""` -- deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` -- set dummy $deplib_matches; shift -- deplib_match=$1 +- libname=`eval \\$echo \"$libname_spec\"` +- deplib_matches=`eval \\$echo \"$library_names_spec\"` +- set dummy $deplib_matches +- deplib_match=$2 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" - else - droppeddeps=yes -- $ECHO -- $ECHO "*** Warning: dynamic linker does not accept needed library $i." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because a test_compile did reveal that the linker did not use this one" -- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." +- $echo +- $echo "*** Warning: dynamic linker does not accept needed library $i." +- $echo "*** I have the capability to make that library automatically link in when" +- $echo "*** you link to this library. But I can only do this if you have a" +- $echo "*** shared version of the library, which you do not appear to have" +- $echo "*** because a test_compile did reveal that the linker did not use this one" +- $echo "*** as a dynamic dependency that programs can get resolved with at runtime." - fi - fi - else - 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 "*** library that it depends on before this library will be fully" -- $ECHO "*** functional. Installing it before continuing would be even better." +- $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 "*** library that it depends on before this library will be fully" +- $echo "*** functional. Installing it before continuing would be even better." - fi -- ;; -- *) +- else - newdeplibs="$newdeplibs $i" -- ;; -- esac +- fi - done - fi - ;; - file_magic*) -- set dummy $deplibs_check_method; shift -- file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` +- set dummy $deplibs_check_method +- file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do -- case $a_deplib in -- -l*) -- func_stripname -l '' "$a_deplib" -- name=$func_stripname_result +- name=`expr $a_deplib : '-l\(.*\)'` +- # If $name is empty we are operating on a -L argument. +- if test "$name" != "" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) @@ -117010,13 +77626,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - esac - fi - if test -n "$a_deplib" ; then -- libname=`eval "\\$ECHO \"$libname_spec\""` +- libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. -- if ls -lLd "$potent_lib" 2>/dev/null | -- $GREP " -> " >/dev/null; then +- if ls -lLd "$potent_lib" 2>/dev/null \ +- | grep " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an @@ -117029,12 +77645,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; +- *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done -- if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | -- $SED -e 10q | -- $EGREP "$file_magic_regex" > /dev/null; then +- if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ +- | ${SED} 10q \ +- | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 @@ -117044,35 +77660,32 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- $ECHO -- $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because I did check the linker path looking for a file starting" +- $echo +- $echo "*** Warning: linker path does not have real file for library $a_deplib." +- $echo "*** I have the capability to make that library automatically link in when" +- $echo "*** you link to this library. But I can only do this if you have a" +- $echo "*** shared version of the library, which you do not appear to have" +- $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then -- $ECHO "*** with $libname but no candidates were found. (...for file magic test)" +- $echo "*** with $libname but no candidates were found. (...for file magic test)" - else -- $ECHO "*** with $libname and none of the candidates passed a file format test" -- $ECHO "*** using a file magic. Last file checked: $potlib" +- $echo "*** with $libname and none of the candidates passed a file format test" +- $echo "*** using a file magic. Last file checked: $potlib" - fi - fi -- ;; -- *) +- else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" -- ;; -- esac +- fi - done # Gone through all deplibs. - ;; - match_pattern*) -- set dummy $deplibs_check_method; shift -- match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` +- set dummy $deplibs_check_method +- match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do -- case $a_deplib in -- -l*) -- func_stripname -l '' "$a_deplib" -- name=$func_stripname_result +- name=`expr $a_deplib : '-l\(.*\)'` +- # If $name is empty we are operating on a -L argument. +- if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) @@ -117082,13 +77695,14 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - esac - fi - if test -n "$a_deplib" ; then -- libname=`eval "\\$ECHO \"$libname_spec\""` +- libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test -- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ -- $EGREP "$match_pattern_regex" > /dev/null; then +- if eval $echo \"$potent_lib\" 2>/dev/null \ +- | ${SED} 10q \ +- | $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 @@ -117098,46 +77712,44 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- $ECHO -- $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because I did check the linker path looking for a file starting" +- $echo +- $echo "*** Warning: linker path does not have real file for library $a_deplib." +- $echo "*** I have the capability to make that library automatically link in when" +- $echo "*** you link to this library. But I can only do this if you have a" +- $echo "*** shared version of the library, which you do not appear to have" +- $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then -- $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" +- $echo "*** with $libname but no candidates were found. (...for regex pattern test)" - else -- $ECHO "*** with $libname and none of the candidates passed a file format test" -- $ECHO "*** using a regex pattern. Last file checked: $potlib" +- $echo "*** with $libname and none of the candidates passed a file format test" +- $echo "*** using a regex pattern. Last file checked: $potlib" - fi - fi -- ;; -- *) +- else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" -- ;; -- esac +- fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" -- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ -- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` +- tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ +- -e 's/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' -- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` +- tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` - done - fi -- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | -- $GREP . >/dev/null; then -- $ECHO +- if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ +- | grep . >/dev/null; then +- $echo - if test "X$deplibs_check_method" = "Xnone"; then -- $ECHO "*** Warning: inter-library dependencies are not supported in this platform." +- $echo "*** Warning: inter-library dependencies are not supported in this platform." - else -- $ECHO "*** Warning: inter-library dependencies are not known to be supported." +- $echo "*** Warning: inter-library dependencies are not known to be supported." - fi -- $ECHO "*** All declared inter-library dependencies are being dropped." +- $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; @@ -117147,36 +77759,48 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - release=$release_save - libname=$libname_save - name=$name_save -+ for (base = name; *name; name++) -+ if (IS_DIR_SEPARATOR (*name)) -+ base = name + 1; -+ return base; -+} - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) -- # On Rhapsody replace the C library with the System framework -- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` +- # On Rhapsody replace the C library is the System framework +- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac -+int -+check_executable(const char * path) -+{ -+ struct stat st; ++ case $host_os in ++ mingw*) ++ cat <<"EOF" ++ /* execv doesn't actually work on mingw as expected on unix */ ++ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); ++ if (rval == -1) ++ { ++ /* failed to start process */ ++ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); ++ return 127; ++ } ++ return rval; ++EOF ++ ;; ++ *) ++ cat <<"EOF" ++ execv (lt_argv_zero, newargz); ++ return rval; /* =127, but avoids unused variable warning */ ++EOF ++ ;; ++ esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then -- $ECHO -- $ECHO "*** Warning: libtool could not satisfy all declared inter-library" -- $ECHO "*** dependencies of module $libname. Therefore, libtool will create" -- $ECHO "*** a static module, that should work as long as the dlopening" -- $ECHO "*** application is linked with the -dlopen flag." +- $echo +- $echo "*** Warning: libtool could not satisfy all declared inter-library" +- $echo "*** dependencies of module $libname. Therefore, libtool will create" +- $echo "*** a static module, that should work as long as the dlopening" +- $echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then -- $ECHO -- $ECHO "*** However, this would only work if libtool was able to extract symbol" -- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -- $ECHO "*** not find such a program. So, this module is probably useless." -- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." +- $echo +- $echo "*** However, this would only work if libtool was able to extract symbol" +- $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" +- $echo "*** not find such a program. So, this module is probably useless." +- $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" @@ -117186,19 +77810,18 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - build_libtool_libs=no - fi - else -- $ECHO "*** The inter-library dependencies that have been dropped here will be" -- $ECHO "*** automatically added whenever a program is linked with this library" -- $ECHO "*** or is declared to -dlopen it." -+ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); -+ if ((!path) || (!*path)) -+ return 0; +- $echo "*** The inter-library dependencies that have been dropped here will be" +- $echo "*** automatically added whenever a program is linked with this library" +- $echo "*** or is declared to -dlopen it." ++ cat <<"EOF" ++} - if test "$allow_undefined" = no; then -- $ECHO -- $ECHO "*** Since this library must not contain undefined symbols," -- $ECHO "*** because either the platform does not support them or" -- $ECHO "*** it was explicitly requested with -no-undefined," -- $ECHO "*** libtool will only create a static version of it." +- $echo +- $echo "*** Since this library must not contain undefined symbols," +- $echo "*** because either the platform does not support them or" +- $echo "*** it was explicitly requested with -no-undefined," +- $echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module @@ -117212,28 +77835,14 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # Done checking deplibs! - deplibs=$newdeplibs - fi -- # Time to change all our "foo.ltframework" stuff back to "-framework foo" -- case $host in -- *-*-darwin*) -- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- ;; -- esac -+ if ((stat (path, &st) >= 0) && -+ ( -+ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -+#if defined (S_IXOTH) -+ ((st.st_mode & S_IXOTH) == S_IXOTH) || -+#endif -+#if defined (S_IXGRP) -+ ((st.st_mode & S_IXGRP) == S_IXGRP) || -+#endif -+ ((st.st_mode & S_IXUSR) == S_IXUSR)) -+ ) -+ return 1; -+ else -+ return 0; ++void * ++xmalloc (size_t num) ++{ ++ void *p = (void *) malloc (num); ++ if (!p) ++ lt_fatal ("Memory exhausted"); + ++ return p; +} - # move library search paths that coincide with paths to not yet @@ -117262,24 +77871,27 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - esac - done - deplibs="$new_libs" -+/* Searches for the full path of the wrapper. Returns -+ newly allocated full path name if found, NULL otherwise */ +char * -+find_executable (const char* wrapper) ++xstrdup (const char *string) +{ -+ int has_slash = 0; -+ const char* p; -+ const char* p_next; -+ /* static buffer for getcwd */ -+ char tmp[LT_PATHMAX + 1]; -+ int tmp_len; -+ char* concat_name; ++ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), ++ string) : NULL; ++} + ++const char * ++base_name (const char *name) ++{ ++ const char *base; - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= -+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ /* Skip over the disk name in MSDOS pathnames. */ ++ if (isalpha ((unsigned char) name[0]) && name[1] == ':') ++ name += 2; ++#endif - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then @@ -117320,7 +77932,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - 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 @@ -117335,226 +77950,32 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi -+ if ((wrapper == NULL) || (*wrapper == '\0')) -+ return NULL; -+ -+ /* Absolute path? */ -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') -+ { -+ concat_name = xstrdup (wrapper); -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ } -+ else -+ { -+#endif -+ if (IS_DIR_SEPARATOR (wrapper[0])) -+ { -+ concat_name = xstrdup (wrapper); -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ } -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ } -+#endif -+ -+ for (p = wrapper; *p; p++) -+ if (*p == '/') -+ { -+ has_slash = 1; -+ break; -+ } -+ if (!has_slash) -+ { -+ /* no slashes; search PATH */ -+ const char* path = getenv ("PATH"); -+ if (path != NULL) -+ { -+ for (p = path; *p; p = p_next) -+ { -+ const char* q; -+ size_t p_len; -+ for (q = p; *q; q++) -+ if (IS_PATH_SEPARATOR(*q)) -+ break; -+ p_len = q - p; -+ p_next = (*q == '\0' ? q : q + 1); -+ if (p_len == 0) -+ { -+ /* empty path: current directory */ -+ if (getcwd (tmp, LT_PATHMAX) == NULL) -+ lt_fatal ("getcwd failed"); -+ tmp_len = strlen(tmp); -+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); -+ memcpy (concat_name, tmp, tmp_len); -+ concat_name[tmp_len] = '/'; -+ strcpy (concat_name + tmp_len + 1, wrapper); -+ } -+ else -+ { -+ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); -+ memcpy (concat_name, p, p_len); -+ concat_name[p_len] = '/'; -+ strcpy (concat_name + p_len + 1, wrapper); -+ } -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ } -+ } -+ /* not found in PATH; assume curdir */ -+ } -+ /* Relative path | not found in path: prepend cwd */ -+ if (getcwd (tmp, LT_PATHMAX) == NULL) -+ lt_fatal ("getcwd failed"); -+ tmp_len = strlen(tmp); -+ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); -+ memcpy (concat_name, tmp, tmp_len); -+ concat_name[tmp_len] = '/'; -+ strcpy (concat_name + tmp_len + 1, wrapper); -+ -+ if (check_executable(concat_name)) -+ return concat_name; -+ XFREE(concat_name); -+ return NULL; ++ for (base = name; *name; name++) ++ if (IS_DIR_SEPARATOR (*name)) ++ base = name + 1; ++ return base; +} -+ -+char * -+strendzap(char *str, const char *pat) -+{ -+ size_t len, patlen; -+ -+ assert(str != NULL); -+ assert(pat != NULL); -+ -+ len = strlen(str); -+ patlen = strlen(pat); -+ -+ if (patlen <= len) -+ { -+ str += len - patlen; -+ if (strcmp(str, pat) == 0) -+ *str = '\0'; -+ } -+ return str; -+} -+ -+static void -+lt_error_core (int exit_status, const char * mode, -+ const char * message, va_list ap) -+{ -+ fprintf (stderr, "%s: %s: ", program_name, mode); -+ vfprintf (stderr, message, ap); -+ fprintf (stderr, ".\n"); -+ -+ if (exit_status >= 0) -+ exit (exit_status); -+} -+ -+void -+lt_fatal (const char *message, ...) -+{ -+ va_list ap; -+ va_start (ap, message); -+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ va_end (ap); -+} -+EOF -+ # we should really use a build-platform specific compiler -+ # here, but OTOH, the wrappers (shell script and this C one) -+ # are only useful if you want to execute the "real" binary. -+ # Since the "real" binary is built for $host, then this -+ # wrapper might as well be built for $host, too. -+ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource -+ ;; -+ esac -+ $rm $output -+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 -+ -+ $echo > $output "\ -+#! $SHELL -+ -+# $output - temporary wrapper script for $objdir/$outputname -+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -+# -+# The $output program cannot be directly executed until all the libtool -+# libraries that it depends on are installed. -+# -+# This wrapper script should never be moved out of the build directory. -+# If it is, it will not operate correctly. -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+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 -+ -+relink_command=\"$relink_command\" -+ -+# This environment variable determines our operation mode. -+if test \"\$libtool_install_magic\" = \"$magic\"; then -+ # install mode needs the following variable: -+ notinst_deplibs='$notinst_deplibs' -+else -+ # When we are sourced in execute mode, \$file and \$echo are already set. -+ if test \"\$libtool_execute_magic\" != \"$magic\"; then -+ echo=\"$qecho\" -+ file=\"\$0\" -+ # Make sure echo works. -+ if test \"X\$1\" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+ elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then -+ # Yippee, \$echo works! -+ : -+ else -+ # Restart under the correct shell, and then maybe \$echo will work. -+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} -+ fi -+ fi\ -+" -+ $echo >> $output "\ - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi -+ # Find the directory that this script lives in. -+ thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` -+ test \"x\$thisdir\" = \"x\$file\" && thisdir=. ++int ++check_executable (const char *path) ++{ ++ struct stat st; - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names -- shift -- realname="$1" -- shift -+ # Follow symbolic links until we get to the real thisdir. -+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` -+ while test -n \"\$file\"; do -+ destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` +- realname="$2" +- shift; shift ++ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", ++ path ? (*path ? path : "EMPTY!") : "NULL!")); ++ if ((!path) || (!*path)) ++ return 0; - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" @@ -117564,13 +77985,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - if test -z "$dlname"; then - dlname=$soname - fi -+ # If there was a directory component, then change thisdir. -+ if test \"x\$destdir\" != \"x\$file\"; then -+ case \"\$destdir\" in -+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; -+ *) thisdir=\"\$thisdir/\$destdir\" ;; -+ esac -+ fi ++ if ((stat (path, &st) >= 0) ++ && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) ++ return 1; ++ else ++ return 0; ++} - lib="$output_objdir/$realname" - linknames= @@ -117578,174 +77998,193 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - do - linknames="$linknames $link" - done -+ file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` -+ done ++int ++make_executable (const char *path) ++{ ++ int rval = 0; ++ struct stat st; - # Use standard objects if they are pic -- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- test "X$libobjs" = "X " && libobjs= -+ # Try to get the absolute directory name. -+ absdir=\`cd \"\$thisdir\" && pwd\` -+ test -n \"\$absdir\" && thisdir=\"\$absdir\" -+" - -- delfiles= -- if test -n "$export_symbols" && test -n "$include_expsyms"; then -- $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" -- export_symbols="$output_objdir/$libname.uexp" -- delfiles="$delfiles $export_symbols" -- fi -- -- orig_export_symbols= -- case $host_os in -- cygwin* | mingw* | cegcc*) -- if test -n "$export_symbols" && test -z "$export_symbols_regex"; then -- # exporting using user supplied symfile -- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then -- # and it's NOT already a .def file. Must figure out -- # which of the given symbols are data symbols and tag -- # them as such. So, trigger use of export_symbols_cmds. -- # export_symbols gets reassigned inside the "prepare -- # the list of exported symbols" if statement, so the -- # include_expsyms logic still works. -- orig_export_symbols="$export_symbols" -- export_symbols= -- always_export_symbols=yes -- fi -- fi -- ;; -- esac -+ if test "$fast_install" = yes; then -+ $echo >> $output "\ -+ program=lt-'$outputname'$exeext -+ progdir=\"\$thisdir/$objdir\" +- test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", ++ path ? (*path ? path : "EMPTY!") : "NULL!")); ++ if ((!path) || (!*path)) ++ return 0; - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then -- func_verbose "generating symbol list for \`$libname.la'" +- $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" -- $opt_dry_run || $RM $export_symbols +- $run $rm $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" -- func_len " $cmd" -- len=$func_len_result -- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -- func_show_eval "$cmd" 'exit $?' -- skipped_export=false +- if len=`expr "X$cmd" : ".*"` && +- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then +- $show "$cmd" +- $run eval "$cmd" || exit $? +- skipped_export=false - else -- # The command line is too long to execute in one step. -- func_verbose "using reloadable object file for export list..." -- skipped_export=: +- # The command line is too long to execute in one step. +- $show "using reloadable object file for export list..." +- skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" -- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then -- func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -- func_show_eval '$MV "${export_symbols}T" "$export_symbols"' +- if test -n "$export_symbols_regex"; then +- $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" +- $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' +- $show "$mv \"${export_symbols}T\" \"$export_symbols\"" +- $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi -+ if test ! -f \"\$progdir/\$program\" || \\ -+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ -+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then ++ if (stat (path, &st) >= 0) ++ { ++ rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); ++ } ++ return rval; ++} - if test -n "$export_symbols" && test -n "$include_expsyms"; then -- tmp_export_symbols="$export_symbols" -- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' +- $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi -- -- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -- # The given exports_symbols file has to be filtered, so filter it. -- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" -- # FIXME: $output_objdir/$libname.filter potentially contains lots of -- # 's' commands which not all seds can handle. GNU sed should be fine -- # though. Also, the filter scales superlinearly with the number of -- # global variables. join(1) would be nice here, but unfortunately -- # isn't a blessed tool. -- $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -- export_symbols=$output_objdir/$libname.def -- $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols -- fi -+ file=\"\$\$-\$program\" ++/* Searches for the full path of the wrapper. Returns ++ newly allocated full path name if found, NULL otherwise ++ Does not chase symlinks, even on platforms that support them. ++*/ ++char * ++find_executable (const char *wrapper) ++{ ++ int has_slash = 0; ++ const char *p; ++ const char *p_next; ++ /* static buffer for getcwd */ ++ char tmp[LT_PATHMAX + 1]; ++ int tmp_len; ++ char *concat_name; - tmp_deplibs= - for test_deplib in $deplibs; do -- case " $convenience " in -- *" $test_deplib "*) ;; -- *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -- ;; -- esac +- case " $convenience " in +- *" $test_deplib "*) ;; +- *) +- tmp_deplibs="$tmp_deplibs $test_deplib" +- ;; +- esac - done - deplibs="$tmp_deplibs" -+ if test ! -d \"\$progdir\"; then -+ $mkdir \"\$progdir\" -+ else -+ $rm \"\$progdir/\$file\" -+ fi" ++ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", ++ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); - if test -n "$convenience"; then -- if test -n "$whole_archive_flag_spec" && -- test "$compiler_needs_object" = yes && -- test -z "$libobjs"; then -- # extract the archives, so we have objects to list. -- # TODO: could optimize this to just extract one archive. -- whole_archive_flag_spec= -- fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -- test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" -+ $echo >> $output "\ ++ if ((wrapper == NULL) || (*wrapper == '\0')) ++ return NULL; - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" -- test "X$libobjs" = "X " && libobjs= - fi - fi -+ # relink executable if necessary -+ if test -n \"\$relink_command\"; then -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : -+ else -+ $echo \"\$relink_command_output\" >&2 -+ $rm \"\$progdir/\$file\" -+ exit $EXIT_FAILURE -+ fi -+ fi - +- - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" -+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || -+ { $rm \"\$progdir/\$program\"; -+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } -+ $rm \"\$progdir/\$file\" -+ fi" -+ else -+ $echo >> $output "\ -+ program='$outputname' -+ progdir=\"\$thisdir/$objdir\" -+" - fi +- fi ++ /* Absolute path? */ ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ } ++ else ++ { ++#endif ++ if (IS_DIR_SEPARATOR (wrapper[0])) ++ { ++ concat_name = xstrdup (wrapper); ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ } ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) ++ } ++#endif - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then -- $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? +- $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? - fi -+ $echo >> $output "\ ++ for (p = wrapper; *p; p++) ++ if (*p == '/') ++ { ++ has_slash = 1; ++ break; ++ } ++ if (!has_slash) ++ { ++ /* no slashes; search PATH */ ++ const char *path = getenv ("PATH"); ++ if (path != NULL) ++ { ++ for (p = path; *p; p = p_next) ++ { ++ const char *q; ++ size_t p_len; ++ for (q = p; *q; q++) ++ if (IS_PATH_SEPARATOR (*q)) ++ break; ++ p_len = q - p; ++ p_next = (*q == '\0' ? q : q + 1); ++ if (p_len == 0) ++ { ++ /* empty path: current directory */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen (tmp); ++ concat_name = ++ XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); ++ } ++ else ++ { ++ concat_name = ++ XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); ++ memcpy (concat_name, p, p_len); ++ concat_name[p_len] = '/'; ++ strcpy (concat_name + p_len + 1, wrapper); ++ } ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ } ++ } ++ /* not found in PATH; assume curdir */ ++ } ++ /* Relative path | not found in path: prepend cwd */ ++ if (getcwd (tmp, LT_PATHMAX) == NULL) ++ lt_fatal ("getcwd failed"); ++ tmp_len = strlen (tmp); ++ concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); ++ memcpy (concat_name, tmp, tmp_len); ++ concat_name[tmp_len] = '/'; ++ strcpy (concat_name + tmp_len + 1, wrapper); - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then @@ -117757,45 +78196,49 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - cmds=$module_cmds - fi - else -- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval test_cmds=\"$archive_expsym_cmds\" -- cmds=$archive_expsym_cmds -- else -- eval test_cmds=\"$archive_cmds\" -- cmds=$archive_cmds +- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- eval test_cmds=\"$archive_expsym_cmds\" +- cmds=$archive_expsym_cmds +- else +- eval test_cmds=\"$archive_cmds\" +- cmds=$archive_cmds - fi -+ if test -f \"\$progdir/\$program\"; then" -+ -+ # Export our shlibpath_var if we have one. -+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -+ $echo >> $output "\ -+ # Add our own library path to $shlibpath_var -+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" -+ -+ # Some systems cannot cope with colon-terminated $shlibpath_var -+ # The second colon is a workaround for a bug in BeOS R4 sed -+ $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` -+ -+ export $shlibpath_var -+" - fi +- fi ++ if (check_executable (concat_name)) ++ return concat_name; ++ XFREE (concat_name); ++ return NULL; ++} - if test "X$skipped_export" != "X:" && -- func_len " $test_cmds" && -- len=$func_len_result && -- test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then +- len=`expr "X$test_cmds" : ".*" 2>/dev/null` && +- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else -- # The command line is too long to link in one step, link piecewise -- # or, if using GNU ld and skipped_export is not :, use a linker -- # script. -+ # fixup the dll searchpath if we need to. -+ if test -n "$dllsearchpath"; then -+ $echo >> $output "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi +- # The command line is too long to link in one step, link piecewise. +- $echo "creating reloadable object files..." ++char * ++chase_symlinks (const char *pathspec) ++{ ++#ifndef S_ISLNK ++ return xstrdup (pathspec); ++#else ++ char buf[LT_PATHMAX]; ++ struct stat s; ++ char *tmp_pathspec = xstrdup (pathspec); ++ char *p; ++ int has_symlinks = 0; ++ while (strlen (tmp_pathspec) && !has_symlinks) ++ { ++ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", ++ tmp_pathspec)); ++ if (lstat (tmp_pathspec, &s) == 0) ++ { ++ if (S_ISLNK (s.st_mode) != 0) ++ { ++ has_symlinks = 1; ++ break; ++ } - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we @@ -117809,479 +78252,354 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - save_libobjs=$libobjs - fi - save_output=$output -- output_la=`$ECHO "X$output" | $Xsed -e "$basename"` -+ $echo >> $output "\ -+ if test \"\$libtool_execute_magic\" != \"$magic\"; then -+ # Run the actual program with our arguments. -+" -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2*) -+ $echo >> $output "\ -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; +- output_la=`$echo "X$output" | $Xsed -e "$basename"` ++ /* search backwards for last DIR_SEPARATOR */ ++ p = tmp_pathspec + strlen (tmp_pathspec) - 1; ++ while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) ++ p--; ++ if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) ++ { ++ /* no more DIR_SEPARATORS left */ ++ break; ++ } ++ *p = '\0'; ++ } ++ else ++ { ++ char *errstr = strerror (errno); ++ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); ++ } ++ } ++ XFREE (tmp_pathspec); - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= +- delfiles= - last_robj= - k=1 -+ *) -+ $echo >> $output "\ -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $echo >> $output "\ -+ \$echo \"\$0: cannot exec \$program \$*\" -+ exit $EXIT_FAILURE -+ fi -+ else -+ # The program doesn't exist. -+ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 -+ \$echo \"This script is just a wrapper for \$program.\" 1>&2 -+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+fi\ -+" -+ chmod +x $output -+ fi -+ exit $EXIT_SUCCESS -+ ;; -+ esac - -- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then -- output=${output_objdir}/${output_la}.lnkscript -- func_verbose "creating GNU ld script: $output" -- $ECHO 'INPUT (' > $output -- for obj in $save_libobjs -- do -- $ECHO "$obj" >> $output -- done -- $ECHO ')' >> $output -- delfiles="$delfiles $output" -- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then -- output=${output_objdir}/${output_la}.lnk -- func_verbose "creating linker input file list: $output" -- : > $output -- set x $save_libobjs -- shift -- firstobj= -- if test "$compiler_needs_object" = yes; then -- firstobj="$1 " -- shift -- fi -- for obj -- do -- $ECHO "$obj" >> $output -- done -- delfiles="$delfiles $output" -- output=$firstobj\"$file_list_spec$output\" -- else -- if test -n "$save_libobjs"; then -- func_verbose "creating reloadable object files..." -- output=$output_objdir/$output_la-${k}.$objext -- eval test_cmds=\"$reload_cmds\" -- func_len " $test_cmds" -- len0=$func_len_result -- len=$len0 -- -- # Loop over the list of objects to be linked. -- for obj in $save_libobjs -- do -- func_len " $obj" -- func_arith $len + $func_len_result -- len=$func_arith_result -- if test "X$objlist" = X || -- test "$len" -lt "$max_cmd_len"; then -- func_append objlist " $obj" -- else -- # The command $test_cmds is almost too long, add a -- # command to the queue. -- if test "$k" -eq 1 ; then -- # The first file doesn't have a previous command to add. -- eval concat_cmds=\"$reload_cmds $objlist $last_robj\" -- else -- # All subsequent reloadable object files will link in -- # the last one created. -- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" -- fi -- last_robj=$output_objdir/$output_la-${k}.$objext -- func_arith $k + 1 -- k=$func_arith_result -- output=$output_objdir/$output_la-${k}.$objext -- objlist=$obj -- func_len " $last_robj" -- func_arith $len0 + $func_len_result -- len=$func_arith_result -- fi -- done -- # Handle the remaining objects by creating one last -- # reloadable object file. All subsequent reloadable object -- # files will link in the last one created. -- test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" -- if test -n "$last_robj"; then -- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" -- fi -- delfiles="$delfiles $output" -+ # See if we need to build an old-fashioned archive. -+ for oldlib in $oldlibs; do - +- output=$output_objdir/$output_la-${k}.$objext +- # Loop over the list of objects to be linked. +- for obj in $save_libobjs +- do +- eval test_cmds=\"$reload_cmds $objlist $last_robj\" +- if test "X$objlist" = X || +- { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && +- test "$len" -le "$max_cmd_len"; }; then +- objlist="$objlist $obj" - else -- output= -- fi -+ if test "$build_libtool_libs" = convenience; then -+ oldobjs="$libobjs_save" -+ addlibs="$convenience" -+ build_libtool_libs=no -+ else -+ if test "$build_libtool_libs" = module; then -+ oldobjs="$libobjs_save" -+ build_libtool_libs=no -+ else -+ oldobjs="$old_deplibs $non_pic_objects" -+ fi -+ addlibs="$old_convenience" -+ fi - -- if ${skipped_export-false}; then -- func_verbose "generating symbol list for \`$libname.la'" -- export_symbols="$output_objdir/$libname.exp" -- $opt_dry_run || $RM $export_symbols -- libobjs=$output -- # Append the command to create the export file. -- test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" -- if test -n "$last_robj"; then -- eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" +- # The command $test_cmds is almost too long, add a +- # command to the queue. +- if test "$k" -eq 1 ; then +- # The first file doesn't have a previous command to add. +- eval concat_cmds=\"$reload_cmds $objlist $last_robj\" +- else +- # All subsequent reloadable object files will link in +- # the last one created. +- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi +- last_robj=$output_objdir/$output_la-${k}.$objext +- k=`expr $k + 1` +- output=$output_objdir/$output_la-${k}.$objext +- objlist=$obj +- len=1 - fi -+ if test -n "$addlibs"; then -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" +- done +- # Handle the remaining objects by creating one last +- # reloadable object file. All subsequent reloadable object +- # files will link in the last one created. +- test -z "$concat_cmds" || concat_cmds=$concat_cmds~ +- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" ++ if (!has_symlinks) ++ { ++ return xstrdup (pathspec); ++ } -- test -n "$save_libobjs" && -- func_verbose "creating a temporary reloadable object file: $output" -+ func_extract_archives $gentop $addlibs -+ oldobjs="$oldobjs $func_extract_archives_result" -+ fi - -- # Loop through the commands generated above and execute them. -- save_ifs="$IFS"; IFS='~' -- for cmd in $concat_cmds; do -- IFS="$save_ifs" -- $opt_silent || { -- func_quote_for_expand "$cmd" -- eval "func_echo $func_quote_for_expand_result" -- } -- $opt_dry_run || eval "$cmd" || { -- lt_exit=$? +- if ${skipped_export-false}; then +- $show "generating symbol list for \`$libname.la'" +- export_symbols="$output_objdir/$libname.exp" +- $run $rm $export_symbols +- libobjs=$output +- # Append the command to create the export file. +- eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" +- fi - -- # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- ( cd "$output_objdir" && \ -- $RM "${realname}T" && \ -- $MV "${realname}U" "$realname" ) -- fi -+ # Do each command in the archive commands. -+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -+ cmds=$old_archive_from_new_cmds -+ else -+ # POSIX demands no paths to be encoded in archives. We have -+ # to avoid creating archives with duplicate basenames if we -+ # might have to extract them afterwards, e.g., when creating a -+ # static archive out of a convenience library, or when linking -+ # the entirety of a libtool archive into another (currently -+ # not supported by libtool). -+ if (for obj in $oldobjs -+ do -+ $echo "X$obj" | $Xsed -e 's%^.*/%%' -+ done | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ $echo "copying selected object files to avoid basename conflicts..." +- # Set up a command to remove the reloadable object files +- # after they are used. +- i=0 +- while test "$i" -lt "$k" +- do +- i=`expr $i + 1` +- delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" +- done ++ tmp_pathspec = realpath (pathspec, buf); ++ if (tmp_pathspec == 0) ++ { ++ lt_fatal ("Could not follow symlinks for %s", pathspec); ++ } ++ return xstrdup (tmp_pathspec); ++#endif ++} -- exit $lt_exit -- } -- done +- $echo "creating a temporary reloadable object file: $output" ++char * ++strendzap (char *str, const char *pat) ++{ ++ size_t len, patlen; + +- # Loop through the commands generated above and execute them. +- save_ifs="$IFS"; IFS='~' +- for cmd in $concat_cmds; do - IFS="$save_ifs" -+ if test -z "$gentop"; then -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" - -- if test -n "$export_symbols_regex" && ${skipped_export-false}; then -- func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -- func_show_eval '$MV "${export_symbols}T" "$export_symbols"' -+ $show "${rm}r $gentop" -+ $run ${rm}r "$gentop" -+ $show "$mkdir $gentop" -+ $run $mkdir "$gentop" -+ exit_status=$? -+ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then -+ exit $exit_status - fi - fi - -- if ${skipped_export-false}; then -- if test -n "$export_symbols" && test -n "$include_expsyms"; then -- tmp_export_symbols="$export_symbols" -- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' -- fi -- -- if test -n "$orig_export_symbols"; then -- # The given exports_symbols file has to be filtered, so filter it. -- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" -- # FIXME: $output_objdir/$libname.filter potentially contains lots of -- # 's' commands which not all seds can handle. GNU sed should be fine -- # though. Also, the filter scales superlinearly with the number of -- # global variables. join(1) would be nice here, but unfortunately -- # isn't a blessed tool. -- $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -- export_symbols=$output_objdir/$libname.def -- $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols -- fi -- fi -+ save_oldobjs=$oldobjs -+ oldobjs= -+ counter=1 -+ for obj in $save_oldobjs -+ do -+ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -+ case " $oldobjs " in -+ " ") oldobjs=$obj ;; -+ *[\ /]"$objbase "*) -+ while :; do -+ # Make sure we don't pick an alternate name that also -+ # overlaps. -+ newobj=lt$counter-$objbase -+ counter=`expr $counter + 1` -+ case " $oldobjs " in -+ *[\ /]"$newobj "*) ;; -+ *) if test ! -f "$gentop/$newobj"; then break; fi ;; -+ esac -+ done -+ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -+ $run ln "$obj" "$gentop/$newobj" || -+ $run cp "$obj" "$gentop/$newobj" -+ oldobjs="$oldobjs $gentop/$newobj" -+ ;; -+ *) oldobjs="$oldobjs $obj" ;; -+ esac -+ done -+ fi +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" ++ assert (str != NULL); ++ assert (pat != NULL); - libobjs=$output - # Restore the value of output. - output=$save_output -+ eval cmds=\"$old_archive_cmds\" ++ len = strlen (str); ++ patlen = strlen (pat); - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -- test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. -+ if len=`expr "X$cmds" : ".*"` && -+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ cmds=$old_archive_cmds -+ else -+ # the command line is too long to link in one step, link in parts -+ $echo "using piecewise archive linking..." -+ save_RANLIB=$RANLIB -+ RANLIB=: -+ objlist= -+ concat_cmds= -+ save_oldobjs=$oldobjs ++ if (patlen <= len) ++ { ++ str += len - patlen; ++ if (strcmp (str, pat) == 0) ++ *str = '\0'; ++ } ++ return str; ++} - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds -+ # Is there a better way of finding the last object in the list? -+ for obj in $save_oldobjs -+ do -+ last_oldobj=$obj -+ done -+ for obj in $save_oldobjs -+ do -+ oldobjs="$objlist $obj" -+ objlist="$objlist $obj" -+ eval test_cmds=\"$old_archive_cmds\" -+ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && -+ test "$len" -le "$max_cmd_len"; then -+ : - else -- cmds=$module_cmds -+ # the above command should be used before it gets too long -+ oldobjs=$objlist -+ if test "$obj" = "$last_oldobj" ; then -+ RANLIB=$save_RANLIB -+ fi -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" -+ objlist= - fi -+ done -+ RANLIB=$save_RANLIB -+ oldobjs=$objlist -+ if test "X$oldobjs" = "X" ; then -+ eval cmds=\"\$concat_cmds\" - else -- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- cmds=$archive_expsym_cmds - else -- cmds=$archive_cmds +- cmds=$module_cmds - fi -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi -- -- if test -n "$delfiles"; then -- # Append the command to remove temporary files to $cmds. -- eval cmds=\"\$cmds~\$RM $delfiles\" +- else +- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then +- cmds=$archive_expsym_cmds +- else +- cmds=$archive_cmds +- fi +- fi ++static void ++lt_error_core (int exit_status, const char *mode, ++ const char *message, va_list ap) ++{ ++ fprintf (stderr, "%s: %s: ", program_name, mode); ++ vfprintf (stderr, message, ap); ++ fprintf (stderr, ".\n"); + +- # Append the command to remove the reloadable object files +- # to the just-reset $cmds. +- eval cmds=\"\$cmds~\$rm $delfiles\" - fi -- -- # Add any objects from preloaded convenience libraries -- if test -n "$dlprefiles"; then -- gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -- -- func_extract_archives $gentop $dlprefiles -- libobjs="$libobjs $func_extract_archives_result" -- test "X$libobjs" = "X " && libobjs= -- fi -- - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" -- $opt_silent || { -- func_quote_for_expand "$cmd" -- eval "func_echo $func_quote_for_expand_result" -- } -- $opt_dry_run || eval "$cmd" || { +- $show "$cmd" +- $run eval "$cmd" || { - lt_exit=$? -- ++ if (exit_status >= 0) ++ exit (exit_status); ++} + - # Restore the uninstalled library and exit - if test "$mode" = relink; then -- ( cd "$output_objdir" && \ -- $RM "${realname}T" && \ -- $MV "${realname}U" "$realname" ) +- $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi -- ++void ++lt_fatal (const char *message, ...) ++{ ++ va_list ap; ++ va_start (ap, message); ++ lt_error_core (EXIT_FAILURE, "FATAL", message, ap); ++ va_end (ap); ++} + - exit $lt_exit - } - done -+ fi -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ eval cmd=\"$cmd\" - IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ done +- IFS="$save_ifs" ++void ++lt_setenv (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", ++ (name ? name : "<NULL>"), ++ (value ? value : "<NULL>"))); ++ { ++#ifdef HAVE_SETENV ++ /* always make a copy, for consistency with !HAVE_SETENV */ ++ char *str = xstrdup (value); ++ setenv (name, str, 1); ++#else ++ int len = strlen (name) + 1 + strlen (value) + 1; ++ char *str = XMALLOC (char, len); ++ sprintf (str, "%s=%s", name, value); ++ if (putenv (str) != EXIT_SUCCESS) ++ { ++ XFREE (str); ++ } ++#endif ++ } ++} - # Restore the uninstalled library and exit - if test "$mode" = relink; then -- $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? -- +- $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? ++char * ++lt_extend_str (const char *orig_value, const char *add, int to_end) ++{ ++ char *new_value; ++ if (orig_value && *orig_value) ++ { ++ int orig_value_len = strlen (orig_value); ++ int add_len = strlen (add); ++ new_value = XMALLOC (char, add_len + orig_value_len + 1); ++ if (to_end) ++ { ++ strcpy (new_value, orig_value); ++ strcpy (new_value + orig_value_len, add); ++ } ++ else ++ { ++ strcpy (new_value, add); ++ strcpy (new_value + add_len, orig_value); ++ } ++ } ++ else ++ { ++ new_value = xstrdup (add); ++ } ++ return new_value; ++} + - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then -- func_show_eval '${RM}r "$gentop"' +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" - fi - fi -- ++int ++lt_split_name_value (const char *arg, char** name, char** value) ++{ ++ const char *p; ++ int len; ++ if (!arg || !*arg) ++ return 1; + - exit $EXIT_SUCCESS - fi -+ if test -n "$generated"; then -+ $show "${rm}r$generated" -+ $run ${rm}r$generated -+ fi ++ p = strchr (arg, (int)'='); - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then -- func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' +- $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" +- $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi - done -+ # Now create the libtool archive. -+ case $output in -+ *.la) -+ old_library= -+ test "$build_old_libs" = yes && old_library="$libname.$libext" -+ $show "creating $output" ++ if (!p) ++ return 1; - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" -+ # Preserve any variables that may affect compiler behavior -+ for var in $variables_saved_for_relink; do -+ if eval test -z \"\${$var+set}\"; then -+ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" -+ elif eval var_value=\$$var; test -z "$var_value"; then -+ relink_command="$var=; export $var; $relink_command" -+ else -+ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` -+ relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi -+ 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" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` -+ if test "$hardcode_automatic" = yes ; then -+ relink_command= - fi +- fi +- fi - ;; - - obj) -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- func_warning "\`-dlopen' is ignored for objects" -- fi -- - case " $deplibs" in - *\ -l* | *\ -L*) -- func_warning "\`-l' and \`-L' are ignored for objects" ;; +- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; - esac -- -- test -n "$rpath" && \ -- func_warning "\`-rpath' is ignored for objects" -- -- test -n "$xrpath" && \ -- func_warning "\`-R' is ignored for objects" -- -- test -n "$vinfo" && \ -- func_warning "\`-version-info' is ignored for objects" -- -- test -n "$release" && \ -- func_warning "\`-release' is ignored for objects" -- ++ *value = xstrdup (++p); + +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 +- fi ++ len = strlen (arg) - strlen (*value); ++ *name = XMALLOC (char, len); ++ strncpy (*name, arg, len-1); ++ (*name)[len - 1] = '\0'; + +- if test -n "$rpath"; then +- $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 +- fi ++ return 0; ++} + +- if test -n "$xrpath"; then +- $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 +- fi ++void ++lt_opt_process_env_set (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; + +- if test -n "$vinfo"; then +- $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 +- fi ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); ++ } + +- if test -n "$release"; then +- $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 +- fi ++ lt_setenv (name, value); ++ XFREE (name); ++ XFREE (value); ++} + - case $output in - *.lo) -- test -n "$objs$old_deplibs" && \ -- func_fatal_error "cannot build library object \`$output' from non-libtool objects" -- -- libobj=$output -- func_lo2o "$libobj" -- obj=$func_lo2o_result +- if test -n "$objs$old_deplibs"; then +- $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 +- exit $EXIT_FAILURE +- fi +- libobj="$output" +- obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac -- ++void ++lt_opt_process_env_prepend (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ char *new_value = NULL; + - # Delete the old objects. -- $opt_dry_run || $RM $obj $libobj +- $run $rm $obj $libobj ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); ++ } - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create @@ -118293,303 +78611,292 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= ++ new_value = lt_extend_str (getenv (name), value, 0); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ XFREE (name); ++ XFREE (value); ++} - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" -- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` +- reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` - else - gentop="$output_objdir/${obj}x" - generated="$generated $gentop" -+ # Only create the output if not a dry run. -+ if test -z "$run"; then -+ for installed in no yes; do -+ if test "$installed" = yes; then -+ if test -z "$install_libdir"; then -+ break -+ fi -+ output="$output_objdir/$outputname"i -+ # Replace all uninstalled libtool libraries with the installed ones -+ newdependency_libs= -+ for deplib in $dependency_libs; do -+ case $deplib in -+ *.la) -+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ if test -z "$libdir"; then -+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ newdependency_libs="$newdependency_libs $libdir/$name" -+ ;; -+ *) newdependency_libs="$newdependency_libs $deplib" ;; -+ esac -+ done -+ dependency_libs="$newdependency_libs" -+ newdlfiles= -+ for lib in $dlfiles; do -+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ if test -z "$libdir"; then -+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ newdlfiles="$newdlfiles $libdir/$name" -+ done -+ dlfiles="$newdlfiles" -+ newdlprefiles= -+ for lib in $dlprefiles; do -+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ if test -z "$libdir"; then -+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ newdlprefiles="$newdlprefiles $libdir/$name" -+ done -+ dlprefiles="$newdlprefiles" -+ else -+ newdlfiles= -+ for lib in $dlfiles; do -+ case $lib in -+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ *) abs=`pwd`"/$lib" ;; -+ esac -+ newdlfiles="$newdlfiles $abs" -+ done -+ dlfiles="$newdlfiles" -+ newdlprefiles= -+ for lib in $dlprefiles; do -+ case $lib in -+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ *) abs=`pwd`"/$lib" ;; -+ esac -+ newdlprefiles="$newdlprefiles $abs" -+ done -+ dlprefiles="$newdlprefiles" -+ fi -+ $rm $output -+ # place dlname in correct position for cygwin -+ tdlname=$dlname -+ case $host,$output,$installed,$module,$dlname in -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -+ esac -+ $echo > $output "\ -+# $outputname - a libtool library file -+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -+# -+# Please DO NOT delete this file! -+# It is necessary for linking the library. ++void ++lt_opt_process_env_append (const char *arg) ++{ ++ char *name = NULL; ++ char *value = NULL; ++ char *new_value = NULL; - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi -+# The name that we can dlopen(3). -+dlname='$tdlname' ++ if (lt_split_name_value (arg, &name, &value) != 0) ++ { ++ XFREE (name); ++ XFREE (value); ++ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); ++ } - # Create the old-style object. -- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+# Names of this library. -+library_names='$library_names' +- reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test ++ new_value = lt_extend_str (getenv (name), value, 1); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ XFREE (name); ++ XFREE (value); ++} - output="$obj" -- func_execute_cmds "$reload_cmds" 'exit $?' -+# The name of the static archive. -+old_library='$old_library' +- cmds=$reload_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" ++void ++lt_update_exe_path (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", ++ (name ? name : "<NULL>"), ++ (value ? value : "<NULL>"))); - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then -- func_show_eval '${RM}r "$gentop"' +- $show "${rm}r $gentop" +- $run ${rm}r $gentop - fi -+# Libraries that this one depends upon. -+dependency_libs='$dependency_libs' ++ if (name && *name && value && *value) ++ { ++ char *new_value = lt_extend_str (getenv (name), value, 0); ++ /* some systems can't cope with a ':'-terminated path #' */ ++ int len = strlen (new_value); ++ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) ++ { ++ new_value[len-1] = '\0'; ++ } ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ } ++} - exit $EXIT_SUCCESS - fi -+# Version information for $libname. -+current=$current -+age=$age -+revision=$revision ++void ++lt_update_lib_path (const char *name, const char *value) ++{ ++ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", ++ (name ? name : "<NULL>"), ++ (value ? value : "<NULL>"))); - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then -- func_show_eval '${RM}r "$gentop"' +- $show "${rm}r $gentop" +- $run ${rm}r $gentop - fi -+# Is this an already installed library? -+installed=$installed ++ if (name && *name && value && *value) ++ { ++ char *new_value = lt_extend_str (getenv (name), value, 0); ++ lt_setenv (name, new_value); ++ XFREE (new_value); ++ } ++} - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" -- # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? +- # $run eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi -+# Should we warn about portability when linking against -modules? -+shouldnotlink=$module - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" -- func_execute_cmds "$reload_cmds" 'exit $?' +- cmds=$reload_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" - fi -+# Files to dlopen/dlpreopen -+dlopen='$dlfiles' -+dlpreopen='$dlprefiles' ++EOF ++} ++# end: func_emit_cwrapperexe_src - if test -n "$gentop"; then -- func_show_eval '${RM}r "$gentop"' -+# Directory that this library needs to be installed in: -+libdir='$install_libdir'" -+ if test "$installed" = no && test "$need_relink" = yes; then -+ $echo >> $output "\ -+relink_command=\"$relink_command\"" -+ fi -+ done - fi +- $show "${rm}r $gentop" +- $run ${rm}r $gentop +- fi ++# func_mode_link arg... ++func_mode_link () ++{ ++ $opt_debug ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) ++ # It is impossible to link a dll without this setting, and ++ # we shouldn't force the makefile maintainer to figure out ++ # which system we are compiling for in order to pass an extra ++ # flag for every libtool invocation. ++ # allow_undefined=no - exit $EXIT_SUCCESS -+ # Do a symbolic link so that the libtool archive can be found in -+ # LD_LIBRARY_PATH before the program is installed. -+ $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" -+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? ++ # FIXME: Unfortunately, there are problems with the above when trying ++ # to make a dll which has undefined symbols, in which case not ++ # even a static library is built. For now, we need to specify ++ # -no-undefined on the libtool link line when we can be certain ++ # that all symbols are satisfied, otherwise we get a static library. ++ allow_undefined=yes ;; ++ *) ++ allow_undefined=yes ++ ;; + esac -+ exit $EXIT_SUCCESS -+ ;; ++ libtool_args=$nonopt ++ base_compile="$nonopt $@" ++ compile_command=$nonopt ++ finalize_command=$nonopt - prog) - case $host in -- *cygwin*) func_stripname '' '.exe' "$output" -- output=$func_stripname_result.exe;; -+ # libtool install mode -+ install) -+ modename="$modename: install" -+ -+ # There may be an optional sh(1) argument at the beginning of -+ # install_prog (especially on Windows NT). -+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || -+ # Allow the use of GNU shtool's install command. -+ $echo "X$nonopt" | grep shtool > /dev/null; then -+ # Aesthetically quote it. -+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; - esac -- test -n "$vinfo" && \ -- func_warning "\`-version-info' is ignored for programs" -+ install_prog="$arg " -+ arg="$1" -+ shift -+ else -+ install_prog= -+ arg=$nonopt -+ fi +- *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; +- esac +- if test -n "$vinfo"; then +- $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 +- fi +- +- if test -n "$release"; then +- $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 +- fi ++ compile_rpath= ++ finalize_rpath= ++ compile_shlibpath= ++ finalize_shlibpath= ++ convenience= ++ old_convenience= ++ deplibs= ++ old_deplibs= ++ compiler_flags= ++ linker_flags= ++ dllsearchpath= ++ lib_search_path=`pwd` ++ inst_prefix_dir= ++ new_inherited_linker_flags= -- test -n "$release" && \ -- func_warning "\`-release' is ignored for programs" -+ # The real first argument should be the name of the installation program. -+ # Aesthetically quote it. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" -+ ;; -+ esac -+ install_prog="$install_prog$arg" - -- test "$preload" = yes \ -- && test "$dlopen_support" = unknown \ -- && test "$dlopen_self" = unknown \ -- && test "$dlopen_self_static" = unknown && \ -- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." -+ # We need to accept at least all the BSD install flags. -+ dest= -+ files= -+ opts= +- if test "$preload" = yes; then +- if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && +- test "$dlopen_self_static" = unknown; then +- $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." +- fi +- fi ++ avoid_version=no ++ dlfiles= ++ dlprefiles= ++ dlself=no ++ export_dynamic=no ++ export_symbols= ++ export_symbols_regex= ++ generated= ++ libobjs= ++ ltlibs= ++ module=no ++ no_install=no ++ objs= ++ non_pic_objects= ++ precious_files_regex= ++ prefer_static_libs=no ++ preload=no + prev= -+ install_type= -+ isdir=no -+ stripme= -+ for arg -+ do -+ if test -n "$dest"; then -+ files="$files $dest" -+ dest=$arg -+ continue -+ fi ++ prevarg= ++ release= ++ rpath= ++ xrpath= ++ perm_rpath= ++ temp_rpath= ++ thread_safe=no ++ vinfo= ++ vinfo_number=no ++ weak_libs= ++ single_module="${wl}-single_module" ++ func_infer_tag $base_compile - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework -- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` +- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` +- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ++ # We need to know -static, to get the right output filenames. ++ for arg ++ do + case $arg in -+ -d) isdir=yes ;; -+ -f) -+ case " $install_prog " in -+ *[\\\ /]cp\ *) ;; -+ *) prev=$arg ;; ++ -shared) ++ test "$build_libtool_libs" != yes && \ ++ func_fatal_configuration "can not build a shared library" ++ build_old_libs=no ++ break ++ ;; ++ -all-static | -static | -static-libtool-libs) ++ case $arg in ++ -all-static) ++ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then ++ func_warning "complete static linking is impossible in this configuration" ++ fi ++ if test -n "$link_static_flag"; then ++ dlopen_self=$dlopen_self_static ++ fi ++ prefer_static_libs=yes ++ ;; ++ -static) ++ if test -z "$pic_flag" && test -n "$link_static_flag"; then ++ dlopen_self=$dlopen_self_static ++ fi ++ prefer_static_libs=built ++ ;; ++ -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 -+ ;; -+ -g | -m | -o) prev=$arg ;; -+ -s) -+ stripme=" -s" -+ continue -+ ;; -+ -*) -+ ;; -+ *) -+ # If the previous option needed an argument, then skip it. -+ if test -n "$prev"; then -+ prev= -+ else -+ dest=$arg -+ continue -+ fi ++ build_libtool_libs=no ++ build_old_libs=yes ++ break ;; esac ++ done - case $host in -- *-*-darwin*) -- # Don't allow lazy linking, it breaks C++ global constructors -- # But is supposedly fixed on 10.4 or later (yay!). -- if test "$tagname" = CXX ; then -- case ${MACOSX_DEPLOYMENT_TARGET-10.0} in -- 10.[0123]) -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -- ;; -- esac -- fi -- # Time to change all our "foo.ltframework" stuff back to "-framework foo" -- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ # Aesthetically quote the argument. -+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -+ case $arg in -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ arg="\"$arg\"" - ;; - esac -+ install_prog="$install_prog $arg" -+ done -+ -+ if test -z "$install_prog"; then -+ $echo "$modename: you must specify an install program" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi +- *darwin*) +- # Don't allow lazy linking, it breaks C++ global constructors +- if test "$tagname" = CXX ; then +- compile_command="$compile_command ${wl}-bind_at_load" +- finalize_command="$finalize_command ${wl}-bind_at_load" +- fi +- ;; +- esac ++ # See if our shared archives depend on static archives. ++ test -n "$old_archive_from_new_cmds" && build_old_libs=yes -+ if test -n "$prev"; then -+ $echo "$modename: the \`$prev' option requires an argument" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi ++ # Go through the arguments, transforming them on the way. ++ while test "$#" -gt 0; do ++ arg="$1" ++ shift ++ func_quote_for_eval "$arg" ++ qarg=$func_quote_for_eval_unquoted_result ++ func_append libtool_args " $func_quote_for_eval_result" - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list @@ -118597,44 +78904,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; -+ if test -z "$files"; then -+ if test -z "$dest"; then -+ $echo "$modename: no file or destination specified" 1>&2 -+ else -+ $echo "$modename: you must specify a destination" 1>&2 -+ fi -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ -+ # Strip any trailing slash from the destination. -+ dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` -+ -+ # Check to see that the destination is a directory. -+ test -d "$dest" && isdir=yes -+ if test "$isdir" = yes; then -+ destdir="$dest" -+ destname= -+ else -+ destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$destdir" = "X$dest" && destdir=. -+ destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` -+ -+ # Not a directory, so check to see that there is only one file specified. -+ set dummy $files -+ if test "$#" -gt 2; then -+ $echo "$modename: \`$dest' is not a directory" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ fi -+ case $destdir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ for file in $files; do -+ case $file in -+ *.lo) ;; - *) +- *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; @@ -118649,28 +78919,22 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac -+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE ++ # If the previous option needs an argument, assign it. ++ if test -n "$prev"; then ++ case $prev in ++ output) ++ func_append compile_command " @OUTPUT@" ++ func_append finalize_command " @OUTPUT@" ;; - *) new_libs="$new_libs $deplib" ;; esac - done +- done - compile_deplibs="$new_libs" -+ ;; -+ esac - -+ # This variable tells wrapper scripts just to set variables rather -+ # than running their programs. -+ libtool_install_magic="$magic" +- - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" -+ staticlibs= -+ future_libdirs= -+ current_libdirs= -+ for file in $files; do - +- - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do @@ -118681,13 +78945,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - esac - done - fi -+ # Do each installation. -+ case $file in -+ *.$libext) -+ # Do the static libraries later. -+ staticlibs="$staticlibs $file" -+ ;; - +- - # Now hardcode the library paths - rpath= - hardcode_libdirs= @@ -118696,7 +78954,30 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" -- else ++ case $prev in ++ dlfiles|dlprefiles) ++ if test "$preload" = no; then ++ # Add the symbol object into the linking commands. ++ func_append compile_command " @SYMFILE@" ++ func_append finalize_command " @SYMFILE@" ++ preload=yes ++ fi ++ case $arg in ++ *.la | *.lo) ;; # We handle these cases below. ++ force) ++ if test "$dlself" = no; then ++ dlself=needless ++ export_dynamic=yes ++ fi ++ prev= ++ continue ++ ;; ++ self) ++ if test "$prev" = dlprefiles; then ++ dlself=yes ++ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then ++ dlself=yes + else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) @@ -118705,7 +78986,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac -- fi ++ dlself=needless ++ export_dynamic=yes + fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" @@ -118715,37 +78998,32 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac -+ *.la) -+ # Check to see that this really is a libtool archive. -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ else -+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE - fi +- fi - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` +- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) +- testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; -- ::) dllsearchpath=$libdir;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; -- ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; -- esac -- ;; -+ -+ library_names= -+ old_library= -+ relink_command= -+ # If there is no directory component, then add one. -+ case $file in -+ */* | *\\*) . $file ;; -+ *) . ./$file ;; - esac ++ prev= ++ continue ++ ;; ++ *) ++ if test "$prev" = dlfiles; then ++ dlfiles="$dlfiles $arg" ++ else ++ dlprefiles="$dlprefiles $arg" ++ fi ++ prev= ++ continue ++ ;; + esac + ;; +- esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && @@ -118754,7 +79032,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - +- - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do @@ -118770,7 +79048,26 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; -- esac ++ expsyms) ++ export_symbols="$arg" ++ test -f "$arg" \ ++ || func_fatal_error "symbol file \`$arg' does not exist" ++ prev= ++ continue ++ ;; ++ expsyms_regex) ++ export_symbols_regex="$arg" ++ prev= ++ continue ++ ;; ++ framework) ++ case $host in ++ *-*-darwin*) ++ case "$deplibs " in ++ *" $qarg.ltframework "*) ;; ++ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ++ ;; + esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" @@ -118778,20 +79075,11 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in -+ # Add the libdir to current_libdirs if it is the destination. -+ if test "X$destdir" = "X$libdir"; then -+ case "$current_libdirs " in - *" $libdir "*) ;; +- *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ *) current_libdirs="$current_libdirs $libdir" ;; -+ esac -+ else -+ # Note the libdir as a future libdir. -+ case "$future_libdirs " in -+ *" $libdir "*) ;; -+ *) future_libdirs="$future_libdirs $libdir" ;; ++ ;; esac - fi +- fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && @@ -118803,85 +79091,451 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. -- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi ++ prev= ++ continue ++ ;; ++ inst_prefix) ++ inst_prefix_dir="$arg" ++ prev= ++ continue ++ ;; ++ objectlist) ++ if test -f "$arg"; then ++ save_arg=$arg ++ moreargs= ++ for fil in `cat "$save_arg"` ++ do ++# moreargs="$moreargs $fil" ++ arg=$fil ++ # A libtool-controlled object. -- func_generate_dlsyms "$outputname" "@PROGRAM@" "no" -+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ -+ test "X$dir" = "X$file/" && dir= -+ dir="$dir$objdir" - -- # template prelinking step -- if test -n "$prelink_cmds"; then -- func_execute_cmds "$prelink_cmds" 'exit $?' +- dlsyms= +- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then +- if test -n "$NM" && test -n "$global_symbol_pipe"; then +- dlsyms="${outputname}S.c" +- else +- $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 +- fi - fi -+ if test -n "$relink_command"; then -+ # Determine the prefix the user has applied to our future dir. -+ inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` ++ # Check to see that this really is a libtool object. ++ if func_lalib_unsafe_p "$arg"; then ++ pic_object= ++ non_pic_object= -- wrappers_required=yes -- case $host in -- *cygwin* | *mingw* ) -- if test "$build_libtool_libs" != yes; then -- wrappers_required=no -- fi -- ;; -- *cegcc) -- # Disable wrappers for cegcc, we are cross compiling anyway. -- wrappers_required=no -- ;; -- *) -- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then -- wrappers_required=no -- fi -- ;; -- esac -- if test "$wrappers_required" = no; then -- # Replace the output file specification. -- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -- link_command="$compile_command$compile_rpath" -+ # Don't allow the user to place us outside of our expected -+ # location b/c this prevents finding dependent libraries that -+ # are installed to the same prefix. -+ # At present, this check doesn't affect windows .dll's that -+ # are installed into $libdir/../bin (currently, that works fine) -+ # but it's something to keep an eye on. -+ if test "$inst_prefix_dir" = "$destdir"; then -+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -+ exit $EXIT_FAILURE +- if test -n "$dlsyms"; then +- case $dlsyms in +- "") ;; +- *.c) +- # Discover the nlist of each of the dlfiles. +- nlist="$output_objdir/${outputname}.nm" ++ # Read the .lo file ++ func_source "$arg" + +- $show "$rm $nlist ${nlist}S ${nlist}T" +- $run $rm "$nlist" "${nlist}S" "${nlist}T" ++ if test -z "$pic_object" || ++ test -z "$non_pic_object" || ++ test "$pic_object" = none && ++ test "$non_pic_object" = none; then ++ func_fatal_error "cannot find name of object for \`$arg'" ++ fi + +- # Parse the name list into a source file. +- $show "creating $output_objdir/$dlsyms" ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" + +- test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ +-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ +-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ ++ if test "$pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ pic_object="$xdir$pic_object" + +-#ifdef __cplusplus +-extern \"C\" { +-#endif ++ if test "$prev" = dlfiles; then ++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then ++ dlfiles="$dlfiles $pic_object" ++ prev= ++ continue ++ else ++ # If libtool objects are unsupported, then we need to preload. ++ prev=dlprefiles ++ fi ++ fi + +-/* Prevent the only kind of declaration conflicts we can make. */ +-#define lt_preloaded_symbols some_other_symbol ++ # CHECK ME: I think I busted this. -Ossama ++ if test "$prev" = dlprefiles; then ++ # Preload the old-style object. ++ dlprefiles="$dlprefiles $pic_object" ++ prev= ++ fi + +-/* External symbol declarations for the compiler. */\ +-" ++ # A PIC object. ++ func_append libobjs " $pic_object" ++ arg="$pic_object" ++ fi + +- if test "$dlself" = yes; then +- $show "generating symbol list for \`$output'" ++ # Non-PIC object. ++ if test "$non_pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ non_pic_object="$xdir$non_pic_object" + +- test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" ++ # A standard non-PIC object ++ func_append non_pic_objects " $non_pic_object" ++ if test -z "$pic_object" || test "$pic_object" = none ; then ++ arg="$non_pic_object" ++ fi ++ else ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ func_append non_pic_objects " $non_pic_object" ++ fi ++ else ++ # Only an error if not doing a dry-run. ++ if $opt_dry_run; then ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" + +- # Add our own program objects to the symbol list. +- progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` +- for arg in $progfiles; do +- $show "extracting global C symbols from \`$arg'" +- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" ++ func_lo2o "$arg" ++ pic_object=$xdir$objdir/$func_lo2o_result ++ non_pic_object=$xdir$func_lo2o_result ++ func_append libobjs " $pic_object" ++ func_append non_pic_objects " $non_pic_object" ++ else ++ func_fatal_error "\`$arg' is not a valid libtool object" ++ fi ++ fi + done +- +- if test -n "$exclude_expsyms"; then +- $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' +- $run eval '$mv "$nlist"T "$nlist"' +- fi +- +- if test -n "$export_symbols_regex"; then +- $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' +- $run eval '$mv "$nlist"T "$nlist"' +- fi +- +- # Prepare the list of exported symbols +- if test -z "$export_symbols"; then +- export_symbols="$output_objdir/$outputname.exp" +- $run $rm $export_symbols +- $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' +- case $host in +- *cygwin* | *mingw* ) +- $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' +- $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' +- ;; +- esac +- else +- $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' +- $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' +- $run eval 'mv "$nlist"T "$nlist"' +- case $host in +- *cygwin* | *mingw* ) +- $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' +- $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' +- ;; +- esac +- fi ++ else ++ func_fatal_error "link input file \`$arg' does not exist" + fi +- +- for arg in $dlprefiles; do +- $show "extracting global C symbols from \`$arg'" +- name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` +- $run eval '$echo ": $name " >> "$nlist"' +- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" +- done +- +- if test -z "$run"; then +- # Make sure we have at least an empty file. +- test -f "$nlist" || : > "$nlist" +- +- if test -n "$exclude_expsyms"; then +- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T +- $mv "$nlist"T "$nlist" +- fi +- +- # Try sorting and uniquifying the output. +- if grep -v "^: " < "$nlist" | +- if sort -k 3 </dev/null >/dev/null 2>&1; then +- sort -k 3 +- else +- sort +2 +- fi | +- uniq > "$nlist"S; then +- : +- else +- grep -v "^: " < "$nlist" > "$nlist"S +- fi +- +- if test -f "$nlist"S; then +- eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' +- else +- $echo '/* NONE */' >> "$output_objdir/$dlsyms" +- fi +- +- $echo >> "$output_objdir/$dlsyms" "\ +- +-#undef lt_preloaded_symbols +- +-#if defined (__STDC__) && __STDC__ +-# define lt_ptr void * +-#else +-# define lt_ptr char * +-# define const +-#endif +- +-/* The mapping between symbol names and symbols. */ +-" +- +- case $host in +- *cygwin* | *mingw* ) +- $echo >> "$output_objdir/$dlsyms" "\ +-/* DATA imports from DLLs on WIN32 can't be const, because +- runtime relocations are performed -- see ld's documentation +- on pseudo-relocs */ +-struct { +-" +- ;; +- * ) +- $echo >> "$output_objdir/$dlsyms" "\ +-const struct { +-" +- ;; +- esac +- +- +- $echo >> "$output_objdir/$dlsyms" "\ +- const char *name; +- lt_ptr address; +-} +-lt_preloaded_symbols[] = +-{\ +-" +- +- eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" +- +- $echo >> "$output_objdir/$dlsyms" "\ +- {0, (lt_ptr) 0} +-}; +- +-/* This works around a problem in FreeBSD linker */ +-#ifdef FREEBSD_WORKAROUND +-static const void *lt_preloaded_setup() { +- return lt_preloaded_symbols; +-} +-#endif +- +-#ifdef __cplusplus +-} +-#endif\ +-" +- fi +- +- pic_flag_for_symtable= +- case $host in +- # compiling the symbol table file with pic_flag works around +- # a FreeBSD bug that causes programs to crash when -lm is +- # linked before any other PIC object. But we must not use +- # pic_flag when linking with -static. The problem exists in +- # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. +- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) +- case "$compile_command " in +- *" -static "*) ;; +- *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; +- esac;; +- *-*-hpux*) +- case "$compile_command " in +- *" -static "*) ;; +- *) pic_flag_for_symtable=" $pic_flag";; +- esac ++ arg=$save_arg ++ prev= ++ continue ++ ;; ++ precious_regex) ++ precious_files_regex="$arg" ++ prev= ++ continue ++ ;; ++ release) ++ release="-$arg" ++ prev= ++ continue ++ ;; ++ rpath | xrpath) ++ # We need an absolute path. ++ case $arg in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ func_fatal_error "only absolute run-paths are allowed" ++ ;; + esac +- +- # Now compile the dynamic symbol file. +- $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" +- $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? +- +- # Clean up the generated files. +- $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" +- $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" +- +- # Transform the symbol file into the correct name. +- case $host in +- *cygwin* | *mingw* ) +- if test -f "$output_objdir/${outputname}.def" ; then +- 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" | $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" | $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 ++ if test "$prev" = rpath; then ++ case "$rpath " in ++ *" $arg "*) ;; ++ *) rpath="$rpath $arg" ;; ++ esac ++ else ++ case "$xrpath " in ++ *" $arg "*) ;; ++ *) xrpath="$xrpath $arg" ;; ++ esac + fi ++ prev= ++ continue ++ ;; ++ shrext) ++ shrext_cmds="$arg" ++ prev= ++ continue ++ ;; ++ weak) ++ weak_libs="$weak_libs $arg" ++ prev= ++ continue ++ ;; ++ xcclinker) ++ linker_flags="$linker_flags $qarg" ++ compiler_flags="$compiler_flags $qarg" ++ prev= ++ func_append compile_command " $qarg" ++ func_append finalize_command " $qarg" ++ continue ++ ;; ++ xcompiler) ++ compiler_flags="$compiler_flags $qarg" ++ prev= ++ func_append compile_command " $qarg" ++ func_append finalize_command " $qarg" ++ continue ++ ;; ++ xlinker) ++ linker_flags="$linker_flags $qarg" ++ compiler_flags="$compiler_flags $wl$qarg" ++ prev= ++ func_append compile_command " $wl$qarg" ++ func_append finalize_command " $wl$qarg" ++ continue + ;; + *) +- $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 +- exit $EXIT_FAILURE ++ eval "$prev=\"\$arg\"" ++ prev= ++ continue + ;; + esac +- else +- # We keep going just in case the user didn't refer to +- # lt_preloaded_symbols. The linker will fail if global_symbol_pipe +- # really was required. +- +- # Nullify the symbol file. +- 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" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` +- link_command="$compile_command$compile_rpath" ++ fi # test -n "$prev" - # We have no uninstalled library dependencies, so finalize right now. -- exit_status=0 -- func_show_eval "$link_command" 'exit_status=$?' -+ if test -n "$inst_prefix_dir"; then -+ # Stick the inst_prefix_dir data into the link command. -+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` -+ else -+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` -+ fi +- $show "$link_command" +- $run eval "$link_command" +- exit_status=$? ++ prevarg="$arg" - # Delete the generated files. -- if test -f "$output_objdir/${outputname}S.${objext}"; then -- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -+ $echo "$modename: warning: relinking \`$file'" 1>&2 -+ $show "$relink_command" -+ if $run eval "$relink_command"; then : -+ else -+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -+ exit $EXIT_FAILURE -+ fi +- if test -n "$dlsyms"; then +- $show "$rm $output_objdir/${outputname}S.${objext}" +- $run $rm "$output_objdir/${outputname}S.${objext}" ++ case $arg in ++ -all-static) ++ if test -n "$link_static_flag"; then ++ # See comment for -static flag below, for more details. ++ func_append compile_command " $link_static_flag" ++ func_append finalize_command " $link_static_flag" fi ++ continue ++ ;; - exit $exit_status - fi -+ # See the names of the shared library. -+ set dummy $library_names -+ if test -n "$2"; then -+ realname="$2" -+ shift -+ shift +- +- if test -n "$shlibpath_var"; then +- # We should set the shlibpath_var +- rpath= +- for dir in $temp_rpath; do +- case $dir in +- [\\/]* | [A-Za-z]:[\\/]*) +- # Absolute path. +- rpath="$rpath$dir:" +- ;; +- *) +- # Relative path: add a thisdir entry. +- rpath="$rpath\$thisdir/$dir:" +- ;; +- esac +- done +- temp_rpath="$rpath" +- fi ++ -allow-undefined) ++ # FIXME: remove this flag sometime in the future. ++ func_fatal_error "\`-allow-undefined' must not be used because it is the default" ++ ;; - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -118889,8 +79543,10 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi -+ srcname="$realname" -+ test -n "$relink_command" && srcname="$realname"T ++ -avoid-version) ++ avoid_version=yes ++ continue ++ ;; - compile_var= - finalize_var= @@ -118908,140 +79564,96 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" -+ # Install the shared library and build the symlinks. -+ $show "$install_prog $dir/$srcname $destdir/$realname" -+ $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? -+ if test -n "$stripme" && test -n "$striplib"; then -+ $show "$striplib $destdir/$realname" -+ $run eval "$striplib $destdir/$realname" || exit $? -+ fi -+ -+ if test "$#" -gt 0; then -+ # Delete the old symlinks, and create new ones. -+ # Try `ln -sf' first, because the `ln' binary might depend on -+ # the symlink we replace! Solaris /bin/ln does not understand -f, -+ # so we also need to try rm && ln -s. -+ for linkname -+ do -+ if test "$linkname" != "$realname"; then -+ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" -+ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" -+ fi -+ done -+ fi -+ -+ # Do each command in the postinstall commands. -+ lib="$destdir/$realname" -+ cmds=$postinstall_cmds -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $show "$cmd" -+ $run eval "$cmd" || { -+ lt_exit=$? -+ -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' -+ fi -+ -+ exit $lt_exit -+ } - done +- done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " -+ IFS="$save_ifs" - fi +- fi - fi ++ -dlopen) ++ prev=dlfiles ++ continue ++ ;; - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. -- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` +- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. -- $opt_dry_run || $RM $output +- $run $rm $output - # Link the executable and exit -- func_show_eval "$link_command" 'exit $?' +- $show "$link_command" +- $run eval "$link_command" || exit $? - exit $EXIT_SUCCESS - fi -+ # Install the pseudo-library for information purposes. -+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ instname="$dir/$name"i -+ $show "$install_prog $instname $destdir/$name" -+ $run eval "$install_prog $instname $destdir/$name" || exit $? ++ -dlpreopen) ++ prev=dlprefiles ++ continue ++ ;; - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" -+ # Maybe install the static library, too. -+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ++ -export-dynamic) ++ export_dynamic=yes ++ continue + ;; -- func_warning "this platform does not like uninstalled shared libraries" -- func_warning "\`$output' will be relinked during installation" +- $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 +- $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - 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= - fi -+ *.lo) -+ # Install (i.e. copy) a libtool object. -+ -+ # Figure out destination file name, if it wasn't already specified. -+ if test -n "$destname"; then -+ destfile="$destdir/$destname" ++ -export-symbols | -export-symbols-regex) ++ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then ++ func_fatal_error "more than one -exported-symbols argument is not allowed" ++ fi ++ if test "X$arg" = "X-export-symbols"; then ++ prev=expsyms else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" -+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ destfile="$destdir/$destfile" ++ prev=expsyms_regex fi - fi - +- - # Replace the output file specification. -- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -+ # Deduce the name of the destination old-style object file. -+ case $destfile in -+ *.lo) -+ staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` -+ ;; -+ *.$objext) -+ staticdest="$destfile" -+ destfile= -+ ;; -+ *) -+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac +- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` ++ continue ++ ;; - # Delete the old output files. -- $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname -+ # Install the libtool object if requested. -+ if test -n "$destfile"; then -+ $show "$install_prog $file $destfile" -+ $run eval "$install_prog $file $destfile" || exit $? -+ fi +- $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname ++ -framework) ++ prev=framework ++ continue ++ ;; -- func_show_eval "$link_command" 'exit $?' -+ # Install the old object if enabled. -+ if test "$build_old_libs" = yes; then -+ # Deduce the name of the old-style object file. -+ staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` +- $show "$link_command" +- $run eval "$link_command" || exit $? ++ -inst-prefix-dir) ++ prev=inst_prefix ++ continue ++ ;; - # Now create the wrapper script. -- func_verbose "creating $output" -+ $show "$install_prog $staticobj $staticdest" -+ $run eval "$install_prog \$staticobj \$staticdest" || exit $? -+ fi -+ exit $EXIT_SUCCESS +- $show "creating $output" ++ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* ++ # so, if we see these flags be careful not to treat them like -L ++ -L[A-Z][A-Z]*:*) ++ case $with_gcc/$host in ++ no/*-*-irix* | /*-*-irix*) ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ ;; ++ esac ++ continue + ;; - # Quote the relink command for shipping. @@ -119049,285 +79661,3205 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then -- relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" +- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" -- else -- func_quote_for_eval "$var_value" -- relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" -- fi ++ -L*) ++ func_stripname '-L' '' "$arg" ++ dir=$func_stripname_result ++ if test -z "$dir"; then ++ if test "$#" -gt 0; then ++ func_fatal_error "require no space between \`-L' and \`$1'" + else +- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` +- relink_command="$var=\"$var_value\"; export $var; $relink_command" ++ func_fatal_error "need path for \`-L' option" + 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 -+ *) -+ # Figure out destination file name, if it wasn't already specified. -+ if test -n "$destname"; then -+ destfile="$destdir/$destname" -+ else -+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ destfile="$destdir/$destfile" -+ fi - -- # Quote $ECHO for shipping. -- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then +- +- # Quote $echo for shipping. +- if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; -+ # If the file is missing, and there is a .exe on the end, strip it -+ # because it is most likely a libtool script we actually want to -+ # install -+ stripped_ext="" -+ case $file in -+ *.exe) -+ if test ! -f "$file"; then -+ file=`$echo $file|${SED} 's,.exe$,,'` -+ stripped_ext=".exe" -+ fi -+ ;; ++ fi ++ # We need an absolute path. ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ absdir=`cd "$dir" && pwd` ++ test -z "$absdir" && \ ++ func_fatal_error "cannot determine absolute directory name of \`$dir'" ++ dir="$absdir" ++ ;; esac -- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` +- qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else -- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` +- qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - -- # Only actually do things if not in dry run mode. -- $opt_dry_run || { +- +- # Only actually do things if our run command is non-null. +- if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in -- *.exe) func_stripname '' '.exe' "$output" -- output=$func_stripname_result ;; -- esac +- *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; ++ case "$deplibs " in ++ *" -L$dir "*) ;; ++ *) ++ deplibs="$deplibs -L$dir" ++ lib_search_path="$lib_search_path $dir" ++ ;; + esac - # test for cygwin because mv fails w/o .exe extensions -+ # Do a test to see if this is really a libtool program. case $host in - *cygwin*) - exeext=.exe -- func_stripname '' '.exe' "$outputname" -- outputname=$func_stripname_result ;; +- outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; -+ *cygwin*|*mingw*) -+ wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` -+ ;; -+ *) -+ wrapper=$file -+ ;; ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) ++ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` ++ case :$dllsearchpath: in ++ *":$dir:"*) ;; ++ ::) dllsearchpath=$dir;; ++ *) dllsearchpath="$dllsearchpath:$dir";; ++ esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ ::) dllsearchpath=$testbindir;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac ++ ;; esac - case $host in - *cygwin* | *mingw* ) -- func_dirname_and_basename "$output" "" "." -- output_name=$func_basename_result -- output_path=$func_dirname_result -- cwrappersource="$output_path/$objdir/lt-$output_name.c" -- cwrapper="$output_path/$output_name.exe" -- $RM $cwrappersource $cwrapper -- trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 +- output_name=`basename $output` +- output_path=`dirname $output` +- cwrappersource="$output_path/$objdir/lt-$output_name.c" +- cwrapper="$output_path/$output_name.exe" +- $rm $cwrappersource $cwrapper +- trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - -- func_emit_cwrapperexe_src > $cwrappersource +- cat > $cwrappersource <<EOF - -- # The wrapper executable is built using the $host compiler, -- # because it contains $host paths and files. If cross- -- # compiling, it, like the target executable, must be -- # executed on the $host or under an emulation environment. -- $opt_dry_run || { -- $LTCC $LTCFLAGS -o $cwrapper $cwrappersource -- $STRIP $cwrapper -- } -+ if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then -+ notinst_deplibs= -+ relink_command= -+ -+ # Note that it is not necessary on cygwin/mingw to append a dot to -+ # foo even if both foo and FILE.exe exist: automatic-append-.exe -+ # behavior happens only for exec(3), not for open(2)! Also, sourcing -+ # `FILE.' does not work on cygwin managed mounts. -+ # -+ # If there is no directory component, then add one. -+ case $wrapper in -+ */* | *\\*) . ${wrapper} ;; -+ *) . ./${wrapper} ;; -+ esac -+ -+ # Check the variables that should have been set. -+ if test -z "$notinst_deplibs"; then -+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ -+ finalize=yes -+ for lib in $notinst_deplibs; do -+ # Check to see that each library is installed. -+ libdir= -+ if test -f "$lib"; then -+ # If there is no directory component, then add one. -+ case $lib in -+ */* | *\\*) . $lib ;; -+ *) . ./$lib ;; -+ esac -+ fi -+ libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test -+ if test -n "$libdir" && test ! -f "$libfile"; then -+ $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 -+ finalize=no -+ fi -+ done -+ -+ relink_command= -+ # Note that it is not necessary on cygwin/mingw to append a dot to -+ # foo even if both foo and FILE.exe exist: automatic-append-.exe -+ # behavior happens only for exec(3), not for open(2)! Also, sourcing -+ # `FILE.' does not work on cygwin managed mounts. -+ # -+ # If there is no directory component, then add one. -+ case $wrapper in -+ */* | *\\*) . ${wrapper} ;; -+ *) . ./${wrapper} ;; -+ esac -+ -+ outputname= -+ if test "$fast_install" = no && test -n "$relink_command"; then -+ if test "$finalize" = yes && test -z "$run"; then -+ tmpdir=`func_mktempdir` -+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` -+ outputname="$tmpdir/$file" -+ # Replace the output file specification. -+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` +-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname +- Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP ++ continue ++ ;; -- # Now, create the wrapper script for func_source use: -- func_ltwrapper_scriptname $cwrapper -- $RM $func_ltwrapper_scriptname_result -- trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 -- $opt_dry_run || { -- # note: this script will not be executed, so do not chmod. -- if test "x$build" = "x$host" ; then -- $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result -+ $show "$relink_command" -+ if $run eval "$relink_command"; then : - else -- func_emit_wrapper no > $func_ltwrapper_scriptname_result -+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -+ ${rm}r "$tmpdir" +- The $output program cannot be directly executed until all the libtool +- libraries that it depends on are installed. ++ -l*) ++ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) ++ # These systems don't actually have a C or math library (as such) ++ continue ++ ;; ++ *-*-os2*) ++ # These systems don't actually have a C library (as such) ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ # Do not include libc due to us having libc/libc_r. ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C and math libraries are in the System framework ++ deplibs="$deplibs System.ltframework" ++ continue ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ test "X$arg" = "X-lc" && continue ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ test "X$arg" = "X-lc" && continue ++ ;; ++ esac ++ elif test "X$arg" = "X-lc_r"; then ++ case $host in ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ # Do not include libc_r directly, use -pthread flag. ++ continue ++ ;; ++ esac ++ fi ++ deplibs="$deplibs $arg" ++ continue ++ ;; + +- This wrapper executable should never be moved out of the build directory. +- If it is, it will not operate correctly. ++ -module) ++ module=yes ++ continue ++ ;; + +- Currently, it simply execs the wrapper *script* "/bin/sh $output", +- but could eventually absorb all of the scripts functionality and +- exec $objdir/$outputname directly. +-*/ +-EOF +- cat >> $cwrappersource<<"EOF" +-#include <stdio.h> +-#include <stdlib.h> +-#include <unistd.h> +-#include <malloc.h> +-#include <stdarg.h> +-#include <assert.h> +-#include <string.h> +-#include <ctype.h> +-#include <sys/stat.h> ++ # Tru64 UNIX uses -model [arg] to determine the layout of C++ ++ # classes, name mangling, and exception handling. ++ # Darwin uses the -arch flag to determine output architecture. ++ -model|-arch|-isysroot) ++ compiler_flags="$compiler_flags $arg" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ prev=xcompiler ++ continue ++ ;; + +-#if defined(PATH_MAX) +-# define LT_PATHMAX PATH_MAX +-#elif defined(MAXPATHLEN) +-# define LT_PATHMAX MAXPATHLEN +-#else +-# define LT_PATHMAX 1024 +-#endif ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ compiler_flags="$compiler_flags $arg" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ case "$new_inherited_linker_flags " in ++ *" $arg "*) ;; ++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; ++ esac ++ continue ++ ;; + +-#ifndef DIR_SEPARATOR +-# define DIR_SEPARATOR '/' +-# define PATH_SEPARATOR ':' +-#endif ++ -multi_module) ++ single_module="${wl}-multi_module" ++ continue ++ ;; + +-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ +- defined (__OS2__) +-# define HAVE_DOS_BASED_FILE_SYSTEM +-# ifndef DIR_SEPARATOR_2 +-# define DIR_SEPARATOR_2 '\\' +-# endif +-# ifndef PATH_SEPARATOR_2 +-# define PATH_SEPARATOR_2 ';' +-# endif +-#endif ++ -no-fast-install) ++ fast_install=no ++ continue ++ ;; + +-#ifndef DIR_SEPARATOR_2 +-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +-#else /* DIR_SEPARATOR_2 */ +-# define IS_DIR_SEPARATOR(ch) \ +- (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +-#endif /* DIR_SEPARATOR_2 */ ++ -no-install) ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) ++ # The PATH hackery in wrapper scripts is required on Windows ++ # and Darwin in order for the loader to find any dlls it needs. ++ func_warning "\`-no-install' is ignored for $host" ++ func_warning "assuming \`-no-fast-install' instead" ++ fast_install=no ++ ;; ++ *) no_install=yes ;; ++ esac ++ continue ++ ;; + +-#ifndef PATH_SEPARATOR_2 +-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +-#else /* PATH_SEPARATOR_2 */ +-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +-#endif /* PATH_SEPARATOR_2 */ ++ -no-undefined) ++ allow_undefined=no ++ continue ++ ;; + +-#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +-#define XFREE(stale) do { \ +- if (stale) { free ((void *) stale); stale = 0; } \ +-} while (0) ++ -objectlist) ++ prev=objectlist ++ continue ++ ;; + +-/* -DDEBUG is fairly common in CFLAGS. */ +-#undef DEBUG +-#if defined DEBUGWRAPPER +-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) +-#else +-# define DEBUG(format, ...) +-#endif ++ -o) prev=output ;; + +-const char *program_name = NULL; ++ -precious-files-regex) ++ prev=precious_regex ++ continue ++ ;; + +-void * xmalloc (size_t num); +-char * xstrdup (const char *string); +-const char * base_name (const char *name); +-char * find_executable(const char *wrapper); +-int check_executable(const char *path); +-char * strendzap(char *str, const char *pat); +-void lt_fatal (const char *message, ...); ++ -release) ++ prev=release ++ continue ++ ;; + +-int +-main (int argc, char *argv[]) +-{ +- char **newargz; +- int i; ++ -rpath) ++ prev=rpath ++ continue ++ ;; + +- program_name = (char *) xstrdup (base_name (argv[0])); +- DEBUG("(main) argv[0] : %s\n",argv[0]); +- DEBUG("(main) program_name : %s\n",program_name); +- newargz = XMALLOC(char *, argc+2); +-EOF ++ -R) ++ prev=xrpath ++ continue ++ ;; + +- cat >> $cwrappersource <<EOF +- newargz[0] = (char *) xstrdup("$SHELL"); +-EOF ++ -R*) ++ func_stripname '-R' '' "$arg" ++ dir=$func_stripname_result ++ # We need an absolute path. ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]*) ;; ++ *) ++ func_fatal_error "only absolute run-paths are allowed" ++ ;; ++ esac ++ case "$xrpath " in ++ *" $dir "*) ;; ++ *) xrpath="$xrpath $dir" ;; ++ esac ++ continue ++ ;; + +- cat >> $cwrappersource <<"EOF" +- newargz[1] = find_executable(argv[0]); +- if (newargz[1] == NULL) +- lt_fatal("Couldn't find %s", argv[0]); +- DEBUG("(main) found exe at : %s\n",newargz[1]); +- /* we know the script has the same name, without the .exe */ +- /* so make sure newargz[1] doesn't end in .exe */ +- strendzap(newargz[1],".exe"); +- for (i = 1; i < argc; i++) +- newargz[i+1] = xstrdup(argv[i]); +- newargz[argc+1] = NULL; ++ -shared) ++ # The effects of -shared are defined in a previous loop. ++ continue ++ ;; + +- for (i=0; i<argc+1; i++) +- { +- DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); +- ; +- } ++ -shrext) ++ prev=shrext ++ continue ++ ;; + +-EOF ++ -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 ++ # would be equivalent was wrong. It would break on at least ++ # Digital Unix and AIX. ++ continue ++ ;; + +- case $host_os in +- mingw*) +- cat >> $cwrappersource <<EOF +- execv("$SHELL",(char const **)newargz); +-EOF +- ;; +- *) +- cat >> $cwrappersource <<EOF +- execv("$SHELL",newargz); +-EOF +- ;; +- esac ++ -thread-safe) ++ thread_safe=yes ++ continue ++ ;; + +- cat >> $cwrappersource <<"EOF" +- return 127; +-} ++ -version-info) ++ prev=vinfo ++ continue ++ ;; + +-void * +-xmalloc (size_t num) +-{ +- void * p = (void *) malloc (num); +- if (!p) +- lt_fatal ("Memory exhausted"); ++ -version-number) ++ prev=vinfo ++ vinfo_number=yes ++ continue ++ ;; + +- return p; +-} ++ -weak) ++ prev=weak ++ continue ++ ;; + +-char * +-xstrdup (const char *string) +-{ +- return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL +-; +-} ++ -Wc,*) ++ func_stripname '-Wc,' '' "$arg" ++ args=$func_stripname_result ++ arg= ++ save_ifs="$IFS"; IFS=',' ++ for flag in $args; do ++ IFS="$save_ifs" ++ func_quote_for_eval "$flag" ++ arg="$arg $wl$func_quote_for_eval_result" ++ compiler_flags="$compiler_flags $func_quote_for_eval_result" ++ done ++ IFS="$save_ifs" ++ func_stripname ' ' '' "$arg" ++ arg=$func_stripname_result ++ ;; + +-const char * +-base_name (const char *name) +-{ +- const char *base; ++ -Wl,*) ++ func_stripname '-Wl,' '' "$arg" ++ args=$func_stripname_result ++ arg= ++ save_ifs="$IFS"; IFS=',' ++ for flag in $args; do ++ IFS="$save_ifs" ++ func_quote_for_eval "$flag" ++ arg="$arg $wl$func_quote_for_eval_result" ++ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" ++ linker_flags="$linker_flags $func_quote_for_eval_result" ++ done ++ IFS="$save_ifs" ++ func_stripname ' ' '' "$arg" ++ arg=$func_stripname_result ++ ;; + +-#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- /* Skip over the disk name in MSDOS pathnames. */ +- if (isalpha ((unsigned char)name[0]) && name[1] == ':') +- name += 2; +-#endif ++ -Xcompiler) ++ prev=xcompiler ++ continue ++ ;; + +- for (base = name; *name; name++) +- if (IS_DIR_SEPARATOR (*name)) +- base = name + 1; +- return base; +-} ++ -Xlinker) ++ prev=xlinker ++ continue ++ ;; + +-int +-check_executable(const char * path) +-{ +- struct stat st; ++ -XCClinker) ++ prev=xcclinker ++ continue ++ ;; + +- DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); +- if ((!path) || (!*path)) +- return 0; ++ # -msg_* for osf cc ++ -msg_*) ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" ++ ;; + +- if ((stat (path, &st) >= 0) && +- ( +- /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ +-#if defined (S_IXOTH) +- ((st.st_mode & S_IXOTH) == S_IXOTH) || +-#endif +-#if defined (S_IXGRP) +- ((st.st_mode & S_IXGRP) == S_IXGRP) || +-#endif +- ((st.st_mode & S_IXUSR) == S_IXUSR)) +- ) +- return 1; +- else +- return 0; +-} ++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler ++ # -r[0-9][0-9]* specifies the processor on the SGI compiler ++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler ++ # +DA*, +DD* enable 64-bit mode on the HP compiler ++ # -q* pass through compiler args for the IBM compiler ++ # -m*, -t[45]*, -txscale* pass through architecture-specific ++ # compiler args for GCC ++ # -F/path gives path to uninstalled frameworks, gcc on darwin ++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC ++ # @file GCC response files ++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ compiler_flags="$compiler_flags $arg" ++ continue ++ ;; + +-/* Searches for the full path of the wrapper. Returns +- newly allocated full path name if found, NULL otherwise */ +-char * +-find_executable (const char* wrapper) +-{ +- int has_slash = 0; +- const char* p; +- const char* p_next; +- /* static buffer for getcwd */ +- char tmp[LT_PATHMAX + 1]; +- int tmp_len; +- char* concat_name; ++ # Some other compiler flag. ++ -* | +*) ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" ++ ;; + +- DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); ++ *.$objext) ++ # A standard object. ++ objs="$objs $arg" ++ ;; + +- if ((wrapper == NULL) || (*wrapper == '\0')) +- return NULL; ++ *.lo) ++ # A libtool-controlled object. + +- /* Absolute path? */ +-#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') +- { +- concat_name = xstrdup (wrapper); +- if (check_executable(concat_name)) +- return concat_name; +- XFREE(concat_name); +- } +- else +- { +-#endif +- if (IS_DIR_SEPARATOR (wrapper[0])) +- { +- concat_name = xstrdup (wrapper); +- if (check_executable(concat_name)) +- return concat_name; +- XFREE(concat_name); +- } +-#if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- } +-#endif ++ # Check to see that this really is a libtool object. ++ if func_lalib_unsafe_p "$arg"; then ++ pic_object= ++ non_pic_object= + +- for (p = wrapper; *p; p++) +- if (*p == '/') +- { +- has_slash = 1; +- break; +- } +- if (!has_slash) +- { +- /* no slashes; search PATH */ +- const char* path = getenv ("PATH"); +- if (path != NULL) +- { +- for (p = path; *p; p = p_next) +- { +- const char* q; +- size_t p_len; +- for (q = p; *q; q++) +- if (IS_PATH_SEPARATOR(*q)) +- break; +- p_len = q - p; +- p_next = (*q == '\0' ? q : q + 1); +- if (p_len == 0) +- { +- /* empty path: current directory */ +- if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); +- tmp_len = strlen(tmp); +- concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); +- memcpy (concat_name, tmp, tmp_len); +- concat_name[tmp_len] = '/'; +- strcpy (concat_name + tmp_len + 1, wrapper); +- } +- else +- { +- concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); +- memcpy (concat_name, p, p_len); +- concat_name[p_len] = '/'; +- strcpy (concat_name + p_len + 1, wrapper); +- } +- if (check_executable(concat_name)) +- return concat_name; +- XFREE(concat_name); +- } +- } +- /* not found in PATH; assume curdir */ +- } +- /* Relative path | not found in path: prepend cwd */ +- if (getcwd (tmp, LT_PATHMAX) == NULL) +- lt_fatal ("getcwd failed"); +- tmp_len = strlen(tmp); +- concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); +- memcpy (concat_name, tmp, tmp_len); +- concat_name[tmp_len] = '/'; +- strcpy (concat_name + tmp_len + 1, wrapper); ++ # Read the .lo file ++ func_source "$arg" + +- if (check_executable(concat_name)) +- return concat_name; +- XFREE(concat_name); +- return NULL; +-} ++ if test -z "$pic_object" || ++ test -z "$non_pic_object" || ++ test "$pic_object" = none && ++ test "$non_pic_object" = none; then ++ func_fatal_error "cannot find name of object for \`$arg'" ++ fi + +-char * +-strendzap(char *str, const char *pat) +-{ +- size_t len, patlen; ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" + +- assert(str != NULL); +- assert(pat != NULL); ++ if test "$pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ pic_object="$xdir$pic_object" + +- len = strlen(str); +- patlen = strlen(pat); ++ if test "$prev" = dlfiles; then ++ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then ++ dlfiles="$dlfiles $pic_object" ++ prev= + continue - fi -- } -- ;; -- * ) -- $RM $output -- trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 -+ file="$outputname" -+ else -+ $echo "$modename: warning: cannot relink \`$file'" 1>&2 ++ else ++ # If libtool objects are unsupported, then we need to preload. ++ prev=dlprefiles ++ fi ++ fi + +- if (patlen <= len) +- { +- str += len - patlen; +- if (strcmp(str, pat) == 0) +- *str = '\0'; +- } +- return str; +-} ++ # CHECK ME: I think I busted this. -Ossama ++ if test "$prev" = dlprefiles; then ++ # Preload the old-style object. ++ dlprefiles="$dlprefiles $pic_object" ++ prev= ++ fi + +-static void +-lt_error_core (int exit_status, const char * mode, +- const char * message, va_list ap) +-{ +- fprintf (stderr, "%s: %s: ", program_name, mode); +- vfprintf (stderr, message, ap); +- fprintf (stderr, ".\n"); ++ # A PIC object. ++ func_append libobjs " $pic_object" ++ arg="$pic_object" ++ fi + +- if (exit_status >= 0) +- exit (exit_status); +-} ++ # Non-PIC object. ++ if test "$non_pic_object" != none; then ++ # Prepend the subdirectory the object is found in. ++ non_pic_object="$xdir$non_pic_object" + +-void +-lt_fatal (const char *message, ...) +-{ +- va_list ap; +- va_start (ap, message); +- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); +- va_end (ap); +-} +-EOF +- # we should really use a build-platform specific compiler +- # here, but OTOH, the wrappers (shell script and this C one) +- # are only useful if you want to execute the "real" binary. +- # Since the "real" binary is built for $host, then this +- # wrapper might as well be built for $host, too. +- $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource +- ;; +- esac +- $rm $output +- trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 ++ # A standard non-PIC object ++ func_append non_pic_objects " $non_pic_object" ++ if test -z "$pic_object" || test "$pic_object" = none ; then ++ arg="$non_pic_object" + fi + else -+ # Install the binary that we compiled earlier. -+ file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` ++ # If the PIC object exists, use it instead. ++ # $xdir was prepended to $pic_object above. ++ non_pic_object="$pic_object" ++ func_append non_pic_objects " $non_pic_object" ++ fi ++ else ++ # Only an error if not doing a dry-run. ++ if $opt_dry_run; then ++ # Extract subdirectory from the argument. ++ func_dirname "$arg" "/" "" ++ xdir="$func_dirname_result" + +- $echo > $output "\ +-#! $SHELL ++ func_lo2o "$arg" ++ pic_object=$xdir$objdir/$func_lo2o_result ++ non_pic_object=$xdir$func_lo2o_result ++ func_append libobjs " $pic_object" ++ func_append non_pic_objects " $non_pic_object" ++ else ++ func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi ++ ;; -- func_emit_wrapper no > $output -- chmod +x $output -+ # remove .exe since cygwin /usr/bin/install will append another -+ # one anyway -+ case $install_prog,$host in -+ */usr/bin/install*,*cygwin*) -+ case $file:$destfile in -+ *.exe:*.exe) -+ # this is ok -+ ;; -+ *.exe:*) -+ destfile=$destfile.exe -+ ;; -+ *:*.exe) -+ destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` +-# $output - temporary wrapper script for $objdir/$outputname +-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP +-# +-# The $output program cannot be directly executed until all the libtool +-# libraries that it depends on are installed. +-# +-# This wrapper script should never be moved out of the build directory. +-# If it is, it will not operate correctly. ++ *.$libext) ++ # An archive. ++ deplibs="$deplibs $arg" ++ old_deplibs="$old_deplibs $arg" ++ continue ++ ;; + +-# Sed substitution that helps us do robust quoting. It backslashifies +-# metacharacters that are still active within double-quoted strings. +-Xsed='${SED} -e 1s/^X//' +-sed_quote_subst='$sed_quote_subst' ++ *.la) ++ # A libtool-controlled library. + +-# 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 ++ if test "$prev" = dlfiles; then ++ # This library was specified with -dlopen. ++ dlfiles="$dlfiles $arg" ++ prev= ++ elif test "$prev" = dlprefiles; then ++ # The library was specified with -dlpreopen. ++ dlprefiles="$dlprefiles $arg" ++ prev= ++ else ++ deplibs="$deplibs $arg" ++ fi ++ continue ++ ;; + +-# 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 ++ # Some other compiler argument. ++ *) ++ # Unknown arguments in both finalize_command and compile_command need ++ # to be aesthetically quoted because they are evaled later. ++ func_quote_for_eval "$arg" ++ arg="$func_quote_for_eval_result" ++ ;; ++ esac # arg + +-relink_command=\"$relink_command\" ++ # Now actually substitute the argument into the commands. ++ if test -n "$arg"; then ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" ++ fi ++ done # argument parsing loop + +-# This environment variable determines our operation mode. +-if test \"\$libtool_install_magic\" = \"$magic\"; then +- # install mode needs the following variable: +- notinst_deplibs='$notinst_deplibs' +-else +- # When we are sourced in execute mode, \$file and \$echo are already set. +- if test \"\$libtool_execute_magic\" != \"$magic\"; then +- echo=\"$qecho\" +- file=\"\$0\" +- # Make sure echo works. +- if test \"X\$1\" = X--no-reexec; then +- # Discard the --no-reexec flag, and continue. +- shift +- elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then +- # Yippee, \$echo works! +- : +- else +- # Restart under the correct shell, and then maybe \$echo will work. +- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} ++ test -n "$prev" && \ ++ func_fatal_help "the \`$prevarg' option requires an argument" ++ ++ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then ++ eval arg=\"$export_dynamic_flag_spec\" ++ func_append compile_command " $arg" ++ func_append finalize_command " $arg" + fi +- fi\ +-" +- $echo >> $output "\ + +- # Find the directory that this script lives in. +- thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` +- test \"x\$thisdir\" = \"x\$file\" && thisdir=. ++ oldlibs= ++ # calculate the name of the file, without its directory ++ func_basename "$output" ++ outputname="$func_basename_result" ++ libobjs_save="$libobjs" + +- # Follow symbolic links until we get to the real thisdir. +- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` +- while test -n \"\$file\"; do +- destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` ++ if test -n "$shlibpath_var"; then ++ # get the directories listed in $shlibpath_var ++ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` ++ else ++ shlib_search_path= ++ fi ++ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" ++ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + +- # If there was a directory component, then change thisdir. +- if test \"x\$destdir\" != \"x\$file\"; then +- case \"\$destdir\" in +- [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; +- *) thisdir=\"\$thisdir/\$destdir\" ;; ++ func_dirname "$output" "/" "" ++ output_objdir="$func_dirname_result$objdir" ++ # Create the object directory. ++ func_mkdir_p "$output_objdir" ++ ++ # Determine the type of output ++ case $output in ++ "") ++ func_fatal_help "you must specify an output file" ++ ;; ++ *.$libext) linkmode=oldlib ;; ++ *.lo | *.$objext) linkmode=obj ;; ++ *.la) linkmode=lib ;; ++ *) linkmode=prog ;; # Anything else should be a program. ++ esac ++ ++ specialdeplibs= ++ ++ libs= ++ # Find all interdependent deplibs by searching for libraries ++ # that are linked more than once (e.g. -la -lb -la) ++ for deplib in $deplibs; do ++ if $opt_duplicate_deps ; then ++ case "$libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ libs="$libs $deplib" ++ done ++ ++ if test "$linkmode" = lib; then ++ libs="$predeps $libs $compiler_lib_search_path $postdeps" ++ ++ # Compute libraries that are listed more than once in $predeps ++ # $postdeps and mark them as special (i.e., whose duplicates are ++ # not to be eliminated). ++ pre_post_deps= ++ if $opt_duplicate_compiler_generated_deps; then ++ for pre_post_dep in $predeps $postdeps; do ++ case "$pre_post_deps " in ++ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; ++ esac ++ pre_post_deps="$pre_post_deps $pre_post_dep" ++ done ++ fi ++ pre_post_deps= ++ fi ++ ++ deplibs= ++ newdependency_libs= ++ newlib_search_path= ++ need_relink=no # whether we're linking any uninstalled libtool libraries ++ notinst_deplibs= # not-installed libtool libraries ++ notinst_path= # paths that contain not-installed libtool libraries ++ ++ case $linkmode in ++ lib) ++ passes="conv dlpreopen link" ++ for file in $dlfiles $dlprefiles; do ++ case $file in ++ *.la) ;; ++ *) ++ func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + ;; + esac - ;; - esac -- } ++ done ++ ;; ++ prog) ++ compile_deplibs= ++ finalize_deplibs= ++ alldeplibs=no ++ newdlfiles= ++ newdlprefiles= ++ passes="conv scan dlopen dlpreopen link" ++ ;; ++ *) passes="conv" ++ ;; ++ esac ++ ++ for pass in $passes; do ++ # The preopen pass in lib mode reverses $deplibs; put it back here ++ # so that -L comes before libs that need it for instance... ++ if test "$linkmode,$pass" = "lib,link"; then ++ ## FIXME: Find the place where the list is rebuilt in the wrong ++ ## order, and fix it there properly ++ tmp_deplibs= ++ for deplib in $deplibs; do ++ tmp_deplibs="$deplib $tmp_deplibs" ++ done ++ deplibs="$tmp_deplibs" ++ fi ++ ++ if test "$linkmode,$pass" = "lib,link" || ++ test "$linkmode,$pass" = "prog,scan"; then ++ libs="$deplibs" ++ deplibs= ++ fi ++ if test "$linkmode" = prog; then ++ case $pass in ++ dlopen) libs="$dlfiles" ;; ++ dlpreopen) libs="$dlprefiles" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; ++ esac ++ fi ++ if test "$linkmode,$pass" = "lib,dlpreopen"; then ++ # Collect and forward deplibs of preopened libtool libs ++ for lib in $dlprefiles; do ++ # Ignore non-libtool-libs ++ dependency_libs= ++ case $lib in ++ *.la) func_source "$lib" ;; ++ esac ++ ++ # Collect preopened libtool deplibs, except any this library ++ # has declared as weak libs ++ for deplib in $dependency_libs; do ++ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` ++ case " $weak_libs " in ++ *" $deplib_base "*) ;; ++ *) deplibs="$deplibs $deplib" ;; ++ esac ++ done ++ done ++ libs="$dlprefiles" ++ fi ++ if test "$pass" = dlopen; then ++ # Collect dlpreopened libraries ++ save_deplibs="$deplibs" ++ deplibs= ++ fi ++ ++ for deplib in $libs; do ++ lib= ++ found=no ++ case $deplib in ++ -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" ++ else ++ compiler_flags="$compiler_flags $deplib" ++ if test "$linkmode" = lib ; then ++ case "$new_inherited_linker_flags " in ++ *" $deplib "*) ;; ++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ esac ++ fi ++ fi ++ continue ++ ;; ++ -l*) ++ if test "$linkmode" != lib && test "$linkmode" != prog; then ++ func_warning "\`-l' is ignored for archives/objects" ++ continue ++ fi ++ func_stripname '-l' '' "$deplib" ++ name=$func_stripname_result ++ if test "$linkmode" = lib; then ++ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" ++ else ++ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" ++ fi ++ for searchdir in $searchdirs; do ++ for search_ext in .la $std_shrext .so .a; do ++ # Search the libtool library ++ lib="$searchdir/lib${name}${search_ext}" ++ if test -f "$lib"; then ++ if test "$search_ext" = ".la"; then ++ found=yes ++ else ++ found=no ++ fi ++ break 2 ++ fi ++ done ++ done ++ if test "$found" != yes; then ++ # deplib doesn't seem to be a libtool library ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" ++ fi ++ continue ++ else # deplib is a libtool library ++ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, ++ # We need to do some special things here, and not later. ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $deplib "*) ++ if func_lalib_p "$lib"; then ++ library_names= ++ old_library= ++ func_source "$lib" ++ for l in $old_library $library_names; do ++ ll="$l" ++ done ++ if test "X$ll" = "X$old_library" ; then # only static version available ++ found=no ++ func_dirname "$lib" "" "." ++ ladir="$func_dirname_result" ++ lib=$ladir/$old_library ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" ++ fi ++ continue ++ fi ++ fi ++ ;; ++ *) ;; ++ esac ++ fi ++ fi ++ ;; # -l ++ *.ltframework) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ if test "$linkmode" = lib ; then ++ case "$new_inherited_linker_flags " in ++ *" $deplib "*) ;; ++ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; ++ esac ++ fi ++ fi ++ continue ++ ;; ++ -L*) ++ case $linkmode in ++ lib) ++ deplibs="$deplib $deplibs" ++ test "$pass" = conv && continue ++ newdependency_libs="$deplib $newdependency_libs" ++ func_stripname '-L' '' "$deplib" ++ newlib_search_path="$newlib_search_path $func_stripname_result" ++ ;; ++ prog) ++ if test "$pass" = conv; then ++ deplibs="$deplib $deplibs" ++ continue ++ fi ++ if test "$pass" = scan; then ++ deplibs="$deplib $deplibs" ++ else ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ fi ++ func_stripname '-L' '' "$deplib" ++ newlib_search_path="$newlib_search_path $func_stripname_result" ++ ;; ++ *) ++ func_warning "\`-L' is ignored for archives/objects" ++ ;; ++ esac # linkmode ++ continue ++ ;; # -L ++ -R*) ++ if test "$pass" = link; then ++ func_stripname '-R' '' "$deplib" ++ dir=$func_stripname_result ++ # Make sure the xrpath contains only unique directories. ++ case "$xrpath " in ++ *" $dir "*) ;; ++ *) xrpath="$xrpath $dir" ;; ++ esac ++ fi ++ deplibs="$deplib $deplibs" ++ continue ++ ;; ++ *.la) lib="$deplib" ;; ++ *.$libext) ++ if test "$pass" = conv; then ++ deplibs="$deplib $deplibs" ++ continue ++ fi ++ case $linkmode in ++ lib) ++ # Linking convenience modules into shared libraries is allowed, ++ # but linking other static libraries is non-portable. ++ case " $dlpreconveniencelibs " in ++ *" $deplib "*) ;; ++ *) ++ valid_a_lib=no ++ case $deplibs_check_method in ++ match_pattern*) ++ set dummy $deplibs_check_method; shift ++ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` ++ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ ++ | $EGREP "$match_pattern_regex" > /dev/null; then ++ valid_a_lib=yes ++ fi ++ ;; ++ pass_all) ++ valid_a_lib=yes ++ ;; ++ esac ++ if test "$valid_a_lib" != yes; then ++ $ECHO ++ $ECHO "*** Warning: Trying to link with static lib archive $deplib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because the file extensions .$libext of this argument makes me believe" ++ $ECHO "*** that it is just a static archive that I should not use here." ++ else ++ $ECHO ++ $ECHO "*** Warning: Linking the shared library $output against the" ++ $ECHO "*** static library $deplib is not portable!" ++ deplibs="$deplib $deplibs" ++ fi ++ ;; ++ esac ++ continue ++ ;; ++ prog) ++ if test "$pass" != link; then ++ deplibs="$deplib $deplibs" ++ else ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ fi ++ continue ++ ;; ++ esac # linkmode ++ ;; # *.$libext ++ *.lo | *.$objext) ++ if test "$pass" = conv; then ++ deplibs="$deplib $deplibs" ++ elif test "$linkmode" = prog; then ++ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then ++ # If there is no dlopen support or we're linking statically, ++ # we need to preload. ++ newdlprefiles="$newdlprefiles $deplib" ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ newdlfiles="$newdlfiles $deplib" ++ fi ++ fi ++ continue ++ ;; ++ %DEPLIBS%) ++ alldeplibs=yes ++ continue ++ ;; ++ esac # case $deplib ++ ++ if test "$found" = yes || test -f "$lib"; then : ++ else ++ func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" ++ fi ++ ++ # Check to see that this really is a libtool archive. ++ func_lalib_unsafe_p "$lib" \ ++ || func_fatal_error "\`$lib' is not a valid libtool archive" ++ ++ func_dirname "$lib" "" "." ++ ladir="$func_dirname_result" ++ ++ dlname= ++ dlopen= ++ dlpreopen= ++ libdir= ++ library_names= ++ old_library= ++ inherited_linker_flags= ++ # If the library was installed with an old release of libtool, ++ # it will not redefine variables installed, or shouldnotlink ++ installed=yes ++ shouldnotlink=no ++ avoidtemprpath= ++ ++ ++ # Read the .la file ++ func_source "$lib" ++ ++ # Convert "-framework foo" to "foo.ltframework" ++ if test -n "$inherited_linker_flags"; then ++ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` ++ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do ++ case " $new_inherited_linker_flags " in ++ *" $tmp_inherited_linker_flag "*) ;; ++ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; ++ esac ++ done ++ fi ++ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ if test "$linkmode,$pass" = "lib,link" || ++ test "$linkmode,$pass" = "prog,scan" || ++ { test "$linkmode" != prog && test "$linkmode" != lib; }; then ++ test -n "$dlopen" && dlfiles="$dlfiles $dlopen" ++ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" ++ fi ++ ++ if test "$pass" = conv; then ++ # Only check for convenience libraries ++ deplibs="$lib $deplibs" ++ if test -z "$libdir"; then ++ if test -z "$old_library"; then ++ func_fatal_error "cannot find name of link library for \`$lib'" ++ fi ++ # It is a libtool convenience library, so add in its objects. ++ convenience="$convenience $ladir/$objdir/$old_library" ++ old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ elif test "$linkmode" != prog && test "$linkmode" != lib; then ++ func_fatal_error "\`$lib' is not a convenience library" ++ fi ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done ++ continue ++ fi # $pass = conv ++ ++ ++ # Get the name of the library we link against. ++ linklib= ++ for l in $old_library $library_names; do ++ linklib="$l" ++ done ++ if test -z "$linklib"; then ++ func_fatal_error "cannot find name of link library for \`$lib'" ++ fi ++ ++ # This library was specified with -dlopen. ++ if test "$pass" = dlopen; then ++ if test -z "$libdir"; then ++ func_fatal_error "cannot -dlopen a convenience library: \`$lib'" ++ fi ++ if test -z "$dlname" || ++ test "$dlopen_support" != yes || ++ test "$build_libtool_libs" = no; then ++ # If there is no dlname, no dlopen support or we're linking ++ # statically, we need to preload. We also need to preload any ++ # dependent libraries so libltdl's deplib preloader doesn't ++ # bomb out in the load deplibs phase. ++ dlprefiles="$dlprefiles $lib $dependency_libs" ++ else ++ newdlfiles="$newdlfiles $lib" ++ fi ++ continue ++ fi # $pass = dlopen ++ ++ # We need an absolute path. ++ case $ladir in ++ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; ++ *) ++ abs_ladir=`cd "$ladir" && pwd` ++ if test -z "$abs_ladir"; then ++ func_warning "cannot determine absolute directory name of \`$ladir'" ++ func_warning "passing it literally to the linker, although it might fail" ++ abs_ladir="$ladir" ++ fi ++ ;; ++ esac ++ func_basename "$lib" ++ laname="$func_basename_result" ++ ++ # Find the relevant object directory and library name. ++ if test "X$installed" = Xyes; then ++ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ func_warning "library \`$lib' was moved." ++ dir="$ladir" ++ absdir="$abs_ladir" ++ libdir="$abs_ladir" ++ else ++ dir="$libdir" ++ absdir="$libdir" ++ fi ++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes ++ else ++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then ++ dir="$ladir" ++ absdir="$abs_ladir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ else ++ dir="$ladir/$objdir" ++ absdir="$abs_ladir/$objdir" ++ # Remove this search path later ++ notinst_path="$notinst_path $abs_ladir" ++ fi ++ fi # $installed = yes ++ func_stripname 'lib' '.la' "$laname" ++ name=$func_stripname_result ++ ++ # This library was specified with -dlpreopen. ++ if test "$pass" = dlpreopen; then ++ if test -z "$libdir" && test "$linkmode" = prog; then ++ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" ++ fi ++ # Prefer using a static library (so that no silly _DYNAMIC symbols ++ # are required to link). ++ if test -n "$old_library"; then ++ newdlprefiles="$newdlprefiles $dir/$old_library" ++ # Keep a list of preopened convenience libraries to check ++ # that they are being used correctly in the link pass. ++ test -z "$libdir" && \ ++ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" ++ # Otherwise, use the dlname, so that lt_dlopen finds it. ++ elif test -n "$dlname"; then ++ newdlprefiles="$newdlprefiles $dir/$dlname" ++ else ++ newdlprefiles="$newdlprefiles $dir/$linklib" ++ fi ++ fi # $pass = dlpreopen ++ ++ if test -z "$libdir"; then ++ # Link the convenience library ++ if test "$linkmode" = lib; then ++ deplibs="$dir/$old_library $deplibs" ++ elif test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$dir/$old_library $compile_deplibs" ++ finalize_deplibs="$dir/$old_library $finalize_deplibs" ++ else ++ deplibs="$lib $deplibs" # used for prog,scan pass ++ fi ++ continue ++ fi ++ ++ ++ if test "$linkmode" = prog && test "$pass" != link; then ++ newlib_search_path="$newlib_search_path $ladir" ++ deplibs="$lib $deplibs" ++ ++ linkalldeplibs=no ++ if test "$link_all_deplibs" != no || test -z "$library_names" || ++ test "$build_libtool_libs" = no; then ++ linkalldeplibs=yes ++ fi ++ ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ case $deplib in ++ -L*) func_stripname '-L' '' "$deplib" ++ newlib_search_path="$newlib_search_path $func_stripname_result" ++ ;; ++ esac ++ # Need to link against all dependency_libs? ++ if test "$linkalldeplibs" = yes; then ++ deplibs="$deplib $deplibs" ++ else ++ # Need to hardcode shared library paths ++ # or/and link against static libraries ++ newdependency_libs="$deplib $newdependency_libs" ++ fi ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done # for deplib ++ continue ++ fi # $linkmode = prog... ++ ++ if test "$linkmode,$pass" = "prog,link"; then ++ if test -n "$library_names" && ++ { { 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. ++ case "$temp_rpath:" in ++ *"$absdir:"*) ;; ++ *) temp_rpath="$temp_rpath$absdir:" ;; ++ esac ++ fi ++ ++ # Hardcode the library path. ++ # Skip directories that are in the system default run-time ++ # search path. ++ case " $sys_lib_dlsearch_path " in ++ *" $absdir "*) ;; ++ *) ++ case "$compile_rpath " in ++ *" $absdir "*) ;; ++ *) compile_rpath="$compile_rpath $absdir" ++ esac ++ ;; ++ esac ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) ++ case "$finalize_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_rpath="$finalize_rpath $libdir" ++ esac ++ ;; ++ esac ++ fi # $linkmode,$pass = prog,link... ++ ++ if test "$alldeplibs" = yes && ++ { test "$deplibs_check_method" = pass_all || ++ { test "$build_libtool_libs" = yes && ++ test -n "$library_names"; }; }; then ++ # We only need to search for static libraries ++ continue ++ fi ++ fi ++ ++ link_static=no # Whether the deplib will be linked statically ++ use_static_libs=$prefer_static_libs ++ if test "$use_static_libs" = built && test "$installed" = yes; then ++ use_static_libs=no ++ fi ++ if test -n "$library_names" && ++ { test "$use_static_libs" = no || test -z "$old_library"; }; then ++ case $host in ++ *cygwin* | *mingw* | *cegcc*) ++ # No point in relinking DLLs because paths are not encoded ++ notinst_deplibs="$notinst_deplibs $lib" ++ need_relink=no ++ ;; ++ *) ++ if test "$installed" = no; then ++ notinst_deplibs="$notinst_deplibs $lib" ++ need_relink=yes ++ fi ++ ;; ++ esac ++ # This is a shared library ++ ++ # Warn about portability, can't link against -module's on some ++ # systems (darwin). Don't bleat about dlopened modules though! ++ dlopenmodule="" ++ for dlpremoduletest in $dlprefiles; do ++ if test "X$dlpremoduletest" = "X$lib"; then ++ dlopenmodule="$dlpremoduletest" ++ break ++ fi ++ done ++ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then ++ $ECHO ++ if test "$linkmode" = prog; then ++ $ECHO "*** Warning: Linking the executable $output against the loadable module" ++ else ++ $ECHO "*** Warning: Linking the shared library $output against the loadable module" ++ fi ++ $ECHO "*** $linklib is not portable!" ++ fi ++ if test "$linkmode" = lib && ++ test "$hardcode_into_libs" = yes; then ++ # Hardcode the library path. ++ # Skip directories that are in the system default run-time ++ # search path. ++ case " $sys_lib_dlsearch_path " in ++ *" $absdir "*) ;; ++ *) ++ case "$compile_rpath " in ++ *" $absdir "*) ;; ++ *) compile_rpath="$compile_rpath $absdir" ++ esac ++ ;; ++ esac ++ case " $sys_lib_dlsearch_path " in ++ *" $libdir "*) ;; ++ *) ++ case "$finalize_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_rpath="$finalize_rpath $libdir" ++ esac ++ ;; ++ esac ++ fi ++ ++ if test -n "$old_archive_from_expsyms_cmds"; then ++ # figure out the soname ++ set dummy $library_names ++ shift ++ realname="$1" ++ shift ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ # use dlname if we got it. it's perfectly good, no? ++ if test -n "$dlname"; then ++ soname="$dlname" ++ elif test -n "$soname_spec"; then ++ # bleh windows ++ case $host in ++ *cygwin* | mingw* | *cegcc*) ++ func_arith $current - $age ++ major=$func_arith_result ++ versuffix="-$major" ++ ;; ++ esac ++ eval soname=\"$soname_spec\" ++ else ++ soname="$realname" ++ fi ++ ++ # Make a new name for the extract_expsyms_cmds to use ++ soroot="$soname" ++ func_basename "$soroot" ++ soname="$func_basename_result" ++ func_stripname 'lib' '.dll' "$soname" ++ newlib=libimp-$func_stripname_result.a ++ ++ # If the library has no export list, then create one now ++ if test -f "$output_objdir/$soname-def"; then : ++ else ++ func_verbose "extracting exported symbol list from \`$soname'" ++ func_execute_cmds "$extract_expsyms_cmds" 'exit $?' ++ fi ++ ++ # Create $newlib ++ if test -f "$output_objdir/$newlib"; then :; else ++ func_verbose "generating import library for \`$soname'" ++ func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' ++ fi ++ # make sure the library variables are pointing to the new library ++ dir=$output_objdir ++ linklib=$newlib ++ fi # test -n "$old_archive_from_expsyms_cmds" ++ ++ if test "$linkmode" = prog || test "$mode" != relink; then ++ add_shlibpath= ++ add_dir= ++ add= ++ lib_linked=yes ++ case $hardcode_action in ++ immediate | unsupported) ++ if test "$hardcode_direct" = no; then ++ add="$dir/$linklib" ++ case $host in ++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; ++ *-*-sysv4*uw2*) add_dir="-L$dir" ;; ++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ ++ *-*-unixware7*) add_dir="-L$dir" ;; ++ *-*-darwin* ) ++ # if the lib is a (non-dlopened) module then we can not ++ # link against it, someone is ignoring the earlier warnings ++ if /usr/bin/file -L $add 2> /dev/null | ++ $GREP ": [^:]* bundle" >/dev/null ; then ++ if test "X$dlopenmodule" != "X$lib"; then ++ $ECHO "*** Warning: lib $linklib is a module, not a shared library" ++ if test -z "$old_library" ; then ++ $ECHO ++ $ECHO "*** And there doesn't seem to be a static archive available" ++ $ECHO "*** The link will probably fail, sorry" ++ else ++ add="$dir/$old_library" ++ fi ++ elif test -n "$old_library"; then ++ add="$dir/$old_library" ++ fi ++ fi ++ esac ++ elif test "$hardcode_minus_L" = no; then ++ case $host in ++ *-*-sunos*) add_shlibpath="$dir" ;; ++ esac ++ add_dir="-L$dir" ++ add="-l$name" ++ elif test "$hardcode_shlibpath_var" = no; then ++ add_shlibpath="$dir" ++ add="-l$name" ++ else ++ lib_linked=no ++ fi ++ ;; ++ relink) ++ if test "$hardcode_direct" = yes && ++ test "$hardcode_direct_absolute" = no; then ++ add="$dir/$linklib" ++ elif test "$hardcode_minus_L" = yes; then ++ add_dir="-L$dir" ++ # Try looking first in the location we're being installed to. ++ if test -n "$inst_prefix_dir"; then ++ case $libdir in ++ [\\/]*) ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ ;; ++ esac ++ fi ++ add="-l$name" ++ elif test "$hardcode_shlibpath_var" = yes; then ++ add_shlibpath="$dir" ++ add="-l$name" ++ else ++ lib_linked=no ++ fi ++ ;; ++ *) lib_linked=no ;; ++ esac ++ ++ if test "$lib_linked" != yes; then ++ func_fatal_configuration "unsupported hardcode properties" ++ fi ++ ++ if test -n "$add_shlibpath"; then ++ case :$compile_shlibpath: in ++ *":$add_shlibpath:"*) ;; ++ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; ++ esac ++ fi ++ if test "$linkmode" = prog; then ++ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" ++ test -n "$add" && compile_deplibs="$add $compile_deplibs" ++ else ++ test -n "$add_dir" && deplibs="$add_dir $deplibs" ++ test -n "$add" && deplibs="$add $deplibs" ++ if test "$hardcode_direct" != yes && ++ test "$hardcode_minus_L" != yes && ++ test "$hardcode_shlibpath_var" = yes; then ++ case :$finalize_shlibpath: in ++ *":$libdir:"*) ;; ++ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ esac ++ fi ++ fi ++ fi ++ ++ if test "$linkmode" = prog || test "$mode" = relink; then ++ add_shlibpath= ++ add_dir= ++ add= ++ # Finalize command for both is simple: just hardcode it. ++ if test "$hardcode_direct" = yes && ++ test "$hardcode_direct_absolute" = no; then ++ add="$libdir/$linklib" ++ elif test "$hardcode_minus_L" = yes; then ++ add_dir="-L$libdir" ++ add="-l$name" ++ elif test "$hardcode_shlibpath_var" = yes; then ++ case :$finalize_shlibpath: in ++ *":$libdir:"*) ;; ++ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; ++ esac ++ add="-l$name" ++ elif test "$hardcode_automatic" = yes; then ++ if test -n "$inst_prefix_dir" && ++ test -f "$inst_prefix_dir$libdir/$linklib" ; then ++ add="$inst_prefix_dir$libdir/$linklib" ++ else ++ add="$libdir/$linklib" ++ fi ++ else ++ # We cannot seem to hardcode it, guess we'll fake it. ++ add_dir="-L$libdir" ++ # Try looking first in the location we're being installed to. ++ if test -n "$inst_prefix_dir"; then ++ case $libdir in ++ [\\/]*) ++ add_dir="$add_dir -L$inst_prefix_dir$libdir" ++ ;; ++ esac ++ fi ++ add="-l$name" ++ fi ++ ++ if test "$linkmode" = prog; then ++ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" ++ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" ++ else ++ test -n "$add_dir" && deplibs="$add_dir $deplibs" ++ test -n "$add" && deplibs="$add $deplibs" ++ fi ++ fi ++ elif test "$linkmode" = prog; then ++ # Here we assume that one of hardcode_direct or hardcode_minus_L ++ # is not unsupported. This is valid on all known static and ++ # shared platforms. ++ if test "$hardcode_direct" != unsupported; then ++ test -n "$old_library" && linklib="$old_library" ++ compile_deplibs="$dir/$linklib $compile_deplibs" ++ finalize_deplibs="$dir/$linklib $finalize_deplibs" ++ else ++ compile_deplibs="-l$name -L$dir $compile_deplibs" ++ finalize_deplibs="-l$name -L$dir $finalize_deplibs" ++ fi ++ elif test "$build_libtool_libs" = yes; then ++ # Not a shared library ++ if test "$deplibs_check_method" != pass_all; then ++ # We're trying link a shared library against a static one ++ # but the system doesn't support it. ++ ++ # Just print a warning and add the library to dependency_libs so ++ # that the program can be linked against the static library. ++ $ECHO ++ $ECHO "*** Warning: This system can not link to static lib archive $lib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have." ++ if test "$module" = yes; then ++ $ECHO "*** But as you try to build a module library, libtool will still create " ++ $ECHO "*** a static module, that should work as long as the dlopening application" ++ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." ++ if test -z "$global_symbol_pipe"; then ++ $ECHO ++ $ECHO "*** However, this would only work if libtool was able to extract symbol" ++ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" ++ $ECHO "*** not find such a program. So, this module is probably useless." ++ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." ++ fi ++ if test "$build_old_libs" = no; then ++ build_libtool_libs=module ++ build_old_libs=yes ++ else ++ build_libtool_libs=no ++ fi ++ fi ++ else ++ deplibs="$dir/$old_library $deplibs" ++ link_static=yes ++ fi ++ fi # link shared/static library? ++ ++ if test "$linkmode" = lib; then ++ if test -n "$dependency_libs" && ++ { test "$hardcode_into_libs" != yes || ++ test "$build_old_libs" = yes || ++ test "$link_static" = yes; }; then ++ # Extract -R from dependency_libs ++ temp_deplibs= ++ for libdir in $dependency_libs; do ++ case $libdir in ++ -R*) func_stripname '-R' '' "$libdir" ++ temp_xrpath=$func_stripname_result ++ case " $xrpath " in ++ *" $temp_xrpath "*) ;; ++ *) xrpath="$xrpath $temp_xrpath";; ++ esac;; ++ *) temp_deplibs="$temp_deplibs $libdir";; ++ esac ++ done ++ dependency_libs="$temp_deplibs" ++ fi ++ ++ newlib_search_path="$newlib_search_path $absdir" ++ # Link against this library ++ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" ++ # ... and its dependency_libs ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ newdependency_libs="$deplib $newdependency_libs" ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done ++ ++ if test "$link_all_deplibs" != no; then ++ # Add the search paths of all dependency libraries ++ for deplib in $dependency_libs; do ++ case $deplib in ++ -L*) path="$deplib" ;; ++ *.la) ++ func_dirname "$deplib" "" "." ++ dir="$func_dirname_result" ++ # We need an absolute path. ++ case $dir in ++ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; ++ *) ++ absdir=`cd "$dir" && pwd` ++ if test -z "$absdir"; then ++ func_warning "cannot determine absolute directory name of \`$dir'" ++ absdir="$dir" ++ fi ++ ;; ++ esac ++ if $GREP "^installed=no" $deplib > /dev/null; then ++ case $host in ++ *-*-darwin*) ++ depdepl= ++ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` ++ if test -n "$deplibrary_names" ; then ++ for tmp in $deplibrary_names ; do ++ depdepl=$tmp ++ done ++ if test -f "$absdir/$objdir/$depdepl" ; then ++ depdepl="$absdir/$objdir/$depdepl" ++ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` ++ if test -z "$darwin_install_name"; then ++ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` ++ fi ++ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" ++ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" ++ path= ++ fi ++ fi ++ ;; ++ *) ++ path="-L$absdir/$objdir" ++ ;; ++ esac ++ else ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$deplib' is not a valid libtool archive" ++ test "$absdir" != "$libdir" && \ ++ func_warning "\`$deplib' seems to be moved" ++ ++ path="-L$absdir" ++ fi ++ ;; ++ esac ++ case " $deplibs " in ++ *" $path "*) ;; ++ *) deplibs="$path $deplibs" ;; ++ esac ++ done ++ fi # link_all_deplibs != no ++ fi # linkmode = lib ++ done # for deplib in $libs ++ if test "$pass" = link; then ++ if test "$linkmode" = "prog"; then ++ compile_deplibs="$new_inherited_linker_flags $compile_deplibs" ++ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" ++ else ++ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ fi ++ fi ++ dependency_libs="$newdependency_libs" ++ if test "$pass" = dlpreopen; then ++ # Link the dlpreopened libraries before other libraries ++ for deplib in $save_deplibs; do ++ deplibs="$deplib $deplibs" ++ done ++ fi ++ if test "$pass" != dlopen; then ++ if test "$pass" != conv; then ++ # Make sure lib_search_path contains only unique directories. ++ lib_search_path= ++ for dir in $newlib_search_path; do ++ case "$lib_search_path " in ++ *" $dir "*) ;; ++ *) lib_search_path="$lib_search_path $dir" ;; ++ esac ++ done ++ newlib_search_path= ++ fi ++ ++ if test "$linkmode,$pass" != "prog,link"; then ++ vars="deplibs" ++ else ++ vars="compile_deplibs finalize_deplibs" ++ fi ++ for var in $vars dependency_libs; do ++ # Add libraries to $var in reverse order ++ eval tmp_libs=\"\$$var\" ++ new_libs= ++ for deplib in $tmp_libs; do ++ # FIXME: Pedantically, this is the right thing to do, so ++ # that some nasty dependency loop isn't accidentally ++ # broken: ++ #new_libs="$deplib $new_libs" ++ # Pragmatically, this seems to cause very few problems in ++ # practice: ++ case $deplib in ++ -L*) new_libs="$deplib $new_libs" ;; ++ -R*) ;; ++ *) ++ # And here is the reason: when a library appears more ++ # than once as an explicit dependence of a library, or ++ # is implicitly linked in more than once by the ++ # compiler, it is considered special, and multiple ++ # occurrences thereof are not removed. Compare this ++ # with having the same library being listed as a ++ # dependency of multiple other libraries: in this case, ++ # we know (pedantically, we assume) the library does not ++ # need to be listed more than once, so we keep only the ++ # last copy. This is not always right, but it is rare ++ # enough that we require users that really mean to play ++ # such unportable linking tricks to link the library ++ # using -Wl,-lname, so that libtool does not consider it ++ # for duplicate removal. ++ case " $specialdeplibs " in ++ *" $deplib "*) new_libs="$deplib $new_libs" ;; ++ *) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$deplib $new_libs" ;; ++ esac ++ ;; ++ esac ++ ;; ++ esac ++ done ++ tmp_libs= ++ for deplib in $new_libs; do ++ case $deplib in ++ -L*) ++ case " $tmp_libs " in ++ *" $deplib "*) ;; ++ *) tmp_libs="$tmp_libs $deplib" ;; ++ esac ++ ;; ++ *) tmp_libs="$tmp_libs $deplib" ;; ++ esac ++ done ++ eval $var=\"$tmp_libs\" ++ done # for var ++ fi ++ # Last step: remove runtime libs from dependency_libs ++ # (they stay in deplibs) ++ tmp_libs= ++ for i in $dependency_libs ; do ++ case " $predeps $postdeps $compiler_lib_search_path " in ++ *" $i "*) ++ i="" ++ ;; ++ esac ++ if test -n "$i" ; then ++ tmp_libs="$tmp_libs $i" ++ fi ++ done ++ dependency_libs=$tmp_libs ++ done # for pass ++ if test "$linkmode" = prog; then ++ dlfiles="$newdlfiles" ++ fi ++ if test "$linkmode" = prog || test "$linkmode" = lib; then ++ dlprefiles="$newdlprefiles" ++ fi ++ ++ case $linkmode in ++ oldlib) ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ func_warning "\`-dlopen' is ignored for archives" ++ fi ++ ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ func_warning "\`-l' and \`-L' are ignored for archives" ;; ++ esac ++ ++ test -n "$rpath" && \ ++ func_warning "\`-rpath' is ignored for archives" ++ ++ test -n "$xrpath" && \ ++ func_warning "\`-R' is ignored for archives" ++ ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info/-version-number' is ignored for archives" ++ ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for archives" ++ ++ test -n "$export_symbols$export_symbols_regex" && \ ++ func_warning "\`-export-symbols' is ignored for archives" ++ ++ # Now set the variables for building old libraries. ++ build_libtool_libs=no ++ oldlibs="$output" ++ objs="$objs$old_deplibs" ++ ;; ++ ++ lib) ++ # Make sure we only generate libraries of the form `libNAME.la'. ++ case $outputname in ++ lib*) ++ func_stripname 'lib' '.la' "$outputname" ++ name=$func_stripname_result ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" ++ ;; ++ *) ++ test "$module" = no && \ ++ func_fatal_help "libtool library \`$output' must begin with \`lib'" ++ ++ if test "$need_lib_prefix" != no; then ++ # Add the "lib" prefix for modules if required ++ func_stripname '' '.la' "$outputname" ++ name=$func_stripname_result ++ eval shared_ext=\"$shrext_cmds\" ++ eval libname=\"$libname_spec\" ++ else ++ func_stripname '' '.la' "$outputname" ++ libname=$func_stripname_result ++ fi ++ ;; ++ esac ++ ++ if test -n "$objs"; then ++ if test "$deplibs_check_method" != pass_all; then ++ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" ++ else ++ $ECHO ++ $ECHO "*** Warning: Linking the shared library $output against the non-libtool" ++ $ECHO "*** objects $objs is not portable!" ++ libobjs="$libobjs $objs" ++ fi ++ fi ++ ++ test "$dlself" != no && \ ++ func_warning "\`-dlopen self' is ignored for libtool libraries" ++ ++ set dummy $rpath ++ shift ++ test "$#" -gt 1 && \ ++ func_warning "ignoring multiple \`-rpath's for a libtool library" ++ ++ install_libdir="$1" ++ ++ oldlibs= ++ if test -z "$rpath"; then ++ if test "$build_libtool_libs" = yes; then ++ # Building a libtool convenience library. ++ # Some compilers have problems with a `.al' extension so ++ # convenience libraries should have the same extension an ++ # archive normally would. ++ oldlibs="$output_objdir/$libname.$libext $oldlibs" ++ build_libtool_libs=convenience ++ build_old_libs=yes ++ fi ++ ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info/-version-number' is ignored for convenience libraries" ++ ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for convenience libraries" ++ else ++ ++ # Parse the version information argument. ++ save_ifs="$IFS"; IFS=':' ++ set dummy $vinfo 0 0 0 ++ shift ++ IFS="$save_ifs" ++ ++ test -n "$7" && \ ++ func_fatal_help "too many parameters to \`-version-info'" ++ ++ # convert absolute version numbers to libtool ages ++ # this retains compatibility with .la files and attempts ++ # to make the code below a bit more comprehensible ++ ++ case $vinfo_number in ++ yes) ++ number_major="$1" ++ number_minor="$2" ++ number_revision="$3" ++ # ++ # There are really only two kinds -- those that ++ # use the current revision as the major version ++ # and those that subtract age and use age as ++ # a minor version. But, then there is irix ++ # which has an extra 1 added just for fun ++ # ++ case $version_type in ++ darwin|linux|osf|windows|none) ++ func_arith $number_major + $number_minor ++ current=$func_arith_result ++ age="$number_minor" ++ revision="$number_revision" ++ ;; ++ freebsd-aout|freebsd-elf|sunos) ++ current="$number_major" ++ revision="$number_minor" ++ age="0" ++ ;; ++ irix|nonstopux) ++ func_arith $number_major + $number_minor ++ current=$func_arith_result ++ age="$number_minor" ++ revision="$number_minor" ++ lt_irix_increment=no ++ ;; ++ *) ++ func_fatal_configuration "$modename: unknown library version type \`$version_type'" ++ ;; ++ esac ++ ;; ++ no) ++ current="$1" ++ revision="$2" ++ age="$3" ++ ;; ++ esac ++ ++ # Check that each of the things are valid numbers. ++ case $current in ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; ++ *) ++ func_error "CURRENT \`$current' must be a nonnegative integer" ++ func_fatal_error "\`$vinfo' is not valid version information" ++ ;; ++ esac ++ ++ case $revision in ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; ++ *) ++ func_error "REVISION \`$revision' must be a nonnegative integer" ++ func_fatal_error "\`$vinfo' is not valid version information" ++ ;; ++ esac ++ ++ case $age in ++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; ++ *) ++ func_error "AGE \`$age' must be a nonnegative integer" ++ func_fatal_error "\`$vinfo' is not valid version information" ++ ;; ++ esac ++ ++ if test "$age" -gt "$current"; then ++ func_error "AGE \`$age' is greater than the current interface number \`$current'" ++ func_fatal_error "\`$vinfo' is not valid version information" ++ fi ++ ++ # Calculate the version variables. ++ major= ++ versuffix= ++ verstring= ++ case $version_type in ++ none) ;; ++ ++ darwin) ++ # Like Linux, but with the current version available in ++ # verstring for coding it into the library header ++ func_arith $current - $age ++ major=.$func_arith_result ++ versuffix="$major.$age.$revision" ++ # Darwin ld doesn't like 0 for these options... ++ func_arith $current + 1 ++ minor_current=$func_arith_result ++ 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) ++ major=".$current" ++ versuffix=".$current.$revision"; ++ ;; ++ ++ freebsd-elf) ++ major=".$current" ++ versuffix=".$current" ++ ;; ++ ++ irix | nonstopux) ++ if test "X$lt_irix_increment" = "Xno"; then ++ func_arith $current - $age ++ else ++ func_arith $current - $age + 1 ++ fi ++ major=$func_arith_result ++ ++ case $version_type in ++ nonstopux) verstring_prefix=nonstopux ;; ++ *) verstring_prefix=sgi ;; ++ esac ++ verstring="$verstring_prefix$major.$revision" ++ ++ # Add in all the interfaces that we are compatible with. ++ loop=$revision ++ while test "$loop" -ne 0; do ++ func_arith $revision - $loop ++ iface=$func_arith_result ++ func_arith $loop - 1 ++ loop=$func_arith_result ++ verstring="$verstring_prefix$major.$iface:$verstring" ++ done ++ ++ # Before this point, $major must not contain `.'. ++ major=.$major ++ versuffix="$major.$revision" ++ ;; ++ ++ linux) ++ func_arith $current - $age ++ major=.$func_arith_result ++ versuffix="$major.$age.$revision" ++ ;; ++ ++ osf) ++ func_arith $current - $age ++ major=.$func_arith_result ++ versuffix=".$current.$age.$revision" ++ verstring="$current.$age.$revision" ++ ++ # Add in all the interfaces that we are compatible with. ++ loop=$age ++ while test "$loop" -ne 0; do ++ func_arith $current - $loop ++ iface=$func_arith_result ++ func_arith $loop - 1 ++ loop=$func_arith_result ++ verstring="$verstring:${iface}.0" ++ done ++ ++ # Make executables depend on our current version. ++ verstring="$verstring:${current}.0" ++ ;; ++ ++ qnx) ++ major=".$current" ++ versuffix=".$current" ++ ;; ++ ++ sunos) ++ major=".$current" ++ versuffix=".$current.$revision" ++ ;; ++ ++ windows) ++ # Use '-' rather than '.', since we only want one ++ # extension on DOS 8.3 filesystems. ++ func_arith $current - $age ++ major=$func_arith_result ++ versuffix="-$major" ++ ;; ++ ++ *) ++ func_fatal_configuration "unknown library version type \`$version_type'" ++ ;; ++ esac ++ ++ # Clear the version info if we defaulted, and they specified a release. ++ if test -z "$vinfo" && test -n "$release"; then ++ major= ++ case $version_type in ++ darwin) ++ # we can't check for "0.0" in archive_cmds due to quoting ++ # problems, so we reset it completely ++ verstring= ++ ;; ++ *) ++ verstring="0.0" ++ ;; ++ esac ++ if test "$need_version" = no; then ++ versuffix= ++ else ++ versuffix=".0.0" ++ fi ++ fi ++ ++ # Remove version info from name if versioning should be avoided ++ if test "$avoid_version" = yes && test "$need_version" = no; then ++ major= ++ versuffix= ++ verstring="" ++ fi ++ ++ # Check to see if the archive will have undefined symbols. ++ if test "$allow_undefined" = yes; then ++ if test "$allow_undefined_flag" = unsupported; then ++ func_warning "undefined symbols not allowed in $host shared libraries" ++ build_libtool_libs=no ++ build_old_libs=yes ++ fi ++ else ++ # Don't allow undefined symbols. ++ allow_undefined_flag="$no_undefined_flag" ++ fi ++ ++ fi ++ ++ func_generate_dlsyms "$libname" "$libname" "yes" ++ libobjs="$libobjs $symfileobj" ++ test "X$libobjs" = "X " && libobjs= ++ ++ if test "$mode" != relink; then ++ # Remove our outputs, but don't remove object files since they ++ # may have been created when compiling PIC objects. ++ removelist= ++ tempremovelist=`$ECHO "$output_objdir/*"` ++ for p in $tempremovelist; do ++ case $p in ++ *.$objext | *.gcno) ++ ;; ++ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) ++ if test "X$precious_files_regex" != "X"; then ++ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 ++ then ++ continue ++ fi ++ fi ++ removelist="$removelist $p" ++ ;; ++ *) ;; ++ esac ++ done ++ test -n "$removelist" && \ ++ func_show_eval "${RM}r \$removelist" ++ fi ++ ++ # Now set the variables for building old libraries. ++ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then ++ oldlibs="$oldlibs $output_objdir/$libname.$libext" ++ ++ # Transform .lo files to .o files. ++ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` ++ fi ++ ++ # Eliminate all temporary directories. ++ #for path in $notinst_path; do ++ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` ++ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` ++ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` ++ #done ++ ++ if test -n "$xrpath"; then ++ # If the user specified any rpath flags, then add them. ++ temp_xrpath= ++ for libdir in $xrpath; do ++ temp_xrpath="$temp_xrpath -R$libdir" ++ case "$finalize_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_rpath="$finalize_rpath $libdir" ;; ++ esac ++ done ++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then ++ dependency_libs="$temp_xrpath $dependency_libs" ++ fi ++ fi ++ ++ # Make sure dlfiles contains only unique files that won't be dlpreopened ++ old_dlfiles="$dlfiles" ++ dlfiles= ++ for lib in $old_dlfiles; do ++ case " $dlprefiles $dlfiles " in ++ *" $lib "*) ;; ++ *) dlfiles="$dlfiles $lib" ;; ++ esac ++ done ++ ++ # Make sure dlprefiles contains only unique files ++ old_dlprefiles="$dlprefiles" ++ dlprefiles= ++ for lib in $old_dlprefiles; do ++ case "$dlprefiles " in ++ *" $lib "*) ;; ++ *) dlprefiles="$dlprefiles $lib" ;; ++ esac ++ done ++ ++ if test "$build_libtool_libs" = yes; then ++ if test -n "$rpath"; then ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) ++ # these systems don't actually have a c library (as such)! ++ ;; ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # Rhapsody C library is in the System framework ++ deplibs="$deplibs System.ltframework" ++ ;; ++ *-*-netbsd*) ++ # Don't link with libc until the a.out ld.so is fixed. ++ ;; ++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ # Do not include libc due to us having libc/libc_r. ++ ;; ++ *-*-sco3.2v5* | *-*-sco5v6*) ++ # Causes problems with __ctype ++ ;; ++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) ++ # Compiler inserts libc in the correct place for threads to work ++ ;; ++ *) ++ # Add libc to deplibs on all other systems if necessary. ++ if test "$build_libtool_need_lc" = "yes"; then ++ deplibs="$deplibs -lc" ++ fi ++ ;; ++ esac ++ fi ++ ++ # Transform deplibs into only deplibs that can be linked in shared. ++ name_save=$name ++ libname_save=$libname ++ release_save=$release ++ versuffix_save=$versuffix ++ major_save=$major ++ # I'm not sure if I'm treating the release correctly. I think ++ # release should show up in the -l (ie -lgmp5) so we don't want to ++ # add it in twice. Is that correct? ++ release="" ++ versuffix="" ++ major="" ++ newdeplibs= ++ droppeddeps=no ++ case $deplibs_check_method in ++ pass_all) ++ # Don't check for shared/static. Everything works. ++ # This might be a little naive. We might want to check ++ # whether the library exists or not. But this is on ++ # osf3 & osf4 and I'm not really sure... Just ++ # implementing what was already the behavior. ++ newdeplibs=$deplibs ++ ;; ++ test_compile) ++ # This code stresses the "libraries are programs" paradigm to its ++ # limits. Maybe even breaks it. We compile a program, linking it ++ # against the deplibs as a proxy for the library. Then we can check ++ # whether they linked in statically or dynamically with ldd. ++ $opt_dry_run || $RM conftest.c ++ cat > conftest.c <<EOF ++ int main() { return 0; } ++EOF ++ $opt_dry_run || $RM conftest ++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then ++ ldd_output=`ldd conftest` ++ for i in $deplibs; do ++ case $i in ++ -l*) ++ func_stripname -l '' "$i" ++ name=$func_stripname_result ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $i "*) ++ newdeplibs="$newdeplibs $i" ++ i="" ++ ;; ++ esac ++ fi ++ if test -n "$i" ; then ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` ++ set dummy $deplib_matches; shift ++ deplib_match=$1 ++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then ++ newdeplibs="$newdeplibs $i" ++ else ++ droppeddeps=yes ++ $ECHO ++ $ECHO "*** Warning: dynamic linker does not accept needed library $i." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which I believe you do not have" ++ $ECHO "*** because a test_compile did reveal that the linker did not use it for" ++ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." ++ fi ++ fi ++ ;; ++ *) ++ newdeplibs="$newdeplibs $i" ++ ;; ++ esac ++ done ++ else ++ # Error occurred in the first compile. Let's try to salvage ++ # the situation: Compile a separate program for each library. ++ for i in $deplibs; do ++ case $i in ++ -l*) ++ func_stripname -l '' "$i" ++ name=$func_stripname_result ++ $opt_dry_run || $RM conftest ++ 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 ++ *" $i "*) ++ newdeplibs="$newdeplibs $i" ++ i="" ++ ;; ++ esac ++ fi ++ if test -n "$i" ; then ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` ++ set dummy $deplib_matches; shift ++ deplib_match=$1 ++ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then ++ newdeplibs="$newdeplibs $i" ++ else ++ droppeddeps=yes ++ $ECHO ++ $ECHO "*** Warning: dynamic linker does not accept needed library $i." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because a test_compile did reveal that the linker did not use this one" ++ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." ++ fi ++ fi ++ else ++ 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 "*** library that it depends on before this library will be fully" ++ $ECHO "*** functional. Installing it before continuing would be even better." ++ fi ++ ;; ++ *) ++ newdeplibs="$newdeplibs $i" ++ ;; ++ esac ++ done ++ fi ++ ;; ++ file_magic*) ++ set dummy $deplibs_check_method; shift ++ file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` ++ for a_deplib in $deplibs; do ++ case $a_deplib in ++ -l*) ++ func_stripname -l '' "$a_deplib" ++ name=$func_stripname_result ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $a_deplib "*) ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ ;; ++ esac ++ fi ++ if test -n "$a_deplib" ; then ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ for potent_lib in $potential_libs; do ++ # Follow soft links. ++ if ls -lLd "$potent_lib" 2>/dev/null | ++ $GREP " -> " >/dev/null; then ++ continue ++ fi ++ # The statement above tries to avoid entering an ++ # endless loop below, in case of cyclic links. ++ # We might still enter an endless loop, since a link ++ # loop can be closed while we follow links, ++ # but so what? ++ potlib="$potent_lib" ++ while test -h "$potlib" 2>/dev/null; do ++ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` ++ case $potliblink in ++ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; ++ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; ++ esac ++ done ++ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | ++ $SED -e 10q | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ break 2 ++ fi ++ done ++ done ++ fi ++ if test -n "$a_deplib" ; then ++ droppeddeps=yes ++ $ECHO ++ $ECHO "*** Warning: linker path does not have real file for library $a_deplib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because I did check the linker path looking for a file starting" ++ if test -z "$potlib" ; then ++ $ECHO "*** with $libname but no candidates were found. (...for file magic test)" ++ else ++ $ECHO "*** with $libname and none of the candidates passed a file format test" ++ $ECHO "*** using a file magic. Last file checked: $potlib" ++ fi ++ fi ++ ;; ++ *) ++ # Add a -L argument. ++ newdeplibs="$newdeplibs $a_deplib" ++ ;; ++ esac ++ done # Gone through all deplibs. ++ ;; ++ match_pattern*) ++ set dummy $deplibs_check_method; shift ++ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` ++ for a_deplib in $deplibs; do ++ case $a_deplib in ++ -l*) ++ func_stripname -l '' "$a_deplib" ++ name=$func_stripname_result ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ case " $predeps $postdeps " in ++ *" $a_deplib "*) ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ ;; ++ esac ++ fi ++ if test -n "$a_deplib" ; then ++ libname=`eval "\\$ECHO \"$libname_spec\""` ++ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do ++ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` ++ for potent_lib in $potential_libs; do ++ potlib="$potent_lib" # see symlink-check above in file_magic test ++ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ ++ $EGREP "$match_pattern_regex" > /dev/null; then ++ newdeplibs="$newdeplibs $a_deplib" ++ a_deplib="" ++ break 2 ++ fi ++ done ++ done ++ fi ++ if test -n "$a_deplib" ; then ++ droppeddeps=yes ++ $ECHO ++ $ECHO "*** Warning: linker path does not have real file for library $a_deplib." ++ $ECHO "*** I have the capability to make that library automatically link in when" ++ $ECHO "*** you link to this library. But I can only do this if you have a" ++ $ECHO "*** shared version of the library, which you do not appear to have" ++ $ECHO "*** because I did check the linker path looking for a file starting" ++ if test -z "$potlib" ; then ++ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" ++ else ++ $ECHO "*** with $libname and none of the candidates passed a file format test" ++ $ECHO "*** using a regex pattern. Last file checked: $potlib" ++ fi ++ fi ++ ;; ++ *) ++ # Add a -L argument. ++ newdeplibs="$newdeplibs $a_deplib" ++ ;; ++ esac ++ done # Gone through all deplibs. ++ ;; ++ none | unknown | *) ++ newdeplibs="" ++ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ ++ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` ++ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then ++ for i in $predeps $postdeps ; do ++ # can't use Xsed below, because $i might contain '/' ++ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` ++ done ++ fi ++ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | ++ $GREP . >/dev/null; then ++ $ECHO ++ if test "X$deplibs_check_method" = "Xnone"; then ++ $ECHO "*** Warning: inter-library dependencies are not supported in this platform." ++ else ++ $ECHO "*** Warning: inter-library dependencies are not known to be supported." ++ fi ++ $ECHO "*** All declared inter-library dependencies are being dropped." ++ droppeddeps=yes ++ fi ++ ;; ++ esac ++ versuffix=$versuffix_save ++ major=$major_save ++ release=$release_save ++ libname=$libname_save ++ name=$name_save ++ ++ case $host in ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # On Rhapsody replace the C library with the System framework ++ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ ;; ++ esac ++ ++ if test "$droppeddeps" = yes; then ++ if test "$module" = yes; then ++ $ECHO ++ $ECHO "*** Warning: libtool could not satisfy all declared inter-library" ++ $ECHO "*** dependencies of module $libname. Therefore, libtool will create" ++ $ECHO "*** a static module, that should work as long as the dlopening" ++ $ECHO "*** application is linked with the -dlopen flag." ++ if test -z "$global_symbol_pipe"; then ++ $ECHO ++ $ECHO "*** However, this would only work if libtool was able to extract symbol" ++ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" ++ $ECHO "*** not find such a program. So, this module is probably useless." ++ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." ++ fi ++ if test "$build_old_libs" = no; then ++ oldlibs="$output_objdir/$libname.$libext" ++ build_libtool_libs=module ++ build_old_libs=yes ++ else ++ build_libtool_libs=no ++ fi ++ else ++ $ECHO "*** The inter-library dependencies that have been dropped here will be" ++ $ECHO "*** automatically added whenever a program is linked with this library" ++ $ECHO "*** or is declared to -dlopen it." ++ ++ if test "$allow_undefined" = no; then ++ $ECHO ++ $ECHO "*** Since this library must not contain undefined symbols," ++ $ECHO "*** because either the platform does not support them or" ++ $ECHO "*** it was explicitly requested with -no-undefined," ++ $ECHO "*** libtool will only create a static version of it." ++ if test "$build_old_libs" = no; then ++ oldlibs="$output_objdir/$libname.$libext" ++ build_libtool_libs=module ++ build_old_libs=yes ++ else ++ build_libtool_libs=no ++ fi ++ fi ++ fi ++ fi ++ # Done checking deplibs! ++ deplibs=$newdeplibs ++ fi ++ # Time to change all our "foo.ltframework" stuff back to "-framework foo" ++ case $host in ++ *-*-darwin*) ++ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ ;; + esac +- fi + +- file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` +- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` +- done ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; ++ esac ++ ;; ++ esac ++ done ++ for deplib in $deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ deplibs="$new_libs" + +- # Try to get the absolute directory name. +- absdir=\`cd \"\$thisdir\" && pwd\` +- test -n \"\$absdir\" && thisdir=\"\$absdir\" +-" ++ # All the library-specific variables (install_libdir is set above). ++ library_names= ++ old_library= ++ dlname= ++ ++ # Test again, we may have decided not to build it any more ++ if test "$build_libtool_libs" = yes; then ++ if test "$hardcode_into_libs" = yes; then ++ # Hardcode the library paths ++ hardcode_libdirs= ++ dep_rpath= ++ rpath="$finalize_rpath" ++ test "$mode" != relink && rpath="$compile_rpath$rpath" ++ for libdir in $rpath; do ++ if test -n "$hardcode_libdir_flag_spec"; then ++ if test -n "$hardcode_libdir_separator"; then ++ if test -z "$hardcode_libdirs"; then ++ hardcode_libdirs="$libdir" ++ else ++ # Just accumulate the unique libdirs. ++ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in ++ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ++ ;; ++ *) ++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ ;; ++ esac ++ fi ++ else ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ dep_rpath="$dep_rpath $flag" ++ fi ++ elif test -n "$runpath_var"; then ++ case "$perm_rpath " in ++ *" $libdir "*) ;; ++ *) perm_rpath="$perm_rpath $libdir" ;; ++ esac ++ fi ++ done ++ # Substitute the hardcoded libdirs into the rpath. ++ if test -n "$hardcode_libdir_separator" && ++ 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\" ++ else ++ eval dep_rpath=\"$hardcode_libdir_flag_spec\" ++ fi ++ fi ++ if test -n "$runpath_var" && test -n "$perm_rpath"; then ++ # We should set the runpath_var. ++ rpath= ++ for dir in $perm_rpath; do ++ rpath="$rpath$dir:" ++ done ++ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" ++ fi ++ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" ++ fi + +- if test "$fast_install" = yes; then +- $echo >> $output "\ +- program=lt-'$outputname'$exeext +- progdir=\"\$thisdir/$objdir\" ++ shlibpath="$finalize_shlibpath" ++ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" ++ if test -n "$shlibpath"; then ++ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" ++ fi + +- if test ! -f \"\$progdir/\$program\" || \\ +- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ +- test \"X\$file\" != \"X\$progdir/\$program\"; }; then ++ # Get the real and link names of the library. ++ eval shared_ext=\"$shrext_cmds\" ++ eval library_names=\"$library_names_spec\" ++ set dummy $library_names ++ shift ++ realname="$1" ++ shift + +- file=\"\$\$-\$program\" ++ if test -n "$soname_spec"; then ++ eval soname=\"$soname_spec\" ++ else ++ soname="$realname" ++ fi ++ if test -z "$dlname"; then ++ dlname=$soname ++ fi + +- if test ! -d \"\$progdir\"; then +- $mkdir \"\$progdir\" +- else +- $rm \"\$progdir/\$file\" +- fi" ++ lib="$output_objdir/$realname" ++ linknames= ++ for link ++ do ++ linknames="$linknames $link" ++ done + +- $echo >> $output "\ ++ # Use standard objects if they are pic ++ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ test "X$libobjs" = "X " && libobjs= + +- # relink executable if necessary +- if test -n \"\$relink_command\"; then +- if relink_command_output=\`eval \$relink_command 2>&1\`; then : +- else +- $echo \"\$relink_command_output\" >&2 +- $rm \"\$progdir/\$file\" +- exit $EXIT_FAILURE +- fi +- fi ++ delfiles= ++ if test -n "$export_symbols" && test -n "$include_expsyms"; then ++ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" ++ export_symbols="$output_objdir/$libname.uexp" ++ delfiles="$delfiles $export_symbols" ++ fi ++ ++ orig_export_symbols= ++ case $host_os in ++ cygwin* | mingw* | cegcc*) ++ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then ++ # exporting using user supplied symfile ++ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then ++ # and it's NOT already a .def file. Must figure out ++ # which of the given symbols are data symbols and tag ++ # them as such. So, trigger use of export_symbols_cmds. ++ # export_symbols gets reassigned inside the "prepare ++ # the list of exported symbols" if statement, so the ++ # include_expsyms logic still works. ++ orig_export_symbols="$export_symbols" ++ export_symbols= ++ always_export_symbols=yes ++ fi ++ fi ++ ;; ++ esac + +- $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || +- { $rm \"\$progdir/\$program\"; +- $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } +- $rm \"\$progdir/\$file\" +- fi" +- else +- $echo >> $output "\ +- program='$outputname' +- progdir=\"\$thisdir/$objdir\" +-" ++ # Prepare the list of exported symbols ++ if test -z "$export_symbols"; then ++ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then ++ func_verbose "generating symbol list for \`$libname.la'" ++ export_symbols="$output_objdir/$libname.exp" ++ $opt_dry_run || $RM $export_symbols ++ cmds=$export_symbols_cmds ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ func_len " $cmd" ++ len=$func_len_result ++ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ func_show_eval "$cmd" 'exit $?' ++ skipped_export=false ++ else ++ # The command line is too long to execute in one step. ++ func_verbose "using reloadable object file for export list..." ++ skipped_export=: ++ # Break out early, otherwise skipped_export may be ++ # set to false by a later but shorter cmd. ++ break ++ fi ++ done ++ IFS="$save_ifs" ++ if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then ++ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' ++ func_show_eval '$MV "${export_symbols}T" "$export_symbols"' ++ fi ++ fi + fi + +- $echo >> $output "\ +- +- if test -f \"\$progdir/\$program\"; then" ++ if test -n "$export_symbols" && test -n "$include_expsyms"; then ++ tmp_export_symbols="$export_symbols" ++ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" ++ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' ++ fi ++ ++ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then ++ # The given exports_symbols file has to be filtered, so filter it. ++ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" ++ # FIXME: $output_objdir/$libname.filter potentially contains lots of ++ # 's' commands which not all seds can handle. GNU sed should be fine ++ # though. Also, the filter scales superlinearly with the number of ++ # global variables. join(1) would be nice here, but unfortunately ++ # isn't a blessed tool. ++ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter ++ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ export_symbols=$output_objdir/$libname.def ++ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols ++ fi + +- # Export our shlibpath_var if we have one. +- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then +- $echo >> $output "\ +- # Add our own library path to $shlibpath_var +- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" ++ tmp_deplibs= ++ for test_deplib in $deplibs; do ++ case " $convenience " in ++ *" $test_deplib "*) ;; ++ *) ++ tmp_deplibs="$tmp_deplibs $test_deplib" ++ ;; ++ esac ++ done ++ deplibs="$tmp_deplibs" + +- # Some systems cannot cope with colon-terminated $shlibpath_var +- # The second colon is a workaround for a bug in BeOS R4 sed +- $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` ++ if test -n "$convenience"; then ++ if test -n "$whole_archive_flag_spec" && ++ test "$compiler_needs_object" = yes && ++ test -z "$libobjs"; then ++ # extract the archives, so we have objects to list. ++ # TODO: could optimize this to just extract one archive. ++ whole_archive_flag_spec= ++ fi ++ if test -n "$whole_archive_flag_spec"; then ++ save_libobjs=$libobjs ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" ++ test "X$libobjs" = "X " && libobjs= ++ else ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" + +- export $shlibpath_var +-" ++ func_extract_archives $gentop $convenience ++ libobjs="$libobjs $func_extract_archives_result" ++ test "X$libobjs" = "X " && libobjs= ++ fi + fi + +- # fixup the dll searchpath if we need to. +- if test -n "$dllsearchpath"; then +- $echo >> $output "\ +- # Add the dll search path components to the executable PATH +- PATH=$dllsearchpath:\$PATH +-" ++ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then ++ eval flag=\"$thread_safe_flag_spec\" ++ linker_flags="$linker_flags $flag" + fi + +- $echo >> $output "\ +- if test \"\$libtool_execute_magic\" != \"$magic\"; then +- # Run the actual program with our arguments. +-" +- case $host in +- # Backslashes separate directories on plain windows +- *-*-mingw | *-*-os2*) +- $echo >> $output "\ +- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +-" +- ;; +- +- *) +- $echo >> $output "\ +- exec \"\$progdir/\$program\" \${1+\"\$@\"} +-" +- ;; +- esac +- $echo >> $output "\ +- \$echo \"\$0: cannot exec \$program \$*\" +- exit $EXIT_FAILURE +- fi +- else +- # The program doesn't exist. +- \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 +- \$echo \"This script is just a wrapper for \$program.\" 1>&2 +- $echo \"See the $PACKAGE documentation for more information.\" 1>&2 +- exit $EXIT_FAILURE +- fi +-fi\ +-" +- chmod +x $output +- fi - exit $EXIT_SUCCESS - ;; - esac -+ $show "$install_prog$stripme $file $destfile" -+ $run eval "$install_prog\$stripme \$file \$destfile" || exit $? -+ test -n "$outputname" && ${rm}r "$tmpdir" -+ ;; -+ esac -+ done - +- - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do -+ for file in $staticlibs; do -+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` ++ # Make a backup of the uninstalled library when relinking ++ if test "$mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? ++ fi - if test "$build_libtool_libs" = convenience; then -- oldobjs="$libobjs_save $symfileobj" +- oldobjs="$libobjs_save" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no -- else ++ # Do each of the archive commands. ++ if test "$module" = yes && test -n "$module_cmds" ; then ++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then ++ eval test_cmds=\"$module_expsym_cmds\" ++ cmds=$module_expsym_cmds ++ else ++ eval test_cmds=\"$module_cmds\" ++ cmds=$module_cmds ++ fi + else - oldobjs="$old_deplibs $non_pic_objects" -- if test "$preload" = yes && test -f "$symfileobj"; then -- oldobjs="$oldobjs $symfileobj" -- fi -- fi ++ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then ++ eval test_cmds=\"$archive_expsym_cmds\" ++ cmds=$archive_expsym_cmds ++ else ++ eval test_cmds=\"$archive_cmds\" ++ cmds=$archive_cmds ++ fi + fi - addlibs="$old_convenience" - fi -+ # Set up the ranlib parameters. -+ oldlib="$destdir/$name" - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" -+ $show "$install_prog $file $oldlib" -+ $run eval "$install_prog \$file \$oldlib" || exit $? ++ if test "X$skipped_export" != "X:" && ++ func_len " $test_cmds" && ++ len=$func_len_result && ++ test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ : ++ else ++ # The command line is too long to link in one step, link piecewise ++ # or, if using GNU ld and skipped_export is not :, use a linker ++ # script. - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" -+ if test -n "$stripme" && test -n "$old_striplib"; then -+ $show "$old_striplib $oldlib" -+ $run eval "$old_striplib $oldlib" || exit $? - fi +- fi ++ # Save the value of $output and $libobjs because we want to ++ # use them later. If we have whole_archive_flag_spec, we ++ # want to use save_libobjs as it was before ++ # whole_archive_flag_spec was expanded, because we can't ++ # assume the linker understands whole_archive_flag_spec. ++ # This may have to be revisited, in case too many ++ # convenience libraries get linked in and end up exceeding ++ # the spec. ++ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then ++ save_libobjs=$libobjs ++ fi ++ save_output=$output ++ output_la=`$ECHO "X$output" | $Xsed -e "$basename"` - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -- cmds=$old_archive_from_new_cmds +- cmds=$old_archive_from_new_cmds - else -+ # Do each command in the postinstall commands. -+ cmds=$old_postinstall_cmds -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" -+ done - -- # Add any objects from preloaded convenience libraries -- if test -n "$dlprefiles"; then -- gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ if test -n "$future_libdirs"; then -+ $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 -+ fi - -- func_extract_archives $gentop $dlprefiles -- oldobjs="$oldobjs $func_extract_archives_result" -- fi -+ if test -n "$current_libdirs"; then -+ # Maybe just do a dry run. -+ test -n "$run" && current_libdirs=" -n$current_libdirs" -+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -+ else -+ exit $EXIT_SUCCESS -+ fi -+ ;; - - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a @@ -119335,23 +82867,160 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs -- do -- func_basename "$obj" -- $ECHO "$func_basename_result" ++ # Clear the reloadable object creation command queue and ++ # initialize k to one. ++ test_cmds= ++ concat_cmds= ++ objlist= ++ last_robj= ++ k=1 ++ ++ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then ++ output=${output_objdir}/${output_la}.lnkscript ++ func_verbose "creating GNU ld script: $output" ++ $ECHO 'INPUT (' > $output ++ for obj in $save_libobjs + do +- $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else -- $ECHO "copying selected object files to avoid basename conflicts..." -- gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -- func_mkdir_p "$gentop" +- $echo "copying selected object files to avoid basename conflicts..." ++ $ECHO "$obj" >> $output ++ done ++ $ECHO ')' >> $output ++ delfiles="$delfiles $output" ++ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then ++ output=${output_objdir}/${output_la}.lnk ++ func_verbose "creating linker input file list: $output" ++ : > $output ++ set x $save_libobjs ++ shift ++ firstobj= ++ if test "$compiler_needs_object" = yes; then ++ firstobj="$1 " ++ shift ++ fi ++ for obj ++ do ++ $ECHO "$obj" >> $output ++ done ++ delfiles="$delfiles $output" ++ output=$firstobj\"$file_list_spec$output\" ++ else ++ if test -n "$save_libobjs"; then ++ func_verbose "creating reloadable object files..." ++ output=$output_objdir/$output_la-${k}.$objext ++ eval test_cmds=\"$reload_cmds\" ++ func_len " $test_cmds" ++ len0=$func_len_result ++ len=$len0 ++ ++ # Loop over the list of objects to be linked. ++ for obj in $save_libobjs ++ do ++ func_len " $obj" ++ func_arith $len + $func_len_result ++ len=$func_arith_result ++ if test "X$objlist" = X || ++ test "$len" -lt "$max_cmd_len"; then ++ func_append objlist " $obj" ++ else ++ # The command $test_cmds is almost too long, add a ++ # command to the queue. ++ if test "$k" -eq 1 ; then ++ # The first file doesn't have a previous command to add. ++ eval concat_cmds=\"$reload_cmds $objlist $last_robj\" ++ else ++ # All subsequent reloadable object files will link in ++ # the last one created. ++ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" ++ fi ++ last_robj=$output_objdir/$output_la-${k}.$objext ++ func_arith $k + 1 ++ k=$func_arith_result ++ output=$output_objdir/$output_la-${k}.$objext ++ objlist=$obj ++ func_len " $last_robj" ++ func_arith $len0 + $func_len_result ++ len=$func_arith_result ++ fi ++ done ++ # Handle the remaining objects by creating one last ++ # reloadable object file. All subsequent reloadable object ++ # files will link in the last one created. ++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ ++ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" ++ if test -n "$last_robj"; then ++ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" ++ fi ++ delfiles="$delfiles $output" + +- if test -z "$gentop"; then +- gentop="$output_objdir/${outputname}x" +- generated="$generated $gentop" ++ else ++ output= ++ fi ++ ++ if ${skipped_export-false}; then ++ func_verbose "generating symbol list for \`$libname.la'" ++ export_symbols="$output_objdir/$libname.exp" ++ $opt_dry_run || $RM $export_symbols ++ libobjs=$output ++ # Append the command to create the export file. ++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ ++ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" ++ if test -n "$last_robj"; then ++ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" ++ fi ++ fi ++ ++ test -n "$save_libobjs" && ++ func_verbose "creating a temporary reloadable object file: $output" ++ ++ # Loop through the commands generated above and execute them. ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $concat_cmds; do ++ IFS="$save_ifs" ++ $opt_silent || { ++ func_quote_for_expand "$cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ $opt_dry_run || eval "$cmd" || { ++ lt_exit=$? ++ ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ ( cd "$output_objdir" && \ ++ $RM "${realname}T" && \ ++ $MV "${realname}U" "$realname" ) ++ fi ++ ++ exit $lt_exit ++ } ++ done ++ IFS="$save_ifs" + +- $show "${rm}r $gentop" +- $run ${rm}r "$gentop" +- $show "$mkdir $gentop" +- $run $mkdir "$gentop" +- exit_status=$? +- if test "$exit_status" -ne 0 && test ! -d "$gentop"; then +- exit $exit_status ++ if test -n "$export_symbols_regex" && ${skipped_export-false}; then ++ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' ++ func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do -- func_basename "$obj" -- objbase="$func_basename_result" +- objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) @@ -119359,201 +83028,195 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase -- func_arith $counter + 1 -- counter=$func_arith_result +- counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done -- func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" +- $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" +- $run ln "$obj" "$gentop/$newobj" || +- $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi -- eval cmds=\"$old_archive_cmds\" -+ # libtool finish mode -+ finish) -+ modename="$modename: finish" -+ libdirs="$nonopt" -+ admincmds= ++ if ${skipped_export-false}; then ++ if test -n "$export_symbols" && test -n "$include_expsyms"; then ++ tmp_export_symbols="$export_symbols" ++ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" ++ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' ++ fi ++ ++ if test -n "$orig_export_symbols"; then ++ # The given exports_symbols file has to be filtered, so filter it. ++ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" ++ # FIXME: $output_objdir/$libname.filter potentially contains lots of ++ # 's' commands which not all seds can handle. GNU sed should be fine ++ # though. Also, the filter scales superlinearly with the number of ++ # global variables. join(1) would be nice here, but unfortunately ++ # isn't a blessed tool. ++ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter ++ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" ++ export_symbols=$output_objdir/$libname.def ++ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols ++ fi ++ fi -- func_len " $cmds" -- len=$func_len_result -- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then +- eval cmds=\"$old_archive_cmds\" ++ libobjs=$output ++ # Restore the value of output. ++ output=$save_output + +- if len=`expr "X$cmds" : ".*"` && +- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts -- func_verbose "using piecewise archive linking..." +- $echo "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs -- oldobjs= ++ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then ++ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" ++ test "X$libobjs" = "X " && libobjs= ++ fi ++ # Expand the library linking commands again to reset the ++ # value of $libobjs for piecewise linking. + - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done -- eval test_cmds=\"$old_archive_cmds\" -- func_len " $test_cmds" -- len0=$func_len_result -- len=$len0 - for obj in $save_oldobjs - do -- func_len " $obj" -- func_arith $len + $func_len_result -- len=$func_arith_result -- func_append objlist " $obj" -- if test "$len" -lt "$max_cmd_len"; then +- oldobjs="$objlist $obj" +- objlist="$objlist $obj" +- eval test_cmds=\"$old_archive_cmds\" +- if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && +- test "$len" -le "$max_cmd_len"; then - : -- else ++ # Do each of the archive commands. ++ if test "$module" = yes && test -n "$module_cmds" ; then ++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then ++ cmds=$module_expsym_cmds + else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then -- RANLIB=$save_RANLIB +- RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= -- len=$len0 -- fi -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ for dir -+ do -+ libdirs="$libdirs $dir" -+ done -+ -+ for libdir in $libdirs; do -+ if test -n "$finish_cmds"; then -+ # Do each command in the finish commands. -+ cmds=$finish_cmds -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $show "$cmd" -+ $run eval "$cmd" || admincmds="$admincmds -+ $cmd" - done ++ cmds=$module_cmds + fi +- done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" -- else + else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" -- fi -+ IFS="$save_ifs" ++ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then ++ cmds=$archive_expsym_cmds ++ else ++ cmds=$archive_cmds ++ fi + fi fi - fi -- func_execute_cmds "$cmds" 'exit $?' -+ if test -n "$finish_eval"; then -+ # Do the single finish_eval. -+ eval cmds=\"$finish_eval\" -+ $run eval "$cmds" || admincmds="$admincmds -+ $cmds" -+ fi -+ done -+ fi -+ -+ # Exit here if they wanted silent mode. -+ test "$show" = : && exit $EXIT_SUCCESS -+ -+ $echo "X----------------------------------------------------------------------" | $Xsed -+ $echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $echo " $libdir" - done -+ $echo -+ $echo "If you ever happen to want to link against installed libraries" -+ $echo "in a given directory, LIBDIR, you must either use libtool, and" -+ $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ $echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ $echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ $echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ $echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- eval cmd=\"$cmd\" +- IFS="$save_ifs" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" +- done -- test -n "$generated" && \ -- func_show_eval "${RM}r$generated" -+ $echo " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $echo " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ $echo -+ $echo "See any operating system documentation about shared libraries for" -+ $echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ $echo "X----------------------------------------------------------------------" | $Xsed -+ exit $EXIT_SUCCESS -+ ;; +- if test -n "$generated"; then +- $show "${rm}r$generated" +- $run ${rm}r$generated +- fi ++ if test -n "$delfiles"; then ++ # Append the command to remove temporary files to $cmds. ++ eval cmds=\"\$cmds~\$RM $delfiles\" ++ fi - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -- func_verbose "creating $output" -+ # libtool execute mode -+ execute) -+ modename="$modename: execute" +- $show "creating $output" ++ # Add any objects from preloaded convenience libraries ++ if test -n "$dlprefiles"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then -- relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" +- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else -- func_quote_for_eval "$var_value" -- relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" -- fi +- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` +- relink_command="$var=\"$var_value\"; export $var; $relink_command" ++ func_extract_archives $gentop $dlprefiles ++ libobjs="$libobjs $func_extract_archives_result" ++ test "X$libobjs" = "X " && libobjs= + fi - 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 -+ # The first argument is the command name. -+ cmd="$nonopt" -+ if test -z "$cmd"; then -+ $echo "$modename: you must specify a COMMAND" 1>&2 -+ $echo "$help" -+ exit $EXIT_FAILURE -+ fi + ++ save_ifs="$IFS"; IFS='~' ++ for cmd in $cmds; do ++ IFS="$save_ifs" ++ eval cmd=\"$cmd\" ++ $opt_silent || { ++ func_quote_for_expand "$cmd" ++ eval "func_echo $func_quote_for_expand_result" ++ } ++ $opt_dry_run || eval "$cmd" || { ++ lt_exit=$? - # Only create the output if not a dry run. -- $opt_dry_run || { +- if test -z "$run"; then - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break -- fi ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ ( cd "$output_objdir" && \ ++ $RM "${realname}T" && \ ++ $MV "${realname}U" "$realname" ) + fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) -- func_basename "$deplib" -- name="$func_basename_result" +- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -- test -z "$libdir" && \ -- func_fatal_error "\`$deplib' is not a valid libtool archive" +- if test -z "$libdir"; then +- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 +- exit $EXIT_FAILURE +- fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; @@ -119561,44 +83224,25 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - done - dependency_libs="$newdependency_libs" - newdlfiles= -+ # Handle -dlopen flags immediately. -+ for file in $execute_dlfiles; do -+ if test ! -f "$file"; then -+ $echo "$modename: \`$file' is not a file" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - - for lib in $dlfiles; do -- case $lib in -- *.la) -- func_basename "$lib" -- name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -- test -z "$libdir" && \ -- func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlfiles="$newdlfiles $libdir/$name" -- ;; -- *) newdlfiles="$newdlfiles $lib" ;; -- esac +- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` +- if test -z "$libdir"; then +- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit $EXIT_FAILURE +- fi +- newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do -- case $lib in -- *.la) -- # Only pass preopened files to the pseudo-archive (for -- # eventual linking with the app. that links it) if we -- # didn't already link the preopened objects directly into -- # the library: -- func_basename "$lib" -- name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -- test -z "$libdir" && \ -- func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlprefiles="$newdlprefiles $libdir/$name" -- ;; -- esac +- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` +- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` +- if test -z "$libdir"; then +- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- exit $EXIT_FAILURE +- fi +- newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" - else @@ -119621,634 +83265,1971 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/ltmain.sh gtk+2. - done - dlprefiles="$newdlprefiles" - fi -- $RM $output +- $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; +- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac -- $ECHO > $output "\ +- $echo > $output "\ -# $outputname - a libtool library file --# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# Please DO NOT delete this file! -# It is necessary for linking the library. -+ dir= -+ case $file in -+ *.la) -+ # Check to see that this really is a libtool archive. -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ else -+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi -# The name that we can dlopen(3). -dlname='$tdlname' -+ # Read the libtool library. -+ dlname= -+ library_names= ++ exit $lt_exit ++ } ++ done ++ IFS="$save_ifs" -# Names of this library. -library_names='$library_names' -+ # If there is no directory component, then add one. -+ case $file in -+ */* | *\\*) . $file ;; -+ *) . ./$file ;; -+ esac ++ # Restore the uninstalled library and exit ++ if test "$mode" = relink; then ++ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? -# The name of the static archive. -old_library='$old_library' -+ # Skip this library if it cannot be dlopened. -+ if test -z "$dlname"; then -+ # Warn if it was a shared library. -+ test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" -+ continue -+ fi - --# Linker flags that can not go in dependency_libs. --inherited_linker_flags='$new_inherited_linker_flags' -+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$dir" = "X$file" && dir=. ++ if test -n "$convenience"; then ++ if test -z "$whole_archive_flag_spec"; then ++ func_show_eval '${RM}r "$gentop"' ++ fi ++ fi -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' -+ if test -f "$dir/$objdir/$dlname"; then -+ dir="$dir/$objdir" -+ else -+ if test ! -f "$dir/$dlname"; then -+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 -+ exit $EXIT_FAILURE -+ fi ++ exit $EXIT_SUCCESS + fi -+ ;; - --# Names of additional weak libraries provided by this library --weak_library_names='$weak_libs' -+ *.lo) -+ # Just add the directory containing the .lo file. -+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -+ test "X$dir" = "X$file" && dir=. -+ ;; -# Version information for $libname. -current=$current -age=$age -revision=$revision -+ *) -+ $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 -+ continue -+ ;; -+ esac ++ # Create links to the real library. ++ for linkname in $linknames; do ++ if test "$realname" != "$linkname"; then ++ func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' ++ fi ++ done -# Is this an already installed library? -installed=$installed -+ # Get the absolute pathname. -+ absdir=`cd "$dir" && pwd` -+ test -n "$absdir" && dir="$absdir" ++ # If -module or -export-dynamic was specified, set the dlname. ++ if test "$module" = yes || test "$export_dynamic" = yes; then ++ # On all known operating systems, these are identical. ++ dlname="$soname" ++ fi ++ fi ++ ;; -# Should we warn about portability when linking against -modules? -shouldnotlink=$module -+ # Now add the directory to shlibpath_var. -+ if eval "test -z \"\$$shlibpath_var\""; then -+ eval "$shlibpath_var=\"\$dir\"" -+ else -+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" ++ obj) ++ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then ++ func_warning "\`-dlopen' is ignored for objects" + fi -+ done -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' -+ # This variable tells wrapper scripts just to set shlibpath_var -+ # rather than running their programs. -+ libtool_execute_magic="$magic" ++ case " $deplibs" in ++ *\ -l* | *\ -L*) ++ func_warning "\`-l' and \`-L' are ignored for objects" ;; ++ esac -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then -- $ECHO >> $output "\ +- $echo >> $output "\ -relink_command=\"$relink_command\"" - fi - done -- } -+ # Check if any of the arguments is a wrapper script. -+ args= -+ for file -+ do -+ case $file in -+ -*) ;; -+ *) -+ # Do a test to see if this is really a libtool program. -+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ # If there is no directory component, then add one. -+ case $file in -+ */* | *\\*) . $file ;; -+ *) . ./$file ;; -+ esac +- fi ++ test -n "$rpath" && \ ++ func_warning "\`-rpath' is ignored for objects" - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. -- func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' +- $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" +- $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac - exit $EXIT_SUCCESS --} -+ # Transform arg to wrapped name. -+ file="$progdir/$program" +- ;; ++ test -n "$xrpath" && \ ++ func_warning "\`-R' is ignored for objects" + +- # libtool install mode +- install) +- modename="$modename: install" ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info' is ignored for objects" + +- # There may be an optional sh(1) argument at the beginning of +- # install_prog (especially on Windows NT). +- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || +- # Allow the use of GNU shtool's install command. +- $echo "X$nonopt" | grep shtool > /dev/null; then +- # Aesthetically quote it. +- arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for objects" ++ ++ case $output in ++ *.lo) ++ test -n "$objs$old_deplibs" && \ ++ func_fatal_error "cannot build library object \`$output' from non-libtool objects" ++ ++ libobj=$output ++ func_lo2o "$libobj" ++ obj=$func_lo2o_result ++ ;; ++ *) ++ libobj= ++ obj="$output" + ;; + esac +- install_prog="$arg " +- arg="$1" +- shift +- else +- install_prog= +- arg=$nonopt +- fi + +- # The real first argument should be the name of the installation program. +- # Aesthetically quote it. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac +- install_prog="$install_prog$arg" ++ # Delete the old objects. ++ $opt_dry_run || $RM $obj $libobj + +- # We need to accept at least all the BSD install flags. +- dest= +- files= +- opts= +- prev= +- install_type= +- isdir=no +- stripme= +- for arg +- do +- if test -n "$dest"; then +- files="$files $dest" +- dest=$arg +- continue +- fi ++ # Objects from convenience libraries. This assumes ++ # single-version convenience libraries. Whenever we create ++ # different ones for PIC/non-PIC, this we'll have to duplicate ++ # the extraction. ++ reload_conv_objs= ++ gentop= ++ # reload_cmds runs $LD directly, so let us get rid of ++ # -Wl from whole_archive_flag_spec and hope we can get by with ++ # turning comma into space.. ++ wl= + +- case $arg in +- -d) isdir=yes ;; +- -f) +- case " $install_prog " in +- *[\\\ /]cp\ *) ;; +- *) prev=$arg ;; +- esac +- ;; +- -g | -m | -o) prev=$arg ;; +- -s) +- stripme=" -s" +- continue +- ;; +- -*) +- ;; +- *) +- # If the previous option needed an argument, then skip it. +- if test -n "$prev"; then +- prev= ++ if test -n "$convenience"; then ++ if test -n "$whole_archive_flag_spec"; then ++ 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 +- dest=$arg +- continue ++ gentop="$output_objdir/${obj}x" ++ generated="$generated $gentop" ++ ++ func_extract_archives $gentop $convenience ++ reload_conv_objs="$reload_objs $func_extract_archives_result" + fi +- ;; +- esac ++ fi + +- # Aesthetically quote the argument. +- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` +- case $arg in +- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") +- arg="\"$arg\"" +- ;; +- esac +- install_prog="$install_prog $arg" +- done ++ # Create the old-style object. ++ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + +- if test -z "$install_prog"; then +- $echo "$modename: you must specify an install program" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- fi ++ output="$obj" ++ func_execute_cmds "$reload_cmds" 'exit $?' + +- if test -n "$prev"; then +- $echo "$modename: the \`$prev' option requires an argument" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- fi ++ # Exit if we aren't doing a library object file. ++ if test -z "$libobj"; then ++ if test -n "$gentop"; then ++ func_show_eval '${RM}r "$gentop"' + fi + +- if test -z "$files"; then +- if test -z "$dest"; then +- $echo "$modename: no file or destination specified" 1>&2 +- else +- $echo "$modename: you must specify a destination" 1>&2 ++ exit $EXIT_SUCCESS + fi +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- fi + +- # Strip any trailing slash from the destination. +- dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` ++ if test "$build_libtool_libs" != yes; then ++ if test -n "$gentop"; then ++ func_show_eval '${RM}r "$gentop"' ++ fi + +- # Check to see that the destination is a directory. +- test -d "$dest" && isdir=yes +- if test "$isdir" = yes; then +- destdir="$dest" +- destname= +- else +- destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` +- test "X$destdir" = "X$dest" && destdir=. +- destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` ++ # Create an invalid libtool object if no PIC, so that we don't ++ # accidentally link it into a program. ++ # $show "echo timestamp > $libobj" ++ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? ++ exit $EXIT_SUCCESS ++ fi + +- # Not a directory, so check to see that there is only one file specified. +- set dummy $files +- if test "$#" -gt 2; then +- $echo "$modename: \`$dest' is not a directory" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE ++ if test -n "$pic_flag" || test "$pic_mode" != default; then ++ # Only do commands if we really have different PIC objects. ++ reload_objs="$libobjs $reload_conv_objs" ++ output="$libobj" ++ func_execute_cmds "$reload_cmds" 'exit $?' + fi +- fi +- case $destdir in +- [\\/]* | [A-Za-z]:[\\/]*) ;; +- *) +- for file in $files; do +- case $file in +- *.lo) ;; +- *) +- $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- ;; +- esac +- done ++ ++ if test -n "$gentop"; then ++ func_show_eval '${RM}r "$gentop"' ++ fi ++ ++ exit $EXIT_SUCCESS + ;; +- esac + +- # This variable tells wrapper scripts just to set variables rather +- # than running their programs. +- libtool_install_magic="$magic" ++ prog) ++ case $host in ++ *cygwin*) func_stripname '' '.exe' "$output" ++ output=$func_stripname_result.exe;; ++ esac ++ test -n "$vinfo" && \ ++ func_warning "\`-version-info' is ignored for programs" + +- staticlibs= +- future_libdirs= +- current_libdirs= +- for file in $files; do ++ test -n "$release" && \ ++ func_warning "\`-release' is ignored for programs" + +- # Do each installation. +- case $file in +- *.$libext) +- # Do the static libraries later. +- staticlibs="$staticlibs $file" ++ test "$preload" = yes \ ++ && test "$dlopen_support" = unknown \ ++ && test "$dlopen_self" = unknown \ ++ && test "$dlopen_self_static" = unknown && \ ++ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." ++ ++ case $host in ++ *-*-rhapsody* | *-*-darwin1.[012]) ++ # On Rhapsody replace the C library is the System framework ++ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + ;; ++ esac + +- *.la) +- # Check to see that this really is a libtool archive. +- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : +- else +- $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE ++ case $host in ++ *-*-darwin*) ++ # Don't allow lazy linking, it breaks C++ global constructors ++ # But is supposedly fixed on 10.4 or later (yay!). ++ if test "$tagname" = CXX ; then ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in ++ 10.[0123]) ++ compile_command="$compile_command ${wl}-bind_at_load" ++ finalize_command="$finalize_command ${wl}-bind_at_load" ++ ;; ++ esac + fi ++ # Time to change all our "foo.ltframework" stuff back to "-framework foo" ++ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ++ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac -+ # Quote arguments (to preserve shell metacharacters). -+ file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` -+ args="$args \"$file\"" -+ done -+ -+ if test -z "$run"; then -+ if test -n "$shlibpath_var"; then -+ # Export the shlibpath_var. -+ eval "export $shlibpath_var" -+ fi --{ test "$mode" = link || test "$mode" = relink; } && -- func_mode_link ${1+"$@"} -+ # Restore saved environment variables -+ for lt_var in LANG LANGUAGE 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" +- library_names= +- old_library= +- relink_command= +- # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . $file ;; +- *) . ./$file ;; +- esac + +- # Add the libdir to current_libdirs if it is the destination. +- if test "X$destdir" = "X$libdir"; then +- case "$current_libdirs " in +- *" $libdir "*) ;; +- *) current_libdirs="$current_libdirs $libdir" ;; ++ # move library search paths that coincide with paths to not yet ++ # installed libraries to the beginning of the library search list ++ new_libs= ++ for path in $notinst_path; do ++ case " $new_libs " in ++ *" -L$path/$objdir "*) ;; ++ *) ++ case " $compile_deplibs " in ++ *" -L$path/$objdir "*) ++ new_libs="$new_libs -L$path/$objdir" ;; + esac +- else +- # Note the libdir as a future libdir. +- case "$future_libdirs " in +- *" $libdir "*) ;; +- *) future_libdirs="$future_libdirs $libdir" ;; ++ ;; ++ esac + done ++ for deplib in $compile_deplibs; do ++ case $deplib in ++ -L*) ++ case " $new_libs " in ++ *" $deplib "*) ;; ++ *) new_libs="$new_libs $deplib" ;; + esac +- fi ++ ;; ++ *) new_libs="$new_libs $deplib" ;; ++ esac ++ done ++ compile_deplibs="$new_libs" -+ # Now prepare to actually exec the command. -+ exec_cmd="\$cmd$args" -+ else -+ # Display what would be done. -+ if test -n "$shlibpath_var"; then -+ eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" -+ $echo "export $shlibpath_var" +- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ +- test "X$dir" = "X$file/" && dir= +- dir="$dir$objdir" + +- if test -n "$relink_command"; then +- # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` ++ compile_command="$compile_command $compile_deplibs" ++ finalize_command="$finalize_command $finalize_deplibs" + +- # Don't allow the user to place us outside of our expected +- # location b/c this prevents finding dependent libraries that +- # are installed to the same prefix. +- # At present, this check doesn't affect windows .dll's that +- # are installed into $libdir/../bin (currently, that works fine) +- # but it's something to keep an eye on. +- if test "$inst_prefix_dir" = "$destdir"; then +- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 +- exit $EXIT_FAILURE +- fi ++ if test -n "$rpath$xrpath"; then ++ # If the user specified any rpath flags, then add them. ++ for libdir in $rpath $xrpath; do ++ # This is the magic to use -rpath. ++ case "$finalize_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_rpath="$finalize_rpath $libdir" ;; ++ esac ++ done + fi -+ $echo "$cmd$args" -+ exit $EXIT_SUCCESS -+ fi -+ ;; --# func_mode_uninstall arg... --func_mode_uninstall () --{ -- $opt_debug -- RM="$nonopt" -+ # libtool clean and uninstall mode -+ clean | uninstall) -+ modename="$modename: $mode" -+ rm="$nonopt" +- if test -n "$inst_prefix_dir"; then +- # Stick the inst_prefix_dir data into the link command. +- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` ++ # Now hardcode the library paths ++ rpath= ++ hardcode_libdirs= ++ for libdir in $compile_rpath $finalize_rpath; do ++ if test -n "$hardcode_libdir_flag_spec"; then ++ if test -n "$hardcode_libdir_separator"; then ++ if test -z "$hardcode_libdirs"; then ++ hardcode_libdirs="$libdir" ++ else ++ # Just accumulate the unique libdirs. ++ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in ++ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ++ ;; ++ *) ++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ ;; ++ esac ++ fi + else +- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ rpath="$rpath $flag" + fi ++ elif test -n "$runpath_var"; then ++ case "$perm_rpath " in ++ *" $libdir "*) ;; ++ *) perm_rpath="$perm_rpath $libdir" ;; ++ esac ++ fi ++ case $host in ++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) ++ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` ++ case :$dllsearchpath: in ++ *":$libdir:"*) ;; ++ ::) dllsearchpath=$libdir;; ++ *) dllsearchpath="$dllsearchpath:$libdir";; ++ esac ++ case :$dllsearchpath: in ++ *":$testbindir:"*) ;; ++ ::) dllsearchpath=$testbindir;; ++ *) dllsearchpath="$dllsearchpath:$testbindir";; ++ esac ++ ;; ++ esac ++ done ++ # Substitute the hardcoded libdirs into the rpath. ++ if test -n "$hardcode_libdir_separator" && ++ test -n "$hardcode_libdirs"; then ++ libdir="$hardcode_libdirs" ++ eval rpath=\" $hardcode_libdir_flag_spec\" ++ fi ++ compile_rpath="$rpath" + +- $echo "$modename: warning: relinking \`$file'" 1>&2 +- $show "$relink_command" +- if $run eval "$relink_command"; then : ++ rpath= ++ hardcode_libdirs= ++ for libdir in $finalize_rpath; do ++ if test -n "$hardcode_libdir_flag_spec"; then ++ if test -n "$hardcode_libdir_separator"; then ++ if test -z "$hardcode_libdirs"; then ++ hardcode_libdirs="$libdir" ++ else ++ # Just accumulate the unique libdirs. ++ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in ++ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ++ ;; ++ *) ++ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ++ ;; ++ esac ++ fi + else +- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 +- exit $EXIT_FAILURE ++ eval flag=\"$hardcode_libdir_flag_spec\" ++ rpath="$rpath $flag" + fi ++ elif test -n "$runpath_var"; then ++ case "$finalize_perm_rpath " in ++ *" $libdir "*) ;; ++ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; ++ esac + fi ++ done ++ # Substitute the hardcoded libdirs into the rpath. ++ if test -n "$hardcode_libdir_separator" && ++ test -n "$hardcode_libdirs"; then ++ libdir="$hardcode_libdirs" ++ eval rpath=\" $hardcode_libdir_flag_spec\" ++ fi ++ finalize_rpath="$rpath" + +- # See the names of the shared library. +- set dummy $library_names +- if test -n "$2"; then +- realname="$2" +- shift +- shift ++ if test -n "$libobjs" && test "$build_old_libs" = yes; then ++ # Transform all the library objects into standard objects. ++ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` ++ fi + +- srcname="$realname" +- test -n "$relink_command" && srcname="$realname"T ++ func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + +- # Install the shared library and build the symlinks. +- $show "$install_prog $dir/$srcname $destdir/$realname" +- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? +- if test -n "$stripme" && test -n "$striplib"; then +- $show "$striplib $destdir/$realname" +- $run eval "$striplib $destdir/$realname" || exit $? +- fi ++ # template prelinking step ++ if test -n "$prelink_cmds"; then ++ func_execute_cmds "$prelink_cmds" 'exit $?' ++ fi + +- if test "$#" -gt 0; then +- # Delete the old symlinks, and create new ones. +- # Try `ln -sf' first, because the `ln' binary might depend on +- # the symlink we replace! Solaris /bin/ln does not understand -f, +- # so we also need to try rm && ln -s. +- for linkname +- do +- if test "$linkname" != "$realname"; then +- $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" +- $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" +- fi +- done +- fi ++ wrappers_required=yes ++ case $host in ++ *cygwin* | *mingw* ) ++ if test "$build_libtool_libs" != yes; then ++ wrappers_required=no ++ fi ++ ;; ++ *cegcc) ++ # Disable wrappers for cegcc, we are cross compiling anyway. ++ wrappers_required=no ++ ;; ++ *) ++ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then ++ wrappers_required=no ++ fi ++ ;; ++ esac ++ if test "$wrappers_required" = no; then ++ # Replace the output file specification. ++ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` ++ link_command="$compile_command$compile_rpath" + +- # Do each command in the postinstall commands. +- lib="$destdir/$realname" +- cmds=$postinstall_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || { +- lt_exit=$? +- +- # Restore the uninstalled library and exit +- if test "$mode" = relink; then +- $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' +- fi ++ # We have no uninstalled library dependencies, so finalize right now. ++ exit_status=0 ++ func_show_eval "$link_command" 'exit_status=$?' + +- exit $lt_exit +- } +- done +- IFS="$save_ifs" ++ # Delete the generated files. ++ if test -f "$output_objdir/${outputname}S.${objext}"; then ++ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + fi + +- # Install the pseudo-library for information purposes. +- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` +- instname="$dir/$name"i +- $show "$install_prog $instname $destdir/$name" +- $run eval "$install_prog $instname $destdir/$name" || exit $? +- +- # Maybe install the static library, too. +- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" +- ;; ++ exit $exit_status ++ fi + +- *.lo) +- # Install (i.e. copy) a libtool object. ++ if test -n "$compile_shlibpath$finalize_shlibpath"; then ++ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" ++ fi ++ if test -n "$finalize_shlibpath"; then ++ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" ++ fi + +- # Figure out destination file name, if it wasn't already specified. +- if test -n "$destname"; then +- destfile="$destdir/$destname" +- else +- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` +- destfile="$destdir/$destfile" ++ compile_var= ++ finalize_var= ++ if test -n "$runpath_var"; then ++ if test -n "$perm_rpath"; then ++ # We should set the runpath_var. ++ rpath= ++ for dir in $perm_rpath; do ++ rpath="$rpath$dir:" ++ done ++ compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi +- +- # Deduce the name of the destination old-style object file. +- case $destfile in +- *.lo) +- staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` +- ;; +- *.$objext) +- staticdest="$destfile" +- destfile= +- ;; +- *) +- $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- ;; +- esac +- +- # Install the libtool object if requested. +- if test -n "$destfile"; then +- $show "$install_prog $file $destfile" +- $run eval "$install_prog $file $destfile" || exit $? ++ if test -n "$finalize_perm_rpath"; then ++ # We should set the runpath_var. ++ rpath= ++ for dir in $finalize_perm_rpath; do ++ rpath="$rpath$dir:" ++ done ++ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi ++ fi + +- # Install the old object if enabled. +- if test "$build_old_libs" = yes; then +- # Deduce the name of the old-style object file. +- staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` +- +- $show "$install_prog $staticobj $staticdest" +- $run eval "$install_prog \$staticobj \$staticdest" || exit $? +- fi ++ if test "$no_install" = yes; then ++ # We don't need to create a wrapper script. ++ link_command="$compile_var$compile_command$compile_rpath" ++ # Replace the output file specification. ++ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` ++ # Delete the old output file. ++ $opt_dry_run || $RM $output ++ # Link the executable and exit ++ func_show_eval "$link_command" 'exit $?' + exit $EXIT_SUCCESS +- ;; ++ fi + +- *) +- # Figure out destination file name, if it wasn't already specified. +- if test -n "$destname"; then +- destfile="$destdir/$destname" ++ if test "$hardcode_action" = relink; then ++ # Fast installation is not supported ++ link_command="$compile_var$compile_command$compile_rpath" ++ relink_command="$finalize_var$finalize_command$finalize_rpath" ++ ++ func_warning "this platform does not like uninstalled shared libraries" ++ func_warning "\`$output' will be relinked during installation" ++ else ++ 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'` ++ else ++ # fast_install is set to needless ++ relink_command= ++ fi + else +- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` +- destfile="$destdir/$destfile" ++ link_command="$compile_var$compile_command$compile_rpath" ++ relink_command="$finalize_var$finalize_command$finalize_rpath" + fi ++ fi + +- # If the file is missing, and there is a .exe on the end, strip it +- # because it is most likely a libtool script we actually want to +- # install +- stripped_ext="" +- case $file in +- *.exe) +- if test ! -f "$file"; then +- file=`$echo $file|${SED} 's,.exe$,,'` +- stripped_ext=".exe" +- fi +- ;; +- esac +- +- # Do a test to see if this is really a libtool program. +- case $host in +- *cygwin*|*mingw*) +- wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` +- ;; +- *) +- wrapper=$file +- ;; +- esac +- if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then +- notinst_deplibs= +- relink_command= +- +- # Note that it is not necessary on cygwin/mingw to append a dot to +- # foo even if both foo and FILE.exe exist: automatic-append-.exe +- # behavior happens only for exec(3), not for open(2)! Also, sourcing +- # `FILE.' does not work on cygwin managed mounts. +- # +- # If there is no directory component, then add one. +- case $wrapper in +- */* | *\\*) . ${wrapper} ;; +- *) . ./${wrapper} ;; +- esac +- +- # Check the variables that should have been set. +- if test -z "$notinst_deplibs"; then +- $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 +- exit $EXIT_FAILURE +- fi ++ # Replace the output file specification. ++ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + +- finalize=yes +- for lib in $notinst_deplibs; do +- # Check to see that each library is installed. +- libdir= +- if test -f "$lib"; then +- # If there is no directory component, then add one. +- case $lib in +- */* | *\\*) . $lib ;; +- *) . ./$lib ;; +- esac +- fi +- libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test +- if test -n "$libdir" && test ! -f "$libfile"; then +- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 +- finalize=no +- fi +- done ++ # Delete the old output files. ++ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname + +- relink_command= +- # Note that it is not necessary on cygwin/mingw to append a dot to +- # foo even if both foo and FILE.exe exist: automatic-append-.exe +- # behavior happens only for exec(3), not for open(2)! Also, sourcing +- # `FILE.' does not work on cygwin managed mounts. +- # +- # If there is no directory component, then add one. +- case $wrapper in +- */* | *\\*) . ${wrapper} ;; +- *) . ./${wrapper} ;; +- esac ++ func_show_eval "$link_command" 'exit $?' + +- outputname= +- if test "$fast_install" = no && test -n "$relink_command"; then +- if test "$finalize" = yes && test -z "$run"; then +- tmpdir=`func_mktempdir` +- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` +- outputname="$tmpdir/$file" +- # Replace the output file specification. +- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` ++ # Now create the wrapper script. ++ func_verbose "creating $output" + +- $show "$relink_command" +- if $run eval "$relink_command"; then : +- else +- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 +- ${rm}r "$tmpdir" +- continue +- fi +- file="$outputname" +- else +- $echo "$modename: warning: cannot relink \`$file'" 1>&2 +- fi ++ # Quote the relink command for shipping. ++ if test -n "$relink_command"; then ++ # Preserve any variables that may affect compiler behavior ++ for var in $variables_saved_for_relink; do ++ if eval test -z \"\${$var+set}\"; then ++ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" ++ elif eval var_value=\$$var; test -z "$var_value"; then ++ relink_command="$var=; export $var; $relink_command" + else +- # Install the binary that we compiled earlier. +- file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` ++ func_quote_for_eval "$var_value" ++ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi +- fi ++ done ++ relink_command="(cd `pwd`; $relink_command)" ++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` ++ fi + +- # remove .exe since cygwin /usr/bin/install will append another +- # one anyway +- case $install_prog,$host in +- */usr/bin/install*,*cygwin*) +- case $file:$destfile in +- *.exe:*.exe) +- # this is ok +- ;; +- *.exe:*) +- destfile=$destfile.exe +- ;; +- *:*.exe) +- destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` +- ;; +- esac +- ;; ++ # Quote $ECHO for shipping. ++ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then ++ case $progpath in ++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; ++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; ++ esac ++ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` ++ else ++ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` ++ fi ++ ++ # Only actually do things if not in dry run mode. ++ $opt_dry_run || { ++ # win32 will think the script is a binary if it has ++ # a .exe suffix, so we strip it off here. ++ case $output in ++ *.exe) func_stripname '' '.exe' "$output" ++ output=$func_stripname_result ;; ++ esac ++ # test for cygwin because mv fails w/o .exe extensions ++ case $host in ++ *cygwin*) ++ exeext=.exe ++ func_stripname '' '.exe' "$outputname" ++ outputname=$func_stripname_result ;; ++ *) exeext= ;; + esac +- $show "$install_prog$stripme $file $destfile" +- $run eval "$install_prog\$stripme \$file \$destfile" || exit $? +- test -n "$outputname" && ${rm}r "$tmpdir" +- ;; +- esac +- done ++ case $host in ++ *cygwin* | *mingw* ) ++ func_dirname_and_basename "$output" "" "." ++ output_name=$func_basename_result ++ output_path=$func_dirname_result ++ cwrappersource="$output_path/$objdir/lt-$output_name.c" ++ cwrapper="$output_path/$output_name.exe" ++ $RM $cwrappersource $cwrapper ++ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 ++ ++ func_emit_cwrapperexe_src > $cwrappersource ++ ++ # The wrapper executable is built using the $host compiler, ++ # because it contains $host paths and files. If cross- ++ # compiling, it, like the target executable, must be ++ # executed on the $host or under an emulation environment. ++ $opt_dry_run || { ++ $LTCC $LTCFLAGS -o $cwrapper $cwrappersource ++ $STRIP $cwrapper ++ } + +- for file in $staticlibs; do +- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` ++ # Now, create the wrapper script for func_source use: ++ func_ltwrapper_scriptname $cwrapper ++ $RM $func_ltwrapper_scriptname_result ++ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 ++ $opt_dry_run || { ++ # note: this script will not be executed, so do not chmod. ++ if test "x$build" = "x$host" ; then ++ $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result ++ else ++ func_emit_wrapper no > $func_ltwrapper_scriptname_result ++ fi ++ } ++ ;; ++ * ) ++ $RM $output ++ trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 + +- # Set up the ranlib parameters. +- oldlib="$destdir/$name" ++ func_emit_wrapper no > $output ++ chmod +x $output ++ ;; ++ esac ++ } ++ exit $EXIT_SUCCESS ++ ;; ++ esac + +- $show "$install_prog $file $oldlib" +- $run eval "$install_prog \$file \$oldlib" || exit $? ++ # See if we need to build an old-fashioned archive. ++ for oldlib in $oldlibs; do + +- if test -n "$stripme" && test -n "$old_striplib"; then +- $show "$old_striplib $oldlib" +- $run eval "$old_striplib $oldlib" || exit $? ++ if test "$build_libtool_libs" = convenience; then ++ oldobjs="$libobjs_save $symfileobj" ++ addlibs="$convenience" ++ build_libtool_libs=no ++ else ++ if test "$build_libtool_libs" = module; then ++ oldobjs="$libobjs_save" ++ build_libtool_libs=no ++ else ++ oldobjs="$old_deplibs $non_pic_objects" ++ if test "$preload" = yes && test -f "$symfileobj"; then ++ oldobjs="$oldobjs $symfileobj" ++ fi ++ fi ++ addlibs="$old_convenience" + fi + +- # Do each command in the postinstall commands. +- cmds=$old_postinstall_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || exit $? +- done +- IFS="$save_ifs" +- done ++ if test -n "$addlibs"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" + +- if test -n "$future_libdirs"; then +- $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 +- fi ++ func_extract_archives $gentop $addlibs ++ oldobjs="$oldobjs $func_extract_archives_result" ++ fi + +- if test -n "$current_libdirs"; then +- # Maybe just do a dry run. +- test -n "$run" && current_libdirs=" -n$current_libdirs" +- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' +- else +- exit $EXIT_SUCCESS +- fi +- ;; ++ # Do each command in the archive commands. ++ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then ++ cmds=$old_archive_from_new_cmds ++ else + +- # libtool finish mode +- finish) +- modename="$modename: finish" +- libdirs="$nonopt" +- admincmds= ++ # Add any objects from preloaded convenience libraries ++ if test -n "$dlprefiles"; then ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" + +- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then +- for dir +- do +- libdirs="$libdirs $dir" +- done ++ func_extract_archives $gentop $dlprefiles ++ oldobjs="$oldobjs $func_extract_archives_result" ++ fi + +- for libdir in $libdirs; do +- if test -n "$finish_cmds"; then +- # Do each command in the finish commands. +- cmds=$finish_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" || admincmds="$admincmds +- $cmd" ++ # POSIX demands no paths to be encoded in archives. We have ++ # to avoid creating archives with duplicate basenames if we ++ # might have to extract them afterwards, e.g., when creating a ++ # static archive out of a convenience library, or when linking ++ # the entirety of a libtool archive into another (currently ++ # not supported by libtool). ++ if (for obj in $oldobjs ++ do ++ func_basename "$obj" ++ $ECHO "$func_basename_result" ++ done | sort | sort -uc >/dev/null 2>&1); then ++ : ++ else ++ $ECHO "copying selected object files to avoid basename conflicts..." ++ gentop="$output_objdir/${outputname}x" ++ generated="$generated $gentop" ++ func_mkdir_p "$gentop" ++ save_oldobjs=$oldobjs ++ oldobjs= ++ counter=1 ++ for obj in $save_oldobjs ++ do ++ func_basename "$obj" ++ objbase="$func_basename_result" ++ case " $oldobjs " in ++ " ") oldobjs=$obj ;; ++ *[\ /]"$objbase "*) ++ while :; do ++ # Make sure we don't pick an alternate name that also ++ # overlaps. ++ newobj=lt$counter-$objbase ++ func_arith $counter + 1 ++ counter=$func_arith_result ++ case " $oldobjs " in ++ *[\ /]"$newobj "*) ;; ++ *) if test ! -f "$gentop/$newobj"; then break; fi ;; ++ esac ++ done ++ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" ++ oldobjs="$oldobjs $gentop/$newobj" ++ ;; ++ *) oldobjs="$oldobjs $obj" ;; ++ esac + done +- IFS="$save_ifs" +- fi +- if test -n "$finish_eval"; then +- # Do the single finish_eval. +- eval cmds=\"$finish_eval\" +- $run eval "$cmds" || admincmds="$admincmds +- $cmds" + fi +- done +- fi +- +- # Exit here if they wanted silent mode. +- test "$show" = : && exit $EXIT_SUCCESS ++ eval cmds=\"$old_archive_cmds\" + +- $echo "X----------------------------------------------------------------------" | $Xsed +- $echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $echo " $libdir" ++ func_len " $cmds" ++ len=$func_len_result ++ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then ++ cmds=$old_archive_cmds ++ else ++ # the command line is too long to link in one step, link in parts ++ func_verbose "using piecewise archive linking..." ++ save_RANLIB=$RANLIB ++ RANLIB=: ++ objlist= ++ concat_cmds= ++ save_oldobjs=$oldobjs ++ oldobjs= ++ # Is there a better way of finding the last object in the list? ++ for obj in $save_oldobjs ++ do ++ last_oldobj=$obj ++ done ++ eval test_cmds=\"$old_archive_cmds\" ++ func_len " $test_cmds" ++ len0=$func_len_result ++ len=$len0 ++ for obj in $save_oldobjs ++ do ++ func_len " $obj" ++ func_arith $len + $func_len_result ++ len=$func_arith_result ++ func_append objlist " $obj" ++ if test "$len" -lt "$max_cmd_len"; then ++ : ++ else ++ # the above command should be used before it gets too long ++ oldobjs=$objlist ++ if test "$obj" = "$last_oldobj" ; then ++ RANLIB=$save_RANLIB ++ fi ++ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ ++ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" ++ objlist= ++ len=$len0 ++ fi ++ done ++ RANLIB=$save_RANLIB ++ oldobjs=$objlist ++ if test "X$oldobjs" = "X" ; then ++ eval cmds=\"\$concat_cmds\" ++ else ++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" ++ fi ++ fi ++ fi ++ func_execute_cmds "$cmds" 'exit $?' + done +- $echo +- $echo "If you ever happen to want to link against installed libraries" +- $echo "in a given directory, LIBDIR, you must either use libtool, and" +- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- $echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- $echo " during execution" +- fi +- if test -n "$runpath_var"; then +- $echo " - add LIBDIR to the \`$runpath_var' environment variable" +- $echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval flag=\"$hardcode_libdir_flag_spec\" +- +- $echo " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $echo " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- $echo +- $echo "See any operating system documentation about shared libraries for" +- $echo "more information, such as the ld(1) and ld.so(8) manual pages." +- $echo "X----------------------------------------------------------------------" | $Xsed +- exit $EXIT_SUCCESS +- ;; +- +- # libtool execute mode +- execute) +- modename="$modename: execute" + +- # The first argument is the command name. +- cmd="$nonopt" +- if test -z "$cmd"; then +- $echo "$modename: you must specify a COMMAND" 1>&2 +- $echo "$help" +- exit $EXIT_FAILURE +- fi ++ test -n "$generated" && \ ++ func_show_eval "${RM}r$generated" + +- # Handle -dlopen flags immediately. +- for file in $execute_dlfiles; do +- if test ! -f "$file"; then +- $echo "$modename: \`$file' is not a file" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- fi ++ # Now create the libtool archive. ++ case $output in ++ *.la) ++ old_library= ++ test "$build_old_libs" = yes && old_library="$libname.$libext" ++ func_verbose "creating $output" + +- dir= +- case $file in +- *.la) +- # Check to see that this really is a libtool archive. +- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : ++ # Preserve any variables that may affect compiler behavior ++ for var in $variables_saved_for_relink; do ++ if eval test -z \"\${$var+set}\"; then ++ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" ++ elif eval var_value=\$$var; test -z "$var_value"; then ++ relink_command="$var=; export $var; $relink_command" + else +- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE ++ func_quote_for_eval "$var_value" ++ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi ++ 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"` ++ if test "$hardcode_automatic" = yes ; then ++ relink_command= ++ fi + +- # Read the libtool library. +- dlname= +- library_names= ++ # Only create the output if not a dry run. ++ $opt_dry_run || { ++ for installed in no yes; do ++ if test "$installed" = yes; then ++ if test -z "$install_libdir"; then ++ break ++ fi ++ output="$output_objdir/$outputname"i ++ # Replace all uninstalled libtool libraries with the installed ones ++ newdependency_libs= ++ for deplib in $dependency_libs; do ++ case $deplib in ++ *.la) ++ func_basename "$deplib" ++ name="$func_basename_result" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$deplib' is not a valid libtool archive" ++ newdependency_libs="$newdependency_libs $libdir/$name" ++ ;; ++ *) newdependency_libs="$newdependency_libs $deplib" ;; ++ esac ++ done ++ dependency_libs="$newdependency_libs" ++ newdlfiles= ++ ++ for lib in $dlfiles; do ++ case $lib in ++ *.la) ++ func_basename "$lib" ++ name="$func_basename_result" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$lib' is not a valid libtool archive" ++ newdlfiles="$newdlfiles $libdir/$name" ++ ;; ++ *) newdlfiles="$newdlfiles $lib" ;; ++ esac ++ done ++ dlfiles="$newdlfiles" ++ newdlprefiles= ++ for lib in $dlprefiles; do ++ case $lib in ++ *.la) ++ # Only pass preopened files to the pseudo-archive (for ++ # eventual linking with the app. that links it) if we ++ # didn't already link the preopened objects directly into ++ # the library: ++ func_basename "$lib" ++ name="$func_basename_result" ++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` ++ test -z "$libdir" && \ ++ func_fatal_error "\`$lib' is not a valid libtool archive" ++ newdlprefiles="$newdlprefiles $libdir/$name" ++ ;; ++ esac ++ done ++ dlprefiles="$newdlprefiles" ++ else ++ newdlfiles= ++ for lib in $dlfiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlfiles="$newdlfiles $abs" ++ done ++ dlfiles="$newdlfiles" ++ newdlprefiles= ++ for lib in $dlprefiles; do ++ case $lib in ++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; ++ *) abs=`pwd`"/$lib" ;; ++ esac ++ newdlprefiles="$newdlprefiles $abs" ++ done ++ dlprefiles="$newdlprefiles" ++ fi ++ $RM $output ++ # place dlname in correct position for cygwin ++ tdlname=$dlname ++ case $host,$output,$installed,$module,$dlname in ++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; ++ esac ++ $ECHO > $output "\ ++# $outputname - a libtool library file ++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION ++# ++# Please DO NOT delete this file! ++# It is necessary for linking the library. + +- # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . $file ;; +- *) . ./$file ;; +- esac ++# The name that we can dlopen(3). ++dlname='$tdlname' + +- # Skip this library if it cannot be dlopened. +- if test -z "$dlname"; then +- # Warn if it was a shared library. +- test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" +- continue +- fi ++# Names of this library. ++library_names='$library_names' + +- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` +- test "X$dir" = "X$file" && dir=. ++# The name of the static archive. ++old_library='$old_library' + +- if test -f "$dir/$objdir/$dlname"; then +- dir="$dir/$objdir" +- else +- if test ! -f "$dir/$dlname"; then +- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 +- exit $EXIT_FAILURE +- fi +- fi +- ;; ++# Linker flags that can not go in dependency_libs. ++inherited_linker_flags='$new_inherited_linker_flags' + +- *.lo) +- # Just add the directory containing the .lo file. +- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` +- test "X$dir" = "X$file" && dir=. +- ;; ++# Libraries that this one depends upon. ++dependency_libs='$dependency_libs' + +- *) +- $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 +- continue +- ;; +- esac ++# Names of additional weak libraries provided by this library ++weak_library_names='$weak_libs' + +- # Get the absolute pathname. +- absdir=`cd "$dir" && pwd` +- test -n "$absdir" && dir="$absdir" ++# Version information for $libname. ++current=$current ++age=$age ++revision=$revision + +- # Now add the directory to shlibpath_var. +- if eval "test -z \"\$$shlibpath_var\""; then +- eval "$shlibpath_var=\"\$dir\"" +- else +- eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" +- fi +- done ++# Is this an already installed library? ++installed=$installed + +- # This variable tells wrapper scripts just to set shlibpath_var +- # rather than running their programs. +- libtool_execute_magic="$magic" ++# Should we warn about portability when linking against -modules? ++shouldnotlink=$module + +- # Check if any of the arguments is a wrapper script. +- args= +- for file +- do +- case $file in +- -*) ;; +- *) +- # Do a test to see if this is really a libtool program. +- if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then +- # If there is no directory component, then add one. +- case $file in +- */* | *\\*) . $file ;; +- *) . ./$file ;; +- esac ++# Files to dlopen/dlpreopen ++dlopen='$dlfiles' ++dlpreopen='$dlprefiles' + +- # Transform arg to wrapped name. +- file="$progdir/$program" +- fi +- ;; +- esac +- # Quote arguments (to preserve shell metacharacters). +- file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` +- args="$args \"$file\"" +- done ++# Directory that this library needs to be installed in: ++libdir='$install_libdir'" ++ if test "$installed" = no && test "$need_relink" = yes; then ++ $ECHO >> $output "\ ++relink_command=\"$relink_command\"" ++ fi ++ done ++ } + +- if test -z "$run"; then +- if test -n "$shlibpath_var"; then +- # Export the shlibpath_var. +- eval "export $shlibpath_var" +- fi ++ # Do a symbolic link so that the libtool archive can be found in ++ # LD_LIBRARY_PATH before the program is installed. ++ func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' ++ ;; ++ esac ++ exit $EXIT_SUCCESS ++} + +- # Restore saved environment variables +- for lt_var in LANG LANGUAGE 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 ++{ test "$mode" = link || test "$mode" = relink; } && ++ func_mode_link ${1+"$@"} + +- # Now prepare to actually exec the command. +- exec_cmd="\$cmd$args" +- else +- # Display what would be done. +- if test -n "$shlibpath_var"; then +- eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" +- $echo "export $shlibpath_var" +- fi +- $echo "$cmd$args" +- exit $EXIT_SUCCESS +- fi +- ;; + +- # libtool clean and uninstall mode +- clean | uninstall) +- modename="$modename: $mode" +- rm="$nonopt" ++# func_mode_uninstall arg... ++func_mode_uninstall () ++{ ++ $opt_debug ++ RM="$nonopt" files= rmforce= exit_status=0 -@@ -8202,28 +6547,30 @@ +@@ -6539,30 +8208,28 @@ for arg do case $arg in -- -f) RM="$RM $arg"; rmforce=yes ;; -- -*) RM="$RM $arg" ;; -+ -f) rm="$rm $arg"; rmforce=yes ;; -+ -*) rm="$rm $arg" ;; +- -f) rm="$rm $arg"; rmforce=yes ;; +- -*) rm="$rm $arg" ;; ++ -f) RM="$RM $arg"; rmforce=yes ;; ++ -*) RM="$RM $arg" ;; *) files="$files $arg" ;; esac done -- test -z "$RM" && \ -- func_fatal_help "you must specify an RM program" -+ if test -z "$rm"; then -+ $echo "$modename: you must specify an RM program" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi +- if test -z "$rm"; then +- $echo "$modename: you must specify an RM program" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- fi ++ test -z "$RM" && \ ++ func_fatal_help "you must specify an RM program" rmdirs= origobjdir="$objdir" for file in $files; do -- func_dirname "$file" "" "." -- dir="$func_dirname_result" -- if test "X$dir" = X.; then -+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -+ if test "X$dir" = "X$file"; then -+ dir=. +- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` +- if test "X$dir" = "X$file"; then +- dir=. ++ func_dirname "$file" "" "." ++ dir="$func_dirname_result" ++ if test "X$dir" = X.; then objdir="$origobjdir" else objdir="$dir/$origobjdir" fi -- func_basename "$file" -- name="$func_basename_result" -+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` +- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` ++ func_basename "$file" ++ name="$func_basename_result" test "$mode" = uninstall && objdir="$dir" # Remember objdir for removal later, being careful to avoid duplicates -@@ -8235,9 +6582,9 @@ +@@ -6574,9 +8241,9 @@ fi # Don't error if the file doesn't exist and rm -f was used. -- if { test -L "$file"; } >/dev/null 2>&1 || -- { test -h "$file"; } >/dev/null 2>&1 || -- test -f "$file"; then -+ if (test -L "$file") >/dev/null 2>&1 \ -+ || (test -h "$file") >/dev/null 2>&1 \ -+ || test -f "$file"; then +- if (test -L "$file") >/dev/null 2>&1 \ +- || (test -h "$file") >/dev/null 2>&1 \ +- || test -f "$file"; then ++ if { test -L "$file"; } >/dev/null 2>&1 || ++ { test -h "$file"; } >/dev/null 2>&1 || ++ test -f "$file"; then : elif test -d "$file"; then exit_status=1 -@@ -8251,8 +6598,8 @@ +@@ -6590,8 +8257,8 @@ case $name in *.la) # Possibly a libtool archive, so verify it. -- if func_lalib_p "$file"; then -- func_source $dir/$name -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ . $dir/$name +- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then +- . $dir/$name ++ if func_lalib_p "$file"; then ++ func_source $dir/$name # Delete the libtool libraries and symlinks. for n in $library_names; do -@@ -8267,17 +6614,39 @@ +@@ -6606,39 +8273,17 @@ *" $dlname "*) ;; *) rmfiles="$rmfiles $objdir/$dlname" ;; esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" +- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ;; uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. -- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' -+ cmds=$postuninstall_cmds -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $show "$cmd" -+ $run eval "$cmd" -+ if test "$?" -ne 0 && test "$rmforce" != yes; then -+ exit_status=1 -+ fi -+ done -+ IFS="$save_ifs" +- cmds=$postuninstall_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" +- if test "$?" -ne 0 && test "$rmforce" != yes; then +- exit_status=1 +- fi +- done +- IFS="$save_ifs" ++ func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. -- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' -+ cmds=$old_postuninstall_cmds -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $show "$cmd" -+ $run eval "$cmd" -+ if test "$?" -ne 0 && test "$rmforce" != yes; then -+ exit_status=1 -+ fi -+ done -+ IFS="$save_ifs" +- cmds=$old_postuninstall_cmds +- save_ifs="$IFS"; IFS='~' +- for cmd in $cmds; do +- IFS="$save_ifs" +- eval cmd=\"$cmd\" +- $show "$cmd" +- $run eval "$cmd" +- if test "$?" -ne 0 && test "$rmforce" != yes; then +- exit_status=1 +- fi +- done +- IFS="$save_ifs" ++ func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; -@@ -8287,20 +6656,20 @@ +@@ -6648,20 +8293,20 @@ *.lo) # Possibly a libtool object, so verify it. -- if func_lalib_p "$file"; then -+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then +- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then ++ if func_lalib_p "$file"; then # Read the .lo file -- func_source $dir/$name -+ . $dir/$name +- . $dir/$name ++ func_source $dir/$name # Add PIC object to the list of files to remove. -- if test -n "$pic_object" && -- test "$pic_object" != none; then -+ if test -n "$pic_object" \ -+ && test "$pic_object" != none; then +- if test -n "$pic_object" \ +- && test "$pic_object" != none; then ++ if test -n "$pic_object" && ++ test "$pic_object" != none; then rmfiles="$rmfiles $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. -- if test -n "$non_pic_object" && -- test "$non_pic_object" != none; then -+ if test -n "$non_pic_object" \ -+ && test "$non_pic_object" != none; then +- if test -n "$non_pic_object" \ +- && test "$non_pic_object" != none; then ++ if test -n "$non_pic_object" && ++ test "$non_pic_object" != none; then rmfiles="$rmfiles $dir/$non_pic_object" fi fi -@@ -8311,26 +6680,17 @@ +@@ -6672,17 +8317,26 @@ noexename=$name case $file in *.exe) -- func_stripname '' '.exe' "$file" -- file=$func_stripname_result -- func_stripname '' '.exe' "$name" -- noexename=$func_stripname_result -+ file=`$echo $file|${SED} 's,.exe$,,'` -+ noexename=`$echo $name|${SED} 's,.exe$,,'` +- file=`$echo $file|${SED} 's,.exe$,,'` +- noexename=`$echo $name|${SED} 's,.exe$,,'` ++ func_stripname '' '.exe' "$file" ++ file=$func_stripname_result ++ func_stripname '' '.exe' "$name" ++ noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe rmfiles="$rmfiles $file" ;; esac # Do a test to see if this is a libtool program. -- if func_ltwrapper_p "$file"; then -- if func_ltwrapper_executable_p "$file"; then -- func_ltwrapper_scriptname "$file" -- relink_command= -- func_source $func_ltwrapper_scriptname_result -- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -- else -- relink_command= -- func_source $dir/$noexename -- fi -+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ relink_command= -+ . $dir/$noexename +- if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then +- relink_command= +- . $dir/$noexename ++ if func_ltwrapper_p "$file"; then ++ if func_ltwrapper_executable_p "$file"; then ++ func_ltwrapper_scriptname "$file" ++ relink_command= ++ func_source $func_ltwrapper_scriptname_result ++ rmfiles="$rmfiles $func_ltwrapper_scriptname_result" ++ else ++ relink_command= ++ func_source $dir/$noexename ++ fi # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles -@@ -8345,38 +6705,239 @@ +@@ -6697,239 +8351,38 @@ fi ;; esac -- func_show_eval "$RM $rmfiles" 'exit_status=1' -+ $show "$rm $rmfiles" -+ $run $rm $rmfiles || exit_status=1 +- $show "$rm $rmfiles" +- $run $rm $rmfiles || exit_status=1 ++ func_show_eval "$RM $rmfiles" 'exit_status=1' done objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then -- func_show_eval "rmdir $dir >/dev/null 2>&1" -+ $show "rmdir $dir" -+ $run rmdir $dir >/dev/null 2>&1 +- $show "rmdir $dir" +- $run rmdir $dir >/dev/null 2>&1 ++ func_show_eval "rmdir $dir >/dev/null 2>&1" fi done exit $exit_status --} -- --{ test "$mode" = uninstall || test "$mode" = clean; } && -- func_mode_uninstall ${1+"$@"} -+ ;; +- ;; ++} --test -z "$mode" && { -- help="$generic_help" -- func_fatal_help "you must specify a MODE" --} -+ "") -+ $echo "$modename: you must specify a MODE" 1>&2 -+ $echo "$generic_help" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+ esac +- "") +- $echo "$modename: you must specify a MODE" 1>&2 +- $echo "$generic_help" 1>&2 +- exit $EXIT_FAILURE +- ;; +- esac ++{ test "$mode" = uninstall || test "$mode" = clean; } && ++ func_mode_uninstall ${1+"$@"} --test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$mode'" -+ if test -z "$exec_cmd"; then -+ $echo "$modename: invalid operation mode \`$mode'" 1>&2 -+ $echo "$generic_help" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+fi # test -z "$show_help" +- if test -z "$exec_cmd"; then +- $echo "$modename: invalid operation mode \`$mode'" 1>&2 +- $echo "$generic_help" 1>&2 +- exit $EXIT_FAILURE +- fi +-fi # test -z "$show_help" ++test -z "$mode" && { ++ help="$generic_help" ++ func_fatal_help "you must specify a MODE" ++} ++ ++test -z "$exec_cmd" && \ ++ func_fatal_help "invalid operation mode \`$mode'" if test -n "$exec_cmd"; then -- eval exec "$exec_cmd" -+ eval exec $exec_cmd +- eval exec $exec_cmd ++ eval exec "$exec_cmd" exit $EXIT_FAILURE fi --exit $exit_status -+# We need to display help for each of the modes. -+case $mode in -+"") $echo \ -+"Usage: $modename [OPTION]... [MODE-ARG]... -+ -+Provide generalized library-building support services. -+ -+ --config show all configuration variables -+ --debug enable verbose shell tracing -+-n, --dry-run display commands without modifying any files -+ --features display basic configuration information and exit -+ --finish same as \`--mode=finish' -+ --help display this help message and exit -+ --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] -+ --quiet same as \`--silent' -+ --silent don't print informational messages -+ --tag=TAG use configuration variables from tag TAG -+ --version print version information -+ -+MODE must be one of the following: -+ -+ clean remove files from the build directory -+ compile compile a source file into a libtool object -+ execute automatically set library path, then run a program -+ finish complete the installation of libtool libraries -+ install install libraries or executables -+ link create a library or an executable -+ uninstall remove libraries from an installed directory -+ -+MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -+a more detailed description of MODE. -+ -+Report bugs to <bug-libtool@gnu.org>." -+ exit $EXIT_SUCCESS -+ ;; -+ -+clean) -+ $echo \ -+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... -+ -+Remove files from the build directory. -+ -+RM is the name of the program to use to delete files associated with each FILE -+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -+to RM. -+ -+If FILE is a libtool library, object or program, all the files associated -+with it are deleted. Otherwise, only FILE itself is deleted using RM." -+ ;; -+ -+compile) -+ $echo \ -+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE -+ -+Compile a source file into a libtool library object. -+ -+This mode accepts the following additional options: -+ -+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE -+ -prefer-pic try to building PIC objects only -+ -prefer-non-pic try to building non-PIC objects only -+ -static always build a \`.o' file suitable for static linking -+ -+COMPILE-COMMAND is a command to be used in creating a \`standard' object file -+from the given SOURCEFILE. -+ -+The output file name is determined by removing the directory component from -+SOURCEFILE, then substituting the C source code suffix \`.c' with the -+library object suffix, \`.lo'." -+ ;; -+ -+execute) -+ $echo \ -+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... -+ -+Automatically set library path, then run a program. -+ -+This mode accepts the following additional options: -+ -+ -dlopen FILE add the directory containing FILE to the library path -+ -+This mode sets the library path environment variable according to \`-dlopen' -+flags. -+ -+If any of the ARGS are libtool executable wrappers, then they are translated -+into their corresponding uninstalled binary, and any of their required library -+directories are added to the library path. -+ -+Then, COMMAND is executed, with ARGS as arguments." -+ ;; -+ -+finish) -+ $echo \ -+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... -+ -+Complete the installation of libtool libraries. -+ -+Each LIBDIR is a directory that contains libtool libraries. -+ -+The commands that this mode executes may require superuser privileges. Use -+the \`--dry-run' option if you just want to see what would be executed." -+ ;; -+ -+install) -+ $echo \ -+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... -+ -+Install executables or libraries. -+ -+INSTALL-COMMAND is the installation command. The first component should be -+either the \`install' or \`cp' program. -+ -+The rest of the components are interpreted as arguments to that command (only -+BSD-compatible install options are recognized)." -+ ;; -+ -+link) -+ $echo \ -+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... -+ -+Link object files or libraries together to form another library, or to -+create an executable program. +-# We need to display help for each of the modes. +-case $mode in +-"") $echo \ +-"Usage: $modename [OPTION]... [MODE-ARG]... +- +-Provide generalized library-building support services. +- +- --config show all configuration variables +- --debug enable verbose shell tracing +--n, --dry-run display commands without modifying any files +- --features display basic configuration information and exit +- --finish same as \`--mode=finish' +- --help display this help message and exit +- --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] +- --quiet same as \`--silent' +- --silent don't print informational messages +- --tag=TAG use configuration variables from tag TAG +- --version print version information +- +-MODE must be one of the following: +- +- clean remove files from the build directory +- compile compile a source file into a libtool object +- execute automatically set library path, then run a program +- finish complete the installation of libtool libraries +- install install libraries or executables +- link create a library or an executable +- uninstall remove libraries from an installed directory +- +-MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for +-a more detailed description of MODE. +- +-Report bugs to <bug-libtool@gnu.org>." +- exit $EXIT_SUCCESS +- ;; +- +-clean) +- $echo \ +-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... +- +-Remove files from the build directory. +- +-RM is the name of the program to use to delete files associated with each FILE +-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +-to RM. +- +-If FILE is a libtool library, object or program, all the files associated +-with it are deleted. Otherwise, only FILE itself is deleted using RM." +- ;; +- +-compile) +- $echo \ +-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE +- +-Compile a source file into a libtool library object. +- +-This mode accepts the following additional options: +- +- -o OUTPUT-FILE set the output file name to OUTPUT-FILE +- -prefer-pic try to building PIC objects only +- -prefer-non-pic try to building non-PIC objects only +- -static always build a \`.o' file suitable for static linking +- +-COMPILE-COMMAND is a command to be used in creating a \`standard' object file +-from the given SOURCEFILE. +- +-The output file name is determined by removing the directory component from +-SOURCEFILE, then substituting the C source code suffix \`.c' with the +-library object suffix, \`.lo'." +- ;; +- +-execute) +- $echo \ +-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... +- +-Automatically set library path, then run a program. +- +-This mode accepts the following additional options: +- +- -dlopen FILE add the directory containing FILE to the library path +- +-This mode sets the library path environment variable according to \`-dlopen' +-flags. +- +-If any of the ARGS are libtool executable wrappers, then they are translated +-into their corresponding uninstalled binary, and any of their required library +-directories are added to the library path. +- +-Then, COMMAND is executed, with ARGS as arguments." +- ;; +- +-finish) +- $echo \ +-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... +- +-Complete the installation of libtool libraries. +- +-Each LIBDIR is a directory that contains libtool libraries. +- +-The commands that this mode executes may require superuser privileges. Use +-the \`--dry-run' option if you just want to see what would be executed." +- ;; +- +-install) +- $echo \ +-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... +- +-Install executables or libraries. +- +-INSTALL-COMMAND is the installation command. The first component should be +-either the \`install' or \`cp' program. +- +-The rest of the components are interpreted as arguments to that command (only +-BSD-compatible install options are recognized)." +- ;; +- +-link) +- $echo \ +-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... +- +-Link object files or libraries together to form another library, or to +-create an executable program. ++exit $exit_status -+LINK-COMMAND is a command using the C compiler that you would use to create -+a program from several object files. -+ -+The following components of LINK-COMMAND are treated specially: -+ -+ -all-static do not do any dynamic linking at all -+ -avoid-version do not add a version suffix if possible -+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -+ -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 -+ -export-symbols-regex 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 -+ -no-fast-install disable the fast-install mode -+ -no-install link a not-installable executable -+ -no-undefined declare that a library does not refer to external symbols -+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -+ -objectlist FILE Use a list of object files found in FILE to specify objects -+ -precious-files-regex REGEX -+ don't remove output files matching REGEX -+ -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 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] -+ -+All other options (arguments beginning with \`-') are ignored. -+ -+Every other argument is treated as a filename. Files ending in \`.la' are -+treated as uninstalled libtool libraries, other files are standard or library -+object files. -+ -+If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -+only library objects (\`.lo' files) may be specified, and \`-rpath' is -+required, except when creating a convenience library. -+ -+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -+using \`ar' and \`ranlib', or on Windows using \`lib'. -+ -+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -+is created, otherwise an executable program is created." -+ ;; -+ -+uninstall) -+ $echo \ -+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... -+ -+Remove libraries from an installation directory. -+ -+RM is the name of the program to use to delete files associated with each FILE -+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -+to RM. -+ -+If FILE is a libtool library, all the files associated with it are deleted. -+Otherwise, only FILE itself is deleted using RM." -+ ;; -+ -+*) -+ $echo "$modename: invalid operation mode \`$mode'" 1>&2 -+ $echo "$help" 1>&2 -+ exit $EXIT_FAILURE -+ ;; -+esac -+ -+$echo -+$echo "Try \`$modename --help' for more information about other modes." -+ -+exit $? +-LINK-COMMAND is a command using the C compiler that you would use to create +-a program from several object files. +- +-The following components of LINK-COMMAND are treated specially: +- +- -all-static do not do any dynamic linking at all +- -avoid-version do not add a version suffix if possible +- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime +- -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 +- -export-symbols-regex 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 +- -no-fast-install disable the fast-install mode +- -no-install link a not-installable executable +- -no-undefined declare that a library does not refer to external symbols +- -o OUTPUT-FILE create OUTPUT-FILE from the specified objects +- -objectlist FILE Use a list of object files found in FILE to specify objects +- -precious-files-regex REGEX +- don't remove output files matching REGEX +- -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 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] +- +-All other options (arguments beginning with \`-') are ignored. +- +-Every other argument is treated as a filename. Files ending in \`.la' are +-treated as uninstalled libtool libraries, other files are standard or library +-object files. +- +-If the OUTPUT-FILE ends in \`.la', then a libtool library is created, +-only library objects (\`.lo' files) may be specified, and \`-rpath' is +-required, except when creating a convenience library. +- +-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created +-using \`ar' and \`ranlib', or on Windows using \`lib'. +- +-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +-is created, otherwise an executable program is created." +- ;; +- +-uninstall) +- $echo \ +-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... +- +-Remove libraries from an installation directory. +- +-RM is the name of the program to use to delete files associated with each FILE +-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +-to RM. +- +-If FILE is a libtool library, all the files associated with it are deleted. +-Otherwise, only FILE itself is deleted using RM." +- ;; +- +-*) +- $echo "$modename: invalid operation mode \`$mode'" 1>&2 +- $echo "$help" 1>&2 +- exit $EXIT_FAILURE +- ;; +-esac +- +-$echo +-$echo "Try \`$modename --help' for more information about other modes." +- +-exit $? # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting -@@ -8390,17 +6951,14 @@ +@@ -6943,14 +8396,17 @@ # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared --build_libtool_libs=no --build_old_libs=yes -+disable_libs=shared +-disable_libs=shared ++build_libtool_libs=no ++build_old_libs=yes # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static --build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -+disable_libs=static +-disable_libs=static ++build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: # mode:shell-script # sh-indentation:2 # End: --# vi:sw=2 -- -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefile.in gtk+2.0-2.14.5/m4macros/Makefile.in ---- gtk+2.0-2.14.5.old/m4macros/Makefile.in 2008-11-24 07:41:43.000000000 +0100 -+++ gtk+2.0-2.14.5/m4macros/Makefile.in 2008-11-25 11:09:49.000000000 +0100 ++# vi:sw=2 ++ +diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makefile.in +--- gtk+2.0-2.14.7.old/m4macros/Makefile.in 2009-01-07 22:52:09.000000000 +0100 ++++ gtk+2.0-2.14.7/m4macros/Makefile.in 2009-01-08 08:03:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -120337,7 +85318,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +93,16 @@ +@@ -81,22 +93,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -120345,8 +85326,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -120356,13 +85337,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +126,7 @@ +@@ -120,6 +125,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -120370,7 +85351,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +145,6 @@ +@@ -138,8 +144,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -120379,7 +85360,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +155,20 @@ +@@ -150,97 +154,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -120475,15 +85456,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +179,20 @@ +@@ -251,29 +179,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -120508,12 +85489,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +203,6 @@ +@@ -284,8 +206,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -120522,7 +85503,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +214,10 @@ +@@ -297,28 +217,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -120551,7 +85532,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +226,25 @@ +@@ -327,22 +229,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -120561,12 +85542,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -120582,17 +85563,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +266,8 @@ +@@ -364,7 +269,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +276,11 @@ +@@ -373,9 +280,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -120600,12 +85581,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,56 +311,63 @@ +@@ -406,56 +316,63 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -120696,7 +85678,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil done tags: TAGS TAGS: -@@ -467,29 +375,23 @@ +@@ -463,29 +380,23 @@ ctags: CTAGS CTAGS: @@ -120739,7 +85721,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -504,9 +406,10 @@ +@@ -500,9 +411,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) @@ -120752,7 +85734,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -526,7 +429,7 @@ +@@ -522,7 +434,7 @@ clean-generic: distclean-generic: @@ -120761,7 +85743,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -537,24 +440,34 @@ +@@ -533,24 +445,34 @@ distclean: distclean-am -rm -f Makefile @@ -120797,7 +85779,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil installcheck-am: maintainer-clean: maintainer-clean-am -@@ -573,17 +486,22 @@ +@@ -569,17 +491,22 @@ ps-am: @@ -120826,9 +85808,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/m4macros/Makefil # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+2.0-2.14.5/Makefile.in ---- gtk+2.0-2.14.5.old/Makefile.in 2008-11-24 17:08:14.000000000 +0100 -+++ gtk+2.0-2.14.5/Makefile.in 2008-11-25 11:09:53.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in +--- gtk+2.0-2.14.7.old/Makefile.in 2009-01-07 22:52:00.000000000 +0100 ++++ gtk+2.0-2.14.7/Makefile.in 2009-01-08 08:03:57.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -120956,7 +85938,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,21 +132,16 @@ +@@ -82,22 +132,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -120964,8 +85946,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -120975,13 +85957,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +165,7 @@ +@@ -121,6 +164,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -120989,7 +85971,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +184,6 @@ +@@ -139,8 +183,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -120998,7 +85980,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,98 +194,20 @@ +@@ -151,97 +193,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -121094,15 +86076,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -252,32 +218,20 @@ +@@ -252,29 +218,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -121127,12 +86109,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -288,8 +242,6 @@ +@@ -285,8 +245,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -121141,7 +86123,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -301,28 +253,10 @@ +@@ -298,28 +256,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -121170,7 +86152,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -331,22 +265,25 @@ +@@ -328,22 +268,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -121180,12 +86162,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -121201,17 +86183,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -368,8 +305,8 @@ +@@ -365,7 +308,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -378,122 +315,70 @@ +@@ -374,122 +319,71 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -121219,6 +86201,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -121392,7 +86375,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ TEST_PROGS = ### testing rules -@@ -520,17 +405,17 @@ +@@ -516,17 +410,17 @@ && DISPLAY=:$$XID && export DISPLAY @@ -121415,7 +86398,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ DISTCLEANFILES = \ gtk+-unix-print-2.0.pc \ gtk+-$(GDKTARGET)-2.0.pc \ -@@ -541,96 +426,83 @@ +@@ -537,96 +431,83 @@ gail-uninstalled.pc \ config.lt @@ -121554,7 +86537,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -@@ -641,24 +513,22 @@ +@@ -637,24 +518,22 @@ distclean-libtool: -rm -f libtool @@ -121586,7 +86569,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ done # This directory's subdirectories are mostly independent; you can cd -@@ -668,7 +538,13 @@ +@@ -664,7 +543,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -121601,7 +86584,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -680,15 +556,20 @@ +@@ -676,15 +561,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -121626,7 +86609,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -709,7 +590,7 @@ +@@ -705,7 +595,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -121635,7 +86618,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -720,35 +601,30 @@ +@@ -716,35 +606,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -121678,7 +86661,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -756,23 +632,23 @@ +@@ -752,23 +637,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -121711,7 +86694,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -784,40 +660,25 @@ +@@ -780,40 +665,25 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -121766,7 +86749,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -828,15 +689,19 @@ +@@ -824,15 +694,19 @@ || exit 1; \ fi; \ done @@ -121791,7 +86774,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ distdir) \ || exit 1; \ fi; \ -@@ -847,22 +712,55 @@ +@@ -843,22 +717,55 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -121852,7 +86835,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst -@@ -882,19 +780,20 @@ +@@ -878,19 +785,20 @@ distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ @@ -121878,7 +86861,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -@@ -919,8 +818,9 @@ +@@ -915,8 +823,9 @@ all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: @@ -121890,7 +86873,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -940,7 +840,7 @@ +@@ -936,7 +845,7 @@ clean-generic: distclean-generic: @@ -121899,7 +86882,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -953,13 +853,15 @@ +@@ -949,13 +858,15 @@ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile @@ -121917,7 +86900,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ info: info-recursive info-am: -@@ -968,12 +870,20 @@ +@@ -964,12 +875,20 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -121938,7 +86921,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -994,29 +904,28 @@ +@@ -990,29 +909,28 @@ ps-am: @@ -121988,9 +86971,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/Makefile.in gtk+ # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/missing gtk+2.0-2.14.5/missing ---- gtk+2.0-2.14.5.old/missing 2007-09-18 16:10:46.000000000 +0200 -+++ gtk+2.0-2.14.5/missing 2008-11-25 11:09:45.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing +--- gtk+2.0-2.14.7.old/missing 2007-09-18 16:10:46.000000000 +0200 ++++ gtk+2.0-2.14.7/missing 2009-01-08 08:03:47.000000000 +0100 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. @@ -122386,9 +87369,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/missing gtk+2.0- +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/mkinstalldirs gtk+2.0-2.14.5/mkinstalldirs ---- gtk+2.0-2.14.5.old/mkinstalldirs 2007-09-18 16:10:46.000000000 +0200 -+++ gtk+2.0-2.14.5/mkinstalldirs 2008-11-25 11:09:53.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/mkinstalldirs gtk+2.0-2.14.7/mkinstalldirs +--- gtk+2.0-2.14.7.old/mkinstalldirs 2007-09-18 16:10:46.000000000 +0200 ++++ gtk+2.0-2.14.7/mkinstalldirs 2009-01-08 08:03:56.000000000 +0100 @@ -1,21 +1,36 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy @@ -122549,9 +87532,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/mkinstalldirs gt +# time-stamp-end: "$" # End: -# mkinstalldirs ends here -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/Makefile.in gtk+2.0-2.14.5/modules/engines/Makefile.in ---- gtk+2.0-2.14.5.old/modules/engines/Makefile.in 2008-11-24 07:41:43.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/engines/Makefile.in 2008-11-25 11:09:50.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules/engines/Makefile.in +--- gtk+2.0-2.14.7.old/modules/engines/Makefile.in 2009-01-07 22:52:09.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/engines/Makefile.in 2009-01-08 08:03:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -122644,7 +87627,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +95,16 @@ +@@ -81,22 +95,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -122652,8 +87635,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -122663,13 +87646,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +128,7 @@ +@@ -120,6 +127,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -122677,7 +87660,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +147,6 @@ +@@ -138,8 +146,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -122686,7 +87669,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +157,20 @@ +@@ -150,97 +156,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -122782,15 +87765,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +181,20 @@ +@@ -251,29 +181,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -122815,12 +87798,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +205,6 @@ +@@ -284,8 +208,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -122829,7 +87812,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +216,10 @@ +@@ -297,28 +219,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -122858,7 +87841,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +228,25 @@ +@@ -327,22 +231,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -122868,12 +87851,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -122889,17 +87872,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +268,8 @@ +@@ -364,7 +271,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +278,11 @@ +@@ -373,9 +282,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -122907,12 +87890,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,33 +313,40 @@ +@@ -406,33 +318,40 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -122973,7 +87957,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ mostlyclean-libtool: -rm -f *.lo -@@ -444,10 +354,6 @@ +@@ -440,10 +359,6 @@ clean-libtool: -rm -rf .libs _libs @@ -122984,7 +87968,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -455,7 +361,13 @@ +@@ -451,7 +366,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -122999,7 +87983,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -467,15 +379,20 @@ +@@ -463,15 +384,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -123024,7 +88008,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -496,7 +413,7 @@ +@@ -492,7 +418,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -123033,7 +88017,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -507,35 +424,30 @@ +@@ -503,35 +429,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -123076,7 +88060,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -543,23 +455,23 @@ +@@ -539,23 +460,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -123109,7 +88093,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -571,29 +483,23 @@ +@@ -567,29 +488,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -123152,7 +88136,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -606,13 +512,17 @@ +@@ -602,13 +517,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -123174,7 +88158,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ distdir) \ || exit 1; \ fi; \ -@@ -623,7 +533,6 @@ +@@ -619,7 +538,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -123182,7 +88166,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -643,7 +552,7 @@ +@@ -639,7 +557,7 @@ clean-generic: distclean-generic: @@ -123191,7 +88175,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -654,25 +563,34 @@ +@@ -650,25 +568,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -123228,7 +88212,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -691,26 +609,24 @@ +@@ -687,26 +614,24 @@ ps-am: @@ -123271,9 +88255,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.14.5/modules/engines/ms-windows/Makefile.in ---- gtk+2.0-2.14.5.old/modules/engines/ms-windows/Makefile.in 2008-11-24 07:41:43.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/engines/ms-windows/Makefile.in 2008-11-25 11:09:50.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.14.7/modules/engines/ms-windows/Makefile.in +--- gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in 2009-01-07 22:52:10.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/engines/ms-windows/Makefile.in 2009-01-08 08:03:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -123397,7 +88381,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +128,16 @@ +@@ -81,22 +128,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -123405,8 +88389,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -123416,13 +88400,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +161,7 @@ +@@ -120,6 +160,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -123430,7 +88414,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +180,6 @@ +@@ -138,8 +179,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -123439,7 +88423,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +190,20 @@ +@@ -150,97 +189,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -123535,15 +88519,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +214,20 @@ +@@ -251,29 +214,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -123568,12 +88552,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +238,6 @@ +@@ -284,8 +241,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -123582,7 +88566,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +249,10 @@ +@@ -297,28 +252,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -123611,7 +88595,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +261,25 @@ +@@ -327,22 +264,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -123621,12 +88605,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -123642,17 +88626,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +301,8 @@ +@@ -364,7 +304,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +311,11 @@ +@@ -373,9 +315,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -123660,12 +88644,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,9 +346,7 @@ +@@ -406,9 +351,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -123675,7 +88660,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -420,18 +354,14 @@ +@@ -416,18 +359,14 @@ -DGDK_DISABLE_DEPRECATED \ $(GTK_DEP_CFLAGS) @@ -123694,7 +88679,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ libwimp_la_SOURCES = \ msw_rc_style.c \ msw_rc_style.h \ -@@ -442,95 +372,75 @@ +@@ -438,95 +377,75 @@ xp_theme_defs.h \ xp_theme.h @@ -123827,7 +88812,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ distclean-compile: -rm -f *.tab.c -@@ -541,37 +451,25 @@ +@@ -537,37 +456,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xp_theme.Plo@am__quote@ .c.o: @@ -123877,7 +88862,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ mostlyclean-libtool: -rm -f *.lo -@@ -579,10 +477,6 @@ +@@ -575,10 +482,6 @@ clean-libtool: -rm -rf .libs _libs @@ -123888,7 +88873,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -590,7 +484,13 @@ +@@ -586,7 +489,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -123903,7 +88888,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -602,15 +502,20 @@ +@@ -598,15 +507,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -123928,7 +88913,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -631,7 +536,7 @@ +@@ -627,7 +541,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -123937,7 +88922,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -642,35 +547,30 @@ +@@ -638,35 +552,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -123980,7 +88965,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -678,23 +578,23 @@ +@@ -674,23 +583,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -124013,7 +88998,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -706,29 +606,23 @@ +@@ -702,29 +611,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -124056,7 +89041,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -739,15 +633,19 @@ +@@ -735,15 +638,19 @@ || exit 1; \ fi; \ done @@ -124081,7 +89066,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ distdir) \ || exit 1; \ fi; \ -@@ -758,8 +656,9 @@ +@@ -754,8 +661,9 @@ all-am: Makefile $(LTLIBRARIES) installdirs: installdirs-recursive installdirs-am: @@ -124093,7 +89078,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -779,7 +678,7 @@ +@@ -775,7 +683,7 @@ clean-generic: distclean-generic: @@ -124102,7 +89087,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -793,24 +692,34 @@ +@@ -789,24 +697,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -124138,7 +89123,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -831,28 +740,27 @@ +@@ -827,28 +745,27 @@ ps-am: @@ -124185,9 +89170,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.14.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in ---- gtk+2.0-2.14.5.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-11-24 07:41:43.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2008-11-25 11:09:50.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.14.7/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +--- gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-01-07 22:52:10.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-01-08 08:03:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -124276,7 +89261,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +93,16 @@ +@@ -81,22 +93,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -124284,8 +89269,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -124295,13 +89280,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +126,7 @@ +@@ -120,6 +125,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -124309,7 +89294,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +145,6 @@ +@@ -138,8 +144,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -124318,7 +89303,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +155,20 @@ +@@ -150,97 +154,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -124414,15 +89399,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +179,20 @@ +@@ -251,29 +179,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -124447,12 +89432,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +203,6 @@ +@@ -284,8 +206,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -124461,7 +89446,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +214,10 @@ +@@ -297,28 +217,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -124490,7 +89475,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +226,25 @@ +@@ -327,22 +229,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -124500,12 +89485,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -124521,17 +89506,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +266,8 @@ +@@ -364,7 +269,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +276,11 @@ +@@ -373,9 +280,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -124539,12 +89524,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,54 +311,62 @@ +@@ -406,54 +316,62 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -124633,7 +89619,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ done tags: TAGS TAGS: -@@ -465,29 +374,23 @@ +@@ -461,29 +379,23 @@ ctags: CTAGS CTAGS: @@ -124676,7 +89662,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -502,9 +405,10 @@ +@@ -498,9 +410,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) @@ -124689,7 +89675,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -524,7 +428,7 @@ +@@ -520,7 +433,7 @@ clean-generic: distclean-generic: @@ -124698,7 +89684,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -535,24 +439,34 @@ +@@ -531,24 +444,34 @@ distclean: distclean-am -rm -f Makefile @@ -124734,7 +89720,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ installcheck-am: maintainer-clean: maintainer-clean-am -@@ -571,17 +485,21 @@ +@@ -567,17 +490,21 @@ ps-am: @@ -124764,9 +89750,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.14.5/modules/engines/ms-windows/Theme/Makefile.in ---- gtk+2.0-2.14.5.old/modules/engines/ms-windows/Theme/Makefile.in 2008-11-24 07:41:43.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/engines/ms-windows/Theme/Makefile.in 2008-11-25 11:09:50.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.14.7/modules/engines/ms-windows/Theme/Makefile.in +--- gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in 2009-01-07 22:52:10.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/engines/ms-windows/Theme/Makefile.in 2009-01-08 08:03:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -124859,7 +89845,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +95,16 @@ +@@ -81,22 +95,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -124867,8 +89853,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -124878,13 +89864,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +128,7 @@ +@@ -120,6 +127,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -124892,7 +89878,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +147,6 @@ +@@ -138,8 +146,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -124901,7 +89887,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +157,20 @@ +@@ -150,97 +156,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -124997,15 +89983,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +181,20 @@ +@@ -251,29 +181,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -125030,12 +90016,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +205,6 @@ +@@ -284,8 +208,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -125044,7 +90030,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +216,10 @@ +@@ -297,28 +219,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -125073,7 +90059,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +228,25 @@ +@@ -327,22 +231,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -125083,12 +90069,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -125104,17 +90090,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +268,8 @@ +@@ -364,7 +271,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +278,11 @@ +@@ -373,9 +282,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -125122,12 +90108,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,31 +313,39 @@ +@@ -406,31 +318,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -125186,7 +90173,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ mostlyclean-libtool: -rm -f *.lo -@@ -442,10 +353,6 @@ +@@ -438,10 +358,6 @@ clean-libtool: -rm -rf .libs _libs @@ -125197,7 +90184,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -453,7 +360,13 @@ +@@ -449,7 +365,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -125212,7 +90199,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -465,15 +378,20 @@ +@@ -461,15 +383,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -125237,7 +90224,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -494,7 +412,7 @@ +@@ -490,7 +417,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -125246,7 +90233,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -505,35 +423,30 @@ +@@ -501,35 +428,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -125289,7 +90276,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -541,23 +454,23 @@ +@@ -537,23 +459,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -125322,7 +90309,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -569,29 +482,23 @@ +@@ -565,29 +487,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -125365,7 +90352,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -602,15 +509,19 @@ +@@ -598,15 +514,19 @@ || exit 1; \ fi; \ done @@ -125390,7 +90377,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ distdir) \ || exit 1; \ fi; \ -@@ -621,7 +532,6 @@ +@@ -617,7 +537,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -125398,7 +90385,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -641,7 +551,7 @@ +@@ -637,7 +556,7 @@ clean-generic: distclean-generic: @@ -125407,7 +90394,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -652,25 +562,34 @@ +@@ -648,25 +567,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -125444,7 +90431,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -689,26 +608,24 @@ +@@ -685,26 +613,24 @@ ps-am: @@ -125487,9 +90474,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.5/modules/engines/pixbuf/Makefile.in ---- gtk+2.0-2.14.5.old/modules/engines/pixbuf/Makefile.in 2008-11-24 07:41:43.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/engines/pixbuf/Makefile.in 2008-11-25 11:09:50.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/modules/engines/pixbuf/Makefile.in +--- gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in 2009-01-07 22:52:10.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/engines/pixbuf/Makefile.in 2009-01-08 08:03:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -125604,7 +90591,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +119,16 @@ +@@ -81,22 +119,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -125612,8 +90599,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -125623,13 +90610,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +152,7 @@ +@@ -120,6 +151,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -125637,7 +90624,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +171,6 @@ +@@ -138,8 +170,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -125646,7 +90633,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +181,20 @@ +@@ -150,97 +180,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -125742,15 +90729,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +205,20 @@ +@@ -251,29 +205,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -125775,12 +90762,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +229,6 @@ +@@ -284,8 +232,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -125789,7 +90776,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +240,10 @@ +@@ -297,28 +243,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -125818,7 +90805,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +252,25 @@ +@@ -327,22 +255,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -125828,12 +90815,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -125849,17 +90836,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +292,8 @@ +@@ -364,7 +295,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +302,11 @@ +@@ -373,9 +306,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -125867,12 +90854,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,9 +337,7 @@ +@@ -406,9 +342,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -125882,7 +90870,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -420,18 +345,14 @@ +@@ -416,18 +350,14 @@ -DGDK_DISABLE_DEPRECATED \ $(GTK_DEP_CFLAGS) @@ -125901,7 +90889,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ libpixmap_la_SOURCES = \ pixbuf-draw.c \ pixbuf-main.c \ -@@ -441,85 +362,73 @@ +@@ -437,85 +367,73 @@ pixbuf-style.h \ pixbuf.h @@ -126024,7 +91012,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ distclean-compile: -rm -f *.tab.c -@@ -530,37 +439,25 @@ +@@ -526,37 +444,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf-render.Plo@am__quote@ .c.o: @@ -126074,7 +91062,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ mostlyclean-libtool: -rm -f *.lo -@@ -568,26 +465,15 @@ +@@ -564,26 +470,15 @@ clean-libtool: -rm -rf .libs _libs @@ -126104,7 +91092,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -597,23 +483,23 @@ +@@ -593,23 +488,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -126137,7 +91125,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -625,29 +511,23 @@ +@@ -621,29 +516,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -126180,7 +91168,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -662,9 +542,10 @@ +@@ -658,9 +547,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) @@ -126193,7 +91181,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -684,7 +565,7 @@ +@@ -680,7 +570,7 @@ clean-generic: distclean-generic: @@ -126202,7 +91190,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -698,24 +579,34 @@ +@@ -694,24 +584,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -126238,7 +91226,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ installcheck-am: maintainer-clean: maintainer-clean-am -@@ -736,20 +627,24 @@ +@@ -732,20 +632,24 @@ ps-am: @@ -126273,9 +91261,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/engines/ # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Makefile.in gtk+2.0-2.14.5/modules/input/Makefile.in ---- gtk+2.0-2.14.5.old/modules/input/Makefile.in 2008-11-24 07:41:44.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/input/Makefile.in 2008-11-25 11:09:51.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/input/Makefile.in +--- gtk+2.0-2.14.7.old/modules/input/Makefile.in 2009-01-07 22:52:11.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/input/Makefile.in 2009-01-08 08:03:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -126589,7 +91577,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +318,16 @@ +@@ -81,22 +318,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -126597,8 +91585,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -126608,13 +91596,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +351,7 @@ +@@ -120,6 +350,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -126622,7 +91610,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +370,6 @@ +@@ -138,8 +369,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -126631,7 +91619,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +380,20 @@ +@@ -150,97 +379,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -126727,15 +91715,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +404,20 @@ +@@ -251,29 +404,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -126760,12 +91748,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +428,6 @@ +@@ -284,8 +431,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -126774,7 +91762,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +439,10 @@ +@@ -297,28 +442,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -126803,7 +91791,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +451,25 @@ +@@ -327,22 +454,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -126813,12 +91801,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -126834,17 +91822,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +491,8 @@ +@@ -364,7 +494,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +501,11 @@ +@@ -373,9 +505,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -126852,12 +91840,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,9 +536,7 @@ +@@ -406,9 +541,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -126867,7 +91856,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -424,22 +548,18 @@ +@@ -420,22 +553,18 @@ $(GTK_DEP_CFLAGS) \ $(INCLUDED_IMMODULE_DEFINE) @@ -126890,7 +91879,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_xim_la_SOURCES = \ gtkimcontextxim.c \ -@@ -450,42 +570,36 @@ +@@ -446,42 +575,36 @@ im_xim_la_LIBADD = $(LDADDS) @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE@STATIC_XIM_MODULE = libstatic-im-xim.la @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@XIM_MODULE = im-xim.la @@ -126933,7 +91922,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma im_thai_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_thai_la_SOURCES = \ thai-charprop.c \ -@@ -498,28 +612,24 @@ +@@ -494,28 +617,24 @@ im_thai_la_LIBADD = $(LDADDS) @INCLUDE_IM_THAI_TRUE@STATIC_THAI_MODULE = libstatic-im-thai.la @INCLUDE_IM_THAI_FALSE@THAI_MODULE = im-thai.la @@ -126962,7 +91951,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma im_ime_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_ime_la_SOURCES = \ gtkimcontextime.c \ -@@ -532,7 +642,6 @@ +@@ -528,7 +647,6 @@ libstatic_im_ime_la_LIBADD = -limm32 @INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE@STATIC_IME_MODULE = libstatic-im-ime.la @INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@IME_MODULE = im-ime.la @@ -126970,7 +91959,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\" im_multipress_la_CPPFLAGS = $(multipress_defs) libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS) -@@ -546,13 +655,11 @@ +@@ -542,13 +660,11 @@ im_multipress_la_LIBADD = $(LDADDS) @INCLUDE_IM_MULTIPRESS_TRUE@STATIC_MULTIPRESS_MODULE = libstatic-im-multipress.la @INCLUDE_IM_MULTIPRESS_FALSE@MULTIPRESS_MODULE = im-multipress.la @@ -126986,7 +91975,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma @BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \ @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \ @BUILD_DYNAMIC_MODULES_TRUE@ $(CEDILLA_MODULE) \ -@@ -567,7 +674,6 @@ +@@ -563,7 +679,6 @@ @BUILD_DYNAMIC_MODULES_TRUE@ $(VIQR_MODULE) \ @BUILD_DYNAMIC_MODULES_TRUE@ $(XIM_MODULE) @@ -126994,7 +91983,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma noinst_LTLIBRARIES = \ $(STATIC_AM_ET_MODULE) \ $(STATIC_CEDILLA_MODULE) \ -@@ -582,234 +688,64 @@ +@@ -578,234 +693,64 @@ $(STATIC_VIQR_MODULE) \ $(STATIC_XIM_MODULE) @@ -127264,7 +92253,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -@@ -818,61 +754,61 @@ +@@ -814,61 +759,61 @@ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ @@ -127352,7 +92341,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma distclean-compile: -rm -f *.tab.c -@@ -898,214 +834,86 @@ +@@ -894,214 +839,86 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thai-charprop.Plo@am__quote@ .c.o: @@ -127605,7 +92594,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -1115,23 +923,23 @@ +@@ -1111,23 +928,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -127638,7 +92627,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1143,29 +951,23 @@ +@@ -1139,29 +956,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -127681,7 +92670,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1179,10 +981,12 @@ +@@ -1175,10 +986,12 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am @@ -127696,7 +92685,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -1203,7 +1007,7 @@ +@@ -1199,7 +1012,7 @@ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -127705,7 +92694,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1217,12 +1021,14 @@ +@@ -1213,12 +1026,14 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -127721,7 +92710,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma info: info-am info-am: -@@ -1231,12 +1037,20 @@ +@@ -1227,12 +1042,20 @@ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -127742,7 +92731,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1257,22 +1071,27 @@ +@@ -1253,22 +1076,27 @@ ps-am: @@ -127777,7 +92766,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma # call as: $(XVFB_START) && someprogram -@@ -1355,7 +1174,18 @@ +@@ -1351,7 +1179,18 @@ included-modules: $(noinst_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES) @@ -127797,9 +92786,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/input/Ma @CROSS_COMPILING_FALSE@all-local: gtk.immodules # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile.in gtk+2.0-2.14.5/modules/Makefile.in ---- gtk+2.0-2.14.5.old/modules/Makefile.in 2008-11-24 07:41:43.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/Makefile.in 2008-11-25 11:09:50.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefile.in +--- gtk+2.0-2.14.7.old/modules/Makefile.in 2009-01-07 22:52:09.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/Makefile.in 2009-01-08 08:03:52.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -127893,7 +92882,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,21 +96,16 @@ +@@ -82,22 +96,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -127901,8 +92890,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -127912,13 +92901,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +129,7 @@ +@@ -121,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -127926,7 +92915,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +148,6 @@ +@@ -139,8 +147,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -127935,7 +92924,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,98 +158,20 @@ +@@ -151,97 +157,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -128031,15 +93020,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -252,32 +182,20 @@ +@@ -252,29 +182,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -128064,12 +93053,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -288,8 +206,6 @@ +@@ -285,8 +209,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -128078,7 +93067,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -301,28 +217,10 @@ +@@ -298,28 +220,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -128107,7 +93096,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -331,22 +229,25 @@ +@@ -328,22 +232,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -128117,12 +93106,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -128138,17 +93127,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -368,8 +269,8 @@ +@@ -365,7 +272,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -378,9 +279,11 @@ +@@ -374,9 +283,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -128156,12 +93145,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -411,31 +314,39 @@ +@@ -407,31 +319,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -128220,7 +93210,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile mostlyclean-libtool: -rm -f *.lo -@@ -443,10 +354,6 @@ +@@ -439,10 +359,6 @@ clean-libtool: -rm -rf .libs _libs @@ -128231,7 +93221,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -454,7 +361,13 @@ +@@ -450,7 +366,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -128246,7 +93236,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -466,15 +379,20 @@ +@@ -462,15 +384,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -128271,7 +93261,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -495,7 +413,7 @@ +@@ -491,7 +418,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -128280,7 +93270,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -506,35 +424,30 @@ +@@ -502,35 +429,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -128323,7 +93313,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -542,23 +455,23 @@ +@@ -538,23 +460,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -128356,7 +93346,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -570,29 +483,23 @@ +@@ -566,29 +488,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -128399,7 +93389,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -605,13 +512,17 @@ +@@ -601,13 +517,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -128421,7 +93411,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile distdir) \ || exit 1; \ fi; \ -@@ -622,7 +533,6 @@ +@@ -618,7 +538,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -128429,7 +93419,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -642,7 +552,7 @@ +@@ -638,7 +557,7 @@ clean-generic: distclean-generic: @@ -128438,7 +93428,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -653,25 +563,34 @@ +@@ -649,25 +568,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -128475,7 +93465,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -690,26 +609,24 @@ +@@ -686,26 +614,24 @@ ps-am: @@ -128518,9 +93508,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/Makefile # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.14.5/modules/other/gail/libgail-util/Makefile.in ---- gtk+2.0-2.14.5.old/modules/other/gail/libgail-util/Makefile.in 2008-11-24 07:41:45.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/other/gail/libgail-util/Makefile.in 2008-11-25 11:09:51.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.14.7/modules/other/gail/libgail-util/Makefile.in +--- gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in 2009-01-07 22:52:12.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/other/gail/libgail-util/Makefile.in 2009-01-08 08:03:53.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -128639,7 +93629,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +123,16 @@ +@@ -81,22 +123,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -128647,8 +93637,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -128658,13 +93648,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +156,7 @@ +@@ -120,6 +155,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -128672,7 +93662,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +175,6 @@ +@@ -138,8 +174,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -128681,7 +93671,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +185,20 @@ +@@ -150,97 +184,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -128777,15 +93767,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +209,20 @@ +@@ -251,29 +209,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -128810,12 +93800,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +233,6 @@ +@@ -284,8 +236,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -128824,7 +93814,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +244,10 @@ +@@ -297,28 +247,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -128853,7 +93843,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +256,25 @@ +@@ -327,22 +259,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -128863,12 +93853,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -128884,17 +93874,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +296,8 @@ +@@ -364,7 +299,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +306,11 @@ +@@ -373,9 +310,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -128902,12 +93892,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -412,32 +343,24 @@ +@@ -408,32 +348,24 @@ @OS_WIN32_TRUE@export_symbols = -export-symbols gailutil.def @OS_WIN32_TRUE@no_undefined = -no-undefined @@ -128940,7 +93931,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libgailutil_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -448,102 +371,87 @@ +@@ -444,102 +376,87 @@ -DGDK_DISABLE_DEPRECATED\ -DGTK_DISABLE_DEPRECATED @@ -129080,7 +94071,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga distclean-compile: -rm -f *.tab.c -@@ -552,148 +460,72 @@ +@@ -548,148 +465,72 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgailutil_la-gailtextutil.Plo@am__quote@ .c.o: @@ -129259,7 +94250,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -703,23 +535,23 @@ +@@ -699,23 +540,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -129292,7 +94283,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -731,29 +563,23 @@ +@@ -727,29 +568,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -129335,7 +94326,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -768,9 +594,10 @@ +@@ -764,9 +599,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) @@ -129348,7 +94339,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -790,7 +617,7 @@ +@@ -786,7 +622,7 @@ clean-generic: distclean-generic: @@ -129357,7 +94348,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -804,24 +631,34 @@ +@@ -800,24 +636,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -129393,7 +94384,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga installcheck-am: maintainer-clean: maintainer-clean-am -@@ -842,21 +679,25 @@ +@@ -838,21 +684,25 @@ ps-am: @@ -129430,9 +94421,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga uninstall-libgailutilincludeHEADERS uninstall-local # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/gail/Makefile.in gtk+2.0-2.14.5/modules/other/gail/Makefile.in ---- gtk+2.0-2.14.5.old/modules/other/gail/Makefile.in 2008-11-24 07:41:45.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/other/gail/Makefile.in 2008-11-25 11:09:51.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modules/other/gail/Makefile.in +--- gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in 2009-01-07 22:52:12.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/other/gail/Makefile.in 2009-01-08 08:03:53.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -129590,7 +94581,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +162,16 @@ +@@ -81,22 +162,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -129598,8 +94589,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -129609,13 +94600,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +195,7 @@ +@@ -120,6 +194,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -129623,7 +94614,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +214,6 @@ +@@ -138,8 +213,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -129632,7 +94623,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +224,20 @@ +@@ -150,97 +223,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -129728,15 +94719,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +248,20 @@ +@@ -251,29 +248,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -129761,12 +94752,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +272,6 @@ +@@ -284,8 +275,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -129775,7 +94766,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +283,10 @@ +@@ -297,28 +286,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -129804,7 +94795,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +295,25 @@ +@@ -327,22 +298,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -129814,12 +94805,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -129835,17 +94826,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +335,8 @@ +@@ -364,7 +338,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +345,11 @@ +@@ -373,9 +349,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -129853,12 +94844,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,14 +380,10 @@ +@@ -406,14 +385,10 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -129873,7 +94865,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga gail_c_sources = \ gail-private-macros.h \ gail.c \ -@@ -476,9 +442,7 @@ +@@ -472,9 +447,7 @@ gailwidget.c \ gailwindow.c @@ -129883,7 +94875,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga gail_private_h_sources = \ gail.h \ gailadjustment.h \ -@@ -536,21 +500,17 @@ +@@ -532,21 +505,17 @@ gailutil.h \ gailwindow.h @@ -129905,7 +94897,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libgail_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/modules/other \ -@@ -562,13 +522,11 @@ +@@ -558,13 +527,11 @@ -DGDK_DISABLE_DEPRECATED \ $(AM_CPPFLAGS) @@ -129919,7 +94911,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libgail_la_LIBADD = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -577,178 +535,76 @@ +@@ -573,178 +540,76 @@ $(GTK_DEP_LIBS) \ $(INTLLIBS) @@ -130135,7 +95127,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga distclean-compile: -rm -f *.tab.c -@@ -810,1879 +666,432 @@ +@@ -806,1879 +671,432 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgail_la-gailwindow.Plo@am__quote@ .c.o: @@ -132254,7 +97246,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga done # This directory's subdirectories are mostly independent; you can cd -@@ -2692,7 +1101,13 @@ +@@ -2688,7 +1106,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -132269,7 +97261,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2704,15 +1119,20 @@ +@@ -2700,15 +1124,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -132294,7 +97286,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -2733,7 +1153,7 @@ +@@ -2729,7 +1158,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -132303,7 +97295,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2744,35 +1164,30 @@ +@@ -2740,35 +1169,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -132346,7 +97338,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -2780,23 +1195,23 @@ +@@ -2776,23 +1200,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -132379,7 +97371,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -2808,29 +1223,23 @@ +@@ -2804,29 +1228,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -132422,7 +97414,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -2841,15 +1250,19 @@ +@@ -2837,15 +1255,19 @@ || exit 1; \ fi; \ done @@ -132447,7 +97439,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga distdir) \ || exit 1; \ fi; \ -@@ -2860,8 +1273,9 @@ +@@ -2856,8 +1278,9 @@ all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -132459,7 +97451,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -2881,7 +1295,7 @@ +@@ -2877,7 +1300,7 @@ clean-generic: distclean-generic: @@ -132468,7 +97460,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -2895,24 +1309,35 @@ +@@ -2891,24 +1314,35 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -132506,7 +97498,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -2933,30 +1358,28 @@ +@@ -2929,30 +1363,28 @@ ps-am: @@ -132556,9 +97548,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14.5/modules/other/gail/tests/Makefile.in ---- gtk+2.0-2.14.5.old/modules/other/gail/tests/Makefile.in 2008-11-24 07:41:45.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/other/gail/tests/Makefile.in 2008-11-25 11:09:51.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14.7/modules/other/gail/tests/Makefile.in +--- gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in 2009-01-07 22:52:12.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/other/gail/tests/Makefile.in 2009-01-08 08:03:53.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -132798,7 +97790,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +244,16 @@ +@@ -81,22 +244,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -132806,8 +97798,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -132817,13 +97809,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +277,7 @@ +@@ -120,6 +276,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -132831,7 +97823,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +296,6 @@ +@@ -138,8 +295,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -132840,7 +97832,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +306,20 @@ +@@ -150,97 +305,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -132936,15 +97928,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +330,20 @@ +@@ -251,29 +330,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -132969,12 +97961,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +354,6 @@ +@@ -284,8 +357,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -132983,7 +97975,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +365,10 @@ +@@ -297,28 +368,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -133012,7 +98004,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +377,25 @@ +@@ -327,22 +380,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -133022,12 +98014,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -133043,17 +98035,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +417,8 @@ +@@ -364,7 +420,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +427,11 @@ +@@ -373,9 +431,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -133061,12 +98053,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,15 +462,11 @@ +@@ -406,15 +467,11 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -133082,7 +98075,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga noinst_LTLIBRARIES = \ libtestaction.la \ libtestbutton.la \ -@@ -439,7 +487,6 @@ +@@ -435,7 +492,6 @@ libtesttreetable.la \ libtestvalues.la @@ -133090,7 +98083,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -448,34 +495,28 @@ +@@ -444,34 +500,28 @@ -I$(top_builddir)/gtk \ -DGDK_DISABLE_DEPRECATED @@ -133125,7 +98118,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestaction_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -483,13 +524,11 @@ +@@ -479,13 +529,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133139,7 +98132,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestbutton_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -497,13 +536,11 @@ +@@ -493,13 +541,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133153,7 +98146,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestcombo_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -511,11 +548,9 @@ +@@ -507,11 +553,9 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133165,7 +98158,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestcomponent_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -523,11 +558,9 @@ +@@ -519,11 +563,9 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133177,7 +98170,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestimage_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -535,13 +568,11 @@ +@@ -531,13 +573,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133191,7 +98184,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestmenuitem_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -549,13 +580,11 @@ +@@ -545,13 +585,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133205,7 +98198,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestnotebook_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -563,13 +592,11 @@ +@@ -559,13 +597,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133219,7 +98212,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestobject_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -577,13 +604,11 @@ +@@ -573,13 +609,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133233,7 +98226,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestoptionmenu_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -591,13 +616,11 @@ +@@ -587,13 +621,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133247,7 +98240,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestpaned_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -605,13 +628,11 @@ +@@ -601,13 +633,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133261,7 +98254,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestprops_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -619,11 +640,9 @@ +@@ -615,11 +645,9 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133273,7 +98266,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestselection_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -631,11 +650,9 @@ +@@ -627,11 +655,9 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133285,7 +98278,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libteststatusbar_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -643,7 +660,6 @@ +@@ -639,7 +665,6 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133293,7 +98286,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtesttable_la_SOURCES = \ testlib.c \ testlib.h \ -@@ -651,7 +667,6 @@ +@@ -647,7 +672,6 @@ testtextlib.h \ testtable.c @@ -133301,7 +98294,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtesttable_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -659,7 +674,6 @@ +@@ -655,7 +679,6 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133309,7 +98302,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtesttext_la_SOURCES = \ testlib.c \ testlib.h \ -@@ -667,7 +681,6 @@ +@@ -663,7 +686,6 @@ testtextlib.h \ testtext.c @@ -133317,7 +98310,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtesttext_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -675,13 +688,11 @@ +@@ -671,13 +693,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133331,7 +98324,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtesttoplevel_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -689,13 +700,11 @@ +@@ -685,13 +705,11 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133345,7 +98338,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtesttreetable_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -703,11 +712,9 @@ +@@ -699,11 +717,9 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133357,7 +98350,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga libtestvalues_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -715,150 +722,63 @@ +@@ -711,150 +727,63 @@ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -133543,7 +98536,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -@@ -867,51 +787,51 @@ +@@ -863,51 +792,51 @@ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ @@ -133616,7 +98609,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga distclean-compile: -rm -f *.tab.c -@@ -939,37 +859,25 @@ +@@ -935,37 +864,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testvalues.Plo@am__quote@ .c.o: @@ -133666,7 +98659,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga mostlyclean-libtool: -rm -f *.lo -@@ -977,26 +885,15 @@ +@@ -973,26 +890,15 @@ clean-libtool: -rm -rf .libs _libs @@ -133696,7 +98689,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -1006,23 +903,23 @@ +@@ -1002,23 +908,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -133729,7 +98722,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1034,29 +931,23 @@ +@@ -1030,29 +936,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -133772,7 +98765,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1071,9 +962,10 @@ +@@ -1067,9 +967,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) @@ -133785,7 +98778,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -1093,7 +985,7 @@ +@@ -1089,7 +990,7 @@ clean-generic: distclean-generic: @@ -133794,7 +98787,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1107,24 +999,34 @@ +@@ -1103,24 +1004,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -133830,7 +98823,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1145,20 +1047,24 @@ +@@ -1141,20 +1052,24 @@ ps-am: @@ -133864,9 +98857,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/ga # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Makefile.in gtk+2.0-2.14.5/modules/other/Makefile.in ---- gtk+2.0-2.14.5.old/modules/other/Makefile.in 2008-11-24 07:41:44.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/other/Makefile.in 2008-11-25 11:09:51.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/other/Makefile.in +--- gtk+2.0-2.14.7.old/modules/other/Makefile.in 2009-01-07 22:52:11.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/other/Makefile.in 2009-01-08 08:03:53.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -133959,7 +98952,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +95,16 @@ +@@ -81,22 +95,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -133967,8 +98960,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -133978,13 +98971,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +128,7 @@ +@@ -120,6 +127,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -133992,7 +98985,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +147,6 @@ +@@ -138,8 +146,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -134001,7 +98994,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +157,20 @@ +@@ -150,97 +156,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -134097,15 +99090,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +181,20 @@ +@@ -251,29 +181,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -134130,12 +99123,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +205,6 @@ +@@ -284,8 +208,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -134144,7 +99137,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +216,10 @@ +@@ -297,28 +219,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -134173,7 +99166,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +228,25 @@ +@@ -327,22 +231,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -134183,12 +99176,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -134204,17 +99197,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +268,8 @@ +@@ -364,7 +271,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +278,11 @@ +@@ -373,9 +282,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -134222,12 +99215,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,31 +313,39 @@ +@@ -406,31 +318,39 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -134286,7 +99280,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma mostlyclean-libtool: -rm -f *.lo -@@ -442,10 +353,6 @@ +@@ -438,10 +358,6 @@ clean-libtool: -rm -rf .libs _libs @@ -134297,7 +99291,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -453,7 +360,13 @@ +@@ -449,7 +365,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -134312,7 +99306,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -465,15 +378,20 @@ +@@ -461,15 +383,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -134337,7 +99331,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -494,7 +412,7 @@ +@@ -490,7 +417,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -134346,7 +99340,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -505,35 +423,30 @@ +@@ -501,35 +428,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -134389,7 +99383,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -541,23 +454,23 @@ +@@ -537,23 +459,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -134422,7 +99416,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -569,29 +482,23 @@ +@@ -565,29 +487,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -134465,7 +99459,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -602,15 +509,19 @@ +@@ -598,15 +514,19 @@ || exit 1; \ fi; \ done @@ -134490,7 +99484,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma distdir) \ || exit 1; \ fi; \ -@@ -621,7 +532,6 @@ +@@ -617,7 +537,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -134498,7 +99492,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -641,7 +551,7 @@ +@@ -637,7 +556,7 @@ clean-generic: distclean-generic: @@ -134507,7 +99501,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -652,25 +562,34 @@ +@@ -648,25 +567,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -134544,7 +99538,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -689,26 +608,24 @@ +@@ -685,26 +613,24 @@ ps-am: @@ -134587,9 +99581,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/other/Ma # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.14.5/modules/printbackends/cups/Makefile.in ---- gtk+2.0-2.14.5.old/modules/printbackends/cups/Makefile.in 2008-11-24 07:41:45.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/printbackends/cups/Makefile.in 2008-11-25 11:09:52.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.14.7/modules/printbackends/cups/Makefile.in +--- gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in 2009-01-07 22:52:13.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/printbackends/cups/Makefile.in 2009-01-08 08:03:55.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -134706,7 +99700,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +121,16 @@ +@@ -81,22 +121,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -134714,8 +99708,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -134725,13 +99719,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +154,7 @@ +@@ -120,6 +153,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -134739,7 +99733,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +173,6 @@ +@@ -138,8 +172,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -134748,7 +99742,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +183,20 @@ +@@ -150,97 +182,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -134844,15 +99838,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +207,20 @@ +@@ -251,29 +207,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -134877,12 +99871,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +231,6 @@ +@@ -284,8 +234,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -134891,7 +99885,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +242,10 @@ +@@ -297,28 +245,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -134920,7 +99914,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +254,25 @@ +@@ -327,22 +257,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -134930,12 +99924,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -134951,17 +99945,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +294,8 @@ +@@ -364,7 +297,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +304,11 @@ +@@ -373,9 +308,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -134969,12 +99963,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,9 +339,7 @@ +@@ -406,9 +344,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -134984,7 +99979,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -424,107 +351,90 @@ +@@ -420,107 +356,90 @@ $(GTK_DEP_CFLAGS) \ $(GTK_DEBUG_FLAGS) @@ -135129,7 +100124,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac distclean-compile: -rm -f *.tab.c -@@ -534,37 +444,25 @@ +@@ -530,37 +449,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintercups.Plo@am__quote@ .c.o: @@ -135179,7 +100174,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac mostlyclean-libtool: -rm -f *.lo -@@ -572,26 +470,15 @@ +@@ -568,26 +475,15 @@ clean-libtool: -rm -rf .libs _libs @@ -135209,7 +100204,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -601,23 +488,23 @@ +@@ -597,23 +493,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -135242,7 +100237,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -629,29 +516,23 @@ +@@ -625,29 +521,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -135285,7 +100280,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -666,9 +547,10 @@ +@@ -662,9 +552,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -135298,7 +100293,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -688,7 +570,7 @@ +@@ -684,7 +575,7 @@ clean-generic: distclean-generic: @@ -135307,7 +100302,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -702,24 +584,34 @@ +@@ -698,24 +589,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -135343,7 +100338,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac installcheck-am: maintainer-clean: maintainer-clean-am -@@ -740,20 +632,24 @@ +@@ -736,20 +637,24 @@ ps-am: @@ -135379,9 +100374,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbackends/file/Makefile.in gtk+2.0-2.14.5/modules/printbackends/file/Makefile.in ---- gtk+2.0-2.14.5.old/modules/printbackends/file/Makefile.in 2008-11-24 07:41:45.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/printbackends/file/Makefile.in 2008-11-25 11:09:52.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.14.7/modules/printbackends/file/Makefile.in +--- gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in 2009-01-07 22:52:13.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/printbackends/file/Makefile.in 2009-01-08 08:03:55.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -135498,7 +100493,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +121,16 @@ +@@ -81,22 +121,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -135506,8 +100501,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -135517,13 +100512,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +154,7 @@ +@@ -120,6 +153,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -135531,7 +100526,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +173,6 @@ +@@ -138,8 +172,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -135540,7 +100535,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +183,20 @@ +@@ -150,97 +182,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -135636,15 +100631,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +207,20 @@ +@@ -251,29 +207,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -135669,12 +100664,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +231,6 @@ +@@ -284,8 +234,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -135683,7 +100678,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +242,10 @@ +@@ -297,28 +245,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -135712,7 +100707,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +254,25 @@ +@@ -327,22 +257,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -135722,12 +100717,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -135743,17 +100738,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +294,8 @@ +@@ -364,7 +297,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +304,11 @@ +@@ -373,9 +308,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -135761,12 +100756,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,17 +339,12 @@ +@@ -406,17 +344,12 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -135784,7 +100780,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac libprintbackend_file_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -430,100 +354,86 @@ +@@ -426,100 +359,86 @@ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(AM_CPPFLAGS) @@ -135922,7 +100918,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac distclean-compile: -rm -f *.tab.c -@@ -531,70 +441,32 @@ +@@ -527,70 +446,32 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo@am__quote@ .c.o: @@ -136009,7 +101005,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac mostlyclean-libtool: -rm -f *.lo -@@ -602,26 +474,15 @@ +@@ -598,26 +479,15 @@ clean-libtool: -rm -rf .libs _libs @@ -136039,7 +101035,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -631,23 +492,23 @@ +@@ -627,23 +497,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -136072,7 +101068,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -659,29 +520,23 @@ +@@ -655,29 +525,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -136115,7 +101111,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -696,9 +551,10 @@ +@@ -692,9 +556,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -136128,7 +101124,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -718,7 +574,7 @@ +@@ -714,7 +579,7 @@ clean-generic: distclean-generic: @@ -136137,7 +101133,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -732,24 +588,34 @@ +@@ -728,24 +593,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -136173,7 +101169,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac installcheck-am: maintainer-clean: maintainer-clean-am -@@ -770,20 +636,24 @@ +@@ -766,20 +641,24 @@ ps-am: @@ -136209,9 +101205,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14.5/modules/printbackends/lpr/Makefile.in ---- gtk+2.0-2.14.5.old/modules/printbackends/lpr/Makefile.in 2008-11-24 07:41:46.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/printbackends/lpr/Makefile.in 2008-11-25 11:09:52.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14.7/modules/printbackends/lpr/Makefile.in +--- gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in 2009-01-07 22:52:13.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/printbackends/lpr/Makefile.in 2009-01-08 08:03:55.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -136325,7 +101321,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +118,16 @@ +@@ -81,22 +118,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -136333,8 +101329,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -136344,13 +101340,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +151,7 @@ +@@ -120,6 +150,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -136358,7 +101354,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +170,6 @@ +@@ -138,8 +169,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -136367,7 +101363,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +180,20 @@ +@@ -150,97 +179,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -136463,15 +101459,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +204,20 @@ +@@ -251,29 +204,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -136496,12 +101492,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +228,6 @@ +@@ -284,8 +231,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -136510,7 +101506,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +239,10 @@ +@@ -297,28 +242,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -136539,7 +101535,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +251,25 @@ +@@ -327,22 +254,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -136549,12 +101545,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -136570,17 +101566,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +291,8 @@ +@@ -364,7 +294,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +301,11 @@ +@@ -373,9 +305,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -136588,12 +101584,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,9 +336,7 @@ +@@ -406,9 +341,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -136603,7 +101600,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -423,98 +347,85 @@ +@@ -419,98 +352,85 @@ $(GTK_DEP_CFLAGS) \ $(GTK_DEBUG_FLAGS) @@ -136739,7 +101736,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac distclean-compile: -rm -f *.tab.c -@@ -522,37 +433,25 @@ +@@ -518,37 +438,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintbackendlpr.Plo@am__quote@ .c.o: @@ -136789,7 +101786,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac mostlyclean-libtool: -rm -f *.lo -@@ -560,26 +459,15 @@ +@@ -556,26 +464,15 @@ clean-libtool: -rm -rf .libs _libs @@ -136819,7 +101816,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -589,23 +477,23 @@ +@@ -585,23 +482,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -136852,7 +101849,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -617,29 +505,23 @@ +@@ -613,29 +510,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -136895,7 +101892,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -654,9 +536,10 @@ +@@ -650,9 +541,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -136908,7 +101905,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -676,7 +559,7 @@ +@@ -672,7 +564,7 @@ clean-generic: distclean-generic: @@ -136917,7 +101914,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -690,24 +573,34 @@ +@@ -686,24 +578,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -136953,7 +101950,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac installcheck-am: maintainer-clean: maintainer-clean-am -@@ -728,20 +621,24 @@ +@@ -724,20 +626,24 @@ ps-am: @@ -136989,9 +101986,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbackends/Makefile.in gtk+2.0-2.14.5/modules/printbackends/Makefile.in ---- gtk+2.0-2.14.5.old/modules/printbackends/Makefile.in 2008-11-24 07:41:45.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/printbackends/Makefile.in 2008-11-25 11:09:52.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/modules/printbackends/Makefile.in +--- gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in 2009-01-07 22:52:13.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/printbackends/Makefile.in 2009-01-08 08:03:53.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -137085,7 +102082,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,21 +96,16 @@ +@@ -83,22 +96,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -137093,8 +102090,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -137104,13 +102101,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -121,6 +129,7 @@ +@@ -122,6 +128,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -137118,7 +102115,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +148,6 @@ +@@ -140,8 +147,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -137127,7 +102124,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,98 +158,20 @@ +@@ -152,97 +157,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -137223,15 +102220,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -253,32 +182,20 @@ +@@ -253,29 +182,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -137256,12 +102253,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -289,8 +206,6 @@ +@@ -286,8 +209,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -137270,7 +102267,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -302,28 +217,10 @@ +@@ -299,28 +220,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -137299,7 +102296,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -332,22 +229,25 @@ +@@ -329,22 +232,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -137309,12 +102306,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -137330,17 +102327,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -369,8 +269,8 @@ +@@ -366,7 +272,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -379,9 +279,11 @@ +@@ -375,9 +283,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -137348,12 +102345,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -412,32 +314,40 @@ +@@ -408,32 +319,40 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -137413,7 +102411,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac mostlyclean-libtool: -rm -f *.lo -@@ -445,10 +355,6 @@ +@@ -441,10 +360,6 @@ clean-libtool: -rm -rf .libs _libs @@ -137424,7 +102422,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -456,7 +362,13 @@ +@@ -452,7 +367,13 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -137439,7 +102437,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -468,15 +380,20 @@ +@@ -464,15 +385,20 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -137464,7 +102462,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -497,7 +414,7 @@ +@@ -493,7 +419,7 @@ local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -137473,7 +102471,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -508,35 +425,30 @@ +@@ -504,35 +430,30 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -137516,7 +102514,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -544,23 +456,23 @@ +@@ -540,23 +461,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -137549,7 +102547,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -572,29 +484,23 @@ +@@ -568,29 +489,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -137592,7 +102590,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -607,13 +513,17 @@ +@@ -603,13 +518,17 @@ done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -137614,7 +102612,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac distdir) \ || exit 1; \ fi; \ -@@ -624,7 +534,6 @@ +@@ -620,7 +539,6 @@ all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -137622,7 +102620,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -644,7 +553,7 @@ +@@ -640,7 +558,7 @@ clean-generic: distclean-generic: @@ -137631,7 +102629,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -655,25 +564,34 @@ +@@ -651,25 +569,34 @@ distclean: distclean-recursive -rm -f Makefile @@ -137668,7 +102666,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -692,26 +610,24 @@ +@@ -688,26 +615,24 @@ ps-am: @@ -137711,9 +102709,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbackends/test/Makefile.in gtk+2.0-2.14.5/modules/printbackends/test/Makefile.in ---- gtk+2.0-2.14.5.old/modules/printbackends/test/Makefile.in 2008-11-24 07:41:46.000000000 +0100 -+++ gtk+2.0-2.14.5/modules/printbackends/test/Makefile.in 2008-11-25 11:09:52.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.14.7/modules/printbackends/test/Makefile.in +--- gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in 2009-01-07 22:52:14.000000000 +0100 ++++ gtk+2.0-2.14.7/modules/printbackends/test/Makefile.in 2009-01-08 08:03:55.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -137829,7 +102827,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +120,16 @@ +@@ -81,22 +120,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -137837,8 +102835,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -137848,13 +102846,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +153,7 @@ +@@ -120,6 +152,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -137862,7 +102860,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +172,6 @@ +@@ -138,8 +171,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -137871,7 +102869,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +182,20 @@ +@@ -150,97 +181,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -137967,15 +102965,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +206,20 @@ +@@ -251,29 +206,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -138000,12 +102998,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +230,6 @@ +@@ -284,8 +233,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -138014,7 +103012,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +241,10 @@ +@@ -297,28 +244,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -138043,7 +103041,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +253,25 @@ +@@ -327,22 +256,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -138053,12 +103051,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -138074,17 +103072,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +293,8 @@ +@@ -364,7 +296,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,9 +303,11 @@ +@@ -373,9 +307,12 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -138092,12 +103090,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -410,17 +338,12 @@ +@@ -406,17 +343,12 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -138115,7 +103114,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac libprintbackend_test_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -430,98 +353,85 @@ +@@ -426,98 +358,85 @@ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(AM_CPPFLAGS) @@ -138251,7 +103250,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac distclean-compile: -rm -f *.tab.c -@@ -529,70 +439,32 @@ +@@ -525,70 +444,32 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo@am__quote@ .c.o: @@ -138338,7 +103337,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac mostlyclean-libtool: -rm -f *.lo -@@ -600,26 +472,15 @@ +@@ -596,26 +477,15 @@ clean-libtool: -rm -rf .libs _libs @@ -138368,7 +103367,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -629,23 +490,23 @@ +@@ -625,23 +495,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -138401,7 +103400,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -657,29 +518,23 @@ +@@ -653,29 +523,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -138444,7 +103443,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -694,9 +549,10 @@ +@@ -690,9 +554,10 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -138457,7 +103456,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -716,7 +572,7 @@ +@@ -712,7 +577,7 @@ clean-generic: distclean-generic: @@ -138466,7 +103465,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -730,24 +586,34 @@ +@@ -726,24 +591,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -138502,7 +103501,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac installcheck-am: maintainer-clean: maintainer-clean-am -@@ -768,20 +634,24 @@ +@@ -764,20 +639,24 @@ ps-am: @@ -138538,9 +103537,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/modules/printbac # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in gtk+2.0-2.14.5/perf/Makefile.in ---- gtk+2.0-2.14.5.old/perf/Makefile.in 2008-11-24 07:41:46.000000000 +0100 -+++ gtk+2.0-2.14.5/perf/Makefile.in 2008-11-25 11:09:52.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in +--- gtk+2.0-2.14.7.old/perf/Makefile.in 2009-01-07 22:52:14.000000000 +0100 ++++ gtk+2.0-2.14.7/perf/Makefile.in 2009-01-08 08:03:55.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -138640,7 +103639,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,21 +104,16 @@ +@@ -81,22 +104,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -138648,8 +103647,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -138659,13 +103658,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -119,6 +137,7 @@ +@@ -120,6 +136,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -138673,7 +103672,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -137,8 +156,6 @@ +@@ -138,8 +155,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -138682,7 +103681,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -149,98 +166,20 @@ +@@ -150,97 +165,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -138778,15 +103777,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -251,32 +190,20 @@ +@@ -251,29 +190,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -138811,12 +103810,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -287,8 +214,6 @@ +@@ -284,8 +217,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -138825,7 +103824,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -300,28 +225,10 @@ +@@ -297,28 +228,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -138854,7 +103853,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -330,22 +237,25 @@ +@@ -327,22 +240,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -138864,12 +103863,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -138885,17 +103884,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -367,8 +277,8 @@ +@@ -364,7 +280,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -377,20 +287,17 @@ +@@ -373,20 +291,18 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -138903,6 +103902,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -138921,7 +103921,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in TEST_PROGS = ### testing rules -@@ -416,7 +323,6 @@ +@@ -412,7 +328,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -138929,7 +103929,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -426,27 +332,18 @@ +@@ -422,27 +337,18 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -138957,7 +103957,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in testperf_SOURCES = \ appwindow.c \ gtkwidgetprofiler.c \ -@@ -460,68 +357,54 @@ +@@ -456,68 +362,54 @@ typebuiltins.h \ widgets.h @@ -139053,7 +104053,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -531,10 +414,10 @@ +@@ -527,10 +419,10 @@ done testperf$(EXEEXT): $(testperf_OBJECTS) $(testperf_DEPENDENCIES) @rm -f testperf$(EXEEXT) @@ -139066,7 +104066,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -548,37 +431,25 @@ +@@ -544,37 +436,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/typebuiltins.Po@am__quote@ .c.o: @@ -139116,7 +104116,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -586,26 +457,15 @@ +@@ -582,26 +462,15 @@ clean-libtool: -rm -rf .libs _libs @@ -139146,7 +104146,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -615,23 +475,23 @@ +@@ -611,23 +480,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -139179,7 +104179,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -643,29 +503,23 @@ +@@ -639,29 +508,23 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -139222,7 +104222,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -681,7 +535,6 @@ +@@ -677,7 +540,6 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) @@ -139230,7 +104230,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in installdirs: install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -@@ -703,13 +556,13 @@ +@@ -699,13 +561,13 @@ clean-generic: distclean-generic: @@ -139246,7 +104246,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in clean: clean-am clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ -@@ -719,24 +572,34 @@ +@@ -715,24 +577,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -139282,7 +104282,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -757,18 +620,23 @@ +@@ -753,18 +625,23 @@ ps-am: @@ -139315,9 +104315,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/perf/Makefile.in # call as: $(XVFB_START) && someprogram -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/po/Makefile.in.in gtk+2.0-2.14.5/po/Makefile.in.in ---- gtk+2.0-2.14.5.old/po/Makefile.in.in 2008-11-24 07:36:02.000000000 +0100 -+++ gtk+2.0-2.14.5/po/Makefile.in.in 2008-11-25 11:09:32.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/po/Makefile.in.in gtk+2.0-2.14.7/po/Makefile.in.in +--- gtk+2.0-2.14.7.old/po/Makefile.in.in 2009-01-07 17:33:44.000000000 +0100 ++++ gtk+2.0-2.14.7/po/Makefile.in.in 2009-01-08 08:03:31.000000000 +0100 @@ -25,6 +25,7 @@ prefix = @prefix@ @@ -139372,9 +104372,9 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/po/Makefile.in.i --files-from=$(srcdir)/POTFILES.in \ && test ! -f $(GETTEXT_PACKAGE).po \ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ -diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.in gtk+2.0-2.14.5/tests/Makefile.in ---- gtk+2.0-2.14.5.old/tests/Makefile.in 2008-11-24 07:41:47.000000000 +0100 -+++ gtk+2.0-2.14.5/tests/Makefile.in 2008-11-25 11:09:53.000000000 +0100 +diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in +--- gtk+2.0-2.14.7.old/tests/Makefile.in 2009-01-07 22:52:15.000000000 +0100 ++++ gtk+2.0-2.14.7/tests/Makefile.in 2009-01-08 08:03:56.000000000 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -139705,7 +104705,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,21 +335,16 @@ +@@ -83,22 +335,15 @@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -139713,8 +104713,8 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --DUMPBIN = @DUMPBIN@ -+ECHO = @ECHO@ +-ECHO = @ECHO@ ++DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -139724,13 +104724,13 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --FGREP = @FGREP@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ ++FGREP = @FGREP@ GAIL_INET_LIBS = @GAIL_INET_LIBS@ GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -121,6 +368,7 @@ +@@ -122,6 +367,7 @@ GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -139738,7 +104738,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +387,6 @@ +@@ -140,8 +386,6 @@ GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -139747,7 +104747,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,98 +397,20 @@ +@@ -152,97 +396,21 @@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -139843,15 +104843,15 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ --LD = @LD@ ++LD = @LD@ LDFLAGS = @LDFLAGS@ LIBJASPER = @LIBJASPER@ LIBJPEG = @LIBJPEG@ -@@ -253,32 +421,20 @@ +@@ -253,29 +421,23 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ --LIPO = @LIPO@ ++LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -139876,12 +104876,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ --OTOOL = @OTOOL@ --OTOOL64 = @OTOOL64@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -289,8 +445,6 @@ +@@ -286,8 +448,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -139890,7 +104890,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -302,28 +456,10 @@ +@@ -299,28 +459,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -139919,7 +104919,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -332,22 +468,25 @@ +@@ -329,22 +471,25 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -139929,12 +104929,12 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +-ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_F77 = @ac_ct_F77@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -139950,17 +104950,17 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -369,8 +508,8 @@ +@@ -366,7 +511,9 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ --lt_ECHO = @lt_ECHO@ ++lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -379,37 +518,21 @@ +@@ -375,37 +522,22 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -139968,6 +104968,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i sysconfdir = @sysconfdir@ target_alias = @target_alias@ - ++top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -140006,7 +105007,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i TEST_PROGS = ### testing rules -@@ -435,7 +558,6 @@ +@@ -431,7 +563,6 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -140014,7 +105015,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -445,89 +567,21 @@ +@@ -441,89 +572,21 @@ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -140106,7 +105107,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i simple_DEPENDENCIES = $(TEST_DEPS) print_editor_DEPENDENCIES = $(TEST_DEPS) testicontheme_DEPENDENCIES = $(TEST_DEPS) -@@ -582,7 +636,6 @@ +@@ -578,7 +641,6 @@ testgrouping_DEPENDENCIES = $(TEST_DEPS) testtooltips_DEPENDENCIES = $(TEST_DEPS) testvolumebutton_DEPENDENCIES = $(TEST_DEPS) @@ -140114,7 +105115,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i simple_LDADD = $(LDADDS) print_editor_LDADD = $(LDADDS) testaccel_LDADD = $(LDADDS) -@@ -644,700 +697,125 @@ +@@ -640,700 +702,125 @@ testgrouping_LDADD = $(LDADDS) testtooltips_LDADD = $(LDADDS) testvolumebutton_LDADD = $(LDADDS) @@ -140842,7 +105843,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -1347,193 +825,193 @@ +@@ -1343,193 +830,193 @@ done autotestkeywords$(EXEEXT): $(autotestkeywords_OBJECTS) $(autotestkeywords_DEPENDENCIES) @rm -f autotestkeywords$(EXEEXT) @@ -141099,7 +106100,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i distclean-compile: -rm -f *.tab.c -@@ -1605,130 +1083,76 @@ +@@ -1601,130 +1088,76 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treestoretest.Po@am__quote@ .c.o: @@ -141263,7 +106264,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -1738,23 +1162,23 @@ +@@ -1734,23 +1167,23 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -141296,7 +106297,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1768,9 +1192,9 @@ +@@ -1764,9 +1197,9 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -141308,7 +106309,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1779,25 +1203,25 @@ +@@ -1775,25 +1208,25 @@ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -141344,7 +106345,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i ;; \ esac; \ else \ -@@ -1822,46 +1246,40 @@ +@@ -1818,46 +1251,40 @@ skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -141408,7 +106409,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1876,7 +1294,6 @@ +@@ -1872,7 +1299,6 @@ $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -141416,7 +106417,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i installdirs: install: install-am install-exec: install-exec-am -@@ -1897,7 +1314,7 @@ +@@ -1893,7 +1319,7 @@ clean-generic: distclean-generic: @@ -141425,7 +106426,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1911,24 +1328,34 @@ +@@ -1907,24 +1333,34 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -141461,7 +106462,7 @@ diff -Naur -x'*config.guess' -x'*config.sub' gtk+2.0-2.14.5.old/tests/Makefile.i installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1949,18 +1376,23 @@ +@@ -1945,18 +1381,23 @@ ps-am: From 41c1bbed0e61f263781238db5ed1a76e7754c820 Mon Sep 17 00:00:00 2001 From: Josselin Mouette <joss@debian.org> Date: Mon, 16 Feb 2009 18:45:03 +0000 Subject: [PATCH 25/29] =?UTF-8?q?008=5Fimplicit=5Fpointer=5Fconversion=5Fg?= =?UTF-8?q?dkgc=5Fdirectfb.patch:=20removed,=20it=E2=80=99s=20obsolete=20a?= =?UTF-8?q?nd=20just=20defines=20the=20same=20macro=20a=20second=20time.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 7 +++++++ ...mplicit_pointer_conversion_gdkgc_directfb.patch | 14 -------------- debian/patches/series | 1 - 3 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch diff --git a/debian/changelog b/debian/changelog index 51bc5e5387..5d2f59202b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gtk+2.0 (2.14.7-2) UNRELEASED; urgency=low + + * 008_implicit_pointer_conversion_gdkgc_directfb.patch: removed, it’s + obsolete and just defines the same macro a second time. + + -- Josselin Mouette <joss@debian.org> Mon, 16 Feb 2009 19:44:27 +0100 + gtk+2.0 (2.14.7-1) experimental; urgency=low [ Loic Minier ] diff --git a/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch b/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch deleted file mode 100644 index bc4e0b99a6..0000000000 --- a/debian/patches/008_implicit_pointer_conversion_gdkgc_directfb.patch +++ /dev/null @@ -1,14 +0,0 @@ -GNOME #447163; Debian 381082 - -Index: gtk+2.0-2.14.0/gdk/directfb/gdkgc-directfb.c -=================================================================== ---- gtk+2.0-2.14.0.orig/gdk/directfb/gdkgc-directfb.c 2008-09-04 06:36:10.000000000 +0200 -+++ gtk+2.0-2.14.0/gdk/directfb/gdkgc-directfb.c 2008-09-05 00:36:25.000000000 +0200 -@@ -33,6 +33,7 @@ - #undef GDK_DISABLE_DEPRECATED - - #include "config.h" -+#undef GDK_DISABLE_DEPRECATED - #include "gdk.h" - - #include <string.h> diff --git a/debian/patches/series b/debian/patches/series index 15be1681eb..35c35f99de 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,6 @@ 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 010_gdkpixbuf_-lm.patch 015_default-fallback-icon-theme.patch From 365a54c50fd031d9e3bc75662a27b0af1e66adee Mon Sep 17 00:00:00 2001 From: Josselin Mouette <joss@debian.org> Date: Mon, 16 Feb 2009 19:47:23 +0000 Subject: [PATCH 26/29] =?UTF-8?q?007=5Fimplicit=5Fpointer=5Fconversion=5Fg?= =?UTF-8?q?dkdrawable=5Fdirectfb.patch:=20removed,=20it=E2=80=99s=20not=20?= =?UTF-8?q?needed=20anymore=20with=20the=20latest=20directfb.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 ++ ...t_pointer_conversion_gdkdrawable_directfb.patch | 14 -------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch diff --git a/debian/changelog b/debian/changelog index 5d2f59202b..6eeb1c94ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ gtk+2.0 (2.14.7-2) UNRELEASED; urgency=low * 008_implicit_pointer_conversion_gdkgc_directfb.patch: removed, it’s obsolete and just defines the same macro a second time. + * 007_implicit_pointer_conversion_gdkdrawable_directfb.patch: removed, + it’s not needed anymore with the latest directfb. -- Josselin Mouette <joss@debian.org> Mon, 16 Feb 2009 19:44:27 +0100 diff --git a/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch b/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch deleted file mode 100644 index 090c3b0471..0000000000 --- a/debian/patches/007_implicit_pointer_conversion_gdkdrawable_directfb.patch +++ /dev/null @@ -1,14 +0,0 @@ -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)\ diff --git a/debian/patches/series b/debian/patches/series index 35c35f99de..cf427b55e9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,7 +4,6 @@ 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch 005_xpmico.patch #006_proper-directfb-modules.patch -007_implicit_pointer_conversion_gdkdrawable_directfb.patch 009_gtk-export-filechooser.patch 010_gdkpixbuf_-lm.patch 015_default-fallback-icon-theme.patch From 98af90cfae8200093c23db1f89dfa12ee634e9c3 Mon Sep 17 00:00:00 2001 From: Josselin Mouette <joss@debian.org> Date: Tue, 17 Feb 2009 22:20:05 +0000 Subject: [PATCH 27/29] =?UTF-8?q?*=20006=5Fproper-directfb-modules.patch:?= =?UTF-8?q?=20removed=20from=20the=20package,=20it=20=20=20won=E2=80=99t?= =?UTF-8?q?=20be=20necessary=20anymore.=20*=20001=5Fstatic-linking-dont-qu?= =?UTF-8?q?ery-immodules.patch,=20=20=20002=5Fstatic-linking-dont-build-pe?= =?UTF-8?q?rf.patch,=20=20=20003=5Fgdk.pc=5Fprivates.patch,=20=20=20004=5F?= =?UTF-8?q?gtk+-ximian-gtk2-filesel-navbutton-5.patch:=20refreshed.=20*=20?= =?UTF-8?q?Remove=20071=5Fcorrect=5Fdirectfb=5Fdeclarations.patch,=20and?= =?UTF-8?q?=20replace=20it=20by=20=20=20032=5Fgdkwindowimpl=5Fdirectfb.pat?= =?UTF-8?q?ch,=20a=20patch=20from=20Sven=20Neumann=20to=20=20=20(hopefully?= =?UTF-8?q?)=20fix=20DirectFB=20support=20for=20GTK+=202.14.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 13 +- ..._static-linking-dont-query-immodules.patch | 20 +- .../002_static-linking-dont-build-perf.patch | 9 +- debian/patches/003_gdk.pc_privates.patch | 18 +- ...gtk+-ximian-gtk2-filesel-navbutton-5.patch | 30 +- .../patches/006_proper-directfb-modules.patch | 32 - .../patches/032_gdkwindowimpl_directfb.patch | 693 ++++++++++++++++++ .../071_correct_directfb_declarations.patch | 300 -------- debian/patches/series | 3 +- 9 files changed, 744 insertions(+), 374 deletions(-) delete mode 100644 debian/patches/006_proper-directfb-modules.patch create mode 100644 debian/patches/032_gdkwindowimpl_directfb.patch delete mode 100644 debian/patches/071_correct_directfb_declarations.patch diff --git a/debian/changelog b/debian/changelog index 6eeb1c94ae..0678218058 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,20 @@ -gtk+2.0 (2.14.7-2) UNRELEASED; urgency=low +gtk+2.0 (2.14.7-2) experimental; urgency=low * 008_implicit_pointer_conversion_gdkgc_directfb.patch: removed, it’s obsolete and just defines the same macro a second time. * 007_implicit_pointer_conversion_gdkdrawable_directfb.patch: removed, it’s not needed anymore with the latest directfb. + * 006_proper-directfb-modules.patch: removed from the package, it + won’t be necessary anymore. + * 001_static-linking-dont-query-immodules.patch, + 002_static-linking-dont-build-perf.patch, + 003_gdk.pc_privates.patch, + 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch: refreshed. + * Remove 071_correct_directfb_declarations.patch, and replace it by + 032_gdkwindowimpl_directfb.patch, a patch from Sven Neumann to + (hopefully) fix DirectFB support for GTK+ 2.14. - -- Josselin Mouette <joss@debian.org> Mon, 16 Feb 2009 19:44:27 +0100 + -- Josselin Mouette <joss@debian.org> Tue, 17 Feb 2009 23:17:56 +0100 gtk+2.0 (2.14.7-1) experimental; urgency=low diff --git a/debian/patches/001_static-linking-dont-query-immodules.patch b/debian/patches/001_static-linking-dont-query-immodules.patch index 4c58919244..d70030044d 100644 --- a/debian/patches/001_static-linking-dont-query-immodules.patch +++ b/debian/patches/001_static-linking-dont-query-immodules.patch @@ -1,8 +1,8 @@ -Index: gtk+2.0-2.11.5/configure.in +Index: gtk+-2.14.7/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 @@ +--- gtk+-2.14.7.orig/configure.in 2009-01-07 17:33:57.000000000 +0100 ++++ gtk+-2.14.7/configure.in 2009-02-17 23:06:24.718714576 +0100 +@@ -152,6 +152,7 @@ esac dnl Initialize libtool AC_PROG_CC AM_DISABLE_STATIC @@ -10,11 +10,11 @@ Index: gtk+2.0-2.11.5/configure.in 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 +Index: gtk+-2.14.7/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 @@ +--- gtk+-2.14.7.orig/modules/input/Makefile.am 2009-01-07 17:33:31.000000000 +0100 ++++ gtk+-2.14.7/modules/input/Makefile.am 2009-02-17 23:06:24.731083956 +0100 +@@ -178,8 +178,12 @@ dist_imconffile_DATA = im-multipress.con if CROSS_COMPILING RUN_QUERY_IMMODULES_TEST=false else @@ -27,8 +27,8 @@ Index: gtk+2.0-2.11.5/modules/input/Makefile.am # 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) +@@ -240,7 +244,18 @@ noinst_LTLIBRARIES = \ + included-modules: $(noinst_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES) - $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules diff --git a/debian/patches/002_static-linking-dont-build-perf.patch b/debian/patches/002_static-linking-dont-build-perf.patch index 5e7fb5c4a5..2abf478197 100644 --- a/debian/patches/002_static-linking-dont-build-perf.patch +++ b/debian/patches/002_static-linking-dont-build-perf.patch @@ -1,9 +1,10 @@ -Index: gtk+2.0-2.10.10/Makefile.am +Index: gtk+-2.14.7/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 @@ +--- gtk+-2.14.7.orig/Makefile.am 2009-01-07 17:33:57.000000000 +0100 ++++ gtk+-2.14.7/Makefile.am 2009-02-17 23:07:14.895082593 +0100 +@@ -1,7 +1,12 @@ ## Makefile.am for GTK+ + include $(top_srcdir)/Makefile.decl -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib +# don't build perf measurement tools in static builds diff --git a/debian/patches/003_gdk.pc_privates.patch b/debian/patches/003_gdk.pc_privates.patch index 67cbecebce..06fa3c853a 100644 --- a/debian/patches/003_gdk.pc_privates.patch +++ b/debian/patches/003_gdk.pc_privates.patch @@ -1,10 +1,10 @@ -Index: gtk+-2.12.1/configure.in +Index: gtk+-2.14.7/configure.in =================================================================== ---- gtk+-2.12.1.orig/configure.in 2007-11-18 00:51:06.548600130 +0100 -+++ gtk+-2.12.1/configure.in 2007-11-18 01:06:06.279872893 +0100 -@@ -1459,21 +1459,23 @@ LDFLAGS="$saved_ldflags" +--- gtk+-2.14.7.orig/configure.in 2009-02-17 23:06:24.718714576 +0100 ++++ gtk+-2.14.7/configure.in 2009-02-17 23:07:30.398582828 +0100 +@@ -1680,21 +1680,23 @@ LDFLAGS="$saved_ldflags" - GDK_PACKAGES="$PANGO_PACKAGES" + GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" if test "x$gdktarget" = "xx11"; then - GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" + GDK_PRIVATE_PACKAGES="$X_PACKAGES" @@ -30,12 +30,12 @@ Index: gtk+-2.12.1/configure.in AC_SUBST(GDK_EXTRA_LIBS) AC_SUBST(GDK_EXTRA_CFLAGS) AC_SUBST(GDK_DEP_LIBS) -Index: gtk+-2.12.1/gdk-2.0.pc.in +Index: gtk+-2.14.7/gdk-2.0.pc.in =================================================================== ---- gtk+-2.12.1.orig/gdk-2.0.pc.in 2007-11-17 23:53:16.038827049 +0100 -+++ gtk+-2.12.1/gdk-2.0.pc.in 2007-11-18 01:06:30.821271428 +0100 +--- gtk+-2.14.7.orig/gdk-2.0.pc.in 2009-01-07 17:33:57.000000000 +0100 ++++ gtk+-2.14.7/gdk-2.0.pc.in 2009-02-17 23:07:30.402582917 +0100 @@ -8,5 +8,6 @@ Name: GDK - Description: GIMP Drawing Kit (${target} target) + Description: GTK+ Drawing Kit (${target} target) Version: @VERSION@ Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@ +Requires.private: @GDK_PRIVATE_PACKAGES@ diff --git a/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch b/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch index 88b08b1aed..41111a76cb 100644 --- a/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch +++ b/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch @@ -1,9 +1,9 @@ -Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c +Index: gtk+-2.14.7/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 +--- gtk+-2.14.7.orig/gtk/gtkfilesel.c 2009-01-07 17:32:57.000000000 +0100 ++++ gtk+-2.14.7/gtk/gtkfilesel.c 2009-02-17 23:07:34.883084908 +0100 +@@ -80,9 +80,13 @@ + #include "gtkeventbox.h" #include "gtkoptionmenu.h" +#include "gtkimage.h" @@ -16,7 +16,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c #include "gtkalias.h" #ifdef G_OS_WIN32 -@@ -317,6 +321,9 @@ +@@ -318,6 +322,9 @@ static gint cmpl_last_val */ static gchar* cmpl_completion_fullname (const gchar*, CompletionState* cmpl_state); @@ -26,7 +26,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c /* Directory operations. */ static CompletionDir* open_ref_dir (gchar* text_to_complete, -@@ -626,6 +633,10 @@ +@@ -627,6 +634,10 @@ gtk_file_selection_init (GtkFileSelectio GtkWidget *spacer; GtkDialog *dialog; @@ -37,7 +37,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c GtkListStore *model; GtkTreeViewColumn *column; -@@ -639,18 +650,9 @@ +@@ -640,18 +651,9 @@ gtk_file_selection_init (GtkFileSelectio filesel->main_vbox = dialog->vbox; gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); @@ -57,7 +57,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0); gtk_widget_show (pulldown_hbox); -@@ -662,14 +664,27 @@ +@@ -663,14 +665,27 @@ gtk_file_selection_init (GtkFileSelectio /* The horizontal box containing the directory and file listboxes */ @@ -87,7 +87,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c if (WANT_HPANED) list_container = g_object_new (GTK_TYPE_HPANED, "visible", TRUE, -@@ -681,9 +696,78 @@ +@@ -682,9 +697,78 @@ gtk_file_selection_init (GtkFileSelectio spacer = gtk_hbox_new (FALSE, 0); gtk_widget_set_size_request (spacer, -1, 5); @@ -167,7 +167,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c /* The directories list */ model = gtk_list_store_new (1, G_TYPE_STRING); -@@ -756,6 +840,15 @@ +@@ -757,6 +841,15 @@ gtk_file_selection_init (GtkFileSelectio gtk_widget_show (filesel->file_list); gtk_widget_show (scrolled_win); @@ -183,7 +183,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c /* 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 @@ +@@ -1012,39 +1105,94 @@ gtk_file_selection_new (const gchar *tit void gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel) { @@ -292,7 +292,7 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c gtk_widget_show (filesel->fileop_ren_file); } -@@ -1805,6 +1953,95 @@ +@@ -1746,6 +1894,95 @@ gtk_file_selection_update_fileops (GtkFi gtk_widget_set_sensitive (fs->fileop_ren_file, sensitive); } @@ -388,10 +388,10 @@ Index: gtk+2.0-2.10.10/gtk/gtkfilesel.c static gint gtk_file_selection_key_press (GtkWidget *widget, GdkEventKey *event, -Index: gtk+2.0-2.10.10/gtk/stock-icons/ximian-icons.h +Index: gtk+-2.14.7/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 ++++ gtk+-2.14.7/gtk/stock-icons/ximian-icons.h 2009-02-17 23:07:34.887082553 +0100 @@ -0,0 +1,825 @@ +/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ + diff --git a/debian/patches/006_proper-directfb-modules.patch b/debian/patches/006_proper-directfb-modules.patch deleted file mode 100644 index f46936ed24..0000000000 --- a/debian/patches/006_proper-directfb-modules.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- gtk+2.0.old/configure.in.orig 2008-09-23 16:50:57.000000000 -0300 -+++ gtk+2.0/configure.in 2008-09-24 19:17:53.000000000 -0300 -@@ -1625,8 +1625,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 -@@ -1678,7 +1688,7 @@ - CFLAGS="$saved_cflags" - LDFLAGS="$saved_ldflags" - --GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" -+GDK_PACKAGES="$GDK_PACKAGES $PANGO_PACKAGES gio-2.0" - if test "x$gdktarget" = "xx11"; then - GDK_PRIVATE_PACKAGES="$X_PACKAGES" - fi diff --git a/debian/patches/032_gdkwindowimpl_directfb.patch b/debian/patches/032_gdkwindowimpl_directfb.patch new file mode 100644 index 0000000000..2bcf0211fa --- /dev/null +++ b/debian/patches/032_gdkwindowimpl_directfb.patch @@ -0,0 +1,693 @@ +Patch from Sven Neumann to fix DirectFB support for GTK+ 2.14. +Based on the original Ubuntu patch for 2.12. + +Index: gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkgeometry-directfb.c 2009-01-07 17:33:47.000000000 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c 2009-02-17 23:13:41.682584286 +0100 +@@ -41,9 +41,9 @@ + + + void +-_gdk_windowing_window_get_offsets (GdkWindow *window, +- gint *x_offset, +- gint *y_offset) ++_gdk_directfb_window_get_offsets (GdkWindow *window, ++ gint *x_offset, ++ gint *y_offset) + { + if (x_offset) + *x_offset = 0; +@@ -69,9 +69,9 @@ _gdk_windowing_window_queue_antiexpose ( + * brings in from offscreen areas are invalidated. + **/ + void +-gdk_window_scroll (GdkWindow *window, +- gint dx, +- gint dy) ++_gdk_directfb_window_scroll (GdkWindow *window, ++ gint dx, ++ gint dy) + { + GdkWindowObject *private; + GdkDrawableImplDirectFB *impl; +@@ -161,10 +161,10 @@ gdk_window_scroll (GdkWindow *window, + * Since: 2.8 + **/ + void +-gdk_window_move_region (GdkWindow *window, +- const GdkRegion *region, +- gint dx, +- gint dy) ++_gdk_directfb_window_move_region (GdkWindow *window, ++ const GdkRegion *region, ++ gint dx, ++ gint dy) + { + GdkWindowObject *private; + GdkDrawableImplDirectFB *impl; +Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkwindow-directfb.c 2009-01-07 17:33:47.000000000 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c 2009-02-17 23:13:41.698583177 +0100 +@@ -33,6 +33,7 @@ + + #include "config.h" + #include "gdk.h" ++#include "gdkwindowimpl.h" + #include "gdkwindow.h" + + #include "gdkdirectfb.h" +@@ -67,6 +68,9 @@ static void gdk_window_impl_directfb_ini + static void gdk_window_impl_directfb_class_init (GdkWindowImplDirectFBClass *klass); + static void gdk_window_impl_directfb_finalize (GObject *object); + ++static void gdk_window_impl_iface_init (GdkWindowImplIface *iface); ++ ++ + typedef struct + { + GdkWindowChildChanged changed; +@@ -98,9 +102,8 @@ gdk_window_directfb_process_all_updates + tmp_list = old_update_windows; + while (tmp_list) + { +- GdkWindowObject *private = GDK_WINDOW_OBJECT( tmp_list->data ); +- GdkWindowImplDirectFB *wimpl = GDK_WINDOW_IMPL_DIRECTFB( private->impl ); +- ++ GdkWindowObject *private = GDK_WINDOW_OBJECT( tmp_list->data ); ++ + if (private->update_freeze_count) + { + D_DEBUG_AT( GDKDFB_Updates, " -> %p frozen [%4d,%4d-%4dx%4d] (%d boxes)\n", +@@ -115,7 +118,7 @@ gdk_window_directfb_process_all_updates + wimpl->flips.num_regions ); + gdk_window_process_updates(tmp_list->data,TRUE); + } +- ++ + g_object_unref (tmp_list->data); + tmp_list = tmp_list->next; + } +@@ -220,6 +223,13 @@ gdk_window_impl_directfb_get_type (void) + NULL + }; + ++ const GInterfaceInfo window_impl_info = ++ { ++ (GInterfaceInitFunc) gdk_window_impl_iface_init, ++ NULL, ++ NULL ++ }; ++ + object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_DIRECTFB, + "GdkWindowImplDirectFB", + &object_info, 0); +@@ -227,6 +237,9 @@ gdk_window_impl_directfb_get_type (void) + GDK_TYPE_PAINTABLE, + &paintable_info); + ++ g_type_add_interface_static (object_type, ++ GDK_TYPE_WINDOW_IMPL, ++ &window_impl_info); + } + + return object_type; +@@ -406,6 +419,7 @@ _gdk_windowing_window_init (void) + + _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL); + private = GDK_WINDOW_OBJECT (_gdk_parent_root); ++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL); + impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); + + private->window_type = GDK_WINDOW_ROOT; +@@ -647,8 +661,8 @@ gdk_directfb_window_new (GdkWindow + + GdkWindow * + _gdk_window_new (GdkWindow *parent, +- GdkWindowAttr *attributes, +- gint attributes_mask) ++ GdkWindowAttr *attributes, ++ gint attributes_mask) + { + g_return_val_if_fail (attributes != NULL, NULL); + +@@ -1230,28 +1244,19 @@ show_window_internal (GdkWindow *window, + } + } + +-void +-gdk_window_show_unraised (GdkWindow *window) +-{ +- g_return_if_fail (GDK_IS_WINDOW (window)); +- +- D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); +- +- show_window_internal (window, FALSE); +-} +- +-void +-gdk_window_show (GdkWindow *window) ++static void ++gdk_directfb_window_show (GdkWindow *window, ++ gboolean raise) + { + g_return_if_fail (GDK_IS_WINDOW (window)); + + D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, window ); + +- show_window_internal (window, TRUE); ++ show_window_internal (window, raise); + } + +-void +-gdk_window_hide (GdkWindow *window) ++static void ++gdk_directfb_window_hide (GdkWindow *window) + { + GdkWindowObject *private; + GdkWindowImplDirectFB *impl; +@@ -1276,11 +1281,11 @@ gdk_window_hide (GdkWindow *window) + + if (!private->input_only && private->parent) + { +- _gdk_windowing_window_clear_area (GDK_WINDOW (private->parent), +- private->x, +- private->y, +- impl->drawable.width, +- impl->drawable.height); ++ gdk_window_clear_area (GDK_WINDOW (private->parent), ++ private->x, ++ private->y, ++ impl->drawable.width, ++ impl->drawable.height); + } + + event_win = gdk_directfb_other_event_window (window, GDK_UNMAP); +@@ -1299,8 +1304,8 @@ gdk_window_hide (GdkWindow *window) + } + } + +-void +-gdk_window_withdraw (GdkWindow *window) ++static void ++gdk_directfb_window_withdraw (GdkWindow *window) + { + g_return_if_fail (GDK_IS_WINDOW (window)); + +@@ -1309,80 +1314,6 @@ gdk_window_withdraw (GdkWindow *window) + } + + void +-gdk_window_move (GdkWindow *window, +- gint x, +- gint y) +-{ +- GdkWindowObject *private; +- GdkWindowImplDirectFB *impl; +- +- g_return_if_fail (GDK_IS_WINDOW (window)); +- +- private = GDK_WINDOW_OBJECT (window); +- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); +- +- if (impl->window) +- { +- private->x = x; +- private->y = y; +- impl->window->MoveTo (impl->window, x, y); +- } +- else +- { +- gint width=impl->drawable.width; +- gint height=impl->drawable.height; +- GdkRectangle old = +- { private->x, private->y,width,height }; +- +- _gdk_directfb_move_resize_child (window, x, y, width, height); +- _gdk_directfb_calc_abs (window); +- +- if (GDK_WINDOW_IS_MAPPED (private)) +- { +- GdkWindow *mousewin; +- GdkRectangle new = { x, y, width, height }; +- +- gdk_rectangle_union (&new, &old, &new); +- gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE); +- +- /* The window the pointer is in might have changed */ +- mousewin = gdk_window_at_pointer (NULL, NULL); +- gdk_directfb_window_send_crossing_events (NULL, mousewin, +- GDK_CROSSING_NORMAL); +- } +- } +-} +- +-void +-gdk_window_resize (GdkWindow *window, +- gint width, +- gint height) +-{ +- GdkWindowObject *private; +- gint x, y; +- +- g_return_if_fail (GDK_IS_WINDOW (window)); +- +- private = GDK_WINDOW_OBJECT (window); +- +- x = private->x; +- y = private->y; +- +- if (private->parent && (private->parent->window_type != GDK_WINDOW_CHILD)) +- { +- GdkWindowChildHandlerData *data; +- +- data = g_object_get_data (G_OBJECT (private->parent), +- "gdk-window-child-handler"); +- +- if (data) +- (*data->get_pos) (window, &x, &y, data->user_data); +- } +- +- gdk_window_move_resize (window, x, y, width, height); +-} +- +-void + _gdk_directfb_move_resize_child (GdkWindow *window, + gint x, + gint y, +@@ -1439,12 +1370,13 @@ _gdk_directfb_move_resize_child (GdkWind + } + } + +-void +-gdk_window_move_resize (GdkWindow *window, +- gint x, +- gint y, +- gint width, +- gint height) ++static void ++gdk_directfb_window_move_resize (GdkWindow *window, ++ gboolean with_move, ++ gint x, ++ gint y, ++ gint width, ++ gint height) + { + GdkWindowObject *private; + GdkWindowImplDirectFB *impl; +@@ -1510,11 +1442,11 @@ gdk_window_move_resize (GdkWindow *windo + } + } + +-void +-_gdk_window_reparent (GdkWindow *window, +- GdkWindow *new_parent, +- gint x, +- gint y) ++static gboolean ++gdk_directfb_window_reparent (GdkWindow *window, ++ GdkWindow *new_parent, ++ gint x, ++ gint y) + { + GdkWindowObject *window_private; + GdkWindowObject *parent_private; +@@ -1523,10 +1455,10 @@ _gdk_window_reparent (GdkWindow *window, + GdkWindowImplDirectFB *parent_impl; + GdkVisual *visual; + +- g_return_if_fail (GDK_IS_WINDOW (window)); ++ g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); + + if (GDK_WINDOW_DESTROYED (window)) +- return; ++ return FALSE; + + if (!new_parent) + new_parent = _gdk_parent_root; +@@ -1539,7 +1471,7 @@ _gdk_window_reparent (GdkWindow *window, + + /* already parented */ + if( window_private->parent == (GdkWindowObject *)new_parent ) +- return; ++ return FALSE; + + window_private->parent = (GdkWindowObject *) new_parent; + +@@ -1593,7 +1525,7 @@ _gdk_window_reparent (GdkWindow *window, + { + g_assert(0); + _gdk_window_destroy (window, FALSE); +- return; ++ return FALSE; + } + /* we hold a reference count on ourselves */ + g_object_ref (window); +@@ -1609,14 +1541,17 @@ _gdk_window_reparent (GdkWindow *window, + &rect, + &impl->drawable.surface); + } ++ ++ return TRUE; + } + +-void +-_gdk_windowing_window_clear_area (GdkWindow *window, +- gint x, +- gint y, +- gint width, +- gint height) ++static void ++gdk_directfb_window_clear_area (GdkWindow *window, ++ gint x, ++ gint y, ++ gint width, ++ gint height, ++ gboolean send_expose) + { + GdkWindowObject *private; + GdkDrawableImplDirectFB *impl; +@@ -1700,51 +1635,8 @@ _gdk_windowing_window_clear_area (GdkWin + g_object_unref (gc); + } + +-void +-_gdk_windowing_window_clear_area_e (GdkWindow *window, +- gint x, +- gint y, +- gint width, +- gint height) +-{ +- GdkRectangle rect; +- GdkWindowObject *private; +- GdkWindowImplDirectFB *impl; +- +- D_DEBUG_AT( GDKDFB_Window, "%s( %p, %4d,%4d-%4dx%4d )\n", __FUNCTION__, window, x, y, width, height ); +- +- g_return_if_fail (GDK_IS_WINDOW (window)); +- +- private = GDK_WINDOW_OBJECT (window); +- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); +- +- /** +- Follow XClearArea definition for zero height width +- **/ +- if( width == 0 ) +- width = impl->drawable.width-x; +- if( height == 0 ) +- height = impl->drawable.height-y; +- +- rect.x = x; +- rect.y = y; +- rect.width = width; +- rect.height = height; +- +- g_return_if_fail (GDK_IS_WINDOW (window)); +- +- if (GDK_WINDOW_DESTROYED (window)) { +- D_DEBUG_AT( GDKDFB_Window, " -> DESTROYED!\n" ); +- return; +- } +- +- _gdk_windowing_window_clear_area (window, x, y, width, height); +- +- gdk_window_invalidate_rect (window, &rect, TRUE); +-} +- +-void +-gdk_window_raise (GdkWindow *window) ++static void ++gdk_window_directfb_raise (GdkWindow *window) + { + GdkWindowImplDirectFB *impl; + +@@ -1774,8 +1666,8 @@ gdk_window_raise (GdkWindow *window) + } + } + +-void +-gdk_window_lower (GdkWindow *window) ++static void ++gdk_window_directfb_lower (GdkWindow *window) + { + GdkWindowImplDirectFB *impl; + +@@ -1875,9 +1767,9 @@ gdk_window_set_role (GdkWindow *window + * Since: 2.12 + * + **/ +-void ++void + gdk_window_set_startup_id (GdkWindow *window, +- const gchar *startup_id) ++ const gchar *startup_id) + { + } + +@@ -1907,9 +1799,9 @@ gdk_window_set_transient_for (GdkWindow + root->children = g_list_insert (root->children, window, i); + } + +-void +-gdk_window_set_background (GdkWindow *window, +- const GdkColor *color) ++static void ++gdk_directfb_window_set_background (GdkWindow *window, ++ const GdkColor *color) + { + GdkWindowObject *private; + +@@ -1930,10 +1822,10 @@ gdk_window_set_background (GdkWindow *wi + private->bg_pixmap = NULL; + } + +-void +-gdk_window_set_back_pixmap (GdkWindow *window, +- GdkPixmap *pixmap, +- gint parent_relative) ++static void ++gdk_directfb_window_set_back_pixmap (GdkWindow *window, ++ GdkPixmap *pixmap, ++ gboolean parent_relative) + { + GdkWindowObject *private; + GdkPixmap *old_pixmap; +@@ -1972,9 +1864,9 @@ gdk_window_set_back_pixmap (GdkWindow *w + } + } + +-void +-gdk_window_set_cursor (GdkWindow *window, +- GdkCursor *cursor) ++static void ++gdk_directfb_window_set_cursor (GdkWindow *window, ++ GdkCursor *cursor) + { + GdkWindowImplDirectFB *impl; + GdkCursor *old_cursor; +@@ -2011,13 +1903,13 @@ gdk_window_set_cursor (GdkWindow *window + gdk_cursor_unref (old_cursor); + } + +-void +-gdk_window_get_geometry (GdkWindow *window, +- gint *x, +- gint *y, +- gint *width, +- gint *height, +- gint *depth) ++static void ++gdk_directfb_window_get_geometry (GdkWindow *window, ++ gint *x, ++ gint *y, ++ gint *width, ++ gint *height, ++ gint *depth) + { + GdkWindowObject *private; + GdkDrawableImplDirectFB *impl; +@@ -2078,10 +1970,10 @@ _gdk_directfb_calc_abs (GdkWindow *windo + } + } + +-gboolean +-gdk_window_get_origin (GdkWindow *window, +- gint *x, +- gint *y) ++static gboolean ++gdk_directfb_window_get_origin (GdkWindow *window, ++ gint *x, ++ gint *y) + { + g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); + +@@ -2215,8 +2107,8 @@ _gdk_windowing_window_get_pointer (displ + + } + +-GdkEventMask +-gdk_window_get_events (GdkWindow *window) ++static GdkEventMask ++gdk_directfb_window_get_events (GdkWindow *window) + { + g_return_val_if_fail (GDK_IS_WINDOW (window), 0); + +@@ -2226,9 +2118,9 @@ gdk_window_get_events (GdkWindow *window + return GDK_WINDOW_OBJECT (window)->event_mask; + } + +-void +-gdk_window_set_events (GdkWindow *window, +- GdkEventMask event_mask) ++static void ++gdk_directfb_window_set_events (GdkWindow *window, ++ GdkEventMask event_mask) + { + g_return_if_fail (GDK_IS_WINDOW (window)); + +@@ -2240,27 +2132,27 @@ gdk_window_set_events (GdkWindow *win + GDK_WINDOW_OBJECT (window)->event_mask = event_mask; + } + +-void +-gdk_window_shape_combine_mask (GdkWindow *window, +- GdkBitmap *mask, +- gint x, +- gint y) ++static void ++gdk_directfb_window_shape_combine_mask (GdkWindow *window, ++ GdkBitmap *mask, ++ gint x, ++ gint y) + { + } + + void + gdk_window_input_shape_combine_mask (GdkWindow *window, +- GdkBitmap *mask, +- gint x, +- gint y) ++ GdkBitmap *mask, ++ gint x, ++ gint y) + { + } + +-void +-gdk_window_shape_combine_region (GdkWindow *window, +- const GdkRegion *shape_region, +- gint offset_x, +- gint offset_y) ++static void ++gdk_directfb_window_shape_combine_region (GdkWindow *window, ++ const GdkRegion *shape_region, ++ gint offset_x, ++ gint offset_y) + { + } + +@@ -2584,13 +2476,13 @@ gdk_window_set_functions (GdkWindow + g_message("unimplemented %s", __FUNCTION__); + } + +-void +-gdk_window_set_child_shapes (GdkWindow *window) ++static void ++gdk_directfb_window_set_child_shapes (GdkWindow *window) + { + } + +-void +-gdk_window_merge_child_shapes (GdkWindow *window) ++static void ++gdk_directfb_window_merge_child_shapes (GdkWindow *window) + { + } + +@@ -2604,9 +2496,9 @@ gdk_window_merge_child_input_shapes (Gdk + { + } + +-gboolean +-gdk_window_set_static_gravities (GdkWindow *window, +- gboolean use_static) ++static gboolean ++gdk_directfb_window_set_static_gravities (GdkWindow *window, ++ gboolean use_static) + { + g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); + +@@ -3153,11 +3045,11 @@ gdk_window_impl_directfb_begin_paint_reg + + D_DEBUG_AT( GDKDFB_Window, " -> [%2d] %4d,%4d-%4dx%4d\n", i, GDKDFB_RECTANGLE_VALS_FROM_BOX( box ) ); + +- _gdk_windowing_window_clear_area (GDK_WINDOW(wimpl->gdkWindow), +- box->x1, +- box->y1, +- box->x2 - box->x1, +- box->y2 - box->y1); ++ gdk_window_clear_area (GDK_WINDOW(wimpl->gdkWindow), ++ box->x1, ++ box->y1, ++ box->x2 - box->x1, ++ box->y2 - box->y1); + } + } + +@@ -3281,6 +3173,33 @@ _gdk_windowing_window_set_composited (Gd + { + } + ++static void ++gdk_window_impl_iface_init (GdkWindowImplIface *iface) ++{ ++ iface->show = gdk_directfb_window_show; ++ iface->hide = gdk_directfb_window_hide; ++ iface->withdraw = gdk_directfb_window_withdraw; ++ iface->raise = gdk_window_directfb_raise; ++ iface->lower = gdk_window_directfb_lower; ++ iface->move_resize = gdk_directfb_window_move_resize; ++ iface->move_region = _gdk_directfb_window_move_region; ++ iface->scroll = _gdk_directfb_window_scroll; ++ iface->clear_area = gdk_directfb_window_clear_area; ++ iface->set_background = gdk_directfb_window_set_background; ++ iface->set_back_pixmap = gdk_directfb_window_set_back_pixmap; ++ iface->get_events = gdk_directfb_window_get_events; ++ iface->set_events = gdk_directfb_window_set_events; ++ iface->reparent = gdk_directfb_window_reparent; ++ iface->set_cursor = gdk_directfb_window_set_cursor; ++ iface->get_geometry = gdk_directfb_window_get_geometry; ++ iface->get_origin = gdk_directfb_window_get_origin; ++ iface->get_offsets = _gdk_directfb_window_get_offsets; ++ iface->shape_combine_mask = gdk_directfb_window_shape_combine_mask; ++ iface->shape_combine_region = gdk_directfb_window_shape_combine_region; ++ iface->set_child_shapes = gdk_directfb_window_set_child_shapes; ++ iface->merge_child_shapes = gdk_directfb_window_merge_child_shapes; ++ iface->set_static_gravities = gdk_directfb_window_set_static_gravities; ++} + + #define __GDK_WINDOW_X11_C__ + #include "gdkaliasdef.c" +Index: gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkprivate-directfb.h 2009-01-07 17:33:47.000000000 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h 2009-02-17 23:13:41.698583177 +0100 +@@ -172,6 +172,17 @@ void gdk_directfb_window_id_table + void gdk_directfb_window_id_table_remove (DFBWindowID dfb_id); + GdkWindow * gdk_directfb_window_id_table_lookup (DFBWindowID dfb_id); + ++void _gdk_directfb_window_get_offsets (GdkWindow *window, ++ gint *x_offset, ++ gint *y_offset); ++void _gdk_directfb_window_scroll (GdkWindow *window, ++ gint dx, ++ gint dy); ++void _gdk_directfb_window_move_region (GdkWindow *window, ++ const GdkRegion *region, ++ gint dx, ++ gint dy); ++ + + typedef struct + { diff --git a/debian/patches/071_correct_directfb_declarations.patch b/debian/patches/071_correct_directfb_declarations.patch deleted file mode 100644 index 3cf2379248..0000000000 --- a/debian/patches/071_correct_directfb_declarations.patch +++ /dev/null @@ -1,300 +0,0 @@ -Index: gtk+2.0-2.14.0/gdk/directfb/gdkgeometry-directfb.c -=================================================================== ---- gtk+2.0-2.14.0.orig/gdk/directfb/gdkgeometry-directfb.c 2008-09-04 06:36:10.000000000 +0200 -+++ gtk+2.0-2.14.0/gdk/directfb/gdkgeometry-directfb.c 2008-09-05 00:36:42.000000000 +0200 -@@ -69,7 +69,7 @@ - * brings in from offscreen areas are invalidated. - **/ - void --gdk_window_scroll (GdkWindow *window, -+_gdk_directfb_window_scroll (GdkWindow *window, - gint dx, - gint dy) - { -@@ -161,7 +161,7 @@ - * Since: 2.8 - **/ - void --gdk_window_move_region (GdkWindow *window, -+_gdk_directfb_window_move_region (GdkWindow *window, - const GdkRegion *region, - gint dx, - gint dy) -Index: gtk+2.0-2.14.0/gdk/directfb/gdkwindow-directfb.c -=================================================================== ---- gtk+2.0-2.14.0.orig/gdk/directfb/gdkwindow-directfb.c 2008-09-04 06:36:10.000000000 +0200 -+++ gtk+2.0-2.14.0/gdk/directfb/gdkwindow-directfb.c 2008-09-05 00:36:42.000000000 +0200 -@@ -33,6 +33,7 @@ - - #include "config.h" - #include "gdk.h" -+#include "gdkwindowimpl.h" - #include "gdkwindow.h" - - #include "gdkdirectfb.h" -@@ -67,6 +68,8 @@ - static void gdk_window_impl_directfb_class_init (GdkWindowImplDirectFBClass *klass); - static void gdk_window_impl_directfb_finalize (GObject *object); - -+static void gdk_window_impl_iface_init (GdkWindowImplIface *iface); -+ - typedef struct - { - GdkWindowChildChanged changed; -@@ -220,6 +223,13 @@ - NULL - }; - -+ const GInterfaceInfo window_impl_info = -+ { -+ (GInterfaceInitFunc) gdk_window_impl_iface_init, -+ NULL, -+ NULL -+ }; -+ - object_type = g_type_register_static (GDK_TYPE_DRAWABLE_IMPL_DIRECTFB, - "GdkWindowImplDirectFB", - &object_info, 0); -@@ -227,6 +237,9 @@ - GDK_TYPE_PAINTABLE, - &paintable_info); - -+ g_type_add_interface_static (object_type, -+ GDK_TYPE_WINDOW_IMPL, -+ &window_impl_info); - } - - return object_type; -@@ -406,6 +419,7 @@ - - _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL); - private = GDK_WINDOW_OBJECT (_gdk_parent_root); -+ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL); - impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); - - private->window_type = GDK_WINDOW_ROOT; -@@ -1231,7 +1245,7 @@ - } - - void --gdk_window_show_unraised (GdkWindow *window) -+gdk_directfb_window_show_unraised (GdkWindow *window) - { - g_return_if_fail (GDK_IS_WINDOW (window)); - -@@ -1241,7 +1255,7 @@ - } - - void --gdk_window_show (GdkWindow *window) -+gdk_directfb_window_show (GdkWindow *window) - { - g_return_if_fail (GDK_IS_WINDOW (window)); - -@@ -1251,7 +1265,7 @@ - } - - void --gdk_window_hide (GdkWindow *window) -+gdk_directfb_window_hide (GdkWindow *window) - { - GdkWindowObject *private; - GdkWindowImplDirectFB *impl; -@@ -1300,7 +1314,7 @@ - } - - void --gdk_window_withdraw (GdkWindow *window) -+gdk_directfb_window_withdraw (GdkWindow *window) - { - g_return_if_fail (GDK_IS_WINDOW (window)); - -@@ -1309,7 +1323,7 @@ - } - - void --gdk_window_move (GdkWindow *window, -+gdk_directfb_window_move (GdkWindow *window, - gint x, - gint y) - { -@@ -1354,7 +1368,7 @@ - } - - void --gdk_window_resize (GdkWindow *window, -+gdk_directfb_window_resize (GdkWindow *window, - gint width, - gint height) - { -@@ -1440,7 +1454,7 @@ - } - - void --gdk_window_move_resize (GdkWindow *window, -+gdk_directfb_window_move_resize (GdkWindow *window, - gint x, - gint y, - gint width, -@@ -1511,7 +1525,7 @@ - } - - void --_gdk_window_reparent (GdkWindow *window, -+gdk_directfb_window_reparent (GdkWindow *window, - GdkWindow *new_parent, - gint x, - gint y) -@@ -1744,7 +1758,7 @@ - } - - void --gdk_window_raise (GdkWindow *window) -+gdk_window_directfb_raise (GdkWindow *window) - { - GdkWindowImplDirectFB *impl; - -@@ -1775,7 +1789,7 @@ - } - - void --gdk_window_lower (GdkWindow *window) -+gdk_window_directfb_lower (GdkWindow *window) - { - GdkWindowImplDirectFB *impl; - -@@ -1908,7 +1922,7 @@ - } - - void --gdk_window_set_background (GdkWindow *window, -+gdk_directfb_window_set_background (GdkWindow *window, - const GdkColor *color) - { - GdkWindowObject *private; -@@ -1931,7 +1945,7 @@ - } - - void --gdk_window_set_back_pixmap (GdkWindow *window, -+gdk_directfb_window_set_back_pixmap (GdkWindow *window, - GdkPixmap *pixmap, - gint parent_relative) - { -@@ -1973,7 +1987,7 @@ - } - - void --gdk_window_set_cursor (GdkWindow *window, -+gdk_directfb_window_set_cursor (GdkWindow *window, - GdkCursor *cursor) - { - GdkWindowImplDirectFB *impl; -@@ -2012,7 +2026,7 @@ - } - - void --gdk_window_get_geometry (GdkWindow *window, -+gdk_directfb_window_get_geometry (GdkWindow *window, - gint *x, - gint *y, - gint *width, -@@ -2079,7 +2093,7 @@ - } - - gboolean --gdk_window_get_origin (GdkWindow *window, -+gdk_directfb_window_get_origin (GdkWindow *window, - gint *x, - gint *y) - { -@@ -2216,7 +2230,7 @@ - } - - GdkEventMask --gdk_window_get_events (GdkWindow *window) -+gdk_directfb_window_get_events (GdkWindow *window) - { - g_return_val_if_fail (GDK_IS_WINDOW (window), 0); - -@@ -2227,7 +2241,7 @@ - } - - void --gdk_window_set_events (GdkWindow *window, -+gdk_directfb_window_set_events (GdkWindow *window, - GdkEventMask event_mask) - { - g_return_if_fail (GDK_IS_WINDOW (window)); -@@ -2241,7 +2255,7 @@ - } - - void --gdk_window_shape_combine_mask (GdkWindow *window, -+gdk_directfb_window_shape_combine_mask (GdkWindow *window, - GdkBitmap *mask, - gint x, - gint y) -@@ -2257,7 +2271,7 @@ - } - - void --gdk_window_shape_combine_region (GdkWindow *window, -+gdk_directfb_window_shape_combine_region (GdkWindow *window, - const GdkRegion *shape_region, - gint offset_x, - gint offset_y) -@@ -2585,12 +2599,12 @@ - } - - void --gdk_window_set_child_shapes (GdkWindow *window) -+gdk_directfb_window_set_child_shapes (GdkWindow *window) - { - } - - void --gdk_window_merge_child_shapes (GdkWindow *window) -+gdk_directfb_window_merge_child_shapes (GdkWindow *window) - { - } - -@@ -2605,7 +2619,7 @@ - } - - gboolean --gdk_window_set_static_gravities (GdkWindow *window, -+gdk_directfb_window_set_static_gravities (GdkWindow *window, - gboolean use_static) - { - g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); -@@ -3281,6 +3295,29 @@ - { - } - -+static void -+gdk_window_impl_iface_init (GdkWindowImplIface *iface) -+{ -+ iface->show = gdk_directfb_window_show; -+ iface->hide = gdk_directfb_window_hide; -+ iface->withdraw = gdk_directfb_window_withdraw; -+ iface->set_events = gdk_directfb_window_set_events; -+ iface->get_events = gdk_directfb_window_get_events; -+ iface->raise = gdk_window_directfb_raise; -+ iface->lower = gdk_window_directfb_lower; -+ iface->move_resize = gdk_directfb_window_move_resize; -+ iface->set_background = gdk_directfb_window_set_background; -+ iface->set_back_pixmap = gdk_directfb_window_set_back_pixmap; -+ iface->reparent = gdk_directfb_window_reparent; -+ iface->set_cursor = gdk_directfb_window_set_cursor; -+ iface->get_geometry = gdk_directfb_window_get_geometry; -+ iface->get_origin = gdk_directfb_window_get_origin; -+ iface->shape_combine_mask = gdk_directfb_window_shape_combine_mask; -+ iface->shape_combine_region = gdk_directfb_window_shape_combine_region; -+ iface->set_child_shapes = gdk_directfb_window_set_child_shapes; -+ iface->merge_child_shapes = gdk_directfb_window_merge_child_shapes; -+ iface->set_static_gravities = gdk_directfb_window_set_static_gravities; -+} - - #define __GDK_WINDOW_X11_C__ - #include "gdkaliasdef.c" diff --git a/debian/patches/series b/debian/patches/series index cf427b55e9..c1e5103e51 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,6 @@ 003_gdk.pc_privates.patch 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch 005_xpmico.patch -#006_proper-directfb-modules.patch 009_gtk-export-filechooser.patch 010_gdkpixbuf_-lm.patch 015_default-fallback-icon-theme.patch @@ -12,12 +11,12 @@ 022_module-files-append-compat-module-files-d.patch 030_gtkentry_password-char-circle.patch 031_directfb_dead-keys.patch +032_gdkwindowimpl_directfb.patch 041_ia32-libs.patch 042_treeview_single-focus.patch 060_ignore-random-icons.patch 070_mandatory-relibtoolize.patch 071_jasper_link_fix.patch -071_correct_directfb_declarations.patch 072_workaround_directfb_build.patch 091_workaround_no_gtk_init_incorrect_display.patch 092_fix_printtest_include.patch From 94db1e1a57714390a0db0fa8cc67870b15713600 Mon Sep 17 00:00:00 2001 From: Josselin Mouette <joss@debian.org> Date: Wed, 18 Feb 2009 12:48:49 +0000 Subject: [PATCH 28/29] 032_gdkwindowimpl_directfb.patch: new version of the patch. This should restore the basic functionality of the backend, but there is still work underway. --- debian/changelog | 8 + .../patches/032_gdkwindowimpl_directfb.patch | 147 ++++++++++++++---- 2 files changed, 128 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0678218058..aa2bcc58d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gtk+2.0 (2.14.7-3) UNRELEASED; urgency=low + + * 032_gdkwindowimpl_directfb.patch: new version of the patch. This + should restore the basic functionality of the backend, but there is + still work underway. + + -- Josselin Mouette <joss@debian.org> Wed, 18 Feb 2009 13:47:56 +0100 + gtk+2.0 (2.14.7-2) experimental; urgency=low * 008_implicit_pointer_conversion_gdkgc_directfb.patch: removed, it’s diff --git a/debian/patches/032_gdkwindowimpl_directfb.patch b/debian/patches/032_gdkwindowimpl_directfb.patch index 2bcf0211fa..7929db84af 100644 --- a/debian/patches/032_gdkwindowimpl_directfb.patch +++ b/debian/patches/032_gdkwindowimpl_directfb.patch @@ -3,8 +3,8 @@ Based on the original Ubuntu patch for 2.12. Index: gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c =================================================================== ---- gtk+-2.14.7.orig/gdk/directfb/gdkgeometry-directfb.c 2009-01-07 17:33:47.000000000 +0100 -+++ gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c 2009-02-17 23:13:41.682584286 +0100 +--- gtk+-2.14.7.orig/gdk/directfb/gdkgeometry-directfb.c 2009-02-17 23:15:22.211082251 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c 2009-02-18 13:47:09.751083146 +0100 @@ -41,9 +41,9 @@ @@ -48,8 +48,8 @@ Index: gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c GdkDrawableImplDirectFB *impl; Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c =================================================================== ---- gtk+-2.14.7.orig/gdk/directfb/gdkwindow-directfb.c 2009-01-07 17:33:47.000000000 +0100 -+++ gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c 2009-02-17 23:13:41.698583177 +0100 +--- gtk+-2.14.7.orig/gdk/directfb/gdkwindow-directfb.c 2009-02-17 23:15:22.195084338 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c 2009-02-18 13:47:16.162587960 +0100 @@ -33,6 +33,7 @@ #include "config.h" @@ -276,7 +276,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c _gdk_directfb_move_resize_child (GdkWindow *window, gint x, gint y, -@@ -1439,12 +1370,13 @@ _gdk_directfb_move_resize_child (GdkWind +@@ -1439,12 +1370,58 @@ _gdk_directfb_move_resize_child (GdkWind } } @@ -286,6 +286,51 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c - gint y, - gint width, - gint height) ++static void ++gdk_directfb_window_move (GdkWindow *window, ++ gint x, ++ gint y) ++{ ++ GdkWindowObject *private; ++ GdkWindowImplDirectFB *impl; ++ ++ g_return_if_fail (GDK_IS_WINDOW (window)); ++ ++ private = GDK_WINDOW_OBJECT (window); ++ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); ++ ++ if (impl->window) ++ { ++ private->x = x; ++ private->y = y; ++ impl->window->MoveTo (impl->window, x, y); ++ } ++ else ++ { ++ gint width=impl->drawable.width; ++ gint height=impl->drawable.height; ++ GdkRectangle old = ++ { private->x, private->y,width,height }; ++ ++ _gdk_directfb_move_resize_child (window, x, y, width, height); ++ _gdk_directfb_calc_abs (window); ++ ++ if (GDK_WINDOW_IS_MAPPED (private)) ++ { ++ GdkWindow *mousewin; ++ GdkRectangle new = { x, y, width, height }; ++ ++ gdk_rectangle_union (&new, &old, &new); ++ gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE); ++ ++ /* The window the pointer is in might have changed */ ++ mousewin = gdk_window_at_pointer (NULL, NULL); ++ gdk_directfb_window_send_crossing_events (NULL, mousewin, ++ GDK_CROSSING_NORMAL); ++ } ++ } ++} ++ +static void +gdk_directfb_window_move_resize (GdkWindow *window, + gboolean with_move, @@ -296,7 +341,55 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; GdkWindowImplDirectFB *impl; -@@ -1510,11 +1442,11 @@ gdk_window_move_resize (GdkWindow *windo +@@ -1478,26 +1455,38 @@ gdk_window_move_resize (GdkWindow *windo + + if (impl->drawable.width == width && impl->drawable.height == height) + { +- gdk_window_move (window, x, y); ++ if (with_move) ++ gdk_directfb_window_move (window, x, y); + } + else if (impl->window) + { +- private->x = x; +- private->y = y; +- impl->window->MoveTo (impl->window, x, y); ++ private->x = x; ++ private->y = y; ++ impl->drawable.width = width; ++ impl->drawable.height = height; ++ ++ if (with_move) ++ impl->window->MoveTo (impl->window, x, y); + impl->window->Resize (impl->window, width, height); + } + else + { +- GdkRectangle old = +- { private->x, private->y, impl->drawable.width, impl->drawable.height }; +- _gdk_directfb_move_resize_child (window, x, y, width, height); ++ GdkRectangle old = { private->x, private->y, impl->drawable.width, impl->drawable.height }; ++ GdkRectangle new = { x, y, width, height }; ++ ++ if (! with_move) ++ { ++ new.x = private->x; ++ new.y = private->y; ++ } ++ ++ _gdk_directfb_move_resize_child (window, ++ new.x, new.y, new.width, new.height); + _gdk_directfb_calc_abs (window); + + if (GDK_WINDOW_IS_MAPPED (private)) + { +- GdkWindow *mousewin; +- GdkRectangle new = { x, y, width, height }; ++ GdkWindow *mousewin; + + gdk_rectangle_union (&new, &old, &new); + gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE); +@@ -1510,11 +1499,11 @@ gdk_window_move_resize (GdkWindow *windo } } @@ -313,7 +406,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *window_private; GdkWindowObject *parent_private; -@@ -1523,10 +1455,10 @@ _gdk_window_reparent (GdkWindow *window, +@@ -1523,10 +1512,10 @@ _gdk_window_reparent (GdkWindow *window, GdkWindowImplDirectFB *parent_impl; GdkVisual *visual; @@ -326,7 +419,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c if (!new_parent) new_parent = _gdk_parent_root; -@@ -1539,7 +1471,7 @@ _gdk_window_reparent (GdkWindow *window, +@@ -1539,7 +1528,7 @@ _gdk_window_reparent (GdkWindow *window, /* already parented */ if( window_private->parent == (GdkWindowObject *)new_parent ) @@ -335,7 +428,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c window_private->parent = (GdkWindowObject *) new_parent; -@@ -1593,7 +1525,7 @@ _gdk_window_reparent (GdkWindow *window, +@@ -1593,7 +1582,7 @@ _gdk_window_reparent (GdkWindow *window, { g_assert(0); _gdk_window_destroy (window, FALSE); @@ -344,7 +437,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c } /* we hold a reference count on ourselves */ g_object_ref (window); -@@ -1609,14 +1541,17 @@ _gdk_window_reparent (GdkWindow *window, +@@ -1609,14 +1598,17 @@ _gdk_window_reparent (GdkWindow *window, &rect, &impl->drawable.surface); } @@ -368,7 +461,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; GdkDrawableImplDirectFB *impl; -@@ -1700,51 +1635,8 @@ _gdk_windowing_window_clear_area (GdkWin +@@ -1700,51 +1692,8 @@ _gdk_windowing_window_clear_area (GdkWin g_object_unref (gc); } @@ -422,7 +515,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowImplDirectFB *impl; -@@ -1774,8 +1666,8 @@ gdk_window_raise (GdkWindow *window) +@@ -1774,8 +1723,8 @@ gdk_window_raise (GdkWindow *window) } } @@ -433,7 +526,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowImplDirectFB *impl; -@@ -1875,9 +1767,9 @@ gdk_window_set_role (GdkWindow *window +@@ -1875,9 +1824,9 @@ gdk_window_set_role (GdkWindow *window * Since: 2.12 * **/ @@ -445,7 +538,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { } -@@ -1907,9 +1799,9 @@ gdk_window_set_transient_for (GdkWindow +@@ -1907,9 +1856,9 @@ gdk_window_set_transient_for (GdkWindow root->children = g_list_insert (root->children, window, i); } @@ -458,7 +551,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; -@@ -1930,10 +1822,10 @@ gdk_window_set_background (GdkWindow *wi +@@ -1930,10 +1879,10 @@ gdk_window_set_background (GdkWindow *wi private->bg_pixmap = NULL; } @@ -473,7 +566,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; GdkPixmap *old_pixmap; -@@ -1972,9 +1864,9 @@ gdk_window_set_back_pixmap (GdkWindow *w +@@ -1972,9 +1921,9 @@ gdk_window_set_back_pixmap (GdkWindow *w } } @@ -486,7 +579,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowImplDirectFB *impl; GdkCursor *old_cursor; -@@ -2011,13 +1903,13 @@ gdk_window_set_cursor (GdkWindow *window +@@ -2011,13 +1960,13 @@ gdk_window_set_cursor (GdkWindow *window gdk_cursor_unref (old_cursor); } @@ -507,7 +600,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; GdkDrawableImplDirectFB *impl; -@@ -2078,10 +1970,10 @@ _gdk_directfb_calc_abs (GdkWindow *windo +@@ -2078,10 +2027,10 @@ _gdk_directfb_calc_abs (GdkWindow *windo } } @@ -522,7 +615,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); -@@ -2215,8 +2107,8 @@ _gdk_windowing_window_get_pointer (displ +@@ -2215,8 +2164,8 @@ _gdk_windowing_window_get_pointer (displ } @@ -533,7 +626,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { g_return_val_if_fail (GDK_IS_WINDOW (window), 0); -@@ -2226,9 +2118,9 @@ gdk_window_get_events (GdkWindow *window +@@ -2226,9 +2175,9 @@ gdk_window_get_events (GdkWindow *window return GDK_WINDOW_OBJECT (window)->event_mask; } @@ -546,7 +639,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { g_return_if_fail (GDK_IS_WINDOW (window)); -@@ -2240,27 +2132,27 @@ gdk_window_set_events (GdkWindow *win +@@ -2240,27 +2189,27 @@ gdk_window_set_events (GdkWindow *win GDK_WINDOW_OBJECT (window)->event_mask = event_mask; } @@ -587,7 +680,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { } -@@ -2584,13 +2476,13 @@ gdk_window_set_functions (GdkWindow +@@ -2584,13 +2533,13 @@ gdk_window_set_functions (GdkWindow g_message("unimplemented %s", __FUNCTION__); } @@ -605,7 +698,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { } -@@ -2604,9 +2496,9 @@ gdk_window_merge_child_input_shapes (Gdk +@@ -2604,9 +2553,9 @@ gdk_window_merge_child_input_shapes (Gdk { } @@ -618,7 +711,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); -@@ -3153,11 +3045,11 @@ gdk_window_impl_directfb_begin_paint_reg +@@ -3153,11 +3102,11 @@ gdk_window_impl_directfb_begin_paint_reg D_DEBUG_AT( GDKDFB_Window, " -> [%2d] %4d,%4d-%4dx%4d\n", i, GDKDFB_RECTANGLE_VALS_FROM_BOX( box ) ); @@ -635,7 +728,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c } } -@@ -3281,6 +3173,33 @@ _gdk_windowing_window_set_composited (Gd +@@ -3281,6 +3230,33 @@ _gdk_windowing_window_set_composited (Gd { } @@ -671,8 +764,8 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c #include "gdkaliasdef.c" Index: gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h =================================================================== ---- gtk+-2.14.7.orig/gdk/directfb/gdkprivate-directfb.h 2009-01-07 17:33:47.000000000 +0100 -+++ gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h 2009-02-17 23:13:41.698583177 +0100 +--- gtk+-2.14.7.orig/gdk/directfb/gdkprivate-directfb.h 2009-02-17 23:15:22.187084160 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h 2009-02-18 13:47:09.820439866 +0100 @@ -172,6 +172,17 @@ void gdk_directfb_window_id_table void gdk_directfb_window_id_table_remove (DFBWindowID dfb_id); GdkWindow * gdk_directfb_window_id_table_lookup (DFBWindowID dfb_id); From 945c207f91ebb3c70691a3899f8ac95638c00531 Mon Sep 17 00:00:00 2001 From: Josselin Mouette <joss@debian.org> Date: Sat, 21 Feb 2009 14:00:34 +0000 Subject: [PATCH 29/29] * 033_directfb_client-message.patch: stolen from the upstream SVN. Fix the DirectFB client_message API. * 034_directfb_memleak.patch: stolen from the upstream SVN. Fix memory leak in the DirectFB code. * Require DirectFB 1.0.0 for the 034 patch. * 070_mandatory-relibtoolize.patch: updated accordingly. --- debian/changelog | 10 +- debian/control | 2 +- debian/control.in | 2 +- .../patches/032_gdkwindowimpl_directfb.patch | 188 +- .../patches/033_directfb_client-message.patch | 72 + debian/patches/034_directfb_memleak.patch | 117 + .../patches/070_mandatory-relibtoolize.patch | 79023 +++++----------- debian/patches/series | 2 + 8 files changed, 23802 insertions(+), 55614 deletions(-) create mode 100644 debian/patches/033_directfb_client-message.patch create mode 100644 debian/patches/034_directfb_memleak.patch diff --git a/debian/changelog b/debian/changelog index aa2bcc58d4..4d16cdbb9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ -gtk+2.0 (2.14.7-3) UNRELEASED; urgency=low +gtk+2.0 (2.14.7-3) experimental; urgency=low * 032_gdkwindowimpl_directfb.patch: new version of the patch. This should restore the basic functionality of the backend, but there is still work underway. + * 033_directfb_client-message.patch: stolen from the upstream SVN. Fix + the DirectFB client_message API. + * 034_directfb_memleak.patch: stolen from the upstream SVN. Fix memory + leak in the DirectFB code. + * Require DirectFB 1.0.0 for the 034 patch. + * 070_mandatory-relibtoolize.patch: updated accordingly. - -- Josselin Mouette <joss@debian.org> Wed, 18 Feb 2009 13:47:56 +0100 + -- Josselin Mouette <joss@debian.org> Sat, 21 Feb 2009 14:59:45 +0100 gtk+2.0 (2.14.7-2) experimental; urgency=low diff --git a/debian/control b/debian/control index 672e1ba23a..f969f295f1 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 5.0.22), chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, - libdirectfb-dev (>= 0.9.26), + libdirectfb-dev (>= 1.0.0), libcups2-dev (>= 1.2), quilt, gawk diff --git a/debian/control.in b/debian/control.in index cf6fbe4adf..877f37a8e4 100644 --- a/debian/control.in +++ b/debian/control.in @@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 5.0.22), chrpath, dpkg-dev (>= 1.13.19), x11proto-xext-dev, - libdirectfb-dev (>= 0.9.26), + libdirectfb-dev (>= 1.0.0), libcups2-dev (>= 1.2), quilt, gawk diff --git a/debian/patches/032_gdkwindowimpl_directfb.patch b/debian/patches/032_gdkwindowimpl_directfb.patch index 7929db84af..1e88ccf991 100644 --- a/debian/patches/032_gdkwindowimpl_directfb.patch +++ b/debian/patches/032_gdkwindowimpl_directfb.patch @@ -1,10 +1,13 @@ Patch from Sven Neumann to fix DirectFB support for GTK+ 2.14. Based on the original Ubuntu patch for 2.12. +GNOME #554407 +Upstream svn r22358,r22381,r22383,r22385 + Index: gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c =================================================================== ---- gtk+-2.14.7.orig/gdk/directfb/gdkgeometry-directfb.c 2009-02-17 23:15:22.211082251 +0100 -+++ gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c 2009-02-18 13:47:09.751083146 +0100 +--- gtk+-2.14.7.orig/gdk/directfb/gdkgeometry-directfb.c 2009-02-21 14:15:18.127086939 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c 2009-02-21 14:15:20.018583625 +0100 @@ -41,9 +41,9 @@ @@ -48,8 +51,8 @@ Index: gtk+-2.14.7/gdk/directfb/gdkgeometry-directfb.c GdkDrawableImplDirectFB *impl; Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c =================================================================== ---- gtk+-2.14.7.orig/gdk/directfb/gdkwindow-directfb.c 2009-02-17 23:15:22.195084338 +0100 -+++ gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c 2009-02-18 13:47:16.162587960 +0100 +--- gtk+-2.14.7.orig/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:15:18.091090046 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:54:17.138584001 +0100 @@ -33,6 +33,7 @@ #include "config.h" @@ -113,7 +116,13 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c } return object_type; -@@ -406,6 +419,7 @@ _gdk_windowing_window_init (void) +@@ -401,11 +414,11 @@ _gdk_windowing_window_init (void) + + g_assert (_gdk_parent_root == NULL); + +- _gdk_display->layer->GetConfiguration( +- _gdk_display->layer, &dlc ); ++ _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc); _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL); private = GDK_WINDOW_OBJECT (_gdk_parent_root); @@ -121,7 +130,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); private->window_type = GDK_WINDOW_ROOT; -@@ -647,8 +661,8 @@ gdk_directfb_window_new (GdkWindow +@@ -647,8 +660,8 @@ gdk_directfb_window_new (GdkWindow GdkWindow * _gdk_window_new (GdkWindow *parent, @@ -132,7 +141,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { g_return_val_if_fail (attributes != NULL, NULL); -@@ -1230,28 +1244,19 @@ show_window_internal (GdkWindow *window, +@@ -1230,28 +1243,19 @@ show_window_internal (GdkWindow *window, } } @@ -167,7 +176,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; GdkWindowImplDirectFB *impl; -@@ -1276,11 +1281,11 @@ gdk_window_hide (GdkWindow *window) +@@ -1276,11 +1280,11 @@ gdk_window_hide (GdkWindow *window) if (!private->input_only && private->parent) { @@ -184,7 +193,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c } event_win = gdk_directfb_other_event_window (window, GDK_UNMAP); -@@ -1299,8 +1304,8 @@ gdk_window_hide (GdkWindow *window) +@@ -1299,8 +1303,8 @@ gdk_window_hide (GdkWindow *window) } } @@ -195,7 +204,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { g_return_if_fail (GDK_IS_WINDOW (window)); -@@ -1309,80 +1314,6 @@ gdk_window_withdraw (GdkWindow *window) +@@ -1309,80 +1313,6 @@ gdk_window_withdraw (GdkWindow *window) } void @@ -276,7 +285,43 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c _gdk_directfb_move_resize_child (GdkWindow *window, gint x, gint y, -@@ -1439,12 +1370,58 @@ _gdk_directfb_move_resize_child (GdkWind +@@ -1407,15 +1337,17 @@ _gdk_directfb_move_resize_child (GdkWind + + if (!private->input_only) + { +- if (impl->drawable.surface) { +- GdkDrawableImplDirectFB *dimpl = GDK_DRAWABLE_IMPL_DIRECTFB (private->impl); +- if(dimpl->cairo_surface) { +- cairo_surface_destroy(dimpl->cairo_surface); +- dimpl->cairo_surface= NULL; +- } +- impl->drawable.surface->Release (impl->drawable.surface); +- impl->drawable.surface = NULL; +- } ++ if (impl->drawable.surface) ++ { ++ if (impl->drawable.cairo_surface) ++ { ++ cairo_surface_destroy (impl->drawable.cairo_surface); ++ impl->drawable.cairo_surface = NULL; ++ } ++ ++ impl->drawable.surface->Release (impl->drawable.surface); ++ impl->drawable.surface = NULL; ++ } + + parent_impl = GDK_WINDOW_IMPL_DIRECTFB (GDK_WINDOW_OBJECT (private->parent)->impl); + +@@ -1432,19 +1364,66 @@ _gdk_directfb_move_resize_child (GdkWind + for (list = private->children; list; list = list->next) + { + private = GDK_WINDOW_OBJECT (list->data); +- impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); ++ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); ++ + _gdk_directfb_move_resize_child (list->data, + private->x, private->y, + impl->drawable.width, impl->drawable.height); } } @@ -341,7 +386,23 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; GdkWindowImplDirectFB *impl; -@@ -1478,26 +1455,38 @@ gdk_window_move_resize (GdkWindow *windo +@@ -1454,8 +1433,14 @@ gdk_window_move_resize (GdkWindow *windo + private = GDK_WINDOW_OBJECT (window); + impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); + ++ if (with_move && (width < 0 && height < 0)) ++ { ++ gdk_directfb_window_move (window, x, y); ++ return; ++ } ++ + if (width < 1) +- width = 1; ++ width = 1; + if (height < 1) + height = 1; + +@@ -1478,26 +1463,39 @@ gdk_window_move_resize (GdkWindow *windo if (impl->drawable.width == width && impl->drawable.height == height) { @@ -368,7 +429,8 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c - GdkRectangle old = - { private->x, private->y, impl->drawable.width, impl->drawable.height }; - _gdk_directfb_move_resize_child (window, x, y, width, height); -+ GdkRectangle old = { private->x, private->y, impl->drawable.width, impl->drawable.height }; ++ GdkRectangle old = { private->x, private->y, ++ impl->drawable.width, impl->drawable.height }; + GdkRectangle new = { x, y, width, height }; + + if (! with_move) @@ -389,7 +451,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c gdk_rectangle_union (&new, &old, &new); gdk_window_invalidate_rect (GDK_WINDOW (private->parent), &new,TRUE); -@@ -1510,11 +1499,11 @@ gdk_window_move_resize (GdkWindow *windo +@@ -1510,11 +1508,11 @@ gdk_window_move_resize (GdkWindow *windo } } @@ -406,7 +468,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *window_private; GdkWindowObject *parent_private; -@@ -1523,10 +1512,10 @@ _gdk_window_reparent (GdkWindow *window, +@@ -1523,10 +1521,10 @@ _gdk_window_reparent (GdkWindow *window, GdkWindowImplDirectFB *parent_impl; GdkVisual *visual; @@ -419,7 +481,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c if (!new_parent) new_parent = _gdk_parent_root; -@@ -1539,7 +1528,7 @@ _gdk_window_reparent (GdkWindow *window, +@@ -1539,7 +1537,7 @@ _gdk_window_reparent (GdkWindow *window, /* already parented */ if( window_private->parent == (GdkWindowObject *)new_parent ) @@ -428,7 +490,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c window_private->parent = (GdkWindowObject *) new_parent; -@@ -1593,7 +1582,7 @@ _gdk_window_reparent (GdkWindow *window, +@@ -1593,7 +1591,7 @@ _gdk_window_reparent (GdkWindow *window, { g_assert(0); _gdk_window_destroy (window, FALSE); @@ -437,7 +499,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c } /* we hold a reference count on ourselves */ g_object_ref (window); -@@ -1609,14 +1598,17 @@ _gdk_window_reparent (GdkWindow *window, +@@ -1609,14 +1607,17 @@ _gdk_window_reparent (GdkWindow *window, &rect, &impl->drawable.surface); } @@ -461,7 +523,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; GdkDrawableImplDirectFB *impl; -@@ -1700,51 +1692,8 @@ _gdk_windowing_window_clear_area (GdkWin +@@ -1700,51 +1701,8 @@ _gdk_windowing_window_clear_area (GdkWin g_object_unref (gc); } @@ -515,7 +577,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowImplDirectFB *impl; -@@ -1774,8 +1723,8 @@ gdk_window_raise (GdkWindow *window) +@@ -1774,8 +1732,8 @@ gdk_window_raise (GdkWindow *window) } } @@ -526,7 +588,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowImplDirectFB *impl; -@@ -1875,9 +1824,9 @@ gdk_window_set_role (GdkWindow *window +@@ -1875,9 +1833,9 @@ gdk_window_set_role (GdkWindow *window * Since: 2.12 * **/ @@ -538,7 +600,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { } -@@ -1907,9 +1856,9 @@ gdk_window_set_transient_for (GdkWindow +@@ -1907,9 +1865,9 @@ gdk_window_set_transient_for (GdkWindow root->children = g_list_insert (root->children, window, i); } @@ -551,7 +613,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; -@@ -1930,10 +1879,10 @@ gdk_window_set_background (GdkWindow *wi +@@ -1930,10 +1888,10 @@ gdk_window_set_background (GdkWindow *wi private->bg_pixmap = NULL; } @@ -566,7 +628,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; GdkPixmap *old_pixmap; -@@ -1972,9 +1921,9 @@ gdk_window_set_back_pixmap (GdkWindow *w +@@ -1972,9 +1930,9 @@ gdk_window_set_back_pixmap (GdkWindow *w } } @@ -579,7 +641,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowImplDirectFB *impl; GdkCursor *old_cursor; -@@ -2011,13 +1960,13 @@ gdk_window_set_cursor (GdkWindow *window +@@ -2011,13 +1969,13 @@ gdk_window_set_cursor (GdkWindow *window gdk_cursor_unref (old_cursor); } @@ -600,7 +662,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { GdkWindowObject *private; GdkDrawableImplDirectFB *impl; -@@ -2078,10 +2027,10 @@ _gdk_directfb_calc_abs (GdkWindow *windo +@@ -2078,10 +2036,10 @@ _gdk_directfb_calc_abs (GdkWindow *windo } } @@ -615,7 +677,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); -@@ -2215,8 +2164,8 @@ _gdk_windowing_window_get_pointer (displ +@@ -2215,8 +2173,8 @@ _gdk_windowing_window_get_pointer (displ } @@ -626,7 +688,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { g_return_val_if_fail (GDK_IS_WINDOW (window), 0); -@@ -2226,9 +2175,9 @@ gdk_window_get_events (GdkWindow *window +@@ -2226,9 +2184,9 @@ gdk_window_get_events (GdkWindow *window return GDK_WINDOW_OBJECT (window)->event_mask; } @@ -639,7 +701,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { g_return_if_fail (GDK_IS_WINDOW (window)); -@@ -2240,27 +2189,27 @@ gdk_window_set_events (GdkWindow *win +@@ -2240,27 +2198,27 @@ gdk_window_set_events (GdkWindow *win GDK_WINDOW_OBJECT (window)->event_mask = event_mask; } @@ -680,7 +742,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { } -@@ -2584,13 +2533,13 @@ gdk_window_set_functions (GdkWindow +@@ -2584,13 +2542,13 @@ gdk_window_set_functions (GdkWindow g_message("unimplemented %s", __FUNCTION__); } @@ -698,7 +760,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { } -@@ -2604,9 +2553,9 @@ gdk_window_merge_child_input_shapes (Gdk +@@ -2604,9 +2562,9 @@ gdk_window_merge_child_input_shapes (Gdk { } @@ -711,7 +773,23 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c { g_return_val_if_fail (GDK_IS_WINDOW (window), FALSE); -@@ -3153,11 +3102,11 @@ gdk_window_impl_directfb_begin_paint_reg +@@ -2708,6 +2666,7 @@ GdkWindow *gdk_directfb_create_child_win + + window = g_object_new (GDK_TYPE_WINDOW, NULL); + private = GDK_WINDOW_OBJECT (window); ++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL); + parent_private = GDK_WINDOW_OBJECT (parent); + parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl); + private->parent = parent_private; +@@ -2787,6 +2746,7 @@ gdk_window_foreign_new_for_display (GdkD + /* we hold a reference count on ourselves */ + g_object_ref (window); + private = GDK_WINDOW_OBJECT (window); ++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL); + private->parent = parent_private; + private->window_type = GDK_WINDOW_TOPLEVEL; + impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); +@@ -3153,11 +3113,11 @@ gdk_window_impl_directfb_begin_paint_reg D_DEBUG_AT( GDKDFB_Window, " -> [%2d] %4d,%4d-%4dx%4d\n", i, GDKDFB_RECTANGLE_VALS_FROM_BOX( box ) ); @@ -728,7 +806,7 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c } } -@@ -3281,6 +3230,33 @@ _gdk_windowing_window_set_composited (Gd +@@ -3281,6 +3241,33 @@ _gdk_windowing_window_set_composited (Gd { } @@ -764,8 +842,8 @@ Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c #include "gdkaliasdef.c" Index: gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h =================================================================== ---- gtk+-2.14.7.orig/gdk/directfb/gdkprivate-directfb.h 2009-02-17 23:15:22.187084160 +0100 -+++ gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h 2009-02-18 13:47:09.820439866 +0100 +--- gtk+-2.14.7.orig/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:15:18.071083243 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:48:30.330588850 +0100 @@ -172,6 +172,17 @@ void gdk_directfb_window_id_table void gdk_directfb_window_id_table_remove (DFBWindowID dfb_id); GdkWindow * gdk_directfb_window_id_table_lookup (DFBWindowID dfb_id); @@ -784,3 +862,43 @@ Index: gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h typedef struct { +Index: gtk+-2.14.7/gdk/directfb/gdkdisplay-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkdisplay-directfb.c 2009-02-21 14:50:43.626587155 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkdisplay-directfb.c 2009-02-21 14:51:12.202624962 +0100 +@@ -36,14 +36,13 @@ + #include "gdkalias.h" + + +- +-extern void _gdk_visual_init (void); +-extern void _gdk_events_init (void); +-extern void _gdk_input_init (void); +-extern void _gdk_dnd_init (void); +-extern void _gdk_windowing_window_init (void); +-extern void _gdk_windowing_image_init (void); +-extern void _gdk_directfb_keyboard_init (void); ++extern void _gdk_visual_init (void); ++extern void _gdk_events_init (void); ++extern void _gdk_input_init (void); ++extern void _gdk_dnd_init (void); ++extern void _gdk_windowing_window_init (void); ++extern void _gdk_windowing_image_init (void); ++extern void _gdk_directfb_keyboard_init (void); + + static gboolean gdk_directfb_argb_font = FALSE; + static gint gdk_directfb_glyph_surface_cache = 8; +@@ -130,11 +129,10 @@ GdkDisplay * gdk_display_open (const gch + _gdk_screen = g_object_new (GDK_TYPE_SCREEN, NULL); + + _gdk_visual_init (); ++ _gdk_windowing_window_init (); + + gdk_screen_set_default_colormap (_gdk_screen, +- gdk_screen_get_system_colormap (_gdk_screen)); +- _gdk_windowing_window_init (); +- _gdk_windowing_image_init (); ++ gdk_screen_get_system_colormap (_gdk_screen)); _gdk_windowing_image_init (); + + _gdk_input_init (); + _gdk_dnd_init (); diff --git a/debian/patches/033_directfb_client-message.patch b/debian/patches/033_directfb_client-message.patch new file mode 100644 index 0000000000..a4d832cd7d --- /dev/null +++ b/debian/patches/033_directfb_client-message.patch @@ -0,0 +1,72 @@ +GNOME #560671 +Upstream svn r22364 + +Index: gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:35:01.226582685 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:35:44.242582415 +0100 +@@ -162,24 +162,22 @@ dfb_events_process_window_event (DFBWind + + static gboolean + gdk_event_send_client_message_by_window (GdkEvent *event, +- GdkWindow *window) ++ GdkWindow *window) + { +- GdkEvent *new_event; ++ DFBUserEvent evt; + + g_return_val_if_fail(event != NULL, FALSE); + g_return_val_if_fail(GDK_IS_WINDOW(window), FALSE); + +- new_event = gdk_directfb_event_make (window, GDK_CLIENT_EVENT); +- new_event->client.message_type = event->client.message_type; +- new_event->client.data_format = event->client.data_format; +- memcpy(&new_event->client.data, +- &event->client.data, +- sizeof(event->client.data)); ++ evt.clazz = DFEC_USER; ++ evt.type = GPOINTER_TO_UINT (GDK_ATOM_TO_POINTER (event->client.message_type)); ++ evt.data = (void *) event->client.data.l[0]; ++ ++ _gdk_display->buffer->PostEvent(_gdk_display->buffer, DFB_EVENT (&evt)); + + return TRUE; + } + +- + static void + dfb_events_dispatch (void) + { +@@ -230,6 +228,32 @@ dfb_events_io_func (GIOChannel *channe + else + dfb_events_process_window_event (&event->window); + break; ++ ++ case DFEC_USER: ++ { ++ GList *list; ++ ++ GDK_NOTE (EVENTS, g_print (" client_message")); ++ ++ for (list = client_filters; list; list = list->next) ++ { ++ GdkClientFilter *filter = list->data; ++ DFBUserEvent *user_event = (DFBUserEvent *) event; ++ GdkAtom type; ++ ++ type = GDK_POINTER_TO_ATOM (GUINT_TO_POINTER (user_event->type)); ++ ++ if (filter->type == type) ++ { ++ if (filter->function (user_event, ++ NULL, ++ filter->data) != GDK_FILTER_CONTINUE) ++ break; ++ } ++ } ++ } ++ break; ++ + default: + break; + } diff --git a/debian/patches/034_directfb_memleak.patch b/debian/patches/034_directfb_memleak.patch new file mode 100644 index 0000000000..a5fd039fab --- /dev/null +++ b/debian/patches/034_directfb_memleak.patch @@ -0,0 +1,117 @@ +GNOME #533456 +Upstream svn r22369 + +Index: gtk+-2.14.7/configure.in +=================================================================== +--- gtk+-2.14.7.orig/configure.in 2009-02-21 14:48:32.835086281 +0100 ++++ gtk+-2.14.7/configure.in 2009-02-21 14:54:42.690587468 +0100 +@@ -1620,7 +1620,7 @@ AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS) + AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS) + + if test "x$gdktarget" = "xdirectfb"; then +- DIRECTFB_REQUIRED_VERSION=0.9.26 ++ DIRECTFB_REQUIRED_VERSION=1.0.0 + AC_MSG_CHECKING(for DirectFB) + + if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then +Index: gtk+-2.14.7/gdk/directfb/gdkcursor-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkcursor-directfb.c 2009-02-21 14:48:30.306588314 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkcursor-directfb.c 2009-02-21 14:54:42.690587468 +0100 +@@ -41,10 +41,6 @@ + + #include <directfb_version.h> + +-#if DIRECTFB_MAJOR_VERSION < 1 +-#define u32 __u32 +-#define u8 __u8 +-#endif + + static struct { + const guchar *bits; +Index: gtk+-2.14.7/gdk/directfb/gdkdirectfb.h +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkdirectfb.h 2009-02-21 14:48:30.374585434 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkdirectfb.h 2009-02-21 14:54:42.690587468 +0100 +@@ -80,10 +80,8 @@ GdkVisual * gdk_directfb_visual_by_forma + IDirectFBWindow *gdk_directfb_window_lookup(GdkWindow *window); + IDirectFBSurface *gdk_directfb_surface_lookup(GdkWindow *window); + +-#if (DIRECTFB_MAJOR_VERSION >= 1) + GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent, +- IDirectFBSurface *subsurface); +-#endif ++ IDirectFBSurface *subsurface); + + + G_END_DECLS +Index: gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:54:41.887087234 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkevents-directfb.c 2009-02-21 14:54:42.690587468 +0100 +@@ -419,7 +419,6 @@ gdk_directfb_event_windows_add (GdkWindo + impl->window->CreateEventBuffer (impl->window, &EventBuffer); + } + +-#if (DIRECTFB_MAJOR_VERSION >= 1) + void + gdk_directfb_event_windows_remove (GdkWindow *window) + { +@@ -436,7 +435,6 @@ gdk_directfb_event_windows_remove (GdkWi + impl->window->DetachEventBuffer (impl->window, EventBuffer); + /* FIXME: should we warn if (! EventBuffer) ? */ + } +-#endif + + GdkWindow * + gdk_directfb_child_at (GdkWindow *window, +Index: gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:48:30.330588850 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkprivate-directfb.h 2009-02-21 14:54:42.690587468 +0100 +@@ -239,10 +239,8 @@ GdkImage* _gdk_directfb_copy_to_image (G + gint width, + gint height); + +-void gdk_directfb_event_windows_add (GdkWindow *window); +-#if (DIRECTFB_MAJOR_VERSION >= 1) ++void gdk_directfb_event_windows_add (GdkWindow *window); + void gdk_directfb_event_windows_remove (GdkWindow *window); +-#endif + + GdkGrabStatus gdk_directfb_keyboard_grab (GdkDisplay *display, + GdkWindow *window, +Index: gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:54:17.138584001 +0100 ++++ gtk+-2.14.7/gdk/directfb/gdkwindow-directfb.c 2009-02-21 14:54:42.694585602 +0100 +@@ -698,9 +698,8 @@ _gdk_windowing_window_destroy (GdkWindow + impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); + + _gdk_selection_window_destroyed (window); +-#if (DIRECTFB_MAJOR_VERSION >= 1) + gdk_directfb_event_windows_remove (window); +-#endif ++ + if (window == _gdk_directfb_pointer_grab_window) + gdk_pointer_ungrab (GDK_CURRENT_TIME); + if (window == _gdk_directfb_keyboard_grab_window) +@@ -2651,9 +2650,8 @@ gdk_window_get_frame_extents (GdkWindow + * Given a directfb window and a subsurface of that window + * create a gdkwindow child wrapper + */ +-#if (DIRECTFB_MAJOR_VERSION >= 1) + GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent, +- IDirectFBSurface *subsurface) ++ IDirectFBSurface *subsurface) + { + GdkWindow *window; + GdkWindowObject *private; +@@ -2698,7 +2696,6 @@ GdkWindow *gdk_directfb_create_child_win + return window; + + } +-#endif + + /* + * The wrapping is not perfect since directfb does not give full access diff --git a/debian/patches/070_mandatory-relibtoolize.patch b/debian/patches/070_mandatory-relibtoolize.patch index 397004c6a1..204a3320db 100644 --- a/debian/patches/070_mandatory-relibtoolize.patch +++ b/debian/patches/070_mandatory-relibtoolize.patch @@ -1,6 +1,7 @@ -diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 ---- gtk+2.0-2.14.7.old/aclocal.m4 2009-01-07 22:51:55.000000000 +0100 -+++ gtk+2.0-2.14.7/aclocal.m4 2009-01-08 08:03:43.000000000 +0100 +Index: gtk+-2.14.7/aclocal.m4 +=================================================================== +--- gtk+-2.14.7.orig/aclocal.m4 2009-02-17 23:15:21.979084400 +0100 ++++ gtk+-2.14.7/aclocal.m4 2009-02-21 14:58:00.407081464 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- @@ -12,7 +13,7 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -11,1155 +11,1543 @@ +@@ -11,937 +11,702 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @@ -30,8 +31,8 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 -AC_DIVERT_POP()])])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(AC_AUTOCONF_VERSION, [2.63],, -+[m4_warning([this file was generated for autoconf 2.63. ++m4_if(AC_AUTOCONF_VERSION, [2.61],, ++[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -317,57 +318,7 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -+ if test "x$no_glib" = x ; then -+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig/" -+ else -+ if test -f conf.glibtest ; then -+ : -+ else -+ echo "*** Could not run GLIB test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$LIBS $GLIB_LIBS" -+ AC_TRY_LINK([ -+#include <glib.h> -+#include <stdio.h> -+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -+ [ 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" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GLIB_CFLAGS="" -+ GLIB_LIBS="" -+ GLIB_GENMARSHAL="" -+ GOBJECT_QUERY="" -+ GLIB_MKENUMS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ AC_SUBST(GLIB_GENMARSHAL) -+ AC_SUBST(GOBJECT_QUERY) -+ AC_SUBST(GLIB_MKENUMS) -+ rm -f conf.glibtest -+]) - +- -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl @@ -423,43 +374,495 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright 2002 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +- +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) +- +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION so it can be traced. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +- [AM_AUTOMAKE_VERSION([1.7.9])]) +- +-# Helper functions for option handling. -*- Autoconf -*- +- +-# Copyright 2001, 2002 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# serial 2 +- +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +- +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +- +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +- +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include <glib.h> ++#include <stdio.h> ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ 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" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ GOBJECT_QUERY="" ++ GLIB_MKENUMS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ AC_SUBST(GLIB_GENMARSHAL) ++ AC_SUBST(GOBJECT_QUERY) ++ AC_SUBST(GLIB_MKENUMS) ++ rm -f conf.glibtest ++]) + +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. -+# + # +-# Check to make sure that the build environment is sane. +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. -+# + # +- +-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# serial 3 +- +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t $srcdir/configure conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then +- +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi +- +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-AC_MSG_RESULT(yes)]) +- +-# -*- Autoconf -*- +- +- +-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# serial 3 +- +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) +- +- +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " +-else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) +-fi +-]) +- +-# AM_AUX_DIR_EXPAND +- +-# Copyright 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. -+# + # +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. +# Macro to add for using GNU gettext. +# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 -+# + # +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir +# Modified to never use included libintl. +# Owen Taylor <otaylor@redhat.com>, 12/15/1998 -+# + # +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. +# Major rework to remove unused code +# Owen Taylor <otaylor@redhat.com>, 12/11/2002 -+# + # +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 -+# + # +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-# Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50]) +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], [ +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +- +-# Copyright 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-install_sh=${install_sh-"$am_aux_dir/install-sh"} +-AC_SUBST(install_sh)]) +- +-# AM_PROG_INSTALL_STRIP +- +-# Copyright 2001 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) +- +-# -*- Autoconf -*- +-# Copyright (C) 2003 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +-# serial 1 +- +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) +- +-# serial 5 -*- Autoconf -*- +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +- +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. +- +-# This program 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 General Public License for more details. +- +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. +- +- +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +- +- +- +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +# Modified to require ngettext +# Matthias Clasen <mclasen@redhat.com> 08/06/2004 -+# + # +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros @@ -472,10 +875,24 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 +dnl definitions in terms of our private definitions. +dnl --# This program 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 General Public License for more details. +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- : > sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], @@ -490,9 +907,13 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + fi + fi]) --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +- case $depmode in +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, @@ -513,10 +934,34 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done + break + fi +- ;; +- none) break ;; +- esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. +- if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # (even with -Werror). So we grep stderr for any message +- # that says an option was ignored. +- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break +- fi + fi + done +- +- cd .. +- rm -rf conftest.dir + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. @@ -527,17 +972,27 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) -+else + else +- am_cv_$1_dependencies_compiler_type=none + AC_MSG_RESULT(no) -+fi + fi +AC_SUBST($1)dnl -+]) + ]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) +- --# AM_AUTOMAKE_VERSION(VERSION) --# ---------------------------- --# Automake X.Y traces this macro to ensure aclocal.m4 has been --# generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], @@ -545,28 +1000,31 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + [USE_NLS=yes + AC_SUBST(USE_NLS) --# AM_SET_CURRENT_AUTOMAKE_VERSION --# ------------------------------- --# Call AM_AUTOMAKE_VERSION so it can be traced. --# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. --AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.7.9])]) + gt_cv_have_gettext=no --# Helper functions for option handling. -*- Autoconf -*- +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking Speeds up one-time builds +- --enable-dependency-tracking Do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH]) +-]) + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= --# Copyright 2001, 2002 Free Software Foundation, Inc. +-# Generate code to set up dependency tracking. -*- Autoconf -*- + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. +-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + # + # First check in libc + # @@ -594,10 +1052,10 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi --# This program 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 General Public License for more details. +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2, or (at your option) +-# any later version. + # + # If we don't have everything we want, check in libintl + # @@ -610,10 +1068,10 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. +-# This program 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 General Public License for more details. + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) @@ -625,7 +1083,10 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + :,-liconv) + fi --# serial 2 +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-# 02111-1307, USA. + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), @@ -638,10 +1099,7 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" --# _AM_MANGLE_OPTION(NAME) --# ----------------------- --AC_DEFUN([_AM_MANGLE_OPTION], --[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +-#serial 2 + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else @@ -653,11 +1111,54 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + fi + fi --# _AM_SET_OPTION(NAME) +-# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ --# Set option NAME. Presently that only means defining a flag for this option. --AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # So let's grep whole file. +- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue +- # Extract the definition of DEP_FILES from the Makefile without +- # running `make'. +- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` +- test -z "$DEPDIR" && continue +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n -e '/^U = / s///p' < "$mf"` +- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" +- # We invoke sed twice because it is the simplest approach to +- # changing $(DEPDIR) to its actual value in the expansion. +- for file in `sed -n -e ' +- /^DEP_FILES = .*\\\\$/ { +- s/^DEP_FILES = // +- :loop +- s/\\\\$// +- p +- n +- /\\\\$/ b loop +- p +- } +- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +-done +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes @@ -723,21 +1224,23 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + fi + ]) --# _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- --# OPTIONS is a space-separated list of Automake options. --AC_DEFUN([_AM_SET_OPTIONS], --[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi --# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) --# ------------------------------------------- --# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. --AC_DEFUN([_AM_IF_OPTION], --[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the @@ -751,13 +1254,11 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + fi + fi --# --# Check to make sure that the build environment is sane. --# +-# Check to see how 'make' treats includes. -*- Autoconf -*- + # We need to process the po/ directory. + POSUB=po --# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile @@ -813,7 +1314,7 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + GLIB_LC_MESSAGES + GLIB_WITH_NLS --# serial 3 +-# serial 2 + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= @@ -845,1032 +1346,6 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + AC_MSG_RESULT($LINGUAS) + fi --# AM_SANITY_CHECK --# --------------- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -+ dnl Construct list of names of catalog files to be constructed. -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi - fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then - -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly -+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). -+ dnl Try to locate is. -+ MKINSTALLDIRS= -+ if test -n "$ac_aux_dir"; then -+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" -+ fi -+ if test -z "$MKINSTALLDIRS"; then -+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi -+ AC_SUBST(MKINSTALLDIRS) - -- test "$[2]" = conftest.file -- ) --then -- # Ok. -- : -+ dnl Generate list of files to be processed by xgettext which will -+ dnl be included in po/Makefile. -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES -+ ]) -+ -+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -+# ------------------------------- -+# Define VARIABLE to the location where catalog files will -+# be installed by po/Makefile. -+glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -+glib_save_prefix="$prefix" -+glib_save_exec_prefix="$exec_prefix" -+glib_save_datarootdir="$datarootdir" -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+test "x$exec_prefix" = xNONE && exec_prefix=$prefix -+datarootdir=`eval echo "${datarootdir}"` -+if test "x$CATOBJEXT" = "x.mo" ; then -+ localedir=`eval echo "${libdir}/locale"` - else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) -+ localedir=`eval echo "${datadir}/locale"` - fi --AC_MSG_RESULT(yes)]) -- --# -*- Autoconf -*- -- -+prefix="$glib_save_prefix" -+exec_prefix="$glib_save_exec_prefix" -+datarootdir="$glib_save_datarootdir" -+AC_DEFINE_UNQUOTED($1, "$localedir", -+ [Define the location where the catalogs will be installed]) -+]) - --# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. -+dnl -+dnl Now the definitions that aclocal will find -+dnl -+ifdef(glib_configure_in,[],[ -+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -+])dnl - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -+# -+# Create a temporary file with TEST-FILE as its contents and pass the -+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -+# 0 and perform ACTION-IF-FAIL for any other exit status. -+AC_DEFUN([GLIB_RUN_PROG], -+[cat >conftest.foo <<_ACEOF -+$2 -+_ACEOF -+if AC_RUN_LOG([$1 conftest.foo]); then -+ m4_ifval([$3], [$3], [:]) -+m4_ifvaln([$4], [else $4])dnl -+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -+fi]) - --# This program 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 General Public License for more details. - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+dnl -*- mode: autoconf -*- - --# serial 3 -+# serial 1 - --# AM_MISSING_PROG(NAME, PROGRAM) --# ------------------------------ --AC_DEFUN([AM_MISSING_PROG], --[AC_REQUIRE([AM_MISSING_HAS_RUN]) --$1=${$1-"${am_missing_run}$2"} --AC_SUBST($1)]) -+dnl Usage: -+dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -+AC_DEFUN([GTK_DOC_CHECK], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ dnl for overriding the documentation installation directory -+ 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]) - -+ dnl enable/disable documentation building -+ AC_ARG_ENABLE([gtk-doc], -+ AS_HELP_STRING([--enable-gtk-doc], -+ [use gtk-doc to build documentation [[default=no]]]),, -+ [enable_gtk_doc=no]) - --# AM_MISSING_HAS_RUN --# ------------------ --# Define MISSING if not defined so far and test if it supports --run. --# If it does, set am_missing_run to use it, otherwise, to nothing. --AC_DEFUN([AM_MISSING_HAS_RUN], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" --# Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " --else -- am_missing_run= -- AC_MSG_WARN([`missing' script is too old or missing]) --fi --]) -+ if test x$enable_gtk_doc = xyes; then -+ ifelse([$1],[], -+ [PKG_CHECK_EXISTS([gtk-doc],, -+ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], -+ [PKG_CHECK_EXISTS([gtk-doc >= $1],, -+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) -+ fi - --# AM_AUX_DIR_EXPAND -+ AC_MSG_CHECKING([whether to build gtk-doc documentation]) -+ AC_MSG_RESULT($enable_gtk_doc) - --# Copyright 2001 Free Software Foundation, Inc. -+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) -+]) - --# This program is distributed in the hope that it will be useful, -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+m4_define([_LT_COPYING], [dnl -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is part of GNU Libtool. -+# -+# GNU Libtool is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# As a special exception to the GNU General Public License, -+# if you distribute this file as part of a program or library that -+# is built using GNU Libtool, you may include this file under the -+# same distribution terms that you use for the rest of that program. -+# -+# GNU Libtool 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 General Public License for more details. -- -+# - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# along with GNU Libtool; see the file COPYING. If not, a copy -+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -+# obtained by writing to the Free Software Foundation, Inc., -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+]) - --# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets --# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to --# `$srcdir', `$srcdir/..', or `$srcdir/../..'. --# --# Of course, Automake must honor this variable whenever it calls a --# tool from the auxiliary directory. The problem is that $srcdir (and --# therefore $ac_aux_dir as well) can be either absolute or relative, --# depending on how configure is run. This is pretty annoying, since --# it makes $ac_aux_dir quite unusable in subdirectories: in the top --# source directory, any form will work fine, but in subdirectories a --# relative path needs to be adjusted first. --# --# $ac_aux_dir/missing --# fails when called from a subdirectory if $ac_aux_dir is relative --# $top_srcdir/$ac_aux_dir/missing --# fails if $ac_aux_dir is absolute, --# fails when called from a subdirectory in a VPATH build with --# a relative $ac_aux_dir --# --# The reason of the latter failure is that $top_srcdir and $ac_aux_dir --# are both prefixed by $srcdir. In an in-source build this is usually --# harmless because $srcdir is `.', but things will broke when you --# start a VPATH build or use an absolute $srcdir. --# --# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, --# iff we strip the leading $srcdir from $ac_aux_dir. That would be: --# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` --# and then we would define $MISSING as --# MISSING="\${SHELL} $am_aux_dir/missing" --# This will work as long as MISSING is not called from configure, because --# unfortunately $(top_srcdir) has no meaning in configure. --# However there are other variables, like CC, which are often used in --# configure, and could therefore not use this "fixed" $ac_aux_dir. --# --# Another solution, used here, is to always expand $ac_aux_dir to an --# absolute PATH. The drawback is that using absolute paths prevent a --# configured tree to be moved without reconfiguration. -+# serial 56 LT_INIT - --# Rely on autoconf to set up CDPATH properly. --AC_PREREQ([2.50]) - --AC_DEFUN([AM_AUX_DIR_EXPAND], [ --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` -+# LT_PREREQ(VERSION) -+# ------------------ -+# Complain and exit if this libtool version is less that VERSION. -+m4_defun([LT_PREREQ], -+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, -+ [m4_default([$3], -+ [m4_fatal([Libtool version $1 or higher is required], -+ 63)])], -+ [$2])]) -+ -+ -+# _LT_CHECK_BUILDDIR -+# ------------------ -+# Complain if the absolute build directory name contains unusual characters -+m4_defun([_LT_CHECK_BUILDDIR], -+[case `pwd` in -+ *\ * | *\ *) -+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -+esac - ]) - --# AM_PROG_INSTALL_SH -+ -+# LT_INIT([OPTIONS]) - # ------------------ --# Define $install_sh. -+AC_DEFUN([LT_INIT], -+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -+AC_BEFORE([$0], [LT_LANG])dnl -+AC_BEFORE([$0], [LT_OUTPUT])dnl -+AC_BEFORE([$0], [LTDL_INIT])dnl -+m4_require([_LT_CHECK_BUILDDIR])dnl -+ -+dnl Autoconf doesn't catch unexpanded LT_ macros by default: -+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -+dnl unless we require an AC_DEFUNed macro: -+AC_REQUIRE([LTOPTIONS_VERSION])dnl -+AC_REQUIRE([LTSUGAR_VERSION])dnl -+AC_REQUIRE([LTVERSION_VERSION])dnl -+AC_REQUIRE([LTOBSOLETE_VERSION])dnl -+m4_require([_LT_PROG_LTMAIN])dnl - --# Copyright 2001 Free Software Foundation, Inc. -+dnl Parse OPTIONS -+_LT_SET_OPTIONS([$0], [$1]) - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ltmain" - --# This program 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 General Public License for more details. -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+AC_SUBST(LIBTOOL)dnl - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+_LT_SETUP - --AC_DEFUN([AM_PROG_INSTALL_SH], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"$am_aux_dir/install-sh"} --AC_SUBST(install_sh)]) -+# Only expand once: -+m4_define([LT_INIT]) -+])# LT_INIT -+ -+# Old names: -+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -+dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - --# AM_PROG_INSTALL_STRIP - --# Copyright 2001 Free Software Foundation, Inc. -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+m4_defun([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+]) - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. - --# This program 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 General Public License for more details. -+# _LT_FILEUTILS_DEFAULTS -+# ---------------------- -+# It is okay to use these file commands and assume they have been set -+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -+m4_defun([_LT_FILEUTILS_DEFAULTS], -+[: ${CP="cp -f"} -+: ${MV="mv -f"} -+: ${RM="rm -f"} -+])# _LT_FILEUTILS_DEFAULTS - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. - --# One issue with vendor `install' (even GNU) is that you can't --# specify the program used to strip binaries. This is especially --# annoying in cross-compiling environments, where the build's strip --# is unlikely to handle the host's binaries. --# Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in `make install-strip', and initialize --# STRIPPROG with the value of the STRIP variable (set by the user). --AC_DEFUN([AM_PROG_INSTALL_STRIP], --[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --# Installed binaries are usually stripped using `strip' when the user --# run `make install-strip'. However `strip' might not be the right --# tool to use in cross-compilation environments, therefore Automake --# will honor the `STRIP' environment variable to overrule this program. --dnl Don't test for $cross_compiling = yes, because it might be `maybe'. --if test "$cross_compiling" != no; then -- AC_CHECK_TOOL([STRIP], [strip], :) -+# _LT_SETUP -+# --------- -+m4_defun([_LT_SETUP], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+_LT_DECL([], [host_alias], [0], [The host system])dnl -+_LT_DECL([], [host], [0])dnl -+_LT_DECL([], [host_os], [0])dnl -+dnl -+_LT_DECL([], [build_alias], [0], [The build system])dnl -+_LT_DECL([], [build], [0])dnl -+_LT_DECL([], [build_os], [0])dnl -+dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([LT_PATH_LD])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+dnl -+AC_REQUIRE([AC_PROG_LN_S])dnl -+test -z "$LN_S" && LN_S="ln -s" -+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -+dnl -+AC_REQUIRE([LT_CMD_MAX_LEN])dnl -+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -+dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_CMD_RELOAD])dnl -+m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CMD_OLD_ARCHIVE])dnl -+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+ -+_LT_CONFIG_LIBTOOL_INIT([ -+# See if we are running on zsh, and set the options which allow our -+# commands through without removal of \ escapes INIT. -+if test -n "\${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi -+]) -+if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST - fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" --AC_SUBST([INSTALL_STRIP_PROGRAM])]) - --# -*- Autoconf -*- --# Copyright (C) 2003 Free Software Foundation, Inc. -+_LT_CHECK_OBJDIR - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+m4_require([_LT_TAG_COMPILER])dnl -+_LT_PROG_ECHO_BACKSLASH - --# This program 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 General Public License for more details. -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi -+ ;; -+esac - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - --# serial 1 -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\([["`\\]]\)/\\\1/g' - --# Check whether the underlying file-system supports filenames --# with a leading dot. For instance MS-DOS doesn't. --AC_DEFUN([AM_SET_LEADING_DOT], --[rm -rf .tst 2>/dev/null --mkdir .tst 2>/dev/null --if test -d .tst; then -- am__leading_dot=. --else -- am__leading_dot=_ --fi --rmdir .tst 2>/dev/null --AC_SUBST([am__leading_dot])]) -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - --# serial 5 -*- Autoconf -*- -+# Sed substitution to delay expansion of an escaped single quote. -+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - --# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. -+# Global variables: -+ofile=libtool -+can_build_shared=yes - --# This program 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 General Public License for more details. -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+with_gnu_ld="$lt_cv_prog_gnu_ld" - -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" - --# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be --# written in clear, in which case automake, when reading aclocal.m4, --# will think it sees a *use*, and therefore will trigger all it's --# C support machinery. Also note that it means that autoscan, seeing --# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -+# Set sane defaults for various variables -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$LD" && LD=ld -+test -z "$ac_objext" && ac_objext=o - -+_LT_CC_BASENAME([$compiler]) - -+# Only perform the check for file, if the check method requires it -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ _LT_PATH_MAGIC -+ fi -+ ;; -+esac - --# _AM_DEPENDENCIES(NAME) --# ---------------------- --# See how the compiler implements dependency checking. --# NAME is "CC", "CXX", "GCJ", or "OBJC". --# We try a few techniques and use that to set a single cache variable. --# --# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was --# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular --# dependency, and given that the user is not expected to run this macro, --# just rely on AC_PROG_CC. --AC_DEFUN([_AM_DEPENDENCIES], --[AC_REQUIRE([AM_SET_DEPDIR])dnl --AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl --AC_REQUIRE([AM_MAKE_INCLUDE])dnl --AC_REQUIRE([AM_DEP_TRACK])dnl -+# Use C for the default configuration in the libtool script -+LT_SUPPORTED_TAG([CC]) -+_LT_LANG_C_CONFIG -+_LT_LANG_DEFAULT_CONFIG -+_LT_CONFIG_COMMANDS -+])# _LT_SETUP - --ifelse([$1], CC, [depcc="$CC" am_compiler_list=], -- [$1], CXX, [depcc="$CXX" am_compiler_list=], -- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], -- [depcc="$$1" am_compiler_list=]) - --AC_CACHE_CHECK([dependency style of $depcc], -- [am_cv_$1_dependencies_compiler_type], --[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -- # We make a subdir and do the tests there. Otherwise we can end up -- # making bogus files that we don't know about and never remove. For -- # instance it was reported that on HP-UX the gcc test will end up -- # making a dummy file named `D' -- because `-MD' means `put the output -- # in D'. -- mkdir conftest.dir -- # Copy depcomp to subdir because otherwise we won't find it if we're -- # using a relative directory. -- cp "$am_depcomp" conftest.dir -- cd conftest.dir -- # We will build objects and dependencies in a subdirectory because -- # it helps to detect inapplicable dependency modes. For instance -- # both Tru64's cc and ICC support -MD to output dependencies as a -- # side effect of compilation, but ICC will put the dependencies in -- # the current directory while Tru64 will put them in the object -- # directory. -- mkdir sub -+# _LT_PROG_LTMAIN -+# --------------- -+# Note that this code is called both from `configure', and `config.status' -+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -+# `config.status' has no value for ac_aux_dir unless we are using Automake, -+# so we pass a copy along to make sure it has a sensible value anyway. -+m4_defun([_LT_PROG_LTMAIN], -+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -+ltmain="$ac_aux_dir/ltmain.sh" -+])# _LT_PROG_LTMAIN - -- am_cv_$1_dependencies_compiler_type=none -- if test "$am_compiler_list" = ""; then -- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` -- fi -- for depmode in $am_compiler_list; do -- # Setup a source with many dependencies, because some compilers -- # like to wrap large dependency lists on column 80 (with \), and -- # we should not choose a depcomp mode which is confused by this. -- # -- # We need to recreate these files for each test, as the compiler may -- # overwrite some of them when testing with obscure command lines. -- # This happens at least with the AIX C compiler. -- : > sub/conftest.c -- for i in 1 2 3 4 5 6; do -- echo '#include "conftst'$i'.h"' >> sub/conftest.c -- : > sub/conftst$i.h -- done -- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- case $depmode in -- nosideeffect) -- # after this tag, mechanisms are not by side-effect, so they'll -- # only be used when explicitly requested -- if test "x$enable_dependency_tracking" = xyes; then -- continue -- else -- break -- fi -- ;; -- none) break ;; -- esac -- # We check with `-c' and `-o' for the sake of the "dashmstdout" -- # mode. It turns out that the SunPro C++ compiler does not properly -- # handle `-M -o', and we need to detect this. -- if depmode=$depmode \ -- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -- >/dev/null 2>conftest.err && -- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -- # icc doesn't choke on unknown options, it will just issue warnings -- # (even with -Werror). So we grep stderr for any message -- # that says an option was ignored. -- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else -- am_cv_$1_dependencies_compiler_type=$depmode -- break -- fi -- fi -- done - -- cd .. -- rm -rf conftest.dir --else -- am_cv_$1_dependencies_compiler_type=none --fi --]) --AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) --AM_CONDITIONAL([am__fastdep$1], [ -- test "x$enable_dependency_tracking" != xno \ -- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) --]) -+# So that we can recreate a full libtool script including additional -+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -+# in macros and then make a single call at the end using the `libtool' -+# label. - - --# AM_SET_DEPDIR --# ------------- --# Choose a directory name for dependency files. --# This macro is AC_REQUIREd in _AM_DEPENDENCIES --AC_DEFUN([AM_SET_DEPDIR], --[AC_REQUIRE([AM_SET_LEADING_DOT])dnl --AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -+# ---------------------------------------- -+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -+m4_define([_LT_CONFIG_LIBTOOL_INIT], -+[m4_ifval([$1], -+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], -+ [$1 -+])])]) -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_INIT]) -+ -+ -+# _LT_CONFIG_LIBTOOL([COMMANDS]) -+# ------------------------------ -+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -+m4_define([_LT_CONFIG_LIBTOOL], -+[m4_ifval([$1], -+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], -+ [$1 -+])])]) -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) -+ -+ -+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -+# ----------------------------------------------------- -+m4_defun([_LT_CONFIG_SAVE_COMMANDS], -+[_LT_CONFIG_LIBTOOL([$1]) -+_LT_CONFIG_LIBTOOL_INIT([$2]) - ]) - - --# AM_DEP_TRACK --# ------------ --AC_DEFUN([AM_DEP_TRACK], --[AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking Speeds up one-time builds -- --enable-dependency-tracking Do not reject slow dependency extractors]) --if test "x$enable_dependency_tracking" != xno; then -- am_depcomp="$ac_aux_dir/depcomp" -- AMDEPBACKSLASH='\' --fi --AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --AC_SUBST([AMDEPBACKSLASH]) -+# _LT_FORMAT_COMMENT([COMMENT]) -+# ----------------------------- -+# Add leading comment marks to the start of each line, and a trailing -+# full-stop to the whole comment if one is not present already. -+m4_define([_LT_FORMAT_COMMENT], -+[m4_ifval([$1], [ -+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], -+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -+)]) -+ -+ -+ -+ -+ -+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -+# ------------------------------------------------------------------- -+# CONFIGNAME is the name given to the value in the libtool script. -+# VARNAME is the (base) name used in the configure script. -+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -+# VARNAME. Any other value will be used directly. -+m4_define([_LT_DECL], -+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], -+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], -+ [m4_ifval([$1], [$1], [$2])]) -+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) -+ m4_ifval([$4], -+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) -+ lt_dict_add_subkey([lt_decl_dict], [$2], -+ [tagged?], [m4_ifval([$5], [yes], [no])])]) - ]) - --# Generate code to set up dependency tracking. -*- Autoconf -*- - --# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. -+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -+# -------------------------------------------------------- -+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) -+ -+ -+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -+# ------------------------------------------------ -+m4_define([lt_decl_tag_varnames], -+[_lt_decl_filter([tagged?], [yes], $@)]) -+ -+ -+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -+# --------------------------------------------------------- -+m4_define([_lt_decl_filter], -+[m4_case([$#], -+ [0], [m4_fatal([$0: too few arguments: $#])], -+ [1], [m4_fatal([$0: too few arguments: $#: $1])], -+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], -+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], -+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl -+]) - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. - --# This program 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 General Public License for more details. -+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -+# -------------------------------------------------- -+m4_define([lt_decl_quote_varnames], -+[_lt_decl_filter([value], [1], $@)]) -+ -+ -+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -+# --------------------------------------------------- -+m4_define([lt_decl_dquote_varnames], -+[_lt_decl_filter([value], [2], $@)]) -+ -+ -+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -+# --------------------------------------------------- -+m4_define([lt_decl_varnames_tagged], -+[m4_assert([$# <= 2])dnl -+_$0(m4_quote(m4_default([$1], [[, ]])), -+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), -+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -+m4_define([_lt_decl_varnames_tagged], -+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) -+ -+ -+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -+# ------------------------------------------------ -+m4_define([lt_decl_all_varnames], -+[_$0(m4_quote(m4_default([$1], [[, ]])), -+ m4_if([$2], [], -+ m4_quote(lt_decl_varnames), -+ m4_quote(m4_shift($@))))[]dnl -+]) -+m4_define([_lt_decl_all_varnames], -+[lt_join($@, lt_decl_varnames_tagged([$1], -+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -+]) - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. - --#serial 2 -+# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -+# ------------------------------------ -+# Quote a variable value, and forward it to `config.status' so that its -+# declaration there will have the same value as in `configure'. VARNAME -+# must have a single quote delimited value for this to work. -+m4_define([_LT_CONFIG_STATUS_DECLARE], -+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) -+ - --# _AM_OUTPUT_DEPENDENCY_COMMANDS -+# _LT_CONFIG_STATUS_DECLARATIONS - # ------------------------------ --AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], --[for mf in $CONFIG_FILES; do -- # Strip MF so we end up with the name of the file. -- mf=`echo "$mf" | sed -e 's/:.*$//'` -- # Check whether this is an Automake generated Makefile or not. -- # We used to match only the files named `Makefile.in', but -- # some people rename them; so instead we look at the file content. -- # Grep'ing the first line is not enough: some people post-process -- # each Makefile.in and add a new line on top of each file to say so. -- # So let's grep whole file. -- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -- dirpart=`AS_DIRNAME("$mf")` -- else -- continue -- fi -- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue -- # Extract the definition of DEP_FILES from the Makefile without -- # running `make'. -- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` -- test -z "$DEPDIR" && continue -- # When using ansi2knr, U may be empty or an underscore; expand it -- U=`sed -n -e '/^U = / s///p' < "$mf"` -- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" -- # We invoke sed twice because it is the simplest approach to -- # changing $(DEPDIR) to its actual value in the expansion. -- for file in `sed -n -e ' -- /^DEP_FILES = .*\\\\$/ { -- s/^DEP_FILES = // -- :loop -- s/\\\\$// -- p -- n -- /\\\\$/ b loop -- p -- } -- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ -- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do -- # Make sure the directory exists. -- test -f "$dirpart/$file" && continue -- fdir=`AS_DIRNAME(["$file"])` -- AS_MKDIR_P([$dirpart/$fdir]) -- # echo "creating $dirpart/$file" -- echo '# dummy' > "$dirpart/$file" -- done --done --])# _AM_OUTPUT_DEPENDENCY_COMMANDS -+# We delimit libtool config variables with single quotes, so when -+# we write them to config.status, we have to be sure to quote all -+# embedded single quotes properly. In configure, this macro expands -+# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -+# -+# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' -+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), -+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - --# AM_OUTPUT_DEPENDENCY_COMMANDS --# ----------------------------- --# This macro should only be invoked once -- use via AC_REQUIRE. -+# _LT_LIBTOOL_TAGS -+# ---------------- -+# Output comment and list of tags supported by the script -+m4_defun([_LT_LIBTOOL_TAGS], -+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -+available_tags="_LT_TAGS"dnl -+]) -+ -+ -+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -+# ----------------------------------- -+# Extract the dictionary values for VARNAME (optionally with TAG) and -+# expand to a commented shell variable setting: - # --# This code is only required when automatic dependency tracking --# is enabled. FIXME. This creates each `.P' file that we will --# need in order to bootstrap the dependency handling code. --AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], --[AC_CONFIG_COMMANDS([depfiles], -- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], -- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -+# # Some comment about what VAR is for. -+# visible_name=$lt_internal_name -+m4_define([_LT_LIBTOOL_DECLARE], -+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], -+ [description])))[]dnl -+m4_pushdef([_libtool_name], -+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), -+ [0], [_libtool_name=[$]$1], -+ [1], [_libtool_name=$lt_[]$1], -+ [2], [_libtool_name=$lt_[]$1], -+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl - ]) - --# Check to see how 'make' treats includes. -*- Autoconf -*- - --# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -+# _LT_LIBTOOL_CONFIG_VARS -+# ----------------------- -+# Produce commented declarations of non-tagged libtool config variables -+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -+# section) are produced by _LT_LIBTOOL_TAG_VARS. -+m4_defun([_LT_LIBTOOL_CONFIG_VARS], -+[m4_foreach([_lt_var], -+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), -+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2, or (at your option) --# any later version. - --# This program 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 General Public License for more details. -+# _LT_LIBTOOL_TAG_VARS(TAG) -+# ------------------------- -+m4_define([_LT_LIBTOOL_TAG_VARS], -+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), -+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. - --# serial 2 -+# _LT_TAGVAR(VARNAME, [TAGNAME]) -+# ------------------------------ -+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. @@ -1905,7 +1380,11 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 - am__include=.include - am__quote="\"" - _am_result=BSD -- fi ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi + fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) @@ -1916,7 +1395,7 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. - +- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) @@ -1926,39 +1405,42 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -- + -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -+# _LT_CONFIG_COMMANDS -+# ------------------- -+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -+# variables for single and double quote escaping we saved from calls -+# to _LT_DECL, we can put quote escaped variables declarations -+# into `config.status', and then the shell code to quote escape them in -+# for loops in `config.status'. Finally, any additional code accumulated -+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -+m4_defun([_LT_CONFIG_COMMANDS], -+[AC_PROVIDE_IFELSE([LT_OUTPUT], -+ dnl If the libtool generation code has been placed in $CONFIG_LT, -+ dnl instead of duplicating it all over again into config.status, -+ dnl then we will have config.status run $CONFIG_LT later, so it -+ dnl needs to know what name is stored there: -+ [AC_CONFIG_COMMANDS([libtool], -+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], -+ dnl If the libtool generation code is destined for config.status, -+ dnl expand the accumulated commands and init code now: -+ [AC_CONFIG_COMMANDS([libtool], -+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -+])#_LT_CONFIG_COMMANDS - +- -# serial 5 ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) -AC_PREREQ(2.52) -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -+[ ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- @@ -1971,2122 +1453,136 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 -if $2; then - $1_TRUE= - $1_FALSE='#' --else ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` + else - $1_TRUE='#' - $1_FALSE= --fi ++ localedir=`eval echo "${datadir}/locale"` + fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) -+# 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 ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) ++]) ++ ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl ++ ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- -+sed_quote_subst='$sed_quote_subst' -+double_quote_subst='$double_quote_subst' -+delay_variable_subst='$delay_variable_subst' -+_LT_CONFIG_STATUS_DECLARATIONS -+LTCC='$LTCC' -+LTCFLAGS='$LTCFLAGS' -+compiler='$compiler_DEFAULT' -+ -+# Quote evaled strings. -+for var in lt_decl_all_varnames([[ \ -+]], lt_decl_quote_varnames); do -+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ *[[\\\\\\\`\\"\\\$]]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac -+done -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. -+# Double-quote double-evaled strings. -+for var in lt_decl_all_varnames([[ \ -+]], lt_decl_dquote_varnames); do -+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ *[[\\\\\\\`\\"\\\$]]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac -+done ++dnl -*- mode: autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -+# Fix-up fallback echo if it was mangled by the above quoting rules. -+case \$lt_ECHO in -+*'\\\[$]0 --fallback-echo"')dnl " -+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` -+ ;; -+esac ++# serial 1 -# This program 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 General Public License for more details. -+_LT_OUTPUT_LIBTOOL_INIT -+]) ++dnl Usage: ++dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ++AC_DEFUN([GTK_DOC_CHECK], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ dnl for overriding the documentation installation directory ++ 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]) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. ++ dnl enable/disable documentation building ++ AC_ARG_ENABLE([gtk-doc], ++ AS_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [[default=no]]]),, ++ [enable_gtk_doc=no]) -AC_PREREQ([2.52]) -+# LT_OUTPUT -+# --------- -+# This macro allows early generation of the libtool script (before -+# AC_OUTPUT is called), incase it is used in configure for compilation -+# tests. -+AC_DEFUN([LT_OUTPUT], -+[: ${CONFIG_LT=./config.lt} -+AC_MSG_NOTICE([creating $CONFIG_LT]) -+cat >"$CONFIG_LT" <<_LTEOF -+#! $SHELL -+# Generated by $as_me. -+# Run this file to recreate a libtool stub with the current configuration. -+ -+lt_cl_silent=false -+SHELL=\${CONFIG_SHELL-$SHELL} -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<\_LTEOF -+AS_SHELL_SANITIZE -+_AS_PREPARE ++ if test x$enable_gtk_doc = xyes; then ++ ifelse([$1],[], ++ [PKG_CHECK_EXISTS([gtk-doc],, ++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], ++ [PKG_CHECK_EXISTS([gtk-doc >= $1],, ++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) ++ fi -# serial 6 -+exec AS_MESSAGE_FD>&1 -+exec AS_MESSAGE_LOG_FD>>config.log -+{ -+ echo -+ AS_BOX([Running $as_me.]) -+} >&AS_MESSAGE_LOG_FD -+ -+lt_cl_help="\ -+\`$as_me' creates a local libtool stub from the current configuration, -+for use in further configure time tests before the real libtool is -+generated. -+ -+Usage: $[0] [[OPTIONS]] -+ -+ -h, --help print this help, then exit -+ -V, --version print version number, then exit -+ -q, --quiet do not print progress messages -+ -d, --debug don't remove temporary files -+ -+Report bugs to <bug-libtool@gnu.org>." -+ -+lt_cl_version="\ -+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -+configured by $[0], generated by m4_PACKAGE_STRING. -+ -+Copyright (C) 2008 Free Software Foundation, Inc. -+This config.lt script is free software; the Free Software Foundation -+gives unlimited permision to copy, distribute and modify it." ++ AC_MSG_CHECKING([whether to build gtk-doc documentation]) ++ AC_MSG_RESULT($enable_gtk_doc) -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) -+while test $[#] != 0 -+do -+ case $[1] in -+ --version | --v* | -V ) -+ echo "$lt_cl_version"; exit 0 ;; -+ --help | --h* | -h ) -+ echo "$lt_cl_help"; exit 0 ;; -+ --debug | --d* | -d ) -+ debug=: ;; -+ --quiet | --q* | --silent | --s* | -q ) -+ lt_cl_silent=: ;; ++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) ++ ++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++]) --# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -+ -*) AC_MSG_ERROR([unrecognized option: $[1] -+Try \`$[0] --help' for more information.]) ;; + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 52 AC_PROG_LIBTOOL -+ *) AC_MSG_ERROR([unrecognized argument: $[1] -+Try \`$[0] --help' for more information.]) ;; -+ esac -+ shift -+done - -+if $lt_cl_silent; then -+ exec AS_MESSAGE_FD>/dev/null -+fi -+_LTEOF - --# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) --# ----------------------------------------------------------- --# If this macro is not defined by Autoconf, define it here. --m4_ifdef([AC_PROVIDE_IFELSE], -- [], -- [m4_define([AC_PROVIDE_IFELSE], -- [m4_ifdef([AC_PROVIDE_$1], -- [$2], [$3])])]) -+cat >>"$CONFIG_LT" <<_LTEOF -+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<\_LTEOF -+AC_MSG_NOTICE([creating $ofile]) -+_LT_OUTPUT_LIBTOOL_COMMANDS -+AS_EXIT(0) -+_LTEOF -+chmod +x "$CONFIG_LT" -+ -+# configure is writing to config.log, but config.lt does its own redirection, -+# appending to config.log, which fails on DOS, as config.log is still kept -+# open by configure. Here we exec the FD to /dev/null, effectively closing -+# config.log, so it can be properly (re)opened and appended to by config.lt. -+if test "$no_create" != yes; then -+ lt_cl_success=: -+ test "$silent" = yes && -+ lt_config_lt_args="$lt_config_lt_args --quiet" -+ exec AS_MESSAGE_LOG_FD>/dev/null -+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -+ exec AS_MESSAGE_LOG_FD>>config.log -+ $lt_cl_success || AS_EXIT(1) -+fi -+])# LT_OUTPUT ++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL --# AC_PROG_LIBTOOL -+# _LT_CONFIG(TAG) - # --------------- --AC_DEFUN([AC_PROG_LIBTOOL], --[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl --dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX --dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. -- AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [AC_LIBTOOL_CXX], -- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -- ])]) --dnl And a similar setup for Fortran 77 support -- AC_PROVIDE_IFELSE([AC_PROG_F77], -- [AC_LIBTOOL_F77], -- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 --])]) -- --dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. --dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run --dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. -- AC_PROVIDE_IFELSE([AC_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], -- [AC_LIBTOOL_GCJ], -- [ifdef([AC_PROG_GCJ], -- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -- ifdef([A][M_PROG_GCJ], -- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) -- ifdef([LT_AC_PROG_GCJ], -- [define([LT_AC_PROG_GCJ], -- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) --])])# AC_PROG_LIBTOOL -- -- --# _AC_PROG_LIBTOOL --# ---------------- --AC_DEFUN([_AC_PROG_LIBTOOL], --[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl --AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl --AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl --AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -- --# This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -- --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' --AC_SUBST(LIBTOOL)dnl -- --# Prevent multiple expansion --define([AC_PROG_LIBTOOL], []) --])# _AC_PROG_LIBTOOL -- -- --# AC_LIBTOOL_SETUP --# ---------------- --AC_DEFUN([AC_LIBTOOL_SETUP], --[AC_PREREQ(2.50)dnl --AC_REQUIRE([AC_ENABLE_SHARED])dnl --AC_REQUIRE([AC_ENABLE_STATIC])dnl --AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl --AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_PROG_LD])dnl --AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl --AC_REQUIRE([AC_PROG_NM])dnl -- --AC_REQUIRE([AC_PROG_LN_S])dnl --AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl --# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! --AC_REQUIRE([AC_OBJEXT])dnl --AC_REQUIRE([AC_EXEEXT])dnl --dnl --AC_LIBTOOL_SYS_MAX_CMD_LEN --AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE --AC_LIBTOOL_OBJDIR -+# If TAG is the built-in tag, create an initial libtool script with a -+# default configuration from the untagged config vars. Otherwise add code -+# to config.status for appending the configuration named by TAG from the -+# matching tagged config vars. -+m4_defun([_LT_CONFIG], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+_LT_CONFIG_SAVE_COMMANDS([ -+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl -+ m4_if(_LT_TAG, [C], [ -+ # 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 -+ setopt NO_GLOB_SUBST -+ fi -+ -+ cfgfile="${ofile}T" -+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 -+ $RM "$cfgfile" - --AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl --_LT_AC_PROG_ECHO_BACKSLASH -+ cat <<_LT_EOF >> "$cfgfile" -+#! $SHELL - --case $host_os in --aix3*) -- # AIX sometimes has problems with the GCC collect2 program. For some -- # reason, if we set the COLLECT_NAMES environment variable, the problems -- # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -- fi -- ;; --esac -- --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='sed -e 1s/^X//' --[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] -- --# Same as above, but do not quote variable references. --[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] -- --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+_LT_COPYING -+_LT_LIBTOOL_TAGS - --# Sed substitution to avoid accidental globbing in evaled expressions --no_glob_subst='s/\*/\\\*/g' -+# ### BEGIN LIBTOOL CONFIG -+_LT_LIBTOOL_CONFIG_VARS -+_LT_LIBTOOL_TAG_VARS -+# ### END LIBTOOL CONFIG - --# Constants: --rm="rm -f" -+_LT_EOF - --# Global variables: --default_ofile=libtool --can_build_shared=yes -+ case $host_os in -+ aix3*) -+ cat <<\_LT_EOF >> "$cfgfile" -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+_LT_EOF -+ ;; -+ esac - --# All known linkers require a `.a' archive for static linking (except MSVC, --# which needs '.lib'). --libext=a --ltmain="$ac_aux_dir/ltmain.sh" --ofile="$default_ofile" --with_gnu_ld="$lt_cv_prog_gnu_ld" -+ _LT_PROG_LTMAIN - --AC_CHECK_TOOL(AR, ar, false) --AC_CHECK_TOOL(RANLIB, ranlib, :) --AC_CHECK_TOOL(STRIP, strip, :) -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - --old_CC="$CC" --old_CFLAGS="$CFLAGS" -+ _LT_PROG_XSI_SHELLFNS - --# Set sane defaults for various variables --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --test -z "$AS" && AS=as --test -z "$CC" && CC=cc --test -z "$LTCC" && LTCC=$CC --test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS --test -z "$DLLTOOL" && DLLTOOL=dlltool --test -z "$LD" && LD=ld --test -z "$LN_S" && LN_S="ln -s" --test -z "$MAGIC_CMD" && MAGIC_CMD=file --test -z "$NM" && NM=nm --test -z "$SED" && SED=sed --test -z "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: --test -z "$ac_objext" && ac_objext=o -+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -+ mv -f "$cfgfile" "$ofile" || -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+], -+[cat <<_LT_EOF >> "$ofile" - --if test -n "$RANLIB"; then -- case $host_os in -- openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -- ;; -- *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -- ;; -- esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" --fi -+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -+dnl in a comment (ie after a #). -+# ### BEGIN LIBTOOL TAG CONFIG: $1 -+_LT_LIBTOOL_TAG_VARS(_LT_TAG) -+# ### END LIBTOOL TAG CONFIG: $1 -+_LT_EOF -+])dnl /m4_if -+], -+[m4_if([$1], [], [ -+ PACKAGE='$PACKAGE' -+ VERSION='$VERSION' -+ TIMESTAMP='$TIMESTAMP' -+ RM='$RM' -+ ofile='$ofile'], []) -+])dnl /_LT_CONFIG_SAVE_COMMANDS -+])# _LT_CONFIG -+ -+ -+# LT_SUPPORTED_TAG(TAG) -+# --------------------- -+# Trace this macro to discover what tags are supported by the libtool -+# --tag option, using: -+# autoconf --trace 'LT_SUPPORTED_TAG:$1' -+AC_DEFUN([LT_SUPPORTED_TAG], []) -+ -+ -+# C support is built-in for now -+m4_define([_LT_LANG_C_enabled], []) -+m4_define([_LT_TAGS], []) - --_LT_CC_BASENAME([$compiler]) - --# Only perform the check for file, if the check method requires it --case $deplibs_check_method in --file_magic*) -- if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- AC_PATH_MAGIC -- fi -- ;; --esac -+# LT_LANG(LANG) -+# ------------- -+# Enable libtool support for the given language if not already enabled. -+AC_DEFUN([LT_LANG], -+[AC_BEFORE([$0], [LT_OUTPUT])dnl -+m4_case([$1], -+ [C], [_LT_LANG(C)], -+ [C++], [_LT_LANG(CXX)], -+ [Java], [_LT_LANG(GCJ)], -+ [Fortran 77], [_LT_LANG(F77)], -+ [Fortran], [_LT_LANG(FC)], -+ [Windows Resource], [_LT_LANG(RC)], -+ [m4_ifdef([_LT_LANG_]$1[_CONFIG], -+ [_LT_LANG($1)], -+ [m4_fatal([$0: unsupported language: "$1"])])])dnl -+])# LT_LANG - --_LT_REQUIRED_DARWIN_CHECKS - --AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) --AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], --enable_win32_dll=yes, enable_win32_dll=no) -- --AC_ARG_ENABLE([libtool-lock], -- [AC_HELP_STRING([--disable-libtool-lock], -- [avoid locking (might break parallel builds)])]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+# _LT_LANG(LANGNAME) -+# ------------------ -+m4_defun([_LT_LANG], -+[m4_ifdef([_LT_LANG_]$1[_enabled], [], -+ [LT_SUPPORTED_TAG([$1])dnl -+ m4_append([_LT_TAGS], [$1 ])dnl -+ m4_define([_LT_LANG_]$1[_enabled], [])dnl -+ _LT_LANG_$1_CONFIG($1)])dnl -+])# _LT_LANG - --AC_ARG_WITH([pic], -- [AC_HELP_STRING([--with-pic], -- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -- [pic_mode="$withval"], -- [pic_mode=default]) --test -z "$pic_mode" && pic_mode=default - --# Use C for the default configuration in the libtool script --tagname= --AC_LIBTOOL_LANG_C_CONFIG --_LT_AC_TAGCONFIG --])# AC_LIBTOOL_SETUP -+# _LT_LANG_DEFAULT_CONFIG -+# ----------------------- -+m4_defun([_LT_LANG_DEFAULT_CONFIG], -+[AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [LT_LANG(CXX)], -+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) -+ -+AC_PROVIDE_IFELSE([AC_PROG_F77], -+ [LT_LANG(F77)], -+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) -+ -+AC_PROVIDE_IFELSE([AC_PROG_FC], -+ [LT_LANG(FC)], -+ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) -+ -+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -+dnl pulling things in needlessly. -+AC_PROVIDE_IFELSE([AC_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [AC_PROVIDE_IFELSE([LT_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [m4_ifdef([AC_PROG_GCJ], -+ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) -+ m4_ifdef([A][M_PROG_GCJ], -+ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) -+ m4_ifdef([LT_PROG_GCJ], -+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -+ -+AC_PROVIDE_IFELSE([LT_PROG_RC], -+ [LT_LANG(RC)], -+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -+])# _LT_LANG_DEFAULT_CONFIG -+ -+# Obsolete macros: -+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -+dnl AC_DEFUN([AC_LIBTOOL_F77], []) -+dnl AC_DEFUN([AC_LIBTOOL_FC], []) -+dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) - - --# _LT_AC_SYS_COMPILER --# ------------------- --AC_DEFUN([_LT_AC_SYS_COMPILER], -+# _LT_TAG_COMPILER -+# ---------------- -+m4_defun([_LT_TAG_COMPILER], - [AC_REQUIRE([AC_PROG_CC])dnl - -+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl -+ - # If no C compiler was specified, use CC. - LTCC=${LTCC-"$CC"} - -@@ -1168,36 +1556,20 @@ - - # Allow CC to be a program name with arguments. - compiler=$CC --])# _LT_AC_SYS_COMPILER -- -- --# _LT_CC_BASENAME(CC) --# ------------------- --# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. --AC_DEFUN([_LT_CC_BASENAME], --[for cc_temp in $1""; do -- case $cc_temp in -- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` --]) -+])# _LT_TAG_COMPILER - - - # _LT_COMPILER_BOILERPLATE - # ------------------------ - # Check for compiler boilerplate output or warnings with - # the simple compiler test code. --AC_DEFUN([_LT_COMPILER_BOILERPLATE], --[AC_REQUIRE([LT_AC_PROG_SED])dnl -+m4_defun([_LT_COMPILER_BOILERPLATE], -+[m4_require([_LT_DECL_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* -+$RM conftest* - ])# _LT_COMPILER_BOILERPLATE - - -@@ -1205,39 +1577,57 @@ - # ---------------------- - # Check for linker boilerplate output or warnings with - # the simple link test code. --AC_DEFUN([_LT_LINKER_BOILERPLATE], --[AC_REQUIRE([LT_AC_PROG_SED])dnl -+m4_defun([_LT_LINKER_BOILERPLATE], -+[m4_require([_LT_DECL_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 -r conftest* -+$RM -r conftest* - ])# _LT_LINKER_BOILERPLATE - - # _LT_REQUIRED_DARWIN_CHECKS --# -------------------------- --# Check for some things on darwin --AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ -+# ------------------------- -+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -+ AC_CHECK_TOOL([LIPO], [lipo], [:]) -+ AC_CHECK_TOOL([OTOOL], [otool], [:]) -+ AC_CHECK_TOOL([OTOOL64], [otool64], [:]) -+ _LT_DECL([], [DSYMUTIL], [1], -+ [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) -+ _LT_DECL([], [NMEDIT], [1], -+ [Tool to change global to local symbols on Mac OS X]) -+ _LT_DECL([], [LIPO], [1], -+ [Tool to manipulate fat objects and archives on Mac OS X]) -+ _LT_DECL([], [OTOOL], [1], -+ [ldd/readelf like tool for Mach-O binaries on Mac OS X]) -+ _LT_DECL([], [OTOOL64], [1], -+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then -- # By default we will add the -single_module flag. You can override -- # by either setting the environment variable LT_MULTI_MODULE -- # non-empty at configure time, or by adding -multi_module to the -- # link flags. -- echo "int foo(void){return 1;}" > conftest.c -- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -- -dynamiclib ${wl}-single_module conftest.c -- if test -f libconftest.dylib; then -- lt_cv_apple_cc_single_mod=yes -- rm -rf libconftest.dylib* -- fi -- rm conftest.c -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ rm -rf libconftest.dylib* -+ echo "int foo(void){return 1;}" > conftest.c -+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err -+ _lt_result=$? -+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then -+ lt_cv_apple_cc_single_mod=yes -+ else -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ fi -+ rm -rf libconftest.dylib* -+ rm -f conftest.* - fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], -@@ -1246,26 +1636,26 @@ - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -- [lt_cv_ld_exported_symbols_list=yes], -- [lt_cv_ld_exported_symbols_list=no]) -- LDFLAGS="$save_LDFLAGS" -+ [lt_cv_ld_exported_symbols_list=yes], -+ [lt_cv_ld_exported_symbols_list=no]) -+ LDFLAGS="$save_LDFLAGS" - ]) - case $host_os in -- rhapsody* | darwin1.[[0123]]) -+ rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- darwin*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- 10.[[012]]*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- 10.*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +@@ -1565,7 +1330,6 @@ s390*-*linux*|sparc*-*linux*) esac - ;; - esac -@@ -1275,10 +1665,10 @@ - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else -- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":"; then -- _lt_dsymutil="~$DSYMUTIL \$lib || :" -+ _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi -@@ -1286,16 +1676,51 @@ - esac - ]) - --# _LT_AC_SYS_LIBPATH_AIX --# ---------------------- -+ -+# _LT_DARWIN_LINKER_FEATURES -+# -------------------------- -+# Checks for linker and compiler features on darwin -+m4_defun([_LT_DARWIN_LINKER_FEATURES], -+[ -+ m4_require([_LT_REQUIRED_DARWIN_CHECKS]) -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ case $cc_basename in -+ ifort*) _lt_dar_can_shared=yes ;; -+ *) _lt_dar_can_shared=$GCC ;; -+ esac -+ if test "$_lt_dar_can_shared" = "yes"; then -+ output_verbose_link_cmd=echo -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ m4_if([$1], [CXX], -+[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi -+],[]) -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+]) -+ -+# _LT_SYS_MODULE_PATH_AIX -+# ----------------------- - # Links a minimal program and checks the executable - # for the system default hardcoded library path. In most cases, - # this is /usr/lib:/lib, but when the MPI compilers are used - # the location of the communication and MPI libs are included too. - # 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_REQUIRE([LT_AC_PROG_SED])dnl -+m4_defun([_LT_SYS_MODULE_PATH_AIX], -+[m4_require([_LT_DECL_SED])dnl - AC_LINK_IFELSE(AC_LANG_PROGRAM,[ - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -1310,45 +1735,45 @@ - 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 -+])# _LT_SYS_MODULE_PATH_AIX - - --# _LT_AC_SHELL_INIT(ARG) --# ---------------------- --AC_DEFUN([_LT_AC_SHELL_INIT], -+# _LT_SHELL_INIT(ARG) -+# ------------------- -+m4_define([_LT_SHELL_INIT], - [ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) - $1 - AC_DIVERT_POP --])# _LT_AC_SHELL_INIT -+])# _LT_SHELL_INIT - - --# _LT_AC_PROG_ECHO_BACKSLASH --# -------------------------- -+# _LT_PROG_ECHO_BACKSLASH -+# ----------------------- - # Add some code to the start of the generated configure script which - # will find an echo command which doesn't interpret backslashes. --AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], --[_LT_AC_SHELL_INIT([ -+m4_defun([_LT_PROG_ECHO_BACKSLASH], -+[_LT_SHELL_INIT([ - # Check that we are running under the correct shell. - SHELL=${CONFIG_SHELL-/bin/sh} - --case X$ECHO in -+case X$lt_ECHO in - X*--fallback-echo) - # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; - esac - --echo=${ECHO-echo} -+ECHO=${lt_ECHO-echo} - if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -- # Yippee, $echo works! -+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $ECHO works! - : - else - # Restart under the correct shell. -@@ -1358,9 +1783,9 @@ - if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift -- cat <<EOF -+ cat <<_LT_EOF - [$]* --EOF -+_LT_EOF - exit 0 - fi - -@@ -1368,124 +1793,127 @@ - # if CDPATH is set. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - --if test -z "$ECHO"; then --if test "X${echo_test_string+set}" != Xset; then --# find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string=`eval $cmd`) 2>/dev/null && -- echo_test_string=`eval $cmd` && -- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -- then -- break -- fi -- done --fi -+if test -z "$lt_ECHO"; then -+ if test "X${echo_test_string+set}" != Xset; then -+ # find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if { echo_test_string=`eval $cmd`; } 2>/dev/null && -+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null -+ then -+ break -+ fi -+ done -+ fi - --if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : --else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+ else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. - -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -- IFS="$lt_save_ifs" -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$dir/echo" -- break -- fi -- done -- IFS="$lt_save_ifs" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ ECHO="$dir/echo" -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" - -- if test "X$echo" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- echo='print -r' -- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -- else -- # Try using printf. -- echo='printf %s\n' -- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- echo="$CONFIG_SHELL [$]0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$CONFIG_SHELL [$]0 --fallback-echo" -+ if test "X$ECHO" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ ECHO='print -r' -+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else -- # maybe with a smaller string... -- prev=: -+ # Try using printf. -+ ECHO='printf %s\n' -+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -+ else -+ # maybe with a smaller string... -+ prev=: - -- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null -+ then -+ break -+ fi -+ prev="$cmd" -+ done - -- if test "$prev" != 'sed 50q "[$]0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -- else -- # Oops. We lost completely, so just stick with echo. -- echo=echo -- fi -+ if test "$prev" != 'sed 50q "[$]0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ ECHO=echo -+ fi -+ fi - fi - fi - fi - fi --fi - - # Copy echo and quote the copy suitably for passing to libtool from - # the Makefile, instead of quoting the original, which is used later. --ECHO=$echo --if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -+lt_ECHO=$ECHO -+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -+ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" - fi - --AC_SUBST(ECHO) --])])# _LT_AC_PROG_ECHO_BACKSLASH -+AC_SUBST(lt_ECHO) -+]) -+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -+_LT_DECL([], [ECHO], [1], -+ [An echo program that does not interpret backslashes]) -+])# _LT_PROG_ECHO_BACKSLASH - - --# _LT_AC_LOCK --# ----------- --AC_DEFUN([_LT_AC_LOCK], -+# _LT_ENABLE_LOCK -+# --------------- -+m4_defun([_LT_ENABLE_LOCK], - [AC_ARG_ENABLE([libtool-lock], -- [AC_HELP_STRING([--disable-libtool-lock], -- [avoid locking (might break parallel builds)])]) -+ [AS_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) - test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - - # Some flags need to be propagated to the compiler or linker for good -@@ -1496,12 +1924,12 @@ - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in -- *ELF-32*) -- HPUX_IA64_MODE="32" -- ;; -- *ELF-64*) -- HPUX_IA64_MODE="64" -- ;; -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; - esac - fi - rm -rf conftest* -@@ -1510,80 +1938,79 @@ - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then -- if test "$lt_cv_prog_gnu_ld" = yes; then -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -melf32bsmip" -- ;; -- *N32*) -- LD="${LD-ld} -melf32bmipn32" -- ;; -- *64-bit*) -- LD="${LD-ld} -melf64bmip" -- ;; -- esac -- else -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -32" -- ;; -- *N32*) -- LD="${LD-ld} -n32" -- ;; -- *64-bit*) -- LD="${LD-ld} -64" -- ;; -- esac -- fi -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi - fi - rm -rf conftest* - ;; - - x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ --s390*-*linux*|sparc*-*linux*) -+s390*-*linux*|s390*-*tpf*|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" -- ;; -- ppc64-*linux*|powerpc64-*linux*) -- LD="${LD-ld} -m elf32ppclinux" -- ;; -- s390x-*linux*) -- LD="${LD-ld} -m elf_s390" -- ;; -- sparc64-*linux*) -- LD="${LD-ld} -m elf32_sparc" -- ;; -- esac -- ;; -- *64-bit*) + ;; + *64-bit*) - libsuff=64 -- 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" -- ;; -- ppc*-*linux*|powerpc*-*linux*) -- LD="${LD-ld} -m elf64ppc" -- ;; -- s390*-*linux*) -- LD="${LD-ld} -m elf64_s390" -- ;; -- sparc*-*linux*) -- LD="${LD-ld} -m elf64_sparc" -- ;; -- esac -- ;; -+ *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" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *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" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*|s390*-*tpf*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; - esac - fi - rm -rf conftest* -@@ -1595,7 +2022,7 @@ - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) -- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -@@ -1611,7 +2038,7 @@ - case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; - *) -- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; -@@ -1621,30 +2048,63 @@ - fi - rm -rf conftest* - ;; -- --AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], --[*-*-cygwin* | *-*-mingw* | *-*-pw32*) -- AC_CHECK_TOOL(DLLTOOL, dlltool, false) -- AC_CHECK_TOOL(AS, as, false) -- AC_CHECK_TOOL(OBJDUMP, objdump, false) -- ;; -- ]) - esac - - need_locks="$enable_libtool_lock" -+])# _LT_ENABLE_LOCK -+ -+ -+# _LT_CMD_OLD_ARCHIVE -+# ------------------- -+m4_defun([_LT_CMD_OLD_ARCHIVE], -+[AC_CHECK_TOOL(AR, ar, false) -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1]) -+ -+AC_CHECK_TOOL(STRIP, strip, :) -+test -z "$STRIP" && STRIP=: -+_LT_DECL([], [STRIP], [1], [A symbol stripping program]) -+ -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+test -z "$RANLIB" && RANLIB=: -+_LT_DECL([], [RANLIB], [1], -+ [Commands used to install an old-style archive]) -+ -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= - --])# _LT_AC_LOCK -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi -+_LT_DECL([], [old_postinstall_cmds], [2]) -+_LT_DECL([], [old_postuninstall_cmds], [2]) -+_LT_TAGDECL([], [old_archive_cmds], [2], -+ [Commands used to build an old-style archive]) -+])# _LT_CMD_OLD_ARCHIVE - - --# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, - # [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) - # ---------------------------------------------------------------- - # Check whether the given compiler option works --AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], --[AC_REQUIRE([LT_AC_PROG_SED]) -+AC_DEFUN([_LT_COMPILER_OPTION], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_SED])dnl - AC_CACHE_CHECK([$1], [$2], - [$2=no -- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or -@@ -1664,29 +2124,35 @@ - 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. -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - $2=yes - fi - fi -- $rm conftest* -+ $RM conftest* - ]) - - if test x"[$]$2" = xyes; then -- ifelse([$5], , :, [$5]) -+ m4_if([$5], , :, [$5]) - else -- ifelse([$6], , :, [$6]) -+ m4_if([$6], , :, [$6]) - fi --])# AC_LIBTOOL_COMPILER_OPTION -+])# _LT_COMPILER_OPTION - -- --# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, --# [ACTION-SUCCESS], [ACTION-FAILURE]) --# ------------------------------------------------------------ --# Check whether the given compiler option works --AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], --[AC_REQUIRE([LT_AC_PROG_SED])dnl -+# Old name: -+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) -+ -+ -+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------- -+# Check whether the given linker option works -+AC_DEFUN([_LT_LINKER_OPTION], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_SED])dnl - AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" -@@ -1698,7 +2164,7 @@ - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD -- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - $2=yes -@@ -1707,22 +2173,28 @@ - $2=yes - fi - fi -- $rm -r conftest* -+ $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - ]) - - if test x"[$]$2" = xyes; then -- ifelse([$4], , :, [$4]) -+ m4_if([$4], , :, [$4]) - else -- ifelse([$5], , :, [$5]) -+ m4_if([$5], , :, [$5]) - fi --])# AC_LIBTOOL_LINKER_OPTION -+])# _LT_LINKER_OPTION - -+# Old name: -+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) - --# AC_LIBTOOL_SYS_MAX_CMD_LEN --# -------------------------- --AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], --[# find the maximum length of command line arguments -+ -+# LT_CMD_MAX_LEN -+#--------------- -+AC_DEFUN([LT_CMD_MAX_LEN], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+# find the maximum length of command line arguments - AC_MSG_CHECKING([the maximum length of command line arguments]) - AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 -@@ -1744,7 +2216,7 @@ - lt_cv_sys_max_cmd_len=-1; - ;; - -- cygwin* | mingw*) -+ cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -1799,7 +2271,7 @@ - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then -- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi -@@ -1810,20 +2282,28 @@ - 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 -+ # Make teststring a little bigger before we do anything with it. -+ # a 1K string should be a reasonable start. -+ for i in 1 2 3 4 5 6 7 8 ; do -+ teststring=$teststring$teststring -+ done - 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 && -+ # 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. -+ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ -+ = "XX$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done -+ # Only check the string length outside the loop. -+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - 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. -+ # 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 - ;; -@@ -1834,27 +2314,35 @@ - else - AC_MSG_RESULT(none) - fi --])# AC_LIBTOOL_SYS_MAX_CMD_LEN -+max_cmd_len=$lt_cv_sys_max_cmd_len -+_LT_DECL([], [max_cmd_len], [0], -+ [What is the maximum length of a command?]) -+])# LT_CMD_MAX_LEN - -+# Old name: -+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) - --# _LT_AC_CHECK_DLFCN --# ------------------ --AC_DEFUN([_LT_AC_CHECK_DLFCN], --[AC_CHECK_HEADERS(dlfcn.h)dnl --])# _LT_AC_CHECK_DLFCN -+ -+# _LT_HEADER_DLFCN -+# ---------------- -+m4_defun([_LT_HEADER_DLFCN], -+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -+])# _LT_HEADER_DLFCN - - --# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, --# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) --# --------------------------------------------------------------------- --AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], --[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -+# ---------------------------------------------------------------- -+m4_defun([_LT_TRY_DLOPEN_SELF], -+[m4_require([_LT_HEADER_DLFCN])dnl - if test "$cross_compiling" = yes; then : - [$4] - else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<EOF -+ cat > conftest.$ac_ext <<_LT_EOF - [#line __oline__ "configure" - #include "confdefs.h" - -@@ -1896,10 +2384,6 @@ - # endif - #endif - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -- - void fnord() { int i=42;} - int main () - { -@@ -1915,9 +2399,9 @@ - else - puts (dlerror ()); - -- exit (status); -+ return status; - }] --EOF -+_LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? -@@ -1932,13 +2416,13 @@ - fi - fi - rm -fr conftest* --])# _LT_AC_TRY_DLOPEN_SELF -+])# _LT_TRY_DLOPEN_SELF - - --# AC_LIBTOOL_DLOPEN_SELF --# ---------------------- --AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], --[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -+# LT_SYS_DLOPEN_SELF -+# ------------------ -+AC_DEFUN([LT_SYS_DLOPEN_SELF], -+[m4_require([_LT_HEADER_DLFCN])dnl - if test "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown -@@ -1954,15 +2438,15 @@ - lt_cv_dlopen_self=yes - ;; - -- mingw* | pw32*) -+ mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= -- ;; -+ ;; - - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= -- ;; -+ ;; - - darwin*) - # if libdl is installed we need to link against it -@@ -1972,7 +2456,7 @@ - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) -- ;; -+ ;; - - *) - AC_CHECK_FUNC([shl_load], -@@ -2014,7 +2498,7 @@ - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl -- _LT_AC_TRY_DLOPEN_SELF( -+ _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) -@@ -2022,8 +2506,8 @@ - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -- lt_cv_dlopen_self_static, [dnl -- _LT_AC_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self_static, [dnl -+ _LT_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) -@@ -2045,19 +2529,32 @@ - *) enable_dlopen_self_static=unknown ;; - esac - fi --])# AC_LIBTOOL_DLOPEN_SELF -+_LT_DECL([dlopen_support], [enable_dlopen], [0], -+ [Whether dlopen is supported]) -+_LT_DECL([dlopen_self], [enable_dlopen_self], [0], -+ [Whether dlopen of programs is supported]) -+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], -+ [Whether dlopen of statically linked programs is supported]) -+])# LT_SYS_DLOPEN_SELF -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) - - --# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) --# --------------------------------- --# 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_PROG_SED])dnl --AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+# _LT_COMPILER_C_O([TAGNAME]) -+# --------------------------- -+# Check to see if options -c and -o are simultaneously supported by compiler. -+# This macro does not hard code the compiler like AC_PROG_CC_C_O. -+m4_defun([_LT_COMPILER_C_O], -+[m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_TAG_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 -- $rm -r conftest 2>/dev/null -+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -+ $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out -@@ -2081,37 +2578,41 @@ - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . 2>&AS_MESSAGE_LOG_FD -- $rm conftest* -+ $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation -- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -- $rm out/* && rmdir out -+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -+ $RM out/* && rmdir out - cd .. -- rmdir conftest -- $rm conftest* -+ $RM -r conftest -+ $RM conftest* - ]) --])# AC_LIBTOOL_PROG_CC_C_O -+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], -+ [Does compiler simultaneously support -c and -o options?]) -+])# _LT_COMPILER_C_O - - --# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) --# ----------------------------------------- -+# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -+# ---------------------------------- - # Check to see if we can do hard links to lock some files if needed --AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], --[AC_REQUIRE([_LT_AC_LOCK])dnl -+m4_defun([_LT_COMPILER_FILE_LOCKS], -+[m4_require([_LT_ENABLE_LOCK])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+_LT_COMPILER_C_O([$1]) - - hard_links="nottested" --if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes -- $rm conftest* -+ $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no -@@ -2124,12 +2625,13 @@ - else - need_locks=no - fi --])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS -+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -+])# _LT_COMPILER_FILE_LOCKS - - --# AC_LIBTOOL_OBJDIR --# ----------------- --AC_DEFUN([AC_LIBTOOL_OBJDIR], -+# _LT_CHECK_OBJDIR -+# ---------------- -+m4_defun([_LT_CHECK_OBJDIR], - [AC_CACHE_CHECK([for objdir], [lt_cv_objdir], - [rm -f .libs 2>/dev/null - mkdir .libs 2>/dev/null -@@ -2141,40 +2643,46 @@ - fi - rmdir .libs 2>/dev/null]) - objdir=$lt_cv_objdir --])# AC_LIBTOOL_OBJDIR -+_LT_DECL([], [objdir], [0], -+ [The name of the directory that contains temporary libtool files])dnl -+m4_pattern_allow([LT_OBJDIR])dnl -+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", -+ [Define to the sub-directory in which libtool stores uninstalled libraries.]) -+])# _LT_CHECK_OBJDIR - - --# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) --# ---------------------------------------------- -+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -+# -------------------------------------- - # Check hardcoding attributes. --AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -+m4_defun([_LT_LINKER_HARDCODE_LIBPATH], - [AC_MSG_CHECKING([how to hardcode library paths into programs]) --_LT_AC_TAGVAR(hardcode_action, $1)= --if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ -- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ -- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+_LT_TAGVAR(hardcode_action, $1)= -+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || -+ test -n "$_LT_TAGVAR(runpath_var, $1)" || -+ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - -- # We can hardcode non-existant directories. -- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -+ # We can hardcode non-existent directories. -+ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && -- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then -+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && -+ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. -- _LT_AC_TAGVAR(hardcode_action, $1)=relink -+ _LT_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. -- _LT_AC_TAGVAR(hardcode_action, $1)=immediate -+ _LT_TAGVAR(hardcode_action, $1)=immediate - fi - else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. -- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -+ _LT_TAGVAR(hardcode_action, $1)=unsupported - fi --AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) -+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - --if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then -+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || -+ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then - # Fast installation is not supported - enable_fast_install=no - elif test "$shlibpath_overrides_runpath" = yes || -@@ -2182,73 +2690,70 @@ - # Fast installation is not necessary - enable_fast_install=needless - fi --])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH -+_LT_TAGDECL([], [hardcode_action], [0], -+ [How to hardcode a shared library path into an executable]) -+])# _LT_LINKER_HARDCODE_LIBPATH - - --# AC_LIBTOOL_SYS_LIB_STRIP --# ------------------------ --AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], --[striplib= -+# _LT_CMD_STRIPLIB -+# ---------------- -+m4_defun([_LT_CMD_STRIPLIB], -+[m4_require([_LT_DECL_EGREP]) -+striplib= - old_striplib= - AC_MSG_CHECKING([whether stripping libraries is possible]) --if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) - else - # FIXME - insert some real tests, host_os isn't really good enough - case $host_os in -- darwin*) -- if test -n "$STRIP" ; then -- striplib="$STRIP -x" -- old_striplib="$STRIP -S" -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_RESULT([no]) --fi -- ;; -- *) -- AC_MSG_RESULT([no]) -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ ;; -+ *) -+ AC_MSG_RESULT([no]) - ;; - esac - fi --])# AC_LIBTOOL_SYS_LIB_STRIP -+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -+_LT_DECL([], [striplib], [1]) -+])# _LT_CMD_STRIPLIB - - --# AC_LIBTOOL_SYS_DYNAMIC_LINKER -+# _LT_SYS_DYNAMIC_LINKER([TAG]) - # ----------------------------- - # PORTME Fill in your ld.so characteristics --AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], --[AC_REQUIRE([LT_AC_PROG_SED])dnl -+m4_defun([_LT_SYS_DYNAMIC_LINKER], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_OBJDUMP])dnl -+m4_require([_LT_DECL_SED])dnl - AC_MSG_CHECKING([dynamic linker characteristics]) --library_names_spec= --libname_spec='lib$name' --soname_spec= --shrext_cmds=".so" --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" --m4_if($1,[],[ -+m4_if([$1], -+ [], [ - if test "$GCC" = yes; 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 $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. -- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else -- lt_search_path_spec=`echo "$lt_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. -@@ -2262,7 +2767,7 @@ - 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 ' -+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' - BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; -@@ -2282,10 +2787,23 @@ - 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` -+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi]) -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -2322,7 +2840,7 @@ - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no -@@ -2348,9 +2866,18 @@ - ;; - - amigaos*) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ case $host_cpu in -+ powerpc) -+ # Since July 2007 AmigaOS4 officially supports .so libraries. -+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ ;; -+ m68k) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ esac - ;; - - beos*) -@@ -2373,25 +2900,28 @@ - # libtool to hard-code these into programs - ;; - --cygwin* | mingw* | pw32*) -+cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32*) -+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ -- chmod a+x \$dldir/$dlname' -+ chmod a+x \$dldir/$dlname~ -+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -+ fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ -- $rm \$dlpath' -+ $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in -@@ -2400,20 +2930,20 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; -- mingw*) -+ mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- 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 ';[c-zC-Z]:/' >/dev/null]; 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 ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ 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"` -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) -@@ -2437,13 +2967,13 @@ - version_type=darwin - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- m4_if([$1], [],[ -- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) -+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' - ;; - -@@ -2536,18 +3066,18 @@ - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; -- hppa*64*) -- shrext_cmds='.sl' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- *) -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH -@@ -2624,17 +3154,26 @@ - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -+ # Some binutils ld are patched to set DT_RUNPATH -+ save_LDFLAGS=$LDFLAGS -+ save_libdir=$libdir -+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ -+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], -+ [shlibpath_overrides_runpath=yes])]) -+ LDFLAGS=$save_LDFLAGS -+ libdir=$save_libdir -+ - # This implies no fast_install, which is unacceptable. + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" +@@ -2628,13 +2392,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -4095,14 +1591,13 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 # 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>/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' ' '` + 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="$sys_lib_dlsearch_path_spec $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 -@@ -2646,11 +3185,23 @@ +@@ -2646,6 +2408,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -4121,6965 +1616,134 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 netbsd*) version_type=sunos need_lib_prefix=no - need_version=no -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' -@@ -2671,14 +3222,16 @@ - shlibpath_overrides_runpath=yes - ;; - --nto-qnx*) -- version_type=linux -+*nto* | *qnx*) -+ version_type=qnx - 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=yes -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='ldqnx.so' - ;; - - openbsd*) -@@ -2687,13 +3240,13 @@ - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no -@@ -2765,7 +3318,6 @@ - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no -- export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) -@@ -2796,13 +3348,12 @@ - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -- shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -- shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -@@ -2812,6 +3363,17 @@ - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -+tpf*) -+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -+ 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}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ - uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -2826,302 +3388,72 @@ - AC_MSG_RESULT([$dynamic_linker]) - test "$dynamic_linker" = no && can_build_shared=no - --AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], --[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) --sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" --AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], --[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) --sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -- - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" - if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi --])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+fi -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+fi - --# _LT_AC_TAGCONFIG --# ---------------- --AC_DEFUN([_LT_AC_TAGCONFIG], --[AC_REQUIRE([LT_AC_PROG_SED])dnl --AC_ARG_WITH([tags], -- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], -- [include additional configurations @<:@automatic@:>@])], -- [tagnames="$withval"]) -- --if test -f "$ltmain" && test -n "$tagnames"; then -- if test ! -f "${ofile}"; then -- AC_MSG_WARN([output file `$ofile' does not exist]) -- fi -- -- if test -z "$LTCC"; then -- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -- if test -z "$LTCC"; then -- AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) -- else -- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) -- fi -- fi -- if test -z "$LTCFLAGS"; then -- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -- fi -+_LT_DECL([], [variables_saved_for_relink], [1], -+ [Variables whose values should be saved in libtool wrapper scripts and -+ restored at link time]) -+_LT_DECL([], [need_lib_prefix], [0], -+ [Do we need the "lib" prefix for modules?]) -+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -+_LT_DECL([], [version_type], [0], [Library versioning type]) -+_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -+_LT_DECL([], [shlibpath_overrides_runpath], [0], -+ [Is shlibpath searched before the hard-coded library search path?]) -+_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -+_LT_DECL([], [library_names_spec], [1], -+ [[List of archive names. First name is the real one, the rest are links. -+ The last name is the one that the linker finds with -lNAME]]) -+_LT_DECL([], [soname_spec], [1], -+ [[The coded name of the library, if different from the real name]]) -+_LT_DECL([], [postinstall_cmds], [2], -+ [Command to use after installation of a shared archive]) -+_LT_DECL([], [postuninstall_cmds], [2], -+ [Command to use after uninstallation of a shared archive]) -+_LT_DECL([], [finish_cmds], [2], -+ [Commands used to finish a libtool library installation in a directory]) -+_LT_DECL([], [finish_eval], [1], -+ [[As "finish_cmds", except a single script fragment to be evaled but -+ not shown]]) -+_LT_DECL([], [hardcode_into_libs], [0], -+ [Whether we should hardcode library paths into libraries]) -+_LT_DECL([], [sys_lib_search_path_spec], [2], -+ [Compile-time system search path for libraries]) -+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], -+ [Run-time system search path for libraries]) -+])# _LT_SYS_DYNAMIC_LINKER - -- # Extract list of available tagged configurations in $ofile. -- # Note that this assumes the entire list is on one line. -- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for tagname in $tagnames; do -- IFS="$lt_save_ifs" -- # Check whether tagname contains only valid characters -- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in -- "") ;; -- *) AC_MSG_ERROR([invalid tag name: $tagname]) -- ;; -- esac -- -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -- then -- AC_MSG_ERROR([tag name \"$tagname\" already exists]) -- fi -- -- # Update the list of available tags. -- if test -n "$tagname"; then -- echo appending configuration tag \"$tagname\" to $ofile -- -- case $tagname in -- CXX) -- if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- AC_LIBTOOL_LANG_CXX_CONFIG -- else -- tagname="" -- fi -- ;; -- -- F77) -- if test -n "$F77" && test "X$F77" != "Xno"; then -- AC_LIBTOOL_LANG_F77_CONFIG -- else -- tagname="" -- fi -- ;; -- -- GCJ) -- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -- AC_LIBTOOL_LANG_GCJ_CONFIG -- else -- tagname="" -- fi -- ;; -- -- RC) -- AC_LIBTOOL_LANG_RC_CONFIG -- ;; -- -- *) -- AC_MSG_ERROR([Unsupported tag name: $tagname]) -- ;; -- esac -- -- # Append the new tag name to the list of available tags. -- if test -n "$tagname" ; then -- available_tags="$available_tags $tagname" -- fi -- fi -- done -- IFS="$lt_save_ifs" -- -- # Now substitute the updated list of available tags. -- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -- mv "${ofile}T" "$ofile" -- chmod +x "$ofile" -- else -- rm -f "${ofile}T" -- AC_MSG_ERROR([unable to update list of available tagged configurations.]) -- fi --fi --])# _LT_AC_TAGCONFIG -- -- --# AC_LIBTOOL_DLOPEN --# ----------------- --# enable checks for dlopen support --AC_DEFUN([AC_LIBTOOL_DLOPEN], -- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) --])# AC_LIBTOOL_DLOPEN -- -- --# AC_LIBTOOL_WIN32_DLL --# -------------------- --# declare package support for building win32 DLLs --AC_DEFUN([AC_LIBTOOL_WIN32_DLL], --[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) --])# AC_LIBTOOL_WIN32_DLL -- -- --# AC_ENABLE_SHARED([DEFAULT]) --# --------------------------- --# implement the --enable-shared flag --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --AC_DEFUN([AC_ENABLE_SHARED], --[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE([shared], -- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], -- [p=${PACKAGE-default} -- case $enableval in -- yes) enable_shared=yes ;; -- no) enable_shared=no ;; -- *) -- enable_shared=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac], -- [enable_shared=]AC_ENABLE_SHARED_DEFAULT) --])# AC_ENABLE_SHARED -- -- --# AC_DISABLE_SHARED --# ----------------- --# set the default shared flag to --disable-shared --AC_DEFUN([AC_DISABLE_SHARED], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_SHARED(no) --])# AC_DISABLE_SHARED -- -- --# AC_ENABLE_STATIC([DEFAULT]) --# --------------------------- --# implement the --enable-static flag --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --AC_DEFUN([AC_ENABLE_STATIC], --[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE([static], -- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], -- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], -- [p=${PACKAGE-default} -- case $enableval in -- yes) enable_static=yes ;; -- no) enable_static=no ;; -- *) -- enable_static=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_static=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac], -- [enable_static=]AC_ENABLE_STATIC_DEFAULT) --])# AC_ENABLE_STATIC -- -- --# AC_DISABLE_STATIC --# ----------------- --# set the default static flag to --disable-static --AC_DEFUN([AC_DISABLE_STATIC], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_STATIC(no) --])# AC_DISABLE_STATIC -- -- --# AC_ENABLE_FAST_INSTALL([DEFAULT]) --# --------------------------------- --# implement the --enable-fast-install flag --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. --AC_DEFUN([AC_ENABLE_FAST_INSTALL], --[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl --AC_ARG_ENABLE([fast-install], -- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -- [p=${PACKAGE-default} -- case $enableval in -- yes) enable_fast_install=yes ;; -- no) enable_fast_install=no ;; -- *) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac], -- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) --])# AC_ENABLE_FAST_INSTALL -- -- --# AC_DISABLE_FAST_INSTALL --# ----------------------- --# set the default to --disable-fast-install --AC_DEFUN([AC_DISABLE_FAST_INSTALL], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --AC_ENABLE_FAST_INSTALL(no) --])# AC_DISABLE_FAST_INSTALL -- -- --# AC_LIBTOOL_PICMODE([MODE]) --# -------------------------- --# implement the --with-pic flag --# MODE is either `yes' or `no'. If omitted, it defaults to `both'. --AC_DEFUN([AC_LIBTOOL_PICMODE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl --pic_mode=ifelse($#,1,$1,default) --])# AC_LIBTOOL_PICMODE -- -- --# AC_PROG_EGREP --# ------------- --# This is predefined starting with Autoconf 2.54, so this conditional --# definition can be removed once we require Autoconf 2.54 or later. --m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], --[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], -- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -- fi]) -- EGREP=$ac_cv_prog_egrep -- AC_SUBST([EGREP]) --])]) -- -- --# AC_PATH_TOOL_PREFIX --# ------------------- --# 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]) --AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, --[case $MAGIC_CMD in --[[\\/*] | ?:[\\/]*]) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; --*) -- lt_save_MAGIC_CMD="$MAGIC_CMD" -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR --dnl $ac_dummy forces splitting on constant user-supplied paths. --dnl POSIX.2 word splitting is done only on the output of word expansions, --dnl not every word. This closes a longstanding sh security hole. -- ac_dummy="ifelse([$2], , $PATH, [$2])" -- for ac_dir in $ac_dummy; do -+# _LT_PATH_TOOL_PREFIX(TOOL) -+# -------------------------- -+# find a file program which can recognize shared library -+AC_DEFUN([_LT_PATH_TOOL_PREFIX], -+[m4_require([_LT_DECL_EGREP])dnl -+AC_MSG_CHECKING([for $1]) -+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -+[case $MAGIC_CMD in -+[[\\/*] | ?:[\\/]*]) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+dnl $ac_dummy forces splitting on constant user-supplied paths. -+dnl POSIX.2 word splitting is done only on the output of word expansions, -+dnl not every word. This closes a longstanding sh security hole. -+ ac_dummy="m4_if([$2], , $PATH, [$2])" -+ for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then -@@ -3135,7 +3467,7 @@ - $EGREP "$file_magic_regex" > /dev/null; then - : - else -- cat <<EOF 1>&2 -+ cat <<_LT_EOF 1>&2 - - *** Warning: the command libtool uses to detect shared libraries, - *** $file_magic_cmd, produces output that libtool cannot recognize. -@@ -3146,7 +3478,7 @@ - *** may want to report the problem to your system manager and/or to - *** bug-libtool@gnu.org - --EOF -+_LT_EOF - fi ;; - esac - fi -@@ -3163,37 +3495,47 @@ - else - AC_MSG_RESULT(no) - fi --])# AC_PATH_TOOL_PREFIX -+_LT_DECL([], [MAGIC_CMD], [0], -+ [Used to examine libraries when file_magic_cmd begins with "file"])dnl -+])# _LT_PATH_TOOL_PREFIX - -+# Old name: -+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) - --# AC_PATH_MAGIC --# ------------- -+ -+# _LT_PATH_MAGIC -+# -------------- - # 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) -+m4_defun([_LT_PATH_MAGIC], -+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) - if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then -- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) -+ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi - fi --])# AC_PATH_MAGIC -+])# _LT_PATH_MAGIC - - --# AC_PROG_LD -+# LT_PATH_LD - # ---------- - # find the pathname to the GNU or non-GNU linker --AC_DEFUN([AC_PROG_LD], --[AC_ARG_WITH([gnu-ld], -- [AC_HELP_STRING([--with-gnu-ld], -- [assume the C compiler uses GNU ld @<:@default=no@:>@])], -- [test "$withval" = no || with_gnu_ld=yes], -- [with_gnu_ld=no]) --AC_REQUIRE([LT_AC_PROG_SED])dnl --AC_REQUIRE([AC_PROG_CC])dnl -+AC_DEFUN([LT_PATH_LD], -+[AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_DECL_EGREP])dnl -+ -+AC_ARG_WITH([gnu-ld], -+ [AS_HELP_STRING([--with-gnu-ld], -+ [assume the C compiler uses GNU ld @<:@default=no@:>@])], -+ [test "$withval" = no || with_gnu_ld=yes], -+ [with_gnu_ld=no])dnl -+ - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -@@ -3210,9 +3552,9 @@ - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld -- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` -+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; -@@ -3262,15 +3604,24 @@ - AC_MSG_RESULT(no) - fi - test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) --AC_PROG_LD_GNU --])# AC_PROG_LD -+_LT_PATH_LD_GNU -+AC_SUBST([LD]) - -+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) -+])# LT_PATH_LD - --# AC_PROG_LD_GNU --# -------------- --AC_DEFUN([AC_PROG_LD_GNU], --[AC_REQUIRE([AC_PROG_EGREP])dnl --AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -+# Old names: -+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD]) -+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AM_PROG_LD], []) -+dnl AC_DEFUN([AC_PROG_LD], []) -+ -+ -+# _LT_PATH_LD_GNU -+#- -------------- -+m4_defun([_LT_PATH_LD_GNU], -+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, - [# I'd rather use --version here, but apparently some GNU lds only accept -v. - case `$LD -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) -@@ -3281,14 +3632,14 @@ - ;; - esac]) - with_gnu_ld=$lt_cv_prog_gnu_ld --])# AC_PROG_LD_GNU -+])# _LT_PATH_LD_GNU - - --# AC_PROG_LD_RELOAD_FLAG --# ---------------------- -+# _LT_CMD_RELOAD -+# -------------- - # find reload flag for linker - # -- PORTME Some linkers may need a different reload flag. --AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], -+m4_defun([_LT_CMD_RELOAD], - [AC_CACHE_CHECK([for $LD option to reload object files], - lt_cv_ld_reload_flag, - [lt_cv_ld_reload_flag='-r']) -@@ -3307,15 +3658,19 @@ - fi - ;; - esac --])# AC_PROG_LD_RELOAD_FLAG -+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl -+_LT_DECL([], [reload_cmds], [2])dnl -+])# _LT_CMD_RELOAD - - --# AC_DEPLIBS_CHECK_METHOD --# ----------------------- -+# _LT_CHECK_MAGIC_METHOD -+# ---------------------- - # 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 recognize dependent libraries], -+m4_defun([_LT_CHECK_MAGIC_METHOD], -+[m4_require([_LT_DECL_EGREP]) -+m4_require([_LT_DECL_OBJDUMP]) -+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= -@@ -3365,12 +3720,18 @@ - fi - ;; - -+cegcc) -+ # use the weaker test based on 'objdump'. See mingw*. -+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ ;; -+ - darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - - freebsd* | dragonfly*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. -@@ -3427,8 +3788,8 @@ +@@ -3427,7 +3201,7 @@ linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then +netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + 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 - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' -@@ -3441,12 +3802,12 @@ - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - --nto-qnx*) -- lt_cv_deplibs_check_method=unknown -+*nto* | *qnx*) -+ lt_cv_deplibs_check_method=pass_all - ;; - - openbsd*) -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -@@ -3465,6 +3826,10 @@ - lt_cv_deplibs_check_method=pass_all - ;; - -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ - sysv4 | sysv4.3*) - case $host_vendor in - motorola) -@@ -3492,7 +3857,7 @@ - esac - ;; - --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+tpf*) - lt_cv_deplibs_check_method=pass_all - ;; - esac -@@ -3500,14 +3865,20 @@ - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown --])# AC_DEPLIBS_CHECK_METHOD -+ -+_LT_DECL([], [deplibs_check_method], [1], -+ [Method to check whether dependent libraries are shared objects]) -+_LT_DECL([], [file_magic_cmd], [1], -+ [Command to use when deplibs_check_method == "file_magic"]) -+])# _LT_CHECK_MAGIC_METHOD - - --# AC_PROG_NM -+# LT_PATH_NM - # ---------- --# find the pathname to a BSD-compatible name lister --AC_DEFUN([AC_PROG_NM], --[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, -+# find the pathname to a BSD- or MS-compatible name lister -+AC_DEFUN([LT_PATH_NM], -+[AC_REQUIRE([AC_PROG_CC])dnl -+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, - [if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -@@ -3549,16 +3920,51 @@ - done - IFS="$lt_save_ifs" - done -- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -+ : ${lt_cv_path_NM=no} - fi]) --NM="$lt_cv_path_NM" --])# AC_PROG_NM -+if test "$lt_cv_path_NM" != "no"; then -+ NM="$lt_cv_path_NM" -+else -+ # Didn't find any BSD compatible name lister, look for dumpbin. -+ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) -+ AC_SUBST([DUMPBIN]) -+ if test "$DUMPBIN" != ":"; then -+ NM="$DUMPBIN" -+ fi -+fi -+test -z "$NM" && NM=nm -+AC_SUBST([NM]) -+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl - -+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], -+ [lt_cv_nm_interface="BSD nm" -+ echo "int some_variable = 0;" > conftest.$ac_ext -+ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$ac_compile" 2>conftest.err) -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) -+ cat conftest.out >&AS_MESSAGE_LOG_FD -+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then -+ lt_cv_nm_interface="MS dumpbin" -+ fi -+ rm -f conftest*]) -+])# LT_PATH_NM -+ -+# Old names: -+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AM_PROG_NM], []) -+dnl AC_DEFUN([AC_PROG_NM], []) - --# AC_CHECK_LIBM --# ------------- -+ -+# LT_LIB_M -+# -------- - # check for math library --AC_DEFUN([AC_CHECK_LIBM], -+AC_DEFUN([LT_LIB_M], - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in -@@ -3573,5028 +3979,5782 @@ - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; - esac --])# AC_CHECK_LIBM -+AC_SUBST([LIBM]) -+])# LT_LIB_M - -+# Old name: -+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_CHECK_LIBM], []) - --# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) --# ----------------------------------- --# sets LIBLTDL to the link flags for the libltdl convenience library and --# LTDLINCL to the include flags for the libltdl header and adds --# --enable-ltdl-convenience to the configure arguments. Note that --# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, --# it is assumed to be `libltdl'. LIBLTDL will be prefixed with --# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' --# (note the single quotes!). If your package is not flat and you're not --# using automake, define top_builddir and top_srcdir appropriately in --# the Makefiles. --AC_DEFUN([AC_LIBLTDL_CONVENIENCE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -- case $enable_ltdl_convenience in -- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; -- "") enable_ltdl_convenience=yes -- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -- esac -- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la -- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -- # For backwards non-gettext consistent compatibility... -- INCLTDL="$LTDLINCL" --])# AC_LIBLTDL_CONVENIENCE - -+# _LT_COMPILER_NO_RTTI([TAGNAME]) -+# ------------------------------- -+m4_defun([_LT_COMPILER_NO_RTTI], -+[m4_require([_LT_TAG_COMPILER])dnl - --# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) --# ----------------------------------- --# sets LIBLTDL to the link flags for the libltdl installable library and --# LTDLINCL to the include flags for the libltdl header and adds --# --enable-ltdl-install to the configure arguments. Note that --# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, --# and an installed libltdl is not found, it is assumed to be `libltdl'. --# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with --# '${top_srcdir}/' (note the single quotes!). If your package is not --# flat and you're not using automake, define top_builddir and top_srcdir --# appropriately in the Makefiles. --# In the future, this macro may have to be called after AC_PROG_LIBTOOL. --AC_DEFUN([AC_LIBLTDL_INSTALLABLE], --[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -- AC_CHECK_LIB(ltdl, lt_dlinit, -- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], -- [if test x"$enable_ltdl_install" = xno; then -- AC_MSG_WARN([libltdl not installed, but installation disabled]) -- else -- enable_ltdl_install=yes -- fi -- ]) -- if test x"$enable_ltdl_install" = x"yes"; then -- ac_configure_args="$ac_configure_args --enable-ltdl-install" -- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la -- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -- else -- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" -- LIBLTDL="-lltdl" -- LTDLINCL= -- fi -- # For backwards non-gettext consistent compatibility... -- INCLTDL="$LTDLINCL" --])# AC_LIBLTDL_INSTALLABLE -+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -+if test "$GCC" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - --# AC_LIBTOOL_CXX --# -------------- --# enable support for C++ libraries --AC_DEFUN([AC_LIBTOOL_CXX], --[AC_REQUIRE([_LT_AC_LANG_CXX]) --])# AC_LIBTOOL_CXX -+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -+ lt_cv_prog_compiler_rtti_exceptions, -+ [-fno-rtti -fno-exceptions], [], -+ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -+fi -+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], -+ [Compiler flag to turn off builtin functions]) -+])# _LT_COMPILER_NO_RTTI - - --# _LT_AC_LANG_CXX --# --------------- --AC_DEFUN([_LT_AC_LANG_CXX], --[AC_REQUIRE([AC_PROG_CXX]) --AC_REQUIRE([_LT_AC_PROG_CXXCPP]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) --])# _LT_AC_LANG_CXX -+# _LT_CMD_GLOBAL_SYMBOLS -+# ---------------------- -+m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+AC_REQUIRE([LT_PATH_LD])dnl -+m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_TAG_COMPILER])dnl - --# _LT_AC_PROG_CXXCPP --# ------------------ --AC_DEFUN([_LT_AC_PROG_CXXCPP], -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], - [ --AC_REQUIRE([AC_PROG_CXX]) --if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- AC_PROG_CXXCPP --fi --])# _LT_AC_PROG_CXXCPP -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] - --# AC_LIBTOOL_F77 --# -------------- --# enable support for Fortran 77 libraries --AC_DEFUN([AC_LIBTOOL_F77], --[AC_REQUIRE([_LT_AC_LANG_F77]) --])# AC_LIBTOOL_F77 -+# Character class describing NM global symbol codes. -+symcode='[[BCDEGRST]]' - -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - --# _LT_AC_LANG_F77 --# --------------- --AC_DEFUN([_LT_AC_LANG_F77], --[AC_REQUIRE([AC_PROG_F77]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) --])# _LT_AC_LANG_F77 -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[[BCDT]]' -+ ;; -+cygwin* | mingw* | pw32* | cegcc*) -+ symcode='[[ABCDGISTW]]' -+ ;; -+hpux*) -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDEGRST]]' -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[[BCDEGRST]]' -+ ;; -+osf*) -+ symcode='[[BCDEGQRST]]' -+ ;; -+solaris*) -+ symcode='[[BDRT]]' -+ ;; -+sco3.2v5*) -+ symcode='[[DT]]' -+ ;; -+sysv4.2uw2*) -+ symcode='[[DT]]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[[ABDT]]' -+ ;; -+sysv4) -+ symcode='[[DFNSTU]]' -+ ;; -+esac - -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[[ABCDGIRSTW]]' ;; -+esac - --# AC_LIBTOOL_GCJ --# -------------- --# enable support for GCJ libraries --AC_DEFUN([AC_LIBTOOL_GCJ], --[AC_REQUIRE([_LT_AC_LANG_GCJ]) --])# AC_LIBTOOL_GCJ -+# Transform an extracted symbol line into a proper C declaration. -+# Some systems (esp. on ia64) link data and code symbols differently, -+# so use this general approach. -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - -+# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - --# _LT_AC_LANG_GCJ --# --------------- --AC_DEFUN([_LT_AC_LANG_GCJ], --[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], -- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], -- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], -- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], -- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], -- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) --])# _LT_AC_LANG_GCJ -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac - -+# Try without a prefix underscore, then with it. -+for ac_symprfx in "" "_"; do - --# AC_LIBTOOL_RC --# ------------- --# enable support for Windows resource files --AC_DEFUN([AC_LIBTOOL_RC], --[AC_REQUIRE([LT_AC_PROG_RC]) --_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) --])# AC_LIBTOOL_RC -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" - -+ # Write the raw and C identifiers. -+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ # Fake it for dumpbin and say T for any non-static function -+ # and D for any global variable. -+ # Also find C++ and __fastcall symbols from MSVC++, -+ # which start with @ or ?. -+ lt_cv_sys_global_symbol_pipe="$AWK ['"\ -+" {last_section=section; section=\$ 3};"\ -+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -+" \$ 0!~/External *\|/{next};"\ -+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -+" {if(hide[section]) next};"\ -+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -+" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -+" ' prfx=^$ac_symprfx]" -+ else -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -+ fi - --# AC_LIBTOOL_LANG_C_CONFIG --# ------------------------ --# Ensure that the configuration vars for the C compiler are --# suitably defined. Those variables are subsequently used by --# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. --AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) --AC_DEFUN([_LT_AC_LANG_C_CONFIG], --[lt_save_CC="$CC" --AC_LANG_PUSH(C) -- --# Source file extension for C test sources. --ac_ext=c -- --# Object file extension for compiled C test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -- --# Code to be used in simple compile tests --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);}' -- --_LT_AC_SYS_COMPILER -- --# save warnings/boilerplate of simple test code --_LT_COMPILER_BOILERPLATE --_LT_LINKER_BOILERPLATE -- --AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) --AC_LIBTOOL_PROG_COMPILER_PIC($1) --AC_LIBTOOL_PROG_CC_C_O($1) --AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) --AC_LIBTOOL_PROG_LD_SHLIBS($1) --AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) --AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) --AC_LIBTOOL_SYS_LIB_STRIP --AC_LIBTOOL_DLOPEN_SELF -- --# Report which library types will actually be built --AC_MSG_CHECKING([if libtool supports shared libraries]) --AC_MSG_RESULT([$can_build_shared]) -- --AC_MSG_CHECKING([whether to build shared libraries]) --test "$can_build_shared" = "no" && enable_shared=no -- --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. --case $host_os in --aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -- --aix[[4-9]]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -- ;; --esac --AC_MSG_RESULT([$enable_shared]) -- --AC_MSG_CHECKING([whether to build static libraries]) --# Make sure either enable_shared or enable_static is yes. --test "$enable_shared" = yes || enable_static=yes --AC_MSG_RESULT([$enable_static]) -- --AC_LIBTOOL_CONFIG($1) -- --AC_LANG_POP --CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_C_CONFIG -- -- --# AC_LIBTOOL_LANG_CXX_CONFIG --# -------------------------- --# Ensure that the configuration vars for the C compiler are --# suitably defined. Those variables are subsequently used by --# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. --AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) --AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], --[AC_LANG_PUSH(C++) --AC_REQUIRE([AC_PROG_CXX]) --AC_REQUIRE([_LT_AC_PROG_CXXCPP]) -- --_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no --_LT_AC_TAGVAR(allow_undefined_flag, $1)= --_LT_AC_TAGVAR(always_export_symbols, $1)=no --_LT_AC_TAGVAR(archive_expsym_cmds, $1)= --_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= --_LT_AC_TAGVAR(hardcode_direct, $1)=no --_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= --_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= --_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= --_LT_AC_TAGVAR(hardcode_minus_L, $1)=no --_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported --_LT_AC_TAGVAR(hardcode_automatic, $1)=no --_LT_AC_TAGVAR(module_cmds, $1)= --_LT_AC_TAGVAR(module_expsym_cmds, $1)= --_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown --_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds --_LT_AC_TAGVAR(no_undefined_flag, $1)= --_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= --_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -- --# Dependencies to place before and after the object being linked: --_LT_AC_TAGVAR(predep_objects, $1)= --_LT_AC_TAGVAR(postdep_objects, $1)= --_LT_AC_TAGVAR(predeps, $1)= --_LT_AC_TAGVAR(postdeps, $1)= --_LT_AC_TAGVAR(compiler_lib_search_path, $1)= --_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= -- --# Source file extension for C++ test sources. --ac_ext=cpp -- --# Object file extension for compiled C++ test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -- --# Code to be used in simple compile tests --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); }' -- --# ltmain only uses $CC for tagged configurations so make sure $CC is set. --_LT_AC_SYS_COMPILER -- --# save warnings/boilerplate of simple test code --_LT_COMPILER_BOILERPLATE --_LT_LINKER_BOILERPLATE -+ # Check to see that the pipe works correctly. -+ pipe_works=no - --# Allow CC to be a program name with arguments. --lt_save_CC=$CC --lt_save_LD=$LD --lt_save_GCC=$GCC --GCC=$GXX --lt_save_with_gnu_ld=$with_gnu_ld --lt_save_path_LD=$lt_cv_path_LD --if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx --else -- $as_unset lt_cv_prog_gnu_ld --fi --if test -n "${lt_cv_path_LDCXX+set}"; then -- lt_cv_path_LD=$lt_cv_path_LDCXX --else -- $as_unset lt_cv_path_LD --fi --test -z "${LDCXX+set}" || LD=$LDCXX --CC=${CXX-"c++"} --compiler=$CC --_LT_AC_TAGVAR(compiler, $1)=$CC --_LT_CC_BASENAME([$compiler]) -+ rm -f conftest* -+ cat > conftest.$ac_ext <<_LT_EOF -+#ifdef __cplusplus -+extern "C" { -+#endif -+char nm_test_var; -+void nm_test_func(void); -+void nm_test_func(void){} -+#ifdef __cplusplus -+} -+#endif -+int main(){nm_test_var='a';nm_test_func();return(0);} -+_LT_EOF - --# We don't want -fno-exception wen compiling C++ code, so set the --# no_builtin_flag separately --if test "$GXX" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' --else -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= --fi -+ if AC_TRY_EVAL(ac_compile); then -+ # Now try to grab the symbols. -+ nlist=conftest.nm -+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi - --if test "$GXX" = yes; then -- # Set up default GNU C++ configuration -+ # Make sure that we snagged all the symbols we need. -+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then -+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then -+ cat <<_LT_EOF > conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif - -- AC_PROG_LD -+_LT_EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - -- # Check if GNU C++ uses GNU ld as the underlying linker, since the -- # archiving commands below assume that GNU ld is being used. -- if test "$with_gnu_ld" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ cat <<_LT_EOF >> conftest.$ac_ext - -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ void *address; -+} -+lt__PROGRAM__LTX_preloaded_symbols[[]] = -+{ -+ { "@PROGRAM@", (void *) 0 }, -+_LT_EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext -+ cat <<\_LT_EOF >> conftest.$ac_ext -+ {0, (void *) 0} -+}; - -- # If archive_cmds runs LD, not CC, wlarc should be empty -- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -- # investigate it a little bit more. (MM) -- wlarc='${wl}' -+/* This works around a problem in FreeBSD linker */ -+#ifdef FREEBSD_WORKAROUND -+static const void *lt_preloaded_setup() { -+ return lt__PROGRAM__LTX_preloaded_symbols; -+} -+#endif - -- # ancient GNU ld didn't support --whole-archive et. al. -- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -- grep 'no-whole-archive' > /dev/null; then -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+#ifdef __cplusplus -+} -+#endif -+_LT_EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -+ pipe_works=yes -+ fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" -+ else -+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -+ fi - else -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else -- with_gnu_ld=no -- wlarc= -- -- # A generic and very simple default shared library creation -- # command for GNU C++ for the case where it uses the native -- # linker, instead of GNU ld. If possible, this setting should -- # overridden to take advantage of the native linker features on -- # the platform it is being used on. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -+ cat conftest.$ac_ext >&5 - fi -+ rm -rf conftest* conftst* - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -- -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done -+]) -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ AC_MSG_RESULT(failed) - else -- GXX=no -- with_gnu_ld=no -- wlarc= -+ AC_MSG_RESULT(ok) - fi - --# PORTME: fill in a description of your system's C++ link characteristics --AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) --_LT_AC_TAGVAR(ld_shlibs, $1)=yes --case $host_os in -- aix3*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- aix[[4-9]]*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- aix_use_runtimelinking=no -- -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -- for ld_flag in $LDFLAGS; do -- case $ld_flag in -- *-brtl*) -- aix_use_runtimelinking=yes -- break -- ;; -- esac -- done -- ;; -- esac -- -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], -+ [Take the output of nm and produce a listing of raw symbols and C names]) -+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -+ [Transform the output of nm in a proper C declaration]) -+_LT_DECL([global_symbol_to_c_name_address], -+ [lt_cv_sys_global_symbol_to_c_name_address], [1], -+ [Transform the output of nm in a C name address pair]) -+_LT_DECL([global_symbol_to_c_name_address_lib_prefix], -+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], -+ [Transform the output of nm in a C name address pair when lib prefix is needed]) -+]) # _LT_CMD_GLOBAL_SYMBOLS - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -- -- _LT_AC_TAGVAR(archive_cmds, $1)='' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - -- if test "$GXX" = yes; then -- case $host_os in aix4.[[012]]|aix4.[[012]].*) -- # We only want to do this on AIX 4.2 and lower, the check -- # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- : -- else -- # We have old collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -- fi -- ;; -- esac -- shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -- fi -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -+# _LT_COMPILER_PIC([TAGNAME]) -+# --------------------------- -+m4_defun([_LT_COMPILER_PIC], -+[m4_require([_LT_TAG_COMPILER])dnl -+_LT_TAGVAR(lt_prog_compiler_wl, $1)= -+_LT_TAGVAR(lt_prog_compiler_pic, $1)= -+_LT_TAGVAR(lt_prog_compiler_static, $1)= - -- # It seems that -bexpall does not export symbols beginning with -- # underscore (_), so it is better to generate a list of symbols to export. -- _LT_AC_TAGVAR(always_export_symbols, $1)=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -- # Determine the default libpath from the value encoded in an empty executable. -- _LT_AC_SYS_LIBPATH_AIX -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+AC_MSG_CHECKING([for $compiler option to produce PIC]) -+m4_if([$1], [CXX], [ -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. - if test "$host_cpu" = ia64; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an empty executable. -- _LT_AC_SYS_LIBPATH_AIX -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -- fi -- fi -- ;; -- -- beos*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- -- chorus*) -- case $cc_basename in -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; -- -- cygwin* | mingw* | pw32*) -- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _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 -- -- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- darwin* | rhapsody*) -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -- if test "$GXX" = yes ; then -- output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -- if test "$lt_cv_apple_cc_single_mod" != "yes"; then -- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -- fi -- else -- 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` $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 $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}' -- ;; -- *) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- fi -- ;; -- -- dgux*) -- case $cc_basename in -- ec++*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- ghcx*) -- # Green Hills C++ Compiler -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; -- freebsd[[12]]*) -- # C++ shared libraries reported to be fairly broken before switch to ELF -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- freebsd-elf*) -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- ;; -- freebsd* | dragonfly*) -- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -- # conventions -- _LT_AC_TAGVAR(ld_shlibs, $1)=yes -- ;; -- gnu*) -- ;; -- hpux9*) -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -- # but as the default -- # location of the library. -- -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- aCC*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- *) -- if test "$GXX" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; -- esac -- ;; -- hpux10*|hpux11*) -- if test $with_gnu_ld = no; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - -+ amigaos*) - case $host_cpu in -- hppa*64*|ia64*) ;; -- *) -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ m68k) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac -- fi -- case $host_cpu in -- hppa*64*|ia64*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- *) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -- # but as the default -- # location of the library. - ;; -- esac - -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- aCC*) -- case $host_cpu in -- hppa*64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- ia64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # 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 -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; -+ *djgpp*) -+ # DJGPP does not support shared libraries at all -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; -+ hpux*) -+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -+ # sets the default TLS model and affects inlining. -+ case $host_cpu in -+ hppa*64*) -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; -+ *qnx* | *nto*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ case $host_os in -+ aix[[4-9]]*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ cxch68*) -+ # Green Hills C++ Compiler -+ # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' +@@ -4434,7 +4208,7 @@ case $host_os in ;; -- *) -- if test "$GXX" = yes; then -- if test $with_gnu_ld = no; then -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ if test "$host_cpu" != ia64; then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ fi -+ ;; -+ aCC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - case $host_cpu in -- hppa*64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- ia64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ hppa*64*|ia64*) -+ # +Z the default - ;; - *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac -- fi -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; -- 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' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -- # Instead, shared libraries are loaded at an image base (0x10000000 by -- # default) and relocated if they conflict, which is a slow very memory -- # consuming and fragmenting process. To avoid this, we pick a random, -- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -- # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- _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' -- ;; -- irix5* | irix6*) -- case $cc_basename in -- CC*) -- # SGI C++ -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- -- # Archives containing C++ object files must be created using -- # "CC -ar", where "CC" is the IRIX C++ compiler. This is -- # necessary to make sure instantiated templates are included -- # in the archive. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ ;; -+ esac - ;; -- *) -- if test "$GXX" = yes; then -- if test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -- fi -- fi -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? - ;; -- esac -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -- linux* | k*bsd*-gnu) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -- -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- -- # Archives containing C++ object files must be created using -- # "CC -Bstatic", where "CC" is the KAI C++ compiler. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -- ;; -- icpc*) -- # Intel C++ -- with_gnu_ld=yes -- # version 8.0 and above of icpc choke on multiply defined symbols -- # if we add $predep_objects and $postdep_objects, however 7.1 and -- # earlier do not add the objects themselves. -- case `$CC -V 2>&1` in -- *"Version 7."*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- ;; -- *) # Version 8.0 or newer -- tmp_idyn= -- case $host_cpu in -- ia64*) tmp_idyn=' -i_dynamic';; -- esac -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; - esac -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -- ;; -- pgCC* | pgcpp*) -- # Portland Group C++ compiler -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- ;; -- cxx*) -- # Compaq C++ -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -- -- runpath_var=LD_RUN_PATH -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # 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' -- ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # KAI C++ Compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ ecpc* ) -+ # old Intel C++ for x86_64 which still supported -KPIC. -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ icpc* ) -+ # Intel C++, used to be incompatible with GCC. -+ # ICC 10 doesn't accept -KPIC any more. -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ cxx*) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ xlc* | xlC*) -+ # IBM XL 8.0 on PPC -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ esac -+ ;; - esac - ;; -- esac -- ;; -- lynxos*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- m88k*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- mvs*) -- case $cc_basename in -- cxx*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; + esac + ;; - netbsd*) -- 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= -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- fi -- # Workaround some broken pre-1.5 toolchains -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -- ;; -- openbsd2*) -- # C++ shared libraries are fairly broken -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- openbsd*) -- 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 -- ;; -- osf3*) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -- -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # Archives containing C++ object files must be created using -- # "CC -Bstatic", where "CC" is the KAI C++ compiler. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -- -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- cxx*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' -+ lynxos*) ++ 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= +@@ -6126,7 +5900,7 @@ AC_MSG_CHECKING([for $compiler option to + ;; + esac ;; -- *) -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -- -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -+ m88k*) - ;; -- esac -- ;; -- osf4* | osf5*) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -- -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # Archives containing C++ object files must be created using -- # the KAI C++ compiler. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- cxx*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -- echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ -- $rm $lib.exp' -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac - ;; -- *) -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -- -- else -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi +- netbsd*) + netbsd* | netbsdelf*-gnu) ;; -- esac -- ;; -- psos*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- sunos4*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.x -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- lcc*) -- # Lucid -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ *qnx* | *nto*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ cxx*) -+ # Digital/Compaq C++ -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ ;; -+ esac - ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ psos*) - ;; -- esac -- ;; -- solaris*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.2, 5.x and Centerline C++ -- _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes -- _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)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- case $host_os in -- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ ;; - *) -- # 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)='-z allextract$convenience -z defaultextract' - ;; - esac -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- -- 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' -- ;; -- gcx*) -- # Green Hills C++ Compiler -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- -- # The C++ compiler must be used to create the archive. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; -- *) -- # GNU C++ compiler with Solaris linker -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -- if $CC --version | grep -v '^2\.7' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -- else -- # g++ 2.7 appears to require `-G' NOT `-shared' on this -- # platform. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -- fi -- -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -- case $host_os in -- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ lcc*) -+ # Lucid -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; - *) -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - ;; -- esac -- fi -+ esac - ;; -- esac -- ;; -- 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 -- runpath_var='LD_RUN_PATH' -- -- case $cc_basename in -- CC*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ esac - ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ *) -+ ;; -+ esac - ;; -- esac -- ;; -- sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -- # link with -lc, and that would cause any symbols used from libc to -- # always be unresolved, which means just about no library would -- # ever link correctly. If we're not using GNU ld we use -z text -- # though, which does catch some bad symbols but isn't as heavy-handed -- # as -z defs. -- # For security reasons, it is highly recommended that you always -- # use absolute paths for naming shared libraries, and exclude the -- # DT_RUNPATH tag from executables and libraries. But doing so -- # requires that you compile everything twice, which is a pain. -- # So that behaviour is only enabled if SCOABSPATH is set to a -- # non-empty value in the environment. Most likely only useful for -- # creating official distributions of packages. -- # This is a hack until libtool officially supports absolute path -- # names for shared libraries. -- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -- runpath_var='LD_RUN_PATH' -- -- case $cc_basename in -- CC*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ vxworks*) - ;; - *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac -- ;; -- tandem*) -- case $cc_basename in -- NCC*) -- # NonStop-UX NCC 3.20 -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- ;; -- vxworks*) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; --esac --AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) --test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ fi -+], -+[ -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - --_LT_AC_TAGVAR(GCC, $1)="$GXX" --_LT_AC_TAGVAR(LD, $1)="$LD" -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; - --AC_LIBTOOL_POSTDEP_PREDEP($1) --AC_LIBTOOL_PROG_COMPILER_PIC($1) --AC_LIBTOOL_PROG_CC_C_O($1) --AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) --AC_LIBTOOL_PROG_LD_SHLIBS($1) --AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) --AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ m68k) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ esac -+ ;; - --AC_LIBTOOL_CONFIG($1) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; - --AC_LANG_POP --CC=$lt_save_CC --LDCXX=$LD --LD=$lt_save_LD --GCC=$lt_save_GCC --with_gnu_ldcxx=$with_gnu_ld --with_gnu_ld=$lt_save_with_gnu_ld --lt_cv_path_LDCXX=$lt_cv_path_LD --lt_cv_path_LD=$lt_save_path_LD --lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld --lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld --])# AC_LIBTOOL_LANG_CXX_CONFIG -+ mingw* | cygwin* | pw32* | os2* | cegcc*) -+ # 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 -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - --# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) --# ------------------------------------ --# Figure out "hidden" library dependencies from verbose --# compiler output when linking a shared library. --# Parse the compiler output and extract the necessary --# objects, libraries and library flags. --AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], --[AC_REQUIRE([LT_AC_PROG_SED])dnl --dnl we can't use the lt_simple_compile_test_code here, --dnl because it contains code intended for an executable, --dnl not a library. It's possible we should let each --dnl tag define a new lt_????_link_test_code variable, --dnl but it's only used here... --ifelse([$1],[],[cat > conftest.$ac_ext <<EOF --int a; --void foo (void) { a = 0; } --EOF --],[$1],[CXX],[cat > conftest.$ac_ext <<EOF --class Foo --{ --public: -- Foo (void) { a = 0; } --private: -- int a; --}; --EOF --],[$1],[F77],[cat > conftest.$ac_ext <<EOF -- subroutine foo -- implicit none -- integer*4 a -- a=0 -- return -- end --EOF --],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF --public class foo { -- private int a; -- public void bar (void) { -- a = 0; -- } --}; --EOF --]) --dnl Parse the compiler output and extract the necessary --dnl objects, libraries and library flags. --if AC_TRY_EVAL(ac_compile); then -- # Parse the compiler output and extract the necessary -- # objects, libraries and library flags. -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; - -- # Sentinel used to keep track of whether or not we are before -- # the conftest object file. -- pre_test_object_deps_done=no -+ hpux*) -+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -+ # sets the default TLS model and affects inlining. -+ case $host_cpu in -+ hppa*64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; - -- # The `*' in the case matches for architectures that use `case' in -- # $output_verbose_cmd can trigger glob expansion during the loop -- # eval without this substitution. -- output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; - -- for p in `eval $output_verbose_link_cmd`; do -- case $p in -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ enable_shared=no -+ ;; - -- -L* | -R* | -l*) -- # Some compilers place space between "-{L,R}" and the path. -- # Remove the space. -- if test $p = "-L" \ -- || test $p = "-R"; then -- prev=$p -- continue -- else -- prev= -- fi -+ *nto* | *qnx*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; - -- if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -- # Internal compiler library paths should come after those -- # provided the user. The postdeps already come after the -- # user supplied libs so there is no need to process them. -- if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" -- else -- _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" -- fi -- ;; -- # The "-l" case would never come before the object being -- # linked, so don't bother handling this case. -- esac -- else -- if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then -- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" -- else -- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" -- fi -- fi -- ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; - -- *.$objext) -- # This assumes that the test object file only shows up -- # once in the compiler output. -- if test "$p" = "conftest.$objext"; then -- pre_test_object_deps_done=yes -- continue -- fi -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; - -- if test "$pre_test_object_deps_done" = no; then -- if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then -- _LT_AC_TAGVAR(predep_objects, $1)="$p" -- else -- _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p" -- fi -- else -- if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then -- _LT_AC_TAGVAR(postdep_objects, $1)="$p" -- else -- _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p" -- fi -- fi -- ;; -+ mingw* | cygwin* | pw32* | os2* | cegcc*) -+ # 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). -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; - -- *) ;; # Ignore the rest. -+ hpux9* | hpux10* | hpux11*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ ;; - -- esac -- done -+ irix5* | irix6* | nonstopux*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC (with -KPIC) is the default. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; - -- # Clean up. -- rm -f a.out a.exe --else -- echo "libtool.m4: error: problem compiling $1 test program" --fi -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ # old Intel for x86_64 which still supported -KPIC. -+ ecc*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ # icc used to be incompatible with GCC. -+ # ICC 10 doesn't accept -KPIC any more. -+ icc* | ifort*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ # Lahey Fortran 8.1. -+ lf95*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ ccc*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All Alpha code is PIC. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ xl*) -+ # IBM XL C 8.0/Fortran 10.1 on PPC -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' -+ ;; -+ esac -+ ;; -+ esac -+ ;; - --$rm -f confest.$objext -+ newsos6) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= --if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then -- _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` --fi -+ *nto* | *qnx*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; - --# PORTME: override above test on systems where it is broken --ifelse([$1],[CXX], --[case $host_os in --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)= -- _LT_AC_TAGVAR(postdep_objects,$1)= -- _LT_AC_TAGVAR(postdeps,$1)= -- ;; -+ osf3* | osf4* | osf5*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All OSF/1 code is PIC. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; - --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 -+ rdos*) -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; -- 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 -+ solaris*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -+ esac - ;; -- 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. -- if test "$solaris_use_stlport4" != yes; then -- _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -- fi -- ;; -- esac -- ;; --esac --]) --case " $_LT_AC_TAGVAR(postdeps, $1) " in --*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; --esac --])# AC_LIBTOOL_POSTDEP_PREDEP -- --# AC_LIBTOOL_LANG_F77_CONFIG --# -------------------------- --# Ensure that the configuration vars for the C compiler are --# suitably defined. Those variables are subsequently used by --# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. --AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)]) --AC_DEFUN([_LT_AC_LANG_F77_CONFIG], --[AC_REQUIRE([AC_PROG_F77]) --AC_LANG_PUSH(Fortran 77) -- --_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no --_LT_AC_TAGVAR(allow_undefined_flag, $1)= --_LT_AC_TAGVAR(always_export_symbols, $1)=no --_LT_AC_TAGVAR(archive_expsym_cmds, $1)= --_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= --_LT_AC_TAGVAR(hardcode_direct, $1)=no --_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= --_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= --_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= --_LT_AC_TAGVAR(hardcode_minus_L, $1)=no --_LT_AC_TAGVAR(hardcode_automatic, $1)=no --_LT_AC_TAGVAR(module_cmds, $1)= --_LT_AC_TAGVAR(module_expsym_cmds, $1)= --_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown --_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds --_LT_AC_TAGVAR(no_undefined_flag, $1)= --_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= --_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ sunos4*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# Source file extension for f77 test sources. --ac_ext=f -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# Object file extension for compiled f77 test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; - --# Code to be used in simple compile tests --lt_simple_compile_test_code="\ -- subroutine t -- return -- end --" -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# Code to be used in simple link tests --lt_simple_link_test_code="\ -- program t -- end --" -+ unicos*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; - --# ltmain only uses $CC for tagged configurations so make sure $CC is set. --_LT_AC_SYS_COMPILER -+ uts4*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - --# save warnings/boilerplate of simple test code --_LT_COMPILER_BOILERPLATE --_LT_LINKER_BOILERPLATE -+ *) -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+]) -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" -+ ;; -+esac -+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) - --# Allow CC to be a program name with arguments. --lt_save_CC="$CC" --CC=${F77-"f77"} --compiler=$CC --_LT_AC_TAGVAR(compiler, $1)=$CC --_LT_CC_BASENAME([$compiler]) -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then -+ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], -+ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], -+ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in -+ "" | " "*) ;; -+ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; -+ esac], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -+fi -+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], -+ [Additional compiler flags for building library objects]) - --AC_MSG_CHECKING([if libtool supports shared libraries]) --AC_MSG_RESULT([$can_build_shared]) -+# -+# Check to make sure the static flag actually works. -+# -+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -+ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), -+ $lt_tmp_static_flag, -+ [], -+ [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], -+ [Compiler flag to prevent dynamic linking]) -+])# _LT_COMPILER_PIC - --AC_MSG_CHECKING([whether to build shared libraries]) --test "$can_build_shared" = "no" && enable_shared=no - --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. --case $host_os in --aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -+# _LT_LINKER_SHLIBS([TAGNAME]) -+# ---------------------------- -+# See if the linker supports building shared libraries. -+m4_defun([_LT_LINKER_SHLIBS], -+[AC_REQUIRE([LT_PATH_LD])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_TAG_COMPILER])dnl -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+m4_if([$1], [CXX], [ -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ case $host_os in -+ aix[[4-9]]*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -6503,6 +6277,9 @@ ifelse([$1],[CXX],[ + cygwin* | mingw*) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; --aix[[4-9]]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -+ cygwin* | mingw* | cegcc*) -+ _LT_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' - ;; --esac --AC_MSG_RESULT([$enable_shared]) + linux* | k*bsd*-gnu) -+ _LT_TAGVAR(link_all_deplibs, $1)=no ++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no + ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -+], [ -+ runpath_var= -+ _LT_TAGVAR(allow_undefined_flag, $1)= -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(archive_cmds, $1)= -+ _LT_TAGVAR(archive_expsym_cmds, $1)= -+ _LT_TAGVAR(compiler_needs_object, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(hardcode_automatic, $1)=no -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+ _LT_TAGVAR(hardcode_libdir_separator, $1)= -+ _LT_TAGVAR(hardcode_minus_L, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_TAGVAR(inherit_rpath, $1)=no -+ _LT_TAGVAR(link_all_deplibs, $1)=unknown -+ _LT_TAGVAR(module_cmds, $1)= -+ _LT_TAGVAR(module_expsym_cmds, $1)= -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)= -+ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= -+ _LT_TAGVAR(thread_safe_flag_spec, $1)= -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ _LT_TAGVAR(include_expsyms, $1)= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. -+dnl Note also adjust exclude_expsyms for C++ above. -+ extract_expsyms_cmds= - --AC_MSG_CHECKING([whether to build static libraries]) --# Make sure either enable_shared or enable_static is yes. --test "$enable_shared" = yes || enable_static=yes --AC_MSG_RESULT([$enable_static]) -- --_LT_AC_TAGVAR(GCC, $1)="$G77" --_LT_AC_TAGVAR(LD, $1)="$LD" -- --AC_LIBTOOL_PROG_COMPILER_PIC($1) --AC_LIBTOOL_PROG_CC_C_O($1) --AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) --AC_LIBTOOL_PROG_LD_SHLIBS($1) --AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) --AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+ case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac - --AC_LIBTOOL_CONFIG($1) -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' - --AC_LANG_POP --CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_F77_CONFIG -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac - -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix[[3-9]]*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 - --# AC_LIBTOOL_LANG_GCJ_CONFIG --# -------------------------- --# Ensure that the configuration vars for the C compiler are --# suitably defined. Those variables are subsequently used by --# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. --AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)]) --AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], --[AC_LANG_SAVE -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. - --# Source file extension for Java test sources. --ac_ext=java -+_LT_EOF -+ fi -+ ;; - --# Object file extension for compiled Java test sources. --objext=o --_LT_AC_TAGVAR(objext, $1)=$objext -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='' -+ ;; -+ m68k) -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ ;; - --# Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}" -+ beos*) -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# Code to be used in simple link tests --lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' -+ cygwin* | mingw* | pw32* | cegcc*) -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_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' - --# ltmain only uses $CC for tagged configurations so make sure $CC is set. --_LT_AC_SYS_COMPILER -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# save warnings/boilerplate of simple test code --_LT_COMPILER_BOILERPLATE --_LT_LINKER_BOILERPLATE -+ interix[[3-9]]*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_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' -+ ;; - --# Allow CC to be a program name with arguments. --lt_save_CC="$CC" --CC=${GCJ-"gcj"} --compiler=$CC --_LT_AC_TAGVAR(compiler, $1)=$CC --_LT_CC_BASENAME([$compiler]) -+ gnu* | linux* | tpf* | k*bsd*-gnu) -+ tmp_diet=no -+ if test "$host_os" = linux-dietlibc; then -+ case $cc_basename in -+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) -+ esac -+ fi -+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ -+ && test "$tmp_diet" = no -+ then -+ tmp_addflag= -+ tmp_sharedflag='-shared' -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ lf95*) # Lahey Fortran 8.1 -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ tmp_sharedflag='--shared' ;; -+ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) -+ tmp_sharedflag='-qmkshrobj' -+ tmp_addflag= ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ _LT_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' -+ _LT_TAGVAR(compiler_needs_object, $1)=yes -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ esac -+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - --# GCJ did not exist at the time GCC didn't implicitly link libc in. --_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ if test "x$supports_anon_versioning" = xyes; then -+ _LT_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 '"$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(old_archive_cmds, $1)=$old_archive_cmds -+ case $cc_basename in -+ xlf*) -+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ if test "x$supports_anon_versioning" = xyes; then -+ _LT_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~ -+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ fi -+ ;; -+ esac -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) --AC_LIBTOOL_PROG_COMPILER_PIC($1) --AC_LIBTOOL_PROG_CC_C_O($1) --AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) --AC_LIBTOOL_PROG_LD_SHLIBS($1) --AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) --AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; - --AC_LIBTOOL_CONFIG($1) -+ solaris*) -+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 - --AC_LANG_RESTORE --CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_GCJ_CONFIG -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - -+_LT_EOF -+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# AC_LIBTOOL_LANG_RC_CONFIG --# ------------------------- --# Ensure that the configuration vars for the Windows resource compiler are --# suitably defined. Those variables are subsequently used by --# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. --AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)]) --AC_DEFUN([_LT_AC_LANG_RC_CONFIG], --[AC_LANG_SAVE -- --# Source file extension for RC test sources. --ac_ext=rc -- --# Object file extension for compiled RC test sources. --objext=o --_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 }' -- --# Code to be used in simple link tests --lt_simple_link_test_code="$lt_simple_compile_test_code" -- --# ltmain only uses $CC for tagged configurations so make sure $CC is set. --_LT_AC_SYS_COMPILER -- --# save warnings/boilerplate of simple test code --_LT_COMPILER_BOILERPLATE --_LT_LINKER_BOILERPLATE -- --# Allow CC to be a program name with arguments. --lt_save_CC="$CC" --CC=${RC-"windres"} --compiler=$CC --_LT_AC_TAGVAR(compiler, $1)=$CC --_LT_CC_BASENAME([$compiler]) --_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -- --AC_LIBTOOL_CONFIG($1) -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 - --AC_LANG_RESTORE --CC="$lt_save_CC" --])# AC_LIBTOOL_LANG_RC_CONFIG -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. - -+_LT_EOF -+ ;; -+ *) -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - --# AC_LIBTOOL_CONFIG([TAGNAME]) --# ---------------------------- --# If TAGNAME is not passed, then create an initial libtool script --# with a default configuration from the untagged config vars. Otherwise --# add code to config.status for appending the configuration named by --# TAGNAME from the matching tagged config vars. --AC_DEFUN([AC_LIBTOOL_CONFIG], --[# The else clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# no rules to generate ltmain.sh. --if test -f "$ltmain"; then -- # 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 -- setopt NO_GLOB_SUBST -- fi -- # Now quote all the things that may contain metacharacters while being -- # careful not to overquote the AC_SUBSTed values. We take copies of the -- # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -- SED SHELL STRIP \ -- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -- deplibs_check_method reload_flag reload_cmds need_locks \ -- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -- lt_cv_sys_global_symbol_to_c_name_address \ -- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- old_postinstall_cmds old_postuninstall_cmds \ -- _LT_AC_TAGVAR(compiler, $1) \ -- _LT_AC_TAGVAR(CC, $1) \ -- _LT_AC_TAGVAR(LD, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \ -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \ -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \ -- _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \ -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \ -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \ -- _LT_AC_TAGVAR(old_archive_cmds, $1) \ -- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \ -- _LT_AC_TAGVAR(predep_objects, $1) \ -- _LT_AC_TAGVAR(postdep_objects, $1) \ -- _LT_AC_TAGVAR(predeps, $1) \ -- _LT_AC_TAGVAR(postdeps, $1) \ -- _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ -- _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ -- _LT_AC_TAGVAR(archive_cmds, $1) \ -- _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ -- _LT_AC_TAGVAR(postinstall_cmds, $1) \ -- _LT_AC_TAGVAR(postuninstall_cmds, $1) \ -- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \ -- _LT_AC_TAGVAR(allow_undefined_flag, $1) \ -- _LT_AC_TAGVAR(no_undefined_flag, $1) \ -- _LT_AC_TAGVAR(export_symbols_cmds, $1) \ -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \ -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \ -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \ -- _LT_AC_TAGVAR(hardcode_automatic, $1) \ -- _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 -- -- case $var in -- _LT_AC_TAGVAR(old_archive_cmds, $1) | \ -- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \ -- _LT_AC_TAGVAR(archive_cmds, $1) | \ -- _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ -- _LT_AC_TAGVAR(module_cmds, $1) | \ -- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ -- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ -- _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ -- extract_expsyms_cmds | reload_cmds | finish_cmds | \ -- postinstall_cmds | postuninstall_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -- # Double-quote double-evaled strings. -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -+ sunos4*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; -+ - *) -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi - ;; - esac -- done -- -- case $lt_echo in -- *'\[$]0 --fallback-echo"') -- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'` -- ;; -- esac - --ifelse([$1], [], -- [cfgfile="${ofile}T" -- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -- $rm -f "$cfgfile" -- AC_MSG_NOTICE([creating $ofile])], -- [cfgfile="$ofile"]) -- -- cat <<__EOF__ >> "$cfgfile" --ifelse([$1], [], --[#! $SHELL -+ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then -+ runpath_var= -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ _LT_TAGVAR(hardcode_direct, $1)=unsupported -+ fi -+ ;; - --# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008 --# Free Software Foundation, Inc. --# --# This file is part of GNU Libtool: --# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program 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 --# General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -+ aix[[4-9]]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no - --# A sed program that does not truncate output. --SED=$lt_SED -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac - --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="$SED -e 1s/^X//" -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - --# 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 -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - --# The names of the tagged configurations supported by this script. --available_tags= -+ _LT_TAGVAR(archive_cmds, $1)='' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' - --# ### BEGIN LIBTOOL CONFIG], --[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && -+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ _LT_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi - --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='' -+ ;; -+ m68k) -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ ;; - --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared -+ bsdi[[45]]*) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -+ ;; - --# Whether or not to build static libraries. --build_old_libs=$enable_static -+ cygwin* | mingw* | pw32* | cegcc*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; - --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) -+ darwin* | rhapsody*) -+ _LT_DARWIN_LINKER_FEATURES($1) -+ ;; - --# Whether or not to disallow shared libs when runtime libs are static --allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) -+ dgux*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install -+ freebsd1*) -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; - --# The host system. --host_alias=$host_alias --host=$host --host_os=$host_os -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# The build system. --build_alias=$build_alias --build=$build --build_os=$build_os -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# An echo program that does not interpret backslashes. --echo=$lt_echo -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS -+ hpux9*) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_direct, $1)=yes - --# A C compiler. --LTCC=$lt_LTCC -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; - --# LTCC compiler flags. --LTCFLAGS=$lt_LTCFLAGS -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ fi -+ ;; - --# A language-specific compiler. --CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: - --# Is the compiler the GNU C compiler? --with_gcc=$_LT_AC_TAGVAR(GCC, $1) -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - --# An ERE matcher. --EGREP=$lt_EGREP -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ fi -+ ;; - --# The linker used to build libraries. --LD=$lt_[]_LT_AC_TAGVAR(LD, $1) -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ # Try to use the -exported_symbol ld option, if it does not -+ # work, assume that -exports_file does not work either and -+ # implicitly export all symbols. -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE(int foo(void) {}, -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ ) -+ LDFLAGS="$save_LDFLAGS" -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -+ fi -+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(inherit_rpath, $1)=yes -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; - --# Whether we need hard or soft links. --LN_S=$lt_LN_S -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# A BSD-compatible nm program. --NM=$lt_NM -+ newsos6) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# A symbol stripping program --STRIP=$lt_STRIP -+ *nto* | *qnx*) -+ ;; - --# Used to examine libraries when file_magic_cmd begins "file" --MAGIC_CMD=$MAGIC_CMD -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ else -+ case $host_os in -+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" -+ os2*) -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; - --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" -+ osf3*) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; - --# Used on cygwin: assembler. --AS="$AS" -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ else -+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - --# The name of the directory that contains temporary libtool files. --objdir=$objdir -+ # Both c and cxx compiler support -rpath directly -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ fi -+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; - --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -+ solaris*) -+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ else -+ case `$CC -V 2>&1` in -+ *"Compilers 5.0"*) -+ wlarc='' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' -+ ;; -+ *) -+ wlarc='${wl}' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ ;; -+ esac -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # 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?) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ esac -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; - --# How to pass a linker flag through the compiler. --wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Object file suffix (normally "o"). --objext="$ac_objext" -+ sysv4) -+ case $host_vendor in -+ sni) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ ;; -+ motorola) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Old archive suffix (normally "a"). --libext="$libext" -+ sysv4.3*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -+ ;; - --# Shared library suffix (normally ".so"). --shrext_cmds='$shrext_cmds' -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ fi -+ ;; - --# Executable file suffix (normally ""). --exeext="$exeext" -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' - --# Additional compiler flags for building library objects. --pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) --pic_mode=$pic_mode -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; - --# What is the maximum length of a command? --max_cmd_len=$lt_cv_sys_max_cmd_len -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; - --# Must we lock files when doing compilation? --need_locks=$lt_need_locks -+ uts4*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix -+ *) -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac - --# Do we need a version for libraries? --need_version=$need_version -+ if test x$host_vendor = xsni; then -+ case $host in -+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' -+ ;; -+ esac -+ fi -+ fi -+]) -+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - --# Whether dlopen is supported. --dlopen_support=$enable_dlopen -+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self -+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -+_LT_DECL([], [extract_expsyms_cmds], [2], -+ [The commands to extract the exported symbol list from a shared archive]) - --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static -+# -+# Do we need to explicitly link libc? -+# -+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -+x|xyes) -+ # Assume -lc should be added -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $_LT_TAGVAR(archive_cmds, $1) in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -+ $RM conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) -+ _LT_TAGVAR(allow_undefined_flag, $1)= -+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) -+ then -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ else -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ fi -+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $RM conftest* -+ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) -+ ;; -+ esac -+ fi -+ ;; -+esac - --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) -+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], -+ [Whether or not to add -lc for building shared libraries]) -+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], -+ [enable_shared_with_static_runtimes], [0], -+ [Whether or not to disallow shared libs when runtime libs are static]) -+_LT_TAGDECL([], [export_dynamic_flag_spec], [1], -+ [Compiler flag to allow reflexive dlopens]) -+_LT_TAGDECL([], [whole_archive_flag_spec], [1], -+ [Compiler flag to generate shared objects directly from archives]) -+_LT_TAGDECL([], [compiler_needs_object], [1], -+ [Whether the compiler copes with passing no objects directly]) -+_LT_TAGDECL([], [old_archive_from_new_cmds], [2], -+ [Create an old-style archive from a shared archive]) -+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], -+ [Create a temporary old-style archive to link instead of a shared archive]) -+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -+_LT_TAGDECL([], [archive_expsym_cmds], [2]) -+_LT_TAGDECL([], [module_cmds], [2], -+ [Commands used to build a loadable module if different from building -+ a shared archive.]) -+_LT_TAGDECL([], [module_expsym_cmds], [2]) -+_LT_TAGDECL([], [with_gnu_ld], [1], -+ [Whether we are building with GNU ld or not]) -+_LT_TAGDECL([], [allow_undefined_flag], [1], -+ [Flag that allows shared libraries with undefined symbols to be built]) -+_LT_TAGDECL([], [no_undefined_flag], [1], -+ [Flag that enforces no undefined symbols]) -+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], -+ [Flag to hardcode $libdir into a binary during linking. -+ This must work even if $libdir does not exist]) -+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], -+ [[If ld is used when linking, flag to hardcode $libdir into a binary -+ during linking. This must work even if $libdir does not exist]]) -+_LT_TAGDECL([], [hardcode_libdir_separator], [1], -+ [Whether we need a single "-rpath" flag with a separated argument]) -+_LT_TAGDECL([], [hardcode_direct], [0], -+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes -+ DIR into the resulting binary]) -+_LT_TAGDECL([], [hardcode_direct_absolute], [0], -+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes -+ DIR into the resulting binary and the resulting library dependency is -+ "absolute", i.e impossible to change by setting ${shlibpath_var} if the -+ library is relocated]) -+_LT_TAGDECL([], [hardcode_minus_L], [0], -+ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR -+ into the resulting binary]) -+_LT_TAGDECL([], [hardcode_shlibpath_var], [0], -+ [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -+ into the resulting binary]) -+_LT_TAGDECL([], [hardcode_automatic], [0], -+ [Set to "yes" if building a shared library automatically hardcodes DIR -+ into the library and all subsequent libraries and executables linked -+ against it]) -+_LT_TAGDECL([], [inherit_rpath], [0], -+ [Set to yes if linker adds runtime paths of dependent libraries -+ to runtime path list]) -+_LT_TAGDECL([], [link_all_deplibs], [0], -+ [Whether libtool must link a program against all its dependency libraries]) -+_LT_TAGDECL([], [fix_srcfile_path], [1], -+ [Fix the shell variable $srcfile for the compiler]) -+_LT_TAGDECL([], [always_export_symbols], [0], -+ [Set to "yes" if exported symbols are required]) -+_LT_TAGDECL([], [export_symbols_cmds], [2], -+ [The commands to list exported symbols]) -+_LT_TAGDECL([], [exclude_expsyms], [1], -+ [Symbols that should not be listed in the preloaded symbols]) -+_LT_TAGDECL([], [include_expsyms], [1], -+ [Symbols that must always be exported]) -+_LT_TAGDECL([], [prelink_cmds], [2], -+ [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [file_list_spec], [1], -+ [Specify filename containing input files]) -+dnl FIXME: Not yet implemented -+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -+dnl [Compiler flag to generate thread safe objects]) -+])# _LT_LINKER_SHLIBS - --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) - --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) -+# _LT_LANG_C_CONFIG([TAG]) -+# ------------------------ -+# Ensure that the configuration variables for a C compiler are suitably -+# defined. These variables are subsequently used by _LT_CONFIG to write -+# the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_C_CONFIG], -+[m4_require([_LT_DECL_EGREP])dnl -+lt_save_CC="$CC" -+AC_LANG_PUSH(C) - --# Library versioning type. --version_type=$version_type -+# Source file extension for C test sources. -+ac_ext=c - --# Format of library name prefix. --libname_spec=$lt_libname_spec -+# Object file extension for compiled C test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext - --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$lt_library_names_spec -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" - --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}' - --# Commands used to build and install an old-style archive. --RANLIB=$lt_RANLIB --old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -+_LT_TAG_COMPILER -+# Save the default compiler, since it gets overwritten when the other -+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -+compiler_DEFAULT=$CC - --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE - --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) -+if test -n "$compiler"; then -+ _LT_COMPILER_NO_RTTI($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ LT_SYS_DLOPEN_SELF -+ _LT_CMD_STRIPLIB -+ -+ # Report which library types will actually be built -+ AC_MSG_CHECKING([if libtool supports shared libraries]) -+ AC_MSG_RESULT([$can_build_shared]) - --# Commands used to build and install a shared archive. --archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) --archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) --postinstall_cmds=$lt_postinstall_cmds --postuninstall_cmds=$lt_postuninstall_cmds -+ AC_MSG_CHECKING([whether to build shared libraries]) -+ test "$can_build_shared" = "no" && enable_shared=no - --# Commands used to build a loadable module (assumed same as above if empty) --module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) --module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. -+ case $host_os in -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; - --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib -+ aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+ esac -+ AC_MSG_RESULT([$enable_shared]) - --# Dependencies to place before the objects being linked to create a --# shared library. --predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) -+ AC_MSG_CHECKING([whether to build static libraries]) -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ AC_MSG_RESULT([$enable_static]) - --# Dependencies to place after the objects being linked to create a --# shared library. --postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) -+ _LT_CONFIG($1) -+fi -+AC_LANG_POP -+CC="$lt_save_CC" -+])# _LT_LANG_C_CONFIG - --# Dependencies to place before the objects being linked to create a --# shared library. --predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) - --# Dependencies to place after the objects being linked to create a --# shared library. --postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) -+# _LT_PROG_CXX -+# ------------ -+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -+# compiler, we have our own version here. -+m4_defun([_LT_PROG_CXX], -+[ -+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -+AC_PROG_CXX -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+else -+ _lt_caught_CXX_error=yes -+fi -+popdef([AC_MSG_ERROR]) -+])# _LT_PROG_CXX - --# The directories searched by this compiler when creating a shared --# library --compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([_LT_PROG_CXX], []) - --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) - --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -+# _LT_LANG_CXX_CONFIG([TAG]) -+# -------------------------- -+# Ensure that the configuration variables for a C++ compiler are suitably -+# defined. These variables are subsequently used by _LT_CONFIG to write -+# the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_CXX_CONFIG], -+[AC_REQUIRE([_LT_PROG_CXX])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_EGREP])dnl -+ -+AC_LANG_PUSH(C++) -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_TAGVAR(allow_undefined_flag, $1)= -+_LT_TAGVAR(always_export_symbols, $1)=no -+_LT_TAGVAR(archive_expsym_cmds, $1)= -+_LT_TAGVAR(compiler_needs_object, $1)=no -+_LT_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_TAGVAR(hardcode_direct, $1)=no -+_LT_TAGVAR(hardcode_direct_absolute, $1)=no -+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_TAGVAR(hardcode_minus_L, $1)=no -+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+_LT_TAGVAR(hardcode_automatic, $1)=no -+_LT_TAGVAR(inherit_rpath, $1)=no -+_LT_TAGVAR(module_cmds, $1)= -+_LT_TAGVAR(module_expsym_cmds, $1)= -+_LT_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(no_undefined_flag, $1)= -+_LT_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no - --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd -+# Source file extension for C++ test sources. -+ac_ext=cpp - --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) -+# Object file extension for compiled C++ test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext - --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) -+# No sense in running all these tests if we already determined that -+# the CXX compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_caught_CXX_error" != yes; then -+ # Code to be used in simple compile tests -+ 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); }' -+ -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ _LT_TAG_COMPILER -+ -+ # save warnings/boilerplate of simple test code -+ _LT_COMPILER_BOILERPLATE -+ _LT_LINKER_BOILERPLATE -+ -+ # Allow CC to be a program name with arguments. -+ lt_save_CC=$CC -+ lt_save_LD=$LD -+ lt_save_GCC=$GCC -+ GCC=$GXX -+ lt_save_with_gnu_ld=$with_gnu_ld -+ lt_save_path_LD=$lt_cv_path_LD -+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+ else -+ $as_unset lt_cv_prog_gnu_ld -+ fi -+ if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+ else -+ $as_unset lt_cv_path_LD -+ fi -+ test -z "${LDCXX+set}" || LD=$LDCXX -+ CC=${CXX-"c++"} -+ compiler=$CC -+ _LT_TAGVAR(compiler, $1)=$CC -+ _LT_CC_BASENAME([$compiler]) - --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds -+ if test -n "$compiler"; then -+ # We don't want -fno-exception when compiling C++ code, so set the -+ # no_builtin_flag separately -+ if test "$GXX" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ else -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+ fi - --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval -+ if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration - --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ LT_PATH_LD - --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ # Check if GNU C++ uses GNU ld as the underlying linker, since the -+ # archiving commands below assume that GNU ld is being used. -+ if test "$with_gnu_ld" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' -+ -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | -+ $GREP 'no-whole-archive' > /dev/null; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ with_gnu_ld=no -+ wlarc= - --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi - --# This is the shared library runtime path variable. --runpath_var=$runpath_var -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - --# This is the shared library path variable. --shlibpath_var=$shlibpath_var -+ else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= -+ fi - --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ # PORTME: fill in a description of your system's C++ link characteristics -+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aix[[4-9]]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no - --# How to hardcode a shared library path into an executable. --hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac - --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi - --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_TAGVAR(archive_cmds, $1)='' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -+ -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && -+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ _LT_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi - --# If ld is used when linking, flag to hardcode \$libdir into --# a binary during linking. This must work even if \$libdir does --# not exist. --hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to -+ # export. -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty -+ # executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared -+ # libraries. -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; - --# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) -+ beos*) -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; - --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) -+ cygwin* | mingw* | pw32* | cegcc*) -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ _LT_DARWIN_LINKER_FEATURES($1) -+ ;; - --# Set to yes if building a shared library automatically hardcodes DIR into the library --# and all subsequent libraries and executables linked against it. --hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) -- --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; - --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) -+ freebsd[[12]]*) -+ # C++ shared libraries reported to be fairly broken before -+ # switch to ELF -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; - --# Compile-time system search path for libraries --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ freebsd-elf*) -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ ;; - --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ freebsd* | dragonfly*) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ ;; - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -+ gnu*) -+ ;; - --# Set to yes if exported symbols are required. --always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) -+ hpux9*) -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - --# The commands to list exported symbols. --export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ ;; -+ *) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ interix[[3-9]]*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_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' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # SGI C++ -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' -+ fi -+ fi -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ esac -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(inherit_rpath, $1)=yes -+ ;; - --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc* | ecpc* ) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ case `$CC -V` in -+ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) -+ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $RANLIB $oldlib' -+ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ ;; -+ *) # Version 6 will use weak symbols -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ ;; -+ esac - --# Symbols that must always be exported. --include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - --ifelse([$1],[], --[# ### END LIBTOOL CONFIG], --[# ### END LIBTOOL TAG CONFIG: $tagname]) -+ runpath_var=LD_RUN_PATH -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: - --__EOF__ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' -+ ;; -+ xl*) -+ # IBM XL 8.0 on PPC, with GNU ld -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ if test "x$supports_anon_versioning" = xyes; then -+ _LT_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 -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_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' -+ _LT_TAGVAR(compiler_needs_object, $1)=yes -+ -+ # 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; -+ esac -+ ;; - --ifelse([$1],[], [ -- case $host_os in -- aix3*) -- cat <<\EOF >> "$cfgfile" -+ lynxos*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; - --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES --fi --EOF -- ;; -- esac -+ m88k*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; - -- # We use sed instead of cat because bash on DJGPP gets confused if -- # if finds mixed CR/LF and LF-only lines. Since sed operates in -- # text mode, it properly converts lines to CR/LF. This bash problem -- # is reportedly fixed, but why not run on old versions too? -- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; - -- mv -f "$cfgfile" "$ofile" || \ -- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -- chmod +x "$ofile" --]) --else -- # If there is no Makefile yet, we rely on a make rule to execute -- # `config.status --recheck' to rerun these tests and create the -- # libtool script then. -- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -- if test -f "$ltmain_in"; then -- test -f Makefile && make "$ltmain" -- fi --fi --])# AC_LIBTOOL_CONFIG -+ netbsd*) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -+ wlarc= -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; - -+ *nto* | *qnx*) -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ ;; - --# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) --# ------------------------------------------- --AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], --[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_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_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_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd=echo -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - --_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ case $host in -+ osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; -+ *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; -+ esac -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx*) -+ case $host in -+ osf3*) -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ ;; -+ *) -+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $RM $lib.exp' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ ;; -+ esac - --if test "$GCC" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: - -- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -- lt_cv_prog_compiler_rtti_exceptions, -- [-fno-rtti -fno-exceptions], [], -- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) --fi --])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ case $host in -+ osf3*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ ;; -+ esac -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; - -+ psos*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; - --# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE --# --------------------------------- --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. --AC_MSG_CHECKING([command to parse $NM output from $compiler object]) --AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], --[ --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ lcc*) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; - --# Character class describing NM global symbol codes. --symcode='[[BCDEGRST]]' -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes -+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ ;; -+ esac -+ _LT_TAGVAR(link_all_deplibs, $1)=yes - --# Regexp to match symbols that can be accessed directly from C. --sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -+ output_verbose_link_cmd='echo' - --# Transform an extracted symbol line into a proper C declaration --lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" -+ # 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_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - --# Transform an extracted symbol line into symbol name and symbol address --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'" -+ # The C++ compiler must be used to create the archive. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ fi -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ ;; - --# Define system-specific variables. --case $host_os in --aix*) -- symcode='[[BCDT]]' -- ;; --cygwin* | mingw* | pw32*) -- symcode='[[ABCDGISTW]]' -- ;; --hpux*) # Its linker distinguishes data from code symbols -- if test "$host_cpu" = ia64; then -- symcode='[[ABCDEGRST]]' -- fi -- 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* | 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'" -- 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'" -- fi -- ;; --irix* | nonstopux*) -- symcode='[[BCDEGRST]]' -- ;; --osf*) -- symcode='[[BCDEGQRST]]' -- ;; --solaris*) -- symcode='[[BDRT]]' -- ;; --sco3.2v5*) -- symcode='[[DT]]' -- ;; --sysv4.2uw2*) -- symcode='[[DT]]' -- ;; --sysv5* | sco5v6* | unixware* | OpenUNIX*) -- symcode='[[ABDT]]' -- ;; --sysv4) -- symcode='[[DFNSTU]]' -- ;; --esac -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' - --# Handle CRLF in mingw tool chain --opt_cr= --case $build_os in --mingw*) -- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -- ;; --esac -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; - --# If we're using GNU nm, then use its standard symbol codes. --case `$NM -V 2>&1` in --*GNU* | *'with BFD'*) -- symcode='[[ABCDGIRSTW]]' ;; --esac -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' - --# Try without a prefix undercore, then with it. --for ac_symprfx in "" "_"; do -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; - -- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -- symxfrm="\\1 $ac_symprfx\\2 \\2" -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; - -- # Write the raw and C identifiers. -- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; - -- # Check to see that the pipe works correctly. -- pipe_works=no -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac - -- rm -f conftest* -- cat > conftest.$ac_ext <<EOF --#ifdef __cplusplus --extern "C" { --#endif --char nm_test_var; --void nm_test_func(){} --#ifdef __cplusplus --} --#endif --int main(){nm_test_var='a';nm_test_func();return(0);} --EOF -+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -+ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -- if AC_TRY_EVAL(ac_compile); then -- # Now try to grab the symbols. -- nlist=conftest.nm -- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi -+ _LT_TAGVAR(GCC, $1)="$GXX" -+ _LT_TAGVAR(LD, $1)="$LD" - -- # Make sure that we snagged all the symbols we need. -- if grep ' nm_test_var$' "$nlist" >/dev/null; then -- if grep ' nm_test_func$' "$nlist" >/dev/null; then -- cat <<EOF > conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif -+ ## CAVEAT EMPTOR: -+ ## There is no encapsulation within the following macros, do not change -+ ## the running order or otherwise move them around unless you know exactly -+ ## what you are doing... -+ _LT_SYS_HIDDEN_LIBDEPS($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+ fi # test -n "$compiler" -+ -+ CC=$lt_save_CC -+ LDCXX=$LD -+ LD=$lt_save_LD -+ GCC=$lt_save_GCC -+ with_gnu_ld=$lt_save_with_gnu_ld -+ lt_cv_path_LDCXX=$lt_cv_path_LD -+ lt_cv_path_LD=$lt_save_path_LD -+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+fi # test "$_lt_caught_CXX_error" != yes - --EOF -- # Now generate the symbol file. -- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' -+AC_LANG_POP -+])# _LT_LANG_CXX_CONFIG - -- cat <<EOF >> conftest.$ac_ext --#if defined (__STDC__) && __STDC__ --# define lt_ptr_t void * --#else --# define lt_ptr_t char * --# define const --#endif - --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr_t address; --} --lt_preloaded_symbols[[]] = -+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -+# --------------------------------- -+# Figure out "hidden" library dependencies from verbose -+# compiler output when linking a shared library. -+# Parse the compiler output and extract the necessary -+# objects, libraries and library flags. -+m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+# Dependencies to place before and after the object being linked: -+_LT_TAGVAR(predep_objects, $1)= -+_LT_TAGVAR(postdep_objects, $1)= -+_LT_TAGVAR(predeps, $1)= -+_LT_TAGVAR(postdeps, $1)= -+_LT_TAGVAR(compiler_lib_search_path, $1)= -+ -+dnl we can't use the lt_simple_compile_test_code here, -+dnl because it contains code intended for an executable, -+dnl not a library. It's possible we should let each -+dnl tag define a new lt_????_link_test_code variable, -+dnl but it's only used here... -+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -+int a; -+void foo (void) { a = 0; } -+_LT_EOF -+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -+class Foo - { --EOF -- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -- cat <<\EOF >> conftest.$ac_ext -- {0, (lt_ptr_t) 0} -+public: -+ Foo (void) { a = 0; } -+private: -+ int a; - }; -+_LT_EOF -+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF -+ subroutine foo -+ implicit none -+ integer*4 a -+ a=0 -+ return -+ end -+_LT_EOF -+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF -+ subroutine foo -+ implicit none -+ integer a -+ a=0 -+ return -+ end -+_LT_EOF -+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -+public class foo { -+ private int a; -+ public void bar (void) { -+ a = 0; -+ } -+}; -+_LT_EOF -+]) -+dnl Parse the compiler output and extract the necessary -+dnl objects, libraries and library flags. -+if AC_TRY_EVAL(ac_compile); then -+ # Parse the compiler output and extract the necessary -+ # objects, libraries and library flags. - --#ifdef __cplusplus --} --#endif --EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -- pipe_works=yes -- fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -- else -- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -- fi -- else -- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -- cat conftest.$ac_ext >&5 -- fi -- rm -rf conftest* conftst* -+ # Sentinel used to keep track of whether or not we are before -+ # the conftest object file. -+ pre_test_object_deps_done=no - -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -- fi --done --]) --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- lt_cv_sys_global_symbol_to_cdecl= --fi --if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -- AC_MSG_RESULT(failed) -+ for p in `eval "$output_verbose_link_cmd"`; do -+ case $p in -+ -+ -L* | -R* | -l*) -+ # Some compilers place space between "-{L,R}" and the path. -+ # Remove the space. -+ if test $p = "-L" || -+ test $p = "-R"; then -+ prev=$p -+ continue -+ else -+ prev= -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ case $p in -+ -L* | -R*) -+ # Internal compiler library paths should come after those -+ # provided the user. The postdeps already come after the -+ # user supplied libs so there is no need to process them. -+ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" -+ else -+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" -+ fi -+ ;; -+ # The "-l" case would never come before the object being -+ # linked, so don't bother handling this case. -+ esac -+ else -+ if test -z "$_LT_TAGVAR(postdeps, $1)"; then -+ _LT_TAGVAR(postdeps, $1)="${prev}${p}" -+ else -+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" -+ fi -+ fi -+ ;; -+ -+ *.$objext) -+ # This assumes that the test object file only shows up -+ # once in the compiler output. -+ if test "$p" = "conftest.$objext"; then -+ pre_test_object_deps_done=yes -+ continue -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then -+ _LT_TAGVAR(predep_objects, $1)="$p" -+ else -+ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" -+ fi -+ else -+ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then -+ _LT_TAGVAR(postdep_objects, $1)="$p" -+ else -+ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" -+ fi -+ fi -+ ;; -+ -+ *) ;; # Ignore the rest. -+ -+ esac -+ done -+ -+ # Clean up. -+ rm -f a.out a.exe - else -- AC_MSG_RESULT(ok) -+ echo "libtool.m4: error: problem compiling $1 test program" - fi --]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - -+$RM -f confest.$objext - --# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) --# --------------------------------------- --AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], --[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= --_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= --_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= -+# PORTME: override above test on systems where it is broken -+m4_if([$1], [CXX], -+[case $host_os in -+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_TAGVAR(predep_objects,$1)= -+ _LT_TAGVAR(postdep_objects,$1)= -+ _LT_TAGVAR(postdeps,$1)= -+ ;; - --AC_MSG_CHECKING([for $compiler option to produce PIC]) -- ifelse([$1],[CXX],[ -- # C++ specific cases for pic, static, wl, etc. -- if test "$GXX" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 - -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- fi -- ;; -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -- ;; -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- 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 -- m4_if([$1], [GCJ], [], -- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -- ;; -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -- ;; -- *djgpp*) -- # DJGPP does not support shared libraries at all -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -- ;; -- interix[[3-9]]*) -- # Interix 3.x gcc -fpic/-fPIC options generate broken code. -- # Instead, we relocate shared libraries at runtime. -- ;; -- sysv4*MP*) -- if test -d /usr/nec; then -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -- fi -- ;; -- hpux*) -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -+ # 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 - ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ esac -+ -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_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 -- else -+ -+ # 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. -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+]) -+ -+case " $_LT_TAGVAR(postdeps, $1) " in -+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -+esac -+ _LT_TAGVAR(compiler_lib_search_dirs, $1)= -+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then -+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+_LT_TAGDECL([], [compiler_lib_search_dirs], [1], -+ [The directories searched by this compiler when creating a shared library]) -+_LT_TAGDECL([], [predep_objects], [1], -+ [Dependencies to place before and after the objects being linked to -+ create a shared library]) -+_LT_TAGDECL([], [postdep_objects], [1]) -+_LT_TAGDECL([], [predeps], [1]) -+_LT_TAGDECL([], [postdeps], [1]) -+_LT_TAGDECL([], [compiler_lib_search_path], [1], -+ [The library search path used internally by the compiler when linking -+ a shared library]) -+])# _LT_SYS_HIDDEN_LIBDEPS -+ -+ -+# _LT_PROG_F77 -+# ------------ -+# Since AC_PROG_F77 is broken, in that it returns the empty string -+# if there is no fortran compiler, we have our own version here. -+m4_defun([_LT_PROG_F77], -+[ -+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -+AC_PROG_F77 -+if test -z "$F77" || test "X$F77" = "Xno"; then -+ _lt_disable_F77=yes -+fi -+popdef([AC_MSG_ERROR]) -+])# _LT_PROG_F77 -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([_LT_PROG_F77], []) -+ -+ -+# _LT_LANG_F77_CONFIG([TAG]) -+# -------------------------- -+# Ensure that the configuration variables for a Fortran 77 compiler are -+# suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_F77_CONFIG], -+[AC_REQUIRE([_LT_PROG_F77])dnl -+AC_LANG_PUSH(Fortran 77) -+ -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_TAGVAR(allow_undefined_flag, $1)= -+_LT_TAGVAR(always_export_symbols, $1)=no -+_LT_TAGVAR(archive_expsym_cmds, $1)= -+_LT_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_TAGVAR(hardcode_direct, $1)=no -+_LT_TAGVAR(hardcode_direct_absolute, $1)=no -+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_TAGVAR(hardcode_minus_L, $1)=no -+_LT_TAGVAR(hardcode_automatic, $1)=no -+_LT_TAGVAR(inherit_rpath, $1)=no -+_LT_TAGVAR(module_cmds, $1)= -+_LT_TAGVAR(module_expsym_cmds, $1)= -+_LT_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(no_undefined_flag, $1)= -+_LT_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Source file extension for f77 test sources. -+ac_ext=f -+ -+# Object file extension for compiled f77 test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# No sense in running all these tests if we already determined that -+# the F77 compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_disable_F77" != yes; then -+ # Code to be used in simple compile tests -+ lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" -+ -+ # Code to be used in simple link tests -+ lt_simple_link_test_code="\ -+ program t -+ end -+" -+ -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ _LT_TAG_COMPILER -+ -+ # save warnings/boilerplate of simple test code -+ _LT_COMPILER_BOILERPLATE -+ _LT_LINKER_BOILERPLATE -+ -+ # Allow CC to be a program name with arguments. -+ lt_save_CC="$CC" -+ lt_save_GCC=$GCC -+ CC=${F77-"f77"} -+ compiler=$CC -+ _LT_TAGVAR(compiler, $1)=$CC -+ _LT_CC_BASENAME([$compiler]) -+ GCC=$G77 -+ if test -n "$compiler"; then -+ AC_MSG_CHECKING([if libtool supports shared libraries]) -+ AC_MSG_RESULT([$can_build_shared]) -+ -+ AC_MSG_CHECKING([whether to build shared libraries]) -+ test "$can_build_shared" = "no" && enable_shared=no -+ -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. - case $host_os in -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; - aix[[4-9]]*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- else -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no + *) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -6711,12 +6488,13 @@ EOF + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi -- ;; -- chorus*) -- case $cc_basename in -- cxch68*) -- # Green Hills C++ Compiler -- # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -- ;; -- esac -- ;; -- darwin*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- case $cc_basename in -- xlc*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- ;; -- esac -- ;; -- dgux*) -- case $cc_basename in -- ec++*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- ;; -- ghcx*) -- # Green Hills C++ Compiler -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- ;; -- *) -- ;; -- esac -- ;; -- freebsd* | dragonfly*) -- # FreeBSD uses GNU C++ -- ;; -- hpux9* | hpux10* | hpux11*) -- case $cc_basename in -- CC*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -- if test "$host_cpu" != ia64; then -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -- fi -- ;; -- aCC*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -- ;; -- esac -- ;; -- *) -- ;; -- esac -- ;; -- interix*) -- # This is c89, which is MS Visual C++ (no shared libs) -- # Anyone wants to do a port? -- ;; -- irix5* | irix6* | nonstopux*) -- case $cc_basename in -- CC*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- # CC pic flag -KPIC is the default. -- ;; -- *) -- ;; -- esac -- ;; -- linux* | k*bsd*-gnu) -- case $cc_basename in -- KCC*) -- # KAI C++ Compiler -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- icpc* | ecpc*) -- # Intel C++ -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -- ;; -- pgCC* | pgcpp*) -- # Portland Group C++ compiler. -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- cxx*) -- # Compaq C++ -- # Make sure the PIC flag is empty. It appears that all Alpha -- # Linux and Compaq Tru64 Unix objects are PIC. -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -- _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 -- ;; -- lynxos*) -- ;; -- m88k*) -- ;; -- mvs*) -- case $cc_basename in -- cxx*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -- ;; -- *) -- ;; -- esac -- ;; -- netbsd*) -- ;; -- osf3* | osf4* | osf5*) -- case $cc_basename in -- KCC*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- ;; -- cxx*) -- # Digital/Compaq C++ -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # Make sure the PIC flag is empty. It appears that all Alpha -- # Linux and Compaq Tru64 Unix objects are PIC. -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -- *) -- ;; -- esac -- ;; -- psos*) -- ;; -- solaris*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.2, 5.x and Centerline C++ -- _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 ' -- ;; -- gcx*) -- # Green Hills C++ Compiler -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -- ;; -- *) -- ;; -- esac -- ;; -- sunos4*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.x -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- lcc*) -- # Lucid -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- ;; -- *) -- ;; -- esac -- ;; -- tandem*) -- case $cc_basename in -- NCC*) -- # NonStop-UX NCC 3.20 -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- ;; -- *) -- ;; -- esac -- ;; -- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -- case $cc_basename in -- CC*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- esac -- ;; -- vxworks*) -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- ;; -+ ;; - esac -- fi --], -+ AC_MSG_RESULT([$enable_shared]) -+ -+ AC_MSG_CHECKING([whether to build static libraries]) -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ AC_MSG_RESULT([$enable_static]) -+ -+ _LT_TAGVAR(GCC, $1)="$G77" -+ _LT_TAGVAR(LD, $1)="$LD" -+ -+ ## CAVEAT EMPTOR: -+ ## There is no encapsulation within the following macros, do not change -+ ## the running order or otherwise move them around unless you know exactly -+ ## what you are doing... -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+ fi # test -n "$compiler" -+ -+ GCC=$lt_save_GCC -+ CC="$lt_save_CC" -+fi # test "$_lt_disable_F77" != yes -+ -+AC_LANG_POP -+])# _LT_LANG_F77_CONFIG ++ _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= +@@ -7147,7 +6925,7 @@ _LT_EOF + _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 +@@ -7464,1137 +7242,1209 @@ AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ + ])# _LT_AC_FILE_LTDLL_C + + +-# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +-# --------------------------------- +-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) ++# --------------------------------- ++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) + + -+# _LT_PROG_FC -+# ----------- -+# Since AC_PROG_FC is broken, in that it returns the empty string -+# if there is no fortran compiler, we have our own version here. -+m4_defun([_LT_PROG_FC], - [ -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -+AC_PROG_FC -+if test -z "$FC" || test "X$FC" = "Xno"; then -+ _lt_disable_FC=yes ++# old names ++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) ++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) ++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) ++ ++# This is just to silence aclocal about the macro not being used ++ifelse([AC_DISABLE_FAST_INSTALL]) ++ ++AC_DEFUN([LT_AC_PROG_GCJ], ++[AC_CHECK_TOOL(GCJ, gcj, no) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS) ++]) ++ ++AC_DEFUN([LT_AC_PROG_RC], ++[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 -+popdef([AC_MSG_ERROR]) -+])# _LT_PROG_FC ++])])# _AS_TEST_PREPARE + -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([_LT_PROG_FC], []) ++# 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 + -+ -+# _LT_LANG_FC_CONFIG([TAG]) -+# ------------------------- -+# Ensure that the configuration variables for a Fortran compiler are -+# suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_FC_CONFIG], -+[AC_REQUIRE([_LT_PROG_FC])dnl -+AC_LANG_PUSH(Fortran) -+ -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_TAGVAR(allow_undefined_flag, $1)= -+_LT_TAGVAR(always_export_symbols, $1)=no -+_LT_TAGVAR(archive_expsym_cmds, $1)= -+_LT_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_TAGVAR(hardcode_direct, $1)=no -+_LT_TAGVAR(hardcode_direct_absolute, $1)=no -+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_TAGVAR(hardcode_minus_L, $1)=no -+_LT_TAGVAR(hardcode_automatic, $1)=no -+_LT_TAGVAR(inherit_rpath, $1)=no -+_LT_TAGVAR(module_cmds, $1)= -+_LT_TAGVAR(module_expsym_cmds, $1)= -+_LT_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(no_undefined_flag, $1)= -+_LT_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Source file extension for fc test sources. -+ac_ext=${ac_fc_srcext-f} -+ -+# Object file extension for compiled fc test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# No sense in running all these tests if we already determined that -+# the FC compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_disable_FC" != yes; then -+ # Code to be used in simple compile tests -+ lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" -+ -+ # Code to be used in simple link tests -+ lt_simple_link_test_code="\ -+ program t -+ end -+" -+ -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ _LT_TAG_COMPILER -+ -+ # save warnings/boilerplate of simple test code -+ _LT_COMPILER_BOILERPLATE -+ _LT_LINKER_BOILERPLATE -+ -+ # Allow CC to be a program name with arguments. -+ lt_save_CC="$CC" -+ lt_save_GCC=$GCC -+ CC=${FC-"f95"} -+ compiler=$CC -+ GCC=$ac_cv_fc_compiler_gnu -+ -+ _LT_TAGVAR(compiler, $1)=$CC -+ _LT_CC_BASENAME([$compiler]) -+ -+ if test -n "$compiler"; then -+ AC_MSG_CHECKING([if libtool supports shared libraries]) -+ AC_MSG_RESULT([$can_build_shared]) -+ -+ AC_MSG_CHECKING([whether to build shared libraries]) -+ test "$can_build_shared" = "no" && enable_shared=no -+ -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. -+ case $host_os in -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+ esac -+ AC_MSG_RESULT([$enable_shared]) - -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- fi -- ;; -+ AC_MSG_CHECKING([whether to build static libraries]) -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ AC_MSG_RESULT([$enable_static]) -+ -+ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" -+ _LT_TAGVAR(LD, $1)="$LD" -+ -+ ## CAVEAT EMPTOR: -+ ## There is no encapsulation within the following macros, do not change -+ ## the running order or otherwise move them around unless you know exactly -+ ## what you are doing... -+ _LT_SYS_HIDDEN_LIBDEPS($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+ fi # test -n "$compiler" -+ -+ GCC=$lt_save_GCC -+ CC="$lt_save_CC" -+fi # test "$_lt_disable_FC" != yes - -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -- ;; -+AC_LANG_POP -+])# _LT_LANG_FC_CONFIG - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; - -- 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 -- m4_if([$1], [GCJ], [], -- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -- ;; -+# _LT_LANG_GCJ_CONFIG([TAG]) -+# -------------------------- -+# Ensure that the configuration variables for the GNU Java Compiler compiler -+# are suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_GCJ_CONFIG], -+[AC_REQUIRE([LT_PROG_GCJ])dnl -+AC_LANG_SAVE - -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -- ;; -+# Source file extension for Java test sources. -+ac_ext=java - -- interix[[3-9]]*) -- # Interix 3.x gcc -fpic/-fPIC options generate broken code. -- # Instead, we relocate shared libraries at runtime. -- ;; -+# Object file extension for compiled Java test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext - -- msdosdjgpp*) -- # Just because we use GCC doesn't mean we suddenly get shared libraries -- # on systems that don't support them. -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- enable_shared=no -- ;; -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="class foo {}" - -- sysv4*MP*) -- if test -d /usr/nec; then -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -- fi -- ;; -+# Code to be used in simple link tests -+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - -- hpux*) -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- ;; -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_TAG_COMPILER - -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- esac -- else -- # PORTME Check for flag to pass linker flags through the system compiler. -- case $host_os in -- aix*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- else -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+lt_save_GCC=$GCC -+GCC=yes -+CC=${GCJ-"gcj"} -+compiler=$CC -+_LT_TAGVAR(compiler, $1)=$CC -+_LT_TAGVAR(LD, $1)="$LD" -+_LT_CC_BASENAME([$compiler]) -+ -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+ -+if test -n "$compiler"; then -+ _LT_COMPILER_NO_RTTI($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+fi -+ -+AC_LANG_RESTORE -+ -+GCC=$lt_save_GCC -+CC="$lt_save_CC" -+])# _LT_LANG_GCJ_CONFIG -+ -+ -+# _LT_LANG_RC_CONFIG([TAG]) -+# ------------------------- -+# Ensure that the configuration variables for the Windows resource compiler -+# are suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_RC_CONFIG], -+[AC_REQUIRE([LT_PROG_RC])dnl -+AC_LANG_SAVE -+ -+# Source file extension for RC test sources. -+ac_ext=rc -+ -+# Object file extension for compiled RC test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+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" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_TAG_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+lt_save_GCC=$GCC -+GCC= -+CC=${RC-"windres"} -+compiler=$CC -+_LT_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ -+if test -n "$compiler"; then -+ : -+ _LT_CONFIG($1) -+fi -+ -+GCC=$lt_save_GCC -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# _LT_LANG_RC_CONFIG -+ -+ -+# LT_PROG_GCJ -+# ----------- -+AC_DEFUN([LT_PROG_GCJ], -+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], -+ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], -+ [AC_CHECK_TOOL(GCJ, gcj,) -+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ AC_SUBST(GCJFLAGS)])])[]dnl -+]) -+ -+# Old name: -+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([LT_AC_PROG_GCJ], []) -+ -+ -+# LT_PROG_RC -+# ---------- -+AC_DEFUN([LT_PROG_RC], -+[AC_CHECK_TOOL(RC, windres,) -+]) -+ -+# Old name: -+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([LT_AC_PROG_RC], []) -+ -+ -+# _LT_DECL_EGREP -+# -------------- -+# If we don't have a new enough Autoconf to choose the best grep -+# available, choose the one first in the user's PATH. -+m4_defun([_LT_DECL_EGREP], -+[AC_REQUIRE([AC_PROG_EGREP])dnl -+AC_REQUIRE([AC_PROG_FGREP])dnl -+test -z "$GREP" && GREP=grep -+_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -+_LT_DECL([], [EGREP], [1], [An ERE matcher]) -+_LT_DECL([], [FGREP], [1], [A literal string matcher]) -+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -+AC_SUBST([GREP]) -+]) -+ -+ -+# _LT_DECL_OBJDUMP -+# -------------- -+# If we don't have a new enough Autoconf to choose the best objdump -+# available, choose the one first in the user's PATH. -+m4_defun([_LT_DECL_OBJDUMP], -+[AC_CHECK_TOOL(OBJDUMP, objdump, false) -+test -z "$OBJDUMP" && OBJDUMP=objdump -+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -+AC_SUBST([OBJDUMP]) -+]) -+ -+ -+# _LT_DECL_SED -+# ------------ -+# Check for a fully-functional sed program, that truncates -+# as few characters as possible. Prefer GNU sed if found. -+m4_defun([_LT_DECL_SED], -+[AC_PROG_SED -+test -z "$SED" && SED=sed -+Xsed="$SED -e 1s/^X//" -+_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], -+ [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -+])# _LT_DECL_SED -+ -+m4_ifndef([AC_PROG_SED], [ +# 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 # +# macro and use it instead. # -+ -+m4_defun([AC_PROG_SED], ++# LT_AC_PROG_SED ++# -------------- ++# Check for a fully-functional sed program, that truncates ++# as few characters as possible. Prefer GNU sed if found. ++AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. @@ -11091,20 +1755,9 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + 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 -- ;; -- darwin*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- case $cc_basename in -- xlc*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- ;; -- esac -- ;; ++ fi + done + done +done @@ -11143,1856 +1796,8 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) -+])#AC_PROG_SED -+])#m4_ifndef - -- 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). -- m4_if([$1], [GCJ], [], -- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -- ;; -+# Old name: -+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([LT_AC_PROG_SED], []) - -- hpux9* | hpux10* | hpux11*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -- ;; -- esac -- # Is there a better lt_prog_compiler_static that works with the bundled CC? -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -- ;; - -- irix5* | irix6* | nonstopux*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # PIC (with -KPIC) is the default. -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -+# _LT_CHECK_SHELL_FEATURES -+# ------------------------ -+# Find out whether the shell is Bourne or XSI compatible, -+# or has some other useful features. -+m4_defun([_LT_CHECK_SHELL_FEATURES], -+[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -+# Try some XSI features -+xsi_shell=no -+( _lt_dummy="a/b/c" -+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,, \ -+ && eval 'test $(( 1 + 1 )) -eq 2 \ -+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ -+ && xsi_shell=yes -+AC_MSG_RESULT([$xsi_shell]) -+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) -+ -+AC_MSG_CHECKING([whether the shell understands "+="]) -+lt_shell_append=no -+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ -+ >/dev/null 2>&1 \ -+ && lt_shell_append=yes -+AC_MSG_RESULT([$lt_shell_append]) -+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) -+ -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ lt_unset=unset -+else -+ lt_unset=false -+fi -+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl -+ -+# test EBCDIC or ASCII -+case `echo X|tr X '\101'` in -+ A) # ASCII based system -+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr -+ lt_SP2NL='tr \040 \012' -+ lt_NL2SP='tr \015\012 \040\040' -+ ;; -+ *) # EBCDIC based system -+ lt_SP2NL='tr \100 \n' -+ lt_NL2SP='tr \r\n \100\100' -+ ;; -+esac -+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -+])# _LT_CHECK_SHELL_FEATURES -+ -+ -+# _LT_PROG_XSI_SHELLFNS -+# --------------------- -+# Bourne and XSI compatible variants of some useful shell functions. -+m4_defun([_LT_PROG_XSI_SHELLFNS], -+[case $xsi_shell in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+} -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result="${1##*/}" -+} -+ -+# func_dirname_and_basename file append nondir_replacement -+# perform func_basename and func_dirname in a single function -+# call: -+# dirname: Compute the dirname of FILE. If nonempty, -+# add APPEND to the result, otherwise set result -+# to NONDIR_REPLACEMENT. -+# value returned in "$func_dirname_result" -+# basename: Compute filename of FILE. -+# value retuned in "$func_basename_result" -+# Implementation must be kept synchronized with func_dirname -+# and func_basename. For efficiency, we do not delegate to -+# those functions but instead duplicate the functionality here. -+func_dirname_and_basename () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}" -+} -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+func_stripname () -+{ -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"} -+} -+ -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=${1%%=*} -+ func_opt_split_arg=${1#*=} -+} -+ -+# func_lo2o object -+func_lo2o () -+{ -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac -+} -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=${1%.*}.lo -+} - -- newsos6) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=$(( $[*] )) -+} - -- linux* | k*bsd*-gnu) -- case $cc_basename in -- icc* | ecc*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -- ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -- # Portland Group compilers (*not* the Pentium gcc compiler, -- # which looks to be a dead project) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -- ccc*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # 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 -- ;; -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=${#1} -+} - -- osf3* | osf4* | osf5*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- # All OSF/1 code is PIC. -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -+_LT_EOF -+ ;; -+ *) # Bourne compatible functions. -+ cat << \_LT_EOF >> "$cfgfile" - -- rdos*) -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -- ;; -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} - -- solaris*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- case $cc_basename in -- f77* | f90* | f95*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -- esac -- ;; -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -+} - -- sunos4*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+dnl func_dirname_and_basename -+dnl A portable version of this function is already defined in general.m4sh -+dnl so there is no need for it here. -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "X${3}" \ -+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "X${3}" \ -+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -+ esac -+} - -- sysv4 | sysv4.2uw2* | sysv4.3*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# sed scripts: -+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -+my_sed_long_arg='1s/^-[[^=]]*=//' - -- sysv4*MP*) -- if test -d /usr/nec ;then -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- fi -- ;; -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -+} - -- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -+} - -- unicos*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- ;; -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` -+} - -- uts4*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -- ;; -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "$[@]"` -+} - -- *) -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -- ;; -- esac -- fi --]) --AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -+} - --# --# Check to make sure the PIC flag actually works. --# --if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then -- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], -- _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), -- [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], -- [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in -- "" | " "*) ;; -- *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; -- esac], -- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) --fi --case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -- *djgpp*) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -+_LT_EOF -+esac -+ -+case $lt_shell_append in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$[1]+=\$[2]" -+} -+_LT_EOF - ;; - *) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$[1]=\$$[1]\$[2]" -+} -+ -+_LT_EOF - ;; --esac -+ esac -+]) - -+# Helper functions for option handling. -*- Autoconf -*- - # --# Check to make sure the static flag actually works. -+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gary V. Vaughan, 2004 - # --wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" --AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -- _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), -- $lt_tmp_static_flag, -- [], -- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# serial 6 ltoptions.m4 -+ -+# This is to help aclocal find these macros, as it can't see m4_define. -+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) -+ -+ -+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -+# ------------------------------------------ -+m4_define([_LT_MANGLE_OPTION], -+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) -+ -+ -+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -+# --------------------------------------- -+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -+# matching handler defined, dispatch to it. Other OPTION-NAMEs are -+# saved as a flag. -+m4_define([_LT_SET_OPTION], -+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), -+ _LT_MANGLE_DEFUN([$1], [$2]), -+ [m4_warning([Unknown $1 option `$2'])])[]dnl - ]) - - --# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) --# ------------------------------------ --# See if the linker supports building shared libraries. --AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], --[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 -- aix[[4-9]]*) -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -- else -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -- fi -- ;; -- pw32*) -- _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 '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -- esac -- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] --],[ -- runpath_var= -- _LT_AC_TAGVAR(allow_undefined_flag, $1)= -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no -- _LT_AC_TAGVAR(archive_cmds, $1)= -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)= -- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= -- _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -- _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -- _LT_AC_TAGVAR(hardcode_automatic, $1)=no -- _LT_AC_TAGVAR(module_cmds, $1)= -- _LT_AC_TAGVAR(module_expsym_cmds, $1)= -- _LT_AC_TAGVAR(always_export_symbols, $1)=no -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- # include_expsyms should be a list of space-separated symbols to be *always* -- # included in the symbol list -- _LT_AC_TAGVAR(include_expsyms, $1)= -- # exclude_expsyms can be an extended regexp of symbols to exclude -- # it will be wrapped by ` (' and `)$', so one must not match beginning or -- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -- # as well as any symbol that contains `d'. -- _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -- # platforms (ab)use it in PIC code, but their linkers get confused if -- # the symbol is explicitly referenced. Since portable code cannot -- # rely on this symbol name, it's probably fine to never include it in -- # preloaded symbol tables. -- # Exclude shared library initialization/finalization symbols. --dnl Note also adjust exclude_expsyms for C++ above. -- extract_expsyms_cmds= -- # Just being paranoid about ensuring that cc_basename is set. -- _LT_CC_BASENAME([$compiler]) -- case $host_os in -- cygwin* | mingw* | pw32*) -- # FIXME: the MSVC++ port hasn't been tested in a loooong time -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$GCC" != yes; then -- with_gnu_ld=no -- fi -- ;; -- interix*) -- # we just hope/assume this is gcc and not c89 (= MSVC++) -- with_gnu_ld=yes -- ;; -- openbsd*) -- with_gnu_ld=no -- ;; -- esac -+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -+# ------------------------------------------------------------ -+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -+m4_define([_LT_IF_OPTION], -+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) - -- _LT_AC_TAGVAR(ld_shlibs, $1)=yes -- if test "$with_gnu_ld" = yes; then -- # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' - -- # Set some defaults for GNU ld with shared library support. These -- # are reset later if shared libraries are not supported. Putting them -- # here allows them to be overridden if necessary. -- runpath_var=LD_RUN_PATH -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -- fi -- supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -- *\ 2.11.*) ;; # other 2.11 versions -- *) supports_anon_versioning=yes ;; -- esac -+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -+# ------------------------------------------------------- -+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -+# are set. -+m4_define([_LT_UNLESS_OPTIONS], -+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), -+ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), -+ [m4_define([$0_found])])])[]dnl -+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -+])[]dnl -+]) - -- # See if GNU ld supports shared libraries. -- case $host_os in -- aix[[3-9]]*) -- # On AIX/PPC, the GNU linker is very broken -- if test "$host_cpu" != ia64; then -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- cat <<EOF 1>&2 - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported --*** to be unable to reliably create shared libraries on AIX. --*** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. -+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -+# ---------------------------------------- -+# OPTION-LIST is a space-separated list of Libtool options associated -+# with MACRO-NAME. If any OPTION has a matching handler declared with -+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -+# the unknown option and exit. -+m4_defun([_LT_SET_OPTIONS], -+[# Set options -+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), -+ [_LT_SET_OPTION([$1], _LT_Option)]) -+ -+m4_if([$1],[LT_INIT],[ -+ dnl -+ dnl Simply set some default values (i.e off) if boolean options were not -+ dnl specified: -+ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no -+ ]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no -+ ]) -+ dnl -+ dnl If no reference was made to various pairs of opposing options, then -+ dnl we run the default mode handler for the pair. For example, if neither -+ dnl `shared' nor `disable-shared' was passed, we enable building of shared -+ dnl archives by default: -+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], -+ [_LT_ENABLE_FAST_INSTALL]) -+ ]) -+])# _LT_SET_OPTIONS - --EOF -- fi -- ;; - -- amigaos*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- -- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can't use -- # them. -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; - -- beos*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -+# ----------------------------------------- -+m4_define([_LT_MANGLE_DEFUN], -+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) - -- cygwin* | mingw* | pw32*) -- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -- # as there is no search path for DLLs. -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _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/'\'' -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' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -+# ----------------------------------------------- -+m4_define([LT_OPTION_DEFINE], -+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -+])# LT_OPTION_DEFINE - -- 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' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -- # Instead, shared libraries are loaded at an image base (0x10000000 by -- # default) and relocated if they conflict, which is a slow very memory -- # consuming and fragmenting process. To avoid this, we pick a random, -- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -- # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- _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' -- ;; - -- 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 -- pgcc*) # Portland Group C compiler -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- tmp_addflag=' $pic_flag' -- ;; -- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- tmp_addflag=' $pic_flag -Mnomain' ;; -- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -- tmp_addflag=' -i_dynamic' ;; -- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -- tmp_addflag=' -i_dynamic -nofor_main' ;; -- ifc* | ifort*) # Intel Fortran compiler -- tmp_addflag=' -nofor_main' ;; -- esac -- 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' -+# dlopen -+# ------ -+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + -+AU_DEFUN([AC_LIBTOOL_DLOPEN], -+[_LT_SET_OPTION([LT_INIT], [dlopen]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you -+put the `dlopen' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) -+ -+ -+# win32-dll -+# --------- -+# Declare package support for building win32 dll's. -+LT_OPTION_DEFINE([LT_INIT], [win32-dll], -+[enable_win32_dll=yes -+ -+case $host in -+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) -+ AC_CHECK_TOOL(AS, as, false) -+ AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+ AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ ;; -+esac -+ -+test -z "$AS" && AS=as -+_LT_DECL([], [AS], [0], [Assembler program])dnl -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl -+ -+test -z "$OBJDUMP" && OBJDUMP=objdump -+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl -+])# win32-dll -+ -+AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+_LT_SET_OPTION([LT_INIT], [win32-dll]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you -+put the `win32-dll' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) - -- 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ -+# _LT_ENABLE_SHARED([DEFAULT]) -+# ---------------------------- -+# implement the --enable-shared flag, and supports the `shared' and -+# `disable-shared' LT_INIT options. -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+m4_define([_LT_ENABLE_SHARED], -+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -+AC_ARG_ENABLE([shared], -+ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -+ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes - fi -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -+ done -+ IFS="$lt_save_ifs" - ;; -+ esac], -+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) - -- netbsd*) -- 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= -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- fi -- ;; -+ _LT_DECL([build_libtool_libs], [enable_shared], [0], -+ [Whether or not to build shared libraries]) -+])# _LT_ENABLE_SHARED - -- solaris*) -- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- cat <<EOF 1>&2 -+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) - --*** Warning: The releases 2.8.* of the GNU linker cannot reliably --*** create shared libraries on Solaris systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.9.1 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -+# Old names: -+AC_DEFUN([AC_ENABLE_SHARED], -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -+]) - --EOF -- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+AC_DEFUN([AC_DISABLE_SHARED], -+[_LT_SET_OPTION([LT_INIT], [disable-shared]) -+]) - -- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -- case `$LD -v 2>&1` in -- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- cat <<_LT_EOF 1>&2 -+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) - --*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not --*** reliably create shared libraries on SCO systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.16.91.0.3 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AM_ENABLE_SHARED], []) -+dnl AC_DEFUN([AM_DISABLE_SHARED], []) - --_LT_EOF -- ;; -- *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -- esac -- ;; - -- sunos4*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- wlarc= -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; - -+# _LT_ENABLE_STATIC([DEFAULT]) -+# ---------------------------- -+# implement the --enable-static flag, and support the `static' and -+# `disable-static' LT_INIT options. -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+m4_define([_LT_ENABLE_STATIC], -+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -+AC_ARG_ENABLE([static], -+ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], -+ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; - *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" - ;; -- esac -+ esac], -+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT) - -- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then -- runpath_var= -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -- fi -- else -- # PORTME fill in a description of your system's linker (not GNU ld) -- case $host_os in -- aix3*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_AC_TAGVAR(always_export_symbols, $1)=yes -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -- # Note: this linker hardcodes the directories in LIBPATH if there -- # are no directories specified by -L. -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -- fi -- ;; -+ _LT_DECL([build_old_libs], [enable_static], [0], -+ [Whether or not to build static libraries]) -+])# _LT_ENABLE_STATIC - -- aix[[4-9]]*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -- else -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' -- fi -- aix_use_runtimelinking=no -+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -- for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi -- done -- ;; -- esac -+# Old names: -+AC_DEFUN([AC_ENABLE_STATIC], -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -+]) - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -+AC_DEFUN([AC_DISABLE_STATIC], -+[_LT_SET_OPTION([LT_INIT], [disable-static]) -+]) - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) - -- _LT_AC_TAGVAR(archive_cmds, $1)='' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AM_ENABLE_STATIC], []) -+dnl AC_DEFUN([AM_DISABLE_STATIC], []) - -- if test "$GCC" = yes; then -- case $host_os in aix4.[[012]]|aix4.[[012]].*) -- # We only want to do this on AIX 4.2 and lower, the check -- # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- : -- else -- # We have old collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -- fi -- ;; -- esac -- shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -- fi -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi - -- # It seems that -bexpall does not export symbols beginning with -- # underscore (_), so it is better to generate a list of symbols to export. -- _LT_AC_TAGVAR(always_export_symbols, $1)=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' -- # Determine the default libpath from the value encoded in an empty executable. -- _LT_AC_SYS_LIBPATH_AIX -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an empty executable. -- _LT_AC_SYS_LIBPATH_AIX -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ -+# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -+# ---------------------------------- -+# implement the --enable-fast-install flag, and support the `fast-install' -+# and `disable-fast-install' LT_INIT options. -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+m4_define([_LT_ENABLE_FAST_INSTALL], -+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -+AC_ARG_ENABLE([fast-install], -+ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -+ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes - fi -- fi -+ done -+ IFS="$lt_save_ifs" - ;; -+ esac], -+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) - -- amigaos*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- # see comment about different semantics on the GNU ld section -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -+_LT_DECL([fast_install], [enable_fast_install], [0], -+ [Whether or not to optimize for fast installation])dnl -+])# _LT_ENABLE_FAST_INSTALL -+ -+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) -+ -+# Old names: -+AU_DEFUN([AC_ENABLE_FAST_INSTALL], -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you put -+the `fast-install' option into LT_INIT's first parameter.]) -+]) - -- bsdi[[45]]*) -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -- ;; -+AU_DEFUN([AC_DISABLE_FAST_INSTALL], -+[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you put -+the `disable-fast-install' option into LT_INIT's first parameter.]) -+]) - -- cygwin* | mingw* | pw32*) -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # 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(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- ;; -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - -- darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- if test "$GCC" = yes ; then -- output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -- else -- 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` $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 $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}' -- ;; -- *) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- fi -- ;; - -- dgux*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# _LT_WITH_PIC([MODE]) -+# -------------------- -+# implement the --with-pic flag, and support the `pic-only' and `no-pic' -+# LT_INIT options. -+# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -+m4_define([_LT_WITH_PIC], -+[AC_ARG_WITH([pic], -+ [AS_HELP_STRING([--with-pic], -+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -+ [pic_mode="$withval"], -+ [pic_mode=default]) - -- freebsd1*) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -+test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) - -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -+])# _LT_WITH_PIC - -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) -+ -+# Old name: -+AU_DEFUN([AC_LIBTOOL_PICMODE], -+[_LT_SET_OPTION([LT_INIT], [pic-only]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you -+put the `pic-only' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- 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 -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; - -- hpux9*) -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+m4_define([_LTDL_MODE], []) -+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], -+ [m4_define([_LTDL_MODE], [nonrecursive])]) -+LT_OPTION_DEFINE([LTDL_INIT], [recursive], -+ [m4_define([_LTDL_MODE], [recursive])]) -+LT_OPTION_DEFINE([LTDL_INIT], [subproject], -+ [m4_define([_LTDL_MODE], [subproject])]) - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- ;; -+m4_define([_LTDL_TYPE], []) -+LT_OPTION_DEFINE([LTDL_INIT], [installable], -+ [m4_define([_LTDL_TYPE], [installable])]) -+LT_OPTION_DEFINE([LTDL_INIT], [convenience], -+ [m4_define([_LTDL_TYPE], [convenience])]) - -- hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -- fi -- if test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -+# -+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gary V. Vaughan, 2004 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. - -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+# serial 6 ltsugar.m4 - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- fi -- ;; -+# This is to help aclocal find these macros, as it can't see m4_define. -+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) - -- hpux11*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case $host_cpu in -- hppa*64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- else -- case $host_cpu in -- hppa*64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- fi -- if test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -- _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' -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- *) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+# lt_join(SEP, ARG1, [ARG2...]) -+# ----------------------------- -+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -+# associated separator. -+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -+# versions in m4sugar had bugs. -+m4_define([lt_join], -+[m4_if([$#], [1], [], -+ [$#], [2], [[$2]], -+ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -+m4_define([_lt_join], -+[m4_if([$#$2], [2], [], -+ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- ;; -- esac -- fi -- ;; - -- irix5* | irix6* | nonstopux*) -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- ;; -+# lt_car(LIST) -+# lt_cdr(LIST) -+# ------------ -+# Manipulate m4 lists. -+# These macros are necessary as long as will still need to support -+# Autoconf-2.59 which quotes differently. -+m4_define([lt_car], [[$1]]) -+m4_define([lt_cdr], -+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], -+ [$#], 1, [], -+ [m4_dquote(m4_shift($@))])]) -+m4_define([lt_unquote], $1) -+ -+ -+# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -+# ------------------------------------------ -+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -+# Note that neither SEPARATOR nor STRING are expanded; they are appended -+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -+# No SEPARATOR is output if MACRO-NAME was previously undefined (different -+# than defined and empty). -+# -+# This macro is needed until we can rely on Autoconf 2.62, since earlier -+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -+m4_define([lt_append], -+[m4_define([$1], -+ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) - -- netbsd*) -- 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 -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; - -- newsos6) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; - -- openbsd*) -- 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 -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -+# ---------------------------------------------------------- -+# Produce a SEP delimited list of all paired combinations of elements of -+# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -+# has the form PREFIXmINFIXSUFFIXn. -+# Needed until we can rely on m4_combine added in Autoconf 2.62. -+m4_define([lt_combine], -+[m4_if(m4_eval([$# > 3]), [1], -+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -+[[m4_foreach([_Lt_prefix], [$2], -+ [m4_foreach([_Lt_suffix], -+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, -+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) -+ -+ -+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -+# ----------------------------------------------------------------------- -+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -+m4_define([lt_if_append_uniq], -+[m4_ifdef([$1], -+ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], -+ [lt_append([$1], [$2], [$3])$4], -+ [$5])], -+ [lt_append([$1], [$2], [$3])$4])]) - -- os2*) -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -- ;; - -- osf3*) -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -+# lt_dict_add(DICT, KEY, VALUE) -+# ----------------------------- -+m4_define([lt_dict_add], -+[m4_define([$1($2)], [$3])]) - -- osf4* | osf5*) # as osf3* with the addition of -msym flag -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- else -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - -- # Both c and cxx compiler support -rpath directly -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -- ;; -+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -+# -------------------------------------------- -+m4_define([lt_dict_add_subkey], -+[m4_define([$1($2:$3)], [$4])]) - -- solaris*) -- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' -- if test "$GCC" = yes; then -- wlarc='${wl}' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -- else -- wlarc='' -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- case $host_os in -- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -- *) -- # 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?) -- 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 -- ;; - -- sunos4*) -- if test "x$host_vendor" = xsequent; then -- # Use $CC to link under sequent, because it throws in some extra .o -- # files that make .init and .fini sections work. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -- fi -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+# lt_dict_fetch(DICT, KEY, [SUBKEY]) -+# ---------------------------------- -+m4_define([lt_dict_fetch], -+[m4_ifval([$3], -+ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), -+ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) - -- sysv4) -- case $host_vendor in -- sni) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -- ;; -- siemens) -- ## LD is ld it makes a PLAMLIB -- ## CC just makes a GrossModule. -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- ;; -- motorola) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -- ;; -- esac -- runpath_var='LD_RUN_PATH' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; - -- sysv4.3*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -- ;; -+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -+# ----------------------------------------------------------------- -+m4_define([lt_if_dict_fetch], -+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], -+ [$5], -+ [$6])]) - -- sysv4*MP*) -- if test -d /usr/nec; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- _LT_AC_TAGVAR(ld_shlibs, $1)=yes -- fi -- ;; - -- 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 -- runpath_var='LD_RUN_PATH' -+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -+# -------------------------------------------------------------- -+m4_define([lt_dict_filter], -+[m4_if([$5], [], [], -+ [lt_join(m4_quote(m4_default([$4], [[, ]])), -+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), -+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -+]) - -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- ;; -+# ltversion.m4 -- version numbers -*- Autoconf -*- -+# -+# Copyright (C) 2004 Free Software Foundation, Inc. -+# Written by Scott James Remnant, 2004 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. - -- sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -- # link with -lc, and that would cause any symbols used from libc to -- # always be unresolved, which means just about no library would -- # ever link correctly. If we're not using GNU ld we use -z text -- # though, which does catch some bad symbols but isn't as heavy-handed -- # as -z defs. -- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -- runpath_var='LD_RUN_PATH' -+# Generated from ltversion.in. - -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- ;; -+# serial 3012 ltversion.m4 -+# This file is part of GNU Libtool - -- uts4*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -+m4_define([LT_PACKAGE_VERSION], [2.2.6]) -+m4_define([LT_PACKAGE_REVISION], [1.3012]) - -- *) -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- ;; -- esac -- fi -+AC_DEFUN([LTVERSION_VERSION], -+[macro_version='2.2.6' -+macro_revision='1.3012' -+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -+_LT_DECL(, macro_revision, 0) - ]) --AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) --test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- - # --# Do we need to explicitly link libc? -+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -+# Written by Scott James Remnant, 2004. - # --case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in --x|xyes) -- # Assume -lc should be added -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# serial 4 lt~obsolete.m4 -+ -+# These exist entirely to fool aclocal when bootstrapping libtool. -+# -+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -+# which have later been changed to m4_define as they aren't part of the -+# exported API, or moved to Autoconf or Automake where they belong. -+# -+# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -+# using a macro with the same name in our local m4/libtool.m4 it'll -+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -+# and doesn't know about Autoconf macros at all.) -+# -+# So we provide this file, which has a silly filename so it's always -+# included after everything else. This provides aclocal with the -+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -+# because those macros already exist, or will be overwritten later. -+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -+# -+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -+# Yes, that means every name once taken will need to remain here until -+# we give up compatibility with versions before 1.7, at which point -+# we need to keep only those names which we still refer to. -+ -+# This is to help aclocal find these macros, as it can't see m4_define. -+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) -+ -+m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -+m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -+m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -+m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -+m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -+m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -+m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -+m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -+m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -+m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -+m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -+m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -+m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -+m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -+m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -+m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -+m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -+m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -+m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -+m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -+m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -+m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -+m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -+m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -+m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -+m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -+m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -+m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) -+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) - -- if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $_LT_AC_TAGVAR(archive_cmds, $1) in -- *'~'*) -- # FIXME: we may have to deal with multi-command sequences. -- ;; -- '$CC '*) -- # Test whether the compiler implicitly links with -lc since on some -- # systems, -lgcc has to come before -lc. If gcc already passes -lc -- # to ld, don't add -lc before -lgcc. -- AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -- $rm conftest* -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. @@ -13015,39 +1820,7 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. - -- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) -- pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)= -- if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) -- then -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- else -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes -- fi -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $rm conftest* -- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) -- ;; -- esac -- fi -- ;; --esac --])# AC_LIBTOOL_PROG_LD_SHLIBS ++ +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], @@ -13088,46 +1861,8 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 +m4_ifvaln([$3], [else + $3])dnl +fi]) - - --# _LT_AC_FILE_LTDLL_C --# ------------------- --# Be careful that the start marker always follows a newline. --AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ --# /* ltdll.c starts here */ --# #define WIN32_LEAN_AND_MEAN --# #include <windows.h> --# #undef WIN32_LEAN_AND_MEAN --# #include <stdio.h> --# --# #ifndef __CYGWIN__ --# # ifdef __CYGWIN32__ --# # define __CYGWIN__ __CYGWIN32__ --# # endif --# #endif --# --# #ifdef __cplusplus --# extern "C" { --# #endif --# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); --# #ifdef __cplusplus --# } --# #endif --# --# #ifdef __CYGWIN__ --# #include <cygwin/cygwin_dll.h> --# DECLARE_CYGWIN_DLL( DllMain ); --# #endif --# HINSTANCE __hDllInstance_base; --# --# BOOL APIENTRY --# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) --# { --# __hDllInstance_base = hInst; --# return TRUE; --# } --# /* ltdll.c ends here */ --])# _LT_AC_FILE_LTDLL_C ++ ++ +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], @@ -13154,11 +1889,8 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED - - --# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) --# --------------------------------- --AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) ++ ++ +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# @@ -13173,9 +1905,16 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - ++ +pkg_failed=no +AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) @@ -13185,20 +1924,6 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - --# This is just to silence aclocal about the macro not being used --ifelse([AC_DISABLE_FAST_INSTALL]) -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) - --AC_DEFUN([LT_AC_PROG_GCJ], --[AC_CHECK_TOOL(GCJ, gcj, no) -- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -- AC_SUBST(GCJFLAGS) --]) +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then @@ -13209,25 +1934,24 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD --AC_DEFUN([LT_AC_PROG_RC], --[AC_CHECK_TOOL(RC, windres, no) --]) +-# This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL]) + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: +-AC_DEFUN([LT_AC_PROG_GCJ], +-[AC_CHECK_TOOL(GCJ, gcj, no) +- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" +- AC_SUBST(GCJFLAGS) +-]) +$$1_PKG_ERRORS --# Cheap backport of AS_EXECUTABLE_P and required macros --# from Autoconf 2.59; we should not use $as_executable_p directly. +-AC_DEFUN([LT_AC_PROG_RC], +-[AC_CHECK_TOOL(RC, windres, no) +-]) +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. --# _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' +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) @@ -13237,9 +1961,17 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 +[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 +path to pkg-config. -+ + +-# Cheap backport of AS_EXECUTABLE_P and required macros +-# from Autoconf 2.59; we should not use $as_executable_p directly. +_PKG_TEXT -+ + +-# _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' +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], + [$4]) else @@ -15173,9 +3905,10 @@ diff -Naur gtk+2.0-2.14.7.old/aclocal.m4 gtk+2.0-2.14.7/aclocal.m4 +]) # _AM_PROG_TAR +m4_include([acinclude.m4]) -diff -Naur gtk+2.0-2.14.7.old/config.h.in gtk+2.0-2.14.7/config.h.in ---- gtk+2.0-2.14.7.old/config.h.in 2009-01-07 22:51:59.000000000 +0100 -+++ gtk+2.0-2.14.7/config.h.in 2009-01-08 08:03:47.000000000 +0100 +Index: gtk+-2.14.7/config.h.in +=================================================================== +--- gtk+-2.14.7.orig/config.h.in 2009-02-17 23:15:21.971082266 +0100 ++++ gtk+-2.14.7/config.h.in 2009-02-21 14:56:58.110583864 +0100 @@ -210,6 +210,10 @@ /* Define to 1 if you have the `_NSGetEnviron' function. */ #undef HAVE__NSGETENVIRON @@ -15187,376 +3920,1348 @@ diff -Naur gtk+2.0-2.14.7.old/config.h.in gtk+2.0-2.14.7/config.h.in /* Define if <X11/extensions/XIproto.h> needed for xReply */ #undef NEED_XIPROTO_H_FOR_XREPLY -diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure ---- gtk+2.0-2.14.7.old/configure 2009-01-07 22:52:17.000000000 +0100 -+++ gtk+2.0-2.14.7/configure 2009-01-08 08:03:46.000000000 +0100 -@@ -577,22 +577,22 @@ - # Check that we are running under the correct shell. - SHELL=${CONFIG_SHELL-/bin/sh} +Index: gtk+-2.14.7/configure +=================================================================== +--- gtk+-2.14.7.orig/configure 2009-02-17 23:15:21.959084442 +0100 ++++ gtk+-2.14.7/configure 2009-02-21 14:58:55.155081350 +0100 +@@ -1,11 +1,11 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.63 for gtk+ 2.14.7. ++# Generated by GNU Autoconf 2.61 for gtk+ 2.14.7. + # + # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>. + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## --------------------- ## +@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which ++ # 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 +@@ -39,45 +39,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits --case X$ECHO in -+case X$lt_ECHO in - X*--fallback-echo) - # Remove one level of quotation (which was required for Make). -- ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` -+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; - esac - --echo=${ECHO-echo} -+ECHO=${lt_ECHO-echo} - if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then -- # Yippee, $echo works! -+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $ECHO works! - : - else - # Restart under the correct shell. -@@ -602,9 +602,9 @@ - if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift -- cat <<EOF -+ cat <<_LT_EOF - $* --EOF -+_LT_EOF - exit 0 - fi - -@@ -612,121 +612,116 @@ - # if CDPATH is set. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - --if test -z "$ECHO"; then --if test "X${echo_test_string+set}" != Xset; then --# find a string as large as possible, as long as the shell can cope with it -- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do -- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string=`eval $cmd`) 2>/dev/null && -- echo_test_string=`eval $cmd` && -- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null -- then -- break -- fi -- done --fi -+if test -z "$lt_ECHO"; then -+ if test "X${echo_test_string+set}" != Xset; then -+ # find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if { echo_test_string=`eval $cmd`; } 2>/dev/null && -+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null -+ then -+ break -+ fi -+ done -+ fi - --if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- : +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='printf %s\n' +- as_echo_n='printf %s' -else -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -- # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+ else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. - -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for dir in $PATH /usr/ucb; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ ECHO="$dir/echo" -+ break -+ fi -+ done - IFS="$lt_save_ifs" -- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$dir/echo" -- break -- fi -- done -- IFS="$lt_save_ifs" - -- if test "X$echo" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # This shell has a builtin print -r that does the trick. -- echo='print -r' -- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && -- test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running configure again with it. -- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -- export ORIGINAL_CONFIG_SHELL -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} -- else -- # Try using printf. -- echo='printf %s\n' -- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && -- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- # Cool, printf works -- : -- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -- test "X$echo_testing_string" = "X$echo_test_string"; then -- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -- export CONFIG_SHELL -- SHELL="$CONFIG_SHELL" -- export SHELL -- echo="$CONFIG_SHELL $0 --fallback-echo" -- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -- test "X$echo_testing_string" = 'X\t' && -- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ if test "X$ECHO" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ ECHO='print -r' -+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} -+ else -+ # Try using printf. -+ ECHO='printf %s\n' -+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then -- echo="$CONFIG_SHELL $0 --fallback-echo" -- else -- # maybe with a smaller string... -- prev=: -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ ECHO="$CONFIG_SHELL $0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ ECHO="$CONFIG_SHELL $0 --fallback-echo" -+ else -+ # maybe with a smaller string... -+ prev=: - -- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do -- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null -- then -- break -- fi -- prev="$cmd" -- done -+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do -+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null -+ then -+ break -+ fi -+ prev="$cmd" -+ done - -- if test "$prev" != 'sed 50q "$0"'; then -- echo_test_string=`eval $prev` -- export echo_test_string -- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} -- else -- # Oops. We lost completely, so just stick with echo. -- echo=echo -- fi -+ if test "$prev" != 'sed 50q "$0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ ECHO=echo -+ fi -+ fi - fi - fi - fi - fi +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' -fi +- + # The user is always right. + if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh + fi - # Copy echo and quote the copy suitably for passing to libtool from - # the Makefile, instead of quoting the original, which is used later. --ECHO=$echo --if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then -- ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -+lt_ECHO=$ECHO -+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then -+ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" + # Support unset when possible. +@@ -93,6 +65,8 @@ fi + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) ++as_nl=' ++' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +@@ -115,7 +89,7 @@ if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } + fi + +@@ -128,10 +102,17 @@ PS2='> ' + PS4='+ ' + + # NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ fi ++done + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && +@@ -153,7 +134,7 @@ as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | ++echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -179,7 +160,7 @@ else + as_have_required=no + fi + +- if test $as_have_required = yes && (eval ": ++ if test $as_have_required = yes && (eval ": + (as_func_return () { + (exit \$1) + } +@@ -261,7 +242,7 @@ IFS=$as_save_IFS + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which ++ # 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 +@@ -282,7 +263,7 @@ _ASEOF + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which ++ # 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 +@@ -362,10 +343,10 @@ fi + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV +- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +- done +- export CONFIG_SHELL +- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi +@@ -434,10 +415,9 @@ fi + + test \$exitcode = 0") || { + echo No shell found that supports shell functions. +- echo Please tell bug-autoconf@gnu.org about your system, +- echo including any error possibly output before this message. +- echo This can help us improve future autoconf versions. +- echo Configuration will now proceed without shell functions. ++ echo Please tell autoconf@gnu.org about your system, ++ echo including any error possibly output before this ++ echo message + } --tagnames=${tagnames+${tagnames},}CXX -- --tagnames=${tagnames+${tagnames},}F77 -- - exec 7<&0 </dev/null 6>&1 +@@ -473,7 +453,7 @@ test \$exitcode = 0") || { + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } - # Name of the host. -@@ -838,6 +833,7 @@ - GDK_DEP_LIBS - GDK_EXTRA_CFLAGS - GDK_EXTRA_LIBS -+GDK_PRIVATE_PACKAGES - GDK_PACKAGES - USE_DIRECTFB_FALSE - USE_DIRECTFB_TRUE -@@ -1001,27 +997,34 @@ - MAINT - MAINTAINER_MODE_FALSE - MAINTAINER_MODE_TRUE + # Don't try to exec as it changes $[0], causing all sort of problems +@@ -501,6 +481,7 @@ case `echo -n x` in + *) + ECHO_N='-n';; + esac ++ + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -513,22 +494,19 @@ if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null ++ mkdir conf$$.dir + fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +- fi ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln + else + as_ln_s='cp -p' + fi +@@ -553,10 +531,10 @@ else + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then +- test -d "$1/."; ++ test -d "$1/."; + else + case $1 in +- -*)set "./$1";; ++ -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi +@@ -791,424 +769,396 @@ ac_includes_default="\ + # include <unistd.h> + #endif" + +-ac_subst_vars='LTLIBOBJS +-LIBOBJS +-ENABLE_MAN_FALSE +-ENABLE_MAN_TRUE +-XMLCATALOG +-XML_CATALOG_FILE +-XSLTPROC +-HAVE_DOCBOOK_FALSE +-HAVE_DOCBOOK_TRUE +-DB2HTML +-GTK_DOC_USE_LIBTOOL_FALSE +-GTK_DOC_USE_LIBTOOL_TRUE +-ENABLE_GTK_DOC_FALSE +-ENABLE_GTK_DOC_TRUE +-GTKDOC_CHECK +-HTML_DIR +-TEST_PRINT_BACKEND_FALSE +-TEST_PRINT_BACKEND_TRUE +-HAVE_HTTP_AUTHSTRING +-HAVE_CUPS_FALSE +-HAVE_CUPS_TRUE +-CUPS_LIBS +-CUPS_CFLAGS +-CUPS_API_MINOR +-CUPS_API_MAJOR +-CUPS_CONFIG +-GAIL_INET_LIBS +-GTK_XIM_FLAGS +-GTK_DEBUG_FLAGS +-CAIRO_PREFIX +-PANGO_PREFIX +-ATK_PREFIX +-GLIB_PREFIX +-GTK_DEP_CFLAGS +-GTK_DEP_LIBS +-GTK_EXTRA_CFLAGS +-GTK_EXTRA_LIBS +-GTK_PACKAGES +-GDK_PIXBUF_DEP_CFLAGS +-GDK_PIXBUF_DEP_LIBS +-GDK_PIXBUF_EXTRA_CFLAGS +-GDK_PIXBUF_EXTRA_LIBS +-GDK_PIXBUF_PACKAGES +-GDK_DEP_CFLAGS +-GDK_DEP_LIBS +-GDK_EXTRA_CFLAGS +-GDK_EXTRA_LIBS +-GDK_PACKAGES +-USE_DIRECTFB_FALSE +-USE_DIRECTFB_TRUE +-GDK_PIXBUF_XLIB_DEP_CFLAGS +-GDK_PIXBUF_XLIB_DEP_LIBS +-GDK_PIXBUF_XLIB_EXTRA_CFLAGS +-GDK_PIXBUF_XLIB_EXTRA_LIBS +-GDK_PIXBUF_XLIB_PACKAGES +-USE_QUARTZ_FALSE +-USE_QUARTZ_TRUE +-USE_WIN32_FALSE +-USE_WIN32_TRUE +-USE_X11_FALSE +-USE_X11_TRUE +-XINPUT_XFREE_FALSE +-XINPUT_XFREE_TRUE +-HAVE_X11R6_FALSE +-HAVE_X11R6_TRUE +-X_EXTRA_LIBS +-X_LIBS +-X_PRE_LIBS +-X_CFLAGS +-XMKMF +-REBUILD_PNGS +-GTK_UPDATE_ICON_CACHE +-GDK_PIXBUF_CSOURCE +-CROSS_COMPILING_FALSE +-CROSS_COMPILING_TRUE +-USE_MMX_FALSE +-USE_MMX_TRUE +-USE_MEDIALIB25_FALSE +-USE_MEDIALIB25_TRUE +-USE_MEDIALIB_FALSE +-USE_MEDIALIB_TRUE +-HAVE_JASPER_FALSE +-HAVE_JASPER_TRUE +-HAVE_JPEG_FALSE +-HAVE_JPEG_TRUE +-HAVE_PNG_FALSE +-HAVE_PNG_TRUE +-HAVE_TIFF_FALSE +-HAVE_TIFF_TRUE +-INCLUDE_IM_XIM_FALSE +-INCLUDE_IM_XIM_TRUE +-INCLUDE_IM_VIQR_FALSE +-INCLUDE_IM_VIQR_TRUE +-INCLUDE_IM_TI_ET_FALSE +-INCLUDE_IM_TI_ET_TRUE +-INCLUDE_IM_TI_ER_FALSE +-INCLUDE_IM_TI_ER_TRUE +-INCLUDE_IM_THAI_FALSE +-INCLUDE_IM_THAI_TRUE +-INCLUDE_IM_MULTIPRESS_FALSE +-INCLUDE_IM_MULTIPRESS_TRUE +-INCLUDE_IM_IPA_FALSE +-INCLUDE_IM_IPA_TRUE +-INCLUDE_IM_INUKTITUT_FALSE +-INCLUDE_IM_INUKTITUT_TRUE +-INCLUDE_IM_IME_FALSE +-INCLUDE_IM_IME_TRUE +-INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE +-INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE +-INCLUDE_IM_CEDILLA_FALSE +-INCLUDE_IM_CEDILLA_TRUE +-INCLUDE_IM_AM_ET_FALSE +-INCLUDE_IM_AM_ET_TRUE +-INCLUDED_IMMODULE_DEFINE +-INCLUDED_IMMODULE_OBJ +-HAVE_INCLUDED_IMMMODULES_FALSE +-HAVE_INCLUDED_IMMMODULES_TRUE +-INCLUDE_GDIPLUS_FALSE +-INCLUDE_GDIPLUS_TRUE +-INCLUDE_JASPER_FALSE +-INCLUDE_JASPER_TRUE +-INCLUDE_ICNS_FALSE +-INCLUDE_ICNS_TRUE +-INCLUDE_PCX_FALSE +-INCLUDE_PCX_TRUE +-INCLUDE_TGA_FALSE +-INCLUDE_TGA_TRUE +-INCLUDE_XBM_FALSE +-INCLUDE_XBM_TRUE +-INCLUDE_XPM_FALSE +-INCLUDE_XPM_TRUE +-INCLUDE_TIFF_FALSE +-INCLUDE_TIFF_TRUE +-INCLUDE_RAS_FALSE +-INCLUDE_RAS_TRUE +-INCLUDE_PNM_FALSE +-INCLUDE_PNM_TRUE +-INCLUDE_JPEG_FALSE +-INCLUDE_JPEG_TRUE +-INCLUDE_ANI_FALSE +-INCLUDE_ANI_TRUE +-INCLUDE_ICO_FALSE +-INCLUDE_ICO_TRUE +-INCLUDE_GIF_FALSE +-INCLUDE_GIF_TRUE +-INCLUDE_WBMP_FALSE +-INCLUDE_WBMP_TRUE +-INCLUDE_BMP_FALSE +-INCLUDE_BMP_TRUE +-INCLUDE_PNG_FALSE +-INCLUDE_PNG_TRUE +-INCLUDED_LOADER_DEFINE +-INCLUDED_LOADER_OBJ +-BUILD_DYNAMIC_MODULES_FALSE +-BUILD_DYNAMIC_MODULES_TRUE +-LIBJASPER +-LIBPNG +-LIBJPEG +-LIBTIFF +-BUILD_GDIPLUS_LOADERS_FALSE +-BUILD_GDIPLUS_LOADERS_TRUE +-GDK_WLIBS +-GLIB_MKENUMS +-GOBJECT_QUERY +-GLIB_GENMARSHAL +-GLIB_LIBS +-GLIB_CFLAGS +-MKINSTALLDIRS +-POSUB +-POFILES +-PO_IN_DATADIR_FALSE +-PO_IN_DATADIR_TRUE +-INTLLIBS +-INSTOBJEXT +-GMOFILES +-DATADIRNAME +-CATOBJEXT +-CATALOGS +-XGETTEXT +-GMSGFMT +-MSGFMT_OPTS +-MSGFMT +-USE_NLS +-REBUILD +-INDENT +-PERL +-DISABLE_EXPLICIT_DEPS_FALSE +-DISABLE_EXPLICIT_DEPS_TRUE +-LIBTOOL_EXPORT_OPTIONS +-BASE_DEPENDENCIES_LIBS +-BASE_DEPENDENCIES_CFLAGS +-PKG_CONFIG +-gtktargetlib +-gdktargetlib +-gdktarget +-MS_LIB_AVAILABLE_FALSE +-MS_LIB_AVAILABLE_TRUE +-ms_librarian +-WINDRES +-OS_LINUX_FALSE +-OS_LINUX_TRUE +-OS_UNIX_FALSE +-OS_UNIX_TRUE +-OS_WIN32_FALSE +-OS_WIN32_TRUE +-PLATFORM_WIN32_FALSE +-PLATFORM_WIN32_TRUE +-MAINT +-MAINTAINER_MODE_FALSE +-MAINTAINER_MODE_TRUE -NM -+am__fastdepCCAS_FALSE -+am__fastdepCCAS_TRUE -+CCASDEPMODE - CCASFLAGS - CCAS +-CCASFLAGS +-CCAS -LIBTOOL -ac_ct_F77 -FFLAGS -F77 - CXXCPP - CPP +-CXXCPP +-CPP -OBJDUMP -AS -DLLTOOL -+OTOOL64 -+OTOOL -+LIPO - NMEDIT - DSYMUTIL -+lt_ECHO - RANLIB - AR +-NMEDIT +-DSYMUTIL +-RANLIB +-AR -ECHO - LN_S -+NM -+ac_ct_DUMPBIN -+DUMPBIN -+LD -+FGREP - EGREP - GREP - SED -+LIBTOOL -+OBJDUMP -+DLLTOOL -+AS - HAVE_OBJC_FALSE - HAVE_OBJC_TRUE - HAVE_CXX_FALSE -@@ -1032,6 +1035,8 @@ - CXXFLAGS - ac_ct_CXX - CXX -+ENABLE_STATIC_FALSE -+ENABLE_STATIC_TRUE - am__fastdepCC_FALSE - am__fastdepCC_TRUE - CCDEPMODE -@@ -1074,13 +1079,17 @@ - GTK_MICRO_VERSION - GTK_MINOR_VERSION - GTK_MAJOR_VERSION -+am__untar -+am__tar -+AMTAR - am__leading_dot - SET_MAKE - AWK -+mkdir_p -+MKDIR_P - INSTALL_STRIP_PROGRAM - STRIP - install_sh +-LN_S +-EGREP +-GREP +-SED +-HAVE_OBJC_FALSE +-HAVE_OBJC_TRUE +-HAVE_CXX_FALSE +-HAVE_CXX_TRUE +-am__fastdepCXX_FALSE +-am__fastdepCXX_TRUE +-CXXDEPMODE +-CXXFLAGS +-ac_ct_CXX +-CXX +-am__fastdepCC_FALSE +-am__fastdepCC_TRUE +-CCDEPMODE +-AMDEPBACKSLASH +-AMDEP_FALSE +-AMDEP_TRUE +-am__quote +-am__include +-DEPDIR +-OBJEXT +-EXEEXT +-ac_ct_CC +-CPPFLAGS +-LDFLAGS +-CFLAGS +-CC +-LIB_EXE_MACHINE_FLAG +-host_os +-host_vendor +-host_cpu +-host +-build_os +-build_vendor +-build_cpu +-build +-GETTEXT_PACKAGE +-GDK_PIXBUF_VERSION +-GDK_PIXBUF_MICRO +-GDK_PIXBUF_MINOR +-GDK_PIXBUF_MAJOR +-GAIL_LT_CURRENT_MINUS_AGE +-GAIL_LT_VERSION_INFO +-LT_CURRENT_MINUS_AGE +-LT_VERSION_INFO +-GTK_BINARY_VERSION +-GTK_VERSION +-GTK_API_VERSION +-GTK_BINARY_AGE +-GTK_INTERFACE_AGE +-GTK_MICRO_VERSION +-GTK_MINOR_VERSION +-GTK_MAJOR_VERSION +-am__leading_dot +-SET_MAKE +-AWK +-INSTALL_STRIP_PROGRAM +-STRIP +-install_sh -AMTAR - MAKEINFO - AUTOHEADER - AUTOMAKE -@@ -1089,6 +1098,7 @@ - VERSION - PACKAGE - CYGPATH_W -+am__isrc - INSTALL_DATA - INSTALL_SCRIPT - INSTALL_PROGRAM -@@ -1135,11 +1145,10 @@ - enable_dependency_tracking - enable_static - enable_shared -+with_pic - enable_fast_install - with_gnu_ld - enable_libtool_lock +-MAKEINFO +-AUTOHEADER +-AUTOMAKE +-AUTOCONF +-ACLOCAL +-VERSION +-PACKAGE +-CYGPATH_W +-INSTALL_DATA +-INSTALL_SCRIPT +-INSTALL_PROGRAM +-target_alias +-host_alias +-build_alias +-LIBS +-ECHO_T +-ECHO_N +-ECHO_C +-DEFS +-mandir +-localedir +-libdir +-psdir +-pdfdir +-dvidir +-htmldir +-infodir +-docdir +-oldincludedir +-includedir +-localstatedir +-sharedstatedir +-sysconfdir +-datadir +-datarootdir +-libexecdir +-sbindir +-bindir +-program_transform_name +-prefix +-exec_prefix +-PACKAGE_BUGREPORT +-PACKAGE_STRING +-PACKAGE_VERSION +-PACKAGE_TARNAME +-PACKAGE_NAME ++ac_subst_vars='SHELL + PATH_SEPARATOR +-SHELL' +-ac_subst_files='' +-ac_user_opts=' +-enable_option_checking +-enable_dependency_tracking +-enable_static +-enable_shared +-enable_fast_install +-with_gnu_ld +-enable_libtool_lock -with_pic -with_tags - enable_largefile - enable_maintainer_mode - enable_debug -@@ -1181,8 +1190,8 @@ - CCC +-enable_largefile +-enable_maintainer_mode +-enable_debug +-enable_shm +-enable_xkb +-enable_xinerama +-enable_rebuilds +-enable_visibility +-with_xinput +-with_gdktarget +-enable_explicit_deps +-enable_glibtest +-enable_modules +-with_libpng +-with_libjpeg +-with_libtiff +-with_libjasper +-enable_gdiplus +-with_included_loaders +-with_included_immodules +-with_x +-enable_cups +-enable_test_print_backend +-with_html_dir +-enable_gtk_doc +-enable_man +-with_xml_catalog +-' +- ac_precious_vars='build_alias ++PACKAGE_NAME ++PACKAGE_TARNAME ++PACKAGE_VERSION ++PACKAGE_STRING ++PACKAGE_BUGREPORT ++exec_prefix ++prefix ++program_transform_name ++bindir ++sbindir ++libexecdir ++datarootdir ++datadir ++sysconfdir ++sharedstatedir ++localstatedir ++includedir ++oldincludedir ++docdir ++infodir ++htmldir ++dvidir ++pdfdir ++psdir ++libdir ++localedir ++mandir ++DEFS ++ECHO_C ++ECHO_N ++ECHO_T ++LIBS ++build_alias + host_alias + target_alias ++INSTALL_PROGRAM ++INSTALL_SCRIPT ++INSTALL_DATA ++am__isrc ++CYGPATH_W ++PACKAGE ++VERSION ++ACLOCAL ++AUTOCONF ++AUTOMAKE ++AUTOHEADER ++MAKEINFO ++install_sh ++STRIP ++INSTALL_STRIP_PROGRAM ++mkdir_p ++AWK ++SET_MAKE ++am__leading_dot ++AMTAR ++am__tar ++am__untar ++GTK_MAJOR_VERSION ++GTK_MINOR_VERSION ++GTK_MICRO_VERSION ++GTK_INTERFACE_AGE ++GTK_BINARY_AGE ++GTK_API_VERSION ++GTK_VERSION ++GTK_BINARY_VERSION ++LT_VERSION_INFO ++LT_CURRENT_MINUS_AGE ++GAIL_LT_VERSION_INFO ++GAIL_LT_CURRENT_MINUS_AGE ++GDK_PIXBUF_MAJOR ++GDK_PIXBUF_MINOR ++GDK_PIXBUF_MICRO ++GDK_PIXBUF_VERSION ++GETTEXT_PACKAGE ++build ++build_cpu ++build_vendor ++build_os ++host ++host_cpu ++host_vendor ++host_os ++LIB_EXE_MACHINE_FLAG + CC + CFLAGS + LDFLAGS +-LIBS + CPPFLAGS ++ac_ct_CC ++EXEEXT ++OBJEXT ++DEPDIR ++am__include ++am__quote ++AMDEP_TRUE ++AMDEP_FALSE ++AMDEPBACKSLASH ++CCDEPMODE ++am__fastdepCC_TRUE ++am__fastdepCC_FALSE ++ENABLE_STATIC_TRUE ++ENABLE_STATIC_FALSE + CXX ++ac_ct_CXX + CXXFLAGS +-CCC ++CXXDEPMODE ++am__fastdepCXX_TRUE ++am__fastdepCXX_FALSE ++HAVE_CXX_TRUE ++HAVE_CXX_FALSE ++HAVE_OBJC_TRUE ++HAVE_OBJC_FALSE ++SED ++GREP ++EGREP ++LN_S ++ECHO ++AR ++RANLIB ++DSYMUTIL ++NMEDIT ++DLLTOOL ++AS ++OBJDUMP CPP CXXCPP --F77 --FFLAGS + F77 + FFLAGS ++ac_ct_F77 ++LIBTOOL +CCAS +CCASFLAGS ++CCASDEPMODE ++am__fastdepCCAS_TRUE ++am__fastdepCCAS_FALSE ++NM ++MAINTAINER_MODE_TRUE ++MAINTAINER_MODE_FALSE ++MAINT ++PLATFORM_WIN32_TRUE ++PLATFORM_WIN32_FALSE ++OS_WIN32_TRUE ++OS_WIN32_FALSE ++OS_UNIX_TRUE ++OS_UNIX_FALSE ++OS_LINUX_TRUE ++OS_LINUX_FALSE ++WINDRES ++ms_librarian ++MS_LIB_AVAILABLE_TRUE ++MS_LIB_AVAILABLE_FALSE ++gdktarget ++gdktargetlib ++gtktargetlib PKG_CONFIG BASE_DEPENDENCIES_CFLAGS BASE_DEPENDENCIES_LIBS -@@ -1821,16 +1830,16 @@ - --disable-option-checking ignore unrecognized --enable/--with options +-XMKMF' +- +- +-# Initialize some variables set by options. +-ac_init_help= +-ac_init_version=false +-ac_unrecognized_opts= +-ac_unrecognized_sep= +-# The variables have the same names as the options, with +-# dashes changed to underlines. +-cache_file=/dev/null +-exec_prefix=NONE +-no_create= +-no_recursion= +-prefix=NONE +-program_prefix=NONE +-program_suffix=NONE +-program_transform_name=s,x,x, +-silent= +-site= +-srcdir= +-verbose= +-x_includes=NONE ++LIBTOOL_EXPORT_OPTIONS ++DISABLE_EXPLICIT_DEPS_TRUE ++DISABLE_EXPLICIT_DEPS_FALSE ++PERL ++INDENT ++REBUILD ++USE_NLS ++MSGFMT ++MSGFMT_OPTS ++GMSGFMT ++XGETTEXT ++CATALOGS ++CATOBJEXT ++DATADIRNAME ++GMOFILES ++INSTOBJEXT ++INTLLIBS ++PO_IN_DATADIR_TRUE ++PO_IN_DATADIR_FALSE ++POFILES ++POSUB ++MKINSTALLDIRS ++GLIB_CFLAGS ++GLIB_LIBS ++GLIB_GENMARSHAL ++GOBJECT_QUERY ++GLIB_MKENUMS ++GDK_WLIBS ++BUILD_GDIPLUS_LOADERS_TRUE ++BUILD_GDIPLUS_LOADERS_FALSE ++LIBTIFF ++LIBJPEG ++LIBPNG ++LIBJASPER ++BUILD_DYNAMIC_MODULES_TRUE ++BUILD_DYNAMIC_MODULES_FALSE ++INCLUDED_LOADER_OBJ ++INCLUDED_LOADER_DEFINE ++INCLUDE_PNG_TRUE ++INCLUDE_PNG_FALSE ++INCLUDE_BMP_TRUE ++INCLUDE_BMP_FALSE ++INCLUDE_WBMP_TRUE ++INCLUDE_WBMP_FALSE ++INCLUDE_GIF_TRUE ++INCLUDE_GIF_FALSE ++INCLUDE_ICO_TRUE ++INCLUDE_ICO_FALSE ++INCLUDE_ANI_TRUE ++INCLUDE_ANI_FALSE ++INCLUDE_JPEG_TRUE ++INCLUDE_JPEG_FALSE ++INCLUDE_PNM_TRUE ++INCLUDE_PNM_FALSE ++INCLUDE_RAS_TRUE ++INCLUDE_RAS_FALSE ++INCLUDE_TIFF_TRUE ++INCLUDE_TIFF_FALSE ++INCLUDE_XPM_TRUE ++INCLUDE_XPM_FALSE ++INCLUDE_XBM_TRUE ++INCLUDE_XBM_FALSE ++INCLUDE_TGA_TRUE ++INCLUDE_TGA_FALSE ++INCLUDE_PCX_TRUE ++INCLUDE_PCX_FALSE ++INCLUDE_ICNS_TRUE ++INCLUDE_ICNS_FALSE ++INCLUDE_JASPER_TRUE ++INCLUDE_JASPER_FALSE ++INCLUDE_GDIPLUS_TRUE ++INCLUDE_GDIPLUS_FALSE ++HAVE_INCLUDED_IMMMODULES_TRUE ++HAVE_INCLUDED_IMMMODULES_FALSE ++INCLUDED_IMMODULE_OBJ ++INCLUDED_IMMODULE_DEFINE ++INCLUDE_IM_AM_ET_TRUE ++INCLUDE_IM_AM_ET_FALSE ++INCLUDE_IM_CEDILLA_TRUE ++INCLUDE_IM_CEDILLA_FALSE ++INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE ++INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE ++INCLUDE_IM_IME_TRUE ++INCLUDE_IM_IME_FALSE ++INCLUDE_IM_INUKTITUT_TRUE ++INCLUDE_IM_INUKTITUT_FALSE ++INCLUDE_IM_IPA_TRUE ++INCLUDE_IM_IPA_FALSE ++INCLUDE_IM_MULTIPRESS_TRUE ++INCLUDE_IM_MULTIPRESS_FALSE ++INCLUDE_IM_THAI_TRUE ++INCLUDE_IM_THAI_FALSE ++INCLUDE_IM_TI_ER_TRUE ++INCLUDE_IM_TI_ER_FALSE ++INCLUDE_IM_TI_ET_TRUE ++INCLUDE_IM_TI_ET_FALSE ++INCLUDE_IM_VIQR_TRUE ++INCLUDE_IM_VIQR_FALSE ++INCLUDE_IM_XIM_TRUE ++INCLUDE_IM_XIM_FALSE ++HAVE_TIFF_TRUE ++HAVE_TIFF_FALSE ++HAVE_PNG_TRUE ++HAVE_PNG_FALSE ++HAVE_JPEG_TRUE ++HAVE_JPEG_FALSE ++HAVE_JASPER_TRUE ++HAVE_JASPER_FALSE ++USE_MEDIALIB_TRUE ++USE_MEDIALIB_FALSE ++USE_MEDIALIB25_TRUE ++USE_MEDIALIB25_FALSE ++USE_MMX_TRUE ++USE_MMX_FALSE ++CROSS_COMPILING_TRUE ++CROSS_COMPILING_FALSE ++GDK_PIXBUF_CSOURCE ++GTK_UPDATE_ICON_CACHE ++REBUILD_PNGS ++XMKMF ++X_CFLAGS ++X_PRE_LIBS ++X_LIBS ++X_EXTRA_LIBS ++HAVE_X11R6_TRUE ++HAVE_X11R6_FALSE ++XINPUT_XFREE_TRUE ++XINPUT_XFREE_FALSE ++USE_X11_TRUE ++USE_X11_FALSE ++USE_WIN32_TRUE ++USE_WIN32_FALSE ++USE_QUARTZ_TRUE ++USE_QUARTZ_FALSE ++GDK_PIXBUF_XLIB_PACKAGES ++GDK_PIXBUF_XLIB_EXTRA_LIBS ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS ++GDK_PIXBUF_XLIB_DEP_LIBS ++GDK_PIXBUF_XLIB_DEP_CFLAGS ++USE_DIRECTFB_TRUE ++USE_DIRECTFB_FALSE ++GDK_PACKAGES ++GDK_PRIVATE_PACKAGES ++GDK_EXTRA_LIBS ++GDK_EXTRA_CFLAGS ++GDK_DEP_LIBS ++GDK_DEP_CFLAGS ++GDK_PIXBUF_PACKAGES ++GDK_PIXBUF_EXTRA_LIBS ++GDK_PIXBUF_EXTRA_CFLAGS ++GDK_PIXBUF_DEP_LIBS ++GDK_PIXBUF_DEP_CFLAGS ++GTK_PACKAGES ++GTK_EXTRA_LIBS ++GTK_EXTRA_CFLAGS ++GTK_DEP_LIBS ++GTK_DEP_CFLAGS ++GLIB_PREFIX ++ATK_PREFIX ++PANGO_PREFIX ++CAIRO_PREFIX ++GTK_DEBUG_FLAGS ++GTK_XIM_FLAGS ++GAIL_INET_LIBS ++CUPS_CONFIG ++CUPS_API_MAJOR ++CUPS_API_MINOR ++CUPS_CFLAGS ++CUPS_LIBS ++HAVE_CUPS_TRUE ++HAVE_CUPS_FALSE ++HAVE_HTTP_AUTHSTRING ++TEST_PRINT_BACKEND_TRUE ++TEST_PRINT_BACKEND_FALSE ++HTML_DIR ++GTKDOC_CHECK ++ENABLE_GTK_DOC_TRUE ++ENABLE_GTK_DOC_FALSE ++GTK_DOC_USE_LIBTOOL_TRUE ++GTK_DOC_USE_LIBTOOL_FALSE ++DB2HTML ++HAVE_DOCBOOK_TRUE ++HAVE_DOCBOOK_FALSE ++XSLTPROC ++XML_CATALOG_FILE ++XMLCATALOG ++ENABLE_MAN_TRUE ++ENABLE_MAN_FALSE ++LIBOBJS ++LTLIBOBJS' ++ac_subst_files='' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++CXX ++CXXFLAGS ++CCC ++CPP ++CXXCPP ++F77 ++FFLAGS ++CCAS ++CCASFLAGS ++PKG_CONFIG ++BASE_DEPENDENCIES_CFLAGS ++BASE_DEPENDENCIES_LIBS ++XMKMF' ++ ++ ++# Initialize some variables set by options. ++ac_init_help= ++ac_init_version=false ++# The variables have the same names as the options, with ++# dashes changed to underlines. ++cache_file=/dev/null ++exec_prefix=NONE ++no_create= ++no_recursion= ++prefix=NONE ++program_prefix=NONE ++program_suffix=NONE ++program_transform_name=s,x,x, ++silent= ++site= ++srcdir= ++verbose= ++x_includes=NONE + x_libraries=NONE + + # Installation directory options. +@@ -1292,21 +1242,13 @@ do + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"enable_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval enable_$ac_useropt=no ;; ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` ++ eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; +@@ -1319,21 +1261,13 @@ do + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 ++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"enable_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval enable_$ac_useropt=\$ac_optarg ;; ++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` ++ eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -1524,38 +1458,22 @@ do + ac_init_version=: ;; + + -with-* | --with-*) +- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"with_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval with_$ac_useropt=\$ac_optarg ;; ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` ++ eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) +- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 ++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } +- ac_useropt_orig=$ac_useropt +- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` +- case $ac_user_opts in +- *" +-"with_$ac_useropt" +-"*) ;; +- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" +- ac_unrecognized_sep=', ';; +- esac +- eval with_$ac_useropt=no ;; ++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` ++ eval with_$ac_package=no ;; + + --x) + # Obsolete; use --with-x. +@@ -1575,7 +1493,7 @@ do + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + +- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option ++ -*) { echo "$as_me: error: unrecognized option: $ac_option + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; +@@ -1584,16 +1502,16 @@ Try \`$0 --help' for more information." + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && +- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 ++ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. +- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && +- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + +@@ -1602,38 +1520,22 @@ done + + if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` +- { $as_echo "$as_me: error: missing argument to $ac_option" >&2 ++ { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } + fi + +-if test -n "$ac_unrecognized_opts"; then +- case $enable_option_checking in +- no) ;; +- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 +- { (exit 1); exit 1; }; } ;; +- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; +- esac +-fi +- +-# Check all directory arguments for consistency. ++# Be sure to have absolute directory names. + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir + do + eval ac_val=\$$ac_var +- # Remove trailing slashes. +- case $ac_val in +- */ ) +- ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` +- eval $ac_var=\$ac_val;; +- esac +- # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac +- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } + done + +@@ -1648,7 +1550,7 @@ target=$target_alias + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes +@@ -1664,10 +1566,10 @@ test "$silent" = yes && exec 6>/dev/null + ac_pwd=`pwd` && test -n "$ac_pwd" && + ac_ls_di=`ls -di .` && + ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || +- { $as_echo "$as_me: error: working directory cannot be determined" >&2 ++ { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } + test "X$ac_ls_di" = "X$ac_pwd_ls_di" || +- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + +@@ -1675,12 +1577,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. +- ac_confdir=`$as_dirname -- "$as_myself" || +-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X"$as_myself" : 'X\(//\)[^/]' \| \ +- X"$as_myself" : 'X\(//\)$' \| \ +- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_myself" | ++ ac_confdir=`$as_dirname -- "$0" || ++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$0" : 'X\(//\)[^/]' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -1707,12 +1609,12 @@ else + fi + if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." +- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } + fi + ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" + ac_abs_confdir=`( +- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 ++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` + # When building in place, set srcdir=. +@@ -1761,9 +1663,9 @@ Configuration: + + Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] ++ [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [PREFIX] ++ [PREFIX] + + By default, \`make install' will install all the files in + \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +@@ -1773,25 +1675,25 @@ for instance \`--prefix=\$HOME'. + For better control, use the options below. + + Fine tuning of the installation directories: +- --bindir=DIR user executables [EPREFIX/bin] +- --sbindir=DIR system admin executables [EPREFIX/sbin] +- --libexecdir=DIR program executables [EPREFIX/libexec] +- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --libdir=DIR object code libraries [EPREFIX/lib] +- --includedir=DIR C header files [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc [/usr/include] +- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] +- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] +- --infodir=DIR info documentation [DATAROOTDIR/info] +- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] +- --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/gtk+] +- --htmldir=DIR html documentation [DOCDIR] +- --dvidir=DIR dvi documentation [DOCDIR] +- --pdfdir=DIR pdf documentation [DOCDIR] +- --psdir=DIR ps documentation [DOCDIR] ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/gtk+] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] + _ACEOF + + cat <<\_ACEOF +@@ -1818,19 +1720,18 @@ if test -n "$ac_init_help"; then + cat <<\_ACEOF + + Optional Features: +- --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking Speeds up one-time builds @@ -15576,30 +5281,259 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure --enable-debug=[no/minimum/yes] turn on debugging [default=minimum] --enable-shm support shared memory if available [default=yes] -@@ -1856,10 +1865,9 @@ - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -- --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pic try to use only PIC/non-PIC objects [default=use - both] -- --with-tags[=TAGS] include additional configurations [automatic] -+ --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-xinput=[no/yes] support XInput - --with-gdktarget=[x11/win32/quartz/directfb] select non-default GDK target - --without-libpng disable PNG loader for gdk-pixbuf -@@ -1887,8 +1895,8 @@ - CXXFLAGS C++ compiler flags - CPP C preprocessor +@@ -1889,6 +1790,8 @@ Some influential environment variables: CXXCPP C++ preprocessor -- F77 Fortran 77 compiler command -- FFLAGS Fortran 77 compiler flags + F77 Fortran 77 compiler command + FFLAGS Fortran 77 compiler flags + CCAS assembler compiler command (defaults to CC) + CCASFLAGS assembler compiler flags (defaults to CFLAGS) PKG_CONFIG path to pkg-config utility BASE_DEPENDENCIES_CFLAGS C compiler flags for BASE_DEPENDENCIES, overriding pkg-config -@@ -2350,7 +2358,8 @@ +@@ -1907,17 +1810,15 @@ fi + if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue +- test -d "$ac_dir" || +- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || +- continue ++ test -d "$ac_dir" || continue + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -1953,7 +1854,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else +- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +@@ -1963,10 +1864,10 @@ test -n "$ac_init_help" && exit $ac_stat + if $ac_init_version; then + cat <<\_ACEOF + gtk+ configure 2.14.7 +-generated by GNU Autoconf 2.63 ++generated by GNU Autoconf 2.61 + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1977,7 +1878,7 @@ This file contains any messages produced + running configure, to aid debugging if configure makes a mistake. + + It was created by gtk+ $as_me 2.14.7, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + +@@ -2013,7 +1914,7 @@ for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- $as_echo "PATH: $as_dir" ++ echo "PATH: $as_dir" + done + IFS=$as_save_IFS + +@@ -2048,7 +1949,7 @@ do + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) +- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; +@@ -2100,12 +2001,11 @@ _ASBOX + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( +- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac +@@ -2135,9 +2035,9 @@ _ASBOX + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +- $as_echo "$ac_var='\''$ac_val'\''" ++ echo "$ac_var='\''$ac_val'\''" + done | sort + echo + +@@ -2152,9 +2052,9 @@ _ASBOX + do + eval ac_val=\$$ac_var + case $ac_val in +- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac +- $as_echo "$ac_var='\''$ac_val'\''" ++ echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi +@@ -2170,8 +2070,8 @@ _ASBOX + echo + fi + test "$ac_signal" != 0 && +- $as_echo "$as_me: caught signal $ac_signal" +- $as_echo "$as_me: exit $exit_status" ++ echo "$as_me: caught signal $ac_signal" ++ echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && +@@ -2213,24 +2113,21 @@ _ACEOF + + + # Let the site file select an alternate cache file if it wants to. +-# Prefer an explicitly selected file to automatically selected ones. +-ac_site_file1=NONE +-ac_site_file2=NONE ++# Prefer explicitly selected file to automatically selected ones. + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ set x "$CONFIG_SITE" + elif test "x$prefix" != xNONE; then +- ac_site_file1=$prefix/share/config.site +- ac_site_file2=$prefix/etc/config.site ++ set x "$prefix/share/config.site" "$prefix/etc/config.site" + else +- ac_site_file1=$ac_default_prefix/share/config.site +- ac_site_file2=$ac_default_prefix/etc/config.site ++ set x "$ac_default_prefix/share/config.site" \ ++ "$ac_default_prefix/etc/config.site" + fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++shift ++for ac_site_file + do +- test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then +- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +-$as_echo "$as_me: loading site script $ac_site_file" >&6;} ++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +@@ -2240,16 +2137,16 @@ if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then +- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +-$as_echo "$as_me: loading cache $cache_file" >&6;} ++ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +-$as_echo "$as_me: creating cache $cache_file" >&6;} ++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi + +@@ -2263,38 +2160,29 @@ for ac_var in $ac_precious_vars; do + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then +- # differences in whitespace do not lead to failure. +- ac_old_val_w=`echo x $ac_old_val` +- ac_new_val_w=`echo x $ac_new_val` +- if test "$ac_old_val_w" != "$ac_new_val_w"; then +- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} +- ac_cache_corrupted=: +- else +- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} +- eval $ac_var=\$ac_old_val +- fi +- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} +- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} ++ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 ++echo "$as_me: former value: $ac_old_val" >&2;} ++ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 ++echo "$as_me: current value: $ac_new_val" >&2;} ++ ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in +- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in +@@ -2304,12 +2192,10 @@ $as_echo "$as_me: current value: \`$ac + fi + done + if $ac_cache_corrupted; then +- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} +- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} ++ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 ++echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -2350,7 +2236,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} @@ -15609,23 +5543,149 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then -@@ -2530,7 +2539,6 @@ - ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' - program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - -- - # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` - -@@ -2544,6 +2552,54 @@ - $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +@@ -2368,8 +2255,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s + fi + done + if test -z "$ac_aux_dir"; then +- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 ++echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } fi -+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +@@ -2395,12 +2282,11 @@ ac_configure="$SHELL $ac_aux_dir/configu + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-# Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-$as_echo_n "checking for a BSD-compatible install... " >&6; } ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } + if test -z "$INSTALL"; then + if test "${ac_cv_path_install+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -2429,29 +2315,17 @@ case $as_dir/ in + # program-specific install script used by HP pwplus--don't use. + : + else +- rm -rf conftest.one conftest.two conftest.dir +- echo one > conftest.one +- echo two > conftest.two +- mkdir conftest.dir +- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +- test -s conftest.one && test -s conftest.two && +- test -s conftest.dir/conftest.one && +- test -s conftest.dir/conftest.two +- then +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 + fi + fi + done + done + ;; + esac +- + done + IFS=$as_save_IFS + +-rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -2464,8 +2338,8 @@ fi + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +-$as_echo "$INSTALL" >&6; } ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -2475,8 +2349,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-$as_echo_n "checking whether build environment is sane... " >&6; } ++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file +@@ -2499,9 +2373,9 @@ if ( + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken ++ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + alias in your environment" >&5 +-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken ++echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken + alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2512,24 +2386,26 @@ then + # Ok. + : + else +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! ++ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! + Check your system clock" >&5 +-$as_echo "$as_me: error: newly created file is older than distributed files! ++echo "$as_me: error: newly created file is older than distributed files! + Check your system clock" >&2;} + { (exit 1); exit 1; }; } + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" + # Use a double $ so make ignores it. + test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +-# Double any \ or $. ++# Double any \ or $. echo might interpret backslashes. + # By default was `s,x,x', remove it if useless. +-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +- ++cat <<\_ACEOF >conftest.sed ++s/[\\$]/&&/g;s/;s,x,x,$// ++_ACEOF ++program_transform_name=`echo $program_transform_name | sed -f conftest.sed` ++rm -f conftest.sed + + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` +@@ -2540,18 +2416,66 @@ if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " + else + am_missing_run= +- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ++echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + ++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then -+ $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin @@ -15660,8 +5720,8 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + MKDIR_P="$ac_install_sh -d" + fi +fi -+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -+$as_echo "$MKDIR_P" >&6; } ++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 ++echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in @@ -15672,7 +5732,76 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -2626,12 +2682,16 @@ + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_AWK+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +@@ -2564,7 +2488,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2575,23 +2499,22 @@ fi + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +-$as_echo "$AWK" >&6; } ++ { echo "$as_me:$LINENO: result: $AWK" >&5 ++echo "${ECHO_T}$AWK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + + test -n "$AWK" && break + done + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +-set x ${MAKE-make} +-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` + if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.make <<\_ACEOF + SHELL = /bin/sh +@@ -2608,12 +2531,12 @@ esac + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -2626,12 +2549,16 @@ else fi rmdir .tst 2>/dev/null @@ -15680,20 +5809,21 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then -+ { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 - $as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} ++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 ++echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi fi # test whether we have cygpath -@@ -2665,10 +2725,7 @@ +@@ -2665,10 +2592,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} @@ -15705,7 +5835,100 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right -@@ -2768,10 +2825,17 @@ +@@ -2678,10 +2602,10 @@ if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -2694,7 +2618,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2705,11 +2629,11 @@ fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } ++ { echo "$as_me:$LINENO: result: $STRIP" >&5 ++echo "${ECHO_T}$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -2718,10 +2642,10 @@ if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -2734,7 +2658,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -2745,11 +2669,11 @@ fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-$as_echo "$ac_ct_STRIP" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++echo "${ECHO_T}$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_STRIP" = x; then +@@ -2757,8 +2681,12 @@ fi + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + STRIP=$ac_ct_STRIP +@@ -2768,10 +2696,17 @@ else fi fi @@ -15724,7 +5947,925 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure -@@ -3952,9 +4016,7 @@ +@@ -2855,34 +2790,34 @@ _ACEOF + + # Make sure we can run config.sub. + $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || +- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} ++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 ++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +-{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +-$as_echo_n "checking build system type... " >&6; } ++{ echo "$as_me:$LINENO: checking build system type" >&5 ++echo $ECHO_N "checking build system type... $ECHO_C" >&6; } + if test "${ac_cv_build+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_build_alias=$build_alias + test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + test "x$ac_build_alias" = x && +- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} ++ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 ++echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +-$as_echo "$ac_cv_build" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++echo "${ECHO_T}$ac_cv_build" >&6; } + case $ac_cv_build in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +-$as_echo "$as_me: error: invalid value of canonical build" >&2;} ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 ++echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; + esac + build=$ac_cv_build +@@ -2899,27 +2834,27 @@ IFS=$ac_save_IFS + case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +-{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +-$as_echo_n "checking host system type... " >&6; } ++{ echo "$as_me:$LINENO: checking host system type" >&5 ++echo $ECHO_N "checking host system type... $ECHO_C" >&6; } + if test "${ac_cv_host+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build + else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || +- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +-$as_echo "$ac_cv_host" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++echo "${ECHO_T}$ac_cv_host" >&6; } + case $ac_cv_host in + *-*-*) ;; +-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +-$as_echo "$as_me: error: invalid value of canonical host" >&2;} ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 ++echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; + esac + host=$ac_cv_host +@@ -2938,8 +2873,8 @@ case $host_os in *\ *) host_os=`echo "$h + + + MATH_LIB=-lm +-{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5 +-$as_echo_n "checking for native Win32... " >&6; } ++{ echo "$as_me:$LINENO: checking for native Win32" >&5 ++echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } + LIB_EXE_MACHINE_FLAG=X86 + case "$host" in + *-*-mingw*) +@@ -2956,8 +2891,8 @@ case "$host" in + os_win32=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $os_win32" >&5 +-$as_echo "$os_win32" >&6; } ++{ echo "$as_me:$LINENO: result: $os_win32" >&5 ++echo "${ECHO_T}$os_win32" >&6; } + + + +@@ -2975,10 +2910,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -2991,7 +2926,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3002,11 +2937,11 @@ fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -3015,10 +2950,10 @@ if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -3031,7 +2966,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3042,11 +2977,11 @@ fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_CC" = x; then +@@ -3054,8 +2989,12 @@ fi + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +@@ -3068,10 +3007,10 @@ if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3084,7 +3023,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3095,11 +3034,11 @@ fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -3108,10 +3047,10 @@ fi + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3129,7 +3068,7 @@ do + continue + fi + ac_cv_prog_CC="cc" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3152,11 +3091,11 @@ fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -3167,10 +3106,10 @@ if test -z "$CC"; then + 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +@@ -3183,7 +3122,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3194,11 +3133,11 @@ fi + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- { $as_echo "$as_me:$LINENO: result: $CC" >&5 +-$as_echo "$CC" >&6; } ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -3211,10 +3150,10 @@ if test -z "$CC"; then + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +@@ -3227,7 +3166,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -3238,11 +3177,11 @@ fi + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +-$as_echo "$ac_ct_CC" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -3254,8 +3193,12 @@ done + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + CC=$ac_ct_CC +@@ -3265,50 +3208,44 @@ fi + fi + + +-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH ++echo "$as_me: error: no acceptable C compiler found in \$PATH + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } + + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 ++echo "$as_me:$LINENO: checking for C compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` + { (ac_try="$ac_compiler --version >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { (ac_try="$ac_compiler -v >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { (ac_try="$ac_compiler -V >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +@@ -3327,22 +3264,27 @@ main () + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" ++ac_clean_files="$ac_clean_files a.out a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } +-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +- +-# The possible output files: +-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" +- ++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++# ++# List of possible output files, starting from the most likely. ++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) ++# only as a last resort. b.out is created by i960 compilers. ++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' ++# ++# The IRIX 6 linker writes into existing files which may not be ++# executable, retaining their permissions. Remove them first so a ++# subsequent execution test works. + ac_rmfiles= + for ac_file in $ac_files + do + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac + done +@@ -3353,11 +3295,10 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. + # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +@@ -3368,7 +3309,7 @@ for ac_file in $ac_files '' + do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most +@@ -3395,27 +3336,25 @@ else + ac_file='' + fi + +-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } + if test -z "$ac_file"; then +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables ++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: C compiler cannot create executables ++echo "$as_me: error: C compiler cannot create executables + See \`config.log' for more details." >&2;} +- { (exit 77); exit 77; }; }; } ++ { (exit 77); exit 77; }; } + fi + + ac_exeext=$ac_cv_exeext + + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then +@@ -3424,53 +3363,49 @@ if test "$cross_compiling" != yes; then + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. ++ { { echo "$as_me:$LINENO: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'. + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run C compiled programs. ++echo "$as_me: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } + fi + fi + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++rm -f a.out a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save + # Check that the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } ++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++echo "${ECHO_T}$cross_compiling" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +-$as_echo_n "checking for suffix of executables... " >&6; } ++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -3479,33 +3414,31 @@ $as_echo "$ac_try_echo") >&5 + for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac + done + else +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } + fi + + rm -f conftest$ac_cv_exeext +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +-$as_echo "$ac_cv_exeext" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++echo "${ECHO_T}$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +-$as_echo_n "checking for suffix of object files... " >&6; } ++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } + if test "${ac_cv_objext+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3528,43 +3461,40 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in +- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac + done + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile ++echo "$as_me: error: cannot compute suffix of object files: cannot compile + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } + fi + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +-$as_echo "$ac_cv_objext" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++echo "${ECHO_T}$ac_cv_objext" >&6; } + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } + if test "${ac_cv_c_compiler_gnu+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3590,21 +3520,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -3614,19 +3543,15 @@ rm -f core conftest.err conftest.$ac_obj + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +-$as_echo "$ac_cv_c_compiler_gnu" >&6; } +-if test $ac_compiler_gnu = yes; then +- GCC=yes +-else +- GCC= +-fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } ++GCC=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +-$as_echo_n "checking whether $CC accepts -g... " >&6; } ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } + if test "${ac_cv_prog_cc_g+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes +@@ -3653,21 +3578,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" +@@ -3692,21 +3616,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag +@@ -3732,21 +3655,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -3761,8 +3683,8 @@ fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +-$as_echo "$ac_cv_prog_cc_g" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then +@@ -3778,10 +3700,10 @@ else + CFLAGS= + fi + fi +-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } + if test "${ac_cv_prog_cc_c89+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_prog_cc_c89=no + ac_save_CC=$CC +@@ -3852,21 +3774,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -3882,15 +3803,15 @@ fi + # AC_CACHE_VAL + case "x$ac_cv_prog_cc_c89" in + x) +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ;; ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; + xno) +- { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +-$as_echo "unsupported" >&6; } ;; ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" +- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + esac + + +@@ -3911,8 +3832,8 @@ am__doit: + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +-$as_echo_n "checking for style of include used by $am_make... " >&6; } ++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 ++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } + am__include="#" + am__quote= + _am_result=none +@@ -3939,8 +3860,8 @@ if test "$am__include" = "#"; then + fi + + +-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +-$as_echo "$_am_result" >&6; } ++{ echo "$as_me:$LINENO: result: $_am_result" >&5 ++echo "${ECHO_T}$_am_result" >&6; } + rm -f confinc confmf + + # Check whether --enable-dependency-tracking was given. +@@ -3952,9 +3873,7 @@ if test "x$enable_dependency_tracking" ! am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi @@ -15735,15 +6876,24 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure AMDEP_TRUE= AMDEP_FALSE='#' else -@@ -3964,7 +4026,6 @@ +@@ -3964,13 +3883,12 @@ fi - depcc="$CC" am_compiler_list= - { $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -@@ -4006,7 +4067,9 @@ +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-$as_echo_n "checking dependency style of $depcc... " >&6; } ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -4006,7 +3924,9 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c @@ -15754,7 +6904,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -@@ -4030,13 +4093,19 @@ +@@ -4030,13 +3950,19 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && @@ -15777,8 +6927,14 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure am_cv_CC_dependencies_compiler_type=$depmode break fi -@@ -4054,9 +4123,7 @@ - $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +@@ -4050,13 +3976,11 @@ else + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - @@ -15788,15 +6944,10 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= -@@ -4093,6 +4160,20 @@ +@@ -4092,16 +4016,24 @@ fi -+ -+ -+ -+ -+ + if test "$enable_static" = yes; then + ENABLE_STATIC_TRUE= + ENABLE_STATIC_FALSE='#' @@ -15805,11 +6956,405 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + ENABLE_STATIC_FALSE= +fi + -+ + if test -n "$ac_tool_prefix"; then for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl do -@@ -4614,7 +4695,9 @@ + # 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +@@ -4114,7 +4046,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -4125,11 +4057,11 @@ fi + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +-$as_echo "$CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $CXX" >&5 ++echo "${ECHO_T}$CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -4142,10 +4074,10 @@ if test -z "$CXX"; then + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +@@ -4158,7 +4090,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -4169,11 +4101,11 @@ fi + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-$as_echo "$ac_ct_CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++echo "${ECHO_T}$ac_ct_CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -4185,8 +4117,12 @@ done + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + CXX=$ac_ct_CXX +@@ -4215,10 +4151,10 @@ if test -z "$CXX"; then + 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +@@ -4231,7 +4167,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -4242,11 +4178,11 @@ fi + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +-$as_echo "$CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $CXX" >&5 ++echo "${ECHO_T}$CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -4259,10 +4195,10 @@ if test -z "$CXX"; then + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +@@ -4275,7 +4211,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -4286,11 +4222,11 @@ fi + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +-$as_echo "$ac_ct_CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 ++echo "${ECHO_T}$ac_ct_CXX" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -4302,8 +4238,12 @@ done + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + CXX=$ac_ct_CXX +@@ -4313,47 +4253,43 @@ fi + fi + fi + # Provide some information about the compiler. +-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +-set X $ac_compile +-ac_compiler=$2 ++echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` + { (ac_try="$ac_compiler --version >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { (ac_try="$ac_compiler -v >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { (ac_try="$ac_compiler -V >&5" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } + if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -4379,21 +4315,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +@@ -4403,19 +4338,15 @@ rm -f core conftest.err conftest.$ac_obj + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +-if test $ac_compiler_gnu = yes; then +- GXX=yes +-else +- GXX= +-fi ++{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } ++GXX=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS +-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +-$as_echo_n "checking whether $CXX accepts -g... " >&6; } ++{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 ++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } + if test "${ac_cv_prog_cxx_g+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes +@@ -4442,21 +4373,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + CXXFLAGS="" +@@ -4481,21 +4411,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +@@ -4521,21 +4450,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -4550,8 +4478,8 @@ fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +-$as_echo "$ac_cv_prog_cxx_g" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS + elif test $ac_cv_prog_cxx_g = yes; then +@@ -4575,10 +4503,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + depcc="$CXX" am_compiler_list= + +-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +-$as_echo_n "checking dependency style of $depcc... " >&6; } ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } + if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up +@@ -4614,7 +4542,9 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c @@ -15820,7 +7365,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -@@ -4638,13 +4721,19 @@ +@@ -4638,13 +4568,19 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && @@ -15843,8 +7388,14 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure am_cv_CXX_dependencies_compiler_type=$depmode break fi -@@ -4662,9 +4751,7 @@ - $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +@@ -4658,13 +4594,11 @@ else + fi + + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } ++{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - @@ -15854,7 +7405,31 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then am__fastdepCXX_TRUE= -@@ -4718,9 +4805,7 @@ +@@ -4697,30 +4631,27 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + CXX= fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -15865,7 +7440,31 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_CXX_TRUE= HAVE_CXX_FALSE='#' else -@@ -4773,9 +4858,7 @@ +@@ -4752,30 +4683,27 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + OBJC=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + OBJC=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -15876,2693 +7475,1065 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_OBJC_TRUE= HAVE_OBJC_FALSE='#' else -@@ -4804,114 +4887,417 @@ +@@ -4793,13 +4721,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test "$os_win32" = "yes"; then + if test x$enable_static = xyes -o x$enable_static = x; then +- { $as_echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 +-$as_echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} ++ { echo "$as_me:$LINENO: WARNING: Disabling static library build, must build as DLL on Windows." >&5 ++echo "$as_me: WARNING: Disabling static library build, must build as DLL on Windows." >&2;} + enable_static=no + fi + if test x$enable_shared = xno; then +- { $as_echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 +-$as_echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} ++ { echo "$as_me:$LINENO: WARNING: Enabling shared library build, must build as DLL on Windows." >&5 ++echo "$as_me: WARNING: Enabling shared library build, must build as DLL on Windows." >&2;} + fi enable_shared=yes fi - -+enable_win32_dll=yes -+ -+case $host in -+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -+set dummy ${ac_tool_prefix}as; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_AS+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$AS"; then -+ ac_cv_prog_AS="$AS" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_AS="${ac_tool_prefix}as" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+AS=$ac_cv_prog_AS -+if test -n "$AS"; then -+ { $as_echo "$as_me:$LINENO: result: $AS" >&5 -+$as_echo "$AS" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ - -+fi -+if test -z "$ac_cv_prog_AS"; then -+ ac_ct_AS=$AS -+ # Extract the first word of "as", so it can be a program name with args. -+set dummy as; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_AS"; then -+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_AS="as" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --# Check whether --enable-shared was given. --if test "${enable_shared+set}" = set; then -- enableval=$enable_shared; p=${PACKAGE-default} -- case $enableval in -- yes) enable_shared=yes ;; -- no) enable_shared=no ;; -- *) -- enable_shared=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_shared=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac -+fi -+fi -+ac_ct_AS=$ac_cv_prog_ac_ct_AS -+if test -n "$ac_ct_AS"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -+$as_echo "$ac_ct_AS" >&6; } - else -- enable_shared=yes -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } +@@ -4854,10 +4782,10 @@ else fi -+ if test "x$ac_ct_AS" = x; then -+ AS="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ AS=$ac_ct_AS -+ fi -+else -+ AS="$ac_cv_prog_AS" -+fi --# Check whether --enable-fast-install was given. --if test "${enable_fast_install+set}" = set; then -- enableval=$enable_fast_install; p=${PACKAGE-default} -- case $enableval in -- yes) enable_fast_install=yes ;; -- no) enable_fast_install=no ;; -- *) -- enable_fast_install=no -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for pkg in $enableval; do -- IFS="$lt_save_ifs" -- if test "X$pkg" = "X$p"; then -- enable_fast_install=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DLLTOOL+set}" = set; then -+ $as_echo_n "(cached) " >&6 +-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +-$as_echo_n "checking for a sed that does not truncate output... " >&6; } ++{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 ++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } + if test "${lt_cv_path_SED+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- enable_fast_install=yes -+ if test -n "$DLLTOOL"; then -+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+DLLTOOL=$ac_cv_prog_DLLTOOL -+if test -n "$DLLTOOL"; then -+ { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -+$as_echo "$DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_DLLTOOL"; then -+ ac_ct_DLLTOOL=$DLLTOOL -+ # Extract the first word of "dlltool", so it can be a program name with args. -+set dummy dlltool; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DLLTOOL"; then -+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DLLTOOL="dlltool" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -+if test -n "$ac_ct_DLLTOOL"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -+$as_echo "$ac_ct_DLLTOOL" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_DLLTOOL" = x; then -+ DLLTOOL="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DLLTOOL=$ac_ct_DLLTOOL -+ fi -+else -+ DLLTOOL="$ac_cv_prog_DLLTOOL" -+fi -+ -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -+set dummy ${ac_tool_prefix}objdump; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_OBJDUMP+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$OBJDUMP"; then -+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+OBJDUMP=$ac_cv_prog_OBJDUMP -+if test -n "$OBJDUMP"; then -+ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -+$as_echo "$OBJDUMP" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_OBJDUMP"; then -+ ac_ct_OBJDUMP=$OBJDUMP -+ # Extract the first word of "objdump", so it can be a program name with args. -+set dummy objdump; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_OBJDUMP"; then -+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_OBJDUMP="objdump" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -+if test -n "$ac_ct_OBJDUMP"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -+$as_echo "$ac_ct_OBJDUMP" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_OBJDUMP" = x; then -+ OBJDUMP="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ OBJDUMP=$ac_ct_OBJDUMP -+ fi -+else -+ OBJDUMP="$ac_cv_prog_OBJDUMP" - fi + # Loop through the user's path and test for sed and gsed. + # Then use that list of sed's as ones to test for truncation. +@@ -4910,40 +4838,45 @@ fi -+ ;; -+esac -+ -+test -z "$AS" && AS=as -+ -+ -+ -+ -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+ -+ -+ -+ -+ -+test -z "$OBJDUMP" && OBJDUMP=objdump -+ -+ -+ -+ -+ -+ -+ -+case `pwd` in -+ *\ * | *\ *) -+ { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -+esac -+ -+ -+ -+macro_version='2.2.6' -+macro_revision='1.3012' -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ltmain="$ac_aux_dir/ltmain.sh" - - { $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 - $as_echo_n "checking for a sed that does not truncate output... " >&6; } --if test "${lt_cv_path_SED+set}" = set; then -+if test "${ac_cv_path_SED+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- # Loop through the user's path and test for sed and gsed. --# Then use that list of sed's as ones to test for truncation. --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -+ for ac_i in 1 2 3 4 5 6 7; do -+ ac_script="$ac_script$as_nl$ac_script" -+ done -+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed -+ $as_unset ac_script || ac_script= -+ if test -z "$SED"; then -+ ac_path_SED_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for lt_ac_prog in sed gsed; do -+ for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do -- 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 -+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -+# Check for GNU ac_path_SED and select it if it is found. -+ # Check for GNU $ac_path_SED -+case `"$ac_path_SED" --version 2>&1` in -+*GNU*) -+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo '' >> "conftest.nl" -+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_SED_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_SED="$ac_path_SED" -+ ac_path_SED_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_SED_found && break 3 - 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 --# along with /bin/sed that truncates output. --for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -- test ! -f $lt_ac_sed && continue -- cat /dev/null > conftest.in -- lt_ac_count=0 -- echo $ECHO_N "0123456789$ECHO_C" >conftest.in -- # Check for GNU sed and select it if it is found. -- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -- lt_cv_path_SED=$lt_ac_sed -- break -+ if test -z "$ac_cv_path_SED"; then -+ { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} -+ { (exit 1); exit 1; }; } - fi -- while true; do -- cat conftest.in conftest.in >conftest.tmp -- mv conftest.tmp conftest.in -- cp conftest.in conftest.nl -- echo >>conftest.nl -- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -- cmp -s conftest.out conftest.nl || break -- # 10000 chars as input seems more than enough -- test $lt_ac_count -gt 10 && break -- lt_ac_count=`expr $lt_ac_count + 1` -- if test $lt_ac_count -gt $lt_ac_max; then -- lt_ac_max=$lt_ac_count -- lt_cv_path_SED=$lt_ac_sed -- fi -- done --done -+else -+ ac_cv_path_SED=$SED -+fi - - fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 -+$as_echo "$ac_cv_path_SED" >&6; } -+ SED="$ac_cv_path_SED" -+ rm -f conftest.sed -+ -+test -z "$SED" && SED=sed -+Xsed="$SED -e 1s/^X//" -+ -+ -+ -+ -+ -+ -+ -+ - --SED=$lt_cv_path_SED + SED=$lt_cv_path_SED -{ $as_echo "$as_me:$LINENO: result: $SED" >&5 -$as_echo "$SED" >&6; } ++{ echo "$as_me:$LINENO: result: $SED" >&5 ++echo "${ECHO_T}$SED" >&6; } - { $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 - $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -@@ -5047,12 +5433,100 @@ +-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +-$as_echo_n "checking for grep that handles long lines and -e... " >&6; } ++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Extract the first word of "grep ggrep" to use in msg output ++if test -z "$GREP"; then ++set dummy grep ggrep; ac_prog_name=$2 + if test "${ac_cv_path_GREP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test -z "$GREP"; then + ac_path_GREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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_test_x "$ac_path_GREP"; } || continue +-# Check for GNU ac_path_GREP and select it if it is found. ++ 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_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 + *GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; + *) + ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +- $as_echo 'GREP' >> "conftest.nl" ++ echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` +@@ -4958,60 +4891,74 @@ case `"$ac_path_GREP" --version 2>&1` in + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- $ac_path_GREP_found && break 3 +- done ++ ++ $ac_path_GREP_found && break 3 + done + done ++ ++done + IFS=$as_save_IFS +- if test -z "$ac_cv_path_GREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ ++ ++fi ++ ++GREP="$ac_cv_path_GREP" ++if test -z "$GREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +- fi ++fi ++ + else + ac_cv_path_GREP=$GREP + fi + ++ + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +-$as_echo "$ac_cv_path_GREP" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +-$as_echo_n "checking for egrep... " >&6; } ++{ echo "$as_me:$LINENO: checking for egrep" >&5 ++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } + if test "${ac_cv_path_EGREP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else +- if test -z "$EGREP"; then ++ # Extract the first word of "egrep" to use in msg output ++if test -z "$EGREP"; then ++set dummy egrep; ac_prog_name=$2 ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + ac_path_EGREP_found=false +- # Loop through the user's path and test for each of PROGNAME-LIST +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + 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_test_x "$ac_path_EGREP"; } || continue +-# Check for GNU ac_path_EGREP and select it if it is found. ++ 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_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 + *GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; + *) + ac_count=0 +- $as_echo_n 0123456789 >"conftest.in" ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" +- $as_echo 'EGREP' >> "conftest.nl" ++ echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` +@@ -5026,24 +4973,33 @@ case `"$ac_path_EGREP" --version 2>&1` i + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + +- $ac_path_EGREP_found && break 3 +- done ++ ++ $ac_path_EGREP_found && break 3 + done + done ++ ++done + IFS=$as_save_IFS +- if test -z "$ac_cv_path_EGREP"; then +- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ ++ ++fi ++ ++EGREP="$ac_cv_path_EGREP" ++if test -z "$EGREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +- fi ++fi ++ + else + ac_cv_path_EGREP=$EGREP + fi + ++ + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +-$as_echo "$ac_cv_path_EGREP" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -- --# Check whether --with-gnu-ld was given. --if test "${with_gnu_ld+set}" = set; then -- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -+{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5 -+$as_echo_n "checking for fgrep... " >&6; } -+if test "${ac_cv_path_FGREP+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -- with_gnu_ld=no -+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -+ then ac_cv_path_FGREP="$GREP -F" -+ else -+ if test -z "$FGREP"; then -+ ac_path_FGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in fgrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -+# Check for GNU ac_path_FGREP and select it if it is found. -+ # Check for GNU $ac_path_FGREP -+case `"$ac_path_FGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'FGREP' >> "conftest.nl" -+ "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_FGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_FGREP="$ac_path_FGREP" -+ ac_path_FGREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_FGREP_found && break 3 -+ done -+ done -+done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_FGREP"; then -+ { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+else -+ ac_cv_path_FGREP=$FGREP -+fi -+ -+ fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 -+$as_echo "$ac_cv_path_FGREP" >&6; } -+ FGREP="$ac_cv_path_FGREP" -+ -+ -+test -z "$GREP" && GREP=grep -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+# Check whether --with-gnu-ld was given. -+if test "${with_gnu_ld+set}" = set; then -+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -+else -+ with_gnu_ld=no - fi - +@@ -5058,8 +5014,8 @@ fi ac_prog=ld -@@ -5072,9 +5546,9 @@ - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld -- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` -+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; -@@ -5154,33 +5628,15 @@ + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-$as_echo_n "checking for ld used by $CC... " >&6; } ++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -5088,14 +5044,14 @@ $as_echo_n "checking for ld used by $CC. + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 +-$as_echo_n "checking for GNU ld... " >&6; } ++ { echo "$as_me:$LINENO: checking for GNU ld" >&5 ++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-$as_echo_n "checking for non-GNU ld... " >&6; } ++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + fi + if test "${lt_cv_path_LD+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -5125,19 +5081,19 @@ fi + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 +-$as_echo "$LD" >&6; } ++ { echo "$as_me:$LINENO: result: $LD" >&5 ++echo "${ECHO_T}$LD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 ++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } + if test "${lt_cv_prog_gnu_ld+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 </dev/null` in +@@ -5149,20 +5105,20 @@ case `$LD -v 2>&1 </dev/null` in + ;; + esac + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +-$as_echo "$lt_cv_prog_gnu_ld" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } --if test "${lt_cv_ld_reload_flag+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 ++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } + if test "${lt_cv_ld_reload_flag+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_ld_reload_flag='-r' --fi ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_ld_reload_flag='-r' + fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } --reload_flag=$lt_cv_ld_reload_flag --case $reload_flag in --"" | " "*) ;; --*) reload_flag=" $reload_flag" ;; --esac --reload_cmds='$LD$reload_flag -o $output$reload_objs' --case $host_os in -- darwin*) -- if test "$GCC" = yes; then -- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -- else -- reload_cmds='$LD$reload_flag -o $output$reload_objs' -- fi -- ;; --esac ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 ++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } + reload_flag=$lt_cv_ld_reload_flag + case $reload_flag in + "" | " "*) ;; +@@ -5179,10 +5135,10 @@ case $host_os in + ;; + esac -{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -$as_echo_n "checking for BSD-compatible nm... " >&6; } -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 -+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } ++{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 ++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then - $as_echo_n "(cached) " >&6 +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -5225,12 +5681,149 @@ - done - IFS="$lt_save_ifs" - done -- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -+ : ${lt_cv_path_NM=no} + if test -n "$NM"; then + # Let the user override the test. +@@ -5228,25 +5184,25 @@ else + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi - { $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 - $as_echo "$lt_cv_path_NM" >&6; } --NM="$lt_cv_path_NM" -+if test "$lt_cv_path_NM" != "no"; then -+ NM="$lt_cv_path_NM" -+else -+ # Didn't find any BSD compatible name lister, look for dumpbin. -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in "dumpbin -symbols" "link -dump -symbols" -+ 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 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DUMPBIN+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$DUMPBIN"; then -+ ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+DUMPBIN=$ac_cv_prog_DUMPBIN -+if test -n "$DUMPBIN"; then -+ { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5 -+$as_echo "$DUMPBIN" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$DUMPBIN" && break -+ done -+fi -+if test -z "$DUMPBIN"; then -+ ac_ct_DUMPBIN=$DUMPBIN -+ for ac_prog in "dumpbin -symbols" "link -dump -symbols" -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_DUMPBIN"; then -+ ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN -+if test -n "$ac_ct_DUMPBIN"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 -+$as_echo "$ac_ct_DUMPBIN" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_DUMPBIN" && break -+done -+ -+ if test "x$ac_ct_DUMPBIN" = x; then -+ DUMPBIN=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ DUMPBIN=$ac_ct_DUMPBIN -+ fi -+fi -+ -+ -+ if test "$DUMPBIN" != ":"; then -+ NM="$DUMPBIN" -+ fi -+fi -+test -z "$NM" && NM=nm -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 -+$as_echo_n "checking the name lister ($NM) interface... " >&6; } -+if test "${lt_cv_nm_interface+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_nm_interface="BSD nm" -+ echo "int some_variable = 0;" > conftest.$ac_ext -+ (eval echo "\"\$as_me:5812: $ac_compile\"" >&5) -+ (eval "$ac_compile" 2>conftest.err) -+ cat conftest.err >&5 -+ (eval echo "\"\$as_me:5815: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) -+ cat conftest.err >&5 -+ (eval echo "\"\$as_me:5818: output\"" >&5) -+ cat conftest.out >&5 -+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then -+ lt_cv_nm_interface="MS dumpbin" -+ fi -+ rm -f conftest* -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 -+$as_echo "$lt_cv_nm_interface" >&6; } +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +-$as_echo "$lt_cv_path_NM" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 ++echo "${ECHO_T}$lt_cv_path_NM" >&6; } + NM="$lt_cv_path_NM" - { $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 - $as_echo_n "checking whether ln -s works... " >&6; } -@@ -5243,6 +5836,331 @@ - $as_echo "no, using $LN_S" >&6; } +-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +-$as_echo_n "checking whether ln -s works... " >&6; } ++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +-$as_echo "no, using $LN_S" >&6; } ++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++echo "${ECHO_T}no, using $LN_S" >&6; } fi -+# find the maximum length of command line arguments -+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -+$as_echo_n "checking the maximum length of command line arguments... " >&6; } -+if test "${lt_cv_sys_max_cmd_len+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ i=0 -+ teststring="ABCD" -+ -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; -+ -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; -+ -+ cygwin* | mingw* | cegcc*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ 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` -+ ;; -+ -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; -+ -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ 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 -+ # Make teststring a little bigger before we do anything with it. -+ # a 1K string should be a reasonable start. -+ for i in 1 2 3 4 5 6 7 8 ; do -+ teststring=$teststring$teststring -+ done -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ # 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. -+ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ -+ = "XX$teststring$teststring"; } >/dev/null 2>&1 && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ # Only check the string length outside the loop. -+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` -+ 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 -+ -+fi -+ -+if test -n $lt_cv_sys_max_cmd_len ; then -+ { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -+$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: none" >&5 -+$as_echo "none" >&6; } -+fi -+max_cmd_len=$lt_cv_sys_max_cmd_len -+ -+ -+ -+ -+ -+ -+: ${CP="cp -f"} -+: ${MV="mv -f"} -+: ${RM="rm -f"} -+ -+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 -+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -+# Try some XSI features -+xsi_shell=no -+( _lt_dummy="a/b/c" -+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,, \ -+ && eval 'test $(( 1 + 1 )) -eq 2 \ -+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ -+ && xsi_shell=yes -+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5 -+$as_echo "$xsi_shell" >&6; } -+ -+ -+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 -+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -+lt_shell_append=no -+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ -+ >/dev/null 2>&1 \ -+ && lt_shell_append=yes -+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5 -+$as_echo "$lt_shell_append" >&6; } -+ -+ -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ lt_unset=unset -+else -+ lt_unset=false -+fi -+ -+ -+ -+ -+ -+# test EBCDIC or ASCII -+case `echo X|tr X '\101'` in -+ A) # ASCII based system -+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr -+ lt_SP2NL='tr \040 \012' -+ lt_NL2SP='tr \015\012 \040\040' -+ ;; -+ *) # EBCDIC based system -+ lt_SP2NL='tr \100 \n' -+ lt_NL2SP='tr \r\n \100\100' -+ ;; -+esac -+ -+ -+ -+ -+ -+ -+ -+ -+ -+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -+$as_echo_n "checking for $LD option to reload object files... " >&6; } -+if test "${lt_cv_ld_reload_flag+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ld_reload_flag='-r' -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -+$as_echo "$lt_cv_ld_reload_flag" >&6; } -+reload_flag=$lt_cv_ld_reload_flag -+case $reload_flag in -+"" | " "*) ;; -+*) reload_flag=" $reload_flag" ;; -+esac -+reload_cmds='$LD$reload_flag -o $output$reload_objs' -+case $host_os in -+ darwin*) -+ if test "$GCC" = yes; then -+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -+ else -+ reload_cmds='$LD$reload_flag -o $output$reload_objs' -+ fi -+ ;; -+esac -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -+set dummy ${ac_tool_prefix}objdump; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_OBJDUMP+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$OBJDUMP"; then -+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+OBJDUMP=$ac_cv_prog_OBJDUMP -+if test -n "$OBJDUMP"; then -+ { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -+$as_echo "$OBJDUMP" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_OBJDUMP"; then -+ ac_ct_OBJDUMP=$OBJDUMP -+ # Extract the first word of "objdump", so it can be a program name with args. -+set dummy objdump; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_OBJDUMP"; then -+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_OBJDUMP="objdump" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -+if test -n "$ac_ct_OBJDUMP"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -+$as_echo "$ac_ct_OBJDUMP" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_OBJDUMP" = x; then -+ OBJDUMP="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ OBJDUMP=$ac_ct_OBJDUMP -+ fi -+else -+ OBJDUMP="$ac_cv_prog_OBJDUMP" -+fi -+ -+test -z "$OBJDUMP" && OBJDUMP=objdump -+ -+ -+ -+ -+ -+ - { $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 - $as_echo_n "checking how to recognize dependent libraries... " >&6; } +-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +-$as_echo_n "checking how to recognize dependent libraries... " >&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 -@@ -5296,12 +6214,18 @@ - fi - ;; - -+cegcc) -+ # use the weaker test based on 'objdump'. See mingw*. -+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ ;; -+ - darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - - freebsd* | dragonfly*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. -@@ -5358,8 +6282,8 @@ +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_file_magic_cmd='$MAGIC_CMD' + lt_cv_file_magic_test_file= +@@ -5358,7 +5314,7 @@ linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then +netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + 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 - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' -@@ -5372,12 +6296,12 @@ - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - --nto-qnx*) -- lt_cv_deplibs_check_method=unknown -+*nto* | *qnx*) -+ lt_cv_deplibs_check_method=pass_all - ;; - - openbsd*) -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -@@ -5396,6 +6320,10 @@ - lt_cv_deplibs_check_method=pass_all - ;; - -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ - sysv4 | sysv4.3*) - case $host_vendor in - motorola) -@@ -5423,7 +6351,7 @@ - esac - ;; - --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+tpf*) - lt_cv_deplibs_check_method=pass_all - ;; +@@ -5429,8 +5385,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* esac -@@ -5438,247 +6366,24 @@ - - --# If no C compiler was specified, use CC. --LTCC=${LTCC-"$CC"} - --# If no C compiler flags were specified, use CFLAGS. --LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - --# Allow CC to be a program name with arguments. --compiler=$CC - - --# Check whether --enable-libtool-lock was given. --if test "${enable_libtool_lock+set}" = set; then -- enableval=$enable_libtool_lock; --fi - --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - --# Some flags need to be propagated to the compiler or linker for good --# libtool support. --case $host in --ia64-*-hpux*) -- # Find out which ABI we are using. -- echo 'int i;' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +-$as_echo "$lt_cv_deplibs_check_method" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 ++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } + file_magic_cmd=$lt_cv_file_magic_cmd + deplibs_check_method=$lt_cv_deplibs_check_method + test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -5464,7 +5420,7 @@ ia64-*-hpux*) + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *ELF-32*) -- HPUX_IA64_MODE="32" -- ;; -- *ELF-64*) -- HPUX_IA64_MODE="64" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; --*-*-irix6*) -- # Find out which ABI we are using. ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) +@@ -5479,11 +5435,11 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. - echo '#line 5482 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? ++ echo '#line 5438 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- if test "$lt_cv_prog_gnu_ld" = yes; then -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -melf32bsmip" -- ;; -- *N32*) -- LD="${LD-ld} -melf32bmipn32" -- ;; -- *64-bit*) -- LD="${LD-ld} -melf64bmip" -- ;; -- esac -- else -- case `/usr/bin/file conftest.$ac_objext` in -- *32-bit*) -- LD="${LD-ld} -32" -- ;; -- *N32*) -- LD="${LD-ld} -n32" -- ;; -- *64-bit*) -- LD="${LD-ld} -64" -- ;; -- esac -- fi -- fi -- rm -rf conftest* -- ;; -- --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 -- (eval $ac_compile) 2>&5 -- ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in +@@ -5521,7 +5477,7 @@ s390*-*linux*|sparc*-*linux*) + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; 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" -- ;; -- ppc64-*linux*|powerpc64-*linux*) -- LD="${LD-ld} -m elf32ppclinux" -- ;; -- s390x-*linux*) -- LD="${LD-ld} -m elf_s390" -- ;; -- sparc64-*linux*) -- LD="${LD-ld} -m elf32_sparc" -- ;; -- esac -- ;; -- *64-bit*) ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *32-bit*) +@@ -5544,7 +5500,6 @@ s390*-*linux*|sparc*-*linux*) + esac + ;; + *64-bit*) - libsuff=64 -- 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" -- ;; -- ppc*-*linux*|powerpc*-*linux*) -- LD="${LD-ld} -m elf64ppc" -- ;; -- s390*-*linux*) -- LD="${LD-ld} -m elf64_s390" -- ;; -- sparc*-*linux*) -- LD="${LD-ld} -m elf64_sparc" -- ;; -- esac -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- --*-*-sco3.2v5*) -- # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -belf" + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" +@@ -5572,10 +5527,10 @@ s390*-*linux*|sparc*-*linux*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } --if test "${lt_cv_cc_needs_belf+set}" = set; then ++ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 ++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } + if test "${lt_cv_cc_needs_belf+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +@@ -5604,30 +5559,26 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 ++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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- lt_cv_cc_needs_belf=yes --else ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + lt_cv_cc_needs_belf=yes + else - $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- lt_cv_cc_needs_belf=no --fi ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_cc_needs_belf=no + fi -rm -rf conftest.dSYM --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' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --fi + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +@@ -5637,8 +5588,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -- fi -- ;; --sparc*-*solaris*) -- # Find out which ABI we are using. -- echo 'int i;' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? ++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 ++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" +@@ -5650,7 +5601,7 @@ sparc*-*solaris*) + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.o` in -- *64-bit*) -- case $lt_cv_prog_gnu_ld in -- yes*) LD="${LD-ld} -m elf64_sparc" ;; -- *) -- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -- LD="${LD-ld} -64" -- fi -- ;; -- esac -- ;; -- esac -- fi -- rm -rf conftest* -- ;; - --*-*-cygwin* | *-*-mingw* | *-*-pw32*) -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. --set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ar; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DLLTOOL+set}" = set; then -+if test "${ac_cv_prog_AR+set}" = set; then - $as_echo_n "(cached) " >&6 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) +@@ -5672,10 +5623,10 @@ sparc*-*solaris*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. + set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_DLLTOOL+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$DLLTOOL"; then -- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -+ if test -n "$AR"; then -+ ac_cv_prog_AR="$AR" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5687,7 +6392,7 @@ - test -z "$as_dir" && as_dir=. + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +@@ -5688,7 +5639,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" -+ ac_cv_prog_AR="${ac_tool_prefix}ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5697,10 +6402,10 @@ - + done +@@ -5699,11 +5650,11 @@ fi fi - fi --DLLTOOL=$ac_cv_prog_DLLTOOL --if test -n "$DLLTOOL"; then + DLLTOOL=$ac_cv_prog_DLLTOOL + if test -n "$DLLTOOL"; then - { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -+AR=$ac_cv_prog_AR -+if test -n "$AR"; then -+ { $as_echo "$as_me:$LINENO: result: $AR" >&5 -+$as_echo "$AR" >&6; } ++ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 ++echo "${ECHO_T}$DLLTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } -@@ -5708,17 +6413,17 @@ - - +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi --if test -z "$ac_cv_prog_DLLTOOL"; then -- ac_ct_DLLTOOL=$DLLTOOL -- # Extract the first word of "dlltool", so it can be a program name with args. --set dummy dlltool; ac_word=$2 -+if test -z "$ac_cv_prog_AR"; then -+ ac_ct_AR=$AR -+ # Extract the first word of "ar", so it can be a program name with args. -+set dummy ar; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then -+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - $as_echo_n "(cached) " >&6 + + +@@ -5712,10 +5663,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. + set dummy dlltool; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$ac_ct_DLLTOOL"; then -- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -+ if test -n "$ac_ct_AR"; then -+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5727,7 +6432,7 @@ - test -z "$as_dir" && as_dir=. + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +@@ -5728,7 +5679,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" -+ ac_cv_prog_ac_ct_AR="ar" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_DLLTOOL="dlltool" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5737,17 +6442,17 @@ - + done +@@ -5739,11 +5690,11 @@ fi fi - fi --ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL --if test -n "$ac_ct_DLLTOOL"; then + ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL + if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } -+ac_ct_AR=$ac_cv_prog_ac_ct_AR -+if test -n "$ac_ct_AR"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -+$as_echo "$ac_ct_AR" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 ++echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi -- if test "x$ac_ct_DLLTOOL" = x; then -- DLLTOOL="false" -+ if test "x$ac_ct_AR" = x; then -+ AR="false" + if test "x$ac_ct_DLLTOOL" = x; then +@@ -5751,8 +5702,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -@@ -5755,22 +6460,35 @@ - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac -- DLLTOOL=$ac_ct_DLLTOOL -+ AR=$ac_ct_AR - fi + DLLTOOL=$ac_ct_DLLTOOL +@@ -5764,10 +5719,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. + set dummy ${ac_tool_prefix}as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_AS+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- DLLTOOL="$ac_cv_prog_DLLTOOL" -+ AR="$ac_cv_prog_AR" - fi - -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. --set dummy ${ac_tool_prefix}as; ac_word=$2 -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -+set dummy ${ac_tool_prefix}strip; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AS+set}" = set; then -+if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- if test -n "$AS"; then -- ac_cv_prog_AS="$AS" # Let the user override the test. -+ if test -n "$STRIP"; then -+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5779,7 +6497,7 @@ - test -z "$as_dir" && as_dir=. + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +@@ -5780,7 +5735,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" -+ ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_AS="${ac_tool_prefix}as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5789,10 +6507,10 @@ - + done +@@ -5791,11 +5746,11 @@ fi fi - fi --AS=$ac_cv_prog_AS --if test -n "$AS"; then + AS=$ac_cv_prog_AS + if test -n "$AS"; then - { $as_echo "$as_me:$LINENO: result: $AS" >&5 -$as_echo "$AS" >&6; } -+STRIP=$ac_cv_prog_STRIP -+if test -n "$STRIP"; then -+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -+$as_echo "$STRIP" >&6; } ++ { echo "$as_me:$LINENO: result: $AS" >&5 ++echo "${ECHO_T}$AS" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } -@@ -5800,17 +6518,17 @@ - - +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi --if test -z "$ac_cv_prog_AS"; then -- ac_ct_AS=$AS -- # Extract the first word of "as", so it can be a program name with args. --set dummy as; ac_word=$2 -+if test -z "$ac_cv_prog_STRIP"; then -+ ac_ct_STRIP=$STRIP -+ # Extract the first word of "strip", so it can be a program name with args. -+set dummy strip; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_AS+set}" = set; then -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 + + +@@ -5804,10 +5759,10 @@ if test -z "$ac_cv_prog_AS"; then + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. + set dummy as; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_AS+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$ac_ct_AS"; then -- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -+ if test -n "$ac_ct_STRIP"; then -+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5819,7 +6537,7 @@ - test -z "$as_dir" && as_dir=. + if test -n "$ac_ct_AS"; then + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. +@@ -5820,7 +5775,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" -+ ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_AS="as" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5829,17 +6547,17 @@ - + done +@@ -5831,11 +5786,11 @@ fi fi - fi --ac_ct_AS=$ac_cv_prog_ac_ct_AS --if test -n "$ac_ct_AS"; then + ac_ct_AS=$ac_cv_prog_ac_ct_AS + if test -n "$ac_ct_AS"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -$as_echo "$ac_ct_AS" >&6; } -+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -+if test -n "$ac_ct_STRIP"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+$as_echo "$ac_ct_STRIP" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 ++echo "${ECHO_T}$ac_ct_AS" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi -- if test "x$ac_ct_AS" = x; then -- AS="false" -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" + if test "x$ac_ct_AS" = x; then +@@ -5843,8 +5798,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -@@ -5847,22 +6565,29 @@ - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac -- AS=$ac_ct_AS -+ STRIP=$ac_ct_STRIP - fi + AS=$ac_ct_AS +@@ -5856,10 +5815,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. + set dummy ${ac_tool_prefix}objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_OBJDUMP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- AS="$ac_cv_prog_AS" -+ STRIP="$ac_cv_prog_STRIP" - fi - -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. --set dummy ${ac_tool_prefix}objdump; ac_word=$2 -+test -z "$STRIP" && STRIP=: -+ -+ -+ -+ -+ -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ranlib; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_OBJDUMP+set}" = set; then -+if test "${ac_cv_prog_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- if test -n "$OBJDUMP"; then -- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5871,7 +6596,7 @@ - test -z "$as_dir" && as_dir=. + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +@@ -5872,7 +5831,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" -+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5881,10 +6606,10 @@ - + done +@@ -5883,11 +5842,11 @@ fi fi - fi --OBJDUMP=$ac_cv_prog_OBJDUMP --if test -n "$OBJDUMP"; then + OBJDUMP=$ac_cv_prog_OBJDUMP + if test -n "$OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -+RANLIB=$ac_cv_prog_RANLIB -+if test -n "$RANLIB"; then -+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } ++ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 ++echo "${ECHO_T}$OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } -@@ -5892,17 +6617,17 @@ - - +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi --if test -z "$ac_cv_prog_OBJDUMP"; then -- ac_ct_OBJDUMP=$OBJDUMP -- # Extract the first word of "objdump", so it can be a program name with args. --set dummy objdump; ac_word=$2 -+if test -z "$ac_cv_prog_RANLIB"; then -+ ac_ct_RANLIB=$RANLIB -+ # Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then -+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 + + +@@ -5896,10 +5855,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. + set dummy objdump; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$ac_ct_OBJDUMP"; then -- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -+ if test -n "$ac_ct_RANLIB"; then -+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -5911,7 +6636,7 @@ - test -z "$as_dir" && as_dir=. + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +@@ -5912,7 +5871,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" -+ ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_OBJDUMP="objdump" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -5921,17 +6646,17 @@ - + done +@@ -5923,11 +5882,11 @@ fi fi - fi --ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP --if test -n "$ac_ct_OBJDUMP"; then + ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP + if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -+if test -n "$ac_ct_RANLIB"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 ++echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi -- if test "x$ac_ct_OBJDUMP" = x; then -- OBJDUMP="false" -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" + if test "x$ac_ct_OBJDUMP" = x; then +@@ -5935,8 +5894,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -@@ -5939,435 +6664,309 @@ - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac -- OBJDUMP=$ac_ct_OBJDUMP -+ RANLIB=$ac_ct_RANLIB - fi - else -- OBJDUMP="$ac_cv_prog_OBJDUMP" -+ RANLIB="$ac_cv_prog_RANLIB" - fi - -- ;; -+test -z "$RANLIB" && RANLIB=: - --esac - --need_locks="$enable_libtool_lock" - - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu + OBJDUMP=$ac_ct_OBJDUMP +@@ -5957,15 +5920,15 @@ ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } --# On Suns, sometimes $CPP names a directory. --if test -n "$CPP" && test -d "$CPP"; then -- CPP= --fi --if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- # Double quotes because CPP needs to be expanded -- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -- do -- ac_preproc_ok=false --for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- # Broken: fails on valid input. --continue -+ -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= -+ -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= fi - --rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac + if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" +@@ -5997,21 +5960,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : + else - $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 -- # Passes both tests. --ac_preproc_ok=: --break --fi + # Broken: fails on valid input. +@@ -6035,14 +5997,13 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err +@@ -6050,7 +6011,7 @@ $as_echo "$ac_try_echo") >&5 + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 --rm -f conftest.err conftest.$ac_ext - --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- break --fi - -- done -- ac_cv_prog_CPP=$CPP - --fi -- CPP=$ac_cv_prog_CPP --else -- ac_cv_prog_CPP=$CPP --fi + # Passes both tests. +@@ -6075,8 +6036,8 @@ fi + else + ac_cv_prog_CPP=$CPP + fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -$as_echo "$CPP" >&6; } --ac_preproc_ok=false --for ac_c_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac ++{ echo "$as_me:$LINENO: result: $CPP" >&5 ++echo "${ECHO_T}$CPP" >&6; } + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes + do +@@ -6104,21 +6065,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : + else - $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 -- # Broken: fails on valid input. --continue --fi - --rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac + # Broken: fails on valid input. +@@ -6142,14 +6102,13 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err +@@ -6157,7 +6116,7 @@ $as_echo "$ac_try_echo") >&5 + # Broken: success on invalid input. + continue + else - $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 -- # Passes both tests. --ac_preproc_ok=: --break --fi - --rm -f conftest.err conftest.$ac_ext - --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : --else + # Passes both tests. +@@ -6173,13 +6132,11 @@ rm -f conftest.err conftest.$ac_ext + if $ac_preproc_ok; then + : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 ++ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check + See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} ++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check + See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } --fi ++ { (exit 1); exit 1; }; } + fi --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_ext=c +@@ -6189,10 +6146,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA + ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } --if test "${ac_cv_header_stdc+set}" = set; then -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - $as_echo_n "(cached) " >&6 ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } + if test "${ac_cv_header_stdc+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> --#include <stdarg.h> --#include <string.h> --#include <float.h> - --int --main () --{ -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+# Character class describing NM global symbol codes. -+symcode='[BCDEGRST]' -+ -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -+ -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[BCDT]' -+ ;; -+cygwin* | mingw* | pw32* | cegcc*) -+ symcode='[ABCDGISTW]' -+ ;; -+hpux*) -+ if test "$host_cpu" = ia64; then -+ symcode='[ABCDEGRST]' -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[BCDEGRST]' -+ ;; -+osf*) -+ symcode='[BCDEGQRST]' -+ ;; -+solaris*) -+ symcode='[BDRT]' -+ ;; -+sco3.2v5*) -+ symcode='[DT]' -+ ;; -+sysv4.2uw2*) -+ symcode='[DT]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[ABDT]' -+ ;; -+sysv4) -+ symcode='[DFNSTU]' -+ ;; - esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_header_stdc=no --fi -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[ABCDGIRSTW]' ;; -+esac - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+# Transform an extracted symbol line into a proper C declaration. -+# Some systems (esp. on ia64) link data and code symbols differently, -+# so use this general approach. -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <string.h> -+# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" - --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi --rm -f conftest* -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac - --fi -+# Try without a prefix underscore, then with it. -+for ac_symprfx in "" "_"; do - --if test $ac_cv_header_stdc = yes; then -- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <stdlib.h> -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" - --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : --else -- ac_cv_header_stdc=no --fi --rm -f conftest* -+ # Write the raw and C identifiers. -+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ # Fake it for dumpbin and say T for any non-static function -+ # and D for any global variable. -+ # Also find C++ and __fastcall symbols from MSVC++, -+ # which start with @ or ?. -+ lt_cv_sys_global_symbol_pipe="$AWK '"\ -+" {last_section=section; section=\$ 3};"\ -+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -+" \$ 0!~/External *\|/{next};"\ -+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -+" {if(hide[section]) next};"\ -+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -+" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -+" ' prfx=^$ac_symprfx" -+ else -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -+ fi - --fi -+ # Check to see that the pipe works correctly. -+ pipe_works=no - --if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -- : --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ctype.h> --#include <stdlib.h> --#if ((' ' & 0x0FF) == 0x020) --# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) --#else --# define ISLOWER(c) \ -- (('a' <= (c) && (c) <= 'i') \ -- || ('j' <= (c) && (c) <= 'r') \ -- || ('s' <= (c) && (c) <= 'z')) --# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+ rm -f conftest* -+ cat > conftest.$ac_ext <<_LT_EOF -+#ifdef __cplusplus -+extern "C" { - #endif -- --#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int --main () --{ -- int i; -- for (i = 0; i < 256; i++) -- if (XOR (islower (i), ISLOWER (i)) -- || toupper (i) != TOUPPER (i)) -- return 2; -- return 0; -+char nm_test_var; -+void nm_test_func(void); -+void nm_test_func(void){} -+#ifdef __cplusplus - } --_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>&5 -+#endif -+int main(){nm_test_var='a';nm_test_func();return(0);} -+_LT_EOF -+ -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_try") 2>&5 -+ (exit $ac_status); }; then -+ # Now try to grab the symbols. -+ nlist=conftest.nm -+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 -+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- $as_echo "$as_me: program exited with status $ac_status" >&5 --$as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ (exit $ac_status); } && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi - --( exit $ac_status ) --ac_cv_header_stdc=no --fi --rm -rf conftest.dSYM --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -+ # Make sure that we snagged all the symbols we need. -+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then -+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then -+ cat <<_LT_EOF > conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+_LT_EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' -+ -+ cat <<_LT_EOF >> conftest.$ac_ext -+ -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ void *address; -+} -+lt__PROGRAM__LTX_preloaded_symbols[] = -+{ -+ { "@PROGRAM@", (void *) 0 }, -+_LT_EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext -+ cat <<\_LT_EOF >> conftest.$ac_ext -+ {0, (void *) 0} -+}; -+ -+/* This works around a problem in FreeBSD linker */ -+#ifdef FREEBSD_WORKAROUND -+static const void *lt_preloaded_setup() { -+ return lt__PROGRAM__LTX_preloaded_symbols; -+} -+#endif - -+#ifdef __cplusplus -+} -+#endif -+_LT_EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext}; then -+ pipe_works=yes -+ fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" -+ else -+ echo "cannot find nm_test_func in $nlist" >&5 -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&5 -+ fi -+ else -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 -+ fi -+ else -+ echo "$progname: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -rf conftest* conftst* -+ -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done - - fi -+ -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ { $as_echo "$as_me:$LINENO: result: failed" >&5 -+$as_echo "failed" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: ok" >&5 -+$as_echo "ok" >&6; } - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --$as_echo "$ac_cv_header_stdc" >&6; } --if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF - --fi - --# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - -@@ -6377,34 +6976,175 @@ - - - --for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+# Check whether --enable-libtool-lock was given. -+if test "${enable_libtool_lock+set}" = set; then -+ enableval=$enable_libtool_lock; -+fi -+ -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '#line 7021 "configure"' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* -+ ;; -+ -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|s390*-*tpf*|sparc*-*linux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; 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" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *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" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*|s390*-*tpf*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -+$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -+if test "${lt_cv_cc_needs_belf+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_includes_default - --#include <$ac_header> -+int -+main () -+{ -+ -+ ; -+ return 0; -+} - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in +@@ -6219,21 +6176,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+ (eval "$ac_link") 2>conftest.er1 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 -@@ -6413,439 +7153,167 @@ + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- eval "$as_ac_Header=yes" -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ lt_cv_cc_needs_belf=yes + } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -- eval "$as_ac_Header=no" -+ lt_cv_cc_needs_belf=no + ac_cv_header_stdc=no +@@ -6325,40 +6281,37 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-$as_echo "$ac_cv_header_stdc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -6380,11 +6333,11 @@ fi + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -6402,21 +6355,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +@@ -6424,15 +6376,12 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -18570,186 +8541,135 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -+rm -rf conftest.dSYM -+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' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -+$as_echo "$lt_cv_cc_needs_belf" >&6; } -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+esac +@@ -6443,21 +6392,20 @@ done --done -- -+need_locks="$enable_libtool_lock" - - --for ac_header in dlfcn.h --do + for ac_header in dlfcn.h + do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ case $host_os in -+ rhapsody* | darwin*) -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then - $as_echo_n "(cached) " >&6 --fi ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } else -- # Is the header compilable? + # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6473,33 +6421,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes -+ if test -n "$DSYMUTIL"; then -+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 -- ac_header_compiler=no + ac_header_compiler=no fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -6513,52 +6460,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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:$LINENO: \$? = $ac_status" >&5 + (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 - $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -- --rm -f conftest.err conftest.$ac_ext + + rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 @@ -18762,12594 +8682,1507 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## --------------------------------------------------------------------- ## --## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## --## --------------------------------------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -6567,24 +6513,21 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -+DSYMUTIL=$ac_cv_prog_DSYMUTIL -+if test -n "$DSYMUTIL"; then -+ { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -+$as_echo "$DSYMUTIL" >&6; } ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- eval "$as_ac_Header=\$ac_header_preproc" -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } + eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } --fi + fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF fi -- --done -- -- -- --if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +@@ -6601,11 +6544,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } --if test -z "$CXXCPP"; then -- if test "${ac_cv_prog_CXXCPP+set}" = set; then -+if test -z "$ac_cv_prog_DSYMUTIL"; then -+ ac_ct_DSYMUTIL=$DSYMUTIL -+ # Extract the first word of "dsymutil", so it can be a program name with args. -+set dummy dsymutil; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then - $as_echo_n "(cached) " >&6 ++{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 ++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- # Double quotes because CXXCPP needs to be expanded -- for CXXCPP in "$CXX -E" "/lib/cpp" -- do -- ac_preproc_ok=false --for ac_cxx_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi -- --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -+ if test -n "$ac_ct_DSYMUTIL"; then -+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi -- --rm -f conftest.err conftest.$ac_ext -- -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi - done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- break --fi -- -- done -- ac_cv_prog_CXXCPP=$CXXCPP -+done -+IFS=$as_save_IFS - - fi -- CXXCPP=$ac_cv_prog_CXXCPP --else -- ac_cv_prog_CXXCPP=$CXXCPP - fi --{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 --$as_echo "$CXXCPP" >&6; } --ac_preproc_ok=false --for ac_cxx_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- : -+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -+if test -n "$ac_ct_DSYMUTIL"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -+$as_echo "$ac_ct_DSYMUTIL" >&6; } - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+ if test "x$ac_ct_DSYMUTIL" = x; then -+ DSYMUTIL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" +@@ -6637,21 +6580,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : + else - $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi -- --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : -+ DSYMUTIL=$ac_ct_DSYMUTIL -+ fi ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -6675,14 +6617,13 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err +@@ -6690,7 +6631,7 @@ $as_echo "$ac_try_echo") >&5 + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -6715,8 +6656,8 @@ fi + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 +-$as_echo "$CXXCPP" >&6; } ++{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 ++echo "${ECHO_T}$CXXCPP" >&6; } + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes + do +@@ -6744,21 +6685,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +@@ -6782,14 +6722,13 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err +@@ -6797,7 +6736,7 @@ $as_echo "$ac_try_echo") >&5 + # Broken: success on invalid input. + continue + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +@@ -6813,13 +6752,11 @@ rm -f conftest.err conftest.$ac_ext + if $ac_preproc_ok; then + : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&5 ++ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check + See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&2;} ++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check + See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } --fi -- --ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -- -+ DSYMUTIL="$ac_cv_prog_DSYMUTIL" ++ { (exit 1); exit 1; }; } fi --ac_ext=f --ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' --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 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 -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -+set dummy ${ac_tool_prefix}nmedit; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_F77+set}" = set; then -+if test "${ac_cv_prog_NMEDIT+set}" = set; then - $as_echo_n "(cached) " >&6 + ac_ext=cpp +@@ -6839,10 +6776,10 @@ if test -n "$ac_tool_prefix"; then + 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 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$F77"; then -- ac_cv_prog_F77="$F77" # Let the user override the test. -+ if test -n "$NMEDIT"; then -+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -6854,7 +7322,7 @@ - test -z "$as_dir" && as_dir=. + if test -n "$F77"; then + ac_cv_prog_F77="$F77" # Let the user override the test. +@@ -6855,7 +6792,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" -+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6864,32 +7332,28 @@ - + done +@@ -6866,11 +6803,11 @@ fi fi - fi --F77=$ac_cv_prog_F77 --if test -n "$F77"; then + F77=$ac_cv_prog_F77 + if test -n "$F77"; then - { $as_echo "$as_me:$LINENO: result: $F77" >&5 -$as_echo "$F77" >&6; } -+NMEDIT=$ac_cv_prog_NMEDIT -+if test -n "$NMEDIT"; then -+ { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 -+$as_echo "$NMEDIT" >&6; } ++ { echo "$as_me:$LINENO: result: $F77" >&5 ++echo "${ECHO_T}$F77" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi -- test -n "$F77" && break -- done - fi --if test -z "$F77"; then -- ac_ct_F77=$F77 -- 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 -+if test -z "$ac_cv_prog_NMEDIT"; then -+ ac_ct_NMEDIT=$NMEDIT -+ # Extract the first word of "nmedit", so it can be a program name with args. -+set dummy nmedit; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_F77+set}" = set; then -+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then - $as_echo_n "(cached) " >&6 +@@ -6883,10 +6820,10 @@ if test -z "$F77"; then + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$ac_ct_F77"; then -- ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -+ if test -n "$ac_ct_NMEDIT"; then -+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -6898,7 +7362,7 @@ - test -z "$as_dir" && as_dir=. + if test -n "$ac_ct_F77"; then + ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. +@@ -6899,7 +6836,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" -+ ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_F77="$ac_prog" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -6908,21 +7372,109 @@ - + done +@@ -6910,11 +6847,11 @@ fi fi - fi --ac_ct_F77=$ac_cv_prog_ac_ct_F77 --if test -n "$ac_ct_F77"; then + ac_ct_F77=$ac_cv_prog_ac_ct_F77 + if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } -+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -+if test -n "$ac_ct_NMEDIT"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -+$as_echo "$ac_ct_NMEDIT" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_NMEDIT" = x; then -+ NMEDIT=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ NMEDIT=$ac_ct_NMEDIT -+ fi -+else -+ NMEDIT="$ac_cv_prog_NMEDIT" -+fi -+ -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. -+set dummy ${ac_tool_prefix}lipo; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_LIPO+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$LIPO"; then -+ ac_cv_prog_LIPO="$LIPO" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_LIPO="${ac_tool_prefix}lipo" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+LIPO=$ac_cv_prog_LIPO -+if test -n "$LIPO"; then -+ { $as_echo "$as_me:$LINENO: result: $LIPO" >&5 -+$as_echo "$LIPO" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 ++echo "${ECHO_T}$ac_ct_F77" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi -- test -n "$ac_ct_F77" && break -+fi -+if test -z "$ac_cv_prog_LIPO"; then -+ ac_ct_LIPO=$LIPO -+ # Extract the first word of "lipo", so it can be a program name with args. -+set dummy lipo; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_LIPO"; then -+ ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_LIPO="lipo" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi - done -+done -+IFS=$as_save_IFS - -- if test "x$ac_ct_F77" = x; then -- F77="" -+fi -+fi -+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO -+if test -n "$ac_ct_LIPO"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 -+$as_echo "$ac_ct_LIPO" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_LIPO" = x; then -+ LIPO=":" +@@ -6926,8 +6863,12 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -@@ -6930,166 +7482,577 @@ - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac -- F77=$ac_ct_F77 -+ LIPO=$ac_ct_LIPO - fi -+else -+ LIPO="$ac_cv_prog_LIPO" - fi + F77=$ac_ct_F77 +@@ -6936,41 +6877,37 @@ fi -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. -+set dummy ${ac_tool_prefix}otool; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_OTOOL+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$OTOOL"; then -+ ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_OTOOL="${ac_tool_prefix}otool" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS --# Provide some information about the compiler. + # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -set X $ac_compile -ac_compiler=$2 --{ (ac_try="$ac_compiler --version >&5" -+fi -+fi -+OTOOL=$ac_cv_prog_OTOOL -+if test -n "$OTOOL"; then -+ { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5 -+$as_echo "$OTOOL" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_OTOOL"; then -+ ac_ct_OTOOL=$OTOOL -+ # Extract the first word of "otool", so it can be a program name with args. -+set dummy otool; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_OTOOL"; then -+ ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_OTOOL="otool" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL -+if test -n "$ac_ct_OTOOL"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 -+$as_echo "$ac_ct_OTOOL" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_OTOOL" = x; then -+ OTOOL=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ OTOOL=$ac_ct_OTOOL -+ fi -+else -+ OTOOL="$ac_cv_prog_OTOOL" -+fi -+ -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -+set dummy ${ac_tool_prefix}otool64; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_OTOOL64+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$OTOOL64"; then -+ ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+OTOOL64=$ac_cv_prog_OTOOL64 -+if test -n "$OTOOL64"; then -+ { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5 -+$as_echo "$OTOOL64" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_prog_OTOOL64"; then -+ ac_ct_OTOOL64=$OTOOL64 -+ # Extract the first word of "otool64", so it can be a program name with args. -+set dummy otool64; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_OTOOL64"; then -+ ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_OTOOL64="otool64" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -+if test -n "$ac_ct_OTOOL64"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 -+$as_echo "$ac_ct_OTOOL64" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_ct_OTOOL64" = x; then -+ OTOOL64=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ OTOOL64=$ac_ct_OTOOL64 -+ fi -+else -+ OTOOL64="$ac_cv_prog_OTOOL64" -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -+$as_echo_n "checking for -single_module linker flag... " >&6; } -+if test "${lt_cv_apple_cc_single_mod+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ rm -rf libconftest.dylib* -+ echo "int foo(void){return 1;}" > conftest.c -+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+-dynamiclib -Wl,-single_module conftest.c" >&5 -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err -+ _lt_result=$? -+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then -+ lt_cv_apple_cc_single_mod=yes -+ else -+ cat conftest.err >&5 -+ fi -+ rm -rf libconftest.dylib* -+ rm -f conftest.* -+ fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -+$as_echo "$lt_cv_apple_cc_single_mod" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" ++echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` + { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler --version >&5") 2>&5 -+ (eval "$ac_link") 2>conftest.er1 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -v >&5" -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ lt_cv_ld_exported_symbols_list=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ lt_cv_ld_exported_symbols_list=no -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$save_LDFLAGS" -+ -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) # darwin 5.x on -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[012]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil='~$DSYMUTIL $lib || :' -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+ if test "${ac_cv_prog_CPP+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ # Double quotes because CPP needs to be expanded -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ Syntax error -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -v >&5") 2>&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (ac_try="$ac_compiler -V >&5" -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Broken: fails on valid input. -+continue -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_compiler -V >&5") 2>&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --rm -f a.out -+ (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 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -f a.out --# If we don't use `.F' as extension, the preprocessor is not run on the --# input file. (Note that this only needs to work for GNU compilers.) --ac_save_ext=$ac_ext --ac_ext=F +@@ -6978,10 +6915,10 @@ rm -f a.out + # input file. (Note that this only needs to work for GNU compilers.) + ac_save_ext=$ac_ext + ac_ext=F -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } --if test "${ac_cv_f77_compiler_gnu+set}" = set; then ++{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } + if test "${ac_cv_f77_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ break -+fi -+ -+ done -+ ac_cv_prog_CPP=$CPP -+ -+fi -+ CPP=$ac_cv_prog_CPP ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -+ ac_cv_prog_CPP=$CPP -+fi -+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } -+ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -- program main --#ifndef __GNUC__ -- choke me -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> - #endif -- -- end -+ Syntax error - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in + program main +@@ -6997,21 +6934,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_f77_werror_flag" || -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_compiler_gnu=yes -+ }; then -+ : + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -- ac_compiler_gnu=no -+ # Broken: fails on valid input. -+continue - fi + ac_compiler_gnu=no +@@ -7021,16 +6957,16 @@ rm -f core conftest.err conftest.$ac_obj + ac_cv_f77_compiler_gnu=$ac_compiler_gnu --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --ac_cv_f77_compiler_gnu=$ac_compiler_gnu -- --fi + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } --ac_ext=$ac_save_ext --ac_test_FFLAGS=${FFLAGS+set} --ac_save_FFLAGS=$FFLAGS --FFLAGS= ++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } + ac_ext=$ac_save_ext + ac_test_FFLAGS=${FFLAGS+set} + ac_save_FFLAGS=$FFLAGS + FFLAGS= -{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -$as_echo_n "checking whether $F77 accepts -g... " >&6; } --if test "${ac_cv_prog_f77_g+set}" = set; then ++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 ++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } + if test "${ac_cv_prog_f77_g+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- FFLAGS=-g --cat >conftest.$ac_ext <<_ACEOF -- program main -+rm -f conftest.err conftest.$ac_ext - -- end -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + FFLAGS=-g + cat >conftest.$ac_ext <<_ACEOF +@@ -7044,21 +6980,20 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_f77_werror_flag" || -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 -+ }; then -+ # Broken: success on invalid input. -+continue + } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes else - $as_echo "$as_me: failed program was:" >&5 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -- ac_cv_prog_f77_g=no -+ # Passes both tests. -+ac_preproc_ok=: -+break + ac_cv_prog_f77_g=no +@@ -7067,8 +7002,8 @@ fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_ext - --fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } --if test "$ac_test_FFLAGS" = set; then -- FFLAGS=$ac_save_FFLAGS --elif test $ac_cv_prog_f77_g = yes; then -- if test "x$ac_cv_f77_compiler_gnu" = xyes; then -- FFLAGS="-g -O2" -- else -- FFLAGS="-g" -- fi --else -- if test "x$ac_cv_f77_compiler_gnu" = xyes; then -- FFLAGS="-O2" -- else -- FFLAGS= -- fi --fi -- ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } + if test "$ac_test_FFLAGS" = set; then + FFLAGS=$ac_save_FFLAGS + elif test $ac_cv_prog_f77_g = yes; then +@@ -7085,11 +7020,7 @@ else + fi + fi + -if test $ac_compiler_gnu = yes; then - G77=yes -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ : - else +-else - G77= -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - fi -+ +-fi ++G77=`test $ac_compiler_gnu = yes && echo yes` ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7097,419 +8060,342 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -7100,10 +7031,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -- --# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! --# find the maximum length of command line arguments + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! + # find the maximum length of command line arguments -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } --if test "${lt_cv_sys_max_cmd_len+set}" = set; then -+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then - $as_echo_n "(cached) " >&6 ++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 ++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } + if test "${lt_cv_sys_max_cmd_len+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- i=0 -- teststring="ABCD" -- -- case $build_os in -- msdosdjgpp*) -- # On DJGPP, this test can blow up pretty badly due to problems in libc -- # (any single argument exceeding 2000 bytes causes a buffer overrun -- # during glob expansion). Even if it were fixed, the result of this -- # check would be larger than it should be. -- lt_cv_sys_max_cmd_len=12288; # 12K is about right -- ;; -- -- gnu*) -- # Under GNU Hurd, this test is not required because there is -- # no limit to the length of command line arguments. -- # Libtool will interpret -1 as no limit whatsoever -- lt_cv_sys_max_cmd_len=-1; -- ;; -- -- cygwin* | mingw*) -- # On Win9x/ME, this test blows up -- it succeeds, but takes -- # about 5 minutes as the teststring grows exponentially. -- # Worse, since 9x/ME are not pre-emptively multitasking, -- # you end up with a "frozen" computer, even though with patience -- # the test eventually succeeds (with a max line length of 256k). -- # Instead, let's just punt: use the minimum linelength reported by -- # all of the supported platforms: 8192 (on NT/2K/XP). -- lt_cv_sys_max_cmd_len=8192; -- ;; -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdlib.h> -+#include <stdarg.h> -+#include <string.h> -+#include <float.h> + i=0 + teststring="ABCD" +@@ -7212,11 +7143,11 @@ else + fi -- amigaos*) -- # On AmigaOS with pdksh, this test takes hours, literally. -- # So we just punt and use a minimum line length of 8192. -- lt_cv_sys_max_cmd_len=8192; -- ;; -+int -+main () -+{ - -- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -- # This has been around since 386BSD, at least. Likely further. -- if test -x /sbin/sysctl; then -- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -- elif test -x /usr/sbin/sysctl; then -- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -- else -- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -- fi -- # And add a safety zone -- 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` -- ;; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- interix*) -- # We know the value 262144 and hardcode it with a safety zone (like BSD) -- lt_cv_sys_max_cmd_len=196608 -- ;; -+ ac_cv_header_stdc=no -+fi - -- osf*) -- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -- # nice to cause kernel panics so lets avoid the loop below. -- # First set a reasonable default. -- lt_cv_sys_max_cmd_len=16384 -- # -- if test -x /sbin/sysconfig; then -- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -- *1*) lt_cv_sys_max_cmd_len=-1 ;; -- esac -- fi -- ;; -- sco3.2v5*) -- lt_cv_sys_max_cmd_len=102400 -- ;; -- sysv5* | sco5v6* | sysv4.2uw2*) -- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -- if test -n "$kargmax"; then -- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` -- else -- lt_cv_sys_max_cmd_len=32768 -- fi -- ;; -- *) -- 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` -- fi -- ;; -- esac -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - --fi -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <string.h> - --if test -n $lt_cv_sys_max_cmd_len ; then + if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "memchr" >/dev/null 2>&1; then -+ : ++ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 ++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:$LINENO: result: none" >&5 -$as_echo "none" >&6; } -+ ac_cv_header_stdc=no ++ { echo "$as_me:$LINENO: result: none" >&5 ++echo "${ECHO_T}none" >&6; } fi -+rm -f conftest* -+fi -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdlib.h> +@@ -7224,10 +7155,10 @@ fi -- -- --# Check for command to grab the raw symbol name followed by C symbol from nm. + + # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } --if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then ++{ 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; } + if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - $as_echo_n "(cached) " >&6 -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "free" >/dev/null 2>&1; then -+ : ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* --# These are sane defaults that work on at least a few old systems. --# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+fi - --# Character class describing NM global symbol codes. --symcode='[BCDEGRST]' -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ctype.h> -+#include <stdlib.h> -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#else -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+#endif - --# Regexp to match symbols that can be accessed directly from C. --sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+int -+main () -+{ -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ return 2; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ : -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Transform an extracted symbol line into a proper C declaration --lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" -+( exit $ac_status ) -+ac_cv_header_stdc=no -+fi -+rm -rf conftest.dSYM -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi - --# Transform an extracted symbol line into symbol name and symbol address --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'" - --# Define system-specific variables. --case $host_os in --aix*) -- symcode='[BCDT]' -- ;; --cygwin* | mingw* | pw32*) -- symcode='[ABCDGISTW]' -- ;; --hpux*) # Its linker distinguishes data from code symbols -- if test "$host_cpu" = ia64; then -- symcode='[ABCDEGRST]' -- fi -- 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* | 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'" -- 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'" -- fi -- ;; --irix* | nonstopux*) -- symcode='[BCDEGRST]' -- ;; --osf*) -- symcode='[BCDEGQRST]' -- ;; --solaris*) -- symcode='[BDRT]' -- ;; --sco3.2v5*) -- symcode='[DT]' -- ;; --sysv4.2uw2*) -- symcode='[DT]' -- ;; --sysv5* | sco5v6* | unixware* | OpenUNIX*) -- symcode='[ABDT]' -- ;; --sysv4) -- symcode='[DFNSTU]' -- ;; --esac -+fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } -+if test $ac_cv_header_stdc = yes; then - --# Handle CRLF in mingw tool chain --opt_cr= --case $build_os in --mingw*) -- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp -- ;; --esac -+cat >>confdefs.h <<\_ACEOF -+#define STDC_HEADERS 1 -+_ACEOF - --# If we're using GNU nm, then use its standard symbol codes. --case `$NM -V 2>&1` in --*GNU* | *'with BFD'*) -- symcode='[ABCDGIRSTW]' ;; --esac -+fi - --# Try without a prefix undercore, then with it. --for ac_symprfx in "" "_"; do -+# On IRIX 5.3, sys/types and inttypes.h are conflicting. - -- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -- symxfrm="\\1 $ac_symprfx\\2 \\2" - -- # Write the raw and C identifiers. -- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - -- # Check to see that the pipe works correctly. -- pipe_works=no - -- rm -f conftest* -- cat > conftest.$ac_ext <<EOF --#ifdef __cplusplus --extern "C" { --#endif --char nm_test_var; --void nm_test_func(){} --#ifdef __cplusplus --} --#endif --int main(){nm_test_var='a';nm_test_func();return(0);} --EOF - -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Now try to grab the symbols. -- nlist=conftest.nm -- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 -- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s "$nlist"; then -- # Try sorting and uniquifying the output. -- if sort "$nlist" | uniq > "$nlist"T; then -- mv -f "$nlist"T "$nlist" -- else -- rm -f "$nlist"T -- fi - -- # Make sure that we snagged all the symbols we need. -- if grep ' nm_test_var$' "$nlist" >/dev/null; then -- if grep ' nm_test_func$' "$nlist" >/dev/null; then -- cat <<EOF > conftest.$ac_ext --#ifdef __cplusplus --extern "C" { --#endif - --EOF -- # Now generate the symbol file. -- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - -- cat <<EOF >> conftest.$ac_ext --#if defined (__STDC__) && __STDC__ --# define lt_ptr_t void * --#else --# define lt_ptr_t char * --# define const --#endif - --/* The mapping between symbol names and symbols. */ --const struct { -- const char *name; -- lt_ptr_t address; --} --lt_preloaded_symbols[] = --{ --EOF -- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext -- cat <<\EOF >> conftest.$ac_ext -- {0, (lt_ptr_t) 0} --}; -+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -+ inttypes.h stdint.h unistd.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default - --#ifdef __cplusplus --} --#endif --EOF -- # Now try linking the two files. -- mv conftest.$ac_objext conftstm.$ac_objext -- lt_save_LIBS="$LIBS" -- lt_save_CFLAGS="$CFLAGS" -- LIBS="conftstm.$ac_objext" -- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 + # These are sane defaults that work on at least a few old systems. +@@ -7332,14 +7263,14 @@ EOF + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext}; then -- pipe_works=yes -- fi -- LIBS="$lt_save_LIBS" -- CFLAGS="$lt_save_CFLAGS" -- else -- echo "cannot find nm_test_func in $nlist" >&5 -- fi -- else -- echo "cannot find nm_test_var in $nlist" >&5 -- fi -- else -- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 -- fi -- else -- echo "$progname: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- fi -- rm -rf conftest* conftst* -- -- # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -- break -- else -- lt_cv_sys_global_symbol_pipe= -- fi --done -+ (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 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ eval "$as_ac_Header=no" +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then +@@ -7394,7 +7325,7 @@ EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi +@@ -7429,17 +7360,17 @@ if test -z "$lt_cv_sys_global_symbol_pip + lt_cv_sys_global_symbol_to_cdecl= fi - --if test -z "$lt_cv_sys_global_symbol_pipe"; then -- lt_cv_sys_global_symbol_to_cdecl= --fi --if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:$LINENO: result: failed" >&5 -$as_echo "failed" >&6; } --else ++ { echo "$as_me:$LINENO: result: failed" >&5 ++echo "${ECHO_T}failed" >&6; } + else - { $as_echo "$as_me:$LINENO: result: ok" >&5 -$as_echo "ok" >&6; } -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ { echo "$as_me:$LINENO: result: ok" >&5 ++echo "${ECHO_T}ok" >&6; } fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } --if test "${lt_cv_objdir+set}" = set; then ++{ echo "$as_me:$LINENO: checking for objdir" >&5 ++echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } + if test "${lt_cv_objdir+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- rm -f .libs 2>/dev/null --mkdir .libs 2>/dev/null --if test -d .libs; then -- lt_cv_objdir=.libs --else -- # MS-DOS does not allow filenames that begin with a dot. -- lt_cv_objdir=_libs --fi --rmdir .libs 2>/dev/null ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + rm -f .libs 2>/dev/null + mkdir .libs 2>/dev/null +@@ -7451,8 +7382,8 @@ else + fi + rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } --objdir=$lt_cv_objdir - -+done ++{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 ++echo "${ECHO_T}$lt_cv_objdir" >&6; } + objdir=$lt_cv_objdir - -+for ac_header in dlfcn.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default - --case $host_os in --aix3*) -- # AIX sometimes has problems with the GCC collect2 program. For some -- # reason, if we set the COLLECT_NAMES environment variable, the problems -- # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES -- fi -- ;; -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; - esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='sed -e 1s/^X//' --sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' -- --# Same as above, but do not quote variable references. --double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' -+ eval "$as_ac_Header=no" -+fi - --# Sed substitution to delay expansion of an escaped shell variable in a --# double_quote_subst'ed string. --delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - --# Sed substitution to avoid accidental globbing in evaled expressions --no_glob_subst='s/\*/\\\*/g' -+fi - --# Constants: --rm="rm -f" -+done - --# Global variables: --default_ofile=libtool --can_build_shared=yes - --# All known linkers require a `.a' archive for static linking (except MSVC, --# which needs '.lib'). --libext=a --ltmain="$ac_aux_dir/ltmain.sh" --ofile="$default_ofile" --with_gnu_ld="$lt_cv_prog_gnu_ld" - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. --set dummy ${ac_tool_prefix}ar; ac_word=$2 -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+if test -z "$CXX"; then -+ if test -n "$CCC"; then -+ CXX=$CCC -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -+ 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 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_AR+set}" = set; then -+if test "${ac_cv_prog_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 +@@ -7503,10 +7434,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_AR+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$AR"; then -- ac_cv_prog_AR="$AR" # Let the user override the test. -+ if test -n "$CXX"; then -+ ac_cv_prog_CXX="$CXX" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -7518,7 +8404,7 @@ - test -z "$as_dir" && as_dir=. + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +@@ -7519,7 +7450,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" -+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_AR="${ac_tool_prefix}ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7528,28 +8414,32 @@ - + done +@@ -7530,11 +7461,11 @@ fi fi - fi --AR=$ac_cv_prog_AR --if test -n "$AR"; then + AR=$ac_cv_prog_AR + if test -n "$AR"; then - { $as_echo "$as_me:$LINENO: result: $AR" >&5 -$as_echo "$AR" >&6; } -+CXX=$ac_cv_prog_CXX -+if test -n "$CXX"; then -+ { $as_echo "$as_me:$LINENO: result: $CXX" >&5 -+$as_echo "$CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $AR" >&5 ++echo "${ECHO_T}$AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi -+ test -n "$CXX" && break -+ done - fi --if test -z "$ac_cv_prog_AR"; then -- ac_ct_AR=$AR -- # Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 -+if test -z "$CXX"; then -+ ac_ct_CXX=$CXX -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_AR+set}" = set; then -+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 +@@ -7543,10 +7474,10 @@ if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$ac_ct_AR"; then -- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -+ if test -n "$ac_ct_CXX"; then -+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -7558,7 +8448,7 @@ - test -z "$as_dir" && as_dir=. + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +@@ -7559,7 +7490,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do 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" -+ ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_prog_ac_ct_AR="ar" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi -@@ -7568,17 +8458,21 @@ - + done +@@ -7570,11 +7501,11 @@ fi fi - fi --ac_ct_AR=$ac_cv_prog_ac_ct_AR --if test -n "$ac_ct_AR"; then + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -+if test -n "$ac_ct_CXX"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -+$as_echo "$ac_ct_CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 ++echo "${ECHO_T}$ac_ct_AR" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi -- if test "x$ac_ct_AR" = x; then -- AR="false" -+ -+ test -n "$ac_ct_CXX" && break -+done -+ -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" + if test "x$ac_ct_AR" = x; then +@@ -7582,8 +7513,12 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -@@ -7586,7866 +8480,1568 @@ - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac -- AR=$ac_ct_AR -+ CXX=$ac_ct_CXX - fi --else -- AR="$ac_cv_prog_AR" - fi - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. --set dummy ${ac_tool_prefix}ranlib; ac_word=$2 + AR=$ac_ct_AR +@@ -7595,10 +7530,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_RANLIB+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_RANLIB+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- if test -n "$RANLIB"; then -- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +@@ -7611,7 +7546,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi --done --done --IFS=$as_save_IFS -- --fi --fi --RANLIB=$ac_cv_prog_RANLIB --if test -n "$RANLIB"; then + done +@@ -7622,11 +7557,11 @@ fi + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } --else ++ { echo "$as_me:$LINENO: result: $RANLIB" >&5 ++echo "${ECHO_T}$RANLIB" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi -+# Provide some information about the compiler. -+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -- --fi --if test -z "$ac_cv_prog_RANLIB"; then -- ac_ct_RANLIB=$RANLIB -- # Extract the first word of "ranlib", so it can be a program name with args. --set dummy ranlib; ac_word=$2 + +@@ -7635,10 +7570,10 @@ if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - $as_echo_n "(cached) " >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$ac_ct_RANLIB"; then -- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_RANLIB="ranlib" + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +@@ -7651,7 +7586,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --fi --fi --ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB --if test -n "$ac_ct_RANLIB"; then ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7662,11 +7597,11 @@ fi + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } --else ++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } --fi -+int -+main () -+{ -+#ifndef __GNUC__ -+ choke me -+#endif ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi -- if test "x$ac_ct_RANLIB" = x; then -- RANLIB=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) + if test "x$ac_ct_RANLIB" = x; then +@@ -7674,8 +7609,12 @@ fi + else + case $cross_compiling:$ac_tool_warned in + yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; esac -- RANLIB=$ac_ct_RANLIB -- fi -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_compiler_gnu=yes - else -- RANLIB="$ac_cv_prog_RANLIB" -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_compiler_gnu=no - fi - --if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. --set dummy ${ac_tool_prefix}strip; ac_word=$2 + RANLIB=$ac_ct_RANLIB +@@ -7687,10 +7626,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_STRIP+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- if test -n "$STRIP"; then -- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_STRIP="${ac_tool_prefix}strip" ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +@@ -7703,7 +7642,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7714,11 +7653,11 @@ fi fi --fi --STRIP=$ac_cv_prog_STRIP --if test -n "$STRIP"; then + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GXX=yes ++ { echo "$as_me:$LINENO: result: $STRIP" >&5 ++echo "${ECHO_T}$STRIP" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } --fi -- -- -+ GXX= ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi --if test -z "$ac_cv_prog_STRIP"; then -- ac_ct_STRIP=$STRIP -- # Extract the first word of "strip", so it can be a program name with args. --set dummy strip; ac_word=$2 + + +@@ -7727,10 +7666,10 @@ if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+ac_test_CXXFLAGS=${CXXFLAGS+set} -+ac_save_CXXFLAGS=$CXXFLAGS -+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -+$as_echo_n "checking whether $CXX accepts -g... " >&6; } -+if test "${ac_cv_prog_cxx_g+set}" = set; then - $as_echo_n "(cached) " >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$ac_ct_STRIP"; then -- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_STRIP="strip" + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +@@ -7743,7 +7682,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --fi --fi --ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP --if test -n "$ac_ct_STRIP"; then ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -7754,11 +7693,11 @@ fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } --else ++ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++echo "${ECHO_T}$ac_ct_STRIP" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } --fi -+int -+main () -+{ ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi -- if test "x$ac_ct_STRIP" = x; then -- STRIP=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) + if test "x$ac_ct_STRIP" = x; then +@@ -7766,8 +7705,12 @@ fi + else + case $cross_compiling:$ac_tool_warned in + yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; esac -- STRIP=$ac_ct_STRIP -- fi -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -- STRIP="$ac_cv_prog_STRIP" --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ CXXFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --old_CC="$CC" --old_CFLAGS="$CFLAGS" -+int -+main () -+{ - --# Set sane defaults for various variables --test -z "$AR" && AR=ar --test -z "$AR_FLAGS" && AR_FLAGS=cru --test -z "$AS" && AS=as --test -z "$CC" && CC=cc --test -z "$LTCC" && LTCC=$CC --test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS --test -z "$DLLTOOL" && DLLTOOL=dlltool --test -z "$LD" && LD=ld --test -z "$LN_S" && LN_S="ln -s" --test -z "$MAGIC_CMD" && MAGIC_CMD=file --test -z "$NM" && NM=nm --test -z "$SED" && SED=sed --test -z "$OBJDUMP" && OBJDUMP=objdump --test -z "$RANLIB" && RANLIB=: --test -z "$STRIP" && STRIP=: --test -z "$ac_objext" && ac_objext=o -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' --old_postinstall_cmds='chmod 644 $oldlib' --old_postuninstall_cmds= -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --if test -n "$RANLIB"; then -- case $host_os in -- openbsd*) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -- ;; -- *) -- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -- ;; -- esac -- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" --fi -+int -+main () -+{ - --for cc_temp in $compiler""; do -- case $cc_temp in -- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -- -- --# Only perform the check for file, if the check method requires it --case $deplibs_check_method in --file_magic*) -- if test "$file_magic_cmd" = '$MAGIC_CMD'; then + STRIP=$ac_ct_STRIP +@@ -7830,10 +7773,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - + case $deplibs_check_method in + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } --if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 ++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } + if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- case $MAGIC_CMD in --[\\/*] | ?:[\\/]*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; --*) -- lt_save_MAGIC_CMD="$MAGIC_CMD" -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" -- for ac_dir in $ac_dummy; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/${ac_tool_prefix}file; then -- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "file_magic "*) -- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- $EGREP "$file_magic_regex" > /dev/null; then -- : -- else -- cat <<EOF 1>&2 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +@@ -7883,19 +7826,19 @@ fi --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org - --EOF -- fi ;; -- esac -- fi -- break -- fi -- done -- IFS="$lt_save_ifs" -- MAGIC_CMD="$lt_save_MAGIC_CMD" -- ;; --esac - fi - --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } --else ++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++echo "${ECHO_T}$MAGIC_CMD" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi --if test -z "$lt_cv_path_MAGIC_CMD"; then -- if test -n "$ac_tool_prefix"; then + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:$LINENO: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } --if test "${lt_cv_path_MAGIC_CMD+set}" = set; then ++ { echo "$as_me:$LINENO: checking for file" >&5 ++echo $ECHO_N "checking for file... $ECHO_C" >&6; } + if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- case $MAGIC_CMD in --[\\/*] | ?:[\\/]*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -- ;; --*) -- lt_save_MAGIC_CMD="$MAGIC_CMD" -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" -- for ac_dir in $ac_dummy; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/file; then -- lt_cv_path_MAGIC_CMD="$ac_dir/file" -- if test -n "$file_magic_test_file"; then -- case $deplibs_check_method in -- "file_magic "*) -- file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -- if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -- $EGREP "$file_magic_regex" > /dev/null; then -- : -- else -- cat <<EOF 1>&2 -- --*** Warning: the command libtool uses to detect shared libraries, --*** $file_magic_cmd, produces output that libtool cannot recognize. --*** The result is that libtool may fail to recognize shared libraries --*** as such. This will affect the creation of libtool libraries that --*** depend on shared libraries, but programs linked with such libtool --*** libraries will work regardless of this problem. Nevertheless, you --*** may want to report the problem to your system manager and/or to --*** bug-libtool@gnu.org -- --EOF -- fi ;; -- esac -- fi -- break -- fi -- done -- IFS="$lt_save_ifs" -- MAGIC_CMD="$lt_save_MAGIC_CMD" -- ;; --esac -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $MAGIC_CMD in + [\\/*] | ?:[\\/]*) +@@ -7945,11 +7888,11 @@ fi --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" --if test -n "$MAGIC_CMD"; then + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } --else ++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 ++echo "${ECHO_T}$MAGIC_CMD" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi -- -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -+$as_echo "$ac_cv_prog_cxx_g" >&6; } -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS=$ac_save_CXXFLAGS -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" + else -- MAGIC_CMD=: -- fi --fi -- -+ CXXFLAGS="-g" - fi -- ;; --esac -- -- -- case $host_os in -- rhapsody* | darwin*) -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. --set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +@@ -7967,10 +7910,10 @@ esac + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_DSYMUTIL+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_DSYMUTIL+set}" = set; then - $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$DSYMUTIL"; then -- ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +@@ -7983,7 +7926,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi --done --done --IFS=$as_save_IFS -- --fi --fi --DSYMUTIL=$ac_cv_prog_DSYMUTIL --if test -n "$DSYMUTIL"; then + done +@@ -7994,11 +7937,11 @@ fi + fi + DSYMUTIL=$ac_cv_prog_DSYMUTIL + if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } --else ++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 ++echo "${ECHO_T}$DSYMUTIL" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+depcc="$CXX" am_compiler_list= --fi --if test -z "$ac_cv_prog_DSYMUTIL"; then -- ac_ct_DSYMUTIL=$DSYMUTIL -- # Extract the first word of "dsymutil", so it can be a program name with args. --set dummy dsymutil; ac_word=$2 +@@ -8007,10 +7950,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then -+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+$as_echo_n "checking dependency style of $depcc... " >&6; } -+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - $as_echo_n "(cached) " >&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- if test -n "$ac_ct_DSYMUTIL"; then -- ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +@@ -8023,7 +7966,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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_DSYMUTIL="dsymutil" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -- --fi --fi --ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL --if test -n "$ac_ct_DSYMUTIL"; then ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -8034,11 +7977,11 @@ fi + fi + ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL + if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } --else ++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 ++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } --fi -+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -+ # We make a subdir and do the tests there. Otherwise we can end up -+ # making bogus files that we don't know about and never remove. For -+ # instance it was reported that on HP-UX the gcc test will end up -+ # making a dummy file named `D' -- because `-MD' means `put the output -+ # in D'. -+ mkdir conftest.dir -+ # Copy depcomp to subdir because otherwise we won't find it if we're -+ # using a relative directory. -+ cp "$am_depcomp" conftest.dir -+ cd conftest.dir -+ # We will build objects and dependencies in a subdirectory because -+ # it helps to detect inapplicable dependency modes. For instance -+ # both Tru64's cc and ICC support -MD to output dependencies as a -+ # side effect of compilation, but ICC will put the dependencies in -+ # the current directory while Tru64 will put them in the object -+ # directory. -+ mkdir sub ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi -- if test "x$ac_ct_DSYMUTIL" = x; then -- DSYMUTIL=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) + if test "x$ac_ct_DSYMUTIL" = x; then +@@ -8046,8 +7989,12 @@ fi + else + case $cross_compiling:$ac_tool_warned in + yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- DSYMUTIL=$ac_ct_DSYMUTIL -+ am_cv_CXX_dependencies_compiler_type=none -+ if test "$am_compiler_list" = ""; then -+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi --else -- DSYMUTIL="$ac_cv_prog_DSYMUTIL" --fi -+ for depmode in $am_compiler_list; do -+ # Setup a source with many dependencies, because some compilers -+ # like to wrap large dependency lists on column 80 (with \), and -+ # we should not choose a depcomp mode which is confused by this. -+ # -+ # We need to recreate these files for each test, as the compiler may -+ # overwrite some of them when testing with obscure command lines. -+ # This happens at least with the AIX C compiler. -+ : > sub/conftest.c -+ for i in 1 2 3 4 5 6; do -+ echo '#include "conftst'$i'.h"' >> sub/conftest.c -+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -+ # Solaris 8's {/usr,}/bin/sh. -+ touch sub/conftst$i.h -+ done -+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. --set dummy ${ac_tool_prefix}nmedit; ac_word=$2 ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + DSYMUTIL=$ac_ct_DSYMUTIL +@@ -8059,10 +8006,10 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_NMEDIT+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_NMEDIT+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- if test -n "$NMEDIT"; then -- ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +@@ -8075,7 +8022,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS -+ case $depmode in -+ nosideeffect) -+ # after this tag, mechanisms are not by side-effect, so they'll -+ # only be used when explicitly requested -+ if test "x$enable_dependency_tracking" = xyes; then -+ continue -+ else -+ break -+ fi -+ ;; -+ none) break ;; -+ esac -+ # We check with `-c' and `-o' for the sake of the "dashmstdout" -+ # mode. It turns out that the SunPro C++ compiler does not properly -+ # handle `-M -o', and we need to detect this. -+ if depmode=$depmode \ -+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ -+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ -+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ -+ >/dev/null 2>conftest.err && -+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && -+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && -+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -+ # icc doesn't choke on unknown options, it will just issue warnings -+ # or remarks (even with -Werror). So we grep stderr for any message -+ # that says an option was ignored or not supported. -+ # When given -MP, icc 7.0 and 7.1 complain thusly: -+ # icc: Command line warning: ignoring option '-M'; no argument required -+ # The diagnosis changed in icc 8.0: -+ # icc: Command line remark: option '-MP' not supported -+ if (grep 'ignoring option' conftest.err || -+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else -+ am_cv_CXX_dependencies_compiler_type=$depmode -+ break -+ fi -+ fi -+ done - --fi --fi --NMEDIT=$ac_cv_prog_NMEDIT --if test -n "$NMEDIT"; then ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -8086,11 +8033,11 @@ fi + fi + NMEDIT=$ac_cv_prog_NMEDIT + if test -n "$NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } -+ cd .. -+ rm -rf conftest.dir ++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5 ++echo "${ECHO_T}$NMEDIT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } --fi -- -- -+ am_cv_CXX_dependencies_compiler_type=none ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi --if test -z "$ac_cv_prog_NMEDIT"; then -- ac_ct_NMEDIT=$NMEDIT -- # Extract the first word of "nmedit", so it can be a program name with args. --set dummy nmedit; ac_word=$2 + + +@@ -8099,10 +8046,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- if test -n "$ac_ct_NMEDIT"; then -- ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_NMEDIT="nmedit" ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +@@ -8115,7 +8062,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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_NMEDIT="nmedit" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done --IFS=$as_save_IFS - ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -8126,11 +8073,11 @@ fi fi --fi --ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT --if test -n "$ac_ct_NMEDIT"; then + ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT + if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } --else ++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 ++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } --fi -+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } -+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi -- if test "x$ac_ct_NMEDIT" = x; then -- NMEDIT=":" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) + if test "x$ac_ct_NMEDIT" = x; then +@@ -8138,8 +8085,12 @@ fi + else + case $cross_compiling:$ac_tool_warned in + yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- NMEDIT=$ac_ct_NMEDIT -- fi -+ if -+ test "x$enable_dependency_tracking" != xno \ -+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then -+ am__fastdepCXX_TRUE= -+ am__fastdepCXX_FALSE='#' - else -- NMEDIT="$ac_cv_prog_NMEDIT" -+ am__fastdepCXX_TRUE='#' -+ am__fastdepCXX_FALSE= ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + NMEDIT=$ac_ct_NMEDIT +@@ -8149,10 +8100,10 @@ else fi - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } --if test "${lt_cv_apple_cc_single_mod+set}" = set; then ++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 ++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } + if test "${lt_cv_apple_cc_single_mod+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_apple_cc_single_mod=no -- if test -z "${LT_MULTI_MODULE}"; then -- # By default we will add the -single_module flag. You can override -- # by either setting the environment variable LT_MULTI_MODULE -- # non-empty at configure time, or by adding -multi_module to the -- # link flags. -- echo "int foo(void){return 1;}" > conftest.c -- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -- -dynamiclib ${wl}-single_module conftest.c -- if test -f libconftest.dylib; then -- lt_cv_apple_cc_single_mod=yes -- rm -rf libconftest.dylib* -- fi -- rm conftest.c -- fi --fi ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then +@@ -8170,12 +8121,12 @@ else + rm conftest.c + fi + fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } --if test "${lt_cv_ld_exported_symbols_list+set}" = set; then -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -+$as_echo_n "checking how to run the C++ preprocessor... " >&6; } -+if test -z "$CXXCPP"; then -+ if test "${ac_cv_prog_CXXCPP+set}" = set; then - $as_echo_n "(cached) " >&6 ++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 ++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } ++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 ++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } + if test "${lt_cv_ld_exported_symbols_list+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- lt_cv_ld_exported_symbols_list=no -- save_LDFLAGS=$LDFLAGS -- echo "_main" > conftest.sym -- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -- cat >conftest.$ac_ext <<_ACEOF -+ # Double quotes because CXXCPP needs to be expanded -+ for CXXCPP in "$CXX -E" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ Syntax error - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" -+if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS +@@ -8202,37 +8153,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- lt_cv_ld_exported_symbols_list=yes -+ : +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + lt_cv_ld_exported_symbols_list=yes else - $as_echo "$as_me: failed program was:" >&5 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -- lt_cv_ld_exported_symbols_list=no -+ # Broken: fails on valid input. -+continue + lt_cv_ld_exported_symbols_list=no fi -rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+rm -f conftest.err conftest.$ac_ext + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" --fi + fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } -- case $host_os in -- rhapsody* | darwin1.[0123]) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -- darwin1.*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- darwin*) -- # if running on 10.5 or later, the deployment target defaults -- # to the OS version, if on x86, and 10.4, the deployment -- # target defaults to 10.4. Don't you love it? -- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -- 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- 10.[012]*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- 10.*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- esac -- ;; -- esac -- if test "$lt_cv_apple_cc_single_mod" = "yes"; then -- _lt_dar_single_mod='$single_module' -- fi -- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -- else -- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" -- fi -- if test "$DSYMUTIL" != ":"; then -- _lt_dsymutil="~$DSYMUTIL \$lib || :" -- else -- _lt_dsymutil= -- fi -- ;; -- esac -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi - --enable_dlopen=no --enable_win32_dll=yes -+rm -f conftest.err conftest.$ac_ext - --# Check whether --enable-libtool-lock was given. --if test "${enable_libtool_lock+set}" = set; then -- enableval=$enable_libtool_lock; -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ break - fi - --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ done -+ ac_cv_prog_CXXCPP=$CXXCPP -+ -+fi -+ CXXCPP=$ac_cv_prog_CXXCPP -+else -+ ac_cv_prog_CXXCPP=$CXXCPP -+fi -+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 -+$as_echo "$CXXCPP" >&6; } -+ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ Syntax error -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ : -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ # Broken: fails on valid input. -+continue -+fi - --# Check whether --with-pic was given. --if test "${with_pic+set}" = set; then -- withval=$with_pic; pic_mode="$withval" -+rm -f conftest.err conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -- pic_mode=default -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Passes both tests. -+ac_preproc_ok=: -+break - fi - --test -z "$pic_mode" && pic_mode=default -+rm -f conftest.err conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ : -+else -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+_lt_caught_CXX_error=yes; } -+fi - --# Use C for the default configuration in the libtool script --tagname= --lt_save_CC="$CC" - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - -+else -+ _lt_caught_CXX_error=yes -+fi - --# Source file extension for C test sources. --ac_ext=c - --# Object file extension for compiled C test sources. --objext=o --objext=$objext - --# Code to be used in simple compile tests --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);}' -+# Set options - - --# If no C compiler was specified, use CC. --LTCC=${LTCC-"$CC"} - --# If no C compiler flags were specified, use CFLAGS. --LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ enable_dlopen=no - --# Allow CC to be a program name with arguments. --compiler=$CC - - --# save warnings/boilerplate of simple test code --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* -+ # Check whether --enable-shared was given. -+if test "${enable_shared+set}" = set; then -+ enableval=$enable_shared; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac -+else -+ enable_shared=yes -+fi - --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 -r conftest* - - - --lt_prog_compiler_no_builtin_flag= - --if test "$GCC" = yes; then -- lt_prog_compiler_no_builtin_flag=' -fno-builtin' ++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 ++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } + case $host_os in + rhapsody* | darwin1.[0123]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; +@@ -8344,10 +8291,10 @@ if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } --if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then ++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_rtti_exceptions=no -- ac_outfile=conftest.$ac_objext -- 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. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- # The option is referenced via a variable to avoid confusing sed. -- lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -- -e 's:$: $lt_compiler_flag:'` ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +@@ -8362,11 +8309,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8365: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>conftest.err) -- ac_status=$? -- cat conftest.err >&5 ++ (eval echo "\"\$as_me:8312: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 - echo "$as_me:8369: \$? = $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. -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_rtti_exceptions=yes -- fi -- fi -- $rm conftest* ++ echo "$as_me:8316: \$? = $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. +@@ -8379,8 +8326,8 @@ else + $rm conftest* --fi + fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } --if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -- lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -+ -+ -+# Check whether --with-pic was given. -+if test "${with_pic+set}" = set; then -+ withval=$with_pic; pic_mode="$withval" - else -- : -+ pic_mode=default - fi - --fi - --lt_prog_compiler_wl= --lt_prog_compiler_pic= --lt_prog_compiler_static= -+test -z "$pic_mode" && pic_mode=default + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +@@ -8394,8 +8341,8 @@ lt_prog_compiler_wl= + lt_prog_compiler_pic= + lt_prog_compiler_static= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -- if test "$GCC" = yes; then -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_static='-static' - -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_prog_compiler_static='-Bstatic' -- fi -- ;; - -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' -- ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; - -- 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' -- ;; - -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- lt_prog_compiler_pic='-fno-common' -+ # Check whether --enable-fast-install was given. -+if test "${enable_fast_install+set}" = set; then -+ enableval=$enable_fast_install; p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" - ;; -+ esac -+else -+ enable_fast_install=yes -+fi - -- interix[3-9]*) -- # Interix 3.x gcc -fpic/-fPIC options generate broken code. -- # Instead, we relocate shared libraries at runtime. -- ;; - -- msdosdjgpp*) -- # Just because we use GCC doesn't mean we suddenly get shared libraries -- # on systems that don't support them. -- lt_prog_compiler_can_build_shared=no -- enable_shared=no -- ;; - -- sysv4*MP*) -- if test -d /usr/nec; then -- lt_prog_compiler_pic=-Kconform_pic -- fi -- ;; - -- hpux*) -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- lt_prog_compiler_pic='-fPIC' -- ;; -- esac -- ;; - -- *) -- lt_prog_compiler_pic='-fPIC' -- ;; -- esac -- else -- # PORTME Check for flag to pass linker flags through the system compiler. -- case $host_os in -- aix*) -- lt_prog_compiler_wl='-Wl,' -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_prog_compiler_static='-Bstatic' -- else -- lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' -- fi -- ;; -- darwin*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- case $cc_basename in -- xlc*) -- lt_prog_compiler_pic='-qnocommon' -- lt_prog_compiler_wl='-Wl,' -- ;; -- esac -- ;; - -- 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' -- ;; - -- hpux9* | hpux10* | hpux11*) -- lt_prog_compiler_wl='-Wl,' -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- lt_prog_compiler_pic='+Z' -- ;; -- esac -- # Is there a better lt_prog_compiler_static that works with the bundled CC? -- lt_prog_compiler_static='${wl}-a ${wl}archive' -- ;; - -- irix5* | irix6* | nonstopux*) -- lt_prog_compiler_wl='-Wl,' -- # PIC (with -KPIC) is the default. -- lt_prog_compiler_static='-non_shared' -- ;; - -- newsos6) -- lt_prog_compiler_pic='-KPIC' -- lt_prog_compiler_static='-Bstatic' -- ;; - -- linux* | k*bsd*-gnu) -- case $cc_basename in -- icc* | ecc*) -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_pic='-KPIC' -- lt_prog_compiler_static='-static' -- ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -- # Portland Group compilers (*not* the Pentium gcc compiler, -- # which looks to be a dead project) -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_pic='-fpic' -- lt_prog_compiler_static='-Bstatic' -- ;; -- ccc*) -- lt_prog_compiler_wl='-Wl,' -- # 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 -- ;; - -- osf3* | osf4* | osf5*) -- lt_prog_compiler_wl='-Wl,' -- # All OSF/1 code is PIC. -- lt_prog_compiler_static='-non_shared' -- ;; -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ltmain" - -- rdos*) -- lt_prog_compiler_static='-non_shared' -- ;; -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -- solaris*) -- lt_prog_compiler_pic='-KPIC' -- lt_prog_compiler_static='-Bstatic' -- case $cc_basename in -- f77* | f90* | f95*) -- lt_prog_compiler_wl='-Qoption ld ';; -- *) -- lt_prog_compiler_wl='-Wl,';; -- esac -- ;; - -- sunos4*) -- lt_prog_compiler_wl='-Qoption ld ' -- lt_prog_compiler_pic='-PIC' -- lt_prog_compiler_static='-Bstatic' -- ;; - -- sysv4 | sysv4.2uw2* | sysv4.3*) -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_pic='-KPIC' -- lt_prog_compiler_static='-Bstatic' -- ;; - -- sysv4*MP*) -- if test -d /usr/nec ;then -- lt_prog_compiler_pic='-Kconform_pic' -- lt_prog_compiler_static='-Bstatic' -- fi -- ;; - -- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_pic='-KPIC' -- lt_prog_compiler_static='-Bstatic' -- ;; - -- unicos*) -- lt_prog_compiler_wl='-Wl,' -- lt_prog_compiler_can_build_shared=no -- ;; - -- uts4*) -- lt_prog_compiler_pic='-pic' -- lt_prog_compiler_static='-Bstatic' -- ;; - -- *) -- lt_prog_compiler_can_build_shared=no -- ;; -- esac -- fi + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' +@@ -8626,18 +8573,18 @@ $as_echo_n "checking for $compiler optio + esac + fi -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } --# --# Check to make sure the PIC flag actually works. --# --if test -n "$lt_prog_compiler_pic"; then + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic"; then -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } --if test "${lt_cv_prog_compiler_pic_works+set}" = set; then ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_pic_works=no -- ac_outfile=conftest.$ac_objext -- 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. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- # The option is referenced via a variable to avoid confusing sed. -- lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -- -e 's:$: $lt_compiler_flag:'` ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext +@@ -8652,11 +8599,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8655: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>conftest.err) -- ac_status=$? -- cat conftest.err >&5 ++ (eval echo "\"\$as_me:8602: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 - echo "$as_me:8659: \$? = $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. -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_pic_works=yes -- fi -- fi -- $rm conftest* ++ echo "$as_me:8606: \$? = $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. +@@ -8669,8 +8616,8 @@ else + $rm conftest* --fi + fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } --if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -- case $lt_prog_compiler_pic in -- "" | " "*) ;; -- *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -- esac --else -- lt_prog_compiler_pic= -- lt_prog_compiler_can_build_shared=no --fi - --fi --case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -- *djgpp*) -- lt_prog_compiler_pic= -- ;; -- *) -- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" -- ;; --esac - --# --# Check to make sure the static flag actually works. --# --wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" + if test x"$lt_cv_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in +@@ -8697,10 +8644,10 @@ esac + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } --if test "${lt_cv_prog_compiler_static_works+set}" = set; then ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_static_works+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_static_works=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- 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 -- if test -s conftest.err; then -- # Append any errors to the config.log. -- cat conftest.err 1>&5 -- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if diff conftest.exp conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_static_works=yes -- fi -- else -- lt_cv_prog_compiler_static_works=yes -- fi -- fi -- $rm -r conftest* -- LDFLAGS="$save_LDFLAGS" ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" +@@ -8725,8 +8672,8 @@ else + LDFLAGS="$save_LDFLAGS" --fi + fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } --if test x"$lt_cv_prog_compiler_static_works" = xyes; then -- : --else -- lt_prog_compiler_static= --fi + if test x"$lt_cv_prog_compiler_static_works" = xyes; then + : +@@ -8735,10 +8682,10 @@ else + fi -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o+set}" = set; then ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_c_o=no -- $rm -r conftest 2>/dev/null -- mkdir conftest -- cd conftest -- mkdir out -- 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 -- # (2) before a word containing "conftest.", or (3) at the end. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -- -e 's:$: $lt_compiler_flag:'` ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_c_o=no + $rm -r conftest 2>/dev/null +@@ -8756,11 +8703,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8759: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>out/conftest.err) -- ac_status=$? -- cat out/conftest.err >&5 ++ (eval echo "\"\$as_me:8706: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 - echo "$as_me:8763: \$? = $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 -- # So say no if there are warnings -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_c_o=yes -- fi -- fi -- chmod u+w . 2>&5 -- $rm conftest* -- # SGI C++ compiler will create directory out/ii_files/ for -- # template instantiation -- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -- $rm out/* && rmdir out -- cd .. -- rmdir conftest -- $rm conftest* ++ echo "$as_me:8710: \$? = $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 +@@ -8782,34 +8729,34 @@ else + $rm conftest* --fi + fi -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } --hard_links="nottested" --if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then -- # do not overwrite the value of need_locks provided by the user + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } -- hard_links=yes -- $rm conftest* -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- touch conftest.a -- ln conftest.a conftest.b 2>&5 || hard_links=no -- ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } -- if test "$hard_links" = no; then ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -- need_locks=warn -- fi --else -- need_locks=no --fi ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -- runpath_var= -- allow_undefined_flag= -- enable_shared_with_static_runtimes=no -- archive_cmds= -- archive_expsym_cmds= -- old_archive_From_new_cmds= -- old_archive_from_expsyms_cmds= -- export_dynamic_flag_spec= -- whole_archive_flag_spec= -- thread_safe_flag_spec= -- hardcode_libdir_flag_spec= -- hardcode_libdir_flag_spec_ld= -- hardcode_libdir_separator= -- hardcode_direct=no -- hardcode_minus_L=no -- hardcode_shlibpath_var=unsupported -- link_all_deplibs=unknown -- hardcode_automatic=no -- module_cmds= -- module_expsym_cmds= -- always_export_symbols=no -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- # include_expsyms should be a list of space-separated symbols to be *always* -- # included in the symbol list -- include_expsyms= -- # exclude_expsyms can be an extended regexp of symbols to exclude -- # it will be wrapped by ` (' and `)$', so one must not match beginning or -- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -- # as well as any symbol that contains `d'. -- exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -- # platforms (ab)use it in PIC code, but their linkers get confused if -- # the symbol is explicitly referenced. Since portable code cannot -- # rely on this symbol name, it's probably fine to never include it in -- # preloaded symbol tables. -- # Exclude shared library initialization/finalization symbols. -- extract_expsyms_cmds= -- # Just being paranoid about ensuring that cc_basename is set. -- for cc_temp in $compiler""; do -- case $cc_temp in -- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+test -z "$LN_S" && LN_S="ln -s" - -- case $host_os in -- cygwin* | mingw* | pw32*) -- # FIXME: the MSVC++ port hasn't been tested in a loooong time -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$GCC" != yes; then -- with_gnu_ld=no -- fi -- ;; -- interix*) -- # we just hope/assume this is gcc and not c89 (= MSVC++) -- with_gnu_ld=yes -- ;; -- openbsd*) -- with_gnu_ld=no -- ;; -- esac - -- ld_shlibs=yes -- if test "$with_gnu_ld" = yes; then -- # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' - -- # Set some defaults for GNU ld with shared library support. These -- # are reset later if shared libraries are not supported. Putting them -- # here allows them to be overridden if necessary. -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec= -- fi -- supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -- *\ 2.11.*) ;; # other 2.11 versions -- *) supports_anon_versioning=yes ;; -- esac - -- # See if GNU ld supports shared libraries. -- case $host_os in -- aix[3-9]*) -- # On AIX/PPC, the GNU linker is very broken -- if test "$host_cpu" != ia64; then -- ld_shlibs=no -- cat <<EOF 1>&2 - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported --*** to be unable to reliably create shared libraries on AIX. --*** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. - --EOF -- fi -- ;; - -- amigaos*) -- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes - -- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can't use -- # them. -- ld_shlibs=no -- ;; - -- beos*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- allow_undefined_flag=unsupported -- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- ld_shlibs=no -- fi -- ;; - -- cygwin* | mingw* | pw32*) -- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec='-L$libdir' -- 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/'\'' -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' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs=no -- fi -- ;; - -- interix[3-9]*) -- hardcode_direct=no -- hardcode_shlibpath_var=no -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- export_dynamic_flag_spec='${wl}-E' -- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -- # Instead, shared libraries are loaded at an image base (0x10000000 by -- # default) and relocated if they conflict, which is a slow very memory -- # consuming and fragmenting process. To avoid this, we pick a random, -- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -- # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- 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' -- ;; - -- 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 -- pgcc*) # Portland Group C compiler -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- tmp_addflag=' $pic_flag' -- ;; -- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- tmp_addflag=' $pic_flag -Mnomain' ;; -- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -- tmp_addflag=' -i_dynamic' ;; -- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -- tmp_addflag=' -i_dynamic -nofor_main' ;; -- ifc* | ifort*) # Intel Fortran compiler -- tmp_addflag=' -nofor_main' ;; -- esac -- 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- fi -- else -- ld_shlibs=no -- fi -- ;; -+if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi + runpath_var= + allow_undefined_flag= +@@ -9021,12 +8968,13 @@ EOF + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $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*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -- wlarc= -- else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- fi -- ;; -+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 -+$as_echo_n "checking for objdir... " >&6; } -+if test "${lt_cv_objdir+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -+$as_echo "$lt_cv_objdir" >&6; } -+objdir=$lt_cv_objdir - -- solaris*) -- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -- ld_shlibs=no -- cat <<EOF 1>&2 - --*** Warning: The releases 2.8.* of the GNU linker cannot reliably --*** create shared libraries on Solaris systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.9.1 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. - --EOF -- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- ld_shlibs=no -- fi -- ;; - -- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -- case `$LD -v 2>&1` in -- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -- ld_shlibs=no -- cat <<_LT_EOF 1>&2 - --*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not --*** reliably create shared libraries on SCO systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.16.91.0.3 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. -+cat >>confdefs.h <<_ACEOF -+#define LT_OBJDIR "$lt_cv_objdir/" -+_ACEOF - --_LT_EOF -- ;; -- *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -- else -- ld_shlibs=no -- fi -- ;; -- esac -- ;; - -- sunos4*) -- archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- wlarc= -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- ;; - -- *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- ld_shlibs=no -- fi -- ;; -- esac - -- if test "$ld_shlibs" = no; then -- runpath_var= -- hardcode_libdir_flag_spec= -- export_dynamic_flag_spec= -- whole_archive_flag_spec= -- fi -- else -- # PORTME fill in a description of your system's linker (not GNU ld) -- case $host_os in -- aix3*) -- allow_undefined_flag=unsupported -- always_export_symbols=yes -- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -- # Note: this linker hardcodes the directories in LIBPATH if there -- # are no directories specified by -L. -- hardcode_minus_L=yes -- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- hardcode_direct=unsupported -- fi -- ;; - -- aix[4-9]*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -- else -- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -- fi -- aix_use_runtimelinking=no - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -- for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi -- done -- ;; -- esac - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - -- archive_cmds='' -- hardcode_direct=yes -- hardcode_libdir_separator=':' -- link_all_deplibs=yes - -- if test "$GCC" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -- # We only want to do this on AIX 4.2 and lower, the check -- # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- : -- else -- # We have old collect2 -- hardcode_direct=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L=yes -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_libdir_separator= -- fi -- ;; -- esac -- shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -- fi -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi - -- # It seems that -bexpall does not export symbols beginning with -- # underscore (_), so it is better to generate a list of symbols to export. -- always_export_symbols=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag='-berok' -- # Determine the default libpath from the value encoded in an empty executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --int --main () --{ - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $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 "$lt_aix_libpath_sed"` --fi --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - - --fi - --rm -rf conftest.dSYM --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 -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi -+ ;; -+esac - -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -- allow_undefined_flag="-z nodefs" -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an empty executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - --int --main () --{ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\(["`\\]\)/\\\1/g' - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to delay expansion of an escaped single quote. -+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+ -+# Global variables: -+ofile=libtool -+can_build_shared=yes -+ -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ -+with_gnu_ld="$lt_cv_prog_gnu_ld" -+ -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" -+ -+# Set sane defaults for various variables -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$LD" && LD=ld -+test -z "$ac_objext" && ac_objext=o -+ -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ -+# Only perform the check for file, if the check method requires it -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $MAGIC_CMD in -+[\\/*] | ?:[\\/]*) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/${ac_tool_prefix}file; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+_LT_EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -9239,21 +9187,18 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$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 ++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 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+fi ++ } && 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 "$lt_aix_libpath_sed"` -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+$as_echo "$MAGIC_CMD" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -9268,13 +9213,12 @@ 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 "$lt_cv_path_MAGIC_CMD"; then -+ if test -n "$ac_tool_prefix"; then -+ { $as_echo "$as_me:$LINENO: checking for file" >&5 -+$as_echo_n "checking for file... " >&6; } -+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then -+ $as_echo_n "(cached) " >&6 else - $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ case $MAGIC_CMD in -+[\\/*] | ?:[\\/]*) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/file; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/file" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+_LT_EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac -+fi -+ -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+$as_echo "$MAGIC_CMD" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 -+ else -+ MAGIC_CMD=: -+ fi fi -rm -rf conftest.dSYM --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 -+ fi -+ ;; -+esac + 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 +@@ -9309,21 +9253,18 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- no_undefined_flag=' ${wl}-bernotok' -- allow_undefined_flag=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- whole_archive_flag_spec='$convenience' -- archive_cmds_need_lc=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -- fi -+# Use C for the default configuration in the libtool script -+ -+lt_save_CC="$CC" -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+# Source file extension for C test sources. -+ac_ext=c -+ -+# Object file extension for compiled C test sources. -+objext=o -+objext=$objext -+ -+# Code to be used in simple compile tests -+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);}' -+ -+ -+ -+ -+ -+ -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+# Save the default compiler, since it gets overwritten when the other -+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -+compiler_DEFAULT=$CC -+ -+# save warnings/boilerplate of simple test code -+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* -+ -+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 -r conftest* -+ -+ -+if test -n "$compiler"; then -+ -+lt_prog_compiler_no_builtin_flag= -+ -+if test "$GCC" = yes; then -+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' -+ -+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_rtti_exceptions=no -+ ac_outfile=conftest.$ac_objext -+ 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. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:9560: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:9564: \$? = $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. -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_rtti_exceptions=yes -+ fi -+ fi -+ $RM conftest* -+ -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -+ -+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -+else -+ : -+fi -+ -+fi -+ -+ -+ -+ -+ -+ -+ lt_prog_compiler_wl= -+lt_prog_compiler_pic= -+lt_prog_compiler_static= -+ -+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+ -+ if test "$GCC" = yes; then -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_static='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static='-Bstatic' - fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -9338,13 +9279,12 @@ 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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + 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 +@@ -9577,7 +9517,7 @@ if test -z "$aix_libpath"; then aix_libp + link_all_deplibs=yes ;; - amigaos*) -- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- # see comment about different semantics on the GNU ld section -- ld_shlibs=no -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ lt_prog_compiler_pic='-fPIC' -+ ;; -+ m68k) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ esac - ;; - -- bsdi[45]*) -- export_dynamic_flag_spec=-rdynamic -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. - ;; - -- cygwin* | mingw* | pw32*) -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # 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' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes=yes -+ mingw* | cygwin* | pw32* | os2* | cegcc*) -+ # 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' - ;; - - darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- archive_cmds_need_lc=no -- hardcode_direct=no -- hardcode_automatic=yes -- hardcode_shlibpath_var=unsupported -- whole_archive_flag_spec='' -- link_all_deplibs=yes -- if test "$GCC" = yes ; then -- output_verbose_link_cmd='echo' -- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -- else -- 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` $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 $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}' -- ;; -- *) -- ld_shlibs=no -- ;; -- esac -- fi -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic='-fno-common' - ;; - -- dgux*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -+ hpux*) -+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -+ # sets the default TLS model and affects inlining. -+ case $host_cpu in -+ hppa*64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic='-fPIC' -+ ;; -+ esac - ;; - -- freebsd1*) -- ld_shlibs=no -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. - ;; - -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ lt_prog_compiler_can_build_shared=no -+ enable_shared=no - ;; - -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -+ *nto* | *qnx*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ lt_prog_compiler_pic='-fPIC -shared' - ;; - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | dragonfly*) -- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic=-Kconform_pic -+ fi - ;; - -- hpux9*) -- if test "$GCC" = yes; then -- archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ *) -+ lt_prog_compiler_pic='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ lt_prog_compiler_wl='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static='-Bstatic' - else -- archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_direct=yes -- -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- hardcode_minus_L=yes -- export_dynamic_flag_spec='${wl}-E' - ;; - -- hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -- fi -- if test "$with_gnu_ld" = no; then -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -+ mingw* | cygwin* | pw32* | os2* | cegcc*) -+ # 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' -+ ;; - -- hardcode_direct=yes -- export_dynamic_flag_spec='${wl}-E' -+ hpux9* | hpux10* | hpux11*) -+ lt_prog_compiler_wl='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ lt_prog_compiler_static='${wl}-a ${wl}archive' -+ ;; - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- hardcode_minus_L=yes -- fi -+ irix5* | irix6* | nonstopux*) -+ lt_prog_compiler_wl='-Wl,' -+ # PIC (with -KPIC) is the default. -+ lt_prog_compiler_static='-non_shared' - ;; - -- hpux11*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case $host_cpu in -- hppa*64*) -- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- else -- case $host_cpu in -- hppa*64*) -- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- fi -- if test "$with_gnu_ld" = no; then -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator=: -- -- case $host_cpu in -- hppa*64*|ia64*) -- hardcode_libdir_flag_spec_ld='+b $libdir' -- hardcode_direct=no -- hardcode_shlibpath_var=no -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ # old Intel for x86_64 which still supported -KPIC. -+ ecc*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-static' -+ ;; -+ # icc used to be incompatible with GCC. -+ # ICC 10 doesn't accept -KPIC any more. -+ icc* | ifort*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-fPIC' -+ lt_prog_compiler_static='-static' -+ ;; -+ # Lahey Fortran 8.1. -+ lf95*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='--shared' -+ lt_prog_compiler_static='--static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-fpic' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ ccc*) -+ lt_prog_compiler_wl='-Wl,' -+ # All Alpha code is PIC. -+ lt_prog_compiler_static='-non_shared' -+ ;; -+ xl*) -+ # IBM XL C 8.0/Fortran 10.1 on PPC -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-qpic' -+ lt_prog_compiler_static='-qstaticlink' -+ ;; -+ *) -+ 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,' - ;; -- *) -- hardcode_direct=yes -- export_dynamic_flag_spec='${wl}-E' -- -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- hardcode_minus_L=yes -+ *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 -- fi -- ;; -- -- irix5* | irix6* | nonstopux*) -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- hardcode_libdir_flag_spec_ld='-rpath $libdir' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- link_all_deplibs=yes -- ;; -- - netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -- else -- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -- fi -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- hardcode_shlibpath_var=no -+ ;; -+ esac - ;; - - newsos6) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -- hardcode_shlibpath_var=no -- ;; -- -- openbsd*) -- 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 -- ld_shlibs=no -- fi -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' - ;; - -- os2*) -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- allow_undefined_flag=unsupported -- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ *nto* | *qnx*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ lt_prog_compiler_pic='-fPIC -shared' - ;; - -- osf3*) -- if test "$GCC" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator=: -+ osf3* | osf4* | osf5*) -+ lt_prog_compiler_wl='-Wl,' -+ # All OSF/1 code is PIC. -+ lt_prog_compiler_static='-non_shared' - ;; - -- osf4* | osf5*) # as osf3* with the addition of -msym flag -- if test "$GCC" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- else -- allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -- -- # Both c and cxx compiler support -rpath directly -- hardcode_libdir_flag_spec='-rpath $libdir' -- fi -- hardcode_libdir_separator=: -+ rdos*) -+ lt_prog_compiler_static='-non_shared' - ;; - - solaris*) -- no_undefined_flag=' -z text' -- if test "$GCC" = yes; then -- wlarc='${wl}' -- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -- else -- wlarc='' -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- fi -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_shlibpath_var=no -- case $host_os in -- solaris2.[0-5] | solaris2.[0-5].*) ;; -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl='-Qoption ld ';; - *) -- # 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?) -- 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 -- ;; -+ lt_prog_compiler_wl='-Wl,';; - esac -- link_all_deplibs=yes - ;; - - sunos4*) -- if test "x$host_vendor" = xsequent; then -- # Use $CC to link under sequent, because it throws in some extra .o -- # files that make .init and .fini sections work. -- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -- fi -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -- -- sysv4) -- case $host_vendor in -- sni) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=yes # is this really true??? -- ;; -- siemens) -- ## LD is ld it makes a PLAMLIB -- ## CC just makes a GrossModule. -- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- reload_cmds='$CC -r -o $output$reload_objs' -- hardcode_direct=no -- ;; -- motorola) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct=no #Motorola manual says yes, but my tests say they lie -- ;; -- esac -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var=no -+ lt_prog_compiler_wl='-Qoption ld ' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' - ;; - -- sysv4.3*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- export_dynamic_flag_spec='-Bexport' -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' - ;; - - sysv4*MP*) -- if test -d /usr/nec; then -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- ld_shlibs=yes -+ if test -d /usr/nec ;then -+ lt_prog_compiler_pic='-Kconform_pic' -+ lt_prog_compiler_static='-Bstatic' - fi - ;; - -- 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 -- runpath_var='LD_RUN_PATH' -- -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' - ;; - -- sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -- # link with -lc, and that would cause any symbols used from libc to -- # always be unresolved, which means just about no library would -- # ever link correctly. If we're not using GNU ld we use -z text -- # though, which does catch some bad symbols but isn't as heavy-handed -- # as -z defs. -- no_undefined_flag='${wl}-z,text' -- allow_undefined_flag='${wl}-z,nodefs' -- archive_cmds_need_lc=no -- hardcode_shlibpath_var=no -- hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -- hardcode_libdir_separator=':' -- link_all_deplibs=yes -- export_dynamic_flag_spec='${wl}-Bexport' -- runpath_var='LD_RUN_PATH' -- -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -+ unicos*) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_can_build_shared=no - ;; - - uts4*) -- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_shlibpath_var=no -+ lt_prog_compiler_pic='-pic' -+ lt_prog_compiler_static='-Bstatic' - ;; - - *) -- ld_shlibs=no -+ lt_prog_compiler_can_build_shared=no - ;; ++ 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 +@@ -9796,8 +9736,8 @@ if test -z "$aix_libpath"; then aix_libp esac fi -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } --test "$ld_shlibs" = no && can_build_shared=no -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic= -+ ;; -+ *) -+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -+$as_echo "$lt_prog_compiler_pic" >&6; } - --# --# Do we need to explicitly link libc? --# --case "x$archive_cmds_need_lc" in --x|xyes) -- # Assume -lc should be added -- archive_cmds_need_lc=yes - -- if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $archive_cmds in -- *'~'*) -- # FIXME: we may have to deal with multi-command sequences. -- ;; -- '$CC '*) -- # Test whether the compiler implicitly links with -lc since on some -- # systems, -lgcc has to come before -lc. If gcc already passes -lc -- # to ld, don't add -lc before -lgcc. -- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -- $rm conftest* -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext - -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } 2>conftest.err; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_prog_compiler_wl -- pic_flag=$lt_prog_compiler_pic -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$allow_undefined_flag -- allow_undefined_flag= -- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -- (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- then -- archive_cmds_need_lc=no -- else -- archive_cmds_need_lc=yes -- fi -- allow_undefined_flag=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $rm conftest* -- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 --$as_echo "$archive_cmds_need_lc" >&6; } -- ;; -- esac -- fi -- ;; --esac - --{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --$as_echo_n "checking dynamic linker characteristics... " >&6; } --library_names_spec= --libname_spec='lib$name' --soname_spec= --shrext_cmds=".so" --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" - --if test "$GCC" = yes; 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. -- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -- else -- 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` -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic"; then -+ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+ lt_cv_prog_compiler_pic_works=no -+ ac_outfile=conftest.$ac_objext -+ 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. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:9899: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:9903: \$? = $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. -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_pic_works=yes -+ fi -+ fi -+ $RM conftest* -+ - fi --need_lib_prefix=unknown --hardcode_into_libs=no -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --need_version=unknown -+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -+ case $lt_prog_compiler_pic in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -+ esac -+else -+ lt_prog_compiler_pic= -+ lt_prog_compiler_can_build_shared=no -+fi - --case $host_os in --aix3*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -- shlibpath_var=LIBPATH -+fi - -- # AIX 3 has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}${shared_ext}$major' -- ;; - --aix[4-9]*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- hardcode_into_libs=yes -- if test "$host_cpu" = ia64; then -- # AIX 5 supports IA64 -- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- else -- # With GCC up to 2.95.x, collect2 would create an import file -- # for dependence libraries. The import file would start with -- # the line `#! .'. This would cause the generated library to -- # depend on `.', always an invalid library. This was fixed in -- # development snapshots of GCC prior to 3.0. -- case $host_os in -- aix4 | aix4.[01] | aix4.[01].*) -- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -- echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -- : -- else -- can_build_shared=no -- fi -- ;; -- esac -- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -- # soname into executable. Probably we can add versioning support to -- # collect2, so additional links can be useful in future. -- if test "$aix_use_runtimelinking" = yes; then -- # If using run time linking (on AIX 4.2 or later) use lib<name>.so -- # instead of lib<name>.a to let people know that these are not -- # typical AIX shared libraries. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- else -- # We preserve .a as extension for shared libraries through AIX4.2 -- # and later when we are not doing run time linking. -- library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}${shared_ext}$major' -- fi -- shlibpath_var=LIBPATH -- fi -- ;; - --amigaos*) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -- ;; - --beos*) -- library_names_spec='${libname}${shared_ext}' -- dynamic_linker="$host_os ld.so" -- shlibpath_var=LIBRARY_PATH -- ;; -- --bsdi[45]*) -- version_type=linux -- 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' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- # the default ld.so.conf also contains /usr/contrib/lib and -- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -- # libtool to hard-code these into programs -- ;; -- --cygwin* | mingw* | pw32*) -- version_type=windows -- shrext_cmds=".dll" -- need_version=no -- need_lib_prefix=no -- -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32*) -- library_names_spec='$libname.dll.a' -- # DLL is installed to $(libdir)/../bin by postinstall_cmds -- postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -- dldir=$destdir/`dirname \$dlpath`~ -- test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname~ -- chmod a+x \$dldir/$dlname' -- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -- dlpath=$dir/\$dldll~ -- $rm \$dlpath' -- shlibpath_overrides_runpath=yes -- -- case $host_os in -- cygwin*) -- # Cygwin DLLs use 'cyg' prefix rather than 'lib' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -- ;; -- mingw*) -- # MinGW DLLs use traditional 'lib' prefix -- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- 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 ';[c-zC-Z]:/' >/dev/null; then -- # It is most probably a Windows format PATH printed by -- # mingw gcc, but we are running on Cygwin. Gcc prints its search -- # path with ; separators, and with drive letters. We can handle the -- # drive letters (cygwin fileutils understands them), so leave them, -- # especially as we might pass files found there to a mingw objdump, -- # which wouldn't understand a cygwinified path. Ahh. -- 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 -- ;; -- pw32*) -- # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- ;; -- esac -- ;; -- -- *) -- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -- ;; -- esac -- dynamic_linker='Win32 ld.exe' -- # FIXME: first we should search . and the directory the executable is in -- shlibpath_var=PATH -- ;; -- --darwin* | rhapsody*) -- dynamic_linker="$host_os dyld" -- version_type=darwin -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -- soname_spec='${libname}${release}${major}$shared_ext' -- shlibpath_overrides_runpath=yes -- shlibpath_var=DYLD_LIBRARY_PATH -- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- -- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" -- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -- ;; -- --dgux*) -- 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 -- ;; -- --freebsd1*) -- dynamic_linker=no -- ;; -- --freebsd* | dragonfly*) -- # DragonFly does not have aout. When/if they implement a new -- # versioning mechanism, adjust this. -- if test -x /usr/bin/objformat; then -- objformat=`/usr/bin/objformat` -- else -- case $host_os in -- freebsd[123]*) objformat=aout ;; -- *) objformat=elf ;; -- esac -- fi -- version_type=freebsd-$objformat -- case $version_type in -- freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- need_version=no -- need_lib_prefix=no -- ;; -- freebsd-*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -- need_version=yes -- ;; -- esac -- shlibpath_var=LD_LIBRARY_PATH -- case $host_os in -- freebsd2*) -- shlibpath_overrides_runpath=yes -- ;; -- freebsd3.[01]* | freebsdelf3.[01]*) -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -- freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- *) # from 4.6 on, and DragonFly -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- esac -- ;; -- --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 -- hardcode_into_libs=yes -- ;; -- --hpux9* | hpux10* | hpux11*) -- # Give a soname corresponding to the major version so that dld.sl refuses to -- # link against other versions. -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- case $host_cpu in -- ia64*) -- shrext_cmds='.so' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.so" -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- if test "X$HPUX_IA64_MODE" = X32; then -- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -- else -- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -- fi -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- hppa*64*) -- shrext_cmds='.sl' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- *) -- shrext_cmds='.sl' -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- ;; -- esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -- postinstall_cmds='chmod 555 $lib' -- ;; -- --interix[3-9]*) -- 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' -- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- --irix5* | irix6* | nonstopux*) -- case $host_os in -- nonstopux*) version_type=nonstopux ;; -- *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -- else -- version_type=irix -- fi ;; -- esac -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -- case $host_os in -- irix5* | nonstopux*) -- libsuff= shlibsuff= -- ;; -- *) -- case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -- libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -- libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -- libsuff=64 shlibsuff=64 libmagic=64-bit;; -- *) libsuff= shlibsuff= libmagic=never-match;; -- esac -- ;; -- esac -- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- hardcode_into_libs=yes -- ;; -- --# No shared lib support for Linux oldld, aout, or coff. --linux*oldld* | linux*aout* | linux*coff*) -- dynamic_linker=no -- ;; -- --# This must be Linux ELF. --linux* | k*bsd*-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' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- # This implies no fast_install, which is unacceptable. -- # Some rework will be needed to allow for fast_install -- # before this can be enabled. -- hardcode_into_libs=yes -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- -- # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" -- fi -- -- # We used to test for /lib/ld.so.1 and disable shared libraries on -- # powerpc, because MkLinux only supported shared libraries with the -- # GNU dynamic linker. Since this was broken with cross compilers, -- # most powerpc-linux boxes support dynamic linking these days and -- # people can always --disable-shared, the test was removed, and we -- # assume the GNU/Linux dynamic linker is in use. -- dynamic_linker='GNU/Linux ld.so' -- ;; -- --netbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- dynamic_linker='NetBSD (a.out) ld.so' -- else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- dynamic_linker='NetBSD ld.elf_so' -- fi -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- --newsos6) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- ;; -- --nto-qnx*) -- 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=yes -- ;; -- --openbsd*) -- version_type=sunos -- sys_lib_dlsearch_path_spec="/usr/lib" -- need_lib_prefix=no -- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -- case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -- esac -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case $host_os in -- openbsd2.[89] | openbsd2.[89].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -- else -- shlibpath_overrides_runpath=yes -- fi -- ;; -- --os2*) -- libname_spec='$name' -- shrext_cmds=".dll" -- need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -- dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -- ;; -- --osf3* | osf4* | osf5*) -- version_type=osf -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -- ;; -- --rdos*) -- dynamic_linker=no -- ;; -- --solaris*) -- 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=yes -- hardcode_into_libs=yes -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' -- ;; -- --sunos4*) -- version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- fi -- need_version=yes -- ;; -- --sysv4 | sysv4.3*) -- version_type=linux -- 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 -- case $host_vendor in -- sni) -- shlibpath_overrides_runpath=no -- need_lib_prefix=no -- export_dynamic_flag_spec='${wl}-Blargedynsym' -- runpath_var=LD_RUN_PATH -- ;; -- siemens) -- need_lib_prefix=no -- ;; -- motorola) -- need_lib_prefix=no -- need_version=no -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -- ;; -- esac -- ;; -- --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -- shlibpath_var=LD_LIBRARY_PATH -- fi -- ;; -- --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- version_type=freebsd-elf -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- if test "$with_gnu_ld" = yes; then -- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -- shlibpath_overrides_runpath=no -- else -- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -- shlibpath_overrides_runpath=yes -- case $host_os in -- sco3.2v5*) -- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -- ;; -- esac -- fi -- sys_lib_dlsearch_path_spec='/usr/lib' -- ;; -- --uts4*) -- version_type=linux -- 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 -- ;; -- --*) -- dynamic_linker=no -- ;; --esac --{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --$as_echo "$dynamic_linker" >&6; } --test "$dynamic_linker" = no && can_build_shared=no -- --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" --fi -- --sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" --if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" --fi -- --sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -- --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" --fi -- --{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --$as_echo_n "checking how to hardcode library paths into programs... " >&6; } --hardcode_action= --if test -n "$hardcode_libdir_flag_spec" || \ -- test -n "$runpath_var" || \ -- test "X$hardcode_automatic" = "Xyes" ; then -- -- # We can hardcode non-existant directories. -- if test "$hardcode_direct" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && -- test "$hardcode_minus_L" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action=immediate -- fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action=unsupported --fi --{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 --$as_echo "$hardcode_action" >&6; } -- --if test "$hardcode_action" = relink; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless --fi -- --striplib= --old_striplib= --{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 --$as_echo_n "checking whether stripping libraries is possible... " >&6; } --if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then -- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -- test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } --else --# FIXME - insert some real tests, host_os isn't really good enough -- case $host_os in -- darwin*) -- if test -n "$STRIP" ; then -- striplib="$STRIP -x" -- old_striplib="$STRIP -S" -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -- else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi -- ;; -- *) -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- ;; -- esac --fi -- --if test "x$enable_dlopen" != xyes; then -- enable_dlopen=unknown -- enable_dlopen_self=unknown -- enable_dlopen_self_static=unknown --else -- lt_cv_dlopen=no -- lt_cv_dlopen_libs= -- -- case $host_os in -- beos*) -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ;; -- -- mingw* | pw32*) -- lt_cv_dlopen="LoadLibrary" -- lt_cv_dlopen_libs= -- ;; -- -- cygwin*) -- lt_cv_dlopen="dlopen" -- lt_cv_dlopen_libs= -- ;; -- -- darwin*) -- # if libdl is installed we need to link against it -- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --$as_echo_n "checking for dlopen in -ldl... " >&6; } --if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); --int --main () --{ --return dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_dl_dlopen=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_dl_dlopen=no --fi -- --rm -rf conftest.dSYM --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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --$as_echo "$ac_cv_lib_dl_dlopen" >&6; } --if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" --else -- -- lt_cv_dlopen="dyld" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- --fi -- -- ;; -- -- *) -- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 --$as_echo_n "checking for shl_load... " >&6; } --if test "${ac_cv_func_shl_load+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define shl_load innocuous_shl_load -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char shl_load (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef shl_load -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char shl_load (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_shl_load || defined __stub___shl_load --choke me --#endif -- --int --main () --{ --return shl_load (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_shl_load=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_func_shl_load=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 --$as_echo "$ac_cv_func_shl_load" >&6; } --if test "x$ac_cv_func_shl_load" = x""yes; then -- lt_cv_dlopen="shl_load" --else -- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 --$as_echo_n "checking for shl_load in -ldld... " >&6; } --if test "${ac_cv_lib_dld_shl_load+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char shl_load (); --int --main () --{ --return shl_load (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_dld_shl_load=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_dld_shl_load=no --fi -- --rm -rf conftest.dSYM --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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 --$as_echo "$ac_cv_lib_dld_shl_load" >&6; } --if test "x$ac_cv_lib_dld_shl_load" = x""yes; then -- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" --else -- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 --$as_echo_n "checking for dlopen... " >&6; } --if test "${ac_cv_func_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define dlopen innocuous_dlopen -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char dlopen (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef dlopen -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_dlopen || defined __stub___dlopen --choke me --#endif -- --int --main () --{ --return dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_func_dlopen=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_func_dlopen=no --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 --$as_echo "$ac_cv_func_dlopen" >&6; } --if test "x$ac_cv_func_dlopen" = x""yes; then -- lt_cv_dlopen="dlopen" --else -- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --$as_echo_n "checking for dlopen in -ldl... " >&6; } --if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); --int --main () --{ --return dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_dl_dlopen=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_dl_dlopen=no --fi -- --rm -rf conftest.dSYM --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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --$as_echo "$ac_cv_lib_dl_dlopen" >&6; } --if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" --else -- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 --$as_echo_n "checking for dlopen in -lsvld... " >&6; } --if test "${ac_cv_lib_svld_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lsvld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); --int --main () --{ --return dlopen (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_svld_dlopen=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_svld_dlopen=no --fi -- --rm -rf conftest.dSYM --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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 --$as_echo "$ac_cv_lib_svld_dlopen" >&6; } --if test "x$ac_cv_lib_svld_dlopen" = x""yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" --else -- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 --$as_echo_n "checking for dld_link in -ldld... " >&6; } --if test "${ac_cv_lib_dld_dld_link+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dld_link (); --int --main () --{ --return dld_link (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_dld_dld_link=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_dld_dld_link=no --fi -- --rm -rf conftest.dSYM --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 --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 --$as_echo "$ac_cv_lib_dld_dld_link" >&6; } --if test "x$ac_cv_lib_dld_dld_link" = x""yes; then -- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" --fi -- -- --fi -- -- --fi -- -- --fi -- -- --fi -- -- --fi -- -- ;; -- esac -- -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -- enable_dlopen=no -- fi -- -- case $lt_cv_dlopen in -- dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -- -- save_LDFLAGS="$LDFLAGS" -- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -- -- save_LIBS="$LIBS" -- LIBS="$lt_cv_dlopen_libs $LIBS" -- -- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 --$as_echo_n "checking whether a program can dlopen itself... " >&6; } --if test "${lt_cv_dlopen_self+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- lt_cv_dlopen_self=cross --else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<EOF --#line 11161 "configure" --#include "confdefs.h" -- --#if HAVE_DLFCN_H --#include <dlfcn.h> --#endif -- --#include <stdio.h> -- --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -- --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -- --#ifdef __cplusplus --extern "C" void exit (int); --#endif -- --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -- -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -- else -- puts (dlerror ()); -- -- exit (status); --} --EOF -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) >&5 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; -- esac -- else : -- # compilation failed -- lt_cv_dlopen_self=no -- fi --fi --rm -fr conftest* -- -- --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 --$as_echo "$lt_cv_dlopen_self" >&6; } -- -- if test "x$lt_cv_dlopen_self" = xyes; then -- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 --$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } --if test "${lt_cv_dlopen_self_static+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- lt_cv_dlopen_self_static=cross --else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext <<EOF --#line 11261 "configure" --#include "confdefs.h" -- --#if HAVE_DLFCN_H --#include <dlfcn.h> --#endif -- --#include <stdio.h> -- --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -- --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -- --#ifdef __cplusplus --extern "C" void exit (int); --#endif -- --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -- -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -- else -- puts (dlerror ()); -- -- exit (status); --} --EOF -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) >&5 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -- x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; -- esac -- else : -- # compilation failed -- lt_cv_dlopen_self_static=no -- fi --fi --rm -fr conftest* -- -- --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 --$as_echo "$lt_cv_dlopen_self_static" >&6; } -- fi -- -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" -- ;; -- esac -- -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac -- -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -- esac --fi -- -- --# Report which library types will actually be built --{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 --$as_echo_n "checking if libtool supports shared libraries... " >&6; } --{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 --$as_echo "$can_build_shared" >&6; } -- --{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 --$as_echo_n "checking whether to build shared libraries... " >&6; } --test "$can_build_shared" = "no" && enable_shared=no -- --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. --case $host_os in --aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; -- --aix[4-9]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -- ;; --esac --{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 --$as_echo "$enable_shared" >&6; } -- --{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 --$as_echo_n "checking whether to build static libraries... " >&6; } --# Make sure either enable_shared or enable_static is yes. --test "$enable_shared" = yes || enable_static=yes --{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 --$as_echo "$enable_static" >&6; } -- --# The else clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# no rules to generate ltmain.sh. --if test -f "$ltmain"; then -- # 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 -- setopt NO_GLOB_SUBST -- fi -- # Now quote all the things that may contain metacharacters while being -- # careful not to overquote the AC_SUBSTed values. We take copies of the -- # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -- SED SHELL STRIP \ -- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -- deplibs_check_method reload_flag reload_cmds need_locks \ -- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -- lt_cv_sys_global_symbol_to_c_name_address \ -- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- old_postinstall_cmds old_postuninstall_cmds \ -- compiler \ -- CC \ -- LD \ -- lt_prog_compiler_wl \ -- lt_prog_compiler_pic \ -- lt_prog_compiler_static \ -- lt_prog_compiler_no_builtin_flag \ -- export_dynamic_flag_spec \ -- thread_safe_flag_spec \ -- whole_archive_flag_spec \ -- enable_shared_with_static_runtimes \ -- old_archive_cmds \ -- old_archive_from_new_cmds \ -- predep_objects \ -- postdep_objects \ -- predeps \ -- postdeps \ -- compiler_lib_search_path \ -- compiler_lib_search_dirs \ -- archive_cmds \ -- archive_expsym_cmds \ -- postinstall_cmds \ -- postuninstall_cmds \ -- old_archive_from_expsyms_cmds \ -- allow_undefined_flag \ -- no_undefined_flag \ -- export_symbols_cmds \ -- hardcode_libdir_flag_spec \ -- hardcode_libdir_flag_spec_ld \ -- hardcode_libdir_separator \ -- hardcode_automatic \ -- module_cmds \ -- module_expsym_cmds \ -- lt_cv_prog_compiler_c_o \ -- fix_srcfile_path \ -- exclude_expsyms \ -- include_expsyms; do -- -- case $var in -- old_archive_cmds | \ -- old_archive_from_new_cmds | \ -- archive_cmds | \ -- archive_expsym_cmds | \ -- module_cmds | \ -- module_expsym_cmds | \ -- old_archive_from_expsyms_cmds | \ -- export_symbols_cmds | \ -- extract_expsyms_cmds | reload_cmds | finish_cmds | \ -- postinstall_cmds | postuninstall_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -- # Double-quote double-evaled strings. -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -- ;; -- *) -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -- ;; -- esac -- done -- -- case $lt_echo in -- *'\$0 --fallback-echo"') -- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -- ;; -- esac -- --cfgfile="${ofile}T" -- trap "$rm \"$cfgfile\"; exit 1" 1 2 15 -- $rm -f "$cfgfile" -- { $as_echo "$as_me:$LINENO: creating $ofile" >&5 --$as_echo "$as_me: creating $ofile" >&6;} -- -- cat <<__EOF__ >> "$cfgfile" --#! $SHELL -- --# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# 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, 2002, 2003, 2004, 2005, 2006, 2007, 2008 --# Free Software Foundation, Inc. --# --# This file is part of GNU Libtool: --# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 --# --# This program is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or --# (at your option) any later version. --# --# This program 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 --# General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- --# A sed program that does not truncate output. --SED=$lt_SED -- --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="$SED -e 1s/^X//" -- --# 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 -- --# The names of the tagged configurations supported by this script. --available_tags= -- --# ### BEGIN LIBTOOL CONFIG -- --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -- --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -- --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared -- --# Whether or not to build static libraries. --build_old_libs=$enable_static -- --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$archive_cmds_need_lc -- --# Whether or not to disallow shared libs when runtime libs are static --allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -- --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install -- --# The host system. --host_alias=$host_alias --host=$host --host_os=$host_os -- --# The build system. --build_alias=$build_alias --build=$build --build_os=$build_os -- --# An echo program that does not interpret backslashes. --echo=$lt_echo -- --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS -- --# A C compiler. --LTCC=$lt_LTCC -- --# LTCC compiler flags. --LTCFLAGS=$lt_LTCFLAGS -- --# A language-specific compiler. --CC=$lt_compiler -- --# Is the compiler the GNU C compiler? --with_gcc=$GCC -- --# An ERE matcher. --EGREP=$lt_EGREP -- --# The linker used to build libraries. --LD=$lt_LD -- --# Whether we need hard or soft links. --LN_S=$lt_LN_S -- --# A BSD-compatible nm program. --NM=$lt_NM -- --# A symbol stripping program --STRIP=$lt_STRIP -- --# Used to examine libraries when file_magic_cmd begins "file" --MAGIC_CMD=$MAGIC_CMD -- --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" -- --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" -- --# Used on cygwin: assembler. --AS="$AS" -- --# The name of the directory that contains temporary libtool files. --objdir=$objdir -- --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -- --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl -- --# Object file suffix (normally "o"). --objext="$ac_objext" -- --# Old archive suffix (normally "a"). --libext="$libext" -- --# Shared library suffix (normally ".so"). --shrext_cmds='$shrext_cmds' -- --# Executable file suffix (normally ""). --exeext="$exeext" -- --# Additional compiler flags for building library objects. --pic_flag=$lt_lt_prog_compiler_pic --pic_mode=$pic_mode -- --# What is the maximum length of a command? --max_cmd_len=$lt_cv_sys_max_cmd_len -- --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_lt_cv_prog_compiler_c_o -- --# Must we lock files when doing compilation? --need_locks=$lt_need_locks -- --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix -- --# Do we need a version for libraries? --need_version=$need_version -- --# Whether dlopen is supported. --dlopen_support=$enable_dlopen -- --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self -- --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static -- --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_lt_prog_compiler_static -- --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -- --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -- --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec -- --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_thread_safe_flag_spec -- --# Library versioning type. --version_type=$version_type -- --# Format of library name prefix. --libname_spec=$lt_libname_spec -- --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$lt_library_names_spec -- --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec -- --# Commands used to build and install an old-style archive. --RANLIB=$lt_RANLIB --old_archive_cmds=$lt_old_archive_cmds --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -- --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -- --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -- --# Commands used to build and install a shared archive. --archive_cmds=$lt_archive_cmds --archive_expsym_cmds=$lt_archive_expsym_cmds --postinstall_cmds=$lt_postinstall_cmds --postuninstall_cmds=$lt_postuninstall_cmds -- --# Commands used to build a loadable module (assumed same as above if empty) --module_cmds=$lt_module_cmds --module_expsym_cmds=$lt_module_expsym_cmds -- --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib -- --# Dependencies to place before the objects being linked to create a --# shared library. --predep_objects=$lt_predep_objects -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdep_objects=$lt_postdep_objects -- --# Dependencies to place before the objects being linked to create a --# shared library. --predeps=$lt_predeps -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdeps=$lt_postdeps -- --# The directories searched by this compiler when creating a shared --# library --compiler_lib_search_dirs=$lt_compiler_lib_search_dirs -- --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_compiler_lib_search_path -- --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -- --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd -- --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag -- --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag -- --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds -- --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval -- --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -- --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -- --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -- --# This is the shared library runtime path variable. --runpath_var=$runpath_var -- --# This is the shared library path variable. --shlibpath_var=$shlibpath_var -- --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -- --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action -- --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -- --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -- --# If ld is used when linking, flag to hardcode \$libdir into --# a binary during linking. This must work even if \$libdir does --# not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -- --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator -- --# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$hardcode_direct -- --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$hardcode_minus_L -- --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var -- --# Set to yes if building a shared library automatically hardcodes DIR into the library --# and all subsequent libraries and executables linked against it. --hardcode_automatic=$hardcode_automatic -- --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" -- --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs -- --# Compile-time system search path for libraries --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -- --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -- --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- --# Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols -- --# The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds -- --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -- --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms -- --# Symbols that must always be exported. --include_expsyms=$lt_include_expsyms -- --# ### END LIBTOOL CONFIG -- --__EOF__ -- -- -- case $host_os in -- aix3*) -- cat <<\EOF >> "$cfgfile" -- --# AIX sometimes has problems with the GCC collect2 program. For some --# reason, if we set the COLLECT_NAMES environment variable, the problems --# vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -- COLLECT_NAMES= -- export COLLECT_NAMES --fi --EOF -- ;; -- esac -- -- # We use sed instead of cat because bash on DJGPP gets confused if -- # if finds mixed CR/LF and LF-only lines. Since sed operates in -- # text mode, it properly converts lines to CR/LF. This bash problem -- # is reportedly fixed, but why not run on old versions too? -- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) -- -- mv -f "$cfgfile" "$ofile" || \ -- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -- chmod +x "$ofile" -- --else -- # If there is no Makefile yet, we rely on a make rule to execute -- # `config.status --recheck' to rerun these tests and create the -- # libtool script then. -- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -- if test -f "$ltmain_in"; then -- test -f Makefile && make "$ltmain" -- fi --fi -- -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --CC="$lt_save_CC" -- -- --# Check whether --with-tags was given. --if test "${with_tags+set}" = set; then -- withval=$with_tags; tagnames="$withval" --fi -- -- --if test -f "$ltmain" && test -n "$tagnames"; then -- if test ! -f "${ofile}"; then -- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 --$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} -- fi -- -- if test -z "$LTCC"; then -- eval "`$SHELL ${ofile} --config | grep '^LTCC='`" -- if test -z "$LTCC"; then -- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 --$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} -- else -- { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 --$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} -- fi -- fi -- if test -z "$LTCFLAGS"; then -- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" -- fi -- -- # Extract list of available tagged configurations in $ofile. -- # Note that this assumes the entire list is on one line. -- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` -- -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for tagname in $tagnames; do -- IFS="$lt_save_ifs" -- # Check whether tagname contains only valid characters -- case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in -- "") ;; -- *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 --$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- esac -- -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null -- then -- { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 --$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- # Update the list of available tags. -- if test -n "$tagname"; then -- echo appending configuration tag \"$tagname\" to $ofile -- -- case $tagname in -- CXX) -- if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -- -- -- -- --archive_cmds_need_lc_CXX=no --allow_undefined_flag_CXX= --always_export_symbols_CXX=no --archive_expsym_cmds_CXX= --export_dynamic_flag_spec_CXX= --hardcode_direct_CXX=no --hardcode_libdir_flag_spec_CXX= --hardcode_libdir_flag_spec_ld_CXX= --hardcode_libdir_separator_CXX= --hardcode_minus_L_CXX=no --hardcode_shlibpath_var_CXX=unsupported --hardcode_automatic_CXX=no --module_cmds_CXX= --module_expsym_cmds_CXX= --link_all_deplibs_CXX=unknown --old_archive_cmds_CXX=$old_archive_cmds --no_undefined_flag_CXX= --whole_archive_flag_spec_CXX= --enable_shared_with_static_runtimes_CXX=no -- --# Dependencies to place before and after the object being linked: --predep_objects_CXX= --postdep_objects_CXX= --predeps_CXX= --postdeps_CXX= --compiler_lib_search_path_CXX= --compiler_lib_search_dirs_CXX= -- --# Source file extension for C++ test sources. --ac_ext=cpp -- --# Object file extension for compiled C++ test sources. --objext=o --objext_CXX=$objext -- --# Code to be used in simple compile tests --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); }' -- --# ltmain only uses $CC for tagged configurations so make sure $CC is set. -- --# If no C compiler was specified, use CC. --LTCC=${LTCC-"$CC"} -- --# If no C compiler flags were specified, use CFLAGS. --LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -- --# Allow CC to be a program name with arguments. --compiler=$CC -- -- --# save warnings/boilerplate of simple test code --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* -- --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 -r conftest* -- -- --# Allow CC to be a program name with arguments. --lt_save_CC=$CC --lt_save_LD=$LD --lt_save_GCC=$GCC --GCC=$GXX --lt_save_with_gnu_ld=$with_gnu_ld --lt_save_path_LD=$lt_cv_path_LD --if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx --else -- $as_unset lt_cv_prog_gnu_ld --fi --if test -n "${lt_cv_path_LDCXX+set}"; then -- lt_cv_path_LD=$lt_cv_path_LDCXX --else -- $as_unset lt_cv_path_LD --fi --test -z "${LDCXX+set}" || LD=$LDCXX --CC=${CXX-"c++"} --compiler=$CC --compiler_CXX=$CC --for cc_temp in $compiler""; do -- case $cc_temp in -- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -- -- --# We don't want -fno-exception wen compiling C++ code, so set the --# no_builtin_flag separately --if test "$GXX" = yes; then -- lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' --else -- lt_prog_compiler_no_builtin_flag_CXX= --fi -- --if test "$GXX" = yes; then -- # Set up default GNU C++ configuration -- -- --# Check whether --with-gnu-ld was given. --if test "${with_gnu_ld+set}" = set; then -- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes --else -- with_gnu_ld=no --fi -- --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 --$as_echo_n "checking for ld used by $CC... " >&6; } -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [\\/]* | ?:[\\/]*) -- re_direlt='/[^/][^/]*/\.\./' -- # Canonicalize the pathname of ld -- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac --elif test "$with_gnu_ld" = yes; then -- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 --$as_echo_n "checking for GNU ld... " >&6; } --else -- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 --$as_echo_n "checking for non-GNU ld... " >&6; } --fi --if test "${lt_cv_path_LD+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- if test -z "$LD"; then -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH; do -- IFS="$lt_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- lt_cv_path_LD="$ac_dir/$ac_prog" -- # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some variants of GNU ld only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in -- *GNU* | *'with BFD'*) -- test "$with_gnu_ld" != no && break -- ;; -- *) -- test "$with_gnu_ld" != yes && break -- ;; -- esac -- fi -- done -- IFS="$lt_save_ifs" --else -- lt_cv_path_LD="$LD" # Let the user override the test with a path. --fi --fi -- --LD="$lt_cv_path_LD" --if test -n "$LD"; then -- { $as_echo "$as_me:$LINENO: result: $LD" >&5 --$as_echo "$LD" >&6; } --else -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } --fi --test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 --$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -- { (exit 1); exit 1; }; } --{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 --$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } --if test "${lt_cv_prog_gnu_ld+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- # I'd rather use --version here, but apparently some GNU lds only accept -v. --case `$LD -v 2>&1 </dev/null` in --*GNU* | *'with BFD'*) -- lt_cv_prog_gnu_ld=yes -- ;; --*) -- lt_cv_prog_gnu_ld=no -- ;; --esac --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 --$as_echo "$lt_cv_prog_gnu_ld" >&6; } --with_gnu_ld=$lt_cv_prog_gnu_ld -- -- -- -- # Check if GNU C++ uses GNU ld as the underlying linker, since the -- # archiving commands below assume that GNU ld is being used. -- if test "$with_gnu_ld" = yes; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- -- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -- -- # If archive_cmds runs LD, not CC, wlarc should be empty -- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -- # investigate it a little bit more. (MM) -- wlarc='${wl}' -- -- # ancient GNU ld didn't support --whole-archive et. al. -- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ -- grep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec_CXX= -- fi -- else -- with_gnu_ld=no -- wlarc= -- -- # A generic and very simple default shared library creation -- # command for GNU C++ for the case where it uses the native -- # linker, instead of GNU ld. If possible, this setting should -- # overridden to take advantage of the native linker features on -- # the platform it is being used on. -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- fi -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -- --else -- GXX=no -- with_gnu_ld=no -- wlarc= --fi -- --# PORTME: fill in a description of your system's C++ link characteristics --{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } --ld_shlibs_CXX=yes --case $host_os in -- aix3*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- aix[4-9]*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- aix_use_runtimelinking=no -- -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -- for ld_flag in $LDFLAGS; do -- case $ld_flag in -- *-brtl*) -- aix_use_runtimelinking=yes -- break -- ;; -- esac -- done -- ;; -- esac -- -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -- fi -- -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -- -- archive_cmds_CXX='' -- hardcode_direct_CXX=yes -- hardcode_libdir_separator_CXX=':' -- link_all_deplibs_CXX=yes -- -- if test "$GXX" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -- # We only want to do this on AIX 4.2 and lower, the check -- # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -- then -- # We have reworked collect2 -- : -- else -- # We have old collect2 -- hardcode_direct_CXX=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L_CXX=yes -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- hardcode_libdir_separator_CXX= -- fi -- ;; -- esac -- shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -- fi -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -- fi -- fi -- fi -- -- # It seems that -bexpall does not export symbols beginning with -- # underscore (_), so it is better to generate a list of symbols to export. -- always_export_symbols_CXX=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag_CXX='-berok' -- # Determine the default libpath from the value encoded in an empty executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $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 "$lt_aix_libpath_sed"` --fi --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- --fi -- --rm -rf conftest.dSYM --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 -- -- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -- -- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' -- allow_undefined_flag_CXX="-z nodefs" -- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an empty executable. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_cxx_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $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 "$lt_aix_libpath_sed"` --fi --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- --fi -- --rm -rf conftest.dSYM --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 -- -- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- no_undefined_flag_CXX=' ${wl}-bernotok' -- allow_undefined_flag_CXX=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- whole_archive_flag_spec_CXX='$convenience' -- archive_cmds_need_lc_CXX=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -- fi -- fi -- ;; -- -- beos*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- allow_undefined_flag_CXX=unsupported -- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- ld_shlibs_CXX=no -- fi -- ;; -- -- chorus*) -- case $cc_basename in -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- esac -- ;; -- -- cygwin* | mingw* | pw32*) -- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_CXX='-L$libdir' -- allow_undefined_flag_CXX=unsupported -- always_export_symbols_CXX=no -- enable_shared_with_static_runtimes_CXX=yes -- -- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs_CXX=no -- fi -- ;; -- darwin* | rhapsody*) -- archive_cmds_need_lc_CXX=no -- hardcode_direct_CXX=no -- hardcode_automatic_CXX=yes -- hardcode_shlibpath_var_CXX=unsupported -- whole_archive_flag_spec_CXX='' -- link_all_deplibs_CXX=yes -- allow_undefined_flag_CXX="$_lt_dar_allow_undefined" -- if test "$GXX" = yes ; then -- output_verbose_link_cmd='echo' -- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -- if test "$lt_cv_apple_cc_single_mod" != "yes"; then -- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -- fi -- else -- 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` $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 $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}' -- ;; -- *) -- ld_shlibs_CXX=no -- ;; -- esac -- fi -- ;; -- -- dgux*) -- case $cc_basename in -- ec++*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- ghcx*) -- # Green Hills C++ Compiler -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- esac -- ;; -- freebsd[12]*) -- # C++ shared libraries reported to be fairly broken before switch to ELF -- ld_shlibs_CXX=no -- ;; -- freebsd-elf*) -- archive_cmds_need_lc_CXX=no -- ;; -- freebsd* | dragonfly*) -- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -- # conventions -- ld_shlibs_CXX=yes -- ;; -- gnu*) -- ;; -- hpux9*) -- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator_CXX=: -- export_dynamic_flag_spec_CXX='${wl}-E' -- hardcode_direct_CXX=yes -- hardcode_minus_L_CXX=yes # Not in the search PATH, -- # but as the default -- # location of the library. -- -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- aCC*) -- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- *) -- if test "$GXX" = yes; then -- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- else -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- fi -- ;; -- esac -- ;; -- hpux10*|hpux11*) -- if test $with_gnu_ld = no; then -- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator_CXX=: -- -- case $host_cpu in -- hppa*64*|ia64*) ;; -- *) -- export_dynamic_flag_spec_CXX='${wl}-E' -- ;; -- esac -- fi -- case $host_cpu in -- hppa*64*|ia64*) -- hardcode_direct_CXX=no -- hardcode_shlibpath_var_CXX=no -- ;; -- *) -- hardcode_direct_CXX=yes -- hardcode_minus_L_CXX=yes # Not in the search PATH, -- # but as the default -- # location of the library. -- ;; -- esac -- -- case $cc_basename in -- CC*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- aCC*) -- case $host_cpu in -- hppa*64*) -- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- ia64*) -- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- *) -- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- esac -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- ;; -- *) -- if test "$GXX" = yes; then -- if test $with_gnu_ld = no; then -- case $host_cpu in -- hppa*64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- ia64*) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- *) -- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- ;; -- esac -- fi -- else -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- fi -- ;; -- esac -- ;; -- interix[3-9]*) -- hardcode_direct_CXX=no -- hardcode_shlibpath_var_CXX=no -- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_CXX='${wl}-E' -- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -- # Instead, shared libraries are loaded at an image base (0x10000000 by -- # default) and relocated if they conflict, which is a slow very memory -- # consuming and fragmenting process. To avoid this, we pick a random, -- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -- # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- archive_expsym_cmds_CXX='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' -- ;; -- irix5* | irix6*) -- case $cc_basename in -- CC*) -- # SGI C++ -- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- -- # Archives containing C++ object files must be created using -- # "CC -ar", where "CC" is the IRIX C++ compiler. This is -- # necessary to make sure instantiated templates are included -- # in the archive. -- old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' -- ;; -- *) -- if test "$GXX" = yes; then -- if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -- fi -- fi -- link_all_deplibs_CXX=yes -- ;; -- esac -- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_CXX=: -- ;; -- linux* | k*bsd*-gnu) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -- -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -- -- hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -- -- # Archives containing C++ object files must be created using -- # "CC -Bstatic", where "CC" is the KAI C++ compiler. -- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' -- ;; -- icpc*) -- # Intel C++ -- with_gnu_ld=yes -- # version 8.0 and above of icpc choke on multiply defined symbols -- # if we add $predep_objects and $postdep_objects, however 7.1 and -- # earlier do not add the objects themselves. -- case `$CC -V 2>&1` in -- *"Version 7."*) -- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- ;; -- *) # Version 8.0 or newer -- tmp_idyn= -- case $host_cpu in -- ia64*) tmp_idyn=' -i_dynamic';; -- esac -- archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- ;; -- esac -- archive_cmds_need_lc_CXX=no -- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -- ;; -- pgCC* | pgcpp*) -- # Portland Group C++ compiler -- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -- -- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- ;; -- cxx*) -- # Compaq C++ -- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -- -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec_CXX='-rpath $libdir' -- hardcode_libdir_separator_CXX=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # 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*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- m88k*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- mvs*) -- case $cc_basename in -- cxx*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- esac -- ;; -- netbsd*) -- 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= -- hardcode_libdir_flag_spec_CXX='-R$libdir' -- hardcode_direct_CXX=yes -- hardcode_shlibpath_var_CXX=no -- fi -- # Workaround some broken pre-1.5 toolchains -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -- ;; -- openbsd2*) -- # C++ shared libraries are fairly broken -- ld_shlibs_CXX=no -- ;; -- openbsd*) -- 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 -- ;; -- osf3*) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -- -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- -- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -- hardcode_libdir_separator_CXX=: -- -- # Archives containing C++ object files must be created using -- # "CC -Bstatic", where "CC" is the KAI C++ compiler. -- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' -- -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- cxx*) -- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- -- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_CXX=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' -- ;; -- *) -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- -- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_CXX=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -- -- else -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- fi -- ;; -- esac -- ;; -- osf4* | osf5*) -- case $cc_basename in -- KCC*) -- # Kuck and Associates, Inc. (KAI) C++ Compiler -- -- # KCC will only create a shared library if the output file -- # ends with ".so" (or ".sl" for HP-UX), so rename the library -- # to its proper name (with version) after linking. -- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- -- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -- hardcode_libdir_separator_CXX=: -- -- # Archives containing C++ object files must be created using -- # the KAI C++ compiler. -- old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- cxx*) -- allow_undefined_flag_CXX=' -expect_unresolved \*' -- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -- echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ -- $rm $lib.exp' -- -- hardcode_libdir_flag_spec_CXX='-rpath $libdir' -- hardcode_libdir_separator_CXX=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "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' -- ;; -- *) -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- -- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_CXX=: -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' -- -- else -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- fi -- ;; -- esac -- ;; -- psos*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- sunos4*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.x -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- lcc*) -- # Lucid -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- esac -- ;; -- solaris*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.2, 5.x and Centerline C++ -- archive_cmds_need_lc_CXX=yes -- 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='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -- -- hardcode_libdir_flag_spec_CXX='-R$libdir' -- hardcode_shlibpath_var_CXX=no -- case $host_os in -- solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) -- # 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='-z allextract$convenience -z defaultextract' -- ;; -- esac -- link_all_deplibs_CXX=yes -- -- 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' -- ;; -- gcx*) -- # Green Hills C++ Compiler -- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- -- # The C++ compiler must be used to create the archive. -- old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -- ;; -- *) -- # GNU C++ compiler with Solaris linker -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- no_undefined_flag_CXX=' ${wl}-z ${wl}defs' -- if $CC --version | grep -v '^2\.7' > /dev/null; then -- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -- else -- # g++ 2.7 appears to require `-G' NOT `-shared' on this -- # platform. -- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' -- -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" -- 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 -- ;; -- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -- no_undefined_flag_CXX='${wl}-z,text' -- archive_cmds_need_lc_CXX=no -- hardcode_shlibpath_var_CXX=no -- runpath_var='LD_RUN_PATH' -- -- case $cc_basename in -- CC*) -- archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- ;; -- sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -- # link with -lc, and that would cause any symbols used from libc to -- # always be unresolved, which means just about no library would -- # ever link correctly. If we're not using GNU ld we use -z text -- # though, which does catch some bad symbols but isn't as heavy-handed -- # as -z defs. -- # For security reasons, it is highly recommended that you always -- # use absolute paths for naming shared libraries, and exclude the -- # DT_RUNPATH tag from executables and libraries. But doing so -- # requires that you compile everything twice, which is a pain. -- # So that behaviour is only enabled if SCOABSPATH is set to a -- # non-empty value in the environment. Most likely only useful for -- # creating official distributions of packages. -- # This is a hack until libtool officially supports absolute path -- # names for shared libraries. -- no_undefined_flag_CXX='${wl}-z,text' -- allow_undefined_flag_CXX='${wl}-z,nodefs' -- archive_cmds_need_lc_CXX=no -- hardcode_shlibpath_var_CXX=no -- hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -- hardcode_libdir_separator_CXX=':' -- link_all_deplibs_CXX=yes -- export_dynamic_flag_spec_CXX='${wl}-Bexport' -- runpath_var='LD_RUN_PATH' -- -- case $cc_basename in -- CC*) -- archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- ;; -- tandem*) -- case $cc_basename in -- NCC*) -- # NonStop-UX NCC 3.20 -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- esac -- ;; -- vxworks*) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; -- *) -- # FIXME: insert proper C++ library support -- ld_shlibs_CXX=no -- ;; --esac --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 --$as_echo "$ld_shlibs_CXX" >&6; } --test "$ld_shlibs_CXX" = no && can_build_shared=no -- --GCC_CXX="$GXX" --LD_CXX="$LD" -- --cat > conftest.$ac_ext <<EOF --class Foo --{ --public: -- Foo (void) { a = 0; } --private: -- int a; --}; --EOF -- --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Parse the compiler output and extract the necessary -- # objects, libraries and library flags. -- -- # Sentinel used to keep track of whether or not we are before -- # the conftest object file. -- pre_test_object_deps_done=no -- -- # The `*' in the case matches for architectures that use `case' in -- # $output_verbose_cmd can trigger glob expansion during the loop -- # eval without this substitution. -- output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` -- -- for p in `eval $output_verbose_link_cmd`; do -- case $p in -- -- -L* | -R* | -l*) -- # Some compilers place space between "-{L,R}" and the path. -- # Remove the space. -- if test $p = "-L" \ -- || test $p = "-R"; then -- prev=$p -- continue -- else -- prev= -- fi -- -- if test "$pre_test_object_deps_done" = no; then -- case $p in -- -L* | -R*) -- # Internal compiler library paths should come after those -- # provided the user. The postdeps already come after the -- # user supplied libs so there is no need to process them. -- if test -z "$compiler_lib_search_path_CXX"; then -- compiler_lib_search_path_CXX="${prev}${p}" -- else -- compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" -- fi -- ;; -- # The "-l" case would never come before the object being -- # linked, so don't bother handling this case. -- esac -- else -- if test -z "$postdeps_CXX"; then -- postdeps_CXX="${prev}${p}" -- else -- postdeps_CXX="${postdeps_CXX} ${prev}${p}" -- fi -- fi -- ;; -- -- *.$objext) -- # This assumes that the test object file only shows up -- # once in the compiler output. -- if test "$p" = "conftest.$objext"; then -- pre_test_object_deps_done=yes -- continue -- fi -- -- if test "$pre_test_object_deps_done" = no; then -- if test -z "$predep_objects_CXX"; then -- predep_objects_CXX="$p" -- else -- predep_objects_CXX="$predep_objects_CXX $p" -- fi -- else -- if test -z "$postdep_objects_CXX"; then -- postdep_objects_CXX="$p" -- else -- postdep_objects_CXX="$postdep_objects_CXX $p" -- fi -- fi -- ;; -- -- *) ;; # Ignore the rest. -- -- esac -- done -- -- # Clean up. -- rm -f a.out a.exe --else -- echo "libtool.m4: error: problem compiling CXX test program" --fi -- --$rm -f confest.$objext -- --compiler_lib_search_dirs_CXX= --if test -n "$compiler_lib_search_path_CXX"; then -- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` --fi -- --# PORTME: override above test on systems where it is broken --case $host_os in --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= -- postdep_objects_CXX= -- 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. -- if test "$solaris_use_stlport4" != yes; then -- postdeps_CXX='-library=Cstd -library=Crun' -- fi -- ;; -- esac -- ;; --esac -- --case " $postdeps_CXX " in --*" -lc "*) archive_cmds_need_lc_CXX=no ;; --esac -- --lt_prog_compiler_wl_CXX= --lt_prog_compiler_pic_CXX= --lt_prog_compiler_static_CXX= -- --{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -- -- # C++ specific cases for pic, static, wl, etc. -- if test "$GXX" = yes; then -- lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_static_CXX='-static' -- -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_prog_compiler_static_CXX='-Bstatic' -- fi -- ;; -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' -- ;; -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- 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*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- lt_prog_compiler_pic_CXX='-fno-common' -- ;; -- *djgpp*) -- # DJGPP does not support shared libraries at all -- lt_prog_compiler_pic_CXX= -- ;; -- interix[3-9]*) -- # Interix 3.x gcc -fpic/-fPIC options generate broken code. -- # Instead, we relocate shared libraries at runtime. -- ;; -- sysv4*MP*) -- if test -d /usr/nec; then -- lt_prog_compiler_pic_CXX=-Kconform_pic -- fi -- ;; -- hpux*) -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- ;; -- *) -- lt_prog_compiler_pic_CXX='-fPIC' -- ;; -- esac -- ;; -- *) -- lt_prog_compiler_pic_CXX='-fPIC' -- ;; -- esac -- else -- case $host_os in -- aix[4-9]*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_prog_compiler_static_CXX='-Bstatic' -- else -- lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' -- fi -- ;; -- chorus*) -- case $cc_basename in -- cxch68*) -- # Green Hills C++ Compiler -- # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -- ;; -- esac -- ;; -- darwin*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- case $cc_basename in -- xlc*) -- lt_prog_compiler_pic_CXX='-qnocommon' -- lt_prog_compiler_wl_CXX='-Wl,' -- ;; -- esac -- ;; -- dgux*) -- case $cc_basename in -- ec++*) -- lt_prog_compiler_pic_CXX='-KPIC' -- ;; -- ghcx*) -- # Green Hills C++ Compiler -- lt_prog_compiler_pic_CXX='-pic' -- ;; -- *) -- ;; -- esac -- ;; -- freebsd* | dragonfly*) -- # FreeBSD uses GNU C++ -- ;; -- hpux9* | hpux10* | hpux11*) -- case $cc_basename in -- CC*) -- lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' -- if test "$host_cpu" != ia64; then -- lt_prog_compiler_pic_CXX='+Z' -- fi -- ;; -- aCC*) -- lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- lt_prog_compiler_pic_CXX='+Z' -- ;; -- esac -- ;; -- *) -- ;; -- esac -- ;; -- interix*) -- # This is c89, which is MS Visual C++ (no shared libs) -- # Anyone wants to do a port? -- ;; -- irix5* | irix6* | nonstopux*) -- case $cc_basename in -- CC*) -- lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_static_CXX='-non_shared' -- # CC pic flag -KPIC is the default. -- ;; -- *) -- ;; -- esac -- ;; -- linux* | k*bsd*-gnu) -- case $cc_basename in -- KCC*) -- # KAI C++ Compiler -- lt_prog_compiler_wl_CXX='--backend -Wl,' -- lt_prog_compiler_pic_CXX='-fPIC' -- ;; -- icpc* | ecpc*) -- # Intel C++ -- lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_pic_CXX='-KPIC' -- lt_prog_compiler_static_CXX='-static' -- ;; -- pgCC* | pgcpp*) -- # Portland Group C++ compiler. -- lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_pic_CXX='-fpic' -- lt_prog_compiler_static_CXX='-Bstatic' -- ;; -- cxx*) -- # Compaq C++ -- # Make sure the PIC flag is empty. It appears that all Alpha -- # Linux and Compaq Tru64 Unix objects are PIC. -- lt_prog_compiler_pic_CXX= -- 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 -- ;; -- lynxos*) -- ;; -- m88k*) -- ;; -- mvs*) -- case $cc_basename in -- cxx*) -- lt_prog_compiler_pic_CXX='-W c,exportall' -- ;; -- *) -- ;; -- esac -- ;; -- netbsd*) -- ;; -- osf3* | osf4* | osf5*) -- case $cc_basename in -- KCC*) -- lt_prog_compiler_wl_CXX='--backend -Wl,' -- ;; -- RCC*) -- # Rational C++ 2.4.1 -- lt_prog_compiler_pic_CXX='-pic' -- ;; -- cxx*) -- # Digital/Compaq C++ -- lt_prog_compiler_wl_CXX='-Wl,' -- # Make sure the PIC flag is empty. It appears that all Alpha -- # Linux and Compaq Tru64 Unix objects are PIC. -- lt_prog_compiler_pic_CXX= -- lt_prog_compiler_static_CXX='-non_shared' -- ;; -- *) -- ;; -- esac -- ;; -- psos*) -- ;; -- solaris*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.2, 5.x and Centerline C++ -- lt_prog_compiler_pic_CXX='-KPIC' -- lt_prog_compiler_static_CXX='-Bstatic' -- lt_prog_compiler_wl_CXX='-Qoption ld ' -- ;; -- gcx*) -- # Green Hills C++ Compiler -- lt_prog_compiler_pic_CXX='-PIC' -- ;; -- *) -- ;; -- esac -- ;; -- sunos4*) -- case $cc_basename in -- CC*) -- # Sun C++ 4.x -- lt_prog_compiler_pic_CXX='-pic' -- lt_prog_compiler_static_CXX='-Bstatic' -- ;; -- lcc*) -- # Lucid -- lt_prog_compiler_pic_CXX='-pic' -- ;; -- *) -- ;; -- esac -- ;; -- tandem*) -- case $cc_basename in -- NCC*) -- # NonStop-UX NCC 3.20 -- lt_prog_compiler_pic_CXX='-KPIC' -- ;; -- *) -- ;; -- esac -- ;; -- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -- case $cc_basename in -- CC*) -- lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_pic_CXX='-KPIC' -- lt_prog_compiler_static_CXX='-Bstatic' -- ;; -- esac -- ;; -- vxworks*) -- ;; -- *) -- lt_prog_compiler_can_build_shared_CXX=no -- ;; -- esac -- fi -- --{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 --$as_echo "$lt_prog_compiler_pic_CXX" >&6; } -- --# --# Check to make sure the PIC flag actually works. --# --if test -n "$lt_prog_compiler_pic_CXX"; then -- --{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 --$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } --if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_pic_works_CXX=no -- ac_outfile=conftest.$ac_objext -- 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. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- # The option is referenced via a variable to avoid confusing sed. -- lt_compile=`echo "$ac_compile" | $SED \ -- -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:13670: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>conftest.err) -- ac_status=$? -- cat conftest.err >&5 -- echo "$as_me:13674: \$? = $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. -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_pic_works_CXX=yes -- fi -- fi -- $rm conftest* -- --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 --$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } -- --if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then -- case $lt_prog_compiler_pic_CXX in -- "" | " "*) ;; -- *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -- esac --else -- lt_prog_compiler_pic_CXX= -- lt_prog_compiler_can_build_shared_CXX=no --fi -- --fi --case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -- *djgpp*) -- lt_prog_compiler_pic_CXX= -- ;; -- *) -- lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" -- ;; --esac -- --# --# Check to make sure the static flag actually works. --# --wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" --{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 --$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } --if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_static_works_CXX=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- 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 -- if test -s conftest.err; then -- # Append any errors to the config.log. -- cat conftest.err 1>&5 -- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if diff conftest.exp conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_static_works_CXX=yes -- fi -- else -- lt_cv_prog_compiler_static_works_CXX=yes -- fi -- fi -- $rm -r conftest* -- LDFLAGS="$save_LDFLAGS" -- --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 --$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } -- --if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then -- : --else -- lt_prog_compiler_static_CXX= --fi -- -- --{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_c_o_CXX=no -- $rm -r conftest 2>/dev/null -- mkdir conftest -- cd conftest -- mkdir out -- 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 -- # (2) before a word containing "conftest.", or (3) at the end. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- lt_compile=`echo "$ac_compile" | $SED \ -- -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:13774: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>out/conftest.err) -- ac_status=$? -- cat out/conftest.err >&5 -- echo "$as_me:13778: \$? = $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 -- # So say no if there are warnings -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_c_o_CXX=yes -- fi -- fi -- chmod u+w . 2>&5 -- $rm conftest* -- # SGI C++ compiler will create directory out/ii_files/ for -- # template instantiation -- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -- $rm out/* && rmdir out -- cd .. -- rmdir conftest -- $rm conftest* -- --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 --$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -- -- --hard_links="nottested" --if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then -- # do not overwrite the value of need_locks provided by the user -- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --$as_echo_n "checking if we can lock with hard links... " >&6; } -- hard_links=yes -- $rm conftest* -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- touch conftest.a -- ln conftest.a conftest.b 2>&5 || hard_links=no -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 --$as_echo "$hard_links" >&6; } -- if test "$hard_links" = no; then -- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -- need_locks=warn -- fi --else -- need_locks=no --fi -- --{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -- -- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- case $host_os in -- aix[4-9]*) -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -- else -- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -- fi -- ;; -- pw32*) -- 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 '\''s/.* //'\'' | sort | uniq > $export_symbols' -- ;; -- esac -- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -- --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 --$as_echo "$ld_shlibs_CXX" >&6; } --test "$ld_shlibs_CXX" = no && can_build_shared=no -- --# --# Do we need to explicitly link libc? --# --case "x$archive_cmds_need_lc_CXX" in --x|xyes) -- # Assume -lc should be added -- archive_cmds_need_lc_CXX=yes -- -- if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $archive_cmds_CXX in -- *'~'*) -- # FIXME: we may have to deal with multi-command sequences. -- ;; -- '$CC '*) -- # Test whether the compiler implicitly links with -lc since on some -- # systems, -lgcc has to come before -lc. If gcc already passes -lc -- # to ld, don't add -lc before -lgcc. -- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -- $rm conftest* -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext -- -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } 2>conftest.err; then -- soname=conftest -- lib=conftest -- libobjs=conftest.$ac_objext -- deplibs= -- wl=$lt_prog_compiler_wl_CXX -- pic_flag=$lt_prog_compiler_pic_CXX -- compiler_flags=-v -- linker_flags=-v -- verstring= -- output_objdir=. -- libname=conftest -- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX -- allow_undefined_flag_CXX= -- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -- (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -- ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -- then -- archive_cmds_need_lc_CXX=no -- else -- archive_cmds_need_lc_CXX=yes -- fi -- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag -- else -- cat conftest.err 1>&5 -- fi -- $rm conftest* -- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 --$as_echo "$archive_cmds_need_lc_CXX" >&6; } -- ;; -- esac -- fi -- ;; --esac -- --{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --$as_echo_n "checking dynamic linker characteristics... " >&6; } --library_names_spec= --libname_spec='lib$name' --soname_spec= --shrext_cmds=".so" --postinstall_cmds= --postuninstall_cmds= --finish_cmds= --finish_eval= --shlibpath_var= --shlibpath_overrides_runpath=unknown --version_type=none --dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" -- --need_lib_prefix=unknown --hardcode_into_libs=no -- --# when you set need_version to no, make sure it does not cause -set_version --# flags to be left without arguments --need_version=unknown -- --case $host_os in --aix3*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -- shlibpath_var=LIBPATH -- -- # AIX 3 has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}${shared_ext}$major' -- ;; -- --aix[4-9]*) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- hardcode_into_libs=yes -- if test "$host_cpu" = ia64; then -- # AIX 5 supports IA64 -- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- else -- # With GCC up to 2.95.x, collect2 would create an import file -- # for dependence libraries. The import file would start with -- # the line `#! .'. This would cause the generated library to -- # depend on `.', always an invalid library. This was fixed in -- # development snapshots of GCC prior to 3.0. -- case $host_os in -- aix4 | aix4.[01] | aix4.[01].*) -- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -- echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -- : -- else -- can_build_shared=no -- fi -- ;; -- esac -- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -- # soname into executable. Probably we can add versioning support to -- # collect2, so additional links can be useful in future. -- if test "$aix_use_runtimelinking" = yes; then -- # If using run time linking (on AIX 4.2 or later) use lib<name>.so -- # instead of lib<name>.a to let people know that these are not -- # typical AIX shared libraries. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- else -- # We preserve .a as extension for shared libraries through AIX4.2 -- # and later when we are not doing run time linking. -- library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}${shared_ext}$major' -- fi -- shlibpath_var=LIBPATH -- fi -- ;; -- --amigaos*) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -- ;; -- --beos*) -- library_names_spec='${libname}${shared_ext}' -- dynamic_linker="$host_os ld.so" -- shlibpath_var=LIBRARY_PATH -- ;; -- --bsdi[45]*) -- version_type=linux -- 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' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -- # the default ld.so.conf also contains /usr/contrib/lib and -- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -- # libtool to hard-code these into programs -- ;; -- --cygwin* | mingw* | pw32*) -- version_type=windows -- shrext_cmds=".dll" -- need_version=no -- need_lib_prefix=no -- -- case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32*) -- library_names_spec='$libname.dll.a' -- # DLL is installed to $(libdir)/../bin by postinstall_cmds -- postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -- dldir=$destdir/`dirname \$dlpath`~ -- test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname~ -- chmod a+x \$dldir/$dlname' -- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -- dlpath=$dir/\$dldll~ -- $rm \$dlpath' -- shlibpath_overrides_runpath=yes -- -- case $host_os in -- cygwin*) -- # Cygwin DLLs use 'cyg' prefix rather than 'lib' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -- ;; -- mingw*) -- # MinGW DLLs use traditional 'lib' prefix -- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- 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 ';[c-zC-Z]:/' >/dev/null; then -- # It is most probably a Windows format PATH printed by -- # mingw gcc, but we are running on Cygwin. Gcc prints its search -- # path with ; separators, and with drive letters. We can handle the -- # drive letters (cygwin fileutils understands them), so leave them, -- # especially as we might pass files found there to a mingw objdump, -- # which wouldn't understand a cygwinified path. Ahh. -- 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 -- ;; -- pw32*) -- # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- ;; -- esac -- ;; -- -- *) -- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -- ;; -- esac -- dynamic_linker='Win32 ld.exe' -- # FIXME: first we should search . and the directory the executable is in -- shlibpath_var=PATH -- ;; -- --darwin* | rhapsody*) -- dynamic_linker="$host_os dyld" -- version_type=darwin -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -- soname_spec='${libname}${release}${major}$shared_ext' -- shlibpath_overrides_runpath=yes -- shlibpath_var=DYLD_LIBRARY_PATH -- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -- -- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -- ;; -- --dgux*) -- 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 -- ;; -- --freebsd1*) -- dynamic_linker=no -- ;; -- --freebsd* | dragonfly*) -- # DragonFly does not have aout. When/if they implement a new -- # versioning mechanism, adjust this. -- if test -x /usr/bin/objformat; then -- objformat=`/usr/bin/objformat` -- else -- case $host_os in -- freebsd[123]*) objformat=aout ;; -- *) objformat=elf ;; -- esac -- fi -- version_type=freebsd-$objformat -- case $version_type in -- freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- need_version=no -- need_lib_prefix=no -- ;; -- freebsd-*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -- need_version=yes -- ;; -- esac -- shlibpath_var=LD_LIBRARY_PATH -- case $host_os in -- freebsd2*) -- shlibpath_overrides_runpath=yes -- ;; -- freebsd3.[01]* | freebsdelf3.[01]*) -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ -- freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- *) # from 4.6 on, and DragonFly -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- esac -- ;; -- --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 -- hardcode_into_libs=yes -- ;; -- --hpux9* | hpux10* | hpux11*) -- # Give a soname corresponding to the major version so that dld.sl refuses to -- # link against other versions. -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- case $host_cpu in -- ia64*) -- shrext_cmds='.so' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.so" -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- if test "X$HPUX_IA64_MODE" = X32; then -- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -- else -- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -- fi -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- hppa*64*) -- shrext_cmds='.sl' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- *) -- shrext_cmds='.sl' -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- ;; -- esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -- postinstall_cmds='chmod 555 $lib' -- ;; -- --interix[3-9]*) -- 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' -- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- --irix5* | irix6* | nonstopux*) -- case $host_os in -- nonstopux*) version_type=nonstopux ;; -- *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -- else -- version_type=irix -- fi ;; -- esac -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -- case $host_os in -- irix5* | nonstopux*) -- libsuff= shlibsuff= -- ;; -- *) -- case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -- libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -- libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -- libsuff=64 shlibsuff=64 libmagic=64-bit;; -- *) libsuff= shlibsuff= libmagic=never-match;; -- esac -- ;; -- esac -- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- hardcode_into_libs=yes -- ;; -- --# No shared lib support for Linux oldld, aout, or coff. --linux*oldld* | linux*aout* | linux*coff*) -- dynamic_linker=no -- ;; -- --# This must be Linux ELF. --linux* | k*bsd*-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' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- # This implies no fast_install, which is unacceptable. -- # Some rework will be needed to allow for fast_install -- # before this can be enabled. -- hardcode_into_libs=yes -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -- -- # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" -- fi -- -- # We used to test for /lib/ld.so.1 and disable shared libraries on -- # powerpc, because MkLinux only supported shared libraries with the -- # GNU dynamic linker. Since this was broken with cross compilers, -- # most powerpc-linux boxes support dynamic linking these days and -- # people can always --disable-shared, the test was removed, and we -- # assume the GNU/Linux dynamic linker is in use. -- dynamic_linker='GNU/Linux ld.so' -- ;; -- --netbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- dynamic_linker='NetBSD (a.out) ld.so' -- else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- dynamic_linker='NetBSD ld.elf_so' -- fi -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- --newsos6) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- ;; -- --nto-qnx*) -- 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=yes -- ;; -- --openbsd*) -- version_type=sunos -- sys_lib_dlsearch_path_spec="/usr/lib" -- need_lib_prefix=no -- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -- case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -- esac -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case $host_os in -- openbsd2.[89] | openbsd2.[89].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -- else -- shlibpath_overrides_runpath=yes -- fi -- ;; -- --os2*) -- libname_spec='$name' -- shrext_cmds=".dll" -- need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -- dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -- ;; -- --osf3* | osf4* | osf5*) -- version_type=osf -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -- ;; -- --rdos*) -- dynamic_linker=no -- ;; -- --solaris*) -- 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=yes -- hardcode_into_libs=yes -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' -- ;; -- --sunos4*) -- version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- fi -- need_version=yes -- ;; -- --sysv4 | sysv4.3*) -- version_type=linux -- 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 -- case $host_vendor in -- sni) -- shlibpath_overrides_runpath=no -- need_lib_prefix=no -- export_dynamic_flag_spec='${wl}-Blargedynsym' -- runpath_var=LD_RUN_PATH -- ;; -- siemens) -- need_lib_prefix=no -- ;; -- motorola) -- need_lib_prefix=no -- need_version=no -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -- ;; -- esac -- ;; -- --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -- shlibpath_var=LD_LIBRARY_PATH -- fi -- ;; -- --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- version_type=freebsd-elf -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- if test "$with_gnu_ld" = yes; then -- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -- shlibpath_overrides_runpath=no -- else -- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -- shlibpath_overrides_runpath=yes -- case $host_os in -- sco3.2v5*) -- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -- ;; -- esac -- fi -- sys_lib_dlsearch_path_spec='/usr/lib' -- ;; -- --uts4*) -- version_type=linux -- 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 -- ;; -- --*) -- dynamic_linker=no -- ;; --esac --{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --$as_echo "$dynamic_linker" >&6; } --test "$dynamic_linker" = no && can_build_shared=no -- --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" --fi -- --sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" --if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" --fi -- --sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -- --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" --fi -- --{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --$as_echo_n "checking how to hardcode library paths into programs... " >&6; } --hardcode_action_CXX= --if test -n "$hardcode_libdir_flag_spec_CXX" || \ -- test -n "$runpath_var_CXX" || \ -- test "X$hardcode_automatic_CXX" = "Xyes" ; then -- -- # We can hardcode non-existant directories. -- if test "$hardcode_direct_CXX" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && -- test "$hardcode_minus_L_CXX" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action_CXX=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action_CXX=immediate -- fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action_CXX=unsupported --fi --{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 --$as_echo "$hardcode_action_CXX" >&6; } -- --if test "$hardcode_action_CXX" = relink; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless --fi -- -- --# The else clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# no rules to generate ltmain.sh. --if test -f "$ltmain"; then -- # 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 -- setopt NO_GLOB_SUBST -- fi -- # Now quote all the things that may contain metacharacters while being -- # careful not to overquote the AC_SUBSTed values. We take copies of the -- # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -- SED SHELL STRIP \ -- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -- deplibs_check_method reload_flag reload_cmds need_locks \ -- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -- lt_cv_sys_global_symbol_to_c_name_address \ -- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- old_postinstall_cmds old_postuninstall_cmds \ -- compiler_CXX \ -- CC_CXX \ -- LD_CXX \ -- lt_prog_compiler_wl_CXX \ -- lt_prog_compiler_pic_CXX \ -- lt_prog_compiler_static_CXX \ -- lt_prog_compiler_no_builtin_flag_CXX \ -- export_dynamic_flag_spec_CXX \ -- thread_safe_flag_spec_CXX \ -- whole_archive_flag_spec_CXX \ -- enable_shared_with_static_runtimes_CXX \ -- old_archive_cmds_CXX \ -- old_archive_from_new_cmds_CXX \ -- predep_objects_CXX \ -- postdep_objects_CXX \ -- predeps_CXX \ -- postdeps_CXX \ -- compiler_lib_search_path_CXX \ -- compiler_lib_search_dirs_CXX \ -- archive_cmds_CXX \ -- archive_expsym_cmds_CXX \ -- postinstall_cmds_CXX \ -- postuninstall_cmds_CXX \ -- old_archive_from_expsyms_cmds_CXX \ -- allow_undefined_flag_CXX \ -- no_undefined_flag_CXX \ -- export_symbols_cmds_CXX \ -- hardcode_libdir_flag_spec_CXX \ -- hardcode_libdir_flag_spec_ld_CXX \ -- hardcode_libdir_separator_CXX \ -- hardcode_automatic_CXX \ -- 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 -- -- case $var in -- old_archive_cmds_CXX | \ -- old_archive_from_new_cmds_CXX | \ -- archive_cmds_CXX | \ -- archive_expsym_cmds_CXX | \ -- module_cmds_CXX | \ -- module_expsym_cmds_CXX | \ -- old_archive_from_expsyms_cmds_CXX | \ -- export_symbols_cmds_CXX | \ -- extract_expsyms_cmds | reload_cmds | finish_cmds | \ -- postinstall_cmds | postuninstall_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -- # Double-quote double-evaled strings. -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -- ;; -- *) -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -- ;; -- esac -- done -- -- case $lt_echo in -- *'\$0 --fallback-echo"') -- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -- ;; -- esac -- --cfgfile="$ofile" -- -- cat <<__EOF__ >> "$cfgfile" --# ### BEGIN LIBTOOL TAG CONFIG: $tagname -- --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -- --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -- --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared -- --# Whether or not to build static libraries. --build_old_libs=$enable_static -- --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$archive_cmds_need_lc_CXX -- --# Whether or not to disallow shared libs when runtime libs are static --allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX -- --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install -- --# The host system. --host_alias=$host_alias --host=$host --host_os=$host_os -- --# The build system. --build_alias=$build_alias --build=$build --build_os=$build_os -- --# An echo program that does not interpret backslashes. --echo=$lt_echo -- --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS -- --# A C compiler. --LTCC=$lt_LTCC -- --# LTCC compiler flags. --LTCFLAGS=$lt_LTCFLAGS -- --# A language-specific compiler. --CC=$lt_compiler_CXX -- --# Is the compiler the GNU C compiler? --with_gcc=$GCC_CXX -- --# An ERE matcher. --EGREP=$lt_EGREP -- --# The linker used to build libraries. --LD=$lt_LD_CXX -- --# Whether we need hard or soft links. --LN_S=$lt_LN_S -- --# A BSD-compatible nm program. --NM=$lt_NM -- --# A symbol stripping program --STRIP=$lt_STRIP -- --# Used to examine libraries when file_magic_cmd begins "file" --MAGIC_CMD=$MAGIC_CMD -- --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" -- --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" -- --# Used on cygwin: assembler. --AS="$AS" -- --# The name of the directory that contains temporary libtool files. --objdir=$objdir -- --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -- --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_CXX -- --# Object file suffix (normally "o"). --objext="$ac_objext" -- --# Old archive suffix (normally "a"). --libext="$libext" -- --# Shared library suffix (normally ".so"). --shrext_cmds='$shrext_cmds' -- --# Executable file suffix (normally ""). --exeext="$exeext" -- --# Additional compiler flags for building library objects. --pic_flag=$lt_lt_prog_compiler_pic_CXX --pic_mode=$pic_mode -- --# What is the maximum length of a command? --max_cmd_len=$lt_cv_sys_max_cmd_len -- --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -- --# Must we lock files when doing compilation? --need_locks=$lt_need_locks -- --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix -- --# Do we need a version for libraries? --need_version=$need_version -- --# Whether dlopen is supported. --dlopen_support=$enable_dlopen -- --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self -- --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static -- --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_lt_prog_compiler_static_CXX -- --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -- --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -- --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX -- --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX -- --# Library versioning type. --version_type=$version_type -- --# Format of library name prefix. --libname_spec=$lt_libname_spec -- --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$lt_library_names_spec -- --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec -- --# Commands used to build and install an old-style archive. --RANLIB=$lt_RANLIB --old_archive_cmds=$lt_old_archive_cmds_CXX --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -- --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -- --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX -- --# Commands used to build and install a shared archive. --archive_cmds=$lt_archive_cmds_CXX --archive_expsym_cmds=$lt_archive_expsym_cmds_CXX --postinstall_cmds=$lt_postinstall_cmds --postuninstall_cmds=$lt_postuninstall_cmds -- --# Commands used to build a loadable module (assumed same as above if empty) --module_cmds=$lt_module_cmds_CXX --module_expsym_cmds=$lt_module_expsym_cmds_CXX -- --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib -- --# Dependencies to place before the objects being linked to create a --# shared library. --predep_objects=$lt_predep_objects_CXX -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdep_objects=$lt_postdep_objects_CXX -- --# Dependencies to place before the objects being linked to create a --# shared library. --predeps=$lt_predeps_CXX -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdeps=$lt_postdeps_CXX -- --# The directories searched by this compiler when creating a shared --# library --compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX -- --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -- --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -- --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd -- --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag_CXX -- --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag_CXX -- --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds -- --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval -- --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -- --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -- --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -- --# This is the shared library runtime path variable. --runpath_var=$runpath_var -- --# This is the shared library path variable. --shlibpath_var=$shlibpath_var -- --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -- --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action_CXX -- --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -- --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -- --# If ld is used when linking, flag to hardcode \$libdir into --# a binary during linking. This must work even if \$libdir does --# not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -- --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -- --# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$hardcode_direct_CXX -- --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$hardcode_minus_L_CXX -- --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX -- --# Set to yes if building a shared library automatically hardcodes DIR into the library --# and all subsequent libraries and executables linked against it. --hardcode_automatic=$hardcode_automatic_CXX -- --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" -- --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs_CXX -- --# Compile-time system search path for libraries --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -- --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -- --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -- --# Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols_CXX -- --# The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds_CXX -- --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -- --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms_CXX -- --# Symbols that must always be exported. --include_expsyms=$lt_include_expsyms_CXX -- --# ### END LIBTOOL TAG CONFIG: $tagname -- --__EOF__ -- -- --else -- # If there is no Makefile yet, we rely on a make rule to execute -- # `config.status --recheck' to rerun these tests and create the -- # libtool script then. -- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -- if test -f "$ltmain_in"; then -- test -f Makefile && make "$ltmain" -- fi --fi -- -- --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --CC=$lt_save_CC --LDCXX=$LD --LD=$lt_save_LD --GCC=$lt_save_GCC --with_gnu_ldcxx=$with_gnu_ld --with_gnu_ld=$lt_save_with_gnu_ld --lt_cv_path_LDCXX=$lt_cv_path_LD --lt_cv_path_LD=$lt_save_path_LD --lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld --lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -- -- else -- tagname="" -- fi -- ;; -- -- F77) -- if test -n "$F77" && test "X$F77" != "Xno"; then -- --ac_ext=f --ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' --ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_f77_compiler_gnu -- -- --archive_cmds_need_lc_F77=no --allow_undefined_flag_F77= --always_export_symbols_F77=no --archive_expsym_cmds_F77= --export_dynamic_flag_spec_F77= --hardcode_direct_F77=no --hardcode_libdir_flag_spec_F77= --hardcode_libdir_flag_spec_ld_F77= --hardcode_libdir_separator_F77= --hardcode_minus_L_F77=no --hardcode_automatic_F77=no --module_cmds_F77= --module_expsym_cmds_F77= --link_all_deplibs_F77=unknown --old_archive_cmds_F77=$old_archive_cmds --no_undefined_flag_F77= --whole_archive_flag_spec_F77= --enable_shared_with_static_runtimes_F77=no -- --# Source file extension for f77 test sources. --ac_ext=f -- --# Object file extension for compiled f77 test sources. --objext=o --objext_F77=$objext -- --# Code to be used in simple compile tests --lt_simple_compile_test_code="\ -- subroutine t -- return -- end --" -- --# Code to be used in simple link tests --lt_simple_link_test_code="\ -- program t -- end --" -- --# ltmain only uses $CC for tagged configurations so make sure $CC is set. -- --# If no C compiler was specified, use CC. --LTCC=${LTCC-"$CC"} -- --# If no C compiler flags were specified, use CFLAGS. --LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -- --# Allow CC to be a program name with arguments. --compiler=$CC -- -- --# save warnings/boilerplate of simple test code --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* -- --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 -r conftest* -- -- --# Allow CC to be a program name with arguments. --lt_save_CC="$CC" --CC=${F77-"f77"} --compiler=$CC --compiler_F77=$CC --for cc_temp in $compiler""; do -- case $cc_temp in -- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -- -- --{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 --$as_echo_n "checking if libtool supports shared libraries... " >&6; } --{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 --$as_echo "$can_build_shared" >&6; } -- --{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 --$as_echo_n "checking whether to build shared libraries... " >&6; } --test "$can_build_shared" = "no" && enable_shared=no -- --# On AIX, shared libraries and static libraries use the same namespace, and --# are all built from PIC. --case $host_os in --aix3*) -- test "$enable_shared" = yes && enable_static=no -- if test -n "$RANLIB"; then -- archive_cmds="$archive_cmds~\$RANLIB \$lib" -- postinstall_cmds='$RANLIB $lib' -- fi -- ;; --aix[4-9]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -- fi -- ;; --esac --{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 --$as_echo "$enable_shared" >&6; } -- --{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 --$as_echo_n "checking whether to build static libraries... " >&6; } --# Make sure either enable_shared or enable_static is yes. --test "$enable_shared" = yes || enable_static=yes --{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 --$as_echo "$enable_static" >&6; } -- --GCC_F77="$G77" --LD_F77="$LD" -- --lt_prog_compiler_wl_F77= --lt_prog_compiler_pic_F77= --lt_prog_compiler_static_F77= -- --{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -- -- if test "$GCC" = yes; then -- lt_prog_compiler_wl_F77='-Wl,' -- lt_prog_compiler_static_F77='-static' -- -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_prog_compiler_static_F77='-Bstatic' -- fi -- ;; -- -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' -- ;; -- -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -- -- 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' -- ;; -- -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- lt_prog_compiler_pic_F77='-fno-common' -- ;; - -- interix[3-9]*) -- # Interix 3.x gcc -fpic/-fPIC options generate broken code. -- # Instead, we relocate shared libraries at runtime. -- ;; -- -- msdosdjgpp*) -- # Just because we use GCC doesn't mean we suddenly get shared libraries -- # on systems that don't support them. -- lt_prog_compiler_can_build_shared_F77=no -- enable_shared=no -- ;; -- -- sysv4*MP*) -- if test -d /usr/nec; then -- lt_prog_compiler_pic_F77=-Kconform_pic -- fi -- ;; -- -- hpux*) -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- lt_prog_compiler_pic_F77='-fPIC' -- ;; -- esac -- ;; -- -- *) -- lt_prog_compiler_pic_F77='-fPIC' -- ;; -- esac -- else -- # PORTME Check for flag to pass linker flags through the system compiler. -- case $host_os in -- aix*) -- lt_prog_compiler_wl_F77='-Wl,' -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_prog_compiler_static_F77='-Bstatic' -- else -- lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' -- fi -- ;; -- darwin*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- case $cc_basename in -- xlc*) -- lt_prog_compiler_pic_F77='-qnocommon' -- lt_prog_compiler_wl_F77='-Wl,' -- ;; -- esac -- ;; -- -- 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' -- ;; -- -- hpux9* | hpux10* | hpux11*) -- lt_prog_compiler_wl_F77='-Wl,' -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- lt_prog_compiler_pic_F77='+Z' -- ;; -- esac -- # Is there a better lt_prog_compiler_static that works with the bundled CC? -- lt_prog_compiler_static_F77='${wl}-a ${wl}archive' -- ;; -- -- irix5* | irix6* | nonstopux*) -- lt_prog_compiler_wl_F77='-Wl,' -- # PIC (with -KPIC) is the default. -- lt_prog_compiler_static_F77='-non_shared' -- ;; -- -- newsos6) -- lt_prog_compiler_pic_F77='-KPIC' -- lt_prog_compiler_static_F77='-Bstatic' -- ;; -- -- linux* | k*bsd*-gnu) -- case $cc_basename in -- icc* | ecc*) -- lt_prog_compiler_wl_F77='-Wl,' -- lt_prog_compiler_pic_F77='-KPIC' -- lt_prog_compiler_static_F77='-static' -- ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -- # Portland Group compilers (*not* the Pentium gcc compiler, -- # which looks to be a dead project) -- lt_prog_compiler_wl_F77='-Wl,' -- lt_prog_compiler_pic_F77='-fpic' -- lt_prog_compiler_static_F77='-Bstatic' -- ;; -- ccc*) -- lt_prog_compiler_wl_F77='-Wl,' -- # 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 -- ;; -- -- osf3* | osf4* | osf5*) -- lt_prog_compiler_wl_F77='-Wl,' -- # All OSF/1 code is PIC. -- 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' -- case $cc_basename in -- f77* | f90* | f95*) -- lt_prog_compiler_wl_F77='-Qoption ld ';; -- *) -- lt_prog_compiler_wl_F77='-Wl,';; -- esac -- ;; - -- sunos4*) -- lt_prog_compiler_wl_F77='-Qoption ld ' -- lt_prog_compiler_pic_F77='-PIC' -- lt_prog_compiler_static_F77='-Bstatic' -- ;; -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -+if test "${lt_cv_prog_compiler_static_works+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_static_works=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ 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 -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_static_works=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works=yes -+ fi -+ fi -+ $RM -r conftest* -+ LDFLAGS="$save_LDFLAGS" - -- sysv4 | sysv4.2uw2* | sysv4.3*) -- lt_prog_compiler_wl_F77='-Wl,' -- lt_prog_compiler_pic_F77='-KPIC' -- lt_prog_compiler_static_F77='-Bstatic' -- ;; -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -+$as_echo "$lt_cv_prog_compiler_static_works" >&6; } - -- sysv4*MP*) -- if test -d /usr/nec ;then -- lt_prog_compiler_pic_F77='-Kconform_pic' -- lt_prog_compiler_static_F77='-Bstatic' -- fi -- ;; -+if test x"$lt_cv_prog_compiler_static_works" = xyes; then -+ : -+else -+ lt_prog_compiler_static= -+fi - -- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -- lt_prog_compiler_wl_F77='-Wl,' -- lt_prog_compiler_pic_F77='-KPIC' -- lt_prog_compiler_static_F77='-Bstatic' -- ;; - -- unicos*) -- lt_prog_compiler_wl_F77='-Wl,' -- lt_prog_compiler_can_build_shared_F77=no -- ;; - -- uts4*) -- lt_prog_compiler_pic_F77='-pic' -- lt_prog_compiler_static_F77='-Bstatic' -- ;; - -- *) -- lt_prog_compiler_can_build_shared_F77=no -- ;; -- esac -- fi - --{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 --$as_echo "$lt_prog_compiler_pic_F77" >&6; } - --# --# Check to make sure the PIC flag actually works. --# --if test -n "$lt_prog_compiler_pic_F77"; then - --{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 --$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } --if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- lt_cv_prog_compiler_pic_works_F77=no -- ac_outfile=conftest.$ac_objext -+ lt_cv_prog_compiler_c_o=no -+ $RM -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext -- lt_compiler_flag="$lt_prog_compiler_pic_F77" -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. -- # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -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:15359: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>conftest.err) -+ (eval echo "\"\$as_me:10004: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? -- cat conftest.err >&5 -- echo "$as_me:15363: \$? = $ac_status" >&5 -- if (exit $ac_status) && test -s "$ac_outfile"; then -+ cat out/conftest.err >&5 -+ echo "$as_me:10008: \$? = $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 -- # So say no if there are warnings other than the usual output. -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_pic_works_F77=yes -+ # So say no if there are warnings -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o=yes - fi - fi -- $rm conftest* -- --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 --$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } -+ chmod u+w . 2>&5 -+ $RM conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -+ $RM out/* && rmdir out -+ cd .. -+ $RM -r conftest -+ $RM conftest* - --if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then -- case $lt_prog_compiler_pic_F77 in -- "" | " "*) ;; -- *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; -- esac --else -- lt_prog_compiler_pic_F77= -- lt_prog_compiler_can_build_shared_F77=no - fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - --fi --case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -- *djgpp*) -- lt_prog_compiler_pic_F77= -- ;; -- *) -- lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" -- ;; --esac - --# --# Check to make sure the static flag actually works. --# --wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" --{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 --$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } --if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_static_works_F77=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- 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 -- if test -s conftest.err; then -- # Append any errors to the config.log. -- cat conftest.err 1>&5 -- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if diff conftest.exp conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_static_works_F77=yes -- fi -- else -- lt_cv_prog_compiler_static_works_F77=yes -- fi -- fi -- $rm -r conftest* -- LDFLAGS="$save_LDFLAGS" - --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 --$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } - --if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then -- : --else -- lt_prog_compiler_static_F77= --fi - - --{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 - $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then -+if test "${lt_cv_prog_compiler_c_o+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- lt_cv_prog_compiler_c_o_F77=no -- $rm -r conftest 2>/dev/null -+ lt_cv_prog_compiler_c_o=no -+ $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out -@@ -15460,43 +10056,45 @@ - -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:15463: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10059: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15467: \$? = $ac_status" >&5 -+ echo "$as_me:10063: \$? = $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 - # So say no if there are warnings -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_c_o_F77=yes -+ lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 -- $rm conftest* -+ $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation -- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -- $rm out/* && rmdir out -+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -+ $RM out/* && rmdir out - cd .. -- rmdir conftest -- $rm conftest* -+ $RM -r conftest -+ $RM conftest* - - fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 --$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -+ -+ - - - hard_links="nottested" --if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then -+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 - $as_echo_n "checking if we can lock with hard links... " >&6; } - hard_links=yes -- $rm conftest* -+ $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no -@@ -15512,39 +10110,47 @@ - need_locks=no - fi - --{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+ -+ -+ -+ -+ -+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 - $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - - runpath_var= -- allow_undefined_flag_F77= -- enable_shared_with_static_runtimes_F77=no -- archive_cmds_F77= -- archive_expsym_cmds_F77= -- old_archive_From_new_cmds_F77= -- old_archive_from_expsyms_cmds_F77= -- export_dynamic_flag_spec_F77= -- whole_archive_flag_spec_F77= -- thread_safe_flag_spec_F77= -- hardcode_libdir_flag_spec_F77= -- hardcode_libdir_flag_spec_ld_F77= -- hardcode_libdir_separator_F77= -- hardcode_direct_F77=no -- hardcode_minus_L_F77=no -- hardcode_shlibpath_var_F77=unsupported -- link_all_deplibs_F77=unknown -- hardcode_automatic_F77=no -- module_cmds_F77= -- module_expsym_cmds_F77= -- always_export_symbols_F77=no -- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ allow_undefined_flag= -+ always_export_symbols=no -+ archive_cmds= -+ archive_expsym_cmds= -+ compiler_needs_object=no -+ enable_shared_with_static_runtimes=no -+ export_dynamic_flag_spec= -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ hardcode_automatic=no -+ hardcode_direct=no -+ hardcode_direct_absolute=no -+ hardcode_libdir_flag_spec= -+ hardcode_libdir_flag_spec_ld= -+ hardcode_libdir_separator= -+ hardcode_minus_L=no -+ hardcode_shlibpath_var=unsupported -+ inherit_rpath=no -+ link_all_deplibs=unknown -+ module_cmds= -+ module_expsym_cmds= -+ old_archive_from_new_cmds= -+ old_archive_from_expsyms_cmds= -+ thread_safe_flag_spec= -+ whole_archive_flag_spec= - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list -- include_expsyms_F77= -+ include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. -- exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot -@@ -15552,19 +10158,9 @@ - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= -- # Just being paranoid about ensuring that cc_basename is set. -- for cc_temp in $compiler""; do -- case $cc_temp in -- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in -- cygwin* | mingw* | pw32*) -+ cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. -@@ -15581,7 +10177,7 @@ - ;; - esac - -- ld_shlibs_F77=yes -+ ld_shlibs=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' -@@ -15590,16 +10186,16 @@ - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec_F77='${wl}--export-dynamic' -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec_F77= -+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec= - fi - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -15612,8 +10208,8 @@ - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then -- ld_shlibs_F77=no -- cat <<EOF 1>&2 -+ ld_shlibs=no -+ cat <<_LT_EOF 1>&2 - - *** Warning: the GNU linker, at least up to release 2.9.1, is reported - *** to be unable to reliably create shared libraries on AIX. -@@ -15621,49 +10217,50 @@ - *** really care for shared libraries, you may want to modify your PATH - *** so that a non-GNU linker is found, and then restart. - --EOF -+_LT_EOF - fi - ;; - - amigaos*) -- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec_F77='-L$libdir' -- hardcode_minus_L_F77=yes -- -- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can't use -- # them. -- ld_shlibs_F77=no -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='' -+ ;; -+ m68k) -+ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ ;; -+ esac - ;; - - beos*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- allow_undefined_flag_F77=unsupported -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag=unsupported - # Joseph Beckenbach <jrb3@best.com> says some releases of gcc - # support --undefined. This deserves some investigation. FIXME -- archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else -- ld_shlibs_F77=no -+ ld_shlibs=no - fi - ;; - -- cygwin* | mingw* | pw32*) -- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, -+ cygwin* | mingw* | pw32* | cegcc*) -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_F77='-L$libdir' -- 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/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ hardcode_libdir_flag_spec='-L$libdir' -+ 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' - -- 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' -+ 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' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; -@@ -15671,79 +10268,109 @@ - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else -- ld_shlibs_F77=no -+ ld_shlibs=no - fi - ;; - - interix[3-9]*) -- hardcode_direct_F77=no -- hardcode_shlibpath_var_F77=no -- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_F77='${wl}-E' -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec='${wl}-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- 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' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ 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' - ;; - -- gnu* | linux* | k*bsd*-gnu) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ gnu* | linux* | tpf* | k*bsd*-gnu) -+ tmp_diet=no -+ if test "$host_os" = linux-dietlibc; then -+ case $cc_basename in -+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) -+ esac -+ fi -+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ -+ && test "$tmp_diet" = no -+ then - tmp_addflag= -+ tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in -- pgcc*) # Portland Group C compiler -- whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; -- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; -+ lf95*) # Lahey Fortran 8.1 -+ whole_archive_flag_spec= -+ tmp_sharedflag='--shared' ;; -+ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) -+ tmp_sharedflag='-qmkshrobj' -+ tmp_addflag= ;; - esac - 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' -+ 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' -+ compiler_needs_object=yes - 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' -+ 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_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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- fi -+ if test "x$supports_anon_versioning" = xyes; 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ -+ case $cc_basename in -+ xlf*) -+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself -+ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' -+ hardcode_libdir_flag_spec= -+ hardcode_libdir_flag_spec_ld='-rpath $libdir' -+ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ if test "x$supports_anon_versioning" = xyes; 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~ -+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ fi -+ ;; -+ esac - else -- ld_shlibs_F77=no -+ ld_shlibs=no - fi - ;; - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ netbsd* | netbsdelf*-gnu) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris*) -- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -- ld_shlibs_F77=no -- cat <<EOF 1>&2 -+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then -+ ld_shlibs=no -+ cat <<_LT_EOF 1>&2 - - *** Warning: The releases 2.8.* of the GNU linker cannot reliably - *** create shared libraries on Solaris systems. Therefore, libtool -@@ -15752,19 +10379,19 @@ - *** your PATH or compiler configuration so that the native linker is - *** used, and then restart. - --EOF -- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+_LT_EOF -+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else -- ld_shlibs_F77=no -+ ld_shlibs=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -- ld_shlibs_F77=no -+ ld_shlibs=no - cat <<_LT_EOF 1>&2 - - *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -@@ -15777,54 +10404,58 @@ - _LT_EOF - ;; - *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else -- ld_shlibs_F77=no -+ ld_shlibs=no - fi - ;; - esac - ;; - - sunos4*) -- archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= -- hardcode_direct_F77=yes -- hardcode_shlibpath_var_F77=no -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no - ;; - - *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else -- ld_shlibs_F77=no -+ ld_shlibs=no - fi - ;; - esac - -- if test "$ld_shlibs_F77" = no; then -+ if test "$ld_shlibs" = no; then - runpath_var= -- hardcode_libdir_flag_spec_F77= -- export_dynamic_flag_spec_F77= -- whole_archive_flag_spec_F77= -+ hardcode_libdir_flag_spec= -+ export_dynamic_flag_spec= -+ whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) -- allow_undefined_flag_F77=unsupported -- always_export_symbols_F77=yes -- archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ allow_undefined_flag=unsupported -+ always_export_symbols=yes -+ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. -- hardcode_minus_L_F77=yes -+ hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. -- hardcode_direct_F77=unsupported -+ hardcode_direct=unsupported - fi - ;; - -@@ -15838,10 +10469,10 @@ - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -- export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - else -- export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - -@@ -15850,10 +10481,10 @@ - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi - done - ;; - esac -@@ -15868,30 +10499,32 @@ - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - -- archive_cmds_F77='' -- hardcode_direct_F77=yes -- hardcode_libdir_separator_F77=':' -- link_all_deplibs_F77=yes -+ archive_cmds='' -+ hardcode_direct=yes -+ hardcode_direct_absolute=yes -+ hardcode_libdir_separator=':' -+ link_all_deplibs=yes -+ file_list_spec='${wl}-f,' - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -+ if test -f "$collect2name" && -+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then -- # We have reworked collect2 -- : -+ # We have reworked collect2 -+ : - else -- # We have old collect2 -- hardcode_direct_F77=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L_F77=yes -- hardcode_libdir_flag_spec_F77='-L$libdir' -- hardcode_libdir_separator_F77= -+ # We have old collect2 -+ hardcode_direct=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L=yes -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_libdir_separator= - fi - ;; - esac -@@ -15899,11 +10532,12 @@ - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi -+ link_all_deplibs=no - else - # not using gcc - if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then -@@ -15914,18 +10548,30 @@ - fi - fi - -+ export_dynamic_flag_spec='${wl}-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. -- always_export_symbols_F77=yes -+ always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. -- allow_undefined_flag_F77='-berok' -- # Determine the default libpath from the value encoded in an empty executable. -- cat >conftest.$ac_ext <<_ACEOF -- program main -+ allow_undefined_flag='-berok' -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ - -- end -+ ; -+ return 0; -+} - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" -@@ -15942,7 +10588,7 @@ - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { -- test -z "$ac_f77_werror_flag" || -+ test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -@@ -15973,19 +10619,30 @@ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" -- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else - if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' -- allow_undefined_flag_F77="-z nodefs" -- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag="-z nodefs" -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" - else -- # Determine the default libpath from the value encoded in an empty executable. -+ # Determine the default libpath from the value encoded in an -+ # empty executable. - cat >conftest.$ac_ext <<_ACEOF -- program main -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ - -- end -+ ; -+ return 0; -+} - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (ac_try="$ac_link" -@@ -16002,7 +10659,7 @@ - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { -- test -z "$ac_f77_werror_flag" || -+ test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -@@ -16033,110 +10690,95 @@ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -- no_undefined_flag_F77=' ${wl}-bernotok' -- allow_undefined_flag_F77=' ${wl}-berok' -+ no_undefined_flag=' ${wl}-bernotok' -+ allow_undefined_flag=' ${wl}-berok' - # Exported symbols can be pulled into shared objects from archives -- whole_archive_flag_spec_F77='$convenience' -- archive_cmds_need_lc_F77=yes -+ whole_archive_flag_spec='$convenience' -+ archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. -- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; - - amigaos*) -- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec_F77='-L$libdir' -- hardcode_minus_L_F77=yes -- # see comment about different semantics on the GNU ld section -- ld_shlibs_F77=no -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='' -+ ;; -+ m68k) -+ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ ;; -+ esac - ;; - - bsdi[45]*) -- export_dynamic_flag_spec_F77=-rdynamic -+ export_dynamic_flag_spec=-rdynamic - ;; - -- cygwin* | mingw* | pw32*) -+ cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. -- hardcode_libdir_flag_spec_F77=' ' -- allow_undefined_flag_F77=unsupported -+ hardcode_libdir_flag_spec=' ' -+ allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. -- archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. -- old_archive_From_new_cmds_F77='true' -+ old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. -- old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path_F77='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes_F77=yes -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path='`cygpath -w "$srcfile"`' -+ enable_shared_with_static_runtimes=yes - ;; - - darwin* | rhapsody*) -- case $host_os in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- archive_cmds_need_lc_F77=no -- hardcode_direct_F77=no -- hardcode_automatic_F77=yes -- hardcode_shlibpath_var_F77=unsupported -- whole_archive_flag_spec_F77='' -- link_all_deplibs_F77=yes -- if test "$GCC" = yes ; then -- output_verbose_link_cmd='echo' -- archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -- else -- 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` $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 $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}' -- ;; -- *) -- ld_shlibs_F77=no -- ;; -- esac -- fi -+ -+ -+ archive_cmds_need_lc=no -+ hardcode_direct=no -+ hardcode_automatic=yes -+ hardcode_shlibpath_var=unsupported -+ whole_archive_flag_spec='' -+ link_all_deplibs=yes -+ allow_undefined_flag="$_lt_dar_allow_undefined" -+ case $cc_basename in -+ ifort*) _lt_dar_can_shared=yes ;; -+ *) _lt_dar_can_shared=$GCC ;; -+ esac -+ if test "$_lt_dar_can_shared" = "yes"; then -+ output_verbose_link_cmd=echo -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ -+ else -+ ld_shlibs=no -+ fi -+ - ;; - - dgux*) -- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_F77='-L$libdir' -- hardcode_shlibpath_var_F77=no -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no - ;; - - freebsd1*) -- ld_shlibs_F77=no -+ ld_shlibs=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -@@ -16144,60 +10786,60 @@ - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) -- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- hardcode_libdir_flag_spec_F77='-R$libdir' -- hardcode_direct_F77=yes -- hardcode_shlibpath_var_F77=no -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) -- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct_F77=yes -- hardcode_minus_L_F77=yes -- hardcode_shlibpath_var_F77=no -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec_F77='-R$libdir' -- hardcode_direct_F77=yes -- hardcode_shlibpath_var_F77=no -+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no - ;; - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else -- archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator_F77=: -- hardcode_direct_F77=yes -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. -- hardcode_minus_L_F77=yes -- export_dynamic_flag_spec_F77='${wl}-E' -+ hardcode_minus_L=yes -+ export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else -- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi - if test "$with_gnu_ld" = no; then -- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator_F77=: -- -- hardcode_direct_F77=yes -- export_dynamic_flag_spec_F77='${wl}-E' -- -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_flag_spec_ld='+b $libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=yes -+ hardcode_direct_absolute=yes -+ export_dynamic_flag_spec='${wl}-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. -- hardcode_minus_L_F77=yes -+ hardcode_minus_L=yes - fi - ;; - -@@ -16205,240 +10847,300 @@ - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) -- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) -- archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - fi - if test "$with_gnu_ld" = no; then -- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator_F77=: -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_direct=no -+ hardcode_shlibpath_var=no -+ ;; -+ *) -+ hardcode_direct=yes -+ hardcode_direct_absolute=yes -+ export_dynamic_flag_spec='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ # Try to use the -exported_symbol ld option, if it does not -+ # work, assume that -exports_file does not work either and -+ # implicitly export all symbols. -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ cat >conftest.$ac_ext <<_ACEOF -+int foo(void) {} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- case $host_cpu in -- hppa*64*|ia64*) -- hardcode_libdir_flag_spec_ld_F77='+b $libdir' -- hardcode_direct_F77=no -- hardcode_shlibpath_var_F77=no -- ;; -- *) -- hardcode_direct_F77=yes -- export_dynamic_flag_spec_F77='${wl}-E' - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- hardcode_minus_L_F77=yes -- ;; -- esac -- fi -- ;; -+fi - -- irix5* | irix6* | nonstopux*) -- if test "$GCC" = yes; then -- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS="$save_LDFLAGS" - else -- archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi -- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_F77=: -- link_all_deplibs_F77=yes -+ archive_cmds_need_lc='no' -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ inherit_rpath=yes -+ link_all_deplibs=yes - ;; - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ 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 -- archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi -- hardcode_libdir_flag_spec_F77='-R$libdir' -- hardcode_direct_F77=yes -- hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no - ;; - - newsos6) -- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct_F77=yes -- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_F77=: -- hardcode_shlibpath_var_F77=no -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_shlibpath_var=no -+ ;; -+ -+ *nto* | *qnx*) - ;; - - openbsd*) - 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' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ hardcode_direct_absolute=yes -+ 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_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_F77='-R$libdir' -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-R$libdir' - ;; - *) -- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac -- fi -+ fi - else -- ld_shlibs_F77=no -+ ld_shlibs=no - fi - ;; - - os2*) -- hardcode_libdir_flag_spec_F77='-L$libdir' -- hardcode_minus_L_F77=yes -- allow_undefined_flag_F77=unsupported -- archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ allow_undefined_flag=unsupported -+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then -- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- allow_undefined_flag_F77=' -expect_unresolved \*' -- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -+ allow_undefined_flag=' -expect_unresolved \*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' - fi -- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_F77=: -+ archive_cmds_need_lc='no' -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then -- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' -+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else -- allow_undefined_flag_F77=' -expect_unresolved \*' -- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+ allow_undefined_flag=' -expect_unresolved \*' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly -- hardcode_libdir_flag_spec_F77='-rpath $libdir' -+ hardcode_libdir_flag_spec='-rpath $libdir' - fi -- hardcode_libdir_separator_F77=: -+ archive_cmds_need_lc='no' -+ hardcode_libdir_separator=: - ;; - - solaris*) -- no_undefined_flag_F77=' -z text' -+ no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' -- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -+ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else -- wlarc='' -- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -+ case `$CC -V 2>&1` in -+ *"Compilers 5.0"*) -+ wlarc='' -+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' -+ ;; -+ *) -+ wlarc='${wl}' -+ archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ ;; -+ esac - fi -- hardcode_libdir_flag_spec_F77='-R$libdir' -- hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # 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?) -+ # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then -- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else -- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' -+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac -- link_all_deplibs_F77=yes -+ link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. -- archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else -- archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi -- hardcode_libdir_flag_spec_F77='-L$libdir' -- hardcode_direct_F77=yes -- hardcode_minus_L_F77=yes -- hardcode_shlibpath_var_F77=no -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) -- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct_F77=yes # is this really true??? -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. -- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- reload_cmds_F77='$CC -r -o $output$reload_objs' -- hardcode_direct_F77=no -+ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ reload_cmds='$CC -r -o $output$reload_objs' -+ hardcode_direct=no - ;; - motorola) -- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var_F77=no -+ hardcode_shlibpath_var=no - ;; - - sysv4.3*) -- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var_F77=no -- export_dynamic_flag_spec_F77='-Bexport' -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var=no -+ export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then -- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var_F77=no -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes -- ld_shlibs_F77=yes -+ ld_shlibs=yes - fi - ;; - - 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 -+ no_undefined_flag='${wl}-z,text' -+ archive_cmds_need_lc=no -+ hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then -- archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else -- archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - -@@ -16449,51 +11151,75 @@ - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. -- no_undefined_flag_F77='${wl}-z,text' -- allow_undefined_flag_F77='${wl}-z,nodefs' -- archive_cmds_need_lc_F77=no -- hardcode_shlibpath_var_F77=no -- hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -- hardcode_libdir_separator_F77=':' -- link_all_deplibs_F77=yes -- export_dynamic_flag_spec_F77='${wl}-Bexport' -+ no_undefined_flag='${wl}-z,text' -+ allow_undefined_flag='${wl}-z,nodefs' -+ archive_cmds_need_lc=no -+ hardcode_shlibpath_var=no -+ hardcode_libdir_flag_spec='${wl}-R,$libdir' -+ hardcode_libdir_separator=':' -+ link_all_deplibs=yes -+ export_dynamic_flag_spec='${wl}-Bexport' - runpath_var='LD_RUN_PATH' - - if test "$GCC" = yes; then -- archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else -- archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - uts4*) -- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_F77='-L$libdir' -- hardcode_shlibpath_var_F77=no -+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_shlibpath_var=no - ;; - - *) -- ld_shlibs_F77=no -+ ld_shlibs=no - ;; - esac -+ -+ if test x$host_vendor = xsni; then -+ case $host in -+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ export_dynamic_flag_spec='${wl}-Blargedynsym' -+ ;; -+ esac -+ fi - fi - --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 --$as_echo "$ld_shlibs_F77" >&6; } --test "$ld_shlibs_F77" = no && can_build_shared=no -+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -+$as_echo "$ld_shlibs" >&6; } -+test "$ld_shlibs" = no && can_build_shared=no -+ -+with_gnu_ld=$with_gnu_ld -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 ++echo "${ECHO_T}$ld_shlibs" >&6; } + test "$ld_shlibs" = no && can_build_shared=no # - # Do we need to explicitly link libc? - # --case "x$archive_cmds_need_lc_F77" in -+case "x$archive_cmds_need_lc" in - x|xyes) - # Assume -lc should be added -- archive_cmds_need_lc_F77=yes -+ archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $archive_cmds_F77 in -+ case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; -@@ -16503,7 +11229,7 @@ +@@ -9817,15 +9757,15 @@ x|xyes) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 - $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -- $rm conftest* -+ $RM conftest* +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } ++ { 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* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -16515,40 +11241,248 @@ - lib=conftest - libobjs=conftest.$ac_objext - deplibs= -- wl=$lt_prog_compiler_wl_F77 -- pic_flag=$lt_prog_compiler_pic_F77 -+ wl=$lt_prog_compiler_wl -+ pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest -- lt_save_allow_undefined_flag=$allow_undefined_flag_F77 -- allow_undefined_flag_F77= -- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -- (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ lt_save_allow_undefined_flag=$allow_undefined_flag -+ allow_undefined_flag= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -9843,7 +9783,7 @@ $as_echo_n "checking whether -lc should + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then -- archive_cmds_need_lc_F77=no -+ archive_cmds_need_lc=no - else -- archive_cmds_need_lc_F77=yes -+ archive_cmds_need_lc=yes - fi -- allow_undefined_flag_F77=$lt_save_allow_undefined_flag -+ allow_undefined_flag=$lt_save_allow_undefined_flag - else + archive_cmds_need_lc=no +@@ -9855,16 +9795,16 @@ $as_echo_n "checking whether -lc should cat conftest.err 1>&5 fi -- $rm conftest* -- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 --$as_echo "$archive_cmds_need_lc_F77" >&6; } -+ $RM conftest* -+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -+$as_echo "$archive_cmds_need_lc" >&6; } + $rm conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +-$as_echo "$archive_cmds_need_lc" >&6; } ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ;; esac fi @@ -31357,427 +10190,13 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure esac -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 - $as_echo_n "checking dynamic linker characteristics... " >&6; } -+ -+if test "$GCC" = yes; 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. -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ 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 +-$as_echo_n "checking dynamic linker characteristics... " >&6; } ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= -@@ -16562,7 +11496,6 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" -- - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -16599,7 +11532,7 @@ - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no -@@ -16625,9 +11558,18 @@ - ;; - - amigaos*) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ case $host_cpu in -+ powerpc) -+ # Since July 2007 AmigaOS4 officially supports .so libraries. -+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ ;; -+ m68k) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ esac - ;; - - beos*) -@@ -16650,25 +11592,28 @@ - # libtool to hard-code these into programs - ;; - --cygwin* | mingw* | pw32*) -+cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32*) -+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ -- chmod a+x \$dldir/$dlname' -+ chmod a+x \$dldir/$dlname~ -+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -+ fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ -- $rm \$dlpath' -+ $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in -@@ -16677,20 +11622,20 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; -- mingw*) -+ mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- 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 ';[c-zC-Z]:/' >/dev/null; 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 ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ 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"` -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) -@@ -16714,12 +11659,13 @@ - version_type=darwin - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -16812,18 +11758,18 @@ - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; -- hppa*64*) -- shrext_cmds='.sl' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- *) -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH -@@ -16900,17 +11846,73 @@ - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -+ # Some binutils ld are patched to set DT_RUNPATH -+ save_LDFLAGS=$LDFLAGS -+ save_libdir=$libdir -+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ -+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then -+ shlibpath_overrides_runpath=yes -+fi -+ -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS=$save_LDFLAGS -+ libdir=$save_libdir -+ - # This implies no fast_install, which is unacceptable. +@@ -10272,13 +10212,11 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes @@ -31786,14 +10205,13 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure # 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>/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' ' '` + 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="$sys_lib_dlsearch_path_spec $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 -@@ -16922,11 +11924,23 @@ +@@ -10290,6 +10228,18 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; @@ -31812,4806 +10230,1083 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure netbsd*) version_type=sunos need_lib_prefix=no - need_version=no -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' -@@ -16947,14 +11961,16 @@ - shlibpath_overrides_runpath=yes +@@ -10467,19 +10417,19 @@ uts4*) + dynamic_linker=no ;; - --nto-qnx*) -- version_type=linux -+*nto* | *qnx*) -+ version_type=qnx - 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=yes -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='ldqnx.so' - ;; - - openbsd*) -@@ -16963,13 +11979,13 @@ - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no -@@ -17041,7 +12057,6 @@ - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no -- export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) -@@ -17072,13 +12087,12 @@ - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -- shlibpath_overrides_runpath=no - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -- shlibpath_overrides_runpath=yes - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -@@ -17088,6 +12102,17 @@ - sys_lib_dlsearch_path_spec='/usr/lib' - ;; - -+tpf*) -+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -+ 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}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ - uts4*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -17103,1437 +12128,1433 @@ - $as_echo "$dynamic_linker" >&6; } + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-$as_echo "$dynamic_linker" >&6; } ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi --sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+fi + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" + fi +@@ -10491,8 +10441,8 @@ if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi - --sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" --fi -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } --hardcode_action_F77= --if test -n "$hardcode_libdir_flag_spec_F77" || \ -- test -n "$runpath_var_F77" || \ -- test "X$hardcode_automatic_F77" = "Xyes" ; then - -- # We can hardcode non-existant directories. -- if test "$hardcode_direct_F77" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && -- test "$hardcode_minus_L_F77" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action_F77=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action_F77=immediate -- fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action_F77=unsupported --fi --{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 --$as_echo "$hardcode_action_F77" >&6; } - --if test "$hardcode_action_F77" = relink; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless --fi - - --# The else clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# no rules to generate ltmain.sh. --if test -f "$ltmain"; then -- # 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 -- setopt NO_GLOB_SUBST -- fi -- # Now quote all the things that may contain metacharacters while being -- # careful not to overquote the AC_SUBSTed values. We take copies of the -- # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -- SED SHELL STRIP \ -- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -- deplibs_check_method reload_flag reload_cmds need_locks \ -- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -- lt_cv_sys_global_symbol_to_c_name_address \ -- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- old_postinstall_cmds old_postuninstall_cmds \ -- compiler_F77 \ -- CC_F77 \ -- LD_F77 \ -- lt_prog_compiler_wl_F77 \ -- lt_prog_compiler_pic_F77 \ -- lt_prog_compiler_static_F77 \ -- lt_prog_compiler_no_builtin_flag_F77 \ -- export_dynamic_flag_spec_F77 \ -- thread_safe_flag_spec_F77 \ -- whole_archive_flag_spec_F77 \ -- enable_shared_with_static_runtimes_F77 \ -- old_archive_cmds_F77 \ -- old_archive_from_new_cmds_F77 \ -- predep_objects_F77 \ -- postdep_objects_F77 \ -- predeps_F77 \ -- postdeps_F77 \ -- compiler_lib_search_path_F77 \ -- compiler_lib_search_dirs_F77 \ -- archive_cmds_F77 \ -- archive_expsym_cmds_F77 \ -- postinstall_cmds_F77 \ -- postuninstall_cmds_F77 \ -- old_archive_from_expsyms_cmds_F77 \ -- allow_undefined_flag_F77 \ -- no_undefined_flag_F77 \ -- export_symbols_cmds_F77 \ -- hardcode_libdir_flag_spec_F77 \ -- hardcode_libdir_flag_spec_ld_F77 \ -- hardcode_libdir_separator_F77 \ -- hardcode_automatic_F77 \ -- 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 -- -- case $var in -- old_archive_cmds_F77 | \ -- old_archive_from_new_cmds_F77 | \ -- archive_cmds_F77 | \ -- archive_expsym_cmds_F77 | \ -- module_cmds_F77 | \ -- module_expsym_cmds_F77 | \ -- old_archive_from_expsyms_cmds_F77 | \ -- export_symbols_cmds_F77 | \ -- extract_expsyms_cmds | reload_cmds | finish_cmds | \ -- postinstall_cmds | postuninstall_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -- # Double-quote double-evaled strings. -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -- ;; -- *) -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -- ;; -- esac -- done - -- case $lt_echo in -- *'\$0 --fallback-echo"') -- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -- ;; -- esac - --cfgfile="$ofile" - -- cat <<__EOF__ >> "$cfgfile" --# ### BEGIN LIBTOOL TAG CONFIG: $tagname - --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL - --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared - --# Whether or not to build static libraries. --build_old_libs=$enable_static - --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$archive_cmds_need_lc_F77 - --# Whether or not to disallow shared libs when runtime libs are static --allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 - --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install - --# The host system. --host_alias=$host_alias --host=$host --host_os=$host_os - --# The build system. --build_alias=$build_alias --build=$build --build_os=$build_os - --# An echo program that does not interpret backslashes. --echo=$lt_echo - --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS - --# A C compiler. --LTCC=$lt_LTCC - --# LTCC compiler flags. --LTCFLAGS=$lt_LTCFLAGS - --# A language-specific compiler. --CC=$lt_compiler_F77 - --# Is the compiler the GNU C compiler? --with_gcc=$GCC_F77 - --# An ERE matcher. --EGREP=$lt_EGREP - --# The linker used to build libraries. --LD=$lt_LD_F77 - --# Whether we need hard or soft links. --LN_S=$lt_LN_S - --# A BSD-compatible nm program. --NM=$lt_NM - --# A symbol stripping program --STRIP=$lt_STRIP - --# Used to examine libraries when file_magic_cmd begins "file" --MAGIC_CMD=$MAGIC_CMD - --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" - --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" - --# Used on cygwin: assembler. --AS="$AS" - --# The name of the directory that contains temporary libtool files. --objdir=$objdir - --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_F77 - --# Object file suffix (normally "o"). --objext="$ac_objext" - --# Old archive suffix (normally "a"). --libext="$libext" - --# Shared library suffix (normally ".so"). --shrext_cmds='$shrext_cmds' - --# Executable file suffix (normally ""). --exeext="$exeext" - --# Additional compiler flags for building library objects. --pic_flag=$lt_lt_prog_compiler_pic_F77 --pic_mode=$pic_mode - --# What is the maximum length of a command? --max_cmd_len=$lt_cv_sys_max_cmd_len - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 - --# Must we lock files when doing compilation? --need_locks=$lt_need_locks - --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix - --# Do we need a version for libraries? --need_version=$need_version - --# Whether dlopen is supported. --dlopen_support=$enable_dlopen - --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self - --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static - --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_lt_prog_compiler_static_F77 - --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 - --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 - --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 - --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 - --# Library versioning type. --version_type=$version_type - --# Format of library name prefix. --libname_spec=$lt_libname_spec - --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$lt_library_names_spec - --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec - --# Commands used to build and install an old-style archive. --RANLIB=$lt_RANLIB --old_archive_cmds=$lt_old_archive_cmds_F77 --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds - --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 - --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 - --# Commands used to build and install a shared archive. --archive_cmds=$lt_archive_cmds_F77 --archive_expsym_cmds=$lt_archive_expsym_cmds_F77 --postinstall_cmds=$lt_postinstall_cmds --postuninstall_cmds=$lt_postuninstall_cmds - --# Commands used to build a loadable module (assumed same as above if empty) --module_cmds=$lt_module_cmds_F77 --module_expsym_cmds=$lt_module_expsym_cmds_F77 - --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib - --# Dependencies to place before the objects being linked to create a --# shared library. --predep_objects=$lt_predep_objects_F77 -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdep_objects=$lt_postdep_objects_F77 -- --# Dependencies to place before the objects being linked to create a --# shared library. --predeps=$lt_predeps_F77 -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdeps=$lt_postdeps_F77 -- --# The directories searched by this compiler when creating a shared --# library --compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 - --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_compiler_lib_search_path_F77 - --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method - --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd - --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag_F77 - --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag_F77 - --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds - --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval - --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - --# This is the shared library runtime path variable. --runpath_var=$runpath_var - --# This is the shared library path variable. --shlibpath_var=$shlibpath_var - --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath - --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action_F77 - --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs - --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 - --# If ld is used when linking, flag to hardcode \$libdir into --# a binary during linking. This must work even if \$libdir does --# not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 -- --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 -- --# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$hardcode_direct_F77 -- --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$hardcode_minus_L_F77 -- --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 -- --# Set to yes if building a shared library automatically hardcodes DIR into the library --# and all subsequent libraries and executables linked against it. --hardcode_automatic=$hardcode_automatic_F77 - --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" - --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs_F77 - --# Compile-time system search path for libraries --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -+hardcode_action= -+if test -n "$hardcode_libdir_flag_spec" || -+ test -n "$runpath_var" || -+ test "X$hardcode_automatic" = "Xyes" ; then -+ -+ # We can hardcode non-existent directories. -+ if test "$hardcode_direct" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && -+ test "$hardcode_minus_L" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action=unsupported -+fi -+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 -+$as_echo "$hardcode_action" >&6; } -+ -+if test "$hardcode_action" = relink || -+ test "$inherit_rpath" = yes; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+ -+ -+ -+ -+ -+ -+ if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32* | cegcc*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+$as_echo_n "checking for dlopen in -ldl... " >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_dl_dlopen=no -+fi -+ -+rm -rf conftest.dSYM -+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 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ -+fi -+ -+ ;; -+ -+ *) -+ { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -+$as_echo_n "checking for shl_load... " >&6; } -+if test "${ac_cv_func_shl_load+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define shl_load innocuous_shl_load -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char shl_load (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef shl_load -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shl_load (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_shl_load || defined __stub___shl_load -+choke me -+#endif -+ -+int -+main () -+{ -+return shl_load (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_shl_load=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -+ ac_cv_func_shl_load=no -+fi - --# Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols_F77 -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -+$as_echo "$ac_cv_func_shl_load" >&6; } -+if test "x$ac_cv_func_shl_load" = x""yes; then -+ lt_cv_dlopen="shl_load" -+else -+ { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -+$as_echo_n "checking for shl_load in -ldld... " >&6; } -+if test "${ac_cv_lib_dld_shl_load+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --# The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds_F77 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char shl_load (); -+int -+main () -+{ -+return shl_load (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_dld_shl_load=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ ac_cv_lib_dld_shl_load=no -+fi - --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms_F77 -+rm -rf conftest.dSYM -+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 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -+else -+ { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -+$as_echo_n "checking for dlopen... " >&6; } -+if test "${ac_cv_func_dlopen+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define dlopen innocuous_dlopen - --# Symbols that must always be exported. --include_expsyms=$lt_include_expsyms_F77 -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char dlopen (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ - --# ### END LIBTOOL TAG CONFIG: $tagname -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif - --__EOF__ -+#undef dlopen - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_dlopen || defined __stub___dlopen -+choke me -+#endif - -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_func_dlopen=yes ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var" || \ +@@ -10516,8 +10466,8 @@ else + # directories. + hardcode_action=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +-$as_echo "$hardcode_action" >&6; } ++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 ++echo "${ECHO_T}$hardcode_action" >&6; } + + if test "$hardcode_action" = relink; then + # Fast installation is not supported +@@ -10530,13 +10480,13 @@ fi + + striplib= + old_striplib= +-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +-$as_echo_n "checking whether stripping libraries is possible... " >&6; } ++{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 ++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } + if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } else -- # If there is no Makefile yet, we rely on a make rule to execute -- # `config.status --recheck' to rerun these tests and create the -- # libtool script then. -- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -- if test -f "$ltmain_in"; then -- test -f Makefile && make "$ltmain" -- fi --fi -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 + # FIXME - insert some real tests, host_os isn't really good enough + case $host_os in +@@ -10544,16 +10494,16 @@ else + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + ;; + esac + fi +@@ -10585,10 +10535,10 @@ else -+ ac_cv_func_dlopen=no -+fi - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -+$as_echo "$ac_cv_func_dlopen" >&6; } -+if test "x$ac_cv_func_dlopen" = x""yes; then -+ lt_cv_dlopen="dlopen" -+else -+ { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+$as_echo_n "checking for dlopen in -ldl... " >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --CC="$lt_save_CC" -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_dl_dlopen=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -- else -- tagname="" -- fi -- ;; -+ ac_cv_lib_dl_dlopen=no -+fi - -- GCJ) -- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then -+rm -rf conftest.dSYM -+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 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+else -+ { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+$as_echo_n "checking for dlopen in -lsvld... " >&6; } -+if test "${ac_cv_lib_svld_dlopen+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsvld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dlopen (); -+int -+main () -+{ -+return dlopen (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_svld_dlopen=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Source file extension for Java test sources. --ac_ext=java -+ ac_cv_lib_svld_dlopen=no -+fi - --# Object file extension for compiled Java test sources. --objext=o --objext_GCJ=$objext -+rm -rf conftest.dSYM -+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 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -+else -+ { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+$as_echo_n "checking for dld_link in -ldld... " >&6; } -+if test "${ac_cv_lib_dld_dld_link+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - --# Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}" -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char dld_link (); -+int -+main () -+{ -+return dld_link (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_lib_dld_dld_link=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Code to be used in simple link tests --lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' -+ ac_cv_lib_dld_dld_link=no -+fi - --# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+rm -rf conftest.dSYM -+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 -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -+$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then -+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -+fi - --# If no C compiler was specified, use CC. --LTCC=${LTCC-"$CC"} - --# If no C compiler flags were specified, use CFLAGS. --LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+fi - --# Allow CC to be a program name with arguments. --compiler=$CC - -+fi - --# save warnings/boilerplate of simple test code --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* - --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 -r conftest* -+fi - - --# Allow CC to be a program name with arguments. --lt_save_CC="$CC" --CC=${GCJ-"gcj"} --compiler=$CC --compiler_GCJ=$CC --for cc_temp in $compiler""; do -- case $cc_temp in -- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+fi - - --# GCJ did not exist at the time GCC didn't implicitly link libc in. --archive_cmds_need_lc_GCJ=no -+fi - --old_archive_cmds_GCJ=$old_archive_cmds -+ ;; -+ esac - -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi - --lt_prog_compiler_no_builtin_flag_GCJ= -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - --if test "$GCC" = yes; then -- lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" - --{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 --$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } --if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -+$as_echo_n "checking whether a program can dlopen itself... " >&6; } -+if test "${lt_cv_dlopen_self+set}" = set; then - $as_echo_n "(cached) " >&6 + darwin*) + # if libdl is installed we need to link against it +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } ++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } + if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- lt_cv_prog_compiler_rtti_exceptions=no -- ac_outfile=conftest.$ac_objext -- 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. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- # The option is referenced via a variable to avoid confusing sed. -- lt_compile=`echo "$ac_compile" | $SED \ -- -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:17680: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>conftest.err) -- ac_status=$? -- cat conftest.err >&5 -- echo "$as_me:17684: \$? = $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. -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_rtti_exceptions=yes -- fi -- fi -- $rm conftest* -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext <<_LT_EOF -+#line 12872 "configure" -+#include "confdefs.h" + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +@@ -10620,37 +10570,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 --$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -+#if HAVE_DLFCN_H -+#include <dlfcn.h> -+#endif + ac_cv_lib_dl_dlopen=no + fi --if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -- lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" --else -- : --fi -+#include <stdio.h> +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } ++if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else --fi -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif +@@ -10663,10 +10609,10 @@ fi + ;; --lt_prog_compiler_wl_GCJ= --lt_prog_compiler_pic_GCJ= --lt_prog_compiler_static_GCJ= -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif + *) +- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +-$as_echo_n "checking for shl_load... " >&6; } ++ { echo "$as_me:$LINENO: checking for shl_load" >&5 ++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } + if test "${ac_cv_func_shl_load+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -10719,42 +10665,38 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_shl_load=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_shl_load=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +-$as_echo "$ac_cv_func_shl_load" >&6; } +-if test "x$ac_cv_func_shl_load" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 ++echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } ++if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" + else +- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +-$as_echo_n "checking for shl_load in -ldld... " >&6; } ++ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 ++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } + if test "${ac_cv_lib_dld_shl_load+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +@@ -10786,43 +10728,39 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_shl_load=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dld_shl_load=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +-$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 ++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } ++if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 +-$as_echo_n "checking for dlopen... " >&6; } ++ { echo "$as_me:$LINENO: checking for dlopen" >&5 ++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } + if test "${ac_cv_func_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -10875,42 +10813,38 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_dlopen=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +-$as_echo "$ac_cv_func_dlopen" >&6; } +-if test "x$ac_cv_func_dlopen" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } ++if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +-$as_echo_n "checking for dlopen in -ldl... " >&6; } ++ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 ++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } + if test "${ac_cv_lib_dl_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" +@@ -10942,43 +10876,39 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dl_dlopen=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } ++if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else +- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +-$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 ++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } + if test "${ac_cv_lib_svld_dlopen+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" +@@ -11010,43 +10940,39 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_svld_dlopen=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_svld_dlopen=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +-$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 ++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } ++if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else +- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +-$as_echo_n "checking for dld_link in -ldld... " >&6; } ++ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 ++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } + if test "${ac_cv_lib_dld_dld_link+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" +@@ -11078,37 +11004,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_dld_link=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dld_dld_link=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +-$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 ++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } ++if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + fi + +@@ -11147,10 +11069,10 @@ fi + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + +- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +-$as_echo_n "checking whether a program can dlopen itself... " >&6; } ++ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 ++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } + if test "${lt_cv_dlopen_self+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +@@ -11158,7 +11080,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 11161 "configure" ++#line 11083 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11224,7 +11146,7 @@ EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +@@ -11242,15 +11164,15 @@ rm -fr conftest* + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +-$as_echo "$lt_cv_dlopen_self" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 ++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" +- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } ++ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 ++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } + if test "${lt_cv_dlopen_self_static+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +@@ -11258,7 +11180,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 11261 "configure" ++#line 11183 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11324,7 +11246,7 @@ EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? +@@ -11342,8 +11264,8 @@ rm -fr conftest* + + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +-$as_echo "$lt_cv_dlopen_self_static" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 ++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" +@@ -11365,13 +11287,13 @@ fi + + + # Report which library types will actually be built +-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-$as_echo_n "checking if libtool supports shared libraries... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-$as_echo "$can_build_shared" >&6; } ++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++echo "${ECHO_T}$can_build_shared" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-$as_echo_n "checking whether to build shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -11391,15 +11313,15 @@ aix[4-9]*) + fi + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 +-$as_echo "$enable_shared" >&6; } ++{ echo "$as_me:$LINENO: result: $enable_shared" >&5 ++echo "${ECHO_T}$enable_shared" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-$as_echo_n "checking whether to build static libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes +-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 +-$as_echo "$enable_static" >&6; } ++{ echo "$as_me:$LINENO: result: $enable_static" >&5 ++echo "${ECHO_T}$enable_static" >&6; } + + # The else clause should only fire when bootstrapping the + # libtool distribution, otherwise you forgot to ship ltmain.sh +@@ -11492,8 +11414,8 @@ if test -f "$ltmain"; then + cfgfile="${ofile}T" + trap "$rm \"$cfgfile\"; exit 1" 1 2 15 + $rm -f "$cfgfile" +- { $as_echo "$as_me:$LINENO: creating $ofile" >&5 +-$as_echo "$as_me: creating $ofile" >&6;} ++ { echo "$as_me:$LINENO: creating $ofile" >&5 ++echo "$as_me: creating $ofile" >&6;} + + cat <<__EOF__ >> "$cfgfile" + #! $SHELL +@@ -11905,18 +11827,18 @@ fi + + if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then +- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 +-$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} ++ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 ++echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} + fi + + if test -z "$LTCC"; then + eval "`$SHELL ${ofile} --config | grep '^LTCC='`" + if test -z "$LTCC"; then +- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 +-$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} ++ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 ++echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} + else +- { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 +-$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} ++ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 ++echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} + fi + fi + if test -z "$LTCFLAGS"; then +@@ -11933,16 +11855,16 @@ $as_echo "$as_me: WARNING: using \`LTCC= + # Check whether tagname contains only valid characters + case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in + "") ;; +- *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 +-$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} ++ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 ++echo "$as_me: error: invalid tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null + then +- { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 +-$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} ++ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 ++echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -12085,8 +12007,8 @@ fi + ac_prog=ld + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. +- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +-$as_echo_n "checking for ld used by $CC... " >&6; } ++ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 ++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -12115,14 +12037,14 @@ $as_echo_n "checking for ld used by $CC. + ;; + esac + elif test "$with_gnu_ld" = yes; then +- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 +-$as_echo_n "checking for GNU ld... " >&6; } ++ { echo "$as_me:$LINENO: checking for GNU ld" >&5 ++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + else +- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +-$as_echo_n "checking for non-GNU ld... " >&6; } ++ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 ++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + fi + if test "${lt_cv_path_LD+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +@@ -12152,19 +12074,19 @@ fi + + LD="$lt_cv_path_LD" + if test -n "$LD"; then +- { $as_echo "$as_me:$LINENO: result: $LD" >&5 +-$as_echo "$LD" >&6; } ++ { echo "$as_me:$LINENO: result: $LD" >&5 ++echo "${ECHO_T}$LD" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi +-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} ++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 ++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 ++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } + if test "${lt_cv_prog_gnu_ld+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # I'd rather use --version here, but apparently some GNU lds only accept -v. + case `$LD -v 2>&1 </dev/null` in +@@ -12176,8 +12098,8 @@ case `$LD -v 2>&1 </dev/null` in + ;; + esac + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +-$as_echo "$lt_cv_prog_gnu_ld" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 ++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } + with_gnu_ld=$lt_cv_prog_gnu_ld + + +@@ -12227,8 +12149,8 @@ else + fi + + # PORTME: fill in a description of your system's C++ link characteristics +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + ld_shlibs_CXX=yes + case $host_os in + aix3*) +@@ -12345,21 +12267,18 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -12374,13 +12293,12 @@ 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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + 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 +@@ -12416,21 +12334,18 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -12445,13 +12360,12 @@ 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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + 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 +@@ -12854,7 +12768,7 @@ if test -z "$aix_libpath"; then aix_libp + ;; + 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= +@@ -13181,8 +13095,8 @@ if test -z "$aix_libpath"; then aix_libp + ld_shlibs_CXX=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-$as_echo "$ld_shlibs_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++echo "${ECHO_T}$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no + + GCC_CXX="$GXX" +@@ -13201,7 +13115,7 @@ EOF + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. +@@ -13357,8 +13271,8 @@ lt_prog_compiler_wl_CXX= + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX= -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } -- if test "$GCC" = yes; then -- lt_prog_compiler_wl_GCJ='-Wl,' -- lt_prog_compiler_static_GCJ='-static' -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); - -- case $host_os in -- aix*) -- # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_prog_compiler_static_GCJ='-Bstatic' -- fi -- ;; -+ return status; -+} -+_LT_EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&5 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; -+ esac -+ else : -+ # compilation failed -+ lt_cv_dlopen_self=no -+ fi -+fi -+rm -fr conftest* - -- amigaos*) -- # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' -- ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -- # PIC is the default for these OSes. -- ;; -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -+$as_echo "$lt_cv_dlopen_self" >&6; } - -- 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 -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -+if test "${lt_cv_dlopen_self_static+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ lt_cv_dlopen_self_static=cross -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext <<_LT_EOF -+#line 12968 "configure" -+#include "confdefs.h" - -- ;; -+#if HAVE_DLFCN_H -+#include <dlfcn.h> -+#endif - -- darwin* | rhapsody*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- lt_prog_compiler_pic_GCJ='-fno-common' -- ;; -+#include <stdio.h> - -- interix[3-9]*) -- # Interix 3.x gcc -fpic/-fPIC options generate broken code. -- # Instead, we relocate shared libraries at runtime. -- ;; -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif - -- msdosdjgpp*) -- # Just because we use GCC doesn't mean we suddenly get shared libraries -- # on systems that don't support them. -- lt_prog_compiler_can_build_shared_GCJ=no -- enable_shared=no -- ;; -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif - -- sysv4*MP*) -- if test -d /usr/nec; then -- lt_prog_compiler_pic_GCJ=-Kconform_pic -- fi -- ;; -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; - -- hpux*) -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- lt_prog_compiler_pic_GCJ='-fPIC' -- ;; -- esac -- ;; -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); - -- *) -- lt_prog_compiler_pic_GCJ='-fPIC' -- ;; -+ return status; -+} -+_LT_EOF -+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&5 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; -+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -13558,7 +13472,7 @@ $as_echo_n "checking for $compiler optio + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in +@@ -13641,18 +13555,18 @@ $as_echo_n "checking for $compiler optio esac -- else -- # PORTME Check for flag to pass linker flags through the system compiler. -- case $host_os in -- aix*) -- lt_prog_compiler_wl_GCJ='-Wl,' -- if test "$host_cpu" = ia64; then -- # AIX 5 now supports IA64 processor -- lt_prog_compiler_static_GCJ='-Bstatic' -- else -- lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' -- fi -- ;; -- darwin*) -- # PIC is the default on this platform -- # Common symbols not allowed in MH_DYLIB files -- case $cc_basename in -- xlc*) -- lt_prog_compiler_pic_GCJ='-qnocommon' -- lt_prog_compiler_wl_GCJ='-Wl,' -- ;; -- esac -- ;; -+ else : -+ # compilation failed -+ lt_cv_dlopen_self_static=no -+ fi -+fi -+rm -fr conftest* + fi -- 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). +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +-$as_echo "$lt_prog_compiler_pic_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } -- ;; -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+$as_echo "$lt_cv_dlopen_self_static" >&6; } -+ fi + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_CXX"; then -- hpux9* | hpux10* | hpux11*) -- lt_prog_compiler_wl_GCJ='-Wl,' -- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -- # not for PA HP-UX. -- case $host_cpu in -- hppa*64*|ia64*) -- # +Z the default -- ;; -- *) -- lt_prog_compiler_pic_GCJ='+Z' -- ;; -- esac -- # Is there a better lt_prog_compiler_static that works with the bundled CC? -- lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' -- ;; -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac - -- irix5* | irix6* | nonstopux*) -- lt_prog_compiler_wl_GCJ='-Wl,' -- # PIC (with -KPIC) is the default. -- lt_prog_compiler_static_GCJ='-non_shared' -- ;; -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi - -- newsos6) -- lt_prog_compiler_pic_GCJ='-KPIC' -- lt_prog_compiler_static_GCJ='-Bstatic' -- ;; - -- linux* | k*bsd*-gnu) -- case $cc_basename in -- icc* | ecc*) -- lt_prog_compiler_wl_GCJ='-Wl,' -- lt_prog_compiler_pic_GCJ='-KPIC' -- lt_prog_compiler_static_GCJ='-static' -- ;; -- pgcc* | pgf77* | pgf90* | pgf95*) -- # Portland Group compilers (*not* the Pentium gcc compiler, -- # which looks to be a dead project) -- lt_prog_compiler_wl_GCJ='-Wl,' -- lt_prog_compiler_pic_GCJ='-fpic' -- lt_prog_compiler_static_GCJ='-Bstatic' -- ;; -- ccc*) -- lt_prog_compiler_wl_GCJ='-Wl,' -- # 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 -- ;; - -- osf3* | osf4* | osf5*) -- lt_prog_compiler_wl_GCJ='-Wl,' -- # All OSF/1 code is PIC. -- 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' -- case $cc_basename in -- f77* | f90* | f95*) -- lt_prog_compiler_wl_GCJ='-Qoption ld ';; -- *) -- lt_prog_compiler_wl_GCJ='-Wl,';; -- esac -- ;; - -- sunos4*) -- lt_prog_compiler_wl_GCJ='-Qoption ld ' -- lt_prog_compiler_pic_GCJ='-PIC' -- lt_prog_compiler_static_GCJ='-Bstatic' -- ;; - -- sysv4 | sysv4.2uw2* | sysv4.3*) -- lt_prog_compiler_wl_GCJ='-Wl,' -- lt_prog_compiler_pic_GCJ='-KPIC' -- lt_prog_compiler_static_GCJ='-Bstatic' -- ;; - -- sysv4*MP*) -- if test -d /usr/nec ;then -- lt_prog_compiler_pic_GCJ='-Kconform_pic' -- lt_prog_compiler_static_GCJ='-Bstatic' -- fi -- ;; - -- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -- lt_prog_compiler_wl_GCJ='-Wl,' -- lt_prog_compiler_pic_GCJ='-KPIC' -- lt_prog_compiler_static_GCJ='-Bstatic' -- ;; - -- unicos*) -- lt_prog_compiler_wl_GCJ='-Wl,' -- lt_prog_compiler_can_build_shared_GCJ=no -- ;; - -- uts4*) -- lt_prog_compiler_pic_GCJ='-pic' -- lt_prog_compiler_static_GCJ='-Bstatic' -- ;; - -- *) -- lt_prog_compiler_can_build_shared_GCJ=no -- ;; -- esac -- fi - --{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 --$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } - --# --# Check to make sure the PIC flag actually works. --# --if test -n "$lt_prog_compiler_pic_GCJ"; then - --{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 --$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } --if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then +-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_pic_works_GCJ=no -- ac_outfile=conftest.$ac_objext -- 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. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- # The option is referenced via a variable to avoid confusing sed. -- lt_compile=`echo "$ac_compile" | $SED \ -- -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:17970: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>conftest.err) -- ac_status=$? -- cat conftest.err >&5 -- echo "$as_me:17974: \$? = $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. -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_pic_works_GCJ=yes -- fi -- fi -- $rm conftest* - --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 --$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; } - --if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then -- case $lt_prog_compiler_pic_GCJ in -- "" | " "*) ;; -- *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; -- esac -+striplib= -+old_striplib= -+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+$as_echo_n "checking whether stripping libraries is possible... " >&6; } -+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } ++ echo $ECHO_N "(cached) $ECHO_C" >&6 else -- lt_prog_compiler_pic_GCJ= -- lt_prog_compiler_can_build_shared_GCJ=no --fi -- --fi --case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -- *djgpp*) -- lt_prog_compiler_pic_GCJ= -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+ fi - ;; - *) -- lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - ;; --esac -+ esac -+fi + lt_cv_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext +@@ -13667,11 +13581,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13670: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13584: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13674: \$? = $ac_status" >&5 ++ echo "$as_me:13588: \$? = $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. +@@ -13684,8 +13598,8 @@ else + $rm conftest* --# --# Check to make sure the static flag actually works. --# --wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in +@@ -13712,10 +13626,10 @@ esac + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } --if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_static_works_GCJ=no -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -- 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 -- if test -s conftest.err; then -- # Append any errors to the config.log. -- cat conftest.err 1>&5 -- $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -- if diff conftest.exp conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_static_works_GCJ=yes -- fi -- else -- lt_cv_prog_compiler_static_works_GCJ=yes -- fi -- fi -- $rm -r conftest* -- LDFLAGS="$save_LDFLAGS" ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" +@@ -13740,8 +13654,8 @@ else + LDFLAGS="$save_LDFLAGS" --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 --$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; } + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } --if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then -- : --else -- lt_prog_compiler_static_GCJ= --fi + if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then + : +@@ -13750,10 +13664,10 @@ else + fi -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } --if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_prog_compiler_c_o_GCJ=no -- $rm -r conftest 2>/dev/null -- mkdir conftest -- cd conftest -- mkdir out -- echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_c_o_CXX=no + $rm -r conftest 2>/dev/null +@@ -13771,11 +13685,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13774: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13688: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13778: \$? = $ac_status" >&5 ++ echo "$as_me:13692: \$? = $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 +@@ -13797,34 +13711,34 @@ else + $rm conftest* -- lt_compiler_flag="-o out/conftest2.$ac_objext" -- # Insert the option either (1) after the last *FLAGS variable, or -- # (2) before a word containing "conftest.", or (3) at the end. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- lt_compile=`echo "$ac_compile" | $SED \ -- -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:18074: $lt_compile\"" >&5) -- (eval "$lt_compile" 2>out/conftest.err) -- ac_status=$? -- cat out/conftest.err >&5 -- echo "$as_me:18078: \$? = $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 -- # So say no if there are warnings -- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -- lt_cv_prog_compiler_c_o_GCJ=yes -- fi -- fi -- chmod u+w . 2>&5 -- $rm conftest* -- # SGI C++ compiler will create directory out/ii_files/ for -- # template instantiation -- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -- $rm out/* && rmdir out -- cd .. -- rmdir conftest -- $rm conftest* - --fi --{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 --$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } --hard_links="nottested" --if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then -- # do not overwrite the value of need_locks provided by the user + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } -- hard_links=yes -- $rm conftest* -- ln conftest.a conftest.b 2>/dev/null && hard_links=no -- touch conftest.a -- ln conftest.a conftest.b 2>&5 || hard_links=no -- ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } -- if test "$hard_links" = no; then ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -- need_locks=warn -- fi --else -- need_locks=no --fi ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } -- runpath_var= -- allow_undefined_flag_GCJ= -- enable_shared_with_static_runtimes_GCJ=no -- archive_cmds_GCJ= -- archive_expsym_cmds_GCJ= -- old_archive_From_new_cmds_GCJ= -- old_archive_from_expsyms_cmds_GCJ= -- export_dynamic_flag_spec_GCJ= -- whole_archive_flag_spec_GCJ= -- thread_safe_flag_spec_GCJ= -- hardcode_libdir_flag_spec_GCJ= -- hardcode_libdir_flag_spec_ld_GCJ= -- hardcode_libdir_separator_GCJ= -- hardcode_direct_GCJ=no -- hardcode_minus_L_GCJ=no -- hardcode_shlibpath_var_GCJ=unsupported -- link_all_deplibs_GCJ=unknown -- hardcode_automatic_GCJ=no -- module_cmds_GCJ= -- module_expsym_cmds_GCJ= -- always_export_symbols_GCJ=no -- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -- # include_expsyms should be a list of space-separated symbols to be *always* -- # included in the symbol list -- include_expsyms_GCJ= -- # exclude_expsyms can be an extended regexp of symbols to exclude -- # it will be wrapped by ` (' and `)$', so one must not match beginning or -- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -- # as well as any symbol that contains `d'. -- exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -- # platforms (ab)use it in PIC code, but their linkers get confused if -- # the symbol is explicitly referenced. Since portable code cannot -- # rely on this symbol name, it's probably fine to never include it in -- # preloaded symbol tables. -- # Exclude shared library initialization/finalization symbols. -- extract_expsyms_cmds= -- # Just being paranoid about ensuring that cc_basename is set. -- for cc_temp in $compiler""; do -- case $cc_temp in -- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - -+ # Report which library types will actually be built -+ { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+$as_echo_n "checking if libtool supports shared libraries... " >&6; } -+ { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+$as_echo "$can_build_shared" >&6; } -+ -+ { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+$as_echo_n "checking whether to build shared libraries... " >&6; } -+ test "$can_build_shared" = "no" && enable_shared=no -+ -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in -- cygwin* | mingw* | pw32*) -- # FIXME: the MSVC++ port hasn't been tested in a loooong time -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- if test "$GCC" != yes; then -- with_gnu_ld=no -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' - fi - ;; -- interix*) -- # we just hope/assume this is gcc and not c89 (= MSVC++) -- with_gnu_ld=yes -- ;; -- openbsd*) -- with_gnu_ld=no -+ -+ aix[4-9]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi - ;; - esac -+ { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 -+$as_echo "$enable_shared" >&6; } - -- ld_shlibs_GCJ=yes -- if test "$with_gnu_ld" = yes; then -- # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' -+ { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+$as_echo_n "checking whether to build static libraries... " >&6; } -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ { $as_echo "$as_me:$LINENO: result: $enable_static" >&5 -+$as_echo "$enable_static" >&6; } - -- # Set some defaults for GNU ld with shared library support. These -- # are reset later if shared libraries are not supported. Putting them -- # here allows them to be overridden if necessary. -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec_GCJ= -- fi -- supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -- *\ 2.11.*) ;; # other 2.11 versions -- *) supports_anon_versioning=yes ;; -- esac - -- # See if GNU ld supports shared libraries. -- case $host_os in -- aix[3-9]*) -- # On AIX/PPC, the GNU linker is very broken -- if test "$host_cpu" != ia64; then -- ld_shlibs_GCJ=no -- cat <<EOF 1>&2 - --*** Warning: the GNU linker, at least up to release 2.9.1, is reported --*** to be unable to reliably create shared libraries on AIX. --*** Therefore, libtool is disabling shared libraries support. If you --*** really care for shared libraries, you may want to modify your PATH --*** so that a non-GNU linker is found, and then restart. - --EOF -- fi -- ;; -+fi -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - -- amigaos*) -- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec_GCJ='-L$libdir' -- hardcode_minus_L_GCJ=yes -- -- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports -- # that the semantics of dynamic libraries on AmigaOS, at least up -- # to version 4, is to share data among multiple programs linked -- # with the same dynamic library. Since this doesn't match the -- # behavior of shared libraries on other platforms, we can't use -- # them. -- ld_shlibs_GCJ=no -- ;; -+CC="$lt_save_CC" - -- beos*) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- allow_undefined_flag_GCJ=unsupported -- # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -- # support --undefined. This deserves some investigation. FIXME -- archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- else -- ld_shlibs_GCJ=no -- fi -- ;; - -- cygwin* | mingw* | pw32*) -- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, -- # as there is no search path for DLLs. -- hardcode_libdir_flag_spec_GCJ='-L$libdir' -- 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/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -- 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' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- else -- ld_shlibs_GCJ=no -- fi -- ;; -+archive_cmds_need_lc_CXX=no -+allow_undefined_flag_CXX= -+always_export_symbols_CXX=no -+archive_expsym_cmds_CXX= -+compiler_needs_object_CXX=no -+export_dynamic_flag_spec_CXX= -+hardcode_direct_CXX=no -+hardcode_direct_absolute_CXX=no -+hardcode_libdir_flag_spec_CXX= -+hardcode_libdir_flag_spec_ld_CXX= -+hardcode_libdir_separator_CXX= -+hardcode_minus_L_CXX=no -+hardcode_shlibpath_var_CXX=unsupported -+hardcode_automatic_CXX=no -+inherit_rpath_CXX=no -+module_cmds_CXX= -+module_expsym_cmds_CXX= -+link_all_deplibs_CXX=unknown -+old_archive_cmds_CXX=$old_archive_cmds -+no_undefined_flag_CXX= -+whole_archive_flag_spec_CXX= -+enable_shared_with_static_runtimes_CXX=no - -- interix[3-9]*) -- hardcode_direct_GCJ=no -- hardcode_shlibpath_var_GCJ=no -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_GCJ='${wl}-E' -- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -- # Instead, shared libraries are loaded at an image base (0x10000000 by -- # default) and relocated if they conflict, which is a slow very memory -- # consuming and fragmenting process. To avoid this, we pick a random, -- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -- # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- 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' -- ;; -+# Source file extension for C++ test sources. -+ac_ext=cpp - -- 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 -- pgcc*) # Portland Group C compiler -- whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- tmp_addflag=' $pic_flag' -- ;; -- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -- whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -- tmp_addflag=' $pic_flag -Mnomain' ;; -- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -- tmp_addflag=' -i_dynamic' ;; -- efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -- tmp_addflag=' -i_dynamic -nofor_main' ;; -- ifc* | ifort*) # Intel Fortran compiler -- tmp_addflag=' -nofor_main' ;; -- esac -- 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' -+# Object file extension for compiled C++ test sources. -+objext=o -+objext_CXX=$objext - -- 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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -- fi -- else -- ld_shlibs_GCJ=no -- fi -- ;; -+# No sense in running all these tests if we already determined that -+# the CXX compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_caught_CXX_error" != yes; then -+ # Code to be used in simple compile tests -+ lt_simple_compile_test_code="int some_variable = 0;" - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -- wlarc= -- else -- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- fi -- ;; -+ # Code to be used in simple link tests -+ lt_simple_link_test_code='int main(int, char *[]) { return(0); }' - -- solaris*) -- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -- ld_shlibs_GCJ=no -- cat <<EOF 1>&2 -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. - --*** Warning: The releases 2.8.* of the GNU linker cannot reliably --*** create shared libraries on Solaris systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.9.1 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. - --EOF -- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- ld_shlibs_GCJ=no -- fi -- ;; - -- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -- case `$LD -v 2>&1` in -- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -- ld_shlibs_GCJ=no -- cat <<_LT_EOF 1>&2 - --*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not --*** reliably create shared libraries on SCO systems. Therefore, libtool --*** is disabling shared libraries support. We urge you to upgrade GNU --*** binutils to release 2.16.91.0.3 or newer. Another option is to modify --*** your PATH or compiler configuration so that the native linker is --*** used, and then restart. - --_LT_EOF -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+ -+ -+ # save warnings/boilerplate of simple test code -+ 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* -+ -+ 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 -r conftest* -+ -+ -+ # Allow CC to be a program name with arguments. -+ lt_save_CC=$CC -+ lt_save_LD=$LD -+ lt_save_GCC=$GCC -+ GCC=$GXX -+ lt_save_with_gnu_ld=$with_gnu_ld -+ lt_save_path_LD=$lt_cv_path_LD -+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+ else -+ $as_unset lt_cv_prog_gnu_ld -+ fi -+ if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+ else -+ $as_unset lt_cv_path_LD -+ fi -+ test -z "${LDCXX+set}" || LD=$LDCXX -+ CC=${CXX-"c++"} -+ compiler=$CC -+ compiler_CXX=$CC -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ -+ if test -n "$compiler"; then -+ # We don't want -fno-exception when compiling C++ code, so set the -+ # no_builtin_flag separately -+ if test "$GXX" = yes; then -+ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -+ else -+ lt_prog_compiler_no_builtin_flag_CXX= -+ fi -+ -+ if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration -+ -+ -+ -+# Check whether --with-gnu-ld was given. -+if test "${with_gnu_ld+set}" = set; then -+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -+else -+ with_gnu_ld=no -+fi -+ -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+$as_echo_n "checking for ld used by $CC... " >&6; } -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [\\/]* | ?:[\\/]*) -+ re_direlt='/[^/][^/]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` -+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 -+$as_echo_n "checking for GNU ld... " >&6; } -+else -+ { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+$as_echo_n "checking for non-GNU ld... " >&6; } -+fi -+if test "${lt_cv_path_LD+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in -+ *GNU* | *'with BFD'*) -+ test "$with_gnu_ld" != no && break - ;; -- *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' -- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' -- else -- ld_shlibs_GCJ=no -- fi -+ *) -+ test "$with_gnu_ld" != yes && break - ;; - esac -- ;; -+ fi -+ done -+ IFS="$lt_save_ifs" -+else -+ lt_cv_path_LD="$LD" # Let the user override the test with a path. -+fi -+fi -+ -+LD="$lt_cv_path_LD" -+if test -n "$LD"; then -+ { $as_echo "$as_me:$LINENO: result: $LD" >&5 -+$as_echo "$LD" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} -+ { (exit 1); exit 1; }; } -+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -+if test "${lt_cv_prog_gnu_ld+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ # I'd rather use --version here, but apparently some GNU lds only accept -v. -+case `$LD -v 2>&1 </dev/null` in -+*GNU* | *'with BFD'*) -+ lt_cv_prog_gnu_ld=yes -+ ;; -+*) -+ lt_cv_prog_gnu_ld=no -+ ;; -+esac -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -+$as_echo "$lt_cv_prog_gnu_ld" >&6; } -+with_gnu_ld=$lt_cv_prog_gnu_ld - -- sunos4*) -- archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- wlarc= -- hardcode_direct_GCJ=yes -- hardcode_shlibpath_var_GCJ=no -- ;; - -- *) -- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -- else -- ld_shlibs_GCJ=no -- fi -- ;; -- esac - -- if test "$ld_shlibs_GCJ" = no; then -- runpath_var= -- hardcode_libdir_flag_spec_GCJ= -- export_dynamic_flag_spec_GCJ= -- whole_archive_flag_spec_GCJ= -- fi -- else -- # PORTME fill in a description of your system's linker (not GNU ld) -- case $host_os in -- aix3*) -- allow_undefined_flag_GCJ=unsupported -- always_export_symbols_GCJ=yes -- archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -- # Note: this linker hardcodes the directories in LIBPATH if there -- # are no directories specified by -L. -- hardcode_minus_L_GCJ=yes -- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -- # Neither direct hardcoding nor static linking is supported with a -- # broken collect2. -- hardcode_direct_GCJ=unsupported -- fi -- ;; - -- aix[4-9]*) -- if test "$host_cpu" = ia64; then -- # On IA64, the linker does run time linking by default, so we don't -- # have to do anything special. -- aix_use_runtimelinking=no -- exp_sym_flag='-Bexport' -- no_entry_flag="" -- else -- # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -- export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -- else -- export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' -- fi -- aix_use_runtimelinking=no - -- # Test if we are trying to use run time linking or normal -- # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -- case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -- for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -- aix_use_runtimelinking=yes -- break -- fi -- done -- ;; -- esac - -- exp_sym_flag='-bexport' -- no_entry_flag='-bnoentry' -+ -+ # Check if GNU C++ uses GNU ld as the underlying linker, since the -+ # archiving commands below assume that GNU ld is being used. -+ if test "$with_gnu_ld" = yes; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' -+ -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | -+ $GREP 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_CXX= -+ fi -+ else -+ with_gnu_ld=no -+ wlarc= -+ -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - -- # When large executables or shared objects are built, AIX ld can -- # have problems creating the table of contents. If linking a library -- # or program results in "error TOC overflow" add -mminimal-toc to -- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' - -- archive_cmds_GCJ='' -- hardcode_direct_GCJ=yes -- hardcode_libdir_separator_GCJ=':' -- link_all_deplibs_GCJ=yes -+ else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= -+ fi - -- if test "$GCC" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -- # We only want to do this on AIX 4.2 and lower, the check -- # below for broken collect2 doesn't work under 4.3+ -+ # PORTME: fill in a description of your system's C++ link characteristics -+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } -+ ld_shlibs_CXX=yes -+ case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aix[4-9]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ archive_cmds_CXX='' -+ hardcode_direct_CXX=yes -+ hardcode_direct_absolute_CXX=yes -+ hardcode_libdir_separator_CXX=':' -+ link_all_deplibs_CXX=yes -+ file_list_spec_CXX='${wl}-f,' -+ -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -- if test -f "$collect2name" && \ -- strings "$collect2name" | grep resolve_lib_name >/dev/null -+ if test -f "$collect2name" && -+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then -- # We have reworked collect2 -- : -+ # We have reworked collect2 -+ : - else -- # We have old collect2 -- hardcode_direct_GCJ=unsupported -- # It fails to find uninstalled libraries when the uninstalled -- # path is not listed in the libpath. Setting hardcode_minus_L -- # to unsupported forces relinking -- hardcode_minus_L_GCJ=yes -- hardcode_libdir_flag_spec_GCJ='-L$libdir' -- hardcode_libdir_separator_GCJ= -+ # We have old collect2 -+ hardcode_direct_CXX=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ hardcode_minus_L_CXX=yes -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ hardcode_libdir_separator_CXX= - fi -- ;; -- esac -- shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -- fi -- else -- # not using gcc -- if test "$host_cpu" = ia64; then -- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -- # chokes on -Wl,-G. The following line is correct: -- shared_flag='-G' -- else -+ esac -+ shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -- else -- shared_flag='${wl}-bM:SRE' -+ shared_flag="$shared_flag "'${wl}-G' - fi -- fi -- fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi - -- # It seems that -bexpall does not export symbols beginning with -- # underscore (_), so it is better to generate a list of symbols to export. -- always_export_symbols_GCJ=yes -- if test "$aix_use_runtimelinking" = yes; then -- # Warning - without using the other runtime loading flags (-brtl), -- # -berok will link without error, but may produce a broken library. -- allow_undefined_flag_GCJ='-berok' -- # Determine the default libpath from the value encoded in an empty executable. -- cat >conftest.$ac_ext <<_ACEOF -+ export_dynamic_flag_spec_CXX='${wl}-bexpall' -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to -+ # export. -+ always_export_symbols_CXX=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ allow_undefined_flag_CXX='-berok' -+ # Determine the default libpath from the value encoded in an empty -+ # executable. -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -18563,7 +13584,7 @@ - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -+ test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -@@ -18594,16 +13615,18 @@ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" -- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -- else -- if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' -- allow_undefined_flag_GCJ="-z nodefs" -- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -- else -- # Determine the default libpath from the value encoded in an empty executable. -- cat >conftest.$ac_ext <<_ACEOF -+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -+ -+ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' -+ allow_undefined_flag_CXX="-z nodefs" -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -18633,7 +13656,7 @@ - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -+ test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -@@ -18657,474 +13680,1568 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - --fi -+fi -+ -+rm -rf conftest.dSYM -+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 -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ no_undefined_flag_CXX=' ${wl}-bernotok' -+ allow_undefined_flag_CXX=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ whole_archive_flag_spec_CXX='$convenience' -+ archive_cmds_need_lc_CXX=yes -+ # This is similar to how AIX traditionally builds its shared -+ # libraries. -+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_CXX=unsupported -+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ -+ cygwin* | mingw* | pw32* | cegcc*) -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, -+ # as there is no search path for DLLs. -+ hardcode_libdir_flag_spec_CXX='-L$libdir' -+ allow_undefined_flag_CXX=unsupported -+ always_export_symbols_CXX=no -+ enable_shared_with_static_runtimes_CXX=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ -+ -+ archive_cmds_need_lc_CXX=no -+ hardcode_direct_CXX=no -+ hardcode_automatic_CXX=yes -+ hardcode_shlibpath_var_CXX=unsupported -+ whole_archive_flag_spec_CXX='' -+ link_all_deplibs_CXX=yes -+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined" -+ case $cc_basename in -+ ifort*) _lt_dar_can_shared=yes ;; -+ *) _lt_dar_can_shared=$GCC ;; -+ esac -+ if test "$_lt_dar_can_shared" = "yes"; then -+ output_verbose_link_cmd=echo -+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi -+ -+ else -+ ld_shlibs_CXX=no -+ fi -+ -+ ;; -+ -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ -+ freebsd[12]*) -+ # C++ shared libraries reported to be fairly broken before -+ # switch to ELF -+ ld_shlibs_CXX=no -+ ;; -+ -+ freebsd-elf*) -+ archive_cmds_need_lc_CXX=no -+ ;; -+ -+ freebsd* | dragonfly*) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ ld_shlibs_CXX=yes -+ ;; -+ -+ gnu*) -+ ;; -+ -+ hpux9*) -+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ hardcode_direct_CXX=yes -+ hardcode_minus_L_CXX=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aCC*) -+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ ;; -+ *) -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ ;; -+ *) -+ hardcode_direct_CXX=yes -+ hardcode_direct_absolute_CXX=yes -+ hardcode_minus_L_CXX=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ interix[3-9]*) -+ hardcode_direct_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds_CXX='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' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # SGI C++ -+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' -+ fi -+ fi -+ link_all_deplibs_CXX=yes -+ ;; -+ esac -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ inherit_rpath_CXX=yes -+ ;; -+ -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc* | ecpc* ) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ archive_cmds_need_lc_CXX=no -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ case `$CC -V` in -+ *pgCC\ [1-5]* | *pgcpp\ [1-5]*) -+ prelink_cmds_CXX='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ old_archive_cmds_CXX='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $RANLIB $oldlib' -+ archive_cmds_CXX='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ archive_expsym_cmds_CXX='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ ;; -+ *) # Version 6 will use weak symbols -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ ;; -+ esac -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_CXX='-rpath $libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' -+ ;; -+ xl*) -+ # IBM XL 8.0 on PPC, with GNU ld -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ if test "x$supports_anon_versioning" = xyes; then -+ archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ ;; -+ *) -+ 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' -+ compiler_needs_object_CXX=yes -+ -+ # 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*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ -+ m88k*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ -+ netbsd*) -+ 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= -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ -+ *nto* | *qnx*) -+ ld_shlibs_CXX=yes -+ ;; -+ -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ ld_shlibs_CXX=no -+ ;; -+ -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ hardcode_direct_absolute_CXX=yes -+ 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 -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ case $host in -+ osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;; -+ *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;; -+ esac -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ cxx*) -+ case $host in -+ osf3*) -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ ;; -+ *) -+ allow_undefined_flag_CXX=' -expect_unresolved \*' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $RM $lib.exp' -+ hardcode_libdir_flag_spec_CXX='-rpath $libdir' -+ ;; -+ esac -+ -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -+ case $host in -+ osf3*) -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ ;; -+ esac -+ -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator_CXX=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ psos*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ lcc*) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ archive_cmds_need_lc_CXX=yes -+ 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='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ hardcode_shlibpath_var_CXX=no -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ # 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='-z allextract$convenience -z defaultextract' -+ ;; -+ esac -+ link_all_deplibs_CXX=yes -+ -+ 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' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ -+ # The C++ compiler must be used to create the archive. -+ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ no_undefined_flag_CXX=' ${wl}-z ${wl}defs' -+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then -+ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ 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 -+ ;; -+ -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ no_undefined_flag_CXX='${wl}-z,text' -+ archive_cmds_need_lc_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ no_undefined_flag_CXX='${wl}-z,text' -+ allow_undefined_flag_CXX='${wl}-z,nodefs' -+ archive_cmds_need_lc_CXX=no -+ hardcode_shlibpath_var_CXX=no -+ hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir' -+ hardcode_libdir_separator_CXX=':' -+ link_all_deplibs_CXX=yes -+ export_dynamic_flag_spec_CXX='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ ;; -+ -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ -+ *) -+ # FIXME: insert proper C++ library support -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ -+ { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+$as_echo "$ld_shlibs_CXX" >&6; } -+ test "$ld_shlibs_CXX" = no && can_build_shared=no -+ -+ GCC_CXX="$GXX" -+ LD_CXX="$LD" -+ -+ ## CAVEAT EMPTOR: -+ ## There is no encapsulation within the following macros, do not change -+ ## the running order or otherwise move them around unless you know exactly -+ ## what you are doing... -+ # Dependencies to place before and after the object being linked: -+predep_objects_CXX= -+postdep_objects_CXX= -+predeps_CXX= -+postdeps_CXX= -+compiler_lib_search_path_CXX= -+ -+cat > conftest.$ac_ext <<_LT_EOF -+class Foo -+{ -+public: -+ Foo (void) { a = 0; } -+private: -+ int a; -+}; -+_LT_EOF -+ -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ # Parse the compiler output and extract the necessary -+ # objects, libraries and library flags. -+ -+ # Sentinel used to keep track of whether or not we are before -+ # the conftest object file. -+ pre_test_object_deps_done=no -+ -+ for p in `eval "$output_verbose_link_cmd"`; do -+ case $p in -+ -+ -L* | -R* | -l*) -+ # Some compilers place space between "-{L,R}" and the path. -+ # Remove the space. -+ if test $p = "-L" || -+ test $p = "-R"; then -+ prev=$p -+ continue -+ else -+ prev= -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ case $p in -+ -L* | -R*) -+ # Internal compiler library paths should come after those -+ # provided the user. The postdeps already come after the -+ # user supplied libs so there is no need to process them. -+ if test -z "$compiler_lib_search_path_CXX"; then -+ compiler_lib_search_path_CXX="${prev}${p}" -+ else -+ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" -+ fi -+ ;; -+ # The "-l" case would never come before the object being -+ # linked, so don't bother handling this case. -+ esac -+ else -+ if test -z "$postdeps_CXX"; then -+ postdeps_CXX="${prev}${p}" -+ else -+ postdeps_CXX="${postdeps_CXX} ${prev}${p}" -+ fi -+ fi -+ ;; -+ -+ *.$objext) -+ # This assumes that the test object file only shows up -+ # once in the compiler output. -+ if test "$p" = "conftest.$objext"; then -+ pre_test_object_deps_done=yes -+ continue -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ if test -z "$predep_objects_CXX"; then -+ predep_objects_CXX="$p" -+ else -+ predep_objects_CXX="$predep_objects_CXX $p" -+ fi -+ else -+ if test -z "$postdep_objects_CXX"; then -+ postdep_objects_CXX="$p" -+ else -+ postdep_objects_CXX="$postdep_objects_CXX $p" -+ fi -+ fi -+ ;; -+ -+ *) ;; # Ignore the rest. -+ -+ esac -+ done -+ -+ # Clean up. -+ rm -f a.out a.exe -+else -+ echo "libtool.m4: error: problem compiling CXX test program" -+fi -+ -+$RM -f confest.$objext -+ -+# PORTME: override above test on systems where it is broken -+case $host_os in -+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= -+ postdep_objects_CXX= -+ 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. -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+ -+ -+case " $postdeps_CXX " in -+*" -lc "*) archive_cmds_need_lc_CXX=no ;; -+esac -+ compiler_lib_search_dirs_CXX= -+if test -n "${compiler_lib_search_path_CXX}"; then -+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - --rm -rf conftest.dSYM --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 - -- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" -- # Warning - without using the other run time loading flags, -- # -berok will link without error, but may produce a broken library. -- no_undefined_flag_GCJ=' ${wl}-bernotok' -- allow_undefined_flag_GCJ=' ${wl}-berok' -- # Exported symbols can be pulled into shared objects from archives -- whole_archive_flag_spec_GCJ='$convenience' -- archive_cmds_need_lc_GCJ=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -- fi -+ -+ -+ -+ -+ -+ -+ -+ -+ lt_prog_compiler_wl_CXX= -+lt_prog_compiler_pic_CXX= -+lt_prog_compiler_static_CXX= -+ -+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -+ -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - - amigaos*) -- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec_GCJ='-L$libdir' -- hardcode_minus_L_GCJ=yes -- # see comment about different semantics on the GNU ld section -- ld_shlibs_GCJ=no -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ m68k) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ esac - ;; - -- bsdi[45]*) -- export_dynamic_flag_spec_GCJ=-rdynamic -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. - ;; -- -- cygwin* | mingw* | pw32*) -- # When not using gcc, we currently assume that we are using -- # Microsoft Visual C++. -- # hardcode_libdir_flag_spec is actually meaningless, as there is -- # no search path for DLLs. -- hardcode_libdir_flag_spec_GCJ=' ' -- allow_undefined_flag_GCJ=unsupported -- # Tell ltmain to make .lib files, not .a files. -- libext=lib -- # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -- # FIXME: Setting linknames here is a bad hack. -- archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -- # 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' -- fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' -- enable_shared_with_static_runtimes_GCJ=yes -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # 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*) -- case $host_os in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -- ;; -- 10.*) -- allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- archive_cmds_need_lc_GCJ=no -- hardcode_direct_GCJ=no -- hardcode_automatic_GCJ=yes -- hardcode_shlibpath_var_GCJ=unsupported -- whole_archive_flag_spec_GCJ='' -- link_all_deplibs_GCJ=yes -- if test "$GCC" = yes ; then -- output_verbose_link_cmd='echo' -- archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -- else -- 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` $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 $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}' -- ;; -- *) -- ld_shlibs_GCJ=no -- ;; -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic_CXX='-fno-common' -+ ;; -+ *djgpp*) -+ # DJGPP does not support shared libraries at all -+ lt_prog_compiler_pic_CXX= -+ ;; -+ interix[3-9]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ lt_prog_compiler_pic_CXX=-Kconform_pic -+ fi -+ ;; -+ hpux*) -+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -+ # sets the default TLS model and affects inlining. -+ case $host_cpu in -+ hppa*64*) -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; - esac -- fi - ;; -- -- dgux*) -- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_GCJ='-L$libdir' -- hardcode_shlibpath_var_GCJ=no -+ *qnx* | *nto*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ lt_prog_compiler_pic_CXX='-fPIC -shared' - ;; -- -- freebsd1*) -- ld_shlibs_GCJ=no -+ *) -+ lt_prog_compiler_pic_CXX='-fPIC' - ;; -+ esac -+ else -+ case $host_os in -+ aix[4-9]*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ lt_prog_compiler_static_CXX='-Bstatic' -+ else -+ lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ cxch68*) -+ # Green Hills C++ Compiler -+ # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ lt_prog_compiler_pic_CXX='-KPIC' -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' -+ if test "$host_cpu" != ia64; then -+ lt_prog_compiler_pic_CXX='+Z' -+ fi -+ ;; -+ aCC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_static_CXX='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # KAI C++ Compiler -+ lt_prog_compiler_wl_CXX='--backend -Wl,' -+ lt_prog_compiler_pic_CXX='-fPIC' -+ ;; -+ ecpc* ) -+ # old Intel C++ for x86_64 which still supported -KPIC. -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-static' -+ ;; -+ icpc* ) -+ # Intel C++, used to be incompatible with GCC. -+ # ICC 10 doesn't accept -KPIC any more. -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-fPIC' -+ lt_prog_compiler_static_CXX='-static' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-fpic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ cxx*) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_static_CXX='-non_shared' -+ ;; -+ xlc* | xlC*) -+ # IBM XL 8.0 on PPC -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-qpic' -+ lt_prog_compiler_static_CXX='-qstaticlink' -+ ;; -+ *) -+ 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 -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ lt_prog_compiler_pic_CXX='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd* | netbsdelf*-gnu) -+ ;; -+ *qnx* | *nto*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ lt_prog_compiler_pic_CXX='-fPIC -shared' -+ ;; -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ lt_prog_compiler_wl_CXX='--backend -Wl,' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ cxx*) -+ # Digital/Compaq C++ -+ lt_prog_compiler_wl_CXX='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_static_CXX='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ psos*) -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ lt_prog_compiler_wl_CXX='-Qoption ld ' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ lt_prog_compiler_pic_CXX='-PIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ lt_prog_compiler_pic_CXX='-pic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ lcc*) -+ # Lucid -+ lt_prog_compiler_pic_CXX='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ lt_prog_compiler_pic_CXX='-KPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ vxworks*) -+ ;; -+ *) -+ lt_prog_compiler_can_build_shared_CXX=no -+ ;; -+ esac -+ fi - -- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -- # support. Future versions do this automatically, but an explicit c++rt0.o -- # does not break anything, and helps significantly (at the cost of a little -- # extra space). -- freebsd2.2*) -- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -- hardcode_libdir_flag_spec_GCJ='-R$libdir' -- hardcode_direct_GCJ=yes -- hardcode_shlibpath_var_GCJ=no -- ;; -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ lt_prog_compiler_pic_CXX= -+ ;; -+ *) -+ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -+$as_echo "$lt_prog_compiler_pic_CXX" >&6; } - -- # Unfortunately, older versions of FreeBSD 2 do not have this feature. -- freebsd2*) -- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct_GCJ=yes -- hardcode_minus_L_GCJ=yes -- hardcode_shlibpath_var_GCJ=no -- ;; - -- # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | dragonfly*) -- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec_GCJ='-R$libdir' -- hardcode_direct_GCJ=yes -- hardcode_shlibpath_var_GCJ=no -- ;; - -- hpux9*) -- if test "$GCC" = yes; then -- archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- else -- archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -- fi -- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator_GCJ=: -- hardcode_direct_GCJ=yes -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$lt_prog_compiler_pic_CXX"; then -+ { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_pic_works_CXX=no -+ ac_outfile=conftest.$ac_objext -+ 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. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:14988: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&5 -+ echo "$as_me:14992: \$? = $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. -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_pic_works_CXX=yes -+ fi -+ fi -+ $RM conftest* - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- hardcode_minus_L_GCJ=yes -- export_dynamic_flag_spec_GCJ='${wl}-E' -- ;; -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } - -- hpux10*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -- fi -- if test "$with_gnu_ld" = no; then -- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator_GCJ=: -+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then -+ case $lt_prog_compiler_pic_CXX in -+ "" | " "*) ;; -+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -+ esac -+else -+ lt_prog_compiler_pic_CXX= -+ lt_prog_compiler_can_build_shared_CXX=no -+fi - -- hardcode_direct_GCJ=yes -- export_dynamic_flag_spec_GCJ='${wl}-E' -+fi - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- hardcode_minus_L_GCJ=yes -- fi -- ;; - -- hpux11*) -- if test "$GCC" = yes -a "$with_gnu_ld" = no; then -- case $host_cpu in -- hppa*64*) -- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- else -- case $host_cpu in -- hppa*64*) -- archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- ia64*) -- archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- *) -- archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -- ;; -- esac -- fi -- if test "$with_gnu_ld" = no; then -- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -- hardcode_libdir_separator_GCJ=: - -- case $host_cpu in -- hppa*64*|ia64*) -- hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' -- hardcode_direct_GCJ=no -- hardcode_shlibpath_var_GCJ=no -- ;; -- *) -- hardcode_direct_GCJ=yes -- export_dynamic_flag_spec_GCJ='${wl}-E' -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_static_works_CXX=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ 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 -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&5 -+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_static_works_CXX=yes -+ fi -+ else -+ lt_cv_prog_compiler_static_works_CXX=yes -+ fi -+ fi -+ $RM -r conftest* -+ LDFLAGS="$save_LDFLAGS" - -- # hardcode_minus_L: Not really in the search PATH, -- # but as the default location of the library. -- hardcode_minus_L_GCJ=yes -- ;; -- esac -- fi -- ;; -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } - -- irix5* | irix6* | nonstopux*) -- if test "$GCC" = yes; then -- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' -- fi -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_GCJ=: -- link_all_deplibs_GCJ=yes -- ;; -+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then -+ : -+else -+ lt_prog_compiler_static_CXX= -+fi - -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -- else -- archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -- fi -- hardcode_libdir_flag_spec_GCJ='-R$libdir' -- hardcode_direct_GCJ=yes -- hardcode_shlibpath_var_GCJ=no -- ;; - -- newsos6) -- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct_GCJ=yes -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_GCJ=: -- hardcode_shlibpath_var_GCJ=no -- ;; - -- openbsd*) -- 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 -- ld_shlibs_GCJ=no -- fi -- ;; - -- os2*) -- hardcode_libdir_flag_spec_GCJ='-L$libdir' -- hardcode_minus_L_GCJ=yes -- allow_undefined_flag_GCJ=unsupported -- archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -- ;; -+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_c_o_CXX=no -+ $RM -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ 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 -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:15087: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:15091: \$? = $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 -+ # So say no if there are warnings -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_CXX=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $RM conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -+ $RM out/* && rmdir out -+ cd .. -+ $RM -r conftest -+ $RM conftest* -+ -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } -+ -+ -+ -+ { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_prog_compiler_c_o_CXX=no -+ $RM -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - -- osf3*) -- if test "$GCC" = yes; then -- allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- else -- allow_undefined_flag_GCJ=' -expect_unresolved \*' -- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- fi -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -- hardcode_libdir_separator_GCJ=: -- ;; -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:15139: $lt_compile\"" >&5) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&5 -+ echo "$as_me:15143: \$? = $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 -+ # So say no if there are warnings -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ lt_cv_prog_compiler_c_o_CXX=yes -+ fi -+ fi -+ chmod u+w . 2>&5 -+ $RM conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -+ $RM out/* && rmdir out -+ cd .. -+ $RM -r conftest -+ $RM conftest* - -- osf4* | osf5*) # as osf3* with the addition of -msym flag -- if test "$GCC" = yes; then -- allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' -- else -- allow_undefined_flag_GCJ=' -expect_unresolved \*' -- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' -+fi -+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } - -- # Both c and cxx compiler support -rpath directly -- hardcode_libdir_flag_spec_GCJ='-rpath $libdir' -- fi -- hardcode_libdir_separator_GCJ=: -- ;; - -- solaris*) -- no_undefined_flag_GCJ=' -z text' -- if test "$GCC" = yes; then -- wlarc='${wl}' -- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' -- else -- wlarc='' -- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -- fi -- hardcode_libdir_flag_spec_GCJ='-R$libdir' -- hardcode_shlibpath_var_GCJ=no -- case $host_os in -- solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) -- # 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?) -- 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 -- ;; - -- sunos4*) -- if test "x$host_vendor" = xsequent; then -- # Use $CC to link under sequent, because it throws in some extra .o -- # files that make .init and .fini sections work. -- archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -- fi -- hardcode_libdir_flag_spec_GCJ='-L$libdir' -- hardcode_direct_GCJ=yes -- hardcode_minus_L_GCJ=yes -- hardcode_shlibpath_var_GCJ=no -- ;; - -- sysv4) -- case $host_vendor in -- sni) -- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct_GCJ=yes # is this really true??? -- ;; -- siemens) -- ## LD is ld it makes a PLAMLIB -- ## CC just makes a GrossModule. -- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' -- reload_cmds_GCJ='$CC -r -o $output$reload_objs' -- hardcode_direct_GCJ=no -- ;; -- motorola) -- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie -- ;; -- esac -- runpath_var='LD_RUN_PATH' -- hardcode_shlibpath_var_GCJ=no -- ;; -+hard_links="nottested" -+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+$as_echo_n "checking if we can lock with hard links... " >&6; } -+ hard_links=yes -+ $RM conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 -+$as_echo "$hard_links" >&6; } -+ if test "$hard_links" = no; then -+ { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi - -- sysv4.3*) -- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var_GCJ=no -- export_dynamic_flag_spec_GCJ='-Bexport' -- ;; - -- sysv4*MP*) -- if test -d /usr/nec; then -- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_shlibpath_var_GCJ=no -- runpath_var=LD_RUN_PATH -- hardcode_runpath_var=yes -- ld_shlibs_GCJ=yes -- fi -- ;; - -- 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 -- runpath_var='LD_RUN_PATH' -+ { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } - -- if test "$GCC" = yes; then -- archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- ;; -+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ case $host_os in -+ aix[4-9]*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ else -+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ export_symbols_cmds_CXX="$ltdll_cmds" -+ ;; -+ cygwin* | mingw* | cegcc*) -+ 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' -+ ;; +@@ -13843,14 +13757,17 @@ $as_echo_n "checking whether the $compil + 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' + ;; + 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' -+ ;; -+ esac -+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -+ -+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+$as_echo "$ld_shlibs_CXX" >&6; } -+test "$ld_shlibs_CXX" = no && can_build_shared=no -+ -+with_gnu_ld_CXX=$with_gnu_ld + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -- sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -- # link with -lc, and that would cause any symbols used from libc to -- # always be unresolved, which means just about no library would -- # ever link correctly. If we're not using GNU ld we use -z text -- # though, which does catch some bad symbols but isn't as heavy-handed -- # as -z defs. -- no_undefined_flag_GCJ='${wl}-z,text' -- allow_undefined_flag_GCJ='${wl}-z,nodefs' -- archive_cmds_need_lc_GCJ=no -- hardcode_shlibpath_var_GCJ=no -- hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -- hardcode_libdir_separator_GCJ=':' -- link_all_deplibs_GCJ=yes -- export_dynamic_flag_spec_GCJ='${wl}-Bexport' -- runpath_var='LD_RUN_PATH' - -- if test "$GCC" = yes; then -- archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- else -- archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' -- fi -- ;; - -- uts4*) -- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_GCJ='-L$libdir' -- hardcode_shlibpath_var_GCJ=no -- ;; - -- *) -- ld_shlibs_GCJ=no -- ;; -- esac -- fi - --{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 --$as_echo "$ld_shlibs_GCJ" >&6; } --test "$ld_shlibs_GCJ" = no && can_build_shared=no +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +-$as_echo "$ld_shlibs_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 ++echo "${ECHO_T}$ld_shlibs_CXX" >&6; } + test "$ld_shlibs_CXX" = no && can_build_shared=no # - # Do we need to explicitly link libc? - # --case "x$archive_cmds_need_lc_GCJ" in -+case "x$archive_cmds_need_lc_CXX" in - x|xyes) - # Assume -lc should be added -- archive_cmds_need_lc_GCJ=yes -+ archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then -- case $archive_cmds_GCJ in -+ case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; -@@ -19134,7 +15251,7 @@ +@@ -13870,15 +13787,15 @@ x|xyes) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 - $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -- $rm conftest* -+ $RM conftest* +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } ++ { 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* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -19146,40 +15263,104 @@ - lib=conftest - libobjs=conftest.$ac_objext - deplibs= -- wl=$lt_prog_compiler_wl_GCJ -- pic_flag=$lt_prog_compiler_pic_GCJ -+ wl=$lt_prog_compiler_wl_CXX -+ pic_flag=$lt_prog_compiler_pic_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest -- lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ -- allow_undefined_flag_GCJ= -- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 -- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 -+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX -+ allow_undefined_flag_CXX= -+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 -+ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -13896,7 +13813,7 @@ $as_echo_n "checking whether -lc should + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then -- archive_cmds_need_lc_GCJ=no -+ archive_cmds_need_lc_CXX=no - else -- archive_cmds_need_lc_GCJ=yes -+ archive_cmds_need_lc_CXX=yes - fi -- allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag -+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else + archive_cmds_need_lc_CXX=no +@@ -13908,16 +13825,16 @@ $as_echo_n "checking whether -lc should cat conftest.err 1>&5 fi -- $rm conftest* -- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 --$as_echo "$archive_cmds_need_lc_GCJ" >&6; } -+ $RM conftest* -+ { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -+$as_echo "$archive_cmds_need_lc_CXX" >&6; } + $rm conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +-$as_echo "$archive_cmds_need_lc_CXX" >&6; } ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ;; esac fi @@ -36619,393 +11314,31 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure esac -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 - $as_echo_n "checking dynamic linker characteristics... " >&6; } -+ +-$as_echo_n "checking dynamic linker characteristics... " >&6; } ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= -@@ -19193,7 +15374,6 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" -- - need_lib_prefix=unknown - hardcode_into_libs=no +@@ -14273,13 +14190,11 @@ linux* | k*bsd*-gnu) + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -@@ -19230,7 +15410,7 @@ - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' -- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then -+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no -@@ -19256,9 +15436,18 @@ - ;; - - amigaos*) -- library_names_spec='$libname.ixlibrary $libname.a' -- # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ case $host_cpu in -+ powerpc) -+ # Since July 2007 AmigaOS4 officially supports .so libraries. -+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ ;; -+ m68k) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ esac - ;; - - beos*) -@@ -19281,25 +15470,28 @@ - # libtool to hard-code these into programs - ;; - --cygwin* | mingw* | pw32*) -+cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - - case $GCC,$host_os in -- yes,cygwin* | yes,mingw* | yes,pw32*) -+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ -- chmod a+x \$dldir/$dlname' -+ chmod a+x \$dldir/$dlname~ -+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -+ fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ -- $rm \$dlpath' -+ $RM \$dlpath' - shlibpath_overrides_runpath=yes - - case $host_os in -@@ -19308,20 +15500,20 @@ - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; -- mingw*) -+ mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- 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 ';[c-zC-Z]:/' >/dev/null; 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 ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH printed by - # mingw gcc, but we are running on Cygwin. Gcc prints its search - # path with ; separators, and with drive letters. We can handle the - # drive letters (cygwin fileutils understands them), so leave them, - # especially as we might pass files found there to a mingw objdump, - # which wouldn't understand a cygwinified path. Ahh. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ 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"` -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - ;; - pw32*) -@@ -19345,7 +15537,7 @@ - version_type=darwin - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -@@ -19406,501 +15598,1348 @@ - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -- esac -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+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 -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+interix[3-9]*) -+ 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' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-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' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # Some binutils ld are patched to set DT_RUNPATH -+ save_LDFLAGS=$LDFLAGS -+ save_libdir=$libdir -+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \ -+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\"" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$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 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then -+ shlibpath_overrides_runpath=yes -+fi -+ -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LDFLAGS=$save_LDFLAGS -+ libdir=$save_libdir -+ -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # 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>/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' ' '` + # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" + 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 -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; -+ + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -14291,6 +14206,18 @@ linux* | k*bsd*-gnu) + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no @@ -37018,3162 +11351,1217 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + dynamic_linker='NetBSD ld.elf_so' + ;; + -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+*nto* | *qnx*) -+ version_type=qnx -+ 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='ldqnx.so' -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[89] | openbsd2.[89].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi - ;; - --gnu*) -- version_type=linux -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf + netbsd*) + version_type=sunos 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' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - --hpux9* | hpux10* | hpux11*) -- # Give a soname corresponding to the major version so that dld.sl refuses to -- # link against other versions. -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- case $host_cpu in -- ia64*) -- shrext_cmds='.so' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.so" -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- if test "X$HPUX_IA64_MODE" = X32; then -- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -- else -- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -- fi -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- hppa*64*) -- shrext_cmds='.sl' -- hardcode_into_libs=yes -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -- ;; -- *) -- shrext_cmds='.sl' -- dynamic_linker="$host_os dld.sl" -- shlibpath_var=SHLIB_PATH -- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- ;; -- esac -- # HP-UX runs *really* slowly unless shared libraries are mode 555. -- postinstall_cmds='chmod 555 $lib' -+rdos*) -+ dynamic_linker=no - ;; - --interix[3-9]*) -+solaris*) - 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}' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -+ shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' - ;; - --irix5* | irix6* | nonstopux*) -- case $host_os in -- nonstopux*) version_type=nonstopux ;; -- *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -- else -- version_type=irix -- fi ;; -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.3*) -+ version_type=linux -+ 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 -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; - esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf - need_lib_prefix=no - need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -- case $host_os in -- irix5* | nonstopux*) -- libsuff= shlibsuff= -- ;; -- *) -- case $LD in # libtool.m4 will add one of these switches to LD -- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -- libsuff= shlibsuff= libmagic=32-bit;; -- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -- libsuff=32 shlibsuff=N32 libmagic=N32;; -- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -- libsuff=64 shlibsuff=64 libmagic=64-bit;; -- *) libsuff= shlibsuff= libmagic=never-match;; -- esac -- ;; -- esac -- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' - ;; - --# No shared lib support for Linux oldld, aout, or coff. --linux*oldld* | linux*aout* | linux*coff*) -- dynamic_linker=no -- ;; -- --# This must be Linux ELF. --linux* | k*bsd*-gnu) -+tpf*) -+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - 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' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -- # This implies no fast_install, which is unacceptable. -- # Some rework will be needed to allow for fast_install -- # before this can be enabled. - hardcode_into_libs=yes -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ ;; -+ -+uts4*) -+ version_type=linux -+ 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 -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+$as_echo "$dynamic_linker" >&6; } -+test "$dynamic_linker" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+fi -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -+hardcode_action_CXX= -+if test -n "$hardcode_libdir_flag_spec_CXX" || -+ test -n "$runpath_var_CXX" || -+ test "X$hardcode_automatic_CXX" = "Xyes" ; then -+ -+ # We can hardcode non-existent directories. -+ if test "$hardcode_direct_CXX" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no && -+ test "$hardcode_minus_L_CXX" != no; then -+ # Linking always hardcodes the temporary library directory. -+ hardcode_action_CXX=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ hardcode_action_CXX=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ hardcode_action_CXX=unsupported -+fi -+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -+$as_echo "$hardcode_action_CXX" >&6; } -+ -+if test "$hardcode_action_CXX" = relink || -+ test "$inherit_rpath_CXX" = yes; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+ -+ -+ -+ -+ -+ -+ -+ fi # test -n "$compiler" -+ -+ CC=$lt_save_CC -+ LDCXX=$LD -+ LD=$lt_save_LD -+ GCC=$lt_save_GCC -+ with_gnu_ld=$lt_save_with_gnu_ld -+ lt_cv_path_LDCXX=$lt_cv_path_LD -+ lt_cv_path_LD=$lt_save_path_LD -+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+fi # test "$_lt_caught_CXX_error" != yes -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ac_config_commands="$ac_config_commands libtool" -+ -+ -+ -+ -+# Only expand once: -+ -+ -+: ${CONFIG_LT=./config.lt} -+{ $as_echo "$as_me:$LINENO: creating $CONFIG_LT" >&5 -+$as_echo "$as_me: creating $CONFIG_LT" >&6;} -+cat >"$CONFIG_LT" <<_LTEOF -+#! $SHELL -+# Generated by $as_me. -+# Run this file to recreate a libtool stub with the current configuration. -+ -+lt_cl_silent=false -+SHELL=\${CONFIG_SHELL-$SHELL} -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<\_LTEOF -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## -+ -+# 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=: -+ # Pre-4.2 versions of Zsh do 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 -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename -- "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ s/-\n.*// -+ ' >$as_me.lineno && -+ chmod +x "$as_me.lineno" || -+ { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -+$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - -- # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null -+fi -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' - fi -+else -+ as_ln_s='cp -p' -+fi -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - -- # We used to test for /lib/ld.so.1 and disable shared libraries on -- # powerpc, because MkLinux only supported shared libraries with the -- # GNU dynamic linker. Since this was broken with cross compilers, -- # most powerpc-linux boxes support dynamic linking these days and -- # people can always --disable-shared, the test was removed, and we -- # assume the GNU/Linux dynamic linker is in use. -- dynamic_linker='GNU/Linux ld.so' -- ;; -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi - --netbsd*) -- version_type=sunos -- need_lib_prefix=no -- need_version=no -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- dynamic_linker='NetBSD (a.out) ld.so' -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L - else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- dynamic_linker='NetBSD ld.elf_so' -+ as_ls_L_option= - fi -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- hardcode_into_libs=yes -- ;; -+ 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 -+as_executable_p=$as_test_x - --newsos6) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- ;; -+# 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'" - --nto-qnx*) -- 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=yes -- ;; -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - --openbsd*) -- version_type=sunos -- sys_lib_dlsearch_path_spec="/usr/lib" -- need_lib_prefix=no -- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -- case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -- esac -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case $host_os in -- openbsd2.[89] | openbsd2.[89].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -- else -- shlibpath_overrides_runpath=yes -- fi -- ;; - --os2*) -- libname_spec='$name' -- shrext_cmds=".dll" -- need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -- dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -- ;; - --osf3* | osf4* | osf5*) -- version_type=osf -- need_lib_prefix=no -- need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- shlibpath_var=LD_LIBRARY_PATH -- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -- ;; -+exec 6>&1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+} >&5 - --rdos*) -- dynamic_linker=no -- ;; -+lt_cl_help="\ -+\`$as_me' creates a local libtool stub from the current configuration, -+for use in further configure time tests before the real libtool is -+generated. -+ -+Usage: $0 [OPTIONS] -+ -+ -h, --help print this help, then exit -+ -V, --version print version number, then exit -+ -q, --quiet do not print progress messages -+ -d, --debug don't remove temporary files -+ -+Report bugs to <bug-libtool@gnu.org>." -+ -+lt_cl_version="\ -+gtk+ config.lt 2.14.7 -+configured by $0, generated by GNU Autoconf 2.63. - --solaris*) -- 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=yes -- hardcode_into_libs=yes -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' -- ;; -+Copyright (C) 2008 Free Software Foundation, Inc. -+This config.lt script is free software; the Free Software Foundation -+gives unlimited permision to copy, distribute and modify it." - --sunos4*) -- version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- fi -- need_version=yes -- ;; -+while test $# != 0 -+do -+ case $1 in -+ --version | --v* | -V ) -+ echo "$lt_cl_version"; exit 0 ;; -+ --help | --h* | -h ) -+ echo "$lt_cl_help"; exit 0 ;; -+ --debug | --d* | -d ) -+ debug=: ;; -+ --quiet | --q* | --silent | --s* | -q ) -+ lt_cl_silent=: ;; -+ -+ -*) { { $as_echo "$as_me:$LINENO: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&5 -+$as_echo "$as_me: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2;} -+ { (exit 1); exit 1; }; } ;; - --sysv4 | sysv4.3*) -- version_type=linux -- 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 -- case $host_vendor in -- sni) -- shlibpath_overrides_runpath=no -- need_lib_prefix=no -- export_dynamic_flag_spec='${wl}-Blargedynsym' -- runpath_var=LD_RUN_PATH -- ;; -- siemens) -- need_lib_prefix=no -- ;; -- motorola) -- need_lib_prefix=no -- need_version=no -- shlibpath_overrides_runpath=no -- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -- ;; -+ *) { { $as_echo "$as_me:$LINENO: error: unrecognized argument: $1 -+Try \`$0 --help' for more information." >&5 -+$as_echo "$as_me: error: unrecognized argument: $1 -+Try \`$0 --help' for more information." >&2;} -+ { (exit 1); exit 1; }; } ;; - esac -- ;; -+ shift -+done - --sysv4*MP*) -- if test -d /usr/nec ;then -- version_type=linux -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -- shlibpath_var=LD_LIBRARY_PATH -- fi -- ;; -+if $lt_cl_silent; then -+ exec 6>/dev/null -+fi -+_LTEOF - --sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- version_type=freebsd-elf -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- hardcode_into_libs=yes -- if test "$with_gnu_ld" = yes; then -- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -- shlibpath_overrides_runpath=no -- else -- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -- shlibpath_overrides_runpath=yes -- case $host_os in -- sco3.2v5*) -- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -- ;; -+cat >>"$CONFIG_LT" <<_LTEOF -+ -+ -+# 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 -+ -+sed_quote_subst='$sed_quote_subst' -+double_quote_subst='$double_quote_subst' -+delay_variable_subst='$delay_variable_subst' -+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' -+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' -+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' -+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' -+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' -+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' -+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' -+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' -+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' -+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' -+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' -+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' -+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' -+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' -+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' -+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' -+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' -+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' -+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' -+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' -+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' -+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' -+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' -+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' -+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' -+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' -+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' -+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' -+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' -+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' -+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' -+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' -+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' -+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' -+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' -+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' -+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' -+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' -+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' -+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' -+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' -+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' -+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' -+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' -+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' -+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' -+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' -+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' -+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' -+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' -+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' -+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' -+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' -+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' -+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' -+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' -+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' -+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' -+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' -+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' -+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' -+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' -+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' -+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' -+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' -+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' -+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' -+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' -+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' -+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' -+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+ -+LTCC='$LTCC' -+LTCFLAGS='$LTCFLAGS' -+compiler='$compiler_DEFAULT' -+ -+# Quote evaled strings. -+for var in SED \ -+GREP \ -+EGREP \ -+FGREP \ -+LD \ -+NM \ -+LN_S \ -+lt_SP2NL \ -+lt_NL2SP \ -+reload_flag \ -+deplibs_check_method \ -+file_magic_cmd \ -+AR \ -+AR_FLAGS \ -+STRIP \ -+RANLIB \ -+CC \ -+CFLAGS \ -+compiler \ -+lt_cv_sys_global_symbol_pipe \ -+lt_cv_sys_global_symbol_to_cdecl \ -+lt_cv_sys_global_symbol_to_c_name_address \ -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+SHELL \ -+ECHO \ -+lt_prog_compiler_no_builtin_flag \ -+lt_prog_compiler_wl \ -+lt_prog_compiler_pic \ -+lt_prog_compiler_static \ -+lt_cv_prog_compiler_c_o \ -+need_locks \ -+DSYMUTIL \ -+NMEDIT \ -+LIPO \ -+OTOOL \ -+OTOOL64 \ -+shrext_cmds \ -+export_dynamic_flag_spec \ -+whole_archive_flag_spec \ -+compiler_needs_object \ -+with_gnu_ld \ -+allow_undefined_flag \ -+no_undefined_flag \ -+hardcode_libdir_flag_spec \ -+hardcode_libdir_flag_spec_ld \ -+hardcode_libdir_separator \ -+fix_srcfile_path \ -+exclude_expsyms \ -+include_expsyms \ -+file_list_spec \ -+variables_saved_for_relink \ -+libname_spec \ -+library_names_spec \ -+soname_spec \ -+finish_eval \ -+old_striplib \ -+striplib \ -+compiler_lib_search_dirs \ -+predep_objects \ -+postdep_objects \ -+predeps \ -+postdeps \ -+compiler_lib_search_path \ -+LD_CXX \ -+compiler_CXX \ -+lt_prog_compiler_no_builtin_flag_CXX \ -+lt_prog_compiler_wl_CXX \ -+lt_prog_compiler_pic_CXX \ -+lt_prog_compiler_static_CXX \ -+lt_cv_prog_compiler_c_o_CXX \ -+export_dynamic_flag_spec_CXX \ -+whole_archive_flag_spec_CXX \ -+compiler_needs_object_CXX \ -+with_gnu_ld_CXX \ -+allow_undefined_flag_CXX \ -+no_undefined_flag_CXX \ -+hardcode_libdir_flag_spec_CXX \ -+hardcode_libdir_flag_spec_ld_CXX \ -+hardcode_libdir_separator_CXX \ -+fix_srcfile_path_CXX \ -+exclude_expsyms_CXX \ -+include_expsyms_CXX \ -+file_list_spec_CXX \ -+compiler_lib_search_dirs_CXX \ -+predep_objects_CXX \ -+postdep_objects_CXX \ -+predeps_CXX \ -+postdeps_CXX \ -+compiler_lib_search_path_CXX; do -+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ *[\\\\\\\`\\"\\\$]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; - esac -- fi -- sys_lib_dlsearch_path_spec='/usr/lib' -- ;; -+done - --uts4*) -- version_type=linux -- 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 -- ;; -+# Double-quote double-evaled strings. -+for var in reload_cmds \ -+old_postinstall_cmds \ -+old_postuninstall_cmds \ -+old_archive_cmds \ -+extract_expsyms_cmds \ -+old_archive_from_new_cmds \ -+old_archive_from_expsyms_cmds \ -+archive_cmds \ -+archive_expsym_cmds \ -+module_cmds \ -+module_expsym_cmds \ -+export_symbols_cmds \ -+prelink_cmds \ -+postinstall_cmds \ -+postuninstall_cmds \ -+finish_cmds \ -+sys_lib_search_path_spec \ -+sys_lib_dlsearch_path_spec \ -+old_archive_cmds_CXX \ -+old_archive_from_new_cmds_CXX \ -+old_archive_from_expsyms_cmds_CXX \ -+archive_cmds_CXX \ -+archive_expsym_cmds_CXX \ -+module_cmds_CXX \ -+module_expsym_cmds_CXX \ -+export_symbols_cmds_CXX \ -+prelink_cmds_CXX; do -+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ *[\\\\\\\`\\"\\\$]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac -+done - --*) -- dynamic_linker=no -+# Fix-up fallback echo if it was mangled by the above quoting rules. -+case \$lt_ECHO in -+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` +@@ -14468,19 +14395,19 @@ uts4*) + dynamic_linker=no ;; esac -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } --test "$dynamic_linker" = no && can_build_shared=no ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - $as_echo_n "(cached) " >&6 --else -- lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" --fi -+ac_aux_dir='$ac_aux_dir' -+xsi_shell='$xsi_shell' -+lt_shell_append='$lt_shell_append' - --sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" --if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" -+# See if we are running on zsh, and set the options which allow our -+# commands through without removal of \ escapes INIT. -+if test -n "\${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi --sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" --fi -+ PACKAGE='$PACKAGE' -+ VERSION='$VERSION' -+ TIMESTAMP='$TIMESTAMP' -+ RM='$RM' -+ ofile='$ofile' + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" + if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" + fi +@@ -14492,8 +14419,8 @@ if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } --hardcode_action_GCJ= --if test -n "$hardcode_libdir_flag_spec_GCJ" || \ -- test -n "$runpath_var_GCJ" || \ -- test "X$hardcode_automatic_GCJ" = "Xyes" ; then ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action_CXX= + if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var_CXX" || \ +@@ -14517,8 +14444,8 @@ else + # directories. + hardcode_action_CXX=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +-$as_echo "$hardcode_action_CXX" >&6; } ++{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 ++echo "${ECHO_T}$hardcode_action_CXX" >&6; } -- # We can hardcode non-existant directories. -- if test "$hardcode_direct_GCJ" != no && -- # If the only mechanism to avoid hardcoding is shlibpath_var, we -- # have to relink, otherwise we might link with an installed library -- # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && -- test "$hardcode_minus_L_GCJ" != no; then -- # Linking always hardcodes the temporary library directory. -- hardcode_action_GCJ=relink -- else -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action_GCJ=immediate -- fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -- hardcode_action_GCJ=unsupported --fi + if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported +@@ -15056,13 +14983,13 @@ done + cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + +-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +-$as_echo_n "checking if libtool supports shared libraries... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 +-$as_echo "$can_build_shared" >&6; } ++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 ++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 ++echo "${ECHO_T}$can_build_shared" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +-$as_echo_n "checking whether to build shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 ++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -15081,15 +15008,15 @@ aix[4-9]*) + fi + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 +-$as_echo "$enable_shared" >&6; } ++{ echo "$as_me:$LINENO: result: $enable_shared" >&5 ++echo "${ECHO_T}$enable_shared" >&6; } + +-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +-$as_echo_n "checking whether to build static libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 ++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes +-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 +-$as_echo "$enable_static" >&6; } ++{ echo "$as_me:$LINENO: result: $enable_static" >&5 ++echo "${ECHO_T}$enable_static" >&6; } + + GCC_F77="$G77" + LD_F77="$LD" +@@ -15098,8 +15025,8 @@ lt_prog_compiler_wl_F77= + lt_prog_compiler_pic_F77= + lt_prog_compiler_static_F77= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl_F77='-Wl,' +@@ -15330,18 +15257,18 @@ $as_echo_n "checking for $compiler optio + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +-$as_echo "$lt_prog_compiler_pic_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_F77"; then + +-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext +@@ -15356,11 +15283,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15359: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15286: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15363: \$? = $ac_status" >&5 ++ echo "$as_me:15290: \$? = $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. +@@ -15373,8 +15300,8 @@ else + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in +@@ -15401,10 +15328,10 @@ esac + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" +@@ -15429,8 +15356,8 @@ else + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } + + if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then + : +@@ -15439,10 +15366,10 @@ else + fi + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_c_o_F77=no + $rm -r conftest 2>/dev/null +@@ -15460,11 +15387,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15463: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15390: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:15467: \$? = $ac_status" >&5 ++ echo "$as_me:15394: \$? = $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 +@@ -15486,34 +15413,34 @@ else + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-$as_echo_n "checking if we can lock with hard links... " >&6; } ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +-$as_echo "$hard_links" >&6; } ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi + +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag_F77= +@@ -15725,12 +15652,13 @@ EOF + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $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= +@@ -15933,21 +15861,18 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -15962,13 +15887,12 @@ 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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + 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 +@@ -15993,21 +15917,18 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -16022,13 +15943,12 @@ 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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + 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 +@@ -16261,7 +16181,7 @@ if test -z "$aix_libpath"; then aix_libp + 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 +@@ -16480,8 +16400,8 @@ if test -z "$aix_libpath"; then aix_libp + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +-$as_echo "$ld_shlibs_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 ++echo "${ECHO_T}$ld_shlibs_F77" >&6; } + test "$ld_shlibs_F77" = no && can_build_shared=no + + # +@@ -16501,15 +16421,15 @@ x|xyes) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } ++ { 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* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -16527,7 +16447,7 @@ $as_echo_n "checking whether -lc should + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_F77=no +@@ -16539,16 +16459,16 @@ $as_echo_n "checking whether -lc should + cat conftest.err 1>&5 + fi + $rm conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +-$as_echo "$archive_cmds_need_lc_F77" >&6; } ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } + ;; + esac + fi + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-$as_echo_n "checking dynamic linker characteristics... " >&6; } ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -16904,13 +16824,11 @@ linux* | k*bsd*-gnu) + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ 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 +@@ -16922,6 +16840,18 @@ linux* | k*bsd*-gnu) + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-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='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -17099,19 +17029,19 @@ uts4*) + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-$as_echo "$dynamic_linker" >&6; } ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" + fi + + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" + if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" + fi +@@ -17123,8 +17053,8 @@ if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action_F77= + if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var_F77" || \ +@@ -17148,8 +17078,8 @@ else + # directories. + hardcode_action_F77=unsupported + fi +-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +-$as_echo "$hardcode_action_F77" >&6; } ++{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 ++echo "${ECHO_T}$hardcode_action_F77" >&6; } + + if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported +@@ -17659,10 +17589,10 @@ if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext +@@ -17677,11 +17607,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17680: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17610: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17684: \$? = $ac_status" >&5 ++ echo "$as_me:17614: \$? = $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. +@@ -17694,8 +17624,8 @@ else + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } + + if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +@@ -17709,8 +17639,8 @@ lt_prog_compiler_wl_GCJ= + lt_prog_compiler_pic_GCJ= + lt_prog_compiler_static_GCJ= + +-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +-$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 ++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl_GCJ='-Wl,' +@@ -17941,18 +17871,18 @@ $as_echo_n "checking for $compiler optio + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 ++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } + + # + # Check to make sure the PIC flag actually works. + # + if test -n "$lt_prog_compiler_pic_GCJ"; then + +-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 ++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext +@@ -17967,11 +17897,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17970: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17900: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17974: \$? = $ac_status" >&5 ++ echo "$as_me:17904: \$? = $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. +@@ -17984,8 +17914,8 @@ else + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +-$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } + + if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in +@@ -18012,10 +17942,10 @@ esac + # Check to make sure the static flag actually works. + # + wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" +@@ -18040,8 +17970,8 @@ else + LDFLAGS="$save_LDFLAGS" + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +-$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } + + if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then + : +@@ -18050,10 +17980,10 @@ else + fi + + +-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } + if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_prog_compiler_c_o_GCJ=no + $rm -r conftest 2>/dev/null +@@ -18071,11 +18001,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18074: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18004: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:18078: \$? = $ac_status" >&5 ++ echo "$as_me:18008: \$? = $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 +@@ -18097,34 +18027,34 @@ else + $rm conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 ++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } + + + hard_links="nottested" + if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user +- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +-$as_echo_n "checking if we can lock with hard links... " >&6; } ++ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 ++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no +- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +-$as_echo "$hard_links" >&6; } ++ { echo "$as_me:$LINENO: result: $hard_links" >&5 ++echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then +- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi + else + need_locks=no + fi + +-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag_GCJ= +@@ -18336,12 +18266,13 @@ EOF + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $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= +@@ -18554,21 +18485,18 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -18583,13 +18511,12 @@ 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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + 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 +@@ -18624,21 +18551,18 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -18653,13 +18577,12 @@ 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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + 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 +@@ -18892,7 +18815,7 @@ if test -z "$aix_libpath"; then aix_libp + 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 +@@ -19111,8 +19034,8 @@ if test -z "$aix_libpath"; then aix_libp + esac + fi + +-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +-$as_echo "$ld_shlibs_GCJ" >&6; } ++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 ++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } + test "$ld_shlibs_GCJ" = no && can_build_shared=no + + # +@@ -19132,15 +19055,15 @@ x|xyes) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. +- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } ++ { 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* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest +@@ -19158,7 +19081,7 @@ $as_echo_n "checking whether -lc should + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_GCJ=no +@@ -19170,16 +19093,16 @@ $as_echo_n "checking whether -lc should + cat conftest.err 1>&5 + fi + $rm conftest* +- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +-$as_echo "$archive_cmds_need_lc_GCJ" >&6; } ++ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 ++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } + ;; + esac + fi + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +-$as_echo_n "checking dynamic linker characteristics... " >&6; } ++{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 ++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -19535,13 +19458,11 @@ linux* | k*bsd*-gnu) + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes +- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" +- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + + # 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>/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="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ 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 +@@ -19553,6 +19474,18 @@ linux* | k*bsd*-gnu) + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-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='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -19730,19 +19663,19 @@ uts4*) + dynamic_linker=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +-$as_echo "$dynamic_linker" >&6; } ++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 ++echo "${ECHO_T}$dynamic_linker" >&6; } + test "$dynamic_linker" = no && can_build_shared=no + + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" + fi + + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" + if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" + fi +@@ -19754,8 +19687,8 @@ if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" + fi + +-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +-$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 ++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + hardcode_action_GCJ= + if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ +@@ -19779,8 +19712,8 @@ else + # directories. + hardcode_action_GCJ=unsupported + fi -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -$as_echo "$hardcode_action_GCJ" >&6; } - --if test "$hardcode_action_GCJ" = relink; then -- # Fast installation is not supported -- enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -- # Fast installation is not necessary -- enable_fast_install=needless --fi - - --# The else clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# no rules to generate ltmain.sh. --if test -f "$ltmain"; then -- # 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 -- setopt NO_GLOB_SUBST -- fi -- # Now quote all the things that may contain metacharacters while being -- # careful not to overquote the AC_SUBSTed values. We take copies of the -- # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -- SED SHELL STRIP \ -- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -- deplibs_check_method reload_flag reload_cmds need_locks \ -- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -- lt_cv_sys_global_symbol_to_c_name_address \ -- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- old_postinstall_cmds old_postuninstall_cmds \ -- compiler_GCJ \ -- CC_GCJ \ -- LD_GCJ \ -- lt_prog_compiler_wl_GCJ \ -- lt_prog_compiler_pic_GCJ \ -- lt_prog_compiler_static_GCJ \ -- lt_prog_compiler_no_builtin_flag_GCJ \ -- export_dynamic_flag_spec_GCJ \ -- thread_safe_flag_spec_GCJ \ -- whole_archive_flag_spec_GCJ \ -- enable_shared_with_static_runtimes_GCJ \ -- old_archive_cmds_GCJ \ -- old_archive_from_new_cmds_GCJ \ -- predep_objects_GCJ \ -- postdep_objects_GCJ \ -- predeps_GCJ \ -- postdeps_GCJ \ -- compiler_lib_search_path_GCJ \ -- compiler_lib_search_dirs_GCJ \ -- archive_cmds_GCJ \ -- archive_expsym_cmds_GCJ \ -- postinstall_cmds_GCJ \ -- postuninstall_cmds_GCJ \ -- old_archive_from_expsyms_cmds_GCJ \ -- allow_undefined_flag_GCJ \ -- no_undefined_flag_GCJ \ -- export_symbols_cmds_GCJ \ -- hardcode_libdir_flag_spec_GCJ \ -- hardcode_libdir_flag_spec_ld_GCJ \ -- hardcode_libdir_separator_GCJ \ -- hardcode_automatic_GCJ \ -- 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 -- -- case $var in -- old_archive_cmds_GCJ | \ -- old_archive_from_new_cmds_GCJ | \ -- archive_cmds_GCJ | \ -- archive_expsym_cmds_GCJ | \ -- module_cmds_GCJ | \ -- module_expsym_cmds_GCJ | \ -- old_archive_from_expsyms_cmds_GCJ | \ -- export_symbols_cmds_GCJ | \ -- extract_expsyms_cmds | reload_cmds | finish_cmds | \ -- postinstall_cmds | postuninstall_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -- # Double-quote double-evaled strings. -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -- ;; -- *) -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -- ;; -- esac -- done -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<\_LTEOF -+{ $as_echo "$as_me:$LINENO: creating $ofile" >&5 -+$as_echo "$as_me: creating $ofile" >&6;} - -- case $lt_echo in -- *'\$0 --fallback-echo"') -- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -- ;; -- esac - --cfgfile="$ofile" -+ # 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 -+ setopt NO_GLOB_SUBST -+ fi -+ -+ cfgfile="${ofile}T" -+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 -+ $RM "$cfgfile" - -- cat <<__EOF__ >> "$cfgfile" --# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+ cat <<_LT_EOF >> "$cfgfile" -+#! $SHELL - -+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION - # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is part of GNU Libtool. -+# -+# GNU Libtool is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# As a special exception to the GNU General Public License, -+# if you distribute this file as part of a program or library that -+# is built using GNU Libtool, you may include this file under the -+# same distribution terms that you use for the rest of that program. -+# -+# GNU Libtool 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with GNU Libtool; see the file COPYING. If not, a copy -+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -+# obtained by writing to the Free Software Foundation, Inc., -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL - --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared -+# The names of the tagged configurations supported by this script. -+available_tags="CXX " -+ -+# ### BEGIN LIBTOOL CONFIG - - # Whether or not to build static libraries. - build_old_libs=$enable_static - --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$archive_cmds_need_lc_GCJ -+# Assembler program. -+AS=$AS -+ -+# DLL creation program. -+DLLTOOL=$DLLTOOL -+ -+# Object dumper program. -+OBJDUMP=$OBJDUMP -+ -+# Which release of libtool.m4 was used? -+macro_version=$macro_version -+macro_revision=$macro_revision -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared - --# Whether or not to disallow shared libs when runtime libs are static --allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ -+# What type of objects to build. -+pic_mode=$pic_mode - - # Whether or not to optimize for fast installation. - fast_install=$enable_fast_install -@@ -19915,1173 +16954,1671 @@ - build=$build - build_os=$build_os - --# An echo program that does not interpret backslashes. --echo=$lt_echo -+# A sed program that does not truncate output. -+SED=$lt_SED -+ -+# Sed that helps us avoid accidentally triggering echo(1) options like -n. -+Xsed="\$SED -e 1s/^X//" -+ -+# A grep program that handles long lines. -+GREP=$lt_GREP -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# A literal string matcher. -+FGREP=$lt_FGREP -+ -+# A BSD- or MS-compatible name lister. -+NM=$lt_NM -+ -+# Whether we need soft or hard links. -+LN_S=$lt_LN_S -+ -+# What is the maximum length of a command? -+max_cmd_len=$max_cmd_len -+ -+# Object file suffix (normally "o"). -+objext=$ac_objext -+ -+# Executable file suffix (normally ""). -+exeext=$exeext -+ -+# whether the shell understands "unset". -+lt_unset=$lt_unset -+ -+# turn spaces into newlines. -+SP2NL=$lt_lt_SP2NL -+ -+# turn newlines into spaces. -+NL2SP=$lt_lt_NL2SP -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method -+ -+# Command to use when deplibs_check_method == "file_magic". -+file_magic_cmd=$lt_file_magic_cmd - - # The archiver. - AR=$lt_AR - AR_FLAGS=$lt_AR_FLAGS - -+# A symbol stripping program. -+STRIP=$lt_STRIP -+ -+# Commands used to install an old-style archive. -+RANLIB=$lt_RANLIB -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ - # A C compiler. --LTCC=$lt_LTCC -+LTCC=$lt_CC - - # LTCC compiler flags. --LTCFLAGS=$lt_LTCFLAGS -+LTCFLAGS=$lt_CFLAGS - --# A language-specific compiler. --CC=$lt_compiler_GCJ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - --# Is the compiler the GNU C compiler? --with_gcc=$GCC_GCJ -+# Transform the output of nm in a proper C declaration. -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - --# An ERE matcher. --EGREP=$lt_EGREP -+# Transform the output of nm in a C name address pair. -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - --# The linker used to build libraries. --LD=$lt_LD_GCJ -+# Transform the output of nm in a C name address pair when lib prefix is needed. -+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - --# Whether we need hard or soft links. --LN_S=$lt_LN_S -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir - --# A BSD-compatible nm program. --NM=$lt_NM -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL - --# A symbol stripping program --STRIP=$lt_STRIP -+# An echo program that does not interpret backslashes. -+ECHO=$lt_ECHO - --# Used to examine libraries when file_magic_cmd begins "file" -+# Used to examine libraries when file_magic_cmd begins with "file". - MAGIC_CMD=$MAGIC_CMD - --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks -+ -+# Tool to manipulate archived DWARF debug symbol files on Mac OS X. -+DSYMUTIL=$lt_DSYMUTIL - --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" -+# Tool to change global to local symbols on Mac OS X. -+NMEDIT=$lt_NMEDIT - --# Used on cygwin: assembler. --AS="$AS" -+# Tool to manipulate fat objects and archives on Mac OS X. -+LIPO=$lt_LIPO - --# The name of the directory that contains temporary libtool files. --objdir=$objdir -+# ldd/readelf like tool for Mach-O binaries on Mac OS X. -+OTOOL=$lt_OTOOL - --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. -+OTOOL64=$lt_OTOOL64 -+ -+# Old archive suffix (normally "a"). -+libext=$libext -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds=$lt_shrext_cmds -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at link time. -+variables_saved_for_relink=$lt_variables_saved_for_relink -+ -+# Do we need the "lib" prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# Shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Command to use after installation of a shared archive. -+postinstall_cmds=$lt_postinstall_cmds -+ -+# Command to use after uninstallation of a shared archive. -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# As "finish_cmds", except a single script fragment to be evaled but -+# not shown. -+finish_eval=$lt_finish_eval -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Compile-time system search path for libraries. -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ -+# Run-time system search path for libraries. -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen -+ -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+ -+# The linker used to build libraries. -+LD=$lt_LD -+ -+# Commands used to build an old-style archive. -+old_archive_cmds=$lt_old_archive_cmds -+ -+# A language specific compiler. -+CC=$lt_compiler -+ -+# Is the compiler the GNU compiler? -+with_gcc=$GCC -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - - # How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_GCJ -+wl=$lt_lt_prog_compiler_wl -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc -+ -+# Whether or not to disallow shared libs when runtime libs are static. -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec -+ -+# Whether the compiler copes with passing no objects directly. -+compiler_needs_object=$lt_compiler_needs_object -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -+ -+# Commands used to build a shared archive. -+archive_cmds=$lt_archive_cmds -+archive_expsym_cmds=$lt_archive_expsym_cmds -+ -+# Commands used to build a loadable module if different from building -+# a shared archive. -+module_cmds=$lt_module_cmds -+module_expsym_cmds=$lt_module_expsym_cmds -+ -+# Whether we are building with GNU ld or not. -+with_gnu_ld=$lt_with_gnu_ld -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag - --# Object file suffix (normally "o"). --objext="$ac_objext" -+# Flag that enforces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag - --# Old archive suffix (normally "a"). --libext="$libext" -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - --# Shared library suffix (normally ".so"). --shrext_cmds='$shrext_cmds' -+# If ld is used when linking, flag to hardcode \$libdir into a binary -+# during linking. This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - --# Executable file suffix (normally ""). --exeext="$exeext" -+# Whether we need a single "-rpath" flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator - --# Additional compiler flags for building library objects. --pic_flag=$lt_lt_prog_compiler_pic_GCJ --pic_mode=$pic_mode -+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -+# DIR into the resulting binary. -+hardcode_direct=$hardcode_direct - --# What is the maximum length of a command? --max_cmd_len=$lt_cv_sys_max_cmd_len -+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -+# DIR into the resulting binary and the resulting library dependency is -+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -+# library is relocated. -+hardcode_direct_absolute=$hardcode_direct_absolute - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ -+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -+# into the resulting binary. -+hardcode_minus_L=$hardcode_minus_L - --# Must we lock files when doing compilation? --need_locks=$lt_need_locks -+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -+# into the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var - --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix -+# Set to "yes" if building a shared library automatically hardcodes DIR -+# into the library and all subsequent libraries and executables linked -+# against it. -+hardcode_automatic=$hardcode_automatic - --# Do we need a version for libraries? --need_version=$need_version -+# Set to yes if linker adds runtime paths of dependent libraries -+# to runtime path list. -+inherit_rpath=$inherit_rpath - --# Whether dlopen is supported. --dlopen_support=$enable_dlopen -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs - --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path - --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static -+# Set to "yes" if exported symbols are required. -+always_export_symbols=$always_export_symbols - --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_lt_prog_compiler_static_GCJ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds - --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms - --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms - --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ -+# Commands necessary for linking programs (against libraries) with templates. -+prelink_cmds=$lt_prelink_cmds - --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ -+# Specify filename containing input files. -+file_list_spec=$lt_file_list_spec - --# Library versioning type. --version_type=$version_type -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action - --# Format of library name prefix. --libname_spec=$lt_libname_spec -+# The directories searched by this compiler when creating a shared library. -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs - --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$lt_library_names_spec -+# Dependencies to place before and after the objects being linked to -+# create a shared library. -+predep_objects=$lt_predep_objects -+postdep_objects=$lt_postdep_objects -+predeps=$lt_predeps -+postdeps=$lt_postdeps - --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path - --# Commands used to build and install an old-style archive. --RANLIB=$lt_RANLIB --old_archive_cmds=$lt_old_archive_cmds_GCJ --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -+# ### END LIBTOOL CONFIG - --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ -+_LT_EOF - --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ -+ case $host_os in -+ aix3*) -+ cat <<\_LT_EOF >> "$cfgfile" -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+_LT_EOF -+ ;; -+ esac - --# Commands used to build and install a shared archive. --archive_cmds=$lt_archive_cmds_GCJ --archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ --postinstall_cmds=$lt_postinstall_cmds --postuninstall_cmds=$lt_postuninstall_cmds - --# Commands used to build a loadable module (assumed same as above if empty) --module_cmds=$lt_module_cmds_GCJ --module_expsym_cmds=$lt_module_expsym_cmds_GCJ -+ltmain="$ac_aux_dir/ltmain.sh" - --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib - --# Dependencies to place before the objects being linked to create a --# shared library. --predep_objects=$lt_predep_objects_GCJ -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdep_objects=$lt_postdep_objects_GCJ -- --# Dependencies to place before the objects being linked to create a --# shared library. --predeps=$lt_predeps_GCJ -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdeps=$lt_postdeps_GCJ -- --# The directories searched by this compiler when creating a shared --# library --compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -+ case $xsi_shell in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" - --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+} - --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd -+# func_basename file -+func_basename () -+{ -+ func_basename_result="${1##*/}" -+} - --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag_GCJ -+# func_dirname_and_basename file append nondir_replacement -+# perform func_basename and func_dirname in a single function -+# call: -+# dirname: Compute the dirname of FILE. If nonempty, -+# add APPEND to the result, otherwise set result -+# to NONDIR_REPLACEMENT. -+# value returned in "$func_dirname_result" -+# basename: Compute filename of FILE. -+# value retuned in "$func_basename_result" -+# Implementation must be kept synchronized with func_dirname -+# and func_basename. For efficiency, we do not delegate to -+# those functions but instead duplicate the functionality here. -+func_dirname_and_basename () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}" -+} - --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag_GCJ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+func_stripname () -+{ -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"} -+} - --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=${1%%=*} -+ func_opt_split_arg=${1#*=} -+} - --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval -+# func_lo2o object -+func_lo2o () -+{ -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac -+} - --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=${1%.*}.lo -+} - --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=$(( $* )) -+} - --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=${#1} -+} - --# This is the shared library runtime path variable. --runpath_var=$runpath_var -+_LT_EOF -+ ;; -+ *) # Bourne compatible functions. -+ cat << \_LT_EOF >> "$cfgfile" - --# This is the shared library path variable. --shlibpath_var=$shlibpath_var -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} - --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -+} - --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action_GCJ - --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "X${3}" \ -+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "X${3}" \ -+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -+ esac -+} - --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ -+# sed scripts: -+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -+my_sed_long_arg='1s/^-[^=]*=//' - --# If ld is used when linking, flag to hardcode \$libdir into --# a binary during linking. This must work even if \$libdir does --# not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ -- --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ -- --# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$hardcode_direct_GCJ -- --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$hardcode_minus_L_GCJ -- --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ -- --# Set to yes if building a shared library automatically hardcodes DIR into the library --# and all subsequent libraries and executables linked against it. --hardcode_automatic=$hardcode_automatic_GCJ -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -+} - --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -+} - --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs_GCJ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` -+} - --# Compile-time system search path for libraries --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "$@"` -+} - --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -+} - --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path -+_LT_EOF -+esac - --# Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols_GCJ -+case $lt_shell_append in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$1+=\$2" -+} -+_LT_EOF -+ ;; -+ *) -+ cat << \_LT_EOF >> "$cfgfile" - --# The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds_GCJ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$1=\$$1\$2" -+} - --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -+_LT_EOF -+ ;; -+ esac - --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms_GCJ - --# Symbols that must always be exported. --include_expsyms=$lt_include_expsyms_GCJ -+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) - --# ### END LIBTOOL TAG CONFIG: $tagname -+ mv -f "$cfgfile" "$ofile" || -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" - --__EOF__ - -+ cat <<_LT_EOF >> "$ofile" - --else -- # If there is no Makefile yet, we rely on a make rule to execute -- # `config.status --recheck' to rerun these tests and create the -- # libtool script then. -- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -- if test -f "$ltmain_in"; then -- test -f Makefile && make "$ltmain" -- fi --fi -+# ### BEGIN LIBTOOL TAG CONFIG: CXX - -+# The linker used to build libraries. -+LD=$lt_LD_CXX - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -+# Commands used to build an old-style archive. -+old_archive_cmds=$lt_old_archive_cmds_CXX - --CC="$lt_save_CC" -+# A language specific compiler. -+CC=$lt_compiler_CXX - -- else -- tagname="" -- fi -- ;; -+# Is the compiler the GNU compiler? -+with_gcc=$GCC_CXX - -- RC) -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX - --# Source file extension for RC test sources. --ac_ext=rc -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_CXX - --# Object file extension for compiled RC test sources. --objext=o --objext_RC=$objext -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_CXX - --# Code to be used in simple compile tests --lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - --# Code to be used in simple link tests --lt_simple_link_test_code="$lt_simple_compile_test_code" -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_CXX - --# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+# Whether or not to disallow shared libs when runtime libs are static. -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - --# If no C compiler was specified, use CC. --LTCC=${LTCC-"$CC"} -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - --# If no C compiler flags were specified, use CFLAGS. --LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - --# Allow CC to be a program name with arguments. --compiler=$CC -+# Whether the compiler copes with passing no objects directly. -+compiler_needs_object=$lt_compiler_needs_object_CXX - -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - --# save warnings/boilerplate of simple test code --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* -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - --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 -r conftest* -+# Commands used to build a shared archive. -+archive_cmds=$lt_archive_cmds_CXX -+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX - -+# Commands used to build a loadable module if different from building -+# a shared archive. -+module_cmds=$lt_module_cmds_CXX -+module_expsym_cmds=$lt_module_expsym_cmds_CXX - --# Allow CC to be a program name with arguments. --lt_save_CC="$CC" --CC=${RC-"windres"} --compiler=$CC --compiler_RC=$CC --for cc_temp in $compiler""; do -- case $cc_temp in -- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+# Whether we are building with GNU ld or not. -+with_gnu_ld=$lt_with_gnu_ld_CXX - --lt_cv_prog_compiler_c_o_RC=yes -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_CXX - --# The else clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# no rules to generate ltmain.sh. --if test -f "$ltmain"; then -- # 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 -- setopt NO_GLOB_SUBST -- fi -- # Now quote all the things that may contain metacharacters while being -- # careful not to overquote the AC_SUBSTed values. We take copies of the -- # variables and quote the copies for generation of the libtool script. -- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ -- SED SHELL STRIP \ -- libname_spec library_names_spec soname_spec extract_expsyms_cmds \ -- old_striplib striplib file_magic_cmd finish_cmds finish_eval \ -- deplibs_check_method reload_flag reload_cmds need_locks \ -- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ -- lt_cv_sys_global_symbol_to_c_name_address \ -- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ -- old_postinstall_cmds old_postuninstall_cmds \ -- compiler_RC \ -- CC_RC \ -- LD_RC \ -- lt_prog_compiler_wl_RC \ -- lt_prog_compiler_pic_RC \ -- lt_prog_compiler_static_RC \ -- lt_prog_compiler_no_builtin_flag_RC \ -- export_dynamic_flag_spec_RC \ -- thread_safe_flag_spec_RC \ -- whole_archive_flag_spec_RC \ -- enable_shared_with_static_runtimes_RC \ -- old_archive_cmds_RC \ -- old_archive_from_new_cmds_RC \ -- predep_objects_RC \ -- postdep_objects_RC \ -- predeps_RC \ -- postdeps_RC \ -- compiler_lib_search_path_RC \ -- compiler_lib_search_dirs_RC \ -- archive_cmds_RC \ -- archive_expsym_cmds_RC \ -- postinstall_cmds_RC \ -- postuninstall_cmds_RC \ -- old_archive_from_expsyms_cmds_RC \ -- allow_undefined_flag_RC \ -- no_undefined_flag_RC \ -- export_symbols_cmds_RC \ -- hardcode_libdir_flag_spec_RC \ -- hardcode_libdir_flag_spec_ld_RC \ -- hardcode_libdir_separator_RC \ -- hardcode_automatic_RC \ -- 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 -- -- case $var in -- old_archive_cmds_RC | \ -- old_archive_from_new_cmds_RC | \ -- archive_cmds_RC | \ -- archive_expsym_cmds_RC | \ -- module_cmds_RC | \ -- module_expsym_cmds_RC | \ -- old_archive_from_expsyms_cmds_RC | \ -- export_symbols_cmds_RC | \ -- extract_expsyms_cmds | reload_cmds | finish_cmds | \ -- postinstall_cmds | postuninstall_cmds | \ -- old_postinstall_cmds | old_postuninstall_cmds | \ -- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) -- # Double-quote double-evaled strings. -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" -- ;; -- *) -- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" -- ;; -- esac -- done -+# Flag that enforces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_CXX - -- case $lt_echo in -- *'\$0 --fallback-echo"') -- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` -- ;; -- esac -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX - --cfgfile="$ofile" -+# If ld is used when linking, flag to hardcode \$libdir into a binary -+# during linking. This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX - -- cat <<__EOF__ >> "$cfgfile" --# ### BEGIN LIBTOOL TAG CONFIG: $tagname -+# Whether we need a single "-rpath" flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX - --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -+# DIR into the resulting binary. -+hardcode_direct=$hardcode_direct_CXX - --# Shell to use when invoking shell scripts. --SHELL=$lt_SHELL -+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -+# DIR into the resulting binary and the resulting library dependency is -+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -+# library is relocated. -+hardcode_direct_absolute=$hardcode_direct_absolute_CXX - --# Whether or not to build shared libraries. --build_libtool_libs=$enable_shared -+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -+# into the resulting binary. -+hardcode_minus_L=$hardcode_minus_L_CXX - --# Whether or not to build static libraries. --build_old_libs=$enable_static -+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -+# into the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX - --# Whether or not to add -lc for building shared libraries. --build_libtool_need_lc=$archive_cmds_need_lc_RC -+# Set to "yes" if building a shared library automatically hardcodes DIR -+# into the library and all subsequent libraries and executables linked -+# against it. -+hardcode_automatic=$hardcode_automatic_CXX - --# Whether or not to disallow shared libs when runtime libs are static --allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC -+# Set to yes if linker adds runtime paths of dependent libraries -+# to runtime path list. -+inherit_rpath=$inherit_rpath_CXX - --# Whether or not to optimize for fast installation. --fast_install=$enable_fast_install -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_CXX - --# The host system. --host_alias=$host_alias --host=$host --host_os=$host_os -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path_CXX - --# The build system. --build_alias=$build_alias --build=$build --build_os=$build_os -+# Set to "yes" if exported symbols are required. -+always_export_symbols=$always_export_symbols_CXX - --# An echo program that does not interpret backslashes. --echo=$lt_echo -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_CXX - --# The archiver. --AR=$lt_AR --AR_FLAGS=$lt_AR_FLAGS -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_CXX - --# A C compiler. --LTCC=$lt_LTCC -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_CXX - --# LTCC compiler flags. --LTCFLAGS=$lt_LTCFLAGS -+# Commands necessary for linking programs (against libraries) with templates. -+prelink_cmds=$lt_prelink_cmds_CXX - --# A language-specific compiler. --CC=$lt_compiler_RC -+# Specify filename containing input files. -+file_list_spec=$lt_file_list_spec_CXX - --# Is the compiler the GNU C compiler? --with_gcc=$GCC_RC -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_CXX - --# An ERE matcher. --EGREP=$lt_EGREP -+# The directories searched by this compiler when creating a shared library. -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX - --# The linker used to build libraries. --LD=$lt_LD_RC -+# Dependencies to place before and after the objects being linked to -+# create a shared library. -+predep_objects=$lt_predep_objects_CXX -+postdep_objects=$lt_postdep_objects_CXX -+predeps=$lt_predeps_CXX -+postdeps=$lt_postdeps_CXX - --# Whether we need hard or soft links. --LN_S=$lt_LN_S -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - --# A BSD-compatible nm program. --NM=$lt_NM -+# ### END LIBTOOL TAG CONFIG: CXX -+_LT_EOF - --# A symbol stripping program --STRIP=$lt_STRIP - --# Used to examine libraries when file_magic_cmd begins "file" --MAGIC_CMD=$MAGIC_CMD -+{ (exit 0); exit 0; } -+_LTEOF -+chmod +x "$CONFIG_LT" - --# Used on cygwin: DLL creation program. --DLLTOOL="$DLLTOOL" -+# configure is writing to config.log, but config.lt does its own redirection, -+# appending to config.log, which fails on DOS, as config.log is still kept -+# open by configure. Here we exec the FD to /dev/null, effectively closing -+# config.log, so it can be properly (re)opened and appended to by config.lt. -+if test "$no_create" != yes; then -+ lt_cl_success=: -+ test "$silent" = yes && -+ lt_config_lt_args="$lt_config_lt_args --quiet" -+ exec 5>/dev/null -+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -+ exec 5>>config.log -+ $lt_cl_success || { (exit 1); exit 1; } -+fi - --# Used on cygwin: object dumper. --OBJDUMP="$OBJDUMP" - --# Used on cygwin: assembler. --AS="$AS" - --# The name of the directory that contains temporary libtool files. --objdir=$objdir -+# Make sure we use 64-bit versions of various file stuff. -+# Check whether --enable-largefile was given. -+if test "${enable_largefile+set}" = set; then -+ enableval=$enable_largefile; -+fi - --# How to create reloadable object files. --reload_flag=$lt_reload_flag --reload_cmds=$lt_reload_cmds -+if test "$enable_largefile" != no; then - --# How to pass a linker flag through the compiler. --wl=$lt_lt_prog_compiler_wl_RC -+ { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -+$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -+if test "${ac_cv_sys_largefile_CC+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_sys_largefile_CC=no -+ if test "$GCC" != yes; then -+ ac_save_CC=$CC -+ while :; do -+ # IRIX 6.2 and later do not support large files by default, -+ # so use the C compiler's -n32 option if that helps. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/types.h> -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ - --# Object file suffix (normally "o"). --objext="$ac_objext" -+ ; -+ return 0; -+} -+_ACEOF -+ rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ break -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Old archive suffix (normally "a"). --libext="$libext" - --# Shared library suffix (normally ".so"). --shrext_cmds='$shrext_cmds' -+fi - --# Executable file suffix (normally ""). --exeext="$exeext" -+rm -f core conftest.err conftest.$ac_objext -+ CC="$CC -n32" -+ rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Additional compiler flags for building library objects. --pic_flag=$lt_lt_prog_compiler_pic_RC --pic_mode=$pic_mode - --# What is the maximum length of a command? --max_cmd_len=$lt_cv_sys_max_cmd_len -+fi - --# Does compiler simultaneously support -c and -o options? --compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC -+rm -f core conftest.err conftest.$ac_objext -+ break -+ done -+ CC=$ac_save_CC -+ rm -f conftest.$ac_ext -+ fi -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -+$as_echo "$ac_cv_sys_largefile_CC" >&6; } -+ if test "$ac_cv_sys_largefile_CC" != no; then -+ CC=$CC$ac_cv_sys_largefile_CC -+ fi - --# Must we lock files when doing compilation? --need_locks=$lt_need_locks -+ { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -+if test "${ac_cv_sys_file_offset_bits+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/types.h> -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ - --# Do we need the lib prefix for modules? --need_lib_prefix=$need_lib_prefix -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Do we need a version for libraries? --need_version=$need_version - --# Whether dlopen is supported. --dlopen_support=$enable_dlopen -+fi - --# Whether dlopen of programs is supported. --dlopen_self=$enable_dlopen_self -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#define _FILE_OFFSET_BITS 64 -+#include <sys/types.h> -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ - --# Whether dlopen of statically linked programs is supported. --dlopen_self_static=$enable_dlopen_self_static -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Compiler flag to prevent dynamic linking. --link_static_flag=$lt_lt_prog_compiler_static_RC - --# Compiler flag to turn off builtin functions. --no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC -+fi - --# Compiler flag to allow reflexive dlopens. --export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cv_sys_file_offset_bits=unknown -+ break -+done -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -+$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -+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 -+;; -+esac -+rm -rf conftest* -+ if test $ac_cv_sys_file_offset_bits = unknown; then -+ { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -+if test "${ac_cv_sys_large_files+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/types.h> -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ - --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# Compiler flag to generate thread-safe objects. --thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC - --# Library versioning type. --version_type=$version_type -+fi - --# Format of library name prefix. --libname_spec=$lt_libname_spec -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#define _LARGE_FILES 1 -+#include <sys/types.h> -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ - --# List of archive names. First name is the real one, the rest are links. --# The last name is the one that the linker finds with -lNAME. --library_names_spec=$lt_library_names_spec -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (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 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --# The coded name of the library, if different from the real name. --soname_spec=$lt_soname_spec - --# Commands used to build and install an old-style archive. --RANLIB=$lt_RANLIB --old_archive_cmds=$lt_old_archive_cmds_RC --old_postinstall_cmds=$lt_old_postinstall_cmds --old_postuninstall_cmds=$lt_old_postuninstall_cmds -+fi - --# Create an old-style archive from a shared archive. --old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cv_sys_large_files=unknown -+ break -+done -+fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -+$as_echo "$ac_cv_sys_large_files" >&6; } -+case $ac_cv_sys_large_files in #( -+ no | unknown) ;; -+ *) -+cat >>confdefs.h <<_ACEOF -+#define _LARGE_FILES $ac_cv_sys_large_files -+_ACEOF -+;; -+esac -+rm -rf conftest* -+ fi -+fi - --# Create a temporary old-style archive to link instead of a shared archive. --old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC - --# Commands used to build and install a shared archive. --archive_cmds=$lt_archive_cmds_RC --archive_expsym_cmds=$lt_archive_expsym_cmds_RC --postinstall_cmds=$lt_postinstall_cmds --postuninstall_cmds=$lt_postuninstall_cmds -+# By default we simply use the C compiler to build assembly code. - --# Commands used to build a loadable module (assumed same as above if empty) --module_cmds=$lt_module_cmds_RC --module_expsym_cmds=$lt_module_expsym_cmds_RC ++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 ++echo "${ECHO_T}$hardcode_action_GCJ" >&6; } + + if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported +@@ -20703,8 +20636,8 @@ CC="$lt_save_CC" + ;; + + *) +- { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 +-$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} ++ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 ++echo "$as_me: error: Unsupported tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +@@ -20723,8 +20656,8 @@ $as_echo "$as_me: error: Unsupported tag + chmod +x "$ofile" + else + rm -f "${ofile}T" +- { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 +-$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} ++ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 ++echo "$as_me: error: unable to update list of available tagged configurations." >&2;} + { (exit 1); exit 1; }; } + fi + fi +@@ -20769,10 +20702,10 @@ fi + + if test "$enable_largefile" != no; then + +- { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +-$as_echo_n "checking for special C compiler options needed for large files... " >&6; } ++ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 ++echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } + if test "${ac_cv_sys_largefile_CC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then +@@ -20809,21 +20742,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + break + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -20837,21 +20769,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -20864,16 +20795,16 @@ rm -f core conftest.err conftest.$ac_obj + rm -f conftest.$ac_ext + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +-$as_echo "$ac_cv_sys_largefile_CC" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 ++echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + +- { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } ++ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } + if test "${ac_cv_sys_file_offset_bits+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + while :; do + cat >conftest.$ac_ext <<_ACEOF +@@ -20905,21 +20836,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -20956,21 +20886,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -20981,8 +20910,8 @@ rm -f core conftest.err conftest.$ac_obj + break + done + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +-$as_echo "$ac_cv_sys_file_offset_bits" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } + case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +@@ -20991,12 +20920,12 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + ;; + esac +-rm -rf conftest* ++rm -f conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then +- { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } ++ { 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 +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + while :; do + cat >conftest.$ac_ext <<_ACEOF +@@ -21028,21 +20957,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -21079,21 +21007,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -21104,8 +21031,8 @@ rm -f core conftest.err conftest.$ac_obj + break + done + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +-$as_echo "$ac_cv_sys_large_files" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 ++echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } + case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +@@ -21114,24 +21041,132 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + ;; + esac +-rm -rf conftest* ++rm -f conftest* + fi + fi + + + # By default we simply use the C compiler to build assembly code. + +-: ${CCAS='$(CC)'} +-# Set ASFLAGS if not already set. +-: ${CCASFLAGS='$(CFLAGS)'} +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS - --# Commands to strip libraries. --old_striplib=$lt_old_striplib --striplib=$lt_striplib - --# Dependencies to place before the objects being linked to create a --# shared library. --predep_objects=$lt_predep_objects_RC -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdep_objects=$lt_postdep_objects_RC -- --# Dependencies to place before the objects being linked to create a --# shared library. --predeps=$lt_predeps_RC -- --# Dependencies to place after the objects being linked to create a --# shared library. --postdeps=$lt_postdeps_RC -- --# The directories searched by this compiler when creating a shared --# library --compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC - --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_compiler_lib_search_path_RC ++ ++ ++ +depcc="$CCAS" am_compiler_list= - --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+$as_echo_n "checking dependency style of $depcc... " >&6; } ++ ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then -+ $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up @@ -40193,9 +12581,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub - --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd ++ + am_cv_CCAS_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` @@ -40216,9 +12602,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag_RC ++ + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll @@ -40257,24 +12641,18 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + fi + fi + done - --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag_RC ++ + cd .. + rm -rf conftest.dir +else + am_cv_CCAS_dependencies_compiler_type=none +fi - --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds ++ +fi -+{ $as_echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 -+$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; } ++{ echo "$as_me:$LINENO: result: $am_cv_CCAS_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CCAS_dependencies_compiler_type" >&6; } +CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type - --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval ++ + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then @@ -40285,926 +12663,386 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + am__fastdepCCAS_FALSE= +fi --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+# Extract the first word of "nm", so it can be a program name with args. -+set dummy nm; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_path_NM+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ case $NM in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_NM="$NM" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS + # Extract the first word of "nm", so it can be a program name with args. + set dummy nm; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_NM+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $NM in + [\\/]* | ?:[\\/]*) +@@ -21146,7 +21181,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21159,17 +21194,17 @@ esac + fi + NM=$ac_cv_path_NM + if test -n "$NM"; then +- { $as_echo "$as_me:$LINENO: result: $NM" >&5 +-$as_echo "$NM" >&6; } ++ { echo "$as_me:$LINENO: result: $NM" >&5 ++echo "${ECHO_T}$NM" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" -+ ;; -+esac -+fi -+NM=$ac_cv_path_NM -+if test -n "$NM"; then -+ { $as_echo "$as_me:$LINENO: result: $NM" >&5 -+$as_echo "$NM" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi --# This is the shared library runtime path variable. --runpath_var=$runpath_var --# This is the shared library path variable. --shlibpath_var=$shlibpath_var +-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + # Check whether --enable-maintainer-mode was given. + if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +@@ -21177,11 +21212,9 @@ else + USE_MAINTAINER_MODE=no + fi --# Is shlibpath searched before the hard-coded library search path? --shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } -+ # Check whether --enable-maintainer-mode was given. -+if test "${enable_maintainer_mode+set}" = set; then -+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -+else -+ USE_MAINTAINER_MODE=no -+fi - --# How to hardcode a shared library path into an executable. --hardcode_action=$hardcode_action_RC -+ { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -+$as_echo "$USE_MAINTAINER_MODE" >&6; } +- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +-$as_echo "$USE_MAINTAINER_MODE" >&6; } +- +- +-if test $USE_MAINTAINER_MODE = yes; then ++ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 ++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then -+ MAINTAINER_MODE_TRUE= -+ MAINTAINER_MODE_FALSE='#' -+else -+ MAINTAINER_MODE_TRUE='#' -+ MAINTAINER_MODE_FALSE= -+fi + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' + else +@@ -21193,8 +21226,8 @@ fi --# Whether we should hardcode library paths into libraries. --hardcode_into_libs=$hardcode_into_libs -+ MAINT=$MAINTAINER_MODE_TRUE --# Flag to hardcode \$libdir into a binary during linking. --# This must work even if \$libdir does not exist. --hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC --# If ld is used when linking, flag to hardcode \$libdir into --# a binary during linking. This must work even if \$libdir does --# not exist. --hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC +-{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +-$as_echo_n "checking for some Win32 platform... " >&6; } ++{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 ++echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } + case "$host" in + *-*-mingw*|*-*-cygwin*) + platform_win32=yes +@@ -21203,11 +21236,9 @@ case "$host" in + platform_win32=no + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 +-$as_echo "$platform_win32" >&6; } - --# Whether we need a single -rpath flag with a separated argument. --hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC - --# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the --# resulting binary. --hardcode_direct=$hardcode_direct_RC -- --# Set to yes if using the -LDIR flag during linking hardcodes DIR into the --# resulting binary. --hardcode_minus_L=$hardcode_minus_L_RC -- --# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into --# the resulting binary. --hardcode_shlibpath_var=$hardcode_shlibpath_var_RC -- --# Set to yes if building a shared library automatically hardcodes DIR into the library --# and all subsequent libraries and executables linked against it. --hardcode_automatic=$hardcode_automatic_RC - --# Variables whose values should be saved in libtool wrapper scripts and --# restored at relink time. --variables_saved_for_relink="$variables_saved_for_relink" -+{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -+$as_echo_n "checking for some Win32 platform... " >&6; } -+case "$host" in -+ *-*-mingw*|*-*-cygwin*) -+ platform_win32=yes -+ ;; -+ *) -+ platform_win32=no -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 -+$as_echo "$platform_win32" >&6; } +-if test "$platform_win32" = "yes"; then ++{ echo "$as_me:$LINENO: result: $platform_win32" >&5 ++echo "${ECHO_T}$platform_win32" >&6; } + if test "$platform_win32" = "yes"; then -+ PLATFORM_WIN32_TRUE= -+ PLATFORM_WIN32_FALSE='#' -+else -+ PLATFORM_WIN32_TRUE='#' -+ PLATFORM_WIN32_FALSE= -+fi + PLATFORM_WIN32_TRUE= + PLATFORM_WIN32_FALSE='#' + else +@@ -21216,9 +21247,7 @@ else + fi --# Whether libtool must link a program against all its dependency libraries. --link_all_deplibs=$link_all_deplibs_RC --# Compile-time system search path for libraries --sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +- +-if test "$os_win32" = "yes"; then + if test "$os_win32" = "yes"; then -+ OS_WIN32_TRUE= -+ OS_WIN32_FALSE='#' -+else -+ OS_WIN32_TRUE='#' -+ OS_WIN32_FALSE= -+fi + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' + else +@@ -21226,9 +21255,7 @@ else + OS_WIN32_FALSE= + fi --# Run-time system search path for libraries --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +- +-if test "$os_win32" != "yes"; then + if test "$os_win32" != "yes"; then -+ OS_UNIX_TRUE= -+ OS_UNIX_FALSE='#' -+else -+ OS_UNIX_TRUE='#' -+ OS_UNIX_FALSE= -+fi + OS_UNIX_TRUE= + OS_UNIX_FALSE='#' + else +@@ -21236,9 +21263,7 @@ else + OS_UNIX_FALSE= + fi --# Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path=$lt_fix_srcfile_path +- +- +-if test "$os_linux" = "yes"; then + if test "$os_linux" = "yes"; then -+ OS_LINUX_TRUE= -+ OS_LINUX_FALSE='#' -+else -+ OS_LINUX_TRUE='#' -+ OS_LINUX_FALSE= -+fi - --# Set to yes if exported symbols are required. --always_export_symbols=$always_export_symbols_RC - --# The commands to list exported symbols. --export_symbols_cmds=$lt_export_symbols_cmds_RC -+if test "$os_win32" = "yes"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -+set dummy ${ac_tool_prefix}windres; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_WINDRES+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$WINDRES"; then -+ ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_WINDRES="${ac_tool_prefix}windres" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --# The commands to extract the exported symbol list from a shared archive. --extract_expsyms_cmds=$lt_extract_expsyms_cmds -+fi -+fi -+WINDRES=$ac_cv_prog_WINDRES -+if test -n "$WINDRES"; then -+ { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 -+$as_echo "$WINDRES" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi - --# Symbols that should not be listed in the preloaded symbols. --exclude_expsyms=$lt_exclude_expsyms_RC - --# Symbols that must always be exported. --include_expsyms=$lt_include_expsyms_RC -+fi -+if test -z "$ac_cv_prog_WINDRES"; then -+ ac_ct_WINDRES=$WINDRES -+ # Extract the first word of "windres", so it can be a program name with args. -+set dummy windres; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_WINDRES"; then -+ ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ac_ct_WINDRES="windres" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - --# ### END LIBTOOL TAG CONFIG: $tagname -+fi -+fi -+ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -+if test -n "$ac_ct_WINDRES"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -+$as_echo "$ac_ct_WINDRES" >&6; } -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi - --__EOF__ -+ if test "x$ac_ct_WINDRES" = x; then -+ WINDRES="no" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ WINDRES=$ac_ct_WINDRES -+ fi -+else -+ WINDRES="$ac_cv_prog_WINDRES" -+fi - -+ if test "$WINDRES" = no; then -+ { { $as_echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 -+$as_echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ # Extract the first word of "lib.exe", so it can be a program name with args. -+set dummy lib.exe; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ms_librarian+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ms_librarian"; then -+ ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -+ ac_cv_prog_ms_librarian="yes" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+IFS=$as_save_IFS - -+ test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" -+fi -+fi -+ms_librarian=$ac_cv_prog_ms_librarian -+if test -n "$ms_librarian"; then -+ { $as_echo "$as_me:$LINENO: result: $ms_librarian" >&5 -+$as_echo "$ms_librarian" >&6; } + OS_LINUX_TRUE= + OS_LINUX_FALSE='#' else -- # If there is no Makefile yet, we rely on a make rule to execute -- # `config.status --recheck' to rerun these tests and create the -- # libtool script then. -- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -- if test -f "$ltmain_in"; then -- test -f Makefile && make "$ltmain" -- fi -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } +@@ -21251,10 +21276,10 @@ if test "$os_win32" = "yes"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. + set dummy ${ac_tool_prefix}windres; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_WINDRES+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. +@@ -21267,7 +21292,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21278,11 +21303,11 @@ fi + fi + WINDRES=$ac_cv_prog_WINDRES + if test -n "$WINDRES"; then +- { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 +-$as_echo "$WINDRES" >&6; } ++ { echo "$as_me:$LINENO: result: $WINDRES" >&5 ++echo "${ECHO_T}$WINDRES" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -21291,10 +21316,10 @@ if test -z "$ac_cv_prog_WINDRES"; then + ac_ct_WINDRES=$WINDRES + # Extract the first word of "windres", so it can be a program name with args. + set dummy windres; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_WINDRES"; then + ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. +@@ -21307,7 +21332,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21318,11 +21343,11 @@ fi + fi + ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES + if test -n "$ac_ct_WINDRES"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 +-$as_echo "$ac_ct_WINDRES" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 ++echo "${ECHO_T}$ac_ct_WINDRES" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_ct_WINDRES" = x; then +@@ -21330,8 +21355,12 @@ fi + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + WINDRES=$ac_ct_WINDRES +@@ -21341,16 +21370,16 @@ else + fi + + if test "$WINDRES" = no; then +- { { $as_echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 +-$as_echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} ++ { { echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 ++echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} + { (exit 1); exit 1; }; } + fi + # Extract the first word of "lib.exe", so it can be a program name with args. + set dummy lib.exe; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_ms_librarian+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ms_librarian"; then + ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. +@@ -21363,7 +21392,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21375,18 +21404,16 @@ fi + fi + ms_librarian=$ac_cv_prog_ms_librarian + if test -n "$ms_librarian"; then +- { $as_echo "$as_me:$LINENO: result: $ms_librarian" >&5 +-$as_echo "$ms_librarian" >&6; } ++ { echo "$as_me:$LINENO: result: $ms_librarian" >&5 ++echo "${ECHO_T}$ms_librarian" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- --CC="$lt_save_CC" -- -- ;; -- -- *) -- { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 --$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- esac -- -- # Append the new tag name to the list of available tags. -- if test -n "$tagname" ; then -- available_tags="$available_tags $tagname" -- fi -- fi -- done -- IFS="$lt_save_ifs" -- -- # Now substitute the updated list of available tags. -- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then -- mv "${ofile}T" "$ofile" -- chmod +x "$ofile" -- else -- rm -f "${ofile}T" -- { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 --$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} -- { (exit 1); exit 1; }; } -- fi fi - - -- --# This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -- --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -- --# Prevent multiple expansion -- -- +-if test x$ms_librarian = xyes; then + if test x$ms_librarian = xyes; then -+ MS_LIB_AVAILABLE_TRUE= -+ MS_LIB_AVAILABLE_FALSE='#' -+else -+ MS_LIB_AVAILABLE_TRUE='#' -+ MS_LIB_AVAILABLE_FALSE= -+fi - - - - -+# Check whether --enable-debug was given. -+if test "${enable_debug+set}" = set; then -+ enableval=$enable_debug; -+else -+ enable_debug=minimum -+fi - -+# Check whether --enable-shm was given. -+if test "${enable_shm+set}" = set; then -+ enableval=$enable_shm; -+else -+ enable_shm="yes" -+fi - -+# Check whether --enable-xkb was given. -+if test "${enable_xkb+set}" = set; then -+ enableval=$enable_xkb; -+else -+ enable_xkb="maybe" -+fi - -+# Check whether --enable-xinerama was given. -+if test "${enable_xinerama+set}" = set; then -+ enableval=$enable_xinerama; -+else -+ enable_xinerama="yes" -+fi - -+# Check whether --enable-rebuilds was given. -+if test "${enable_rebuilds+set}" = set; then -+ enableval=$enable_rebuilds; -+else -+ enable_rebuilds=yes -+fi - -+# Check whether --enable-visibility was given. -+if test "${enable_visibility+set}" = set; then -+ enableval=$enable_visibility; -+else -+ enable_visibility=yes -+fi - - - -+# Check whether --with-xinput was given. -+if test "${with_xinput+set}" = set; then -+ withval=$with_xinput; -+fi - - -+if test "$platform_win32" = yes; then -+ gdktarget=win32 -+else -+ gdktarget=x11 -+fi - - -+# Check whether --with-gdktarget was given. -+if test "${with_gdktarget+set}" = set; then -+ withval=$with_gdktarget; gdktarget=$with_gdktarget -+fi - - - -+case $gdktarget in -+ x11|win32|quartz|directfb) ;; -+ *) { { $as_echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 -+$as_echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} -+ { (exit 1); exit 1; }; };; -+esac - -+gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la -+gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la - --# Make sure we use 64-bit versions of various file stuff. --# Check whether --enable-largefile was given. --if test "${enable_largefile+set}" = set; then -- enableval=$enable_largefile; --fi - --if test "$enable_largefile" != no; then - -- { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 --$as_echo_n "checking for special C compiler options needed for large files... " >&6; } --if test "${ac_cv_sys_largefile_CC+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_cv_sys_largefile_CC=no -- if test "$GCC" != yes; then -- ac_save_CC=$CC -- while :; do -- # IRIX 6.2 and later do not support large files by default, -- # so use the C compiler's -n32 option if that helps. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/types.h> -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; --int --main () --{ - -- ; -- return 0; --} --_ACEOF -- rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- break -+if test "x$enable_debug" = "xyes"; then -+ test "$cflags_set" = set || CFLAGS="$CFLAGS -g" -+ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" + MS_LIB_AVAILABLE_TRUE= + MS_LIB_AVAILABLE_FALSE='#' else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- -+ if test "x$enable_debug" = "xno"; then -+ GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" -+ else -+ GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS" -+ fi - fi +@@ -21463,8 +21490,8 @@ fi --rm -f core conftest.err conftest.$ac_objext -- CC="$CC -n32" -- rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- + case $gdktarget in + x11|win32|quartz|directfb) ;; +- *) { { $as_echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 +-$as_echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} ++ *) { { echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 ++echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} + { (exit 1); exit 1; }; };; + esac -+if test "x$enable_visibility" = "xno"; then -+ GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY" - fi +@@ -21499,8 +21526,8 @@ _ACEOF --rm -f core conftest.err conftest.$ac_objext -- break -- done -- CC=$ac_save_CC -- rm -f conftest.$ac_ext -- fi --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 --$as_echo "$ac_cv_sys_largefile_CC" >&6; } -- if test "$ac_cv_sys_largefile_CC" != no; then -- CC=$CC$ac_cv_sys_largefile_CC -- fi -- { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 --$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } --if test "${ac_cv_sys_file_offset_bits+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- while :; do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <sys/types.h> -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; --int --main () --{ - -- ; -- return 0; --} -+cat >>confdefs.h <<_ACEOF -+#define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}" - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - --fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#define _FILE_OFFSET_BITS 64 --#include <sys/types.h> -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; --int --main () --{ - -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+# Build time sanity check... -+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+$as_echo_n "checking whether build environment is sane... " >&6; } -+# Just in case -+sleep 1 -+echo timestamp > conftest.file -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ if test "$*" = "X"; then -+ # -L didn't work. -+ set X `ls -t $srcdir/configure conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$*" != "X $srcdir/configure conftest.file" \ -+ && test "$*" != "X conftest.file $srcdir/configure"; then - -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -+alias in your environment" >&5 -+$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -+alias in your environment" >&2;} -+ { (exit 1); exit 1; }; } -+ fi - -+ test "$2" = conftest.file -+ ) -+then -+ # Ok. -+ : -+else -+ { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -+Check your system clock" >&5 -+$as_echo "$as_me: error: newly created file is older than distributed files! -+Check your system clock" >&2;} -+ { (exit 1); exit 1; }; } - fi -+{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ac_cv_sys_file_offset_bits=unknown -- break --done --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 --$as_echo "$ac_cv_sys_file_offset_bits" >&6; } --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 --;; --esac --rm -rf conftest* -- if test $ac_cv_sys_file_offset_bits = unknown; then -- { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 --$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } --if test "${ac_cv_sys_large_files+set}" = set; then -+# Checks for programs. -+{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 -+$as_echo_n "checking for library containing strerror... " >&6; } -+if test "${ac_cv_search_strerror+set}" = set; then - $as_echo_n "(cached) " >&6 + # Build time sanity check... +-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +-$as_echo_n "checking whether build environment is sane... " >&6; } ++{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 ++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } + # Just in case + sleep 1 + echo timestamp > conftest.file +@@ -21523,9 +21550,9 @@ if ( + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". +- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken ++ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + alias in your environment" >&5 +-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken ++echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken + alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -21536,20 +21563,20 @@ then + # Ok. + : else -- while :; do -- cat >conftest.$ac_ext <<_ACEOF -+ ac_func_search_save_LIBS=$LIBS -+cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <sys/types.h> -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (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 -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- --fi +- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! ++ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! + Check your system clock" >&5 +-$as_echo "$as_me: error: newly created file is older than distributed files! ++echo "$as_me: error: newly created file is older than distributed files! + Check your system clock" >&2;} + { (exit 1); exit 1; }; } + fi +-{ $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#define _LARGE_FILES 1 --#include <sys/types.h> -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply define LARGE_OFF_T to be 9223372036854775807, -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char strerror (); - int - main () - { -- -+return strerror (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+for ac_lib in '' cposix; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in + # Checks for programs. +-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 +-$as_echo_n "checking for library containing strerror... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } + if test "${ac_cv_search_strerror+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -21587,30 +21614,26 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+ (eval "$ac_link") 2>conftest.er1 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 -@@ -21090,8 +18627,11 @@ + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 (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 -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ ac_cv_search_strerror=$ac_res +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_strerror=$ac_res else - $as_echo "$as_me: failed program was:" >&5 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21099,53 +18639,53 @@ + fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ac_cv_sys_large_files=unknown -+rm -rf conftest.dSYM -+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 -+fi - done -+if test "${ac_cv_search_strerror+set}" = set; then -+ : -+else -+ ac_cv_search_strerror=no +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then +@@ -21625,40 +21648,582 @@ fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 --$as_echo "$ac_cv_sys_large_files" >&6; } --case $ac_cv_sys_large_files in #( -- no | unknown) ;; -- *) --cat >>confdefs.h <<_ACEOF --#define _LARGE_FILES $ac_cv_sys_large_files --_ACEOF --;; --esac --rm -rf conftest* -- fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +-$as_echo "$ac_cv_search_strerror" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++echo "${ECHO_T}$ac_cv_search_strerror" >&6; } + ac_res=$ac_cv_search_strerror + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -+$as_echo "$ac_cv_search_strerror" >&6; } -+ac_res=$ac_cv_search_strerror -+if test "$ac_res" != no; then -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+fi - --# By default we simply use the C compiler to build assembly code. -- --: ${CCAS='$(CC)'} --# Set ASFLAGS if not already set. --: ${CCASFLAGS='$(CFLAGS)'} -- -- --# Extract the first word of "nm", so it can be a program name with args. --set dummy nm; ac_word=$2 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -41213,116 +13051,54 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_NM+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- case $NM in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_NM="$NM" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext" ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -21153,111 +18693,83 @@ - done - IFS=$as_save_IFS - -- test -z "$ac_cv_path_NM" && ac_cv_path_NM="nm" -- ;; --esac - fi --NM=$ac_cv_path_NM --if test -n "$NM"; then -- { $as_echo "$as_me:$LINENO: result: $NM" >&5 --$as_echo "$NM" >&6; } ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ - -- --{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 --$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } -- # Check whether --enable-maintainer-mode was given. --if test "${enable_maintainer_mode+set}" = set; then -- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval --else -- USE_MAINTAINER_MODE=no - fi -- -- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 --$as_echo "$USE_MAINTAINER_MODE" >&6; } -- -- --if test $USE_MAINTAINER_MODE = yes; then -- MAINTAINER_MODE_TRUE= -- MAINTAINER_MODE_FALSE='#' ++fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -- MAINTAINER_MODE_TRUE='#' -- MAINTAINER_MODE_FALSE= --fi -- -- MAINT=$MAINTAINER_MODE_TRUE -- -- -- --{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 --$as_echo_n "checking for some Win32 platform... " >&6; } --case "$host" in -- *-*-mingw*|*-*-cygwin*) -- platform_win32=yes -- ;; -- *) -- platform_win32=no -- ;; --esac --{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 --$as_echo "$platform_win32" >&6; } -- -- --if test "$platform_win32" = "yes"; then -- PLATFORM_WIN32_TRUE= -- PLATFORM_WIN32_FALSE='#' ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. - else -- PLATFORM_WIN32_TRUE='#' -- PLATFORM_WIN32_FALSE= --fi -- -- -- ++else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -41331,150 +13107,131 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + for ac_exec_ext in '' $ac_executable_extensions; do + 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" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS --if test "$os_win32" = "yes"; then -- OS_WIN32_TRUE= -- OS_WIN32_FALSE='#' --else -- OS_WIN32_TRUE='#' -- OS_WIN32_FALSE= - fi -- -- -- --if test "$os_win32" != "yes"; then -- OS_UNIX_TRUE= -- OS_UNIX_FALSE='#' ++fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- OS_UNIX_TRUE='#' -- OS_UNIX_FALSE= -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi -- -- --if test "$os_linux" = "yes"; then -- OS_LINUX_TRUE= -- OS_LINUX_FALSE='#' +-{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 +-$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; } +-if test "${am_cv_prog_cc_stdc+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- am_cv_prog_cc_stdc=no +-ac_save_CC="$CC" +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi - else -- OS_LINUX_TRUE='#' -- OS_LINUX_FALSE= ++else + CC="$ac_cv_prog_CC" - fi - -- --if test "$os_win32" = "yes"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. --set dummy ${ac_tool_prefix}windres; ac_word=$2 ++fi ++ +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_WINDRES+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- if test -n "$WINDRES"; then -- ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -21266,7 +18778,7 @@ - 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_WINDRES="${ac_tool_prefix}windres" ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH + do +- CC="$ac_save_CC $ac_arg" ++ 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -21276,29 +18788,30 @@ - - fi - fi --WINDRES=$ac_cv_prog_WINDRES --if test -n "$WINDRES"; then -- { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5 --$as_echo "$WINDRES" >&6; } ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - - ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ + fi - fi --if test -z "$ac_cv_prog_WINDRES"; then -- ac_ct_WINDRES=$WINDRES -- # Extract the first word of "windres", so it can be a program name with args. --set dummy windres; ac_word=$2 ++fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- if test -n "$ac_ct_WINDRES"; then -- ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. - else ++else + ac_prog_rejected=no - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do -@@ -21306,7 +18819,11 @@ - 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ac_ct_WINDRES="windres" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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 + fi + ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -21314,46 +18831,44 @@ - done - IFS=$as_save_IFS - ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC @@ -41486,44 +13243,19 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi - fi - fi --ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES --if test -n "$ac_ct_WINDRES"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 --$as_echo "$ac_ct_WINDRES" >&6; } ++fi ++fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - -- if test "x$ac_ct_WINDRES" = x; then -- WINDRES="no" -- else -- case $cross_compiling:$ac_tool_warned in --yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 --$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} --ac_tool_warned=yes ;; --esac -- WINDRES=$ac_ct_WINDRES -- fi --else -- WINDRES="$ac_cv_prog_WINDRES" --fi - -- if test "$WINDRES" = no; then -- { { $as_echo "$as_me:$LINENO: error: *** Could not find an implementation of windres in your PATH." >&5 --$as_echo "$as_me: error: *** Could not find an implementation of windres in your PATH." >&2;} -- { (exit 1); exit 1; }; } -- fi -- # Extract the first word of "lib.exe", so it can be a program name with args. --set dummy lib.exe; ac_word=$2 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then @@ -41531,97 +13263,58 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + 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 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ms_librarian+set}" = set; then ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- if test -n "$ms_librarian"; then -- ac_cv_prog_ms_librarian="$ms_librarian" # Let the user override the test. ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH -@@ -21362,7 +18877,7 @@ - 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_prog_ms_librarian="yes" ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -21370,226 +18885,301 @@ - done - IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no" - fi - fi --ms_librarian=$ac_cv_prog_ms_librarian --if test -n "$ms_librarian"; then -- { $as_echo "$as_me:$LINENO: result: $ms_librarian" >&5 --$as_echo "$ms_librarian" >&6; } ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } - fi - - ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ + test -n "$CC" && break + done - fi -- -- --if test x$ms_librarian = xyes; then -- MS_LIB_AVAILABLE_TRUE= -- MS_LIB_AVAILABLE_FALSE='#' --else -- MS_LIB_AVAILABLE_TRUE='#' -- MS_LIB_AVAILABLE_FALSE= --fi -- -- -- -- --# Check whether --enable-debug was given. --if test "${enable_debug+set}" = set; then -- enableval=$enable_debug; --else -- enable_debug=minimum --fi -- --# Check whether --enable-shm was given. --if test "${enable_shm+set}" = set; then -- enableval=$enable_shm; ++fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ $as_echo_n "(cached) " >&6 - else -- enable_shm="yes" --fi -- --# Check whether --enable-xkb was given. --if test "${enable_xkb+set}" = set; then -- enableval=$enable_xkb; ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. - else -- enable_xkb="maybe" --fi ++else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -41630,151 +13323,107 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + for ac_exec_ext in '' $ac_executable_extensions; do + 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" -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - --# Check whether --enable-xinerama was given. --if test "${enable_xinerama+set}" = set; then -- enableval=$enable_xinerama; --else -- enable_xinerama="yes" - fi -- --# Check whether --enable-rebuilds was given. --if test "${enable_rebuilds+set}" = set; then -- enableval=$enable_rebuilds; --else -- enable_rebuilds=yes - fi -- --# Check whether --enable-visibility was given. --if test "${enable_visibility+set}" = set; then -- enableval=$enable_visibility; ++ ++fi ++fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- enable_visibility=yes -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ + test -n "$ac_ct_CC" && break +done - --# Check whether --with-xinput was given. --if test "${with_xinput+set}" = set; then -- withval=$with_xinput; --fi -- -- --if test "$platform_win32" = yes; then -- gdktarget=win32 --else -- gdktarget=x11 ++ + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi - fi - -- --# Check whether --with-gdktarget was given. --if test "${with_gdktarget+set}" = set; then -- withval=$with_gdktarget; gdktarget=$with_gdktarget - fi - - -+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 -+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH ++echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; }; } - --case $gdktarget in -- x11|win32|quartz|directfb) ;; -- *) { { $as_echo "$as_me:$LINENO: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&5 --$as_echo "$as_me: error: Invalid target for GDK: use x11, quartz, directfb or win32." >&2;} -- { (exit 1); exit 1; }; };; ++ { (exit 1); exit 1; }; } ++ +# Provide some information about the compiler. -+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 ++echo "$as_me:$LINENO: checking for C compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; - esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } - --gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la --gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la -- -- -+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++ ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then -+ $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 +else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ - + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++ +int +main () +{ +#ifndef __GNUC__ + choke me +#endif - --if test "x$enable_debug" = "xyes"; then -- test "$cflags_set" = set || CFLAGS="$CFLAGS -g" -- GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES" ++ + ; + return 0; +} @@ -41785,50 +13434,38 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes - else -- if test "x$enable_debug" = "xno"; then -- GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS" -- else -- GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS" -- fi -+ $as_echo "$as_me: failed program was:" >&5 ++else ++ echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no - fi - ++fi ++ +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu - --if test "x$enable_visibility" = "xno"; then -- GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS -DDISABLE_VISIBILITY" - fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= ++ +fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } ++GCC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS -+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then -+ $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes @@ -41840,11 +13477,11 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - ++ +int +main () +{ - ++ + ; + return 0; +} @@ -41855,75 +13492,34 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 -+ $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - --cat >>confdefs.h <<_ACEOF --#define GTK_COMPILED_WITH_DEBUGGING "${enable_debug}" ++ + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ - _ACEOF ++_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - ++ +int +main () +{ - -- --# Build time sanity check... --{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 --$as_echo_n "checking whether build environment is sane... " >&6; } --# Just in case --sleep 1 --echo timestamp > conftest.file --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$*" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -- fi -- rm -f conftest.file -- if test "$*" != "X $srcdir/configure conftest.file" \ -- && test "$*" != "X conftest.file $srcdir/configure"; then -- -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken --alias in your environment" >&5 --$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken --alias in your environment" >&2;} -- { (exit 1); exit 1; }; } -- fi -- -- test "$2" = conftest.file -- ) --then -- # Ok. -- : ++ + ; + return 0; +} @@ -41934,140 +13530,75 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : - else -- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! --Check your system clock" >&5 --$as_echo "$as_me: error: newly created file is older than distributed files! --Check your system clock" >&2;} -- { (exit 1); exit 1; }; } --fi --{ $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } -+ $as_echo "$as_me: failed program was:" >&5 ++else ++ echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - --# Checks for programs. --{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 --$as_echo_n "checking for library containing strerror... " >&6; } --if test "${ac_cv_search_strerror+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_func_search_save_LIBS=$LIBS --cat >conftest.$ac_ext <<_ACEOF ++ + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char strerror (); - int - main () - { --return strerror (); ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + - ; - return 0; - } - _ACEOF --for ac_lib in '' cposix; do -- if test -z "$ac_lib"; then -- ac_res="none required" -- else -- ac_res=-l$ac_lib -- LIBS="-l$ac_lib $ac_func_search_save_LIBS" -- fi -- rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac - eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" - $as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 -@@ -21598,11 +19188,8 @@ - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_search_strerror=$ac_res ++ 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); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21610,50 +19197,40 @@ - - fi - --rm -rf conftest.dSYM --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 --fi --done --if test "${ac_cv_search_strerror+set}" = set; then -- : --else -- ac_cv_search_strerror=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 --$as_echo "$ac_cv_search_strerror" >&6; } --ac_res=$ac_cv_search_strerror --if test "$ac_res" != no; then -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - ++fi ++ +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - -- -- -- --{ $as_echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5 --$as_echo_n "checking for ${CC-cc} option to accept ANSI C... " >&6; } --if test "${am_cv_prog_cc_stdc+set}" = set; then ++fi ++ +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then @@ -42083,31 +13614,23 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + CFLAGS= + fi +fi -+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- am_cv_prog_cc_stdc=no --ac_save_CC="$CC" --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" --do -- CC="$ac_save_CC $ac_arg" -- cat >conftest.$ac_ext <<_ACEOF ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -21681,24 +19258,40 @@ ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include <stdarg.h> + #include <stdio.h> + #include <sys/types.h> +@@ -21681,66 +22246,202 @@ static char *f (char * (*g) (char **, in va_end (v); return s; } @@ -42152,16 +13675,29 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -@@ -21716,7 +19309,7 @@ + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 + ac_cv_prog_cc_c89=$ac_arg else - $as_echo "$as_me: failed program was:" >&5 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21724,23 +19317,144 @@ + fi @@ -42177,20 +13713,17 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) -+ { $as_echo "$as_me:$LINENO: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; + xno) -+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" -+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; +esac - --if test -z "$am_cv_prog_cc_stdc"; then -- { $as_echo "$as_me:$LINENO: result: none needed" >&5 --$as_echo "none needed" >&6; } ++ + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' @@ -42200,10 +13733,10 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + +depcc="$CC" am_compiler_list= + -+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+$as_echo_n "checking dependency style of $depcc... " >&6; } ++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 ++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then -+ $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up @@ -42283,16 +13816,25 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + fi + fi + done -+ + +-if test -z "$am_cv_prog_cc_stdc"; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } + cd .. + rm -rf conftest.dir -+else + else +- { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 +-$as_echo "$am_cv_prog_cc_stdc" >&6; } + am_cv_CC_dependencies_compiler_type=none -+fi + fi +-case "x$am_cv_prog_cc_stdc" in +- x|xno) ;; +- *) CC="$CC $am_cv_prog_cc_stdc" ;; +-esac + +fi -+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } ++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 ++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if @@ -42300,16 +13842,10 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' - else -- { $as_echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5 --$as_echo "$am_cv_prog_cc_stdc" >&6; } ++else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= - fi --case "x$am_cv_prog_cc_stdc" in -- x|xno) ;; -- *) CC="$CC $am_cv_prog_cc_stdc" ;; --esac ++fi + + + @@ -42317,23 +13853,270 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or -@@ -22057,10 +19771,11 @@ - { $as_echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 - $as_echo_n "checking for BASE_DEPENDENCIES... " >&6; } +@@ -21755,12 +22456,11 @@ esac + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # OS/2's system install, which has a completely different semantic + # ./install, which can be erroneously created by make from ./install.sh. +-# Reject install programs that cannot install multiple files. +-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +-$as_echo_n "checking for a BSD-compatible install... " >&6; } ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } + if test -z "$INSTALL"; then + if test "${ac_cv_path_install+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH +@@ -21789,29 +22489,17 @@ case $as_dir/ in + # program-specific install script used by HP pwplus--don't use. + : + else +- rm -rf conftest.one conftest.two conftest.dir +- echo one > conftest.one +- echo two > conftest.two +- mkdir conftest.dir +- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && +- test -s conftest.one && test -s conftest.two && +- test -s conftest.dir/conftest.one && +- test -s conftest.dir/conftest.two +- then +- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" +- break 3 +- fi ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 + fi + fi + done + done + ;; + esac +- + done + IFS=$as_save_IFS + +-rm -rf conftest.one conftest.two conftest.dir + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -21824,8 +22512,8 @@ fi + INSTALL=$ac_install_sh + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +-$as_echo "$INSTALL" >&6; } ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. +@@ -21835,12 +22523,11 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +-set x ${MAKE-make} +-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` + if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.make <<\_ACEOF + SHELL = /bin/sh +@@ -21857,12 +22544,12 @@ esac + rm -f conftest.make + fi + if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + SET_MAKE= + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -21895,8 +22582,8 @@ CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_I + if test x"$os_win32" = xyes; then + if test x"$GCC" = xyes; then + msnative_struct='' +- { $as_echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 +-$as_echo_n "checking how to get MSVC-compatible struct packing... " >&6; } ++ { echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 ++echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6; } + if test -z "$ac_cv_prog_CC"; then + our_gcc="$CC" + else +@@ -21915,14 +22602,14 @@ $as_echo_n "checking how to get MSVC-com + ;; + esac + if test x"$msnative_struct" = x ; then +- { $as_echo "$as_me:$LINENO: result: no way" >&5 +-$as_echo "no way" >&6; } +- { $as_echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 +-$as_echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} ++ { echo "$as_me:$LINENO: result: no way" >&5 ++echo "${ECHO_T}no way" >&6; } ++ { echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 ++echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} + else + CFLAGS="$CFLAGS $msnative_struct" +- { $as_echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 +-$as_echo "${msnative_struct}" >&6; } ++ { echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 ++echo "${ECHO_T}${msnative_struct}" >&6; } + fi + fi + fi +@@ -21942,10 +22629,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -21960,7 +22647,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -21972,11 +22659,11 @@ esac + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -21985,10 +22672,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -22003,7 +22690,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -22015,11 +22702,11 @@ esac + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-$as_echo "$ac_pt_PKG_CONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_pt_PKG_CONFIG" = x; then +@@ -22027,8 +22714,12 @@ fi + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + PKG_CONFIG=$ac_pt_PKG_CONFIG +@@ -22040,54 +22731,58 @@ fi + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } ++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi + + fi + + pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 +-$as_echo_n "checking for BASE_DEPENDENCIES... " >&6; } ++{ echo "$as_me:$LINENO: checking for BASE_DEPENDENCIES" >&5 ++echo $ECHO_N "checking for BASE_DEPENDENCIES... $ECHO_C" >&6; } -if test -n "$BASE_DEPENDENCIES_CFLAGS"; then - pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$BASE_DEPENDENCIES_CFLAGS"; then + pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 ac_status=$? -@@ -22070,13 +19785,15 @@ +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` else pkg_failed=yes fi @@ -42347,15 +14130,19 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure - pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 +if test -n "$PKG_CONFIG"; then + if test -n "$BASE_DEPENDENCIES_LIBS"; then + pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS" + else + if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6\"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6") 2>&5 ac_status=$? -@@ -22086,8 +19803,9 @@ +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6" 2>/dev/null` else pkg_failed=yes fi @@ -42367,7 +14154,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure fi -@@ -22100,9 +19818,9 @@ +@@ -22100,14 +22795,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then @@ -42379,18 +14166,4461 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure fi # Put the nasty error message in config.log where it belongs echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5 -@@ -22203,9 +19921,7 @@ - { $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 - $as_echo "$enable_explicit_deps" >&6; } +- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: + + $BASE_DEPENDENCIES_PKG_ERRORS + +@@ -22118,7 +22813,7 @@ Alternatively, you may set the environme + and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: ++echo "$as_me: error: Package requirements (glib-2.0 >= 2.17.6 atk >= 1.13.0 pango >= 1.20 cairo >= 1.6) were not met: + + $BASE_DEPENDENCIES_PKG_ERRORS + +@@ -22131,9 +22826,7 @@ See the pkg-config man page for more det + " >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++ { { echo "$as_me:$LINENO: 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 + path to pkg-config. + +@@ -22143,7 +22836,7 @@ See the pkg-config man page for more det + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++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 + path to pkg-config. + +@@ -22153,12 +22846,12 @@ See the pkg-config man page for more det + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } + else + BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS + BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + : + fi + +@@ -22181,8 +22874,8 @@ else + fi + + +-{ $as_echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 +-$as_echo_n "checking Whether to write dependencies into .pc files... " >&6; } ++{ echo "$as_me:$LINENO: checking Whether to write dependencies into .pc files" >&5 ++echo $ECHO_N "checking Whether to write dependencies into .pc files... $ECHO_C" >&6; } + case $enable_explicit_deps in + auto) + export SED +@@ -22195,17 +22888,15 @@ case $enable_explicit_deps in + ;; + yes|no) + ;; +- *) { { $as_echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 +-$as_echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} ++ *) { { echo "$as_me:$LINENO: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&5 ++echo "$as_me: error: Value given to --enable-explicit-deps must be one of yes, no or auto" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +-{ $as_echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 +-$as_echo "$enable_explicit_deps" >&6; } - ++{ echo "$as_me:$LINENO: result: $enable_explicit_deps" >&5 ++echo "${ECHO_T}$enable_explicit_deps" >&6; } + - -if test $enable_explicit_deps = no; then + if test $enable_explicit_deps = no; then DISABLE_EXPLICIT_DEPS_TRUE= DISABLE_EXPLICIT_DEPS_FALSE='#' else -@@ -27766,9 +25482,7 @@ +@@ -22221,10 +22912,10 @@ for ac_prog in perl5 perl + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_PERL+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $PERL in + [\\/]* | ?:[\\/]*) +@@ -22239,7 +22930,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -22251,11 +22942,11 @@ esac + fi + PERL=$ac_cv_path_PERL + if test -n "$PERL"; then +- { $as_echo "$as_me:$LINENO: result: $PERL" >&5 +-$as_echo "$PERL" >&6; } ++ { echo "$as_me:$LINENO: result: $PERL" >&5 ++echo "${ECHO_T}$PERL" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -22266,10 +22957,10 @@ done + # We would like indent, but don't require it. + # Extract the first word of "indent", so it can be a program name with args. + set dummy indent; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_INDENT+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$INDENT"; then + ac_cv_prog_INDENT="$INDENT" # Let the user override the test. +@@ -22282,7 +22973,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -22293,11 +22984,11 @@ fi + fi + INDENT=$ac_cv_prog_INDENT + if test -n "$INDENT"; then +- { $as_echo "$as_me:$LINENO: result: $INDENT" >&5 +-$as_echo "$INDENT" >&6; } ++ { echo "$as_me:$LINENO: result: $INDENT" >&5 ++echo "${ECHO_T}$INDENT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -22316,11 +23007,11 @@ fi + + for ac_func in lstat mkstemp flockfile getc_unlocked + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -22373,42 +23064,35 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -22417,11 +23101,11 @@ done + + for ac_func in localtime_r + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -22474,42 +23158,35 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -22517,8 +23194,8 @@ done + + + # _NL_TIME_FIRST_WEEKDAY is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 +-$as_echo_n "checking for _NL_TIME_FIRST_WEEKDAY... " >&6; } ++{ echo "$as_me:$LINENO: checking for _NL_TIME_FIRST_WEEKDAY" >&5 ++echo $ECHO_N "checking for _NL_TIME_FIRST_WEEKDAY... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22543,34 +23220,30 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 ++echo "${ECHO_T}$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +@@ -22580,8 +23253,8 @@ _ACEOF + fi + + # _NL_MEASUREMENT_MEASUREMENT is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 +-$as_echo_n "checking for _NL_MEASUREMENT_MEASUREMENT... " >&6; } ++{ echo "$as_me:$LINENO: checking for _NL_MEASUREMENT_MEASUREMENT" >&5 ++echo $ECHO_N "checking for _NL_MEASUREMENT_MEASUREMENT... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22606,34 +23279,30 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 ++echo "${ECHO_T}$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +@@ -22643,8 +23312,8 @@ _ACEOF + fi + + # _NL_PAPER_HEIGHT is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 +-$as_echo_n "checking for _NL_PAPER_HEIGHT... " >&6; } ++{ echo "$as_me:$LINENO: checking for _NL_PAPER_HEIGHT" >&5 ++echo $ECHO_N "checking for _NL_PAPER_HEIGHT... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22669,34 +23338,30 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 ++echo "${ECHO_T}$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +@@ -22706,8 +23371,8 @@ _ACEOF + fi + + # _NL_PAPER_WIDTH is an enum and not a define +-{ $as_echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 +-$as_echo_n "checking for _NL_PAPER_WIDTH... " >&6; } ++{ echo "$as_me:$LINENO: checking for _NL_PAPER_WIDTH" >&5 ++echo $ECHO_N "checking for _NL_PAPER_WIDTH... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22732,34 +23397,30 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 ++echo "${ECHO_T}$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +@@ -22769,8 +23430,8 @@ _ACEOF + fi + + # sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable +-{ $as_echo "$as_me:$LINENO: checking for sigsetjmp" >&5 +-$as_echo_n "checking for sigsetjmp... " >&6; } ++{ echo "$as_me:$LINENO: checking for sigsetjmp" >&5 ++echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22795,34 +23456,30 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $gtk_ok" >&5 +-$as_echo "$gtk_ok" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_ok" >&5 ++echo "${ECHO_T}$gtk_ok" >&6; } + if test "$gtk_ok" = "yes"; then + + cat >>confdefs.h <<\_ACEOF +@@ -22837,21 +23494,20 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/L + + for ac_header in locale.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22867,33 +23523,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22907,52 +23562,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -22961,24 +23615,21 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -22986,10 +23637,10 @@ fi + done + + if test $ac_cv_header_locale_h = yes; then +- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 +-$as_echo_n "checking for LC_MESSAGES... " >&6; } ++ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 ++echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } + if test "${am_cv_val_LC_MESSAGES+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23012,35 +23663,31 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + am_cv_val_LC_MESSAGES=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + am_cv_val_LC_MESSAGES=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +-$as_echo "$am_cv_val_LC_MESSAGES" >&6; } ++{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 ++echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -23059,17 +23706,17 @@ _ACEOF + INTLLIBS= + + if test "${ac_cv_header_libintl_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for libintl.h" >&5 ++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } + if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 +-$as_echo_n "checking libintl.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 ++echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23085,33 +23732,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 +-$as_echo_n "checking libintl.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 ++echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -23125,52 +23771,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -23179,28 +23824,28 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 +-$as_echo_n "checking for libintl.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for libintl.h" >&5 ++echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } + if test "${ac_cv_header_libintl_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_libintl_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-$as_echo "$ac_cv_header_libintl_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 ++echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } + + fi +-if test "x$ac_cv_header_libintl_h" = x""yes; then ++if test $ac_cv_header_libintl_h = yes; then + gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" + + # + # First check in libc + # +- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 +-$as_echo_n "checking for ngettext in libc... " >&6; } ++ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 ++echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } + if test "${gt_cv_func_ngettext_libc+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23225,42 +23870,38 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gt_cv_func_ngettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gt_cv_func_ngettext_libc=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +-$as_echo "$gt_cv_func_ngettext_libc" >&6; } ++{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 ++echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 +-$as_echo_n "checking for dgettext in libc... " >&6; } ++ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 ++echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } + if test "${gt_cv_func_dgettext_libc+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23285,47 +23926,43 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gt_cv_func_dgettext_libc=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gt_cv_func_dgettext_libc=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + + fi +-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 +-$as_echo "$gt_cv_func_dgettext_libc" >&6; } ++{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 ++echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + + for ac_func in bind_textdomain_codeset + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23378,42 +24015,35 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -23428,10 +24058,10 @@ done + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + +- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 +-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } ++ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 ++echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } + if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -23463,41 +24093,37 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_bindtextdomain=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_intl_bindtextdomain=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 +-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +-$as_echo_n "checking for ngettext in -lintl... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } ++if test $ac_cv_lib_intl_bindtextdomain = yes; then ++ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } + if test "${ac_cv_lib_intl_ngettext+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -23529,41 +24155,37 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_intl_ngettext=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +-$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +-$as_echo_n "checking for dgettext in -lintl... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } ++if test $ac_cv_lib_intl_ngettext = yes; then ++ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 ++echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } + if test "${ac_cv_lib_intl_dgettext+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" +@@ -23595,37 +24217,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_dgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_intl_dgettext=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +-$as_echo "$ac_cv_lib_intl_dgettext" >&6; } +-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } ++if test $ac_cv_lib_intl_dgettext = yes; then + gt_cv_func_dgettext_libintl=yes + fi + +@@ -23635,14 +24253,14 @@ fi + + + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 +-$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } +- { $as_echo "$as_me:$LINENO: result: " >&5 +-$as_echo "" >&6; } +- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +-$as_echo_n "checking for ngettext in -lintl... " >&6; } ++ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 ++echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: " >&5 ++echo "${ECHO_T}" >&6; } ++ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 ++echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } + if test "${ac_cv_lib_intl_ngettext+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +@@ -23674,41 +24292,37 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_ngettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_intl_ngettext=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +-$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +-$as_echo_n "checking for dcgettext in -lintl... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } ++if test $ac_cv_lib_intl_ngettext = yes; then ++ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 ++echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } + if test "${ac_cv_lib_intl_dcgettext+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl -liconv $LIBS" +@@ -23740,37 +24354,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_intl_dcgettext=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_intl_dcgettext=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } ++if test $ac_cv_lib_intl_dcgettext = yes; then + gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv + else +@@ -23795,11 +24405,11 @@ fi + + for ac_func in bind_textdomain_codeset + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -23852,42 +24462,35 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -23923,10 +24526,10 @@ _ACEOF + + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_MSGFMT+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case "$MSGFMT" in + /*) +@@ -23950,11 +24553,11 @@ esac + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != "no"; then +- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 +-$as_echo "$MSGFMT" >&6; } ++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 ++echo "${ECHO_T}$MSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" +@@ -23962,11 +24565,11 @@ fi + + for ac_func in dcgettext + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24019,50 +24622,43 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + + MSGFMT_OPTS= +- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 +-$as_echo_n "checking if msgfmt accepts -c... " >&6; } ++ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 ++echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } + cat >conftest.foo <<_ACEOF + + msgid "" +@@ -24076,25 +24672,25 @@ msgstr "" + "Content-Transfer-Encoding: 8bit\n" + + _ACEOF +-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&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=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +-else { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + echo "$as_me: failed input was:" >&5 + sed 's/^/| /' conftest.foo >&5 + fi + + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_GMSGFMT+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) +@@ -24109,7 +24705,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -24122,20 +24718,20 @@ esac + fi + GMSGFMT=$ac_cv_path_GMSGFMT + if test -n "$GMSGFMT"; then +- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +-$as_echo "$GMSGFMT" >&6; } ++ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 ++echo "${ECHO_T}$GMSGFMT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_XGETTEXT+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case "$XGETTEXT" in + /*) +@@ -24159,11 +24755,11 @@ esac + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +-$as_echo "$XGETTEXT" >&6; } ++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 ++echo "${ECHO_T}$XGETTEXT" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + cat >conftest.$ac_ext <<_ACEOF +@@ -24188,33 +24784,30 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + CATOBJEXT=.gmo + DATADIRNAME=share + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + case $host in + *-*-solaris*) +- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 +-$as_echo_n "checking for bind_textdomain_codeset... " >&6; } ++ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 ++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } + if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24267,36 +24860,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_bind_textdomain_codeset=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_bind_textdomain_codeset=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 +-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } +-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 ++echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } ++if test $ac_cv_func_bind_textdomain_codeset = yes; then + CATOBJEXT=.gmo + DATADIRNAME=share + else +@@ -24312,7 +24901,6 @@ fi + esac + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" +@@ -24338,8 +24926,8 @@ _ACEOF + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else +- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 +-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } ++ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } + XGETTEXT=":" + fi + fi +@@ -24371,8 +24959,8 @@ $as_echo "found xgettext program is not + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else +- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 +-$as_echo_n "checking for catalogs to be installed... " >&6; } ++ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 ++echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no +@@ -24396,8 +24984,8 @@ $as_echo_n "checking for catalogs to be + fi + done + LINGUAS=$NEW_LINGUAS +- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 +-$as_echo "$LINGUAS" >&6; } ++ { echo "$as_me:$LINENO: result: $LINGUAS" >&5 ++echo "${ECHO_T}$LINGUAS" >&6; } + fi + + if test -n "$LINGUAS"; then +@@ -24453,14 +25041,14 @@ _ACEOF + + + +-{ $as_echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 +-$as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; } ++{ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5 ++echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6; } + + gtk_save_LIBS=$LIBS + LIBS="$LIBS -lm" + if test "$cross_compiling" = yes; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } + + else + cat >conftest.$ac_ext <<_ACEOF +@@ -24478,27 +25066,25 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) +@@ -24523,82 +25109,78 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- { $as_echo "$as_me:$LINENO: result: -std1" >&5 +-$as_echo "-std1" >&6; } ++ { echo "$as_me:$LINENO: result: -std1" >&5 ++echo "${ECHO_T}-std1" >&6; } + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) +-{ $as_echo "$as_me:$LINENO: result: " >&5 +-$as_echo "" >&6; } ++{ echo "$as_me:$LINENO: result: " >&5 ++echo "${ECHO_T}" >&6; } + CFLAGS="$gtk_save_CFLAGS" +- { $as_echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 +-$as_echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} ++ { echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5 ++echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;} + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + + + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + + + LIBS=$gtk_save_LIBS + +-{ $as_echo "$as_me:$LINENO: checking for the BeOS" >&5 +-$as_echo_n "checking for the BeOS... " >&6; } ++{ echo "$as_me:$LINENO: checking for the BeOS" >&5 ++echo $ECHO_N "checking for the BeOS... $ECHO_C" >&6; } + case $host in + *-*-beos*) +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + MATH_LIB= + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + ;; + esac + + # + # see bug 162979 + # +-{ $as_echo "$as_me:$LINENO: checking for HP-UX" >&5 +-$as_echo_n "checking for HP-UX... " >&6; } ++{ echo "$as_me:$LINENO: checking for HP-UX" >&5 ++echo $ECHO_N "checking for HP-UX... $ECHO_C" >&6; } + case $host_os in + hpux9* | hpux10* | hpux11*) +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + CFLAGS="$CFLAGS -DHPPEX -DSHMLINK" + ;; + *) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + ;; + esac + +-{ $as_echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 +-$as_echo_n "checking for extra flags for POSIX compliance... " >&6; } ++{ echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5 ++echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -24620,22 +25202,21 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- { $as_echo "$as_me:$LINENO: result: none needed" >&5 +-$as_echo "none needed" >&6; } ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_save_CFLAGS="$CFLAGS" +@@ -24661,29 +25242,28 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- { $as_echo "$as_me:$LINENO: result: -posix" >&5 +-$as_echo "-posix" >&6; } ++ { echo "$as_me:$LINENO: result: -posix" >&5 ++echo "${ECHO_T}-posix" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: result: " >&5 +-$as_echo "" >&6; } ++ { echo "$as_me:$LINENO: result: " >&5 ++echo "${ECHO_T}" >&6; } + CFLAGS="$gtk_save_CFLAGS" +- { $as_echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 +-$as_echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} ++ { echo "$as_me:$LINENO: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&5 ++echo "$as_me: WARNING: Could not determine POSIX flag. (-posix didn't work.)" >&2;} + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +@@ -24733,10 +25313,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -24751,7 +25331,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -24763,11 +25343,11 @@ esac + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 ++echo "${ECHO_T}$PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -24776,10 +25356,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -24794,7 +25374,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -24806,11 +25386,11 @@ esac + fi + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +-$as_echo "$ac_pt_PKG_CONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 ++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + if test "x$ac_pt_PKG_CONFIG" = x; then +@@ -24818,8 +25398,12 @@ fi + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} + ac_tool_warned=yes ;; + esac + PKG_CONFIG=$ac_pt_PKG_CONFIG +@@ -24831,14 +25415,14 @@ fi + fi + if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.16 +- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } ++ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 ++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi + +@@ -24852,8 +25436,8 @@ fi + fi + + min_glib_version=2.17.6 +- { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 +-$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } ++ { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 ++echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; } + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs +@@ -24976,32 +25560,29 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + no_glib=yes + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + +@@ -25011,12 +25592,12 @@ fi + fi + fi + if test "x$no_glib" = x ; then +- { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 +-$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } ++ { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 ++echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } + : + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" +@@ -25053,21 +25634,18 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && 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" +@@ -25078,14 +25656,13 @@ $as_echo "$ac_try_echo") >&5 + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed." + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" +@@ -25097,10 +25674,10 @@ rm -f core conftest.err conftest.$ac_obj + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** GLIB 2.17.6 or better is required. The latest version of + *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** GLIB 2.17.6 or better is required. The latest version of + *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." >&2;} + { (exit 1); exit 1; }; } +@@ -25128,11 +25705,11 @@ LIBS="$LIBS $GLIB_LIBS" + + for ac_func in bind_textdomain_codeset + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -25185,42 +25762,35 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -25231,21 +25801,20 @@ LIBS=$gtk_save_LIBS + + for ac_header in pwd.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25261,33 +25830,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25301,52 +25869,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -25355,24 +25922,21 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + cat >>confdefs.h <<\_ACEOF +@@ -25386,21 +25950,20 @@ done + + for ac_header in sys/time.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25416,33 +25979,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25456,52 +26018,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -25510,24 +26071,21 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + cat >>confdefs.h <<\_ACEOF +@@ -25541,21 +26099,20 @@ done + + for ac_header in unistd.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25571,33 +26128,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25611,52 +26167,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -25665,24 +26220,21 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + cat >>confdefs.h <<\_ACEOF +@@ -25696,21 +26248,20 @@ done + + for ac_header in ftw.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25726,33 +26277,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25766,52 +26316,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -25820,24 +26369,21 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + cat >>confdefs.h <<\_ACEOF +@@ -25849,8 +26395,8 @@ fi + done + + +-{ $as_echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 +-$as_echo_n "checking for GNU ftw extensions... " >&6; } ++{ echo "$as_me:$LINENO: checking for GNU ftw extensions" >&5 ++echo $ECHO_N "checking for GNU ftw extensions... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -25874,21 +26420,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no +@@ -25896,16 +26441,16 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $gtk_ok = yes; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define HAVE_GNU_FTW 1 + _ACEOF + + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + saved_cflags="$CFLAGS" +@@ -25913,10 +26458,10 @@ saved_ldflags="$LDFLAGS" + + + # Checks for header files. +-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +-$as_echo_n "checking for ANSI C header files... " >&6; } ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } + if test "${ac_cv_header_stdc+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -25943,21 +26488,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no +@@ -26049,40 +26593,37 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + ac_cv_header_stdc=no + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + + + fi + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +-$as_echo "$ac_cv_header_stdc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -26093,10 +26634,10 @@ fi + + + # Checks for typedefs, structures, and compiler characteristics. +-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +-$as_echo_n "checking for an ANSI C-conforming const... " >&6; } ++{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 ++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } + if test "${ac_cv_c_const+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26168,21 +26709,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_const=no +@@ -26190,22 +26730,22 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +-$as_echo "$ac_cv_c_const" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 ++echo "${ECHO_T}$ac_cv_c_const" >&6; } + if test $ac_cv_c_const = no; then + + cat >>confdefs.h <<\_ACEOF +-#define const /**/ ++#define const + _ACEOF + + fi + + + # Checks for library functions. +-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +-$as_echo_n "checking return type of signal handlers... " >&6; } ++{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 ++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } + if test "${ac_cv_type_signal+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26230,21 +26770,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_signal=void +@@ -26252,8 +26791,8 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +-$as_echo "$ac_cv_type_signal" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 ++echo "${ECHO_T}$ac_cv_type_signal" >&6; } + + cat >>confdefs.h <<_ACEOF + #define RETSIGTYPE $ac_cv_type_signal +@@ -26264,21 +26803,20 @@ _ACEOF + + for ac_header in stdlib.h unistd.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -26294,33 +26832,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -26334,52 +26871,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -26388,24 +26924,21 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -26415,11 +26948,11 @@ done + + for ac_func in getpagesize + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26472,51 +27005,44 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + +-{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5 +-$as_echo_n "checking for working mmap... " >&6; } ++{ echo "$as_me:$LINENO: checking for working mmap" >&5 ++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } + if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then + ac_cv_func_mmap_fixed_mapped=no +@@ -26660,39 +27186,36 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_mmap_fixed_mapped=yes + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + ac_cv_func_mmap_fixed_mapped=no + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 ++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } + if test $ac_cv_func_mmap_fixed_mapped = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -26706,11 +27229,11 @@ rm -f conftest.mmap + + for ac_func in mallinfo + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26763,42 +27286,35 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -26807,11 +27323,11 @@ done + + for ac_func in getresuid + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26864,51 +27380,44 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi + done + +-{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 +-$as_echo_n "checking for uid_t in sys/types.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 ++echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } + if test "${ac_cv_type_uid_t+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -26928,8 +27437,8 @@ fi + rm -f conftest* + + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 +-$as_echo "$ac_cv_type_uid_t" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 ++echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } + if test $ac_cv_type_uid_t = no; then + + cat >>confdefs.h <<\_ACEOF +@@ -26945,8 +27454,8 @@ fi + + + # Check if <sys/select.h> needs to be included for fd_set +-{ $as_echo "$as_me:$LINENO: checking for fd_set" >&5 +-$as_echo_n "checking for fd_set... " >&6; } ++{ echo "$as_me:$LINENO: checking for fd_set" >&5 ++echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -26968,21 +27477,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gtk_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_ok=no +@@ -26990,8 +27498,8 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $gtk_ok = yes; then +- { $as_echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 +-$as_echo "yes, found in sys/types.h" >&6; } ++ { echo "$as_me:$LINENO: result: yes, found in sys/types.h" >&5 ++echo "${ECHO_T}yes, found in sys/types.h" >&6; } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -27014,22 +27522,22 @@ cat >>confdefs.h <<\_ACEOF + #define HAVE_SYS_SELECT_H 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 +-$as_echo "yes, found in sys/select.h" >&6; } ++ { echo "$as_me:$LINENO: result: yes, found in sys/select.h" >&5 ++echo "${ECHO_T}yes, found in sys/select.h" >&6; } + else + + cat >>confdefs.h <<\_ACEOF + #define NO_FD_SET 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + fi + + # `widechar' tests for gdki18n.h +-{ $as_echo "$as_me:$LINENO: checking for wchar.h" >&5 +-$as_echo_n "checking for wchar.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for wchar.h" >&5 ++echo $ECHO_N "checking for wchar.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27043,21 +27551,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gdk_wchar_h=no +@@ -27071,12 +27578,12 @@ cat >>confdefs.h <<\_ACEOF + _ACEOF + + fi +-{ $as_echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 +-$as_echo "$gdk_wchar_h" >&6; } ++{ echo "$as_me:$LINENO: result: $gdk_wchar_h" >&5 ++echo "${ECHO_T}$gdk_wchar_h" >&6; } + + # Check for wctype.h (for iswalnum) +-{ $as_echo "$as_me:$LINENO: checking for wctype.h" >&5 +-$as_echo_n "checking for wctype.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for wctype.h" >&5 ++echo $ECHO_N "checking for wctype.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27090,21 +27597,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gdk_wctype_h=no +@@ -27118,15 +27624,15 @@ cat >>confdefs.h <<\_ACEOF + _ACEOF + + fi +-{ $as_echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 +-$as_echo "$gdk_wctype_h" >&6; } ++{ echo "$as_me:$LINENO: result: $gdk_wctype_h" >&5 ++echo "${ECHO_T}$gdk_wctype_h" >&6; } + + # in Solaris 2.5, `iswalnum' is in -lw + GDK_WLIBS= +-{ $as_echo "$as_me:$LINENO: checking for iswalnum" >&5 +-$as_echo_n "checking for iswalnum... " >&6; } ++{ echo "$as_me:$LINENO: checking for iswalnum" >&5 ++echo $ECHO_N "checking for iswalnum... $ECHO_C" >&6; } + if test "${ac_cv_func_iswalnum+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -27179,42 +27685,38 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_iswalnum=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_iswalnum=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 +-$as_echo "$ac_cv_func_iswalnum" >&6; } +-if test "x$ac_cv_func_iswalnum" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_iswalnum" >&5 ++echo "${ECHO_T}$ac_cv_func_iswalnum" >&6; } ++if test $ac_cv_func_iswalnum = yes; then + : + else +- { $as_echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 +-$as_echo_n "checking for iswalnum in -lw... " >&6; } ++ { echo "$as_me:$LINENO: checking for iswalnum in -lw" >&5 ++echo $ECHO_N "checking for iswalnum in -lw... $ECHO_C" >&6; } + if test "${ac_cv_lib_w_iswalnum+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lw $LIBS" +@@ -27246,37 +27748,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_w_iswalnum=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_w_iswalnum=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 +-$as_echo "$ac_cv_lib_w_iswalnum" >&6; } +-if test "x$ac_cv_lib_w_iswalnum" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_iswalnum" >&5 ++echo "${ECHO_T}$ac_cv_lib_w_iswalnum" >&6; } ++if test $ac_cv_lib_w_iswalnum = yes; then + GDK_WLIBS=-lw + fi + +@@ -27286,8 +27784,8 @@ fi + oLIBS="$LIBS" + LIBS="$LIBS $GDK_WLIBS" + # The following is necessary for Linux libc-5.4.38 +-{ $as_echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5 +-$as_echo_n "checking if iswalnum() and friends are properly defined... " >&6; } ++{ echo "$as_me:$LINENO: checking if iswalnum() and friends are properly defined" >&5 ++echo $ECHO_N "checking if iswalnum() and friends are properly defined... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27322,30 +27820,26 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + gdk_working_wctype=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gdk_working_wctype=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$oLIBS" +@@ -27358,13 +27852,13 @@ _ACEOF + + GDK_WLIBS= + fi +-{ $as_echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 +-$as_echo "$gdk_working_wctype" >&6; } ++{ echo "$as_me:$LINENO: result: $gdk_working_wctype" >&5 ++echo "${ECHO_T}$gdk_working_wctype" >&6; } + + + # Check for uxtheme.h (for MS-Windows Engine) +-{ $as_echo "$as_me:$LINENO: checking for uxtheme.h" >&5 +-$as_echo_n "checking for uxtheme.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for uxtheme.h" >&5 ++echo $ECHO_N "checking for uxtheme.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27378,21 +27872,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + gtk_uxtheme_h=no +@@ -27406,28 +27899,27 @@ cat >>confdefs.h <<\_ACEOF + _ACEOF + + fi +-{ $as_echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 +-$as_echo "$gtk_uxtheme_h" >&6; } ++{ echo "$as_me:$LINENO: result: $gtk_uxtheme_h" >&5 ++echo "${ECHO_T}$gtk_uxtheme_h" >&6; } + + # Checks for gdkspawn + + for ac_header in crt_externs.h + do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27443,33 +27935,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27483,52 +27974,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -27537,24 +28027,21 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -27564,11 +28051,11 @@ done + + for ac_func in _NSGetEnviron + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -27621,42 +28108,35 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -27683,8 +28163,8 @@ _ACEOF + fi + + +-{ $as_echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 +-$as_echo_n "checking whether to build gmodulized gdk-pixbuf... " >&6; } ++{ echo "$as_me:$LINENO: checking whether to build gmodulized gdk-pixbuf" >&5 ++echo $ECHO_N "checking whether to build gmodulized gdk-pixbuf... $ECHO_C" >&6; } + + # Check whether --enable-modules was given. + if test "${enable_modules+set}" = set; then +@@ -27695,13 +28175,13 @@ fi + dynworks=false + deps= + if test x$enable_modules = xno; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- { $as_echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 +-$as_echo_n "checking whether dynamic modules work... " >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ { echo "$as_me:$LINENO: checking whether dynamic modules work" >&5 ++echo $ECHO_N "checking whether dynamic modules work... $ECHO_C" >&6; } + ## for loop is to strip newline + tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0` + for I in $tmp; do +@@ -27726,11 +28206,11 @@ cat >>confdefs.h <<\_ACEOF + #define USE_GMODULE 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + fi + +@@ -27766,9 +28246,7 @@ if test "${enable_gdiplus+set}" = set; t fi @@ -42401,7 +18631,1278 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure BUILD_GDIPLUS_LOADERS_TRUE= BUILD_GDIPLUS_LOADERS_FALSE='#' else -@@ -29022,9 +26736,7 @@ +@@ -27779,10 +28257,10 @@ fi + + if test x$os_win32 = xno || test x$enable_gdiplus = xno; then + if test x$with_libtiff != xno && test -z "$LIBTIFF"; then +- { $as_echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 +-$as_echo_n "checking for TIFFReadRGBAImageOriented in -ltiff... " >&6; } ++ { echo "$as_me:$LINENO: checking for TIFFReadRGBAImageOriented in -ltiff" >&5 ++echo $ECHO_N "checking for TIFFReadRGBAImageOriented in -ltiff... $ECHO_C" >&6; } + if test "${ac_cv_lib_tiff_TIFFReadRGBAImageOriented+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltiff -lm $LIBS" +@@ -27814,49 +28292,45 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_tiff_TIFFReadRGBAImageOriented=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tiff_TIFFReadRGBAImageOriented=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 +-$as_echo "$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } +-if test "x$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&5 ++echo "${ECHO_T}$ac_cv_lib_tiff_TIFFReadRGBAImageOriented" >&6; } ++if test $ac_cv_lib_tiff_TIFFReadRGBAImageOriented = yes; then + if test "${ac_cv_header_tiffio_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +-$as_echo_n "checking tiffio.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 ++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27872,33 +28346,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +-$as_echo_n "checking tiffio.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 ++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27912,52 +28385,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -27966,30 +28438,30 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_tiffio_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + + fi +-if test "x$ac_cv_header_tiffio_h" = x""yes; then ++if test $ac_cv_header_tiffio_h = yes; then + TIFF='tiff'; LIBTIFF='-ltiff' + else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} + fi + + + else +- { $as_echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 +-$as_echo_n "checking for TIFFWriteScanline in -ltiff... " >&6; } ++ { echo "$as_me:$LINENO: checking for TIFFWriteScanline in -ltiff" >&5 ++echo $ECHO_N "checking for TIFFWriteScanline in -ltiff... $ECHO_C" >&6; } + if test "${ac_cv_lib_tiff_TIFFWriteScanline+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltiff -ljpeg -lz -lm $LIBS" +@@ -28021,49 +28493,45 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_tiff_TIFFWriteScanline=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tiff_TIFFWriteScanline=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 +-$as_echo "$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } +-if test "x$ac_cv_lib_tiff_TIFFWriteScanline" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFWriteScanline" >&5 ++echo "${ECHO_T}$ac_cv_lib_tiff_TIFFWriteScanline" >&6; } ++if test $ac_cv_lib_tiff_TIFFWriteScanline = yes; then + if test "${ac_cv_header_tiffio_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +-$as_echo_n "checking tiffio.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 ++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28079,33 +28547,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +-$as_echo_n "checking tiffio.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 ++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28119,52 +28586,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -28173,30 +28639,30 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_tiffio_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + + fi +-if test "x$ac_cv_header_tiffio_h" = x""yes; then ++if test $ac_cv_header_tiffio_h = yes; then + TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz' + else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} + fi + + + else +- { $as_echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 +-$as_echo_n "checking for TIFFFlushData in -ltiff34... " >&6; } ++ { echo "$as_me:$LINENO: checking for TIFFFlushData in -ltiff34" >&5 ++echo $ECHO_N "checking for TIFFFlushData in -ltiff34... $ECHO_C" >&6; } + if test "${ac_cv_lib_tiff34_TIFFFlushData+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltiff34 -ljpeg -lz -lm $LIBS" +@@ -28228,49 +28694,45 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_tiff34_TIFFFlushData=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tiff34_TIFFFlushData=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 +-$as_echo "$ac_cv_lib_tiff34_TIFFFlushData" >&6; } +-if test "x$ac_cv_lib_tiff34_TIFFFlushData" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff34_TIFFFlushData" >&5 ++echo "${ECHO_T}$ac_cv_lib_tiff34_TIFFFlushData" >&6; } ++if test $ac_cv_lib_tiff34_TIFFFlushData = yes; then + if test "${ac_cv_header_tiffio_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +-$as_echo_n "checking tiffio.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 ++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28286,33 +28748,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +-$as_echo_n "checking tiffio.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 ++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28326,52 +28787,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -28380,28 +28840,28 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for tiffio.h" >&5 +-$as_echo_n "checking for tiffio.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } + if test "${ac_cv_header_tiffio_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_tiffio_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +-$as_echo "$ac_cv_header_tiffio_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } + + fi +-if test "x$ac_cv_header_tiffio_h" = x""yes; then ++if test $ac_cv_header_tiffio_h = yes; then + TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz' + else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF header files not found) ***" >&2;} + fi + + + else +- { $as_echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&5 ++echo "$as_me: WARNING: *** TIFF loader will not be built (TIFF library not found) ***" >&2;} + fi + + fi +@@ -28411,11 +28871,11 @@ fi + fi + + if test x$with_libtiff != xno && test -z "$LIBTIFF"; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Checks for TIFF loader failed. You can build without it by passing + *** --without-libtiff to configure but some programs using GTK+ may + *** not work properly" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Checks for TIFF loader failed. You can build without it by passing + *** --without-libtiff to configure but some programs using GTK+ may + *** not work properly" >&2;} +@@ -28425,10 +28885,10 @@ fi + + if test x$os_win32 = xno || test x$enable_gdiplus = xno; then + if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then +- { $as_echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 +-$as_echo_n "checking for jpeg_destroy_decompress in -ljpeg... " >&6; } ++ { echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5 ++echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6; } + if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ljpeg $LIBS" +@@ -28460,47 +28920,43 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_jpeg_jpeg_destroy_decompress=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_jpeg_jpeg_destroy_decompress=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 +-$as_echo "$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } +-if test "x$ac_cv_lib_jpeg_jpeg_destroy_decompress" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5 ++echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6; } ++if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then + jpeg_ok=yes + else + jpeg_ok=no +- { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&5 ++echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG library not found) ***" >&2;} + fi + + if test "$jpeg_ok" = yes; then +- { $as_echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +-$as_echo_n "checking for jpeglib.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 ++echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28518,35 +28974,34 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + jpeg_ok=no + fi + + rm -f conftest.err conftest.$ac_ext +- { $as_echo "$as_me:$LINENO: result: $jpeg_ok" >&5 +-$as_echo "$jpeg_ok" >&6; } ++ { echo "$as_me:$LINENO: result: $jpeg_ok" >&5 ++echo "${ECHO_T}$jpeg_ok" >&6; } + if test "$jpeg_ok" = yes; then + LIBJPEG='-ljpeg' +- { $as_echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 +-$as_echo_n "checking for jpeg_simple_progression in -ljpeg... " >&6; } ++ { echo "$as_me:$LINENO: checking for jpeg_simple_progression in -ljpeg" >&5 ++echo $ECHO_N "checking for jpeg_simple_progression in -ljpeg... $ECHO_C" >&6; } + if test "${ac_cv_lib_jpeg_jpeg_simple_progression+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ljpeg $LIBS" +@@ -28578,60 +29033,56 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_jpeg_jpeg_simple_progression=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_jpeg_jpeg_simple_progression=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 +-$as_echo "$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } +-if test "x$ac_cv_lib_jpeg_jpeg_simple_progression" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_simple_progression" >&5 ++echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_simple_progression" >&6; } ++if test $ac_cv_lib_jpeg_jpeg_simple_progression = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_PROGRESSIVE_JPEG 1 + _ACEOF + + else +- { $as_echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 +-$as_echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} ++ { echo "$as_me:$LINENO: WARNING: JPEG library does not support progressive saving." >&5 ++echo "$as_me: WARNING: JPEG library does not support progressive saving." >&2;} + fi + + else +- { $as_echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&5 ++echo "$as_me: WARNING: *** JPEG loader will not be built (JPEG header file not found) ***" >&2;} + fi + fi + fi + + if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Checks for JPEG loader failed. You can build without it by passing + *** --without-libjpeg to configure but some programs using GTK+ may + *** not work properly" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Checks for JPEG loader failed. You can build without it by passing + *** --without-libjpeg to configure but some programs using GTK+ may + *** not work properly" >&2;} +@@ -28640,21 +29091,21 @@ $as_echo "$as_me: error: + fi + + if test x$with_libpng != xno && test -z "$LIBPNG"; then +- { $as_echo "$as_me:$LINENO: checking for libpng12" >&5 +-$as_echo_n "checking for libpng12... " >&6; } ++ { echo "$as_me:$LINENO: checking for libpng12" >&5 ++echo $ECHO_N "checking for libpng12... $ECHO_C" >&6; } + if $PKG_CONFIG --exists libpng12 ; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + PNG='png' + PNG_DEP_CFLAGS_PACKAGES=libpng12 + LIBPNG=`$PKG_CONFIG --libs libpng12` + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 +-$as_echo_n "checking for png_read_info in -lpng... " >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ { echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5 ++echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6; } + if test "${ac_cv_lib_png_png_read_info+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpng -lz -lm $LIBS" +@@ -28686,49 +29137,45 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_png_png_read_info=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_png_png_read_info=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 +-$as_echo "$ac_cv_lib_png_png_read_info" >&6; } +-if test "x$ac_cv_lib_png_png_read_info" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_info" >&5 ++echo "${ECHO_T}$ac_cv_lib_png_png_read_info" >&6; } ++if test $ac_cv_lib_png_png_read_info = yes; then + if test "${ac_cv_header_png_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for png.h" >&5 +-$as_echo_n "checking for png.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for png.h" >&5 ++echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } + if test "${ac_cv_header_png_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +-$as_echo "$ac_cv_header_png_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 ++echo "${ECHO_T}$ac_cv_header_png_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking png.h usability" >&5 +-$as_echo_n "checking png.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking png.h usability" >&5 ++echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28744,33 +29191,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking png.h presence" >&5 +-$as_echo_n "checking png.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking png.h presence" >&5 ++echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28784,52 +29230,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -28838,18 +29283,18 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for png.h" >&5 +-$as_echo_n "checking for png.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for png.h" >&5 ++echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } + if test "${ac_cv_header_png_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_png_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 +-$as_echo "$ac_cv_header_png_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 ++echo "${ECHO_T}$ac_cv_header_png_h" >&6; } + + fi +-if test "x$ac_cv_header_png_h" = x""yes; then ++if test $ac_cv_header_png_h = yes; then + png_ok=yes + else + png_ok=no +@@ -28857,13 +29302,13 @@ fi + + + else +- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&5 ++echo "$as_me: WARNING: *** PNG loader will not be built (PNG library not found) ***" >&2;} + fi + + if test "$png_ok" = yes; then +- { $as_echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 +-$as_echo_n "checking for png_structp in png.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for png_structp in png.h" >&5 ++echo $ECHO_N "checking for png_structp in png.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28885,49 +29330,48 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + png_ok=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + png_ok=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- { $as_echo "$as_me:$LINENO: result: $png_ok" >&5 +-$as_echo "$png_ok" >&6; } ++ { echo "$as_me:$LINENO: result: $png_ok" >&5 ++echo "${ECHO_T}$png_ok" >&6; } + if test "$png_ok" = yes; then + PNG='png'; LIBPNG='-lpng -lz' + else +- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 +-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&5 ++echo "$as_me: WARNING: *** PNG loader will not be built (PNG library is too old) ***" >&2;} + fi + else +- { $as_echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 +-$as_echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} ++ { echo "$as_me:$LINENO: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&5 ++echo "$as_me: WARNING: *** PNG loader will not be built (PNG header file not found) ***" >&2;} + fi + fi + fi + + if test x$with_libpng != xno && test -z "$LIBPNG"; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Checks for PNG loader failed. You can build without it by passing + *** --without-libpng to configure but many programs using GTK+ will + *** not work properly. The PNG loader is also needed if you are compiling + *** from CVS." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Checks for PNG loader failed. You can build without it by passing + *** --without-libpng to configure but many programs using GTK+ will + *** not work properly. The PNG loader is also needed if you are compiling +@@ -28936,10 +29380,10 @@ $as_echo "$as_me: error: + fi + + if test x$with_libjasper != xno && test -z "$LIBJASPER"; then +- { $as_echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 +-$as_echo_n "checking for jas_init in -ljasper... " >&6; } ++ { echo "$as_me:$LINENO: checking for jas_init in -ljasper" >&5 ++echo $ECHO_N "checking for jas_init in -ljasper... $ECHO_C" >&6; } + if test "${ac_cv_lib_jasper_jas_init+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ljasper -ljpeg $LIBS" +@@ -28971,47 +29415,43 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_jasper_jas_init=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_jasper_jas_init=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 +-$as_echo "$ac_cv_lib_jasper_jas_init" >&6; } +-if test "x$ac_cv_lib_jasper_jas_init" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jasper_jas_init" >&5 ++echo "${ECHO_T}$ac_cv_lib_jasper_jas_init" >&6; } ++if test $ac_cv_lib_jasper_jas_init = yes; then + LIBJASPER=-ljasper + fi + + fi + + if test x$with_libjasper != xno && test -z "$LIBJASPER"; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Checks for JPEG2000 loader failed. You can build without it by passing + *** --without-libjasper to configure" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Checks for JPEG2000 loader failed. You can build without it by passing + *** --without-libjasper to configure" >&2;} + { (exit 1); exit 1; }; } +@@ -29022,9 +29462,7 @@ $as_echo "$as_me: error: @@ -42412,7 +19913,40 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure BUILD_DYNAMIC_MODULES_TRUE= BUILD_DYNAMIC_MODULES_FALSE='#' else -@@ -29117,9 +26829,7 @@ +@@ -29036,8 +29474,8 @@ fi + # + # Allow building some or all gdk-pixbuf loaders included + # +-{ $as_echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 +-$as_echo_n "checking pixbuf loaders to build... " >&6; } ++{ echo "$as_me:$LINENO: checking pixbuf loaders to build" >&5 ++echo $ECHO_N "checking pixbuf loaders to build... $ECHO_C" >&6; } + + + # Check whether --with-included_loaders was given. +@@ -29080,8 +29518,8 @@ else + included_loaders="$with_included_loaders" + fi + +-{ $as_echo "$as_me:$LINENO: result: $included_loaders" >&5 +-$as_echo "$included_loaders" >&6; } ++{ echo "$as_me:$LINENO: result: $included_loaders" >&5 ++echo "${ECHO_T}$included_loaders" >&6; } + + INCLUDED_LOADER_OBJ= + INCLUDED_LOADER_DEFINE= +@@ -29091,8 +29529,8 @@ for loader in $included_loaders; do + if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then + : + else +- { { $as_echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 +-$as_echo "$as_me: error: the specified loader $loader does not exist" >&2;} ++ { { echo "$as_me:$LINENO: error: the specified loader $loader does not exist" >&5 ++echo "$as_me: error: the specified loader $loader does not exist" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -29117,9 +29555,7 @@ IFS="$gtk_save_ifs" @@ -42423,7 +19957,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_PNG_TRUE= INCLUDE_PNG_FALSE='#' else -@@ -29127,9 +26837,7 @@ +@@ -29127,9 +29563,7 @@ else INCLUDE_PNG_FALSE= fi @@ -42434,7 +19968,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_BMP_TRUE= INCLUDE_BMP_FALSE='#' else -@@ -29137,9 +26845,7 @@ +@@ -29137,9 +29571,7 @@ else INCLUDE_BMP_FALSE= fi @@ -42445,7 +19979,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_WBMP_TRUE= INCLUDE_WBMP_FALSE='#' else -@@ -29147,9 +26853,7 @@ +@@ -29147,9 +29579,7 @@ else INCLUDE_WBMP_FALSE= fi @@ -42456,7 +19990,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_GIF_TRUE= INCLUDE_GIF_FALSE='#' else -@@ -29157,9 +26861,7 @@ +@@ -29157,9 +29587,7 @@ else INCLUDE_GIF_FALSE= fi @@ -42467,7 +20001,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_ICO_TRUE= INCLUDE_ICO_FALSE='#' else -@@ -29167,9 +26869,7 @@ +@@ -29167,9 +29595,7 @@ else INCLUDE_ICO_FALSE= fi @@ -42478,7 +20012,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_ANI_TRUE= INCLUDE_ANI_FALSE='#' else -@@ -29177,9 +26877,7 @@ +@@ -29177,9 +29603,7 @@ else INCLUDE_ANI_FALSE= fi @@ -42489,7 +20023,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_JPEG_TRUE= INCLUDE_JPEG_FALSE='#' else -@@ -29187,9 +26885,7 @@ +@@ -29187,9 +29611,7 @@ else INCLUDE_JPEG_FALSE= fi @@ -42500,7 +20034,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_PNM_TRUE= INCLUDE_PNM_FALSE='#' else -@@ -29197,9 +26893,7 @@ +@@ -29197,9 +29619,7 @@ else INCLUDE_PNM_FALSE= fi @@ -42511,7 +20045,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_RAS_TRUE= INCLUDE_RAS_FALSE='#' else -@@ -29207,9 +26901,7 @@ +@@ -29207,9 +29627,7 @@ else INCLUDE_RAS_FALSE= fi @@ -42522,7 +20056,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_TIFF_TRUE= INCLUDE_TIFF_FALSE='#' else -@@ -29217,9 +26909,7 @@ +@@ -29217,9 +29635,7 @@ else INCLUDE_TIFF_FALSE= fi @@ -42533,7 +20067,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_XPM_TRUE= INCLUDE_XPM_FALSE='#' else -@@ -29227,9 +26917,7 @@ +@@ -29227,9 +29643,7 @@ else INCLUDE_XPM_FALSE= fi @@ -42544,7 +20078,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_XBM_TRUE= INCLUDE_XBM_FALSE='#' else -@@ -29237,9 +26925,7 @@ +@@ -29237,9 +29651,7 @@ else INCLUDE_XBM_FALSE= fi @@ -42555,7 +20089,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_TGA_TRUE= INCLUDE_TGA_FALSE='#' else -@@ -29247,9 +26933,7 @@ +@@ -29247,9 +29659,7 @@ else INCLUDE_TGA_FALSE= fi @@ -42566,7 +20100,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_PCX_TRUE= INCLUDE_PCX_FALSE='#' else -@@ -29257,9 +26941,7 @@ +@@ -29257,9 +29667,7 @@ else INCLUDE_PCX_FALSE= fi @@ -42577,7 +20111,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_ICNS_TRUE= INCLUDE_ICNS_FALSE='#' else -@@ -29267,9 +26949,7 @@ +@@ -29267,9 +29675,7 @@ else INCLUDE_ICNS_FALSE= fi @@ -42588,7 +20122,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_JASPER_TRUE= INCLUDE_JASPER_FALSE='#' else -@@ -29279,9 +26959,7 @@ +@@ -29279,9 +29685,7 @@ fi # As all GDI+ loaders are either built-in or not, arbitrarily just # check one of the variables here @@ -42599,18 +20133,121 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_GDIPLUS_TRUE= INCLUDE_GDIPLUS_FALSE='#' else -@@ -29430,9 +27108,7 @@ +@@ -29291,20 +29695,18 @@ fi - { $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 - $as_echo "$included_immodules" >&6; } + + if test x$gio_can_sniff = x; then +- { $as_echo "$as_me:$LINENO: checking if gio can sniff png" >&5 +-$as_echo_n "checking if gio can sniff png... " >&6; } ++ { echo "$as_me:$LINENO: checking if gio can sniff png" >&5 ++echo $ECHO_N "checking if gio can sniff png... $ECHO_C" >&6; } + gtk_save_LIBS="$LIBS" + gtk_save_CFLAGS="$CFLAGS" + LIBS="`$PKG_CONFIG --libs gio-2.0`" + CFLAGS="`$PKG_CONFIG --cflags gio-2.0`" + if test "$cross_compiling" = yes; then +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling + See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: cannot run test program while cross compiling ++echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } ++ { (exit 1); exit 1; }; } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -29348,21 +29750,19 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gio_can_sniff=yes + +@@ -29371,20 +29771,19 @@ cat >>confdefs.h <<\_ACEOF + _ACEOF + + else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ( exit $ac_status ) + gio_can_sniff=no + fi +-rm -rf conftest.dSYM + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + + +- { $as_echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 +-$as_echo "$gio_can_sniff" >&6; } ++ { echo "$as_me:$LINENO: result: $gio_can_sniff" >&5 ++echo "${ECHO_T}$gio_can_sniff" >&6; } + LIBS="$gtk_save_LIBS" + CFLAGS="$gtk_save_CFLAGS" + fi +@@ -29392,8 +29791,8 @@ fi + # + # Allow building some or all immodules included + # +-{ $as_echo "$as_me:$LINENO: checking immodules to build" >&5 +-$as_echo_n "checking immodules to build... " >&6; } ++{ echo "$as_me:$LINENO: checking immodules to build" >&5 ++echo $ECHO_N "checking immodules to build... $ECHO_C" >&6; } + + + # Check whether --with-included_immodules was given. +@@ -29428,11 +29827,9 @@ else + included_immodules="$with_included_immodules" + fi + +-{ $as_echo "$as_me:$LINENO: result: $included_immodules" >&5 +-$as_echo "$included_immodules" >&6; } - - -if test "x$included_immodules" != x; then ++{ echo "$as_me:$LINENO: result: $included_immodules" >&5 ++echo "${ECHO_T}$included_immodules" >&6; } + if test "x$included_immodules" != x; then HAVE_INCLUDED_IMMMODULES_TRUE= HAVE_INCLUDED_IMMMODULES_FALSE='#' else -@@ -29463,9 +27139,7 @@ +@@ -29450,8 +29847,8 @@ for immodule in $included_immodules; do + if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then + : + else +- { { $as_echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 +-$as_echo "$as_me: error: the specified input method $immodule does not exist" >&2;} ++ { { echo "$as_me:$LINENO: error: the specified input method $immodule does not exist" >&5 ++echo "$as_me: error: the specified input method $immodule does not exist" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -29463,9 +29860,7 @@ IFS="$gtk_save_ifs" @@ -42621,7 +20258,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_AM_ET_TRUE= INCLUDE_IM_AM_ET_FALSE='#' else -@@ -29473,9 +27147,7 @@ +@@ -29473,9 +29868,7 @@ else INCLUDE_IM_AM_ET_FALSE= fi @@ -42632,7 +20269,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_CEDILLA_TRUE= INCLUDE_IM_CEDILLA_FALSE='#' else -@@ -29483,9 +27155,7 @@ +@@ -29483,9 +29876,7 @@ else INCLUDE_IM_CEDILLA_FALSE= fi @@ -42643,7 +20280,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE= INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE='#' else -@@ -29493,9 +27163,7 @@ +@@ -29493,9 +29884,7 @@ else INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE= fi @@ -42654,7 +20291,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_IME_TRUE= INCLUDE_IM_IME_FALSE='#' else -@@ -29503,9 +27171,7 @@ +@@ -29503,9 +29892,7 @@ else INCLUDE_IM_IME_FALSE= fi @@ -42665,7 +20302,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_INUKTITUT_TRUE= INCLUDE_IM_INUKTITUT_FALSE='#' else -@@ -29513,9 +27179,7 @@ +@@ -29513,9 +29900,7 @@ else INCLUDE_IM_INUKTITUT_FALSE= fi @@ -42676,7 +20313,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_IPA_TRUE= INCLUDE_IM_IPA_FALSE='#' else -@@ -29523,9 +27187,7 @@ +@@ -29523,9 +29908,7 @@ else INCLUDE_IM_IPA_FALSE= fi @@ -42687,7 +20324,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_MULTIPRESS_TRUE= INCLUDE_IM_MULTIPRESS_FALSE='#' else -@@ -29533,9 +27195,7 @@ +@@ -29533,9 +29916,7 @@ else INCLUDE_IM_MULTIPRESS_FALSE= fi @@ -42698,7 +20335,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_THAI_TRUE= INCLUDE_IM_THAI_FALSE='#' else -@@ -29543,9 +27203,7 @@ +@@ -29543,9 +29924,7 @@ else INCLUDE_IM_THAI_FALSE= fi @@ -42709,7 +20346,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_TI_ER_TRUE= INCLUDE_IM_TI_ER_FALSE='#' else -@@ -29553,9 +27211,7 @@ +@@ -29553,9 +29932,7 @@ else INCLUDE_IM_TI_ER_FALSE= fi @@ -42720,7 +20357,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_TI_ET_TRUE= INCLUDE_IM_TI_ET_FALSE='#' else -@@ -29563,9 +27219,7 @@ +@@ -29563,9 +29940,7 @@ else INCLUDE_IM_TI_ET_FALSE= fi @@ -42731,7 +20368,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_VIQR_TRUE= INCLUDE_IM_VIQR_FALSE='#' else -@@ -29573,9 +27227,7 @@ +@@ -29573,9 +29948,7 @@ else INCLUDE_IM_VIQR_FALSE= fi @@ -42742,7 +20379,107 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure INCLUDE_IM_XIM_TRUE= INCLUDE_IM_XIM_FALSE='#' else -@@ -29712,9 +27364,7 @@ +@@ -29584,10 +29957,10 @@ else + fi + + +-{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +-$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } ++{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_wait_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -29620,21 +29993,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_sys_wait_h=no +@@ -29642,8 +30014,8 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +-$as_echo "$ac_cv_header_sys_wait_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } + if test $ac_cv_header_sys_wait_h = yes; then + + cat >>confdefs.h <<\_ACEOF +@@ -29653,10 +30025,10 @@ _ACEOF + fi + + +-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +-$as_echo_n "checking return type of signal handlers... " >&6; } ++{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 ++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } + if test "${ac_cv_type_signal+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -29681,21 +30053,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_signal=void +@@ -29703,8 +30074,8 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +-$as_echo "$ac_cv_type_signal" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 ++echo "${ECHO_T}$ac_cv_type_signal" >&6; } + + cat >>confdefs.h <<_ACEOF + #define RETSIGTYPE $ac_cv_type_signal +@@ -29712,9 +30083,7 @@ _ACEOF @@ -42753,7 +20490,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_TIFF_TRUE= HAVE_TIFF_FALSE='#' else -@@ -29722,9 +27372,7 @@ +@@ -29722,9 +30091,7 @@ else HAVE_TIFF_FALSE= fi @@ -42764,7 +20501,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_PNG_TRUE= HAVE_PNG_FALSE='#' else -@@ -29732,9 +27380,7 @@ +@@ -29732,9 +30099,7 @@ else HAVE_PNG_FALSE= fi @@ -42775,7 +20512,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_JPEG_TRUE= HAVE_JPEG_FALSE='#' else -@@ -29742,9 +27388,7 @@ +@@ -29742,9 +30107,7 @@ else HAVE_JPEG_FALSE= fi @@ -42786,7 +20523,470 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_JASPER_TRUE= HAVE_JASPER_FALSE='#' else -@@ -30221,9 +27865,7 @@ +@@ -29772,17 +30135,17 @@ fi + # support. + # + if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 +-$as_echo_n "checking for sys/systeminfo.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 ++echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 +-$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 +-$as_echo_n "checking sys/systeminfo.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/systeminfo.h usability" >&5 ++echo $ECHO_N "checking sys/systeminfo.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -29798,33 +30161,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/systeminfo.h presence" >&5 +-$as_echo_n "checking sys/systeminfo.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/systeminfo.h presence" >&5 ++echo $ECHO_N "checking sys/systeminfo.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -29838,52 +30200,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/systeminfo.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -29892,18 +30253,18 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 +-$as_echo_n "checking for sys/systeminfo.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for sys/systeminfo.h" >&5 ++echo $ECHO_N "checking for sys/systeminfo.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_systeminfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sys_systeminfo_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 +-$as_echo "$ac_cv_header_sys_systeminfo_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_systeminfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_systeminfo_h" >&6; } + + fi +-if test "x$ac_cv_header_sys_systeminfo_h" = x""yes; then ++if test $ac_cv_header_sys_systeminfo_h = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_SYS_SYSTEMINFO_H 1 +@@ -29913,17 +30274,17 @@ fi + + + if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 +-$as_echo_n "checking for sys/sysinfo.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 ++echo $ECHO_N "checking for sys/sysinfo.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 +-$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 +-$as_echo_n "checking sys/sysinfo.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/sysinfo.h usability" >&5 ++echo $ECHO_N "checking sys/sysinfo.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -29939,33 +30300,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 +-$as_echo_n "checking sys/sysinfo.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/sysinfo.h presence" >&5 ++echo $ECHO_N "checking sys/sysinfo.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -29979,52 +30339,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/sysinfo.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -30033,18 +30392,18 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 +-$as_echo_n "checking for sys/sysinfo.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for sys/sysinfo.h" >&5 ++echo $ECHO_N "checking for sys/sysinfo.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_sysinfo_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sys_sysinfo_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 +-$as_echo "$ac_cv_header_sys_sysinfo_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysinfo_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_sysinfo_h" >&6; } + + fi +-if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then ++if test $ac_cv_header_sys_sysinfo_h = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_SYS_SYSINFO_H 1 +@@ -30054,15 +30413,15 @@ fi + + + +-{ $as_echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 +-$as_echo_n "checking for mediaLib 2.3... " >&6; } ++{ echo "$as_me:$LINENO: checking for mediaLib 2.3" >&5 ++echo $ECHO_N "checking for mediaLib 2.3... $ECHO_C" >&6; } + use_mlib25=no + # Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib + # patch requires. +-{ $as_echo "$as_me:$LINENO: checking for mlib_ImageSetStruct in -lmlib" >&5 +-$as_echo_n "checking for mlib_ImageSetStruct in -lmlib... " >&6; } ++{ echo "$as_me:$LINENO: checking for mlib_ImageSetStruct in -lmlib" >&5 ++echo $ECHO_N "checking for mlib_ImageSetStruct in -lmlib... $ECHO_C" >&6; } + if test "${ac_cv_lib_mlib_mlib_ImageSetStruct+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmlib $LIBS" +@@ -30094,37 +30453,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_mlib_mlib_ImageSetStruct=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_mlib_mlib_ImageSetStruct=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 +-$as_echo "$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } +-if test "x$ac_cv_lib_mlib_mlib_ImageSetStruct" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_ImageSetStruct" >&5 ++echo "${ECHO_T}$ac_cv_lib_mlib_mlib_ImageSetStruct" >&6; } ++if test $ac_cv_lib_mlib_mlib_ImageSetStruct = yes; then + use_mlib=yes + else + use_mlib=no +@@ -30138,14 +30493,14 @@ _ACEOF + + MEDIA_LIB=-lmlib + +- { $as_echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 +-$as_echo_n "checking for mediaLib 2.5... " >&6; } ++ { echo "$as_me:$LINENO: checking for mediaLib 2.5" >&5 ++echo $ECHO_N "checking for mediaLib 2.5... $ECHO_C" >&6; } + # Check for a mediaLib 2.5 function since that is what is needed for + # gdk_rgb_convert integration. +- { $as_echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 +-$as_echo_n "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... " >&6; } ++ { echo "$as_me:$LINENO: checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib" >&5 ++echo $ECHO_N "checking for mlib_VideoColorRGBint_to_BGRAint in -lmlib... $ECHO_C" >&6; } + if test "${ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmlib $LIBS" +@@ -30177,37 +30532,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 +-$as_echo "$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } +-if test "x$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&5 ++echo "${ECHO_T}$ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint" >&6; } ++if test $ac_cv_lib_mlib_mlib_VideoColorRGBint_to_BGRAint = yes; then + use_mlib25=yes + else + use_mlib25=no +@@ -30221,9 +30572,7 @@ _ACEOF fi fi @@ -42797,7 +20997,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_MEDIALIB_TRUE= USE_MEDIALIB_FALSE='#' else -@@ -30231,9 +27873,7 @@ +@@ -30231,9 +30580,7 @@ else USE_MEDIALIB_FALSE= fi @@ -42808,7 +21008,57 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_MEDIALIB25_TRUE= USE_MEDIALIB25_FALSE='#' else -@@ -30293,9 +27933,7 @@ +@@ -30248,8 +30595,8 @@ fi + # + # This code is partially taken from Mesa + # +-{ $as_echo "$as_me:$LINENO: checking for x86 platform" >&5 +-$as_echo_n "checking for x86 platform... " >&6; } ++{ echo "$as_me:$LINENO: checking for x86 platform" >&5 ++echo $ECHO_N "checking for x86 platform... $ECHO_C" >&6; } + case $host_cpu in + i386|i486|i586|i686|i786|k6|k7) + use_x86_asm=yes +@@ -30257,21 +30604,21 @@ case $host_cpu in + *) + use_x86_asm=no + esac +-{ $as_echo "$as_me:$LINENO: result: $use_x86_asm" >&5 +-$as_echo "$use_x86_asm" >&6; } ++{ echo "$as_me:$LINENO: result: $use_x86_asm" >&5 ++echo "${ECHO_T}$use_x86_asm" >&6; } + + use_mmx_asm=no + if test $use_x86_asm = yes; then + save_ac_ext=$ac_ext + ac_ext=S + +- { $as_echo "$as_me:$LINENO: checking compiler support for MMX" >&5 +-$as_echo_n "checking compiler support for MMX... " >&6; } ++ { echo "$as_me:$LINENO: checking compiler support for MMX" >&5 ++echo $ECHO_N "checking compiler support for MMX... $ECHO_C" >&6; } + cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + use_mmx_asm=yes + fi +@@ -30285,17 +30632,15 @@ cat >>confdefs.h <<\_ACEOF + #define USE_MMX 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi fi @@ -42819,7 +21069,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_MMX_TRUE= USE_MMX_FALSE='#' else -@@ -30310,9 +27948,7 @@ +@@ -30310,9 +30655,7 @@ if test -z "$LIBPNG" && test x"$os_win32 fi @@ -42830,7 +21080,1462 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure CROSS_COMPILING_TRUE= CROSS_COMPILING_FALSE='#' else -@@ -32475,9 +30111,7 @@ +@@ -30324,10 +30667,10 @@ fi + if test $cross_compiling = yes; then + # Extract the first word of "gdk-pixbuf-csource", so it can be a program name with args. + set dummy gdk-pixbuf-csource; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $GDK_PIXBUF_CSOURCE in + [\\/]* | ?:[\\/]*) +@@ -30342,7 +30685,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -30355,20 +30698,20 @@ esac + fi + GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE + if test -n "$GDK_PIXBUF_CSOURCE"; then +- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 +-$as_echo "$GDK_PIXBUF_CSOURCE" >&6; } ++ { echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5 ++echo "${ECHO_T}$GDK_PIXBUF_CSOURCE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + + # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. + set dummy gtk-update-icon-cache; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_GTK_UPDATE_ICON_CACHE+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $GTK_UPDATE_ICON_CACHE in + [\\/]* | ?:[\\/]*) +@@ -30383,7 +30726,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -30396,11 +30739,11 @@ esac + fi + GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE + if test -n "$GTK_UPDATE_ICON_CACHE"; then +- { $as_echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 +-$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; } ++ { echo "$as_me:$LINENO: result: $GTK_UPDATE_ICON_CACHE" >&5 ++echo "${ECHO_T}$GTK_UPDATE_ICON_CACHE" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -30411,11 +30754,11 @@ fi + + if test ! -f $srcdir/gtk/gtkbuiltincache.h && + test "x$REBUILD_PNGS" = "x#" ; then +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** gtkbuiltincache.h is not in the tree, and cannot be built + *** because you don't have libpng, or (when cross-compiling) you + *** don't have a prebuilt gtk-update-icon-cache on the build system." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** gtkbuiltincache.h is not in the tree, and cannot be built + *** because you don't have libpng, or (when cross-compiling) you + *** don't have a prebuilt gtk-update-icon-cache on the build system." >&2;} +@@ -30452,9 +30795,9 @@ if test "x$gdktarget" = "xx11"; then + # settings. + # + if $PKG_CONFIG --exists fontconfig; then : ; else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." >&2;} + { (exit 1); exit 1; }; } + fi +@@ -30482,8 +30825,8 @@ $as_echo "$as_me: error: + GTK_PACKAGES_FOR_X="x11" + else + have_base_x_pc=false +- { $as_echo "$as_me:$LINENO: checking for X" >&5 +-$as_echo_n "checking for X... " >&6; } ++ { echo "$as_me:$LINENO: checking for X" >&5 ++echo $ECHO_N "checking for X... $ECHO_C" >&6; } + + + # Check whether --with-x was given. +@@ -30497,11 +30840,11 @@ if test "x$with_x" = xno; then + have_x=disabled + else + case $x_includes,$x_libraries in #( +- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 +-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} ++ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 ++echo "$as_me: error: Cannot use X directory names containing '" >&2;} + { (exit 1); exit 1; }; };; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # One or both of the vars are not set, and there is no cached value. + ac_x_includes=no ac_x_libraries=no +@@ -30522,7 +30865,7 @@ _ACEOF + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. +- for ac_extension in a so sl dylib la dll; do ++ for ac_extension in a so sl; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break +@@ -30536,7 +30879,7 @@ _ACEOF + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in +- /usr/lib | /usr/lib64 | /lib | /lib64) ;; ++ /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi +@@ -30597,14 +30940,13 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err +@@ -30612,7 +30954,7 @@ $as_echo "$ac_try_echo") >&5 + # We can compile using X headers with no special include directory. + ac_x_includes= + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do +@@ -30653,33 +30995,30 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && 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= + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS=$ac_save_LIBS +-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` ++for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` + do + # Don't even attempt the hair of trying to link an X program! +- for ac_extension in a so sl dylib la dll; do ++ for ac_extension in a so sl; do + if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 +@@ -30688,7 +31027,6 @@ do + done + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi # $ac_x_libraries = no +@@ -30711,8 +31049,8 @@ fi + fi # $with_x != no + + if test "$have_x" != yes; then +- { $as_echo "$as_me:$LINENO: result: $have_x" >&5 +-$as_echo "$have_x" >&6; } ++ { echo "$as_me:$LINENO: result: $have_x" >&5 ++echo "${ECHO_T}$have_x" >&6; } + no_x=yes + else + # If each of the values was on the command line, it overrides each guess. +@@ -30722,8 +31060,8 @@ else + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" +- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +-$as_echo "libraries $x_libraries, headers $x_includes" >&6; } ++ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 ++echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } + fi + + if test "$no_x" = yes; then +@@ -30744,8 +31082,8 @@ else + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +-$as_echo_n "checking whether -R must be followed by a space... " >&6; } ++ { 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" + ac_xsave_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes +@@ -30770,26 +31108,23 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ } && 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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS="$ac_xsave_LIBS -R $x_libraries" +@@ -30814,38 +31149,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ } && 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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: result: neither works" >&5 +-$as_echo "neither works" >&6; } ++ { echo "$as_me:$LINENO: result: neither works" >&5 ++echo "${ECHO_T}neither works" >&6; } + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + +-rm -rf conftest.dSYM + 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 +@@ -30891,30 +31221,27 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } ++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 ++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } + if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" +@@ -30946,45 +31273,41 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_dnet_ntoa=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dnet_dnet_ntoa=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } ++if test $ac_cv_lib_dnet_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } ++ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } + if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" +@@ -31016,44 +31339,39 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dnet_stub_dnet_ntoa=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } ++if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" + fi + + fi + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" +@@ -31066,10 +31384,10 @@ rm -f core conftest.err conftest.$ac_obj + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. +- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 +-$as_echo_n "checking for gethostbyname... " >&6; } ++ { echo "$as_me:$LINENO: checking for gethostbyname" >&5 ++echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } + if test "${ac_cv_func_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31122,41 +31440,37 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_gethostbyname=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +-$as_echo "$ac_cv_func_gethostbyname" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 ++echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } + + if test $ac_cv_func_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } ++ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 ++echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } + if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" +@@ -31188,45 +31502,41 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_nsl_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_nsl_gethostbyname=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } +-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } ++if test $ac_cv_lib_nsl_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then +- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } ++ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 ++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } + if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" +@@ -31258,37 +31568,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_bsd_gethostbyname=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_bsd_gethostbyname=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } +-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } ++if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" + fi + +@@ -31302,10 +31608,10 @@ fi + # variants that don't use the name server (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. +- { $as_echo "$as_me:$LINENO: checking for connect" >&5 +-$as_echo_n "checking for connect... " >&6; } ++ { echo "$as_me:$LINENO: checking for connect" >&5 ++echo $ECHO_N "checking for connect... $ECHO_C" >&6; } + if test "${ac_cv_func_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31358,41 +31664,37 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_connect=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_connect=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +-$as_echo "$ac_cv_func_connect" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 ++echo "${ECHO_T}$ac_cv_func_connect" >&6; } + + if test $ac_cv_func_connect = no; then +- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +-$as_echo_n "checking for connect in -lsocket... " >&6; } ++ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 ++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } + if test "${ac_cv_lib_socket_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +@@ -31424,47 +31726,43 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_socket_connect=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_socket_connect=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +-$as_echo "$ac_cv_lib_socket_connect" >&6; } +-if test "x$ac_cv_lib_socket_connect" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 ++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } ++if test $ac_cv_lib_socket_connect = yes; then + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + fi + + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- { $as_echo "$as_me:$LINENO: checking for remove" >&5 +-$as_echo_n "checking for remove... " >&6; } ++ { echo "$as_me:$LINENO: checking for remove" >&5 ++echo $ECHO_N "checking for remove... $ECHO_C" >&6; } + if test "${ac_cv_func_remove+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31517,41 +31815,37 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_remove=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_remove=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +-$as_echo "$ac_cv_func_remove" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 ++echo "${ECHO_T}$ac_cv_func_remove" >&6; } + + if test $ac_cv_func_remove = no; then +- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +-$as_echo_n "checking for remove in -lposix... " >&6; } ++ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 ++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } + if test "${ac_cv_lib_posix_remove+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" +@@ -31583,47 +31877,43 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_posix_remove=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_posix_remove=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +-$as_echo "$ac_cv_lib_posix_remove" >&6; } +-if test "x$ac_cv_lib_posix_remove" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 ++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } ++if test $ac_cv_lib_posix_remove = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" + fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- { $as_echo "$as_me:$LINENO: checking for shmat" >&5 +-$as_echo_n "checking for shmat... " >&6; } ++ { echo "$as_me:$LINENO: checking for shmat" >&5 ++echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } + if test "${ac_cv_func_shmat+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31676,41 +31966,37 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_shmat=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_shmat=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +-$as_echo "$ac_cv_func_shmat" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 ++echo "${ECHO_T}$ac_cv_func_shmat" >&6; } + + if test $ac_cv_func_shmat = no; then +- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +-$as_echo_n "checking for shmat in -lipc... " >&6; } ++ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 ++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } + if test "${ac_cv_lib_ipc_shmat+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" +@@ -31742,37 +32028,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ipc_shmat=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_ipc_shmat=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +-$as_echo "$ac_cv_lib_ipc_shmat" >&6; } +-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 ++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } ++if test $ac_cv_lib_ipc_shmat = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" + fi + +@@ -31788,10 +32070,10 @@ fi + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry +- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } ++ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 ++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } + if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" +@@ -31823,37 +32105,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_ICE_IceConnectionNumber=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } ++if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" + fi + +@@ -31862,8 +32140,8 @@ fi + fi + + if test x$no_x = xyes ; then +- { { $as_echo "$as_me:$LINENO: error: X development libraries not found" >&5 +-$as_echo "$as_me: error: X development libraries not found" >&2;} ++ { { echo "$as_me:$LINENO: error: X development libraries not found" >&5 ++echo "$as_me: error: X development libraries not found" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -31887,10 +32165,10 @@ $as_echo "$as_me: error: X development l + # Sanity check for the X11 and Xext libraries. While everything we need from + # Xext is optional, the chances a system has *none* of these things is so + # small that we just unconditionally require it. +- { $as_echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 +-$as_echo_n "checking for XOpenDisplay... " >&6; } ++ { echo "$as_me:$LINENO: checking for XOpenDisplay" >&5 ++echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6; } + if test "${ac_cv_func_XOpenDisplay+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -31943,47 +32221,43 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XOpenDisplay=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XOpenDisplay=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 +-$as_echo "$ac_cv_func_XOpenDisplay" >&6; } +-if test "x$ac_cv_func_XOpenDisplay" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XOpenDisplay" >&5 ++echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6; } ++if test $ac_cv_func_XOpenDisplay = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 +-$as_echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} ++ { { echo "$as_me:$LINENO: error: *** libX11 not found. Check 'config.log' for more details." >&5 ++echo "$as_me: error: *** libX11 not found. Check 'config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + +- { $as_echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 +-$as_echo_n "checking for XextFindDisplay... " >&6; } ++ { echo "$as_me:$LINENO: checking for XextFindDisplay" >&5 ++echo $ECHO_N "checking for XextFindDisplay... $ECHO_C" >&6; } + if test "${ac_cv_func_XextFindDisplay+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32036,47 +32310,43 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XextFindDisplay=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XextFindDisplay=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5 +-$as_echo "$ac_cv_func_XextFindDisplay" >&6; } +-if test "x$ac_cv_func_XextFindDisplay" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XextFindDisplay" >&5 ++echo "${ECHO_T}$ac_cv_func_XextFindDisplay" >&6; } ++if test $ac_cv_func_XextFindDisplay = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 +-$as_echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} ++ { { echo "$as_me:$LINENO: error: *** libXext not found. Check 'config.log' for more details." >&5 ++echo "$as_me: error: *** libXext not found. Check 'config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + +- { $as_echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 +-$as_echo_n "checking for XRenderQueryExtension... " >&6; } ++ { echo "$as_me:$LINENO: checking for XRenderQueryExtension" >&5 ++echo $ECHO_N "checking for XRenderQueryExtension... $ECHO_C" >&6; } + if test "${ac_cv_func_XRenderQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32129,48 +32399,44 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XRenderQueryExtension=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XRenderQueryExtension=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 +-$as_echo "$ac_cv_func_XRenderQueryExtension" >&6; } +-if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XRenderQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_func_XRenderQueryExtension" >&6; } ++if test $ac_cv_func_XRenderQueryExtension = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 +-$as_echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} ++ { { echo "$as_me:$LINENO: error: *** libXrender not found. Check 'config.log' for more details." >&5 ++echo "$as_me: error: *** libXrender not found. Check 'config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + + + # Check for xReply + +- { $as_echo "$as_me:$LINENO: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5 +-$as_echo_n "checking if <X11/extensions/XIproto.h> is needed for xReply... " >&6; } ++ { echo "$as_me:$LINENO: checking if <X11/extensions/XIproto.h> is needed for xReply" >&5 ++echo $ECHO_N "checking if <X11/extensions/XIproto.h> is needed for xReply... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -32192,22 +32458,21 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +@@ -32232,33 +32497,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + + cat >>confdefs.h <<\_ACEOF + #define NEED_XIPROTO_H_FOR_XREPLY 1 + _ACEOF + + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { $as_echo "$as_me:$LINENO: result: unknown" >&5 +-$as_echo "unknown" >&6; } +- { { $as_echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 +-$as_echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} ++ { echo "$as_me:$LINENO: result: unknown" >&5 ++echo "${ECHO_T}unknown" >&6; } ++ { { echo "$as_me:$LINENO: error: xReply type unavailable. X11 is too old" >&5 ++echo "$as_me: error: xReply type unavailable. X11 is too old" >&2;} + { (exit 1); exit 1; }; } + fi + +@@ -32273,11 +32537,11 @@ rm -f core conftest.err conftest.$ac_obj + + for ac_func in XConvertCase XInternAtoms + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32330,42 +32594,35 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -32378,10 +32635,10 @@ done + # for clarity + + have_x11r6=false +- { $as_echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 +-$as_echo_n "checking for XAddConnectionWatch... " >&6; } ++ { echo "$as_me:$LINENO: checking for XAddConnectionWatch" >&5 ++echo $ECHO_N "checking for XAddConnectionWatch... $ECHO_C" >&6; } + if test "${ac_cv_func_XAddConnectionWatch+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32434,36 +32691,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XAddConnectionWatch=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XAddConnectionWatch=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 +-$as_echo "$ac_cv_func_XAddConnectionWatch" >&6; } +-if test "x$ac_cv_func_XAddConnectionWatch" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XAddConnectionWatch" >&5 ++echo "${ECHO_T}$ac_cv_func_XAddConnectionWatch" >&6; } ++if test $ac_cv_func_XAddConnectionWatch = yes; then + have_x11r6=true + fi + +@@ -32475,9 +32728,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi @@ -42841,7 +22546,993 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_X11R6_TRUE= HAVE_X11R6_FALSE='#' else -@@ -33728,9 +31362,7 @@ +@@ -32489,18 +32740,18 @@ fi + # Check for XKB support. + + if test "x$enable_xkb" = "xyes"; then +- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 +-$as_echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: XKB support explicitly enabled" >&5 ++echo "$as_me: WARNING: XKB support explicitly enabled" >&2;} + + cat >>confdefs.h <<\_ACEOF + #define HAVE_XKB 1 + _ACEOF + + elif test "x$enable_xkb" = "xmaybe"; then +- { $as_echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 +-$as_echo_n "checking for XkbQueryExtension... " >&6; } ++ { echo "$as_me:$LINENO: checking for XkbQueryExtension" >&5 ++echo $ECHO_N "checking for XkbQueryExtension... $ECHO_C" >&6; } + if test "${ac_cv_func_XkbQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32553,36 +32804,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XkbQueryExtension=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XkbQueryExtension=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5 +-$as_echo "$ac_cv_func_XkbQueryExtension" >&6; } +-if test "x$ac_cv_func_XkbQueryExtension" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XkbQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_func_XkbQueryExtension" >&6; } ++if test $ac_cv_func_XkbQueryExtension = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_XKB 1 +@@ -32591,16 +32838,16 @@ _ACEOF + fi + + else +- { $as_echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 +-$as_echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: XKB support explicitly disabled" >&5 ++echo "$as_me: WARNING: XKB support explicitly disabled" >&2;} + fi + + # Check for shaped window extension + +- { $as_echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 +-$as_echo_n "checking for XShapeCombineMask... " >&6; } ++ { echo "$as_me:$LINENO: checking for XShapeCombineMask" >&5 ++echo $ECHO_N "checking for XShapeCombineMask... $ECHO_C" >&6; } + if test "${ac_cv_func_XShapeCombineMask+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32653,36 +32900,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XShapeCombineMask=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XShapeCombineMask=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 +-$as_echo "$ac_cv_func_XShapeCombineMask" >&6; } +-if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XShapeCombineMask" >&5 ++echo "${ECHO_T}$ac_cv_func_XShapeCombineMask" >&6; } ++if test $ac_cv_func_XShapeCombineMask = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_SHAPE_EXT 1 +@@ -32695,10 +32938,10 @@ fi + gtk_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $x_cflags" + +- { $as_echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 +-$as_echo_n "checking for XSyncQueryExtension... " >&6; } ++ { echo "$as_me:$LINENO: checking for XSyncQueryExtension" >&5 ++echo $ECHO_N "checking for XSyncQueryExtension... $ECHO_C" >&6; } + if test "${ac_cv_func_XSyncQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32751,40 +32994,36 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XSyncQueryExtension=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XSyncQueryExtension=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 +-$as_echo "$ac_cv_func_XSyncQueryExtension" >&6; } +-if test "x$ac_cv_func_XSyncQueryExtension" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 +-$as_echo_n "checking for X11/extensions/sync.h... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XSyncQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_func_XSyncQueryExtension" >&6; } ++if test $ac_cv_func_XSyncQueryExtension = yes; then ++ { echo "$as_me:$LINENO: checking for X11/extensions/sync.h" >&5 ++echo $ECHO_N "checking for X11/extensions/sync.h... $ECHO_C" >&6; } + if test "${ac_cv_header_X11_extensions_sync_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32802,21 +33041,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_X11_extensions_sync_h=no +@@ -32824,9 +33062,9 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 +-$as_echo "$ac_cv_header_X11_extensions_sync_h" >&6; } +-if test "x$ac_cv_header_X11_extensions_sync_h" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_sync_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_sync_h" >&6; } ++if test $ac_cv_header_X11_extensions_sync_h = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_XSYNC 1 +@@ -32846,10 +33084,10 @@ fi + + if test "x$enable_shm" = "xyes"; then + # Check for the XShm extension, normally in Xext +- { $as_echo "$as_me:$LINENO: checking for XShmAttach" >&5 +-$as_echo_n "checking for XShmAttach... " >&6; } ++ { echo "$as_me:$LINENO: checking for XShmAttach" >&5 ++echo $ECHO_N "checking for XShmAttach... $ECHO_C" >&6; } + if test "${ac_cv_func_XShmAttach+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -32902,43 +33140,39 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XShmAttach=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XShmAttach=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 +-$as_echo "$ac_cv_func_XShmAttach" >&6; } +-if test "x$ac_cv_func_XShmAttach" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XShmAttach" >&5 ++echo "${ECHO_T}$ac_cv_func_XShmAttach" >&6; } ++if test $ac_cv_func_XShmAttach = yes; then + : + else + # On AIX, it is in XextSam instead +- { $as_echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 +-$as_echo_n "checking for XShmAttach in -lXextSam... " >&6; } ++ { echo "$as_me:$LINENO: checking for XShmAttach in -lXextSam" >&5 ++echo $ECHO_N "checking for XShmAttach in -lXextSam... $ECHO_C" >&6; } + if test "${ac_cv_lib_XextSam_XShmAttach+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXextSam $LIBS" +@@ -32970,37 +33204,33 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_XextSam_XShmAttach=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_XextSam_XShmAttach=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 +-$as_echo "$ac_cv_lib_XextSam_XShmAttach" >&6; } +-if test "x$ac_cv_lib_XextSam_XShmAttach" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_XextSam_XShmAttach" >&5 ++echo "${ECHO_T}$ac_cv_lib_XextSam_XShmAttach" >&6; } ++if test $ac_cv_lib_XextSam_XShmAttach = yes; then + case "$x_extra_libs " in + *-lXextSam[\ \ ]*) ;; + *) x_extra_libs="-lXextSam $x_extra_libs" ;; +@@ -33015,17 +33245,17 @@ fi + if test "x$enable_shm" = "xyes"; then + # Check for shared memory + if test "${ac_cv_header_sys_ipc_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 +-$as_echo_n "checking for sys/ipc.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 ++echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_ipc_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 +-$as_echo "$ac_cv_header_sys_ipc_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 +-$as_echo_n "checking sys/ipc.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/ipc.h usability" >&5 ++echo $ECHO_N "checking sys/ipc.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -33041,33 +33271,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 +-$as_echo_n "checking sys/ipc.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/ipc.h presence" >&5 ++echo $ECHO_N "checking sys/ipc.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -33081,52 +33310,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/ipc.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/ipc.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/ipc.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/ipc.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/ipc.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/ipc.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/ipc.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/ipc.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -33135,18 +33363,18 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 +-$as_echo_n "checking for sys/ipc.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for sys/ipc.h" >&5 ++echo $ECHO_N "checking for sys/ipc.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_ipc_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sys_ipc_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 +-$as_echo "$ac_cv_header_sys_ipc_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_ipc_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_ipc_h" >&6; } + + fi +-if test "x$ac_cv_header_sys_ipc_h" = x""yes; then ++if test $ac_cv_header_sys_ipc_h = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_IPC_H 1 +@@ -33158,17 +33386,17 @@ fi + + + if test "${ac_cv_header_sys_shm_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 +-$as_echo_n "checking for sys/shm.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for sys/shm.h" >&5 ++echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_shm_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 +-$as_echo "$ac_cv_header_sys_shm_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 +-$as_echo_n "checking sys/shm.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/shm.h usability" >&5 ++echo $ECHO_N "checking sys/shm.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -33184,33 +33412,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 +-$as_echo_n "checking sys/shm.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking sys/shm.h presence" >&5 ++echo $ECHO_N "checking sys/shm.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -33224,52 +33451,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/shm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/shm.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/shm.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/shm.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/shm.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/shm.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/shm.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/shm.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -33278,18 +33504,18 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for sys/shm.h" >&5 +-$as_echo_n "checking for sys/shm.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for sys/shm.h" >&5 ++echo $ECHO_N "checking for sys/shm.h... $ECHO_C" >&6; } + if test "${ac_cv_header_sys_shm_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_sys_shm_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 +-$as_echo "$ac_cv_header_sys_shm_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_shm_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_shm_h" >&6; } + + fi +-if test "x$ac_cv_header_sys_shm_h" = x""yes; then ++if test $ac_cv_header_sys_shm_h = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_SHM_H 1 +@@ -33303,8 +33529,8 @@ fi + + # Check for the X shared memory extension header file + have_xshm=no +- { $as_echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 +-$as_echo_n "checking X11/extensions/XShm.h... " >&6; } ++ { echo "$as_me:$LINENO: checking X11/extensions/XShm.h" >&5 ++echo $ECHO_N "checking X11/extensions/XShm.h... $ECHO_C" >&6; } + if test "x$no_xext_lib" = "xyes"; then + : + else +@@ -33339,21 +33565,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + have_xshm=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -33362,8 +33587,8 @@ fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gtk_save_CFLAGS" + fi +- { $as_echo "$as_me:$LINENO: result: $have_xshm" >&5 +-$as_echo "$have_xshm" >&6; } ++ { echo "$as_me:$LINENO: result: $have_xshm" >&5 ++echo "${ECHO_T}$have_xshm" >&6; } + if test $have_xshm = yes ; then + + cat >>confdefs.h <<\_ACEOF +@@ -33381,14 +33606,14 @@ _ACEOF + case "$host" in + *-*-solaris*) + # Check for solaris +- { $as_echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 +-$as_echo_n "checking for Xinerama support on Solaris... " >&6; } ++ { echo "$as_me:$LINENO: checking for Xinerama support on Solaris" >&5 ++echo $ECHO_N "checking for Xinerama support on Solaris... $ECHO_C" >&6; } + + have_solaris_xinerama=false +- { $as_echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 +-$as_echo_n "checking for XineramaGetInfo... " >&6; } ++ { echo "$as_me:$LINENO: checking for XineramaGetInfo" >&5 ++echo $ECHO_N "checking for XineramaGetInfo... $ECHO_C" >&6; } + if test "${ac_cv_func_XineramaGetInfo+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -33441,40 +33666,36 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_func_XineramaGetInfo=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_XineramaGetInfo=no + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 +-$as_echo "$ac_cv_func_XineramaGetInfo" >&6; } +-if test "x$ac_cv_func_XineramaGetInfo" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 +-$as_echo_n "checking for X11/extensions/xinerama.h... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_func_XineramaGetInfo" >&5 ++echo "${ECHO_T}$ac_cv_func_XineramaGetInfo" >&6; } ++if test $ac_cv_func_XineramaGetInfo = yes; then ++ { echo "$as_me:$LINENO: checking for X11/extensions/xinerama.h" >&5 ++echo $ECHO_N "checking for X11/extensions/xinerama.h... $ECHO_C" >&6; } + if test "${ac_cv_header_X11_extensions_xinerama_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -33492,21 +33713,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_X11_extensions_xinerama_h=no +@@ -33514,9 +33734,9 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 +-$as_echo "$ac_cv_header_X11_extensions_xinerama_h" >&6; } +-if test "x$ac_cv_header_X11_extensions_xinerama_h" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xinerama_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_xinerama_h" >&6; } ++if test $ac_cv_header_X11_extensions_xinerama_h = yes; then + have_solaris_xinerama=true + else + : +@@ -33537,27 +33757,27 @@ cat >>confdefs.h <<\_ACEOF + #define HAVE_XINERAMA 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ;; + *) + # Check for XFree +- { $as_echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 +-$as_echo_n "checking for Xinerama support on XFree86... " >&6; } ++ { echo "$as_me:$LINENO: checking for Xinerama support on XFree86" >&5 ++echo $ECHO_N "checking for Xinerama support on XFree86... $ECHO_C" >&6; } + + have_xfree_xinerama=false + if $PKG_CONFIG --exists xinerama ; then + have_xfree_xinerama=true + X_PACKAGES="$X_PACKAGES xinerama" + else +- { $as_echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 +-$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } ++ { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 ++echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; } + if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXinerama $LIBS" +@@ -33589,41 +33809,37 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xinerama_XineramaQueryExtension=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xinerama_XineramaQueryExtension=no + fi + +-rm -rf conftest.dSYM + 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 +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 +-$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } +-if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then +- { $as_echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +-$as_echo_n "checking for X11/extensions/Xinerama.h... " >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } ++if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then ++ { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 ++echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; } + if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -33641,21 +33857,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_X11_extensions_Xinerama_h=no +@@ -33663,9 +33878,9 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +-$as_echo "$ac_cv_header_X11_extensions_Xinerama_h" >&6; } +-if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; } ++if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then + case "$x_extra_libs " in + *-lXinerama[\ \ ]*) ;; + *) x_extra_libs="-lXinerama $x_extra_libs" ;; +@@ -33692,11 +33907,11 @@ cat >>confdefs.h <<\_ACEOF + #define HAVE_XINERAMA 1 + _ACEOF + +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ;; + esac +@@ -33728,9 +33943,7 @@ _ACEOF fi @@ -42852,7 +23543,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure XINPUT_XFREE_TRUE= XINPUT_XFREE_FALSE='#' else -@@ -33810,9 +31442,7 @@ +@@ -33810,9 +34023,7 @@ _ACEOF CPPFLAGS="$gtk_save_cppflags" LIBS="$gtk_save_libs" @@ -42863,7 +23554,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_X11_TRUE= USE_X11_FALSE='#' else -@@ -33821,9 +31451,7 @@ +@@ -33821,9 +34032,7 @@ else fi else @@ -42874,7 +23565,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure XINPUT_XFREE_TRUE= XINPUT_XFREE_FALSE='#' else -@@ -33831,9 +31459,7 @@ +@@ -33831,9 +34040,7 @@ else XINPUT_XFREE_FALSE= fi @@ -42885,7 +23576,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_X11_TRUE= USE_X11_FALSE='#' else -@@ -33841,9 +31467,7 @@ +@@ -33841,9 +34048,7 @@ else USE_X11_FALSE= fi @@ -42896,7 +23587,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_X11R6_TRUE= HAVE_X11R6_FALSE='#' else -@@ -33855,9 +31479,7 @@ +@@ -33855,9 +34060,7 @@ fi if test "x$gdktarget" = "xwin32"; then GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" @@ -42907,7 +23598,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_WIN32_TRUE= USE_WIN32_FALSE='#' else -@@ -33866,9 +31488,7 @@ +@@ -33866,9 +34069,7 @@ else fi else @@ -42918,7 +23609,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_WIN32_TRUE= USE_WIN32_FALSE='#' else -@@ -33880,9 +31500,7 @@ +@@ -33880,9 +34081,7 @@ fi if test "x$gdktarget" = "xquartz"; then GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" @@ -42929,7 +23620,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_QUARTZ_TRUE= USE_QUARTZ_FALSE='#' else -@@ -33891,9 +31509,7 @@ +@@ -33891,9 +34090,7 @@ else fi else @@ -42940,16 +23631,37 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_QUARTZ_TRUE= USE_QUARTZ_FALSE='#' else -@@ -33913,7 +31529,7 @@ +@@ -33913,22 +34110,22 @@ GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG if test "x$gdktarget" = "xdirectfb"; then - DIRECTFB_REQUIRED_VERSION=0.9.24 -+ DIRECTFB_REQUIRED_VERSION=0.9.26 - { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 - $as_echo_n "checking for DirectFB... " >&6; } +- { $as_echo "$as_me:$LINENO: checking for DirectFB" >&5 +-$as_echo_n "checking for DirectFB... " >&6; } ++ DIRECTFB_REQUIRED_VERSION=1.0.0 ++ { echo "$as_me:$LINENO: checking for DirectFB" >&5 ++echo $ECHO_N "checking for DirectFB... $ECHO_C" >&6; } -@@ -33936,9 +31552,7 @@ + if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } ++ { 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" + else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend + *** are required. The latest version of DirectFB is always available + *** from http://www.directfb.org/. + " >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer and the cairo backend + *** are required. The latest version of DirectFB is always available + *** from http://www.directfb.org/. +@@ -33936,9 +34133,7 @@ $as_echo "$as_me: error: { (exit 1); exit 1; }; } fi @@ -42960,7 +23672,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_DIRECTFB_TRUE= USE_DIRECTFB_FALSE='#' else -@@ -33947,9 +31561,7 @@ +@@ -33947,9 +34142,7 @@ else fi else @@ -42971,7 +23683,78 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure USE_DIRECTFB_TRUE= USE_DIRECTFB_FALSE='#' else -@@ -34063,18 +31675,19 @@ +@@ -33968,20 +34161,20 @@ else + PANGO_PACKAGES="pango pangocairo" + fi + +-{ $as_echo "$as_me:$LINENO: checking Pango flags" >&5 +-$as_echo_n "checking Pango flags... " >&6; } ++{ echo "$as_me:$LINENO: checking Pango flags" >&5 ++echo $ECHO_N "checking Pango flags... $ECHO_C" >&6; } + if $PKG_CONFIG --exists $PANGO_PACKAGES ; then + PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` + PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` + +- { $as_echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 +-$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; } ++ { echo "$as_me:$LINENO: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 ++echo "${ECHO_T}$PANGO_CFLAGS $PANGO_LIBS" >&6; } + else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Pango not found. Pango built with Cairo support is required + *** to build GTK+. See http://www.pango.org for Pango information. + " >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Pango not found. Pango built with Cairo support is required + *** to build GTK+. See http://www.pango.org for Pango information. + " >&2;} +@@ -34023,36 +34216,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Can't link to Pango. Pango is required to build + *** GTK+. For more information see http://www.pango.org" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Can't link to Pango. Pango is required to build + *** GTK+. For more information see http://www.pango.org" >&2;} + { (exit 1); exit 1; }; } + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gtk_save_LIBS" +@@ -34063,18 +34252,19 @@ LDFLAGS="$saved_ldflags" GDK_PACKAGES="$PANGO_PACKAGES gio-2.0" if test "x$gdktarget" = "xx11"; then @@ -42995,7 +23778,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure fi -@@ -34084,6 +31697,7 @@ +@@ -34084,25 +34274,26 @@ fi @@ -43003,7 +23786,76 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure ######################################## # Check for Accessibility Toolkit flags ######################################## -@@ -34196,7 +31810,7 @@ + + ATK_PACKAGES=atk +-{ $as_echo "$as_me:$LINENO: checking ATK flags" >&5 +-$as_echo_n "checking ATK flags... " >&6; } ++{ echo "$as_me:$LINENO: checking ATK flags" >&5 ++echo $ECHO_N "checking ATK flags... $ECHO_C" >&6; } + if $PKG_CONFIG --exists $ATK_PACKAGES ; then + ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` + ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` + +- { $as_echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 +-$as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; } ++ { echo "$as_me:$LINENO: result: $ATK_CFLAGS $ATK_LIBS" >&5 ++echo "${ECHO_T}$ATK_CFLAGS $ATK_LIBS" >&6; } + else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Accessibility Toolkit not found. Accessibility Toolkit is required + *** to build GTK+. + " >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Accessibility Toolkit not found. Accessibility Toolkit is required + *** to build GTK+. + " >&2;} +@@ -34142,36 +34333,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + : + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required + *** to build GTK+" >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required + *** to build GTK+" >&2;} + { (exit 1); exit 1; }; } + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gtk_save_LIBS" +@@ -34196,7 +34383,7 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=pr CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" if test $enable_explicit_deps != yes ; then @@ -43012,7 +23864,473 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure fi -@@ -34829,9 +32443,7 @@ +@@ -34224,10 +34411,10 @@ fi + ######################## + + old_LIBS="$LIBS" +-{ $as_echo "$as_me:$LINENO: checking for library containing gethostent" >&5 +-$as_echo_n "checking for library containing gethostent... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing gethostent" >&5 ++echo $ECHO_N "checking for library containing gethostent... $ECHO_C" >&6; } + if test "${ac_cv_search_gethostent+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -34265,30 +34452,26 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_gethostent=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_gethostent+set}" = set; then +@@ -34303,18 +34486,18 @@ fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 +-$as_echo "$ac_cv_search_gethostent" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostent" >&5 ++echo "${ECHO_T}$ac_cv_search_gethostent" >&6; } + ac_res=$ac_cv_search_gethostent + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +-{ $as_echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 +-$as_echo_n "checking for library containing setsockopt... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing setsockopt" >&5 ++echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; } + if test "${ac_cv_search_setsockopt+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -34352,30 +34535,26 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_setsockopt=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_setsockopt+set}" = set; then +@@ -34390,18 +34569,18 @@ fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 +-$as_echo "$ac_cv_search_setsockopt" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5 ++echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; } + ac_res=$ac_cv_search_setsockopt + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +-{ $as_echo "$as_me:$LINENO: checking for library containing connect" >&5 +-$as_echo_n "checking for library containing connect... " >&6; } ++{ echo "$as_me:$LINENO: checking for library containing connect" >&5 ++echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; } + if test "${ac_cv_search_connect+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_func_search_save_LIBS=$LIBS + cat >conftest.$ac_ext <<_ACEOF +@@ -34439,30 +34618,26 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_search_connect=$ac_res + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_connect+set}" = set; then +@@ -34477,8 +34652,8 @@ fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 +-$as_echo "$ac_cv_search_connect" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5 ++echo "${ECHO_T}$ac_cv_search_connect" >&6; } + ac_res=$ac_cv_search_connect + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +@@ -34486,10 +34661,10 @@ if test "$ac_res" != no; then + fi + + +-{ $as_echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 +-$as_echo_n "checking for struct sockaddr_un.sun_len... " >&6; } ++{ echo "$as_me:$LINENO: checking for struct sockaddr_un.sun_len" >&5 ++echo $ECHO_N "checking for struct sockaddr_un.sun_len... $ECHO_C" >&6; } + if test "${ac_cv_member_struct_sockaddr_un_sun_len+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -34517,21 +34692,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_sockaddr_un_sun_len=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +@@ -34560,21 +34734,20 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_sockaddr_un_sun_len=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_struct_sockaddr_un_sun_len=no +@@ -34585,9 +34758,9 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 +-$as_echo "$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } +-if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = x""yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 ++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } ++if test $ac_cv_member_struct_sockaddr_un_sun_len = yes; then + struct_sockaddr_un_sun_len=true + else + struct_sockaddr_un_suin_len=false +@@ -34626,10 +34799,10 @@ if test "x$enable_cups" = "xauto" + then + # Extract the first word of "cups-config", so it can be a program name with args. + set dummy cups-config; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $CUPS_CONFIG in + [\\/]* | ?:[\\/]*) +@@ -34644,7 +34817,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -34657,11 +34830,11 @@ esac + fi + CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG + if test -n "$CUPS_CONFIG"; then +- { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 +-$as_echo "$CUPS_CONFIG" >&6; } ++ { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5 ++echo "${ECHO_T}$CUPS_CONFIG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -34688,17 +34861,17 @@ _ACEOF + + + if test "${ac_cv_header_cups_cups_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +-$as_echo_n "checking for cups/cups.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for cups/cups.h" >&5 ++echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cups_cups_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +-$as_echo "$ac_cv_header_cups_cups_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 +-$as_echo_n "checking cups/cups.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 ++echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -34714,33 +34887,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 +-$as_echo_n "checking cups/cups.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 ++echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -34754,52 +34926,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -34808,30 +34979,28 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +-$as_echo_n "checking for cups/cups.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for cups/cups.h" >&5 ++echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cups_cups_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_cups_cups_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +-$as_echo "$ac_cv_header_cups_cups_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6; } + + fi +-if test "x$ac_cv_header_cups_cups_h" = x""yes; then ++if test $ac_cv_header_cups_cups_h = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 +-$as_echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} ++ { { echo "$as_me:$LINENO: error: *** Sorry, cups-config present but cups/cups.h missing." >&5 ++echo "$as_me: error: *** Sorry, cups-config present but cups/cups.h missing." >&2;} + { (exit 1); exit 1; }; } + fi fi @@ -43023,7 +24341,106 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_CUPS_TRUE= HAVE_CUPS_FALSE='#' else -@@ -34998,9 +32610,7 @@ +@@ -34863,25 +35032,24 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + cat >>confdefs.h <<\_ACEOF +-#define HAVE_HTTP_AUTHSTRING /**/ ++#define HAVE_HTTP_AUTHSTRING + _ACEOF + + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + +@@ -34897,11 +35065,11 @@ rm -f core conftest.err conftest.$ac_obj + + for ac_func in httpGetAuthString + do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } + if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -34954,42 +35122,35 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++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 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + + fi +@@ -34998,9 +35159,7 @@ done LIBS="$gtk_save_libs" else @@ -43034,7 +24451,353 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_CUPS_TRUE= HAVE_CUPS_FALSE='#' else -@@ -35317,9 +32927,7 @@ +@@ -35014,17 +35173,17 @@ gtk_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS" + + if test "${ac_cv_header_cairo_pdf_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 +-$as_echo_n "checking for cairo-pdf.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 ++echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cairo_pdf_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 +-$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking cairo-pdf.h usability" >&5 +-$as_echo_n "checking cairo-pdf.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking cairo-pdf.h usability" >&5 ++echo $ECHO_N "checking cairo-pdf.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -35040,33 +35199,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 +-$as_echo_n "checking cairo-pdf.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking cairo-pdf.h presence" >&5 ++echo $ECHO_N "checking cairo-pdf.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -35080,52 +35238,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: cairo-pdf.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -35134,24 +35291,24 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 +-$as_echo_n "checking for cairo-pdf.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for cairo-pdf.h" >&5 ++echo $ECHO_N "checking for cairo-pdf.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cairo_pdf_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_cairo_pdf_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 +-$as_echo "$ac_cv_header_cairo_pdf_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_pdf_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_pdf_h" >&6; } + + fi +-if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then ++if test $ac_cv_header_cairo_pdf_h = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Can't find cairo-pdf.h. You must build Cairo with the pdf + *** backend enabled." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Can't find cairo-pdf.h. You must build Cairo with the pdf + *** backend enabled." >&2;} + { (exit 1); exit 1; }; } +@@ -35161,17 +35318,17 @@ fi + + if test "$os_win32" != "yes"; then + if test "${ac_cv_header_cairo_ps_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 +-$as_echo_n "checking for cairo-ps.h... " >&6; } ++ { echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 ++echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cairo_ps_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 +-$as_echo "$ac_cv_header_cairo_ps_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 +-$as_echo_n "checking cairo-ps.h usability... " >&6; } ++{ echo "$as_me:$LINENO: checking cairo-ps.h usability" >&5 ++echo $ECHO_N "checking cairo-ps.h usability... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -35187,33 +35344,32 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes + else +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 +-$as_echo_n "checking cairo-ps.h presence... " >&6; } ++{ echo "$as_me:$LINENO: checking cairo-ps.h presence" >&5 ++echo $ECHO_N "checking cairo-ps.h presence... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -35227,52 +35383,51 @@ case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (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 +- $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no + fi + + rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: cairo-ps.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: cairo-ps.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: cairo-ps.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: cairo-ps.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: cairo-ps.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: cairo-ps.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: cairo-ps.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: cairo-ps.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## --------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ## +@@ -35281,24 +35436,24 @@ _ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 +-$as_echo_n "checking for cairo-ps.h... " >&6; } ++{ echo "$as_me:$LINENO: checking for cairo-ps.h" >&5 ++echo $ECHO_N "checking for cairo-ps.h... $ECHO_C" >&6; } + if test "${ac_cv_header_cairo_ps_h+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_cairo_ps_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 +-$as_echo "$ac_cv_header_cairo_ps_h" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_header_cairo_ps_h" >&5 ++echo "${ECHO_T}$ac_cv_header_cairo_ps_h" >&6; } + + fi +-if test "x$ac_cv_header_cairo_ps_h" = x""yes; then ++if test $ac_cv_header_cairo_ps_h = yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: ++ { { echo "$as_me:$LINENO: error: + *** Can't find cairo-ps.h. You must build Cairo with the + *** postscript backend enabled." >&5 +-$as_echo "$as_me: error: ++echo "$as_me: error: + *** Can't find cairo-ps.h. You must build Cairo with the + *** postscript backend enabled." >&2;} + { (exit 1); exit 1; }; } +@@ -35317,9 +35472,7 @@ else enable_test_print_backend=no fi @@ -43045,7 +24808,76 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure TEST_PRINT_BACKEND_TRUE= TEST_PRINT_BACKEND_FALSE='#' else -@@ -35442,9 +33050,7 @@ +@@ -35378,32 +35531,32 @@ fi + + if test x$enable_gtk_doc = xyes; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.8\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.8") 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + : + else +- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 +-$as_echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} ++ { { echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&5 ++echo "$as_me: error: You need to have gtk-doc >= 1.8 installed to build gtk-doc" >&2;} + { (exit 1); exit 1; }; } + fi + fi + +- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 +-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 +-$as_echo "$enable_gtk_doc" >&6; } ++ { echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5 ++echo $ECHO_N "checking whether to build gtk-doc documentation... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5 ++echo "${ECHO_T}$enable_gtk_doc" >&6; } + + for ac_prog in gtkdoc-check + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $GTKDOC_CHECK in + [\\/]* | ?:[\\/]*) +@@ -35418,7 +35571,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -35430,11 +35583,11 @@ esac + fi + GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK + if test -n "$GTKDOC_CHECK"; then +- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 +-$as_echo "$GTKDOC_CHECK" >&6; } ++ { echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5 ++echo "${ECHO_T}$GTKDOC_CHECK" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -35442,9 +35595,7 @@ fi done @@ -43056,7 +24888,7 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure ENABLE_GTK_DOC_TRUE= ENABLE_GTK_DOC_FALSE='#' else -@@ -35452,9 +33058,7 @@ +@@ -35452,9 +35603,7 @@ else ENABLE_GTK_DOC_FALSE= fi @@ -43067,7 +24899,42 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure GTK_DOC_USE_LIBTOOL_TRUE= GTK_DOC_USE_LIBTOOL_FALSE='#' else -@@ -35502,9 +33106,7 @@ +@@ -35466,10 +35615,10 @@ fi + + # Extract the first word of "db2html", so it can be a program name with args. + set dummy db2html; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_prog_DB2HTML+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$DB2HTML"; then + ac_cv_prog_DB2HTML="$DB2HTML" # Let the user override the test. +@@ -35482,7 +35631,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -35494,17 +35643,15 @@ fi + fi + DB2HTML=$ac_cv_prog_DB2HTML + if test -n "$DB2HTML"; then +- { $as_echo "$as_me:$LINENO: result: $DB2HTML" >&5 +-$as_echo "$DB2HTML" >&6; } ++ { echo "$as_me:$LINENO: result: $DB2HTML" >&5 ++echo "${ECHO_T}$DB2HTML" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } fi @@ -43078,7 +24945,156 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure HAVE_DOCBOOK_TRUE= HAVE_DOCBOOK_FALSE='#' else -@@ -35678,9 +33280,7 @@ +@@ -35524,10 +35671,10 @@ fi + if test "${enable_man}" != no; then + # Extract the first word of "xsltproc", so it can be a program name with args. + set dummy xsltproc; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_XSLTPROC+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $XSLTPROC in + [\\/]* | ?:[\\/]*) +@@ -35542,7 +35689,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -35554,11 +35701,11 @@ esac + fi + XSLTPROC=$ac_cv_path_XSLTPROC + if test -n "$XSLTPROC"; then +- { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +-$as_echo "$XSLTPROC" >&6; } ++ { echo "$as_me:$LINENO: result: $XSLTPROC" >&5 ++echo "${ECHO_T}$XSLTPROC" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -35579,24 +35726,24 @@ fi + jh_found_xmlcatalog=true + XML_CATALOG_FILE="$with_xml_catalog" + +- { $as_echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 +-$as_echo_n "checking for XML catalog ($XML_CATALOG_FILE)... " >&6; } ++ { echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 ++echo $ECHO_N "checking for XML catalog ($XML_CATALOG_FILE)... $ECHO_C" >&6; } + if test -f "$XML_CATALOG_FILE"; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } + else + jh_found_xmlcatalog=false +- { $as_echo "$as_me:$LINENO: result: not found" >&5 +-$as_echo "not found" >&6; } ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } + fi + + # check for the xmlcatalog program + # Extract the first word of "xmlcatalog", so it can be a program name with args. + set dummy xmlcatalog; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_XMLCATALOG+set}" = set; then +- $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $XMLCATALOG in + [\\/]* | ?:[\\/]*) +@@ -35611,7 +35758,7 @@ do + for ac_exec_ext in '' $ac_executable_extensions; do + 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" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +@@ -35624,11 +35771,11 @@ esac + fi + XMLCATALOG=$ac_cv_path_XMLCATALOG + if test -n "$XMLCATALOG"; then +- { $as_echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 +-$as_echo "$XMLCATALOG" >&6; } ++ { echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 ++echo "${ECHO_T}$XMLCATALOG" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + +@@ -35643,44 +35790,42 @@ fi + fi + + +- { $as_echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 +-$as_echo_n "checking for DocBook XML DTD V4.1.2 in XML catalog... " >&6; } ++ { echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 ++echo $ECHO_N "checking for DocBook XML DTD V4.1.2 in XML catalog... $ECHO_C" >&6; } + if $jh_found_xmlcatalog && \ +- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 ++ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 + ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.1.2//EN" >&2) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: not found" >&5 +-$as_echo "not found" >&6; } ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } + enable_man=no + fi + + +- { $as_echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 +-$as_echo_n "checking for DocBook XSL Stylesheets in XML catalog... " >&6; } ++ { echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets in XML catalog" >&5 ++echo $ECHO_N "checking for DocBook XSL Stylesheets in XML catalog... $ECHO_C" >&6; } + if $jh_found_xmlcatalog && \ +- { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 ++ { (echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 + ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" >&2) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- { $as_echo "$as_me:$LINENO: result: found" >&5 +-$as_echo "found" >&6; } ++ { echo "$as_me:$LINENO: result: found" >&5 ++echo "${ECHO_T}found" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: not found" >&5 +-$as_echo "not found" >&6; } ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } + enable_man=no + fi fi @@ -43089,432 +25105,1982 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure ENABLE_MAN_TRUE= ENABLE_MAN_FALSE='#' else -@@ -35811,6 +33411,13 @@ +@@ -35727,12 +35872,11 @@ _ACEOF + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( +- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( +- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac +@@ -35765,12 +35909,12 @@ $as_echo "$as_me: WARNING: cache variabl + if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && +- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 +-$as_echo "$as_me: updating cache $cache_file" >&6;} ++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else +- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} ++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache +@@ -35786,7 +35930,7 @@ ac_ltlibobjs= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' +- ac_i=`$as_echo "$ac_i" | sed "$ac_script"` ++ ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" +@@ -35798,510 +35942,530 @@ LTLIBOBJS=$ac_ltlibobjs + + + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. ++echo "$as_me: error: conditional \"AMDEP\" was never defined. 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 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_STATIC\" was never defined. + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"ENABLE_STATIC\" was never defined. ++echo "$as_me: error: conditional \"am__fastdepCC\" 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 - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. ++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 -@@ -35832,6 +33439,20 @@ +-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++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 -+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. + if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. ++echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. ++echo "$as_me: error: conditional \"HAVE_CXX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_OBJC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. ++echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -@@ -35874,6 +33495,13 @@ +-$as_echo "$as_me: error: conditional \"HAVE_OBJC\" was never defined. ++echo "$as_me: error: conditional \"am__fastdepCCAS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. ++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. ++echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined. ++echo "$as_me: error: conditional \"OS_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"OS_UNIX\" was never defined. ++echo "$as_me: error: conditional \"OS_UNIX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"OS_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"OS_LINUX\" was never defined. ++echo "$as_me: error: conditional \"OS_LINUX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. ++echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi - if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -@@ -36690,6 +34318,7 @@ +-$as_echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined. ++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. ++echo "$as_me: error: conditional \"DISABLE_EXPLICIT_DEPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_GDIPLUS_LOADERS_TRUE}" && test -z "${BUILD_GDIPLUS_LOADERS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. ++echo "$as_me: error: conditional \"BUILD_GDIPLUS_LOADERS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_DYNAMIC_MODULES_TRUE}" && test -z "${BUILD_DYNAMIC_MODULES_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. ++echo "$as_me: error: conditional \"BUILD_DYNAMIC_MODULES\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_PNG_TRUE}" && test -z "${INCLUDE_PNG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNG\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNG\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_PNG\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_PNG\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_BMP_TRUE}" && test -z "${INCLUDE_BMP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_BMP\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_BMP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_BMP\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_BMP\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_WBMP_TRUE}" && test -z "${INCLUDE_WBMP_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_WBMP\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_WBMP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_WBMP\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_WBMP\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_GIF_TRUE}" && test -z "${INCLUDE_GIF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GIF\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GIF\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_GIF\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_GIF\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_ICO_TRUE}" && test -z "${INCLUDE_ICO_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICO\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICO\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_ICO\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_ICO\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_ANI_TRUE}" && test -z "${INCLUDE_ANI_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ANI\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ANI\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_ANI\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_ANI\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_JPEG_TRUE}" && test -z "${INCLUDE_JPEG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JPEG\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JPEG\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_JPEG\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_JPEG\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_PNM_TRUE}" && test -z "${INCLUDE_PNM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNM\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PNM\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_PNM\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_PNM\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_RAS_TRUE}" && test -z "${INCLUDE_RAS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_RAS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_RAS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_RAS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_RAS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_TIFF_TRUE}" && test -z "${INCLUDE_TIFF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIFF\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TIFF\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_TIFF\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_TIFF\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_XPM_TRUE}" && test -z "${INCLUDE_XPM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_XPM\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_XPM\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_XPM\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_XPM\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_XBM_TRUE}" && test -z "${INCLUDE_XBM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_XBM\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_XBM\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_XBM\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_XBM\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_TGA_TRUE}" && test -z "${INCLUDE_TGA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_TGA\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_TGA\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_TGA\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_TGA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_PCX_TRUE}" && test -z "${INCLUDE_PCX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_PCX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_PCX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_PCX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_ICNS_TRUE}" && test -z "${INCLUDE_ICNS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_ICNS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_ICNS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_JASPER_TRUE}" && test -z "${INCLUDE_JASPER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_GDIPLUS_TRUE}" && test -z "${INCLUDE_GDIPLUS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_GDIPLUS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_GDIPLUS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. ++echo "$as_me: error: conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_AM_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_CEDILLA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IME\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_IME\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_INUKTITUT\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_IPA\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_IPA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_MULTIPRESS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_THAI\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_THAI\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_TI_ER\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_TI_ET\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_VIQR\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_VIQR\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"INCLUDE_IM_XIM\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. ++echo "$as_me: error: conditional \"INCLUDE_IM_XIM\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_TIFF_TRUE}" && test -z "${HAVE_TIFF_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_TIFF\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_TIFF\" was never defined. ++echo "$as_me: error: conditional \"HAVE_TIFF\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_PNG\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. ++echo "$as_me: error: conditional \"HAVE_PNG\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_JPEG_TRUE}" && test -z "${HAVE_JPEG_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JPEG\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JPEG\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. ++echo "$as_me: error: conditional \"HAVE_JPEG\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_JASPER_TRUE}" && test -z "${HAVE_JASPER_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. ++echo "$as_me: error: conditional \"HAVE_JASPER\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_MEDIALIB_TRUE}" && test -z "${USE_MEDIALIB_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_MEDIALIB\" was never defined. ++echo "$as_me: error: conditional \"USE_MEDIALIB\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_MEDIALIB25_TRUE}" && test -z "${USE_MEDIALIB25_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB25\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_MEDIALIB25\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_MEDIALIB25\" was never defined. ++echo "$as_me: error: conditional \"USE_MEDIALIB25\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_MMX_TRUE}" && test -z "${USE_MMX_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_MMX\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_MMX\" was never defined. ++echo "$as_me: error: conditional \"USE_MMX\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. ++echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. ++echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. ++echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_X11\" was never defined. ++echo "$as_me: error: conditional \"USE_X11\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"XINPUT_XFREE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. ++echo "$as_me: error: conditional \"XINPUT_XFREE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_X11\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_X11\" was never defined. ++echo "$as_me: error: conditional \"USE_X11\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_X11R6\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. ++echo "$as_me: error: conditional \"HAVE_X11R6\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_WIN32\" was never defined. ++echo "$as_me: error: conditional \"USE_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_WIN32\" was never defined. ++echo "$as_me: error: conditional \"USE_WIN32\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. ++echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_QUARTZ\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. ++echo "$as_me: error: conditional \"USE_QUARTZ\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. ++echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"USE_DIRECTFB\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. ++echo "$as_me: error: conditional \"USE_DIRECTFB\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. ++echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CUPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. ++echo "$as_me: error: conditional \"HAVE_CUPS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${TEST_PRINT_BACKEND_TRUE}" && test -z "${TEST_PRINT_BACKEND_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"TEST_PRINT_BACKEND\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"TEST_PRINT_BACKEND\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"TEST_PRINT_BACKEND\" was never defined. ++echo "$as_me: error: conditional \"TEST_PRINT_BACKEND\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. ++echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. ++echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. ++echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then +- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined. ++ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MAN\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +-$as_echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined. ++echo "$as_me: error: conditional \"ENABLE_MAN\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + + : ${CONFIG_STATUS=./config.status} +-ac_write_fail=0 + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++echo "$as_me: creating $CONFIG_STATUS" >&6;} ++cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL + # Generated by $as_me. + # Run this file to recreate the current configuration. +@@ -36314,7 +36478,7 @@ ac_cs_silent=false + SHELL=\${CONFIG_SHELL-$SHELL} + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + ## --------------------- ## + ## M4sh Initialization. ## + ## --------------------- ## +@@ -36324,7 +36488,7 @@ DUALCASE=1; export DUALCASE # for MKS sh + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which ++ # 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 +@@ -36346,45 +36510,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE + as_cr_digits='0123456789' + as_cr_alnum=$as_cr_Letters$as_cr_digits + +-as_nl=' +-' +-export as_nl +-# Printing a long string crashes Solaris 7 /usr/bin/printf. +-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +- as_echo='printf %s\n' +- as_echo_n='printf %s' +-else +- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then +- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' +- as_echo_n='/usr/ucb/echo -n' +- else +- as_echo_body='eval expr "X$1" : "X\\(.*\\)"' +- as_echo_n_body='eval +- arg=$1; +- case $arg in +- *"$as_nl"*) +- expr "X$arg" : "X\\(.*\\)$as_nl"; +- arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; +- esac; +- expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" +- ' +- export as_echo_n_body +- as_echo_n='sh -c $as_echo_n_body as_echo' +- fi +- export as_echo_body +- as_echo='sh -c $as_echo_body as_echo' +-fi +- + # The user is always right. + if test "${PATH_SEPARATOR+set}" != set; then +- PATH_SEPARATOR=: +- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { +- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || +- PATH_SEPARATOR=';' +- } ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh + fi + + # Support unset when possible. +@@ -36400,6 +36536,8 @@ fi + # there to prevent editors from complaining about space-tab. + # (If _AS_PATH_WALK were called with IFS unset, it would disable word + # splitting by setting IFS to empty value.) ++as_nl=' ++' + IFS=" "" $as_nl" + + # Find who we are. Look in the path if we contain no directory separator. +@@ -36422,7 +36560,7 @@ if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } + fi + +@@ -36435,10 +36573,17 @@ PS2='> ' + PS4='+ ' + + # NLS nuisances. +-LC_ALL=C +-export LC_ALL +-LANGUAGE=C +-export LANGUAGE ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ fi ++done + + # Required to use basename. + if expr a : '\(a\)' >/dev/null 2>&1 && +@@ -36460,7 +36605,7 @@ as_me=`$as_basename -- "$0" || + $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X/"$0" | ++echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q +@@ -36511,7 +36656,7 @@ $as_unset CDPATH + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || +- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems +@@ -36539,6 +36684,7 @@ case `echo -n x` in + *) + ECHO_N='-n';; + esac ++ + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +@@ -36551,22 +36697,19 @@ if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file + else + rm -f conf$$.dir +- mkdir conf$$.dir 2>/dev/null ++ mkdir conf$$.dir + fi +-if (echo >conf$$.file) 2>/dev/null; then +- if ln -s conf$$.file conf$$ 2>/dev/null; then +- as_ln_s='ln -s' +- # ... but there are two gotchas: +- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. +- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. +- # In both cases, we have to default to `cp -p'. +- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -p' +- elif ln conf$$.file conf$$ 2>/dev/null; then +- as_ln_s=ln +- else ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +- fi ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln + else + as_ln_s='cp -p' + fi +@@ -36591,10 +36734,10 @@ else + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then +- test -d "$1/."; ++ test -d "$1/."; + else + case $1 in +- -*)set "./$1";; ++ -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi +@@ -36617,7 +36760,7 @@ exec 6>&1 + # values after options handling. + ac_log=" + This file was extended by gtk+ $as_me 2.14.7, which was +-generated by GNU Autoconf 2.63. Invocation command line was ++generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -36630,16 +36773,7 @@ on `(hostname || uname -n) 2>/dev/null | + + _ACEOF + +-case $ac_config_files in *" +-"*) set x $ac_config_files; shift; ac_config_files=$*;; +-esac +- +-case $ac_config_headers in *" +-"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +-esac +- +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<_ACEOF + # Files that config.status was made for. + config_files="$ac_config_files" + config_headers="$ac_config_headers" +@@ -36647,23 +36781,22 @@ config_commands="$ac_config_commands" + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + ac_cs_usage="\ + \`$as_me' instantiates files from templates according to the + current configuration. + +-Usage: $0 [OPTION]... [FILE]... ++Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit +- -q, --quiet, --silent +- do not print progress messages ++ -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions +- --file=FILE[:TEMPLATE] +- instantiate the configuration file FILE +- --header=FILE[:TEMPLATE] +- instantiate the configuration header FILE ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE + + Configuration files: + $config_files +@@ -36677,25 +36810,25 @@ $config_commands + Report bugs to <bug-autoconf@gnu.org>." + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<_ACEOF + ac_cs_version="\\ + gtk+ config.status 2.14.7 +-configured by $0, generated by GNU Autoconf 2.63, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.61, ++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +-Copyright (C) 2008 Free Software Foundation, Inc. ++Copyright (C) 2006 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +-AWK='$AWK' +-test -n "\$AWK" || AWK=awk +MKDIR_P='$MKDIR_P' - AWK='$AWK' - test -n "\$AWK" || AWK=awk _ACEOF -@@ -36794,6 +34423,359 @@ - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-# The default lists apply if the user does not specify any file. ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If no file are specified by the user, then we need to provide default ++# value. By we need to know if files were specified by the user. + ac_need_defaults=: + while test $# != 0 + do +@@ -36717,36 +36850,30 @@ do + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) +- $as_echo "$ac_cs_version"; exit ;; ++ echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift +- case $ac_optarg in +- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ++ CONFIG_FILES="$CONFIG_FILES $ac_optarg" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift +- case $ac_optarg in +- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; +- esac +- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header +- { $as_echo "$as_me: error: ambiguous option: $1 ++ { echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) +- $as_echo "$ac_cs_usage"; exit ;; ++ echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; -+# 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 + # This is an error. +- -*) { $as_echo "$as_me: error: unrecognized option: $1 ++ -*) { echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + +@@ -36765,29 +36892,27 @@ if $ac_cs_silent; then + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<_ACEOF + if \$ac_cs_recheck; then +- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +- shift +- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 +- CONFIG_SHELL='$SHELL' ++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 ++ CONFIG_SHELL=$SHELL + export CONFIG_SHELL +- exec "\$@" ++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + fi + + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + exec 5>>config.log + { + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX + ## Running $as_me. ## + _ASBOX +- $as_echo "$ac_log" ++ echo "$ac_log" + } >&5 + + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<_ACEOF + # + # INIT-COMMANDS + # +@@ -36829,7 +36954,7 @@ fi + + _ACEOF + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + + # Handling of arguments. + for ac_config_target in $ac_config_targets +@@ -36910,8 +37035,8 @@ do + "contrib/gdk-pixbuf-xlib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/Makefile" ;; + "contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc") CONFIG_FILES="$CONFIG_FILES contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc" ;; + +- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 ++echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac + done +@@ -36952,144 +37077,536 @@ $debug || + (umask 077 && mkdir "$tmp") + } || + { +- $as_echo "$as_me: cannot create a temporary directory in ." >&2 ++ echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } + } + +-# Set up the scripts for CONFIG_FILES section. +-# No need to generate them if there are no CONFIG_FILES. +-# This happens for instance with `./config.status config.h'. ++# ++# Set up the sed scripts for CONFIG_FILES section. ++# + -+sed_quote_subst='$sed_quote_subst' -+double_quote_subst='$double_quote_subst' -+delay_variable_subst='$delay_variable_subst' -+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' -+AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' -+DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' -+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' -+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' -+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' -+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' -+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' -+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' -+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' -+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' -+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' -+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' -+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' -+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' -+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' -+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' -+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' -+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' -+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' -+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' -+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' -+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' -+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' -+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' -+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' -+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' -+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' -+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' -+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' -+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' -+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' -+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' -+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' -+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' -+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' -+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' -+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' -+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' -+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' -+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' -+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' -+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' -+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' -+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' -+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' -+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' -+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' -+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' -+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' -+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' -+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' -+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' -+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' -+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' -+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' -+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' -+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' -+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' -+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' -+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' -+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' -+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' -+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' -+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' -+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' -+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' -+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' -+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' -+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' -+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' -+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' -+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' -+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' -+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' -+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' -+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`' -+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`' -+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`' -+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`' -+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`' -+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`' -+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`' ++# No need to generate the scripts if there are no CONFIG_FILES. ++# This happens for instance when ./config.status config.h + if test -n "$CONFIG_FILES"; then + ++_ACEOF + +-ac_cr=' ' +-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` +-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then +- ac_cs_awk_cr='\\r' +-else +- ac_cs_awk_cr=$ac_cr + -+LTCC='$LTCC' -+LTCFLAGS='$LTCFLAGS' -+compiler='$compiler_DEFAULT' + -+# Quote evaled strings. -+for var in SED \ -+GREP \ -+EGREP \ -+FGREP \ -+LD \ -+NM \ -+LN_S \ -+lt_SP2NL \ -+lt_NL2SP \ -+reload_flag \ -+deplibs_check_method \ -+file_magic_cmd \ -+AR \ -+AR_FLAGS \ -+STRIP \ -+RANLIB \ -+CC \ -+CFLAGS \ -+compiler \ -+lt_cv_sys_global_symbol_pipe \ -+lt_cv_sys_global_symbol_to_cdecl \ -+lt_cv_sys_global_symbol_to_c_name_address \ -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+SHELL \ -+ECHO \ -+lt_prog_compiler_no_builtin_flag \ -+lt_prog_compiler_wl \ -+lt_prog_compiler_pic \ -+lt_prog_compiler_static \ -+lt_cv_prog_compiler_c_o \ -+need_locks \ -+DSYMUTIL \ -+NMEDIT \ -+LIPO \ -+OTOOL \ -+OTOOL64 \ -+shrext_cmds \ -+export_dynamic_flag_spec \ -+whole_archive_flag_spec \ -+compiler_needs_object \ -+with_gnu_ld \ -+allow_undefined_flag \ -+no_undefined_flag \ -+hardcode_libdir_flag_spec \ -+hardcode_libdir_flag_spec_ld \ -+hardcode_libdir_separator \ -+fix_srcfile_path \ -+exclude_expsyms \ -+include_expsyms \ -+file_list_spec \ -+variables_saved_for_relink \ -+libname_spec \ -+library_names_spec \ -+soname_spec \ -+finish_eval \ -+old_striplib \ -+striplib \ -+compiler_lib_search_dirs \ -+predep_objects \ -+postdep_objects \ -+predeps \ -+postdeps \ -+compiler_lib_search_path \ -+LD_CXX \ -+compiler_CXX \ -+lt_prog_compiler_no_builtin_flag_CXX \ -+lt_prog_compiler_wl_CXX \ -+lt_prog_compiler_pic_CXX \ -+lt_prog_compiler_static_CXX \ -+lt_cv_prog_compiler_c_o_CXX \ -+export_dynamic_flag_spec_CXX \ -+whole_archive_flag_spec_CXX \ -+compiler_needs_object_CXX \ -+with_gnu_ld_CXX \ -+allow_undefined_flag_CXX \ -+no_undefined_flag_CXX \ -+hardcode_libdir_flag_spec_CXX \ -+hardcode_libdir_flag_spec_ld_CXX \ -+hardcode_libdir_separator_CXX \ -+fix_srcfile_path_CXX \ -+exclude_expsyms_CXX \ -+include_expsyms_CXX \ -+file_list_spec_CXX \ -+compiler_lib_search_dirs_CXX \ -+predep_objects_CXX \ -+postdep_objects_CXX \ -+predeps_CXX \ -+postdeps_CXX \ -+compiler_lib_search_path_CXX; do -+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ *[\\\\\\\`\\"\\\$]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++SHELL!$SHELL$ac_delim ++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim ++PACKAGE_NAME!$PACKAGE_NAME$ac_delim ++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim ++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim ++PACKAGE_STRING!$PACKAGE_STRING$ac_delim ++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim ++exec_prefix!$exec_prefix$ac_delim ++prefix!$prefix$ac_delim ++program_transform_name!$program_transform_name$ac_delim ++bindir!$bindir$ac_delim ++sbindir!$sbindir$ac_delim ++libexecdir!$libexecdir$ac_delim ++datarootdir!$datarootdir$ac_delim ++datadir!$datadir$ac_delim ++sysconfdir!$sysconfdir$ac_delim ++sharedstatedir!$sharedstatedir$ac_delim ++localstatedir!$localstatedir$ac_delim ++includedir!$includedir$ac_delim ++oldincludedir!$oldincludedir$ac_delim ++docdir!$docdir$ac_delim ++infodir!$infodir$ac_delim ++htmldir!$htmldir$ac_delim ++dvidir!$dvidir$ac_delim ++pdfdir!$pdfdir$ac_delim ++psdir!$psdir$ac_delim ++libdir!$libdir$ac_delim ++localedir!$localedir$ac_delim ++mandir!$mandir$ac_delim ++DEFS!$DEFS$ac_delim ++ECHO_C!$ECHO_C$ac_delim ++ECHO_N!$ECHO_N$ac_delim ++ECHO_T!$ECHO_T$ac_delim ++LIBS!$LIBS$ac_delim ++build_alias!$build_alias$ac_delim ++host_alias!$host_alias$ac_delim ++target_alias!$target_alias$ac_delim ++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim ++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim ++INSTALL_DATA!$INSTALL_DATA$ac_delim ++am__isrc!$am__isrc$ac_delim ++CYGPATH_W!$CYGPATH_W$ac_delim ++PACKAGE!$PACKAGE$ac_delim ++VERSION!$VERSION$ac_delim ++ACLOCAL!$ACLOCAL$ac_delim ++AUTOCONF!$AUTOCONF$ac_delim ++AUTOMAKE!$AUTOMAKE$ac_delim ++AUTOHEADER!$AUTOHEADER$ac_delim ++MAKEINFO!$MAKEINFO$ac_delim ++install_sh!$install_sh$ac_delim ++STRIP!$STRIP$ac_delim ++INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim ++mkdir_p!$mkdir_p$ac_delim ++AWK!$AWK$ac_delim ++SET_MAKE!$SET_MAKE$ac_delim ++am__leading_dot!$am__leading_dot$ac_delim ++AMTAR!$AMTAR$ac_delim ++am__tar!$am__tar$ac_delim ++am__untar!$am__untar$ac_delim ++GTK_MAJOR_VERSION!$GTK_MAJOR_VERSION$ac_delim ++GTK_MINOR_VERSION!$GTK_MINOR_VERSION$ac_delim ++GTK_MICRO_VERSION!$GTK_MICRO_VERSION$ac_delim ++GTK_INTERFACE_AGE!$GTK_INTERFACE_AGE$ac_delim ++GTK_BINARY_AGE!$GTK_BINARY_AGE$ac_delim ++GTK_API_VERSION!$GTK_API_VERSION$ac_delim ++GTK_VERSION!$GTK_VERSION$ac_delim ++GTK_BINARY_VERSION!$GTK_BINARY_VERSION$ac_delim ++LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim ++LT_CURRENT_MINUS_AGE!$LT_CURRENT_MINUS_AGE$ac_delim ++GAIL_LT_VERSION_INFO!$GAIL_LT_VERSION_INFO$ac_delim ++GAIL_LT_CURRENT_MINUS_AGE!$GAIL_LT_CURRENT_MINUS_AGE$ac_delim ++GDK_PIXBUF_MAJOR!$GDK_PIXBUF_MAJOR$ac_delim ++GDK_PIXBUF_MINOR!$GDK_PIXBUF_MINOR$ac_delim ++GDK_PIXBUF_MICRO!$GDK_PIXBUF_MICRO$ac_delim ++GDK_PIXBUF_VERSION!$GDK_PIXBUF_VERSION$ac_delim ++GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim ++build!$build$ac_delim ++build_cpu!$build_cpu$ac_delim ++build_vendor!$build_vendor$ac_delim ++build_os!$build_os$ac_delim ++host!$host$ac_delim ++host_cpu!$host_cpu$ac_delim ++host_vendor!$host_vendor$ac_delim ++host_os!$host_os$ac_delim ++LIB_EXE_MACHINE_FLAG!$LIB_EXE_MACHINE_FLAG$ac_delim ++CC!$CC$ac_delim ++CFLAGS!$CFLAGS$ac_delim ++LDFLAGS!$LDFLAGS$ac_delim ++CPPFLAGS!$CPPFLAGS$ac_delim ++ac_ct_CC!$ac_ct_CC$ac_delim ++EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++DEPDIR!$DEPDIR$ac_delim ++am__include!$am__include$ac_delim ++am__quote!$am__quote$ac_delim ++AMDEP_TRUE!$AMDEP_TRUE$ac_delim ++AMDEP_FALSE!$AMDEP_FALSE$ac_delim ++_ACEOF ++ ++ 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 ++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 + -+# Double-quote double-evaled strings. -+for var in reload_cmds \ -+old_postinstall_cmds \ -+old_postuninstall_cmds \ -+old_archive_cmds \ -+extract_expsyms_cmds \ -+old_archive_from_new_cmds \ -+old_archive_from_expsyms_cmds \ -+archive_cmds \ -+archive_expsym_cmds \ -+module_cmds \ -+module_expsym_cmds \ -+export_symbols_cmds \ -+prelink_cmds \ -+postinstall_cmds \ -+postuninstall_cmds \ -+finish_cmds \ -+sys_lib_search_path_spec \ -+sys_lib_dlsearch_path_spec \ -+old_archive_cmds_CXX \ -+old_archive_from_new_cmds_CXX \ -+old_archive_from_expsyms_cmds_CXX \ -+archive_cmds_CXX \ -+archive_expsym_cmds_CXX \ -+module_cmds_CXX \ -+module_expsym_cmds_CXX \ -+export_symbols_cmds_CXX \ -+prelink_cmds_CXX; do -+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ *[\\\\\\\`\\"\\\$]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac -+done -+ -+# Fix-up fallback echo if it was mangled by the above quoting rules. -+case \$lt_ECHO in -+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` -+ ;; -+esac -+ -+ac_aux_dir='$ac_aux_dir' -+xsi_shell='$xsi_shell' -+lt_shell_append='$lt_shell_append' -+ -+# See if we are running on zsh, and set the options which allow our -+# commands through without removal of \ escapes INIT. -+if test -n "\${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST ++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 + +-echo 'BEGIN {' >"$tmp/subs1.awk" && ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++_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 ++CEOF$ac_eof + _ACEOF + + +-{ +- echo "cat >conf$$subs.awk <<_ACEOF" && +- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && +- echo "_ACEOF" +-} >conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do +- . ./conf$$subs.sh || +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } ++ cat >conf$$subs.sed <<_ACEOF ++AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim ++CCDEPMODE!$CCDEPMODE$ac_delim ++am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim ++am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim ++ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim ++ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim ++CXX!$CXX$ac_delim ++ac_ct_CXX!$ac_ct_CXX$ac_delim ++CXXFLAGS!$CXXFLAGS$ac_delim ++CXXDEPMODE!$CXXDEPMODE$ac_delim ++am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim ++am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim ++HAVE_CXX_TRUE!$HAVE_CXX_TRUE$ac_delim ++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 ++ECHO!$ECHO$ac_delim ++AR!$AR$ac_delim ++RANLIB!$RANLIB$ac_delim ++DSYMUTIL!$DSYMUTIL$ac_delim ++NMEDIT!$NMEDIT$ac_delim ++DLLTOOL!$DLLTOOL$ac_delim ++AS!$AS$ac_delim ++OBJDUMP!$OBJDUMP$ac_delim ++CPP!$CPP$ac_delim ++CXXCPP!$CXXCPP$ac_delim ++F77!$F77$ac_delim ++FFLAGS!$FFLAGS$ac_delim ++ac_ct_F77!$ac_ct_F77$ac_delim ++LIBTOOL!$LIBTOOL$ac_delim ++CCAS!$CCAS$ac_delim ++CCASFLAGS!$CCASFLAGS$ac_delim ++CCASDEPMODE!$CCASDEPMODE$ac_delim ++am__fastdepCCAS_TRUE!$am__fastdepCCAS_TRUE$ac_delim ++am__fastdepCCAS_FALSE!$am__fastdepCCAS_FALSE$ac_delim ++NM!$NM$ac_delim ++MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim ++MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim ++MAINT!$MAINT$ac_delim ++PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim ++PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim ++OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim ++OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim ++OS_UNIX_TRUE!$OS_UNIX_TRUE$ac_delim ++OS_UNIX_FALSE!$OS_UNIX_FALSE$ac_delim ++OS_LINUX_TRUE!$OS_LINUX_TRUE$ac_delim ++OS_LINUX_FALSE!$OS_LINUX_FALSE$ac_delim ++WINDRES!$WINDRES$ac_delim ++ms_librarian!$ms_librarian$ac_delim ++MS_LIB_AVAILABLE_TRUE!$MS_LIB_AVAILABLE_TRUE$ac_delim ++MS_LIB_AVAILABLE_FALSE!$MS_LIB_AVAILABLE_FALSE$ac_delim ++gdktarget!$gdktarget$ac_delim ++gdktargetlib!$gdktargetlib$ac_delim ++gtktargetlib!$gtktargetlib$ac_delim ++PKG_CONFIG!$PKG_CONFIG$ac_delim ++BASE_DEPENDENCIES_CFLAGS!$BASE_DEPENDENCIES_CFLAGS$ac_delim ++BASE_DEPENDENCIES_LIBS!$BASE_DEPENDENCIES_LIBS$ac_delim ++LIBTOOL_EXPORT_OPTIONS!$LIBTOOL_EXPORT_OPTIONS$ac_delim ++DISABLE_EXPLICIT_DEPS_TRUE!$DISABLE_EXPLICIT_DEPS_TRUE$ac_delim ++DISABLE_EXPLICIT_DEPS_FALSE!$DISABLE_EXPLICIT_DEPS_FALSE$ac_delim ++PERL!$PERL$ac_delim ++INDENT!$INDENT$ac_delim ++REBUILD!$REBUILD$ac_delim ++USE_NLS!$USE_NLS$ac_delim ++MSGFMT!$MSGFMT$ac_delim ++MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim ++GMSGFMT!$GMSGFMT$ac_delim ++XGETTEXT!$XGETTEXT$ac_delim ++CATALOGS!$CATALOGS$ac_delim ++CATOBJEXT!$CATOBJEXT$ac_delim ++DATADIRNAME!$DATADIRNAME$ac_delim ++GMOFILES!$GMOFILES$ac_delim ++INSTOBJEXT!$INSTOBJEXT$ac_delim ++INTLLIBS!$INTLLIBS$ac_delim ++PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim ++PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim ++POFILES!$POFILES$ac_delim ++POSUB!$POSUB$ac_delim ++MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim ++GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim ++GLIB_LIBS!$GLIB_LIBS$ac_delim ++GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim ++GOBJECT_QUERY!$GOBJECT_QUERY$ac_delim ++GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim ++GDK_WLIBS!$GDK_WLIBS$ac_delim ++BUILD_GDIPLUS_LOADERS_TRUE!$BUILD_GDIPLUS_LOADERS_TRUE$ac_delim ++BUILD_GDIPLUS_LOADERS_FALSE!$BUILD_GDIPLUS_LOADERS_FALSE$ac_delim ++LIBTIFF!$LIBTIFF$ac_delim ++LIBJPEG!$LIBJPEG$ac_delim ++LIBPNG!$LIBPNG$ac_delim ++LIBJASPER!$LIBJASPER$ac_delim ++BUILD_DYNAMIC_MODULES_TRUE!$BUILD_DYNAMIC_MODULES_TRUE$ac_delim ++BUILD_DYNAMIC_MODULES_FALSE!$BUILD_DYNAMIC_MODULES_FALSE$ac_delim ++_ACEOF + +- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` +- if test $ac_delim_n = $ac_delim_num; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { { 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 +-rm -f conf$$subs.sh + +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++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 + -+ -+ PACKAGE='$PACKAGE' -+ VERSION='$VERSION' -+ TIMESTAMP='$TIMESTAMP' -+ RM='$RM' -+ ofile='$ofile' -+ -+ -+ -+ac_aux_dir='$ac_aux_dir' -+ -+ -+ -+ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++_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 ++CEOF$ac_eof + _ACEOF +-sed -n ' +-h +-s/^/S["/; s/!.*/"]=/ +-p +-g +-s/^[^!]*!// +-:repl +-t repl +-s/'"$ac_delim"'$// +-t delim +-:nl +-h +-s/\(.\{148\}\).*/\1/ +-t more1 +-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +-p +-n +-b repl +-:more1 +-s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +-p +-g +-s/.\{148\}// +-t nl +-:delim +-h +-s/\(.\{148\}\).*/\1/ +-t more2 +-s/["\\]/\\&/g; s/^/"/; s/$/"/ +-p +-b +-:more2 +-s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +-p +-g +-s/.\{148\}// +-t delim +-' <conf$$subs.awk | sed ' +-/^[^""]/{ +- N +- s/\n// +-} +-' >>$CONFIG_STATUS || ac_write_fail=1 +-rm -f conf$$subs.awk +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-_ACAWK +-cat >>"\$tmp/subs1.awk" <<_ACAWK && +- for (key in S) S_is_set[key] = 1 +- FS = "" - if test "x$gdktarget" = "xx11" ; then - gdk_windowing=' -@@ -36837,6 +34819,7 @@ - case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -+ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; - "gdk/gdkconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gdk/gdkconfig.h" ;; -@@ -37405,6 +35388,11 @@ +-} +-{ +- line = $ 0 +- nfields = split(line, field, "@") +- substed = 0 +- len = length(field[1]) +- for (i = 2; i < nfields; i++) { +- key = field[i] +- keylen = length(key) +- if (S_is_set[key]) { +- value = S[key] +- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) +- len += length(value) + length(field[++i]) +- substed = 1 +- } else +- len += 1 + keylen +- } + +- print line +-} ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++INCLUDED_LOADER_OBJ!$INCLUDED_LOADER_OBJ$ac_delim ++INCLUDED_LOADER_DEFINE!$INCLUDED_LOADER_DEFINE$ac_delim ++INCLUDE_PNG_TRUE!$INCLUDE_PNG_TRUE$ac_delim ++INCLUDE_PNG_FALSE!$INCLUDE_PNG_FALSE$ac_delim ++INCLUDE_BMP_TRUE!$INCLUDE_BMP_TRUE$ac_delim ++INCLUDE_BMP_FALSE!$INCLUDE_BMP_FALSE$ac_delim ++INCLUDE_WBMP_TRUE!$INCLUDE_WBMP_TRUE$ac_delim ++INCLUDE_WBMP_FALSE!$INCLUDE_WBMP_FALSE$ac_delim ++INCLUDE_GIF_TRUE!$INCLUDE_GIF_TRUE$ac_delim ++INCLUDE_GIF_FALSE!$INCLUDE_GIF_FALSE$ac_delim ++INCLUDE_ICO_TRUE!$INCLUDE_ICO_TRUE$ac_delim ++INCLUDE_ICO_FALSE!$INCLUDE_ICO_FALSE$ac_delim ++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 ++INCLUDE_RAS_TRUE!$INCLUDE_RAS_TRUE$ac_delim ++INCLUDE_RAS_FALSE!$INCLUDE_RAS_FALSE$ac_delim ++INCLUDE_TIFF_TRUE!$INCLUDE_TIFF_TRUE$ac_delim ++INCLUDE_TIFF_FALSE!$INCLUDE_TIFF_FALSE$ac_delim ++INCLUDE_XPM_TRUE!$INCLUDE_XPM_TRUE$ac_delim ++INCLUDE_XPM_FALSE!$INCLUDE_XPM_FALSE$ac_delim ++INCLUDE_XBM_TRUE!$INCLUDE_XBM_TRUE$ac_delim ++INCLUDE_XBM_FALSE!$INCLUDE_XBM_FALSE$ac_delim ++INCLUDE_TGA_TRUE!$INCLUDE_TGA_TRUE$ac_delim ++INCLUDE_TGA_FALSE!$INCLUDE_TGA_FALSE$ac_delim ++INCLUDE_PCX_TRUE!$INCLUDE_PCX_TRUE$ac_delim ++INCLUDE_PCX_FALSE!$INCLUDE_PCX_FALSE$ac_delim ++INCLUDE_ICNS_TRUE!$INCLUDE_ICNS_TRUE$ac_delim ++INCLUDE_ICNS_FALSE!$INCLUDE_ICNS_FALSE$ac_delim ++INCLUDE_JASPER_TRUE!$INCLUDE_JASPER_TRUE$ac_delim ++INCLUDE_JASPER_FALSE!$INCLUDE_JASPER_FALSE$ac_delim ++INCLUDE_GDIPLUS_TRUE!$INCLUDE_GDIPLUS_TRUE$ac_delim ++INCLUDE_GDIPLUS_FALSE!$INCLUDE_GDIPLUS_FALSE$ac_delim ++HAVE_INCLUDED_IMMMODULES_TRUE!$HAVE_INCLUDED_IMMMODULES_TRUE$ac_delim ++HAVE_INCLUDED_IMMMODULES_FALSE!$HAVE_INCLUDED_IMMMODULES_FALSE$ac_delim ++INCLUDED_IMMODULE_OBJ!$INCLUDED_IMMODULE_OBJ$ac_delim ++INCLUDED_IMMODULE_DEFINE!$INCLUDED_IMMODULE_DEFINE$ac_delim ++INCLUDE_IM_AM_ET_TRUE!$INCLUDE_IM_AM_ET_TRUE$ac_delim ++INCLUDE_IM_AM_ET_FALSE!$INCLUDE_IM_AM_ET_FALSE$ac_delim ++INCLUDE_IM_CEDILLA_TRUE!$INCLUDE_IM_CEDILLA_TRUE$ac_delim ++INCLUDE_IM_CEDILLA_FALSE!$INCLUDE_IM_CEDILLA_FALSE$ac_delim ++INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE!$INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE$ac_delim ++INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE!$INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE$ac_delim ++INCLUDE_IM_IME_TRUE!$INCLUDE_IM_IME_TRUE$ac_delim ++INCLUDE_IM_IME_FALSE!$INCLUDE_IM_IME_FALSE$ac_delim ++INCLUDE_IM_INUKTITUT_TRUE!$INCLUDE_IM_INUKTITUT_TRUE$ac_delim ++INCLUDE_IM_INUKTITUT_FALSE!$INCLUDE_IM_INUKTITUT_FALSE$ac_delim ++INCLUDE_IM_IPA_TRUE!$INCLUDE_IM_IPA_TRUE$ac_delim ++INCLUDE_IM_IPA_FALSE!$INCLUDE_IM_IPA_FALSE$ac_delim ++INCLUDE_IM_MULTIPRESS_TRUE!$INCLUDE_IM_MULTIPRESS_TRUE$ac_delim ++INCLUDE_IM_MULTIPRESS_FALSE!$INCLUDE_IM_MULTIPRESS_FALSE$ac_delim ++INCLUDE_IM_THAI_TRUE!$INCLUDE_IM_THAI_TRUE$ac_delim ++INCLUDE_IM_THAI_FALSE!$INCLUDE_IM_THAI_FALSE$ac_delim ++INCLUDE_IM_TI_ER_TRUE!$INCLUDE_IM_TI_ER_TRUE$ac_delim ++INCLUDE_IM_TI_ER_FALSE!$INCLUDE_IM_TI_ER_FALSE$ac_delim ++INCLUDE_IM_TI_ET_TRUE!$INCLUDE_IM_TI_ET_TRUE$ac_delim ++INCLUDE_IM_TI_ET_FALSE!$INCLUDE_IM_TI_ET_FALSE$ac_delim ++INCLUDE_IM_VIQR_TRUE!$INCLUDE_IM_VIQR_TRUE$ac_delim ++INCLUDE_IM_VIQR_FALSE!$INCLUDE_IM_VIQR_FALSE$ac_delim ++INCLUDE_IM_XIM_TRUE!$INCLUDE_IM_XIM_TRUE$ac_delim ++INCLUDE_IM_XIM_FALSE!$INCLUDE_IM_XIM_FALSE$ac_delim ++HAVE_TIFF_TRUE!$HAVE_TIFF_TRUE$ac_delim ++HAVE_TIFF_FALSE!$HAVE_TIFF_FALSE$ac_delim ++HAVE_PNG_TRUE!$HAVE_PNG_TRUE$ac_delim ++HAVE_PNG_FALSE!$HAVE_PNG_FALSE$ac_delim ++HAVE_JPEG_TRUE!$HAVE_JPEG_TRUE$ac_delim ++HAVE_JPEG_FALSE!$HAVE_JPEG_FALSE$ac_delim ++HAVE_JASPER_TRUE!$HAVE_JASPER_TRUE$ac_delim ++HAVE_JASPER_FALSE!$HAVE_JASPER_FALSE$ac_delim ++USE_MEDIALIB_TRUE!$USE_MEDIALIB_TRUE$ac_delim ++USE_MEDIALIB_FALSE!$USE_MEDIALIB_FALSE$ac_delim ++USE_MEDIALIB25_TRUE!$USE_MEDIALIB25_TRUE$ac_delim ++USE_MEDIALIB25_FALSE!$USE_MEDIALIB25_FALSE$ac_delim ++USE_MMX_TRUE!$USE_MMX_TRUE$ac_delim ++USE_MMX_FALSE!$USE_MMX_FALSE$ac_delim ++CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim ++CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim ++GDK_PIXBUF_CSOURCE!$GDK_PIXBUF_CSOURCE$ac_delim ++GTK_UPDATE_ICON_CACHE!$GTK_UPDATE_ICON_CACHE$ac_delim ++REBUILD_PNGS!$REBUILD_PNGS$ac_delim ++XMKMF!$XMKMF$ac_delim ++X_CFLAGS!$X_CFLAGS$ac_delim ++X_PRE_LIBS!$X_PRE_LIBS$ac_delim ++X_LIBS!$X_LIBS$ac_delim ++X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim ++HAVE_X11R6_TRUE!$HAVE_X11R6_TRUE$ac_delim ++HAVE_X11R6_FALSE!$HAVE_X11R6_FALSE$ac_delim ++XINPUT_XFREE_TRUE!$XINPUT_XFREE_TRUE$ac_delim ++XINPUT_XFREE_FALSE!$XINPUT_XFREE_FALSE$ac_delim ++USE_X11_TRUE!$USE_X11_TRUE$ac_delim ++USE_X11_FALSE!$USE_X11_FALSE$ac_delim ++USE_WIN32_TRUE!$USE_WIN32_TRUE$ac_delim ++USE_WIN32_FALSE!$USE_WIN32_FALSE$ac_delim ++USE_QUARTZ_TRUE!$USE_QUARTZ_TRUE$ac_delim ++_ACEOF + +-_ACAWK ++ 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 ++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-3.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then +- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +-else +- cat +-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +-$as_echo "$as_me: error: could not setup config files machinery" >&2;} ++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 ++CEOF$ac_eof ++_ACEOF ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++USE_QUARTZ_FALSE!$USE_QUARTZ_FALSE$ac_delim ++GDK_PIXBUF_XLIB_PACKAGES!$GDK_PIXBUF_XLIB_PACKAGES$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_LIBS!$GDK_PIXBUF_XLIB_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_XLIB_EXTRA_CFLAGS!$GDK_PIXBUF_XLIB_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_XLIB_DEP_LIBS!$GDK_PIXBUF_XLIB_DEP_LIBS$ac_delim ++GDK_PIXBUF_XLIB_DEP_CFLAGS!$GDK_PIXBUF_XLIB_DEP_CFLAGS$ac_delim ++USE_DIRECTFB_TRUE!$USE_DIRECTFB_TRUE$ac_delim ++USE_DIRECTFB_FALSE!$USE_DIRECTFB_FALSE$ac_delim ++GDK_PACKAGES!$GDK_PACKAGES$ac_delim ++GDK_PRIVATE_PACKAGES!$GDK_PRIVATE_PACKAGES$ac_delim ++GDK_EXTRA_LIBS!$GDK_EXTRA_LIBS$ac_delim ++GDK_EXTRA_CFLAGS!$GDK_EXTRA_CFLAGS$ac_delim ++GDK_DEP_LIBS!$GDK_DEP_LIBS$ac_delim ++GDK_DEP_CFLAGS!$GDK_DEP_CFLAGS$ac_delim ++GDK_PIXBUF_PACKAGES!$GDK_PIXBUF_PACKAGES$ac_delim ++GDK_PIXBUF_EXTRA_LIBS!$GDK_PIXBUF_EXTRA_LIBS$ac_delim ++GDK_PIXBUF_EXTRA_CFLAGS!$GDK_PIXBUF_EXTRA_CFLAGS$ac_delim ++GDK_PIXBUF_DEP_LIBS!$GDK_PIXBUF_DEP_LIBS$ac_delim ++GDK_PIXBUF_DEP_CFLAGS!$GDK_PIXBUF_DEP_CFLAGS$ac_delim ++GTK_PACKAGES!$GTK_PACKAGES$ac_delim ++GTK_EXTRA_LIBS!$GTK_EXTRA_LIBS$ac_delim ++GTK_EXTRA_CFLAGS!$GTK_EXTRA_CFLAGS$ac_delim ++GTK_DEP_LIBS!$GTK_DEP_LIBS$ac_delim ++GTK_DEP_CFLAGS!$GTK_DEP_CFLAGS$ac_delim ++GLIB_PREFIX!$GLIB_PREFIX$ac_delim ++ATK_PREFIX!$ATK_PREFIX$ac_delim ++PANGO_PREFIX!$PANGO_PREFIX$ac_delim ++CAIRO_PREFIX!$CAIRO_PREFIX$ac_delim ++GTK_DEBUG_FLAGS!$GTK_DEBUG_FLAGS$ac_delim ++GTK_XIM_FLAGS!$GTK_XIM_FLAGS$ac_delim ++GAIL_INET_LIBS!$GAIL_INET_LIBS$ac_delim ++CUPS_CONFIG!$CUPS_CONFIG$ac_delim ++CUPS_API_MAJOR!$CUPS_API_MAJOR$ac_delim ++CUPS_API_MINOR!$CUPS_API_MINOR$ac_delim ++CUPS_CFLAGS!$CUPS_CFLAGS$ac_delim ++CUPS_LIBS!$CUPS_LIBS$ac_delim ++HAVE_CUPS_TRUE!$HAVE_CUPS_TRUE$ac_delim ++HAVE_CUPS_FALSE!$HAVE_CUPS_FALSE$ac_delim ++HAVE_HTTP_AUTHSTRING!$HAVE_HTTP_AUTHSTRING$ac_delim ++TEST_PRINT_BACKEND_TRUE!$TEST_PRINT_BACKEND_TRUE$ac_delim ++TEST_PRINT_BACKEND_FALSE!$TEST_PRINT_BACKEND_FALSE$ac_delim ++HTML_DIR!$HTML_DIR$ac_delim ++GTKDOC_CHECK!$GTKDOC_CHECK$ac_delim ++ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim ++ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim ++GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim ++GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim ++DB2HTML!$DB2HTML$ac_delim ++HAVE_DOCBOOK_TRUE!$HAVE_DOCBOOK_TRUE$ac_delim ++HAVE_DOCBOOK_FALSE!$HAVE_DOCBOOK_FALSE$ac_delim ++XSLTPROC!$XSLTPROC$ac_delim ++XML_CATALOG_FILE!$XML_CATALOG_FILE$ac_delim ++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` = 57; 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 +@@ -37105,133 +37622,19 @@ s/^[^=]*=[ ]*$// + }' + fi + +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + fi # test -n "$CONFIG_FILES" + +-# Set up the scripts for CONFIG_HEADERS section. +-# No need to generate them if there are no CONFIG_HEADERS. +-# This happens for instance with `./config.status Makefile'. +-if test -n "$CONFIG_HEADERS"; then +-cat >"$tmp/defines.awk" <<\_ACAWK || +-BEGIN { +-_ACEOF +- +-# Transform confdefs.h into an awk script `defines.awk', embedded as +-# here-document in config.status, that substitutes the proper values into +-# config.h.in to produce config.h. +- +-# Create a delimiter string that does not exist in confdefs.h, to ease +-# handling of long lines. +-ac_delim='%!_!# ' +-for ac_last_try in false false :; do +- ac_t=`sed -n "/$ac_delim/p" confdefs.h` +- if test -z "$ac_t"; then +- break +- elif $ac_last_try; then +- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} +- { (exit 1); exit 1; }; } +- else +- ac_delim="$ac_delim!$ac_delim _$ac_delim!! " +- fi +-done +- +-# For the awk script, D is an array of macro values keyed by name, +-# likewise P contains macro parameters if any. Preserve backslash +-# newline sequences. +- +-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +-sed -n ' +-s/.\{148\}/&'"$ac_delim"'/g +-t rset +-:rset +-s/^[ ]*#[ ]*define[ ][ ]*/ / +-t def +-d +-:def +-s/\\$// +-t bsnl +-s/["\\]/\\&/g +-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +-D["\1"]=" \3"/p +-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +-d +-:bsnl +-s/["\\]/\\&/g +-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +-D["\1"]=" \3\\\\\\n"\\/p +-t cont +-s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +-t cont +-d +-:cont +-n +-s/.\{148\}/&'"$ac_delim"'/g +-t clear +-:clear +-s/\\$// +-t bsnlc +-s/["\\]/\\&/g; s/^/"/; s/$/"/p +-d +-:bsnlc +-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +-b cont +-' <confdefs.h | sed ' +-s/'"$ac_delim"'/"\\\ +-"/g' >>$CONFIG_STATUS || ac_write_fail=1 +- +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +- for (key in D) D_is_set[key] = 1 +- FS = "" +-} +-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { +- line = \$ 0 +- split(line, arg, " ") +- if (arg[1] == "#") { +- defundef = arg[2] +- mac1 = arg[3] +- } else { +- defundef = substr(arg[1], 2) +- mac1 = arg[2] +- } +- split(mac1, mac2, "(") #) +- macro = mac2[1] +- prefix = substr(line, 1, index(line, defundef) - 1) +- if (D_is_set[macro]) { +- # Preserve the white space surrounding the "#". +- print prefix "define", macro P[macro] D[macro] +- next +- } else { +- # Replace #undef with comments. This is necessary, for example, +- # in the case of _POSIX_SOURCE, which is predefined and required +- # on some systems where configure will not decide to define it. +- if (defundef == "undef") { +- print "/*", prefix defundef, macro, "*/" +- next +- } +- } +-} +-{ print } +-_ACAWK +-_ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +-$as_echo "$as_me: error: could not setup config headers machinery" >&2;} +- { (exit 1); exit 1; }; } +-fi # test -n "$CONFIG_HEADERS" +- + +-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +-shift +-for ac_tag ++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS + do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; +- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} ++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 ++echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; +@@ -37260,38 +37663,26 @@ $as_echo "$as_me: error: invalid tag $ac + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || +- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} ++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 ++echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac +- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac +- ac_file_inputs="$ac_file_inputs '$ac_f'" ++ ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +- configure_input='Generated from '` +- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' +- `' by configure.' ++ configure_input="Generated from "`IFS=: ++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" +- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 +-$as_echo "$as_me: creating $ac_file" >&6;} ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} + fi +- # Neutralize special characters interpreted by sed in replacement strings. +- case $configure_input in #( +- *\&* | *\|* | *\\* ) +- ac_sed_conf_input=`$as_echo "$configure_input" | +- sed 's/[\\\\&|]/\\\\&/g'`;; #( +- *) ac_sed_conf_input=$configure_input;; +- esac + + case $ac_tag in +- *:-:* | *:-) cat >"$tmp/stdin" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ;; ++ *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac +@@ -37301,7 +37692,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$ac_file" | ++echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37327,7 +37718,7 @@ $as_echo X"$ac_file" | + as_dirs= + while :; do + case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +@@ -37336,7 +37727,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | ++echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37357,17 +37748,17 @@ $as_echo X"$as_dir" | + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. + + case "$ac_dir" in + .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) +- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. +- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; +@@ -37405,15 +37796,19 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac @@ -43525,20 +27091,213 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + esac _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -@@ -37461,6 +35449,7 @@ +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + # If the template does not know about datarootdir, expand it. + # FIXME: This hack should be removed a few years after 2.60. + ac_datarootdir_hack=; ac_datarootdir_seen= + +-ac_sed_dataroot=' +-/datarootdir/ { ++case `sed -n '/datarootdir/ { + p + q + } +@@ -37422,14 +37817,13 @@ ac_sed_dataroot=' + /@infodir@/p + /@localedir@/p + /@mandir@/p +-' +-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in ++' $ac_file_inputs` in + *datarootdir*) ac_datarootdir_seen=yes;; + *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + _ACEOF +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g +@@ -37443,16 +37837,15 @@ _ACEOF + # Neutralize VPATH when `$srcdir' = `.'. + # Shell code in configure.ac might set extrasub. + # FIXME: do we really want to maintain this feature? +-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +-ac_sed_extra="$ac_vpsub ++cat >>$CONFIG_STATUS <<_ACEOF ++ sed "$ac_vpsub + $extrasub + _ACEOF +-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++cat >>$CONFIG_STATUS <<\_ACEOF + :t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b +-s|@configure_input@|$ac_sed_conf_input|;t t ++s&@configure_input@&$configure_input&;t t + s&@top_builddir@&$ac_top_builddir_sub&;t t +-s&@top_build_prefix@&$ac_top_build_prefix&;t t + s&@srcdir@&$ac_srcdir&;t t + s&@abs_srcdir@&$ac_abs_srcdir&;t t + s&@top_srcdir@&$ac_top_srcdir&;t t +@@ -37461,75 +37854,138 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack - " - eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -@@ -37515,21 +35504,22 @@ - { (exit 1); exit 1; }; } +-" +-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++" $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"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && +- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&5 +-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' + which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" + case $ac_file in +- -) cat "$tmp/out" && rm -f "$tmp/out";; +- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; +- esac \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ -) cat "$tmp/out"; rm -f "$tmp/out";; ++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; ++ esac + ;; + :H) + # + # CONFIG_HEADER + # ++_ACEOF ++ ++# Transform confdefs.h into a sed script `conftest.defines', that ++# substitutes the proper values into config.h.in to produce config.h. ++rm -f conftest.defines conftest.tail ++# First, append a space to every undef/define line, to ease matching. ++echo 's/$/ /' >conftest.defines ++# Then, protect against being on the right side of a sed subst, or in ++# an unquoted here document, in config.status. If some macros were ++# called several times there might be several #defines for the same ++# symbol, which is useless. But do not sort them, since the last ++# AC_DEFINE must be honored. ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where ++# NAME is the cpp macro being defined, VALUE is the value it is being given. ++# PARAMS is the parameter list in the macro definition--in most cases, it's ++# just an empty string. ++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' ++ac_dB='\\)[ (].*,\\1define\\2' ++ac_dC=' ' ++ac_dD=' ,' ++ ++uniq confdefs.h | ++ sed -n ' ++ t rset ++ :rset ++ s/^[ ]*#[ ]*define[ ][ ]*// ++ t ok ++ d ++ :ok ++ s/[\\&,]/\\&/g ++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p ++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p ++ ' >>conftest.defines ++ ++# Remove the space that was appended to ease matching. ++# Then replace #undef with comments. This is necessary, for ++# example, in the case of _POSIX_SOURCE, which is predefined and required ++# on some systems where configure will not decide to define it. ++# (The regexp can be short, since the line contains either #define or #undef.) ++echo 's/ $// ++s,^[ #]*u.*,/* & */,' >>conftest.defines ++ ++# Break up conftest.defines: ++ac_max_sed_lines=50 ++ ++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" ++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" ++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" ++# et cetera. ++ac_in='$ac_file_inputs' ++ac_out='"$tmp/out1"' ++ac_nxt='"$tmp/out2"' ++ ++while : ++do ++ # Write a here document: ++ cat >>$CONFIG_STATUS <<_ACEOF ++ # First, check the format of the line: ++ cat >"\$tmp/defines.sed" <<\\CEOF ++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def ++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def ++b ++:def ++_ACEOF ++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS ++ echo 'CEOF ++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS ++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in ++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail ++ grep . conftest.tail >/dev/null || break ++ rm -f conftest.defines ++ mv conftest.tail conftest.defines ++done ++rm -f conftest.defines conftest.tail ++ ++echo "ac_result=$ac_in" >>$CONFIG_STATUS ++cat >>$CONFIG_STATUS <<\_ACEOF + if test x"$ac_file" != x-; then +- { +- $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" +- } >"$tmp/config.h" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } +- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then +- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +-$as_echo "$as_me: $ac_file is unchanged" >&6;} ++ echo "/* $configure_input */" >"$tmp/config.h" ++ cat "$ac_result" >>"$tmp/config.h" ++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then ++ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++echo "$as_me: $ac_file is unchanged" >&6;} + else +- rm -f "$ac_file" +- mv "$tmp/config.h" "$ac_file" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +-$as_echo "$as_me: error: could not create $ac_file" >&2;} +- { (exit 1); exit 1; }; } ++ rm -f $ac_file ++ mv "$tmp/config.h" $ac_file + fi + else +- $as_echo "/* $configure_input */" \ +- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ +- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +-$as_echo "$as_me: error: could not create -" >&2;} +- { (exit 1); exit 1; }; } ++ echo "/* $configure_input */" ++ cat "$ac_result" fi - # Compute "$ac_file"'s index in $config_headers. -+_am_arg="$ac_file" +-# Compute "$ac_file"'s index in $config_headers. ++ rm -f "$tmp/out12" ++# Compute $ac_file's index in $config_headers. ++_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in @@ -43560,11 +27319,22 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$_am_arg" | ++echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q -@@ -37564,8 +35554,9 @@ +@@ -37549,8 +38005,8 @@ $as_echo X"$ac_file" | + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + +- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 +-$as_echo "$as_me: executing $ac_file commands" >&6;} ++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + +@@ -37564,14 +38020,15 @@ $as_echo "$as_me: executing $ac_file com # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -43576,7 +27346,14 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ -@@ -37592,27 +35583,21 @@ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$mf" | ++echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37592,27 +38049,21 @@ $as_echo X"$mf" | else continue fi @@ -43617,824 +27394,82 @@ diff -Naur gtk+2.0-2.14.7.old/configure gtk+2.0-2.14.7/configure sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue -@@ -37685,6 +35670,814 @@ - done - done - ;; -+ "libtool":C) -+ -+ # 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 -+ setopt NO_GLOB_SUBST -+ fi -+ -+ cfgfile="${ofile}T" -+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 -+ $RM "$cfgfile" -+ -+ cat <<_LT_EOF >> "$cfgfile" -+#! $SHELL -+ -+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is part of GNU Libtool. -+# -+# GNU Libtool is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# As a special exception to the GNU General Public License, -+# if you distribute this file as part of a program or library that -+# is built using GNU Libtool, you may include this file under the -+# same distribution terms that you use for the rest of that program. -+# -+# GNU Libtool 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with GNU Libtool; see the file COPYING. If not, a copy -+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -+# obtained by writing to the Free Software Foundation, Inc., -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ -+ -+# The names of the tagged configurations supported by this script. -+available_tags="CXX " -+ -+# ### BEGIN LIBTOOL CONFIG -+ -+# Whether or not to build static libraries. -+build_old_libs=$enable_static -+ -+# Assembler program. -+AS=$AS -+ -+# DLL creation program. -+DLLTOOL=$DLLTOOL -+ -+# Object dumper program. -+OBJDUMP=$OBJDUMP -+ -+# Which release of libtool.m4 was used? -+macro_version=$macro_version -+macro_revision=$macro_revision -+ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared -+ -+# What type of objects to build. -+pic_mode=$pic_mode -+ -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install -+ -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os -+ -+# A sed program that does not truncate output. -+SED=$lt_SED -+ -+# Sed that helps us avoid accidentally triggering echo(1) options like -n. -+Xsed="\$SED -e 1s/^X//" -+ -+# A grep program that handles long lines. -+GREP=$lt_GREP -+ -+# An ERE matcher. -+EGREP=$lt_EGREP -+ -+# A literal string matcher. -+FGREP=$lt_FGREP -+ -+# A BSD- or MS-compatible name lister. -+NM=$lt_NM -+ -+# Whether we need soft or hard links. -+LN_S=$lt_LN_S -+ -+# What is the maximum length of a command? -+max_cmd_len=$max_cmd_len -+ -+# Object file suffix (normally "o"). -+objext=$ac_objext -+ -+# Executable file suffix (normally ""). -+exeext=$exeext -+ -+# whether the shell understands "unset". -+lt_unset=$lt_unset -+ -+# turn spaces into newlines. -+SP2NL=$lt_lt_SP2NL -+ -+# turn newlines into spaces. -+NL2SP=$lt_lt_NL2SP -+ -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds -+ -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method -+ -+# Command to use when deplibs_check_method == "file_magic". -+file_magic_cmd=$lt_file_magic_cmd -+ -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS -+ -+# A symbol stripping program. -+STRIP=$lt_STRIP -+ -+# Commands used to install an old-style archive. -+RANLIB=$lt_RANLIB -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds -+ -+# A C compiler. -+LTCC=$lt_CC -+ -+# LTCC compiler flags. -+LTCFLAGS=$lt_CFLAGS -+ -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -+ -+# Transform the output of nm in a proper C declaration. -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -+ -+# Transform the output of nm in a C name address pair. -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -+ -+# Transform the output of nm in a C name address pair when lib prefix is needed. -+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -+ -+# The name of the directory that contains temporary libtool files. -+objdir=$objdir -+ -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL -+ -+# An echo program that does not interpret backslashes. -+ECHO=$lt_ECHO -+ -+# Used to examine libraries when file_magic_cmd begins with "file". -+MAGIC_CMD=$MAGIC_CMD -+ -+# Must we lock files when doing compilation? -+need_locks=$lt_need_locks -+ -+# Tool to manipulate archived DWARF debug symbol files on Mac OS X. -+DSYMUTIL=$lt_DSYMUTIL -+ -+# Tool to change global to local symbols on Mac OS X. -+NMEDIT=$lt_NMEDIT -+ -+# Tool to manipulate fat objects and archives on Mac OS X. -+LIPO=$lt_LIPO -+ -+# ldd/readelf like tool for Mach-O binaries on Mac OS X. -+OTOOL=$lt_OTOOL -+ -+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. -+OTOOL64=$lt_OTOOL64 -+ -+# Old archive suffix (normally "a"). -+libext=$libext -+ -+# Shared library suffix (normally ".so"). -+shrext_cmds=$lt_shrext_cmds -+ -+# The commands to extract the exported symbol list from a shared archive. -+extract_expsyms_cmds=$lt_extract_expsyms_cmds -+ -+# Variables whose values should be saved in libtool wrapper scripts and -+# restored at link time. -+variables_saved_for_relink=$lt_variables_saved_for_relink -+ -+# Do we need the "lib" prefix for modules? -+need_lib_prefix=$need_lib_prefix -+ -+# Do we need a version for libraries? -+need_version=$need_version -+ -+# Library versioning type. -+version_type=$version_type -+ -+# Shared library runtime path variable. -+runpath_var=$runpath_var -+ -+# Shared library path variable. -+shlibpath_var=$shlibpath_var -+ -+# Is shlibpath searched before the hard-coded library search path? -+shlibpath_overrides_runpath=$shlibpath_overrides_runpath -+ -+# Format of library name prefix. -+libname_spec=$lt_libname_spec -+ -+# List of archive names. First name is the real one, the rest are links. -+# The last name is the one that the linker finds with -lNAME -+library_names_spec=$lt_library_names_spec -+ -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec -+ -+# Command to use after installation of a shared archive. -+postinstall_cmds=$lt_postinstall_cmds -+ -+# Command to use after uninstallation of a shared archive. -+postuninstall_cmds=$lt_postuninstall_cmds -+ -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds -+ -+# As "finish_cmds", except a single script fragment to be evaled but -+# not shown. -+finish_eval=$lt_finish_eval -+ -+# Whether we should hardcode library paths into libraries. -+hardcode_into_libs=$hardcode_into_libs -+ -+# Compile-time system search path for libraries. -+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -+ -+# Run-time system search path for libraries. -+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+ -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen -+ -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self -+ -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static -+ -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib -+ -+ -+# The linker used to build libraries. -+LD=$lt_LD -+ -+# Commands used to build an old-style archive. -+old_archive_cmds=$lt_old_archive_cmds -+ -+# A language specific compiler. -+CC=$lt_compiler -+ -+# Is the compiler the GNU compiler? -+with_gcc=$GCC -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc -+ -+# Whether or not to disallow shared libs when runtime libs are static. -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec -+ -+# Whether the compiler copes with passing no objects directly. -+compiler_needs_object=$lt_compiler_needs_object -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds -+ -+# Commands used to build a shared archive. -+archive_cmds=$lt_archive_cmds -+archive_expsym_cmds=$lt_archive_expsym_cmds -+ -+# Commands used to build a loadable module if different from building -+# a shared archive. -+module_cmds=$lt_module_cmds -+module_expsym_cmds=$lt_module_expsym_cmds -+ -+# Whether we are building with GNU ld or not. -+with_gnu_ld=$lt_with_gnu_ld -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag -+ -+# Flag that enforces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -+ -+# If ld is used when linking, flag to hardcode \$libdir into a binary -+# during linking. This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld -+ -+# Whether we need a single "-rpath" flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator -+ -+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -+# DIR into the resulting binary. -+hardcode_direct=$hardcode_direct -+ -+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -+# DIR into the resulting binary and the resulting library dependency is -+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -+# library is relocated. -+hardcode_direct_absolute=$hardcode_direct_absolute -+ -+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -+# into the resulting binary. -+hardcode_minus_L=$hardcode_minus_L -+ -+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -+# into the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var -+ -+# Set to "yes" if building a shared library automatically hardcodes DIR -+# into the library and all subsequent libraries and executables linked -+# against it. -+hardcode_automatic=$hardcode_automatic -+ -+# Set to yes if linker adds runtime paths of dependent libraries -+# to runtime path list. -+inherit_rpath=$inherit_rpath -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs -+ -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path -+ -+# Set to "yes" if exported symbols are required. -+always_export_symbols=$always_export_symbols -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms -+ -+# Commands necessary for linking programs (against libraries) with templates. -+prelink_cmds=$lt_prelink_cmds -+ -+# Specify filename containing input files. -+file_list_spec=$lt_file_list_spec -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action -+ -+# The directories searched by this compiler when creating a shared library. -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs -+ -+# Dependencies to place before and after the objects being linked to -+# create a shared library. -+predep_objects=$lt_predep_objects -+postdep_objects=$lt_postdep_objects -+predeps=$lt_predeps -+postdeps=$lt_postdeps -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path -+ -+# ### END LIBTOOL CONFIG -+ -+_LT_EOF -+ -+ case $host_os in -+ aix3*) -+ cat <<\_LT_EOF >> "$cfgfile" -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+_LT_EOF -+ ;; -+ esac -+ -+ -+ltmain="$ac_aux_dir/ltmain.sh" -+ -+ -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ case $xsi_shell in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+} -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result="${1##*/}" -+} -+ -+# func_dirname_and_basename file append nondir_replacement -+# perform func_basename and func_dirname in a single function -+# call: -+# dirname: Compute the dirname of FILE. If nonempty, -+# add APPEND to the result, otherwise set result -+# to NONDIR_REPLACEMENT. -+# value returned in "$func_dirname_result" -+# basename: Compute filename of FILE. -+# value retuned in "$func_basename_result" -+# Implementation must be kept synchronized with func_dirname -+# and func_basename. For efficiency, we do not delegate to -+# those functions but instead duplicate the functionality here. -+func_dirname_and_basename () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}" -+} -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+func_stripname () -+{ -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"} -+} -+ -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=${1%%=*} -+ func_opt_split_arg=${1#*=} -+} -+ -+# func_lo2o object -+func_lo2o () -+{ -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac -+} -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=${1%.*}.lo -+} -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=$(( $* )) -+} -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=${#1} -+} -+ -+_LT_EOF -+ ;; -+ *) # Bourne compatible functions. -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -+} -+ -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "X${3}" \ -+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "X${3}" \ -+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -+ esac -+} -+ -+# sed scripts: -+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -+my_sed_long_arg='1s/^-[^=]*=//' -+ -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -+} -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -+} -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` -+} -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "$@"` -+} -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -+} -+ -+_LT_EOF -+esac -+ -+case $lt_shell_append in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$1+=\$2" -+} -+_LT_EOF -+ ;; -+ *) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$1=\$$1\$2" -+} -+ -+_LT_EOF -+ ;; -+ esac -+ -+ -+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ mv -f "$cfgfile" "$ofile" || -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+ -+ -+ cat <<_LT_EOF >> "$ofile" -+ -+# ### BEGIN LIBTOOL TAG CONFIG: CXX -+ -+# The linker used to build libraries. -+LD=$lt_LD_CXX -+ -+# Commands used to build an old-style archive. -+old_archive_cmds=$lt_old_archive_cmds_CXX -+ -+# A language specific compiler. -+CC=$lt_compiler_CXX -+ -+# Is the compiler the GNU compiler? -+with_gcc=$GCC_CXX -+ -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -+ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX -+ -+# Additional compiler flags for building library objects. -+pic_flag=$lt_lt_prog_compiler_pic_CXX -+ -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_CXX -+ -+# Does compiler simultaneously support -c and -o options? -+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX -+ -+# Whether or not to add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_CXX -+ -+# Whether or not to disallow shared libs when runtime libs are static. -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX -+ -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -+ -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX -+ -+# Whether the compiler copes with passing no objects directly. -+compiler_needs_object=$lt_compiler_needs_object_CXX -+ -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -+ -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX -+ -+# Commands used to build a shared archive. -+archive_cmds=$lt_archive_cmds_CXX -+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -+ -+# Commands used to build a loadable module if different from building -+# a shared archive. -+module_cmds=$lt_module_cmds_CXX -+module_expsym_cmds=$lt_module_expsym_cmds_CXX -+ -+# Whether we are building with GNU ld or not. -+with_gnu_ld=$lt_with_gnu_ld_CXX -+ -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_CXX -+ -+# Flag that enforces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_CXX -+ -+# Flag to hardcode \$libdir into a binary during linking. -+# This must work even if \$libdir does not exist -+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -+ -+# If ld is used when linking, flag to hardcode \$libdir into a binary -+# during linking. This must work even if \$libdir does not exist. -+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX -+ -+# Whether we need a single "-rpath" flag with a separated argument. -+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -+ -+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -+# DIR into the resulting binary. -+hardcode_direct=$hardcode_direct_CXX -+ -+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -+# DIR into the resulting binary and the resulting library dependency is -+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -+# library is relocated. -+hardcode_direct_absolute=$hardcode_direct_absolute_CXX -+ -+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -+# into the resulting binary. -+hardcode_minus_L=$hardcode_minus_L_CXX -+ -+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -+# into the resulting binary. -+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX -+ -+# Set to "yes" if building a shared library automatically hardcodes DIR -+# into the library and all subsequent libraries and executables linked -+# against it. -+hardcode_automatic=$hardcode_automatic_CXX -+ -+# Set to yes if linker adds runtime paths of dependent libraries -+# to runtime path list. -+inherit_rpath=$inherit_rpath_CXX -+ -+# Whether libtool must link a program against all its dependency libraries. -+link_all_deplibs=$link_all_deplibs_CXX -+ -+# Fix the shell variable \$srcfile for the compiler. -+fix_srcfile_path=$lt_fix_srcfile_path_CXX -+ -+# Set to "yes" if exported symbols are required. -+always_export_symbols=$always_export_symbols_CXX -+ -+# The commands to list exported symbols. -+export_symbols_cmds=$lt_export_symbols_cmds_CXX -+ -+# Symbols that should not be listed in the preloaded symbols. -+exclude_expsyms=$lt_exclude_expsyms_CXX -+ -+# Symbols that must always be exported. -+include_expsyms=$lt_include_expsyms_CXX -+ -+# Commands necessary for linking programs (against libraries) with templates. -+prelink_cmds=$lt_prelink_cmds_CXX -+ -+# Specify filename containing input files. -+file_list_spec=$lt_file_list_spec_CXX -+ -+# How to hardcode a shared library path into an executable. -+hardcode_action=$hardcode_action_CXX -+ -+# The directories searched by this compiler when creating a shared library. -+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX -+ -+# Dependencies to place before and after the objects being linked to -+# create a shared library. -+predep_objects=$lt_predep_objects_CXX -+postdep_objects=$lt_postdep_objects_CXX -+predeps=$lt_predeps_CXX -+postdeps=$lt_postdeps_CXX -+ -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -+ -+# ### END LIBTOOL TAG CONFIG: CXX -+_LT_EOF -+ -+ ;; - "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac ;; -diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7/contrib/gdk-pixbuf-xlib/Makefile.in ---- gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in 2009-01-07 22:52:01.000000000 +0100 -+++ gtk+2.0-2.14.7/contrib/gdk-pixbuf-xlib/Makefile.in 2009-01-08 08:03:48.000000000 +0100 +@@ -37621,7 +38072,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$file" | ++echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37647,7 +38098,7 @@ $as_echo X"$file" | + as_dirs= + while :; do + case $as_dir in #( +- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" +@@ -37656,7 +38107,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +-$as_echo X"$as_dir" | ++echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -37677,8 +38128,8 @@ $as_echo X"$as_dir" | + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" +- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" +@@ -37733,8 +38184,8 @@ _______EOF + + + if cmp -s $outfile gdk/gdkconfig.h; then +- { $as_echo "$as_me:$LINENO: gdk/gdkconfig.h is unchanged" >&5 +-$as_echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} ++ { echo "$as_me:$LINENO: gdk/gdkconfig.h is unchanged" >&5 ++echo "$as_me: gdk/gdkconfig.h is unchanged" >&6;} + rm -f $outfile + else + mv $outfile gdk/gdkconfig.h +@@ -37750,11 +38201,6 @@ _ACEOF + chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save + +-test $ac_write_fail = 0 || +- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} +- { (exit 1); exit 1; }; } +- + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. +@@ -37776,10 +38222,6 @@ if test "$no_create" != yes; then + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } + fi +-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then +- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +-fi + + + echo "configuration: +Index: gtk+-2.14.7/contrib/gdk-pixbuf-xlib/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2009-02-17 23:15:21.951084263 +0100 ++++ gtk+-2.14.7/contrib/gdk-pixbuf-xlib/Makefile.in 2009-02-21 14:58:40.582582121 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -44466,7 +27501,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +34,65 @@ +@@ -37,10 +34,65 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -44534,7 +27569,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +103,17 @@ +@@ -51,22 +103,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -44558,7 +27593,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +128,15 @@ +@@ -81,8 +128,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -44566,9 +27601,8 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +135,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -44577,13 +27611,9 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +160,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +161,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -44591,7 +27621,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +179,6 @@ +@@ -138,8 +180,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -44600,7 +27630,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +189,21 @@ +@@ -150,91 +190,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -44693,20 +27723,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +214,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +219,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -44729,12 +27746,10 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +241,6 @@ +@@ -284,8 +238,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -44743,7 +27758,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +252,10 @@ +@@ -297,28 +249,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -44772,7 +27787,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +264,25 @@ +@@ -327,22 +261,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -44782,12 +27797,11 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -44803,17 +27817,15 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +304,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +302,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +315,12 @@ +@@ -373,9 +311,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -44821,13 +27833,12 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,29 +351,23 @@ +@@ -406,29 +346,23 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -44857,7 +27868,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 libgdk_pixbuf_xlib_2_0_la_SOURCES = \ gdk-pixbuf-xlib-private.h \ gdk-pixbuf-xlib.c \ -@@ -436,99 +375,80 @@ +@@ -436,99 +370,80 @@ libgdk_pixbuf_xlib_2_0_la_SOURCES = \ gdk-pixbuf-xlib-drawable.c \ gdk-pixbuf-xlibrgb.c @@ -44995,7 +28006,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 distclean-compile: -rm -f *.tab.c -@@ -539,100 +459,75 @@ +@@ -539,100 +454,75 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdk-pixbuf-xlibrgb.Plo@am__quote@ .c.o: @@ -45125,7 +28136,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -642,23 +537,23 @@ +@@ -642,23 +532,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -45158,7 +28169,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -670,29 +565,23 @@ +@@ -670,29 +560,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -45201,7 +28212,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -707,9 +596,10 @@ +@@ -707,9 +591,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) @@ -45214,7 +28225,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -729,7 +619,7 @@ +@@ -729,7 +614,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -45223,7 +28234,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -743,12 +633,14 @@ +@@ -743,12 +628,14 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -45239,7 +28250,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 info: info-am info-am: -@@ -756,12 +648,20 @@ +@@ -756,12 +643,20 @@ info-am: install-data-am: install-libgdk_pixbuf_xlibincludeHEADERS \ install-pkgconfigDATA @@ -45260,7 +28271,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 installcheck-am: maintainer-clean: maintainer-clean-am -@@ -782,23 +682,27 @@ +@@ -782,23 +677,27 @@ ps: ps-am ps-am: @@ -45300,9 +28311,10 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.14.7 uninstall-libgdk_pixbuf_xlibincludeHEADERS \ uninstall-pkgconfigDATA -diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefile.in ---- gtk+2.0-2.14.7.old/contrib/Makefile.in 2009-01-07 22:52:01.000000000 +0100 -+++ gtk+2.0-2.14.7/contrib/Makefile.in 2009-01-08 08:03:47.000000000 +0100 +Index: gtk+-2.14.7/contrib/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/contrib/Makefile.in 2009-02-17 23:15:21.935083906 +0100 ++++ gtk+-2.14.7/contrib/Makefile.in 2009-02-21 14:58:40.374581872 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -45333,7 +28345,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +31,36 @@ +@@ -37,11 +31,36 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -45372,7 +28384,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,22 +71,17 @@ +@@ -52,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -45396,7 +28408,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,22 +96,15 @@ +@@ -82,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -45404,9 +28416,8 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -91,10 +103,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -45415,13 +28426,9 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -121,6 +128,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -121,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -45429,7 +28436,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +147,6 @@ +@@ -139,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -45438,7 +28445,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,97 +157,21 @@ +@@ -151,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -45531,20 +28538,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -252,29 +182,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -257,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -45567,12 +28561,10 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +209,6 @@ +@@ -285,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -45581,7 +28573,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +220,10 @@ +@@ -298,28 +217,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -45610,7 +28602,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +232,25 @@ +@@ -328,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -45620,12 +28612,11 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -45641,17 +28632,15 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,7 +272,9 @@ - libexecdir = @libexecdir@ +@@ -366,6 +270,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -374,9 +283,12 @@ +@@ -374,9 +279,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -45659,13 +28648,12 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -407,31 +319,39 @@ +@@ -407,31 +314,39 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -45724,7 +28712,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil mostlyclean-libtool: -rm -f *.lo -@@ -439,10 +359,6 @@ +@@ -439,10 +354,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -45735,7 +28723,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -450,7 +366,13 @@ +@@ -450,7 +361,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -45750,7 +28738,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -462,15 +384,20 @@ +@@ -462,15 +379,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -45775,7 +28763,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -491,7 +418,7 @@ +@@ -491,7 +413,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -45784,7 +28772,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -502,35 +429,30 @@ +@@ -502,35 +424,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -45827,7 +28815,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -538,23 +460,23 @@ +@@ -538,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -45860,7 +28848,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -566,29 +488,23 @@ +@@ -566,29 +483,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -45903,7 +28891,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -601,13 +517,17 @@ +@@ -601,13 +512,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -45925,7 +28913,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil distdir) \ || exit 1; \ fi; \ -@@ -618,7 +538,6 @@ +@@ -618,7 +533,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -45933,7 +28921,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -638,7 +557,7 @@ +@@ -638,7 +552,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -45942,7 +28930,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -649,25 +568,34 @@ +@@ -649,25 +563,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -45979,7 +28967,7 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -686,26 +614,24 @@ +@@ -686,26 +609,24 @@ ps: ps-recursive ps-am: @@ -46022,9 +29010,10 @@ diff -Naur gtk+2.0-2.14.7.old/contrib/Makefile.in gtk+2.0-2.14.7/contrib/Makefil # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gtk-demo/Makefile.in ---- gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in 2009-01-07 22:52:02.000000000 +0100 -+++ gtk+2.0-2.14.7/demos/gtk-demo/Makefile.in 2009-01-08 08:03:48.000000000 +0100 +Index: gtk+-2.14.7/demos/gtk-demo/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/demos/gtk-demo/Makefile.in 2009-02-17 23:15:21.927082260 +0100 ++++ gtk+-2.14.7/demos/gtk-demo/Makefile.in 2009-02-21 14:58:40.950582034 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -46055,7 +29044,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,65 @@ +@@ -37,10 +33,65 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -46123,7 +29112,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +102,17 @@ +@@ -51,22 +102,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -46147,7 +29136,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +127,15 @@ +@@ -81,8 +127,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -46155,9 +29144,8 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +134,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -46166,13 +29154,9 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +159,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +160,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -46180,7 +29164,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +178,6 @@ +@@ -138,8 +179,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -46189,7 +29173,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +188,21 @@ +@@ -150,91 +189,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -46282,20 +29266,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +213,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +218,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -46318,12 +29289,10 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +240,6 @@ +@@ -284,8 +237,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -46332,7 +29301,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +251,10 @@ +@@ -297,28 +248,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -46361,7 +29330,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +263,25 @@ +@@ -327,22 +260,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -46371,12 +29340,11 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -46392,17 +29360,15 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +303,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +301,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,17 +314,17 @@ +@@ -373,17 +310,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -46410,7 +29376,6 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -46425,7 +29390,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt TEST_PROGS = ### testing rules -@@ -409,9 +350,7 @@ +@@ -409,9 +345,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -46435,7 +29400,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt demos = \ appwindow.c \ assistant.c \ -@@ -444,7 +383,6 @@ +@@ -444,7 +378,6 @@ demos = \ tree_store.c \ ui_manager.c @@ -46443,7 +29408,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt INCLUDES = \ -DDEMOCODEDIR="\"$(democodedir)\"" \ -I$(top_srcdir) \ -@@ -454,34 +392,26 @@ +@@ -454,34 +387,26 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -46478,7 +29443,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt IMAGEFILES = alphatest.png \ apple-red.png \ background.jpg \ -@@ -497,93 +427,55 @@ +@@ -497,93 +422,55 @@ IMAGEFILES = alphatest.png \ gnu-keys.png \ gtk-logo-rgb.gif @@ -46603,7 +29568,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt else :; fi; \ done -@@ -591,8 +483,8 @@ +@@ -591,8 +478,8 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -46614,7 +29579,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt done clean-binPROGRAMS: -@@ -603,10 +495,10 @@ +@@ -603,10 +490,10 @@ clean-binPROGRAMS: done gtk-demo$(EXEEXT): $(gtk_demo_OBJECTS) $(gtk_demo_DEPENDENCIES) @rm -f gtk-demo$(EXEEXT) @@ -46627,7 +29592,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt distclean-compile: -rm -f *.tab.c -@@ -644,82 +536,58 @@ +@@ -644,82 +531,58 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_manager.Po@am__quote@ .c.o: @@ -46732,7 +29697,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -729,23 +597,23 @@ +@@ -729,23 +592,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -46765,7 +29730,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -757,29 +625,23 @@ +@@ -757,29 +620,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -46808,7 +29773,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -795,9 +657,10 @@ +@@ -795,9 +652,10 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) $(DATA) @@ -46821,7 +29786,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am -@@ -818,7 +681,7 @@ +@@ -818,7 +676,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -46830,7 +29795,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -833,24 +696,34 @@ +@@ -833,24 +691,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -46866,7 +29831,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt installcheck-am: maintainer-clean: maintainer-clean-am -@@ -871,21 +744,24 @@ +@@ -871,21 +739,24 @@ ps: ps-am ps-am: @@ -46902,9 +29867,10 @@ diff -Naur gtk+2.0-2.14.7.old/demos/gtk-demo/Makefile.in gtk+2.0-2.14.7/demos/gt # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in ---- gtk+2.0-2.14.7.old/demos/Makefile.in 2009-01-07 22:52:01.000000000 +0100 -+++ gtk+2.0-2.14.7/demos/Makefile.in 2009-01-08 08:03:48.000000000 +0100 +Index: gtk+-2.14.7/demos/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/demos/Makefile.in 2009-02-17 23:15:21.915084436 +0100 ++++ gtk+-2.14.7/demos/Makefile.in 2009-02-21 14:58:40.779083701 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -46934,7 +29900,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +32,74 @@ +@@ -37,11 +32,74 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -47011,7 +29977,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,22 +110,17 @@ +@@ -52,22 +110,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -47035,7 +30001,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,22 +135,15 @@ +@@ -82,8 +135,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -47043,9 +30009,8 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -91,10 +142,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -47054,13 +30019,9 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -121,6 +167,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -121,6 +168,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -47068,7 +30029,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +186,6 @@ +@@ -139,8 +187,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -47077,7 +30038,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,97 +196,21 @@ +@@ -151,91 +197,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -47170,20 +30131,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -252,29 +221,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -257,24 +226,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -47206,12 +30154,10 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +248,6 @@ +@@ -285,8 +245,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -47220,7 +30166,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +259,10 @@ +@@ -298,28 +256,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -47249,7 +30195,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +271,25 @@ +@@ -328,22 +268,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -47259,12 +30205,11 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -47280,17 +30225,15 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,7 +311,9 @@ - libexecdir = @libexecdir@ +@@ -366,6 +309,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -374,24 +322,19 @@ +@@ -374,24 +318,18 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -47298,7 +30241,6 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -47322,7 +30264,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in TEST_PROGS = ### testing rules -@@ -417,9 +360,7 @@ +@@ -417,9 +355,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -47332,7 +30274,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -428,131 +369,74 @@ +@@ -428,131 +364,74 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -47493,7 +30435,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -562,25 +446,25 @@ +@@ -562,25 +441,25 @@ clean-noinstPROGRAMS: done pixbuf-demo$(EXEEXT): $(pixbuf_demo_OBJECTS) $(pixbuf_demo_DEPENDENCIES) @rm -f pixbuf-demo$(EXEEXT) @@ -47526,7 +30468,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -594,37 +478,25 @@ +@@ -594,37 +473,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpixbuf.Po@am__quote@ .c.o: @@ -47576,7 +30518,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -632,10 +504,6 @@ +@@ -632,10 +499,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -47587,7 +30529,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -643,7 +511,13 @@ +@@ -643,7 +506,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -47602,7 +30544,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -655,15 +529,20 @@ +@@ -655,15 +524,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -47627,7 +30569,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -684,7 +563,7 @@ +@@ -684,7 +558,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -47636,7 +30578,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -695,35 +574,30 @@ +@@ -695,35 +569,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -47679,7 +30621,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -731,23 +605,23 @@ +@@ -731,23 +600,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -47712,7 +30654,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -759,29 +633,23 @@ +@@ -759,29 +628,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -47755,7 +30697,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -792,15 +660,19 @@ +@@ -792,15 +655,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -47780,7 +30722,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -812,7 +684,6 @@ +@@ -812,7 +679,6 @@ check: $(BUILT_SOURCES) all-am: Makefile $(PROGRAMS) installdirs: installdirs-recursive installdirs-am: @@ -47788,7 +30730,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -833,7 +704,7 @@ +@@ -833,7 +699,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -47797,7 +30739,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -849,24 +720,34 @@ +@@ -849,24 +715,34 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -47833,7 +30775,7 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -887,27 +768,25 @@ +@@ -887,27 +763,25 @@ ps: ps-recursive ps-am: @@ -47878,9 +30820,10 @@ diff -Naur gtk+2.0-2.14.7.old/demos/Makefile.in gtk+2.0-2.14.7/demos/Makefile.in # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/depcomp gtk+2.0-2.14.7/depcomp ---- gtk+2.0-2.14.7.old/depcomp 2007-09-18 16:10:46.000000000 +0200 -+++ gtk+2.0-2.14.7/depcomp 2009-01-08 08:03:56.000000000 +0100 +Index: gtk+-2.14.7/depcomp +=================================================================== +--- gtk+-2.14.7.orig/depcomp 2009-02-17 23:15:21.903082213 +0100 ++++ gtk+-2.14.7/depcomp 2009-02-21 14:58:49.771084221 +0100 @@ -1,7 +1,10 @@ #! /bin/sh - @@ -47962,7 +30905,7 @@ diff -Naur gtk+2.0-2.14.7.old/depcomp gtk+2.0-2.14.7/depcomp tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" -@@ -66,7 +92,20 @@ +@@ -66,7 +92,20 @@ gcc3) ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. @@ -47984,7 +30927,7 @@ diff -Naur gtk+2.0-2.14.7.old/depcomp gtk+2.0-2.14.7/depcomp stat=$? if test $stat -eq 0; then : else -@@ -176,34 +215,39 @@ +@@ -176,34 +215,39 @@ aix) # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. @@ -48036,7 +30979,7 @@ diff -Naur gtk+2.0-2.14.7.old/depcomp gtk+2.0-2.14.7/depcomp else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile -@@ -251,6 +295,46 @@ +@@ -251,6 +295,46 @@ icc) rm -f "$tmpdepfile" ;; @@ -48083,7 +31026,7 @@ diff -Naur gtk+2.0-2.14.7.old/depcomp gtk+2.0-2.14.7/depcomp tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. -@@ -262,27 +346,43 @@ +@@ -262,27 +346,43 @@ tru64) base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then @@ -48137,7 +31080,7 @@ diff -Naur gtk+2.0-2.14.7.old/depcomp gtk+2.0-2.14.7/depcomp if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" # That's a tab and a space in the []. -@@ -426,7 +526,8 @@ +@@ -426,7 +526,8 @@ cpp) done "$@" -E | @@ -48147,7 +31090,7 @@ diff -Naur gtk+2.0-2.14.7.old/depcomp gtk+2.0-2.14.7/depcomp sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" -@@ -477,3 +578,12 @@ +@@ -477,3 +578,12 @@ none) esac exit 0 @@ -48160,9 +31103,10 @@ diff -Naur gtk+2.0-2.14.7.old/depcomp gtk+2.0-2.14.7/depcomp +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makefile.in ---- gtk+2.0-2.14.7.old/docs/faq/Makefile.in 2009-01-07 22:52:02.000000000 +0100 -+++ gtk+2.0-2.14.7/docs/faq/Makefile.in 2009-01-08 08:03:48.000000000 +0100 +Index: gtk+-2.14.7/docs/faq/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/faq/Makefile.in 2009-02-17 23:15:21.895088878 +0100 ++++ gtk+-2.14.7/docs/faq/Makefile.in 2009-02-21 14:58:41.234583493 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -48193,7 +31137,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,23 @@ +@@ -37,10 +31,23 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -48219,7 +31163,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +58,17 @@ +@@ -51,22 +58,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -48243,7 +31187,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +83,15 @@ +@@ -81,8 +83,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -48251,9 +31195,8 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +90,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -48262,13 +31205,9 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +115,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -48276,7 +31215,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +134,6 @@ +@@ -138,8 +135,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -48285,7 +31224,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +144,21 @@ +@@ -150,91 +145,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -48378,20 +31317,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +169,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +174,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -48414,12 +31340,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +196,6 @@ +@@ -284,8 +193,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -48428,7 +31352,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +207,10 @@ +@@ -297,28 +204,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -48457,7 +31381,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +219,25 @@ +@@ -327,22 +216,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -48467,12 +31391,11 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -48488,17 +31411,15 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +259,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +257,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,16 +270,17 @@ +@@ -373,16 +266,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -48506,7 +31427,6 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -48520,7 +31440,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef TEST_PROGS = ### testing rules -@@ -408,61 +306,67 @@ +@@ -408,61 +301,67 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -48622,7 +31542,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -480,7 +384,6 @@ +@@ -480,7 +379,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile @@ -48630,7 +31550,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef installdirs: install: install-am install-exec: install-exec-am -@@ -501,7 +404,7 @@ +@@ -501,7 +399,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -48639,7 +31559,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -512,7 +415,7 @@ +@@ -512,7 +410,7 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-am -rm -f Makefile @@ -48648,7 +31568,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef dvi: dvi-am -@@ -524,12 +427,20 @@ +@@ -524,12 +422,20 @@ info-am: install-data-am: @@ -48669,7 +31589,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef installcheck-am: maintainer-clean: maintainer-clean-am -@@ -540,25 +451,27 @@ +@@ -540,25 +446,27 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool @@ -48708,9 +31628,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/faq/Makefile.in gtk+2.0-2.14.7/docs/faq/Makef # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in ---- gtk+2.0-2.14.7.old/docs/Makefile.in 2009-01-07 22:52:02.000000000 +0100 -+++ gtk+2.0-2.14.7/docs/Makefile.in 2009-01-08 08:03:48.000000000 +0100 +Index: gtk+-2.14.7/docs/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/Makefile.in 2009-02-17 23:15:21.863086696 +0100 ++++ gtk+-2.14.7/docs/Makefile.in 2009-02-21 14:58:41.090582230 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -48741,7 +31662,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ +@@ -37,10 +31,35 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -48779,7 +31700,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +70,17 @@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -48803,7 +31724,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +95,15 @@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -48811,9 +31732,8 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -48822,13 +31742,9 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +127,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -48836,7 +31752,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +146,6 @@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -48845,7 +31761,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +156,21 @@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -48938,20 +31854,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +181,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -48974,12 +31877,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +208,6 @@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -48988,7 +31889,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +219,10 @@ +@@ -297,28 +216,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -49017,7 +31918,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +231,25 @@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -49027,12 +31928,11 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -49048,17 +31948,15 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +271,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,30 +282,21 @@ +@@ -373,30 +278,20 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -49066,7 +31964,6 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -49098,7 +31995,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in TEST_PROGS = ### testing rules -@@ -422,31 +322,39 @@ +@@ -422,31 +317,39 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -49157,7 +32054,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -454,10 +362,6 @@ +@@ -454,10 +357,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -49168,7 +32065,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -465,7 +369,13 @@ +@@ -465,7 +364,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -49183,7 +32080,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -477,15 +387,20 @@ +@@ -477,15 +382,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -49208,7 +32105,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -506,7 +421,7 @@ +@@ -506,7 +416,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -49217,7 +32114,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -517,35 +432,30 @@ +@@ -517,35 +427,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -49260,7 +32157,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -553,23 +463,23 @@ +@@ -553,23 +458,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -49293,7 +32190,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -581,29 +491,23 @@ +@@ -581,29 +486,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -49336,7 +32233,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -614,15 +518,19 @@ +@@ -614,15 +513,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -49361,7 +32258,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -633,7 +541,6 @@ +@@ -633,7 +536,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -49369,7 +32266,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -653,7 +560,7 @@ +@@ -653,7 +555,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -49378,7 +32275,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -664,25 +571,34 @@ +@@ -664,25 +566,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -49415,7 +32312,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -701,26 +617,24 @@ +@@ -701,26 +612,24 @@ ps: ps-recursive ps-am: @@ -49458,9 +32355,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/Makefile.in gtk+2.0-2.14.7/docs/Makefile.in # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs/reference/gdk/Makefile.in ---- gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in 2009-01-07 22:52:03.000000000 +0100 -+++ gtk+2.0-2.14.7/docs/reference/gdk/Makefile.in 2009-01-08 08:03:49.000000000 +0100 +Index: gtk+-2.14.7/docs/reference/gdk/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/reference/gdk/Makefile.in 2009-02-17 23:15:21.843084294 +0100 ++++ gtk+-2.14.7/docs/reference/gdk/Makefile.in 2009-02-21 14:58:41.730582844 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -49491,7 +32389,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,24 @@ +@@ -43,10 +37,24 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -49518,7 +32416,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -57,22 +65,17 @@ +@@ -57,22 +65,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -49542,7 +32440,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,22 +90,15 @@ +@@ -87,8 +90,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -49550,9 +32448,8 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -96,10 +97,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -49561,13 +32458,9 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -126,6 +122,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -126,6 +123,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -49575,7 +32468,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -144,8 +141,6 @@ +@@ -144,8 +142,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -49584,7 +32477,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -156,97 +151,21 @@ +@@ -156,91 +152,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -49677,20 +32570,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -257,29 +176,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -262,24 +181,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -49713,12 +32593,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -290,8 +203,6 @@ +@@ -290,8 +200,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -49727,7 +32605,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -303,28 +214,10 @@ +@@ -303,28 +211,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -49756,7 +32634,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -333,22 +226,25 @@ +@@ -333,22 +223,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -49766,12 +32644,11 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -49787,17 +32664,15 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -370,7 +266,9 @@ - libexecdir = @libexecdir@ +@@ -371,6 +264,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -379,22 +277,19 @@ +@@ -379,22 +273,18 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -49805,7 +32680,6 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -49827,7 +32701,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs TEST_PROGS = ### testing rules -@@ -420,7 +315,6 @@ +@@ -420,7 +310,6 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -49835,7 +32709,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs AUTOMAKE_OPTIONS = 1.6 # The name of the module. -@@ -470,7 +364,6 @@ +@@ -470,7 +359,6 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -49843,7 +32717,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs GTKDOC_LIBS = $(top_builddir)/gdk/$(gdktargetlib) # Extra options to supply to gtkdoc-mkdb -@@ -572,7 +465,6 @@ +@@ -572,7 +460,6 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -49851,7 +32725,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -585,13 +477,10 @@ +@@ -585,13 +472,10 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -49865,7 +32739,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -599,31 +488,45 @@ +@@ -599,31 +483,45 @@ SCANOBJ_FILES = \ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -49925,7 +32799,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -631,39 +534,29 @@ +@@ -631,39 +529,29 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -49978,7 +32852,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -681,7 +574,6 @@ +@@ -681,7 +569,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile all-local @@ -49986,7 +32860,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs installdirs: install: install-am install-exec: install-exec-am -@@ -703,7 +595,7 @@ +@@ -703,7 +590,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -49995,7 +32869,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -714,25 +606,34 @@ +@@ -714,25 +601,34 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-am -rm -f Makefile @@ -50032,7 +32906,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs installcheck-am: maintainer-clean: maintainer-clean-am -@@ -752,18 +653,23 @@ +@@ -752,18 +648,23 @@ ps: ps-am ps-am: @@ -50066,9 +32940,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk/Makefile.in gtk+2.0-2.14.7/docs # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/docs/reference/gdk-pixbuf/Makefile.in ---- gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in 2009-01-07 22:52:02.000000000 +0100 -+++ gtk+2.0-2.14.7/docs/reference/gdk-pixbuf/Makefile.in 2009-01-08 08:03:49.000000000 +0100 +Index: gtk+-2.14.7/docs/reference/gdk-pixbuf/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/reference/gdk-pixbuf/Makefile.in 2009-02-17 23:15:21.799084777 +0100 ++++ gtk+-2.14.7/docs/reference/gdk-pixbuf/Makefile.in 2009-02-21 14:58:41.559081578 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -50099,7 +32974,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,28 @@ +@@ -43,10 +37,28 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -50130,7 +33005,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -57,22 +69,17 @@ +@@ -57,22 +69,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -50154,7 +33029,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,22 +94,15 @@ +@@ -87,8 +94,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -50162,9 +33037,8 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -96,10 +101,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -50173,13 +33047,9 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -126,6 +126,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -126,6 +127,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -50187,7 +33057,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -144,8 +145,6 @@ +@@ -144,8 +146,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -50196,7 +33066,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -156,97 +155,21 @@ +@@ -156,91 +156,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -50289,20 +33159,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -257,29 +180,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -262,24 +185,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -50325,12 +33182,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -290,8 +207,6 @@ +@@ -290,8 +204,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -50339,7 +33194,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -303,28 +218,10 @@ +@@ -303,28 +215,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -50368,7 +33223,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -333,22 +230,25 @@ +@@ -333,22 +227,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -50378,12 +33233,11 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -50399,17 +33253,15 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -370,7 +270,9 @@ - libexecdir = @libexecdir@ +@@ -371,6 +268,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -379,28 +281,20 @@ +@@ -379,28 +277,19 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -50417,7 +33269,6 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -50446,7 +33297,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 TEST_PROGS = ### testing rules -@@ -426,7 +320,6 @@ +@@ -426,7 +315,6 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -50454,7 +33305,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 AUTOMAKE_OPTIONS = 1.6 # The name of the module. -@@ -458,7 +351,6 @@ +@@ -458,7 +346,6 @@ IGNORE_HFILES = \ xpm-color-table.h \ test-images.h @@ -50462,7 +33313,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ -@@ -466,7 +358,6 @@ +@@ -466,7 +353,6 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -50470,7 +33321,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 GTKDOC_LIBS = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -496,7 +387,6 @@ +@@ -496,7 +382,6 @@ FIXXREF_OPTIONS = --extra-dir=$(GLIB_PRE --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -50478,7 +33329,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -509,13 +399,10 @@ +@@ -509,13 +394,10 @@ FIXXREF_OPTIONS = --extra-dir=$(GLIB_PRE # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -50492,7 +33343,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -523,40 +410,49 @@ +@@ -523,40 +405,49 @@ SCANOBJ_FILES = \ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -50561,7 +33412,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -564,15 +460,9 @@ +@@ -564,15 +455,9 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -50578,7 +33429,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ -@@ -591,8 +481,8 @@ +@@ -591,8 +476,8 @@ install-man1: $(man1_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -50589,7 +33440,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 done uninstall-man1: @$(NORMAL_UNINSTALL) -@@ -612,8 +502,8 @@ +@@ -612,8 +497,8 @@ uninstall-man1: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -50600,7 +33451,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 done tags: TAGS TAGS: -@@ -621,29 +511,23 @@ +@@ -621,29 +506,23 @@ TAGS: ctags: CTAGS CTAGS: @@ -50643,7 +33494,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -661,9 +545,10 @@ +@@ -661,9 +540,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(MANS) all-local @@ -50656,7 +33507,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -684,7 +569,7 @@ +@@ -684,7 +564,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -50665,7 +33516,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -695,25 +580,34 @@ +@@ -695,25 +575,34 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-am -rm -f Makefile @@ -50702,7 +33553,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 installcheck-am: maintainer-clean: maintainer-clean-am -@@ -733,21 +627,25 @@ +@@ -733,21 +622,25 @@ ps: ps-am ps-am: @@ -50737,9 +33588,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.14 # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs/reference/gtk/Makefile.in ---- gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in 2009-01-07 22:52:04.000000000 +0100 -+++ gtk+2.0-2.14.7/docs/reference/gtk/Makefile.in 2009-01-08 08:03:49.000000000 +0100 +Index: gtk+-2.14.7/docs/reference/gtk/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/reference/gtk/Makefile.in 2009-02-17 23:15:21.739087836 +0100 ++++ gtk+-2.14.7/docs/reference/gtk/Makefile.in 2009-02-21 14:58:41.894586021 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -50770,7 +33622,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,28 @@ +@@ -43,10 +37,28 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -50801,7 +33653,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -57,25 +69,17 @@ +@@ -57,25 +69,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -50829,7 +33681,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -90,22 +94,15 @@ +@@ -90,8 +94,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -50837,9 +33689,8 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -99,10 +101,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -50848,13 +33699,9 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -129,6 +126,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -129,6 +127,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -50862,7 +33709,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -147,8 +145,6 @@ +@@ -147,8 +146,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -50871,7 +33718,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -159,97 +155,21 @@ +@@ -159,91 +156,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -50964,20 +33811,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -260,29 +180,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -265,24 +185,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -51000,12 +33834,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -293,8 +207,6 @@ +@@ -293,8 +204,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -51014,7 +33846,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -306,28 +218,10 @@ +@@ -306,28 +215,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -51043,7 +33875,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -336,22 +230,25 @@ +@@ -336,22 +227,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -51053,12 +33885,11 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -51074,17 +33905,15 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -373,7 +270,9 @@ - libexecdir = @libexecdir@ +@@ -374,6 +268,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -382,22 +281,19 @@ +@@ -382,22 +277,18 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -51092,7 +33921,6 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -51114,7 +33942,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs TEST_PROGS = ### testing rules -@@ -423,7 +319,6 @@ +@@ -423,7 +314,6 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -51122,7 +33950,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs AUTOMAKE_OPTIONS = 1.6 # The name of the module. -@@ -531,7 +426,6 @@ +@@ -531,7 +421,6 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -51130,7 +33958,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs GTKDOC_LIBS = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -576,7 +470,6 @@ +@@ -576,7 +465,6 @@ content_files = \ gtk-builder-convert.xml \ visual_index.xml @@ -51138,7 +33966,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs expand_content_files = \ glossary.xml \ migrating-checklist.sgml \ -@@ -766,7 +659,6 @@ +@@ -766,7 +654,6 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -51146,7 +33974,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -779,13 +671,10 @@ +@@ -779,13 +666,10 @@ FIXXREF_OPTIONS = --extra-dir=../gdk-pix # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -51160,7 +33988,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -793,40 +682,49 @@ +@@ -793,40 +677,49 @@ SCANOBJ_FILES = \ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -51229,7 +34057,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -834,15 +732,9 @@ +@@ -834,15 +727,9 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -51246,7 +34074,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ -@@ -861,8 +753,8 @@ +@@ -861,8 +748,8 @@ install-man1: $(man1_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -51257,7 +34085,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs done uninstall-man1: @$(NORMAL_UNINSTALL) -@@ -882,8 +774,8 @@ +@@ -882,8 +769,8 @@ uninstall-man1: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -51268,7 +34096,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs done tags: TAGS TAGS: -@@ -891,29 +783,23 @@ +@@ -891,29 +778,23 @@ TAGS: ctags: CTAGS CTAGS: @@ -51311,7 +34139,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -931,9 +817,10 @@ +@@ -931,9 +812,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(MANS) all-local @@ -51324,7 +34152,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -954,7 +841,7 @@ +@@ -954,7 +836,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -51333,7 +34161,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -965,25 +852,34 @@ +@@ -965,25 +847,34 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-am -rm -f Makefile @@ -51370,7 +34198,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1003,21 +899,25 @@ +@@ -1003,21 +894,25 @@ ps: ps-am ps-am: @@ -51405,9 +34233,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/gtk/Makefile.in gtk+2.0-2.14.7/docs # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.14.7/docs/reference/libgail-util/Makefile.in ---- gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in 2009-01-07 22:52:04.000000000 +0100 -+++ gtk+2.0-2.14.7/docs/reference/libgail-util/Makefile.in 2009-01-08 08:03:49.000000000 +0100 +Index: gtk+-2.14.7/docs/reference/libgail-util/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/reference/libgail-util/Makefile.in 2009-02-17 23:15:21.703090454 +0100 ++++ gtk+-2.14.7/docs/reference/libgail-util/Makefile.in 2009-02-21 14:58:42.043082129 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -51438,7 +34267,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -43,10 +37,23 @@ +@@ -43,10 +37,23 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -51464,7 +34293,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -57,22 +64,17 @@ +@@ -57,22 +64,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -51488,7 +34317,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -87,22 +89,15 @@ +@@ -87,8 +89,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -51496,9 +34325,8 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -96,10 +96,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -51507,13 +34335,9 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -126,6 +121,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -126,6 +122,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -51521,7 +34345,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -144,8 +140,6 @@ +@@ -144,8 +141,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -51530,7 +34354,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -156,97 +150,21 @@ +@@ -156,91 +151,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -51623,20 +34447,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -257,29 +175,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -262,24 +180,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -51659,12 +34470,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -290,8 +202,6 @@ +@@ -290,8 +199,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -51673,7 +34482,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -303,28 +213,10 @@ +@@ -303,28 +210,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -51702,7 +34511,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -333,22 +225,25 @@ +@@ -333,22 +222,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -51712,12 +34521,11 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -51733,17 +34541,15 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -370,7 +265,9 @@ - libexecdir = @libexecdir@ +@@ -371,6 +263,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -379,13 +276,14 @@ +@@ -379,13 +272,13 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -51751,7 +34557,6 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -51761,7 +34566,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. EXTRA_DIST = \ $(content_files) \ $(HTML_IMAGES) \ -@@ -418,7 +316,6 @@ +@@ -418,7 +311,6 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -51769,7 +34574,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. AUTOMAKE_OPTIONS = 1.7 # The name of the module. -@@ -441,16 +338,13 @@ +@@ -441,16 +333,13 @@ INCLUDES = \ -I$(top_builddir) \ $(DEP_CFLAGS) @@ -51786,7 +34591,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@@ -463,13 +357,10 @@ +@@ -463,13 +352,10 @@ HTML_IMAGES = # searched for in VPATH/GPATH. # GPATH = $(srcdir) @@ -51800,7 +34605,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. SCANOBJ_FILES = \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ -@@ -477,69 +368,73 @@ +@@ -477,69 +363,73 @@ SCANOBJ_FILES = \ $(DOC_MODULE).prerequisites \ $(DOC_MODULE).signals @@ -51910,7 +34715,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -557,7 +452,6 @@ +@@ -557,7 +447,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile all-local @@ -51918,7 +34723,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. installdirs: install: install-am install-exec: install-exec-am -@@ -579,7 +473,7 @@ +@@ -579,7 +468,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -51927,7 +34732,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -590,25 +484,34 @@ +@@ -590,25 +479,34 @@ clean-am: clean-generic clean-libtool cl distclean: distclean-am -rm -f Makefile @@ -51964,7 +34769,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. installcheck-am: maintainer-clean: maintainer-clean-am -@@ -628,18 +531,23 @@ +@@ -628,18 +526,23 @@ ps: ps-am ps-am: @@ -51998,9 +34803,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2. # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/reference/Makefile.in ---- gtk+2.0-2.14.7.old/docs/reference/Makefile.in 2009-01-07 22:52:02.000000000 +0100 -+++ gtk+2.0-2.14.7/docs/reference/Makefile.in 2009-01-08 08:03:48.000000000 +0100 +Index: gtk+-2.14.7/docs/reference/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/reference/Makefile.in 2009-02-17 23:15:21.659088492 +0100 ++++ gtk+-2.14.7/docs/reference/Makefile.in 2009-02-21 14:58:41.370585065 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -52031,7 +34837,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ +@@ -37,10 +31,35 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -52069,7 +34875,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +70,17 @@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -52093,7 +34899,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +95,15 @@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -52101,9 +34907,8 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -52112,13 +34917,9 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +127,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -52126,7 +34927,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +146,6 @@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -52135,7 +34936,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +156,21 @@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -52228,20 +35029,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +181,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -52264,12 +35052,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +208,6 @@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -52278,7 +35064,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +219,10 @@ +@@ -297,28 +216,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -52307,7 +35093,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +231,25 @@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -52317,12 +35103,11 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -52338,17 +35123,15 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +271,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +282,12 @@ +@@ -373,9 +278,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -52356,13 +35139,12 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,31 +318,39 @@ +@@ -406,31 +313,39 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -52421,7 +35203,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref mostlyclean-libtool: -rm -f *.lo -@@ -438,10 +358,6 @@ +@@ -438,10 +353,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -52432,7 +35214,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -449,7 +365,13 @@ +@@ -449,7 +360,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -52447,7 +35229,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -461,15 +383,20 @@ +@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -52472,7 +35254,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -490,7 +417,7 @@ +@@ -490,7 +412,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -52481,7 +35263,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -501,35 +428,30 @@ +@@ -501,35 +423,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -52524,7 +35306,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -537,23 +459,23 @@ +@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -52557,7 +35339,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -565,29 +487,23 @@ +@@ -565,29 +482,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -52600,7 +35382,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -598,15 +514,19 @@ +@@ -598,15 +509,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -52625,7 +35407,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref distdir) \ || exit 1; \ fi; \ -@@ -617,7 +537,6 @@ +@@ -617,7 +532,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -52633,7 +35415,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -637,7 +556,7 @@ +@@ -637,7 +551,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -52642,7 +35424,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -648,25 +567,34 @@ +@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -52679,7 +35461,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -685,26 +613,24 @@ +@@ -685,26 +608,24 @@ ps: ps-recursive ps-am: @@ -52722,9 +35504,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/reference/Makefile.in gtk+2.0-2.14.7/docs/ref # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/Makefile.in ---- gtk+2.0-2.14.7.old/docs/tools/Makefile.in 2009-01-07 22:52:04.000000000 +0100 -+++ gtk+2.0-2.14.7/docs/tools/Makefile.in 2009-01-08 08:03:49.000000000 +0100 +Index: gtk+-2.14.7/docs/tools/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/tools/Makefile.in 2009-02-17 23:15:21.627087777 +0100 ++++ gtk+-2.14.7/docs/tools/Makefile.in 2009-02-21 14:58:42.199082193 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -52754,7 +35537,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,46 @@ +@@ -37,10 +32,46 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -52803,7 +35586,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +82,17 @@ +@@ -51,22 +82,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -52827,7 +35610,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +107,15 @@ +@@ -81,8 +107,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -52835,9 +35618,8 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +114,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -52846,13 +35628,9 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +139,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +140,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -52860,7 +35638,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +158,6 @@ +@@ -138,8 +159,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -52869,7 +35647,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +168,21 @@ +@@ -150,91 +169,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -52962,20 +35740,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +193,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +198,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -52998,12 +35763,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +220,6 @@ +@@ -284,8 +217,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -53012,7 +35775,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +231,10 @@ +@@ -297,28 +228,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -53041,7 +35804,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +243,25 @@ +@@ -327,22 +240,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -53051,12 +35814,11 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -53072,17 +35834,15 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +283,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +281,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +294,12 @@ +@@ -373,9 +290,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -53090,13 +35850,12 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,7 +330,6 @@ +@@ -406,7 +325,6 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -53104,7 +35863,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -415,24 +338,17 @@ +@@ -415,24 +333,17 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -53129,7 +35888,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M doc_shooter_DEPENDENCIES = $(DEPS) doc_shooter_LDADD = $(LDADDS) doc_shooter_SOURCES = \ -@@ -442,46 +358,39 @@ +@@ -442,46 +353,39 @@ doc_shooter_SOURCES = \ widgets.c \ widgets.h @@ -53203,7 +35962,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -491,10 +400,10 @@ +@@ -491,10 +395,10 @@ clean-noinstPROGRAMS: done doc-shooter$(EXEEXT): $(doc_shooter_OBJECTS) $(doc_shooter_DEPENDENCIES) @rm -f doc-shooter$(EXEEXT) @@ -53216,7 +35975,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M distclean-compile: -rm -f *.tab.c -@@ -504,37 +413,25 @@ +@@ -504,37 +408,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widgets.Po@am__quote@ .c.o: @@ -53266,7 +36025,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M mostlyclean-libtool: -rm -f *.lo -@@ -542,26 +439,15 @@ +@@ -542,26 +434,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -53296,7 +36055,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -571,23 +457,23 @@ +@@ -571,23 +452,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -53329,7 +36088,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -599,29 +485,23 @@ +@@ -599,29 +480,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -53372,7 +36131,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -636,7 +516,6 @@ +@@ -636,7 +511,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -53380,7 +36139,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M installdirs: install: install-am install-exec: install-exec-am -@@ -657,7 +536,7 @@ +@@ -657,7 +531,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -53389,7 +36148,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -671,24 +550,34 @@ +@@ -671,24 +545,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -53425,7 +36184,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M installcheck-am: maintainer-clean: maintainer-clean-am -@@ -709,19 +598,23 @@ +@@ -709,19 +593,23 @@ ps: ps-am ps-am: @@ -53458,9 +36217,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tools/Makefile.in gtk+2.0-2.14.7/docs/tools/M # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tutorial/Makefile.in ---- gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in 2009-01-07 22:52:04.000000000 +0100 -+++ gtk+2.0-2.14.7/docs/tutorial/Makefile.in 2009-01-08 08:03:49.000000000 +0100 +Index: gtk+-2.14.7/docs/tutorial/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/docs/tutorial/Makefile.in 2009-02-17 23:15:21.591089417 +0100 ++++ gtk+-2.14.7/docs/tutorial/Makefile.in 2009-02-21 14:58:42.331086609 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -53491,7 +36251,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,23 @@ +@@ -37,10 +31,23 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -53517,7 +36277,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +58,17 @@ +@@ -51,22 +58,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -53541,7 +36301,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +83,15 @@ +@@ -81,8 +83,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -53549,9 +36309,8 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +90,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -53560,13 +36319,9 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +115,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +116,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -53574,7 +36329,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +134,6 @@ +@@ -138,8 +135,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -53583,7 +36338,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +144,21 @@ +@@ -150,91 +145,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -53676,20 +36431,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +169,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +174,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -53712,12 +36454,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +196,6 @@ +@@ -284,8 +193,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -53726,7 +36466,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +207,10 @@ +@@ -297,28 +204,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -53755,7 +36495,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +219,25 @@ +@@ -327,22 +216,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -53765,12 +36505,11 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -53786,17 +36525,15 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +259,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +257,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,47 +270,28 @@ +@@ -373,47 +266,27 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -53804,7 +36541,6 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -53859,7 +36595,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto TEST_PROGS = ### testing rules -@@ -439,61 +317,67 @@ +@@ -439,61 +312,67 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -53961,7 +36697,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -511,7 +395,6 @@ +@@ -511,7 +390,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile @@ -53969,7 +36705,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto installdirs: install: install-am install-exec: install-exec-am -@@ -532,7 +415,7 @@ +@@ -532,7 +410,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -53978,7 +36714,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -543,7 +426,7 @@ +@@ -543,7 +421,7 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-am -rm -f Makefile @@ -53987,7 +36723,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto dvi: dvi-am -@@ -555,12 +438,20 @@ +@@ -555,12 +433,20 @@ info-am: install-data-am: @@ -54008,7 +36744,7 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto installcheck-am: maintainer-clean: maintainer-clean-am -@@ -571,25 +462,27 @@ +@@ -571,25 +457,27 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool @@ -54047,9 +36783,10 @@ diff -Naur gtk+2.0-2.14.7.old/docs/tutorial/Makefile.in gtk+2.0-2.14.7/docs/tuto # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/directfb/Makefile.in ---- gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in 2009-01-07 22:52:06.000000000 +0100 -+++ gtk+2.0-2.14.7/gdk/directfb/Makefile.in 2009-01-08 08:03:50.000000000 +0100 +Index: gtk+-2.14.7/gdk/directfb/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk/directfb/Makefile.in 2009-02-17 23:15:21.559089680 +0100 ++++ gtk+-2.14.7/gdk/directfb/Makefile.in 2009-02-21 14:58:43.446583063 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -54080,7 +36817,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,60 @@ +@@ -37,10 +33,60 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -54143,7 +36880,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +97,17 @@ +@@ -51,22 +97,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -54167,7 +36904,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +122,15 @@ +@@ -81,8 +122,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -54175,9 +36912,8 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +129,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -54186,13 +36922,9 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +154,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +155,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -54200,7 +36932,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +173,6 @@ +@@ -138,8 +174,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -54209,7 +36941,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +183,21 @@ +@@ -150,91 +184,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -54302,20 +37034,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +208,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +213,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -54338,12 +37057,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +235,6 @@ +@@ -284,8 +232,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -54352,7 +37069,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +246,10 @@ +@@ -297,28 +243,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -54381,7 +37098,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +258,25 @@ +@@ -327,22 +255,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -54391,12 +37108,11 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -54412,17 +37128,15 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +298,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +296,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,14 +309,17 @@ +@@ -373,14 +305,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -54430,7 +37144,6 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -54442,7 +37155,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct TEST_PROGS = ### testing rules -@@ -406,9 +345,7 @@ +@@ -406,9 +340,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -54452,7 +37165,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \ -DGDK_COMPILATION \ -@@ -419,13 +356,10 @@ +@@ -419,13 +351,10 @@ INCLUDES = \ @GTK_DEBUG_FLAGS@ \ @GDK_DEP_CFLAGS@ @@ -54466,7 +37179,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct libgdk_directfb_la_SOURCES = \ gdkapplaunchcontext-directfb.c \ gdkcolor-directfb.c \ -@@ -458,98 +392,57 @@ +@@ -458,98 +387,57 @@ libgdk_directfb_la_SOURCES = \ gdkwindowid.c \ x-cursors.xbm @@ -54595,7 +37308,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct distclean-compile: -rm -f *.tab.c -@@ -581,82 +474,58 @@ +@@ -581,82 +469,58 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowid.Plo@am__quote@ .c.o: @@ -54700,7 +37413,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -666,23 +535,23 @@ +@@ -666,23 +530,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -54733,7 +37446,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -694,29 +563,23 @@ +@@ -694,29 +558,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -54776,7 +37489,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -731,9 +594,10 @@ +@@ -731,9 +589,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -54789,7 +37502,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -753,7 +617,7 @@ +@@ -753,7 +612,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -54798,7 +37511,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -767,24 +631,34 @@ +@@ -767,24 +626,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -54834,7 +37547,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct installcheck-am: maintainer-clean: maintainer-clean-am -@@ -805,19 +679,23 @@ +@@ -805,19 +674,23 @@ ps: ps-am ps-am: @@ -54868,9 +37581,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/directfb/Makefile.in gtk+2.0-2.14.7/gdk/direct uninstall-libgdkincludeHEADERS # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in ---- gtk+2.0-2.14.7.old/gdk/Makefile.in 2009-01-07 22:52:06.000000000 +0100 -+++ gtk+2.0-2.14.7/gdk/Makefile.in 2009-01-08 08:03:50.000000000 +0100 +Index: gtk+-2.14.7/gdk/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk/Makefile.in 2009-02-17 23:15:21.507088028 +0100 ++++ gtk+-2.14.7/gdk/Makefile.in 2009-02-21 14:58:43.266582462 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -54902,7 +37616,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +34,143 @@ +@@ -37,10 +34,143 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -55048,7 +37762,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +181,17 @@ +@@ -51,22 +181,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -55072,7 +37786,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +206,15 @@ +@@ -81,8 +206,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -55080,9 +37794,8 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +213,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -55091,13 +37804,9 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +238,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +239,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -55105,7 +37814,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +257,6 @@ +@@ -138,8 +258,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -55114,7 +37823,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +267,21 @@ +@@ -150,91 +268,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -55207,20 +37916,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +292,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +297,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -55243,12 +37939,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +319,6 @@ +@@ -284,8 +316,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -55257,7 +37951,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +330,10 @@ +@@ -297,28 +327,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -55286,7 +37980,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +342,25 @@ +@@ -327,22 +339,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -55296,12 +37990,11 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -55317,17 +38010,15 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +382,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +380,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,31 +393,22 @@ +@@ -373,31 +389,21 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -55335,7 +38026,6 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -55369,7 +38059,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in TEST_PROGS = ### testing rules -@@ -423,10 +434,8 @@ +@@ -423,10 +429,8 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -55380,7 +38070,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -436,9 +445,7 @@ +@@ -436,9 +440,7 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -55390,7 +38080,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined # libtool stuff: set version and export symbols for resolving -@@ -452,7 +459,6 @@ +@@ -452,7 +454,6 @@ LDADD = \ $(LIBTOOL_EXPORT_OPTIONS) @USE_MEDIALIB_FALSE@medialib_sources = @@ -55398,7 +38088,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in @USE_MEDIALIB_TRUE@medialib_sources = \ @USE_MEDIALIB_TRUE@ gdkmedialib.c -@@ -496,17 +502,14 @@ +@@ -496,17 +497,14 @@ gdk_public_h_sources = \ gdkvisual.h \ gdkwindow.h @@ -55416,7 +38106,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in gdk_c_sources = \ $(medialib_sources) \ gdk.c \ -@@ -543,7 +546,6 @@ +@@ -543,7 +541,6 @@ gdk_c_sources = \ gdkwindow.c \ gdkwindowimpl.c @@ -55424,7 +38114,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in gdk_built_sources = \ gdkaliasdef.c \ gdkenumtypes.c \ -@@ -553,7 +555,6 @@ +@@ -553,7 +550,6 @@ gdk_built_sources = \ $(gdk_built_private_headers) @@ -55432,7 +38122,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in # # setup GDK sources and their dependencies # -@@ -566,40 +567,31 @@ +@@ -566,40 +562,31 @@ common_sources = \ gdkenumtypes.c \ gdkmarshalers.h @@ -55473,7 +38163,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h EXTRA_HEADERS = -@@ -613,183 +605,79 @@ +@@ -613,183 +600,79 @@ BUILT_SOURCES = \ $(gdk_built_sources) \ gdkconfig.h @@ -55697,7 +38387,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -828,64 +716,47 @@ +@@ -828,64 +711,47 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindowimpl.Plo@am__quote@ .c.o: @@ -55781,7 +38471,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -895,7 +766,13 @@ +@@ -895,7 +761,13 @@ uninstall-gdkincludeHEADERS: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -55796,7 +38486,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -907,15 +784,20 @@ +@@ -907,15 +779,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -55821,7 +38511,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -936,7 +818,7 @@ +@@ -936,7 +813,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -55830,7 +38520,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -947,35 +829,30 @@ +@@ -947,35 +824,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -55873,7 +38563,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -983,23 +860,23 @@ +@@ -983,23 +855,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -55906,7 +38596,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1013,9 +890,9 @@ +@@ -1013,9 +885,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -55918,7 +38608,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1024,25 +901,25 @@ +@@ -1024,25 +896,25 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -55954,7 +38644,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in ;; \ esac; \ else \ -@@ -1067,46 +944,40 @@ +@@ -1067,46 +939,40 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -56018,7 +38708,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1119,13 +990,17 @@ +@@ -1119,13 +985,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -56040,7 +38730,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -1137,8 +1012,9 @@ +@@ -1137,8 +1007,9 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -56052,7 +38742,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -1159,14 +1035,14 @@ +@@ -1159,14 +1030,14 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -56069,7 +38759,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in clean: clean-recursive clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ -@@ -1176,26 +1052,36 @@ +@@ -1176,26 +1047,36 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -56107,7 +38797,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -1216,32 +1102,30 @@ +@@ -1216,32 +1097,30 @@ ps: ps-recursive ps-am: @@ -56162,9 +38852,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/Makefile.in gtk+2.0-2.14.7/gdk/Makefile.in # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/Makefile.in ---- gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in 2009-01-07 22:52:06.000000000 +0100 -+++ gtk+2.0-2.14.7/gdk/quartz/Makefile.in 2009-01-08 08:03:50.000000000 +0100 +Index: gtk+-2.14.7/gdk/quartz/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk/quartz/Makefile.in 2009-02-17 23:15:21.479082514 +0100 ++++ gtk+-2.14.7/gdk/quartz/Makefile.in 2009-02-21 14:58:43.623082240 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -56195,7 +38886,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ +@@ -37,10 +33,59 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -56257,7 +38948,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +96,17 @@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -56281,7 +38972,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +121,15 @@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -56289,9 +38980,8 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -56300,13 +38990,9 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +153,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -56314,7 +39000,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +172,6 @@ +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -56323,7 +39009,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +182,21 @@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -56416,20 +39102,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +207,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -56452,12 +39125,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +234,6 @@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -56466,7 +39137,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +245,10 @@ +@@ -297,28 +242,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -56495,7 +39166,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +257,25 @@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -56505,12 +39176,11 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -56526,17 +39196,15 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +297,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +308,12 @@ +@@ -373,9 +304,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -56544,13 +39212,12 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +344,7 @@ +@@ -406,9 +339,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -56560,7 +39227,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -419,11 +355,8 @@ +@@ -419,11 +350,8 @@ INCLUDES = \ $(GDK_DEP_CFLAGS) \ "-xobjective-c" @@ -56572,7 +39239,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M libgdk_quartz_la_SOURCES = \ GdkQuartzView.c \ GdkQuartzView.h \ -@@ -462,98 +395,56 @@ +@@ -462,98 +390,56 @@ libgdk_quartz_la_SOURCES = \ gdkwindow-quartz.h \ xcursors.h @@ -56701,7 +39368,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M distclean-compile: -rm -f *.tab.c -@@ -587,82 +478,58 @@ +@@ -587,82 +473,58 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-quartz.Plo@am__quote@ .c.o: @@ -56806,7 +39473,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -672,23 +539,23 @@ +@@ -672,23 +534,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -56839,7 +39506,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -700,29 +567,23 @@ +@@ -700,29 +562,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -56882,7 +39549,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -737,9 +598,10 @@ +@@ -737,9 +593,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -56895,7 +39562,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -759,7 +621,7 @@ +@@ -759,7 +616,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -56904,7 +39571,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -773,24 +635,34 @@ +@@ -773,24 +630,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -56940,7 +39607,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M installcheck-am: maintainer-clean: maintainer-clean-am -@@ -811,19 +683,23 @@ +@@ -811,19 +678,23 @@ ps: ps-am ps-am: @@ -56974,9 +39641,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/quartz/Makefile.in gtk+2.0-2.14.7/gdk/quartz/M uninstall-libgdkincludeHEADERS # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Makefile.in ---- gtk+2.0-2.14.7.old/gdk/tests/Makefile.in 2009-01-07 22:52:07.000000000 +0100 -+++ gtk+2.0-2.14.7/gdk/tests/Makefile.in 2009-01-08 08:03:50.000000000 +0100 +Index: gtk+-2.14.7/gdk/tests/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk/tests/Makefile.in 2009-02-17 23:15:21.415087439 +0100 ++++ gtk+-2.14.7/gdk/tests/Makefile.in 2009-02-21 14:58:43.794582040 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -57007,7 +39675,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,47 @@ +@@ -37,10 +31,47 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -57057,7 +39725,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +82,17 @@ +@@ -51,22 +82,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -57081,7 +39749,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +107,15 @@ +@@ -81,8 +107,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -57089,9 +39757,8 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +114,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -57100,13 +39767,9 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +139,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +140,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -57114,7 +39777,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +158,6 @@ +@@ -138,8 +159,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -57123,7 +39786,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +168,21 @@ +@@ -150,91 +169,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -57216,20 +39879,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +193,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +198,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -57252,12 +39902,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +220,6 @@ +@@ -284,8 +217,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -57266,7 +39914,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +231,10 @@ +@@ -297,28 +228,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -57295,7 +39943,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +243,25 @@ +@@ -327,22 +240,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -57305,12 +39953,11 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -57326,17 +39973,15 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +283,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +281,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +294,12 @@ +@@ -373,9 +290,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -57344,13 +39989,12 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,20 +330,15 @@ +@@ -406,20 +325,15 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -57371,7 +40015,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak check_gdk_cairo_SOURCES = \ check-gdk-cairo.c \ $(NULL) -@@ -430,50 +349,43 @@ +@@ -430,50 +344,43 @@ check_gdk_cairo_LDADD = \ $(top_builddir)/gdk/libgdk-$(gdktarget)-$(GTK_API_VERSION).la \ $(NULL) @@ -57449,7 +40093,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; for p in $$list; do \ -@@ -483,10 +395,10 @@ +@@ -483,10 +390,10 @@ clean-checkPROGRAMS: done check-gdk-cairo$(EXEEXT): $(check_gdk_cairo_OBJECTS) $(check_gdk_cairo_DEPENDENCIES) @rm -f check-gdk-cairo$(EXEEXT) @@ -57462,7 +40106,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak distclean-compile: -rm -f *.tab.c -@@ -494,37 +406,25 @@ +@@ -494,37 +401,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gdk-cairo.Po@am__quote@ .c.o: @@ -57512,7 +40156,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak mostlyclean-libtool: -rm -f *.lo -@@ -532,26 +432,15 @@ +@@ -532,26 +427,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -57542,7 +40186,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -561,23 +450,23 @@ +@@ -561,23 +445,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -57575,7 +40219,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -591,9 +480,9 @@ +@@ -591,9 +475,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -57587,7 +40231,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -602,25 +491,25 @@ +@@ -602,25 +486,25 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -57623,7 +40267,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak ;; \ esac; \ else \ -@@ -645,46 +534,40 @@ +@@ -645,46 +529,40 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -57687,7 +40331,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -700,7 +583,6 @@ +@@ -700,7 +578,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile @@ -57695,7 +40339,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak installdirs: install: install-am install-exec: install-exec-am -@@ -722,37 +604,48 @@ +@@ -722,37 +599,48 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -57747,7 +40391,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak installcheck-am: maintainer-clean: maintainer-clean-am -@@ -773,18 +666,23 @@ +@@ -773,18 +661,23 @@ ps: ps-am ps-am: @@ -57780,9 +40424,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/tests/Makefile.in gtk+2.0-2.14.7/gdk/tests/Mak # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Makefile.in ---- gtk+2.0-2.14.7.old/gdk/win32/Makefile.in 2009-01-07 22:52:07.000000000 +0100 -+++ gtk+2.0-2.14.7/gdk/win32/Makefile.in 2009-01-08 08:03:51.000000000 +0100 +Index: gtk+-2.14.7/gdk/win32/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk/win32/Makefile.in 2009-02-17 23:15:21.367089300 +0100 ++++ gtk+-2.14.7/gdk/win32/Makefile.in 2009-02-21 14:58:43.982582819 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -57813,7 +40458,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,69 @@ +@@ -37,10 +33,69 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -57885,7 +40530,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +106,17 @@ +@@ -51,22 +106,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -57909,7 +40554,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +131,15 @@ +@@ -81,8 +131,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -57917,9 +40562,8 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +138,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -57928,13 +40572,9 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +163,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +164,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -57942,7 +40582,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +182,6 @@ +@@ -138,8 +183,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -57951,7 +40591,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +192,21 @@ +@@ -150,91 +193,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -58044,20 +40684,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +217,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +222,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -58080,12 +40707,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +244,6 @@ +@@ -284,8 +241,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -58094,7 +40719,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +255,10 @@ +@@ -297,28 +252,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -58123,7 +40748,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +267,25 @@ +@@ -327,22 +264,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -58133,12 +40758,11 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -58154,17 +40778,15 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +307,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +305,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,17 +318,17 @@ +@@ -373,17 +314,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -58172,7 +40794,6 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -58187,7 +40808,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak TEST_PROGS = ### testing rules -@@ -409,9 +354,7 @@ +@@ -409,9 +349,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -58197,7 +40818,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DINSIDE_GDK_WIN32 \ -@@ -423,13 +366,9 @@ +@@ -423,13 +361,9 @@ INCLUDES = \ $(GDK_WIN32_EXTRA_CFLAGS)\ -DGDK_COMPILATION @@ -58211,7 +40832,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak libgdk_win32_la_SOURCES = \ xcursors.h \ gdkapplaunchcontext-win32.c \ -@@ -467,103 +406,56 @@ +@@ -467,103 +401,56 @@ libgdk_win32_la_SOURCES = \ wintab.h \ pktdef.h @@ -58345,7 +40966,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak distclean-compile: -rm -f *.tab.c -@@ -596,64 +488,47 @@ +@@ -596,64 +483,47 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkwindow-win32.Plo@am__quote@ .c.o: @@ -58429,7 +41050,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak done # This directory's subdirectories are mostly independent; you can cd -@@ -663,7 +538,13 @@ +@@ -663,7 +533,13 @@ uninstall-libgdkincludeHEADERS: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -58444,7 +41065,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -675,15 +556,20 @@ +@@ -675,15 +551,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -58469,7 +41090,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -704,7 +590,7 @@ +@@ -704,7 +585,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -58478,7 +41099,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -715,35 +601,30 @@ +@@ -715,35 +596,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -58521,7 +41142,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -751,23 +632,23 @@ +@@ -751,23 +627,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -58554,7 +41175,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -779,29 +660,23 @@ +@@ -779,29 +655,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -58597,7 +41218,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -812,15 +687,19 @@ +@@ -812,15 +682,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -58622,7 +41243,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak distdir) \ || exit 1; \ fi; \ -@@ -831,8 +710,9 @@ +@@ -831,8 +705,9 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -58634,7 +41255,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -852,7 +732,7 @@ +@@ -852,7 +727,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -58643,7 +41264,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -866,24 +746,34 @@ +@@ -866,24 +741,34 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -58679,7 +41300,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -904,28 +794,26 @@ +@@ -904,28 +789,26 @@ ps: ps-recursive ps-am: @@ -58725,9 +41346,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/Makefile.in gtk+2.0-2.14.7/gdk/win32/Mak # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/rc/Makefile.in ---- gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in 2009-01-07 22:52:07.000000000 +0100 -+++ gtk+2.0-2.14.7/gdk/win32/rc/Makefile.in 2009-01-08 08:03:51.000000000 +0100 +Index: gtk+-2.14.7/gdk/win32/rc/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk/win32/rc/Makefile.in 2009-02-17 23:15:21.315090582 +0100 ++++ gtk+-2.14.7/gdk/win32/rc/Makefile.in 2009-02-21 14:58:44.126582615 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -58757,7 +41379,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,24 @@ +@@ -37,10 +32,24 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -58784,7 +41406,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +60,17 @@ +@@ -51,22 +60,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -58808,7 +41430,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +85,15 @@ +@@ -81,8 +85,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -58816,9 +41438,8 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +92,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -58827,13 +41448,9 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +117,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +118,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -58841,7 +41458,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +136,6 @@ +@@ -138,8 +137,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -58850,7 +41467,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +146,21 @@ +@@ -150,91 +147,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -58943,20 +41560,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +171,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +176,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -58979,12 +41583,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +198,6 @@ +@@ -284,8 +195,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -58993,7 +41595,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +209,10 @@ +@@ -297,28 +206,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -59022,7 +41624,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +221,25 @@ +@@ -327,22 +218,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -59032,12 +41634,11 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -59053,17 +41654,15 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +261,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +259,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,18 +272,17 @@ +@@ -373,18 +268,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -59071,7 +41670,6 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -59087,7 +41685,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ TEST_PROGS = ### testing rules -@@ -410,27 +308,40 @@ +@@ -410,27 +303,40 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -59143,7 +41741,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -@@ -438,39 +349,29 @@ +@@ -438,39 +344,29 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -59196,7 +41794,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -485,7 +386,6 @@ +@@ -485,7 +381,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) @@ -59204,7 +41802,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ installdirs: install: install-am install-exec: install-exec-am -@@ -506,7 +406,7 @@ +@@ -506,7 +401,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -59213,7 +41811,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -517,24 +417,34 @@ +@@ -517,24 +412,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-am -rm -f Makefile @@ -59249,7 +41847,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ installcheck-am: maintainer-clean: maintainer-clean-am -@@ -553,17 +463,21 @@ +@@ -553,17 +458,21 @@ ps: ps-am ps-am: @@ -59279,9 +41877,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/win32/rc/Makefile.in gtk+2.0-2.14.7/gdk/win32/ # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefile.in ---- gtk+2.0-2.14.7.old/gdk/x11/Makefile.in 2009-01-07 22:52:07.000000000 +0100 -+++ gtk+2.0-2.14.7/gdk/x11/Makefile.in 2009-01-08 08:03:51.000000000 +0100 +Index: gtk+-2.14.7/gdk/x11/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk/x11/Makefile.in 2009-02-17 23:15:21.291087601 +0100 ++++ gtk+-2.14.7/gdk/x11/Makefile.in 2009-02-21 14:58:44.347082288 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -59313,7 +41912,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,12 +34,86 @@ +@@ -37,12 +34,86 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -59402,7 +42001,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -53,22 +124,17 @@ +@@ -53,22 +124,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -59426,7 +42025,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,22 +149,15 @@ +@@ -83,8 +149,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -59434,9 +42033,8 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -92,10 +156,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -59445,13 +42043,9 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -122,6 +181,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -122,6 +182,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -59459,7 +42053,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -140,8 +200,6 @@ +@@ -140,8 +201,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -59468,7 +42062,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -152,97 +210,21 @@ +@@ -152,91 +211,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -59561,20 +42155,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -253,29 +235,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -258,24 +240,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -59597,12 +42178,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -286,8 +262,6 @@ +@@ -286,8 +259,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -59611,7 +42190,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -299,28 +273,10 @@ +@@ -299,28 +270,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -59640,7 +42219,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -329,22 +285,25 @@ +@@ -329,22 +282,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -59650,12 +42229,11 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -59671,17 +42249,15 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -366,7 +325,9 @@ - libexecdir = @libexecdir@ +@@ -367,6 +323,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -375,9 +336,12 @@ +@@ -375,9 +332,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -59689,13 +42265,12 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -385,12 +349,8 @@ +@@ -385,12 +344,8 @@ GTESTER_REPORT = gtester-report # in $P # We need to include all these C files here since the conditionals # don't seem to be correctly expanded for the dist files. @@ -59709,7 +42284,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil TEST_PROGS = ### testing rules -@@ -416,9 +376,7 @@ +@@ -416,9 +371,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -59719,7 +42294,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -DGDK_COMPILATION \ -@@ -428,178 +386,69 @@ +@@ -428,178 +381,69 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GDK_DEP_CFLAGS) @@ -59940,7 +42515,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -609,10 +458,10 @@ +@@ -609,10 +453,10 @@ clean-noinstPROGRAMS: done checksettings$(EXEEXT): $(checksettings_OBJECTS) $(checksettings_DEPENDENCIES) @rm -f checksettings$(EXEEXT) @@ -59953,7 +42528,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil distclean-compile: -rm -f *.tab.c -@@ -652,82 +501,58 @@ +@@ -652,82 +496,58 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsettings-common.Plo@am__quote@ .c.o: @@ -60058,7 +42633,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -737,23 +562,23 @@ +@@ -737,23 +557,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -60091,7 +42666,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -767,9 +592,9 @@ +@@ -767,9 +587,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -60103,7 +42678,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -778,25 +603,25 @@ +@@ -778,25 +598,25 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -60139,7 +42714,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil ;; \ esac; \ else \ -@@ -821,46 +646,40 @@ +@@ -821,46 +641,40 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -60203,7 +42778,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -875,9 +694,10 @@ +@@ -875,9 +689,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) @@ -60216,7 +42791,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -897,7 +717,7 @@ +@@ -897,7 +712,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -60225,7 +42800,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -911,24 +731,34 @@ +@@ -911,24 +726,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -60261,7 +42836,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil installcheck-am: maintainer-clean: maintainer-clean-am -@@ -949,20 +779,24 @@ +@@ -949,20 +774,24 @@ ps: ps-am ps-am: @@ -60295,9 +42870,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk/x11/Makefile.in gtk+2.0-2.14.7/gdk/x11/Makefil # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/Makefile.in ---- gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in 2009-01-07 22:52:05.000000000 +0100 -+++ gtk+2.0-2.14.7/gdk-pixbuf/Makefile.in 2009-01-08 08:03:50.000000000 +0100 +Index: gtk+-2.14.7/gdk-pixbuf/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk-pixbuf/Makefile.in 2009-02-17 23:15:21.259087375 +0100 ++++ gtk+-2.14.7/gdk-pixbuf/Makefile.in 2009-02-21 14:58:42.815082271 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -60330,7 +42906,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,1440 +35,1372 @@ +@@ -37,1440 +35,1367 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -61638,13 +44214,14 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ -+DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ -+FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ +GAIL_INET_LIBS = @GAIL_INET_LIBS@ +GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ +GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ @@ -61711,7 +44288,6 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ -+LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBJASPER = @LIBJASPER@ +LIBJPEG = @LIBJPEG@ @@ -61722,7 +44298,6 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M +LIBTOOL = @LIBTOOL@ +LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ +LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -61737,8 +44312,6 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ @@ -61778,7 +44351,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ++ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ @@ -61812,7 +44385,6 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ms_librarian = @ms_librarian@ @@ -61826,7 +44398,6 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +GTESTER = gtester # in $PATH for non-GLIB packages @@ -63043,7 +45614,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -@@ -1479,116 +1409,115 @@ +@@ -1479,116 +1404,115 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ @@ -63211,7 +45782,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M else :; fi; \ done -@@ -1596,8 +1525,8 @@ +@@ -1596,8 +1520,8 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -63222,7 +45793,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M done clean-binPROGRAMS: -@@ -1615,16 +1544,16 @@ +@@ -1615,16 +1539,16 @@ clean-noinstPROGRAMS: done gdk-pixbuf-csource$(EXEEXT): $(gdk_pixbuf_csource_OBJECTS) $(gdk_pixbuf_csource_DEPENDENCIES) @rm -f gdk-pixbuf-csource$(EXEEXT) @@ -63243,7 +45814,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M distclean-compile: -rm -f *.tab.c -@@ -1672,64 +1601,47 @@ +@@ -1672,64 +1596,47 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gdk-pixbuf.Po@am__quote@ .c.o: @@ -63327,7 +45898,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M done # This directory's subdirectories are mostly independent; you can cd -@@ -1739,7 +1651,13 @@ +@@ -1739,7 +1646,13 @@ uninstall-libgdk_pixbufincludeHEADERS: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -63342,7 +45913,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1751,15 +1669,20 @@ +@@ -1751,15 +1664,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -63367,7 +45938,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -1780,7 +1703,7 @@ +@@ -1780,7 +1698,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -63376,7 +45947,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -1791,35 +1714,30 @@ +@@ -1791,35 +1709,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -63419,7 +45990,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -1827,23 +1745,23 @@ +@@ -1827,23 +1740,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -63452,7 +46023,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1857,9 +1775,9 @@ +@@ -1857,9 +1770,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -63464,7 +46035,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1868,25 +1786,25 @@ +@@ -1868,25 +1781,25 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -63500,7 +46071,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M ;; \ esac; \ else \ -@@ -1911,46 +1829,40 @@ +@@ -1911,46 +1824,40 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -63564,7 +46135,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1961,15 +1873,19 @@ +@@ -1961,15 +1868,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -63589,7 +46160,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M distdir) \ || exit 1; \ fi; \ -@@ -1978,13 +1894,16 @@ +@@ -1978,13 +1889,16 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive @@ -63609,7 +46180,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -2006,13 +1925,13 @@ +@@ -2006,13 +1920,13 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -63625,7 +46196,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -@@ -2023,12 +1942,14 @@ +@@ -2023,12 +1937,14 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -63641,7 +46212,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M info: info-recursive info-am: -@@ -2038,12 +1959,20 @@ +@@ -2038,12 +1954,20 @@ install-data-am: install-libgdk_pixbufin @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -63662,7 +46233,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -2064,35 +1993,34 @@ +@@ -2064,35 +1988,34 @@ ps: ps-recursive ps-am: @@ -63723,9 +46294,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/M # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-pixbuf/pixops/Makefile.in ---- gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in 2009-01-07 22:52:05.000000000 +0100 -+++ gtk+2.0-2.14.7/gdk-pixbuf/pixops/Makefile.in 2009-01-08 08:03:50.000000000 +0100 +Index: gtk+-2.14.7/gdk-pixbuf/pixops/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gdk-pixbuf/pixops/Makefile.in 2009-02-17 23:15:21.215122569 +0100 ++++ gtk+-2.14.7/gdk-pixbuf/pixops/Makefile.in 2009-02-21 14:58:42.995081894 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -63756,7 +46328,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ +@@ -37,10 +33,59 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -63818,7 +46390,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +96,17 @@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -63842,7 +46414,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +121,15 @@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -63850,9 +46422,8 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -63861,13 +46432,9 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +153,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -63875,7 +46442,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +172,6 @@ +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -63884,7 +46451,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +182,21 @@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -63977,20 +46544,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +207,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -64013,12 +46567,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +234,6 @@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -64027,7 +46579,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +245,10 @@ +@@ -297,28 +242,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -64056,7 +46608,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +257,25 @@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -64066,12 +46618,11 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -64087,17 +46638,15 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +297,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,18 +308,17 @@ +@@ -373,18 +304,16 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -64105,7 +46654,6 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -64121,7 +46669,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p TEST_PROGS = ### testing rules -@@ -410,97 +344,70 @@ +@@ -410,97 +339,70 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -64248,7 +46796,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -510,58 +417,62 @@ +@@ -510,58 +412,62 @@ clean-noinstPROGRAMS: done timescale$(EXEEXT): $(timescale_OBJECTS) $(timescale_DEPENDENCIES) @rm -f timescale$(EXEEXT) @@ -64340,7 +46888,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p mostlyclean-libtool: -rm -f *.lo -@@ -569,26 +480,15 @@ +@@ -569,26 +475,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -64370,7 +46918,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -598,23 +498,23 @@ +@@ -598,23 +493,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -64403,7 +46951,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -626,29 +526,23 @@ +@@ -626,29 +521,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -64446,7 +46994,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -663,7 +557,6 @@ +@@ -663,7 +552,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) @@ -64454,7 +47002,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p installdirs: install: install-am install-exec: install-exec-am -@@ -684,7 +577,7 @@ +@@ -684,7 +572,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -64463,7 +47011,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -698,24 +591,34 @@ +@@ -698,24 +586,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -64499,7 +47047,7 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p installcheck-am: maintainer-clean: maintainer-clean-am -@@ -736,19 +639,23 @@ +@@ -736,19 +634,23 @@ ps: ps-am ps-am: @@ -64529,9 +47077,10 @@ diff -Naur gtk+2.0-2.14.7.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.14.7/gdk-p # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in ---- gtk+2.0-2.14.7.old/gtk/Makefile.in 2009-01-07 22:52:08.000000000 +0100 -+++ gtk+2.0-2.14.7/gtk/Makefile.in 2009-01-08 08:03:51.000000000 +0100 +Index: gtk+-2.14.7/gtk/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gtk/Makefile.in 2009-02-17 23:15:21.147089272 +0100 ++++ gtk+-2.14.7/gtk/Makefile.in 2009-02-21 14:58:45.055081978 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -64565,7 +47114,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,7 +36,13 @@ +@@ -37,7 +36,13 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -64579,7 +47128,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in @OS_LINUX_TRUE@am__append_1 = abicheck.sh pltcheck.sh @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_2 = $(INCLUDED_IMMODULE_OBJ) @HAVE_INCLUDED_IMMMODULES_TRUE@am__append_3 = $(INCLUDED_IMMODULE_OBJ) -@@ -61,1756 +66,950 @@ +@@ -61,1756 +66,945 @@ host_triplet = @host@ @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_12 = gtksearchenginequartz.h @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_quartz_c_sources) @USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_14 = $(gtk_use_stub_c_sources) @@ -66502,13 +49051,14 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ -+DUMPBIN = @DUMPBIN@ ++ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ -+FGREP = @FGREP@ ++F77 = @F77@ ++FFLAGS = @FFLAGS@ +GAIL_INET_LIBS = @GAIL_INET_LIBS@ +GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ +GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ @@ -66575,7 +49125,6 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ -+LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBJASPER = @LIBJASPER@ +LIBJPEG = @LIBJPEG@ @@ -66586,7 +49135,6 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in +LIBTOOL = @LIBTOOL@ +LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ +LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ @@ -66601,8 +49149,6 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ @@ -66642,7 +49188,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ++ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ @@ -66676,7 +49222,6 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ms_librarian = @ms_librarian@ @@ -66690,7 +49235,6 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +GTESTER = gtester # in $PATH for non-GLIB packages @@ -67274,7 +49818,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in gtksearchenginesimple.c fnmatch.c gtkaboutdialog.c \ gtkaccelgroup.c gtkaccellabel.c gtkaccelmap.c gtkaccessible.c \ gtkaction.c gtkactiongroup.c gtkadjustment.c gtkalignment.c \ -@@ -1830,25 +1029,26 @@ +@@ -1830,25 +1024,26 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk gtkfilechooserdialog.c gtkfilechooserembed.c \ gtkfilechooserentry.c gtkfilechoosersettings.c \ gtkfilechooserutils.c gtkfilechooserwidget.c gtkfilefilter.c \ @@ -67320,7 +49864,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in gtkrecentchooserdialog.c gtkrecentchoosermenu.c \ gtkrecentchooserwidget.c gtkrecentchooserutils.c \ gtkrecentchooser.c gtkrecentfilter.c gtkrecentmanager.c \ -@@ -1856,8 +1056,8 @@ +@@ -1856,8 +1051,8 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk gtkscrolledwindow.c gtkselection.c gtkseparator.c \ gtkseparatormenuitem.c gtkseparatortoolitem.c gtksettings.c \ gtksizegroup.c gtkshow.c gtksocket.c gtkspinbutton.c \ @@ -67331,7 +49875,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in gtktextbuffer.c gtktextbufferrichtext.c \ gtktextbufferserialize.c gtktextchild.c gtktextdisplay.c \ gtktextiter.c gtktextlayout.c gtktextmark.c gtktextsegment.c \ -@@ -1872,370 +1072,501 @@ +@@ -1872,370 +1067,501 @@ am__libgtk_x11_2_0_la_SOURCES_DIST = gtk gtkvbox.c gtkvolumebutton.c gtkviewport.c gtkvpaned.c \ gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c \ gtkwidget.c gtkwindow-decorate.c gtkwindow.c \ @@ -68149,7 +50693,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in else :; fi; \ done -@@ -2243,8 +1574,8 @@ +@@ -2243,8 +1569,8 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ @@ -68160,7 +50704,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in done clean-binPROGRAMS: -@@ -2255,20 +1586,19 @@ +@@ -2255,20 +1581,19 @@ clean-binPROGRAMS: done gtk-query-immodules-2.0$(EXEEXT): $(gtk_query_immodules_2_0_OBJECTS) $(gtk_query_immodules_2_0_DEPENDENCIES) @rm -f gtk-query-immodules-2.0$(EXEEXT) @@ -68186,7 +50730,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in else :; fi; \ done -@@ -2276,12 +1606,12 @@ +@@ -2276,12 +1601,12 @@ uninstall-binSCRIPTS: @$(NORMAL_UNINSTALL) @list='$(bin_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ @@ -68202,7 +50746,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -2547,82 +1877,64 @@ +@@ -2547,82 +1872,64 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updateiconcache.Po@am__quote@ .c.o: @@ -68311,7 +50855,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -2632,7 +1944,13 @@ +@@ -2632,7 +1939,13 @@ uninstall-gtkunixprintincludeHEADERS: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -68326,7 +50870,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2644,15 +1962,20 @@ +@@ -2644,15 +1957,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -68351,7 +50895,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -2673,7 +1996,7 @@ +@@ -2673,7 +1991,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -68360,7 +50904,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2684,35 +2007,30 @@ +@@ -2684,35 +2002,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -68403,7 +50947,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -2720,23 +2038,23 @@ +@@ -2720,23 +2033,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -68436,7 +50980,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -2750,9 +2068,9 @@ +@@ -2750,9 +2063,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -68448,7 +50992,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -2761,25 +2079,25 @@ +@@ -2761,25 +2074,25 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -68484,7 +51028,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in ;; \ esac; \ else \ -@@ -2804,46 +2122,40 @@ +@@ -2804,46 +2117,40 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -68548,7 +51092,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -2856,13 +2168,17 @@ +@@ -2856,13 +2163,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -68570,7 +51114,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -2877,8 +2193,9 @@ +@@ -2877,8 +2188,9 @@ install-binPROGRAMS: install-libLTLIBRAR installdirs: installdirs-recursive installdirs-am: @@ -68582,7 +51126,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive -@@ -2900,13 +2217,13 @@ +@@ -2900,13 +2212,13 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -68598,7 +51142,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ -@@ -2916,12 +2233,14 @@ +@@ -2916,12 +2228,14 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -68614,7 +51158,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in info: info-recursive info-am: -@@ -2929,15 +2248,23 @@ +@@ -2929,15 +2243,23 @@ info-am: install-data-am: install-data-local install-gtkincludeHEADERS \ install-gtkunixprintincludeHEADERS @@ -68638,7 +51182,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -2960,35 +2287,34 @@ +@@ -2960,35 +2282,34 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-gtkincludeHEADERS \ @@ -68697,9 +51241,10 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/Makefile.in gtk+2.0-2.14.7/gtk/Makefile.in # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Makefile.in ---- gtk+2.0-2.14.7.old/gtk/tests/Makefile.in 2009-01-07 22:52:09.000000000 +0100 -+++ gtk+2.0-2.14.7/gtk/tests/Makefile.in 2009-01-08 08:03:51.000000000 +0100 +Index: gtk+-2.14.7/gtk/tests/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gtk/tests/Makefile.in 2009-02-17 23:15:21.099088199 +0100 ++++ gtk+-2.14.7/gtk/tests/Makefile.in 2009-02-21 14:58:45.302582009 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -68729,7 +51274,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +32,86 @@ +@@ -37,11 +32,86 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -68818,7 +51363,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,22 +122,17 @@ +@@ -52,22 +122,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -68842,7 +51387,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,22 +147,15 @@ +@@ -82,8 +147,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -68850,9 +51395,8 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -91,10 +154,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -68861,13 +51405,9 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -121,6 +179,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -121,6 +180,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -68875,7 +51415,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +198,6 @@ +@@ -139,8 +199,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -68884,7 +51424,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,97 +208,21 @@ +@@ -151,91 +209,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -68977,20 +51517,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -252,29 +233,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -257,24 +238,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -69013,12 +51540,10 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +260,6 @@ +@@ -285,8 +257,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -69027,7 +51552,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +271,10 @@ +@@ -298,28 +268,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -69056,7 +51581,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +283,25 @@ +@@ -328,22 +280,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -69066,12 +51591,11 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -69087,17 +51611,15 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,7 +323,9 @@ - libexecdir = @libexecdir@ +@@ -366,6 +321,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -374,16 +334,20 @@ +@@ -374,16 +330,19 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -69105,7 +51627,6 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -69121,7 +51642,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak ### testing rules -@@ -408,7 +372,6 @@ +@@ -408,7 +367,6 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -69129,7 +51650,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -418,20 +381,16 @@ +@@ -418,20 +376,16 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -69150,7 +51671,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak testing_SOURCES = testing.c testing_LDADD = $(progs_ldadd) liststore_SOURCES = liststore.c -@@ -466,128 +425,39 @@ +@@ -466,128 +420,39 @@ defaultvalue_SOURCES = defaultvalue.c pi defaultvalue_LDADD = $(progs_ldadd) textbuffer_SOURCES = textbuffer.c pixbuf-init.c textbuffer_LDADD = $(progs_ldadd) @@ -69306,7 +51827,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -597,37 +467,37 @@ +@@ -597,37 +462,37 @@ clean-noinstPROGRAMS: done builder$(EXEEXT): $(builder_OBJECTS) $(builder_DEPENDENCIES) @rm -f builder$(EXEEXT) @@ -69355,7 +51876,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak distclean-compile: -rm -f *.tab.c -@@ -645,37 +515,25 @@ +@@ -645,37 +510,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview-scrolling.Po@am__quote@ .c.o: @@ -69405,7 +51926,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak mostlyclean-libtool: -rm -f *.lo -@@ -683,26 +541,15 @@ +@@ -683,26 +536,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -69435,7 +51956,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -712,23 +559,23 @@ +@@ -712,23 +554,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -69468,7 +51989,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -740,29 +587,23 @@ +@@ -740,29 +582,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -69511,7 +52032,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -777,7 +618,6 @@ +@@ -777,7 +613,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -69519,7 +52040,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak installdirs: install: install-am install-exec: install-exec-am -@@ -798,7 +638,7 @@ +@@ -798,7 +633,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -69528,7 +52049,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -812,24 +652,34 @@ +@@ -812,24 +647,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -69564,7 +52085,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak installcheck-am: maintainer-clean: maintainer-clean-am -@@ -850,18 +700,23 @@ +@@ -850,18 +695,23 @@ ps: ps-am ps-am: @@ -69597,9 +52118,10 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/tests/Makefile.in gtk+2.0-2.14.7/gtk/tests/Mak # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/theme-bits/Makefile.in ---- gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in 2009-01-07 22:52:09.000000000 +0100 -+++ gtk+2.0-2.14.7/gtk/theme-bits/Makefile.in 2009-01-08 08:03:51.000000000 +0100 +Index: gtk+-2.14.7/gtk/theme-bits/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/gtk/theme-bits/Makefile.in 2009-02-17 23:15:21.051090059 +0100 ++++ gtk+-2.14.7/gtk/theme-bits/Makefile.in 2009-02-21 14:58:45.511082880 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -69629,7 +52151,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,42 @@ +@@ -37,10 +32,42 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -69674,7 +52196,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +78,17 @@ +@@ -51,22 +78,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -69698,7 +52220,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +103,15 @@ +@@ -81,8 +103,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -69706,9 +52228,8 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +110,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -69717,13 +52238,9 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +135,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +136,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -69731,7 +52248,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +154,6 @@ +@@ -138,8 +155,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -69740,7 +52257,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +164,21 @@ +@@ -150,91 +165,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -69833,20 +52350,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +189,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +194,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -69869,12 +52373,10 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +216,6 @@ +@@ -284,8 +213,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -69883,7 +52385,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +227,10 @@ +@@ -297,28 +224,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -69912,7 +52414,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +239,25 @@ +@@ -327,22 +236,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -69922,12 +52424,11 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -69943,17 +52444,15 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +279,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +277,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,14 +290,18 @@ +@@ -373,14 +286,17 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -69961,7 +52460,6 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -69974,7 +52472,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them TEST_PROGS = ### testing rules -@@ -406,56 +327,46 @@ +@@ -406,56 +322,46 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -70058,7 +52556,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -465,10 +376,10 @@ +@@ -465,10 +371,10 @@ clean-noinstPROGRAMS: done decompose-bits$(EXEEXT): $(decompose_bits_OBJECTS) $(decompose_bits_DEPENDENCIES) @rm -f decompose-bits$(EXEEXT) @@ -70071,7 +52569,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them distclean-compile: -rm -f *.tab.c -@@ -476,37 +387,25 @@ +@@ -476,37 +382,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decompose-bits.Po@am__quote@ .c.o: @@ -70121,7 +52619,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them mostlyclean-libtool: -rm -f *.lo -@@ -514,26 +413,15 @@ +@@ -514,26 +408,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -70151,7 +52649,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -543,23 +431,23 @@ +@@ -543,23 +426,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -70184,7 +52682,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -571,29 +459,23 @@ +@@ -571,29 +454,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -70227,7 +52725,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -608,7 +490,6 @@ +@@ -608,7 +485,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -70235,7 +52733,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them installdirs: install: install-am install-exec: install-exec-am -@@ -629,7 +510,7 @@ +@@ -629,7 +505,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -70244,7 +52742,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -643,24 +524,34 @@ +@@ -643,24 +519,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -70280,7 +52778,7 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them installcheck-am: maintainer-clean: maintainer-clean-am -@@ -681,18 +572,23 @@ +@@ -681,18 +567,23 @@ ps: ps-am ps-am: @@ -70313,9 +52811,10 @@ diff -Naur gtk+2.0-2.14.7.old/gtk/theme-bits/Makefile.in gtk+2.0-2.14.7/gtk/them # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/install-sh gtk+2.0-2.14.7/install-sh ---- gtk+2.0-2.14.7.old/install-sh 2007-09-18 16:10:46.000000000 +0200 -+++ gtk+2.0-2.14.7/install-sh 2009-01-08 08:03:47.000000000 +0100 +Index: gtk+-2.14.7/install-sh +=================================================================== +--- gtk+-2.14.7.orig/install-sh 2009-02-17 23:15:21.023088456 +0100 ++++ gtk+-2.14.7/install-sh 2009-02-21 14:58:40.127084285 +0100 @@ -1,7 +1,8 @@ #!/bin/sh -# @@ -71021,14215 +53520,47 @@ diff -Naur gtk+2.0-2.14.7.old/install-sh gtk+2.0-2.14.7/install-sh +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -diff -Naur gtk+2.0-2.14.7.old/ltmain.sh gtk+2.0-2.14.7/ltmain.sh ---- gtk+2.0-2.14.7.old/ltmain.sh 2008-08-30 00:27:25.000000000 +0200 -+++ gtk+2.0-2.14.7/ltmain.sh 2009-01-08 08:03:30.000000000 +0100 -@@ -1,52 +1,83 @@ --# 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, 2006, --# 2007, 2008 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 -+# Generated from ltmain.m4sh. -+ -+# ltmain.sh (GNU libtool) 2.2.6 -+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -+ -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 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. -+ -+# GNU Libtool is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by - # the Free Software Foundation; either version 2 of the License, or - # (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, but -+# As a special exception to the GNU General Public License, -+# if you distribute this file as part of a program or library that -+# is built using GNU Libtool, you may include this file under the -+# same distribution terms that you use for the rest of that program. -+# -+# GNU Libtool 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 - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --# --# As a special exception to the GNU General Public License, if you --# distribute this file as part of a program that contains a --# configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- --basename="s,^.*/,,g" -- --# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh --# is ksh but when the shell is invoked as "sh" and the current value of --# the _XPG environment variable is not equal to 1 (one), the special --# positional parameter $0, within a function call, is the name of the --# function. --progpath="$0" -- --# The name of this program: --progname=`echo "$progpath" | $SED $basename` --modename="$progname" -+# along with GNU Libtool; see the file COPYING. If not, a copy -+# can be downloaded from http://www.gnu.org/licenses/gpl.html, -+# or obtained by writing to the Free Software Foundation, Inc., -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - --# Global variables: --EXIT_SUCCESS=0 --EXIT_FAILURE=1 -+# Usage: $progname [OPTION]... [MODE-ARG]... -+# -+# Provide generalized library-building support services. -+# -+# --config show all configuration variables -+# --debug enable verbose shell tracing -+# -n, --dry-run display commands without modifying any files -+# --features display basic configuration information and exit -+# --mode=MODE use operation mode MODE -+# --preserve-dup-deps don't remove duplicate dependency libraries -+# --quiet, --silent don't print informational messages -+# --tag=TAG use configuration variables from tag TAG -+# -v, --verbose print informational messages (default) -+# --version print version information -+# -h, --help print short or long help message -+# -+# MODE must be one of the following: -+# -+# clean remove files from the build directory -+# compile compile a source file into a libtool object -+# execute automatically set library path, then run a program -+# finish complete the installation of libtool libraries -+# install install libraries or executables -+# link create a library or an executable -+# uninstall remove libraries from an installed directory -+# -+# MODE-ARGS vary depending on the MODE. -+# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -+# -+# When reporting a bug, please describe a test case to reproduce it and -+# include the following information: -+# -+# host-triplet: $host -+# shell: $SHELL -+# compiler: $LTCC -+# compiler flags: $LTCFLAGS -+# linker: $LD (gnu? $with_gnu_ld) -+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1 -+# automake: $automake_version -+# autoconf: $autoconf_version -+# -+# Report bugs to <bug-libtool@gnu.org>. +Index: gtk+-2.14.7/ltmain.sh +=================================================================== +--- gtk+-2.14.7.orig/ltmain.sh 2009-02-17 23:15:20.999087919 +0100 ++++ gtk+-2.14.7/ltmain.sh 2008-04-29 22:21:21.000000000 +0200 +@@ -43,7 +43,7 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.26 --TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" -+VERSION="2.2.6 Debian-2.2.6a-1" -+TIMESTAMP="" -+package_revision=1.3012 - --# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). -+# Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -@@ -60,104 +91,261 @@ - 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 -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X$1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -- # Yippee, $echo works! -- : --else -- # Restart under the correct shell, and then maybe $echo will work. -- exec $SHELL "$progpath" --no-reexec ${1+"$@"} --fi -- --if test "X$1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <<EOF --$* --EOF -- exit $EXIT_SUCCESS --fi -- --default_mode= --help="Try \`$progname --help' for more information." --magic="%%%MAGIC variable%%%" --mkdir="mkdir" --mv="mv -f" --rm="rm -f" -- --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed="${SED}"' -e 1s/^X//' --sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' --# test EBCDIC or ASCII --case `echo X|tr X '\101'` in -- A) # ASCII based system -- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr -- SP2NL='tr \040 \012' -- NL2SP='tr \015\012 \040\040' -- ;; -- *) # EBCDIC based system -- SP2NL='tr \100 \n' -- NL2SP='tr \r\n \100\100' -- ;; --esac -- --# NLS nuisances. -+# NLS nuisances: We save the old values to restore during execute mode. - # Only set LANG and LC_ALL to C if already set. - # 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. --lt_env= -+lt_user_locale= -+lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${$lt_var+set}\" = set; then -- save_$lt_var=\$$lt_var -- lt_env=\"$lt_var=\$$lt_var \$lt_env\" -- $lt_var=C -+ save_$lt_var=\$$lt_var -+ $lt_var=C - export $lt_var -+ lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" -+ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done - --if test -n "$lt_env"; then -- lt_env="env $lt_env" --fi -+$lt_unset CDPATH -+ -+ -+ -+ -+ -+: ${CP="cp -f"} -+: ${ECHO="echo"} -+: ${EGREP="/bin/grep -E"} -+: ${FGREP="/bin/grep -F"} -+: ${GREP="/bin/grep"} -+: ${LN_S="ln -s"} -+: ${MAKE="make"} -+: ${MKDIR="mkdir"} -+: ${MV="mv -f"} -+: ${RM="rm -f"} -+: ${SED="/bin/sed"} -+: ${SHELL="${CONFIG_SHELL-/bin/sh}"} -+: ${Xsed="$SED -e 1s/^X//"} -+ -+# Global variables: -+EXIT_SUCCESS=0 -+EXIT_FAILURE=1 -+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -+ -+exit_status=$EXIT_SUCCESS - - # Make sure IFS has a sensible default - lt_nl=' - ' - IFS=" $lt_nl" - --if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- $echo "$modename: not configured to build any kind of library" 1>&2 -- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit $EXIT_FAILURE --fi -+dirname="s,/[^/]*$,," -+basename="s,^.*/,," - --# Global variables. --mode=$default_mode --nonopt= --prev= --prevopt= --run= --show="$echo" --show_help= --execute_dlfiles= --duplicate_deps=no --preserve_args= --lo2o="s/\\.lo\$/.${objext}/" --o2lo="s/\\.${objext}\$/.lo/" --extracted_archives= --extracted_serial=0 -+# func_dirname_and_basename file append nondir_replacement -+# perform func_basename and func_dirname in a single function -+# call: -+# dirname: Compute the dirname of FILE. If nonempty, -+# add APPEND to the result, otherwise set result -+# to NONDIR_REPLACEMENT. -+# value returned in "$func_dirname_result" -+# basename: Compute filename of FILE. -+# value retuned in "$func_basename_result" -+# Implementation must be kept synchronized with func_dirname -+# and func_basename. For efficiency, we do not delegate to -+# those functions but instead duplicate the functionality here. -+func_dirname_and_basename () -+{ -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -+} -+ -+# Generated shell functions inserted here. -+ -+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -+# is ksh but when the shell is invoked as "sh" and the current value of -+# the _XPG environment variable is not equal to 1 (one), the special -+# positional parameter $0, within a function call, is the name of the -+# function. -+progpath="$0" -+ -+# The name of this program: -+# In the unlikely event $progname began with a '-', it would play havoc with -+# func_echo (imagine progname=-n), so we prepend ./ in that case: -+func_dirname_and_basename "$progpath" -+progname=$func_basename_result -+case $progname in -+ -*) progname=./$progname ;; -+esac -+ -+# Make sure we have an absolute path for reexecution: -+case $progpath in -+ [\\/]*|[A-Za-z]:\\*) ;; -+ *[\\/]*) -+ progdir=$func_dirname_result -+ progdir=`cd "$progdir" && pwd` -+ progpath="$progdir/$progname" -+ ;; -+ *) -+ save_IFS="$IFS" -+ IFS=: -+ for progdir in $PATH; do -+ IFS="$save_IFS" -+ test -x "$progdir/$progname" && break -+ done -+ IFS="$save_IFS" -+ test -n "$progdir" || progdir=`pwd` -+ progpath="$progdir/$progname" -+ ;; -+esac -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed="${SED}"' -e 1s/^X//' -+sed_quote_subst='s/\([`"$\\]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\(["`\\]\)/\\\1/g' -+ -+# Re-`\' parameter expansions in output of double_quote_subst that were -+# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -+# in input to double_quote_subst, that '$' was protected from expansion. -+# Since each input `\' is now two `\'s, look for any number of runs of -+# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -+bs='\\' -+bs2='\\\\' -+bs4='\\\\\\\\' -+dollar='\$' -+sed_double_backslash="\ -+ s/$bs4/&\\ -+/g -+ s/^$bs2$dollar/$bs&/ -+ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g -+ s/\n//g" -+ -+# Standard options: -+opt_dry_run=false -+opt_help=false -+opt_quiet=false -+opt_verbose=false -+opt_warning=: -+ -+# func_echo arg... -+# Echo program name prefixed message, along with the current mode -+# name if it has been set yet. -+func_echo () -+{ -+ $ECHO "$progname${mode+: }$mode: $*" -+} -+ -+# func_verbose arg... -+# Echo program name prefixed message in verbose mode only. -+func_verbose () -+{ -+ $opt_verbose && func_echo ${1+"$@"} -+ -+ # A bug in bash halts the script if the last line of a function -+ # fails when set -e is in force, so we need another command to -+ # work around that: -+ : -+} -+ -+# func_error arg... -+# Echo program name prefixed message to standard error. -+func_error () -+{ -+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -+} -+ -+# func_warning arg... -+# Echo program name prefixed warning message to standard error. -+func_warning () -+{ -+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -+ -+ # bash bug again: -+ : -+} -+ -+# func_fatal_error arg... -+# Echo program name prefixed message to standard error, and exit. -+func_fatal_error () -+{ -+ func_error ${1+"$@"} -+ exit $EXIT_FAILURE -+} -+ -+# func_fatal_help arg... -+# Echo program name prefixed message to standard error, followed by -+# a help hint, and exit. -+func_fatal_help () -+{ -+ func_error ${1+"$@"} -+ func_fatal_error "$help" -+} -+help="Try \`$progname --help' for more information." ## default -+ -+ -+# func_grep expression filename -+# Check whether EXPRESSION matches any line of FILENAME, without output. -+func_grep () -+{ -+ $GREP "$1" "$2" >/dev/null 2>&1 -+} -+ -+ -+# func_mkdir_p directory-path -+# Make sure the entire path to DIRECTORY-PATH is available. -+func_mkdir_p () -+{ -+ my_directory_path="$1" -+ my_dir_list= -+ -+ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then -+ -+ # Protect directory names starting with `-' -+ case $my_directory_path in -+ -*) my_directory_path="./$my_directory_path" ;; -+ esac -+ -+ # While some portion of DIR does not yet exist... -+ while test ! -d "$my_directory_path"; do -+ # ...make a list in topmost first order. Use a colon delimited -+ # list incase some portion of path contains whitespace. -+ my_dir_list="$my_directory_path:$my_dir_list" -+ -+ # If the last portion added has no slash in it, the list is done -+ case $my_directory_path in */*) ;; *) break ;; esac -+ -+ # ...otherwise throw away the child directory and loop -+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` -+ done -+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` -+ -+ save_mkdir_p_IFS="$IFS"; IFS=':' -+ for my_dir in $my_dir_list; do -+ IFS="$save_mkdir_p_IFS" -+ # mkdir can fail with a `File exist' error if two processes -+ # try to create one of the directories concurrently. Don't -+ # stop in that case! -+ $MKDIR "$my_dir" 2>/dev/null || : -+ done -+ IFS="$save_mkdir_p_IFS" -+ -+ # Bail out if we (or some other process) failed to create a directory. -+ test -d "$my_directory_path" || \ -+ func_fatal_error "Failed to create \`$1'" -+ fi -+} - --##################################### --# Shell function definitions: --# This seems to be the best place for them - - # func_mktempdir [string] - # Make a temporary directory that won't clash with other running -@@ -167,7 +355,7 @@ - { - my_template="${TMPDIR-/tmp}/${1-$progname}" - -- if test "$run" = ":"; then -+ if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else -@@ -176,526 +364,787 @@ - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then -- # Failing that, at least try and use $RANDOM to avoid a race -- my_tmpdir="${my_template}-${RANDOM-0}$$" -+ # Failing that, at least try and use $RANDOM to avoid a race -+ my_tmpdir="${my_template}-${RANDOM-0}$$" - -- save_mktempdir_umask=`umask` -- umask 0077 -- $mkdir "$my_tmpdir" -- umask $save_mktempdir_umask -+ save_mktempdir_umask=`umask` -+ umask 0077 -+ $MKDIR "$my_tmpdir" -+ umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure -- test -d "$my_tmpdir" || { -- $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 -- exit $EXIT_FAILURE -- } -+ test -d "$my_tmpdir" || \ -+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - -- $echo "X$my_tmpdir" | $Xsed -+ $ECHO "X$my_tmpdir" | $Xsed - } - - --# func_win32_libid arg --# return the library type of file 'arg' --# --# Need a lot of goo to handle *both* DLLs and import libs --# Has to be a shell function in order to 'eat' the argument --# that is supplied when $file_magic_command is called. --func_win32_libid () -+# func_quote_for_eval arg -+# Aesthetically quote ARG to be evaled later. -+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -+# is double-quoted, suitable for a subsequent eval, whereas -+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -+# which are still active within double quotes backslashified. -+func_quote_for_eval () - { -- win32_libid_type="unknown" -- win32_fileres=`file -L $1 2>/dev/null` -- case $win32_fileres in -- *ar\ archive\ import\ library*) # definitely import -- win32_libid_type="x86 archive import" -- ;; -- *ar\ archive*) # could be an import, or static -- 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 -- } -- }'` -- case $win32_nmres in -- import*) win32_libid_type="x86 archive import";; -- *) win32_libid_type="x86 archive static";; -- esac -- fi -- ;; -- *DLL*) -- win32_libid_type="x86 DLL" -- ;; -- *executable*) # but shell scripts are "executable" too... -- case $win32_fileres in -- *MS\ Windows\ PE\ Intel*) -- win32_libid_type="x86 DLL" -- ;; -+ case $1 in -+ *[\\\`\"\$]*) -+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; -+ *) -+ func_quote_for_eval_unquoted_result="$1" ;; -+ esac -+ -+ case $func_quote_for_eval_unquoted_result in -+ # Double-quote args containing shell metacharacters to delay -+ # word splitting, command substitution and and variable -+ # expansion for a subsequent eval. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, so we specify it separately. -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" -+ ;; -+ *) -+ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac -- ;; -- esac -- $echo $win32_libid_type - } - - --# func_infer_tag arg --# Infer tagged configuration to use if any are available and --# if one wasn't chosen via the "--tag" command line option. --# Only attempt this if the compiler in the base compile --# command doesn't match the default compiler. --# arg is usually of the form 'gcc ...' --func_infer_tag () -+# func_quote_for_expand arg -+# Aesthetically quote ARG to be evaled later; same as above, -+# but do not quote variable references. -+func_quote_for_expand () - { -- if test -n "$available_tags" && test -z "$tagname"; then -- CC_quoted= -- for arg in $CC; do -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- CC_quoted="$CC_quoted $arg" -- done -- case $@ in -- # Blanks in the command may have been stripped by the calling shell, -- # but not from the CC environment variable when configure was run. -- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; -- # Blanks at the start of $base_compile will cause this to fail -- # if we don't check for them as well. -+ case $1 in -+ *[\\\`\"]*) -+ my_arg=`$ECHO "X$1" | $Xsed \ -+ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) -- for z in $available_tags; do -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then -- # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -- CC_quoted= -- for arg in $CC; do -- # Double-quote args containing other shell metacharacters. -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- CC_quoted="$CC_quoted $arg" -- done -- case "$@ " in -- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) -- # The compiler in the base compile command matches -- # the one in the tagged configuration. -- # Assume this is the tagged configuration we want. -- tagname=$z -- break -- ;; -- esac -- fi -- done -- # If $tagname still isn't set, then no tagged configuration -- # was found and let the user know that the "--tag" command -- # line option must be used. -- if test -z "$tagname"; then -- $echo "$modename: unable to infer tagged configuration" -- $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit $EXIT_FAILURE --# else --# $echo "$modename: using $tagname tagged configuration" -- fi -- ;; -- esac -- fi -+ my_arg="$1" ;; -+ esac -+ -+ case $my_arg in -+ # Double-quote args containing shell metacharacters to delay -+ # word splitting and command substitution for a subsequent eval. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, so we specify it separately. -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ my_arg="\"$my_arg\"" -+ ;; -+ esac -+ -+ func_quote_for_expand_result="$my_arg" - } - - --# func_extract_an_archive dir oldlib --func_extract_an_archive () -+# func_show_eval cmd [fail_exp] -+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -+# is given, then evaluate it. -+func_show_eval () - { -- f_ex_an_ar_dir="$1"; shift -- f_ex_an_ar_oldlib="$1" -+ my_cmd="$1" -+ my_fail_exp="${2-:}" - -- $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" -- $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? -- if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then -- : -- else -- $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 -- exit $EXIT_FAILURE -+ ${opt_silent-false} || { -+ func_quote_for_expand "$my_cmd" -+ eval "func_echo $func_quote_for_expand_result" -+ } -+ -+ if ${opt_dry_run-false}; then :; else -+ eval "$my_cmd" -+ my_status=$? -+ if test "$my_status" -eq 0; then :; else -+ eval "(exit $my_status); $my_fail_exp" -+ fi - fi - } - --# func_extract_archives gentop oldlib ... --func_extract_archives () -+ -+# func_show_eval_locale cmd [fail_exp] -+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -+# is given, then evaluate it. Use the saved locale for evaluation. -+func_show_eval_locale () - { -- my_gentop="$1"; shift -- my_oldlibs=${1+"$@"} -- my_oldobjs="" -- my_xlib="" -- my_xabs="" -- my_xdir="" -- my_status="" -+ my_cmd="$1" -+ my_fail_exp="${2-:}" -+ -+ ${opt_silent-false} || { -+ func_quote_for_expand "$my_cmd" -+ eval "func_echo $func_quote_for_expand_result" -+ } - -- $show "${rm}r $my_gentop" -- $run ${rm}r "$my_gentop" -- $show "$mkdir $my_gentop" -- $run $mkdir "$my_gentop" -- my_status=$? -- if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then -- exit $my_status -+ if ${opt_dry_run-false}; then :; else -+ eval "$lt_user_locale -+ $my_cmd" -+ my_status=$? -+ eval "$lt_safe_locale" -+ if test "$my_status" -eq 0; then :; else -+ eval "(exit $my_status); $my_fail_exp" -+ fi - fi -+} - -- for my_xlib in $my_oldlibs; do -- # Extract the objects. -- case $my_xlib in -- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; -- *) my_xabs=`pwd`"/$my_xlib" ;; -- esac -- my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` -- 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" -- $show "$mkdir $my_xdir" -- $run $mkdir "$my_xdir" -- exit_status=$? -- if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then -- exit $exit_status -- fi -- case $host in -- *-darwin*) -- $show "Extracting $my_xabs" -- # Do not bother doing anything if just a dry run -- if test -z "$run"; then -- darwin_orig_dir=`pwd` -- cd $my_xdir || exit $? -- darwin_archive=$my_xabs -- darwin_curdir=`pwd` -- darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` -- darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` -- if test -n "$darwin_arches"; then -- darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` -- darwin_arch= -- $show "$darwin_base_archive has multiple architectures $darwin_arches" -- for darwin_arch in $darwin_arches ; do -- mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" -- lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" -- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" -- func_extract_an_archive "`pwd`" "${darwin_base_archive}" -- cd "$darwin_curdir" -- $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" -- done # $darwin_arches -- ## Okay now we have a bunch of thin objects, gotta fatten them up :) -- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` -- darwin_file= -- darwin_files= -- for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -- lipo -create -output "$darwin_file" $darwin_files -- done # $darwin_filelist -- ${rm}r unfat-$$ -- cd "$darwin_orig_dir" -- else -- cd "$darwin_orig_dir" -- func_extract_an_archive "$my_xdir" "$my_xabs" -- fi # $darwin_arches -- fi # $run -- ;; -- *) -- func_extract_an_archive "$my_xdir" "$my_xabs" -- ;; -- esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -- done -- func_extract_archives_result="$my_oldobjs" -+ -+ -+ -+# func_version -+# Echo version message to standard output and exit. -+func_version () -+{ -+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { -+ s/^# // -+ s/^# *$// -+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ -+ p -+ }' < "$progpath" -+ exit $? -+} -+ -+# func_usage -+# Echo short help message to standard output and exit. -+func_usage () -+{ -+ $SED -n '/^# Usage:/,/# -h/ { -+ s/^# // -+ s/^# *$// -+ s/\$progname/'$progname'/ -+ p -+ }' < "$progpath" -+ $ECHO -+ $ECHO "run \`$progname --help | more' for full usage" -+ exit $? -+} -+ -+# func_help -+# Echo long help message to standard output and exit. -+func_help () -+{ -+ $SED -n '/^# Usage:/,/# Report bugs to/ { -+ s/^# // -+ s/^# *$// -+ s*\$progname*'$progname'* -+ s*\$host*'"$host"'* -+ s*\$SHELL*'"$SHELL"'* -+ s*\$LTCC*'"$LTCC"'* -+ s*\$LTCFLAGS*'"$LTCFLAGS"'* -+ s*\$LD*'"$LD"'* -+ s/\$with_gnu_ld/'"$with_gnu_ld"'/ -+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ -+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ -+ p -+ }' < "$progpath" -+ exit $? -+} -+ -+# func_missing_arg argname -+# Echo program name prefixed message to standard error and set global -+# exit_cmd. -+func_missing_arg () -+{ -+ func_error "missing argument for $1" -+ exit_cmd=exit - } --# End of Shell function definitions --##################################### - --# Darwin sucks --eval std_shrext=\"$shrext_cmds\" -+exit_cmd=: - --disable_libs=no - --# Parse our command line options once, thoroughly. --while test "$#" -gt 0 --do -- arg="$1" -+ -+ -+ -+# Check that we have a working $ECHO. -+if test "X$1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. - shift -+elif test "X$1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then -+ # Yippee, $ECHO works! -+ : -+else -+ # Restart under the correct shell, and then maybe $ECHO will work. -+ exec $SHELL "$progpath" --no-reexec ${1+"$@"} -+fi - -- case $arg in -- -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; -- *) optarg= ;; -- esac -+if test "X$1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat <<EOF -+$* -+EOF -+ exit $EXIT_SUCCESS -+fi - -- # If the previous option needs an argument, assign it. -- if test -n "$prev"; then -- case $prev in -- execute_dlfiles) -- execute_dlfiles="$execute_dlfiles $arg" -- ;; -- tag) -- tagname="$arg" -- preserve_args="${preserve_args}=$arg" -- -- # Check whether tagname contains only valid characters -- case $tagname in -- *[!-_A-Za-z0-9,/]*) -- $echo "$progname: invalid tag name: $tagname" 1>&2 -- exit $EXIT_FAILURE -- ;; -- esac -+magic="%%%MAGIC variable%%%" -+magic_exe="%%%MAGIC EXE variable%%%" - -- case $tagname in -- CC) -- # Don't test for the "default" C tag, as we know, it's there, but -- # not specially marked. -- ;; -- *) -- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then -- taglist="$taglist $tagname" -- # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" -- else -- $echo "$progname: ignoring unknown tag $tagname" 1>&2 -- fi -- ;; -- esac -- ;; -- *) -- eval "$prev=\$arg" -- ;; -- esac -+# Global variables. -+# $mode is unset -+nonopt= -+execute_dlfiles= -+preserve_args= -+lo2o="s/\\.lo\$/.${objext}/" -+o2lo="s/\\.${objext}\$/.lo/" -+extracted_archives= -+extracted_serial=0 - -- prev= -- prevopt= -- continue -- fi -+opt_dry_run=false -+opt_duplicate_deps=false -+opt_silent=false -+opt_debug=: - -- # Have we seen a non-optional argument yet? -- case $arg in -- --help) -- show_help=yes -- ;; -+# If this variable is set in any of the actions, the command in it -+# will be execed at the end. This prevents here-documents from being -+# left over by shells. -+exec_cmd= - -- --version) -- echo "\ --$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP -- --Copyright (C) 2008 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 $? -- ;; -+# func_fatal_configuration arg... -+# Echo program name prefixed message to standard error, followed by -+# a configuration failure hint, and exit. -+func_fatal_configuration () -+{ -+ func_error ${1+"$@"} -+ func_error "See the $PACKAGE documentation for more information." -+ func_fatal_error "Fatal configuration error." -+} -+ -+ -+# func_config -+# Display the configuration for all the tags in this script. -+func_config () -+{ -+ re_begincf='^# ### BEGIN LIBTOOL' -+ re_endcf='^# ### END LIBTOOL' -+ -+ # Default configuration. -+ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - -- --config) -- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath - # Now print the configurations for the tags. - for tagname in $taglist; do -- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" -+ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" - done -- exit $? -- ;; -- -- --debug) -- $echo "$progname: enabling shell trace mode" -- set -x -- preserve_args="$preserve_args $arg" -- ;; - -- --dry-run | -n) -- run=: -- ;; -+ exit $? -+} - -- --features) -- $echo "host: $host" -+# func_features -+# Display the features supported by this script. -+func_features () -+{ -+ $ECHO "host: $host" - if test "$build_libtool_libs" = yes; then -- $echo "enable shared libraries" -+ $ECHO "enable shared libraries" - else -- $echo "disable shared libraries" -+ $ECHO "disable shared libraries" - fi - if test "$build_old_libs" = yes; then -- $echo "enable static libraries" -+ $ECHO "enable static libraries" - else -- $echo "disable static libraries" -+ $ECHO "disable static libraries" - fi -+ - exit $? -- ;; -+} - -- --finish) mode="finish" ;; -+# func_enable_tag tagname -+# Verify that TAGNAME is valid, and either flag an error and exit, or -+# enable the TAGNAME tag. We also add TAGNAME to the global $taglist -+# variable here. -+func_enable_tag () -+{ -+ # Global variable: -+ tagname="$1" -+ -+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" -+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" -+ sed_extractcf="/$re_begincf/,/$re_endcf/p" -+ -+ # Validate tagname. -+ case $tagname in -+ *[!-_A-Za-z0-9,/]*) -+ func_fatal_error "invalid tag name: $tagname" -+ ;; -+ esac - -- --mode) prevopt="--mode" prev=mode ;; -- --mode=*) mode="$optarg" ;; -+ # Don't test for the "default" C tag, as we know it's -+ # there but not specially marked. -+ case $tagname in -+ CC) ;; -+ *) -+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then -+ taglist="$taglist $tagname" - -- --preserve-dup-deps) duplicate_deps="yes" ;; -+ # Evaluate the configuration. Be careful to quote the path -+ # and the sed script, to avoid splitting on whitespace, but -+ # also don't use non-portable quotes within backquotes within -+ # quotes we have to do it in 2 steps: -+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` -+ eval "$extractedcf" -+ else -+ func_error "ignoring unknown tag $tagname" -+ fi -+ ;; -+ esac -+} - -- --quiet | --silent) -- show=: -- preserve_args="$preserve_args $arg" -- ;; -+# Parse options once, thoroughly. This comes as soon as possible in -+# the script to make things like `libtool --version' happen quickly. -+{ - -- --tag) -- prevopt="--tag" -- prev=tag -- preserve_args="$preserve_args --tag" -+ # Shorthand for --mode=foo, only valid as the first argument -+ case $1 in -+ clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift - ;; -- --tag=*) -- set tag "$optarg" ${1+"$@"} -- shift -- prev=tag -- preserve_args="$preserve_args --tag" -+ compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift - ;; -- -- -dlopen) -- prevopt="-dlopen" -- prev=execute_dlfiles -+ execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift - ;; -- -- -*) -- $echo "$modename: unrecognized option \`$arg'" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -+ finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift - ;; -- -- *) -- nonopt="$arg" -- break -+ install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+ link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac --done - --if test -n "$prevopt"; then -- $echo "$modename: option \`$prevopt' requires an argument" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE --fi -+ # Parse non-mode specific arguments: -+ while test "$#" -gt 0; do -+ opt="$1" -+ shift - --case $disable_libs in --no) -- ;; --shared) -- build_libtool_libs=no -- build_old_libs=yes -- ;; --static) -- build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -- ;; --esac -+ case $opt in -+ --config) func_config ;; - --# If this variable is set in any of the actions, the command in it --# will be execed at the end. This prevents here-documents from being --# left over by shells. --exec_cmd= -+ --debug) preserve_args="$preserve_args $opt" -+ func_echo "enabling shell trace mode" -+ opt_debug='set -x' -+ $opt_debug -+ ;; - --if test -z "$show_help"; then -+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -+ execute_dlfiles="$execute_dlfiles $1" -+ shift -+ ;; - -- # Infer the operation mode. -- if test -z "$mode"; then -- $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 -- $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 -- case $nonopt in -- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) -- mode=link -- for arg -- do -- case $arg in -- -c) -- mode=compile -- break -- ;; -- esac -- done -- ;; -- *db | *dbx | *strace | *truss) -- mode=execute -- ;; -- *install*|cp|mv) -- mode=install -- ;; -- *rm) -- mode=uninstall -+ --dry-run | -n) opt_dry_run=: ;; -+ --features) func_features ;; -+ --finish) mode="finish" ;; -+ -+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -+ case $1 in -+ # Valid mode arguments: -+ clean) ;; -+ compile) ;; -+ execute) ;; -+ finish) ;; -+ install) ;; -+ link) ;; -+ relink) ;; -+ uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+ esac -+ -+ mode="$1" -+ shift -+ ;; -+ -+ --preserve-dup-deps) -+ opt_duplicate_deps=: ;; -+ -+ --quiet|--silent) preserve_args="$preserve_args $opt" -+ opt_silent=: -+ ;; -+ -+ --verbose| -v) preserve_args="$preserve_args $opt" -+ opt_silent=false -+ ;; -+ -+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -+ preserve_args="$preserve_args $opt $1" -+ func_enable_tag "$1" # tagname is set here -+ shift -+ ;; -+ -+ # Separate optargs to long options: -+ -dlopen=*|--mode=*|--tag=*) -+ func_opt_split "$opt" -+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -+ shift -+ ;; -+ -+ -\?|-h) func_usage ;; -+ --help) opt_help=: ;; -+ --version) func_version ;; -+ -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ -+ *) nonopt="$opt" -+ break -+ ;; -+ esac -+ done -+ -+ -+ case $host in -+ *cygwin* | *mingw* | *pw32* | *cegcc*) -+ # don't eliminate duplications in $postdeps and $predeps -+ opt_duplicate_compiler_generated_deps=: - ;; - *) -- # If we have no mode, but dlfiles were specified, then do execute mode. -- test -n "$execute_dlfiles" && mode=execute -+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ ;; -+ esac - -- # Just use the default operation mode. -- if test -z "$mode"; then -- if test -n "$nonopt"; then -- $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 -- else -- $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 -- fi -+ # Having warned about all mis-specified options, bail out if -+ # anything was wrong. -+ $exit_cmd $EXIT_FAILURE -+} -+ -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () -+{ -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF - fi -- ;; -- esac -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi -+ -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+## ----------- ## -+## Main. ## -+## ----------- ## -+ -+$opt_help || { -+ # Sanity checks first: -+ func_check_version_match -+ -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" - fi - -+ test -z "$mode" && func_fatal_error "error: you must specify a MODE." -+ -+ -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" -+ -+ - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then -- $echo "$modename: unrecognized option \`-dlopen'" 1>&2 -- $echo "$help" 1>&2 -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" -- help="Try \`$modename --help --mode=$mode' for more information." -+ help="Try \`$progname --help --mode=$mode' for more information." -+} - -- # These modes are in order of execution frequency so that they run quickly. -- case $mode in -- # libtool compile mode -- compile) -- modename="$modename: compile" -- # Get the compilation command and the source file. -- base_compile= -- srcfile="$nonopt" # always keep a non-empty value in "srcfile" -- suppress_opt=yes -- suppress_output= -- arg_mode=normal -- libobj= -- later= - -- for arg -- do -- case $arg_mode in -- arg ) -- # do not "continue". Instead, add this to base_compile -- lastarg="$arg" -- arg_mode=normal -- ;; -+# func_lalib_p file -+# True iff FILE is a libtool `.la' library or `.lo' object file. -+# This function is only a basic sanity check; it will hardly flush out -+# determined imposters. -+func_lalib_p () -+{ -+ test -f "$1" && -+ $SED -e 4q "$1" 2>/dev/null \ -+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -+} - -- target ) -- libobj="$arg" -- arg_mode=normal -- continue -- ;; -+# func_lalib_unsafe_p file -+# True iff FILE is a libtool `.la' library or `.lo' object file. -+# This function implements the same check as func_lalib_p without -+# resorting to external programs. To this end, it redirects stdin and -+# closes it afterwards, without saving the original file descriptor. -+# As a safety measure, use it only where a negative result would be -+# fatal anyway. Works if `file' does not exist. -+func_lalib_unsafe_p () -+{ -+ lalib_p=no -+ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then -+ for lalib_p_l in 1 2 3 4 -+ do -+ read lalib_p_line -+ case "$lalib_p_line" in -+ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; -+ esac -+ done -+ exec 0<&5 5<&- -+ fi -+ test "$lalib_p" = yes -+} - -- normal ) -- # Accept any command-line options. -- case $arg in -- -o) -- if test -n "$libobj" ; then -- $echo "$modename: you cannot specify \`-o' more than once" 1>&2 -- exit $EXIT_FAILURE -- fi -- arg_mode=target -- continue -- ;; -+# func_ltwrapper_script_p file -+# True iff FILE is a libtool wrapper script -+# This function is only a basic sanity check; it will hardly flush out -+# determined imposters. -+func_ltwrapper_script_p () -+{ -+ func_lalib_p "$1" -+} - -- -static | -prefer-pic | -prefer-non-pic) -- later="$later $arg" -- continue -- ;; -+# func_ltwrapper_executable_p file -+# True iff FILE is a libtool wrapper executable -+# This function is only a basic sanity check; it will hardly flush out -+# determined imposters. -+func_ltwrapper_executable_p () -+{ -+ func_ltwrapper_exec_suffix= -+ case $1 in -+ *.exe) ;; -+ *) func_ltwrapper_exec_suffix=.exe ;; -+ esac -+ $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -+} -+ -+# func_ltwrapper_scriptname file -+# Assumes file is an ltwrapper_executable -+# uses $file to determine the appropriate filename for a -+# temporary ltwrapper_script. -+func_ltwrapper_scriptname () -+{ -+ func_ltwrapper_scriptname_result="" -+ if func_ltwrapper_executable_p "$1"; then -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -+ fi -+} -+ -+# func_ltwrapper_p file -+# True iff FILE is a libtool wrapper script or wrapper executable -+# This function is only a basic sanity check; it will hardly flush out -+# determined imposters. -+func_ltwrapper_p () -+{ -+ func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -+} -+ -+ -+# func_execute_cmds commands fail_cmd -+# Execute tilde-delimited COMMANDS. -+# If FAIL_CMD is given, eval that upon failure. -+# FAIL_CMD may read-access the current command in variable CMD! -+func_execute_cmds () -+{ -+ $opt_debug -+ save_ifs=$IFS; IFS='~' -+ for cmd in $1; do -+ IFS=$save_ifs -+ eval cmd=\"$cmd\" -+ func_show_eval "$cmd" "${2-:}" -+ done -+ IFS=$save_ifs -+} -+ -+ -+# func_source file -+# Source FILE, adding directory component if necessary. -+# Note that it is not necessary on cygwin/mingw to append a dot to -+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe -+# behavior happens only for exec(3), not for open(2)! Also, sourcing -+# `FILE.' does not work on cygwin managed mounts. -+func_source () -+{ -+ $opt_debug -+ case $1 in -+ */* | *\\*) . "$1" ;; -+ *) . "./$1" ;; -+ esac -+} -+ -+ -+# func_infer_tag arg -+# Infer tagged configuration to use if any are available and -+# if one wasn't chosen via the "--tag" command line option. -+# Only attempt this if the compiler in the base compile -+# command doesn't match the default compiler. -+# arg is usually of the form 'gcc ...' -+func_infer_tag () -+{ -+ $opt_debug -+ if test -n "$available_tags" && test -z "$tagname"; then -+ CC_quoted= -+ for arg in $CC; do -+ func_quote_for_eval "$arg" -+ CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ done -+ case $@ in -+ # Blanks in the command may have been stripped by the calling shell, -+ # but not from the CC environment variable when configure was run. -+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; -+ # Blanks at the start of $base_compile will cause this to fail -+ # if we don't check for them as well. -+ *) -+ for z in $available_tags; do -+ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then -+ # Evaluate the configuration. -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ CC_quoted= -+ for arg in $CC; do -+ # Double-quote args containing other shell metacharacters. -+ func_quote_for_eval "$arg" -+ CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ done -+ case "$@ " in -+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) -+ # The compiler in the base compile command matches -+ # the one in the tagged configuration. -+ # Assume this is the tagged configuration we want. -+ tagname=$z -+ break -+ ;; -+ esac -+ fi -+ done -+ # If $tagname still isn't set, then no tagged configuration -+ # was found and let the user know that the "--tag" command -+ # line option must be used. -+ if test -z "$tagname"; then -+ func_echo "unable to infer tagged configuration" -+ func_fatal_error "specify a tag with \`--tag'" -+# else -+# func_verbose "using $tagname tagged configuration" -+ fi -+ ;; -+ esac -+ fi -+} -+ -+ -+ -+# func_write_libtool_object output_name pic_name nonpic_name -+# Create a libtool object file (analogous to a ".la" file), -+# but don't create it if we're doing a dry run. -+func_write_libtool_object () -+{ -+ write_libobj=${1} -+ if test "$build_libtool_libs" = yes; then -+ write_lobj=\'${2}\' -+ else -+ write_lobj=none -+ fi -+ -+ if test "$build_old_libs" = yes; then -+ write_oldobj=\'${3}\' -+ else -+ write_oldobj=none -+ fi -+ -+ $opt_dry_run || { -+ cat >${write_libobj}T <<EOF -+# $write_libobj - a libtool object file -+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -+# -+# Please DO NOT delete this file! -+# It is necessary for linking the library. -+ -+# Name of the PIC object. -+pic_object=$write_lobj -+ -+# Name of the non-PIC object -+non_pic_object=$write_oldobj -+ -+EOF -+ $MV "${write_libobj}T" "${write_libobj}" -+ } -+} -+ -+# func_mode_compile arg... -+func_mode_compile () -+{ -+ $opt_debug -+ # Get the compilation command and the source file. -+ base_compile= -+ srcfile="$nonopt" # always keep a non-empty value in "srcfile" -+ suppress_opt=yes -+ suppress_output= -+ arg_mode=normal -+ libobj= -+ later= -+ pie_flag= -+ -+ for arg -+ do -+ case $arg_mode in -+ arg ) -+ # do not "continue". Instead, add this to base_compile -+ lastarg="$arg" -+ arg_mode=normal -+ ;; -+ -+ target ) -+ libobj="$arg" -+ arg_mode=normal -+ continue -+ ;; -+ -+ normal ) -+ # Accept any command-line options. -+ case $arg in -+ -o) -+ test -n "$libobj" && \ -+ func_fatal_error "you cannot specify \`-o' more than once" -+ arg_mode=target -+ continue -+ ;; -+ -+ -pie | -fpie | -fPIE) -+ pie_flag="$pie_flag $arg" -+ continue -+ ;; -+ -+ -shared | -static | -prefer-pic | -prefer-non-pic) -+ later="$later $arg" -+ continue -+ ;; - - -no-suppress) - suppress_opt=no -@@ -708,31 +1157,25 @@ - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) -- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` -+ func_stripname '-Wc,' '' "$arg" -+ args=$func_stripname_result - lastarg= - save_ifs="$IFS"; IFS=',' -- for arg in $args; do -+ for arg in $args; do - IFS="$save_ifs" -- -- # Double-quote args containing other shell metacharacters. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- lastarg="$lastarg $arg" -+ func_quote_for_eval "$arg" -+ lastarg="$lastarg $func_quote_for_eval_result" - done - IFS="$save_ifs" -- lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` -+ func_stripname ' ' '' "$lastarg" -+ lastarg=$func_stripname_result - - # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" - continue - ;; - -- * ) -+ *) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # -@@ -744,66 +1187,42 @@ - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` -- -- case $lastarg in -- # Double-quote args containing other shell metacharacters. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, and some SunOS ksh mistreat backslash-escaping -- # in scan sets (worked around with variable expansion), -- # and furthermore cannot handle '|' '&' '(' ')' in scan sets -- # at all, so we specify them separately. -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- lastarg="\"$lastarg\"" -- ;; -- esac -- -- base_compile="$base_compile $lastarg" -+ func_quote_for_eval "$lastarg" -+ base_compile="$base_compile $func_quote_for_eval_result" - done # for arg - - case $arg_mode in - arg) -- $echo "$modename: you must specify an argument for -Xcompile" -- exit $EXIT_FAILURE -+ func_fatal_error "you must specify an argument for -Xcompile" - ;; - target) -- $echo "$modename: you must specify a target with \`-o'" 1>&2 -- exit $EXIT_FAILURE -+ func_fatal_error "you must specify a target with \`-o'" - ;; - *) - # Get the name of the library object. -- [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` -+ test -z "$libobj" && { -+ func_basename "$srcfile" -+ libobj="$func_basename_result" -+ } - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo -- xform='[cCFSifmso]' - case $libobj in -- *.ada) xform=ada ;; -- *.adb) xform=adb ;; -- *.ads) xform=ads ;; -- *.asm) xform=asm ;; -- *.c++) xform=c++ ;; -- *.cc) xform=cc ;; -- *.ii) xform=ii ;; -- *.class) xform=class ;; -- *.cpp) xform=cpp ;; -- *.cxx) xform=cxx ;; -- *.[fF][09]?) xform=[fF][09]. ;; -- *.for) xform=for ;; -- *.java) xform=java ;; -- *.obj) xform=obj ;; -- *.sx) xform=sx ;; -+ *.[cCFSifmso] | \ -+ *.ada | *.adb | *.ads | *.asm | \ -+ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ -+ *.[fF][09]? | *.for | *.java | *.obj | *.sx) -+ func_xform "$libobj" -+ libobj=$func_xform_result -+ ;; - esac - -- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` -- - case $libobj in -- *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; -+ *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; - *) -- $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 -- exit $EXIT_FAILURE -+ func_fatal_error "cannot determine name of library object from \`$libobj'" - ;; - esac - -@@ -811,7 +1230,15 @@ - - for arg in $later; do - case $arg in -+ -shared) -+ test "$build_libtool_libs" != yes && \ -+ func_fatal_configuration "can not build a shared library" -+ build_old_libs=no -+ continue -+ ;; -+ - -static) -+ build_libtool_libs=no - build_old_libs=yes - continue - ;; -@@ -828,28 +1255,17 @@ - esac - done - -- qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` -- case $qlibobj in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- qlibobj="\"$qlibobj\"" ;; -- esac -- test "X$libobj" != "X$qlibobj" \ -- && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ -- && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." -- objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$obj"; then -- xdir= -- else -- xdir=$xdir/ -- fi -+ func_quote_for_eval "$libobj" -+ test "X$libobj" != "X$func_quote_for_eval_result" \ -+ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ -+ && func_warning "libobj name \`$libobj' may not contain shell special characters." -+ func_dirname_and_basename "$obj" "/" "" -+ objname="$func_basename_result" -+ xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname - -- if test -z "$base_compile"; then -- $echo "$modename: you must specify a compilation command" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- fi -+ test -z "$base_compile" && \ -+ func_fatal_help "you must specify a compilation command" - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then -@@ -858,12 +1274,9 @@ - removelist="$lobj $libobj ${libobj}T" - fi - -- $run $rm $removelist -- trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 -- - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in -- cygwin* | mingw* | pw32* | os2*) -+ cygwin* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac -@@ -875,10 +1288,8 @@ - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then -- output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} -+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" -- removelist="$removelist $output_obj $lockfile" -- trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else - output_obj= - need_locks=no -@@ -888,13 +1299,13 @@ - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then -- until $run ln "$progpath" "$lockfile" 2>/dev/null; do -- $show "Waiting for $lockfile to be removed" -+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do -+ func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then -- $echo "\ -+ $ECHO "\ - *** ERROR, $lockfile exists and contains: - `cat $lockfile 2>/dev/null` - -@@ -905,34 +1316,22 @@ - avoid parallel builds (make -j) in this platform, or get a better - compiler." - -- $run $rm $removelist -+ $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- $echo "$srcfile" > "$lockfile" -+ removelist="$removelist $output_obj" -+ $ECHO "$srcfile" > "$lockfile" - fi - -+ $opt_dry_run || $RM $removelist -+ removelist="$removelist $lockfile" -+ trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 -+ - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi -- qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` -- case $qsrcfile in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- qsrcfile="\"$qsrcfile\"" ;; -- esac -- -- $run $rm "$libobj" "${libobj}T" -- -- # Create a libtool object file (analogous to a ".la" file), -- # but don't create it if we're doing a dry run. -- test -z "$run" && cat > ${libobj}T <<EOF --# $libobj - a libtool object file --# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP --# --# Please DO NOT delete this file! --# It is necessary for linking the library. -- --# Name of the PIC object. --EOF -+ func_quote_for_eval "$srcfile" -+ qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then -@@ -946,32 +1345,19 @@ - command="$base_compile $qsrcfile" - fi - -- if test ! -d "${xdir}$objdir"; then -- $show "$mkdir ${xdir}$objdir" -- $run $mkdir ${xdir}$objdir -- exit_status=$? -- if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then -- exit $exit_status -- fi -- fi -+ func_mkdir_p "$xdir$objdir" - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - command="$command -o $lobj" - fi - -- $run $rm "$lobj" "$output_obj" -- -- $show "$command" -- if $run eval $lt_env "$command"; then : -- else -- test -n "$output_obj" && $run $rm $removelist -- exit $EXIT_FAILURE -- fi -+ func_show_eval_locale "$command" \ -+ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then -- $echo "\ -+ $ECHO "\ - *** ERROR, $lockfile contains: - `cat $lockfile 2>/dev/null` - -@@ -985,45 +1371,27 @@ - avoid parallel builds (make -j) in this platform, or get a better - compiler." - -- $run $rm $removelist -+ $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then -- $show "$mv $output_obj $lobj" -- if $run $mv $output_obj $lobj; then : -- else -- error=$? -- $run $rm $removelist -- exit $error -- fi -+ func_show_eval '$MV "$output_obj" "$lobj"' \ -+ 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - -- # Append the name of the PIC object to the libtool object file. -- test -z "$run" && cat >> ${libobj}T <<EOF --pic_object='$objdir/$objname' -- --EOF -- - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then -- suppress_output=' >/dev/null 2>&1' -+ suppress_output=' >/dev/null 2>&1' - fi -- else -- # No PIC object so indicate it doesn't exist in the libtool -- # object file. -- test -z "$run" && cat >> ${libobj}T <<EOF --pic_object=none -- --EOF - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code -- command="$base_compile $qsrcfile" -+ command="$base_compile $qsrcfile$pie_flag" - else - command="$base_compile $qsrcfile $pic_flag" - fi -@@ -1033,17 +1401,12 @@ - - # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" -- $run $rm "$obj" "$output_obj" -- $show "$command" -- if $run eval $lt_env "$command"; then : -- else -- $run $rm $removelist -- exit $EXIT_FAILURE -- fi -+ func_show_eval_locale "$command" \ -+ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then -- $echo "\ -+ $ECHO "\ - *** ERROR, $lockfile contains: - `cat $lockfile 2>/dev/null` - -@@ -1057,5477 +1420,6783 @@ - avoid parallel builds (make -j) in this platform, or get a better - compiler." - -- $run $rm $removelist -+ $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then -- $show "$mv $output_obj $obj" -- if $run $mv $output_obj $obj; then : -- else -- error=$? -- $run $rm $removelist -- exit $error -- fi -+ func_show_eval '$MV "$output_obj" "$obj"' \ -+ 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi -- -- # Append the name of the non-PIC object the libtool object file. -- # Only append if the libtool object file exists. -- test -z "$run" && cat >> ${libobj}T <<EOF --# Name of the non-PIC object. --non_pic_object='$objname' -- --EOF -- else -- # Append the name of the non-PIC object the libtool object file. -- # Only append if the libtool object file exists. -- test -z "$run" && cat >> ${libobj}T <<EOF --# Name of the non-PIC object. --non_pic_object=none -- --EOF - fi - -- $run $mv "${libobj}T" "${libobj}" -+ $opt_dry_run || { -+ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - -- # Unlock the critical section if it was locked -- if test "$need_locks" != no; then -- $run $rm "$lockfile" -- fi -+ # Unlock the critical section if it was locked -+ if test "$need_locks" != no; then -+ removelist=$lockfile -+ $RM "$lockfile" -+ fi -+ } - - exit $EXIT_SUCCESS -- ;; -+} - -- # libtool link mode -- link | relink) -- modename="$modename: link" -- case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -- # It is impossible to link a dll without this setting, and -- # we shouldn't force the makefile maintainer to figure out -- # which system we are compiling for in order to pass an extra -- # flag for every libtool invocation. -- # allow_undefined=no -+$opt_help || { -+test "$mode" = compile && func_mode_compile ${1+"$@"} -+} - -- # FIXME: Unfortunately, there are problems with the above when trying -- # to make a dll which has undefined symbols, in which case not -- # even a static library is built. For now, we need to specify -- # -no-undefined on the libtool link line when we can be certain -- # that all symbols are satisfied, otherwise we get a static library. -- allow_undefined=yes -- ;; -- *) -- allow_undefined=yes -- ;; -- esac -- libtool_args="$nonopt" -- base_compile="$nonopt $@" -- compile_command="$nonopt" -- finalize_command="$nonopt" -+func_mode_help () -+{ -+ # We need to display help for each of the modes. -+ case $mode in -+ "") -+ # Generic help is extracted from the usage comments -+ # at the start of this file. -+ func_help -+ ;; - -- compile_rpath= -- finalize_rpath= -- compile_shlibpath= -- finalize_shlibpath= -- convenience= -- old_convenience= -- deplibs= -- old_deplibs= -- compiler_flags= -- linker_flags= -- dllsearchpath= -- lib_search_path=`pwd` -- inst_prefix_dir= -+ clean) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -- avoid_version=no -- dlfiles= -- dlprefiles= -- dlself=no -- export_dynamic=no -- export_symbols= -- export_symbols_regex= -- generated= -- libobjs= -- ltlibs= -- module=no -- no_install=no -- objs= -- non_pic_objects= -- notinst_path= # paths that contain not-installed libtool libraries -- precious_files_regex= -- prefer_static_libs=no -- preload=no -- prev= -- prevarg= -- release= -- rpath= -- xrpath= -- perm_rpath= -- temp_rpath= -- thread_safe=no -- vinfo= -- vinfo_number=no -- single_module="${wl}-single_module" -+Remove files from the build directory. - -- func_infer_tag $base_compile -+RM is the name of the program to use to delete files associated with each FILE -+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -+to RM. - -- # We need to know -static, to get the right output filenames. -- for arg -- do -- case $arg in -- -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 -- if test -n "$link_static_flag"; then -- dlopen_self=$dlopen_self_static -- fi -- prefer_static_libs=yes -- ;; -- -static) -- if test -z "$pic_flag" && test -n "$link_static_flag"; then -- dlopen_self=$dlopen_self_static -- fi -- prefer_static_libs=built -- ;; -- -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 -- ;; -- esac -- done -+If FILE is a libtool library, object or program, all the files associated -+with it are deleted. Otherwise, only FILE itself is deleted using RM." -+ ;; - -- # See if our shared archives depend on static archives. -- test -n "$old_archive_from_new_cmds" && build_old_libs=yes -+ compile) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -- # Go through the arguments, transforming them on the way. -- while test "$#" -gt 0; do -- arg="$1" -- shift -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test -- ;; -- *) qarg=$arg ;; -- esac -- libtool_args="$libtool_args $qarg" -+Compile a source file into a libtool library object. - -- # If the previous option needs an argument, assign it. -- if test -n "$prev"; then -- case $prev in -- output) -- compile_command="$compile_command @OUTPUT@" -- finalize_command="$finalize_command @OUTPUT@" -- ;; -- esac -+This mode accepts the following additional options: - -- case $prev in -- dlfiles|dlprefiles) -- if test "$preload" = no; then -- # Add the symbol object into the linking commands. -- compile_command="$compile_command @SYMFILE@" -- finalize_command="$finalize_command @SYMFILE@" -- preload=yes -- fi -- case $arg in -- *.la | *.lo) ;; # We handle these cases below. -- force) -- if test "$dlself" = no; then -- dlself=needless -- export_dynamic=yes -- fi -- prev= -- continue -- ;; -- self) -- if test "$prev" = dlprefiles; then -- dlself=yes -- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then -- dlself=yes -- else -- dlself=needless -- export_dynamic=yes -- fi -- prev= -- continue -- ;; -- *) -- if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -- else -- dlprefiles="$dlprefiles $arg" -- fi -- prev= -- continue -- ;; -- esac -- ;; -- expsyms) -- export_symbols="$arg" -- if test ! -f "$arg"; then -- $echo "$modename: symbol file \`$arg' does not exist" -- exit $EXIT_FAILURE -- fi -- prev= -- continue -- ;; -- expsyms_regex) -- export_symbols_regex="$arg" -- prev= -- continue -- ;; -- inst_prefix) -- inst_prefix_dir="$arg" -- prev= -- continue -- ;; -- precious_regex) -- precious_files_regex="$arg" -- prev= -- continue -- ;; -- release) -- release="-$arg" -- prev= -- continue -- ;; -- objectlist) -- if test -f "$arg"; then -- save_arg=$arg -- moreargs= -- for fil in `cat $save_arg` -- do --# moreargs="$moreargs $fil" -- arg=$fil -- # A libtool-controlled object. -+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE -+ -no-suppress do not suppress compiler output for multiple passes -+ -prefer-pic try to building PIC objects only -+ -prefer-non-pic try to building non-PIC objects only -+ -shared do not build a \`.o' file suitable for static linking -+ -static only build a \`.o' file suitable for static linking - -- # Check to see that this really is a libtool object. -- if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- pic_object= -- non_pic_object= -+COMPILE-COMMAND is a command to be used in creating a \`standard' object file -+from the given SOURCEFILE. - -- # Read the .lo file -- # If there is no directory component, then add one. -- case $arg in -- */* | *\\*) . $arg ;; -- *) . ./$arg ;; -- esac -+The output file name is determined by removing the directory component from -+SOURCEFILE, then substituting the C source code suffix \`.c' with the -+library object suffix, \`.lo'." -+ ;; - -- if test -z "$pic_object" || \ -- test -z "$non_pic_object" || -- test "$pic_object" = none && \ -- test "$non_pic_object" = none; then -- $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -- exit $EXIT_FAILURE -- fi -+ execute) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - -- # Extract subdirectory from the argument. -- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$arg"; then -- xdir= -- else -- xdir="$xdir/" -- fi -+Automatically set library path, then run a program. - -- if test "$pic_object" != none; then -- # Prepend the subdirectory the object is found in. -- pic_object="$xdir$pic_object" -+This mode accepts the following additional options: - -- if test "$prev" = dlfiles; then -- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -- prev= -- continue -- else -- # If libtool objects are unsupported, then we need to preload. -- prev=dlprefiles -- fi -- fi -+ -dlopen FILE add the directory containing FILE to the library path - -- # CHECK ME: I think I busted this. -Ossama -- if test "$prev" = dlprefiles; then -- # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -- prev= -- fi -+This mode sets the library path environment variable according to \`-dlopen' -+flags. - -- # A PIC object. -- libobjs="$libobjs $pic_object" -- arg="$pic_object" -- fi -+If any of the ARGS are libtool executable wrappers, then they are translated -+into their corresponding uninstalled binary, and any of their required library -+directories are added to the library path. - -- # Non-PIC object. -- if test "$non_pic_object" != none; then -- # Prepend the subdirectory the object is found in. -- non_pic_object="$xdir$non_pic_object" -+Then, COMMAND is executed, with ARGS as arguments." -+ ;; - -- # A standard non-PIC object -- non_pic_objects="$non_pic_objects $non_pic_object" -- if test -z "$pic_object" || test "$pic_object" = none ; then -- arg="$non_pic_object" -- fi -- else -- # If the PIC object exists, use it instead. -- # $xdir was prepended to $pic_object above. -- non_pic_object="$pic_object" -- non_pic_objects="$non_pic_objects $non_pic_object" -- fi -- else -- # Only an error if not doing a dry-run. -- if test -z "$run"; then -- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 -- exit $EXIT_FAILURE -- else -- # Dry-run case. -+ finish) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - -- # Extract subdirectory from the argument. -- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$arg"; then -- xdir= -- else -- xdir="$xdir/" -- fi -+Complete the installation of libtool libraries. - -- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` -- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` -- libobjs="$libobjs $pic_object" -- non_pic_objects="$non_pic_objects $non_pic_object" -- fi -- fi -- done -- else -- $echo "$modename: link input file \`$save_arg' does not exist" -- exit $EXIT_FAILURE -- fi -- arg=$save_arg -- prev= -- continue -- ;; -- rpath | xrpath) -- # We need an absolute path. -- case $arg in -- [\\/]* | [A-Za-z]:[\\/]*) ;; -- *) -- $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit $EXIT_FAILURE -- ;; -- esac -- if test "$prev" = rpath; then -- case "$rpath " in -- *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -- esac -- else -- case "$xrpath " in -- *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -- esac -- fi -- prev= -- continue -- ;; -- xcompiler) -- compiler_flags="$compiler_flags $qarg" -- prev= -- compile_command="$compile_command $qarg" -- finalize_command="$finalize_command $qarg" -- continue -- ;; -- xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -- prev= -- compile_command="$compile_command $wl$qarg" -- finalize_command="$finalize_command $wl$qarg" -- continue -- ;; -- xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -- prev= -- compile_command="$compile_command $qarg" -- finalize_command="$finalize_command $qarg" -- continue -- ;; -- shrext) -- shrext_cmds="$arg" -- prev= -- continue -- ;; -- darwin_framework|darwin_framework_skip) -- test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" -- compile_command="$compile_command $arg" -- finalize_command="$finalize_command $arg" -- prev= -- continue -- ;; -- *) -- eval "$prev=\"\$arg\"" -- prev= -- continue -- ;; -- esac -- fi # test -n "$prev" -+Each LIBDIR is a directory that contains libtool libraries. - -- prevarg="$arg" -+The commands that this mode executes may require superuser privileges. Use -+the \`--dry-run' option if you just want to see what would be executed." -+ ;; - -- case $arg in -- -all-static) -- if test -n "$link_static_flag"; then -- compile_command="$compile_command $link_static_flag" -- finalize_command="$finalize_command $link_static_flag" -- fi -- continue -- ;; -+ install) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -- -allow-undefined) -- # FIXME: remove this flag sometime in the future. -- $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 -- continue -- ;; -+Install executables or libraries. - -- -avoid-version) -- avoid_version=yes -- continue -- ;; -+INSTALL-COMMAND is the installation command. The first component should be -+either the \`install' or \`cp' program. - -- -dlopen) -- prev=dlfiles -- continue -- ;; -+The following components of INSTALL-COMMAND are treated specially: - -- -dlpreopen) -- prev=dlprefiles -- continue -- ;; -+ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -- -export-dynamic) -- export_dynamic=yes -- continue -- ;; -+The rest of the components are interpreted as arguments to that command (only -+BSD-compatible install options are recognized)." -+ ;; - -- -export-symbols | -export-symbols-regex) -- if test -n "$export_symbols" || test -n "$export_symbols_regex"; then -- $echo "$modename: more than one -exported-symbols argument is not allowed" -- exit $EXIT_FAILURE -- fi -- if test "X$arg" = "X-export-symbols"; then -- prev=expsyms -- else -- prev=expsyms_regex -- fi -- continue -- ;; -+ link) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -- -framework|-arch|-isysroot) -- case " $CC " in -- *" ${arg} ${1} "* | *" ${arg} ${1} "*) -- prev=darwin_framework_skip ;; -- *) compiler_flags="$compiler_flags $arg" -- prev=darwin_framework ;; -- esac -- compile_command="$compile_command $arg" -- finalize_command="$finalize_command $arg" -- continue -- ;; -+Link object files or libraries together to form another library, or to -+create an executable program. - -- -inst-prefix-dir) -- prev=inst_prefix -- continue -- ;; -+LINK-COMMAND is a command using the C compiler that you would use to create -+a program from several object files. - -- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* -- # so, if we see these flags be careful not to treat them like -L -- -L[A-Z][A-Z]*:*) -- case $with_gcc/$host in -- no/*-*-irix* | /*-*-irix*) -- compile_command="$compile_command $arg" -- finalize_command="$finalize_command $arg" -- ;; -- esac -- continue -- ;; -+The following components of LINK-COMMAND are treated specially: - -- -L*) -- dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` -- # We need an absolute path. -- case $dir in -- [\\/]* | [A-Za-z]:[\\/]*) ;; -- *) -- absdir=`cd "$dir" && pwd` -- if test -z "$absdir"; then -- $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 -- absdir="$dir" -- notinst_path="$notinst_path $dir" -- fi -- dir="$absdir" -- ;; -- esac -- case "$deplibs " in -- *" -L$dir "*) ;; -- *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -- ;; -- esac -- case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -- testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` -- case :$dllsearchpath: in -- *":$dir:"*) ;; -- *) dllsearchpath="$dllsearchpath:$dir";; -- esac -- case :$dllsearchpath: in -- *":$testbindir:"*) ;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -- esac -- ;; -- esac -- continue -- ;; -+ -all-static do not do any dynamic linking at all -+ -avoid-version do not add a version suffix if possible -+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -+ -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 -+ -export-symbols-regex 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 -+ -no-fast-install disable the fast-install mode -+ -no-install link a not-installable executable -+ -no-undefined declare that a library does not refer to external symbols -+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -+ -objectlist FILE Use a list of object files found in FILE to specify objects -+ -precious-files-regex REGEX -+ don't remove output files matching REGEX -+ -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 -+ -shared only do dynamic linking of libtool libraries -+ -shrext SUFFIX override the standard shared library file extension -+ -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] -+ -weak LIBNAME declare that the target provides the LIBNAME interface - -- -l*) -- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then -- case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) -- # These systems don't actually have a C or math library (as such) -- continue -- ;; -- *-*-os2*) -- # These systems don't actually have a C library (as such) -- test "X$arg" = "X-lc" && continue -- ;; -- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -- # Do not include libc due to us having libc/libc_r. -- test "X$arg" = "X-lc" && continue -- ;; -- *-*-rhapsody* | *-*-darwin1.[012]) -- # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs -framework System" -- continue -- ;; -- *-*-sco3.2v5* | *-*-sco5v6*) -- # Causes problems with __ctype -- test "X$arg" = "X-lc" && continue -- ;; -- *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -- # Compiler inserts libc in the correct place for threads to work -- test "X$arg" = "X-lc" && continue -- ;; -- esac -- elif test "X$arg" = "X-lc_r"; then -- case $host in -- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -- # Do not include libc_r directly, use -pthread flag. -- continue -- ;; -- esac -- fi -- deplibs="$deplibs $arg" -- continue -- ;; -+All other options (arguments beginning with \`-') are ignored. - -- # Tru64 UNIX uses -model [arg] to determine the layout of C++ -- # classes, name mangling, and exception handling. -- -model) -- compile_command="$compile_command $arg" -- compiler_flags="$compiler_flags $arg" -- finalize_command="$finalize_command $arg" -- prev=xcompiler -- continue -- ;; -+Every other argument is treated as a filename. Files ending in \`.la' are -+treated as uninstalled libtool libraries, other files are standard or library -+object files. - -- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- compiler_flags="$compiler_flags $arg" -- compile_command="$compile_command $arg" -- finalize_command="$finalize_command $arg" -- continue -- ;; -+If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -+only library objects (\`.lo' files) may be specified, and \`-rpath' is -+required, except when creating a convenience library. - -- -multi_module) -- single_module="${wl}-multi_module" -- continue -- ;; -+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -+using \`ar' and \`ranlib', or on Windows using \`lib'. - -- -module) -- module=yes -- continue -- ;; -+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -+is created, otherwise an executable program is created." -+ ;; - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m* pass through architecture-specific compiler args for GCC -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args 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*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ uninstall) -+ $ECHO \ -+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -- # Unknown arguments in both finalize_command and compile_command need -- # to be aesthetically quoted because they are evaled later. -- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- compile_command="$compile_command $arg" -- finalize_command="$finalize_command $arg" -- compiler_flags="$compiler_flags $arg" -- continue -+Remove libraries from an installation directory. -+ -+RM is the name of the program to use to delete files associated with each FILE -+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -+to RM. -+ -+If FILE is a libtool library, all the files associated with it are deleted. -+Otherwise, only FILE itself is deleted using RM." - ;; - -- -shrext) -- prev=shrext -- continue -- ;; -+ *) -+ func_fatal_help "invalid operation mode \`$mode'" -+ ;; -+ esac - -- -no-fast-install) -- fast_install=no -- continue -- ;; -+ $ECHO -+ $ECHO "Try \`$progname --help' for more information about other modes." - -- -no-install) -- case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) -- # The PATH hackery in wrapper scripts is required on Windows -- # 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 -- ;; -- *) no_install=yes ;; -- esac -- continue -- ;; -+ exit $? -+} - -- -no-undefined) -- allow_undefined=no -- continue -- ;; -+ # Now that we've collected a possible --mode arg, show help if necessary -+ $opt_help && func_mode_help - -- -objectlist) -- prev=objectlist -- continue -- ;; - -- -o) prev=output ;; -+# func_mode_execute arg... -+func_mode_execute () -+{ -+ $opt_debug -+ # The first argument is the command name. -+ cmd="$nonopt" -+ test -z "$cmd" && \ -+ func_fatal_help "you must specify a COMMAND" - -- -precious-files-regex) -- prev=precious_regex -- continue -- ;; -+ # Handle -dlopen flags immediately. -+ for file in $execute_dlfiles; do -+ test -f "$file" \ -+ || func_fatal_help "\`$file' is not a file" - -- -release) -- prev=release -- continue -- ;; -+ dir= -+ case $file in -+ *.la) -+ # Check to see that this really is a libtool archive. -+ func_lalib_unsafe_p "$file" \ -+ || func_fatal_help "\`$lib' is not a valid libtool archive" - -- -rpath) -- prev=rpath -- continue -- ;; -+ # Read the libtool library. -+ dlname= -+ library_names= -+ func_source "$file" - -- -R) -- prev=xrpath -- continue -- ;; -+ # Skip this library if it cannot be dlopened. -+ if test -z "$dlname"; then -+ # Warn if it was a shared library. -+ test -n "$library_names" && \ -+ func_warning "\`$file' was not linked with \`-export-dynamic'" -+ continue -+ fi - -- -R*) -- dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` -- # We need an absolute path. -- case $dir in -- [\\/]* | [A-Za-z]:[\\/]*) ;; -- *) -- $echo "$modename: only absolute run-paths are allowed" 1>&2 -- exit $EXIT_FAILURE -- ;; -- esac -- case "$xrpath " in -- *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -- esac -- continue -- ;; -+ func_dirname "$file" "" "." -+ dir="$func_dirname_result" - -- -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 -- # would be equivalent was wrong. It would break on at least -- # Digital Unix and AIX. -- continue -+ if test -f "$dir/$objdir/$dlname"; then -+ dir="$dir/$objdir" -+ else -+ if test ! -f "$dir/$dlname"; then -+ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -+ fi -+ fi - ;; - -- -thread-safe) -- thread_safe=yes -- continue -+ *.lo) -+ # Just add the directory containing the .lo file. -+ func_dirname "$file" "" "." -+ dir="$func_dirname_result" - ;; - -- -version-info) -- prev=vinfo -- continue -- ;; -- -version-number) -- prev=vinfo -- vinfo_number=yes -+ *) -+ func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" - continue - ;; -+ esac - -- -Wc,*) -- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` -- arg= -- save_ifs="$IFS"; IFS=',' -- for flag in $args; do -- IFS="$save_ifs" -- case $flag in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- flag="\"$flag\"" -- ;; -- esac -- arg="$arg $wl$flag" -- compiler_flags="$compiler_flags $flag" -- done -- IFS="$save_ifs" -- arg=`$echo "X$arg" | $Xsed -e "s/^ //"` -- ;; -+ # Get the absolute pathname. -+ absdir=`cd "$dir" && pwd` -+ test -n "$absdir" && dir="$absdir" - -- -Wl,*) -- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` -- arg= -- save_ifs="$IFS"; IFS=',' -- for flag in $args; do -- IFS="$save_ifs" -- case $flag in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- flag="\"$flag\"" -- ;; -- esac -- arg="$arg $wl$flag" -- compiler_flags="$compiler_flags $wl$flag" -- linker_flags="$linker_flags $flag" -- done -- IFS="$save_ifs" -- arg=`$echo "X$arg" | $Xsed -e "s/^ //"` -- ;; -+ # Now add the directory to shlibpath_var. -+ if eval "test -z \"\$$shlibpath_var\""; then -+ eval "$shlibpath_var=\"\$dir\"" -+ else -+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" -+ fi -+ done - -- -Xcompiler) -- prev=xcompiler -- continue -- ;; -+ # This variable tells wrapper scripts just to set shlibpath_var -+ # rather than running their programs. -+ libtool_execute_magic="$magic" - -- -Xlinker) -- prev=xlinker -- continue -+ # Check if any of the arguments is a wrapper script. -+ args= -+ for file -+ do -+ case $file in -+ -*) ;; -+ *) -+ # Do a test to see if this is really a libtool program. -+ if func_ltwrapper_script_p "$file"; then -+ func_source "$file" -+ # Transform arg to wrapped name. -+ file="$progdir/$program" -+ elif func_ltwrapper_executable_p "$file"; then -+ func_ltwrapper_scriptname "$file" -+ func_source "$func_ltwrapper_scriptname_result" -+ # Transform arg to wrapped name. -+ file="$progdir/$program" -+ fi - ;; -+ esac -+ # Quote arguments (to preserve shell metacharacters). -+ func_quote_for_eval "$file" -+ args="$args $func_quote_for_eval_result" -+ done - -- -XCClinker) -- prev=xcclinker -- continue -- ;; -+ if test "X$opt_dry_run" = Xfalse; then -+ if test -n "$shlibpath_var"; then -+ # Export the shlibpath_var. -+ eval "export $shlibpath_var" -+ fi - -- # Some other compiler flag. -- -* | +*) -- # Unknown arguments in both finalize_command and compile_command need -- # to be aesthetically quoted because they are evaled later. -- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- ;; -+ # Restore saved environment variables -+ for lt_var in LANG LANGUAGE 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 -+ else -+ $lt_unset $lt_var -+ fi" -+ done - -- *.$objext) -- # A standard object. -- objs="$objs $arg" -- ;; -+ # Now prepare to actually exec the command. -+ exec_cmd="\$cmd$args" -+ else -+ # Display what would be done. -+ if test -n "$shlibpath_var"; then -+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" -+ $ECHO "export $shlibpath_var" -+ fi -+ $ECHO "$cmd$args" -+ exit $EXIT_SUCCESS -+ fi -+} - -- *.lo) -- # A libtool-controlled object. -+test "$mode" = execute && func_mode_execute ${1+"$@"} - -- # Check to see that this really is a libtool object. -- if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- pic_object= -- non_pic_object= - -- # Read the .lo file -- # If there is no directory component, then add one. -- case $arg in -- */* | *\\*) . $arg ;; -- *) . ./$arg ;; -- esac -+# func_mode_finish arg... -+func_mode_finish () -+{ -+ $opt_debug -+ libdirs="$nonopt" -+ admincmds= - -- if test -z "$pic_object" || \ -- test -z "$non_pic_object" || -- test "$pic_object" = none && \ -- test "$non_pic_object" = none; then -- $echo "$modename: cannot find name of object for \`$arg'" 1>&2 -- exit $EXIT_FAILURE -- fi -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ for dir -+ do -+ libdirs="$libdirs $dir" -+ done - -- # Extract subdirectory from the argument. -- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$arg"; then -- xdir= -- else -- xdir="$xdir/" -- fi -+ for libdir in $libdirs; do -+ if test -n "$finish_cmds"; then -+ # Do each command in the finish commands. -+ func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -+'"$cmd"'"' -+ fi -+ if test -n "$finish_eval"; then -+ # Do the single finish_eval. -+ eval cmds=\"$finish_eval\" -+ $opt_dry_run || eval "$cmds" || admincmds="$admincmds -+ $cmds" -+ fi -+ done -+ fi - -- if test "$pic_object" != none; then -- # Prepend the subdirectory the object is found in. -- pic_object="$xdir$pic_object" -+ # Exit here if they wanted silent mode. -+ $opt_silent && exit $EXIT_SUCCESS - -- if test "$prev" = dlfiles; then -- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -- prev= -- continue -- else -- # If libtool objects are unsupported, then we need to preload. -- prev=dlprefiles -- fi -- fi -+ $ECHO "X----------------------------------------------------------------------" | $Xsed -+ $ECHO "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ $ECHO -+ $ECHO "If you ever happen to want to link against installed libraries" -+ $ECHO "in a given directory, LIBDIR, you must either use libtool, and" -+ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ $ECHO "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ $ECHO " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" -+ $ECHO " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" - -- # CHECK ME: I think I busted this. -Ossama -- if test "$prev" = dlprefiles; then -- # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -- prev= -- fi -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ $ECHO - -- # A PIC object. -- libobjs="$libobjs $pic_object" -- arg="$pic_object" -- fi -+ $ECHO "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ $ECHO "pages." -+ ;; -+ *) -+ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ $ECHO "X----------------------------------------------------------------------" | $Xsed -+ exit $EXIT_SUCCESS -+} - -- # Non-PIC object. -- if test "$non_pic_object" != none; then -- # Prepend the subdirectory the object is found in. -- non_pic_object="$xdir$non_pic_object" -+test "$mode" = finish && func_mode_finish ${1+"$@"} - -- # A standard non-PIC object -- non_pic_objects="$non_pic_objects $non_pic_object" -- if test -z "$pic_object" || test "$pic_object" = none ; then -- arg="$non_pic_object" -- fi -- else -- # If the PIC object exists, use it instead. -- # $xdir was prepended to $pic_object above. -- non_pic_object="$pic_object" -- non_pic_objects="$non_pic_objects $non_pic_object" -- fi -- else -- # Only an error if not doing a dry-run. -- if test -z "$run"; then -- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 -- exit $EXIT_FAILURE -- else -- # Dry-run case. - -- # Extract subdirectory from the argument. -- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$xdir" = "X$arg"; then -- xdir= -- else -- xdir="$xdir/" -- fi -+# func_mode_install arg... -+func_mode_install () -+{ -+ $opt_debug -+ # There may be an optional sh(1) argument at the beginning of -+ # install_prog (especially on Windows NT). -+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || -+ # Allow the use of GNU shtool's install command. -+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then -+ # Aesthetically quote it. -+ func_quote_for_eval "$nonopt" -+ install_prog="$func_quote_for_eval_result " -+ arg=$1 -+ shift -+ else -+ install_prog= -+ arg=$nonopt -+ fi - -- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` -- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` -- libobjs="$libobjs $pic_object" -- non_pic_objects="$non_pic_objects $non_pic_object" -- fi -- fi -- ;; -+ # The real first argument should be the name of the installation program. -+ # Aesthetically quote it. -+ func_quote_for_eval "$arg" -+ install_prog="$install_prog$func_quote_for_eval_result" - -- *.$libext) -- # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ # We need to accept at least all the BSD install flags. -+ dest= -+ files= -+ opts= -+ prev= -+ install_type= -+ isdir=no -+ stripme= -+ for arg -+ do -+ if test -n "$dest"; then -+ files="$files $dest" -+ dest=$arg - continue -- ;; -- -- *.la) -- # A libtool-controlled library. -+ fi - -- if test "$prev" = dlfiles; then -- # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -- prev= -- elif test "$prev" = dlprefiles; then -- # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -+ case $arg in -+ -d) isdir=yes ;; -+ -f) -+ case " $install_prog " in -+ *[\\\ /]cp\ *) ;; -+ *) prev=$arg ;; -+ esac -+ ;; -+ -g | -m | -o) -+ prev=$arg -+ ;; -+ -s) -+ stripme=" -s" -+ continue -+ ;; -+ -*) -+ ;; -+ *) -+ # If the previous option needed an argument, then skip it. -+ if test -n "$prev"; then - prev= - else -- deplibs="$deplibs $arg" -+ dest=$arg -+ continue - fi -- continue - ;; -+ esac - -- # Some other compiler argument. -- *) -- # Unknown arguments in both finalize_command and compile_command need -- # to be aesthetically quoted because they are evaled later. -- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- ;; -- esac # arg -+ # Aesthetically quote the argument. -+ func_quote_for_eval "$arg" -+ install_prog="$install_prog $func_quote_for_eval_result" -+ done - -- # Now actually substitute the argument into the commands. -- if test -n "$arg"; then -- compile_command="$compile_command $arg" -- finalize_command="$finalize_command $arg" -- fi -- done # argument parsing loop -+ test -z "$install_prog" && \ -+ func_fatal_help "you must specify an install program" - -- if test -n "$prev"; then -- $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- fi -+ test -n "$prev" && \ -+ func_fatal_help "the \`$prev' option requires an argument" - -- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -- eval arg=\"$export_dynamic_flag_spec\" -- compile_command="$compile_command $arg" -- finalize_command="$finalize_command $arg" -+ if test -z "$files"; then -+ if test -z "$dest"; then -+ func_fatal_help "no file or destination specified" -+ else -+ func_fatal_help "you must specify a destination" -+ fi - fi - -- oldlibs= -- # calculate the name of the file, without its directory -- outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` -- libobjs_save="$libobjs" -+ # Strip any trailing slash from the destination. -+ func_stripname '' '/' "$dest" -+ dest=$func_stripname_result - -- if test -n "$shlibpath_var"; then -- # get the directories listed in $shlibpath_var -- eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` -+ # Check to see that the destination is a directory. -+ test -d "$dest" && isdir=yes -+ if test "$isdir" = yes; then -+ destdir="$dest" -+ destname= - else -- shlib_search_path= -- fi -- eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -- eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" -+ func_dirname_and_basename "$dest" "" "." -+ destdir="$func_dirname_result" -+ destname="$func_basename_result" - -- output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$output_objdir" = "X$output"; then -- output_objdir="$objdir" -- else -- output_objdir="$output_objdir/$objdir" -- fi -- # Create the object directory. -- if test ! -d "$output_objdir"; then -- $show "$mkdir $output_objdir" -- $run $mkdir $output_objdir -- exit_status=$? -- if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then -- exit $exit_status -- fi -+ # Not a directory, so check to see that there is only one file specified. -+ set dummy $files; shift -+ test "$#" -gt 1 && \ -+ func_fatal_help "\`$dest' is not a directory" - fi -- -- # Determine the type of output -- case $output in -- "") -- $echo "$modename: you must specify an output file" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- ;; -- *.$libext) linkmode=oldlib ;; -- *.lo | *.$objext) linkmode=obj ;; -- *.la) linkmode=lib ;; -- *) linkmode=prog ;; # Anything else should be a program. -- esac -- -- case $host in -- *cygwin* | *mingw* | *pw32*) -- # don't eliminate duplications in $postdeps and $predeps -- duplicate_compiler_generated_deps=yes -- ;; -+ case $destdir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; - *) -- duplicate_compiler_generated_deps=$duplicate_deps -+ for file in $files; do -+ case $file in -+ *.lo) ;; -+ *) -+ func_fatal_help "\`$destdir' must be an absolute directory name" -+ ;; -+ esac -+ done - ;; - esac -- specialdeplibs= - -- libs= -- # Find all interdependent deplibs by searching for libraries -- # that are linked more than once (e.g. -la -lb -la) -- for deplib in $deplibs; do -- if test "X$duplicate_deps" = "Xyes" ; then -- case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- fi -- libs="$libs $deplib" -- done -+ # This variable tells wrapper scripts just to set variables rather -+ # than running their programs. -+ libtool_install_magic="$magic" - -- if test "$linkmode" = lib; then -- libs="$predeps $libs $compiler_lib_search_path $postdeps" -+ staticlibs= -+ future_libdirs= -+ current_libdirs= -+ for file in $files; do - -- # Compute libraries that are listed more than once in $predeps -- # $postdeps and mark them as special (i.e., whose duplicates are -- # not to be eliminated). -- pre_post_deps= -- if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then -- for pre_post_dep in $predeps $postdeps; do -- case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ # Do each installation. -+ case $file in -+ *.$libext) -+ # Do the static libraries later. -+ staticlibs="$staticlibs $file" -+ ;; -+ -+ *.la) -+ # Check to see that this really is a libtool archive. -+ func_lalib_unsafe_p "$file" \ -+ || func_fatal_help "\`$file' is not a valid libtool archive" -+ -+ library_names= -+ old_library= -+ relink_command= -+ func_source "$file" -+ -+ # Add the libdir to current_libdirs if it is the destination. -+ if test "X$destdir" = "X$libdir"; then -+ case "$current_libdirs " in -+ *" $libdir "*) ;; -+ *) current_libdirs="$current_libdirs $libdir" ;; - esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -- done -- fi -- pre_post_deps= -- fi -+ else -+ # Note the libdir as a future libdir. -+ case "$future_libdirs " in -+ *" $libdir "*) ;; -+ *) future_libdirs="$future_libdirs $libdir" ;; -+ esac -+ fi - -- deplibs= -- newdependency_libs= -- newlib_search_path= -- need_relink=no # whether we're linking any uninstalled libtool libraries -- notinst_deplibs= # not-installed libtool libraries -- case $linkmode in -- lib) -- passes="conv link" -- for file in $dlfiles $dlprefiles; do -- case $file in -- *.la) ;; -- *) -- $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 -- exit $EXIT_FAILURE -+ func_dirname "$file" "/" "" -+ dir="$func_dirname_result" -+ dir="$dir$objdir" -+ -+ if test -n "$relink_command"; then -+ # Determine the prefix the user has applied to our future dir. -+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` -+ -+ # Don't allow the user to place us outside of our expected -+ # location b/c this prevents finding dependent libraries that -+ # are installed to the same prefix. -+ # At present, this check doesn't affect windows .dll's that -+ # are installed into $libdir/../bin (currently, that works fine) -+ # but it's something to keep an eye on. -+ test "$inst_prefix_dir" = "$destdir" && \ -+ func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" -+ -+ if test -n "$inst_prefix_dir"; then -+ # Stick the inst_prefix_dir data into the link command. -+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` -+ else -+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` -+ fi -+ -+ func_warning "relinking \`$file'" -+ func_show_eval "$relink_command" \ -+ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' -+ fi -+ -+ # See the names of the shared library. -+ set dummy $library_names; shift -+ if test -n "$1"; then -+ realname="$1" -+ shift -+ -+ srcname="$realname" -+ test -n "$relink_command" && srcname="$realname"T -+ -+ # Install the shared library and build the symlinks. -+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ -+ 'exit $?' -+ tstripme="$stripme" -+ case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ case $realname in -+ *.dll.a) -+ tstripme="" -+ ;; -+ esac - ;; - esac -- done -- ;; -- prog) -- compile_deplibs= -- finalize_deplibs= -- alldeplibs=no -- newdlfiles= -- newdlprefiles= -- passes="conv scan dlopen dlpreopen link" -- ;; -- *) passes="conv" -- ;; -- esac -- for pass in $passes; do -- if test "$linkmode,$pass" = "lib,link" || -- test "$linkmode,$pass" = "prog,scan"; then -- libs="$deplibs" -- deplibs= -- fi -- if test "$linkmode" = prog; then -- case $pass in -- dlopen) libs="$dlfiles" ;; -- dlpreopen) libs="$dlprefiles" ;; ++VERSION="1.5.26 Debian 1.5.26-4" + TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" + + # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +@@ -2135,7 +2135,10 @@ EOF + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; -- esac -- fi -- if test "$pass" = dlopen; then -- # Collect dlpreopened libraries -- save_deplibs="$deplibs" -- deplibs= -- fi -- for deplib in $libs; do -- lib= -- found=no -- case $deplib in -- -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" -- else -- compiler_flags="$compiler_flags $deplib" -- fi -- continue -- ;; -- -l*) -- if test "$linkmode" != lib && test "$linkmode" != prog; then -- $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 -- continue -- fi -- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` -- if test "$linkmode" = lib; then -- searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" -- else -- searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" -+ if test -n "$tstripme" && test -n "$striplib"; then -+ func_show_eval "$striplib $destdir/$realname" 'exit $?' - fi -- for searchdir in $searchdirs; do -- for search_ext in .la $std_shrext .so .a; do -- # Search the libtool library -- lib="$searchdir/lib${name}${search_ext}" -- if test -f "$lib"; then -- if test "$search_ext" = ".la"; then -- found=yes -- else -- found=no -- fi -- break 2 -- fi -+ -+ if test "$#" -gt 0; then -+ # Delete the old symlinks, and create new ones. -+ # Try `ln -sf' first, because the `ln' binary might depend on -+ # the symlink we replace! Solaris /bin/ln does not understand -f, -+ # so we also need to try rm && ln -s. -+ for linkname -+ do -+ test "$linkname" != "$realname" \ -+ && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" - done -- done -- if test "$found" != yes; then -- # deplib doesn't seem to be a libtool library -- if test "$linkmode,$pass" = "prog,link"; then -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- else -- deplibs="$deplib $deplibs" -- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -- fi -- continue -- else # deplib is a libtool library -- # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, -- # We need to do some special things here, and not later. -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -- case " $predeps $postdeps " in -- *" $deplib "*) -- if (${SED} -e '2q' $lib | -- grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- library_names= -- old_library= -- case $lib in -- */* | *\\*) . $lib ;; -- *) . ./$lib ;; -- esac -- for l in $old_library $library_names; do -- ll="$l" -- done -- if test "X$ll" = "X$old_library" ; then # only static version available -- found=no -- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -- test "X$ladir" = "X$lib" && ladir="." -- lib=$ladir/$old_library -- if test "$linkmode,$pass" = "prog,link"; then -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- else -- deplibs="$deplib $deplibs" -- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -- fi -- continue -- fi -- fi -- ;; -- *) ;; -- esac -- fi -- fi -- ;; # -l -- -L*) -- case $linkmode in -- lib) -- deplibs="$deplib $deplibs" -- test "$pass" = conv && continue -- newdependency_libs="$deplib $newdependency_libs" -- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` -- ;; -- prog) -- if test "$pass" = conv; then -- deplibs="$deplib $deplibs" -- continue -- fi -- if test "$pass" = scan; then -- deplibs="$deplib $deplibs" -- else -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- fi -- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` -- ;; -- *) -- $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 -- ;; -- esac # linkmode -- continue -- ;; # -L -- -R*) -- if test "$pass" = link; then -- dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` -- # Make sure the xrpath contains only unique directories. -- case "$xrpath " in -- *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -- esac -- fi -- deplibs="$deplib $deplibs" -- continue -- ;; -- *.la) lib="$deplib" ;; -- *.$libext) -- if test "$pass" = conv; then -- deplibs="$deplib $deplibs" -- continue -- fi -- case $linkmode in -- lib) -- valid_a_lib=no -- case $deplibs_check_method in -- match_pattern*) -- set dummy $deplibs_check_method -- match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -- if eval $echo \"$deplib\" 2>/dev/null \ -- | $SED 10q \ -- | $EGREP "$match_pattern_regex" > /dev/null; then -- valid_a_lib=yes -- fi -- ;; -- pass_all) -- valid_a_lib=yes -- ;; -- esac -- if test "$valid_a_lib" != yes; then -- $echo -- $echo "*** Warning: Trying to link with static lib archive $deplib." -- $echo "*** I have the capability to make that library automatically link in when" -- $echo "*** you link to this library. But I can only do this if you have a" -- $echo "*** shared version of the library, which you do not appear to have" -- $echo "*** because the file extensions .$libext of this argument makes me believe" -- $echo "*** that it is just a static archive that I should not used here." -- else -- $echo -- $echo "*** Warning: Linking the shared library $output against the" -- $echo "*** static library $deplib is not portable!" -- deplibs="$deplib $deplibs" -- fi -- continue -- ;; -- prog) -- if test "$pass" != link; then -- deplibs="$deplib $deplibs" -- else -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- fi -- continue -- ;; -- esac # linkmode -- ;; # *.$libext -- *.lo | *.$objext) -- if test "$pass" = conv; then -- deplibs="$deplib $deplibs" -- elif test "$linkmode" = prog; then -- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -- # If there is no dlopen support or we're linking statically, -- # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- else -- newdlfiles="$newdlfiles $deplib" -- fi - fi -- continue -- ;; -- %DEPLIBS%) -- alldeplibs=yes -- continue -- ;; -- esac # case $deplib -- if test "$found" = yes || test -f "$lib"; then : -- else -- $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 -- exit $EXIT_FAILURE -- fi - -- # Check to see that this really is a libtool archive. -- if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -- else -- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit $EXIT_FAILURE -+ # Do each command in the postinstall commands. -+ lib="$destdir/$realname" -+ func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - -- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -- test "X$ladir" = "X$lib" && ladir="." -- -- dlname= -- dlopen= -- dlpreopen= -- libdir= -- library_names= -- old_library= -- # If the library was installed with an old release of libtool, -- # it will not redefine variables installed, or shouldnotlink -- installed=yes -- shouldnotlink=no -- avoidtemprpath= -+ # Install the pseudo-library for information purposes. -+ func_basename "$file" -+ name="$func_basename_result" -+ instname="$dir/$name"i -+ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - -+ # Maybe install the static library, too. -+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ ;; - -- # Read the .la file -- case $lib in -- */* | *\\*) . $lib ;; -- *) . ./$lib ;; -- esac -+ *.lo) -+ # Install (i.e. copy) a libtool object. - -- if test "$linkmode,$pass" = "lib,link" || -- test "$linkmode,$pass" = "prog,scan" || -- { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ # Figure out destination file name, if it wasn't already specified. -+ if test -n "$destname"; then -+ destfile="$destdir/$destname" -+ else -+ func_basename "$file" -+ destfile="$func_basename_result" -+ destfile="$destdir/$destfile" - fi - -- if test "$pass" = conv; then -- # Only check for convenience libraries -- deplibs="$lib $deplibs" -- if test -z "$libdir"; then -- if test -z "$old_library"; then -- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit $EXIT_FAILURE -- fi -- # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -- tmp_libs= -- for deplib in $dependency_libs; do -- deplibs="$deplib $deplibs" -- if test "X$duplicate_deps" = "Xyes" ; then -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- fi -- tmp_libs="$tmp_libs $deplib" -- done -- elif test "$linkmode" != prog && test "$linkmode" != lib; then -- $echo "$modename: \`$lib' is not a convenience library" 1>&2 -- exit $EXIT_FAILURE -- fi -- continue -- fi # $pass = conv -+ # Deduce the name of the destination old-style object file. -+ case $destfile in -+ *.lo) -+ func_lo2o "$destfile" -+ staticdest=$func_lo2o_result -+ ;; -+ *.$objext) -+ staticdest="$destfile" -+ destfile= -+ ;; -+ *) -+ func_fatal_help "cannot copy a libtool object to \`$destfile'" -+ ;; -+ esac - -+ # Install the libtool object if requested. -+ test -n "$destfile" && \ -+ func_show_eval "$install_prog $file $destfile" 'exit $?' - -- # Get the name of the library we link against. -- linklib= -- for l in $old_library $library_names; do -- linklib="$l" -- done -- if test -z "$linklib"; then -- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 -- exit $EXIT_FAILURE -+ # Install the old object if enabled. -+ if test "$build_old_libs" = yes; then -+ # Deduce the name of the old-style object file. -+ func_lo2o "$file" -+ staticobj=$func_lo2o_result -+ func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' - fi -+ exit $EXIT_SUCCESS -+ ;; - -- # This library was specified with -dlopen. -- if test "$pass" = dlopen; then -- if test -z "$libdir"; then -- $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 -- exit $EXIT_FAILURE -- fi -- if test -z "$dlname" || -- test "$dlopen_support" != yes || -- test "$build_libtool_libs" = no; then -- # If there is no dlname, no dlopen support or we're linking -- # statically, we need to preload. We also need to preload any -- # dependent libraries so libltdl's deplib preloader doesn't -- # bomb out in the load deplibs phase. -- dlprefiles="$dlprefiles $lib $dependency_libs" -- else -- newdlfiles="$newdlfiles $lib" -- fi -- continue -- fi # $pass = dlopen -+ *) -+ # Figure out destination file name, if it wasn't already specified. -+ if test -n "$destname"; then -+ destfile="$destdir/$destname" -+ else -+ func_basename "$file" -+ destfile="$func_basename_result" -+ destfile="$destdir/$destfile" -+ fi - -- # We need an absolute path. -- case $ladir in -- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; -+ # If the file is missing, and there is a .exe on the end, strip it -+ # because it is most likely a libtool script we actually want to -+ # install -+ stripped_ext="" -+ case $file in -+ *.exe) -+ if test ! -f "$file"; then -+ func_stripname '' '.exe' "$file" -+ file=$func_stripname_result -+ stripped_ext=".exe" -+ fi -+ ;; -+ esac -+ -+ # Do a test to see if this is really a libtool program. -+ case $host in -+ *cygwin* | *mingw*) -+ if func_ltwrapper_executable_p "$file"; then -+ func_ltwrapper_scriptname "$file" -+ wrapper=$func_ltwrapper_scriptname_result -+ else -+ func_stripname '' '.exe' "$file" -+ wrapper=$func_stripname_result -+ fi -+ ;; - *) -- abs_ladir=`cd "$ladir" && pwd` -- if test -z "$abs_ladir"; then -- $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 -- $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 -- abs_ladir="$ladir" -+ wrapper=$file -+ ;; -+ esac -+ if func_ltwrapper_script_p "$wrapper"; then -+ notinst_deplibs= -+ relink_command= -+ -+ func_source "$wrapper" -+ -+ # Check the variables that should have been set. -+ test -z "$generated_by_libtool_version" && \ -+ func_fatal_error "invalid libtool wrapper script \`$wrapper'" -+ -+ finalize=yes -+ for lib in $notinst_deplibs; do -+ # Check to see that each library is installed. -+ libdir= -+ if test -f "$lib"; then -+ func_source "$lib" -+ fi -+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test -+ if test -n "$libdir" && test ! -f "$libfile"; then -+ func_warning "\`$lib' has not been installed in \`$libdir'" -+ finalize=no -+ fi -+ done -+ -+ relink_command= -+ func_source "$wrapper" -+ -+ outputname= -+ if test "$fast_install" = no && test -n "$relink_command"; then -+ $opt_dry_run || { -+ if test "$finalize" = yes; then -+ tmpdir=`func_mktempdir` -+ func_basename "$file$stripped_ext" -+ file="$func_basename_result" -+ outputname="$tmpdir/$file" -+ # Replace the output file specification. -+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -+ -+ $opt_silent || { -+ func_quote_for_expand "$relink_command" -+ eval "func_echo $func_quote_for_expand_result" -+ } -+ if eval "$relink_command"; then : -+ else -+ func_error "error: relink \`$file' with the above command before installing it" -+ $opt_dry_run || ${RM}r "$tmpdir" -+ continue -+ fi -+ file="$outputname" -+ else -+ func_warning "cannot relink \`$file'" -+ fi -+ } -+ else -+ # Install the binary that we compiled earlier. -+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi -+ fi -+ -+ # remove .exe since cygwin /usr/bin/install will append another -+ # one anyway -+ case $install_prog,$host in -+ */usr/bin/install*,*cygwin*) -+ case $file:$destfile in -+ *.exe:*.exe) -+ # this is ok -+ ;; -+ *.exe:*) -+ destfile=$destfile.exe -+ ;; -+ *:*.exe) -+ func_stripname '' '.exe' "$destfile" -+ destfile=$func_stripname_result -+ ;; -+ esac - ;; - esac -- laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -+ func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' -+ $opt_dry_run || if test -n "$outputname"; then -+ ${RM}r "$tmpdir" -+ fi -+ ;; -+ esac -+ done - -- # Find the relevant object directory and library name. -- if test "X$installed" = Xyes; then -- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -- $echo "$modename: warning: library \`$lib' was moved." 1>&2 -- dir="$ladir" -- absdir="$abs_ladir" -- libdir="$abs_ladir" -- else -- dir="$libdir" -- absdir="$libdir" -+ for file in $staticlibs; do -+ func_basename "$file" -+ name="$func_basename_result" -+ -+ # Set up the ranlib parameters. -+ oldlib="$destdir/$name" -+ -+ func_show_eval "$install_prog \$file \$oldlib" 'exit $?' -+ -+ if test -n "$stripme" && test -n "$old_striplib"; then -+ func_show_eval "$old_striplib $oldlib" 'exit $?' -+ fi -+ -+ # Do each command in the postinstall commands. -+ func_execute_cmds "$old_postinstall_cmds" 'exit $?' -+ done -+ -+ test -n "$future_libdirs" && \ -+ func_warning "remember to run \`$progname --finish$future_libdirs'" -+ -+ if test -n "$current_libdirs"; then -+ # Maybe just do a dry run. -+ $opt_dry_run && current_libdirs=" -n$current_libdirs" -+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -+ else -+ exit $EXIT_SUCCESS -+ fi -+} -+ -+test "$mode" = install && func_mode_install ${1+"$@"} -+ -+ -+# func_generate_dlsyms outputname originator pic_p -+# Extract symbols from dlprefiles and create ${outputname}S.o with -+# a dlpreopen symbol table. -+func_generate_dlsyms () -+{ -+ $opt_debug -+ my_outputname="$1" -+ my_originator="$2" -+ my_pic_p="${3-no}" -+ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` -+ my_dlsyms= -+ -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ if test -n "$NM" && test -n "$global_symbol_pipe"; then -+ my_dlsyms="${my_outputname}S.c" -+ else -+ func_error "not configured to extract global symbols from dlpreopened files" -+ fi -+ fi -+ -+ if test -n "$my_dlsyms"; then -+ case $my_dlsyms in -+ "") ;; -+ *.c) -+ # Discover the nlist of each of the dlfiles. -+ nlist="$output_objdir/${my_outputname}.nm" -+ -+ func_show_eval "$RM $nlist ${nlist}S ${nlist}T" -+ -+ # Parse the name list into a source file. -+ func_verbose "creating $output_objdir/$my_dlsyms" -+ -+ $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ -+ -+#ifdef __cplusplus -+extern \"C\" { -+#endif -+ -+/* External symbol declarations for the compiler. */\ -+" -+ -+ if test "$dlself" = yes; then -+ func_verbose "generating symbol list for \`$output'" -+ -+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" -+ -+ # Add our own program objects to the symbol list. -+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ for progfile in $progfiles; do -+ func_verbose "extracting global C symbols from \`$progfile'" -+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -+ done -+ -+ if test -n "$exclude_expsyms"; then -+ $opt_dry_run || { -+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' -+ } - fi -- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes -- else -- if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -- dir="$ladir" -- absdir="$abs_ladir" -- # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ -+ if test -n "$export_symbols_regex"; then -+ $opt_dry_run || { -+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' -+ } -+ fi -+ -+ # Prepare the list of exported symbols -+ if test -z "$export_symbols"; then -+ export_symbols="$output_objdir/$outputname.exp" -+ $opt_dry_run || { -+ $RM $export_symbols -+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac -+ } - else -- dir="$ladir/$objdir" -- absdir="$abs_ladir/$objdir" -- # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ $opt_dry_run || { -+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -+ eval '$MV "$nlist"T "$nlist"' -+ case $host in -+ *cygwin | *mingw* | *cegcc* ) -+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' -+ ;; -+ esac -+ } - fi -- fi # $installed = yes -- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -+ fi - -- # This library was specified with -dlpreopen. -- if test "$pass" = dlpreopen; then -- if test -z "$libdir"; then -- $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 -- exit $EXIT_FAILURE -+ for dlprefile in $dlprefiles; do -+ func_verbose "extracting global C symbols from \`$dlprefile'" -+ func_basename "$dlprefile" -+ name="$func_basename_result" -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ done -+ -+ $opt_dry_run || { -+ # Make sure we have at least an empty file. -+ test -f "$nlist" || : > "$nlist" -+ -+ if test -n "$exclude_expsyms"; then -+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -+ $MV "$nlist"T "$nlist" - fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -+ -+ # Try sorting and uniquifying the output. -+ if $GREP -v "^: " < "$nlist" | -+ if sort -k 3 </dev/null >/dev/null 2>&1; then -+ sort -k 3 -+ else -+ sort +2 -+ fi | -+ uniq > "$nlist"S; then -+ : - else -- newdlprefiles="$newdlprefiles $dir/$linklib" -+ $GREP -v "^: " < "$nlist" > "$nlist"S - fi -- fi # $pass = dlpreopen - -- if test -z "$libdir"; then -- # Link the convenience library -- if test "$linkmode" = lib; then -- deplibs="$dir/$old_library $deplibs" -- elif test "$linkmode,$pass" = "prog,link"; then -- compile_deplibs="$dir/$old_library $compile_deplibs" -- finalize_deplibs="$dir/$old_library $finalize_deplibs" -+ if test -f "$nlist"S; then -+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else -- deplibs="$lib $deplibs" # used for prog,scan pass -+ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi -- continue -- fi - -+ $ECHO >> "$output_objdir/$my_dlsyms" "\ - -- if test "$linkmode" = prog && test "$pass" != link; then -- newlib_search_path="$newlib_search_path $ladir" -- deplibs="$lib $deplibs" -+/* The mapping between symbol names and symbols. */ -+typedef struct { -+ const char *name; -+ void *address; -+} lt_dlsymlist; -+" -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ $ECHO >> "$output_objdir/$my_dlsyms" "\ -+/* DATA imports from DLLs on WIN32 con't be const, because -+ runtime relocations are performed -- see ld's documentation -+ on pseudo-relocs. */" -+ lt_dlsym_const= ;; -+ *osf5*) -+ echo >> "$output_objdir/$my_dlsyms" "\ -+/* This system does not cope well with relocations in const data */" -+ lt_dlsym_const= ;; -+ *) -+ lt_dlsym_const=const ;; -+ esac - -- linkalldeplibs=no -- if test "$link_all_deplibs" != no || test -z "$library_names" || -- test "$build_libtool_libs" = no; then -- linkalldeplibs=yes -- fi -+ $ECHO >> "$output_objdir/$my_dlsyms" "\ -+extern $lt_dlsym_const lt_dlsymlist -+lt_${my_prefix}_LTX_preloaded_symbols[]; -+$lt_dlsym_const lt_dlsymlist -+lt_${my_prefix}_LTX_preloaded_symbols[] = -+{\ -+ { \"$my_originator\", (void *) 0 }," - -- tmp_libs= -- for deplib in $dependency_libs; do -- case $deplib in -- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test -- esac -- # Need to link against all dependency_libs? -- if test "$linkalldeplibs" = yes; then -- deplibs="$deplib $deplibs" -- else -- # Need to hardcode shared library paths -- # or/and link against static libraries -- newdependency_libs="$deplib $newdependency_libs" -- fi -- if test "X$duplicate_deps" = "Xyes" ; then -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- fi -- tmp_libs="$tmp_libs $deplib" -- done # for deplib -- continue -- fi # $linkmode = prog... -+ case $need_lib_prefix in -+ no) -+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" -+ ;; -+ *) -+ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" -+ ;; -+ esac -+ $ECHO >> "$output_objdir/$my_dlsyms" "\ -+ {0, (void *) 0} -+}; - -- if test "$linkmode,$pass" = "prog,link"; then -- if test -n "$library_names" && -- { { 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. -- case "$temp_rpath " in -- *" $dir "*) ;; -- *" $absdir "*) ;; -- *) temp_rpath="$temp_rpath $absdir" ;; -- esac -- fi -+/* This works around a problem in FreeBSD linker */ -+#ifdef FREEBSD_WORKAROUND -+static const void *lt_preloaded_setup() { -+ return lt_${my_prefix}_LTX_preloaded_symbols; -+} -+#endif - -- # Hardcode the library path. -- # Skip directories that are in the system default run-time -- # search path. -- case " $sys_lib_dlsearch_path " in -- *" $absdir "*) ;; -- *) -- case "$compile_rpath " in -- *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -- esac -- ;; -- esac -- case " $sys_lib_dlsearch_path " in -- *" $libdir "*) ;; -- *) -- case "$finalize_rpath " in -- *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -- esac -- ;; -- esac -- fi # $linkmode,$pass = prog,link... -+#ifdef __cplusplus -+} -+#endif\ -+" -+ } # !$opt_dry_run - -- if test "$alldeplibs" = yes && -- { test "$deplibs_check_method" = pass_all || -- { test "$build_libtool_libs" = yes && -- test -n "$library_names"; }; }; then -- # We only need to search for static libraries -- continue -- fi -- fi -+ pic_flag_for_symtable= -+ case "$compile_command " in -+ *" -static "*) ;; -+ *) -+ case $host in -+ # compiling the symbol table file with pic_flag works around -+ # a FreeBSD bug that causes programs to crash when -lm is -+ # linked before any other PIC object. But we must not use -+ # pic_flag when linking with -static. The problem exists in -+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -+ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; -+ *-*-hpux*) -+ pic_flag_for_symtable=" $pic_flag" ;; -+ *) -+ if test "X$my_pic_p" != Xno; then -+ pic_flag_for_symtable=" $pic_flag" -+ fi -+ ;; -+ esac -+ ;; -+ esac -+ symtab_cflags= -+ for arg in $LTCFLAGS; do -+ case $arg in -+ -pie | -fpie | -fPIE) ;; -+ *) symtab_cflags="$symtab_cflags $arg" ;; -+ esac -+ done - -- link_static=no # Whether the deplib will be linked statically -- use_static_libs=$prefer_static_libs -- if test "$use_static_libs" = built && test "$installed" = yes ; then -- use_static_libs=no -- fi -- if test -n "$library_names" && -- { test "$use_static_libs" = no || test -z "$old_library"; }; then -- if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -- need_relink=yes -- fi -- # This is a shared library -+ # Now compile the dynamic symbol file. -+ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - -- # Warn about portability, can't link against -module's on -- # some systems (darwin) -- if test "$shouldnotlink" = yes && test "$pass" = link ; then -- $echo -- if test "$linkmode" = prog; then -- $echo "*** Warning: Linking the executable $output against the loadable module" -- else -- $echo "*** Warning: Linking the shared library $output against the loadable module" -- fi -- $echo "*** $linklib is not portable!" -- fi -- if test "$linkmode" = lib && -- test "$hardcode_into_libs" = yes; then -- # Hardcode the library path. -- # Skip directories that are in the system default run-time -- # search path. -- case " $sys_lib_dlsearch_path " in -- *" $absdir "*) ;; -- *) -- case "$compile_rpath " in -- *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -- esac -- ;; -- esac -- case " $sys_lib_dlsearch_path " in -- *" $libdir "*) ;; -- *) -- case "$finalize_rpath " in -- *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -- esac -- ;; -- esac -+ # Clean up the generated files. -+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' -+ -+ # Transform the symbol file into the correct name. -+ symfileobj="$output_objdir/${my_outputname}S.$objext" -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ if test -f "$output_objdir/$my_outputname.def"; then -+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ else -+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - fi -+ ;; -+ *) -+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ ;; -+ esac -+ ;; -+ *) -+ func_fatal_error "unknown suffix for \`$my_dlsyms'" -+ ;; -+ esac -+ else -+ # We keep going just in case the user didn't refer to -+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe -+ # 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@%%"` -+ fi -+} - -- if test -n "$old_archive_from_expsyms_cmds"; then -- # figure out the soname -- set dummy $library_names -- realname="$2" -- shift; shift -- libname=`eval \\$echo \"$libname_spec\"` -- # use dlname if we got it. it's perfectly good, no? -- if test -n "$dlname"; then -- soname="$dlname" -- elif test -n "$soname_spec"; then -- # bleh windows -- case $host in -- *cygwin* | mingw*) -- major=`expr $current - $age` -- versuffix="-$major" -- ;; -- esac -- eval soname=\"$soname_spec\" -- else -- soname="$realname" -- fi -+# func_win32_libid arg -+# return the library type of file 'arg' -+# -+# Need a lot of goo to handle *both* DLLs and import libs -+# Has to be a shell function in order to 'eat' the argument -+# that is supplied when $file_magic_command is called. -+func_win32_libid () -+{ -+ $opt_debug -+ win32_libid_type="unknown" -+ win32_fileres=`file -L $1 2>/dev/null` -+ case $win32_fileres in -+ *ar\ archive\ import\ library*) # definitely import -+ win32_libid_type="x86 archive import" -+ ;; -+ *ar\ archive*) # could be an import, or static -+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -+ $EGREP '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 -+ } -+ }'` -+ case $win32_nmres in -+ import*) win32_libid_type="x86 archive import";; -+ *) win32_libid_type="x86 archive static";; -+ esac -+ fi -+ ;; -+ *DLL*) -+ win32_libid_type="x86 DLL" -+ ;; -+ *executable*) # but shell scripts are "executable" too... -+ case $win32_fileres in -+ *MS\ Windows\ PE\ Intel*) -+ win32_libid_type="x86 DLL" -+ ;; -+ esac -+ ;; -+ esac -+ $ECHO "$win32_libid_type" -+} - -- # Make a new name for the extract_expsyms_cmds to use -- soroot="$soname" -- soname=`$echo $soroot | ${SED} -e 's/^.*\///'` -- newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - -- # If the library has no export list, then create one now -- if test -f "$output_objdir/$soname-def"; then : -- else -- $show "extracting exported symbol list from \`$soname'" -- save_ifs="$IFS"; IFS='~' -- cmds=$extract_expsyms_cmds -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- fi - -- # Create $newlib -- if test -f "$output_objdir/$newlib"; then :; else -- $show "generating import library for \`$soname'" -- save_ifs="$IFS"; IFS='~' -- cmds=$old_archive_from_expsyms_cmds -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- fi -- # make sure the library variables are pointing to the new library -- dir=$output_objdir -- linklib=$newlib -- fi # test -n "$old_archive_from_expsyms_cmds" -+# func_extract_an_archive dir oldlib -+func_extract_an_archive () -+{ -+ $opt_debug -+ f_ex_an_ar_dir="$1"; shift -+ f_ex_an_ar_oldlib="$1" -+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' -+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" -+ fi -+} - -- if test "$linkmode" = prog || test "$mode" != relink; then -- add_shlibpath= -- add_dir= -- add= -- lib_linked=yes -- case $hardcode_action in -- immediate | unsupported) -- if test "$hardcode_direct" = no; then -- add="$dir/$linklib" -- case $host in -- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; -- *-*-sysv4*uw2*) add_dir="-L$dir" ;; -- *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ -- *-*-unixware7*) add_dir="-L$dir" ;; -- *-*-darwin* ) -- # if the lib is a module then we can not link against -- # it, someone is ignoring the new warnings I added -- if /usr/bin/file -L $add 2> /dev/null | -- $EGREP ": [^:]* bundle" >/dev/null ; then -- $echo "** Warning, lib $linklib is a module, not a shared library" -- if test -z "$old_library" ; then -- $echo -- $echo "** And there doesn't seem to be a static archive available" -- $echo "** The link will probably fail, sorry" -- else -- add="$dir/$old_library" -- fi -- fi -- esac -- elif test "$hardcode_minus_L" = no; then -- case $host in -- *-*-sunos*) add_shlibpath="$dir" ;; -- esac -- add_dir="-L$dir" -- add="-l$name" -- elif test "$hardcode_shlibpath_var" = no; then -- add_shlibpath="$dir" -- add="-l$name" -- else -- lib_linked=no -- fi -- ;; -- relink) -- if test "$hardcode_direct" = yes; then -- add="$dir/$linklib" -- elif test "$hardcode_minus_L" = yes; then -- add_dir="-L$dir" -- # Try looking first in the location we're being installed to. -- if test -n "$inst_prefix_dir"; then -- case $libdir in -- [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -- ;; -- esac -- fi -- add="-l$name" -- elif test "$hardcode_shlibpath_var" = yes; then -- add_shlibpath="$dir" -- add="-l$name" -- else -- lib_linked=no -- fi -- ;; -- *) lib_linked=no ;; -- esac - -- if test "$lib_linked" != yes; then -- $echo "$modename: configuration error: unsupported hardcode properties" -- exit $EXIT_FAILURE -- fi -+# func_extract_archives gentop oldlib ... -+func_extract_archives () -+{ -+ $opt_debug -+ my_gentop="$1"; shift -+ my_oldlibs=${1+"$@"} -+ my_oldobjs="" -+ my_xlib="" -+ my_xabs="" -+ my_xdir="" - -- if test -n "$add_shlibpath"; then -- case :$compile_shlibpath: in -- *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -- esac -- fi -- if test "$linkmode" = prog; then -- test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" -- test -n "$add" && compile_deplibs="$add $compile_deplibs" -- else -- test -n "$add_dir" && deplibs="$add_dir $deplibs" -- test -n "$add" && deplibs="$add $deplibs" -- if test "$hardcode_direct" != yes && \ -- test "$hardcode_minus_L" != yes && \ -- test "$hardcode_shlibpath_var" = yes; then -- case :$finalize_shlibpath: in -- *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -- esac -- fi -- fi -- fi -+ for my_xlib in $my_oldlibs; do -+ # Extract the objects. -+ case $my_xlib in -+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; -+ *) my_xabs=`pwd`"/$my_xlib" ;; -+ esac -+ func_basename "$my_xlib" -+ my_xlib="$func_basename_result" -+ my_xlib_u=$my_xlib -+ while :; do -+ case " $extracted_archives " in -+ *" $my_xlib_u "*) -+ func_arith $extracted_serial + 1 -+ extracted_serial=$func_arith_result -+ 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" - -- if test "$linkmode" = prog || test "$mode" = relink; then -- add_shlibpath= -- add_dir= -- add= -- # Finalize command for both is simple: just hardcode it. -- if test "$hardcode_direct" = yes; then -- add="$libdir/$linklib" -- elif test "$hardcode_minus_L" = yes; then -- add_dir="-L$libdir" -- add="-l$name" -- elif test "$hardcode_shlibpath_var" = yes; then -- case :$finalize_shlibpath: in -- *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -- esac -- add="-l$name" -- elif test "$hardcode_automatic" = yes; then -- if test -n "$inst_prefix_dir" && -- test -f "$inst_prefix_dir$libdir/$linklib" ; then -- add="$inst_prefix_dir$libdir/$linklib" -- else -- add="$libdir/$linklib" -- fi -- else -- # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" -- # Try looking first in the location we're being installed to. -- if test -n "$inst_prefix_dir"; then -- case $libdir in -- [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -- ;; -- esac -- fi -- add="-l$name" -- fi -+ func_mkdir_p "$my_xdir" - -- if test "$linkmode" = prog; then -- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" -- test -n "$add" && finalize_deplibs="$add $finalize_deplibs" -- else -- test -n "$add_dir" && deplibs="$add_dir $deplibs" -- test -n "$add" && deplibs="$add $deplibs" -- fi -- fi -- elif test "$linkmode" = prog; then -- # Here we assume that one of hardcode_direct or hardcode_minus_L -- # is not unsupported. This is valid on all known static and -- # shared platforms. -- if test "$hardcode_direct" != unsupported; then -- test -n "$old_library" && linklib="$old_library" -- compile_deplibs="$dir/$linklib $compile_deplibs" -- finalize_deplibs="$dir/$linklib $finalize_deplibs" -+ case $host in -+ *-darwin*) -+ func_verbose "Extracting $my_xabs" -+ # Do not bother doing anything if just a dry run -+ $opt_dry_run || { -+ darwin_orig_dir=`pwd` -+ cd $my_xdir || exit $? -+ darwin_archive=$my_xabs -+ darwin_curdir=`pwd` -+ darwin_base_archive=`basename "$darwin_archive"` -+ darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` -+ if test -n "$darwin_arches"; then -+ darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` -+ darwin_arch= -+ func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" -+ for darwin_arch in $darwin_arches ; do -+ func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" -+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" -+ func_extract_an_archive "`pwd`" "${darwin_base_archive}" -+ cd "$darwin_curdir" -+ $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" -+ done # $darwin_arches -+ ## Okay now we've a bunch of thin objects, gotta fatten them up :) -+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` -+ darwin_file= -+ darwin_files= -+ for darwin_file in $darwin_filelist; do -+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ $LIPO -create -output "$darwin_file" $darwin_files -+ done # $darwin_filelist -+ $RM -rf unfat-$$ -+ cd "$darwin_orig_dir" - else -- compile_deplibs="-l$name -L$dir $compile_deplibs" -- finalize_deplibs="-l$name -L$dir $finalize_deplibs" -- fi -- elif test "$build_libtool_libs" = yes; then -- # Not a shared library -- if test "$deplibs_check_method" != pass_all; then -- # We're trying link a shared library against a static one -- # but the system doesn't support it. -+ cd $darwin_orig_dir -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ fi # $darwin_arches -+ } # !$opt_dry_run -+ ;; -+ *) -+ func_extract_an_archive "$my_xdir" "$my_xabs" -+ ;; -+ esac -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ done - -- # Just print a warning and add the library to dependency_libs so -- # that the program can be linked against the static library. -- $echo -- $echo "*** Warning: This system can not link to static lib archive $lib." -- $echo "*** I have the capability to make that library automatically link in when" -- $echo "*** you link to this library. But I can only do this if you have a" -- $echo "*** shared version of the library, which you do not appear to have." -- if test "$module" = yes; then -- $echo "*** But as you try to build a module library, libtool will still create " -- $echo "*** a static module, that should work as long as the dlopening application" -- $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." -- if test -z "$global_symbol_pipe"; then -- $echo -- $echo "*** However, this would only work if libtool was able to extract symbol" -- $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -- $echo "*** not find such a program. So, this module is probably useless." -- $echo "*** \`nm' from GNU binutils and a full rebuild may help." -- fi -- if test "$build_old_libs" = no; then -- build_libtool_libs=module -- build_old_libs=yes -- else -- build_libtool_libs=no -- fi -- fi -- else -- deplibs="$dir/$old_library $deplibs" -- link_static=yes -- fi -- fi # link shared/static library? -+ func_extract_archives_result="$my_oldobjs" -+} - -- if test "$linkmode" = lib; then -- if test -n "$dependency_libs" && -- { test "$hardcode_into_libs" != yes || -- test "$build_old_libs" = yes || -- test "$link_static" = yes; }; then -- # Extract -R from dependency_libs -- temp_deplibs= -- for libdir in $dependency_libs; do -- case $libdir in -- -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` -- case " $xrpath " in -- *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -- esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -- esac -- done -- dependency_libs="$temp_deplibs" -- fi - -- newlib_search_path="$newlib_search_path $absdir" -- # Link against this library -- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" -- # ... and its dependency_libs -- tmp_libs= -- for deplib in $dependency_libs; do -- newdependency_libs="$deplib $newdependency_libs" -- if test "X$duplicate_deps" = "Xyes" ; then -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- fi -- tmp_libs="$tmp_libs $deplib" -- done - -- if test "$link_all_deplibs" != no; then -- # Add the search paths of all dependency libraries -- for deplib in $dependency_libs; do -- case $deplib in -- -L*) path="$deplib" ;; -- *.la) -- dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` -- test "X$dir" = "X$deplib" && dir="." -- # We need an absolute path. -- case $dir in -- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -- *) -- absdir=`cd "$dir" && pwd` -- if test -z "$absdir"; then -- $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 -- absdir="$dir" -- fi -- ;; -- esac -- if grep "^installed=no" $deplib > /dev/null; then -- path="$absdir/$objdir" -- else -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -- if test -z "$libdir"; then -- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -- exit $EXIT_FAILURE -- fi -- if test "$absdir" != "$libdir"; then -- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 -- fi -- path="$absdir" -- fi -- depdepl= -- case $host in -- *-*-darwin*) -- # we do not want to link against static libs, -- # but need to link against shared -- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -- eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -- if test -n "$deplibrary_names" ; then -- for tmp in $deplibrary_names ; do -- depdepl=$tmp -- done -- if test -f "$deplibdir/$depdepl" ; then -- depdepl="$deplibdir/$depdepl" -- elif test -f "$path/$depdepl" ; then -- depdepl="$path/$depdepl" -- else -- # Can't find it, oh well... -- depdepl= -- fi -- # do not add paths which are already there -- case " $newlib_search_path " in -- *" $path "*) ;; -- *) newlib_search_path="$newlib_search_path $path";; -- esac -- fi -- path="" -- ;; -- *) -- path="-L$path" -- ;; -- esac -- ;; -- -l*) -- case $host in -- *-*-darwin*) -- # Again, we only want to link against shared libraries -- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` -- for tmp in $newlib_search_path ; do -- if test -f "$tmp/lib$tmp_libs.dylib" ; then -- eval depdepl="$tmp/lib$tmp_libs.dylib" -- break -- fi -- done -- path="" -- ;; -- *) continue ;; -- esac -- ;; -- *) continue ;; -- esac -- case " $deplibs " in -- *" $path "*) ;; -- *) deplibs="$path $deplibs" ;; -- esac -- case " $deplibs " in -- *" $depdepl "*) ;; -- *) deplibs="$depdepl $deplibs" ;; -- esac -- done -- fi # link_all_deplibs != no -- fi # linkmode = lib -- done # for deplib in $libs -- dependency_libs="$newdependency_libs" -- if test "$pass" = dlpreopen; then -- # Link the dlpreopened libraries before other libraries -- for deplib in $save_deplibs; do -- deplibs="$deplib $deplibs" -- done -- fi -- if test "$pass" != dlopen; then -- if test "$pass" != conv; then -- # Make sure lib_search_path contains only unique directories. -- lib_search_path= -- for dir in $newlib_search_path; do -- case "$lib_search_path " in -- *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -- esac -- done -- newlib_search_path= -+# func_emit_wrapper_part1 [arg=no] -+# -+# Emit the first part of a libtool wrapper script on stdout. -+# For more information, see the description associated with -+# func_emit_wrapper(), below. -+func_emit_wrapper_part1 () -+{ -+ func_emit_wrapper_part1_arg1=no -+ if test -n "$1" ; then -+ func_emit_wrapper_part1_arg1=$1 - fi - -- if test "$linkmode,$pass" != "prog,link"; then -- vars="deplibs" -- else -- vars="compile_deplibs finalize_deplibs" -- fi -- for var in $vars dependency_libs; do -- # Add libraries to $var in reverse order -- eval tmp_libs=\"\$$var\" -- new_libs= -- for deplib in $tmp_libs; do -- # FIXME: Pedantically, this is the right thing to do, so -- # that some nasty dependency loop isn't accidentally -- # broken: -- #new_libs="$deplib $new_libs" -- # Pragmatically, this seems to cause very few problems in -- # practice: -- case $deplib in -- -L*) new_libs="$deplib $new_libs" ;; -- -R*) ;; -- *) -- # And here is the reason: when a library appears more -- # than once as an explicit dependence of a library, or -- # is implicitly linked in more than once by the -- # compiler, it is considered special, and multiple -- # occurrences thereof are not removed. Compare this -- # with having the same library being listed as a -- # dependency of multiple other libraries: in this case, -- # we know (pedantically, we assume) the library does not -- # need to be listed more than once, so we keep only the -- # last copy. This is not always right, but it is rare -- # enough that we require users that really mean to play -- # such unportable linking tricks to link the library -- # using -Wl,-lname, so that libtool does not consider it -- # for duplicate removal. -- case " $specialdeplibs " in -- *" $deplib "*) new_libs="$deplib $new_libs" ;; -- *) -- case " $new_libs " in -- *" $deplib "*) ;; -- *) new_libs="$deplib $new_libs" ;; -- esac -- ;; -- esac -- ;; -- esac -- done -- tmp_libs= -- for deplib in $new_libs; do -- case $deplib in -- -L*) -- case " $tmp_libs " in -- *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -- esac -- ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -- esac -- done -- eval $var=\"$tmp_libs\" -- done # for var -- fi -- # Last step: remove runtime libs from dependency_libs -- # (they stay in deplibs) -- tmp_libs= -- for i in $dependency_libs ; do -- case " $predeps $postdeps $compiler_lib_search_path " in -- *" $i "*) -- i="" -- ;; -- esac -- if test -n "$i" ; then -- tmp_libs="$tmp_libs $i" -- fi -- done -- dependency_libs=$tmp_libs -- done # for pass -- if test "$linkmode" = prog; then -- dlfiles="$newdlfiles" -- dlprefiles="$newdlprefiles" -+ $ECHO "\ -+#! $SHELL -+ -+# $output - temporary wrapper script for $objdir/$outputname -+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -+# -+# The $output program cannot be directly executed until all the libtool -+# libraries that it depends on are installed. -+# -+# This wrapper script should never be moved out of the build directory. -+# If it is, it will not operate correctly. -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+Xsed='${SED} -e 1s/^X//' -+sed_quote_subst='$sed_quote_subst' -+ -+# Be 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 -+ -+relink_command=\"$relink_command\" -+ -+# This environment variable determines our operation mode. -+if test \"\$libtool_install_magic\" = \"$magic\"; then -+ # install mode needs the following variables: -+ generated_by_libtool_version='$macro_version' -+ notinst_deplibs='$notinst_deplibs' -+else -+ # When we are sourced in execute mode, \$file and \$ECHO are already set. -+ if test \"\$libtool_execute_magic\" != \"$magic\"; then -+ ECHO=\"$qecho\" -+ file=\"\$0\" -+ # Make sure echo works. -+ if test \"X\$1\" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then -+ # Yippee, \$ECHO works! -+ : -+ else -+ # Restart under the correct shell, and then maybe \$ECHO will work. -+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi -+ fi\ -+" -+ $ECHO "\ - -- case $linkmode in -- oldlib) -- case " $deplibs" in -- *\ -l* | *\ -L*) -- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; -+ # Find the directory that this script lives in. -+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` -+ test \"x\$thisdir\" = \"x\$file\" && thisdir=. -+ -+ # Follow symbolic links until we get to the real thisdir. -+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` -+ while test -n \"\$file\"; do -+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` -+ -+ # If there was a directory component, then change thisdir. -+ if test \"x\$destdir\" != \"x\$file\"; then -+ case \"\$destdir\" in -+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; -+ *) thisdir=\"\$thisdir/\$destdir\" ;; - esac -+ fi - -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 -- fi -+ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` -+ done -+" -+} -+# end: func_emit_wrapper_part1 - -- if test -n "$rpath"; then -- $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 -- fi -+# func_emit_wrapper_part2 [arg=no] -+# -+# Emit the second part of a libtool wrapper script on stdout. -+# For more information, see the description associated with -+# func_emit_wrapper(), below. -+func_emit_wrapper_part2 () -+{ -+ func_emit_wrapper_part2_arg1=no -+ if test -n "$1" ; then -+ func_emit_wrapper_part2_arg1=$1 -+ fi -+ -+ $ECHO "\ -+ -+ # Usually 'no', except on cygwin/mingw when embedded into -+ # the cwrapper. -+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 -+ if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then -+ # special case for '.' -+ if test \"\$thisdir\" = \".\"; then -+ thisdir=\`pwd\` -+ fi -+ # remove .libs from thisdir -+ case \"\$thisdir\" in -+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; -+ $objdir ) thisdir=. ;; -+ esac -+ fi - -- if test -n "$xrpath"; then -- $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 -- fi -+ # Try to get the absolute directory name. -+ absdir=\`cd \"\$thisdir\" && pwd\` -+ test -n \"\$absdir\" && thisdir=\"\$absdir\" -+" - -- if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 -- fi -+ if test "$fast_install" = yes; then -+ $ECHO "\ -+ program=lt-'$outputname'$exeext -+ progdir=\"\$thisdir/$objdir\" - -- if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 -- fi -+ if test ! -f \"\$progdir/\$program\" || -+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ -+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then - -- if test -n "$export_symbols" || test -n "$export_symbols_regex"; then -- $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 -- fi -+ file=\"\$\$-\$program\" - -- # Now set the variables for building old libraries. -- build_libtool_libs=no -- oldlibs="$output" -- objs="$objs$old_deplibs" -- ;; -+ if test ! -d \"\$progdir\"; then -+ $MKDIR \"\$progdir\" -+ else -+ $RM \"\$progdir/\$file\" -+ fi" - -- lib) -- # Make sure we only generate libraries of the form `libNAME.la'. -- case $outputname in -- lib*) -- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -- eval shared_ext=\"$shrext_cmds\" -- eval libname=\"$libname_spec\" -- ;; -- *) -- if test "$module" = no; then -- $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- fi -- if test "$need_lib_prefix" != no; then -- # Add the "lib" prefix for modules if required -- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -- eval shared_ext=\"$shrext_cmds\" -- eval libname=\"$libname_spec\" -- else -- libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -- fi -- ;; -- esac -+ $ECHO "\ - -- if test -n "$objs"; then -- if test "$deplibs_check_method" != pass_all; then -- $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 -- exit $EXIT_FAILURE -+ # relink executable if necessary -+ if test -n \"\$relink_command\"; then -+ if relink_command_output=\`eval \$relink_command 2>&1\`; then : -+ else -+ $ECHO \"\$relink_command_output\" >&2 -+ $RM \"\$progdir/\$file\" -+ exit 1 -+ fi -+ fi -+ -+ $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || -+ { $RM \"\$progdir/\$program\"; -+ $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } -+ $RM \"\$progdir/\$file\" -+ fi" - else -- $echo -- $echo "*** Warning: Linking the shared library $output against the non-libtool" -- $echo "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ $ECHO "\ -+ program='$outputname' -+ progdir=\"\$thisdir/$objdir\" -+" - fi -- fi - -- if test "$dlself" != no; then -- $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 -- fi -+ $ECHO "\ - -- set dummy $rpath -- if test "$#" -gt 2; then -- $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 -- fi -- install_libdir="$2" -+ if test -f \"\$progdir/\$program\"; then" - -- oldlibs= -- if test -z "$rpath"; then -- if test "$build_libtool_libs" = yes; then -- # Building a libtool convenience library. -- # Some compilers have problems with a `.al' extension so -- # convenience libraries should have the same extension an -- # archive normally would. -- oldlibs="$output_objdir/$libname.$libext $oldlibs" -- build_libtool_libs=convenience -- build_old_libs=yes -- fi -+ # Export our shlibpath_var if we have one. -+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -+ $ECHO "\ -+ # Add our own library path to $shlibpath_var -+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" -+ -+ # Some systems cannot cope with colon-terminated $shlibpath_var -+ # The second colon is a workaround for a bug in BeOS R4 sed -+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` - -- if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 -+ export $shlibpath_var -+" - fi - -- if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 -+ # fixup the dll searchpath if we need to. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" - fi -- else - -- # Parse the version information argument. -- save_ifs="$IFS"; IFS=':' -- set dummy $vinfo 0 0 0 -- IFS="$save_ifs" -+ $ECHO "\ -+ if test \"\$libtool_execute_magic\" != \"$magic\"; then -+ # Run the actual program with our arguments. -+" -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+ fi -+ else -+ # The program doesn't exist. -+ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 -+ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 -+ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 -+ exit 1 -+ fi -+fi\ -+" -+} -+# end: func_emit_wrapper_part2 - -- if test -n "$8"; then -- $echo "$modename: too many parameters to \`-version-info'" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -+ -+# func_emit_wrapper [arg=no] -+# -+# Emit a libtool wrapper script on stdout. -+# Don't directly open a file because we may want to -+# incorporate the script contents within a cygwin/mingw -+# wrapper executable. Must ONLY be called from within -+# func_mode_link because it depends on a number of variables -+# set therein. -+# -+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -+# variable will take. If 'yes', then the emitted script -+# will assume that the directory in which it is stored is -+# the $objdir directory. This is a cygwin/mingw-specific -+# behavior. -+func_emit_wrapper () -+{ -+ func_emit_wrapper_arg1=no -+ if test -n "$1" ; then -+ func_emit_wrapper_arg1=$1 - fi - -- # convert absolute version numbers to libtool ages -- # this retains compatibility with .la files and attempts -- # to make the code below a bit more comprehensible -+ # split this up so that func_emit_cwrapperexe_src -+ # can call each part independently. -+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" -+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" -+} - -- case $vinfo_number in -- yes) -- number_major="$2" -- number_minor="$3" -- number_revision="$4" -- # -- # There are really only two kinds -- those that -- # use the current revision as the major version -- # and those that subtract age and use age as -- # a minor version. But, then there is irix -- # which has an extra 1 added just for fun -- # -- case $version_type in -- darwin|linux|osf|windows|none) -- current=`expr $number_major + $number_minor` -- age="$number_minor" -- revision="$number_revision" -- ;; -- freebsd-aout|freebsd-elf|sunos) -- current="$number_major" -- revision="$number_minor" -- age="0" -- ;; -- irix|nonstopux) -- current=`expr $number_major + $number_minor` -- age="$number_minor" -- revision="$number_minor" -- lt_irix_increment=no -- ;; -- esac -- ;; -- no) -- current="$2" -- revision="$3" -- age="$4" -- ;; -- esac - -- # Check that each of the things are valid numbers. -- case $current in -- 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -- *) -- $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit $EXIT_FAILURE -- ;; -- esac -+# func_to_host_path arg -+# -+# Convert paths to host format when used with build tools. -+# Intended for use with "native" mingw (where libtool itself -+# is running under the msys shell), or in the following cross- -+# build environments: -+# $build $host -+# mingw (msys) mingw [e.g. native] -+# cygwin mingw -+# *nix + wine mingw -+# where wine is equipped with the `winepath' executable. -+# In the native mingw case, the (msys) shell automatically -+# converts paths for any non-msys applications it launches, -+# but that facility isn't available from inside the cwrapper. -+# Similar accommodations are necessary for $host mingw and -+# $build cygwin. Calling this function does no harm for other -+# $host/$build combinations not listed above. -+# -+# ARG is the path (on $build) that should be converted to -+# the proper representation for $host. The result is stored -+# in $func_to_host_path_result. -+func_to_host_path () -+{ -+ func_to_host_path_result="$1" -+ if test -n "$1" ; then -+ case $host in -+ *mingw* ) -+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ case $build in -+ *mingw* ) # actually, msys -+ # awkward: cmd appends spaces to result -+ lt_sed_strip_trailing_spaces="s/[ ]*\$//" -+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\ -+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -+ $SED -e "$lt_sed_naive_backslashify"` -+ ;; -+ *cygwin* ) -+ func_to_host_path_tmp1=`cygpath -w "$1"` -+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -+ $SED -e "$lt_sed_naive_backslashify"` -+ ;; -+ * ) -+ # Unfortunately, winepath does not exit with a non-zero -+ # error code, so we are forced to check the contents of -+ # stdout. On the other hand, if the command is not -+ # found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both -+ # error code of zero AND non-empty stdout, which explains -+ # the odd construction: -+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ # Allow warning below. -+ func_to_host_path_result="" -+ fi -+ ;; -+ esac -+ if test -z "$func_to_host_path_result" ; then -+ func_error "Could not determine host path corresponding to" -+ func_error " '$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_path_result="$1" -+ fi -+ ;; -+ esac -+ fi -+} -+# end: func_to_host_path - -- case $revision in -- 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -- *) -- $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit $EXIT_FAILURE -- ;; -- esac -+# func_to_host_pathlist arg -+# -+# Convert pathlists to host format when used with build tools. -+# See func_to_host_path(), above. This function supports the -+# following $build/$host combinations (but does no harm for -+# combinations not listed here): -+# $build $host -+# mingw (msys) mingw [e.g. native] -+# cygwin mingw -+# *nix + wine mingw -+# -+# Path separators are also converted from $build format to -+# $host format. If ARG begins or ends with a path separator -+# character, it is preserved (but converted to $host format) -+# on output. -+# -+# ARG is a pathlist (on $build) that should be converted to -+# the proper representation on $host. The result is stored -+# in $func_to_host_pathlist_result. -+func_to_host_pathlist () -+{ -+ func_to_host_pathlist_result="$1" -+ if test -n "$1" ; then -+ case $host in -+ *mingw* ) -+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_to_host_pathlist_tmp2="$1" -+ # Once set for this call, this variable should not be -+ # reassigned. It is used in tha fallback case. -+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ -+ $SED -e 's|^:*||' -e 's|:*$||'` -+ case $build in -+ *mingw* ) # Actually, msys. -+ # Awkward: cmd appends spaces to result. -+ lt_sed_strip_trailing_spaces="s/[ ]*\$//" -+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ -+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -+ $SED -e "$lt_sed_naive_backslashify"` -+ ;; -+ *cygwin* ) -+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` -+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -+ $SED -e "$lt_sed_naive_backslashify"` -+ ;; -+ * ) -+ # unfortunately, winepath doesn't convert pathlists -+ func_to_host_pathlist_result="" -+ func_to_host_pathlist_oldIFS=$IFS -+ IFS=: -+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -+ IFS=$func_to_host_pathlist_oldIFS -+ if test -n "$func_to_host_pathlist_f" ; then -+ func_to_host_path "$func_to_host_pathlist_f" -+ if test -n "$func_to_host_path_result" ; then -+ if test -z "$func_to_host_pathlist_result" ; then -+ func_to_host_pathlist_result="$func_to_host_path_result" -+ else -+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" -+ fi -+ fi -+ fi -+ IFS=: -+ done -+ IFS=$func_to_host_pathlist_oldIFS -+ ;; -+ esac -+ if test -z "$func_to_host_pathlist_result" ; then -+ func_error "Could not determine the host path(s) corresponding to" -+ func_error " '$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This may break if $1 contains DOS-style drive -+ # specifications. The fix is not to complicate the expression -+ # below, but for the user to provide a working wine installation -+ # with winepath so that path translation in the cross-to-mingw -+ # case works properly. -+ lt_replace_pathsep_nix_to_dos="s|:|;|g" -+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -+ $SED -e "$lt_replace_pathsep_nix_to_dos"` -+ fi -+ # Now, add the leading and trailing path separators back -+ case "$1" in -+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -+ ;; -+ esac -+ case "$1" in -+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+} -+# end: func_to_host_pathlist - -- case $age in -- 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -- *) -- $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit $EXIT_FAILURE -- ;; -- esac -+# func_emit_cwrapperexe_src -+# emit the source code for a wrapper executable on stdout -+# Must ONLY be called from within func_mode_link because -+# it depends on a number of variable set therein. -+func_emit_cwrapperexe_src () -+{ -+ cat <<EOF - -- if test "$age" -gt "$current"; then -- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit $EXIT_FAILURE -- fi -+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname -+ Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION - -- # Calculate the version variables. -- major= -- versuffix= -- verstring= -- case $version_type in -- none) ;; -+ The $output program cannot be directly executed until all the libtool -+ libraries that it depends on are installed. - -- darwin) -- # Like Linux, but with the current version available in -- # verstring for coding it into the library header -- major=.`expr $current - $age` -- versuffix="$major.$age.$revision" -- # Darwin ld doesn't like 0 for these options... -- minor_current=`expr $current + 1` -- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" -- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" -- ;; -+ This wrapper executable should never be moved out of the build directory. -+ If it is, it will not operate correctly. - -- freebsd-aout) -- major=".$current" -- versuffix=".$current.$revision"; -- ;; -+ Currently, it simply execs the wrapper *script* "$SHELL $output", -+ but could eventually absorb all of the scripts functionality and -+ exec $objdir/$outputname directly. -+*/ -+EOF -+ cat <<"EOF" -+#include <stdio.h> -+#include <stdlib.h> -+#ifdef _MSC_VER -+# include <direct.h> -+# include <process.h> -+# include <io.h> -+# define setmode _setmode -+#else -+# include <unistd.h> -+# include <stdint.h> -+# ifdef __CYGWIN__ -+# include <io.h> -+# define HAVE_SETENV -+# ifdef __STRICT_ANSI__ -+char *realpath (const char *, char *); -+int putenv (char *); -+int setenv (const char *, const char *, int); -+# endif -+# endif -+#endif -+#include <malloc.h> -+#include <stdarg.h> -+#include <assert.h> -+#include <string.h> -+#include <ctype.h> -+#include <errno.h> -+#include <fcntl.h> -+#include <sys/stat.h> - -- freebsd-elf) -- major=".$current" -- versuffix=".$current"; -- ;; -+#if defined(PATH_MAX) -+# define LT_PATHMAX PATH_MAX -+#elif defined(MAXPATHLEN) -+# define LT_PATHMAX MAXPATHLEN -+#else -+# define LT_PATHMAX 1024 -+#endif - -- irix | nonstopux) -- 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 ;; -- esac -- verstring="$verstring_prefix$major.$revision" -+#ifndef S_IXOTH -+# define S_IXOTH 0 -+#endif -+#ifndef S_IXGRP -+# define S_IXGRP 0 -+#endif - -- # Add in all the interfaces that we are compatible with. -- loop=$revision -- while test "$loop" -ne 0; do -- iface=`expr $revision - $loop` -- loop=`expr $loop - 1` -- verstring="$verstring_prefix$major.$iface:$verstring" -- done -+#ifdef _MSC_VER -+# define S_IXUSR _S_IEXEC -+# define stat _stat -+# ifndef _INTPTR_T_DEFINED -+# define intptr_t int -+# endif -+#endif - -- # Before this point, $major must not contain `.'. -- major=.$major -- versuffix="$major.$revision" -- ;; -+#ifndef DIR_SEPARATOR -+# define DIR_SEPARATOR '/' -+# define PATH_SEPARATOR ':' -+#endif - -- linux) -- major=.`expr $current - $age` -- versuffix="$major.$age.$revision" -- ;; -+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ -+ defined (__OS2__) -+# define HAVE_DOS_BASED_FILE_SYSTEM -+# define FOPEN_WB "wb" -+# ifndef DIR_SEPARATOR_2 -+# define DIR_SEPARATOR_2 '\\' -+# endif -+# ifndef PATH_SEPARATOR_2 -+# define PATH_SEPARATOR_2 ';' -+# endif -+#endif - -- osf) -- major=.`expr $current - $age` -- versuffix=".$current.$age.$revision" -- verstring="$current.$age.$revision" -+#ifndef DIR_SEPARATOR_2 -+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -+#else /* DIR_SEPARATOR_2 */ -+# define IS_DIR_SEPARATOR(ch) \ -+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -+#endif /* DIR_SEPARATOR_2 */ - -- # Add in all the interfaces that we are compatible with. -- loop=$age -- while test "$loop" -ne 0; do -- iface=`expr $current - $loop` -- loop=`expr $loop - 1` -- verstring="$verstring:${iface}.0" -- done -+#ifndef PATH_SEPARATOR_2 -+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -+#else /* PATH_SEPARATOR_2 */ -+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -+#endif /* PATH_SEPARATOR_2 */ - -- # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -- ;; -+#ifdef __CYGWIN__ -+# define FOPEN_WB "wb" -+#endif - -- sunos) -- major=".$current" -- versuffix=".$current.$revision" -- ;; -+#ifndef FOPEN_WB -+# define FOPEN_WB "w" -+#endif -+#ifndef _O_BINARY -+# define _O_BINARY 0 -+#endif - -- windows) -- # Use '-' rather than '.', since we only want one -- # extension on DOS 8.3 filesystems. -- major=`expr $current - $age` -- versuffix="-$major" -- ;; -+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -+#define XFREE(stale) do { \ -+ if (stale) { free ((void *) stale); stale = 0; } \ -+} while (0) - -- *) -- $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 -+#undef LTWRAPPER_DEBUGPRINTF -+#if defined DEBUGWRAPPER -+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args -+static void -+ltwrapper_debugprintf (const char *fmt, ...) -+{ -+ va_list args; -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+} -+#else -+# define LTWRAPPER_DEBUGPRINTF(args) -+#endif - -- # Clear the version info if we defaulted, and they specified a release. -- if test -z "$vinfo" && test -n "$release"; then -- major= -- case $version_type in -- darwin) -- # we can't check for "0.0" in archive_cmds due to quoting -- # problems, so we reset it completely -- verstring= -- ;; -- *) -- verstring="0.0" -- ;; -- esac -- if test "$need_version" = no; then -- versuffix= -- else -- versuffix=".0.0" -- fi -- fi -+const char *program_name = NULL; - -- # Remove version info from name if versioning should be avoided -- if test "$avoid_version" = yes && test "$need_version" = no; then -- major= -- versuffix= -- verstring="" -- fi -+void *xmalloc (size_t num); -+char *xstrdup (const char *string); -+const char *base_name (const char *name); -+char *find_executable (const char *wrapper); -+char *chase_symlinks (const char *pathspec); -+int make_executable (const char *path); -+int check_executable (const char *path); -+char *strendzap (char *str, const char *pat); -+void lt_fatal (const char *message, ...); -+void lt_setenv (const char *name, const char *value); -+char *lt_extend_str (const char *orig_value, const char *add, int to_end); -+void lt_opt_process_env_set (const char *arg); -+void lt_opt_process_env_prepend (const char *arg); -+void lt_opt_process_env_append (const char *arg); -+int lt_split_name_value (const char *arg, char** name, char** value); -+void lt_update_exe_path (const char *name, const char *value); -+void lt_update_lib_path (const char *name, const char *value); - -- # Check to see if the archive will have undefined symbols. -- if test "$allow_undefined" = yes; then -- if test "$allow_undefined_flag" = unsupported; then -- $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 -- build_libtool_libs=no -- build_old_libs=yes -- fi -- else -- # Don't allow undefined symbols. -- allow_undefined_flag="$no_undefined_flag" -- fi -- fi -+static const char *script_text_part1 = -+EOF - -- if test "$mode" != relink; then -- # Remove our outputs, but don't remove object files since they -- # may have been created when compiling PIC objects. -- removelist= -- tempremovelist=`$echo "$output_objdir/*"` -- for p in $tempremovelist; do -- case $p in -- *.$objext) -- ;; -- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) -- if test "X$precious_files_regex" != "X"; then -- if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 -- then -- continue -- fi -- fi -- removelist="$removelist $p" -- ;; -- *) ;; -- esac -- done -- if test -n "$removelist"; then -- $show "${rm}r $removelist" -- $run ${rm}r $removelist -- fi -- fi -+ func_emit_wrapper_part1 yes | -+ $SED -e 's/\([\\"]\)/\\\1/g' \ -+ -e 's/^/ "/' -e 's/$/\\n"/' -+ echo ";" -+ cat <<EOF - -- # Now set the variables for building old libraries. -- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+static const char *script_text_part2 = -+EOF -+ func_emit_wrapper_part2 yes | -+ $SED -e 's/\([\\"]\)/\\\1/g' \ -+ -e 's/^/ "/' -e 's/$/\\n"/' -+ echo ";" -+ -+ cat <<EOF -+const char * MAGIC_EXE = "$magic_exe"; -+const char * LIB_PATH_VARNAME = "$shlibpath_var"; -+EOF - -- # Transform .lo files to .o files. -- oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -- fi -+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -+ func_to_host_pathlist "$temp_rpath" -+ cat <<EOF -+const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; -+EOF -+ else -+ cat <<"EOF" -+const char * LIB_PATH_VALUE = ""; -+EOF -+ 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 -+ if test -n "$dllsearchpath"; then -+ func_to_host_pathlist "$dllsearchpath:" -+ cat <<EOF -+const char * EXE_PATH_VARNAME = "PATH"; -+const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; -+EOF -+ else -+ cat <<"EOF" -+const char * EXE_PATH_VARNAME = ""; -+const char * EXE_PATH_VALUE = ""; -+EOF -+ fi - -- if test -n "$xrpath"; then -- # If the user specified any rpath flags, then add them. -- temp_xrpath= -- for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -- case "$finalize_rpath " in -- *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -- esac -- done -- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -- dependency_libs="$temp_xrpath $dependency_libs" -- fi -- fi -+ if test "$fast_install" = yes; then -+ cat <<EOF -+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */ -+EOF -+ else -+ cat <<EOF -+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */ -+EOF -+ fi - -- # Make sure dlfiles contains only unique files that won't be dlpreopened -- old_dlfiles="$dlfiles" -- dlfiles= -- for lib in $old_dlfiles; do -- case " $dlprefiles $dlfiles " in -- *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -- esac -- done - -- # Make sure dlprefiles contains only unique files -- old_dlprefiles="$dlprefiles" -- dlprefiles= -- for lib in $old_dlprefiles; do -- case "$dlprefiles " in -- *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -- esac -- done -+ cat <<"EOF" - -- if test "$build_libtool_libs" = yes; then -- if test -n "$rpath"; then -- case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) -- # these systems don't actually have a c library (as such)! -- ;; -- *-*-rhapsody* | *-*-darwin1.[012]) -- # Rhapsody C library is in the System framework -- deplibs="$deplibs -framework System" -- ;; -- *-*-netbsd*) -- # Don't link with libc until the a.out ld.so is fixed. -- ;; -- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -- # Do not include libc due to us having libc/libc_r. -- ;; -- *-*-sco3.2v5* | *-*-sco5v6*) -- # Causes problems with __ctype -- ;; -- *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -- # Compiler inserts libc in the correct place for threads to work -- ;; -- *) -- # Add libc to deplibs on all other systems if necessary. -- if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -- fi -+#define LTWRAPPER_OPTION_PREFIX "--lt-" -+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 -+ -+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; -+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; -+ -+static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; -+ -+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; -+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; -+ /* argument is putenv-style "foo=bar", value of foo is set to bar */ -+ -+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; -+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; -+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ -+ -+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; -+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; -+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ -+ -+int -+main (int argc, char *argv[]) -+{ -+ char **newargz; -+ int newargc; -+ char *tmp_pathspec; -+ char *actual_cwrapper_path; -+ char *actual_cwrapper_name; -+ char *target_name; -+ char *lt_argv_zero; -+ intptr_t rval = 127; -+ -+ int i; -+ -+ program_name = (char *) xstrdup (base_name (argv[0])); -+ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); -+ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); -+ -+ /* very simple arg parsing; don't want to rely on getopt */ -+ for (i = 1; i < argc; i++) -+ { -+ if (strcmp (argv[i], dumpscript_opt) == 0) -+ { -+EOF -+ case "$host" in -+ *mingw* | *cygwin* ) -+ # make stdout use "unix" line endings -+ echo " setmode(1,_O_BINARY);" -+ ;; -+ esac -+ -+ cat <<"EOF" -+ printf ("%s", script_text_part1); -+ printf ("%s", script_text_part2); -+ return 0; -+ } -+ } -+ -+ newargz = XMALLOC (char *, argc + 1); -+ tmp_pathspec = find_executable (argv[0]); -+ if (tmp_pathspec == NULL) -+ lt_fatal ("Couldn't find %s", argv[0]); -+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", -+ tmp_pathspec)); -+ -+ actual_cwrapper_path = chase_symlinks (tmp_pathspec); -+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", -+ actual_cwrapper_path)); -+ XFREE (tmp_pathspec); -+ -+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); -+ strendzap (actual_cwrapper_path, actual_cwrapper_name); -+ -+ /* wrapper name transforms */ -+ strendzap (actual_cwrapper_name, ".exe"); -+ tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1); -+ XFREE (actual_cwrapper_name); -+ actual_cwrapper_name = tmp_pathspec; -+ tmp_pathspec = 0; -+ -+ /* target_name transforms -- use actual target program name; might have lt- prefix */ -+ target_name = xstrdup (base_name (TARGET_PROGRAM_NAME)); -+ strendzap (target_name, ".exe"); -+ tmp_pathspec = lt_extend_str (target_name, ".exe", 1); -+ XFREE (target_name); -+ target_name = tmp_pathspec; -+ tmp_pathspec = 0; -+ -+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", -+ target_name)); -+EOF -+ -+ cat <<EOF -+ newargz[0] = -+ XMALLOC (char, (strlen (actual_cwrapper_path) + -+ strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1)); -+ strcpy (newargz[0], actual_cwrapper_path); -+ strcat (newargz[0], "$objdir"); -+ strcat (newargz[0], "/"); -+EOF -+ -+ cat <<"EOF" -+ /* stop here, and copy so we don't have to do this twice */ -+ tmp_pathspec = xstrdup (newargz[0]); -+ -+ /* do NOT want the lt- prefix here, so use actual_cwrapper_name */ -+ strcat (newargz[0], actual_cwrapper_name); -+ -+ /* DO want the lt- prefix here if it exists, so use target_name */ -+ lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1); -+ XFREE (tmp_pathspec); -+ tmp_pathspec = NULL; -+EOF -+ -+ case $host_os in -+ mingw*) -+ cat <<"EOF" -+ { -+ char* p; -+ while ((p = strchr (newargz[0], '\\')) != NULL) -+ { -+ *p = '/'; -+ } -+ while ((p = strchr (lt_argv_zero, '\\')) != NULL) -+ { -+ *p = '/'; -+ } -+ } -+EOF - ;; -- esac -- fi -+ esac -+ -+ cat <<"EOF" -+ XFREE (target_name); -+ XFREE (actual_cwrapper_path); -+ XFREE (actual_cwrapper_name); -+ -+ lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ -+ lt_setenv ("DUALCASE", "1"); /* for MSK sh */ -+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); -+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); -+ -+ newargc=0; -+ for (i = 1; i < argc; i++) -+ { -+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) -+ { -+ if (argv[i][env_set_opt_len] == '=') -+ { -+ const char *p = argv[i] + env_set_opt_len + 1; -+ lt_opt_process_env_set (p); -+ } -+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) -+ { -+ lt_opt_process_env_set (argv[++i]); /* don't copy */ -+ } -+ else -+ lt_fatal ("%s missing required argument", env_set_opt); -+ continue; -+ } -+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) -+ { -+ if (argv[i][env_prepend_opt_len] == '=') -+ { -+ const char *p = argv[i] + env_prepend_opt_len + 1; -+ lt_opt_process_env_prepend (p); -+ } -+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) -+ { -+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */ -+ } -+ else -+ lt_fatal ("%s missing required argument", env_prepend_opt); -+ continue; -+ } -+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) -+ { -+ if (argv[i][env_append_opt_len] == '=') -+ { -+ const char *p = argv[i] + env_append_opt_len + 1; -+ lt_opt_process_env_append (p); -+ } -+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) -+ { -+ lt_opt_process_env_append (argv[++i]); /* don't copy */ -+ } -+ else -+ lt_fatal ("%s missing required argument", env_append_opt); -+ continue; -+ } -+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) -+ { -+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX -+ namespace, but it is not one of the ones we know about and -+ have already dealt with, above (inluding dump-script), then -+ report an error. Otherwise, targets might begin to believe -+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX -+ namespace. The first time any user complains about this, we'll -+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option -+ or a configure.ac-settable value. -+ */ -+ lt_fatal ("Unrecognized option in %s namespace: '%s'", -+ ltwrapper_option_prefix, argv[i]); -+ } -+ /* otherwise ... */ -+ newargz[++newargc] = xstrdup (argv[i]); -+ } -+ newargz[++newargc] = NULL; -+ -+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); -+ for (i = 0; i < newargc; i++) -+ { -+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); -+ } - -- # Transform deplibs into only deplibs that can be linked in shared. -- name_save=$name -- libname_save=$libname -- release_save=$release -- versuffix_save=$versuffix -- major_save=$major -- # I'm not sure if I'm treating the release correctly. I think -- # release should show up in the -l (ie -lgmp5) so we don't want to -- # add it in twice. Is that correct? -- release="" -- versuffix="" -- major="" -- newdeplibs= -- droppeddeps=no -- case $deplibs_check_method in -- pass_all) -- # Don't check for shared/static. Everything works. -- # This might be a little naive. We might want to check -- # whether the library exists or not. But this is on -- # osf3 & osf4 and I'm not really sure... Just -- # implementing what was already the behavior. -- newdeplibs=$deplibs -- ;; -- test_compile) -- # This code stresses the "libraries are programs" paradigm to its -- # limits. Maybe even breaks it. We compile a program, linking it -- # against the deplibs as a proxy for the library. Then we can check -- # whether they linked in statically or dynamically with ldd. -- $rm conftest.c -- cat > conftest.c <<EOF -- int main() { return 0; } - EOF -- $rm conftest -- 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" != "0"; then -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -- case " $predeps $postdeps " in -- *" $i "*) -- newdeplibs="$newdeplibs $i" -- i="" -- ;; -- esac -- fi -- if test -n "$i" ; then -- libname=`eval \\$echo \"$libname_spec\"` -- deplib_matches=`eval \\$echo \"$library_names_spec\"` -- set dummy $deplib_matches -- deplib_match=$2 -- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -- else -- droppeddeps=yes -- $echo -- $echo "*** Warning: dynamic linker does not accept needed library $i." -- $echo "*** I have the capability to make that library automatically link in when" -- $echo "*** you link to this library. But I can only do this if you have a" -- $echo "*** shared version of the library, which I believe you do not have" -- $echo "*** because a test_compile did reveal that the linker did not use it for" -- $echo "*** its dynamic dependency list that programs get resolved with at runtime." -- fi -- fi -- else -- newdeplibs="$newdeplibs $i" -- fi -- done -- else -- # Error occurred in the first compile. Let's try to salvage -- # the situation: Compile a separate program for each library. -- 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" != "0"; then -- $rm conftest -- 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 -- *" $i "*) -- newdeplibs="$newdeplibs $i" -- i="" -- ;; -- esac -- fi -- if test -n "$i" ; then -- libname=`eval \\$echo \"$libname_spec\"` -- deplib_matches=`eval \\$echo \"$library_names_spec\"` -- set dummy $deplib_matches -- deplib_match=$2 -- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -- else -- droppeddeps=yes -- $echo -- $echo "*** Warning: dynamic linker does not accept needed library $i." -- $echo "*** I have the capability to make that library automatically link in when" -- $echo "*** you link to this library. But I can only do this if you have a" -- $echo "*** shared version of the library, which you do not appear to have" -- $echo "*** because a test_compile did reveal that the linker did not use this one" -- $echo "*** as a dynamic dependency that programs can get resolved with at runtime." -- fi -- fi -- else -- 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 "*** library that it depends on before this library will be fully" -- $echo "*** functional. Installing it before continuing would be even better." -- fi -- else -- newdeplibs="$newdeplibs $i" -- fi -- done -- fi -- ;; -- file_magic*) -- set dummy $deplibs_check_method -- file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -- for a_deplib in $deplibs; do -- name=`expr $a_deplib : '-l\(.*\)'` -- # If $name is empty we are operating on a -L argument. -- if test "$name" != "" && test "$name" != "0"; then -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -- case " $predeps $postdeps " in -- *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -- a_deplib="" -- ;; -- esac -- fi -- if test -n "$a_deplib" ; then -- libname=`eval \\$echo \"$libname_spec\"` -- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -- for potent_lib in $potential_libs; do -- # Follow soft links. -- if ls -lLd "$potent_lib" 2>/dev/null \ -- | grep " -> " >/dev/null; then -- continue -- fi -- # The statement above tries to avoid entering an -- # endless loop below, in case of cyclic links. -- # We might still enter an endless loop, since a link -- # loop can be closed while we follow links, -- # but so what? -- potlib="$potent_lib" -- while test -h "$potlib" 2>/dev/null; do -- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` -- case $potliblink in -- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -- *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; -- esac -- done -- if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ -- | ${SED} 10q \ -- | $EGREP "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -- a_deplib="" -- break 2 -- fi -- done -- done -- fi -- if test -n "$a_deplib" ; then -- droppeddeps=yes -- $echo -- $echo "*** Warning: linker path does not have real file for library $a_deplib." -- $echo "*** I have the capability to make that library automatically link in when" -- $echo "*** you link to this library. But I can only do this if you have a" -- $echo "*** shared version of the library, which you do not appear to have" -- $echo "*** because I did check the linker path looking for a file starting" -- if test -z "$potlib" ; then -- $echo "*** with $libname but no candidates were found. (...for file magic test)" -- else -- $echo "*** with $libname and none of the candidates passed a file format test" -- $echo "*** using a file magic. Last file checked: $potlib" -- fi -- fi -- else -- # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -- fi -- done # Gone through all deplibs. -- ;; -- match_pattern*) -- set dummy $deplibs_check_method -- match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` -- for a_deplib in $deplibs; do -- name=`expr $a_deplib : '-l\(.*\)'` -- # If $name is empty we are operating on a -L argument. -- if test -n "$name" && test "$name" != "0"; then -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -- case " $predeps $postdeps " in -- *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -- a_deplib="" -- ;; -- esac -- fi -- if test -n "$a_deplib" ; then -- libname=`eval \\$echo \"$libname_spec\"` -- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -- for potent_lib in $potential_libs; do -- potlib="$potent_lib" # see symlink-check above in file_magic test -- if eval $echo \"$potent_lib\" 2>/dev/null \ -- | ${SED} 10q \ -- | $EGREP "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -- a_deplib="" -- break 2 -- fi -- done -- done -- fi -- if test -n "$a_deplib" ; then -- droppeddeps=yes -- $echo -- $echo "*** Warning: linker path does not have real file for library $a_deplib." -- $echo "*** I have the capability to make that library automatically link in when" -- $echo "*** you link to this library. But I can only do this if you have a" -- $echo "*** shared version of the library, which you do not appear to have" -- $echo "*** because I did check the linker path looking for a file starting" -- if test -z "$potlib" ; then -- $echo "*** with $libname but no candidates were found. (...for regex pattern test)" -- else -- $echo "*** with $libname and none of the candidates passed a file format test" -- $echo "*** using a regex pattern. Last file checked: $potlib" -- fi -- fi -- else -- # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -- fi -- done # Gone through all deplibs. -- ;; -- none | unknown | *) -- newdeplibs="" -- tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ -- -e 's/ -[LR][^ ]*//g'` -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -- for i in $predeps $postdeps ; do -- # can't use Xsed below, because $i might contain '/' -- tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` -- done -- fi -- if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ -- | grep . >/dev/null; then -- $echo -- if test "X$deplibs_check_method" = "Xnone"; then -- $echo "*** Warning: inter-library dependencies are not supported in this platform." -- else -- $echo "*** Warning: inter-library dependencies are not known to be supported." -- fi -- $echo "*** All declared inter-library dependencies are being dropped." -- droppeddeps=yes -- fi -- ;; -- esac -- versuffix=$versuffix_save -- major=$major_save -- release=$release_save -- libname=$libname_save -- name=$name_save - -- case $host in -- *-*-rhapsody* | *-*-darwin1.[012]) -- # On Rhapsody replace the C library is the System framework -- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` -- ;; -- esac -+ case $host_os in -+ mingw*) -+ cat <<"EOF" -+ /* execv doesn't actually work on mingw as expected on unix */ -+ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); -+ if (rval == -1) -+ { -+ /* failed to start process */ -+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -+ return 127; -+ } -+ return rval; -+EOF -+ ;; -+ *) -+ cat <<"EOF" -+ execv (lt_argv_zero, newargz); -+ return rval; /* =127, but avoids unused variable warning */ -+EOF -+ ;; -+ esac - -- if test "$droppeddeps" = yes; then -- if test "$module" = yes; then -- $echo -- $echo "*** Warning: libtool could not satisfy all declared inter-library" -- $echo "*** dependencies of module $libname. Therefore, libtool will create" -- $echo "*** a static module, that should work as long as the dlopening" -- $echo "*** application is linked with the -dlopen flag." -- if test -z "$global_symbol_pipe"; then -- $echo -- $echo "*** However, this would only work if libtool was able to extract symbol" -- $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -- $echo "*** not find such a program. So, this module is probably useless." -- $echo "*** \`nm' from GNU binutils and a full rebuild may help." -- fi -- if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" -- build_libtool_libs=module -- build_old_libs=yes -- else -- build_libtool_libs=no -- fi -- else -- $echo "*** The inter-library dependencies that have been dropped here will be" -- $echo "*** automatically added whenever a program is linked with this library" -- $echo "*** or is declared to -dlopen it." -+ cat <<"EOF" -+} - -- if test "$allow_undefined" = no; then -- $echo -- $echo "*** Since this library must not contain undefined symbols," -- $echo "*** because either the platform does not support them or" -- $echo "*** it was explicitly requested with -no-undefined," -- $echo "*** libtool will only create a static version of it." -- if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" -- build_libtool_libs=module -- build_old_libs=yes -- else -- build_libtool_libs=no -- fi -- fi -- fi -- fi -- # Done checking deplibs! -- deplibs=$newdeplibs -- fi -+void * -+xmalloc (size_t num) -+{ -+ void *p = (void *) malloc (num); -+ if (!p) -+ lt_fatal ("Memory exhausted"); - -+ return p; -+} - -- # move library search paths that coincide with paths to not yet -- # installed libraries to the beginning of the library search list -- new_libs= -- for path in $notinst_path; do -- case " $new_libs " in -- *" -L$path/$objdir "*) ;; -- *) -- case " $deplibs " in -- *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -- esac -- ;; -- esac -- done -- for deplib in $deplibs; do -- case $deplib in -- -L*) -- case " $new_libs " in -- *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -- esac -- ;; -- *) new_libs="$new_libs $deplib" ;; -- esac -- done -- deplibs="$new_libs" -+char * -+xstrdup (const char *string) -+{ -+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), -+ string) : NULL; -+} - -+const char * -+base_name (const char *name) -+{ -+ const char *base; - -- # All the library-specific variables (install_libdir is set above). -- library_names= -- old_library= -- dlname= -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ /* Skip over the disk name in MSDOS pathnames. */ -+ if (isalpha ((unsigned char) name[0]) && name[1] == ':') -+ name += 2; -+#endif - -- # Test again, we may have decided not to build it any more -- if test "$build_libtool_libs" = yes; then -- if test "$hardcode_into_libs" = yes; then -- # Hardcode the library paths -- hardcode_libdirs= -- dep_rpath= -- rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -- for libdir in $rpath; do -- if test -n "$hardcode_libdir_flag_spec"; then -- if test -n "$hardcode_libdir_separator"; then -- if test -z "$hardcode_libdirs"; then -- hardcode_libdirs="$libdir" -- else -- # Just accumulate the unique libdirs. -- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -- ;; -- *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -- ;; -- esac -- fi -- else -- eval flag=\"$hardcode_libdir_flag_spec\" -- dep_rpath="$dep_rpath $flag" -- fi -- elif test -n "$runpath_var"; then -- case "$perm_rpath " in -- *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -- esac -- fi -- done -- # Substitute the hardcoded libdirs into the rpath. -- if test -n "$hardcode_libdir_separator" && -- test -n "$hardcode_libdirs"; then -- libdir="$hardcode_libdirs" -- if test -n "$hardcode_libdir_flag_spec_ld"; then -- 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 -- fi -- if test -n "$runpath_var" && test -n "$perm_rpath"; then -- # We should set the runpath_var. -- rpath= -- for dir in $perm_rpath; do -- rpath="$rpath$dir:" -- done -- eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" -- fi -- test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" -- fi -+ for (base = name; *name; name++) -+ if (IS_DIR_SEPARATOR (*name)) -+ base = name + 1; -+ return base; -+} - -- shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -- if test -n "$shlibpath"; then -- eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" -- fi -+int -+check_executable (const char *path) -+{ -+ struct stat st; - -- # Get the real and link names of the library. -- eval shared_ext=\"$shrext_cmds\" -- eval library_names=\"$library_names_spec\" -- set dummy $library_names -- realname="$2" -- shift; shift -+ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -+ path ? (*path ? path : "EMPTY!") : "NULL!")); -+ if ((!path) || (!*path)) -+ return 0; - -- if test -n "$soname_spec"; then -- eval soname=\"$soname_spec\" -- else -- soname="$realname" -- fi -- if test -z "$dlname"; then -- dlname=$soname -- fi -+ if ((stat (path, &st) >= 0) -+ && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) -+ return 1; -+ else -+ return 0; -+} - -- lib="$output_objdir/$realname" -- linknames= -- for link -- do -- linknames="$linknames $link" -- done -+int -+make_executable (const char *path) -+{ -+ int rval = 0; -+ struct stat st; - -- # Use standard objects if they are pic -- test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -+ path ? (*path ? path : "EMPTY!") : "NULL!")); -+ if ((!path) || (!*path)) -+ return 0; - -- # Prepare the list of exported symbols -- if test -z "$export_symbols"; then -- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then -- $show "generating symbol list for \`$libname.la'" -- export_symbols="$output_objdir/$libname.exp" -- $run $rm $export_symbols -- cmds=$export_symbols_cmds -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- if len=`expr "X$cmd" : ".*"` && -- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -- $show "$cmd" -- $run eval "$cmd" || exit $? -- skipped_export=false -- else -- # The command line is too long to execute in one step. -- $show "using reloadable object file for export list..." -- skipped_export=: -- # Break out early, otherwise skipped_export may be -- # set to false by a later but shorter cmd. -- break -- fi -- done -- IFS="$save_ifs" -- if test -n "$export_symbols_regex"; then -- $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" -- $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -- $show "$mv \"${export_symbols}T\" \"$export_symbols\"" -- $run eval '$mv "${export_symbols}T" "$export_symbols"' -- fi -- fi -- fi -+ if (stat (path, &st) >= 0) -+ { -+ rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); -+ } -+ return rval; -+} - -- if test -n "$export_symbols" && test -n "$include_expsyms"; then -- $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' -- fi -+/* Searches for the full path of the wrapper. Returns -+ newly allocated full path name if found, NULL otherwise -+ Does not chase symlinks, even on platforms that support them. -+*/ -+char * -+find_executable (const char *wrapper) -+{ -+ int has_slash = 0; -+ const char *p; -+ const char *p_next; -+ /* static buffer for getcwd */ -+ char tmp[LT_PATHMAX + 1]; -+ int tmp_len; -+ char *concat_name; - -- tmp_deplibs= -- for test_deplib in $deplibs; do -- case " $convenience " in -- *" $test_deplib "*) ;; -- *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -- ;; -- esac -- done -- deplibs="$tmp_deplibs" -+ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -+ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); - -- if test -n "$convenience"; then -- if test -n "$whole_archive_flag_spec"; then -- save_libobjs=$libobjs -- eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -- else -- gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ if ((wrapper == NULL) || (*wrapper == '\0')) -+ return NULL; - -- func_extract_archives $gentop $convenience -- libobjs="$libobjs $func_extract_archives_result" -- fi -- fi -- -- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -- eval flag=\"$thread_safe_flag_spec\" -- linker_flags="$linker_flags $flag" -- fi -+ /* Absolute path? */ -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') -+ { -+ concat_name = xstrdup (wrapper); -+ if (check_executable (concat_name)) -+ return concat_name; -+ XFREE (concat_name); -+ } -+ else -+ { -+#endif -+ if (IS_DIR_SEPARATOR (wrapper[0])) -+ { -+ concat_name = xstrdup (wrapper); -+ if (check_executable (concat_name)) -+ return concat_name; -+ XFREE (concat_name); -+ } -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -+ } -+#endif - -- # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -- $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? -- fi -+ for (p = wrapper; *p; p++) -+ if (*p == '/') -+ { -+ has_slash = 1; -+ break; -+ } -+ if (!has_slash) -+ { -+ /* no slashes; search PATH */ -+ const char *path = getenv ("PATH"); -+ if (path != NULL) -+ { -+ for (p = path; *p; p = p_next) -+ { -+ const char *q; -+ size_t p_len; -+ for (q = p; *q; q++) -+ if (IS_PATH_SEPARATOR (*q)) -+ break; -+ p_len = q - p; -+ p_next = (*q == '\0' ? q : q + 1); -+ if (p_len == 0) -+ { -+ /* empty path: current directory */ -+ if (getcwd (tmp, LT_PATHMAX) == NULL) -+ lt_fatal ("getcwd failed"); -+ tmp_len = strlen (tmp); -+ concat_name = -+ XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -+ memcpy (concat_name, tmp, tmp_len); -+ concat_name[tmp_len] = '/'; -+ strcpy (concat_name + tmp_len + 1, wrapper); -+ } -+ else -+ { -+ concat_name = -+ XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); -+ memcpy (concat_name, p, p_len); -+ concat_name[p_len] = '/'; -+ strcpy (concat_name + p_len + 1, wrapper); -+ } -+ if (check_executable (concat_name)) -+ return concat_name; -+ XFREE (concat_name); -+ } -+ } -+ /* not found in PATH; assume curdir */ -+ } -+ /* Relative path | not found in path: prepend cwd */ -+ if (getcwd (tmp, LT_PATHMAX) == NULL) -+ lt_fatal ("getcwd failed"); -+ tmp_len = strlen (tmp); -+ concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -+ memcpy (concat_name, tmp, tmp_len); -+ concat_name[tmp_len] = '/'; -+ strcpy (concat_name + tmp_len + 1, wrapper); - -- # Do each of the archive commands. -- if test "$module" = yes && test -n "$module_cmds" ; then -- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -- eval test_cmds=\"$module_expsym_cmds\" -- cmds=$module_expsym_cmds -- else -- eval test_cmds=\"$module_cmds\" -- cmds=$module_cmds -- fi -- else -- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- eval test_cmds=\"$archive_expsym_cmds\" -- cmds=$archive_expsym_cmds -- else -- eval test_cmds=\"$archive_cmds\" -- cmds=$archive_cmds -- fi -- fi -+ if (check_executable (concat_name)) -+ return concat_name; -+ XFREE (concat_name); -+ return NULL; -+} - -- if test "X$skipped_export" != "X:" && -- len=`expr "X$test_cmds" : ".*" 2>/dev/null` && -- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -- : -- else -- # The command line is too long to link in one step, link piecewise. -- $echo "creating reloadable object files..." -+char * -+chase_symlinks (const char *pathspec) -+{ -+#ifndef S_ISLNK -+ return xstrdup (pathspec); -+#else -+ char buf[LT_PATHMAX]; -+ struct stat s; -+ char *tmp_pathspec = xstrdup (pathspec); -+ char *p; -+ int has_symlinks = 0; -+ while (strlen (tmp_pathspec) && !has_symlinks) -+ { -+ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -+ tmp_pathspec)); -+ if (lstat (tmp_pathspec, &s) == 0) -+ { -+ if (S_ISLNK (s.st_mode) != 0) -+ { -+ has_symlinks = 1; -+ break; -+ } - -- # Save the value of $output and $libobjs because we want to -- # use them later. If we have whole_archive_flag_spec, we -- # want to use save_libobjs as it was before -- # whole_archive_flag_spec was expanded, because we can't -- # assume the linker understands whole_archive_flag_spec. -- # This may have to be revisited, in case too many -- # convenience libraries get linked in and end up exceeding -- # the spec. -- if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then -- save_libobjs=$libobjs -- fi -- save_output=$output -- output_la=`$echo "X$output" | $Xsed -e "$basename"` -+ /* search backwards for last DIR_SEPARATOR */ -+ p = tmp_pathspec + strlen (tmp_pathspec) - 1; -+ while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) -+ p--; -+ if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) -+ { -+ /* no more DIR_SEPARATORS left */ -+ break; -+ } -+ *p = '\0'; -+ } -+ else -+ { -+ char *errstr = strerror (errno); -+ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -+ } -+ } -+ XFREE (tmp_pathspec); - -- # Clear the reloadable object creation command queue and -- # initialize k to one. -- test_cmds= -- concat_cmds= -- objlist= -- delfiles= -- last_robj= -- k=1 -- output=$output_objdir/$output_la-${k}.$objext -- # Loop over the list of objects to be linked. -- for obj in $save_libobjs -- do -- eval test_cmds=\"$reload_cmds $objlist $last_robj\" -- if test "X$objlist" = X || -- { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && -- test "$len" -le "$max_cmd_len"; }; then -- objlist="$objlist $obj" -- else -- # The command $test_cmds is almost too long, add a -- # command to the queue. -- if test "$k" -eq 1 ; then -- # The first file doesn't have a previous command to add. -- eval concat_cmds=\"$reload_cmds $objlist $last_robj\" -- else -- # All subsequent reloadable object files will link in -- # the last one created. -- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" -- fi -- last_robj=$output_objdir/$output_la-${k}.$objext -- k=`expr $k + 1` -- output=$output_objdir/$output_la-${k}.$objext -- objlist=$obj -- len=1 -- fi -- done -- # Handle the remaining objects by creating one last -- # reloadable object file. All subsequent reloadable object -- # files will link in the last one created. -- test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" -+ if (!has_symlinks) -+ { -+ return xstrdup (pathspec); -+ } - -- if ${skipped_export-false}; then -- $show "generating symbol list for \`$libname.la'" -- export_symbols="$output_objdir/$libname.exp" -- $run $rm $export_symbols -- libobjs=$output -- # Append the command to create the export file. -- eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" -- fi -- -- # Set up a command to remove the reloadable object files -- # after they are used. -- i=0 -- while test "$i" -lt "$k" -- do -- i=`expr $i + 1` -- delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" -- done -+ tmp_pathspec = realpath (pathspec, buf); -+ if (tmp_pathspec == 0) -+ { -+ lt_fatal ("Could not follow symlinks for %s", pathspec); -+ } -+ return xstrdup (tmp_pathspec); -+#endif -+} - -- $echo "creating a temporary reloadable object file: $output" -+char * -+strendzap (char *str, const char *pat) -+{ -+ size_t len, patlen; - -- # Loop through the commands generated above and execute them. -- save_ifs="$IFS"; IFS='~' -- for cmd in $concat_cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -+ assert (str != NULL); -+ assert (pat != NULL); - -- libobjs=$output -- # Restore the value of output. -- output=$save_output -+ len = strlen (str); -+ patlen = strlen (pat); - -- if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -- eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -- fi -- # Expand the library linking commands again to reset the -- # value of $libobjs for piecewise linking. -+ if (patlen <= len) -+ { -+ str += len - patlen; -+ if (strcmp (str, pat) == 0) -+ *str = '\0'; -+ } -+ return str; -+} - -- # Do each of the archive commands. -- if test "$module" = yes && test -n "$module_cmds" ; then -- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -- cmds=$module_expsym_cmds -- else -- cmds=$module_cmds -- fi -- else -- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -- cmds=$archive_expsym_cmds -- else -- cmds=$archive_cmds -- fi -- fi -+static void -+lt_error_core (int exit_status, const char *mode, -+ const char *message, va_list ap) -+{ -+ fprintf (stderr, "%s: %s: ", program_name, mode); -+ vfprintf (stderr, message, ap); -+ fprintf (stderr, ".\n"); - -- # Append the command to remove the reloadable object files -- # to the just-reset $cmds. -- eval cmds=\"\$cmds~\$rm $delfiles\" -- fi -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- $show "$cmd" -- $run eval "$cmd" || { -- lt_exit=$? -+ if (exit_status >= 0) -+ exit (exit_status); -+} - -- # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' -- fi -+void -+lt_fatal (const char *message, ...) -+{ -+ va_list ap; -+ va_start (ap, message); -+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ va_end (ap); -+} - -- exit $lt_exit -- } -- done -- IFS="$save_ifs" -+void -+lt_setenv (const char *name, const char *value) -+{ -+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -+ (name ? name : "<NULL>"), -+ (value ? value : "<NULL>"))); -+ { -+#ifdef HAVE_SETENV -+ /* always make a copy, for consistency with !HAVE_SETENV */ -+ char *str = xstrdup (value); -+ setenv (name, str, 1); -+#else -+ int len = strlen (name) + 1 + strlen (value) + 1; -+ char *str = XMALLOC (char, len); -+ sprintf (str, "%s=%s", name, value); -+ if (putenv (str) != EXIT_SUCCESS) -+ { -+ XFREE (str); -+ } -+#endif -+ } -+} - -- # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? -+char * -+lt_extend_str (const char *orig_value, const char *add, int to_end) -+{ -+ char *new_value; -+ if (orig_value && *orig_value) -+ { -+ int orig_value_len = strlen (orig_value); -+ int add_len = strlen (add); -+ new_value = XMALLOC (char, add_len + orig_value_len + 1); -+ if (to_end) -+ { -+ strcpy (new_value, orig_value); -+ strcpy (new_value + orig_value_len, add); -+ } -+ else -+ { -+ strcpy (new_value, add); -+ strcpy (new_value + add_len, orig_value); -+ } -+ } -+ else -+ { -+ new_value = xstrdup (add); -+ } -+ return new_value; -+} - -- if test -n "$convenience"; then -- if test -z "$whole_archive_flag_spec"; then -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- fi -- fi -+int -+lt_split_name_value (const char *arg, char** name, char** value) -+{ -+ const char *p; -+ int len; -+ if (!arg || !*arg) -+ return 1; - -- exit $EXIT_SUCCESS -- fi -+ p = strchr (arg, (int)'='); - -- # Create links to the real library. -- for linkname in $linknames; do -- if test "$realname" != "$linkname"; then -- $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" -- $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? -- fi -- done -+ if (!p) -+ return 1; - -- # If -module or -export-dynamic was specified, set the dlname. -- if test "$module" = yes || test "$export_dynamic" = yes; then -- # On all known operating systems, these are identical. -- dlname="$soname" -- fi -- fi -- ;; -- -- obj) -- case " $deplibs" in -- *\ -l* | *\ -L*) -- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; -- esac -+ *value = xstrdup (++p); - -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 -- fi -+ len = strlen (arg) - strlen (*value); -+ *name = XMALLOC (char, len); -+ strncpy (*name, arg, len-1); -+ (*name)[len - 1] = '\0'; - -- if test -n "$rpath"; then -- $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 -- fi -+ return 0; -+} - -- if test -n "$xrpath"; then -- $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 -- fi -+void -+lt_opt_process_env_set (const char *arg) -+{ -+ char *name = NULL; -+ char *value = NULL; - -- if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 -- fi -+ if (lt_split_name_value (arg, &name, &value) != 0) -+ { -+ XFREE (name); -+ XFREE (value); -+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); -+ } - -- if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 -- fi -+ lt_setenv (name, value); -+ XFREE (name); -+ XFREE (value); -+} - -- case $output in -- *.lo) -- if test -n "$objs$old_deplibs"; then -- $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 -- exit $EXIT_FAILURE -- fi -- libobj="$output" -- obj=`$echo "X$output" | $Xsed -e "$lo2o"` -- ;; -- *) -- libobj= -- obj="$output" -- ;; -- esac -+void -+lt_opt_process_env_prepend (const char *arg) -+{ -+ char *name = NULL; -+ char *value = NULL; -+ char *new_value = NULL; - -- # Delete the old objects. -- $run $rm $obj $libobj -+ if (lt_split_name_value (arg, &name, &value) != 0) -+ { -+ XFREE (name); -+ XFREE (value); -+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); -+ } - -- # Objects from convenience libraries. This assumes -- # single-version convenience libraries. Whenever we create -- # different ones for PIC/non-PIC, this we'll have to duplicate -- # the extraction. -- reload_conv_objs= -- gentop= -- # reload_cmds runs $LD directly, so let us get rid of -- # -Wl from whole_archive_flag_spec and hope we can get by with -- # turning comma into space.. -- wl= -+ new_value = lt_extend_str (getenv (name), value, 0); -+ lt_setenv (name, new_value); -+ XFREE (new_value); -+ XFREE (name); -+ XFREE (value); -+} - -- if test -n "$convenience"; then -- if test -n "$whole_archive_flag_spec"; then -- 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" -+void -+lt_opt_process_env_append (const char *arg) -+{ -+ char *name = NULL; -+ char *value = NULL; -+ char *new_value = NULL; - -- func_extract_archives $gentop $convenience -- reload_conv_objs="$reload_objs $func_extract_archives_result" -- fi -- fi -+ if (lt_split_name_value (arg, &name, &value) != 0) -+ { -+ XFREE (name); -+ XFREE (value); -+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); -+ } - -- # Create the old-style object. -- reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+ new_value = lt_extend_str (getenv (name), value, 1); -+ lt_setenv (name, new_value); -+ XFREE (new_value); -+ XFREE (name); -+ XFREE (value); -+} - -- output="$obj" -- cmds=$reload_cmds -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -+void -+lt_update_exe_path (const char *name, const char *value) -+{ -+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ (name ? name : "<NULL>"), -+ (value ? value : "<NULL>"))); - -- # Exit if we aren't doing a library object file. -- if test -z "$libobj"; then -- if test -n "$gentop"; then -- $show "${rm}r $gentop" -- $run ${rm}r $gentop -- fi -+ if (name && *name && value && *value) -+ { -+ char *new_value = lt_extend_str (getenv (name), value, 0); -+ /* some systems can't cope with a ':'-terminated path #' */ -+ int len = strlen (new_value); -+ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) -+ { -+ new_value[len-1] = '\0'; -+ } -+ lt_setenv (name, new_value); -+ XFREE (new_value); -+ } -+} - -- exit $EXIT_SUCCESS -- fi -+void -+lt_update_lib_path (const char *name, const char *value) -+{ -+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ (name ? name : "<NULL>"), -+ (value ? value : "<NULL>"))); - -- if test "$build_libtool_libs" != yes; then -- if test -n "$gentop"; then -- $show "${rm}r $gentop" -- $run ${rm}r $gentop -- fi -+ if (name && *name && value && *value) -+ { -+ char *new_value = lt_extend_str (getenv (name), value, 0); -+ lt_setenv (name, new_value); -+ XFREE (new_value); -+ } -+} - -- # Create an invalid libtool object if no PIC, so that we don't -- # accidentally link it into a program. -- # $show "echo timestamp > $libobj" -- # $run eval "echo timestamp > $libobj" || exit $? -- exit $EXIT_SUCCESS -- fi - -- if test -n "$pic_flag" || test "$pic_mode" != default; then -- # Only do commands if we really have different PIC objects. -- reload_objs="$libobjs $reload_conv_objs" -- output="$libobj" -- cmds=$reload_cmds -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- fi -+EOF -+} -+# end: func_emit_cwrapperexe_src - -- if test -n "$gentop"; then -- $show "${rm}r $gentop" -- $run ${rm}r $gentop -- fi -+# func_mode_link arg... -+func_mode_link () -+{ -+ $opt_debug -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ # It is impossible to link a dll without this setting, and -+ # we shouldn't force the makefile maintainer to figure out -+ # which system we are compiling for in order to pass an extra -+ # flag for every libtool invocation. -+ # allow_undefined=no - -- exit $EXIT_SUCCESS -+ # FIXME: Unfortunately, there are problems with the above when trying -+ # to make a dll which has undefined symbols, in which case not -+ # even a static library is built. For now, we need to specify -+ # -no-undefined on the libtool link line when we can be certain -+ # that all symbols are satisfied, otherwise we get a static library. -+ allow_undefined=yes - ;; -+ *) -+ allow_undefined=yes -+ ;; -+ esac -+ libtool_args=$nonopt -+ base_compile="$nonopt $@" -+ compile_command=$nonopt -+ finalize_command=$nonopt - -- prog) -- case $host in -- *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; -- esac -- if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 -- fi -- -- if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 -- fi -+ compile_rpath= -+ finalize_rpath= -+ compile_shlibpath= -+ finalize_shlibpath= -+ convenience= -+ old_convenience= -+ deplibs= -+ old_deplibs= -+ compiler_flags= -+ linker_flags= -+ dllsearchpath= -+ lib_search_path=`pwd` -+ inst_prefix_dir= -+ new_inherited_linker_flags= - -- if test "$preload" = yes; then -- if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && -- test "$dlopen_self_static" = unknown; then -- $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." -- fi -- fi -+ avoid_version=no -+ dlfiles= -+ dlprefiles= -+ dlself=no -+ export_dynamic=no -+ export_symbols= -+ export_symbols_regex= -+ generated= -+ libobjs= -+ ltlibs= -+ module=no -+ no_install=no -+ objs= -+ non_pic_objects= -+ precious_files_regex= -+ prefer_static_libs=no -+ preload=no -+ prev= -+ prevarg= -+ release= -+ rpath= -+ xrpath= -+ perm_rpath= -+ temp_rpath= -+ thread_safe=no -+ vinfo= -+ vinfo_number=no -+ weak_libs= -+ single_module="${wl}-single_module" -+ func_infer_tag $base_compile - -- case $host in -- *-*-rhapsody* | *-*-darwin1.[012]) -- # On Rhapsody replace the C library is the System framework -- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` -- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` -+ # We need to know -static, to get the right output filenames. -+ for arg -+ do -+ case $arg in -+ -shared) -+ test "$build_libtool_libs" != yes && \ -+ func_fatal_configuration "can not build a shared library" -+ build_old_libs=no -+ break -+ ;; -+ -all-static | -static | -static-libtool-libs) -+ case $arg in -+ -all-static) -+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then -+ func_warning "complete static linking is impossible in this configuration" -+ fi -+ if test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ prefer_static_libs=yes -+ ;; -+ -static) -+ if test -z "$pic_flag" && test -n "$link_static_flag"; then -+ dlopen_self=$dlopen_self_static -+ fi -+ prefer_static_libs=built -+ ;; -+ -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 - ;; - esac -+ done - -- case $host in -- *darwin*) -- # Don't allow lazy linking, it breaks C++ global constructors -- if test "$tagname" = CXX ; then -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -- fi -- ;; -- esac -+ # See if our shared archives depend on static archives. -+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes - -+ # Go through the arguments, transforming them on the way. -+ while test "$#" -gt 0; do -+ arg="$1" -+ shift -+ func_quote_for_eval "$arg" -+ qarg=$func_quote_for_eval_unquoted_result -+ func_append libtool_args " $func_quote_for_eval_result" - -- # move library search paths that coincide with paths to not yet -- # installed libraries to the beginning of the library search list -- new_libs= -- for path in $notinst_path; do -- case " $new_libs " in -- *" -L$path/$objdir "*) ;; -- *) -- case " $compile_deplibs " in -- *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -- esac -- ;; -- esac -- done -- for deplib in $compile_deplibs; do -- case $deplib in -- -L*) -- case " $new_libs " in -- *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -- esac -+ # If the previous option needs an argument, assign it. -+ if test -n "$prev"; then -+ case $prev in -+ output) -+ func_append compile_command " @OUTPUT@" -+ func_append finalize_command " @OUTPUT@" - ;; -- *) new_libs="$new_libs $deplib" ;; - esac -- done -- compile_deplibs="$new_libs" - -- -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -- -- if test -n "$rpath$xrpath"; then -- # If the user specified any rpath flags, then add them. -- for libdir in $rpath $xrpath; do -- # This is the magic to use -rpath. -- case "$finalize_rpath " in -- *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -- esac -- done -- fi -- -- # Now hardcode the library paths -- rpath= -- hardcode_libdirs= -- for libdir in $compile_rpath $finalize_rpath; do -- if test -n "$hardcode_libdir_flag_spec"; then -- if test -n "$hardcode_libdir_separator"; then -- if test -z "$hardcode_libdirs"; then -- hardcode_libdirs="$libdir" -+ case $prev in -+ dlfiles|dlprefiles) -+ if test "$preload" = no; then -+ # Add the symbol object into the linking commands. -+ func_append compile_command " @SYMFILE@" -+ func_append finalize_command " @SYMFILE@" -+ preload=yes -+ fi -+ case $arg in -+ *.la | *.lo) ;; # We handle these cases below. -+ force) -+ if test "$dlself" = no; then -+ dlself=needless -+ export_dynamic=yes -+ fi -+ prev= -+ continue -+ ;; -+ self) -+ if test "$prev" = dlprefiles; then -+ dlself=yes -+ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then -+ dlself=yes - else -- # Just accumulate the unique libdirs. -- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -- ;; -- *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -- ;; -- esac -+ dlself=needless -+ export_dynamic=yes - fi -- else -- eval flag=\"$hardcode_libdir_flag_spec\" -- rpath="$rpath $flag" -- fi -- elif test -n "$runpath_var"; then -- case "$perm_rpath " in -- *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -- esac -- fi -- case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) -- testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` -- case :$dllsearchpath: in -- *":$libdir:"*) ;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -- esac -- case :$dllsearchpath: in -- *":$testbindir:"*) ;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ prev= -+ continue -+ ;; -+ *) -+ if test "$prev" = dlfiles; then -+ dlfiles="$dlfiles $arg" -+ else -+ dlprefiles="$dlprefiles $arg" -+ fi -+ prev= -+ continue -+ ;; - esac - ;; -- esac -- done -- # Substitute the hardcoded libdirs into the rpath. -- if test -n "$hardcode_libdir_separator" && -- test -n "$hardcode_libdirs"; then -- libdir="$hardcode_libdirs" -- eval rpath=\" $hardcode_libdir_flag_spec\" -- fi -- compile_rpath="$rpath" -- -- rpath= -- hardcode_libdirs= -- for libdir in $finalize_rpath; do -- if test -n "$hardcode_libdir_flag_spec"; then -- if test -n "$hardcode_libdir_separator"; then -- if test -z "$hardcode_libdirs"; then -- hardcode_libdirs="$libdir" -- else -- # Just accumulate the unique libdirs. -- case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -- ;; -- *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -- ;; -+ expsyms) -+ export_symbols="$arg" -+ test -f "$arg" \ -+ || func_fatal_error "symbol file \`$arg' does not exist" -+ prev= -+ continue -+ ;; -+ expsyms_regex) -+ export_symbols_regex="$arg" -+ prev= -+ continue -+ ;; -+ framework) -+ case $host in -+ *-*-darwin*) -+ case "$deplibs " in -+ *" $qarg.ltframework "*) ;; -+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -+ ;; - esac -- fi -- else -- eval flag=\"$hardcode_libdir_flag_spec\" -- rpath="$rpath $flag" -- fi -- elif test -n "$runpath_var"; then -- case "$finalize_perm_rpath " in -- *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ ;; - esac -- fi -- done -- # Substitute the hardcoded libdirs into the rpath. -- if test -n "$hardcode_libdir_separator" && -- test -n "$hardcode_libdirs"; then -- libdir="$hardcode_libdirs" -- eval rpath=\" $hardcode_libdir_flag_spec\" -- fi -- finalize_rpath="$rpath" -- -- if test -n "$libobjs" && test "$build_old_libs" = yes; then -- # Transform all the library objects into standard objects. -- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- fi -+ prev= -+ continue -+ ;; -+ inst_prefix) -+ inst_prefix_dir="$arg" -+ prev= -+ continue -+ ;; -+ objectlist) -+ if test -f "$arg"; then -+ save_arg=$arg -+ moreargs= -+ for fil in `cat "$save_arg"` -+ do -+# moreargs="$moreargs $fil" -+ arg=$fil -+ # A libtool-controlled object. - -- dlsyms= -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- if test -n "$NM" && test -n "$global_symbol_pipe"; then -- dlsyms="${outputname}S.c" -- else -- $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 -- fi -- fi -+ # Check to see that this really is a libtool object. -+ if func_lalib_unsafe_p "$arg"; then -+ pic_object= -+ non_pic_object= - -- if test -n "$dlsyms"; then -- case $dlsyms in -- "") ;; -- *.c) -- # Discover the nlist of each of the dlfiles. -- nlist="$output_objdir/${outputname}.nm" -+ # Read the .lo file -+ func_source "$arg" - -- $show "$rm $nlist ${nlist}S ${nlist}T" -- $run $rm "$nlist" "${nlist}S" "${nlist}T" -+ if test -z "$pic_object" || -+ test -z "$non_pic_object" || -+ test "$pic_object" = none && -+ test "$non_pic_object" = none; then -+ func_fatal_error "cannot find name of object for \`$arg'" -+ fi - -- # Parse the name list into a source file. -- $show "creating $output_objdir/$dlsyms" -+ # Extract subdirectory from the argument. -+ func_dirname "$arg" "/" "" -+ xdir="$func_dirname_result" - -- test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ --/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ --/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ -+ if test "$pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ pic_object="$xdir$pic_object" - --#ifdef __cplusplus --extern \"C\" { --#endif -+ if test "$prev" = dlfiles; then -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ dlfiles="$dlfiles $pic_object" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi - --/* Prevent the only kind of declaration conflicts we can make. */ --#define lt_preloaded_symbols some_other_symbol -+ # CHECK ME: I think I busted this. -Ossama -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ dlprefiles="$dlprefiles $pic_object" -+ prev= -+ fi - --/* External symbol declarations for the compiler. */\ --" -+ # A PIC object. -+ func_append libobjs " $pic_object" -+ arg="$pic_object" -+ fi - -- if test "$dlself" = yes; then -- $show "generating symbol list for \`$output'" -+ # Non-PIC object. -+ if test "$non_pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ non_pic_object="$xdir$non_pic_object" - -- test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" -+ # A standard non-PIC object -+ func_append non_pic_objects " $non_pic_object" -+ if test -z "$pic_object" || test "$pic_object" = none ; then -+ arg="$non_pic_object" -+ fi -+ else -+ # If the PIC object exists, use it instead. -+ # $xdir was prepended to $pic_object above. -+ non_pic_object="$pic_object" -+ func_append non_pic_objects " $non_pic_object" -+ fi -+ else -+ # Only an error if not doing a dry-run. -+ if $opt_dry_run; then -+ # Extract subdirectory from the argument. -+ func_dirname "$arg" "/" "" -+ xdir="$func_dirname_result" - -- # Add our own program objects to the symbol list. -- progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- for arg in $progfiles; do -- $show "extracting global C symbols from \`$arg'" -- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" -+ func_lo2o "$arg" -+ pic_object=$xdir$objdir/$func_lo2o_result -+ non_pic_object=$xdir$func_lo2o_result -+ func_append libobjs " $pic_object" -+ func_append non_pic_objects " $non_pic_object" -+ else -+ func_fatal_error "\`$arg' is not a valid libtool object" -+ fi -+ fi - done -- -- if test -n "$exclude_expsyms"; then -- $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' -- $run eval '$mv "$nlist"T "$nlist"' -- fi -- -- if test -n "$export_symbols_regex"; then -- $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' -- $run eval '$mv "$nlist"T "$nlist"' -- fi -- -- # Prepare the list of exported symbols -- if test -z "$export_symbols"; then -- export_symbols="$output_objdir/$outputname.exp" -- $run $rm $export_symbols -- $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -- case $host in -- *cygwin* | *mingw* ) -- $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -- $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' -- ;; -- esac -- else -- $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -- $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' -- $run eval 'mv "$nlist"T "$nlist"' -- case $host in -- *cygwin* | *mingw* ) -- $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' -- $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' -- ;; -- esac -- fi -+ else -+ func_fatal_error "link input file \`$arg' does not exist" - fi -- -- for arg in $dlprefiles; do -- $show "extracting global C symbols from \`$arg'" -- name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` -- $run eval '$echo ": $name " >> "$nlist"' -- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" -- done -- -- if test -z "$run"; then -- # Make sure we have at least an empty file. -- test -f "$nlist" || : > "$nlist" -- -- if test -n "$exclude_expsyms"; then -- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T -- $mv "$nlist"T "$nlist" -- fi -- -- # Try sorting and uniquifying the output. -- if grep -v "^: " < "$nlist" | -- if sort -k 3 </dev/null >/dev/null 2>&1; then -- sort -k 3 -- else -- sort +2 -- fi | -- uniq > "$nlist"S; then -- : -- else -- grep -v "^: " < "$nlist" > "$nlist"S -- fi -- -- if test -f "$nlist"S; then -- eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' -- else -- $echo '/* NONE */' >> "$output_objdir/$dlsyms" -- fi -- -- $echo >> "$output_objdir/$dlsyms" "\ -- --#undef lt_preloaded_symbols -- --#if defined (__STDC__) && __STDC__ --# define lt_ptr void * --#else --# define lt_ptr char * --# define const --#endif -- --/* The mapping between symbol names and symbols. */ --" -- -- case $host in -- *cygwin* | *mingw* ) -- $echo >> "$output_objdir/$dlsyms" "\ --/* DATA imports from DLLs on WIN32 can't be const, because -- runtime relocations are performed -- see ld's documentation -- on pseudo-relocs */ --struct { --" -- ;; -- * ) -- $echo >> "$output_objdir/$dlsyms" "\ --const struct { --" -- ;; -- esac -- -- -- $echo >> "$output_objdir/$dlsyms" "\ -- const char *name; -- lt_ptr address; --} --lt_preloaded_symbols[] = --{\ --" -- -- eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" -- -- $echo >> "$output_objdir/$dlsyms" "\ -- {0, (lt_ptr) 0} --}; -- --/* This works around a problem in FreeBSD linker */ --#ifdef FREEBSD_WORKAROUND --static const void *lt_preloaded_setup() { -- return lt_preloaded_symbols; --} --#endif -- --#ifdef __cplusplus --} --#endif\ --" -- fi -- -- pic_flag_for_symtable= -- case $host in -- # compiling the symbol table file with pic_flag works around -- # a FreeBSD bug that causes programs to crash when -lm is -- # linked before any other PIC object. But we must not use -- # pic_flag when linking with -static. The problem exists in -- # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -- case "$compile_command " in -- *" -static "*) ;; -- *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; -- esac;; -- *-*-hpux*) -- case "$compile_command " in -- *" -static "*) ;; -- *) pic_flag_for_symtable=" $pic_flag";; -- esac -+ arg=$save_arg -+ prev= -+ continue -+ ;; -+ precious_regex) -+ precious_files_regex="$arg" -+ prev= -+ continue -+ ;; -+ release) -+ release="-$arg" -+ prev= -+ continue -+ ;; -+ rpath | xrpath) -+ # We need an absolute path. -+ case $arg in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ func_fatal_error "only absolute run-paths are allowed" -+ ;; - esac -- -- # Now compile the dynamic symbol file. -- $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" -- $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? -- -- # Clean up the generated files. -- $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" -- $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" -- -- # Transform the symbol file into the correct name. -- case $host in -- *cygwin* | *mingw* ) -- if test -f "$output_objdir/${outputname}.def" ; then -- 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" | $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" | $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 -+ if test "$prev" = rpath; then -+ case "$rpath " in -+ *" $arg "*) ;; -+ *) rpath="$rpath $arg" ;; -+ esac -+ else -+ case "$xrpath " in -+ *" $arg "*) ;; -+ *) xrpath="$xrpath $arg" ;; -+ esac -+ fi -+ prev= -+ continue -+ ;; -+ shrext) -+ shrext_cmds="$arg" -+ prev= -+ continue -+ ;; -+ weak) -+ weak_libs="$weak_libs $arg" -+ prev= -+ continue -+ ;; -+ xcclinker) -+ linker_flags="$linker_flags $qarg" -+ compiler_flags="$compiler_flags $qarg" -+ prev= -+ func_append compile_command " $qarg" -+ func_append finalize_command " $qarg" -+ continue -+ ;; -+ xcompiler) -+ compiler_flags="$compiler_flags $qarg" -+ prev= -+ func_append compile_command " $qarg" -+ func_append finalize_command " $qarg" -+ continue -+ ;; -+ xlinker) -+ linker_flags="$linker_flags $qarg" -+ compiler_flags="$compiler_flags $wl$qarg" -+ prev= -+ func_append compile_command " $wl$qarg" -+ func_append finalize_command " $wl$qarg" -+ continue - ;; - *) -- $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 -- exit $EXIT_FAILURE -+ eval "$prev=\"\$arg\"" -+ prev= -+ continue - ;; - esac -- else -- # We keep going just in case the user didn't refer to -- # lt_preloaded_symbols. The linker will fail if global_symbol_pipe -- # really was required. -- -- # Nullify the symbol file. -- 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" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` -- link_command="$compile_command$compile_rpath" -+ fi # test -n "$prev" - -- # We have no uninstalled library dependencies, so finalize right now. -- $show "$link_command" -- $run eval "$link_command" -- exit_status=$? -+ prevarg="$arg" - -- # Delete the generated files. -- if test -n "$dlsyms"; then -- $show "$rm $output_objdir/${outputname}S.${objext}" -- $run $rm "$output_objdir/${outputname}S.${objext}" -+ case $arg in -+ -all-static) -+ if test -n "$link_static_flag"; then -+ # See comment for -static flag below, for more details. -+ func_append compile_command " $link_static_flag" -+ func_append finalize_command " $link_static_flag" - fi -+ continue -+ ;; - -- exit $exit_status -- fi -- -- if test -n "$shlibpath_var"; then -- # We should set the shlibpath_var -- rpath= -- for dir in $temp_rpath; do -- case $dir in -- [\\/]* | [A-Za-z]:[\\/]*) -- # Absolute path. -- rpath="$rpath$dir:" -- ;; -- *) -- # Relative path: add a thisdir entry. -- rpath="$rpath\$thisdir/$dir:" -- ;; -- esac -- done -- temp_rpath="$rpath" -- fi -+ -allow-undefined) -+ # FIXME: remove this flag sometime in the future. -+ func_fatal_error "\`-allow-undefined' must not be used because it is the default" -+ ;; - -- if test -n "$compile_shlibpath$finalize_shlibpath"; then -- compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" -- fi -- if test -n "$finalize_shlibpath"; then -- finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" -- fi -+ -avoid-version) -+ avoid_version=yes -+ continue -+ ;; - -- compile_var= -- finalize_var= -- if test -n "$runpath_var"; then -- if test -n "$perm_rpath"; then -- # We should set the runpath_var. -- rpath= -- for dir in $perm_rpath; do -- rpath="$rpath$dir:" -- done -- compile_var="$runpath_var=\"$rpath\$$runpath_var\" " -- fi -- if test -n "$finalize_perm_rpath"; then -- # We should set the runpath_var. -- rpath= -- for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -- done -- finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " -- fi -- fi -+ -dlopen) -+ prev=dlfiles -+ continue -+ ;; - -- if test "$no_install" = yes; then -- # We don't need to create a wrapper script. -- link_command="$compile_var$compile_command$compile_rpath" -- # Replace the output file specification. -- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -- # Delete the old output file. -- $run $rm $output -- # Link the executable and exit -- $show "$link_command" -- $run eval "$link_command" || exit $? -- exit $EXIT_SUCCESS -- fi -+ -dlpreopen) -+ prev=dlprefiles -+ continue -+ ;; - -- if test "$hardcode_action" = relink; then -- # Fast installation is not supported -- link_command="$compile_var$compile_command$compile_rpath" -- relink_command="$finalize_var$finalize_command$finalize_rpath" -+ -export-dynamic) -+ export_dynamic=yes -+ continue -+ ;; - -- $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 -- $echo "$modename: \`$output' will be relinked during installation" 1>&2 -- else -- 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" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` -- else -- # fast_install is set to needless -- relink_command= -- fi -+ -export-symbols | -export-symbols-regex) -+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then -+ func_fatal_error "more than one -exported-symbols argument is not allowed" -+ fi -+ if test "X$arg" = "X-export-symbols"; then -+ prev=expsyms - else -- link_command="$compile_var$compile_command$compile_rpath" -- relink_command="$finalize_var$finalize_command$finalize_rpath" -+ prev=expsyms_regex - fi -- fi -- -- # Replace the output file specification. -- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -+ continue -+ ;; - -- # Delete the old output files. -- $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname -+ -framework) -+ prev=framework -+ continue -+ ;; - -- $show "$link_command" -- $run eval "$link_command" || exit $? -+ -inst-prefix-dir) -+ prev=inst_prefix -+ continue -+ ;; - -- # Now create the wrapper script. -- $show "creating $output" -+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* -+ # so, if we see these flags be careful not to treat them like -L -+ -L[A-Z][A-Z]*:*) -+ case $with_gcc/$host in -+ no/*-*-irix* | /*-*-irix*) -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ ;; -+ esac -+ continue -+ ;; - -- # Quote the relink command for shipping. -- if test -n "$relink_command"; then -- # Preserve any variables that may affect compiler behavior -- for var in $variables_saved_for_relink; do -- if eval test -z \"\${$var+set}\"; then -- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" -- elif eval var_value=\$$var; test -z "$var_value"; then -- relink_command="$var=; export $var; $relink_command" -+ -L*) -+ func_stripname '-L' '' "$arg" -+ dir=$func_stripname_result -+ if test -z "$dir"; then -+ if test "$#" -gt 0; then -+ func_fatal_error "require no space between \`-L' and \`$1'" - else -- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` -- relink_command="$var=\"$var_value\"; export $var; $relink_command" -+ func_fatal_error "need path for \`-L' option" - fi -- done -- relink_command="(cd `pwd`; $relink_command)" -- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` -- fi -- -- # Quote $echo for shipping. -- if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then -- case $progpath in -- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; -- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; -+ fi -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ absdir=`cd "$dir" && pwd` -+ test -z "$absdir" && \ -+ func_fatal_error "cannot determine absolute directory name of \`$dir'" -+ dir="$absdir" -+ ;; - esac -- qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` -- else -- qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` -- fi -- -- # Only actually do things if our run command is non-null. -- if test -z "$run"; then -- # win32 will think the script is a binary if it has -- # a .exe suffix, so we strip it off here. -- case $output in -- *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; -+ case "$deplibs " in -+ *" -L$dir "*) ;; -+ *) -+ deplibs="$deplibs -L$dir" -+ lib_search_path="$lib_search_path $dir" -+ ;; - esac -- # test for cygwin because mv fails w/o .exe extensions - case $host in -- *cygwin*) -- exeext=.exe -- outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; -- *) exeext= ;; -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` -+ case :$dllsearchpath: in -+ *":$dir:"*) ;; -+ ::) dllsearchpath=$dir;; -+ *) dllsearchpath="$dllsearchpath:$dir";; -+ esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ ::) dllsearchpath=$testbindir;; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; -+ esac -+ ;; - esac -- case $host in -- *cygwin* | *mingw* ) -- output_name=`basename $output` -- output_path=`dirname $output` -- cwrappersource="$output_path/$objdir/lt-$output_name.c" -- cwrapper="$output_path/$output_name.exe" -- $rm $cwrappersource $cwrapper -- trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 -- -- cat > $cwrappersource <<EOF -- --/* $cwrappersource - temporary wrapper executable for $objdir/$outputname -- Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -+ continue -+ ;; - -- The $output program cannot be directly executed until all the libtool -- libraries that it depends on are installed. -+ -l*) -+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) -+ # These systems don't actually have a C or math library (as such) -+ continue -+ ;; -+ *-*-os2*) -+ # These systems don't actually have a C library (as such) -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc due to us having libc/libc_r. -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C and math libraries are in the System framework -+ deplibs="$deplibs System.ltframework" -+ continue -+ ;; -+ *-*-sco3.2v5* | *-*-sco5v6*) -+ # Causes problems with __ctype -+ test "X$arg" = "X-lc" && continue -+ ;; -+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -+ # Compiler inserts libc in the correct place for threads to work -+ test "X$arg" = "X-lc" && continue -+ ;; -+ esac -+ elif test "X$arg" = "X-lc_r"; then -+ case $host in -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; -+ esac -+ fi -+ deplibs="$deplibs $arg" -+ continue -+ ;; - -- This wrapper executable should never be moved out of the build directory. -- If it is, it will not operate correctly. -+ -module) -+ module=yes -+ continue -+ ;; - -- Currently, it simply execs the wrapper *script* "/bin/sh $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. --*/ --EOF -- cat >> $cwrappersource<<"EOF" --#include <stdio.h> --#include <stdlib.h> --#include <unistd.h> --#include <malloc.h> --#include <stdarg.h> --#include <assert.h> --#include <string.h> --#include <ctype.h> --#include <sys/stat.h> -+ # Tru64 UNIX uses -model [arg] to determine the layout of C++ -+ # classes, name mangling, and exception handling. -+ # Darwin uses the -arch flag to determine output architecture. -+ -model|-arch|-isysroot) -+ compiler_flags="$compiler_flags $arg" -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ prev=xcompiler -+ continue -+ ;; - --#if defined(PATH_MAX) --# define LT_PATHMAX PATH_MAX --#elif defined(MAXPATHLEN) --# define LT_PATHMAX MAXPATHLEN --#else --# define LT_PATHMAX 1024 --#endif -+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -+ compiler_flags="$compiler_flags $arg" -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ case "$new_inherited_linker_flags " in -+ *" $arg "*) ;; -+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -+ esac -+ continue -+ ;; - --#ifndef DIR_SEPARATOR --# define DIR_SEPARATOR '/' --# define PATH_SEPARATOR ':' --#endif -+ -multi_module) -+ single_module="${wl}-multi_module" -+ continue -+ ;; - --#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ -- defined (__OS2__) --# define HAVE_DOS_BASED_FILE_SYSTEM --# ifndef DIR_SEPARATOR_2 --# define DIR_SEPARATOR_2 '\\' --# endif --# ifndef PATH_SEPARATOR_2 --# define PATH_SEPARATOR_2 ';' --# endif --#endif -+ -no-fast-install) -+ fast_install=no -+ continue -+ ;; - --#ifndef DIR_SEPARATOR_2 --# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) --#else /* DIR_SEPARATOR_2 */ --# define IS_DIR_SEPARATOR(ch) \ -- (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) --#endif /* DIR_SEPARATOR_2 */ -+ -no-install) -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) -+ # The PATH hackery in wrapper scripts is required on Windows -+ # and Darwin in order for the loader to find any dlls it needs. -+ func_warning "\`-no-install' is ignored for $host" -+ func_warning "assuming \`-no-fast-install' instead" -+ fast_install=no -+ ;; -+ *) no_install=yes ;; -+ esac -+ continue -+ ;; - --#ifndef PATH_SEPARATOR_2 --# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) --#else /* PATH_SEPARATOR_2 */ --# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) --#endif /* PATH_SEPARATOR_2 */ -+ -no-undefined) -+ allow_undefined=no -+ continue -+ ;; - --#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) --#define XFREE(stale) do { \ -- if (stale) { free ((void *) stale); stale = 0; } \ --} while (0) -+ -objectlist) -+ prev=objectlist -+ continue -+ ;; - --/* -DDEBUG is fairly common in CFLAGS. */ --#undef DEBUG --#if defined DEBUGWRAPPER --# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) --#else --# define DEBUG(format, ...) --#endif -+ -o) prev=output ;; - --const char *program_name = NULL; -+ -precious-files-regex) -+ prev=precious_regex -+ continue -+ ;; - --void * xmalloc (size_t num); --char * xstrdup (const char *string); --const char * base_name (const char *name); --char * find_executable(const char *wrapper); --int check_executable(const char *path); --char * strendzap(char *str, const char *pat); --void lt_fatal (const char *message, ...); -+ -release) -+ prev=release -+ continue -+ ;; - --int --main (int argc, char *argv[]) --{ -- char **newargz; -- int i; -+ -rpath) -+ prev=rpath -+ continue -+ ;; - -- program_name = (char *) xstrdup (base_name (argv[0])); -- DEBUG("(main) argv[0] : %s\n",argv[0]); -- DEBUG("(main) program_name : %s\n",program_name); -- newargz = XMALLOC(char *, argc+2); --EOF -+ -R) -+ prev=xrpath -+ continue -+ ;; - -- cat >> $cwrappersource <<EOF -- newargz[0] = (char *) xstrdup("$SHELL"); --EOF -+ -R*) -+ func_stripname '-R' '' "$arg" -+ dir=$func_stripname_result -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) ;; -+ *) -+ func_fatal_error "only absolute run-paths are allowed" -+ ;; -+ esac -+ case "$xrpath " in -+ *" $dir "*) ;; -+ *) xrpath="$xrpath $dir" ;; -+ esac -+ continue -+ ;; - -- cat >> $cwrappersource <<"EOF" -- newargz[1] = find_executable(argv[0]); -- if (newargz[1] == NULL) -- lt_fatal("Couldn't find %s", argv[0]); -- DEBUG("(main) found exe at : %s\n",newargz[1]); -- /* we know the script has the same name, without the .exe */ -- /* so make sure newargz[1] doesn't end in .exe */ -- strendzap(newargz[1],".exe"); -- for (i = 1; i < argc; i++) -- newargz[i+1] = xstrdup(argv[i]); -- newargz[argc+1] = NULL; -+ -shared) -+ # The effects of -shared are defined in a previous loop. -+ continue -+ ;; - -- for (i=0; i<argc+1; i++) -- { -- DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); -- ; -- } -+ -shrext) -+ prev=shrext -+ continue -+ ;; - --EOF -+ -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 -+ # would be equivalent was wrong. It would break on at least -+ # Digital Unix and AIX. -+ continue -+ ;; - -- case $host_os in -- mingw*) -- cat >> $cwrappersource <<EOF -- execv("$SHELL",(char const **)newargz); --EOF -- ;; -- *) -- cat >> $cwrappersource <<EOF -- execv("$SHELL",newargz); --EOF -- ;; -- esac -+ -thread-safe) -+ thread_safe=yes -+ continue -+ ;; - -- cat >> $cwrappersource <<"EOF" -- return 127; --} -+ -version-info) -+ prev=vinfo -+ continue -+ ;; - --void * --xmalloc (size_t num) --{ -- void * p = (void *) malloc (num); -- if (!p) -- lt_fatal ("Memory exhausted"); -+ -version-number) -+ prev=vinfo -+ vinfo_number=yes -+ continue -+ ;; - -- return p; --} -+ -weak) -+ prev=weak -+ continue -+ ;; - --char * --xstrdup (const char *string) --{ -- return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL --; --} -+ -Wc,*) -+ func_stripname '-Wc,' '' "$arg" -+ args=$func_stripname_result -+ arg= -+ save_ifs="$IFS"; IFS=',' -+ for flag in $args; do -+ IFS="$save_ifs" -+ func_quote_for_eval "$flag" -+ arg="$arg $wl$func_quote_for_eval_result" -+ compiler_flags="$compiler_flags $func_quote_for_eval_result" -+ done -+ IFS="$save_ifs" -+ func_stripname ' ' '' "$arg" -+ arg=$func_stripname_result -+ ;; - --const char * --base_name (const char *name) --{ -- const char *base; -+ -Wl,*) -+ func_stripname '-Wl,' '' "$arg" -+ args=$func_stripname_result -+ arg= -+ save_ifs="$IFS"; IFS=',' -+ for flag in $args; do -+ IFS="$save_ifs" -+ func_quote_for_eval "$flag" -+ arg="$arg $wl$func_quote_for_eval_result" -+ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -+ linker_flags="$linker_flags $func_quote_for_eval_result" -+ done -+ IFS="$save_ifs" -+ func_stripname ' ' '' "$arg" -+ arg=$func_stripname_result -+ ;; - --#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -- /* Skip over the disk name in MSDOS pathnames. */ -- if (isalpha ((unsigned char)name[0]) && name[1] == ':') -- name += 2; --#endif -+ -Xcompiler) -+ prev=xcompiler -+ continue -+ ;; - -- for (base = name; *name; name++) -- if (IS_DIR_SEPARATOR (*name)) -- base = name + 1; -- return base; --} -+ -Xlinker) -+ prev=xlinker -+ continue -+ ;; - --int --check_executable(const char * path) --{ -- struct stat st; -+ -XCClinker) -+ prev=xcclinker -+ continue -+ ;; - -- DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); -- if ((!path) || (!*path)) -- return 0; -+ # -msg_* for osf cc -+ -msg_*) -+ func_quote_for_eval "$arg" -+ arg="$func_quote_for_eval_result" -+ ;; - -- if ((stat (path, &st) >= 0) && -- ( -- /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ --#if defined (S_IXOTH) -- ((st.st_mode & S_IXOTH) == S_IXOTH) || --#endif --#if defined (S_IXGRP) -- ((st.st_mode & S_IXGRP) == S_IXGRP) || --#endif -- ((st.st_mode & S_IXUSR) == S_IXUSR)) -- ) -- return 1; -- else -- return 0; --} -+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -+ # -r[0-9][0-9]* specifies the processor on the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -+ # +DA*, +DD* enable 64-bit mode on the HP compiler -+ # -q* pass through compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* pass through architecture-specific -+ # compiler args for GCC -+ # -F/path gives path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -+ # @file GCC response files -+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ func_quote_for_eval "$arg" -+ arg="$func_quote_for_eval_result" -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ compiler_flags="$compiler_flags $arg" -+ continue -+ ;; - --/* Searches for the full path of the wrapper. Returns -- newly allocated full path name if found, NULL otherwise */ --char * --find_executable (const char* wrapper) --{ -- int has_slash = 0; -- const char* p; -- const char* p_next; -- /* static buffer for getcwd */ -- char tmp[LT_PATHMAX + 1]; -- int tmp_len; -- char* concat_name; -+ # Some other compiler flag. -+ -* | +*) -+ func_quote_for_eval "$arg" -+ arg="$func_quote_for_eval_result" -+ ;; - -- DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); -+ *.$objext) -+ # A standard object. -+ objs="$objs $arg" -+ ;; - -- if ((wrapper == NULL) || (*wrapper == '\0')) -- return NULL; -+ *.lo) -+ # A libtool-controlled object. - -- /* Absolute path? */ --#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -- if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') -- { -- concat_name = xstrdup (wrapper); -- if (check_executable(concat_name)) -- return concat_name; -- XFREE(concat_name); -- } -- else -- { --#endif -- if (IS_DIR_SEPARATOR (wrapper[0])) -- { -- concat_name = xstrdup (wrapper); -- if (check_executable(concat_name)) -- return concat_name; -- XFREE(concat_name); -- } --#if defined (HAVE_DOS_BASED_FILE_SYSTEM) -- } --#endif -+ # Check to see that this really is a libtool object. -+ if func_lalib_unsafe_p "$arg"; then -+ pic_object= -+ non_pic_object= - -- for (p = wrapper; *p; p++) -- if (*p == '/') -- { -- has_slash = 1; -- break; -- } -- if (!has_slash) -- { -- /* no slashes; search PATH */ -- const char* path = getenv ("PATH"); -- if (path != NULL) -- { -- for (p = path; *p; p = p_next) -- { -- const char* q; -- size_t p_len; -- for (q = p; *q; q++) -- if (IS_PATH_SEPARATOR(*q)) -- break; -- p_len = q - p; -- p_next = (*q == '\0' ? q : q + 1); -- if (p_len == 0) -- { -- /* empty path: current directory */ -- if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -- tmp_len = strlen(tmp); -- concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); -- memcpy (concat_name, tmp, tmp_len); -- concat_name[tmp_len] = '/'; -- strcpy (concat_name + tmp_len + 1, wrapper); -- } -- else -- { -- concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); -- memcpy (concat_name, p, p_len); -- concat_name[p_len] = '/'; -- strcpy (concat_name + p_len + 1, wrapper); -- } -- if (check_executable(concat_name)) -- return concat_name; -- XFREE(concat_name); -- } -- } -- /* not found in PATH; assume curdir */ -- } -- /* Relative path | not found in path: prepend cwd */ -- if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -- tmp_len = strlen(tmp); -- concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); -- memcpy (concat_name, tmp, tmp_len); -- concat_name[tmp_len] = '/'; -- strcpy (concat_name + tmp_len + 1, wrapper); -+ # Read the .lo file -+ func_source "$arg" - -- if (check_executable(concat_name)) -- return concat_name; -- XFREE(concat_name); -- return NULL; --} -+ if test -z "$pic_object" || -+ test -z "$non_pic_object" || -+ test "$pic_object" = none && -+ test "$non_pic_object" = none; then -+ func_fatal_error "cannot find name of object for \`$arg'" -+ fi - --char * --strendzap(char *str, const char *pat) --{ -- size_t len, patlen; -+ # Extract subdirectory from the argument. -+ func_dirname "$arg" "/" "" -+ xdir="$func_dirname_result" - -- assert(str != NULL); -- assert(pat != NULL); -+ if test "$pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ pic_object="$xdir$pic_object" - -- len = strlen(str); -- patlen = strlen(pat); -+ if test "$prev" = dlfiles; then -+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ dlfiles="$dlfiles $pic_object" -+ prev= -+ continue -+ else -+ # If libtool objects are unsupported, then we need to preload. -+ prev=dlprefiles -+ fi -+ fi - -- if (patlen <= len) -- { -- str += len - patlen; -- if (strcmp(str, pat) == 0) -- *str = '\0'; -- } -- return str; --} -+ # CHECK ME: I think I busted this. -Ossama -+ if test "$prev" = dlprefiles; then -+ # Preload the old-style object. -+ dlprefiles="$dlprefiles $pic_object" -+ prev= -+ fi - --static void --lt_error_core (int exit_status, const char * mode, -- const char * message, va_list ap) --{ -- fprintf (stderr, "%s: %s: ", program_name, mode); -- vfprintf (stderr, message, ap); -- fprintf (stderr, ".\n"); -+ # A PIC object. -+ func_append libobjs " $pic_object" -+ arg="$pic_object" -+ fi - -- if (exit_status >= 0) -- exit (exit_status); --} -+ # Non-PIC object. -+ if test "$non_pic_object" != none; then -+ # Prepend the subdirectory the object is found in. -+ non_pic_object="$xdir$non_pic_object" - --void --lt_fatal (const char *message, ...) --{ -- va_list ap; -- va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -- va_end (ap); --} --EOF -- # we should really use a build-platform specific compiler -- # here, but OTOH, the wrappers (shell script and this C one) -- # are only useful if you want to execute the "real" binary. -- # Since the "real" binary is built for $host, then this -- # wrapper might as well be built for $host, too. -- $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource -- ;; -- esac -- $rm $output -- trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 -+ # A standard non-PIC object -+ func_append non_pic_objects " $non_pic_object" -+ if test -z "$pic_object" || test "$pic_object" = none ; then -+ arg="$non_pic_object" -+ fi -+ else -+ # If the PIC object exists, use it instead. -+ # $xdir was prepended to $pic_object above. -+ non_pic_object="$pic_object" -+ func_append non_pic_objects " $non_pic_object" -+ fi -+ else -+ # Only an error if not doing a dry-run. -+ if $opt_dry_run; then -+ # Extract subdirectory from the argument. -+ func_dirname "$arg" "/" "" -+ xdir="$func_dirname_result" - -- $echo > $output "\ --#! $SHELL -+ func_lo2o "$arg" -+ pic_object=$xdir$objdir/$func_lo2o_result -+ non_pic_object=$xdir$func_lo2o_result -+ func_append libobjs " $pic_object" -+ func_append non_pic_objects " $non_pic_object" -+ else -+ func_fatal_error "\`$arg' is not a valid libtool object" -+ fi -+ fi -+ ;; - --# $output - temporary wrapper script for $objdir/$outputname --# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP --# --# The $output program cannot be directly executed until all the libtool --# libraries that it depends on are installed. --# --# This wrapper script should never be moved out of the build directory. --# If it is, it will not operate correctly. -+ *.$libext) -+ # An archive. -+ deplibs="$deplibs $arg" -+ old_deplibs="$old_deplibs $arg" -+ continue -+ ;; - --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed='${SED} -e 1s/^X//' --sed_quote_subst='$sed_quote_subst' -+ *.la) -+ # A libtool-controlled library. - --# 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 -+ if test "$prev" = dlfiles; then -+ # This library was specified with -dlopen. -+ dlfiles="$dlfiles $arg" -+ prev= -+ elif test "$prev" = dlprefiles; then -+ # The library was specified with -dlpreopen. -+ dlprefiles="$dlprefiles $arg" -+ prev= -+ else -+ deplibs="$deplibs $arg" -+ fi -+ continue -+ ;; - --# 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 -+ # Some other compiler argument. -+ *) -+ # Unknown arguments in both finalize_command and compile_command need -+ # to be aesthetically quoted because they are evaled later. -+ func_quote_for_eval "$arg" -+ arg="$func_quote_for_eval_result" -+ ;; -+ esac # arg - --relink_command=\"$relink_command\" -+ # Now actually substitute the argument into the commands. -+ if test -n "$arg"; then -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ fi -+ done # argument parsing loop - --# This environment variable determines our operation mode. --if test \"\$libtool_install_magic\" = \"$magic\"; then -- # install mode needs the following variable: -- notinst_deplibs='$notinst_deplibs' --else -- # When we are sourced in execute mode, \$file and \$echo are already set. -- if test \"\$libtool_execute_magic\" != \"$magic\"; then -- echo=\"$qecho\" -- file=\"\$0\" -- # Make sure echo works. -- if test \"X\$1\" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift -- elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then -- # Yippee, \$echo works! -- : -- else -- # Restart under the correct shell, and then maybe \$echo will work. -- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} -+ test -n "$prev" && \ -+ func_fatal_help "the \`$prevarg' option requires an argument" -+ -+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -+ eval arg=\"$export_dynamic_flag_spec\" -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" - fi -- fi\ --" -- $echo >> $output "\ - -- # Find the directory that this script lives in. -- thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` -- test \"x\$thisdir\" = \"x\$file\" && thisdir=. -+ oldlibs= -+ # calculate the name of the file, without its directory -+ func_basename "$output" -+ outputname="$func_basename_result" -+ libobjs_save="$libobjs" - -- # Follow symbolic links until we get to the real thisdir. -- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` -- while test -n \"\$file\"; do -- destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` -+ if test -n "$shlibpath_var"; then -+ # get the directories listed in $shlibpath_var -+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` -+ else -+ shlib_search_path= -+ fi -+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\" -+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - -- # If there was a directory component, then change thisdir. -- if test \"x\$destdir\" != \"x\$file\"; then -- case \"\$destdir\" in -- [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; -- *) thisdir=\"\$thisdir/\$destdir\" ;; -+ func_dirname "$output" "/" "" -+ output_objdir="$func_dirname_result$objdir" -+ # Create the object directory. -+ func_mkdir_p "$output_objdir" -+ -+ # Determine the type of output -+ case $output in -+ "") -+ func_fatal_help "you must specify an output file" -+ ;; -+ *.$libext) linkmode=oldlib ;; -+ *.lo | *.$objext) linkmode=obj ;; -+ *.la) linkmode=lib ;; -+ *) linkmode=prog ;; # Anything else should be a program. -+ esac -+ -+ specialdeplibs= -+ -+ libs= -+ # Find all interdependent deplibs by searching for libraries -+ # that are linked more than once (e.g. -la -lb -la) -+ for deplib in $deplibs; do -+ if $opt_duplicate_deps ; then -+ case "$libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ libs="$libs $deplib" -+ done -+ -+ if test "$linkmode" = lib; then -+ libs="$predeps $libs $compiler_lib_search_path $postdeps" -+ -+ # Compute libraries that are listed more than once in $predeps -+ # $postdeps and mark them as special (i.e., whose duplicates are -+ # not to be eliminated). -+ pre_post_deps= -+ if $opt_duplicate_compiler_generated_deps; then -+ for pre_post_dep in $predeps $postdeps; do -+ case "$pre_post_deps " in -+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ esac -+ pre_post_deps="$pre_post_deps $pre_post_dep" -+ done -+ fi -+ pre_post_deps= -+ fi -+ -+ deplibs= -+ newdependency_libs= -+ newlib_search_path= -+ need_relink=no # whether we're linking any uninstalled libtool libraries -+ notinst_deplibs= # not-installed libtool libraries -+ notinst_path= # paths that contain not-installed libtool libraries -+ -+ case $linkmode in -+ lib) -+ passes="conv dlpreopen link" -+ for file in $dlfiles $dlprefiles; do -+ case $file in -+ *.la) ;; -+ *) -+ func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" -+ ;; -+ esac -+ done -+ ;; -+ prog) -+ compile_deplibs= -+ finalize_deplibs= -+ alldeplibs=no -+ newdlfiles= -+ newdlprefiles= -+ passes="conv scan dlopen dlpreopen link" -+ ;; -+ *) passes="conv" -+ ;; -+ esac -+ -+ for pass in $passes; do -+ # The preopen pass in lib mode reverses $deplibs; put it back here -+ # so that -L comes before libs that need it for instance... -+ if test "$linkmode,$pass" = "lib,link"; then -+ ## FIXME: Find the place where the list is rebuilt in the wrong -+ ## order, and fix it there properly -+ tmp_deplibs= -+ for deplib in $deplibs; do -+ tmp_deplibs="$deplib $tmp_deplibs" -+ done -+ deplibs="$tmp_deplibs" -+ fi -+ -+ if test "$linkmode,$pass" = "lib,link" || -+ test "$linkmode,$pass" = "prog,scan"; then -+ libs="$deplibs" -+ deplibs= -+ fi -+ if test "$linkmode" = prog; then -+ case $pass in -+ dlopen) libs="$dlfiles" ;; -+ dlpreopen) libs="$dlprefiles" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; -+ esac -+ fi -+ if test "$linkmode,$pass" = "lib,dlpreopen"; then -+ # Collect and forward deplibs of preopened libtool libs -+ for lib in $dlprefiles; do -+ # Ignore non-libtool-libs -+ dependency_libs= -+ case $lib in -+ *.la) func_source "$lib" ;; -+ esac -+ -+ # Collect preopened libtool deplibs, except any this library -+ # has declared as weak libs -+ for deplib in $dependency_libs; do -+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` -+ case " $weak_libs " in -+ *" $deplib_base "*) ;; -+ *) deplibs="$deplibs $deplib" ;; -+ esac -+ done -+ done -+ libs="$dlprefiles" -+ fi -+ if test "$pass" = dlopen; then -+ # Collect dlpreopened libraries -+ save_deplibs="$deplibs" -+ deplibs= -+ fi -+ -+ for deplib in $libs; do -+ lib= -+ found=no -+ case $deplib in -+ -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" -+ else -+ compiler_flags="$compiler_flags $deplib" -+ if test "$linkmode" = lib ; then -+ case "$new_inherited_linker_flags " in -+ *" $deplib "*) ;; -+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ esac -+ fi -+ fi -+ continue -+ ;; -+ -l*) -+ if test "$linkmode" != lib && test "$linkmode" != prog; then -+ func_warning "\`-l' is ignored for archives/objects" -+ continue -+ fi -+ func_stripname '-l' '' "$deplib" -+ name=$func_stripname_result -+ if test "$linkmode" = lib; then -+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" -+ else -+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" -+ fi -+ for searchdir in $searchdirs; do -+ for search_ext in .la $std_shrext .so .a; do -+ # Search the libtool library -+ lib="$searchdir/lib${name}${search_ext}" -+ if test -f "$lib"; then -+ if test "$search_ext" = ".la"; then -+ found=yes -+ else -+ found=no -+ fi -+ break 2 -+ fi -+ done -+ done -+ if test "$found" != yes; then -+ # deplib doesn't seem to be a libtool library -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ fi -+ continue -+ else # deplib is a libtool library -+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, -+ # We need to do some special things here, and not later. -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $deplib "*) -+ if func_lalib_p "$lib"; then -+ library_names= -+ old_library= -+ func_source "$lib" -+ for l in $old_library $library_names; do -+ ll="$l" -+ done -+ if test "X$ll" = "X$old_library" ; then # only static version available -+ found=no -+ func_dirname "$lib" "" "." -+ ladir="$func_dirname_result" -+ lib=$ladir/$old_library -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ fi -+ continue -+ fi -+ fi -+ ;; -+ *) ;; -+ esac -+ fi -+ fi -+ ;; # -l -+ *.ltframework) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ if test "$linkmode" = lib ; then -+ case "$new_inherited_linker_flags " in -+ *" $deplib "*) ;; -+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ esac -+ fi -+ fi -+ continue -+ ;; -+ -L*) -+ case $linkmode in -+ lib) -+ deplibs="$deplib $deplibs" -+ test "$pass" = conv && continue -+ newdependency_libs="$deplib $newdependency_libs" -+ func_stripname '-L' '' "$deplib" -+ newlib_search_path="$newlib_search_path $func_stripname_result" -+ ;; -+ prog) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ if test "$pass" = scan; then -+ deplibs="$deplib $deplibs" -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ func_stripname '-L' '' "$deplib" -+ newlib_search_path="$newlib_search_path $func_stripname_result" -+ ;; -+ *) -+ func_warning "\`-L' is ignored for archives/objects" -+ ;; -+ esac # linkmode -+ continue -+ ;; # -L -+ -R*) -+ if test "$pass" = link; then -+ func_stripname '-R' '' "$deplib" -+ dir=$func_stripname_result -+ # Make sure the xrpath contains only unique directories. -+ case "$xrpath " in -+ *" $dir "*) ;; -+ *) xrpath="$xrpath $dir" ;; -+ esac -+ fi -+ deplibs="$deplib $deplibs" -+ continue -+ ;; -+ *.la) lib="$deplib" ;; -+ *.$libext) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ case $linkmode in -+ lib) -+ # Linking convenience modules into shared libraries is allowed, -+ # but linking other static libraries is non-portable. -+ case " $dlpreconveniencelibs " in -+ *" $deplib "*) ;; -+ *) -+ valid_a_lib=no -+ case $deplibs_check_method in -+ match_pattern*) -+ set dummy $deplibs_check_method; shift -+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` -+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ -+ | $EGREP "$match_pattern_regex" > /dev/null; then -+ valid_a_lib=yes -+ fi -+ ;; -+ pass_all) -+ valid_a_lib=yes -+ ;; -+ esac -+ if test "$valid_a_lib" != yes; then -+ $ECHO -+ $ECHO "*** Warning: Trying to link with static lib archive $deplib." -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which you do not appear to have" -+ $ECHO "*** because the file extensions .$libext of this argument makes me believe" -+ $ECHO "*** that it is just a static archive that I should not use here." -+ else -+ $ECHO -+ $ECHO "*** Warning: Linking the shared library $output against the" -+ $ECHO "*** static library $deplib is not portable!" -+ deplibs="$deplib $deplibs" -+ fi -+ ;; -+ esac -+ continue -+ ;; -+ prog) -+ if test "$pass" != link; then -+ deplibs="$deplib $deplibs" -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ continue -+ ;; -+ esac # linkmode -+ ;; # *.$libext -+ *.lo | *.$objext) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ elif test "$linkmode" = prog; then -+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ # If there is no dlopen support or we're linking statically, -+ # we need to preload. -+ newdlprefiles="$newdlprefiles $deplib" -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ newdlfiles="$newdlfiles $deplib" -+ fi -+ fi -+ continue -+ ;; -+ %DEPLIBS%) -+ alldeplibs=yes -+ continue -+ ;; -+ esac # case $deplib -+ -+ if test "$found" = yes || test -f "$lib"; then : -+ else -+ func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" -+ fi -+ -+ # Check to see that this really is a libtool archive. -+ func_lalib_unsafe_p "$lib" \ -+ || func_fatal_error "\`$lib' is not a valid libtool archive" -+ -+ func_dirname "$lib" "" "." -+ ladir="$func_dirname_result" -+ -+ dlname= -+ dlopen= -+ dlpreopen= -+ libdir= -+ library_names= -+ old_library= -+ inherited_linker_flags= -+ # If the library was installed with an old release of libtool, -+ # it will not redefine variables installed, or shouldnotlink -+ installed=yes -+ shouldnotlink=no -+ avoidtemprpath= -+ -+ -+ # Read the .la file -+ func_source "$lib" -+ -+ # Convert "-framework foo" to "foo.ltframework" -+ if test -n "$inherited_linker_flags"; then -+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` -+ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do -+ case " $new_inherited_linker_flags " in -+ *" $tmp_inherited_linker_flag "*) ;; -+ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -+ esac -+ done -+ fi -+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ if test "$linkmode,$pass" = "lib,link" || -+ test "$linkmode,$pass" = "prog,scan" || -+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then -+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ fi -+ -+ if test "$pass" = conv; then -+ # Only check for convenience libraries -+ deplibs="$lib $deplibs" -+ if test -z "$libdir"; then -+ if test -z "$old_library"; then -+ func_fatal_error "cannot find name of link library for \`$lib'" -+ fi -+ # It is a libtool convenience library, so add in its objects. -+ convenience="$convenience $ladir/$objdir/$old_library" -+ old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ elif test "$linkmode" != prog && test "$linkmode" != lib; then -+ func_fatal_error "\`$lib' is not a convenience library" -+ fi -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ deplibs="$deplib $deplibs" -+ if $opt_duplicate_deps ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done -+ continue -+ fi # $pass = conv -+ -+ -+ # Get the name of the library we link against. -+ linklib= -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ if test -z "$linklib"; then -+ func_fatal_error "cannot find name of link library for \`$lib'" -+ fi -+ -+ # This library was specified with -dlopen. -+ if test "$pass" = dlopen; then -+ if test -z "$libdir"; then -+ func_fatal_error "cannot -dlopen a convenience library: \`$lib'" -+ fi -+ if test -z "$dlname" || -+ test "$dlopen_support" != yes || -+ test "$build_libtool_libs" = no; then -+ # If there is no dlname, no dlopen support or we're linking -+ # statically, we need to preload. We also need to preload any -+ # dependent libraries so libltdl's deplib preloader doesn't -+ # bomb out in the load deplibs phase. -+ dlprefiles="$dlprefiles $lib $dependency_libs" -+ else -+ newdlfiles="$newdlfiles $lib" -+ fi -+ continue -+ fi # $pass = dlopen -+ -+ # We need an absolute path. -+ case $ladir in -+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; -+ *) -+ abs_ladir=`cd "$ladir" && pwd` -+ if test -z "$abs_ladir"; then -+ func_warning "cannot determine absolute directory name of \`$ladir'" -+ func_warning "passing it literally to the linker, although it might fail" -+ abs_ladir="$ladir" -+ fi -+ ;; -+ esac -+ func_basename "$lib" -+ laname="$func_basename_result" -+ -+ # Find the relevant object directory and library name. -+ if test "X$installed" = Xyes; then -+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ func_warning "library \`$lib' was moved." -+ dir="$ladir" -+ absdir="$abs_ladir" -+ libdir="$abs_ladir" -+ else -+ dir="$libdir" -+ absdir="$libdir" -+ fi -+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes -+ else -+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ dir="$ladir" -+ absdir="$abs_ladir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ else -+ dir="$ladir/$objdir" -+ absdir="$abs_ladir/$objdir" -+ # Remove this search path later -+ notinst_path="$notinst_path $abs_ladir" -+ fi -+ fi # $installed = yes -+ func_stripname 'lib' '.la' "$laname" -+ name=$func_stripname_result -+ -+ # This library was specified with -dlpreopen. -+ if test "$pass" = dlpreopen; then -+ if test -z "$libdir" && test "$linkmode" = prog; then -+ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" -+ fi -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ newdlprefiles="$newdlprefiles $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ newdlprefiles="$newdlprefiles $dir/$dlname" -+ else -+ newdlprefiles="$newdlprefiles $dir/$linklib" -+ fi -+ fi # $pass = dlpreopen -+ -+ if test -z "$libdir"; then -+ # Link the convenience library -+ if test "$linkmode" = lib; then -+ deplibs="$dir/$old_library $deplibs" -+ elif test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$dir/$old_library $compile_deplibs" -+ finalize_deplibs="$dir/$old_library $finalize_deplibs" -+ else -+ deplibs="$lib $deplibs" # used for prog,scan pass -+ fi -+ continue -+ fi -+ -+ -+ if test "$linkmode" = prog && test "$pass" != link; then -+ newlib_search_path="$newlib_search_path $ladir" -+ deplibs="$lib $deplibs" -+ -+ linkalldeplibs=no -+ if test "$link_all_deplibs" != no || test -z "$library_names" || -+ test "$build_libtool_libs" = no; then -+ linkalldeplibs=yes -+ fi -+ -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ newlib_search_path="$newlib_search_path $func_stripname_result" -+ ;; -+ esac -+ # Need to link against all dependency_libs? -+ if test "$linkalldeplibs" = yes; then -+ deplibs="$deplib $deplibs" -+ else -+ # Need to hardcode shared library paths -+ # or/and link against static libraries -+ newdependency_libs="$deplib $newdependency_libs" -+ fi -+ if $opt_duplicate_deps ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done # for deplib -+ continue -+ fi # $linkmode = prog... -+ -+ if test "$linkmode,$pass" = "prog,link"; then -+ if test -n "$library_names" && -+ { { 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. -+ case "$temp_rpath:" in -+ *"$absdir:"*) ;; -+ *) temp_rpath="$temp_rpath$absdir:" ;; -+ esac -+ fi -+ -+ # Hardcode the library path. -+ # Skip directories that are in the system default run-time -+ # search path. -+ case " $sys_lib_dlsearch_path " in -+ *" $absdir "*) ;; -+ *) -+ case "$compile_rpath " in -+ *" $absdir "*) ;; -+ *) compile_rpath="$compile_rpath $absdir" -+ esac -+ ;; -+ esac -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" -+ esac -+ ;; -+ esac -+ fi # $linkmode,$pass = prog,link... -+ -+ if test "$alldeplibs" = yes && -+ { test "$deplibs_check_method" = pass_all || -+ { test "$build_libtool_libs" = yes && -+ test -n "$library_names"; }; }; then -+ # We only need to search for static libraries -+ continue -+ fi -+ fi -+ -+ link_static=no # Whether the deplib will be linked statically -+ use_static_libs=$prefer_static_libs -+ if test "$use_static_libs" = built && test "$installed" = yes; then -+ use_static_libs=no -+ fi -+ if test -n "$library_names" && -+ { test "$use_static_libs" = no || test -z "$old_library"; }; then -+ case $host in -+ *cygwin* | *mingw* | *cegcc*) -+ # No point in relinking DLLs because paths are not encoded -+ notinst_deplibs="$notinst_deplibs $lib" -+ need_relink=no -+ ;; -+ *) -+ if test "$installed" = no; then -+ notinst_deplibs="$notinst_deplibs $lib" -+ need_relink=yes -+ fi -+ ;; -+ esac -+ # This is a shared library -+ -+ # Warn about portability, can't link against -module's on some -+ # systems (darwin). Don't bleat about dlopened modules though! -+ dlopenmodule="" -+ for dlpremoduletest in $dlprefiles; do -+ if test "X$dlpremoduletest" = "X$lib"; then -+ dlopenmodule="$dlpremoduletest" -+ break -+ fi -+ done -+ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then -+ $ECHO -+ if test "$linkmode" = prog; then -+ $ECHO "*** Warning: Linking the executable $output against the loadable module" -+ else -+ $ECHO "*** Warning: Linking the shared library $output against the loadable module" -+ fi -+ $ECHO "*** $linklib is not portable!" -+ fi -+ if test "$linkmode" = lib && -+ test "$hardcode_into_libs" = yes; then -+ # Hardcode the library path. -+ # Skip directories that are in the system default run-time -+ # search path. -+ case " $sys_lib_dlsearch_path " in -+ *" $absdir "*) ;; -+ *) -+ case "$compile_rpath " in -+ *" $absdir "*) ;; -+ *) compile_rpath="$compile_rpath $absdir" -+ esac -+ ;; -+ esac -+ case " $sys_lib_dlsearch_path " in -+ *" $libdir "*) ;; -+ *) -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" -+ esac -+ ;; -+ esac -+ fi -+ -+ if test -n "$old_archive_from_expsyms_cmds"; then -+ # figure out the soname -+ set dummy $library_names -+ shift -+ realname="$1" -+ shift -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ # use dlname if we got it. it's perfectly good, no? -+ if test -n "$dlname"; then -+ soname="$dlname" -+ elif test -n "$soname_spec"; then -+ # bleh windows -+ case $host in -+ *cygwin* | mingw* | *cegcc*) -+ func_arith $current - $age -+ major=$func_arith_result -+ versuffix="-$major" -+ ;; -+ esac -+ eval soname=\"$soname_spec\" -+ else -+ soname="$realname" -+ fi -+ -+ # Make a new name for the extract_expsyms_cmds to use -+ soroot="$soname" -+ func_basename "$soroot" -+ soname="$func_basename_result" -+ func_stripname 'lib' '.dll' "$soname" -+ newlib=libimp-$func_stripname_result.a -+ -+ # If the library has no export list, then create one now -+ if test -f "$output_objdir/$soname-def"; then : -+ else -+ func_verbose "extracting exported symbol list from \`$soname'" -+ func_execute_cmds "$extract_expsyms_cmds" 'exit $?' -+ fi -+ -+ # Create $newlib -+ if test -f "$output_objdir/$newlib"; then :; else -+ func_verbose "generating import library for \`$soname'" -+ func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' -+ fi -+ # make sure the library variables are pointing to the new library -+ dir=$output_objdir -+ linklib=$newlib -+ fi # test -n "$old_archive_from_expsyms_cmds" -+ -+ if test "$linkmode" = prog || test "$mode" != relink; then -+ add_shlibpath= -+ add_dir= -+ add= -+ lib_linked=yes -+ case $hardcode_action in -+ immediate | unsupported) -+ if test "$hardcode_direct" = no; then -+ add="$dir/$linklib" -+ case $host in -+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; -+ *-*-sysv4*uw2*) add_dir="-L$dir" ;; -+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ -+ *-*-unixware7*) add_dir="-L$dir" ;; -+ *-*-darwin* ) -+ # if the lib is a (non-dlopened) module then we can not -+ # link against it, someone is ignoring the earlier warnings -+ if /usr/bin/file -L $add 2> /dev/null | -+ $GREP ": [^:]* bundle" >/dev/null ; then -+ if test "X$dlopenmodule" != "X$lib"; then -+ $ECHO "*** Warning: lib $linklib is a module, not a shared library" -+ if test -z "$old_library" ; then -+ $ECHO -+ $ECHO "*** And there doesn't seem to be a static archive available" -+ $ECHO "*** The link will probably fail, sorry" -+ else -+ add="$dir/$old_library" -+ fi -+ elif test -n "$old_library"; then -+ add="$dir/$old_library" -+ fi -+ fi -+ esac -+ elif test "$hardcode_minus_L" = no; then -+ case $host in -+ *-*-sunos*) add_shlibpath="$dir" ;; -+ esac -+ add_dir="-L$dir" -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = no; then -+ add_shlibpath="$dir" -+ add="-l$name" -+ else -+ lib_linked=no -+ fi -+ ;; -+ relink) -+ if test "$hardcode_direct" = yes && -+ test "$hardcode_direct_absolute" = no; then -+ add="$dir/$linklib" -+ elif test "$hardcode_minus_L" = yes; then -+ add_dir="-L$dir" -+ # Try looking first in the location we're being installed to. -+ if test -n "$inst_prefix_dir"; then -+ case $libdir in -+ [\\/]*) -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ ;; -+ esac -+ fi -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = yes; then -+ add_shlibpath="$dir" -+ add="-l$name" -+ else -+ lib_linked=no -+ fi -+ ;; -+ *) lib_linked=no ;; -+ esac -+ -+ if test "$lib_linked" != yes; then -+ func_fatal_configuration "unsupported hardcode properties" -+ fi -+ -+ if test -n "$add_shlibpath"; then -+ case :$compile_shlibpath: in -+ *":$add_shlibpath:"*) ;; -+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ esac -+ fi -+ if test "$linkmode" = prog; then -+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" -+ test -n "$add" && compile_deplibs="$add $compile_deplibs" -+ else -+ test -n "$add_dir" && deplibs="$add_dir $deplibs" -+ test -n "$add" && deplibs="$add $deplibs" -+ if test "$hardcode_direct" != yes && -+ test "$hardcode_minus_L" != yes && -+ test "$hardcode_shlibpath_var" = yes; then -+ case :$finalize_shlibpath: in -+ *":$libdir:"*) ;; -+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ esac -+ fi -+ fi -+ fi -+ -+ if test "$linkmode" = prog || test "$mode" = relink; then -+ add_shlibpath= -+ add_dir= -+ add= -+ # Finalize command for both is simple: just hardcode it. -+ if test "$hardcode_direct" = yes && -+ test "$hardcode_direct_absolute" = no; then -+ add="$libdir/$linklib" -+ elif test "$hardcode_minus_L" = yes; then -+ add_dir="-L$libdir" -+ add="-l$name" -+ elif test "$hardcode_shlibpath_var" = yes; then -+ case :$finalize_shlibpath: in -+ *":$libdir:"*) ;; -+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ esac -+ add="-l$name" -+ elif test "$hardcode_automatic" = yes; then -+ if test -n "$inst_prefix_dir" && -+ test -f "$inst_prefix_dir$libdir/$linklib" ; then -+ add="$inst_prefix_dir$libdir/$linklib" -+ else -+ add="$libdir/$linklib" -+ fi -+ else -+ # We cannot seem to hardcode it, guess we'll fake it. -+ add_dir="-L$libdir" -+ # Try looking first in the location we're being installed to. -+ if test -n "$inst_prefix_dir"; then -+ case $libdir in -+ [\\/]*) -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ ;; -+ esac -+ fi -+ add="-l$name" -+ fi -+ -+ if test "$linkmode" = prog; then -+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" -+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs" -+ else -+ test -n "$add_dir" && deplibs="$add_dir $deplibs" -+ test -n "$add" && deplibs="$add $deplibs" -+ fi -+ fi -+ elif test "$linkmode" = prog; then -+ # Here we assume that one of hardcode_direct or hardcode_minus_L -+ # is not unsupported. This is valid on all known static and -+ # shared platforms. -+ if test "$hardcode_direct" != unsupported; then -+ test -n "$old_library" && linklib="$old_library" -+ compile_deplibs="$dir/$linklib $compile_deplibs" -+ finalize_deplibs="$dir/$linklib $finalize_deplibs" -+ else -+ compile_deplibs="-l$name -L$dir $compile_deplibs" -+ finalize_deplibs="-l$name -L$dir $finalize_deplibs" -+ fi -+ elif test "$build_libtool_libs" = yes; then -+ # Not a shared library -+ if test "$deplibs_check_method" != pass_all; then -+ # We're trying link a shared library against a static one -+ # but the system doesn't support it. -+ -+ # Just print a warning and add the library to dependency_libs so -+ # that the program can be linked against the static library. -+ $ECHO -+ $ECHO "*** Warning: This system can not link to static lib archive $lib." -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which you do not appear to have." -+ if test "$module" = yes; then -+ $ECHO "*** But as you try to build a module library, libtool will still create " -+ $ECHO "*** a static module, that should work as long as the dlopening application" -+ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." -+ if test -z "$global_symbol_pipe"; then -+ $ECHO -+ $ECHO "*** However, this would only work if libtool was able to extract symbol" -+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ $ECHO "*** not find such a program. So, this module is probably useless." -+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." -+ fi -+ if test "$build_old_libs" = no; then -+ build_libtool_libs=module -+ build_old_libs=yes -+ else -+ build_libtool_libs=no -+ fi -+ fi -+ else -+ deplibs="$dir/$old_library $deplibs" -+ link_static=yes -+ fi -+ fi # link shared/static library? -+ -+ if test "$linkmode" = lib; then -+ if test -n "$dependency_libs" && -+ { test "$hardcode_into_libs" != yes || -+ test "$build_old_libs" = yes || -+ test "$link_static" = yes; }; then -+ # Extract -R from dependency_libs -+ temp_deplibs= -+ for libdir in $dependency_libs; do -+ case $libdir in -+ -R*) func_stripname '-R' '' "$libdir" -+ temp_xrpath=$func_stripname_result -+ case " $xrpath " in -+ *" $temp_xrpath "*) ;; -+ *) xrpath="$xrpath $temp_xrpath";; -+ esac;; -+ *) temp_deplibs="$temp_deplibs $libdir";; -+ esac -+ done -+ dependency_libs="$temp_deplibs" -+ fi -+ -+ newlib_search_path="$newlib_search_path $absdir" -+ # Link against this library -+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" -+ # ... and its dependency_libs -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ newdependency_libs="$deplib $newdependency_libs" -+ if $opt_duplicate_deps ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done -+ -+ if test "$link_all_deplibs" != no; then -+ # Add the search paths of all dependency libraries -+ for deplib in $dependency_libs; do -+ case $deplib in -+ -L*) path="$deplib" ;; -+ *.la) -+ func_dirname "$deplib" "" "." -+ dir="$func_dirname_result" -+ # We need an absolute path. -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -+ *) -+ absdir=`cd "$dir" && pwd` -+ if test -z "$absdir"; then -+ func_warning "cannot determine absolute directory name of \`$dir'" -+ absdir="$dir" -+ fi -+ ;; -+ esac -+ if $GREP "^installed=no" $deplib > /dev/null; then -+ case $host in -+ *-*-darwin*) -+ depdepl= -+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ if test -n "$deplibrary_names" ; then -+ for tmp in $deplibrary_names ; do -+ depdepl=$tmp -+ done -+ if test -f "$absdir/$objdir/$depdepl" ; then -+ depdepl="$absdir/$objdir/$depdepl" -+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` -+ if test -z "$darwin_install_name"; then -+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` -+ fi -+ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -+ path= -+ fi -+ fi -+ ;; -+ *) -+ path="-L$absdir/$objdir" -+ ;; -+ esac -+ else -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ test -z "$libdir" && \ -+ func_fatal_error "\`$deplib' is not a valid libtool archive" -+ test "$absdir" != "$libdir" && \ -+ func_warning "\`$deplib' seems to be moved" -+ -+ path="-L$absdir" -+ fi -+ ;; -+ esac -+ case " $deplibs " in -+ *" $path "*) ;; -+ *) deplibs="$path $deplibs" ;; -+ esac -+ done -+ fi # link_all_deplibs != no -+ fi # linkmode = lib -+ done # for deplib in $libs -+ if test "$pass" = link; then -+ if test "$linkmode" = "prog"; then -+ compile_deplibs="$new_inherited_linker_flags $compile_deplibs" -+ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" -+ else -+ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ fi -+ fi -+ dependency_libs="$newdependency_libs" -+ if test "$pass" = dlpreopen; then -+ # Link the dlpreopened libraries before other libraries -+ for deplib in $save_deplibs; do -+ deplibs="$deplib $deplibs" -+ done -+ fi -+ if test "$pass" != dlopen; then -+ if test "$pass" != conv; then -+ # Make sure lib_search_path contains only unique directories. -+ lib_search_path= -+ for dir in $newlib_search_path; do -+ case "$lib_search_path " in -+ *" $dir "*) ;; -+ *) lib_search_path="$lib_search_path $dir" ;; -+ esac -+ done -+ newlib_search_path= -+ fi -+ -+ if test "$linkmode,$pass" != "prog,link"; then -+ vars="deplibs" -+ else -+ vars="compile_deplibs finalize_deplibs" -+ fi -+ for var in $vars dependency_libs; do -+ # Add libraries to $var in reverse order -+ eval tmp_libs=\"\$$var\" -+ new_libs= -+ for deplib in $tmp_libs; do -+ # FIXME: Pedantically, this is the right thing to do, so -+ # that some nasty dependency loop isn't accidentally -+ # broken: -+ #new_libs="$deplib $new_libs" -+ # Pragmatically, this seems to cause very few problems in -+ # practice: -+ case $deplib in -+ -L*) new_libs="$deplib $new_libs" ;; -+ -R*) ;; -+ *) -+ # And here is the reason: when a library appears more -+ # than once as an explicit dependence of a library, or -+ # is implicitly linked in more than once by the -+ # compiler, it is considered special, and multiple -+ # occurrences thereof are not removed. Compare this -+ # with having the same library being listed as a -+ # dependency of multiple other libraries: in this case, -+ # we know (pedantically, we assume) the library does not -+ # need to be listed more than once, so we keep only the -+ # last copy. This is not always right, but it is rare -+ # enough that we require users that really mean to play -+ # such unportable linking tricks to link the library -+ # using -Wl,-lname, so that libtool does not consider it -+ # for duplicate removal. -+ case " $specialdeplibs " in -+ *" $deplib "*) new_libs="$deplib $new_libs" ;; -+ *) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$deplib $new_libs" ;; -+ esac -+ ;; -+ esac -+ ;; -+ esac -+ done -+ tmp_libs= -+ for deplib in $new_libs; do -+ case $deplib in -+ -L*) -+ case " $tmp_libs " in -+ *" $deplib "*) ;; -+ *) tmp_libs="$tmp_libs $deplib" ;; -+ esac -+ ;; -+ *) tmp_libs="$tmp_libs $deplib" ;; -+ esac -+ done -+ eval $var=\"$tmp_libs\" -+ done # for var -+ fi -+ # Last step: remove runtime libs from dependency_libs -+ # (they stay in deplibs) -+ tmp_libs= -+ for i in $dependency_libs ; do -+ case " $predeps $postdeps $compiler_lib_search_path " in -+ *" $i "*) -+ i="" -+ ;; -+ esac -+ if test -n "$i" ; then -+ tmp_libs="$tmp_libs $i" -+ fi -+ done -+ dependency_libs=$tmp_libs -+ done # for pass -+ if test "$linkmode" = prog; then -+ dlfiles="$newdlfiles" -+ fi -+ if test "$linkmode" = prog || test "$linkmode" = lib; then -+ dlprefiles="$newdlprefiles" -+ fi -+ -+ case $linkmode in -+ oldlib) -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ func_warning "\`-dlopen' is ignored for archives" -+ fi -+ -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ func_warning "\`-l' and \`-L' are ignored for archives" ;; -+ esac -+ -+ test -n "$rpath" && \ -+ func_warning "\`-rpath' is ignored for archives" -+ -+ test -n "$xrpath" && \ -+ func_warning "\`-R' is ignored for archives" -+ -+ test -n "$vinfo" && \ -+ func_warning "\`-version-info/-version-number' is ignored for archives" -+ -+ test -n "$release" && \ -+ func_warning "\`-release' is ignored for archives" -+ -+ test -n "$export_symbols$export_symbols_regex" && \ -+ func_warning "\`-export-symbols' is ignored for archives" -+ -+ # Now set the variables for building old libraries. -+ build_libtool_libs=no -+ oldlibs="$output" -+ objs="$objs$old_deplibs" -+ ;; -+ -+ lib) -+ # Make sure we only generate libraries of the form `libNAME.la'. -+ case $outputname in -+ lib*) -+ func_stripname 'lib' '.la' "$outputname" -+ name=$func_stripname_result -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" -+ ;; -+ *) -+ test "$module" = no && \ -+ func_fatal_help "libtool library \`$output' must begin with \`lib'" -+ -+ if test "$need_lib_prefix" != no; then -+ # Add the "lib" prefix for modules if required -+ func_stripname '' '.la' "$outputname" -+ name=$func_stripname_result -+ eval shared_ext=\"$shrext_cmds\" -+ eval libname=\"$libname_spec\" -+ else -+ func_stripname '' '.la' "$outputname" -+ libname=$func_stripname_result -+ fi -+ ;; -+ esac -+ -+ if test -n "$objs"; then -+ if test "$deplibs_check_method" != pass_all; then -+ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" -+ else -+ $ECHO -+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool" -+ $ECHO "*** objects $objs is not portable!" -+ libobjs="$libobjs $objs" -+ fi -+ fi -+ -+ test "$dlself" != no && \ -+ func_warning "\`-dlopen self' is ignored for libtool libraries" -+ -+ set dummy $rpath -+ shift -+ test "$#" -gt 1 && \ -+ func_warning "ignoring multiple \`-rpath's for a libtool library" -+ -+ install_libdir="$1" -+ -+ oldlibs= -+ if test -z "$rpath"; then -+ if test "$build_libtool_libs" = yes; then -+ # Building a libtool convenience library. -+ # Some compilers have problems with a `.al' extension so -+ # convenience libraries should have the same extension an -+ # archive normally would. -+ oldlibs="$output_objdir/$libname.$libext $oldlibs" -+ build_libtool_libs=convenience -+ build_old_libs=yes -+ fi -+ -+ test -n "$vinfo" && \ -+ func_warning "\`-version-info/-version-number' is ignored for convenience libraries" -+ -+ test -n "$release" && \ -+ func_warning "\`-release' is ignored for convenience libraries" -+ else -+ -+ # Parse the version information argument. -+ save_ifs="$IFS"; IFS=':' -+ set dummy $vinfo 0 0 0 -+ shift -+ IFS="$save_ifs" -+ -+ test -n "$7" && \ -+ func_fatal_help "too many parameters to \`-version-info'" -+ -+ # convert absolute version numbers to libtool ages -+ # this retains compatibility with .la files and attempts -+ # to make the code below a bit more comprehensible -+ -+ case $vinfo_number in -+ yes) -+ number_major="$1" -+ number_minor="$2" -+ number_revision="$3" -+ # -+ # There are really only two kinds -- those that -+ # use the current revision as the major version -+ # and those that subtract age and use age as -+ # a minor version. But, then there is irix -+ # which has an extra 1 added just for fun -+ # -+ case $version_type in -+ darwin|linux|osf|windows|none) -+ func_arith $number_major + $number_minor -+ current=$func_arith_result -+ age="$number_minor" -+ revision="$number_revision" -+ ;; -+ freebsd-aout|freebsd-elf|sunos) -+ current="$number_major" -+ revision="$number_minor" -+ age="0" -+ ;; -+ irix|nonstopux) -+ func_arith $number_major + $number_minor -+ current=$func_arith_result -+ age="$number_minor" -+ revision="$number_minor" -+ lt_irix_increment=no -+ ;; -+ *) -+ func_fatal_configuration "$modename: unknown library version type \`$version_type'" -+ ;; -+ esac -+ ;; -+ no) -+ current="$1" -+ revision="$2" -+ age="$3" -+ ;; -+ esac -+ -+ # Check that each of the things are valid numbers. -+ case $current in -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -+ *) -+ func_error "CURRENT \`$current' must be a nonnegative integer" -+ func_fatal_error "\`$vinfo' is not valid version information" -+ ;; -+ esac -+ -+ case $revision in -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -+ *) -+ func_error "REVISION \`$revision' must be a nonnegative integer" -+ func_fatal_error "\`$vinfo' is not valid version information" -+ ;; -+ esac -+ -+ case $age in -+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; -+ *) -+ func_error "AGE \`$age' must be a nonnegative integer" -+ func_fatal_error "\`$vinfo' is not valid version information" -+ ;; -+ esac -+ -+ if test "$age" -gt "$current"; then -+ func_error "AGE \`$age' is greater than the current interface number \`$current'" -+ func_fatal_error "\`$vinfo' is not valid version information" -+ fi -+ -+ # Calculate the version variables. -+ major= -+ versuffix= -+ verstring= -+ case $version_type in -+ none) ;; -+ -+ darwin) -+ # Like Linux, but with the current version available in -+ # verstring for coding it into the library header -+ func_arith $current - $age -+ major=.$func_arith_result -+ versuffix="$major.$age.$revision" -+ # Darwin ld doesn't like 0 for these options... -+ func_arith $current + 1 -+ minor_current=$func_arith_result -+ 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) -+ major=".$current" -+ versuffix=".$current.$revision"; -+ ;; -+ -+ freebsd-elf) -+ major=".$current" -+ versuffix=".$current" -+ ;; -+ -+ irix | nonstopux) -+ if test "X$lt_irix_increment" = "Xno"; then -+ func_arith $current - $age -+ else -+ func_arith $current - $age + 1 -+ fi -+ major=$func_arith_result -+ -+ case $version_type in -+ nonstopux) verstring_prefix=nonstopux ;; -+ *) verstring_prefix=sgi ;; -+ esac -+ verstring="$verstring_prefix$major.$revision" -+ -+ # Add in all the interfaces that we are compatible with. -+ loop=$revision -+ while test "$loop" -ne 0; do -+ func_arith $revision - $loop -+ iface=$func_arith_result -+ func_arith $loop - 1 -+ loop=$func_arith_result -+ verstring="$verstring_prefix$major.$iface:$verstring" -+ done -+ -+ # Before this point, $major must not contain `.'. -+ major=.$major -+ versuffix="$major.$revision" -+ ;; -+ -+ linux) -+ func_arith $current - $age -+ major=.$func_arith_result -+ versuffix="$major.$age.$revision" -+ ;; -+ -+ osf) -+ func_arith $current - $age -+ major=.$func_arith_result -+ versuffix=".$current.$age.$revision" -+ verstring="$current.$age.$revision" -+ -+ # Add in all the interfaces that we are compatible with. -+ loop=$age -+ while test "$loop" -ne 0; do -+ func_arith $current - $loop -+ iface=$func_arith_result -+ func_arith $loop - 1 -+ loop=$func_arith_result -+ verstring="$verstring:${iface}.0" -+ done -+ -+ # Make executables depend on our current version. -+ verstring="$verstring:${current}.0" -+ ;; -+ -+ qnx) -+ major=".$current" -+ versuffix=".$current" -+ ;; -+ -+ sunos) -+ major=".$current" -+ versuffix=".$current.$revision" -+ ;; -+ -+ windows) -+ # Use '-' rather than '.', since we only want one -+ # extension on DOS 8.3 filesystems. -+ func_arith $current - $age -+ major=$func_arith_result -+ versuffix="-$major" -+ ;; -+ -+ *) -+ func_fatal_configuration "unknown library version type \`$version_type'" -+ ;; -+ esac -+ -+ # Clear the version info if we defaulted, and they specified a release. -+ if test -z "$vinfo" && test -n "$release"; then -+ major= -+ case $version_type in -+ darwin) -+ # we can't check for "0.0" in archive_cmds due to quoting -+ # problems, so we reset it completely -+ verstring= -+ ;; -+ *) -+ verstring="0.0" -+ ;; -+ esac -+ if test "$need_version" = no; then -+ versuffix= -+ else -+ versuffix=".0.0" -+ fi -+ fi -+ -+ # Remove version info from name if versioning should be avoided -+ if test "$avoid_version" = yes && test "$need_version" = no; then -+ major= -+ versuffix= -+ verstring="" -+ fi -+ -+ # Check to see if the archive will have undefined symbols. -+ if test "$allow_undefined" = yes; then -+ if test "$allow_undefined_flag" = unsupported; then -+ func_warning "undefined symbols not allowed in $host shared libraries" -+ build_libtool_libs=no -+ build_old_libs=yes -+ fi -+ else -+ # Don't allow undefined symbols. -+ allow_undefined_flag="$no_undefined_flag" -+ fi -+ -+ fi -+ -+ func_generate_dlsyms "$libname" "$libname" "yes" -+ libobjs="$libobjs $symfileobj" -+ test "X$libobjs" = "X " && libobjs= -+ -+ if test "$mode" != relink; then -+ # Remove our outputs, but don't remove object files since they -+ # may have been created when compiling PIC objects. -+ removelist= -+ tempremovelist=`$ECHO "$output_objdir/*"` -+ for p in $tempremovelist; do -+ case $p in -+ *.$objext | *.gcno) -+ ;; -+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) -+ if test "X$precious_files_regex" != "X"; then -+ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 -+ then -+ continue -+ fi -+ fi -+ removelist="$removelist $p" -+ ;; -+ *) ;; -+ esac -+ done -+ test -n "$removelist" && \ -+ func_show_eval "${RM}r \$removelist" -+ fi -+ -+ # Now set the variables for building old libraries. -+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -+ oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ -+ # Transform .lo files to .o files. -+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -+ fi -+ -+ # Eliminate all temporary directories. -+ #for path in $notinst_path; do -+ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` -+ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` -+ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` -+ #done -+ -+ if test -n "$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ temp_xrpath= -+ for libdir in $xrpath; do -+ temp_xrpath="$temp_xrpath -R$libdir" -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; -+ esac -+ done -+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -+ dependency_libs="$temp_xrpath $dependency_libs" -+ fi -+ fi -+ -+ # Make sure dlfiles contains only unique files that won't be dlpreopened -+ old_dlfiles="$dlfiles" -+ dlfiles= -+ for lib in $old_dlfiles; do -+ case " $dlprefiles $dlfiles " in -+ *" $lib "*) ;; -+ *) dlfiles="$dlfiles $lib" ;; -+ esac -+ done -+ -+ # Make sure dlprefiles contains only unique files -+ old_dlprefiles="$dlprefiles" -+ dlprefiles= -+ for lib in $old_dlprefiles; do -+ case "$dlprefiles " in -+ *" $lib "*) ;; -+ *) dlprefiles="$dlprefiles $lib" ;; -+ esac -+ done -+ -+ if test "$build_libtool_libs" = yes; then -+ if test -n "$rpath"; then -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) -+ # these systems don't actually have a c library (as such)! -+ ;; -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # Rhapsody C library is in the System framework -+ deplibs="$deplibs System.ltframework" -+ ;; -+ *-*-netbsd*) -+ # Don't link with libc until the a.out ld.so is fixed. -+ ;; -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ # Do not include libc due to us having libc/libc_r. -+ ;; -+ *-*-sco3.2v5* | *-*-sco5v6*) -+ # Causes problems with __ctype -+ ;; -+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) -+ # Compiler inserts libc in the correct place for threads to work -+ ;; -+ *) -+ # Add libc to deplibs on all other systems if necessary. -+ if test "$build_libtool_need_lc" = "yes"; then -+ deplibs="$deplibs -lc" -+ fi -+ ;; -+ esac -+ fi -+ -+ # Transform deplibs into only deplibs that can be linked in shared. -+ name_save=$name -+ libname_save=$libname -+ release_save=$release -+ versuffix_save=$versuffix -+ major_save=$major -+ # I'm not sure if I'm treating the release correctly. I think -+ # release should show up in the -l (ie -lgmp5) so we don't want to -+ # add it in twice. Is that correct? -+ release="" -+ versuffix="" -+ major="" -+ newdeplibs= -+ droppeddeps=no -+ case $deplibs_check_method in -+ pass_all) -+ # Don't check for shared/static. Everything works. -+ # This might be a little naive. We might want to check -+ # whether the library exists or not. But this is on -+ # osf3 & osf4 and I'm not really sure... Just -+ # implementing what was already the behavior. -+ newdeplibs=$deplibs -+ ;; -+ test_compile) -+ # This code stresses the "libraries are programs" paradigm to its -+ # limits. Maybe even breaks it. We compile a program, linking it -+ # against the deplibs as a proxy for the library. Then we can check -+ # whether they linked in statically or dynamically with ldd. -+ $opt_dry_run || $RM conftest.c -+ cat > conftest.c <<EOF -+ int main() { return 0; } -+EOF -+ $opt_dry_run || $RM conftest -+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then -+ ldd_output=`ldd conftest` -+ for i in $deplibs; do -+ case $i in -+ -l*) -+ func_stripname -l '' "$i" -+ name=$func_stripname_result -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $i "*) -+ newdeplibs="$newdeplibs $i" -+ i="" -+ ;; -+ esac -+ fi -+ if test -n "$i" ; then -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` -+ set dummy $deplib_matches; shift -+ deplib_match=$1 -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ newdeplibs="$newdeplibs $i" -+ else -+ droppeddeps=yes -+ $ECHO -+ $ECHO "*** Warning: dynamic linker does not accept needed library $i." -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which I believe you do not have" -+ $ECHO "*** because a test_compile did reveal that the linker did not use it for" -+ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." -+ fi -+ fi -+ ;; -+ *) -+ newdeplibs="$newdeplibs $i" -+ ;; -+ esac -+ done -+ else -+ # Error occurred in the first compile. Let's try to salvage -+ # the situation: Compile a separate program for each library. -+ for i in $deplibs; do -+ case $i in -+ -l*) -+ func_stripname -l '' "$i" -+ name=$func_stripname_result -+ $opt_dry_run || $RM conftest -+ 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 -+ *" $i "*) -+ newdeplibs="$newdeplibs $i" -+ i="" -+ ;; -+ esac -+ fi -+ if test -n "$i" ; then -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` -+ set dummy $deplib_matches; shift -+ deplib_match=$1 -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ newdeplibs="$newdeplibs $i" -+ else -+ droppeddeps=yes -+ $ECHO -+ $ECHO "*** Warning: dynamic linker does not accept needed library $i." -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which you do not appear to have" -+ $ECHO "*** because a test_compile did reveal that the linker did not use this one" -+ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." -+ fi -+ fi -+ else -+ 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 "*** library that it depends on before this library will be fully" -+ $ECHO "*** functional. Installing it before continuing would be even better." -+ fi -+ ;; -+ *) -+ newdeplibs="$newdeplibs $i" -+ ;; -+ esac -+ done -+ fi -+ ;; -+ file_magic*) -+ set dummy $deplibs_check_method; shift -+ file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` -+ for a_deplib in $deplibs; do -+ case $a_deplib in -+ -l*) -+ func_stripname -l '' "$a_deplib" -+ name=$func_stripname_result -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $a_deplib "*) -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ ;; -+ esac -+ fi -+ if test -n "$a_deplib" ; then -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do -+ # Follow soft links. -+ if ls -lLd "$potent_lib" 2>/dev/null | -+ $GREP " -> " >/dev/null; then -+ continue -+ fi -+ # The statement above tries to avoid entering an -+ # endless loop below, in case of cyclic links. -+ # We might still enter an endless loop, since a link -+ # loop can be closed while we follow links, -+ # but so what? -+ potlib="$potent_lib" -+ while test -h "$potlib" 2>/dev/null; do -+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` -+ case $potliblink in -+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; -+ esac -+ done -+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | -+ $SED -e 10q | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ break 2 -+ fi -+ done -+ done -+ fi -+ if test -n "$a_deplib" ; then -+ droppeddeps=yes -+ $ECHO -+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which you do not appear to have" -+ $ECHO "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)" -+ else -+ $ECHO "*** with $libname and none of the candidates passed a file format test" -+ $ECHO "*** using a file magic. Last file checked: $potlib" -+ fi -+ fi -+ ;; -+ *) -+ # Add a -L argument. -+ newdeplibs="$newdeplibs $a_deplib" -+ ;; -+ esac -+ done # Gone through all deplibs. -+ ;; -+ match_pattern*) -+ set dummy $deplibs_check_method; shift -+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` -+ for a_deplib in $deplibs; do -+ case $a_deplib in -+ -l*) -+ func_stripname -l '' "$a_deplib" -+ name=$func_stripname_result -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ case " $predeps $postdeps " in -+ *" $a_deplib "*) -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ ;; -+ esac -+ fi -+ if test -n "$a_deplib" ; then -+ libname=`eval "\\$ECHO \"$libname_spec\""` -+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ for potent_lib in $potential_libs; do -+ potlib="$potent_lib" # see symlink-check above in file_magic test -+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ -+ $EGREP "$match_pattern_regex" > /dev/null; then -+ newdeplibs="$newdeplibs $a_deplib" -+ a_deplib="" -+ break 2 -+ fi -+ done -+ done -+ fi -+ if test -n "$a_deplib" ; then -+ droppeddeps=yes -+ $ECHO -+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which you do not appear to have" -+ $ECHO "*** because I did check the linker path looking for a file starting" -+ if test -z "$potlib" ; then -+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" -+ else -+ $ECHO "*** with $libname and none of the candidates passed a file format test" -+ $ECHO "*** using a regex pattern. Last file checked: $potlib" -+ fi -+ fi -+ ;; -+ *) -+ # Add a -L argument. -+ newdeplibs="$newdeplibs $a_deplib" -+ ;; -+ esac -+ done # Gone through all deplibs. -+ ;; -+ none | unknown | *) -+ newdeplibs="" -+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ -+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` -+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ for i in $predeps $postdeps ; do -+ # can't use Xsed below, because $i might contain '/' -+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` -+ done -+ fi -+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | -+ $GREP . >/dev/null; then -+ $ECHO -+ if test "X$deplibs_check_method" = "Xnone"; then -+ $ECHO "*** Warning: inter-library dependencies are not supported in this platform." -+ else -+ $ECHO "*** Warning: inter-library dependencies are not known to be supported." -+ fi -+ $ECHO "*** All declared inter-library dependencies are being dropped." -+ droppeddeps=yes -+ fi -+ ;; -+ esac -+ versuffix=$versuffix_save -+ major=$major_save -+ release=$release_save -+ libname=$libname_save -+ name=$name_save -+ -+ case $host in -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # On Rhapsody replace the C library with the System framework -+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -+ ;; -+ esac -+ -+ if test "$droppeddeps" = yes; then -+ if test "$module" = yes; then -+ $ECHO -+ $ECHO "*** Warning: libtool could not satisfy all declared inter-library" -+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create" -+ $ECHO "*** a static module, that should work as long as the dlopening" -+ $ECHO "*** application is linked with the -dlopen flag." -+ if test -z "$global_symbol_pipe"; then -+ $ECHO -+ $ECHO "*** However, this would only work if libtool was able to extract symbol" -+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ $ECHO "*** not find such a program. So, this module is probably useless." -+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." -+ fi -+ if test "$build_old_libs" = no; then -+ oldlibs="$output_objdir/$libname.$libext" -+ build_libtool_libs=module -+ build_old_libs=yes -+ else -+ build_libtool_libs=no -+ fi -+ else -+ $ECHO "*** The inter-library dependencies that have been dropped here will be" -+ $ECHO "*** automatically added whenever a program is linked with this library" -+ $ECHO "*** or is declared to -dlopen it." -+ -+ if test "$allow_undefined" = no; then -+ $ECHO -+ $ECHO "*** Since this library must not contain undefined symbols," -+ $ECHO "*** because either the platform does not support them or" -+ $ECHO "*** it was explicitly requested with -no-undefined," -+ $ECHO "*** libtool will only create a static version of it." -+ if test "$build_old_libs" = no; then -+ oldlibs="$output_objdir/$libname.$libext" -+ build_libtool_libs=module -+ build_old_libs=yes -+ else -+ build_libtool_libs=no -+ fi -+ fi -+ fi -+ fi -+ # Done checking deplibs! -+ deplibs=$newdeplibs -+ fi -+ # Time to change all our "foo.ltframework" stuff back to "-framework foo" -+ case $host in -+ *-*-darwin*) -+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ ;; - esac -- fi - -- file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` -- done -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; -+ *) -+ case " $deplibs " in -+ *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; -+ esac -+ ;; -+ esac -+ done -+ for deplib in $deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ done -+ deplibs="$new_libs" - -- # Try to get the absolute directory name. -- absdir=\`cd \"\$thisdir\" && pwd\` -- test -n \"\$absdir\" && thisdir=\"\$absdir\" --" -+ # All the library-specific variables (install_libdir is set above). -+ library_names= -+ old_library= -+ dlname= -+ -+ # Test again, we may have decided not to build it any more -+ if test "$build_libtool_libs" = yes; then -+ if test "$hardcode_into_libs" = yes; then -+ # Hardcode the library paths -+ hardcode_libdirs= -+ dep_rpath= -+ rpath="$finalize_rpath" -+ test "$mode" != relink && rpath="$compile_rpath$rpath" -+ for libdir in $rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi -+ else -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ dep_rpath="$dep_rpath $flag" -+ fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; -+ esac -+ fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ 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\" -+ else -+ eval dep_rpath=\"$hardcode_libdir_flag_spec\" -+ fi -+ fi -+ if test -n "$runpath_var" && test -n "$perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $perm_rpath; do -+ rpath="$rpath$dir:" -+ done -+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" -+ fi -+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" -+ fi - -- if test "$fast_install" = yes; then -- $echo >> $output "\ -- program=lt-'$outputname'$exeext -- progdir=\"\$thisdir/$objdir\" -+ shlibpath="$finalize_shlibpath" -+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ if test -n "$shlibpath"; then -+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" -+ fi - -- if test ! -f \"\$progdir/\$program\" || \\ -- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ -- test \"X\$file\" != \"X\$progdir/\$program\"; }; then -+ # Get the real and link names of the library. -+ eval shared_ext=\"$shrext_cmds\" -+ eval library_names=\"$library_names_spec\" -+ set dummy $library_names -+ shift -+ realname="$1" -+ shift - -- file=\"\$\$-\$program\" -+ if test -n "$soname_spec"; then -+ eval soname=\"$soname_spec\" -+ else -+ soname="$realname" -+ fi -+ if test -z "$dlname"; then -+ dlname=$soname -+ fi - -- if test ! -d \"\$progdir\"; then -- $mkdir \"\$progdir\" -- else -- $rm \"\$progdir/\$file\" -- fi" -+ lib="$output_objdir/$realname" -+ linknames= -+ for link -+ do -+ linknames="$linknames $link" -+ done - -- $echo >> $output "\ -+ # Use standard objects if they are pic -+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ test "X$libobjs" = "X " && libobjs= - -- # relink executable if necessary -- if test -n \"\$relink_command\"; then -- if relink_command_output=\`eval \$relink_command 2>&1\`; then : -- else -- $echo \"\$relink_command_output\" >&2 -- $rm \"\$progdir/\$file\" -- exit $EXIT_FAILURE -- fi -- fi -+ delfiles= -+ if test -n "$export_symbols" && test -n "$include_expsyms"; then -+ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" -+ export_symbols="$output_objdir/$libname.uexp" -+ delfiles="$delfiles $export_symbols" -+ fi -+ -+ orig_export_symbols= -+ case $host_os in -+ cygwin* | mingw* | cegcc*) -+ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then -+ # exporting using user supplied symfile -+ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then -+ # and it's NOT already a .def file. Must figure out -+ # which of the given symbols are data symbols and tag -+ # them as such. So, trigger use of export_symbols_cmds. -+ # export_symbols gets reassigned inside the "prepare -+ # the list of exported symbols" if statement, so the -+ # include_expsyms logic still works. -+ orig_export_symbols="$export_symbols" -+ export_symbols= -+ always_export_symbols=yes -+ fi -+ fi -+ ;; -+ esac - -- $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || -- { $rm \"\$progdir/\$program\"; -- $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } -- $rm \"\$progdir/\$file\" -- fi" -- else -- $echo >> $output "\ -- program='$outputname' -- progdir=\"\$thisdir/$objdir\" --" -+ # Prepare the list of exported symbols -+ if test -z "$export_symbols"; then -+ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then -+ func_verbose "generating symbol list for \`$libname.la'" -+ export_symbols="$output_objdir/$libname.exp" -+ $opt_dry_run || $RM $export_symbols -+ cmds=$export_symbols_cmds -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ func_len " $cmd" -+ len=$func_len_result -+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ func_show_eval "$cmd" 'exit $?' -+ skipped_export=false -+ else -+ # The command line is too long to execute in one step. -+ func_verbose "using reloadable object file for export list..." -+ skipped_export=: -+ # Break out early, otherwise skipped_export may be -+ # set to false by a later but shorter cmd. -+ break -+ fi -+ done -+ IFS="$save_ifs" -+ if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then -+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"' -+ fi -+ fi - fi - -- $echo >> $output "\ -- -- if test -f \"\$progdir/\$program\"; then" -+ if test -n "$export_symbols" && test -n "$include_expsyms"; then -+ tmp_export_symbols="$export_symbols" -+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' -+ fi -+ -+ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -+ # The given exports_symbols file has to be filtered, so filter it. -+ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" -+ # FIXME: $output_objdir/$libname.filter potentially contains lots of -+ # 's' commands which not all seds can handle. GNU sed should be fine -+ # though. Also, the filter scales superlinearly with the number of -+ # global variables. join(1) would be nice here, but unfortunately -+ # isn't a blessed tool. -+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ export_symbols=$output_objdir/$libname.def -+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols -+ fi - -- # Export our shlibpath_var if we have one. -- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -- $echo >> $output "\ -- # Add our own library path to $shlibpath_var -- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" -+ tmp_deplibs= -+ for test_deplib in $deplibs; do -+ case " $convenience " in -+ *" $test_deplib "*) ;; -+ *) -+ tmp_deplibs="$tmp_deplibs $test_deplib" -+ ;; -+ esac -+ done -+ deplibs="$tmp_deplibs" - -- # Some systems cannot cope with colon-terminated $shlibpath_var -- # The second colon is a workaround for a bug in BeOS R4 sed -- $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` -+ if test -n "$convenience"; then -+ if test -n "$whole_archive_flag_spec" && -+ test "$compiler_needs_object" = yes && -+ test -z "$libobjs"; then -+ # extract the archives, so we have objects to list. -+ # TODO: could optimize this to just extract one archive. -+ whole_archive_flag_spec= -+ fi -+ if test -n "$whole_archive_flag_spec"; then -+ save_libobjs=$libobjs -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -+ test "X$libobjs" = "X " && libobjs= -+ else -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" - -- export $shlibpath_var --" -+ func_extract_archives $gentop $convenience -+ libobjs="$libobjs $func_extract_archives_result" -+ test "X$libobjs" = "X " && libobjs= -+ fi - fi - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $echo >> $output "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -+ eval flag=\"$thread_safe_flag_spec\" -+ linker_flags="$linker_flags $flag" - fi - -- $echo >> $output "\ -- if test \"\$libtool_execute_magic\" != \"$magic\"; then -- # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2*) -- $echo >> $output "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $echo >> $output "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $echo >> $output "\ -- \$echo \"\$0: cannot exec \$program \$*\" -- exit $EXIT_FAILURE -- fi -- else -- # The program doesn't exist. -- \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 -- \$echo \"This script is just a wrapper for \$program.\" 1>&2 -- $echo \"See the $PACKAGE documentation for more information.\" 1>&2 -- exit $EXIT_FAILURE -- fi --fi\ --" -- chmod +x $output -- fi -- exit $EXIT_SUCCESS -- ;; -- esac -- -- # See if we need to build an old-fashioned archive. -- for oldlib in $oldlibs; do -+ # Make a backup of the uninstalled library when relinking -+ if test "$mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? -+ fi - -- if test "$build_libtool_libs" = convenience; then -- oldobjs="$libobjs_save" -- addlibs="$convenience" -- build_libtool_libs=no -- else -- if test "$build_libtool_libs" = module; then -- oldobjs="$libobjs_save" -- build_libtool_libs=no -+ # Do each of the archive commands. -+ if test "$module" = yes && test -n "$module_cmds" ; then -+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -+ eval test_cmds=\"$module_expsym_cmds\" -+ cmds=$module_expsym_cmds -+ else -+ eval test_cmds=\"$module_cmds\" -+ cmds=$module_cmds -+ fi - else -- oldobjs="$old_deplibs $non_pic_objects" -+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -+ eval test_cmds=\"$archive_expsym_cmds\" -+ cmds=$archive_expsym_cmds -+ else -+ eval test_cmds=\"$archive_cmds\" -+ cmds=$archive_cmds -+ fi - fi -- addlibs="$old_convenience" -- fi - -- if test -n "$addlibs"; then -- gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ if test "X$skipped_export" != "X:" && -+ func_len " $test_cmds" && -+ len=$func_len_result && -+ test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ : -+ else -+ # The command line is too long to link in one step, link piecewise -+ # or, if using GNU ld and skipped_export is not :, use a linker -+ # script. - -- func_extract_archives $gentop $addlibs -- oldobjs="$oldobjs $func_extract_archives_result" -- fi -+ # Save the value of $output and $libobjs because we want to -+ # use them later. If we have whole_archive_flag_spec, we -+ # want to use save_libobjs as it was before -+ # whole_archive_flag_spec was expanded, because we can't -+ # assume the linker understands whole_archive_flag_spec. -+ # This may have to be revisited, in case too many -+ # convenience libraries get linked in and end up exceeding -+ # the spec. -+ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then -+ save_libobjs=$libobjs -+ fi -+ save_output=$output -+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"` - -- # Do each command in the archive commands. -- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -- cmds=$old_archive_from_new_cmds -- else -- # POSIX demands no paths to be encoded in archives. We have -- # to avoid creating archives with duplicate basenames if we -- # might have to extract them afterwards, e.g., when creating a -- # static archive out of a convenience library, or when linking -- # the entirety of a libtool archive into another (currently -- # not supported by libtool). -- if (for obj in $oldobjs -+ # Clear the reloadable object creation command queue and -+ # initialize k to one. -+ test_cmds= -+ concat_cmds= -+ objlist= -+ last_robj= -+ k=1 -+ -+ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then -+ output=${output_objdir}/${output_la}.lnkscript -+ func_verbose "creating GNU ld script: $output" -+ $ECHO 'INPUT (' > $output -+ for obj in $save_libobjs - do -- $echo "X$obj" | $Xsed -e 's%^.*/%%' -- done | sort | sort -uc >/dev/null 2>&1); then -- : -- else -- $echo "copying selected object files to avoid basename conflicts..." -+ $ECHO "$obj" >> $output -+ done -+ $ECHO ')' >> $output -+ delfiles="$delfiles $output" -+ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then -+ output=${output_objdir}/${output_la}.lnk -+ func_verbose "creating linker input file list: $output" -+ : > $output -+ set x $save_libobjs -+ shift -+ firstobj= -+ if test "$compiler_needs_object" = yes; then -+ firstobj="$1 " -+ shift -+ fi -+ for obj -+ do -+ $ECHO "$obj" >> $output -+ done -+ delfiles="$delfiles $output" -+ output=$firstobj\"$file_list_spec$output\" -+ else -+ if test -n "$save_libobjs"; then -+ func_verbose "creating reloadable object files..." -+ output=$output_objdir/$output_la-${k}.$objext -+ eval test_cmds=\"$reload_cmds\" -+ func_len " $test_cmds" -+ len0=$func_len_result -+ len=$len0 -+ -+ # Loop over the list of objects to be linked. -+ for obj in $save_libobjs -+ do -+ func_len " $obj" -+ func_arith $len + $func_len_result -+ len=$func_arith_result -+ if test "X$objlist" = X || -+ test "$len" -lt "$max_cmd_len"; then -+ func_append objlist " $obj" -+ else -+ # The command $test_cmds is almost too long, add a -+ # command to the queue. -+ if test "$k" -eq 1 ; then -+ # The first file doesn't have a previous command to add. -+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\" -+ else -+ # All subsequent reloadable object files will link in -+ # the last one created. -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" -+ fi -+ last_robj=$output_objdir/$output_la-${k}.$objext -+ func_arith $k + 1 -+ k=$func_arith_result -+ output=$output_objdir/$output_la-${k}.$objext -+ objlist=$obj -+ func_len " $last_robj" -+ func_arith $len0 + $func_len_result -+ len=$func_arith_result -+ fi -+ done -+ # Handle the remaining objects by creating one last -+ # reloadable object file. All subsequent reloadable object -+ # files will link in the last one created. -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" -+ if test -n "$last_robj"; then -+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" -+ fi -+ delfiles="$delfiles $output" - -- if test -z "$gentop"; then -- gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ else -+ output= -+ fi -+ -+ if ${skipped_export-false}; then -+ func_verbose "generating symbol list for \`$libname.la'" -+ export_symbols="$output_objdir/$libname.exp" -+ $opt_dry_run || $RM $export_symbols -+ libobjs=$output -+ # Append the command to create the export file. -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" -+ if test -n "$last_robj"; then -+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" -+ fi -+ fi -+ -+ test -n "$save_libobjs" && -+ func_verbose "creating a temporary reloadable object file: $output" -+ -+ # Loop through the commands generated above and execute them. -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $concat_cmds; do -+ IFS="$save_ifs" -+ $opt_silent || { -+ func_quote_for_expand "$cmd" -+ eval "func_echo $func_quote_for_expand_result" -+ } -+ $opt_dry_run || eval "$cmd" || { -+ lt_exit=$? -+ -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ ( cd "$output_objdir" && \ -+ $RM "${realname}T" && \ -+ $MV "${realname}U" "$realname" ) -+ fi -+ -+ exit $lt_exit -+ } -+ done -+ IFS="$save_ifs" - -- $show "${rm}r $gentop" -- $run ${rm}r "$gentop" -- $show "$mkdir $gentop" -- $run $mkdir "$gentop" -- exit_status=$? -- if test "$exit_status" -ne 0 && test ! -d "$gentop"; then -- exit $exit_status -+ if test -n "$export_symbols_regex" && ${skipped_export-false}; then -+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - -- save_oldobjs=$oldobjs -- oldobjs= -- counter=1 -- for obj in $save_oldobjs -- do -- objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` -- case " $oldobjs " in -- " ") oldobjs=$obj ;; -- *[\ /]"$objbase "*) -- while :; do -- # Make sure we don't pick an alternate name that also -- # overlaps. -- newobj=lt$counter-$objbase -- counter=`expr $counter + 1` -- case " $oldobjs " in -- *[\ /]"$newobj "*) ;; -- *) if test ! -f "$gentop/$newobj"; then break; fi ;; -- esac -- done -- $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- $run ln "$obj" "$gentop/$newobj" || -- $run cp "$obj" "$gentop/$newobj" -- oldobjs="$oldobjs $gentop/$newobj" -- ;; -- *) oldobjs="$oldobjs $obj" ;; -- esac -- done -- fi -+ if ${skipped_export-false}; then -+ if test -n "$export_symbols" && test -n "$include_expsyms"; then -+ tmp_export_symbols="$export_symbols" -+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' -+ fi -+ -+ if test -n "$orig_export_symbols"; then -+ # The given exports_symbols file has to be filtered, so filter it. -+ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" -+ # FIXME: $output_objdir/$libname.filter potentially contains lots of -+ # 's' commands which not all seds can handle. GNU sed should be fine -+ # though. Also, the filter scales superlinearly with the number of -+ # global variables. join(1) would be nice here, but unfortunately -+ # isn't a blessed tool. -+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ export_symbols=$output_objdir/$libname.def -+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols -+ fi -+ fi - -- eval cmds=\"$old_archive_cmds\" -+ libobjs=$output -+ # Restore the value of output. -+ output=$save_output - -- if len=`expr "X$cmds" : ".*"` && -- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then -- cmds=$old_archive_cmds -- else -- # the command line is too long to link in one step, link in parts -- $echo "using piecewise archive linking..." -- save_RANLIB=$RANLIB -- RANLIB=: -- objlist= -- concat_cmds= -- save_oldobjs=$oldobjs -+ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then -+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -+ test "X$libobjs" = "X " && libobjs= -+ fi -+ # Expand the library linking commands again to reset the -+ # value of $libobjs for piecewise linking. - -- # Is there a better way of finding the last object in the list? -- for obj in $save_oldobjs -- do -- last_oldobj=$obj -- done -- for obj in $save_oldobjs -- do -- oldobjs="$objlist $obj" -- objlist="$objlist $obj" -- eval test_cmds=\"$old_archive_cmds\" -- if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && -- test "$len" -le "$max_cmd_len"; then -- : -+ # Do each of the archive commands. -+ if test "$module" = yes && test -n "$module_cmds" ; then -+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then -+ cmds=$module_expsym_cmds - else -- # the above command should be used before it gets too long -- oldobjs=$objlist -- if test "$obj" = "$last_oldobj" ; then -- RANLIB=$save_RANLIB -- fi -- test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" -- objlist= -+ cmds=$module_cmds - fi -- done -- RANLIB=$save_RANLIB -- oldobjs=$objlist -- if test "X$oldobjs" = "X" ; then -- eval cmds=\"\$concat_cmds\" - else -- eval cmds=\"\$concat_cmds~\$old_archive_cmds\" -+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then -+ cmds=$archive_expsym_cmds -+ else -+ cmds=$archive_cmds -+ fi - fi - fi -- fi -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- eval cmd=\"$cmd\" -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- done - -- if test -n "$generated"; then -- $show "${rm}r$generated" -- $run ${rm}r$generated -- fi -+ if test -n "$delfiles"; then -+ # Append the command to remove temporary files to $cmds. -+ eval cmds=\"\$cmds~\$RM $delfiles\" -+ fi - -- # Now create the libtool archive. -- case $output in -- *.la) -- old_library= -- test "$build_old_libs" = yes && old_library="$libname.$libext" -- $show "creating $output" -+ # Add any objects from preloaded convenience libraries -+ if test -n "$dlprefiles"; then -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" - -- # Preserve any variables that may affect compiler behavior -- for var in $variables_saved_for_relink; do -- if eval test -z \"\${$var+set}\"; then -- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" -- elif eval var_value=\$$var; test -z "$var_value"; then -- relink_command="$var=; export $var; $relink_command" -- else -- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` -- relink_command="$var=\"$var_value\"; export $var; $relink_command" -+ func_extract_archives $gentop $dlprefiles -+ libobjs="$libobjs $func_extract_archives_result" -+ test "X$libobjs" = "X " && libobjs= - fi -- 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" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` -- if test "$hardcode_automatic" = yes ; then -- relink_command= -- fi - -+ save_ifs="$IFS"; IFS='~' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ eval cmd=\"$cmd\" -+ $opt_silent || { -+ func_quote_for_expand "$cmd" -+ eval "func_echo $func_quote_for_expand_result" -+ } -+ $opt_dry_run || eval "$cmd" || { -+ lt_exit=$? - -- # Only create the output if not a dry run. -- if test -z "$run"; then -- for installed in no yes; do -- if test "$installed" = yes; then -- if test -z "$install_libdir"; then -- break -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ ( cd "$output_objdir" && \ -+ $RM "${realname}T" && \ -+ $MV "${realname}U" "$realname" ) - fi -- output="$output_objdir/$outputname"i -- # Replace all uninstalled libtool libraries with the installed ones -- newdependency_libs= -- for deplib in $dependency_libs; do -- case $deplib in -- *.la) -- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -- if test -z "$libdir"; then -- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 -- exit $EXIT_FAILURE -- fi -- newdependency_libs="$newdependency_libs $libdir/$name" -- ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -- esac -- done -- dependency_libs="$newdependency_libs" -- newdlfiles= -- for lib in $dlfiles; do -- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -- if test -z "$libdir"; then -- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit $EXIT_FAILURE -- fi -- newdlfiles="$newdlfiles $libdir/$name" -- done -- dlfiles="$newdlfiles" -- newdlprefiles= -- for lib in $dlprefiles; do -- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -- if test -z "$libdir"; then -- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- exit $EXIT_FAILURE -- fi -- newdlprefiles="$newdlprefiles $libdir/$name" -- done -- dlprefiles="$newdlprefiles" -- else -- newdlfiles= -- for lib in $dlfiles; do -- case $lib in -- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -- *) abs=`pwd`"/$lib" ;; -- esac -- newdlfiles="$newdlfiles $abs" -- done -- dlfiles="$newdlfiles" -- newdlprefiles= -- for lib in $dlprefiles; do -- case $lib in -- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -- *) abs=`pwd`"/$lib" ;; -- esac -- newdlprefiles="$newdlprefiles $abs" -- done -- dlprefiles="$newdlprefiles" -- fi -- $rm $output -- # place dlname in correct position for cygwin -- tdlname=$dlname -- case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -- esac -- $echo > $output "\ --# $outputname - a libtool library file --# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP --# --# Please DO NOT delete this file! --# It is necessary for linking the library. - --# The name that we can dlopen(3). --dlname='$tdlname' -+ exit $lt_exit -+ } -+ done -+ IFS="$save_ifs" - --# Names of this library. --library_names='$library_names' -+ # Restore the uninstalled library and exit -+ if test "$mode" = relink; then -+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - --# The name of the static archive. --old_library='$old_library' -+ if test -n "$convenience"; then -+ if test -z "$whole_archive_flag_spec"; then -+ func_show_eval '${RM}r "$gentop"' -+ fi -+ fi - --# Libraries that this one depends upon. --dependency_libs='$dependency_libs' -+ exit $EXIT_SUCCESS -+ fi - --# Version information for $libname. --current=$current --age=$age --revision=$revision -+ # Create links to the real library. -+ for linkname in $linknames; do -+ if test "$realname" != "$linkname"; then -+ func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' -+ fi -+ done - --# Is this an already installed library? --installed=$installed -+ # If -module or -export-dynamic was specified, set the dlname. -+ if test "$module" = yes || test "$export_dynamic" = yes; then -+ # On all known operating systems, these are identical. -+ dlname="$soname" -+ fi -+ fi -+ ;; - --# Should we warn about portability when linking against -modules? --shouldnotlink=$module -+ obj) -+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ func_warning "\`-dlopen' is ignored for objects" -+ fi - --# Files to dlopen/dlpreopen --dlopen='$dlfiles' --dlpreopen='$dlprefiles' -+ case " $deplibs" in -+ *\ -l* | *\ -L*) -+ func_warning "\`-l' and \`-L' are ignored for objects" ;; -+ esac - --# Directory that this library needs to be installed in: --libdir='$install_libdir'" -- if test "$installed" = no && test "$need_relink" = yes; then -- $echo >> $output "\ --relink_command=\"$relink_command\"" -- fi -- done -- fi -+ test -n "$rpath" && \ -+ func_warning "\`-rpath' is ignored for objects" - -- # Do a symbolic link so that the libtool archive can be found in -- # LD_LIBRARY_PATH before the program is installed. -- $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" -- $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? -- ;; -- esac -- exit $EXIT_SUCCESS -- ;; -+ test -n "$xrpath" && \ -+ func_warning "\`-R' is ignored for objects" - -- # libtool install mode -- install) -- modename="$modename: install" -+ test -n "$vinfo" && \ -+ func_warning "\`-version-info' is ignored for objects" - -- # There may be an optional sh(1) argument at the beginning of -- # install_prog (especially on Windows NT). -- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || -- # Allow the use of GNU shtool's install command. -- $echo "X$nonopt" | grep shtool > /dev/null; then -- # Aesthetically quote it. -- arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -+ test -n "$release" && \ -+ func_warning "\`-release' is ignored for objects" -+ -+ case $output in -+ *.lo) -+ test -n "$objs$old_deplibs" && \ -+ func_fatal_error "cannot build library object \`$output' from non-libtool objects" -+ -+ libobj=$output -+ func_lo2o "$libobj" -+ obj=$func_lo2o_result -+ ;; -+ *) -+ libobj= -+ obj="$output" - ;; - esac -- install_prog="$arg " -- arg="$1" -- shift -- else -- install_prog= -- arg=$nonopt -- fi - -- # The real first argument should be the name of the installation program. -- # Aesthetically quote it. -- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- install_prog="$install_prog$arg" -+ # Delete the old objects. -+ $opt_dry_run || $RM $obj $libobj - -- # We need to accept at least all the BSD install flags. -- dest= -- files= -- opts= -- prev= -- install_type= -- isdir=no -- stripme= -- for arg -- do -- if test -n "$dest"; then -- files="$files $dest" -- dest=$arg -- continue -- fi -+ # Objects from convenience libraries. This assumes -+ # single-version convenience libraries. Whenever we create -+ # different ones for PIC/non-PIC, this we'll have to duplicate -+ # the extraction. -+ reload_conv_objs= -+ gentop= -+ # reload_cmds runs $LD directly, so let us get rid of -+ # -Wl from whole_archive_flag_spec and hope we can get by with -+ # turning comma into space.. -+ wl= - -- case $arg in -- -d) isdir=yes ;; -- -f) -- case " $install_prog " in -- *[\\\ /]cp\ *) ;; -- *) prev=$arg ;; -- esac -- ;; -- -g | -m | -o) prev=$arg ;; -- -s) -- stripme=" -s" -- continue -- ;; -- -*) -- ;; -- *) -- # If the previous option needed an argument, then skip it. -- if test -n "$prev"; then -- prev= -+ if test -n "$convenience"; then -+ if test -n "$whole_archive_flag_spec"; then -+ 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 -- dest=$arg -- continue -+ gentop="$output_objdir/${obj}x" -+ generated="$generated $gentop" -+ -+ func_extract_archives $gentop $convenience -+ reload_conv_objs="$reload_objs $func_extract_archives_result" - fi -- ;; -- esac -+ fi - -- # Aesthetically quote the argument. -- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -- case $arg in -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- arg="\"$arg\"" -- ;; -- esac -- install_prog="$install_prog $arg" -- done -+ # Create the old-style object. -+ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - -- if test -z "$install_prog"; then -- $echo "$modename: you must specify an install program" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- fi -+ output="$obj" -+ func_execute_cmds "$reload_cmds" 'exit $?' - -- if test -n "$prev"; then -- $echo "$modename: the \`$prev' option requires an argument" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- fi -+ # Exit if we aren't doing a library object file. -+ if test -z "$libobj"; then -+ if test -n "$gentop"; then -+ func_show_eval '${RM}r "$gentop"' -+ fi - -- if test -z "$files"; then -- if test -z "$dest"; then -- $echo "$modename: no file or destination specified" 1>&2 -- else -- $echo "$modename: you must specify a destination" 1>&2 -+ exit $EXIT_SUCCESS - fi -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- fi - -- # Strip any trailing slash from the destination. -- dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` -+ if test "$build_libtool_libs" != yes; then -+ if test -n "$gentop"; then -+ func_show_eval '${RM}r "$gentop"' -+ fi - -- # Check to see that the destination is a directory. -- test -d "$dest" && isdir=yes -- if test "$isdir" = yes; then -- destdir="$dest" -- destname= -- else -- destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` -- test "X$destdir" = "X$dest" && destdir=. -- destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` -+ # Create an invalid libtool object if no PIC, so that we don't -+ # accidentally link it into a program. -+ # $show "echo timestamp > $libobj" -+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? -+ exit $EXIT_SUCCESS -+ fi - -- # Not a directory, so check to see that there is only one file specified. -- set dummy $files -- if test "$#" -gt 2; then -- $echo "$modename: \`$dest' is not a directory" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -+ if test -n "$pic_flag" || test "$pic_mode" != default; then -+ # Only do commands if we really have different PIC objects. -+ reload_objs="$libobjs $reload_conv_objs" -+ output="$libobj" -+ func_execute_cmds "$reload_cmds" 'exit $?' - fi -- fi -- case $destdir in -- [\\/]* | [A-Za-z]:[\\/]*) ;; -- *) -- for file in $files; do -- case $file in -- *.lo) ;; -- *) -- $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- ;; -- esac -- done -+ -+ if test -n "$gentop"; then -+ func_show_eval '${RM}r "$gentop"' -+ fi -+ -+ exit $EXIT_SUCCESS - ;; -- esac - -- # This variable tells wrapper scripts just to set variables rather -- # than running their programs. -- libtool_install_magic="$magic" -+ prog) -+ case $host in -+ *cygwin*) func_stripname '' '.exe' "$output" -+ output=$func_stripname_result.exe;; -+ esac -+ test -n "$vinfo" && \ -+ func_warning "\`-version-info' is ignored for programs" - -- staticlibs= -- future_libdirs= -- current_libdirs= -- for file in $files; do -+ test -n "$release" && \ -+ func_warning "\`-release' is ignored for programs" - -- # Do each installation. -- case $file in -- *.$libext) -- # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ test "$preload" = yes \ -+ && test "$dlopen_support" = unknown \ -+ && test "$dlopen_self" = unknown \ -+ && test "$dlopen_self_static" = unknown && \ -+ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." -+ -+ case $host in -+ *-*-rhapsody* | *-*-darwin1.[012]) -+ # On Rhapsody replace the C library is the System framework -+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - ;; -+ esac - -- *.la) -- # Check to see that this really is a libtool archive. -- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -- else -- $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -+ case $host in -+ *-*-darwin*) -+ # Don't allow lazy linking, it breaks C++ global constructors -+ # But is supposedly fixed on 10.4 or later (yay!). -+ if test "$tagname" = CXX ; then -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in -+ 10.[0123]) -+ compile_command="$compile_command ${wl}-bind_at_load" -+ finalize_command="$finalize_command ${wl}-bind_at_load" -+ ;; -+ esac - fi -+ # Time to change all our "foo.ltframework" stuff back to "-framework foo" -+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ ;; -+ esac - -- library_names= -- old_library= -- relink_command= -- # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -- esac - -- # Add the libdir to current_libdirs if it is the destination. -- if test "X$destdir" = "X$libdir"; then -- case "$current_libdirs " in -- *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ # move library search paths that coincide with paths to not yet -+ # installed libraries to the beginning of the library search list -+ new_libs= -+ for path in $notinst_path; do -+ case " $new_libs " in -+ *" -L$path/$objdir "*) ;; -+ *) -+ case " $compile_deplibs " in -+ *" -L$path/$objdir "*) -+ new_libs="$new_libs -L$path/$objdir" ;; - esac -- else -- # Note the libdir as a future libdir. -- case "$future_libdirs " in -- *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ ;; -+ esac -+ done -+ for deplib in $compile_deplibs; do -+ case $deplib in -+ -L*) -+ case " $new_libs " in -+ *" $deplib "*) ;; -+ *) new_libs="$new_libs $deplib" ;; - esac -- fi -+ ;; -+ *) new_libs="$new_libs $deplib" ;; -+ esac -+ done -+ compile_deplibs="$new_libs" - -- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ -- test "X$dir" = "X$file/" && dir= -- dir="$dir$objdir" - -- if test -n "$relink_command"; then -- # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` -+ compile_command="$compile_command $compile_deplibs" -+ finalize_command="$finalize_command $finalize_deplibs" - -- # Don't allow the user to place us outside of our expected -- # location b/c this prevents finding dependent libraries that -- # are installed to the same prefix. -- # At present, this check doesn't affect windows .dll's that -- # are installed into $libdir/../bin (currently, that works fine) -- # but it's something to keep an eye on. -- if test "$inst_prefix_dir" = "$destdir"; then -- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -- exit $EXIT_FAILURE -- fi -+ if test -n "$rpath$xrpath"; then -+ # If the user specified any rpath flags, then add them. -+ for libdir in $rpath $xrpath; do -+ # This is the magic to use -rpath. -+ case "$finalize_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; -+ esac -+ done -+ fi - -- if test -n "$inst_prefix_dir"; then -- # Stick the inst_prefix_dir data into the link command. -- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` -+ # Now hardcode the library paths -+ rpath= -+ hardcode_libdirs= -+ for libdir in $compile_rpath $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi - else -- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" - fi -+ elif test -n "$runpath_var"; then -+ case "$perm_rpath " in -+ *" $libdir "*) ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; -+ esac -+ fi -+ case $host in -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` -+ case :$dllsearchpath: in -+ *":$libdir:"*) ;; -+ ::) dllsearchpath=$libdir;; -+ *) dllsearchpath="$dllsearchpath:$libdir";; -+ esac -+ case :$dllsearchpath: in -+ *":$testbindir:"*) ;; -+ ::) dllsearchpath=$testbindir;; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; -+ esac -+ ;; -+ esac -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ compile_rpath="$rpath" - -- $echo "$modename: warning: relinking \`$file'" 1>&2 -- $show "$relink_command" -- if $run eval "$relink_command"; then : -+ rpath= -+ hardcode_libdirs= -+ for libdir in $finalize_rpath; do -+ if test -n "$hardcode_libdir_flag_spec"; then -+ if test -n "$hardcode_libdir_separator"; then -+ if test -z "$hardcode_libdirs"; then -+ hardcode_libdirs="$libdir" -+ else -+ # Just accumulate the unique libdirs. -+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) -+ ;; -+ *) -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ ;; -+ esac -+ fi - else -- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -- exit $EXIT_FAILURE -+ eval flag=\"$hardcode_libdir_flag_spec\" -+ rpath="$rpath $flag" - fi -+ elif test -n "$runpath_var"; then -+ case "$finalize_perm_rpath " in -+ *" $libdir "*) ;; -+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ esac - fi -+ done -+ # Substitute the hardcoded libdirs into the rpath. -+ if test -n "$hardcode_libdir_separator" && -+ test -n "$hardcode_libdirs"; then -+ libdir="$hardcode_libdirs" -+ eval rpath=\" $hardcode_libdir_flag_spec\" -+ fi -+ finalize_rpath="$rpath" - -- # See the names of the shared library. -- set dummy $library_names -- if test -n "$2"; then -- realname="$2" -- shift -- shift -+ if test -n "$libobjs" && test "$build_old_libs" = yes; then -+ # Transform all the library objects into standard objects. -+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ fi - -- srcname="$realname" -- test -n "$relink_command" && srcname="$realname"T -+ func_generate_dlsyms "$outputname" "@PROGRAM@" "no" - -- # Install the shared library and build the symlinks. -- $show "$install_prog $dir/$srcname $destdir/$realname" -- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? -- if test -n "$stripme" && test -n "$striplib"; then -- $show "$striplib $destdir/$realname" -- $run eval "$striplib $destdir/$realname" || exit $? -- fi -+ # template prelinking step -+ if test -n "$prelink_cmds"; then -+ func_execute_cmds "$prelink_cmds" 'exit $?' -+ fi - -- if test "$#" -gt 0; then -- # Delete the old symlinks, and create new ones. -- # Try `ln -sf' first, because the `ln' binary might depend on -- # the symlink we replace! Solaris /bin/ln does not understand -f, -- # so we also need to try rm && ln -s. -- for linkname -- do -- if test "$linkname" != "$realname"; then -- $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" -- $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" -- fi -- done -- fi -+ wrappers_required=yes -+ case $host in -+ *cygwin* | *mingw* ) -+ if test "$build_libtool_libs" != yes; then -+ wrappers_required=no -+ fi -+ ;; -+ *cegcc) -+ # Disable wrappers for cegcc, we are cross compiling anyway. -+ wrappers_required=no -+ ;; -+ *) -+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then -+ wrappers_required=no -+ fi -+ ;; -+ esac -+ if test "$wrappers_required" = no; then -+ # Replace the output file specification. -+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ link_command="$compile_command$compile_rpath" - -- # Do each command in the postinstall commands. -- lib="$destdir/$realname" -- cmds=$postinstall_cmds -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- $show "$cmd" -- $run eval "$cmd" || { -- lt_exit=$? -- -- # Restore the uninstalled library and exit -- if test "$mode" = relink; then -- $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' -- fi -+ # We have no uninstalled library dependencies, so finalize right now. -+ exit_status=0 -+ func_show_eval "$link_command" 'exit_status=$?' - -- exit $lt_exit -- } -- done -- IFS="$save_ifs" -+ # Delete the generated files. -+ if test -f "$output_objdir/${outputname}S.${objext}"; then -+ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' - fi - -- # Install the pseudo-library for information purposes. -- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- instname="$dir/$name"i -- $show "$install_prog $instname $destdir/$name" -- $run eval "$install_prog $instname $destdir/$name" || exit $? -- -- # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -- ;; -+ exit $exit_status -+ fi - -- *.lo) -- # Install (i.e. copy) a libtool object. -+ if test -n "$compile_shlibpath$finalize_shlibpath"; then -+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" -+ fi -+ if test -n "$finalize_shlibpath"; then -+ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" -+ fi - -- # Figure out destination file name, if it wasn't already specified. -- if test -n "$destname"; then -- destfile="$destdir/$destname" -- else -- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- destfile="$destdir/$destfile" -+ compile_var= -+ finalize_var= -+ if test -n "$runpath_var"; then -+ if test -n "$perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $perm_rpath; do -+ rpath="$rpath$dir:" -+ done -+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -- -- # Deduce the name of the destination old-style object file. -- case $destfile in -- *.lo) -- staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` -- ;; -- *.$objext) -- staticdest="$destfile" -- destfile= -- ;; -- *) -- $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- ;; -- esac -- -- # Install the libtool object if requested. -- if test -n "$destfile"; then -- $show "$install_prog $file $destfile" -- $run eval "$install_prog $file $destfile" || exit $? -+ if test -n "$finalize_perm_rpath"; then -+ # We should set the runpath_var. -+ rpath= -+ for dir in $finalize_perm_rpath; do -+ rpath="$rpath$dir:" -+ done -+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -+ fi - -- # Install the old object if enabled. -- if test "$build_old_libs" = yes; then -- # Deduce the name of the old-style object file. -- staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` -- -- $show "$install_prog $staticobj $staticdest" -- $run eval "$install_prog \$staticobj \$staticdest" || exit $? -- fi -+ if test "$no_install" = yes; then -+ # We don't need to create a wrapper script. -+ link_command="$compile_var$compile_command$compile_rpath" -+ # Replace the output file specification. -+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ # Delete the old output file. -+ $opt_dry_run || $RM $output -+ # Link the executable and exit -+ func_show_eval "$link_command" 'exit $?' - exit $EXIT_SUCCESS -- ;; -+ fi - -- *) -- # Figure out destination file name, if it wasn't already specified. -- if test -n "$destname"; then -- destfile="$destdir/$destname" -+ if test "$hardcode_action" = relink; then -+ # Fast installation is not supported -+ link_command="$compile_var$compile_command$compile_rpath" -+ relink_command="$finalize_var$finalize_command$finalize_rpath" -+ -+ func_warning "this platform does not like uninstalled shared libraries" -+ func_warning "\`$output' will be relinked during installation" -+ else -+ 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'` -+ else -+ # fast_install is set to needless -+ relink_command= -+ fi - else -- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- destfile="$destdir/$destfile" -+ link_command="$compile_var$compile_command$compile_rpath" -+ relink_command="$finalize_var$finalize_command$finalize_rpath" - fi -+ fi - -- # If the file is missing, and there is a .exe on the end, strip it -- # because it is most likely a libtool script we actually want to -- # install -- stripped_ext="" -- case $file in -- *.exe) -- if test ! -f "$file"; then -- file=`$echo $file|${SED} 's,.exe$,,'` -- stripped_ext=".exe" -- fi -- ;; -- esac -- -- # Do a test to see if this is really a libtool program. -- case $host in -- *cygwin*|*mingw*) -- wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` -- ;; -- *) -- wrapper=$file -- ;; -- esac -- if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then -- notinst_deplibs= -- relink_command= -- -- # Note that it is not necessary on cygwin/mingw to append a dot to -- # foo even if both foo and FILE.exe exist: automatic-append-.exe -- # behavior happens only for exec(3), not for open(2)! Also, sourcing -- # `FILE.' does not work on cygwin managed mounts. -- # -- # If there is no directory component, then add one. -- case $wrapper in -- */* | *\\*) . ${wrapper} ;; -- *) . ./${wrapper} ;; -- esac -- -- # Check the variables that should have been set. -- if test -z "$notinst_deplibs"; then -- $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 -- exit $EXIT_FAILURE -- fi -+ # Replace the output file specification. -+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - -- finalize=yes -- for lib in $notinst_deplibs; do -- # Check to see that each library is installed. -- libdir= -- if test -f "$lib"; then -- # If there is no directory component, then add one. -- case $lib in -- */* | *\\*) . $lib ;; -- *) . ./$lib ;; -- esac -- fi -- libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test -- if test -n "$libdir" && test ! -f "$libfile"; then -- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 -- finalize=no -- fi -- done -+ # Delete the old output files. -+ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - -- relink_command= -- # Note that it is not necessary on cygwin/mingw to append a dot to -- # foo even if both foo and FILE.exe exist: automatic-append-.exe -- # behavior happens only for exec(3), not for open(2)! Also, sourcing -- # `FILE.' does not work on cygwin managed mounts. -- # -- # If there is no directory component, then add one. -- case $wrapper in -- */* | *\\*) . ${wrapper} ;; -- *) . ./${wrapper} ;; -- esac -+ func_show_eval "$link_command" 'exit $?' - -- outputname= -- if test "$fast_install" = no && test -n "$relink_command"; then -- if test "$finalize" = yes && test -z "$run"; then -- tmpdir=`func_mktempdir` -- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` -- outputname="$tmpdir/$file" -- # Replace the output file specification. -- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` -+ # Now create the wrapper script. -+ func_verbose "creating $output" - -- $show "$relink_command" -- if $run eval "$relink_command"; then : -- else -- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 -- ${rm}r "$tmpdir" -- continue -- fi -- file="$outputname" -- else -- $echo "$modename: warning: cannot relink \`$file'" 1>&2 -- fi -+ # Quote the relink command for shipping. -+ if test -n "$relink_command"; then -+ # Preserve any variables that may affect compiler behavior -+ for var in $variables_saved_for_relink; do -+ if eval test -z \"\${$var+set}\"; then -+ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" -+ elif eval var_value=\$$var; test -z "$var_value"; then -+ relink_command="$var=; export $var; $relink_command" - else -- # Install the binary that we compiled earlier. -- file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` -+ func_quote_for_eval "$var_value" -+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi -- fi -+ done -+ relink_command="(cd `pwd`; $relink_command)" -+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ fi - -- # remove .exe since cygwin /usr/bin/install will append another -- # one anyway -- case $install_prog,$host in -- */usr/bin/install*,*cygwin*) -- case $file:$destfile in -- *.exe:*.exe) -- # this is ok -- ;; -- *.exe:*) -- destfile=$destfile.exe -- ;; -- *:*.exe) -- destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` -- ;; -- esac -- ;; -+ # Quote $ECHO for shipping. -+ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then -+ case $progpath in -+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; -+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; -+ esac -+ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` -+ else -+ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` -+ fi -+ -+ # Only actually do things if not in dry run mode. -+ $opt_dry_run || { -+ # win32 will think the script is a binary if it has -+ # a .exe suffix, so we strip it off here. -+ case $output in -+ *.exe) func_stripname '' '.exe' "$output" -+ output=$func_stripname_result ;; -+ esac -+ # test for cygwin because mv fails w/o .exe extensions -+ case $host in -+ *cygwin*) -+ exeext=.exe -+ func_stripname '' '.exe' "$outputname" -+ outputname=$func_stripname_result ;; -+ *) exeext= ;; esac -- $show "$install_prog$stripme $file $destfile" -- $run eval "$install_prog\$stripme \$file \$destfile" || exit $? -- test -n "$outputname" && ${rm}r "$tmpdir" -- ;; -- esac -- done -+ case $host in -+ *cygwin* | *mingw* ) -+ func_dirname_and_basename "$output" "" "." -+ output_name=$func_basename_result -+ output_path=$func_dirname_result -+ cwrappersource="$output_path/$objdir/lt-$output_name.c" -+ cwrapper="$output_path/$output_name.exe" -+ $RM $cwrappersource $cwrapper -+ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 -+ -+ func_emit_cwrapperexe_src > $cwrappersource -+ -+ # The wrapper executable is built using the $host compiler, -+ # because it contains $host paths and files. If cross- -+ # compiling, it, like the target executable, must be -+ # executed on the $host or under an emulation environment. -+ $opt_dry_run || { -+ $LTCC $LTCFLAGS -o $cwrapper $cwrappersource -+ $STRIP $cwrapper -+ } - -- for file in $staticlibs; do -- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ # Now, create the wrapper script for func_source use: -+ func_ltwrapper_scriptname $cwrapper -+ $RM $func_ltwrapper_scriptname_result -+ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 -+ $opt_dry_run || { -+ # note: this script will not be executed, so do not chmod. -+ if test "x$build" = "x$host" ; then -+ $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result -+ else -+ func_emit_wrapper no > $func_ltwrapper_scriptname_result -+ fi -+ } -+ ;; -+ * ) -+ $RM $output -+ trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - -- # Set up the ranlib parameters. -- oldlib="$destdir/$name" -+ func_emit_wrapper no > $output -+ chmod +x $output -+ ;; -+ esac -+ } -+ exit $EXIT_SUCCESS -+ ;; -+ esac - -- $show "$install_prog $file $oldlib" -- $run eval "$install_prog \$file \$oldlib" || exit $? -+ # See if we need to build an old-fashioned archive. -+ for oldlib in $oldlibs; do - -- if test -n "$stripme" && test -n "$old_striplib"; then -- $show "$old_striplib $oldlib" -- $run eval "$old_striplib $oldlib" || exit $? -+ if test "$build_libtool_libs" = convenience; then -+ oldobjs="$libobjs_save $symfileobj" -+ addlibs="$convenience" -+ build_libtool_libs=no -+ else -+ if test "$build_libtool_libs" = module; then -+ oldobjs="$libobjs_save" -+ build_libtool_libs=no -+ else -+ oldobjs="$old_deplibs $non_pic_objects" -+ if test "$preload" = yes && test -f "$symfileobj"; then -+ oldobjs="$oldobjs $symfileobj" -+ fi -+ fi -+ addlibs="$old_convenience" fi - -- # Do each command in the postinstall commands. -- cmds=$old_postinstall_cmds -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -- done -+ if test -n "$addlibs"; then -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" - -- if test -n "$future_libdirs"; then -- $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 -- fi -+ func_extract_archives $gentop $addlibs -+ oldobjs="$oldobjs $func_extract_archives_result" -+ fi - -- if test -n "$current_libdirs"; then -- # Maybe just do a dry run. -- test -n "$run" && current_libdirs=" -n$current_libdirs" -- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -- else -- exit $EXIT_SUCCESS -- fi -- ;; -+ # Do each command in the archive commands. -+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -+ cmds=$old_archive_from_new_cmds -+ else - -- # libtool finish mode -- finish) -- modename="$modename: finish" -- libdirs="$nonopt" -- admincmds= -+ # Add any objects from preloaded convenience libraries -+ if test -n "$dlprefiles"; then -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -+ func_extract_archives $gentop $dlprefiles -+ oldobjs="$oldobjs $func_extract_archives_result" -+ fi - -- for libdir in $libdirs; do -- if test -n "$finish_cmds"; then -- # Do each command in the finish commands. -- cmds=$finish_cmds -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- $show "$cmd" -- $run eval "$cmd" || admincmds="$admincmds -- $cmd" -+ # POSIX demands no paths to be encoded in archives. We have -+ # to avoid creating archives with duplicate basenames if we -+ # might have to extract them afterwards, e.g., when creating a -+ # static archive out of a convenience library, or when linking -+ # the entirety of a libtool archive into another (currently -+ # not supported by libtool). -+ if (for obj in $oldobjs -+ do -+ func_basename "$obj" -+ $ECHO "$func_basename_result" -+ done | sort | sort -uc >/dev/null 2>&1); then -+ : -+ else -+ $ECHO "copying selected object files to avoid basename conflicts..." -+ gentop="$output_objdir/${outputname}x" -+ generated="$generated $gentop" -+ func_mkdir_p "$gentop" -+ save_oldobjs=$oldobjs -+ oldobjs= -+ counter=1 -+ for obj in $save_oldobjs -+ do -+ func_basename "$obj" -+ objbase="$func_basename_result" -+ case " $oldobjs " in -+ " ") oldobjs=$obj ;; -+ *[\ /]"$objbase "*) -+ while :; do -+ # Make sure we don't pick an alternate name that also -+ # overlaps. -+ newobj=lt$counter-$objbase -+ func_arith $counter + 1 -+ counter=$func_arith_result -+ case " $oldobjs " in -+ *[\ /]"$newobj "*) ;; -+ *) if test ! -f "$gentop/$newobj"; then break; fi ;; -+ esac -+ done -+ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -+ oldobjs="$oldobjs $gentop/$newobj" -+ ;; -+ *) oldobjs="$oldobjs $obj" ;; -+ esac - done -- IFS="$save_ifs" -- fi -- if test -n "$finish_eval"; then -- # Do the single finish_eval. -- eval cmds=\"$finish_eval\" -- $run eval "$cmds" || admincmds="$admincmds -- $cmds" - fi -- done -- fi -- -- # Exit here if they wanted silent mode. -- test "$show" = : && exit $EXIT_SUCCESS -+ eval cmds=\"$old_archive_cmds\" - -- $echo "X----------------------------------------------------------------------" | $Xsed -- $echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- $echo " $libdir" -+ func_len " $cmds" -+ len=$func_len_result -+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ cmds=$old_archive_cmds -+ else -+ # the command line is too long to link in one step, link in parts -+ func_verbose "using piecewise archive linking..." -+ save_RANLIB=$RANLIB -+ RANLIB=: -+ objlist= -+ concat_cmds= -+ save_oldobjs=$oldobjs -+ oldobjs= -+ # Is there a better way of finding the last object in the list? -+ for obj in $save_oldobjs -+ do -+ last_oldobj=$obj -+ done -+ eval test_cmds=\"$old_archive_cmds\" -+ func_len " $test_cmds" -+ len0=$func_len_result -+ len=$len0 -+ for obj in $save_oldobjs -+ do -+ func_len " $obj" -+ func_arith $len + $func_len_result -+ len=$func_arith_result -+ func_append objlist " $obj" -+ if test "$len" -lt "$max_cmd_len"; then -+ : -+ else -+ # the above command should be used before it gets too long -+ oldobjs=$objlist -+ if test "$obj" = "$last_oldobj" ; then -+ RANLIB=$save_RANLIB -+ fi -+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" -+ objlist= -+ len=$len0 -+ fi -+ done -+ RANLIB=$save_RANLIB -+ oldobjs=$objlist -+ if test "X$oldobjs" = "X" ; then -+ eval cmds=\"\$concat_cmds\" -+ else -+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\" -+ fi -+ fi -+ fi -+ func_execute_cmds "$cmds" 'exit $?' - done -- $echo -- $echo "If you ever happen to want to link against installed libraries" -- $echo "in a given directory, LIBDIR, you must either use libtool, and" -- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- $echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- $echo " during execution" -- fi -- if test -n "$runpath_var"; then -- $echo " - add LIBDIR to the \`$runpath_var' environment variable" -- $echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- $echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- $echo -- $echo "See any operating system documentation about shared libraries for" -- $echo "more information, such as the ld(1) and ld.so(8) manual pages." -- $echo "X----------------------------------------------------------------------" | $Xsed -- exit $EXIT_SUCCESS -- ;; -- -- # libtool execute mode -- execute) -- modename="$modename: execute" - -- # The first argument is the command name. -- cmd="$nonopt" -- if test -z "$cmd"; then -- $echo "$modename: you must specify a COMMAND" 1>&2 -- $echo "$help" -- exit $EXIT_FAILURE -- fi -+ test -n "$generated" && \ -+ func_show_eval "${RM}r$generated" - -- # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -- if test ! -f "$file"; then -- $echo "$modename: \`$file' is not a file" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- fi -+ # Now create the libtool archive. -+ case $output in -+ *.la) -+ old_library= -+ test "$build_old_libs" = yes && old_library="$libname.$libext" -+ func_verbose "creating $output" - -- dir= -- case $file in -- *.la) -- # Check to see that this really is a libtool archive. -- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ # Preserve any variables that may affect compiler behavior -+ for var in $variables_saved_for_relink; do -+ if eval test -z \"\${$var+set}\"; then -+ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" -+ elif eval var_value=\$$var; test -z "$var_value"; then -+ relink_command="$var=; export $var; $relink_command" - else -- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -+ func_quote_for_eval "$var_value" -+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi -+ 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"` -+ if test "$hardcode_automatic" = yes ; then -+ relink_command= -+ fi - -- # Read the libtool library. -- dlname= -- library_names= -+ # Only create the output if not a dry run. -+ $opt_dry_run || { -+ for installed in no yes; do -+ if test "$installed" = yes; then -+ if test -z "$install_libdir"; then -+ break -+ fi -+ output="$output_objdir/$outputname"i -+ # Replace all uninstalled libtool libraries with the installed ones -+ newdependency_libs= -+ for deplib in $dependency_libs; do -+ case $deplib in -+ *.la) -+ func_basename "$deplib" -+ name="$func_basename_result" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ test -z "$libdir" && \ -+ func_fatal_error "\`$deplib' is not a valid libtool archive" -+ newdependency_libs="$newdependency_libs $libdir/$name" -+ ;; -+ *) newdependency_libs="$newdependency_libs $deplib" ;; -+ esac -+ done -+ dependency_libs="$newdependency_libs" -+ newdlfiles= -+ -+ for lib in $dlfiles; do -+ case $lib in -+ *.la) -+ func_basename "$lib" -+ name="$func_basename_result" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ test -z "$libdir" && \ -+ func_fatal_error "\`$lib' is not a valid libtool archive" -+ newdlfiles="$newdlfiles $libdir/$name" -+ ;; -+ *) newdlfiles="$newdlfiles $lib" ;; -+ esac -+ done -+ dlfiles="$newdlfiles" -+ newdlprefiles= -+ for lib in $dlprefiles; do -+ case $lib in -+ *.la) -+ # Only pass preopened files to the pseudo-archive (for -+ # eventual linking with the app. that links it) if we -+ # didn't already link the preopened objects directly into -+ # the library: -+ func_basename "$lib" -+ name="$func_basename_result" -+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ test -z "$libdir" && \ -+ func_fatal_error "\`$lib' is not a valid libtool archive" -+ newdlprefiles="$newdlprefiles $libdir/$name" -+ ;; -+ esac -+ done -+ dlprefiles="$newdlprefiles" -+ else -+ newdlfiles= -+ for lib in $dlfiles; do -+ case $lib in -+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ *) abs=`pwd`"/$lib" ;; -+ esac -+ newdlfiles="$newdlfiles $abs" -+ done -+ dlfiles="$newdlfiles" -+ newdlprefiles= -+ for lib in $dlprefiles; do -+ case $lib in -+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ *) abs=`pwd`"/$lib" ;; -+ esac -+ newdlprefiles="$newdlprefiles $abs" -+ done -+ dlprefiles="$newdlprefiles" -+ fi -+ $RM $output -+ # place dlname in correct position for cygwin -+ tdlname=$dlname -+ case $host,$output,$installed,$module,$dlname in -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -+ esac -+ $ECHO > $output "\ -+# $outputname - a libtool library file -+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -+# -+# Please DO NOT delete this file! -+# It is necessary for linking the library. - -- # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -- esac -+# The name that we can dlopen(3). -+dlname='$tdlname' - -- # Skip this library if it cannot be dlopened. -- if test -z "$dlname"; then -- # Warn if it was a shared library. -- test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" -- continue -- fi -+# Names of this library. -+library_names='$library_names' - -- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -- test "X$dir" = "X$file" && dir=. -+# The name of the static archive. -+old_library='$old_library' - -- if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -- else -- if test ! -f "$dir/$dlname"; then -- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 -- exit $EXIT_FAILURE -- fi -- fi -- ;; -+# Linker flags that can not go in dependency_libs. -+inherited_linker_flags='$new_inherited_linker_flags' - -- *.lo) -- # Just add the directory containing the .lo file. -- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -- test "X$dir" = "X$file" && dir=. -- ;; -+# Libraries that this one depends upon. -+dependency_libs='$dependency_libs' - -- *) -- $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 -- continue -- ;; -- esac -+# Names of additional weak libraries provided by this library -+weak_library_names='$weak_libs' - -- # Get the absolute pathname. -- absdir=`cd "$dir" && pwd` -- test -n "$absdir" && dir="$absdir" -+# Version information for $libname. -+current=$current -+age=$age -+revision=$revision - -- # Now add the directory to shlibpath_var. -- if eval "test -z \"\$$shlibpath_var\""; then -- eval "$shlibpath_var=\"\$dir\"" -- else -- eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" -- fi -- done -+# Is this an already installed library? -+installed=$installed - -- # This variable tells wrapper scripts just to set shlibpath_var -- # rather than running their programs. -- libtool_execute_magic="$magic" -+# Should we warn about portability when linking against -modules? -+shouldnotlink=$module - -- # Check if any of the arguments is a wrapper script. -- args= -- for file -- do -- case $file in -- -*) ;; -- *) -- # Do a test to see if this is really a libtool program. -- if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- # If there is no directory component, then add one. -- case $file in -- */* | *\\*) . $file ;; -- *) . ./$file ;; -- esac -+# Files to dlopen/dlpreopen -+dlopen='$dlfiles' -+dlpreopen='$dlprefiles' - -- # Transform arg to wrapped name. -- file="$progdir/$program" -- fi -- ;; -- esac -- # Quote arguments (to preserve shell metacharacters). -- file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` -- args="$args \"$file\"" -- done -+# Directory that this library needs to be installed in: -+libdir='$install_libdir'" -+ if test "$installed" = no && test "$need_relink" = yes; then -+ $ECHO >> $output "\ -+relink_command=\"$relink_command\"" -+ fi -+ done -+ } - -- if test -z "$run"; then -- if test -n "$shlibpath_var"; then -- # Export the shlibpath_var. -- eval "export $shlibpath_var" -- fi -+ # Do a symbolic link so that the libtool archive can be found in -+ # LD_LIBRARY_PATH before the program is installed. -+ func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' -+ ;; -+ esac -+ exit $EXIT_SUCCESS -+} - -- # Restore saved environment variables -- for lt_var in LANG LANGUAGE 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 -+{ test "$mode" = link || test "$mode" = relink; } && -+ func_mode_link ${1+"$@"} - -- # Now prepare to actually exec the command. -- exec_cmd="\$cmd$args" -- else -- # Display what would be done. -- if test -n "$shlibpath_var"; then -- eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" -- $echo "export $shlibpath_var" -- fi -- $echo "$cmd$args" -- exit $EXIT_SUCCESS -- fi -- ;; - -- # libtool clean and uninstall mode -- clean | uninstall) -- modename="$modename: $mode" -- rm="$nonopt" -+# func_mode_uninstall arg... -+func_mode_uninstall () -+{ -+ $opt_debug -+ RM="$nonopt" - files= - rmforce= - exit_status=0 -@@ -6539,30 +8208,28 @@ - for arg - do - case $arg in -- -f) rm="$rm $arg"; rmforce=yes ;; -- -*) rm="$rm $arg" ;; -+ -f) RM="$RM $arg"; rmforce=yes ;; -+ -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; - esac - done - -- if test -z "$rm"; then -- $echo "$modename: you must specify an RM program" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- fi -+ test -z "$RM" && \ -+ func_fatal_help "you must specify an RM program" - - rmdirs= - - origobjdir="$objdir" - for file in $files; do -- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` -- if test "X$dir" = "X$file"; then -- dir=. -+ func_dirname "$file" "" "." -+ dir="$func_dirname_result" -+ if test "X$dir" = X.; then - objdir="$origobjdir" - else - objdir="$dir/$origobjdir" - fi -- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -+ func_basename "$file" -+ name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" - - # Remember objdir for removal later, being careful to avoid duplicates -@@ -6574,9 +8241,9 @@ - fi - - # Don't error if the file doesn't exist and rm -f was used. -- if (test -L "$file") >/dev/null 2>&1 \ -- || (test -h "$file") >/dev/null 2>&1 \ -- || test -f "$file"; then -+ if { test -L "$file"; } >/dev/null 2>&1 || -+ { test -h "$file"; } >/dev/null 2>&1 || -+ test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 -@@ -6590,8 +8257,8 @@ - case $name in - *.la) - # Possibly a libtool archive, so verify it. -- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- . $dir/$name -+ if func_lalib_p "$file"; then -+ func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -@@ -6606,39 +8273,17 @@ - *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; - esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. -- cmds=$postuninstall_cmds -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- $show "$cmd" -- $run eval "$cmd" -- if test "$?" -ne 0 && test "$rmforce" != yes; then -- exit_status=1 -- fi -- done -- IFS="$save_ifs" -+ func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. -- cmds=$old_postuninstall_cmds -- save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -- IFS="$save_ifs" -- eval cmd=\"$cmd\" -- $show "$cmd" -- $run eval "$cmd" -- if test "$?" -ne 0 && test "$rmforce" != yes; then -- exit_status=1 -- fi -- done -- IFS="$save_ifs" -+ func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. - ;; -@@ -6648,20 +8293,20 @@ - - *.lo) - # Possibly a libtool object, so verify it. -- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ if func_lalib_p "$file"; then - - # Read the .lo file -- . $dir/$name -+ func_source $dir/$name - - # Add PIC object to the list of files to remove. -- if test -n "$pic_object" \ -- && test "$pic_object" != none; then -+ if test -n "$pic_object" && -+ test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. -- if test -n "$non_pic_object" \ -- && test "$non_pic_object" != none; then -+ if test -n "$non_pic_object" && -+ test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" - fi - fi -@@ -6672,17 +8317,26 @@ - noexename=$name - case $file in - *.exe) -- file=`$echo $file|${SED} 's,.exe$,,'` -- noexename=`$echo $name|${SED} 's,.exe$,,'` -+ func_stripname '' '.exe' "$file" -+ file=$func_stripname_result -+ func_stripname '' '.exe' "$name" -+ noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe - rmfiles="$rmfiles $file" + if test "$pass" = dlopen; then +@@ -3269,6 +3272,11 @@ EOF + 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 - # Do a test to see if this is a libtool program. -- if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -- relink_command= -- . $dir/$noexename -+ if func_ltwrapper_p "$file"; then -+ if func_ltwrapper_executable_p "$file"; then -+ func_ltwrapper_scriptname "$file" -+ relink_command= -+ func_source $func_ltwrapper_scriptname_result -+ rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -+ else -+ relink_command= -+ func_source $dir/$noexename -+ fi - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -@@ -6697,239 +8351,38 @@ - fi - ;; - esac -- $show "$rm $rmfiles" -- $run $rm $rmfiles || exit_status=1 -+ func_show_eval "$RM $rmfiles" 'exit_status=1' - done - objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then -- $show "rmdir $dir" -- $run rmdir $dir >/dev/null 2>&1 -+ func_show_eval "rmdir $dir >/dev/null 2>&1" - fi - done - - exit $exit_status -- ;; -+} - -- "") -- $echo "$modename: you must specify a MODE" 1>&2 -- $echo "$generic_help" 1>&2 -- exit $EXIT_FAILURE -- ;; -- esac -+{ test "$mode" = uninstall || test "$mode" = clean; } && -+ func_mode_uninstall ${1+"$@"} - -- if test -z "$exec_cmd"; then -- $echo "$modename: invalid operation mode \`$mode'" 1>&2 -- $echo "$generic_help" 1>&2 -- exit $EXIT_FAILURE -- fi --fi # test -z "$show_help" -+test -z "$mode" && { -+ help="$generic_help" -+ func_fatal_help "you must specify a MODE" -+} -+ -+test -z "$exec_cmd" && \ -+ func_fatal_help "invalid operation mode \`$mode'" - - if test -n "$exec_cmd"; then -- eval exec $exec_cmd -+ eval exec "$exec_cmd" - exit $EXIT_FAILURE - fi - --# We need to display help for each of the modes. --case $mode in --"") $echo \ --"Usage: $modename [OPTION]... [MODE-ARG]... -- --Provide generalized library-building support services. -- -- --config show all configuration variables -- --debug enable verbose shell tracing ---n, --dry-run display commands without modifying any files -- --features display basic configuration information and exit -- --finish same as \`--mode=finish' -- --help display this help message and exit -- --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] -- --quiet same as \`--silent' -- --silent don't print informational messages -- --tag=TAG use configuration variables from tag TAG -- --version print version information -- --MODE must be one of the following: -- -- clean remove files from the build directory -- compile compile a source file into a libtool object -- execute automatically set library path, then run a program -- finish complete the installation of libtool libraries -- install install libraries or executables -- link create a library or an executable -- uninstall remove libraries from an installed directory -- --MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for --a more detailed description of MODE. -- --Report bugs to <bug-libtool@gnu.org>." -- exit $EXIT_SUCCESS -- ;; -- --clean) -- $echo \ --"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... -- --Remove files from the build directory. -- --RM is the name of the program to use to delete files associated with each FILE --(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed --to RM. -- --If FILE is a libtool library, object or program, all the files associated --with it are deleted. Otherwise, only FILE itself is deleted using RM." -- ;; -- --compile) -- $echo \ --"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE -- --Compile a source file into a libtool library object. -- --This mode accepts the following additional options: -- -- -o OUTPUT-FILE set the output file name to OUTPUT-FILE -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -- -static always build a \`.o' file suitable for static linking -- --COMPILE-COMMAND is a command to be used in creating a \`standard' object file --from the given SOURCEFILE. -- --The output file name is determined by removing the directory component from --SOURCEFILE, then substituting the C source code suffix \`.c' with the --library object suffix, \`.lo'." -- ;; -- --execute) -- $echo \ --"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... -- --Automatically set library path, then run a program. -- --This mode accepts the following additional options: -- -- -dlopen FILE add the directory containing FILE to the library path -- --This mode sets the library path environment variable according to \`-dlopen' --flags. -- --If any of the ARGS are libtool executable wrappers, then they are translated --into their corresponding uninstalled binary, and any of their required library --directories are added to the library path. -- --Then, COMMAND is executed, with ARGS as arguments." -- ;; -- --finish) -- $echo \ --"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... -- --Complete the installation of libtool libraries. -- --Each LIBDIR is a directory that contains libtool libraries. -- --The commands that this mode executes may require superuser privileges. Use --the \`--dry-run' option if you just want to see what would be executed." -- ;; -- --install) -- $echo \ --"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... -- --Install executables or libraries. -- --INSTALL-COMMAND is the installation command. The first component should be --either the \`install' or \`cp' program. -- --The rest of the components are interpreted as arguments to that command (only --BSD-compatible install options are recognized)." -- ;; -- --link) -- $echo \ --"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... -- --Link object files or libraries together to form another library, or to --create an executable program. -+exit $exit_status - --LINK-COMMAND is a command using the C compiler that you would use to create --a program from several object files. -- --The following components of LINK-COMMAND are treated specially: -- -- -all-static do not do any dynamic linking at all -- -avoid-version do not add a version suffix if possible -- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -- -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 -- -export-symbols-regex 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 -- -no-fast-install disable the fast-install mode -- -no-install link a not-installable executable -- -no-undefined declare that a library does not refer to external symbols -- -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -- -objectlist FILE Use a list of object files found in FILE to specify objects -- -precious-files-regex REGEX -- don't remove output files matching REGEX -- -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 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] -- --All other options (arguments beginning with \`-') are ignored. -- --Every other argument is treated as a filename. Files ending in \`.la' are --treated as uninstalled libtool libraries, other files are standard or library --object files. -- --If the OUTPUT-FILE ends in \`.la', then a libtool library is created, --only library objects (\`.lo' files) may be specified, and \`-rpath' is --required, except when creating a convenience library. -- --If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created --using \`ar' and \`ranlib', or on Windows using \`lib'. -- --If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file --is created, otherwise an executable program is created." -- ;; -- --uninstall) -- $echo \ --"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... -- --Remove libraries from an installation directory. -- --RM is the name of the program to use to delete files associated with each FILE --(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed --to RM. -- --If FILE is a libtool library, all the files associated with it are deleted. --Otherwise, only FILE itself is deleted using RM." -- ;; -- --*) -- $echo "$modename: invalid operation mode \`$mode'" 1>&2 -- $echo "$help" 1>&2 -- exit $EXIT_FAILURE -- ;; --esac -- --$echo --$echo "Try \`$modename --help' for more information about other modes." -- --exit $? - - # The TAGs below are defined such that we never get into a situation - # in which we disable both kinds of libraries. Given conflicting -@@ -6943,14 +8396,17 @@ - # configuration. But we'll never go from static-only to shared-only. - - # ### BEGIN LIBTOOL TAG CONFIG: disable-shared --disable_libs=shared -+build_libtool_libs=no -+build_old_libs=yes - # ### END LIBTOOL TAG CONFIG: disable-shared - - # ### BEGIN LIBTOOL TAG CONFIG: disable-static --disable_libs=static -+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` - # ### END LIBTOOL TAG CONFIG: disable-static - - # Local Variables: - # mode:shell-script - # sh-indentation:2 - # End: -+# vi:sw=2 -+ -diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makefile.in ---- gtk+2.0-2.14.7.old/m4macros/Makefile.in 2009-01-07 22:52:09.000000000 +0100 -+++ gtk+2.0-2.14.7/m4macros/Makefile.in 2009-01-08 08:03:52.000000000 +0100 + ;; + no) +Index: gtk+-2.14.7/m4macros/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/m4macros/Makefile.in 2009-02-17 23:15:20.971083871 +0100 ++++ gtk+-2.14.7/m4macros/Makefile.in 2009-02-21 14:58:45.674583478 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -85259,7 +53590,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,32 @@ +@@ -37,10 +32,32 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -85294,7 +53625,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +68,17 @@ +@@ -51,22 +68,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -85318,7 +53649,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +93,15 @@ +@@ -81,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -85326,9 +53657,8 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +100,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -85337,13 +53667,9 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +125,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +126,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -85351,7 +53677,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +144,6 @@ +@@ -138,8 +145,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -85360,7 +53686,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +154,21 @@ +@@ -150,91 +155,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -85453,20 +53779,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +179,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +184,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -85489,12 +53802,10 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +206,6 @@ +@@ -284,8 +203,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -85503,7 +53814,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +217,10 @@ +@@ -297,28 +214,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -85532,7 +53843,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +229,25 @@ +@@ -327,22 +226,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -85542,12 +53853,11 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -85563,17 +53873,15 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +269,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +267,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +280,12 @@ +@@ -373,9 +276,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -85581,13 +53889,12 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,56 +316,63 @@ +@@ -406,56 +311,63 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -85678,7 +53985,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef done tags: TAGS TAGS: -@@ -463,29 +380,23 @@ +@@ -463,29 +375,23 @@ TAGS: ctags: CTAGS CTAGS: @@ -85721,7 +54028,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -500,9 +411,10 @@ +@@ -500,9 +406,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) @@ -85734,7 +54041,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -522,7 +434,7 @@ +@@ -522,7 +429,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -85743,7 +54050,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -533,24 +445,34 @@ +@@ -533,24 +440,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-am -rm -f Makefile @@ -85779,7 +54086,7 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef installcheck-am: maintainer-clean: maintainer-clean-am -@@ -569,17 +491,22 @@ +@@ -569,17 +486,22 @@ ps: ps-am ps-am: @@ -85808,9 +54115,10 @@ diff -Naur gtk+2.0-2.14.7.old/m4macros/Makefile.in gtk+2.0-2.14.7/m4macros/Makef # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in ---- gtk+2.0-2.14.7.old/Makefile.in 2009-01-07 22:52:00.000000000 +0100 -+++ gtk+2.0-2.14.7/Makefile.in 2009-01-08 08:03:57.000000000 +0100 +Index: gtk+-2.14.7/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/Makefile.in 2009-02-17 23:15:20.915088486 +0100 ++++ gtk+-2.14.7/Makefile.in 2009-02-21 14:58:50.122581688 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -85840,7 +54148,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +32,71 @@ +@@ -37,11 +32,71 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -85914,7 +54222,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,22 +107,17 @@ +@@ -52,22 +107,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -85938,7 +54246,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,22 +132,15 @@ +@@ -82,8 +132,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -85946,9 +54254,8 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -91,10 +139,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -85957,13 +54264,9 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -121,6 +164,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -121,6 +165,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -85971,7 +54274,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +183,6 @@ +@@ -139,8 +184,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -85980,7 +54283,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,97 +193,21 @@ +@@ -151,91 +194,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -86073,20 +54376,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -252,29 +218,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -257,24 +223,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -86109,12 +54399,10 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +245,6 @@ +@@ -285,8 +242,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -86123,7 +54411,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +256,10 @@ +@@ -298,28 +253,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -86152,7 +54440,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +268,25 @@ +@@ -328,22 +265,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -86162,12 +54450,11 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -86183,17 +54470,15 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,7 +308,9 @@ - libexecdir = @libexecdir@ +@@ -366,6 +306,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -374,122 +319,71 @@ +@@ -374,122 +315,70 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -86201,7 +54486,6 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -86375,7 +54659,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in TEST_PROGS = ### testing rules -@@ -516,17 +410,17 @@ +@@ -516,17 +405,17 @@ XVFB_START = \ && DISPLAY=:$$XID && export DISPLAY @@ -86398,7 +54682,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in DISTCLEANFILES = \ gtk+-unix-print-2.0.pc \ gtk+-$(GDKTARGET)-2.0.pc \ -@@ -537,96 +431,83 @@ +@@ -537,96 +426,83 @@ DISTCLEANFILES = \ gail-uninstalled.pc \ config.lt @@ -86537,7 +54821,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -@@ -637,24 +518,22 @@ +@@ -637,24 +513,22 @@ clean-libtool: distclean-libtool: -rm -f libtool @@ -86569,7 +54853,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in done # This directory's subdirectories are mostly independent; you can cd -@@ -664,7 +543,13 @@ +@@ -664,7 +538,13 @@ uninstall-pkgconfigDATA: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -86584,7 +54868,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -676,15 +561,20 @@ +@@ -676,15 +556,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -86609,7 +54893,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -705,7 +595,7 @@ +@@ -705,7 +590,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -86618,7 +54902,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -716,35 +606,30 @@ +@@ -716,35 +601,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -86661,7 +54945,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -752,23 +637,23 @@ +@@ -752,23 +632,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -86694,7 +54978,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -780,40 +665,25 @@ +@@ -780,40 +660,25 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -86749,7 +55033,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -824,15 +694,19 @@ +@@ -824,15 +689,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -86774,7 +55058,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in distdir) \ || exit 1; \ fi; \ -@@ -843,22 +717,55 @@ +@@ -843,22 +712,55 @@ distdir: $(DISTFILES) -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -86835,7 +55119,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst -@@ -878,19 +785,20 @@ +@@ -878,19 +780,20 @@ distcheck: dist distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ @@ -86861,7 +55145,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ -@@ -915,8 +823,9 @@ +@@ -915,8 +818,9 @@ check: check-recursive all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: @@ -86873,7 +55157,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -936,7 +845,7 @@ +@@ -936,7 +840,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -86882,7 +55166,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: -@@ -949,13 +858,15 @@ +@@ -949,13 +853,15 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile @@ -86900,7 +55184,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in info: info-recursive info-am: -@@ -964,12 +875,20 @@ +@@ -964,12 +870,20 @@ install-data-am: install-pkgconfigDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -86921,7 +55205,7 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -990,29 +909,28 @@ +@@ -990,29 +904,28 @@ ps: ps-recursive ps-am: @@ -86971,9 +55255,10 @@ diff -Naur gtk+2.0-2.14.7.old/Makefile.in gtk+2.0-2.14.7/Makefile.in # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing ---- gtk+2.0-2.14.7.old/missing 2007-09-18 16:10:46.000000000 +0200 -+++ gtk+2.0-2.14.7/missing 2009-01-08 08:03:47.000000000 +0100 +Index: gtk+-2.14.7/missing +=================================================================== +--- gtk+-2.14.7.orig/missing 2009-02-17 23:15:20.847087456 +0100 ++++ gtk+-2.14.7/missing 2009-02-21 14:58:40.135083486 +0100 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. @@ -86997,7 +55282,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a -@@ -29,6 +33,8 @@ +@@ -29,6 +33,8 @@ if test $# -eq 0; then fi run=: @@ -87006,7 +55291,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing # In the cases where this matters, `missing' is being run in the # srcdir already. -@@ -38,18 +44,24 @@ +@@ -38,18 +44,24 @@ else configure_ac=configure.in fi @@ -87037,7 +55322,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing -h|--h|--he|--hel|--help) echo "\ -@@ -67,6 +79,7 @@ +@@ -67,6 +79,7 @@ Supported PROGRAM values: aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' @@ -87045,7 +55330,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c -@@ -74,11 +87,15 @@ +@@ -74,11 +87,15 @@ Supported PROGRAM values: lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags @@ -87063,7 +55348,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing ;; -*) -@@ -87,14 +104,44 @@ +@@ -87,14 +104,44 @@ Supported PROGRAM values: exit 1 ;; @@ -87110,7 +55395,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." -@@ -102,13 +149,8 @@ +@@ -102,13 +149,8 @@ WARNING: \`$1' is missing on your system ;; autoconf) @@ -87125,7 +55410,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." -@@ -116,13 +158,8 @@ +@@ -116,13 +158,8 @@ WARNING: \`$1' is missing on your system ;; autoheader) @@ -87140,7 +55425,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." -@@ -130,7 +167,7 @@ +@@ -130,7 +167,7 @@ WARNING: \`$1' is missing on your system test -z "$files" && files="config.h" touch_files= for f in $files; do @@ -87149,7 +55434,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; -@@ -140,13 +177,8 @@ +@@ -140,13 +177,8 @@ WARNING: \`$1' is missing on your system ;; automake*) @@ -87164,7 +55449,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." -@@ -156,20 +188,15 @@ +@@ -156,20 +188,15 @@ WARNING: \`$1' is missing on your system ;; autom4te) @@ -87189,7 +55474,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing if test -f "$file"; then touch $file else -@@ -185,74 +212,67 @@ +@@ -185,74 +212,67 @@ WARNING: \`$1' is needed, and you do not bison|yacc) echo 1>&2 "\ @@ -87280,7 +55565,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing touch $file else test -z "$file" || exec >$file -@@ -262,32 +282,36 @@ +@@ -262,32 +282,36 @@ WARNING: \`$1' is missing on your system ;; makeinfo) @@ -87331,7 +55616,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error -@@ -300,13 +324,13 @@ +@@ -300,13 +324,13 @@ WARNING: \`$1' is missing on your system fi firstarg="$1" if shift; then @@ -87347,7 +55632,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 -@@ -323,8 +347,8 @@ +@@ -323,8 +347,8 @@ WARNING: I can't seem to be able to run *) echo 1>&2 "\ @@ -87358,7 +55643,7 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing proper tools for further handling them. Check the \`README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case -@@ -334,3 +358,10 @@ +@@ -334,3 +358,10 @@ WARNING: \`$1' is needed, and you do not esac exit 0 @@ -87369,9 +55654,10 @@ diff -Naur gtk+2.0-2.14.7.old/missing gtk+2.0-2.14.7/missing +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: -diff -Naur gtk+2.0-2.14.7.old/mkinstalldirs gtk+2.0-2.14.7/mkinstalldirs ---- gtk+2.0-2.14.7.old/mkinstalldirs 2007-09-18 16:10:46.000000000 +0200 -+++ gtk+2.0-2.14.7/mkinstalldirs 2009-01-08 08:03:56.000000000 +0100 +Index: gtk+-2.14.7/mkinstalldirs +=================================================================== +--- gtk+-2.14.7.orig/mkinstalldirs 2009-02-17 23:15:20.823088386 +0100 ++++ gtk+-2.14.7/mkinstalldirs 2009-02-21 14:58:50.030585009 +0100 @@ -1,21 +1,36 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy @@ -87416,7 +55702,7 @@ diff -Naur gtk+2.0-2.14.7.old/mkinstalldirs gtk+2.0-2.14.7/mkinstalldirs ;; -m) # -m PERM arg shift -@@ -23,6 +38,10 @@ +@@ -23,6 +38,10 @@ while test $# -gt 0 ; do dirmode=$1 shift ;; @@ -87427,7 +55713,7 @@ diff -Naur gtk+2.0-2.14.7.old/mkinstalldirs gtk+2.0-2.14.7/mkinstalldirs --) # stop option processing shift break -@@ -50,30 +69,58 @@ +@@ -50,30 +69,58 @@ case $# in 0) exit 0 ;; esac @@ -87491,7 +55777,7 @@ diff -Naur gtk+2.0-2.14.7.old/mkinstalldirs gtk+2.0-2.14.7/mkinstalldirs case $pathcomp in -*) pathcomp=./$pathcomp ;; esac -@@ -84,21 +131,21 @@ +@@ -84,21 +131,21 @@ do mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then @@ -87522,7 +55808,7 @@ diff -Naur gtk+2.0-2.14.7.old/mkinstalldirs gtk+2.0-2.14.7/mkinstalldirs done done -@@ -107,5 +154,8 @@ +@@ -107,5 +154,8 @@ exit $errstatus # Local Variables: # mode: shell-script # sh-indentation: 2 @@ -87532,9 +55818,10 @@ diff -Naur gtk+2.0-2.14.7.old/mkinstalldirs gtk+2.0-2.14.7/mkinstalldirs +# time-stamp-end: "$" # End: -# mkinstalldirs ends here -diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules/engines/Makefile.in ---- gtk+2.0-2.14.7.old/modules/engines/Makefile.in 2009-01-07 22:52:09.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/engines/Makefile.in 2009-01-08 08:03:52.000000000 +0100 +Index: gtk+-2.14.7/modules/engines/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/engines/Makefile.in 2009-02-17 23:15:20.803088428 +0100 ++++ gtk+-2.14.7/modules/engines/Makefile.in 2009-02-21 14:58:46.018582856 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -87565,7 +55852,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ +@@ -37,10 +31,35 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -87603,7 +55890,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +70,17 @@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -87627,7 +55914,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +95,15 @@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -87635,9 +55922,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -87646,13 +55932,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +127,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -87660,7 +55942,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +146,6 @@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -87669,7 +55951,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +156,21 @@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -87762,20 +56044,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +181,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -87798,12 +56067,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +208,6 @@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -87812,7 +56079,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +219,10 @@ +@@ -297,28 +216,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -87841,7 +56108,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +231,25 @@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -87851,12 +56118,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -87872,17 +56138,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +271,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +282,12 @@ +@@ -373,9 +278,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -87890,13 +56154,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,33 +318,40 @@ +@@ -406,33 +313,40 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -87957,7 +56220,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules mostlyclean-libtool: -rm -f *.lo -@@ -440,10 +359,6 @@ +@@ -440,10 +354,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -87968,7 +56231,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -451,7 +366,13 @@ +@@ -451,7 +361,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -87983,7 +56246,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -463,15 +384,20 @@ +@@ -463,15 +379,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -88008,7 +56271,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -492,7 +418,7 @@ +@@ -492,7 +413,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -88017,7 +56280,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -503,35 +429,30 @@ +@@ -503,35 +424,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -88060,7 +56323,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -539,23 +460,23 @@ +@@ -539,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -88093,7 +56356,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -567,29 +488,23 @@ +@@ -567,29 +483,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -88136,7 +56399,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -602,13 +517,17 @@ +@@ -602,13 +512,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -88158,7 +56421,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules distdir) \ || exit 1; \ fi; \ -@@ -619,7 +538,6 @@ +@@ -619,7 +533,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -88166,7 +56429,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -639,7 +557,7 @@ +@@ -639,7 +552,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -88175,7 +56438,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -650,25 +568,34 @@ +@@ -650,25 +563,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -88212,7 +56475,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -687,26 +614,24 @@ +@@ -687,26 +609,24 @@ ps: ps-recursive ps-am: @@ -88255,9 +56518,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/Makefile.in gtk+2.0-2.14.7/modules # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.14.7/modules/engines/ms-windows/Makefile.in ---- gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in 2009-01-07 22:52:10.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/engines/ms-windows/Makefile.in 2009-01-08 08:03:52.000000000 +0100 +Index: gtk+-2.14.7/modules/engines/ms-windows/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/engines/ms-windows/Makefile.in 2009-02-17 23:15:20.755082466 +0100 ++++ gtk+-2.14.7/modules/engines/ms-windows/Makefile.in 2009-02-21 14:58:46.215086393 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -88287,7 +56551,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,67 @@ +@@ -37,10 +32,67 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -88357,7 +56621,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +103,17 @@ +@@ -51,22 +103,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -88381,7 +56645,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +128,15 @@ +@@ -81,8 +128,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -88389,9 +56653,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +135,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -88400,13 +56663,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +160,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +161,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -88414,7 +56673,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +179,6 @@ +@@ -138,8 +180,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -88423,7 +56682,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +189,21 @@ +@@ -150,91 +190,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -88516,20 +56775,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +214,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +219,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -88552,12 +56798,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +241,6 @@ +@@ -284,8 +238,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -88566,7 +56810,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +252,10 @@ +@@ -297,28 +249,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -88595,7 +56839,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +264,25 @@ +@@ -327,22 +261,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -88605,12 +56849,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -88626,17 +56869,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +304,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +302,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +315,12 @@ +@@ -373,9 +311,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -88644,13 +56885,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +351,7 @@ +@@ -406,9 +346,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -88660,7 +56900,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -416,18 +359,14 @@ +@@ -416,18 +354,14 @@ INCLUDES = \ -DGDK_DISABLE_DEPRECATED \ $(GTK_DEP_CFLAGS) @@ -88679,7 +56919,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 libwimp_la_SOURCES = \ msw_rc_style.c \ msw_rc_style.h \ -@@ -438,95 +377,75 @@ +@@ -438,95 +372,75 @@ libwimp_la_SOURCES = \ xp_theme_defs.h \ xp_theme.h @@ -88812,7 +57052,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 distclean-compile: -rm -f *.tab.c -@@ -537,37 +456,25 @@ +@@ -537,37 +451,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xp_theme.Plo@am__quote@ .c.o: @@ -88862,7 +57102,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 mostlyclean-libtool: -rm -f *.lo -@@ -575,10 +482,6 @@ +@@ -575,10 +477,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -88873,7 +57113,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -586,7 +489,13 @@ +@@ -586,7 +484,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -88888,7 +57128,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -598,15 +507,20 @@ +@@ -598,15 +502,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -88913,7 +57153,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -627,7 +541,7 @@ +@@ -627,7 +536,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -88922,7 +57162,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -638,35 +552,30 @@ +@@ -638,35 +547,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -88965,7 +57205,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -674,23 +583,23 @@ +@@ -674,23 +578,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -88998,7 +57238,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -702,29 +611,23 @@ +@@ -702,29 +606,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -89041,7 +57281,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -735,15 +638,19 @@ +@@ -735,15 +633,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -89066,7 +57306,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 distdir) \ || exit 1; \ fi; \ -@@ -754,8 +661,9 @@ +@@ -754,8 +656,9 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) installdirs: installdirs-recursive installdirs-am: @@ -89078,7 +57318,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -775,7 +683,7 @@ +@@ -775,7 +678,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -89087,7 +57327,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -789,24 +697,34 @@ +@@ -789,24 +692,34 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -89123,7 +57363,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -827,28 +745,27 @@ +@@ -827,28 +740,27 @@ ps: ps-recursive ps-am: @@ -89170,9 +57410,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.1 # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.14.7/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in ---- gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-01-07 22:52:10.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-01-08 08:03:52.000000000 +0100 +Index: gtk+-2.14.7/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-02-17 23:15:20.627088406 +0100 ++++ gtk+-2.14.7/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2009-02-21 14:58:46.531082699 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -89202,7 +57443,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,32 @@ +@@ -37,10 +32,32 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -89237,7 +57478,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +68,17 @@ +@@ -51,22 +68,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -89261,7 +57502,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +93,15 @@ +@@ -81,8 +93,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -89269,9 +57510,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +100,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -89280,13 +57520,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +125,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +126,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -89294,7 +57530,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +144,6 @@ +@@ -138,8 +145,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -89303,7 +57539,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +154,21 @@ +@@ -150,91 +155,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -89396,20 +57632,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +179,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +184,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -89432,12 +57655,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +206,6 @@ +@@ -284,8 +203,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -89446,7 +57667,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +217,10 @@ +@@ -297,28 +214,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -89475,7 +57696,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +229,25 @@ +@@ -327,22 +226,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -89485,12 +57706,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -89506,17 +57726,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +269,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +267,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +280,12 @@ +@@ -373,9 +276,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -89524,13 +57742,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,54 +316,62 @@ +@@ -406,54 +311,62 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -89619,7 +57836,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. done tags: TAGS TAGS: -@@ -461,29 +379,23 @@ +@@ -461,29 +374,23 @@ TAGS: ctags: CTAGS CTAGS: @@ -89662,7 +57879,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -498,9 +410,10 @@ +@@ -498,9 +405,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(DATA) @@ -89675,7 +57892,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -520,7 +433,7 @@ +@@ -520,7 +428,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -89684,7 +57901,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -531,24 +444,34 @@ +@@ -531,24 +439,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-am -rm -f Makefile @@ -89720,7 +57937,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. installcheck-am: maintainer-clean: maintainer-clean-am -@@ -567,17 +490,21 @@ +@@ -567,17 +485,21 @@ ps: ps-am ps-am: @@ -89750,9 +57967,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile. # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.14.7/modules/engines/ms-windows/Theme/Makefile.in ---- gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in 2009-01-07 22:52:10.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/engines/ms-windows/Theme/Makefile.in 2009-01-08 08:03:52.000000000 +0100 +Index: gtk+-2.14.7/modules/engines/ms-windows/Theme/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/engines/ms-windows/Theme/Makefile.in 2009-02-17 23:15:20.595086713 +0100 ++++ gtk+-2.14.7/modules/engines/ms-windows/Theme/Makefile.in 2009-02-21 14:58:46.366582812 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -89783,7 +58001,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ +@@ -37,10 +31,35 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -89821,7 +58039,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +70,17 @@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -89845,7 +58063,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +95,15 @@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -89853,9 +58071,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -89864,13 +58081,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +127,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -89878,7 +58091,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +146,6 @@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -89887,7 +58100,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +156,21 @@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -89980,20 +58193,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +181,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -90016,12 +58216,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +208,6 @@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -90030,7 +58228,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +219,10 @@ +@@ -297,28 +216,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -90059,7 +58257,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +231,25 @@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -90069,12 +58267,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -90090,17 +58287,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +271,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +282,12 @@ +@@ -373,9 +278,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -90108,13 +58303,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,31 +318,39 @@ +@@ -406,31 +313,39 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -90173,7 +58367,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 mostlyclean-libtool: -rm -f *.lo -@@ -438,10 +358,6 @@ +@@ -438,10 +353,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -90184,7 +58378,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -449,7 +365,13 @@ +@@ -449,7 +360,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -90199,7 +58393,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -461,15 +383,20 @@ +@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -90224,7 +58418,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -490,7 +417,7 @@ +@@ -490,7 +412,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -90233,7 +58427,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -501,35 +428,30 @@ +@@ -501,35 +423,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -90276,7 +58470,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -537,23 +459,23 @@ +@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -90309,7 +58503,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -565,29 +487,23 @@ +@@ -565,29 +482,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -90352,7 +58546,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -598,15 +514,19 @@ +@@ -598,15 +509,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -90377,7 +58571,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 distdir) \ || exit 1; \ fi; \ -@@ -617,7 +537,6 @@ +@@ -617,7 +532,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -90385,7 +58579,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -637,7 +556,7 @@ +@@ -637,7 +551,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -90394,7 +58588,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -648,25 +567,34 @@ +@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -90431,7 +58625,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -685,26 +613,24 @@ +@@ -685,26 +608,24 @@ ps: ps-recursive ps-am: @@ -90474,9 +58668,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2 # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/modules/engines/pixbuf/Makefile.in ---- gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in 2009-01-07 22:52:10.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/engines/pixbuf/Makefile.in 2009-01-08 08:03:52.000000000 +0100 +Index: gtk+-2.14.7/modules/engines/pixbuf/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/engines/pixbuf/Makefile.in 2009-02-17 23:15:20.571086666 +0100 ++++ gtk+-2.14.7/modules/engines/pixbuf/Makefile.in 2009-02-21 14:58:46.719082500 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -90506,7 +58701,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,58 @@ +@@ -37,10 +32,58 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -90567,7 +58762,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +94,17 @@ +@@ -51,22 +94,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -90591,7 +58786,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +119,15 @@ +@@ -81,8 +119,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -90599,9 +58794,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +126,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -90610,13 +58804,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +151,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +152,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -90624,7 +58814,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +170,6 @@ +@@ -138,8 +171,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -90633,7 +58823,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +180,21 @@ +@@ -150,91 +181,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -90726,20 +58916,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +205,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +210,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -90762,12 +58939,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +232,6 @@ +@@ -284,8 +229,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -90776,7 +58951,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +243,10 @@ +@@ -297,28 +240,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -90805,7 +58980,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +255,25 @@ +@@ -327,22 +252,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -90815,12 +58990,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -90836,17 +59010,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +295,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +293,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +306,12 @@ +@@ -373,9 +302,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -90854,13 +59026,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +342,7 @@ +@@ -406,9 +337,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -90870,7 +59041,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -416,18 +350,14 @@ +@@ -416,18 +345,14 @@ INCLUDES = \ -DGDK_DISABLE_DEPRECATED \ $(GTK_DEP_CFLAGS) @@ -90889,7 +59060,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ libpixmap_la_SOURCES = \ pixbuf-draw.c \ pixbuf-main.c \ -@@ -437,85 +367,73 @@ +@@ -437,85 +362,73 @@ libpixmap_la_SOURCES = \ pixbuf-style.h \ pixbuf.h @@ -91012,7 +59183,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ distclean-compile: -rm -f *.tab.c -@@ -526,37 +444,25 @@ +@@ -526,37 +439,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf-render.Plo@am__quote@ .c.o: @@ -91062,7 +59233,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ mostlyclean-libtool: -rm -f *.lo -@@ -564,26 +470,15 @@ +@@ -564,26 +465,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -91092,7 +59263,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -593,23 +488,23 @@ +@@ -593,23 +483,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -91125,7 +59296,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -621,29 +516,23 @@ +@@ -621,29 +511,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -91168,7 +59339,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -658,9 +547,10 @@ +@@ -658,9 +542,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) @@ -91181,7 +59352,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -680,7 +570,7 @@ +@@ -680,7 +565,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -91190,7 +59361,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -694,24 +584,34 @@ +@@ -694,24 +579,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -91226,7 +59397,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ installcheck-am: maintainer-clean: maintainer-clean-am -@@ -732,20 +632,24 @@ +@@ -732,20 +627,24 @@ ps: ps-am ps-am: @@ -91261,9 +59432,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.14.7/ # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/input/Makefile.in ---- gtk+2.0-2.14.7.old/modules/input/Makefile.in 2009-01-07 22:52:11.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/input/Makefile.in 2009-01-08 08:03:52.000000000 +0100 +Index: gtk+-2.14.7/modules/input/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/input/Makefile.in 2009-02-17 23:15:20.547089552 +0100 ++++ gtk+-2.14.7/modules/input/Makefile.in 2009-02-21 14:58:47.126585129 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -91294,7 +59466,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,256 @@ +@@ -37,10 +33,256 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -91553,7 +59725,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +293,17 @@ +@@ -51,22 +293,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -91577,7 +59749,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +318,15 @@ +@@ -81,8 +318,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -91585,9 +59757,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +325,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -91596,13 +59767,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +350,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +351,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -91610,7 +59777,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +369,6 @@ +@@ -138,8 +370,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -91619,7 +59786,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +379,21 @@ +@@ -150,91 +380,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -91712,20 +59879,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +404,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +409,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -91748,12 +59902,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +431,6 @@ +@@ -284,8 +428,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -91762,7 +59914,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +442,10 @@ +@@ -297,28 +439,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -91791,7 +59943,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +454,25 @@ +@@ -327,22 +451,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -91801,12 +59953,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -91822,17 +59973,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +494,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +492,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +505,12 @@ +@@ -373,9 +501,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -91840,13 +59989,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +541,7 @@ +@@ -406,9 +536,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -91856,7 +60004,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -420,22 +553,18 @@ +@@ -420,22 +548,18 @@ INCLUDES = \ $(GTK_DEP_CFLAGS) \ $(INCLUDED_IMMODULE_DEFINE) @@ -91879,7 +60027,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_xim_la_SOURCES = \ gtkimcontextxim.c \ -@@ -446,42 +575,36 @@ +@@ -446,42 +570,36 @@ libstatic_im_xim_la_SOURCES = $(im_xim_l im_xim_la_LIBADD = $(LDADDS) @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_TRUE@STATIC_XIM_MODULE = libstatic-im-xim.la @HAVE_X11R6_TRUE@@INCLUDE_IM_XIM_FALSE@XIM_MODULE = im-xim.la @@ -91922,7 +60070,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i im_thai_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_thai_la_SOURCES = \ thai-charprop.c \ -@@ -494,28 +617,24 @@ +@@ -494,28 +612,24 @@ libstatic_im_thai_la_SOURCES = $(im_thai im_thai_la_LIBADD = $(LDADDS) @INCLUDE_IM_THAI_TRUE@STATIC_THAI_MODULE = libstatic-im-thai.la @INCLUDE_IM_THAI_FALSE@THAI_MODULE = im-thai.la @@ -91951,7 +60099,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i im_ime_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined) im_ime_la_SOURCES = \ gtkimcontextime.c \ -@@ -528,7 +647,6 @@ +@@ -528,7 +642,6 @@ im_ime_la_LIBADD = -limm32 $(LDADDS) libstatic_im_ime_la_LIBADD = -limm32 @INCLUDE_IM_IME_TRUE@@USE_WIN32_TRUE@STATIC_IME_MODULE = libstatic-im-ime.la @INCLUDE_IM_IME_FALSE@@USE_WIN32_TRUE@IME_MODULE = im-ime.la @@ -91959,7 +60107,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\" im_multipress_la_CPPFLAGS = $(multipress_defs) libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS) -@@ -542,13 +660,11 @@ +@@ -542,13 +655,11 @@ libstatic_im_multipress_la_SOURCES = $(i im_multipress_la_LIBADD = $(LDADDS) @INCLUDE_IM_MULTIPRESS_TRUE@STATIC_MULTIPRESS_MODULE = libstatic-im-multipress.la @INCLUDE_IM_MULTIPRESS_FALSE@MULTIPRESS_MODULE = im-multipress.la @@ -91975,7 +60123,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i @BUILD_DYNAMIC_MODULES_TRUE@module_LTLIBRARIES = \ @BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \ @BUILD_DYNAMIC_MODULES_TRUE@ $(CEDILLA_MODULE) \ -@@ -563,7 +679,6 @@ +@@ -563,7 +674,6 @@ dist_imconffile_DATA = im-multipress.con @BUILD_DYNAMIC_MODULES_TRUE@ $(VIQR_MODULE) \ @BUILD_DYNAMIC_MODULES_TRUE@ $(XIM_MODULE) @@ -91983,7 +60131,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i noinst_LTLIBRARIES = \ $(STATIC_AM_ET_MODULE) \ $(STATIC_CEDILLA_MODULE) \ -@@ -578,234 +693,64 @@ +@@ -578,234 +688,64 @@ noinst_LTLIBRARIES = \ $(STATIC_VIQR_MODULE) \ $(STATIC_XIM_MODULE) @@ -92253,7 +60401,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -@@ -814,61 +759,61 @@ +@@ -814,61 +754,61 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ @@ -92341,7 +60489,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i distclean-compile: -rm -f *.tab.c -@@ -894,214 +839,86 @@ +@@ -894,214 +834,86 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thai-charprop.Plo@am__quote@ .c.o: @@ -92594,7 +60742,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -1111,23 +928,23 @@ +@@ -1111,23 +923,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -92627,7 +60775,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1139,29 +956,23 @@ +@@ -1139,29 +951,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -92670,7 +60818,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1175,10 +986,12 @@ +@@ -1175,10 +981,12 @@ distdir: $(DISTFILES) check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am @@ -92685,7 +60833,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -1199,7 +1012,7 @@ +@@ -1199,7 +1007,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: @@ -92694,7 +60842,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1213,12 +1026,14 @@ +@@ -1213,12 +1021,14 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -92710,7 +60858,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i info: info-am info-am: -@@ -1227,12 +1042,20 @@ +@@ -1227,12 +1037,20 @@ install-data-am: install-dist_imconffile @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook @@ -92731,7 +60879,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1253,22 +1076,27 @@ +@@ -1253,22 +1071,27 @@ ps: ps-am ps-am: @@ -92766,7 +60914,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i # call as: $(XVFB_START) && someprogram -@@ -1351,7 +1179,18 @@ +@@ -1351,7 +1174,18 @@ uninstall-local: included-modules: $(noinst_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES) @@ -92786,9 +60934,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/input/Makefile.in gtk+2.0-2.14.7/modules/i @CROSS_COMPILING_FALSE@all-local: gtk.immodules # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefile.in ---- gtk+2.0-2.14.7.old/modules/Makefile.in 2009-01-07 22:52:09.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/Makefile.in 2009-01-08 08:03:52.000000000 +0100 +Index: gtk+-2.14.7/modules/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/Makefile.in 2009-02-17 23:15:20.519086481 +0100 ++++ gtk+-2.14.7/modules/Makefile.in 2009-02-21 14:58:45.847082567 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -92819,7 +60968,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,11 +31,36 @@ +@@ -37,11 +31,36 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -92858,7 +61007,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -52,22 +71,17 @@ +@@ -52,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -92882,7 +61031,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -82,22 +96,15 @@ +@@ -82,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -92890,9 +61039,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -91,10 +103,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -92901,13 +61049,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -121,6 +128,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -121,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -92915,7 +61059,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -139,8 +147,6 @@ +@@ -139,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -92924,7 +61068,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -151,97 +157,21 @@ +@@ -151,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -93017,20 +61161,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -252,29 +182,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -257,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -93053,12 +61184,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -285,8 +209,6 @@ +@@ -285,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -93067,7 +61196,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -298,28 +220,10 @@ +@@ -298,28 +217,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -93096,7 +61225,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -328,22 +232,25 @@ +@@ -328,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -93106,12 +61235,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -93127,17 +61255,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -365,7 +272,9 @@ - libexecdir = @libexecdir@ +@@ -366,6 +270,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -374,9 +283,12 @@ +@@ -374,9 +279,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -93145,13 +61271,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -407,31 +319,39 @@ +@@ -407,31 +314,39 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -93210,7 +61335,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil mostlyclean-libtool: -rm -f *.lo -@@ -439,10 +359,6 @@ +@@ -439,10 +354,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -93221,7 +61346,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -450,7 +366,13 @@ +@@ -450,7 +361,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -93236,7 +61361,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -462,15 +384,20 @@ +@@ -462,15 +379,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -93261,7 +61386,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -491,7 +418,7 @@ +@@ -491,7 +413,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -93270,7 +61395,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -502,35 +429,30 @@ +@@ -502,35 +424,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -93313,7 +61438,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -538,23 +460,23 @@ +@@ -538,23 +455,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -93346,7 +61471,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -566,29 +488,23 @@ +@@ -566,29 +483,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -93389,7 +61514,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -601,13 +517,17 @@ +@@ -601,13 +512,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -93411,7 +61536,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil distdir) \ || exit 1; \ fi; \ -@@ -618,7 +538,6 @@ +@@ -618,7 +533,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -93419,7 +61544,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -638,7 +557,7 @@ +@@ -638,7 +552,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -93428,7 +61553,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -649,25 +568,34 @@ +@@ -649,25 +563,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -93465,7 +61590,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -686,26 +614,24 @@ +@@ -686,26 +609,24 @@ ps: ps-recursive ps-am: @@ -93508,9 +61633,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/Makefile.in gtk+2.0-2.14.7/modules/Makefil # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.14.7/modules/other/gail/libgail-util/Makefile.in ---- gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in 2009-01-07 22:52:12.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/other/gail/libgail-util/Makefile.in 2009-01-08 08:03:53.000000000 +0100 +Index: gtk+-2.14.7/modules/other/gail/libgail-util/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/other/gail/libgail-util/Makefile.in 2009-02-17 23:15:20.499084568 +0100 ++++ gtk+-2.14.7/modules/other/gail/libgail-util/Makefile.in 2009-02-21 14:58:48.074581872 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -93542,7 +61668,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +34,60 @@ +@@ -37,10 +34,60 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -93605,7 +61731,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +98,17 @@ +@@ -51,22 +98,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -93629,7 +61755,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +123,15 @@ +@@ -81,8 +123,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -93637,9 +61763,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +130,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -93648,13 +61773,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +155,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +156,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -93662,7 +61783,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +174,6 @@ +@@ -138,8 +175,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -93671,7 +61792,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +184,21 @@ +@@ -150,91 +185,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -93764,20 +61885,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +209,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +214,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -93800,12 +61908,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +236,6 @@ +@@ -284,8 +233,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -93814,7 +61920,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +247,10 @@ +@@ -297,28 +244,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -93843,7 +61949,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +259,25 @@ +@@ -327,22 +256,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -93853,12 +61959,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -93874,17 +61979,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +299,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +297,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +310,12 @@ +@@ -373,9 +306,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -93892,13 +61995,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -408,32 +348,24 @@ +@@ -408,32 +343,24 @@ XVFB_START = \ @OS_WIN32_TRUE@export_symbols = -export-symbols gailutil.def @OS_WIN32_TRUE@no_undefined = -no-undefined @@ -93931,7 +62033,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. libgailutil_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -444,102 +376,87 @@ +@@ -444,102 +371,87 @@ libgailutil_la_CPPFLAGS = \ -DGDK_DISABLE_DEPRECATED\ -DGTK_DISABLE_DEPRECATED @@ -94071,7 +62173,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. distclean-compile: -rm -f *.tab.c -@@ -548,148 +465,72 @@ +@@ -548,148 +460,72 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgailutil_la-gailtextutil.Plo@am__quote@ .c.o: @@ -94250,7 +62352,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -699,23 +540,23 @@ +@@ -699,23 +535,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -94283,7 +62385,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -727,29 +568,23 @@ +@@ -727,29 +563,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -94326,7 +62428,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -764,9 +599,10 @@ +@@ -764,9 +594,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) @@ -94339,7 +62441,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -786,7 +622,7 @@ +@@ -786,7 +617,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -94348,7 +62450,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -800,24 +636,34 @@ +@@ -800,24 +631,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -94384,7 +62486,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. installcheck-am: maintainer-clean: maintainer-clean-am -@@ -838,21 +684,25 @@ +@@ -838,21 +679,25 @@ ps: ps-am ps-am: @@ -94421,9 +62523,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/libgail-util/Makefile.in gtk+2. uninstall-libgailutilincludeHEADERS uninstall-local # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modules/other/gail/Makefile.in ---- gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in 2009-01-07 22:52:12.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/other/gail/Makefile.in 2009-01-08 08:03:53.000000000 +0100 +Index: gtk+-2.14.7/modules/other/gail/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/other/gail/Makefile.in 2009-02-17 23:15:20.463089141 +0100 ++++ gtk+-2.14.7/modules/other/gail/Makefile.in 2009-02-21 14:58:47.839084066 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -94454,7 +62557,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,100 @@ +@@ -37,10 +33,100 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -94557,7 +62660,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +137,17 @@ +@@ -51,22 +137,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -94581,7 +62684,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +162,15 @@ +@@ -81,8 +162,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -94589,9 +62692,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +169,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -94600,13 +62702,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +194,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +195,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -94614,7 +62712,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +213,6 @@ +@@ -138,8 +214,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -94623,7 +62721,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +223,21 @@ +@@ -150,91 +224,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -94716,20 +62814,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +248,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +253,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -94752,12 +62837,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +275,6 @@ +@@ -284,8 +272,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -94766,7 +62849,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +286,10 @@ +@@ -297,28 +283,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -94795,7 +62878,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +298,25 @@ +@@ -327,22 +295,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -94805,12 +62888,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -94826,17 +62908,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +338,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +336,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +349,12 @@ +@@ -373,9 +345,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -94844,13 +62924,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,14 +385,10 @@ +@@ -406,14 +380,10 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -94865,7 +62944,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu gail_c_sources = \ gail-private-macros.h \ gail.c \ -@@ -472,9 +447,7 @@ +@@ -472,9 +442,7 @@ gail_c_sources = \ gailwidget.c \ gailwindow.c @@ -94875,7 +62954,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu gail_private_h_sources = \ gail.h \ gailadjustment.h \ -@@ -532,21 +505,17 @@ +@@ -532,21 +500,17 @@ gail_private_h_sources = \ gailutil.h \ gailwindow.h @@ -94897,7 +62976,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu libgail_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/modules/other \ -@@ -558,13 +527,11 @@ +@@ -558,13 +522,11 @@ libgail_la_CPPFLAGS = \ -DGDK_DISABLE_DEPRECATED \ $(AM_CPPFLAGS) @@ -94911,7 +62990,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu libgail_la_LIBADD = \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ $(top_builddir)/gdk/$(gdktargetlib) \ -@@ -573,178 +540,76 @@ +@@ -573,178 +535,76 @@ libgail_la_LIBADD = \ $(GTK_DEP_LIBS) \ $(INTLLIBS) @@ -95127,7 +63206,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu distclean-compile: -rm -f *.tab.c -@@ -806,1879 +671,432 @@ +@@ -806,1879 +666,432 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgail_la-gailwindow.Plo@am__quote@ .c.o: @@ -97246,7 +65325,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu done # This directory's subdirectories are mostly independent; you can cd -@@ -2688,7 +1106,13 @@ +@@ -2688,7 +1101,13 @@ uninstall-libgailincludeHEADERS: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -97261,7 +65340,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2700,15 +1124,20 @@ +@@ -2700,15 +1119,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -97286,7 +65365,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -2729,7 +1158,7 @@ +@@ -2729,7 +1153,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -97295,7 +65374,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -2740,35 +1169,30 @@ +@@ -2740,35 +1164,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -97338,7 +65417,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -2776,23 +1200,23 @@ +@@ -2776,23 +1195,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -97371,7 +65450,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -2804,29 +1228,23 @@ +@@ -2804,29 +1223,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -97414,7 +65493,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -2837,15 +1255,19 @@ +@@ -2837,15 +1250,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -97439,7 +65518,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu distdir) \ || exit 1; \ fi; \ -@@ -2856,8 +1278,9 @@ +@@ -2856,8 +1273,9 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: @@ -97451,7 +65530,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -2877,7 +1300,7 @@ +@@ -2877,7 +1295,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -97460,7 +65539,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -2891,24 +1314,35 @@ +@@ -2891,24 +1309,35 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -97498,7 +65577,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -2929,30 +1363,28 @@ +@@ -2929,30 +1358,28 @@ ps: ps-recursive ps-am: @@ -97548,9 +65627,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/Makefile.in gtk+2.0-2.14.7/modu # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14.7/modules/other/gail/tests/Makefile.in ---- gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in 2009-01-07 22:52:12.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/other/gail/tests/Makefile.in 2009-01-08 08:03:53.000000000 +0100 +Index: gtk+-2.14.7/modules/other/gail/tests/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/other/gail/tests/Makefile.in 2009-02-17 23:15:20.439087138 +0100 ++++ gtk+-2.14.7/modules/other/gail/tests/Makefile.in 2009-02-21 14:58:48.394582668 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -97580,7 +65660,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,183 @@ +@@ -37,10 +32,183 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -97766,7 +65846,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +219,17 @@ +@@ -51,22 +219,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -97790,7 +65870,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +244,15 @@ +@@ -81,8 +244,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -97798,9 +65878,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +251,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -97809,13 +65888,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +276,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +277,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -97823,7 +65898,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +295,6 @@ +@@ -138,8 +296,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -97832,7 +65907,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +305,21 @@ +@@ -150,91 +306,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -97925,20 +66000,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +330,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +335,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -97961,12 +66023,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +357,6 @@ +@@ -284,8 +354,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -97975,7 +66035,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +368,10 @@ +@@ -297,28 +365,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -98004,7 +66064,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +380,25 @@ +@@ -327,22 +377,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -98014,12 +66074,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -98035,17 +66094,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +420,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +418,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +431,12 @@ +@@ -373,9 +427,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -98053,13 +66110,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,15 +467,11 @@ +@@ -406,15 +462,11 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -98075,7 +66131,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. noinst_LTLIBRARIES = \ libtestaction.la \ libtestbutton.la \ -@@ -435,7 +492,6 @@ +@@ -435,7 +487,6 @@ noinst_LTLIBRARIES = \ libtesttreetable.la \ libtestvalues.la @@ -98083,7 +66139,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ -@@ -444,34 +500,28 @@ +@@ -444,34 +495,28 @@ AM_CPPFLAGS = \ -I$(top_builddir)/gtk \ -DGDK_DISABLE_DEPRECATED @@ -98118,7 +66174,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestaction_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -479,13 +529,11 @@ +@@ -479,13 +524,11 @@ libtestaction_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98132,7 +66188,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestbutton_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -493,13 +541,11 @@ +@@ -493,13 +536,11 @@ libtestbutton_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98146,7 +66202,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestcombo_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -507,11 +553,9 @@ +@@ -507,11 +548,9 @@ libtestcombo_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98158,7 +66214,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestcomponent_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -519,11 +563,9 @@ +@@ -519,11 +558,9 @@ libtestcomponent_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98170,7 +66226,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestimage_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -531,13 +573,11 @@ +@@ -531,13 +568,11 @@ libtestimage_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98184,7 +66240,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestmenuitem_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -545,13 +585,11 @@ +@@ -545,13 +580,11 @@ libtestmenuitem_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98198,7 +66254,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestnotebook_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -559,13 +597,11 @@ +@@ -559,13 +592,11 @@ libtestnotebook_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98212,7 +66268,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestobject_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -573,13 +609,11 @@ +@@ -573,13 +604,11 @@ libtestobject_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98226,7 +66282,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestoptionmenu_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -587,13 +621,11 @@ +@@ -587,13 +616,11 @@ libtestoptionmenu_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98240,7 +66296,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestpaned_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -601,13 +633,11 @@ +@@ -601,13 +628,11 @@ libtestpaned_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98254,7 +66310,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestprops_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -615,11 +645,9 @@ +@@ -615,11 +640,9 @@ libtestprops_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98266,7 +66322,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestselection_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -627,11 +655,9 @@ +@@ -627,11 +650,9 @@ libtestselection_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98278,7 +66334,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libteststatusbar_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -639,7 +665,6 @@ +@@ -639,7 +660,6 @@ libteststatusbar_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98286,7 +66342,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtesttable_la_SOURCES = \ testlib.c \ testlib.h \ -@@ -647,7 +672,6 @@ +@@ -647,7 +667,6 @@ libtesttable_la_SOURCES = \ testtextlib.h \ testtable.c @@ -98294,7 +66350,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtesttable_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -655,7 +679,6 @@ +@@ -655,7 +674,6 @@ libtesttable_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98302,7 +66358,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtesttext_la_SOURCES = \ testlib.c \ testlib.h \ -@@ -663,7 +686,6 @@ +@@ -663,7 +681,6 @@ libtesttext_la_SOURCES = \ testtextlib.h \ testtext.c @@ -98310,7 +66366,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtesttext_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -671,13 +693,11 @@ +@@ -671,13 +688,11 @@ libtesttext_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98324,7 +66380,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtesttoplevel_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -685,13 +705,11 @@ +@@ -685,13 +700,11 @@ libtesttoplevel_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98338,7 +66394,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtesttreetable_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -699,11 +717,9 @@ +@@ -699,11 +712,9 @@ libtesttreetable_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98350,7 +66406,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. libtestvalues_la_LDFLAGS = \ -rpath $(moduledir) -module -avoid-version $(no_undefined) \ $(top_builddir)/gtk/$(gtktargetlib) \ -@@ -711,150 +727,63 @@ +@@ -711,150 +722,63 @@ libtestvalues_la_LDFLAGS = \ $(GTK_DEP_LIBS) \ $(LDFLAGS) @@ -98536,7 +66592,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -@@ -863,51 +792,51 @@ +@@ -863,51 +787,51 @@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ @@ -98609,7 +66665,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. distclean-compile: -rm -f *.tab.c -@@ -935,37 +864,25 @@ +@@ -935,37 +859,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testvalues.Plo@am__quote@ .c.o: @@ -98659,7 +66715,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. mostlyclean-libtool: -rm -f *.lo -@@ -973,26 +890,15 @@ +@@ -973,26 +885,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -98689,7 +66745,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -1002,23 +908,23 @@ +@@ -1002,23 +903,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -98722,7 +66778,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1030,29 +936,23 @@ +@@ -1030,29 +931,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -98765,7 +66821,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1067,9 +967,10 @@ +@@ -1067,9 +962,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) @@ -98778,7 +66834,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -1089,7 +990,7 @@ +@@ -1089,7 +985,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -98787,7 +66843,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1103,24 +1004,34 @@ +@@ -1103,24 +999,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -98823,7 +66879,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1141,20 +1052,24 @@ +@@ -1141,20 +1047,24 @@ ps: ps-am ps-am: @@ -98857,9 +66913,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.14. # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/other/Makefile.in ---- gtk+2.0-2.14.7.old/modules/other/Makefile.in 2009-01-07 22:52:11.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/other/Makefile.in 2009-01-08 08:03:53.000000000 +0100 +Index: gtk+-2.14.7/modules/other/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/other/Makefile.in 2009-02-17 23:15:20.415084646 +0100 ++++ gtk+-2.14.7/modules/other/Makefile.in 2009-02-21 14:58:47.290585373 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -98890,7 +66947,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +31,35 @@ +@@ -37,10 +31,35 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -98928,7 +66985,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +70,17 @@ +@@ -51,22 +70,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -98952,7 +67009,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +95,15 @@ +@@ -81,8 +95,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -98960,9 +67017,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +102,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -98971,13 +67027,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +127,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +128,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -98985,7 +67037,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +146,6 @@ +@@ -138,8 +147,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -98994,7 +67046,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +156,21 @@ +@@ -150,91 +157,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -99087,20 +67139,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +181,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +186,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -99123,12 +67162,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +208,6 @@ +@@ -284,8 +205,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -99137,7 +67174,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +219,10 @@ +@@ -297,28 +216,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -99166,7 +67203,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +231,25 @@ +@@ -327,22 +228,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -99176,12 +67213,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -99197,17 +67233,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +271,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +269,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +282,12 @@ +@@ -373,9 +278,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -99215,13 +67249,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,31 +318,39 @@ +@@ -406,31 +313,39 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -99280,7 +67313,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o mostlyclean-libtool: -rm -f *.lo -@@ -438,10 +358,6 @@ +@@ -438,10 +353,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -99291,7 +67324,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -449,7 +365,13 @@ +@@ -449,7 +360,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -99306,7 +67339,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -461,15 +383,20 @@ +@@ -461,15 +378,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -99331,7 +67364,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -490,7 +417,7 @@ +@@ -490,7 +412,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -99340,7 +67373,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -501,35 +428,30 @@ +@@ -501,35 +423,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -99383,7 +67416,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -537,23 +459,23 @@ +@@ -537,23 +454,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -99416,7 +67449,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -565,29 +487,23 @@ +@@ -565,29 +482,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -99459,7 +67492,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -598,15 +514,19 @@ +@@ -598,15 +509,19 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done @@ -99484,7 +67517,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o distdir) \ || exit 1; \ fi; \ -@@ -617,7 +537,6 @@ +@@ -617,7 +532,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -99492,7 +67525,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -637,7 +556,7 @@ +@@ -637,7 +551,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -99501,7 +67534,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -648,25 +567,34 @@ +@@ -648,25 +562,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -99538,7 +67571,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -685,26 +613,24 @@ +@@ -685,26 +608,24 @@ ps: ps-recursive ps-am: @@ -99581,9 +67614,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/other/Makefile.in gtk+2.0-2.14.7/modules/o # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.14.7/modules/printbackends/cups/Makefile.in ---- gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in 2009-01-07 22:52:13.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/printbackends/cups/Makefile.in 2009-01-08 08:03:55.000000000 +0100 +Index: gtk+-2.14.7/modules/printbackends/cups/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/printbackends/cups/Makefile.in 2009-02-17 23:15:20.391085576 +0100 ++++ gtk+-2.14.7/modules/printbackends/cups/Makefile.in 2009-02-21 14:58:48.746581735 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -99614,7 +67648,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ +@@ -37,10 +33,59 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -99676,7 +67710,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +96,17 @@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -99700,7 +67734,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +121,15 @@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -99708,9 +67742,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -99719,13 +67752,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +153,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -99733,7 +67762,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +172,6 @@ +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -99742,7 +67771,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +182,21 @@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -99835,20 +67864,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +207,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -99871,12 +67887,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +234,6 @@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -99885,7 +67899,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +245,10 @@ +@@ -297,28 +242,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -99914,7 +67928,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +257,25 @@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -99924,12 +67938,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -99945,17 +67958,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +297,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +308,12 @@ +@@ -373,9 +304,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -99963,13 +67974,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +344,7 @@ +@@ -406,9 +339,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -99979,7 +67989,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -420,107 +356,90 @@ +@@ -420,107 +351,90 @@ INCLUDES = \ $(GTK_DEP_CFLAGS) \ $(GTK_DEBUG_FLAGS) @@ -100124,7 +68134,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 distclean-compile: -rm -f *.tab.c -@@ -530,37 +449,25 @@ +@@ -530,37 +444,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintercups.Plo@am__quote@ .c.o: @@ -100174,7 +68184,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 mostlyclean-libtool: -rm -f *.lo -@@ -568,26 +475,15 @@ +@@ -568,26 +470,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -100204,7 +68214,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -597,23 +493,23 @@ +@@ -597,23 +488,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -100237,7 +68247,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -625,29 +521,23 @@ +@@ -625,29 +516,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -100280,7 +68290,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -662,9 +552,10 @@ +@@ -662,9 +547,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -100293,7 +68303,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -684,7 +575,7 @@ +@@ -684,7 +570,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -100302,7 +68312,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -698,24 +589,34 @@ +@@ -698,24 +584,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -100338,7 +68348,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 installcheck-am: maintainer-clean: maintainer-clean-am -@@ -736,20 +637,24 @@ +@@ -736,20 +632,24 @@ ps: ps-am ps-am: @@ -100374,9 +68384,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.1 # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.14.7/modules/printbackends/file/Makefile.in ---- gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in 2009-01-07 22:52:13.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/printbackends/file/Makefile.in 2009-01-08 08:03:55.000000000 +0100 +Index: gtk+-2.14.7/modules/printbackends/file/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/printbackends/file/Makefile.in 2009-02-17 23:15:20.363089350 +0100 ++++ gtk+-2.14.7/modules/printbackends/file/Makefile.in 2009-02-21 14:58:48.954581985 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -100407,7 +68418,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,59 @@ +@@ -37,10 +33,59 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -100469,7 +68480,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +96,17 @@ +@@ -51,22 +96,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -100493,7 +68504,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +121,15 @@ +@@ -81,8 +121,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -100501,9 +68512,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +128,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -100512,13 +68522,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +153,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +154,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -100526,7 +68532,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +172,6 @@ +@@ -138,8 +173,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -100535,7 +68541,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +182,21 @@ +@@ -150,91 +183,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -100628,20 +68634,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +207,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +212,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -100664,12 +68657,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +234,6 @@ +@@ -284,8 +231,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -100678,7 +68669,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +245,10 @@ +@@ -297,28 +242,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -100707,7 +68698,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +257,25 @@ +@@ -327,22 +254,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -100717,12 +68708,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -100738,17 +68728,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +297,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +295,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +308,12 @@ +@@ -373,9 +304,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -100756,13 +68744,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,17 +344,12 @@ +@@ -406,17 +339,12 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -100780,7 +68767,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 libprintbackend_file_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -426,100 +359,86 @@ +@@ -426,100 +354,86 @@ libprintbackend_file_la_CPPFLAGS = \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(AM_CPPFLAGS) @@ -100918,7 +68905,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 distclean-compile: -rm -f *.tab.c -@@ -527,70 +446,32 @@ +@@ -527,70 +441,32 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_file_la-gtkprintbackendfile.Plo@am__quote@ .c.o: @@ -101005,7 +68992,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 mostlyclean-libtool: -rm -f *.lo -@@ -598,26 +479,15 @@ +@@ -598,26 +474,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -101035,7 +69022,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -627,23 +497,23 @@ +@@ -627,23 +492,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -101068,7 +69055,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -655,29 +525,23 @@ +@@ -655,29 +520,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -101111,7 +69098,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -692,9 +556,10 @@ +@@ -692,9 +551,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -101124,7 +69111,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -714,7 +579,7 @@ +@@ -714,7 +574,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -101133,7 +69120,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -728,24 +593,34 @@ +@@ -728,24 +588,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -101169,7 +69156,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 installcheck-am: maintainer-clean: maintainer-clean-am -@@ -766,20 +641,24 @@ +@@ -766,20 +636,24 @@ ps: ps-am ps-am: @@ -101205,9 +69192,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/file/Makefile.in gtk+2.0-2.1 # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14.7/modules/printbackends/lpr/Makefile.in ---- gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in 2009-01-07 22:52:13.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/printbackends/lpr/Makefile.in 2009-01-08 08:03:55.000000000 +0100 +Index: gtk+-2.14.7/modules/printbackends/lpr/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/printbackends/lpr/Makefile.in 2009-02-17 23:15:20.335083836 +0100 ++++ gtk+-2.14.7/modules/printbackends/lpr/Makefile.in 2009-02-21 14:58:49.150581965 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -101238,7 +69226,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,56 @@ +@@ -37,10 +33,56 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -101297,7 +69285,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +93,17 @@ +@@ -51,22 +93,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -101321,7 +69309,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +118,15 @@ +@@ -81,8 +118,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -101329,9 +69317,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +125,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -101340,13 +69327,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +150,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +151,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -101354,7 +69337,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +169,6 @@ +@@ -138,8 +170,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -101363,7 +69346,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +179,21 @@ +@@ -150,91 +180,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -101456,20 +69439,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +204,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +209,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -101492,12 +69462,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +231,6 @@ +@@ -284,8 +228,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -101506,7 +69474,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +242,10 @@ +@@ -297,28 +239,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -101535,7 +69503,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +254,25 @@ +@@ -327,22 +251,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -101545,12 +69513,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -101566,17 +69533,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +294,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +292,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +305,12 @@ +@@ -373,9 +301,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -101584,13 +69549,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,9 +341,7 @@ +@@ -406,9 +336,7 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -101600,7 +69564,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -419,98 +352,85 @@ +@@ -419,98 +347,85 @@ INCLUDES = \ $(GTK_DEP_CFLAGS) \ $(GTK_DEBUG_FLAGS) @@ -101736,7 +69700,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 distclean-compile: -rm -f *.tab.c -@@ -518,37 +438,25 @@ +@@ -518,37 +433,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkprintbackendlpr.Plo@am__quote@ .c.o: @@ -101786,7 +69750,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 mostlyclean-libtool: -rm -f *.lo -@@ -556,26 +464,15 @@ +@@ -556,26 +459,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -101816,7 +69780,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -585,23 +482,23 @@ +@@ -585,23 +477,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -101849,7 +69813,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -613,29 +510,23 @@ +@@ -613,29 +505,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -101892,7 +69856,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -650,9 +541,10 @@ +@@ -650,9 +536,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -101905,7 +69869,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -672,7 +564,7 @@ +@@ -672,7 +559,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -101914,7 +69878,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -686,24 +578,34 @@ +@@ -686,24 +573,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -101950,7 +69914,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 installcheck-am: maintainer-clean: maintainer-clean-am -@@ -724,20 +626,24 @@ +@@ -724,20 +621,24 @@ ps: ps-am ps-am: @@ -101986,9 +69950,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.14 # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/modules/printbackends/Makefile.in ---- gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in 2009-01-07 22:52:13.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/printbackends/Makefile.in 2009-01-08 08:03:53.000000000 +0100 +Index: gtk+-2.14.7/modules/printbackends/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/printbackends/Makefile.in 2009-02-17 23:15:20.311086721 +0100 ++++ gtk+-2.14.7/modules/printbackends/Makefile.in 2009-02-21 14:58:48.554581844 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -102019,7 +69984,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,12 +31,36 @@ +@@ -37,12 +31,36 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -102058,7 +70023,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -53,22 +71,17 @@ +@@ -53,22 +71,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -102082,7 +70047,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,22 +96,15 @@ +@@ -83,8 +96,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -102090,9 +70055,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -92,10 +103,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -102101,13 +70065,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -122,6 +128,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -122,6 +129,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -102115,7 +70075,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -140,8 +147,6 @@ +@@ -140,8 +148,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -102124,7 +70084,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -152,97 +157,21 @@ +@@ -152,91 +158,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -102217,20 +70177,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -253,29 +182,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -258,24 +187,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -102253,12 +70200,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -286,8 +209,6 @@ +@@ -286,8 +206,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -102267,7 +70212,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -299,28 +220,10 @@ +@@ -299,28 +217,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -102296,7 +70241,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -329,22 +232,25 @@ +@@ -329,22 +229,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -102306,12 +70251,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -102327,17 +70271,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -366,7 +272,9 @@ - libexecdir = @libexecdir@ +@@ -367,6 +270,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -375,9 +283,12 @@ +@@ -375,9 +279,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -102345,13 +70287,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -408,32 +319,40 @@ +@@ -408,32 +314,40 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -102411,7 +70352,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m mostlyclean-libtool: -rm -f *.lo -@@ -441,10 +360,6 @@ +@@ -441,10 +355,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -102422,7 +70363,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -452,7 +367,13 @@ +@@ -452,7 +362,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -102437,7 +70378,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -464,15 +385,20 @@ +@@ -464,15 +380,20 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -102462,7 +70403,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ -@@ -493,7 +419,7 @@ +@@ -493,7 +414,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ @@ -102471,7 +70412,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -504,35 +430,30 @@ +@@ -504,35 +425,30 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done @@ -102514,7 +70455,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ -@@ -540,23 +461,23 @@ +@@ -540,23 +456,23 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -102547,7 +70488,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -568,29 +489,23 @@ +@@ -568,29 +484,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -102590,7 +70531,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -603,13 +518,17 @@ +@@ -603,13 +513,17 @@ distdir: $(DISTFILES) done list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ @@ -102612,7 +70553,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m distdir) \ || exit 1; \ fi; \ -@@ -620,7 +539,6 @@ +@@ -620,7 +534,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: @@ -102620,7 +70561,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive -@@ -640,7 +558,7 @@ +@@ -640,7 +553,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -102629,7 +70570,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -651,25 +569,34 @@ +@@ -651,25 +564,34 @@ clean-am: clean-generic clean-libtool mo distclean: distclean-recursive -rm -f Makefile @@ -102666,7 +70607,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m installcheck-am: maintainer-clean: maintainer-clean-recursive -@@ -688,26 +615,24 @@ +@@ -688,26 +610,24 @@ ps: ps-recursive ps-am: @@ -102709,9 +70650,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/Makefile.in gtk+2.0-2.14.7/m # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.14.7/modules/printbackends/test/Makefile.in ---- gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in 2009-01-07 22:52:14.000000000 +0100 -+++ gtk+2.0-2.14.7/modules/printbackends/test/Makefile.in 2009-01-08 08:03:55.000000000 +0100 +Index: gtk+-2.14.7/modules/printbackends/test/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/modules/printbackends/test/Makefile.in 2009-02-17 23:15:20.287084718 +0100 ++++ gtk+-2.14.7/modules/printbackends/test/Makefile.in 2009-02-21 14:58:49.346581946 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -102742,7 +70684,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +33,58 @@ +@@ -37,10 +33,58 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -102803,7 +70745,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +95,17 @@ +@@ -51,22 +95,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -102827,7 +70769,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +120,15 @@ +@@ -81,8 +120,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -102835,9 +70777,8 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +127,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -102846,13 +70787,9 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +152,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +153,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -102860,7 +70797,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +171,6 @@ +@@ -138,8 +172,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -102869,7 +70806,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +181,21 @@ +@@ -150,91 +182,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -102962,20 +70899,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +206,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +211,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -102998,12 +70922,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +233,6 @@ +@@ -284,8 +230,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -103012,7 +70934,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +244,10 @@ +@@ -297,28 +241,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -103041,7 +70963,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +256,25 @@ +@@ -327,22 +253,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -103051,12 +70973,11 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -103072,17 +70993,15 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +296,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +294,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,9 +307,12 @@ +@@ -373,9 +303,11 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -103090,13 +71009,12 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages -@@ -406,17 +343,12 @@ +@@ -406,17 +338,12 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -103114,7 +71032,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 libprintbackend_test_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk \ -@@ -426,98 +358,85 @@ +@@ -426,98 +353,85 @@ libprintbackend_test_la_CPPFLAGS = \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(AM_CPPFLAGS) @@ -103250,7 +71168,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 distclean-compile: -rm -f *.tab.c -@@ -525,70 +444,32 @@ +@@ -525,70 +439,32 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprintbackend_test_la-gtkprintbackendtest.Plo@am__quote@ .c.o: @@ -103337,7 +71255,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 mostlyclean-libtool: -rm -f *.lo -@@ -596,26 +477,15 @@ +@@ -596,26 +472,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -103367,7 +71285,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -625,23 +495,23 @@ +@@ -625,23 +490,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -103400,7 +71318,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -653,29 +523,23 @@ +@@ -653,29 +518,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -103443,7 +71361,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -690,9 +554,10 @@ +@@ -690,9 +549,10 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) @@ -103456,7 +71374,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 install: install-am install-exec: install-exec-am install-data: install-data-am -@@ -712,7 +577,7 @@ +@@ -712,7 +572,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -103465,7 +71383,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -726,24 +591,34 @@ +@@ -726,24 +586,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -103501,7 +71419,7 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 installcheck-am: maintainer-clean: maintainer-clean-am -@@ -764,20 +639,24 @@ +@@ -764,20 +634,24 @@ ps: ps-am ps-am: @@ -103537,9 +71455,10 @@ diff -Naur gtk+2.0-2.14.7.old/modules/printbackends/test/Makefile.in gtk+2.0-2.1 # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in ---- gtk+2.0-2.14.7.old/perf/Makefile.in 2009-01-07 22:52:14.000000000 +0100 -+++ gtk+2.0-2.14.7/perf/Makefile.in 2009-01-08 08:03:55.000000000 +0100 +Index: gtk+-2.14.7/perf/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/perf/Makefile.in 2009-02-17 23:15:20.263085649 +0100 ++++ gtk+-2.14.7/perf/Makefile.in 2009-02-21 14:58:49.503081654 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -103569,7 +71488,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,10 +32,43 @@ +@@ -37,10 +32,43 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -103615,7 +71534,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -51,22 +79,17 @@ +@@ -51,22 +79,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -103639,7 +71558,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -81,22 +104,15 @@ +@@ -81,8 +104,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -103647,9 +71566,8 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -90,10 +111,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -103658,13 +71576,9 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -120,6 +136,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -120,6 +137,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -103672,7 +71586,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -138,8 +155,6 @@ +@@ -138,8 +156,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -103681,7 +71595,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -150,97 +165,21 @@ +@@ -150,91 +166,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -103774,20 +71688,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -251,29 +190,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -256,24 +195,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -103810,12 +71711,10 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -284,8 +217,6 @@ +@@ -284,8 +214,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -103824,7 +71723,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -297,28 +228,10 @@ +@@ -297,28 +225,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -103853,7 +71752,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -327,22 +240,25 @@ +@@ -327,22 +237,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -103863,12 +71762,11 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -103884,17 +71782,15 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -364,7 +280,9 @@ - libexecdir = @libexecdir@ +@@ -365,6 +278,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -373,20 +291,18 @@ +@@ -373,20 +287,17 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -103902,7 +71798,6 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -103921,7 +71816,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in TEST_PROGS = ### testing rules -@@ -412,7 +328,6 @@ +@@ -412,7 +323,6 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -103929,7 +71824,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -422,27 +337,18 @@ +@@ -422,27 +332,18 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -103957,7 +71852,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in testperf_SOURCES = \ appwindow.c \ gtkwidgetprofiler.c \ -@@ -456,68 +362,54 @@ +@@ -456,68 +357,54 @@ testperf_SOURCES = \ typebuiltins.h \ widgets.h @@ -104053,7 +71948,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -527,10 +419,10 @@ +@@ -527,10 +414,10 @@ clean-noinstPROGRAMS: done testperf$(EXEEXT): $(testperf_OBJECTS) $(testperf_DEPENDENCIES) @rm -f testperf$(EXEEXT) @@ -104066,7 +71961,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -544,37 +436,25 @@ +@@ -544,37 +431,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/typebuiltins.Po@am__quote@ .c.o: @@ -104116,7 +72011,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in mostlyclean-libtool: -rm -f *.lo -@@ -582,26 +462,15 @@ +@@ -582,26 +457,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -104146,7 +72041,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -611,23 +480,23 @@ +@@ -611,23 +475,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -104179,7 +72074,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -639,29 +508,23 @@ +@@ -639,29 +503,23 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -104222,7 +72117,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -677,7 +540,6 @@ +@@ -677,7 +535,6 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) @@ -104230,7 +72125,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in installdirs: install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -@@ -699,13 +561,13 @@ +@@ -699,13 +556,13 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -104246,7 +72141,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in clean: clean-am clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ -@@ -715,24 +577,34 @@ +@@ -715,24 +572,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -104282,7 +72177,7 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -753,18 +625,23 @@ +@@ -753,18 +620,23 @@ ps: ps-am ps-am: @@ -104315,10 +72210,11 @@ diff -Naur gtk+2.0-2.14.7.old/perf/Makefile.in gtk+2.0-2.14.7/perf/Makefile.in # call as: $(XVFB_START) && someprogram -diff -Naur gtk+2.0-2.14.7.old/po/Makefile.in.in gtk+2.0-2.14.7/po/Makefile.in.in ---- gtk+2.0-2.14.7.old/po/Makefile.in.in 2009-01-07 17:33:44.000000000 +0100 -+++ gtk+2.0-2.14.7/po/Makefile.in.in 2009-01-08 08:03:31.000000000 +0100 -@@ -25,6 +25,7 @@ +Index: gtk+-2.14.7/po/Makefile.in.in +=================================================================== +--- gtk+-2.14.7.orig/po/Makefile.in.in 2009-02-17 23:15:20.239088534 +0100 ++++ gtk+-2.14.7/po/Makefile.in.in 2009-02-21 14:56:58.606582727 +0100 +@@ -25,6 +25,7 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -104326,7 +72222,7 @@ diff -Naur gtk+2.0-2.14.7.old/po/Makefile.in.in gtk+2.0-2.14.7/po/Makefile.in.in datadir = @datadir@ libdir = @libdir@ localedir = $(libdir)/locale -@@ -40,6 +41,7 @@ +@@ -40,6 +41,7 @@ CC = @CC@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ @@ -104334,7 +72230,7 @@ diff -Naur gtk+2.0-2.14.7.old/po/Makefile.in.in gtk+2.0-2.14.7/po/Makefile.in.in XGETTEXT = @XGETTEXT@ MSGMERGE = msgmerge -@@ -54,7 +56,7 @@ +@@ -54,7 +56,7 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $ SOURCES = POFILES = @POFILES@ GMOFILES = @GMOFILES@ @@ -104343,7 +72239,7 @@ diff -Naur gtk+2.0-2.14.7.old/po/Makefile.in.in gtk+2.0-2.14.7/po/Makefile.in.in $(POFILES) $(GMOFILES) $(SOURCES) POTFILES = \ -@@ -78,7 +80,7 @@ +@@ -78,7 +80,7 @@ INSTOBJEXT = @INSTOBJEXT@ .po.gmo: file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ @@ -104352,7 +72248,7 @@ diff -Naur gtk+2.0-2.14.7.old/po/Makefile.in.in gtk+2.0-2.14.7/po/Makefile.in.in .po.cat: sed -f ../intl/po2msg.sed < $< > $*.msg \ -@@ -92,7 +94,7 @@ +@@ -92,7 +94,7 @@ all-no: $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ @@ -104361,7 +72257,7 @@ diff -Naur gtk+2.0-2.14.7.old/po/Makefile.in.in gtk+2.0-2.14.7/po/Makefile.in.in --flag=g_strdup_printf:1:c-format \ --flag=g_string_printf:2:c-format \ --flag=g_string_append_printf:2:c-format \ -@@ -108,10 +110,6 @@ +@@ -108,10 +110,6 @@ $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTF --flag=g_snprintf:3:c-format \ --flag=g_scanner_error:2:c-format \ --flag=g_scanner_warn:2:c-format \ @@ -104372,9 +72268,10 @@ diff -Naur gtk+2.0-2.14.7.old/po/Makefile.in.in gtk+2.0-2.14.7/po/Makefile.in.in --files-from=$(srcdir)/POTFILES.in \ && test ! -f $(GETTEXT_PACKAGE).po \ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ -diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in ---- gtk+2.0-2.14.7.old/tests/Makefile.in 2009-01-07 22:52:15.000000000 +0100 -+++ gtk+2.0-2.14.7/tests/Makefile.in 2009-01-08 08:03:56.000000000 +0100 +Index: gtk+-2.14.7/tests/Makefile.in +=================================================================== +--- gtk+-2.14.7.orig/tests/Makefile.in 2009-02-17 23:15:20.215090931 +0100 ++++ gtk+-2.14.7/tests/Makefile.in 2009-02-21 14:58:49.907082371 +0100 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. @@ -104404,7 +72301,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -@@ -37,12 +32,274 @@ +@@ -37,12 +32,274 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @@ -104681,7 +72578,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ -@@ -53,22 +310,17 @@ +@@ -53,22 +310,17 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@ BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@ @@ -104705,7 +72602,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in CUPS_API_MAJOR = @CUPS_API_MAJOR@ CUPS_API_MINOR = @CUPS_API_MINOR@ CUPS_CFLAGS = @CUPS_CFLAGS@ -@@ -83,22 +335,15 @@ +@@ -83,8 +335,6 @@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -104713,9 +72610,8 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in -DISABLE_EXPLICIT_DEPS_TRUE = @DISABLE_EXPLICIT_DEPS_TRUE@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ --ECHO = @ECHO@ -+DUMPBIN = @DUMPBIN@ - ECHO_C = @ECHO_C@ + ECHO = @ECHO@ +@@ -92,10 +342,6 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ @@ -104724,13 +72620,9 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in -ENABLE_MAN_FALSE = @ENABLE_MAN_FALSE@ -ENABLE_MAN_TRUE = @ENABLE_MAN_TRUE@ EXEEXT = @EXEEXT@ --F77 = @F77@ --FFLAGS = @FFLAGS@ -+FGREP = @FGREP@ - GAIL_INET_LIBS = @GAIL_INET_LIBS@ - GAIL_LT_CURRENT_MINUS_AGE = @GAIL_LT_CURRENT_MINUS_AGE@ - GAIL_LT_VERSION_INFO = @GAIL_LT_VERSION_INFO@ -@@ -122,6 +367,7 @@ + F77 = @F77@ + FFLAGS = @FFLAGS@ +@@ -122,6 +368,7 @@ GDK_PIXBUF_XLIB_DEP_LIBS = @GDK_PIXBUF_X GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@ GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@ GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@ @@ -104738,7 +72630,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in GDK_WLIBS = @GDK_WLIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -@@ -140,8 +386,6 @@ +@@ -140,8 +387,6 @@ GTK_BINARY_VERSION = @GTK_BINARY_VERSION GTK_DEBUG_FLAGS = @GTK_DEBUG_FLAGS@ GTK_DEP_CFLAGS = @GTK_DEP_CFLAGS@ GTK_DEP_LIBS = @GTK_DEP_LIBS@ @@ -104747,7 +72639,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in GTK_EXTRA_CFLAGS = @GTK_EXTRA_CFLAGS@ GTK_EXTRA_LIBS = @GTK_EXTRA_LIBS@ GTK_INTERFACE_AGE = @GTK_INTERFACE_AGE@ -@@ -152,97 +396,21 @@ +@@ -152,91 +397,14 @@ GTK_PACKAGES = @GTK_PACKAGES@ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@ GTK_VERSION = @GTK_VERSION@ GTK_XIM_FLAGS = @GTK_XIM_FLAGS@ @@ -104840,20 +72732,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - INSTOBJEXT = @INSTOBJEXT@ - INTLLIBS = @INTLLIBS@ -+LD = @LD@ - LDFLAGS = @LDFLAGS@ - LIBJASPER = @LIBJASPER@ - LIBJPEG = @LIBJPEG@ -@@ -253,29 +421,23 @@ - LIBTOOL = @LIBTOOL@ - LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@ - LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@ -+LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ +@@ -258,24 +426,15 @@ LTLIBOBJS = @LTLIBOBJS@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ @@ -104876,12 +72755,10 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -286,8 +448,6 @@ +@@ -286,8 +445,6 @@ PANGO_PREFIX = @PANGO_PREFIX@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ @@ -104890,7 +72767,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -@@ -299,28 +459,10 @@ +@@ -299,28 +456,10 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -104919,7 +72796,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in XMKMF = @XMKMF@ XMLCATALOG = @XMLCATALOG@ XML_CATALOG_FILE = @XML_CATALOG_FILE@ -@@ -329,22 +471,25 @@ +@@ -329,22 +468,25 @@ X_CFLAGS = @X_CFLAGS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -104929,12 +72806,11 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ + ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -104950,17 +72826,15 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ -@@ -366,7 +511,9 @@ - libexecdir = @libexecdir@ +@@ -367,6 +509,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ mandir = @mandir@ +mkdir_p = @mkdir_p@ ms_librarian = @ms_librarian@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ -@@ -375,37 +522,22 @@ +@@ -375,37 +518,21 @@ program_transform_name = @program_transf psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ @@ -104968,7 +72842,6 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in sysconfdir = @sysconfdir@ target_alias = @target_alias@ - -+top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ GTESTER = gtester # in $PATH for non-GLIB packages @@ -105007,7 +72880,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in TEST_PROGS = ### testing rules -@@ -431,7 +563,6 @@ +@@ -431,7 +558,6 @@ XVFB_START = \ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY @@ -105015,7 +72888,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -@@ -441,89 +572,21 @@ +@@ -441,89 +567,21 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -105107,7 +72980,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in simple_DEPENDENCIES = $(TEST_DEPS) print_editor_DEPENDENCIES = $(TEST_DEPS) testicontheme_DEPENDENCIES = $(TEST_DEPS) -@@ -578,7 +641,6 @@ +@@ -578,7 +636,6 @@ testactions_DEPENDENCIES = $(TEST_DEPS) testgrouping_DEPENDENCIES = $(TEST_DEPS) testtooltips_DEPENDENCIES = $(TEST_DEPS) testvolumebutton_DEPENDENCIES = $(TEST_DEPS) @@ -105115,7 +72988,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in simple_LDADD = $(LDADDS) print_editor_LDADD = $(LDADDS) testaccel_LDADD = $(LDADDS) -@@ -640,700 +702,125 @@ +@@ -640,700 +697,125 @@ testactions_LDADD = $(LDADDS) testgrouping_LDADD = $(LDADDS) testtooltips_LDADD = $(LDADDS) testvolumebutton_LDADD = $(LDADDS) @@ -105843,7 +73716,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; for p in $$list; do \ -@@ -1343,193 +830,193 @@ +@@ -1343,193 +825,193 @@ clean-noinstPROGRAMS: done autotestkeywords$(EXEEXT): $(autotestkeywords_OBJECTS) $(autotestkeywords_DEPENDENCIES) @rm -f autotestkeywords$(EXEEXT) @@ -106100,7 +73973,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -1601,130 +1088,76 @@ +@@ -1601,130 +1083,76 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treestoretest.Po@am__quote@ .c.o: @@ -106264,7 +74137,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) -@@ -1734,23 +1167,23 @@ +@@ -1734,23 +1162,23 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -106297,7 +74170,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique -@@ -1764,9 +1197,9 @@ +@@ -1764,9 +1192,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) @@ -106309,7 +74182,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ -@@ -1775,25 +1208,25 @@ +@@ -1775,25 +1203,25 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ @@ -106345,7 +74218,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in ;; \ esac; \ else \ -@@ -1818,46 +1251,40 @@ +@@ -1818,46 +1246,40 @@ check-TESTS: $(TESTS) skipped=""; \ if test "$$skip" -ne 0; then \ skipped="($$skip tests were not run)"; \ @@ -106409,7 +74282,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ -@@ -1872,7 +1299,6 @@ +@@ -1872,7 +1294,6 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile $(PROGRAMS) @@ -106417,7 +74290,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in installdirs: install: install-am install-exec: install-exec-am -@@ -1893,7 +1319,7 @@ +@@ -1893,7 +1314,7 @@ mostlyclean-generic: clean-generic: distclean-generic: @@ -106426,7 +74299,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -1907,24 +1333,34 @@ +@@ -1907,24 +1328,34 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -106462,7 +74335,7 @@ diff -Naur gtk+2.0-2.14.7.old/tests/Makefile.in gtk+2.0-2.14.7/tests/Makefile.in installcheck-am: maintainer-clean: maintainer-clean-am -@@ -1945,18 +1381,23 @@ +@@ -1945,18 +1376,23 @@ ps: ps-am ps-am: diff --git a/debian/patches/series b/debian/patches/series index c1e5103e51..ae74b8ce08 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,6 +12,8 @@ 030_gtkentry_password-char-circle.patch 031_directfb_dead-keys.patch 032_gdkwindowimpl_directfb.patch +033_directfb_client-message.patch +034_directfb_memleak.patch 041_ia32-libs.patch 042_treeview_single-focus.patch 060_ignore-random-icons.patch